From a527845e4ff46ba883e2b0997b5b9c2d1063bdb1 Mon Sep 17 00:00:00 2001
From: UdjinM6 <UdjinM6@users.noreply.github.com>
Date: Thu, 12 Jul 2018 12:01:10 +0300
Subject: [PATCH 001/400] Bump to 0.12.4.0 pre-release (#2167)

---
 configure.ac        | 6 +++---
 doc/Doxyfile        | 2 +-
 src/clientversion.h | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/configure.ac b/configure.ac
index fe7382891283..5687cc66fbab 100644
--- 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, 0)
 define(_CLIENT_VERSION_MINOR, 12)
-define(_CLIENT_VERSION_REVISION, 3)
-define(_CLIENT_VERSION_BUILD, 2)
-define(_CLIENT_VERSION_IS_RELEASE, true)
+define(_CLIENT_VERSION_REVISION, 4)
+define(_CLIENT_VERSION_BUILD, 0)
+define(_CLIENT_VERSION_IS_RELEASE, false)
 define(_COPYRIGHT_YEAR, 2018)
 define(_COPYRIGHT_HOLDERS,[The %s developers])
 define(_COPYRIGHT_HOLDERS_SUBSTITUTION,[[Dash Core]])
diff --git a/doc/Doxyfile b/doc/Doxyfile
index 3dc283de4429..27caefebda08 100644
--- a/doc/Doxyfile
+++ b/doc/Doxyfile
@@ -41,7 +41,7 @@ PROJECT_NAME           = "Dash Core"
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = 0.12.3.2
+PROJECT_NUMBER         = 0.12.4.0
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a
diff --git a/src/clientversion.h b/src/clientversion.h
index 0a890f9e439b..6150c700ab81 100644
--- a/src/clientversion.h
+++ b/src/clientversion.h
@@ -16,11 +16,11 @@
 //! These need to be macros, as clientversion.cpp's and dash*-res.rc's voodoo requires it
 #define CLIENT_VERSION_MAJOR 0
 #define CLIENT_VERSION_MINOR 12
-#define CLIENT_VERSION_REVISION 3
-#define CLIENT_VERSION_BUILD 2
+#define CLIENT_VERSION_REVISION 4
+#define CLIENT_VERSION_BUILD 0
 
 //! Set to true for release, false for prerelease or test build
-#define CLIENT_VERSION_IS_RELEASE true
+#define CLIENT_VERSION_IS_RELEASE false
 
 /**
  * Copyright year (2009-this)

From 2c0d4c9d777f3abc05e5f280b7eb0ba18a55f0f3 Mon Sep 17 00:00:00 2001
From: gladcow <sergey@dash.org>
Date: Thu, 12 Jul 2018 12:01:48 +0300
Subject: [PATCH 002/400] Save/load InstantSend cache (#2051)

* CTxLockCandidate serialization

* COutPointLock serialization

* CInstantSend serialization

* Read/write instantsend.dat file

* Read\write InstantSend cache only if InstantSend is enabled
---
 src/init.cpp     | 15 ++++++++++++
 src/instantx.cpp | 18 +++++++++++++-
 src/instantx.h   | 62 ++++++++++++++++++++++++++++++++++++++++++++++--
 3 files changed, 92 insertions(+), 3 deletions(-)

diff --git a/src/init.cpp b/src/init.cpp
index e60cd794e085..585a26161e89 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -251,6 +251,11 @@ void PrepareShutdown()
         flatdb3.Dump(governance);
         CFlatDB<CNetFulfilledRequestManager> flatdb4("netfulfilled.dat", "magicFulfilledCache");
         flatdb4.Dump(netfulfilledman);
+        if(fEnableInstantSend)
+        {
+            CFlatDB<CInstantSend> flatdb5("instantsend.dat", "magicInstantSendCache");
+            flatdb5.Dump(instantsend);
+        }
     }
 
     UnregisterNodeSignals(GetNodeSignals());
@@ -1914,6 +1919,16 @@ bool AppInitMain(boost::thread_group& threadGroup, CScheduler& scheduler)
         if(!flatdb4.Load(netfulfilledman)) {
             return InitError(_("Failed to load fulfilled requests cache from") + "\n" + (pathDB / strDBName).string());
         }
+
+        if(fEnableInstantSend)
+        {
+            strDBName = "instantsend.dat";
+            uiInterface.InitMessage(_("Loading InstantSend data cache..."));
+            CFlatDB<CInstantSend> flatdb5(strDBName, "magicInstantSendCache");
+            if(!flatdb5.Load(instantsend)) {
+                return InitError(_("Failed to load InstantSend data cache from") + "\n" + (pathDB / strDBName).string());
+            }
+        }
     }
 
 
diff --git a/src/instantx.cpp b/src/instantx.cpp
index acccc7ea4c50..e41a683c6983 100644
--- a/src/instantx.cpp
+++ b/src/instantx.cpp
@@ -37,6 +37,7 @@ int nInstantSendDepth = DEFAULT_INSTANTSEND_DEPTH;
 int nCompleteTXLocks;
 
 CInstantSend instantsend;
+const std::string CInstantSend::SERIALIZATION_VERSION_STRING = "CInstantSend-Version-1";
 
 // Transaction Locks
 //
@@ -797,6 +798,21 @@ bool CInstantSend::IsInstantSendReadyToLock(const uint256& txHash)
     return it != mapTxLockCandidates.end() && it->second.IsAllOutPointsReady();
 }
 
+void CInstantSend::Clear()
+{
+    LOCK(cs_instantsend);
+
+    mapLockRequestAccepted.clear();
+    mapLockRequestRejected.clear();
+    mapTxLockVotes.clear();
+    mapTxLockVotesOrphan.clear();
+    mapTxLockCandidates.clear();
+    mapVotedOutpoints.clear();
+    mapLockedOutpoints.clear();
+    mapMasternodeOrphanVotes.clear();
+    nCachedBlockHeight = 0;
+}
+
 bool CInstantSend::IsLockedInstantSendTransaction(const uint256& txHash)
 {
     if(!fEnableInstantSend || GetfLargeWorkForkFound() || GetfLargeWorkInvalidChainFound() ||
@@ -928,7 +944,7 @@ void CInstantSend::SyncTransaction(const CTransaction& tx, const CBlockIndex *pi
     }
 }
 
-std::string CInstantSend::ToString()
+std::string CInstantSend::ToString() const
 {
     LOCK(cs_instantsend);
     return strprintf("Lock Candidates: %llu, Votes %llu", mapTxLockCandidates.size(), mapTxLockVotes.size());
diff --git a/src/instantx.h b/src/instantx.h
index ac2c79749fce..1c95a03f9221 100644
--- a/src/instantx.h
+++ b/src/instantx.h
@@ -53,6 +53,8 @@ extern int nCompleteTXLocks;
 class CInstantSend
 {
 private:
+    static const std::string SERIALIZATION_VERSION_STRING;
+
     // Keep track of current block height
     int nCachedBlockHeight;
 
@@ -91,7 +93,37 @@ class CInstantSend
     bool IsInstantSendReadyToLock(const uint256 &txHash);
 
 public:
-    CCriticalSection cs_instantsend;
+    mutable CCriticalSection cs_instantsend;
+
+    ADD_SERIALIZE_METHODS;
+
+    template <typename Stream, typename Operation>
+    inline void SerializationOp(Stream& s, Operation ser_action) {
+        std::string strVersion;
+        if(ser_action.ForRead()) {
+            READWRITE(strVersion);
+        }
+        else {
+            strVersion = SERIALIZATION_VERSION_STRING;
+            READWRITE(strVersion);
+        }
+
+        READWRITE(mapLockRequestAccepted);
+        READWRITE(mapLockRequestRejected);
+        READWRITE(mapTxLockVotes);
+        READWRITE(mapTxLockVotesOrphan);
+        READWRITE(mapTxLockCandidates);
+        READWRITE(mapVotedOutpoints);
+        READWRITE(mapLockedOutpoints);
+        READWRITE(mapMasternodeOrphanVotes);
+        READWRITE(nCachedBlockHeight);
+
+        if(ser_action.ForRead() && (strVersion != SERIALIZATION_VERSION_STRING)) {
+            Clear();
+        }
+    }
+
+    void Clear();
 
     void ProcessMessage(CNode* pfrom, const std::string& strCommand, CDataStream& vRecv, CConnman& connman);
 
@@ -126,7 +158,7 @@ class CInstantSend
     void UpdatedBlockTip(const CBlockIndex *pindex);
     void SyncTransaction(const CTransaction& tx, const CBlockIndex *pindex, int posInBlock);
 
-    std::string ToString();
+    std::string ToString() const;
 };
 
 /**
@@ -264,6 +296,8 @@ class COutPointLock
     static const int SIGNATURES_REQUIRED        = 6;
     static const int SIGNATURES_TOTAL           = 10;
 
+    COutPointLock() {}
+
     COutPointLock(const COutPoint& outpointIn) :
         outpoint(outpointIn),
         mapMasternodeVotes()
@@ -271,6 +305,15 @@ class COutPointLock
 
     COutPoint GetOutpoint() const { return outpoint; }
 
+    ADD_SERIALIZE_METHODS;
+
+    template <typename Stream, typename Operation>
+    inline void SerializationOp(Stream& s, Operation ser_action) {
+        READWRITE(outpoint);
+        READWRITE(mapMasternodeVotes);
+        READWRITE(fAttacked);
+    }
+
     bool AddVote(const CTxLockVote& vote);
     std::vector<CTxLockVote> GetVotes() const;
     bool HasMasternodeVoted(const COutPoint& outpointMasternodeIn) const;
@@ -291,6 +334,11 @@ class CTxLockCandidate
     int64_t nTimeCreated;
 
 public:
+    CTxLockCandidate() :
+        nConfirmedHeight(-1),
+        nTimeCreated(GetTime())
+    {}
+
     CTxLockCandidate(const CTxLockRequest& txLockRequestIn) :
         nConfirmedHeight(-1),
         nTimeCreated(GetTime()),
@@ -301,6 +349,16 @@ class CTxLockCandidate
     CTxLockRequest txLockRequest;
     std::map<COutPoint, COutPointLock> mapOutPointLocks;
 
+    ADD_SERIALIZE_METHODS;
+
+    template <typename Stream, typename Operation>
+    inline void SerializationOp(Stream& s, Operation ser_action) {
+        READWRITE(txLockRequest);
+        READWRITE(mapOutPointLocks);
+        READWRITE(nTimeCreated);
+        READWRITE(nConfirmedHeight);
+    }
+
     uint256 GetHash() const { return txLockRequest.GetHash(); }
 
     void AddOutPointLock(const COutPoint& outpoint);

From 8ee9333bc2b0e02e98c163076c0f8743b3e583b5 Mon Sep 17 00:00:00 2001
From: Nathan Marley <nathan.marley@gmail.com>
Date: Thu, 12 Jul 2018 16:02:20 +0700
Subject: [PATCH 003/400] remove boost dependency from Dash-specific code
 (#2072)

* replace boost casts in dash-specific code

Specifically for spork.cpp : this should be temporary until all spork
sigs are based on hash and not string serialization format, after which
I expect the old signatures (else branch) should go away altogether. But
I still think it's worth it to get pieces of the boost dependency
removed, and this is an easy win, and could be merged now or in a patch
release w/o issue.

* replace boost::shared_ptr w/std::shared_ptr
---
 src/governance-classes.h    |  4 +---
 src/governance-object.cpp   |  5 +++--
 src/governance-vote.cpp     | 16 +++++++---------
 src/governance-vote.h       |  2 --
 src/masternode-payments.cpp |  8 ++++----
 src/masternode.cpp          | 20 ++++++++++----------
 src/privatesend.cpp         | 18 +++++++++---------
 src/spork.cpp               |  6 +++---
 8 files changed, 37 insertions(+), 42 deletions(-)

diff --git a/src/governance-classes.h b/src/governance-classes.h
index b75454675917..bb6aa0d45255 100644
--- a/src/governance-classes.h
+++ b/src/governance-classes.h
@@ -12,8 +12,6 @@
 #include "script/standard.h"
 #include "util.h"
 
-#include <boost/shared_ptr.hpp>
-
 class CSuperblock;
 class CGovernanceTrigger;
 class CGovernanceTriggerManager;
@@ -22,7 +20,7 @@ class CSuperblockManager;
 static const int TRIGGER_UNKNOWN            = -1;
 static const int TRIGGER_SUPERBLOCK         = 1000;
 
-typedef boost::shared_ptr<CSuperblock> CSuperblock_sptr;
+typedef std::shared_ptr<CSuperblock> CSuperblock_sptr;
 
 // DECLARE GLOBAL VARIABLES FOR GOVERNANCE CLASSES
 extern CGovernanceTriggerManager triggerman;
diff --git a/src/governance-object.cpp b/src/governance-object.cpp
index 8ef5bf56dd33..890c1c14db8f 100644
--- a/src/governance-object.cpp
+++ b/src/governance-object.cpp
@@ -15,6 +15,7 @@
 #include "util.h"
 
 #include <univalue.h>
+#include <string>
 
 CGovernanceObject::CGovernanceObject():
     cs(),
@@ -225,8 +226,8 @@ std::string CGovernanceObject::GetSignatureMessage() const
 {
     LOCK(cs);
     std::string strMessage = nHashParent.ToString() + "|" +
-        boost::lexical_cast<std::string>(nRevision) + "|" +
-        boost::lexical_cast<std::string>(nTime) + "|" +
+        std::to_string(nRevision) + "|" +
+        std::to_string(nTime) + "|" +
         GetDataAsHexString() + "|" +
         masternodeOutpoint.ToStringShort() + "|" +
         nCollateralHash.ToString();
diff --git a/src/governance-vote.cpp b/src/governance-vote.cpp
index 815497a978de..f20760fcb904 100644
--- a/src/governance-vote.cpp
+++ b/src/governance-vote.cpp
@@ -9,8 +9,6 @@
 #include "messagesigner.h"
 #include "util.h"
 
-#include <boost/lexical_cast.hpp>
-
 std::string CGovernanceVoting::ConvertOutcomeToString(vote_outcome_enum_t nOutcome)
 {
     switch(nOutcome)
@@ -173,7 +171,7 @@ bool CGovernanceVote::Sign(const CKey& keyMasternode, const CPubKey& pubKeyMaste
     } else {
 
         std::string strMessage = masternodeOutpoint.ToStringShort() + "|" + nParentHash.ToString() + "|" +
-            boost::lexical_cast<std::string>(nVoteSignal) + "|" + boost::lexical_cast<std::string>(nVoteOutcome) + "|" + boost::lexical_cast<std::string>(nTime);
+            std::to_string(nVoteSignal) + "|" + std::to_string(nVoteOutcome) + "|" + std::to_string(nTime);
 
         if(!CMessageSigner::SignMessage(strMessage, vchSig, keyMasternode)) {
             LogPrintf("CGovernanceVote::Sign -- SignMessage() failed\n");
@@ -199,9 +197,9 @@ bool CGovernanceVote::CheckSignature(const CPubKey& pubKeyMasternode) const
         if (!CHashSigner::VerifyHash(hash, pubKeyMasternode, vchSig, strError)) {
             // could be a signature in old format
             std::string strMessage = masternodeOutpoint.ToStringShort() + "|" + nParentHash.ToString() + "|" +
-                boost::lexical_cast<std::string>(nVoteSignal) + "|" +
-                boost::lexical_cast<std::string>(nVoteOutcome) + "|" +
-                boost::lexical_cast<std::string>(nTime);
+                std::to_string(nVoteSignal) + "|" +
+                std::to_string(nVoteOutcome) + "|" +
+                std::to_string(nTime);
 
             if(!CMessageSigner::VerifyMessage(pubKeyMasternode, vchSig, strMessage, strError)) {
                 // nope, not in old format either
@@ -211,9 +209,9 @@ bool CGovernanceVote::CheckSignature(const CPubKey& pubKeyMasternode) const
         }
     } else {
         std::string strMessage = masternodeOutpoint.ToStringShort() + "|" + nParentHash.ToString() + "|" +
-            boost::lexical_cast<std::string>(nVoteSignal) + "|" +
-            boost::lexical_cast<std::string>(nVoteOutcome) + "|" +
-            boost::lexical_cast<std::string>(nTime);
+            std::to_string(nVoteSignal) + "|" +
+            std::to_string(nVoteOutcome) + "|" +
+            std::to_string(nTime);
 
         if(!CMessageSigner::VerifyMessage(pubKeyMasternode, vchSig, strMessage, strError)) {
             LogPrint("gobject", "CGovernanceVote::IsValid -- VerifyMessage() failed, error: %s\n", strError);
diff --git a/src/governance-vote.h b/src/governance-vote.h
index 19909e49c003..3b851cad2222 100644
--- a/src/governance-vote.h
+++ b/src/governance-vote.h
@@ -8,8 +8,6 @@
 #include "key.h"
 #include "primitives/transaction.h"
 
-#include <boost/lexical_cast.hpp>
-
 class CGovernanceVote;
 class CConnman;
 
diff --git a/src/masternode-payments.cpp b/src/masternode-payments.cpp
index 73c97c24c594..df8e78982f2c 100644
--- a/src/masternode-payments.cpp
+++ b/src/masternode-payments.cpp
@@ -14,7 +14,7 @@
 #include "spork.h"
 #include "util.h"
 
-#include <boost/lexical_cast.hpp>
+#include <string>
 
 /** Object for who's going to get paid on which blocks */
 CMasternodePayments mnpayments;
@@ -455,7 +455,7 @@ bool CMasternodePaymentVote::Sign()
         }
     } else {
         std::string strMessage = masternodeOutpoint.ToStringShort() +
-                    boost::lexical_cast<std::string>(nBlockHeight) +
+                    std::to_string(nBlockHeight) +
                     ScriptToAsmStr(payee);
 
         if(!CMessageSigner::SignMessage(strMessage, vchSig, activeMasternode.keyMasternode)) {
@@ -905,7 +905,7 @@ bool CMasternodePaymentVote::CheckSignature(const CPubKey& pubKeyMasternode, int
         if (!CHashSigner::VerifyHash(hash, pubKeyMasternode, vchSig, strError)) {
             // could be a signature in old format
             std::string strMessage = masternodeOutpoint.ToStringShort() +
-                        boost::lexical_cast<std::string>(nBlockHeight) +
+                        std::to_string(nBlockHeight) +
                         ScriptToAsmStr(payee);
             if(!CMessageSigner::VerifyMessage(pubKeyMasternode, vchSig, strMessage, strError)) {
                 // nope, not in old format either
@@ -921,7 +921,7 @@ bool CMasternodePaymentVote::CheckSignature(const CPubKey& pubKeyMasternode, int
         }
     } else {
         std::string strMessage = masternodeOutpoint.ToStringShort() +
-                    boost::lexical_cast<std::string>(nBlockHeight) +
+                    std::to_string(nBlockHeight) +
                     ScriptToAsmStr(payee);
 
         if (!CMessageSigner::VerifyMessage(pubKeyMasternode, vchSig, strMessage, strError)) {
diff --git a/src/masternode.cpp b/src/masternode.cpp
index d1a7628e0e44..024a9aa90488 100644
--- a/src/masternode.cpp
+++ b/src/masternode.cpp
@@ -18,7 +18,7 @@
 #include "wallet/wallet.h"
 #endif // ENABLE_WALLET
 
-#include <boost/lexical_cast.hpp>
+#include <string>
 
 
 CMasternode::CMasternode() :
@@ -640,9 +640,9 @@ bool CMasternodeBroadcast::Sign(const CKey& keyCollateralAddress)
             return false;
         }
     } else {
-        std::string strMessage = addr.ToString(false) + boost::lexical_cast<std::string>(sigTime) +
+        std::string strMessage = addr.ToString(false) + std::to_string(sigTime) +
                         pubKeyCollateralAddress.GetID().ToString() + pubKeyMasternode.GetID().ToString() +
-                        boost::lexical_cast<std::string>(nProtocolVersion);
+                        std::to_string(nProtocolVersion);
 
         if (!CMessageSigner::SignMessage(strMessage, vchSig, keyCollateralAddress)) {
             LogPrintf("CMasternodeBroadcast::Sign -- SignMessage() failed\n");
@@ -668,9 +668,9 @@ bool CMasternodeBroadcast::CheckSignature(int& nDos) const
 
         if (!CHashSigner::VerifyHash(hash, pubKeyCollateralAddress, vchSig, strError)) {
             // maybe it's in old format
-            std::string strMessage = addr.ToString(false) + boost::lexical_cast<std::string>(sigTime) +
+            std::string strMessage = addr.ToString(false) + std::to_string(sigTime) +
                             pubKeyCollateralAddress.GetID().ToString() + pubKeyMasternode.GetID().ToString() +
-                            boost::lexical_cast<std::string>(nProtocolVersion);
+                            std::to_string(nProtocolVersion);
 
             if (!CMessageSigner::VerifyMessage(pubKeyCollateralAddress, vchSig, strMessage, strError)){
                 // nope, not in old format either
@@ -680,9 +680,9 @@ bool CMasternodeBroadcast::CheckSignature(int& nDos) const
             }
         }
     } else {
-        std::string strMessage = addr.ToString(false) + boost::lexical_cast<std::string>(sigTime) +
+        std::string strMessage = addr.ToString(false) + std::to_string(sigTime) +
                         pubKeyCollateralAddress.GetID().ToString() + pubKeyMasternode.GetID().ToString() +
-                        boost::lexical_cast<std::string>(nProtocolVersion);
+                        std::to_string(nProtocolVersion);
 
         if (!CMessageSigner::VerifyMessage(pubKeyCollateralAddress, vchSig, strMessage, strError)){
             LogPrintf("CMasternodeBroadcast::CheckSignature -- Got bad Masternode announce signature, error: %s\n", strError);
@@ -762,7 +762,7 @@ bool CMasternodePing::Sign(const CKey& keyMasternode, const CPubKey& pubKeyMaste
         }
     } else {
         std::string strMessage = CTxIn(masternodeOutpoint).ToString() + blockHash.ToString() +
-                    boost::lexical_cast<std::string>(sigTime);
+                    std::to_string(sigTime);
 
         if (!CMessageSigner::SignMessage(strMessage, vchSig, keyMasternode)) {
             LogPrintf("CMasternodePing::Sign -- SignMessage() failed\n");
@@ -788,7 +788,7 @@ bool CMasternodePing::CheckSignature(const CPubKey& pubKeyMasternode, int &nDos)
 
         if (!CHashSigner::VerifyHash(hash, pubKeyMasternode, vchSig, strError)) {
             std::string strMessage = CTxIn(masternodeOutpoint).ToString() + blockHash.ToString() +
-                        boost::lexical_cast<std::string>(sigTime);
+                        std::to_string(sigTime);
 
             if (!CMessageSigner::VerifyMessage(pubKeyMasternode, vchSig, strMessage, strError)) {
                 LogPrintf("CMasternodePing::CheckSignature -- Got bad Masternode ping signature, masternode=%s, error: %s\n", masternodeOutpoint.ToStringShort(), strError);
@@ -798,7 +798,7 @@ bool CMasternodePing::CheckSignature(const CPubKey& pubKeyMasternode, int &nDos)
         }
     } else {
         std::string strMessage = CTxIn(masternodeOutpoint).ToString() + blockHash.ToString() +
-                    boost::lexical_cast<std::string>(sigTime);
+                    std::to_string(sigTime);
 
         if (!CMessageSigner::VerifyMessage(pubKeyMasternode, vchSig, strMessage, strError)) {
             LogPrintf("CMasternodePing::CheckSignature -- Got bad Masternode ping signature, masternode=%s, error: %s\n", masternodeOutpoint.ToStringShort(), strError);
diff --git a/src/privatesend.cpp b/src/privatesend.cpp
index ec16dead5d98..42852d49f826 100644
--- a/src/privatesend.cpp
+++ b/src/privatesend.cpp
@@ -19,7 +19,7 @@
 #include "util.h"
 #include "utilmoneystr.h"
 
-#include <boost/lexical_cast.hpp>
+#include <string>
 
 bool CDarkSendEntry::AddScriptSig(const CTxIn& txin)
 {
@@ -62,9 +62,9 @@ bool CDarksendQueue::Sign()
         }
     } else {
         std::string strMessage = CTxIn(masternodeOutpoint).ToString() +
-                        boost::lexical_cast<std::string>(nDenom) +
-                        boost::lexical_cast<std::string>(nTime) +
-                        boost::lexical_cast<std::string>(fReady);
+                        std::to_string(nDenom) +
+                        std::to_string(nTime) +
+                        std::to_string(fReady);
 
         if(!CMessageSigner::SignMessage(strMessage, vchSig, activeMasternode.keyMasternode)) {
             LogPrintf("CDarksendQueue::Sign -- SignMessage() failed, %s\n", ToString());
@@ -94,9 +94,9 @@ bool CDarksendQueue::CheckSignature(const CPubKey& pubKeyMasternode) const
         }
     } else {
         std::string strMessage = CTxIn(masternodeOutpoint).ToString() +
-                        boost::lexical_cast<std::string>(nDenom) +
-                        boost::lexical_cast<std::string>(nTime) +
-                        boost::lexical_cast<std::string>(fReady);
+                        std::to_string(nDenom) +
+                        std::to_string(nTime) +
+                        std::to_string(fReady);
 
         if(!CMessageSigner::VerifyMessage(pubKeyMasternode, vchSig, strMessage, strError)) {
             LogPrintf("CDarksendQueue::CheckSignature -- Got bad Masternode queue signature: %s; error: %s\n", ToString(), strError);
@@ -141,7 +141,7 @@ bool CDarksendBroadcastTx::Sign()
             return false;
         }
     } else {
-        std::string strMessage = tx->GetHash().ToString() + boost::lexical_cast<std::string>(sigTime);
+        std::string strMessage = tx->GetHash().ToString() + std::to_string(sigTime);
 
         if(!CMessageSigner::SignMessage(strMessage, vchSig, activeMasternode.keyMasternode)) {
             LogPrintf("CDarksendBroadcastTx::Sign -- SignMessage() failed\n");
@@ -170,7 +170,7 @@ bool CDarksendBroadcastTx::CheckSignature(const CPubKey& pubKeyMasternode) const
             return false;
         }
     } else {
-        std::string strMessage = tx->GetHash().ToString() + boost::lexical_cast<std::string>(sigTime);
+        std::string strMessage = tx->GetHash().ToString() + std::to_string(sigTime);
 
         if(!CMessageSigner::VerifyMessage(pubKeyMasternode, vchSig, strMessage, strError)) {
             LogPrintf("CDarksendBroadcastTx::CheckSignature -- Got bad dstx signature, error: %s\n", strError);
diff --git a/src/spork.cpp b/src/spork.cpp
index c6b4e653e8a8..a00f6f7536c6 100644
--- a/src/spork.cpp
+++ b/src/spork.cpp
@@ -11,7 +11,7 @@
 #include "net_processing.h"
 #include "netmessagemaker.h"
 
-#include <boost/lexical_cast.hpp>
+#include <string>
 
 CSporkManager sporkManager;
 
@@ -262,7 +262,7 @@ bool CSporkMessage::Sign(const CKey& key)
             return false;
         }
     } else {
-        std::string strMessage = boost::lexical_cast<std::string>(nSporkID) + boost::lexical_cast<std::string>(nValue) + boost::lexical_cast<std::string>(nTimeSigned);
+        std::string strMessage = std::to_string(nSporkID) + std::to_string(nValue) + std::to_string(nTimeSigned);
 
         if(!CMessageSigner::SignMessage(strMessage, vchSig, key)) {
             LogPrintf("CSporkMessage::Sign -- SignMessage() failed\n");
@@ -292,7 +292,7 @@ bool CSporkMessage::CheckSignature(const CKeyID& pubKeyId) const
             return false;
         }
     } else {
-        std::string strMessage = boost::lexical_cast<std::string>(nSporkID) + boost::lexical_cast<std::string>(nValue) + boost::lexical_cast<std::string>(nTimeSigned);
+        std::string strMessage = std::to_string(nSporkID) + std::to_string(nValue) + std::to_string(nTimeSigned);
 
         if (!CMessageSigner::VerifyMessage(pubKeyId, vchSig, strMessage, strError)){
             // Note: unlike for other messages we have to check for new format even with SPORK_6_NEW_SIGS

From 43091a3efd1c6798b9ee34f97890adb66d775579 Mon Sep 17 00:00:00 2001
From: PaulieD <jedipbb1383@gmail.com>
Date: Thu, 12 Jul 2018 04:02:51 -0500
Subject: [PATCH 004/400] PrivateSend Enhancement: Up default round count to 4
 and allow user to mix up to 16 rounds (#2128)

* Allows a user to mix up to 16 rounds

All codebase appears to accept up to 16 rounds, however this form was capped at 8; restricting users to 2-8 rounds. This commit allows a user to actually use up to 16 rounds in practice. This will greatly enhance the privacy of those very worried about their privacy, as well as possibly increasing liquidity and increasing the privacy of all users.

* Up the default for PS mixing to 4 rounds.
---
 src/privatesend-client.h      | 2 +-
 src/qt/forms/optionsdialog.ui | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/privatesend-client.h b/src/privatesend-client.h
index 02b9d2be588c..0486a281bd0a 100644
--- a/src/privatesend-client.h
+++ b/src/privatesend-client.h
@@ -21,7 +21,7 @@ static const int MIN_PRIVATESEND_LIQUIDITY          = 0;
 static const int MAX_PRIVATESEND_ROUNDS             = 16;
 static const int MAX_PRIVATESEND_AMOUNT             = MAX_MONEY / COIN;
 static const int MAX_PRIVATESEND_LIQUIDITY          = 100;
-static const int DEFAULT_PRIVATESEND_ROUNDS         = 2;
+static const int DEFAULT_PRIVATESEND_ROUNDS         = 4;
 static const int DEFAULT_PRIVATESEND_AMOUNT         = 1000;
 static const int DEFAULT_PRIVATESEND_LIQUIDITY      = 0;
 
diff --git a/src/qt/forms/optionsdialog.ui b/src/qt/forms/optionsdialog.ui
index d4df3ba2fe0f..ff3351ec0f1e 100644
--- a/src/qt/forms/optionsdialog.ui
+++ b/src/qt/forms/optionsdialog.ui
@@ -224,7 +224,7 @@
             <number>2</number>
            </property>
            <property name="maximum">
-            <number>8</number>
+            <number>16</number>
            </property>
            <property name="value">
             <number>4</number>

From 3c89983db6e983e57ac9f84a0cd6c49a5a7687a3 Mon Sep 17 00:00:00 2001
From: UdjinM6 <UdjinM6@users.noreply.github.com>
Date: Thu, 12 Jul 2018 12:03:26 +0300
Subject: [PATCH 005/400] Remove DarksendConfig (#2132)

---
 contrib/dash-qt.pro            |   1 -
 src/Makefile.qt.include        |   4 -
 src/qt/darksendconfig.cpp      |  91 ----------------
 src/qt/darksendconfig.h        |  37 -------
 src/qt/forms/darksendconfig.ui | 188 ---------------------------------
 src/qt/overviewpage.cpp        |  10 --
 6 files changed, 331 deletions(-)
 delete mode 100644 src/qt/darksendconfig.cpp
 delete mode 100644 src/qt/darksendconfig.h
 delete mode 100644 src/qt/forms/darksendconfig.ui

diff --git a/contrib/dash-qt.pro b/contrib/dash-qt.pro
index 57a29cdea769..cde8c56930a8 100644
--- a/contrib/dash-qt.pro
+++ b/contrib/dash-qt.pro
@@ -3,7 +3,6 @@ FORMS += \
     ../src/qt/forms/addressbookpage.ui \
     ../src/qt/forms/askpassphrasedialog.ui \
     ../src/qt/forms/coincontroldialog.ui \
-    ../src/qt/forms/darksendconfig.ui \
     ../src/qt/forms/debugwindow.ui \
     ../src/qt/forms/editaddressdialog.ui \
     ../src/qt/forms/helpmessagedialog.ui \
diff --git a/src/Makefile.qt.include b/src/Makefile.qt.include
index c5c95fc614b0..c53c8e535366 100644
--- a/src/Makefile.qt.include
+++ b/src/Makefile.qt.include
@@ -31,7 +31,6 @@ QT_FORMS_UI = \
   qt/forms/addressbookpage.ui \
   qt/forms/askpassphrasedialog.ui \
   qt/forms/coincontroldialog.ui \
-  qt/forms/darksendconfig.ui \
   qt/forms/editaddressdialog.ui \
   qt/forms/helpmessagedialog.ui \
   qt/forms/intro.ui \
@@ -62,7 +61,6 @@ QT_MOC_CPP = \
   qt/moc_coincontroldialog.cpp \
   qt/moc_coincontroltreewidget.cpp \
   qt/moc_csvmodelwriter.cpp \
-  qt/moc_darksendconfig.cpp \
   qt/moc_editaddressdialog.cpp \
   qt/moc_guiutil.cpp \
   qt/moc_intro.cpp \
@@ -132,7 +130,6 @@ BITCOIN_QT_H = \
   qt/coincontroldialog.h \
   qt/coincontroltreewidget.h \
   qt/csvmodelwriter.h \
-  qt/darksendconfig.h \
   qt/editaddressdialog.h \
   qt/guiconstants.h \
   qt/guiutil.h \
@@ -487,7 +484,6 @@ BITCOIN_QT_WALLET_CPP = \
   qt/askpassphrasedialog.cpp \
   qt/coincontroldialog.cpp \
   qt/coincontroltreewidget.cpp \
-  qt/darksendconfig.cpp \
   qt/editaddressdialog.cpp \
   qt/masternodelist.cpp \
   qt/openuridialog.cpp \
diff --git a/src/qt/darksendconfig.cpp b/src/qt/darksendconfig.cpp
deleted file mode 100644
index ceb7ec3f79ac..000000000000
--- a/src/qt/darksendconfig.cpp
+++ /dev/null
@@ -1,91 +0,0 @@
-#include "darksendconfig.h"
-#include "ui_darksendconfig.h"
-
-#include "bitcoinunits.h"
-#include "guiconstants.h"
-#include "optionsmodel.h"
-#include "privatesend-client.h"
-#include "walletmodel.h"
-
-#include <QMessageBox>
-#include <QPushButton>
-#include <QKeyEvent>
-#include <QSettings>
-
-DarksendConfig::DarksendConfig(QWidget *parent) :
-    QDialog(parent),
-    ui(new Ui::DarksendConfig),
-    model(0)
-{
-    ui->setupUi(this);
-
-    connect(ui->buttonBasic, SIGNAL(clicked()), this, SLOT(clickBasic()));
-    connect(ui->buttonHigh, SIGNAL(clicked()), this, SLOT(clickHigh()));
-    connect(ui->buttonMax, SIGNAL(clicked()), this, SLOT(clickMax()));
-}
-
-DarksendConfig::~DarksendConfig()
-{
-    delete ui;
-}
-
-void DarksendConfig::setModel(WalletModel *model)
-{
-    this->model = model;
-}
-
-void DarksendConfig::clickBasic()
-{
-    configure(true, 1000, 2);
-
-    QString strAmount(BitcoinUnits::formatWithUnit(
-        model->getOptionsModel()->getDisplayUnit(), 1000 * COIN));
-    QMessageBox::information(this, tr("PrivateSend Configuration"),
-        tr(
-            "PrivateSend was successfully set to basic (%1 and 2 rounds). You can change this at any time by opening Dash's configuration screen."
-        ).arg(strAmount)
-    );
-
-    close();
-}
-
-void DarksendConfig::clickHigh()
-{
-    configure(true, 1000, 8);
-
-    QString strAmount(BitcoinUnits::formatWithUnit(
-        model->getOptionsModel()->getDisplayUnit(), 1000 * COIN));
-    QMessageBox::information(this, tr("PrivateSend Configuration"),
-        tr(
-            "PrivateSend was successfully set to high (%1 and 8 rounds). You can change this at any time by opening Dash's configuration screen."
-        ).arg(strAmount)
-    );
-
-    close();
-}
-
-void DarksendConfig::clickMax()
-{
-    configure(true, 1000, 16);
-
-    QString strAmount(BitcoinUnits::formatWithUnit(
-        model->getOptionsModel()->getDisplayUnit(), 1000 * COIN));
-    QMessageBox::information(this, tr("PrivateSend Configuration"),
-        tr(
-            "PrivateSend was successfully set to maximum (%1 and 16 rounds). You can change this at any time by opening Dash's configuration screen."
-        ).arg(strAmount)
-    );
-
-    close();
-}
-
-void DarksendConfig::configure(bool enabled, int coins, int rounds) {
-
-    QSettings settings;
-
-    settings.setValue("nPrivateSendRounds", rounds);
-    settings.setValue("nPrivateSendAmount", coins);
-
-    privateSendClient.nPrivateSendRounds = rounds;
-    privateSendClient.nPrivateSendAmount = coins;
-}
diff --git a/src/qt/darksendconfig.h b/src/qt/darksendconfig.h
deleted file mode 100644
index a1e1a37c5ef6..000000000000
--- a/src/qt/darksendconfig.h
+++ /dev/null
@@ -1,37 +0,0 @@
-#ifndef DARKSENDCONFIG_H
-#define DARKSENDCONFIG_H
-
-#include <QDialog>
-
-namespace Ui {
-    class DarksendConfig;
-}
-class WalletModel;
-
-/** Multifunctional dialog to ask for passphrases. Used for encryption, unlocking, and changing the passphrase.
- */
-class DarksendConfig : public QDialog
-{
-    Q_OBJECT
-
-public:
-
-    DarksendConfig(QWidget *parent = 0);
-    ~DarksendConfig();
-
-    void setModel(WalletModel *model);
-
-
-private:
-    Ui::DarksendConfig *ui;
-    WalletModel *model;
-    void configure(bool enabled, int coins, int rounds);
-
-private Q_SLOTS:
-
-    void clickBasic();
-    void clickHigh();
-    void clickMax();
-};
-
-#endif // DARKSENDCONFIG_H
diff --git a/src/qt/forms/darksendconfig.ui b/src/qt/forms/darksendconfig.ui
deleted file mode 100644
index 4ac909fbf6e7..000000000000
--- a/src/qt/forms/darksendconfig.ui
+++ /dev/null
@@ -1,188 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>DarksendConfig</class>
- <widget class="QDialog" name="DarksendConfig">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>630</width>
-    <height>307</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string>Configure PrivateSend</string>
-  </property>
-  <widget class="QPushButton" name="buttonBasic">
-   <property name="geometry">
-    <rect>
-     <x>20</x>
-     <y>70</y>
-     <width>151</width>
-     <height>27</height>
-    </rect>
-   </property>
-   <property name="text">
-    <string>Basic Privacy</string>
-   </property>
-  </widget>
-  <widget class="QPushButton" name="buttonHigh">
-   <property name="geometry">
-    <rect>
-     <x>20</x>
-     <y>140</y>
-     <width>151</width>
-     <height>27</height>
-    </rect>
-   </property>
-   <property name="text">
-    <string>High Privacy</string>
-   </property>
-  </widget>
-  <widget class="QPushButton" name="buttonMax">
-   <property name="geometry">
-    <rect>
-     <x>20</x>
-     <y>210</y>
-     <width>151</width>
-     <height>27</height>
-    </rect>
-   </property>
-   <property name="text">
-    <string>Maximum Privacy</string>
-   </property>
-  </widget>
-  <widget class="QLabel" name="label">
-   <property name="geometry">
-    <rect>
-     <x>30</x>
-     <y>20</y>
-     <width>571</width>
-     <height>31</height>
-    </rect>
-   </property>
-   <property name="text">
-    <string>Please select a privacy level.</string>
-   </property>
-  </widget>
-  <widget class="QLabel" name="label_2">
-   <property name="geometry">
-    <rect>
-     <x>190</x>
-     <y>70</y>
-     <width>421</width>
-     <height>21</height>
-    </rect>
-   </property>
-   <property name="text">
-    <string>Use 2 separate masternodes to mix funds up to 1000 DASH</string>
-   </property>
-  </widget>
-  <widget class="QLabel" name="label_3">
-   <property name="geometry">
-    <rect>
-     <x>190</x>
-     <y>140</y>
-     <width>411</width>
-     <height>21</height>
-    </rect>
-   </property>
-   <property name="text">
-    <string>Use 8 separate masternodes to mix funds up to 1000 DASH</string>
-   </property>
-  </widget>
-  <widget class="QLabel" name="label_4">
-   <property name="geometry">
-    <rect>
-     <x>190</x>
-     <y>210</y>
-     <width>421</width>
-     <height>21</height>
-    </rect>
-   </property>
-   <property name="text">
-    <string>Use 16 separate masternodes</string>
-   </property>
-  </widget>
-  <widget class="QLabel" name="label_6">
-   <property name="geometry">
-    <rect>
-     <x>40</x>
-     <y>100</y>
-     <width>561</width>
-     <height>21</height>
-    </rect>
-   </property>
-   <property name="text">
-    <string>This option is the quickest and will cost about ~0.025 DASH to anonymize 1000 DASH</string>
-   </property>
-  </widget>
-  <widget class="QLabel" name="label_7">
-   <property name="geometry">
-    <rect>
-     <x>40</x>
-     <y>170</y>
-     <width>561</width>
-     <height>21</height>
-    </rect>
-   </property>
-   <property name="text">
-    <string>This option is moderately fast and will cost about 0.05 DASH to anonymize 1000 DASH</string>
-   </property>
-  </widget>
-  <widget class="QLabel" name="label_8">
-   <property name="geometry">
-    <rect>
-     <x>40</x>
-     <y>240</y>
-     <width>561</width>
-     <height>21</height>
-    </rect>
-   </property>
-   <property name="text">
-    <string>This is the slowest and most secure option. Using maximum anonymity will cost</string>
-   </property>
-  </widget>
-  <widget class="QLabel" name="label_9">
-   <property name="geometry">
-    <rect>
-     <x>40</x>
-     <y>260</y>
-     <width>561</width>
-     <height>21</height>
-    </rect>
-   </property>
-   <property name="text">
-    <string>0.1 DASH per 1000 DASH you anonymize.</string>
-   </property>
-  </widget>
-  <widget class="Line" name="line">
-   <property name="geometry">
-    <rect>
-     <x>10</x>
-     <y>120</y>
-     <width>601</width>
-     <height>16</height>
-    </rect>
-   </property>
-   <property name="orientation">
-    <enum>Qt::Horizontal</enum>
-   </property>
-  </widget>
-  <widget class="Line" name="line_2">
-   <property name="geometry">
-    <rect>
-     <x>10</x>
-     <y>190</y>
-     <width>601</width>
-     <height>16</height>
-    </rect>
-   </property>
-   <property name="orientation">
-    <enum>Qt::Horizontal</enum>
-   </property>
-  </widget>
- </widget>
- <resources/>
- <connections/>
-</ui>
diff --git a/src/qt/overviewpage.cpp b/src/qt/overviewpage.cpp
index 806ff34decd8..1ea7c5d242e8 100644
--- a/src/qt/overviewpage.cpp
+++ b/src/qt/overviewpage.cpp
@@ -19,7 +19,6 @@
 #include "walletmodel.h"
 
 #include "instantx.h"
-#include "darksendconfig.h"
 #include "masternode-sync.h"
 #include "privatesend-client.h"
 
@@ -646,15 +645,6 @@ void OverviewPage::togglePrivateSend(){
         privateSendClient.UnlockCoins();
     } else {
         ui->togglePrivateSend->setText(tr("Stop Mixing"));
-
-        /* show darksend configuration if client has defaults set */
-
-        if(privateSendClient.nPrivateSendAmount == 0){
-            DarksendConfig dlg(this);
-            dlg.setModel(walletModel);
-            dlg.exec();
-        }
-
     }
 }
 

From 6da2837bdd033814856ed6fc2cb13a98d704b21b Mon Sep 17 00:00:00 2001
From: gladcow <sergey@dash.org>
Date: Thu, 12 Jul 2018 12:04:42 +0300
Subject: [PATCH 006/400] InstantSend Integration tests (#2141)

* adjust `AddLocal` method only in regtest mode

* Create Masternodes in regtest

* sentinelping call for masternodes

* set externalip option for masternodes in regtest

* fix MNB relay during masternodes creation

* fix node_count naming

* instantsend doublespend

* decrease node restarts

* prevent spending masternode collaterals

* move long test to the test list start

* remove InstantSend spork sending

* remove spork-specific code

* fix checking double spend rejection
---
 qa/pull-tester/rpc-tests.py         |   1 +
 qa/rpc-tests/p2p-instantsend.py     | 192 ++++++++++++++++++++++++++++
 qa/rpc-tests/test_framework/util.py |   2 +-
 src/chainparams.cpp                 |   3 +
 src/chainparams.h                   |   3 +
 src/masternodeman.cpp               |   4 +-
 src/net.cpp                         |   2 +-
 7 files changed, 204 insertions(+), 3 deletions(-)
 create mode 100755 qa/rpc-tests/p2p-instantsend.py

diff --git a/qa/pull-tester/rpc-tests.py b/qa/pull-tester/rpc-tests.py
index 7690ee5511e9..3d2916d0d368 100755
--- a/qa/pull-tester/rpc-tests.py
+++ b/qa/pull-tester/rpc-tests.py
@@ -116,6 +116,7 @@
     'fundrawtransaction.py',
     'fundrawtransaction-hd.py',
     # vv Tests less than 2m vv
+    'p2p-instantsend.py',
     'wallet.py',
     'wallet-accounts.py',
     'wallet-dump.py',
diff --git a/qa/rpc-tests/p2p-instantsend.py b/qa/rpc-tests/p2p-instantsend.py
new file mode 100755
index 000000000000..33aaa755b6b0
--- /dev/null
+++ b/qa/rpc-tests/p2p-instantsend.py
@@ -0,0 +1,192 @@
+#!/usr/bin/env python3
+# Copyright (c) 2018 The Dash Core developers
+# Distributed under the MIT software license, see the accompanying
+# file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+from test_framework.mininode import *
+from test_framework.test_framework import BitcoinTestFramework
+from test_framework.util import *
+from time import *
+
+'''
+InstantSendTest -- test InstantSend functionality (prevent doublespend for unconfirmed transactions)
+'''
+
+MASTERNODE_COLLATERAL = 1000
+
+
+class MasternodeInfo:
+    def __init__(self, key, collateral_id, collateral_out):
+        self.key = key
+        self.collateral_id = collateral_id
+        self.collateral_out = collateral_out
+
+
+class InstantSendTest(BitcoinTestFramework):
+    def __init__(self):
+        super().__init__()
+        self.mn_count = 10
+        self.num_nodes = self.mn_count + 4
+        self.mninfo = []
+        self.setup_clean_chain = True
+        self.is_network_split = False
+        # set sender,  receiver,  isolated nodes
+        self.isolated_idx = self.num_nodes - 1
+        self.receiver_idx = self.num_nodes - 2
+        self.sender_idx = self.num_nodes - 3
+
+    def create_simple_node(self):
+        idx = len(self.nodes)
+        self.nodes.append(start_node(idx, self.options.tmpdir,
+                                     ["-debug"]))
+        for i in range(0, idx):
+            connect_nodes(self.nodes[i], idx)
+
+    def get_mnconf_file(self):
+        return os.path.join(self.options.tmpdir, "node0/regtest/masternode.conf")
+
+    def prepare_masternodes(self):
+        for idx in range(0, self.mn_count):
+            key = self.nodes[0].masternode("genkey")
+            address = self.nodes[0].getnewaddress()
+            txid = self.nodes[0].sendtoaddress(address, MASTERNODE_COLLATERAL)
+            txrow = self.nodes[0].getrawtransaction(txid, True)
+            collateral_vout = 0
+            for vout_idx in range(0, len(txrow["vout"])):
+                vout = txrow["vout"][vout_idx]
+                if vout["value"] == MASTERNODE_COLLATERAL:
+                    collateral_vout = vout_idx
+            self.nodes[0].lockunspent(False,
+                                      [{"txid": txid, "vout": collateral_vout}])
+            self.mninfo.append(MasternodeInfo(key, txid, collateral_vout))
+
+    def write_mn_config(self):
+        conf = self.get_mnconf_file()
+        f = open(conf, 'a')
+        for idx in range(0, self.mn_count):
+            f.write("mn%d 127.0.0.1:%d %s %s %d\n" % (idx + 1, p2p_port(idx + 1),
+                                                      self.mninfo[idx].key,
+                                                      self.mninfo[idx].collateral_id,
+                                                      self.mninfo[idx].collateral_out))
+        f.close()
+
+    def create_masternodes(self):
+        for idx in range(0, self.mn_count):
+            self.nodes.append(start_node(idx + 1, self.options.tmpdir,
+                                         ['-debug=masternode', '-externalip=127.0.0.1',
+                                          '-masternode=1',
+                                          '-masternodeprivkey=%s' % self.mninfo[idx].key
+                                          ]))
+            for i in range(0, idx + 1):
+                connect_nodes(self.nodes[i], idx + 1)
+
+    def sentinel(self):
+        for i in range(1, self.mn_count + 1):
+            self.nodes[i].sentinelping("1.1.0")
+
+    def setup_network(self):
+        self.nodes = []
+        # create faucet node for collateral and transactions
+        self.nodes.append(start_node(0, self.options.tmpdir, ["-debug"]))
+        required_balance = MASTERNODE_COLLATERAL * self.mn_count + 1
+        while self.nodes[0].getbalance() < required_balance:
+            set_mocktime(get_mocktime() + 1)
+            self.nodes[0].generate(1)
+        # create masternodes
+        self.prepare_masternodes()
+        self.write_mn_config()
+        stop_node(self.nodes[0], 0)
+        self.nodes[0] = start_node(0, self.options.tmpdir, ["-debug"])
+        self.create_masternodes()
+        # create connected simple nodes
+        for i in range(0, self.num_nodes - self.mn_count - 1):
+            self.create_simple_node()
+        # feed the sender with some balance
+        sender_addr = self.nodes[self.sender_idx].getnewaddress()
+        self.nodes[0].sendtoaddress(sender_addr, 1)
+        # make sender funds mature for InstantSend
+        for i in range(0, 2):
+            set_mocktime(get_mocktime() + 1)
+            self.nodes[0].generate(1)
+        # sync nodes
+        self.sync_all()
+        set_mocktime(get_mocktime() + 1)
+        sync_masternodes(self.nodes)
+        for i in range(1, self.mn_count + 1):
+            res = self.nodes[0].masternode("start-alias", "mn%d" % i)
+            assert(res["result"] == 'successful')
+        sync_masternodes(self.nodes)
+        #self.sentinel()
+        mn_info = self.nodes[0].masternodelist("status")
+        assert(len(mn_info) == self.mn_count)
+        for status in mn_info.values():
+            assert(status == 'ENABLED')
+
+    def create_raw_trx(self, node_from, node_to, amount):
+        # fill inputs
+        inputs=[]
+        balances = node_from.listunspent()
+        for tx in balances:
+            if tx['amount'] > amount:
+                input = {}
+                input["txid"] = tx['txid']
+                input['vout'] = tx['vout']
+                in_amount = float(tx['amount'])
+                inputs.append(input)
+                break
+        assert(len(inputs) > 0)
+        # fill outputs
+        receiver_address = node_to.getnewaddress()
+        change_address = node_from.getnewaddress()
+        fee = 0.001
+        outputs={}
+        outputs[receiver_address] = amount
+        outputs[change_address] = in_amount - amount - fee
+        rawtx = node_from.createrawtransaction(inputs, outputs)
+        return node_from.signrawtransaction(rawtx)
+
+    def run_test(self):
+        # create doublepending transaction,  but don't relay it
+        dblspnd_tx = self.create_raw_trx(self.nodes[self.sender_idx],
+                                       self.nodes[self.isolated_idx],
+                                       0.5)
+        # stop one node to isolate it from network
+        stop_node(self.nodes[self.isolated_idx], self.isolated_idx)
+        # instantsend to receiver
+        receiver_addr = self.nodes[self.receiver_idx].getnewaddress()
+        is_id = self.nodes[self.sender_idx].instantsendtoaddress(receiver_addr, 0.9)
+        # wait for instantsend locks
+        start = time()
+        locked = False
+        while True:
+            is_trx = self.nodes[self.sender_idx].gettransaction(is_id)
+            if is_trx['instantlock']:
+                locked = True
+                break
+            if time() > start + 10:
+                break
+        assert(locked)
+        # start last node
+        self.nodes[self.isolated_idx] = start_node(self.isolated_idx,
+                                                   self.options.tmpdir,
+                                                   ["-debug"])
+        # send doublespend transaction to isolated node
+        self.nodes[self.isolated_idx].sendrawtransaction(dblspnd_tx['hex'])
+        # generate block on isolated node with doublespend transaction
+        set_mocktime(get_mocktime() + 1)
+        self.nodes[self.isolated_idx].generate(1)
+        wrong_block = self.nodes[self.isolated_idx].getbestblockhash()
+        # connect isolated block to network
+        for i in range(0, self.isolated_idx):
+            connect_nodes(self.nodes[i], self.isolated_idx)
+        # check doublespend block is rejected by other nodes
+        timeout = 10
+        for i in range(0, self.isolated_idx):
+            res = self.nodes[i].waitforblock(wrong_block, timeout)
+            assert (res['hash'] != wrong_block)
+            # wait for long time only for first node
+            timeout = 1
+
+
+if __name__ == '__main__':
+    InstantSendTest().main()
diff --git a/qa/rpc-tests/test_framework/util.py b/qa/rpc-tests/test_framework/util.py
index 86b074243e5f..6cb94be5922a 100644
--- a/qa/rpc-tests/test_framework/util.py
+++ b/qa/rpc-tests/test_framework/util.py
@@ -30,7 +30,7 @@
 COVERAGE_DIR = None
 
 # The maximum number of nodes a single test can spawn
-MAX_NODES = 8
+MAX_NODES = 15
 # Don't assign rpc or p2p ports lower than this
 PORT_MIN = 11000
 # The number of ports to "reserve" for p2p and rpc, each
diff --git a/src/chainparams.cpp b/src/chainparams.cpp
index e01c9c8c09d2..23054a381a16 100644
--- a/src/chainparams.cpp
+++ b/src/chainparams.cpp
@@ -223,6 +223,7 @@ class CMainParams : public CChainParams {
         fMiningRequiresPeers = true;
         fDefaultConsistencyChecks = false;
         fRequireStandard = true;
+        fRequireRoutableExternalIP = true;
         fMineBlocksOnDemand = false;
         fAllowMultipleAddressesFromGroup = false;
         fAllowMultiplePorts = false;
@@ -369,6 +370,7 @@ class CTestNetParams : public CChainParams {
         fMiningRequiresPeers = true;
         fDefaultConsistencyChecks = false;
         fRequireStandard = false;
+        fRequireRoutableExternalIP = true;
         fMineBlocksOnDemand = false;
         fAllowMultipleAddressesFromGroup = false;
         fAllowMultiplePorts = false;
@@ -597,6 +599,7 @@ class CRegTestParams : public CChainParams {
         fMiningRequiresPeers = false;
         fDefaultConsistencyChecks = true;
         fRequireStandard = false;
+        fRequireRoutableExternalIP = false;
         fMineBlocksOnDemand = true;
         fAllowMultipleAddressesFromGroup = true;
         fAllowMultiplePorts = true;
diff --git a/src/chainparams.h b/src/chainparams.h
index 034e186bc73d..a0e0b07b3b0c 100644
--- a/src/chainparams.h
+++ b/src/chainparams.h
@@ -69,6 +69,8 @@ class CChainParams
     bool DefaultConsistencyChecks() const { return fDefaultConsistencyChecks; }
     /** Policy: Filter transactions that do not match well-defined patterns */
     bool RequireStandard() const { return fRequireStandard; }
+    /** Require addresses specified with "-externalip" parameter to be routable */
+    bool RequireRoutableExternalIP() const { return fRequireRoutableExternalIP; }
     uint64_t PruneAfterHeight() const { return nPruneAfterHeight; }
     /** Make miner stop after a block is found. In RPC, don't return until nGenProcLimit blocks are generated */
     bool MineBlocksOnDemand() const { return fMineBlocksOnDemand; }
@@ -106,6 +108,7 @@ class CChainParams
     bool fMiningRequiresPeers;
     bool fDefaultConsistencyChecks;
     bool fRequireStandard;
+    bool fRequireRoutableExternalIP;
     bool fMineBlocksOnDemand;
     bool fAllowMultipleAddressesFromGroup;
     bool fAllowMultiplePorts;
diff --git a/src/masternodeman.cpp b/src/masternodeman.cpp
index bec58a45dc9c..815cd09f3eb2 100644
--- a/src/masternodeman.cpp
+++ b/src/masternodeman.cpp
@@ -968,7 +968,9 @@ void CMasternodeMan::SyncAll(CNode* pnode, CConnman& connman)
     LOCK(cs);
 
     for (const auto& mnpair : mapMasternodes) {
-        if (mnpair.second.addr.IsRFC1918() || mnpair.second.addr.IsLocal()) continue; // do not send local network masternode
+        if (Params().RequireRoutableExternalIP() &&
+            (mnpair.second.addr.IsRFC1918() || mnpair.second.addr.IsLocal()))
+            continue; // do not send local network masternode
         // NOTE: send masternode regardless of its current state, the other node will need it to verify old votes.
         LogPrint("masternode", "CMasternodeMan::%s -- Sending Masternode entry: masternode=%s  addr=%s\n", __func__, mnpair.first.ToStringShort(), mnpair.second.addr.ToString());
         PushDsegInvs(pnode, mnpair.second);
diff --git a/src/net.cpp b/src/net.cpp
index f0bd58abbe5a..988230de8e73 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -205,7 +205,7 @@ void AdvertiseLocal(CNode *pnode)
 // learn a new local address
 bool AddLocal(const CService& addr, int nScore)
 {
-    if (!addr.IsRoutable())
+    if (!addr.IsRoutable() && Params().RequireRoutableExternalIP())
         return false;
 
     if (!fDiscover && nScore < LOCAL_MANUAL)

From 448e92f4aa3849803f5a21db68d3680583a79eb9 Mon Sep 17 00:00:00 2001
From: PaulieD <jedipbb1383@gmail.com>
Date: Thu, 12 Jul 2018 04:05:39 -0500
Subject: [PATCH 007/400] GetOutPointPrivateSendRounds readability (#2149)

* .gitnore visual studio bs

* Improves the readability of the `GetOutpointPrivateSendRounds` function by not having the second argument be needed, as the second arg should only not be 0 when it is recursively calling itself

* Revert ".gitnore visual studio bs"

This reverts commit 129b5242ade6a97a71810f492b5b347be219b691.

* changed back comment and fixed allignment

* refactor based on Udjin's suggestions.

* refactor based on Udjin's suggestions.

* fix alignment

* Revert "fix alignment"

This reverts commit c2cc2ae531c191258cd043b2b45a316443e4b860.

* actually fix alignment

* actually fix alignment
---
 src/qt/coincontroldialog.cpp |  4 ++--
 src/wallet/rpcwallet.cpp     |  2 +-
 src/wallet/wallet.cpp        | 20 ++++++++++----------
 src/wallet/wallet.h          |  4 ++--
 4 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/qt/coincontroldialog.cpp b/src/qt/coincontroldialog.cpp
index ae07319657f6..b5c29fc8814c 100644
--- a/src/qt/coincontroldialog.cpp
+++ b/src/qt/coincontroldialog.cpp
@@ -433,7 +433,7 @@ void CoinControlDialog::viewItemChanged(QTreeWidgetItem* item, int column)
             item->setCheckState(COLUMN_CHECKBOX, Qt::Unchecked);
         else {
             coinControl->Select(outpt);
-            int nRounds = pwalletMain->GetOutpointPrivateSendRounds(outpt);
+            int nRounds = pwalletMain->GetCappedOutpointPrivateSendRounds(outpt);
             if (coinControl->fUsePrivateSend && nRounds < privateSendClient.nPrivateSendRounds) {
                 QMessageBox::warning(this, windowTitle(),
                     tr("Non-anonymized input selected. <b>PrivateSend will be disabled.</b><br><br>If you still want to use PrivateSend, please deselect all non-nonymized inputs first and then check PrivateSend checkbox again."),
@@ -781,7 +781,7 @@ void CoinControlDialog::updateView()
 
             // PrivateSend rounds
             COutPoint outpoint = COutPoint(out.tx->tx->GetHash(), out.i);
-            int nRounds = pwalletMain->GetOutpointPrivateSendRounds(outpoint);
+            int nRounds = pwalletMain->GetCappedOutpointPrivateSendRounds(outpoint);
 
             if (nRounds >= 0 || fDebug) itemOutput->setText(COLUMN_PRIVATESEND_ROUNDS, QString::number(nRounds));
             else itemOutput->setText(COLUMN_PRIVATESEND_ROUNDS, tr("n/a"));
diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index 96060030381a..54daf6c4a4f6 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -2647,7 +2647,7 @@ UniValue listunspent(const JSONRPCRequest& request)
         entry.push_back(Pair("confirmations", out.nDepth));
         entry.push_back(Pair("spendable", out.fSpendable));
         entry.push_back(Pair("solvable", out.fSolvable));
-        entry.push_back(Pair("ps_rounds", pwalletMain->GetOutpointPrivateSendRounds(COutPoint(out.tx->GetHash(), out.i))));
+        entry.push_back(Pair("ps_rounds", pwalletMain->GetCappedOutpointPrivateSendRounds(COutPoint(out.tx->GetHash(), out.i))));
         results.push_back(entry);
     }
 
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
index b2aa465b5396..2260fc5da9c3 100644
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -1506,10 +1506,10 @@ int CWallet::GetRealOutpointPrivateSendRounds(const COutPoint& outpoint, int nRo
 }
 
 // respect current settings
-int CWallet::GetOutpointPrivateSendRounds(const COutPoint& outpoint) const
+int CWallet::GetCappedOutpointPrivateSendRounds(const COutPoint& outpoint) const
 {
     LOCK(cs_wallet);
-    int realPrivateSendRounds = GetRealOutpointPrivateSendRounds(outpoint, 0);
+    int realPrivateSendRounds = GetRealOutpointPrivateSendRounds(outpoint);
     return realPrivateSendRounds > privateSendClient.nPrivateSendRounds ? privateSendClient.nPrivateSendRounds : realPrivateSendRounds;
 }
 
@@ -2172,7 +2172,7 @@ CAmount CWalletTx::GetAnonymizedCredit(bool fUseCache) const
 
         if(pwallet->IsSpent(hashTx, i) || !pwallet->IsDenominated(outpoint)) continue;
 
-        const int nRounds = pwallet->GetOutpointPrivateSendRounds(outpoint);
+        const int nRounds = pwallet->GetCappedOutpointPrivateSendRounds(outpoint);
         if(nRounds >= privateSendClient.nPrivateSendRounds){
             nCredit += pwallet->GetCredit(txout, ISMINE_SPENDABLE);
             if (!MoneyRange(nCredit))
@@ -2420,7 +2420,7 @@ float CWallet::GetAverageAnonymizedRounds() const
     for (const auto& outpoint : setWalletUTXO) {
         if(!IsDenominated(outpoint)) continue;
 
-        nTotal += GetOutpointPrivateSendRounds(outpoint);
+        nTotal += GetCappedOutpointPrivateSendRounds(outpoint);
         nCount++;
     }
 
@@ -2444,7 +2444,7 @@ CAmount CWallet::GetNormalizedAnonymizedBalance() const
         if (!IsDenominated(outpoint)) continue;
         if (it->second.GetDepthInMainChain() < 0) continue;
 
-        int nRounds = GetOutpointPrivateSendRounds(outpoint);
+        int nRounds = GetCappedOutpointPrivateSendRounds(outpoint);
         nTotal += it->second.tx->vout[outpoint.n].nValue * nRounds / privateSendClient.nPrivateSendRounds;
     }
 
@@ -2844,7 +2844,7 @@ bool CWallet::SelectCoins(const std::vector<COutput>& vAvailableCoins, const CAm
 
             if(nCoinType == ONLY_DENOMINATED) {
                 COutPoint outpoint = COutPoint(out.tx->GetHash(),out.i);
-                int nRounds = GetOutpointPrivateSendRounds(outpoint);
+                int nRounds = GetCappedOutpointPrivateSendRounds(outpoint);
                 // make sure it's actually anonymized
                 if(nRounds < privateSendClient.nPrivateSendRounds) continue;
             }
@@ -2867,7 +2867,7 @@ bool CWallet::SelectCoins(const std::vector<COutput>& vAvailableCoins, const CAm
                 //make sure it's the denom we're looking for, round the amount up to smallest denom
                 if(out.tx->tx->vout[out.i].nValue == nDenom && nValueRet + nDenom < nTargetValue + nSmallestDenom) {
                     COutPoint outpoint = COutPoint(out.tx->GetHash(),out.i);
-                    int nRounds = GetOutpointPrivateSendRounds(outpoint);
+                    int nRounds = GetCappedOutpointPrivateSendRounds(outpoint);
                     // make sure it's actually anonymized
                     if(nRounds < privateSendClient.nPrivateSendRounds) continue;
                     nValueRet += nDenom;
@@ -3028,7 +3028,7 @@ bool CWallet::SelectCoinsByDenominations(int nDenom, CAmount nValueMin, CAmount
 
             CTxIn txin = CTxIn(out.tx->GetHash(), out.i);
 
-            int nRounds = GetOutpointPrivateSendRounds(txin.prevout);
+            int nRounds = GetCappedOutpointPrivateSendRounds(txin.prevout);
             if(nRounds >= nPrivateSendRoundsMax) continue;
             if(nRounds < nPrivateSendRoundsMin) continue;
 
@@ -3112,7 +3112,7 @@ bool CWallet::SelectCoinsGrouppedByAddresses(std::vector<CompactTallyItem>& vecT
                 // otherwise they will just lead to higher fee / lower priority
                 if(wtx.tx->vout[i].nValue <= nSmallestDenom/10) continue;
                 // ignore anonymized
-                if(GetOutpointPrivateSendRounds(COutPoint(outpoint.hash, i)) >= privateSendClient.nPrivateSendRounds) continue;
+                if(GetCappedOutpointPrivateSendRounds(COutPoint(outpoint.hash, i)) >= privateSendClient.nPrivateSendRounds) continue;
             }
 
             CompactTallyItem& item = mapTally[txdest];
@@ -3178,7 +3178,7 @@ bool CWallet::SelectCoinsDark(CAmount nValueMin, CAmount nValueMax, std::vector<
         if(nValueRet + out.tx->tx->vout[out.i].nValue <= nValueMax){
             CTxIn txin = CTxIn(out.tx->GetHash(),out.i);
 
-            int nRounds = GetOutpointPrivateSendRounds(txin.prevout);
+            int nRounds = GetCappedOutpointPrivateSendRounds(txin.prevout);
             if(nRounds >= nPrivateSendRoundsMax) continue;
             if(nRounds < nPrivateSendRoundsMin) continue;
 
diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h
index 65caff1f7867..ee7b9376c147 100644
--- a/src/wallet/wallet.h
+++ b/src/wallet/wallet.h
@@ -820,9 +820,9 @@ class CWallet : public CCryptoKeyStore, public CValidationInterface
     int  CountInputsWithAmount(CAmount nInputAmount);
 
     // get the PrivateSend chain depth for a given input
-    int GetRealOutpointPrivateSendRounds(const COutPoint& outpoint, int nRounds) const;
+    int GetRealOutpointPrivateSendRounds(const COutPoint& outpoint, int nRounds = 0) const;
     // respect current settings
-    int GetOutpointPrivateSendRounds(const COutPoint& outpoint) const;
+    int GetCappedOutpointPrivateSendRounds(const COutPoint& outpoint) const;
 
     bool IsDenominated(const COutPoint& outpoint) const;
 

From 0e689341d2d7035ce3ed86746b0bdcb1f86da03b Mon Sep 17 00:00:00 2001
From: PaulieD <jedipbb1383@gmail.com>
Date: Thu, 12 Jul 2018 04:06:30 -0500
Subject: [PATCH 008/400] Implement Governance ZMQ notification messages
 (#2160)

* fix whitespace

* added zmq stuff for governance objects and votes
it seems that zmq is currently not in a working state, need to figure that out.

Need to:
plug in the new methods added
possibly plug in the old methods, as it doesn't look like they are.

* formatting fix. Will probably need to revert for this PR

* continue linking new zmq messages in

* added comment, might need to revert

* fixes error of it not knowing about the classes

* Actually link in, all new govobjects and govvotes should be broadcast over zmq now.

* fix compile error, forgot to change params when copying

* fix compile error

* add imports to the header files in zmqconfig.h

* fixing linking(i think) error

* Revert "added comment, might need to revert"

This reverts commit 2918ea40fe9a96834c4bd89e13cb458cde6814f2.

* Revert "formatting fix. Will probably need to revert for this PR"

This reverts commit ca10558866ab61e3dd0c70541fdcfee6f5115157.

* fix tabs etc

* EOL added

* optimization of hash.begin() @nmarley thoughts?

* remove formatting changes

* iterator i -> it and removal of notifier

* typo in df879f57

* use auto for the iterators

* introduce hash prefix

* implement changes in zmq_sub.py, update the doc, and change argument name to fix typo

* deref iterators before calling methods

* continued e8a4c505

* missed one... continued e8a4c505

* killing some tabs

* fix spacing for setting or comparing iterators

* change order of new variables to match current setup

* re-add elif's I didn't realize got removed

* Revert "fix spacing for setting or comparing iterators"

This reverts commit 8ce2068148dcd275ebba7ee6038d0db1c582b9f3.

* Revert "use auto for the iterators"

This reverts commit cb16cf0760bfaf68c56684877898611802bf2303.

* Revert "missed one... continued e8a4c505"

This reverts commit 2087cf894f7e9682508b4692b89897b4fa4e4b7a.

* Revert "continued e8a4c505"

This reverts commit a78c8ad2c9bb1602242a8f040e17ef958982348c.

* Revert "deref iterators before calling methods"

This reverts commit e8a4c505d1d34360eaf882d92cd8fbc55436cfcc.

* Revert "iterator i -> it and removal of notifier"

This reverts commit 29574248b1a0d05c18d60454d07c77979aae6fb2.

* Revert "fix whitespace"

This reverts commit 612be48d963000b4cbc5f64981a88a3225428b37.

* Revert "typo in df879f5"

* Revert "Optimization of hash.begin()"

* fixes problem with revert

* Udjin complain's a lot ;)

* help text, init.cpp

* add signals in validationinterface.cpp

* Change location of vote notification call.

* remain consistent

* remove unneeded include due to change of notification location

* implement raw notifications
---
 contrib/zmq/zmq_sub.py               | 17 +++++++++++
 doc/zmq.md                           |  4 +++
 src/governance.cpp                   |  8 +++++-
 src/init.cpp                         |  2 ++
 src/validationinterface.cpp          |  6 ++++
 src/validationinterface.h            |  8 ++++++
 src/zmq/zmqabstractnotifier.cpp      | 10 +++++++
 src/zmq/zmqabstractnotifier.h        |  5 ++++
 src/zmq/zmqconfig.h                  |  3 ++
 src/zmq/zmqnotificationinterface.cpp | 38 +++++++++++++++++++++++++
 src/zmq/zmqnotificationinterface.h   |  3 ++
 src/zmq/zmqpublishnotifier.cpp       | 42 ++++++++++++++++++++++++++++
 src/zmq/zmqpublishnotifier.h         | 25 +++++++++++++++++
 13 files changed, 170 insertions(+), 1 deletion(-)

diff --git a/contrib/zmq/zmq_sub.py b/contrib/zmq/zmq_sub.py
index 47087e875b59..7fbfbbd005e6 100755
--- a/contrib/zmq/zmq_sub.py
+++ b/contrib/zmq/zmq_sub.py
@@ -14,9 +14,13 @@
 zmqSubSocket.setsockopt(zmq.SUBSCRIBE, b"hashblock")
 zmqSubSocket.setsockopt(zmq.SUBSCRIBE, b"hashtx")
 zmqSubSocket.setsockopt(zmq.SUBSCRIBE, b"hashtxlock")
+zmqSubSocket.setsockopt(zmq.SUBSCRIBE, b"hashgovernancevote")
+zmqSubSocket.setsockopt(zmq.SUBSCRIBE, b"hashgovernanceobject")
 zmqSubSocket.setsockopt(zmq.SUBSCRIBE, b"rawblock")
 zmqSubSocket.setsockopt(zmq.SUBSCRIBE, b"rawtx")
 zmqSubSocket.setsockopt(zmq.SUBSCRIBE, b"rawtxlock")
+zmqSubSocket.setsockopt(zmq.SUBSCRIBE, b"rawgovernancevote")
+zmqSubSocket.setsockopt(zmq.SUBSCRIBE, b"rawgovernanceobject")
 zmqSubSocket.connect("tcp://127.0.0.1:%i" % port)
 
 try:
@@ -48,6 +52,19 @@
         elif topic == "rawtxlock":
             print('- RAW TX LOCK ('+sequence+') -')
             print(binascii.hexlify(body).decode("utf-8"))
+        elif topic == "hashgovernancevote":
+            print('- HASH GOVERNANCE VOTE ('+sequence+') -')
+            print(binascii.hexlify(body).decode("utf-8"))
+        elif topic == "hashgovernanceobject":
+            print('- HASH GOVERNANCE OBJECT ('+sequence+') -')
+            print(binascii.hexlify(body).decode("utf-8"))
+        elif topic == "rawgovernancevote":
+            print('- RAW GOVERNANCE VOTE ('+sequence+') -')
+            print(binascii.hexlify(body).decode("utf-8"))
+        elif topic == "rawgovernanceobject":
+            print('- RAW GOVERNANCE OBJECT ('+sequence+') -')
+            print(binascii.hexlify(body).decode("utf-8"))
+
 
 except KeyboardInterrupt:
     zmqContext.destroy()
diff --git a/doc/zmq.md b/doc/zmq.md
index a708ca5ab666..489ab549a018 100644
--- a/doc/zmq.md
+++ b/doc/zmq.md
@@ -62,6 +62,10 @@ Currently, the following notifications are supported:
     -zmqpubrawblock=address
     -zmqpubrawtx=address
     -zmqpubrawtxlock=address
+    -zmqpubhashgovernancevote=address
+    -zmqpubhashgovernanceobject=address
+    -zmqpubrawgovernancevote=address
+    -zmqpubhashgovernanceobject=address
 
 The socket type is PUB and the address must be a valid ZeroMQ socket
 address. The same address can be used in more than one notification.
diff --git a/src/governance.cpp b/src/governance.cpp
index 4d33b6dde224..4bbb62a2374b 100644
--- a/src/governance.cpp
+++ b/src/governance.cpp
@@ -3,6 +3,7 @@
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #include "consensus/validation.h"
+#include "validationinterface.h"
 #include "governance.h"
 #include "governance-object.h"
 #include "governance-validators.h"
@@ -264,7 +265,8 @@ void CGovernanceManager::ProcessMessage(CNode* pfrom, const std::string& strComm
             }
             return;
         }
-
+        // SEND NOTIFICATION TO SCRIPT/ZMQ
+        GetMainSignals().NotifyGovernanceVote(vote);
     }
 }
 
@@ -361,6 +363,10 @@ void CGovernanceManager::AddGovernanceObject(CGovernanceObject& govobj, CConnman
     CGovernanceException exception;
     CheckOrphanVotes(govobj, exception, connman);
 
+    // SEND NOTIFICATION TO SCRIPT/ZMQ
+    GetMainSignals().NotifyGovernanceObject(govobj);
+
+
     DBG( std::cout << "CGovernanceManager::AddGovernanceObject END" << std::endl; );
 }
 
diff --git a/src/init.cpp b/src/init.cpp
index 585a26161e89..78adc74786c7 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -490,6 +490,8 @@ std::string HelpMessage(HelpMessageMode mode)
     strUsage += HelpMessageOpt("-zmqpubhashblock=<address>", _("Enable publish hash block in <address>"));
     strUsage += HelpMessageOpt("-zmqpubhashtx=<address>", _("Enable publish hash transaction in <address>"));
     strUsage += HelpMessageOpt("-zmqpubhashtxlock=<address>", _("Enable publish hash transaction (locked via InstantSend) in <address>"));
+    strUsage += HelpMessageOpt("-zmqpubhashgovernancevote=<address>", _("Enable publish hash of governance votes in <address>"));
+    strUsage += HelpMessageOpt("-zmqpubhashgovernanceobject=<address>", _("Enable publish hash of governance objects (like proposals) in <address>"));
     strUsage += HelpMessageOpt("-zmqpubrawblock=<address>", _("Enable publish raw block in <address>"));
     strUsage += HelpMessageOpt("-zmqpubrawtx=<address>", _("Enable publish raw transaction in <address>"));
     strUsage += HelpMessageOpt("-zmqpubrawtxlock=<address>", _("Enable publish raw transaction (locked via InstantSend) in <address>"));
diff --git a/src/validationinterface.cpp b/src/validationinterface.cpp
index 56620c929479..436cedf1019c 100644
--- a/src/validationinterface.cpp
+++ b/src/validationinterface.cpp
@@ -26,6 +26,8 @@ void RegisterValidationInterface(CValidationInterface* pwalletIn) {
     g_signals.ScriptForMining.connect(boost::bind(&CValidationInterface::GetScriptForMining, pwalletIn, _1));
     g_signals.BlockFound.connect(boost::bind(&CValidationInterface::ResetRequestCount, pwalletIn, _1));
     g_signals.NewPoWValidBlock.connect(boost::bind(&CValidationInterface::NewPoWValidBlock, pwalletIn, _1, _2));
+    g_signals.NotifyGovernanceObject.connect(boost::bind(&CValidationInterface::NotifyGovernanceObject, pwalletIn, _1));
+    g_signals.NotifyGovernanceVote.connect(boost::bind(&CValidationInterface::NotifyGovernanceVote, pwalletIn, _1));
 }
 
 void UnregisterValidationInterface(CValidationInterface* pwalletIn) {
@@ -42,6 +44,8 @@ void UnregisterValidationInterface(CValidationInterface* pwalletIn) {
     g_signals.NewPoWValidBlock.disconnect(boost::bind(&CValidationInterface::NewPoWValidBlock, pwalletIn, _1, _2));
     g_signals.NotifyHeaderTip.disconnect(boost::bind(&CValidationInterface::NotifyHeaderTip, pwalletIn, _1, _2));
     g_signals.AcceptedBlockHeader.disconnect(boost::bind(&CValidationInterface::AcceptedBlockHeader, pwalletIn, _1));
+    g_signals.NotifyGovernanceObject.disconnect(boost::bind(&CValidationInterface::NotifyGovernanceObject, pwalletIn, _1));
+    g_signals.NotifyGovernanceVote.disconnect(boost::bind(&CValidationInterface::NotifyGovernanceVote, pwalletIn, _1));
 }
 
 void UnregisterAllValidationInterfaces() {
@@ -58,4 +62,6 @@ void UnregisterAllValidationInterfaces() {
     g_signals.NewPoWValidBlock.disconnect_all_slots();
     g_signals.NotifyHeaderTip.disconnect_all_slots();
     g_signals.AcceptedBlockHeader.disconnect_all_slots();
+    g_signals.NotifyGovernanceObject.disconnect_all_slots();
+    g_signals.NotifyGovernanceVote.disconnect_all_slots();
 }
diff --git a/src/validationinterface.h b/src/validationinterface.h
index 7086840c7347..8ce15b30cd5f 100644
--- a/src/validationinterface.h
+++ b/src/validationinterface.h
@@ -18,6 +18,8 @@ class CReserveScript;
 class CTransaction;
 class CValidationInterface;
 class CValidationState;
+class CGovernanceVote;
+class CGovernanceObject;
 class uint256;
 
 // These functions dispatch to one or all registered wallets
@@ -36,6 +38,8 @@ class CValidationInterface {
     virtual void UpdatedBlockTip(const CBlockIndex *pindexNew, const CBlockIndex *pindexFork, bool fInitialDownload) {}
     virtual void SyncTransaction(const CTransaction &tx, const CBlockIndex *pindex, int posInBlock) {}
     virtual void NotifyTransactionLock(const CTransaction &tx) {}
+    virtual void NotifyGovernanceVote(const CGovernanceVote &vote) {}
+    virtual void NotifyGovernanceObject(const CGovernanceObject &object) {}
     virtual void SetBestChain(const CBlockLocator &locator) {}
     virtual bool UpdatedTransaction(const uint256 &hash) { return false;}
     virtual void Inventory(const uint256 &hash) {}
@@ -69,6 +73,10 @@ struct CMainSignals {
     boost::signals2::signal<void (const CTransaction &, const CBlockIndex *pindex, int posInBlock)> SyncTransaction;
     /** Notifies listeners of an updated transaction lock without new data. */
     boost::signals2::signal<void (const CTransaction &)> NotifyTransactionLock;
+    /** Notifies listeners of a new governance vote. */
+    boost::signals2::signal<void (const CGovernanceVote &)> NotifyGovernanceVote;
+    /** Notifies listeners of a new governance object. */
+    boost::signals2::signal<void (const CGovernanceObject &)> NotifyGovernanceObject;
     /** Notifies listeners of an updated transaction without new data (for now: a coinbase potentially becoming visible). */
     boost::signals2::signal<bool (const uint256 &)> UpdatedTransaction;
     /** Notifies listeners of a new active block chain. */
diff --git a/src/zmq/zmqabstractnotifier.cpp b/src/zmq/zmqabstractnotifier.cpp
index 76543a4a797a..ea993d6061bc 100644
--- a/src/zmq/zmqabstractnotifier.cpp
+++ b/src/zmq/zmqabstractnotifier.cpp
@@ -25,3 +25,13 @@ bool CZMQAbstractNotifier::NotifyTransactionLock(const CTransaction &/*transacti
 {
     return true;
 }
+
+bool CZMQAbstractNotifier::NotifyGovernanceVote(const CGovernanceVote& /*vote*/)
+{
+    return true;
+}
+
+bool CZMQAbstractNotifier::NotifyGovernanceObject(const CGovernanceObject& /*object*/)
+{
+    return true;
+}
diff --git a/src/zmq/zmqabstractnotifier.h b/src/zmq/zmqabstractnotifier.h
index 0d3f1fcd4e41..ee6aa3ad7e2c 100644
--- a/src/zmq/zmqabstractnotifier.h
+++ b/src/zmq/zmqabstractnotifier.h
@@ -8,6 +8,8 @@
 #include "zmqconfig.h"
 
 class CBlockIndex;
+class CGovernanceObject;
+class CGovernanceVote;
 class CZMQAbstractNotifier;
 
 typedef CZMQAbstractNotifier* (*CZMQNotifierFactory)();
@@ -35,6 +37,9 @@ class CZMQAbstractNotifier
     virtual bool NotifyBlock(const CBlockIndex *pindex);
     virtual bool NotifyTransaction(const CTransaction &transaction);
     virtual bool NotifyTransactionLock(const CTransaction &transaction);
+    virtual bool NotifyGovernanceVote(const CGovernanceVote &vote);
+    virtual bool NotifyGovernanceObject(const CGovernanceObject &object);
+
 
 protected:
     void *psocket;
diff --git a/src/zmq/zmqconfig.h b/src/zmq/zmqconfig.h
index 4dbc5226d554..b7168c962dcb 100644
--- a/src/zmq/zmqconfig.h
+++ b/src/zmq/zmqconfig.h
@@ -19,6 +19,9 @@
 #include "primitives/block.h"
 #include "primitives/transaction.h"
 
+#include "governance-object.h"
+#include "governance-vote.h"
+
 void zmqError(const char *str);
 
 #endif // BITCOIN_ZMQ_ZMQCONFIG_H
diff --git a/src/zmq/zmqnotificationinterface.cpp b/src/zmq/zmqnotificationinterface.cpp
index 475c0251bc07..7895f17aaa8b 100644
--- a/src/zmq/zmqnotificationinterface.cpp
+++ b/src/zmq/zmqnotificationinterface.cpp
@@ -38,9 +38,13 @@ CZMQNotificationInterface* CZMQNotificationInterface::Create()
     factories["pubhashblock"] = CZMQAbstractNotifier::Create<CZMQPublishHashBlockNotifier>;
     factories["pubhashtx"] = CZMQAbstractNotifier::Create<CZMQPublishHashTransactionNotifier>;
     factories["pubhashtxlock"] = CZMQAbstractNotifier::Create<CZMQPublishHashTransactionLockNotifier>;
+    factories["pubhashgovernancevote"] = CZMQAbstractNotifier::Create<CZMQPublishHashGovernanceVoteNotifier>;
+    factories["pubhashgovernanceobject"] = CZMQAbstractNotifier::Create<CZMQPublishHashGovernanceObjectNotifier>;
     factories["pubrawblock"] = CZMQAbstractNotifier::Create<CZMQPublishRawBlockNotifier>;
     factories["pubrawtx"] = CZMQAbstractNotifier::Create<CZMQPublishRawTransactionNotifier>;
     factories["pubrawtxlock"] = CZMQAbstractNotifier::Create<CZMQPublishRawTransactionLockNotifier>;
+    factories["pubrawgovernancevote"] = CZMQAbstractNotifier::Create<CZMQPublishRawGovernanceVoteNotifier>;
+    factories["pubrawgovernanceobject"] = CZMQAbstractNotifier::Create<CZMQPublishRawGovernanceObjectNotifier>;
 
     for (std::map<std::string, CZMQNotifierFactory>::const_iterator i=factories.begin(); i!=factories.end(); ++i)
     {
@@ -179,3 +183,37 @@ void CZMQNotificationInterface::NotifyTransactionLock(const CTransaction &tx)
         }
     }
 }
+
+void CZMQNotificationInterface::NotifyGovernanceVote(const CGovernanceVote &vote)
+{
+    for (std::list<CZMQAbstractNotifier*>::iterator i = notifiers.begin(); i != notifiers.end(); )
+    {
+        CZMQAbstractNotifier *notifier = *i;
+        if (notifier->NotifyGovernanceVote(vote))
+        {
+            i++;
+        }
+        else
+        {
+            notifier->Shutdown();
+            i = notifiers.erase(i);
+        }
+    }
+}
+
+void CZMQNotificationInterface::NotifyGovernanceObject(const CGovernanceObject &object)
+{
+    for (std::list<CZMQAbstractNotifier*>::iterator i = notifiers.begin(); i != notifiers.end(); )
+    {
+        CZMQAbstractNotifier *notifier = *i;
+        if (notifier->NotifyGovernanceObject(object))
+        {
+            i++;
+        }
+        else
+        {
+            notifier->Shutdown();
+            i = notifiers.erase(i);
+        }
+    }
+}
diff --git a/src/zmq/zmqnotificationinterface.h b/src/zmq/zmqnotificationinterface.h
index 13b5c8bf96ed..aeaed254a007 100644
--- a/src/zmq/zmqnotificationinterface.h
+++ b/src/zmq/zmqnotificationinterface.h
@@ -27,6 +27,9 @@ class CZMQNotificationInterface : public CValidationInterface
     void SyncTransaction(const CTransaction& tx, const CBlockIndex *pindex, int posInBlock) override;
     void UpdatedBlockTip(const CBlockIndex *pindexNew, const CBlockIndex *pindexFork, bool fInitialDownload) override;
     void NotifyTransactionLock(const CTransaction &tx) override;
+    void NotifyGovernanceVote(const CGovernanceVote& vote) override;
+    void NotifyGovernanceObject(const CGovernanceObject& object) override;
+
 
 private:
     CZMQNotificationInterface();
diff --git a/src/zmq/zmqpublishnotifier.cpp b/src/zmq/zmqpublishnotifier.cpp
index be1f7ac0adfb..8a6c4167d0c8 100644
--- a/src/zmq/zmqpublishnotifier.cpp
+++ b/src/zmq/zmqpublishnotifier.cpp
@@ -13,9 +13,13 @@ static std::multimap<std::string, CZMQAbstractPublishNotifier*> mapPublishNotifi
 static const char *MSG_HASHBLOCK  = "hashblock";
 static const char *MSG_HASHTX     = "hashtx";
 static const char *MSG_HASHTXLOCK = "hashtxlock";
+static const char *MSG_HASHGVOTE  = "hashgovernancevote";
+static const char *MSG_HASHGOBJ   = "hashgovernanceobject";
 static const char *MSG_RAWBLOCK   = "rawblock";
 static const char *MSG_RAWTX      = "rawtx";
 static const char *MSG_RAWTXLOCK  = "rawtxlock";
+static const char *MSG_RAWGVOTE   = "rawgovernancevote";
+static const char *MSG_RAWGOBJ    = "rawgovernanceobject";
 
 // Internal function to send multipart message
 static int zmq_send_multipart(void *sock, const void* data, size_t size, ...)
@@ -173,6 +177,26 @@ bool CZMQPublishHashTransactionLockNotifier::NotifyTransactionLock(const CTransa
     return SendMessage(MSG_HASHTXLOCK, data, 32);
 }
 
+bool CZMQPublishHashGovernanceVoteNotifier::NotifyGovernanceVote(const CGovernanceVote &vote)
+{
+    uint256 hash = vote.GetHash();
+    LogPrint("zmq", "zmq: Publish hashgovernancevote %s\n", hash.GetHex());
+    char data[32];
+    for (unsigned int i = 0; i < 32; i++)
+        data[31 - i] = hash.begin()[i];
+    return SendMessage(MSG_HASHGVOTE, data, 32);
+}
+
+bool CZMQPublishHashGovernanceObjectNotifier::NotifyGovernanceObject(const CGovernanceObject &object)
+{
+    uint256 hash = object.GetHash();
+    LogPrint("zmq", "zmq: Publish hashgovernanceobject %s\n", hash.GetHex());
+    char data[32];
+    for (unsigned int i = 0; i < 32; i++)
+        data[31 - i] = hash.begin()[i];
+    return SendMessage(MSG_HASHGOBJ, data, 32);
+}
+
 bool CZMQPublishRawBlockNotifier::NotifyBlock(const CBlockIndex *pindex)
 {
     LogPrint("zmq", "zmq: Publish rawblock %s\n", pindex->GetBlockHash().GetHex());
@@ -211,3 +235,21 @@ bool CZMQPublishRawTransactionLockNotifier::NotifyTransactionLock(const CTransac
     ss << transaction;
     return SendMessage(MSG_RAWTXLOCK, &(*ss.begin()), ss.size());
 }
+
+bool CZMQPublishRawGovernanceVoteNotifier::NotifyGovernanceVote(const CGovernanceVote &vote)
+{
+    uint256 nHash = vote.GetHash();
+    LogPrint("gobject", "gobject: Publish rawgovernanceobject: hash = %s, vote = %d\n", nHash.ToString(), vote.ToString());
+    CDataStream ss(SER_NETWORK, PROTOCOL_VERSION);
+    ss << vote;
+    return SendMessage(MSG_RAWGVOTE, &(*ss.begin()), ss.size());
+}
+
+bool CZMQPublishRawGovernanceObjectNotifier::NotifyGovernanceObject(const CGovernanceObject &govobj)
+{
+    uint256 nHash = govobj.GetHash();
+    LogPrint("gobject", "gobject: Publish rawgovernanceobject: hash = %s, type = %d\n", nHash.ToString(), govobj.GetObjectType());
+    CDataStream ss(SER_NETWORK, PROTOCOL_VERSION);
+    ss << govobj;
+    return SendMessage(MSG_RAWGOBJ, &(*ss.begin()), ss.size());
+}
diff --git a/src/zmq/zmqpublishnotifier.h b/src/zmq/zmqpublishnotifier.h
index 4ade12cdceac..31c90317d8c0 100644
--- a/src/zmq/zmqpublishnotifier.h
+++ b/src/zmq/zmqpublishnotifier.h
@@ -8,6 +8,8 @@
 #include "zmqabstractnotifier.h"
 
 class CBlockIndex;
+class CGovernanceVote;
+class CGovernanceObject;
 
 class CZMQAbstractPublishNotifier : public CZMQAbstractNotifier
 {
@@ -46,6 +48,18 @@ class CZMQPublishHashTransactionLockNotifier : public CZMQAbstractPublishNotifie
     bool NotifyTransactionLock(const CTransaction &transaction) override;
 };
 
+class CZMQPublishHashGovernanceVoteNotifier : public CZMQAbstractPublishNotifier
+{
+public:
+    bool NotifyGovernanceVote(const CGovernanceVote &vote) override;
+};
+
+class CZMQPublishHashGovernanceObjectNotifier : public CZMQAbstractPublishNotifier
+{
+public:
+    bool NotifyGovernanceObject(const CGovernanceObject &object) override;
+};
+
 class CZMQPublishRawBlockNotifier : public CZMQAbstractPublishNotifier
 {
 public:
@@ -64,4 +78,15 @@ class CZMQPublishRawTransactionLockNotifier : public CZMQAbstractPublishNotifier
     bool NotifyTransactionLock(const CTransaction &transaction) override;
 };
 
+class CZMQPublishRawGovernanceVoteNotifier : public CZMQAbstractPublishNotifier
+{
+public:
+    bool NotifyGovernanceVote(const CGovernanceVote &vote) override;
+};
+
+class CZMQPublishRawGovernanceObjectNotifier : public CZMQAbstractPublishNotifier
+{
+public:
+    bool NotifyGovernanceObject(const CGovernanceObject &object) override;
+};
 #endif // BITCOIN_ZMQ_ZMQPUBLISHNOTIFIER_H

From df1be90ce1802f99e54a1791f4651e332f2af9d2 Mon Sep 17 00:00:00 2001
From: strophy <32928115+strophy@users.noreply.github.com>
Date: Thu, 12 Jul 2018 17:07:17 +0800
Subject: [PATCH 009/400]  Update links to obsolete documentation (#2162)

* Update links to obsolete documentation

* Change link text
---
 doc/README.md            | 2 +-
 doc/README_windows.txt   | 4 ++--
 src/qt/utilitydialog.cpp | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/doc/README.md b/doc/README.md
index 59b619ca9f3e..9798a25b6ec4 100644
--- a/doc/README.md
+++ b/doc/README.md
@@ -24,7 +24,7 @@ Drag Dash-Qt to your applications folder, and then run Dash-Qt.
 
 ### Need Help?
 
-* See the [Dash documentation](https://dashpay.atlassian.net/wiki/display/DOC)
+* See the [Dash documentation](https://docs.dash.org)
 for help and more information.
 * Ask for help on [Dash Nation Discord](http://dashchat.org)
 * Ask for help on the [Dash Forum](https://dash.org/forum)
diff --git a/doc/README_windows.txt b/doc/README_windows.txt
index 1a347d4be28e..7c763782b034 100644
--- a/doc/README_windows.txt
+++ b/doc/README_windows.txt
@@ -18,6 +18,6 @@ However, it downloads and stores the entire history of Dash transactions;
 depending on the speed of your computer and network connection, the synchronization
 process can take anywhere from a few hours to a day or more.
 
-See the dash wiki at:
-  https://dashpay.atlassian.net/wiki/
+See the Dash documentation at:
+  https://docs.dash.org
 for more help and information.
diff --git a/src/qt/utilitydialog.cpp b/src/qt/utilitydialog.cpp
index 4cb568ee03e9..a2822804bef0 100644
--- a/src/qt/utilitydialog.cpp
+++ b/src/qt/utilitydialog.cpp
@@ -161,7 +161,7 @@ your funds will already be anonymized. No additional waiting is required.</li> \
 This means those 1000 addresses last for about 100 mixing events. When 900 of them are used, your wallet must create more addresses. \
 It can only do this, however, if you have automatic backups enabled.<br> \
 Consequently, users who have backups disabled will also have PrivateSend disabled. <hr>\
-For more info see <a href=\"https://dashpay.atlassian.net/wiki/display/DOC/PrivateSend\">https://dashpay.atlassian.net/wiki/display/DOC/PrivateSend</a> \
+For more information, see the <a href=\"https://docs.dash.org/en/latest/wallets/dashcore/privatesend-instantsend.html\">PrivateSend documentation</a>. \
         "));
         ui->aboutMessage->setWordWrap(true);
         ui->helpMessage->setVisible(false);

From fd70a1eb92893146e4d92040dd69e1c6c080a26c Mon Sep 17 00:00:00 2001
From: Nathan Marley <nathan.marley@gmail.com>
Date: Thu, 12 Jul 2018 16:07:51 +0700
Subject: [PATCH 010/400] iterator cleanup in several places (#2164)

* iterator cleanup in Dash-specific code

* const

* *Pair/pair

* it++ -> ++it
---
 src/governance-classes.cpp  |  10 +--
 src/governance.cpp          |  72 ++++++++++------------
 src/instantx.cpp            | 117 +++++++++++++-----------------------
 src/masternode-payments.cpp |  15 ++---
 src/masternodeman.cpp       |  23 +++----
 src/privatesend-client.cpp  |   3 +-
 src/privatesend.cpp         |   4 +-
 src/spork.cpp               |   8 +--
 8 files changed, 98 insertions(+), 154 deletions(-)

diff --git a/src/governance-classes.cpp b/src/governance-classes.cpp
index 5f6553ec1805..4cb2c00dcf28 100644
--- a/src/governance-classes.cpp
+++ b/src/governance-classes.cpp
@@ -239,16 +239,12 @@ std::vector<CSuperblock_sptr> CGovernanceTriggerManager::GetActiveTriggers()
     DBG( std::cout << "GetActiveTriggers: mapTrigger.size() = " << mapTrigger.size() << std::endl; );
 
     // LOOK AT THESE OBJECTS AND COMPILE A VALID LIST OF TRIGGERS
-    trigger_m_it it = mapTrigger.begin();
-    while(it != mapTrigger.end()) {
-
-        CGovernanceObject* pObj = governance.FindGovernanceObject((*it).first);
-
+    for (const auto& pair : mapTrigger) {
+        CGovernanceObject* pObj = governance.FindGovernanceObject(pair.first);
         if(pObj) {
             DBG( std::cout << "GetActiveTriggers: pObj->GetDataAsPlainString() = " << pObj->GetDataAsPlainString() << std::endl; );
-            vecResults.push_back(it->second);
+            vecResults.push_back(pair.second);
         }
-        ++it;
     }
 
     DBG( std::cout << "GetActiveTriggers: vecResults.size() = " << vecResults.size() << std::endl; );
diff --git a/src/governance.cpp b/src/governance.cpp
index 4bbb62a2374b..0a86adaf0fed 100644
--- a/src/governance.cpp
+++ b/src/governance.cpp
@@ -530,10 +530,10 @@ std::vector<CGovernanceVote> CGovernanceManager::GetCurrentVotes(const uint256&
         vote_rec_t voteRecord;
         if (!govobj.GetCurrentMNVotes(mnpair.first, voteRecord)) continue;
 
-        for (vote_instance_m_it it3 = voteRecord.mapInstances.begin(); it3 != voteRecord.mapInstances.end(); ++it3) {
-            int signal = (it3->first);
-            int outcome = ((it3->second).eOutcome);
-            int64_t nCreationTime = ((it3->second).nCreationTime);
+        for (const auto& voteInstancePair : voteRecord.mapInstances) {
+            int signal = voteInstancePair.first;
+            int outcome = voteInstancePair.second.eOutcome;
+            int64_t nCreationTime = voteInstancePair.second.nCreationTime;
 
             CGovernanceVote vote = CGovernanceVote(mnpair.first, nParentHash, (vote_signal_enum_t)signal, (vote_outcome_enum_t)outcome);
             vote.SetTime(nCreationTime);
@@ -551,24 +551,15 @@ std::vector<const CGovernanceObject*> CGovernanceManager::GetAllNewerThan(int64_
 
     std::vector<const CGovernanceObject*> vGovObjs;
 
-    object_m_cit it = mapObjects.begin();
-    while(it != mapObjects.end())
-    {
+    for (const auto& objPair : mapObjects) {
         // IF THIS OBJECT IS OLDER THAN TIME, CONTINUE
-
-        if((*it).second.GetCreationTime() < nMoreThanTime) {
-            ++it;
+        if(objPair.second.GetCreationTime() < nMoreThanTime) {
             continue;
         }
 
         // ADD GOVERNANCE OBJECT TO LIST
-
-        const CGovernanceObject* pGovObj = &((*it).second);
+        const CGovernanceObject* pGovObj = &(objPair.second);
         vGovObjs.push_back(pGovObj);
-
-        // NEXT
-
-        ++it;
     }
 
     return vGovObjs;
@@ -730,9 +721,10 @@ void CGovernanceManager::SyncAll(CNode* pnode, CConnman& connman) const
     LOCK2(cs_main, cs);
 
     // all valid objects, no votes
-    for(object_m_cit it = mapObjects.begin(); it != mapObjects.end(); ++it) {
-        const CGovernanceObject& govobj = it->second;
-        std::string strHash = it->first.ToString();
+    for (const auto& objPair : mapObjects) {
+        uint256 nHash = objPair.first;
+        const CGovernanceObject& govobj = objPair.second;
+        std::string strHash = nHash.ToString();
 
         LogPrint("gobject", "CGovernanceManager::%s -- attempting to sync govobj: %s, peer=%d\n", __func__, strHash, pnode->id);
 
@@ -744,7 +736,7 @@ void CGovernanceManager::SyncAll(CNode* pnode, CConnman& connman) const
 
         // Push the inventory budget proposal message over to the other client
         LogPrint("gobject", "CGovernanceManager::%s -- syncing govobj: %s, peer=%d\n", __func__, strHash, pnode->id);
-        pnode->PushInventory(CInv(MSG_GOVERNANCE_OBJECT, it->first));
+        pnode->PushInventory(CInv(MSG_GOVERNANCE_OBJECT, nHash));
         ++nObjCount;
     }
 
@@ -910,8 +902,8 @@ void CGovernanceManager::CheckMasternodeOrphanVotes(CConnman& connman)
 
     ScopedLockBool guard(cs, fRateChecksEnabled, false);
 
-    for(object_m_it it = mapObjects.begin(); it != mapObjects.end(); ++it) {
-        it->second.CheckOrphanVotes(connman);
+    for (auto& objPair : mapObjects) {
+        objPair.second.CheckOrphanVotes(connman);
     }
 }
 
@@ -1092,22 +1084,25 @@ int CGovernanceManager::RequestGovernanceObjectVotes(const std::vector<CNode*>&
 
         if(mapObjects.empty()) return -2;
 
-        for(object_m_it it = mapObjects.begin(); it != mapObjects.end(); ++it) {
-            if(mapAskedRecently.count(it->first)) {
-                std::map<CService, int64_t>::iterator it1 = mapAskedRecently[it->first].begin();
-                while(it1 != mapAskedRecently[it->first].end()) {
-                    if(it1->second < nNow) {
-                        mapAskedRecently[it->first].erase(it1++);
+        for (const auto& objPair : mapObjects) {
+            uint256 nHash = objPair.first;
+            if(mapAskedRecently.count(nHash)) {
+                auto it = mapAskedRecently[nHash].begin();
+                while(it != mapAskedRecently[nHash].end()) {
+                    if(it->second < nNow) {
+                        mapAskedRecently[nHash].erase(it++);
                     } else {
-                        ++it1;
+                        ++it;
                     }
                 }
-                if(mapAskedRecently[it->first].size() >= nPeersPerHashMax) continue;
+                if(mapAskedRecently[nHash].size() >= nPeersPerHashMax) continue;
             }
-            if(it->second.nObjectType == GOVERNANCE_OBJECT_TRIGGER) {
-                vpGovObjsTriggersTmp.push_back(&(it->second));
+
+            auto govObj = objPair.second;
+            if(govObj.nObjectType == GOVERNANCE_OBJECT_TRIGGER) {
+                vpGovObjsTriggersTmp.push_back(&govObj);
             } else {
-                vpGovObjsTmp.push_back(&(it->second));
+                vpGovObjsTmp.push_back(&govObj);
             }
         }
     }
@@ -1194,8 +1189,8 @@ void CGovernanceManager::RebuildIndexes()
     LOCK(cs);
 
     cmapVoteToObject.Clear();
-    for(object_m_it it = mapObjects.begin(); it != mapObjects.end(); ++it) {
-        CGovernanceObject& govobj = it->second;
+    for (auto& objPair : mapObjects) {
+        CGovernanceObject& govobj = objPair.second;
         std::vector<CGovernanceVote> vecVotes = govobj.GetVoteFile().GetVotes();
         for(size_t i = 0; i < vecVotes.size(); ++i) {
             cmapVoteToObject.Insert(vecVotes[i].GetHash(), &govobj);
@@ -1242,10 +1237,8 @@ std::string CGovernanceManager::ToString() const
     int nTriggerCount = 0;
     int nOtherCount = 0;
 
-    object_m_cit it = mapObjects.begin();
-
-    while(it != mapObjects.end()) {
-        switch(it->second.GetObjectType()) {
+    for (const auto& objPair : mapObjects) {
+        switch(objPair.second.GetObjectType()) {
             case GOVERNANCE_OBJECT_PROPOSAL:
                 nProposalCount++;
                 break;
@@ -1256,7 +1249,6 @@ std::string CGovernanceManager::ToString() const
                 nOtherCount++;
                 break;
         }
-        ++it;
     }
 
     return strprintf("Governance Objects: %d (Proposals: %d, Triggers: %d, Other: %d; Erased: %d), Votes: %d",
diff --git a/src/instantx.cpp b/src/instantx.cpp
index e41a683c6983..4bd0c0b483d1 100644
--- a/src/instantx.cpp
+++ b/src/instantx.cpp
@@ -223,12 +223,10 @@ void CInstantSend::Vote(CTxLockCandidate& txLockCandidate, CConnman& connman)
     if(mapLockRequestAccepted.find(txHash) == mapLockRequestAccepted.end()) return;
     // check if we need to vote on this candidate's outpoints,
     // it's possible that we need to vote for several of them
-    std::map<COutPoint, COutPointLock>::iterator itOutpointLock = txLockCandidate.mapOutPointLocks.begin();
-    while(itOutpointLock != txLockCandidate.mapOutPointLocks.end()) {
-
-        int nPrevoutHeight = GetUTXOHeight(itOutpointLock->first);
+    for (auto& outpointLockPair : txLockCandidate.mapOutPointLocks) {
+        int nPrevoutHeight = GetUTXOHeight(outpointLockPair.first);
         if(nPrevoutHeight == -1) {
-            LogPrint("instantsend", "CInstantSend::Vote -- Failed to find UTXO %s\n", itOutpointLock->first.ToStringShort());
+            LogPrint("instantsend", "CInstantSend::Vote -- Failed to find UTXO %s\n", outpointLockPair.first.ToStringShort());
             return;
         }
 
@@ -238,20 +236,18 @@ void CInstantSend::Vote(CTxLockCandidate& txLockCandidate, CConnman& connman)
         int nMinRequiredProtocol = std::max(MIN_INSTANTSEND_PROTO_VERSION, mnpayments.GetMinMasternodePaymentsProto());
         if(!mnodeman.GetMasternodeRank(activeMasternode.outpoint, nRank, nLockInputHeight, nMinRequiredProtocol)) {
             LogPrint("instantsend", "CInstantSend::Vote -- Can't calculate rank for masternode %s\n", activeMasternode.outpoint.ToStringShort());
-            ++itOutpointLock;
             continue;
         }
 
         int nSignaturesTotal = COutPointLock::SIGNATURES_TOTAL;
         if(nRank > nSignaturesTotal) {
             LogPrint("instantsend", "CInstantSend::Vote -- Masternode not in the top %d (%d)\n", nSignaturesTotal, nRank);
-            ++itOutpointLock;
             continue;
         }
 
         LogPrint("instantsend", "CInstantSend::Vote -- In the top %d (%d)\n", nSignaturesTotal, nRank);
 
-        std::map<COutPoint, std::set<uint256> >::iterator itVoted = mapVotedOutpoints.find(itOutpointLock->first);
+        std::map<COutPoint, std::set<uint256> >::iterator itVoted = mapVotedOutpoints.find(outpointLockPair.first);
 
         // Check to see if we already voted for this outpoint,
         // refuse to vote twice or to include the same outpoint in another tx
@@ -259,23 +255,22 @@ void CInstantSend::Vote(CTxLockCandidate& txLockCandidate, CConnman& connman)
         if(itVoted != mapVotedOutpoints.end()) {
             for (const auto& hash : itVoted->second) {
                 std::map<uint256, CTxLockCandidate>::iterator it2 = mapTxLockCandidates.find(hash);
-                if(it2->second.HasMasternodeVoted(itOutpointLock->first, activeMasternode.outpoint)) {
+                if(it2->second.HasMasternodeVoted(outpointLockPair.first, activeMasternode.outpoint)) {
                     // we already voted for this outpoint to be included either in the same tx or in a competing one,
                     // skip it anyway
                     fAlreadyVoted = true;
                     LogPrintf("CInstantSend::Vote -- WARNING: We already voted for this outpoint, skipping: txHash=%s, outpoint=%s\n",
-                            txHash.ToString(), itOutpointLock->first.ToStringShort());
+                            txHash.ToString(), outpointLockPair.first.ToStringShort());
                     break;
                 }
             }
         }
         if(fAlreadyVoted) {
-            ++itOutpointLock;
             continue; // skip to the next outpoint
         }
 
         // we haven't voted for this outpoint yet, let's try to do this now
-        CTxLockVote vote(txHash, itOutpointLock->first, activeMasternode.outpoint);
+        CTxLockVote vote(txHash, outpointLockPair.first, activeMasternode.outpoint);
 
         if(!vote.Sign()) {
             LogPrintf("CInstantSend::Vote -- Failed to sign consensus vote\n");
@@ -289,27 +284,25 @@ void CInstantSend::Vote(CTxLockCandidate& txLockCandidate, CConnman& connman)
         // vote constructed sucessfully, let's store and relay it
         uint256 nVoteHash = vote.GetHash();
         mapTxLockVotes.insert(std::make_pair(nVoteHash, vote));
-        if(itOutpointLock->second.AddVote(vote)) {
+        if(outpointLockPair.second.AddVote(vote)) {
             LogPrintf("CInstantSend::Vote -- Vote created successfully, relaying: txHash=%s, outpoint=%s, vote=%s\n",
-                    txHash.ToString(), itOutpointLock->first.ToStringShort(), nVoteHash.ToString());
+                    txHash.ToString(), outpointLockPair.first.ToStringShort(), nVoteHash.ToString());
 
             if(itVoted == mapVotedOutpoints.end()) {
                 std::set<uint256> setHashes;
                 setHashes.insert(txHash);
-                mapVotedOutpoints.insert(std::make_pair(itOutpointLock->first, setHashes));
+                mapVotedOutpoints.insert(std::make_pair(outpointLockPair.first, setHashes));
             } else {
-                mapVotedOutpoints[itOutpointLock->first].insert(txHash);
-                if(mapVotedOutpoints[itOutpointLock->first].size() > 1) {
+                mapVotedOutpoints[outpointLockPair.first].insert(txHash);
+                if(mapVotedOutpoints[outpointLockPair.first].size() > 1) {
                     // it's ok to continue, just warn user
                     LogPrintf("CInstantSend::Vote -- WARNING: Vote conflicts with some existing votes: txHash=%s, outpoint=%s, vote=%s\n",
-                            txHash.ToString(), itOutpointLock->first.ToStringShort(), nVoteHash.ToString());
+                            txHash.ToString(), outpointLockPair.first.ToStringShort(), nVoteHash.ToString());
                 }
             }
 
             vote.Relay(connman);
         }
-
-        ++itOutpointLock;
     }
 }
 
@@ -548,11 +541,8 @@ void CInstantSend::LockTransactionInputs(const CTxLockCandidate& txLockCandidate
 
     if(!txLockCandidate.IsAllOutPointsReady()) return;
 
-    std::map<COutPoint, COutPointLock>::const_iterator it = txLockCandidate.mapOutPointLocks.begin();
-
-    while(it != txLockCandidate.mapOutPointLocks.end()) {
-        mapLockedOutpoints.insert(std::make_pair(it->first, txHash));
-        ++it;
+    for (const auto& pair : txLockCandidate.mapOutPointLocks) {
+        mapLockedOutpoints.insert(std::make_pair(pair.first, txHash));
     }
     LogPrint("instantsend", "CInstantSend::LockTransactionInputs -- done, txid=%s\n", txHash.ToString());
 }
@@ -648,12 +638,9 @@ int64_t CInstantSend::GetAverageMasternodeOrphanVoteTime()
     // NOTE: should never actually call this function when mapMasternodeOrphanVotes is empty
     if(mapMasternodeOrphanVotes.empty()) return 0;
 
-    std::map<COutPoint, int64_t>::iterator it = mapMasternodeOrphanVotes.begin();
     int64_t total = 0;
-
-    while(it != mapMasternodeOrphanVotes.end()) {
-        total+= it->second;
-        ++it;
+    for (const auto& pair : mapMasternodeOrphanVotes) {
+        total += pair.second;
     }
 
     return total / mapMasternodeOrphanVotes.size();
@@ -673,11 +660,10 @@ void CInstantSend::CheckAndRemove()
         uint256 txHash = txLockCandidate.GetHash();
         if(txLockCandidate.IsExpired(nCachedBlockHeight)) {
             LogPrintf("CInstantSend::CheckAndRemove -- Removing expired Transaction Lock Candidate: txid=%s\n", txHash.ToString());
-            std::map<COutPoint, COutPointLock>::iterator itOutpointLock = txLockCandidate.mapOutPointLocks.begin();
-            while(itOutpointLock != txLockCandidate.mapOutPointLocks.end()) {
-                mapLockedOutpoints.erase(itOutpointLock->first);
-                mapVotedOutpoints.erase(itOutpointLock->first);
-                ++itOutpointLock;
+
+            for (const auto& pair : txLockCandidate.mapOutPointLocks) {
+                mapLockedOutpoints.erase(pair.first);
+                mapVotedOutpoints.erase(pair.first);
             }
             mapLockRequestAccepted.erase(txHash);
             mapLockRequestRejected.erase(txHash);
@@ -828,11 +814,9 @@ bool CInstantSend::IsLockedInstantSendTransaction(const uint256& txHash)
     if(itLockCandidate->second.mapOutPointLocks.empty()) return false;
 
     // and all of these outputs must be included in mapLockedOutpoints with correct hash
-    std::map<COutPoint, COutPointLock>::iterator itOutpointLock = itLockCandidate->second.mapOutPointLocks.begin();
-    while(itOutpointLock != itLockCandidate->second.mapOutPointLocks.end()) {
+    for (const auto& pair : itLockCandidate->second.mapOutPointLocks) {
         uint256 hashLocked;
-        if(!GetLockedOutPointTxHash(itOutpointLock->first, hashLocked) || hashLocked != txHash) return false;
-        ++itOutpointLock;
+        if(!GetLockedOutPointTxHash(pair.first, hashLocked) || hashLocked != txHash) return false;
     }
 
     return true;
@@ -912,35 +896,28 @@ void CInstantSend::SyncTransaction(const CTransaction& tx, const CBlockIndex *pi
                 txHash.ToString(), nHeightNew);
         itLockCandidate->second.SetConfirmedHeight(nHeightNew);
         // Loop through outpoint locks
-        std::map<COutPoint, COutPointLock>::iterator itOutpointLock = itLockCandidate->second.mapOutPointLocks.begin();
-        while(itOutpointLock != itLockCandidate->second.mapOutPointLocks.end()) {
+        for (const auto& pair : itLockCandidate->second.mapOutPointLocks) {
+
             // Check corresponding lock votes
-            std::vector<CTxLockVote> vVotes = itOutpointLock->second.GetVotes();
-            std::vector<CTxLockVote>::iterator itVote = vVotes.begin();
-            std::map<uint256, CTxLockVote>::iterator it;
-            while(itVote != vVotes.end()) {
-                uint256 nVoteHash = itVote->GetHash();
+            for (const auto& vote : pair.second.GetVotes()) {
+                uint256 nVoteHash = vote.GetHash();
                 LogPrint("instantsend", "CInstantSend::SyncTransaction -- txid=%s nHeightNew=%d vote %s updated\n",
                         txHash.ToString(), nHeightNew, nVoteHash.ToString());
-                it = mapTxLockVotes.find(nVoteHash);
+                const auto& it = mapTxLockVotes.find(nVoteHash);
                 if(it != mapTxLockVotes.end()) {
                     it->second.SetConfirmedHeight(nHeightNew);
                 }
-                ++itVote;
             }
-            ++itOutpointLock;
         }
     }
 
     // check orphan votes
-    std::map<uint256, CTxLockVote>::iterator itOrphanVote = mapTxLockVotesOrphan.begin();
-    while(itOrphanVote != mapTxLockVotesOrphan.end()) {
-        if(itOrphanVote->second.GetTxHash() == txHash) {
+    for (const auto& pair : mapTxLockVotesOrphan) {
+        if(pair.second.GetTxHash() == txHash) {
             LogPrint("instantsend", "CInstantSend::SyncTransaction -- txid=%s nHeightNew=%d vote %s updated\n",
-                    txHash.ToString(), nHeightNew, itOrphanVote->first.ToString());
-            mapTxLockVotes[itOrphanVote->first].SetConfirmedHeight(nHeightNew);
+                    txHash.ToString(), nHeightNew, pair.first.ToString());
+            mapTxLockVotes[pair.first].SetConfirmedHeight(nHeightNew);
         }
-        ++itOrphanVote;
     }
 }
 
@@ -1178,10 +1155,8 @@ bool COutPointLock::AddVote(const CTxLockVote& vote)
 std::vector<CTxLockVote> COutPointLock::GetVotes() const
 {
     std::vector<CTxLockVote> vRet;
-    std::map<COutPoint, CTxLockVote>::const_iterator itVote = mapMasternodeVotes.begin();
-    while(itVote != mapMasternodeVotes.end()) {
-        vRet.push_back(itVote->second);
-        ++itVote;
+    for (const auto& pair : mapMasternodeVotes) {
+        vRet.push_back(pair.second);
     }
     return vRet;
 }
@@ -1193,10 +1168,8 @@ bool COutPointLock::HasMasternodeVoted(const COutPoint& outpointMasternodeIn) co
 
 void COutPointLock::Relay(CConnman& connman) const
 {
-    std::map<COutPoint, CTxLockVote>::const_iterator itVote = mapMasternodeVotes.begin();
-    while(itVote != mapMasternodeVotes.end()) {
-        itVote->second.Relay(connman);
-        ++itVote;
+    for (const auto& pair : mapMasternodeVotes) {
+        pair.second.Relay(connman);
     }
 }
 
@@ -1227,10 +1200,8 @@ bool CTxLockCandidate::IsAllOutPointsReady() const
 {
     if(mapOutPointLocks.empty()) return false;
 
-    std::map<COutPoint, COutPointLock>::const_iterator it = mapOutPointLocks.begin();
-    while(it != mapOutPointLocks.end()) {
-        if(!it->second.IsReady()) return false;
-        ++it;
+    for (const auto& pair : mapOutPointLocks) {
+        if(!pair.second.IsReady()) return false;
     }
     return true;
 }
@@ -1245,10 +1216,8 @@ int CTxLockCandidate::CountVotes() const
 {
     // Note: do NOT use vote count to figure out if tx is locked, use IsAllOutPointsReady() instead
     int nCountVotes = 0;
-    std::map<COutPoint, COutPointLock>::const_iterator it = mapOutPointLocks.begin();
-    while(it != mapOutPointLocks.end()) {
-        nCountVotes += it->second.CountVotes();
-        ++it;
+    for (const auto& pair : mapOutPointLocks) {
+        nCountVotes += pair.second.CountVotes();
     }
     return nCountVotes;
 }
@@ -1267,9 +1236,7 @@ bool CTxLockCandidate::IsTimedOut() const
 void CTxLockCandidate::Relay(CConnman& connman) const
 {
     connman.RelayTransaction(*txLockRequest.tx);
-    std::map<COutPoint, COutPointLock>::const_iterator itOutpointLock = mapOutPointLocks.begin();
-    while(itOutpointLock != mapOutPointLocks.end()) {
-        itOutpointLock->second.Relay(connman);
-        ++itOutpointLock;
+    for (const auto& pair : mapOutPointLocks) {
+        pair.second.Relay(connman);
     }
 }
diff --git a/src/masternode-payments.cpp b/src/masternode-payments.cpp
index df8e78982f2c..34e6b6e51541 100644
--- a/src/masternode-payments.cpp
+++ b/src/masternode-payments.cpp
@@ -1009,12 +1009,11 @@ void CMasternodePayments::RequestLowDataPaymentBlocks(CNode* pnode, CConnman& co
         pindex = pindex->pprev;
     }
 
-    auto it = mapMasternodeBlocks.begin();
-
-    while(it != mapMasternodeBlocks.end()) {
+    for (auto& mnBlockPayees : mapMasternodeBlocks) {
+        int nBlockHeight = mnBlockPayees.first;
         int nTotalVotes = 0;
         bool fFound = false;
-        for (const auto& payee : it->second.vecPayees) {
+        for (const auto& payee : mnBlockPayees.second.vecPayees) {
             if(payee.GetVoteCount() >= MNPAYMENTS_SIGNATURES_REQUIRED) {
                 fFound = true;
                 break;
@@ -1025,24 +1024,23 @@ void CMasternodePayments::RequestLowDataPaymentBlocks(CNode* pnode, CConnman& co
         // or no clear winner was found but there are at least avg number of votes
         if(fFound || nTotalVotes >= (MNPAYMENTS_SIGNATURES_TOTAL + MNPAYMENTS_SIGNATURES_REQUIRED)/2) {
             // so just move to the next block
-            ++it;
             continue;
         }
         // DEBUG
         DBG (
             // Let's see why this failed
-            for (const auto& payee : it->second.vecPayees) {
+            for (const auto& payee : mnBlockPayees.second.vecPayees) {
                 CTxDestination address1;
                 ExtractDestination(payee.GetPayee(), address1);
                 CBitcoinAddress address2(address1);
                 printf("payee %s votes %d\n", address2.ToString().c_str(), payee.GetVoteCount());
             }
-            printf("block %d votes total %d\n", it->first, nTotalVotes);
+            printf("block %d votes total %d\n", nBlockHeight, nTotalVotes);
         )
         // END DEBUG
         // Low data block found, let's try to sync it
         uint256 hash;
-        if(GetBlockHash(hash, it->first)) {
+        if(GetBlockHash(hash, nBlockHeight)) {
             vToFetch.push_back(CInv(MSG_MASTERNODE_PAYMENT_BLOCK, hash));
         }
         // We should not violate GETDATA rules
@@ -1052,7 +1050,6 @@ void CMasternodePayments::RequestLowDataPaymentBlocks(CNode* pnode, CConnman& co
             // Start filling new batch
             vToFetch.clear();
         }
-        ++it;
     }
     // Ask for the rest of it
     if(!vToFetch.empty()) {
diff --git a/src/masternodeman.cpp b/src/masternodeman.cpp
index 815cd09f3eb2..a0c763c0d2a1 100644
--- a/src/masternodeman.cpp
+++ b/src/masternodeman.cpp
@@ -772,14 +772,11 @@ void CMasternodeMan::ProcessPendingMnbRequests(CConnman& connman)
         bool fDone = connman.ForNode(itPendingMNB->first, [&](CNode* pnode) {
             // compile request vector
             std::vector<CInv> vToFetch;
-            std::set<uint256>& setHashes = itPendingMNB->second.second;
-            std::set<uint256>::iterator it = setHashes.begin();
-            while(it != setHashes.end()) {
-                if(*it != uint256()) {
-                    vToFetch.push_back(CInv(MSG_MASTERNODE_ANNOUNCE, *it));
-                    LogPrint("masternode", "-- asking for mnb %s from addr=%s\n", it->ToString(), pnode->addr.ToString());
+            for (auto& nHash : itPendingMNB->second.second) {
+                if(nHash != uint256()) {
+                    vToFetch.push_back(CInv(MSG_MASTERNODE_ANNOUNCE, nHash));
+                    LogPrint("masternode", "-- asking for mnb %s from addr=%s\n", nHash.ToString(), pnode->addr.ToString());
                 }
-                ++it;
             }
 
             // ask for data
@@ -1013,20 +1010,18 @@ void CMasternodeMan::DoFullVerificationStep(CConnman& connman)
     int nRanksTotal = (int)vecMasternodeRanks.size();
 
     // send verify requests only if we are in top MAX_POSE_RANK
-    rank_pair_vec_t::iterator it = vecMasternodeRanks.begin();
-    while(it != vecMasternodeRanks.end()) {
-        if(it->first > MAX_POSE_RANK) {
+    for (auto& rankPair : vecMasternodeRanks) {
+        if(rankPair.first > MAX_POSE_RANK) {
             LogPrint("masternode", "CMasternodeMan::DoFullVerificationStep -- Must be in top %d to send verify request\n",
                         (int)MAX_POSE_RANK);
             return;
         }
-        if(it->second.outpoint == activeMasternode.outpoint) {
-            nMyRank = it->first;
+        if(rankPair.second.outpoint == activeMasternode.outpoint) {
+            nMyRank = rankPair.first;
             LogPrint("masternode", "CMasternodeMan::DoFullVerificationStep -- Found self at rank %d/%d, verifying up to %d masternodes\n",
                         nMyRank, nRanksTotal, (int)MAX_POSE_CONNECTIONS);
             break;
         }
-        ++it;
     }
 
     // edge case: list is too short and this masternode is not enabled
@@ -1044,7 +1039,7 @@ void CMasternodeMan::DoFullVerificationStep(CConnman& connman)
 
     sort(vSortedByAddr.begin(), vSortedByAddr.end(), CompareByAddr());
 
-    it = vecMasternodeRanks.begin() + nOffset;
+    auto it = vecMasternodeRanks.begin() + nOffset;
     while(it != vecMasternodeRanks.end()) {
         if(it->second.IsPoSeVerified() || it->second.IsPoSeBanned()) {
             LogPrint("masternode", "CMasternodeMan::DoFullVerificationStep -- Already %s%s%s masternode %s address %s, skipping...\n",
diff --git a/src/privatesend-client.cpp b/src/privatesend-client.cpp
index 02e43e8d0c85..eb411f78b121 100644
--- a/src/privatesend-client.cpp
+++ b/src/privatesend-client.cpp
@@ -1342,7 +1342,8 @@ bool CPrivateSendClient::CreateDenominated(const CompactTallyItem& tallyItem, bo
     do {
         std::vector<CAmount> vecStandardDenoms = CPrivateSend::GetStandardDenominations();
 
-        BOOST_REVERSE_FOREACH(CAmount nDenomValue, vecStandardDenoms) {
+        for (auto it = vecStandardDenoms.rbegin(); it != vecStandardDenoms.rend(); ++it) {
+            CAmount nDenomValue = *it;
 
             if(fSkip) {
                 // Note: denoms are skipped if there are already DENOMS_COUNT_MAX of them
diff --git a/src/privatesend.cpp b/src/privatesend.cpp
index 42852d49f826..b991667262f0 100644
--- a/src/privatesend.cpp
+++ b/src/privatesend.cpp
@@ -417,8 +417,8 @@ int CPrivateSend::GetDenominationsByAmounts(const std::vector<CAmount>& vecAmoun
     CScript scriptTmp = CScript();
     std::vector<CTxOut> vecTxOut;
 
-    BOOST_REVERSE_FOREACH(CAmount nAmount, vecAmount) {
-        CTxOut txout(nAmount, scriptTmp);
+    for (auto it = vecAmount.rbegin(); it != vecAmount.rend(); ++it) {
+        CTxOut txout((*it), scriptTmp);
         vecTxOut.push_back(txout);
     }
 
diff --git a/src/spork.cpp b/src/spork.cpp
index a00f6f7536c6..4ecdddc8d1c0 100644
--- a/src/spork.cpp
+++ b/src/spork.cpp
@@ -73,12 +73,8 @@ void CSporkManager::ProcessSpork(CNode* pfrom, const std::string& strCommand, CD
         ExecuteSpork(spork.nSporkID, spork.nValue);
 
     } else if (strCommand == NetMsgType::GETSPORKS) {
-
-        std::map<int, CSporkMessage>::iterator it = mapSporksActive.begin();
-
-        while(it != mapSporksActive.end()) {
-            connman.PushMessage(pfrom, CNetMsgMaker(pfrom->GetSendVersion()).Make(NetMsgType::SPORK, it->second));
-            it++;
+        for (const auto& pair : mapSporksActive) {
+            connman.PushMessage(pfrom, CNetMsgMaker(pfrom->GetSendVersion()).Make(NetMsgType::SPORK, pair.second));
         }
     }
 

From 42c193df08362ba480cd9315af393081e553ab8c Mon Sep 17 00:00:00 2001
From: Nathan Marley <nathan.marley@gmail.com>
Date: Thu, 12 Jul 2018 16:08:22 +0700
Subject: [PATCH 011/400] replace map count/insert w/emplace in instantx.cpp
 (#2165)

* replace map count/insert w/emplace in instantx.cpp

This feels like an optimization, something about:

```
if map.count(key)
     return false
else
     insert(pair)
     return true
```

... just feels icky. Plus, `vote.GetMasternodeOutpoint()` is only called
once. The previous version might be slightly more readable, however.

* use std::pair template constructor shortcut
---
 src/instantx.cpp | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/instantx.cpp b/src/instantx.cpp
index 4bd0c0b483d1..afe7f7e10f2d 100644
--- a/src/instantx.cpp
+++ b/src/instantx.cpp
@@ -1146,10 +1146,7 @@ bool CTxLockVote::IsFailed() const
 
 bool COutPointLock::AddVote(const CTxLockVote& vote)
 {
-    if(mapMasternodeVotes.count(vote.GetMasternodeOutpoint()))
-        return false;
-    mapMasternodeVotes.insert(std::make_pair(vote.GetMasternodeOutpoint(), vote));
-    return true;
+    return mapMasternodeVotes.emplace(vote.GetMasternodeOutpoint(), vote).second;
 }
 
 std::vector<CTxLockVote> COutPointLock::GetVotes() const

From e23339d6f0b1658e4e8bfb783bae263fb50c73ae Mon Sep 17 00:00:00 2001
From: Nathan Marley <nathan.marley@gmail.com>
Date: Thu, 12 Jul 2018 16:08:43 +0700
Subject: [PATCH 012/400] use nullptr in Dash-specific code (#2166)

This is recommended in modern C++ code as nullptr is more type-safe and can't
be converted to an integer, unlike NULL.
---
 src/governance-classes.cpp |  2 +-
 src/governance-object.cpp  |  2 +-
 src/governance.cpp         | 12 ++++++------
 src/governance.h           |  4 ++--
 src/masternode.cpp         |  4 ++--
 src/masternodeconfig.cpp   |  2 +-
 src/masternodeman.cpp      | 18 +++++++++---------
 src/privatesend-client.cpp |  2 +-
 src/rpc/governance.cpp     |  6 +++---
 9 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/src/governance-classes.cpp b/src/governance-classes.cpp
index 4cb2c00dcf28..6722efe26622 100644
--- a/src/governance-classes.cpp
+++ b/src/governance-classes.cpp
@@ -284,7 +284,7 @@ bool CSuperblockManager::IsSuperblockTriggered(int nBlockHeight)
         CGovernanceObject* pObj = pSuperblock->GetGovernanceObject();
 
         if(!pObj) {
-            LogPrintf("CSuperblockManager::IsSuperblockTriggered -- pObj == NULL, continuing\n");
+            LogPrintf("CSuperblockManager::IsSuperblockTriggered -- pObj == nullptr, continuing\n");
             DBG( std::cout << "IsSuperblockTriggered pObj is NULL, continuing" << std::endl; );
             continue;
         }
diff --git a/src/governance-object.cpp b/src/governance-object.cpp
index 890c1c14db8f..0874139ec0f5 100644
--- a/src/governance-object.cpp
+++ b/src/governance-object.cpp
@@ -777,7 +777,7 @@ void CGovernanceObject::CheckOrphanVotes(CConnman& connman)
             continue;
         }
         CGovernanceException exception;
-        if(!ProcessVote(NULL, vote, exception, connman)) {
+        if(!ProcessVote(nullptr, vote, exception, connman)) {
             LogPrintf("CGovernanceObject::CheckOrphanVotes -- Failed to add orphan vote: %s\n", exception.what());
         }
         else {
diff --git a/src/governance.cpp b/src/governance.cpp
index 0a86adaf0fed..7909a7a1cb5f 100644
--- a/src/governance.cpp
+++ b/src/governance.cpp
@@ -65,7 +65,7 @@ bool CGovernanceManager::HaveVoteForHash(const uint256& nHash) const
 {
     LOCK(cs);
 
-    CGovernanceObject* pGovobj = NULL;
+    CGovernanceObject* pGovobj = nullptr;
     return cmapVoteToObject.Get(nHash, pGovobj) && pGovobj->GetVoteFile().HasVote(nHash);
 }
 
@@ -79,7 +79,7 @@ bool CGovernanceManager::SerializeVoteForHash(const uint256& nHash, CDataStream&
 {
     LOCK(cs);
 
-    CGovernanceObject* pGovobj = NULL;
+    CGovernanceObject* pGovobj = nullptr;
     return cmapVoteToObject.Get(nHash,pGovobj) && pGovobj->GetVoteFile().SerializeVoteToStream(nHash, ss);
 }
 
@@ -287,7 +287,7 @@ void CGovernanceManager::CheckOrphanVotes(CGovernanceObject& govobj, CGovernance
         if(pairVote.second < nNow) {
             fRemove = true;
         }
-        else if(govobj.ProcessVote(NULL, vote, exception, connman)) {
+        else if(govobj.ProcessVote(nullptr, vote, exception, connman)) {
             vote.Relay(connman);
             fRemove = true;
         }
@@ -350,7 +350,7 @@ void CGovernanceManager::AddGovernanceObject(CGovernanceObject& govobj, CConnman
         DBG( std::cout << "CGovernanceManager::AddGovernanceObject After AddNewTrigger" << std::endl; );
     }
 
-    LogPrintf("CGovernanceManager::AddGovernanceObject -- %s new, received from %s\n", strHash, pfrom? pfrom->GetAddrName() : "NULL");
+    LogPrintf("CGovernanceManager::AddGovernanceObject -- %s new, received from %s\n", strHash, pfrom ? pfrom->GetAddrName() : "nullptr");
     govobj.Relay(connman);
 
     // Update the rate buffer
@@ -489,7 +489,7 @@ CGovernanceObject* CGovernanceManager::FindGovernanceObject(const uint256& nHash
     if(mapObjects.count(nHash))
         return &mapObjects[nHash];
 
-    return NULL;
+    return nullptr;
 }
 
 std::vector<CGovernanceVote> CGovernanceManager::GetMatchingVotes(const uint256& nParentHash) const
@@ -624,7 +624,7 @@ bool CGovernanceManager::ConfirmInventoryRequest(const CInv& inv)
     }
 
 
-    hash_s_t* setHash = NULL;
+    hash_s_t* setHash = nullptr;
     switch(inv.type) {
     case MSG_GOVERNANCE_OBJECT:
         setHash = &setRequestedObjects;
diff --git a/src/governance.h b/src/governance.h
index 73be71e533e2..9a0bac58d1b3 100644
--- a/src/governance.h
+++ b/src/governance.h
@@ -307,7 +307,7 @@ class CGovernanceManager
     std::vector<CGovernanceVote> GetCurrentVotes(const uint256& nParentHash, const COutPoint& mnCollateralOutpointFilter) const;
     std::vector<const CGovernanceObject*> GetAllNewerThan(int64_t nMoreThanTime) const;
 
-    void AddGovernanceObject(CGovernanceObject& govobj, CConnman& connman, CNode* pfrom = NULL);
+    void AddGovernanceObject(CGovernanceObject& govobj, CConnman& connman, CNode* pfrom = nullptr);
 
     void UpdateCachesAndClean();
 
@@ -388,7 +388,7 @@ class CGovernanceManager
     bool MasternodeRateCheck(const CGovernanceObject& govobj, bool fUpdateFailStatus, bool fForce, bool& fRateCheckBypassed);
 
     bool ProcessVoteAndRelay(const CGovernanceVote& vote, CGovernanceException& exception, CConnman& connman) {
-        bool fOK = ProcessVote(NULL, vote, exception, connman);
+        bool fOK = ProcessVote(nullptr, vote, exception, connman);
         if(fOK) {
             vote.Relay(connman);
         }
diff --git a/src/masternode.cpp b/src/masternode.cpp
index 024a9aa90488..53f0e9285664 100644
--- a/src/masternode.cpp
+++ b/src/masternode.cpp
@@ -343,7 +343,7 @@ void CMasternode::UpdateLastPaid(const CBlockIndex *pindex, int nMaxBlocksToScan
                 }
         }
 
-        if (BlockReading->pprev == NULL) { assert(BlockReading); break; }
+        if (BlockReading->pprev == nullptr) { assert(BlockReading); break; }
         BlockReading = BlockReading->pprev;
     }
 
@@ -847,7 +847,7 @@ bool CMasternodePing::CheckAndUpdate(CMasternode* pmn, bool fFromNewBroadcast, i
         return false;
     }
 
-    if (pmn == NULL) {
+    if (pmn == nullptr) {
         LogPrint("masternode", "CMasternodePing::CheckAndUpdate -- Couldn't find Masternode entry, masternode=%s\n", masternodeOutpoint.ToStringShort());
         return false;
     }
diff --git a/src/masternodeconfig.cpp b/src/masternodeconfig.cpp
index 2dac44eaf195..0e2e67be796a 100644
--- a/src/masternodeconfig.cpp
+++ b/src/masternodeconfig.cpp
@@ -21,7 +21,7 @@ bool CMasternodeConfig::read(std::string& strErrRet) {
 
     if (!streamConfig.good()) {
         FILE* configFile = fopen(pathMasternodeConfigFile.string().c_str(), "a");
-        if (configFile != NULL) {
+        if (configFile != nullptr) {
             std::string strHeader = "# Masternode config file\n"
                           "# Format: alias IP:port masternodeprivkey collateral_output_txid collateral_output_index\n"
                           "# Example: mn1 127.0.0.2:19999 93HaYBVUCYjEMeeH1Y4sBGLALQZE1Yc1K64xiqgX37tGBDQL8Xg 2bcd3c84c84f87eaa86e4e56834c92927a07f9e18718810b92e0d0324456a67c 0\n";
diff --git a/src/masternodeman.cpp b/src/masternodeman.cpp
index a0c763c0d2a1..9e7f07d2e955 100644
--- a/src/masternodeman.cpp
+++ b/src/masternodeman.cpp
@@ -253,7 +253,7 @@ void CMasternodeMan::CheckAndRemove(CConnman& connman)
                     // mapSeenMasternodeBroadcast.erase(itMnbReplies->first);
                     int nDos;
                     itMnbReplies->second[0].fRecovery = true;
-                    CheckMnbAndUpdateMasternodeList(NULL, itMnbReplies->second[0], nDos, connman);
+                    CheckMnbAndUpdateMasternodeList(nullptr, itMnbReplies->second[0], nDos, connman);
                 }
                 LogPrint("masternode", "CMasternodeMan::CheckAndRemove -- removing mnb recovery reply, masternode=%s, size=%d\n", itMnbReplies->second[0].outpoint.ToStringShort(), (int)itMnbReplies->second.size());
                 mMnbRecoveryGoodReplies.erase(itMnbReplies++);
@@ -445,7 +445,7 @@ CMasternode* CMasternodeMan::Find(const COutPoint &outpoint)
 {
     LOCK(cs);
     auto it = mapMasternodes.find(outpoint);
-    return it == mapMasternodes.end() ? NULL : &(it->second);
+    return it == mapMasternodes.end() ? nullptr : &(it->second);
 }
 
 bool CMasternodeMan::Get(const COutPoint& outpoint, CMasternode& masternodeRet)
@@ -571,7 +571,7 @@ bool CMasternodeMan::GetNextMasternodeInQueueForPayment(int nBlockHeight, bool f
     int nTenthNetwork = nMnCount/10;
     int nCountTenth = 0;
     arith_uint256 nHighest = 0;
-    const CMasternode *pBestMasternode = NULL;
+    const CMasternode *pBestMasternode = nullptr;
     for (const auto& s : vecMasternodeLastPaid) {
         arith_uint256 nScore = s.second->CalculateScore(blockHash);
         if(nScore > nHighest){
@@ -862,7 +862,7 @@ void CMasternodeMan::ProcessMessage(CNode* pfrom, const std::string& strCommand,
         if(nDos > 0) {
             // if anything significant failed, mark that node
             Misbehaving(pfrom->GetId(), nDos);
-        } else if(pmn != NULL) {
+        } else if(pmn != nullptr) {
             // nothing significant failed, mn is a known one too
             return;
         }
@@ -1081,8 +1081,8 @@ void CMasternodeMan::CheckSameAddr()
     {
         LOCK(cs);
 
-        CMasternode* pprevMasternode = NULL;
-        CMasternode* pverifiedMasternode = NULL;
+        CMasternode* pprevMasternode = nullptr;
+        CMasternode* pverifiedMasternode = nullptr;
 
         for (auto& mnpair : mapMasternodes) {
             vSortedByAddr.push_back(&mnpair.second);
@@ -1096,7 +1096,7 @@ void CMasternodeMan::CheckSameAddr()
             // initial step
             if(!pprevMasternode) {
                 pprevMasternode = pmn;
-                pverifiedMasternode = pmn->IsPoSeVerified() ? pmn : NULL;
+                pverifiedMasternode = pmn->IsPoSeVerified() ? pmn : nullptr;
                 continue;
             }
             // second+ step
@@ -1111,7 +1111,7 @@ void CMasternodeMan::CheckSameAddr()
                     pverifiedMasternode = pmn;
                 }
             } else {
-                pverifiedMasternode = pmn->IsPoSeVerified() ? pmn : NULL;
+                pverifiedMasternode = pmn->IsPoSeVerified() ? pmn : nullptr;
             }
             pprevMasternode = pmn;
         }
@@ -1276,7 +1276,7 @@ void CMasternodeMan::ProcessVerifyReply(CNode* pnode, CMasternodeVerification& m
     {
         LOCK(cs);
 
-        CMasternode* prealMasternode = NULL;
+        CMasternode* prealMasternode = nullptr;
         std::vector<CMasternode*> vpMasternodesToBan;
 
         uint256 hash1 = mnv.GetSignatureHash1(blockHash);
diff --git a/src/privatesend-client.cpp b/src/privatesend-client.cpp
index eb411f78b121..61f4f427909f 100644
--- a/src/privatesend-client.cpp
+++ b/src/privatesend-client.cpp
@@ -486,7 +486,7 @@ bool CPrivateSendClient::CheckPoolStateUpdate(PoolState nStateNew, int nEntriesC
 //
 bool CPrivateSendClient::SignFinalTransaction(const CTransaction& finalTransactionNew, CNode* pnode, CConnman& connman)
 {
-    if(fMasternodeMode || pnode == NULL) return false;
+    if(fMasternodeMode || pnode == nullptr) return false;
 
     finalMutableTransaction = finalTransactionNew;
     LogPrintf("CPrivateSendClient::SignFinalTransaction -- finalMutableTransaction=%s", finalMutableTransaction.ToString());
diff --git a/src/rpc/governance.cpp b/src/rpc/governance.cpp
index 830e9f7cdcd6..a6b1ebaed5d0 100644
--- a/src/rpc/governance.cpp
+++ b/src/rpc/governance.cpp
@@ -717,7 +717,7 @@ UniValue gobject(const JSONRPCRequest& request)
         // FIND THE GOVERNANCE OBJECT THE USER IS LOOKING FOR
         CGovernanceObject* pGovObj = governance.FindGovernanceObject(hash);
 
-        if(pGovObj == NULL)
+        if(pGovObj == nullptr)
             throw JSONRPCError(RPC_INVALID_PARAMETER, "Unknown governance object");
 
         // REPORT BASIC OBJECT STATS
@@ -797,7 +797,7 @@ UniValue gobject(const JSONRPCRequest& request)
 
         CGovernanceObject* pGovObj = governance.FindGovernanceObject(hash);
 
-        if(pGovObj == NULL) {
+        if(pGovObj == nullptr) {
             throw JSONRPCError(RPC_INVALID_PARAMETER, "Unknown governance-hash");
         }
 
@@ -840,7 +840,7 @@ UniValue gobject(const JSONRPCRequest& request)
 
         CGovernanceObject* pGovObj = governance.FindGovernanceObject(hash);
 
-        if(pGovObj == NULL) {
+        if(pGovObj == nullptr) {
             throw JSONRPCError(RPC_INVALID_PARAMETER, "Unknown governance-hash");
         }
 

From 5036d7dfc525f16dfb6394fed9af1555e064febf Mon Sep 17 00:00:00 2001
From: Oleg Girko <ol+github@infoserver.lv>
Date: Thu, 12 Jul 2018 10:09:02 +0100
Subject: [PATCH 013/400] depends: Update Qt download url (#2177)

---
 depends/packages/qt.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/depends/packages/qt.mk b/depends/packages/qt.mk
index d5354c6bf650..e8301eb692a8 100644
--- a/depends/packages/qt.mk
+++ b/depends/packages/qt.mk
@@ -1,6 +1,6 @@
 PACKAGE=qt
 $(package)_version=5.7.1
-$(package)_download_path=http://download.qt.io/official_releases/qt/5.7/$($(package)_version)/submodules
+$(package)_download_path=https://download.qt.io/archive/qt/5.7/$($(package)_version)/submodules
 $(package)_suffix=opensource-src-$($(package)_version).tar.gz
 $(package)_file_name=qtbase-$($(package)_suffix)
 $(package)_sha256_hash=95f83e532d23b3ddbde7973f380ecae1bac13230340557276f75f2e37984e410

From 23dde9f12b7970b71e22193218787df16cad4c4f Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Thu, 12 Jul 2018 11:17:19 +0200
Subject: [PATCH 014/400] Remove a few annoying debug prints from
 CMasternodeMan (#2179)

These are occurring every second and cause more noise than actual
information.
---
 src/masternodeman.cpp | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/masternodeman.cpp b/src/masternodeman.cpp
index 9e7f07d2e955..89434e3155df 100644
--- a/src/masternodeman.cpp
+++ b/src/masternodeman.cpp
@@ -163,8 +163,6 @@ void CMasternodeMan::Check()
 {
     LOCK2(cs_main, cs);
 
-    LogPrint("masternode", "CMasternodeMan::Check -- nLastSentinelPingTime=%d, IsSentinelPingActive()=%d\n", nLastSentinelPingTime, IsSentinelPingActive());
-
     for (auto& mnpair : mapMasternodes) {
         // NOTE: internally it checks only every MASTERNODE_CHECK_SECONDS seconds
         // since the last time, so expect some MNs to skip this
@@ -795,7 +793,6 @@ void CMasternodeMan::ProcessPendingMnbRequests(CConnman& connman)
             ++itPendingMNB;
         }
     }
-    LogPrint("masternode", "%s -- mapPendingMNB size: %d\n", __func__, mapPendingMNB.size());
 }
 
 void CMasternodeMan::ProcessMessage(CNode* pfrom, const std::string& strCommand, CDataStream& vRecv, CConnman& connman)
@@ -1170,7 +1167,6 @@ void CMasternodeMan::ProcessPendingMnvRequests(CConnman& connman)
             ++itPendingMNV;
         }
     }
-    LogPrint("masternode", "%s -- mapPendingMNV size: %d\n", __func__, mapPendingMNV.size());
 }
 
 void CMasternodeMan::SendVerifyReply(CNode* pnode, CMasternodeVerification& mnv, CConnman& connman)

From f3e380659a89afdce5b3e43a77c9ae9d052f8d20 Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Thu, 12 Jul 2018 15:28:59 +0200
Subject: [PATCH 015/400] Move to in-docker CI builds and add Jenkins support
 (#2178)

* GCC-7 and glibc-2.27 compat code

* Statically link libstdc++ for GCC based builds

Makes sure binaries which are built on a newer build host still work
on older distros.

* Use python3 when installing MacOS native tools

* Move actual build logic out of Travis and upgrade to gcc-7

Travis will now simply call a few scripts which do the actual work.
These scripts will first create a "builder image" which contains the
necessary environment for the actual build. Then scripts are called
inside this builder image to do the build.

This should make us more independant from Travis and also allows us
to do local CI testing.

The build matrix is also moved out of .travis.yml and instead moved
into ci/matrix.sh. This script is sourced with only "BUILD_TARGET" being
set so that it internally can figure out which other environment
variables need to be set.

This commit also upgrades the used GCC version to 7. This is due to the
use of ubuntu:bionic as base image for the builder image.

* Add Jenkinsfiles for regular CI and nightly gitian builds

* Automatically download OSX SDK in gitian-build.sh

* Remove bogus "export MAKEJOBS=-j5"

* Forward cache/src dirs into builder container

Fixes caching issues on Travis.

* fix

* Fail build immediately when building depends took too long
---
 .travis.yml                          | 116 ++++++++++---------------
 Jenkinsfile                          |  93 ++++++++++++++++++++
 Jenkinsfile.gitian                   | 123 +++++++++++++++++++++++++++
 ci/Dockerfile.builder                |  58 +++++++++++++
 ci/Dockerfile.gitian-builder         |  17 ++++
 ci/build_depends.sh                  |  29 +++++++
 ci/build_src.sh                      |  37 ++++++++
 ci/matrix.sh                         |  88 +++++++++++++++++++
 ci/test_integrationtests.sh          |  18 ++++
 ci/test_unittests.sh                 |  27 ++++++
 contrib/gitian-build.sh              |  10 +++
 depends/hosts/linux.mk               |   2 +-
 depends/hosts/mingw32.mk             |   2 +-
 depends/packages/native_biplist.mk   |   4 +-
 depends/packages/native_ds_store.mk  |   4 +-
 depends/packages/native_mac_alias.mk |   4 +-
 src/Makefile.am                      |   1 +
 src/compat/glibc_compat.cpp          |  45 ++++++++++
 18 files changed, 601 insertions(+), 77 deletions(-)
 create mode 100644 Jenkinsfile
 create mode 100644 Jenkinsfile.gitian
 create mode 100644 ci/Dockerfile.builder
 create mode 100644 ci/Dockerfile.gitian-builder
 create mode 100755 ci/build_depends.sh
 create mode 100755 ci/build_src.sh
 create mode 100755 ci/matrix.sh
 create mode 100755 ci/test_integrationtests.sh
 create mode 100755 ci/test_unittests.sh

diff --git a/.travis.yml b/.travis.yml
index 5a81f2049473..70267409a506 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,18 +1,21 @@
 # errata:
-# - A travis bug causes caches to trample eachother when using the same
-#   compiler key (which we don't use anyway). This is worked around for now by
-#   replacing the "compilers" with a build name prefixed by the no-op ":"
-#   command. See: https://github.com/travis-ci/travis-ci/issues/4393
 # - sudo/dist/group are set so as to get Blue Box VMs, necessary for [loopback]
 #   IPv6 support
 
 sudo: required
 dist: trusty
-group: deprecated-2017Q3
 
 os: linux
 language: generic
 
+addons:
+  apt:
+    packages:
+      # Use more recent docker version
+      - docker-ce
+      # Can be removed if Travis ever upgrades to Bionic
+      - realpath
+
 services:
   - docker
 
@@ -20,9 +23,7 @@ cache:
   apt: true
   ccache: true
   directories:
-    - depends/built
-    - depends/sdk-sources
-    - $HOME/.ccache
+    - $HOME/cache
 
 env:
   global:
@@ -30,78 +31,55 @@ env:
     - secure: "J0T+zrRBBzBnxoioCD378cRSJUF8Vms32QMmrENVVfuJl03oBQv0QxSatLEiD4PtRPrN00mJ8/k/HdqFQ0SN1yg6a00duOZ6C9jk6t/fExBO1LNhp3Z7lcaMUrNEyRN6sgfVeznDVTGj9jBQU2HNlwHk0UD9BNp/k+Bjhrtw7Njp9JTLZKBgxrXk0WZmfk0d75Q+9DajA1j2tSfWVpwzv6HMGfqIH1wsVEakBY+tnaE6EO3IdzdWHhf/iV+Tx0tL0Qz/6mejgSuoGLTJLmeTrceTTmsDlN3B95y+XfcYDs6EP7gpzN8Ffg/mLV8xJ2Myj7+b1o+smMJZE5tLuPIeAu0YsfkPNa/tNLotOlDxF72per0kXyNYbRf+JrpxiOu9pLCtdtd40V2SsiNhpQqHVy+b+wkkqo2syTHT+9UNkqEi3WFm6TqFuOeQNtDm6R0hRl/Talw/ZEeKs68z1Cf6VyBrZG5LqtOurtWlKwXCe/Tr1i2g4BEAcbywphtCCcfgMK9YSGQnjKkGk6k9gVEa2bneYLZz1RSh2OpXnIsIJOX7X0hNd5xtQDLgbpSUlKwVcEriWeGe12GCszKNX9gdEo2bHeq4xAJ6BE+ot745z9dc+nC2BJ6Su+I5L6zBg4m2FWn0TWhPvz/6JR26t6ls/E7m+hkwJTCHnIUiFmmzpEw="
     # DOCKER_HUB_PASSWORD
     - secure: "RLzlMhfLqwSBrZqJOVOd61suXBn+HtUR3vOZfuFYF/Qmjjj5TE41+rObZmzc54hP/ZL+OH6blnibpvfDXlX+eN38ivFQfuxkJIGL68SJsEwNBRwW39Yw6Hl5RdI41MLCH7ByN15wifLp1JKBilHJ7XGMOUjI7P0yl7JjX8GBXUCtJbVLRugo80/yn+XQ1NdnlpbpYHNjMEQFWSODPa3pSK5McWvyQjDZDgS+IkdrZmIYJPMa7bmKH5I/edUPSmXQT905FgEwq9u8XR0SyBopli21EK9l6GkXIIvmDTYz5vT26Apvi2B4Aoazlklg+KNRUJuLGerpt6kbnU0gMSUChVkFfFhOk6GRSN3a/AUfD2FOudvMhet2QvlPHx+GYdEUr5XVo5HW42pHsqfD6eDtHd8VLTsHP0q4C8V85fNMv21lkkehy2ry8fx/RRy6x4O2wg2mua+79UkGKXp75gMKzWEcth34PCFCOu37l2F8R/ANnrQ52K/8vIQ88TtU2OpYX89fHjLojBxu+WKEBGZH2LRPsZBOUHeeO5C/xKDrhZU24ORnMW8wg66Qg5GIX1KI4a8yp73Mpues5hzpJ6wkMuRrQt40ymKndLCjv8KSd+5BfP6Or/KIrzDNYdZaasjk7JNi6rcZmm9d3fTAo+Ja/mjpUCIOo3SX14luzVCJIig="
-    - MAKEJOBS=-j5
-    - RUN_TESTS=false
-    - CHECK_DOC=0
-    - BOOST_TEST_RANDOM=1$TRAVIS_BUILD_ID
-    - CCACHE_SIZE=400M
-    - CCACHE_TEMPDIR=/tmp/.ccache-temp
-    - CCACHE_COMPRESS=1
-    - BASE_OUTDIR=$TRAVIS_BUILD_DIR/out
-    - SDK_URL=https://bitcoincore.org/depends-sources/sdks
-    - PYTHON_DEBUG=1
-    - WINEDEBUG=fixme-all
     - DOCKER_BUILD=false
 
   matrix:
-# ARM
-    - HOST=arm-linux-gnueabihf PPA="ppa:bitcoin/bitcoin" PACKAGES="g++-arm-linux-gnueabihf" DEP_OPTS="NO_QT=1" CHECK_DOC=1 GOAL="install" BITCOIN_CONFIG="--enable-glibc-back-compat --enable-reduce-exports"
-# Win32
-    - HOST=i686-w64-mingw32 DPKG_ADD_ARCH="i386" DEP_OPTS="NO_QT=1" PPA="ppa:bitcoin/bitcoin" PACKAGES="python3 nsis g++-mingw-w64-i686 wine1.7 bc" RUN_TESTS=true GOAL="install" BITCOIN_CONFIG="--enable-gui --enable-reduce-exports" MAKEJOBS="-j4"
-# 32-bit + dash
-    - HOST=i686-pc-linux-gnu PPA="ppa:bitcoin/bitcoin" PACKAGES="g++-multilib bc python3-zmq" DEP_OPTS="NO_QT=1" RUN_TESTS=true GOAL="install" BITCOIN_CONFIG="--enable-zmq --enable-glibc-back-compat --enable-reduce-exports LDFLAGS=-static-libstdc++" USE_SHELL="/bin/dash" PYZMQ=true
-# Win64
-    - HOST=x86_64-w64-mingw32 DPKG_ADD_ARCH="i386" DEP_OPTS="NO_QT=1" PPA="ppa:bitcoin/bitcoin" PACKAGES="python3 nsis g++-mingw-w64-x86-64 wine1.7 bc" RUN_TESTS=true GOAL="install" BITCOIN_CONFIG="--enable-gui --enable-reduce-exports" MAKEJOBS="-j4"
-# dashd
-    - HOST=x86_64-unknown-linux-gnu PPA="ppa:bitcoin/bitcoin" PACKAGES="bc python3-zmq" DEP_OPTS="NO_QT=1 NO_UPNP=1 DEBUG=1" RUN_TESTS=true GOAL="install" BITCOIN_CONFIG="--enable-zmq --enable-glibc-back-compat --enable-reduce-exports" CPPFLAGS="-DDEBUG_LOCKORDER -DENABLE_DASH_DEBUG" PYZMQ=true
-# No wallet
-    - HOST=x86_64-unknown-linux-gnu PPA="ppa:bitcoin/bitcoin" PACKAGES="python3" DEP_OPTS="NO_WALLET=1" RUN_TESTS=true GOAL="install" BITCOIN_CONFIG="--enable-glibc-back-compat --enable-reduce-exports"
-# Cross-Mac
-    - HOST=x86_64-apple-darwin11 PPA="ppa:bitcoin/bitcoin" PACKAGES="cmake imagemagick libcap-dev librsvg2-bin libz-dev libbz2-dev libtiff-tools python3-dev" BITCOIN_CONFIG="--enable-gui --enable-reduce-exports" OSX_SDK=10.11 GOAL="deploy"
-# dashd release build (for docker)
-    - HOST=x86_64-unknown-linux-gnu PPA="ppa:bitcoin/bitcoin" PACKAGES="bc python3-zmq" DEP_OPTS="NO_QT=1 NO_UPNP=1" GOAL="install" BITCOIN_CONFIG="--enable-zmq --enable-glibc-back-compat --enable-reduce-exports" PYZMQ=true DOCKER_BUILD=true
+    - BUILD_TARGET=arm-linux
+    - BUILD_TARGET=win32
+    - BUILD_TARGET=win64
+    - BUILD_TARGET=linux32
+    - BUILD_TARGET=linux64
+    - BUILD_TARGET=linux64_nowallet
+    - BUILD_TARGET=linux64_release DOCKER_BUILD=true
+    - BUILD_TARGET=mac
+
+before_cache:
+  # Save builder image
+  - docker save dash-builder-$BUILD_TARGET-$TRAVIS_JOB_NUMBER $(docker history -q dash-builder-$BUILD_TARGET-$TRAVIS_JOB_NUMBER | grep -v \<missing\>) | gzip -2 > $HOME/cache/docker/dash-builder-$BUILD_TARGET.tar.gz
 
-before_install:
-    - git clone https://github.com/dashpay/dash_hash
-    - travis_retry sudo apt-get install python3-pip python3-dev
-    - travis_retry sudo add-apt-repository ppa:ubuntu-wine/ppa -y
-    - export PATH=$(echo $PATH | tr ':' "\n" | sed '/\/opt\/python/d' | tr "\n" ":" | sed "s|::|:|g")
 install:
-    - if [ "$PYZMQ" = "true" ]; then pip3 install pyzmq --user ; fi
-    - if [ -n "$PPA" ]; then travis_retry sudo add-apt-repository "$PPA" -y; fi
-    - if [ -n "$DPKG_ADD_ARCH" ]; then sudo dpkg --add-architecture "$DPKG_ADD_ARCH" ; fi
-    - if [ -n "$PACKAGES" ]; then travis_retry sudo apt-get update; fi
-    - if [ -n "$PACKAGES" ]; then travis_retry sudo apt-get install --no-install-recommends --no-upgrade -qq $PACKAGES; fi
-    - cd dash_hash && python3 setup.py install --user && cd ..
+    # Our scripts try to be Travis agnostic
+    - export PULL_REQUEST="$TRAVIS_PULL_REQUEST"
+    - export JOB_NUMBER="$TRAVIS_JOB_NUMBER"
+    - export HOST_SRC_DIR=$TRAVIS_BUILD_DIR
+    - export HOST_CACHE_DIR=$HOME/cache
+    - source ./ci/matrix.sh
+    - mkdir -p $HOST_CACHE_DIR/docker && mkdir -p $HOST_CACHE_DIR/ccache && mkdir -p $HOST_CACHE_DIR/depends && mkdir -p $HOST_CACHE_DIR/sdk-sources
+    # Keep this as it makes caching related debugging easier
+    - ls -lah $HOST_CACHE_DIR && ls -lah $HOST_CACHE_DIR/depends && ls -lah $HOST_CACHE_DIR/ccache && ls -lah $HOST_CACHE_DIR/docker
+    # Load cached builder image
+    - if [ -f $HOST_CACHE_DIR/docker/dash-builder-$BUILD_TARGET.tar.gz ]; then zcat $HOST_CACHE_DIR/docker/dash-builder-$BUILD_TARGET.tar.gz | docker load || true; fi
+    - docker build --pull -t $BUILDER_IMAGE_NAME --build-arg=USER_ID=$UID --build-arg=GROUP_ID=$UID --build-arg=BUILD_TARGET=$BUILD_TARGET -f ci/Dockerfile.builder ci
 before_script:
-    - unset CC; unset CXX
-    - unset DISPLAY
     # Make sure stdout is in blocking mode. Otherwise builds will fail due to large writes to stdout
     # See https://github.com/travis-ci/travis-ci/issues/4704. If this gets fixed, this line can also be removed.
     - python3 -c 'import os,sys,fcntl; flags = fcntl.fcntl(sys.stdout, fcntl.F_GETFL); fcntl.fcntl(sys.stdout, fcntl.F_SETFL, flags&~os.O_NONBLOCK);'
-    #- if [ "$CHECK_DOC" = 1 ]; then contrib/devtools/check-doc.py; fi TODO reenable after all Bitcoin PRs have been merged and docs fully fixed
-    - mkdir -p depends/SDKs depends/sdk-sources
-    - if [ -n "$OSX_SDK" -a ! -f depends/sdk-sources/MacOSX${OSX_SDK}.sdk.tar.gz ]; then curl --location --fail $SDK_URL/MacOSX${OSX_SDK}.sdk.tar.gz -o depends/sdk-sources/MacOSX${OSX_SDK}.sdk.tar.gz; fi
-    - if [ -n "$OSX_SDK" -a -f depends/sdk-sources/MacOSX${OSX_SDK}.sdk.tar.gz ]; then tar -C depends/SDKs -xf depends/sdk-sources/MacOSX${OSX_SDK}.sdk.tar.gz; fi
-    - make $MAKEJOBS -C depends HOST=$HOST $DEP_OPTS
 script:
     - export TRAVIS_COMMIT_LOG=`git log --format=fuller -1`
-    - if [ -n "$USE_SHELL" ]; then export CONFIG_SHELL="$USE_SHELL"; fi
-    - OUTDIR=$BASE_OUTDIR/$TRAVIS_PULL_REQUEST/$TRAVIS_JOB_NUMBER-$HOST
-    - BITCOIN_CONFIG_ALL="--disable-dependency-tracking --prefix=$TRAVIS_BUILD_DIR/depends/$HOST --bindir=$OUTDIR/bin --libdir=$OUTDIR/lib"
-    - depends/$HOST/native/bin/ccache --max-size=$CCACHE_SIZE
-    - test -n "$USE_SHELL" && eval '"$USE_SHELL" -c "./autogen.sh"' || ./autogen.sh
-    - mkdir build && cd build
-    - ../configure --cache-file=config.cache $BITCOIN_CONFIG_ALL $BITCOIN_CONFIG || ( cat config.log && false)
-    - make distdir VERSION=$HOST
-    - cd dashcore-$HOST
-    - ./configure --cache-file=../config.cache $BITCOIN_CONFIG_ALL $BITCOIN_CONFIG || ( cat config.log && false)
-    - make $MAKEJOBS $GOAL || ( echo "Build failure. Verbose build follows." && make $GOAL V=1 ; false )
-    - export LD_LIBRARY_PATH=$TRAVIS_BUILD_DIR/depends/$HOST/lib
-    - if [ "$RUN_TESTS" = "true" ]; then travis_wait 30 make $MAKEJOBS check VERBOSE=1; fi
-    - if [ "$RUN_TESTS" = "true" ]; then qa/pull-tester/rpc-tests.py --coverage; fi
-    - cd ../..
-    - if [ "$DOCKER_BUILD" = "true" ]; then BUILD_DIR=build/dashcore-$HOST ./docker/build-docker.sh; fi
+    # Our scripts try to be Travis agnostic
+    - $DOCKER_RUN_IN_BUILDER ./ci/build_depends.sh;
+    # Skip Dash Core build if depends build take more than 20 mins.
+    - if [ $SECONDS -lt 1200 ]; then $DOCKER_RUN_IN_BUILDER ./ci/build_src.sh && export SRC_BUILT="true"; fi
+    - |
+      if [ "$SRC_BUILT" = "true" ]; then
+        travis_wait 30 $DOCKER_RUN_IN_BUILDER ./ci/test_unittests.sh;
+        $DOCKER_RUN_IN_BUILDER ./ci/test_integrationtests.sh;
+        if [ "$DOCKER_BUILD" = "true" ]; then BUILD_DIR=build-ci/dashcore-$BUILD_TARGET ./docker/build-docker.sh; fi;
+      else
+        # Let the build fail immediately. Caches are still uploaded even after failure. The next Travis run should then
+        # use the caches and thus be much faster, causing the build to succeed
+        false
+      fi;
 after_script:
     - echo $TRAVIS_COMMIT_RANGE
     - echo $TRAVIS_COMMIT_LOG
diff --git a/Jenkinsfile b/Jenkinsfile
new file mode 100644
index 000000000000..3df07ed035ca
--- /dev/null
+++ b/Jenkinsfile
@@ -0,0 +1,93 @@
+// This Jenkinsfile will build a builder image and then run the actual build and tests inside this image
+// It's very important to not execute any scripts outside of the builder container, as it's our protection against
+// external developers bringing in harmful code into Jenkins.
+// Jenkins will only run the build if this Jenkinsfile was not modified in an external pull request. Only branches
+// which are part of the Dash repo will allow modification to the Jenkinsfile.
+
+def targets = [
+  'win32',
+  'win64',
+  'linux32',
+  'linux64',
+  'linux64_nowallet',
+  'linux64_release',
+  'mac',
+]
+
+def tasks = [:]
+for(int i = 0; i < targets.size(); i++) {
+  def target = targets[i]
+
+  tasks["${target}"] = {
+    node {
+      def BUILD_NUMBER = sh(returnStdout: true, script: 'echo $BUILD_NUMBER').trim()
+      def BRANCH_NAME = sh(returnStdout: true, script: 'echo $BRANCH_NAME').trim()
+      def UID = sh(returnStdout: true, script: 'id -u').trim()
+      def HOME = sh(returnStdout: true, script: 'echo $HOME').trim()
+      def pwd = sh(returnStdout: true, script: 'pwd').trim()
+
+      checkout scm
+
+      // restore cache
+      try {
+        copyArtifacts(projectName: "dashpay-dash/${BRANCH_NAME}", optional: true, selector: lastSuccessful(), filter: "ci-cache-${target}.tar.gz")
+      } catch (Exception e) {
+      }
+      if (fileExists("ci-cache-${target}.tar.gz")) {
+        hasCache = true
+        echo "Using cache from dashpay-dash/${BRANCH_NAME}"
+      } else {
+        try {
+          copyArtifacts(projectName: 'dashpay-dash/develop', optional: true, selector: lastSuccessful(), filter: "ci-cache-${target}.tar.gz");
+        } catch (Exception e) {
+        }
+        if (fileExists("ci-cache-${target}.tar.gz")) {
+          hasCache = true
+          echo "Using cache from dashpay-dash/develop"
+        }
+      }
+
+      def env = [
+        "BUILD_TARGET=${target}",
+        "PULL_REQUEST=false",
+        "JOB_NUMBER=${BUILD_NUMBER}",
+      ]
+      withEnv(env) {
+        def builderImageName="dash-builder-${target}"
+
+        def builderImage
+        stage("${target}/builder-image") {
+          builderImage = docker.build("${builderImageName}", "--build-arg BUILD_TARGET=${target} ci -f ci/Dockerfile.builder")
+        }
+
+        if (hasCache) {
+          sh "cd ${pwd} && tar xzfv ci-cache-${target}.tar.gz"
+        } else {
+          sh "mkdir -p ${pwd}/ci-cache-${target}"
+        }
+
+        builderImage.inside("-t") {
+          stage("${target}/depends") {
+            sh './ci/build_depends.sh'
+          }
+          stage("${target}/build") {
+            sh './ci/build_src.sh'
+          }
+          stage("${target}/test") {
+            sh './ci/test_unittests.sh'
+          }
+          stage("${target}/test") {
+            sh './ci/test_integrationtests.sh'
+          }
+        }
+
+        // archive cache
+        sh "tar czfv ci-cache-${target}.tar.gz ci-cache-${target}"
+        archiveArtifacts artifacts: "ci-cache-${target}.tar.gz", fingerprint: true
+      }
+    }
+  }
+}
+
+parallel tasks
+
diff --git a/Jenkinsfile.gitian b/Jenkinsfile.gitian
new file mode 100644
index 000000000000..f7a0c212eab5
--- /dev/null
+++ b/Jenkinsfile.gitian
@@ -0,0 +1,123 @@
+def targets = [
+  'linux',
+  'win',
+  'osx',
+]
+
+def osslTarUrl = 'http://downloads.sourceforge.net/project/osslsigncode/osslsigncode/osslsigncode-1.7.1.tar.gz'
+def osslPatchUrl = 'https://bitcoincore.org/cfields/osslsigncode-Backports-to-1.7.1.patch'
+def SDK_URL='https://bitcoincore.org/depends-sources/sdks'
+def OSX_SDK='10.11'
+def proc = 4
+def mem = 2000
+
+def repositoryUrl = "https://github.com/dashpay/dash.git"
+def commit = "develop"
+
+def tasks = [:]
+for(int i = 0; i < targets.size(); i++) {
+  def target = targets[i]
+
+  tasks["${target}"] = {
+    node {
+      deleteDir() // cleanup workspace
+
+      def pwd = sh(returnStdout: true, script: 'pwd').trim()
+      def dockerGid = sh(returnStdout: true, script: "stat -c '%g' /var/run/docker.sock").trim()
+      def BRANCH_NAME = sh(returnStdout: true, script: 'echo $BRANCH_NAME').trim()
+      def hasCache = false
+
+      def gitianDescriptor
+
+      stage("${target}/prepare") {
+        dir('dash') {
+          checkout scm
+          gitianDescriptor = readYaml file: "contrib/gitian-descriptors/gitian-${target}.yml"
+        }
+        dir('gitian-builder') {
+          git url: 'https://github.com/dashpay/gitian-builder.git'
+        }
+        sh "mkdir -p dashcore-binaries"
+        if (target == "osx") {
+          dir('gitian-builder') {
+            sh 'mkdir -p inputs'
+            sh "curl --location --fail $SDK_URL/MacOSX${OSX_SDK}.sdk.tar.gz -o inputs/MacOSX${OSX_SDK}.sdk.tar.gz"
+          }
+        }
+
+        // restore cache
+        try {
+          copyArtifacts(projectName: "dashpay-dash-gitian-nightly/${BRANCH_NAME}", optional: true, selector: lastSuccessful(), filter: "cache-${gitianDescriptor.name}.tar.gz")
+        } catch (Exception e) {
+        }
+        if (fileExists("cache-${gitianDescriptor.name}.tar.gz")) {
+          hasCache = true
+          echo "Using cache from dashpay-dash-gitian-nightly/${BRANCH_NAME}"
+        } else {
+          try {
+            copyArtifacts(projectName: 'dashpay-dash-gitian-nightly/develop', optional: true, selector: lastSuccessful(), filter: "cache-${gitianDescriptor.name}.tar.gz");
+          } catch (Exception e) {
+          }
+          if (fileExists("cache-${gitianDescriptor.name}.tar.gz")) {
+            hasCache = true
+            echo "Using cache from dashpay-dash-gitian-nightly/develop"
+          }
+        }
+      }
+
+      def gitianImage
+      stage("${target}/builder-image") {
+        dir('dash') {
+          gitianImage = docker.build("dash-gitian:${env.BUILD_ID}", 'ci -f ci/Dockerfile.gitian-builder')
+        }
+      }
+
+      gitianImage.inside("--group-add ${dockerGid} -t -v \"/var/run/docker.sock:/var/run/docker.sock\"") {
+        sh "mkdir -p gitian-builder/cache"
+        if (hasCache) {
+          sh "cd gitian-builder/cache && tar xzfv ../../cache-${gitianDescriptor.name}.tar.gz"
+        }
+
+        stage("${target}/download") {
+          dir('gitian-builder') {
+            sh "mkdir -p inputs"
+            sh "cd inputs && curl -R -O ${osslPatchUrl}"
+            sh "cd inputs && curl -R -O ${osslTarUrl}"
+            sh "make -C ../dash/depends download SOURCES_PATH=`pwd`/cache/common"
+          }
+        }
+        stage("${target}/base-vm") {
+          dir('gitian-builder') {
+            sh "./bin/make-base-vm --suite trusty --arch amd64 --docker"
+          }
+        }
+
+        stage("${target}/gbuild") {
+          dir('gitian-builder') {
+            // make sure an old version is not running
+            sh "docker rm -fv gitian-target || true"
+
+            try {
+              sh """
+                tail -F var/install.log &
+                tail -F var/build.log &
+                USE_DOCKER=1 ./bin/gbuild -j ${proc} -m ${mem} --commit dash=${commit} --url dash=${repositoryUrl} ../dash/contrib/gitian-descriptors/gitian-${target}.yml
+              """
+            } finally {
+              // make sure it doesn't run forever
+              sh "docker rm -fv gitian-target || true"
+            }
+            sh "mv build/out/dashcore-* ../dashcore-binaries/"
+            sh "mv build/out/src/dashcore-* ../dashcore-binaries/"
+          }
+          archiveArtifacts artifacts: 'dashcore-binaries/*', fingerprint: true
+        }
+
+        sh "cd gitian-builder/cache && tar czfv ../../cache-${gitianDescriptor.name}.tar.gz common ${gitianDescriptor.name}"
+        archiveArtifacts artifacts: "cache-${gitianDescriptor.name}.tar.gz", fingerprint: true
+      }
+    }
+  }
+}
+
+parallel tasks
diff --git a/ci/Dockerfile.builder b/ci/Dockerfile.builder
new file mode 100644
index 000000000000..66d28227184c
--- /dev/null
+++ b/ci/Dockerfile.builder
@@ -0,0 +1,58 @@
+FROM ubuntu:bionic
+
+# Build and base stuff
+# (zlib1g-dev and libssl-dev are needed for the Qt host binary builds, but should not be used by target binaries)
+RUN apt-get update && apt-get install -y \
+  git \
+  g++ \
+  autotools-dev libtool m4 automake autoconf pkg-config \
+  zlib1g-dev \
+  libssl1.0-dev \
+  curl \
+  ccache \
+  bsdmainutils \
+  python3-pip python3-dev \
+  && rm -rf /var/lib/apt/lists
+
+# Python stuff
+RUN pip3 install pyzmq # really needed?
+
+# dash_hash
+RUN git clone https://github.com/dashpay/dash_hash
+RUN cd dash_hash && python3 setup.py install
+
+ARG USER_ID=1000
+ARG GROUP_ID=1000
+
+# add user with specified (or default) user/group ids
+ENV USER_ID ${USER_ID}
+ENV GROUP_ID ${GROUP_ID}
+RUN groupadd -g ${GROUP_ID} dash
+RUN useradd -u ${USER_ID} -g dash -s /bin/bash -m -d /dash dash
+
+# Extra packages
+ARG BUILD_TARGET=linux64
+ADD matrix.sh /tmp/matrix.sh
+RUN . /tmp/matrix.sh && \
+  if [ -n "$DPKG_ADD_ARCH" ]; then dpkg --add-architecture "$DPKG_ADD_ARCH" ; fi && \
+  if [ -n "$PACKAGES" ]; then apt-get update && apt-get install -y --no-install-recommends --no-upgrade $PACKAGES && rm -rf /var/lib/apt/lists; fi
+
+# Make sure std::thread and friends is available
+# Will fail on non-win builds, but we ignore this
+RUN \
+  update-alternatives --set i686-w64-mingw32-gcc /usr/bin/i686-w64-mingw32-gcc-posix; \
+  update-alternatives --set i686-w64-mingw32-g++  /usr/bin/i686-w64-mingw32-g++-posix; \
+  update-alternatives --set x86_64-w64-mingw32-gcc  /usr/bin/x86_64-w64-mingw32-gcc-posix; \
+  update-alternatives --set x86_64-w64-mingw32-g++  /usr/bin/x86_64-w64-mingw32-g++-posix; \
+  exit 0
+
+RUN mkdir /dash-src && \
+  mkdir -p /cache/ccache && \
+  mkdir /cache/depends && \
+  mkdir /cache/sdk-sources && \
+  chown $USER_ID:$GROUP_ID /dash-src && \
+  chown $USER_ID:$GROUP_ID /cache && \
+  chown $USER_ID:$GROUP_ID /cache -R
+WORKDIR /dash-src
+
+USER dash
diff --git a/ci/Dockerfile.gitian-builder b/ci/Dockerfile.gitian-builder
new file mode 100644
index 000000000000..79bd2a381b45
--- /dev/null
+++ b/ci/Dockerfile.gitian-builder
@@ -0,0 +1,17 @@
+FROM ubuntu:bionic
+
+RUN apt-get update && apt-get install -y \
+  ruby curl make libltdl7 git apache2 apt-cacher-ng python-vm-builder ruby qemu-utils \
+  && rm -rf /var/lib/apt/lists
+
+ARG USER_ID=1000
+ARG GROUP_ID=1000
+
+# add user with specified (or default) user/group ids
+ENV USER_ID ${USER_ID}
+ENV GROUP_ID ${GROUP_ID}
+RUN groupadd -g ${GROUP_ID} dash
+RUN useradd -u ${USER_ID} -g dash -s /bin/bash -m -d /dash dash
+
+WORKDIR /dash
+USER dash
\ No newline at end of file
diff --git a/ci/build_depends.sh b/ci/build_depends.sh
new file mode 100755
index 000000000000..d4e7cd0e59ca
--- /dev/null
+++ b/ci/build_depends.sh
@@ -0,0 +1,29 @@
+#!/usr/bin/env bash
+
+# This script is executed inside the builder image
+
+set -e
+
+source ./ci/matrix.sh
+
+unset CC; unset CXX
+unset DISPLAY
+
+mkdir -p $CACHE_DIR/depends
+mkdir -p $CACHE_DIR/sdk-sources
+
+ln -s $CACHE_DIR/depends depends/built
+ln -s $CACHE_DIR/sdk-sources depends/sdk-sources
+
+mkdir -p depends/SDKs
+
+if [ -n "$OSX_SDK" ]; then
+  if [ ! -f depends/sdk-sources/MacOSX${OSX_SDK}.sdk.tar.gz ]; then
+    curl --location --fail $SDK_URL/MacOSX${OSX_SDK}.sdk.tar.gz -o depends/sdk-sources/MacOSX${OSX_SDK}.sdk.tar.gz
+  fi
+  if [ -f depends/sdk-sources/MacOSX${OSX_SDK}.sdk.tar.gz ]; then
+    tar -C depends/SDKs -xf depends/sdk-sources/MacOSX${OSX_SDK}.sdk.tar.gz
+  fi
+fi
+
+make $MAKEJOBS -C depends HOST=$HOST $DEP_OPTS
diff --git a/ci/build_src.sh b/ci/build_src.sh
new file mode 100755
index 000000000000..2a659e7efc8a
--- /dev/null
+++ b/ci/build_src.sh
@@ -0,0 +1,37 @@
+#!/usr/bin/env bash
+
+# This script is executed inside the builder image
+
+set -e
+
+source ./ci/matrix.sh
+
+unset CC; unset CXX
+unset DISPLAY
+
+export CCACHE_COMPRESS=${CCACHE_COMPRESS:-1}
+export CCACHE_SIZE=${CCACHE_SIZE:-400M}
+
+#if [ "$CHECK_DOC" = 1 ]; then contrib/devtools/check-doc.py; fi TODO reenable after all Bitcoin PRs have been merged and docs fully fixed
+
+depends/$HOST/native/bin/ccache --max-size=$CCACHE_SIZE
+
+if [ -n "$USE_SHELL" ]; then
+  export CONFIG_SHELL="$USE_SHELL"
+fi
+
+BITCOIN_CONFIG_ALL="--disable-dependency-tracking --prefix=$BUILD_DIR/depends/$HOST --bindir=$OUT_DIR/bin --libdir=$OUT_DIR/lib"
+
+test -n "$USE_SHELL" && eval '"$USE_SHELL" -c "./autogen.sh"' || ./autogen.sh
+
+rm -rf build-ci
+mkdir build-ci
+cd build-ci
+
+../configure --cache-file=config.cache $BITCOIN_CONFIG_ALL $BITCOIN_CONFIG || ( cat config.log && false)
+make distdir VERSION=$BUILD_TARGET
+
+cd dashcore-$BUILD_TARGET
+./configure --cache-file=../config.cache $BITCOIN_CONFIG_ALL $BITCOIN_CONFIG || ( cat config.log && false)
+
+make $MAKEJOBS $GOAL || ( echo "Build failure. Verbose build follows." && make $GOAL V=1 ; false )
diff --git a/ci/matrix.sh b/ci/matrix.sh
new file mode 100755
index 000000000000..15e918bc53e4
--- /dev/null
+++ b/ci/matrix.sh
@@ -0,0 +1,88 @@
+#!/usr/bin/env bash
+
+# This script is meant to be sourced into the actual build script. It contains the build matrix and will set all
+# necessary environment variables for the request build target
+
+export BUILD_TARGET=${BUILD_TARGET:-linux64}
+export PULL_REQUEST=${PULL_REQUEST:-false}
+export JOB_NUMBER=${JOB_NUMBER:-1}
+
+export BUILDER_IMAGE_NAME="dash-builder-$BUILD_TARGET-$JOB_NUMBER"
+
+export HOST_SRC_DIR=${HOST_SRC_DIR:-$(pwd)}
+export HOST_CACHE_DIR=${HOST_CACHE_DIR:-$(pwd)/ci-cache-$BUILD_TARGET}
+
+export SRC_DIR=${SRC_DIR:-$HOST_SRC_DIR}
+export BUILD_DIR=$SRC_DIR
+export OUT_DIR=$BUILD_DIR/out
+
+export CACHE_DIR=${CACHE_DIR:-$HOST_CACHE_DIR}
+export CCACHE_DIR=$CACHE_DIR/ccache
+
+export DOCKER_RUN_VOLUME_ARGS="-v $HOST_SRC_DIR:$SRC_DIR -v $HOST_CACHE_DIR:$CACHE_DIR"
+export DOCKER_RUN_ENV_ARGS="-e SRC_DIR=$SRC_DIR -e CACHE_DIR=$CACHE_DIR -e PULL_REQUEST=$PULL_REQUEST -e JOB_NUMBER=$JOB_NUMBER -e BUILD_TARGET=$BUILD_TARGET"
+export DOCKER_RUN_ARGS="$DOCKER_RUN_VOLUME_ARGS $DOCKER_RUN_ENV_ARGS"
+export DOCKER_RUN_IN_BUILDER="docker run -t --rm -w $SRC_DIR $DOCKER_RUN_ARGS $BUILDER_IMAGE_NAME"
+
+# Default values for targets
+export GOAL="install"
+export SDK_URL=${SDK_URL:-https://bitcoincore.org/depends-sources/sdks}
+export PYTHON_DEBUG=1
+export MAKEJOBS="-j4"
+
+if [ "$BUILD_TARGET" = "arm-linux" ]; then
+  export HOST=arm-linux-gnueabihf
+  export PACKAGES="g++-arm-linux-gnueabihf"
+  export DEP_OPTS="NO_QT=1"
+  export CHECK_DOC=1
+  export BITCOIN_CONFIG="--enable-glibc-back-compat --enable-reduce-exports"
+elif [ "$BUILD_TARGET" = "win32" ]; then
+  export HOST=i686-w64-mingw32
+  export DPKG_ADD_ARCH="i386"
+  export DEP_OPTS="NO_QT=1"
+  export PACKAGES="python3 nsis g++-mingw-w64-i686 wine-stable wine32 bc"
+  export BITCOIN_CONFIG="--enable-gui --enable-reduce-exports"
+  export DIRECT_WINE_EXEC_TESTS=true
+  export RUN_TESTS=true
+elif [ "$BUILD_TARGET" = "win64" ]; then
+  export HOST=x86_64-w64-mingw32
+  export DPKG_ADD_ARCH="i386"
+  export DEP_OPTS="NO_QT=1"
+  export PACKAGES="python3 nsis g++-mingw-w64-x86-64 wine-stable wine64 bc"
+  export BITCOIN_CONFIG="--enable-gui --enable-reduce-exports"
+  export DIRECT_WINE_EXEC_TESTS=true
+  export RUN_TESTS=true
+elif [ "$BUILD_TARGET" = "linux32" ]; then
+  export HOST=i686-pc-linux-gnu
+  export PACKAGES="g++-multilib bc python3-zmq"
+  export DEP_OPTS="NO_QT=1"
+  export BITCOIN_CONFIG="--enable-zmq --enable-glibc-back-compat --enable-reduce-exports LDFLAGS=-static-libstdc++"
+  export USE_SHELL="/bin/dash"
+  export PYZMQ=true
+  export RUN_TESTS=true
+elif [ "$BUILD_TARGET" = "linux64" ]; then
+  export HOST=x86_64-unknown-linux-gnu
+  export PACKAGES="bc python3-zmq"
+  export DEP_OPTS="NO_QT=1 NO_UPNP=1 DEBUG=1"
+  export BITCOIN_CONFIG="--enable-zmq --enable-glibc-back-compat --enable-reduce-exports"
+  export CPPFLAGS="-DDEBUG_LOCKORDER -DENABLE_DASH_DEBUG"
+  export PYZMQ=true
+  export RUN_TESTS=true
+elif [ "$BUILD_TARGET" = "linux64_nowallet" ]; then
+  export HOST=x86_64-unknown-linux-gnu
+  export PACKAGES="python3"
+  export DEP_OPTS="NO_WALLET=1"
+  export BITCOIN_CONFIG="--enable-glibc-back-compat --enable-reduce-exports"
+elif [ "$BUILD_TARGET" = "linux64_release" ]; then
+  export HOST=x86_64-unknown-linux-gnu
+  export PACKAGES="bc python3-zmq"
+  export DEP_OPTS="NO_QT=1 NO_UPNP=1"
+  export BITCOIN_CONFIG="--enable-zmq --enable-glibc-back-compat --enable-reduce-exports"
+  export PYZMQ=true
+elif [ "$BUILD_TARGET" = "mac" ]; then
+  export HOST=x86_64-apple-darwin11
+  export PACKAGES="cmake imagemagick libcap-dev librsvg2-bin libz-dev libbz2-dev libtiff-tools"
+  export BITCOIN_CONFIG="--enable-gui --enable-reduce-exports"
+  export OSX_SDK=10.11
+  export GOAL="deploy"
+fi
diff --git a/ci/test_integrationtests.sh b/ci/test_integrationtests.sh
new file mode 100755
index 000000000000..2223a98c89d0
--- /dev/null
+++ b/ci/test_integrationtests.sh
@@ -0,0 +1,18 @@
+#!/usr/bin/env bash
+
+# This script is executed inside the builder image
+
+set -e
+
+source ./ci/matrix.sh
+
+if [ "$RUN_TESTS" != "true" ]; then
+  echo "Skipping integration tests"
+  exit 0
+fi
+
+export LD_LIBRARY_PATH=$BUILD_DIR/depends/$HOST/lib
+
+cd build-ci/dashcore-$BUILD_TARGET
+
+./qa/pull-tester/rpc-tests.py --coverage
diff --git a/ci/test_unittests.sh b/ci/test_unittests.sh
new file mode 100755
index 000000000000..f5af7e39637e
--- /dev/null
+++ b/ci/test_unittests.sh
@@ -0,0 +1,27 @@
+#!/usr/bin/env bash
+
+# This script is executed inside the builder image
+
+set -e
+
+source ./ci/matrix.sh
+
+if [ "$RUN_TESTS" != "true" ]; then
+  echo "Skipping unit tests"
+  exit 0
+fi
+
+# TODO this is not Travis agnostic
+export BOOST_TEST_RANDOM=1$TRAVIS_BUILD_ID
+export LD_LIBRARY_PATH=$BUILD_DIR/depends/$HOST/lib
+
+export WINEDEBUG=fixme-all
+export BOOST_TEST_LOG_LEVEL=test_suite
+
+cd build-ci/dashcore-$BUILD_TARGET
+if [ "$DIRECT_WINE_EXEC_TESTS" = "true" ]; then
+  # Inside Docker, binfmt isn't working so we can't trust in make invoking windows binaries correctly
+  wine ./src/test/test_dash.exe
+else
+  make $MAKEJOBS check VERBOSE=1
+fi
diff --git a/contrib/gitian-build.sh b/contrib/gitian-build.sh
index 15392c17778f..b0d9b5ca485e 100755
--- a/contrib/gitian-build.sh
+++ b/contrib/gitian-build.sh
@@ -28,6 +28,9 @@ scriptName=$(basename -- "$0")
 signProg="gpg --detach-sign"
 commitFiles=true
 
+SDK_URL=${SDK_URL:-https://bitcoincore.org/depends-sources/sdks}
+OSX_SDK=${OSX_SDK:-10.11}
+
 # Help Message
 read -d '' usage <<- EOF
 Usage: $scriptName [-c|u|v|b|s|B|o|h|j|m|] signer version
@@ -316,6 +319,13 @@ then
 	    echo ""
 	    echo "Compiling ${VERSION} Mac OSX"
 	    echo ""
+
+	    if [ -n "$OSX_SDK" ]; then
+	        if [ ! -f inputs/MacOSX${OSX_SDK}.sdk.tar.gz ]; then
+	            curl --location --fail $SDK_URL/MacOSX${OSX_SDK}.sdk.tar.gz -o inputs/MacOSX${OSX_SDK}.sdk.tar.gz
+	        fi
+	    fi
+
 	    ./bin/gbuild -j ${proc} -m ${mem} --commit dash=${COMMIT} --url dash=${url} ../dash/contrib/gitian-descriptors/gitian-osx.yml
 	    ./bin/gsign -p "$signProg" --signer "$SIGNER" --release ${VERSION}-osx-unsigned --destination ../gitian.sigs/ ../dash/contrib/gitian-descriptors/gitian-osx.yml
 	    mv build/out/dashcore-*-osx-unsigned.tar.gz inputs/dashcore-osx-unsigned.tar.gz
diff --git a/depends/hosts/linux.mk b/depends/hosts/linux.mk
index b13a0f1ad714..602206d63421 100644
--- a/depends/hosts/linux.mk
+++ b/depends/hosts/linux.mk
@@ -1,5 +1,5 @@
 linux_CFLAGS=-pipe
-linux_CXXFLAGS=$(linux_CFLAGS)
+linux_CXXFLAGS=$(linux_CFLAGS) -static-libstdc++
 
 linux_release_CFLAGS=-O2
 linux_release_CXXFLAGS=$(linux_release_CFLAGS)
diff --git a/depends/hosts/mingw32.mk b/depends/hosts/mingw32.mk
index dbfb62fdcf98..83fc501a1990 100644
--- a/depends/hosts/mingw32.mk
+++ b/depends/hosts/mingw32.mk
@@ -1,5 +1,5 @@
 mingw32_CFLAGS=-pipe
-mingw32_CXXFLAGS=$(mingw32_CFLAGS)
+mingw32_CXXFLAGS=$(mingw32_CFLAGS) -static-libstdc++
 
 mingw32_release_CFLAGS=-O2
 mingw32_release_CXXFLAGS=$(mingw32_release_CFLAGS)
diff --git a/depends/packages/native_biplist.mk b/depends/packages/native_biplist.mk
index 3c6e8900f664..373490aedcaa 100644
--- a/depends/packages/native_biplist.mk
+++ b/depends/packages/native_biplist.mk
@@ -11,10 +11,10 @@ define $(package)_preprocess_cmds
 endef
 
 define $(package)_build_cmds
-    python setup.py build
+    python3 setup.py build
 endef
 
 define $(package)_stage_cmds
     mkdir -p $($(package)_install_libdir) && \
-    python setup.py install --root=$($(package)_staging_dir) --prefix=$(build_prefix) --install-lib=$($(package)_install_libdir)
+    python3 setup.py install --root=$($(package)_staging_dir) --prefix=$(build_prefix) --install-lib=$($(package)_install_libdir)
 endef
diff --git a/depends/packages/native_ds_store.mk b/depends/packages/native_ds_store.mk
index 49f5829ac1c0..e2d035d480c9 100644
--- a/depends/packages/native_ds_store.mk
+++ b/depends/packages/native_ds_store.mk
@@ -8,10 +8,10 @@ $(package)_install_libdir=$(build_prefix)/lib/python/dist-packages
 $(package)_dependencies=native_biplist
 
 define $(package)_build_cmds
-    python setup.py build
+    python3 setup.py build
 endef
 
 define $(package)_stage_cmds
     mkdir -p $($(package)_install_libdir) && \
-    python setup.py install --root=$($(package)_staging_dir) --prefix=$(build_prefix) --install-lib=$($(package)_install_libdir)
+    python3 setup.py install --root=$($(package)_staging_dir) --prefix=$(build_prefix) --install-lib=$($(package)_install_libdir)
 endef
diff --git a/depends/packages/native_mac_alias.mk b/depends/packages/native_mac_alias.mk
index 85a8a402bf92..9982a52a335c 100644
--- a/depends/packages/native_mac_alias.mk
+++ b/depends/packages/native_mac_alias.mk
@@ -12,10 +12,10 @@ define $(package)_preprocess_cmds
 endef
 
 define $(package)_build_cmds
-    python setup.py build
+    python3 setup.py build
 endef
 
 define $(package)_stage_cmds
     mkdir -p $($(package)_install_libdir) && \
-    python setup.py install --root=$($(package)_staging_dir) --prefix=$(build_prefix) --install-lib=$($(package)_install_libdir)
+    python3 setup.py install --root=$($(package)_staging_dir) --prefix=$(build_prefix) --install-lib=$($(package)_install_libdir)
 endef
diff --git a/src/Makefile.am b/src/Makefile.am
index a54e81c1d1bf..b015c2388077 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -425,6 +425,7 @@ libdash_util_a_SOURCES = \
 
 if GLIBC_BACK_COMPAT
 libdash_util_a_SOURCES += compat/glibc_compat.cpp
+AM_LDFLAGS += -Wl,--wrap=log2f -Wl,--wrap=__divmoddi4
 endif
 
 # cli: shared between dash-cli and dash-qt
diff --git a/src/compat/glibc_compat.cpp b/src/compat/glibc_compat.cpp
index f5f61a3abfce..1df6e217fbe9 100644
--- a/src/compat/glibc_compat.cpp
+++ b/src/compat/glibc_compat.cpp
@@ -7,6 +7,7 @@
 #endif
 
 #include <cstddef>
+#include <cstdint>
 
 #if defined(HAVE_SYS_SELECT_H)
 #include <sys/select.h>
@@ -27,3 +28,47 @@ extern "C" FDELT_TYPE __fdelt_warn(FDELT_TYPE a)
     return a / __NFDBITS;
 }
 extern "C" FDELT_TYPE __fdelt_chk(FDELT_TYPE) __attribute__((weak, alias("__fdelt_warn")));
+
+#if defined(__i386__) || defined(__arm__)
+
+extern "C" int64_t __udivmoddi4(uint64_t u, uint64_t v, uint64_t* rp);
+
+extern "C" int64_t __wrap___divmoddi4(int64_t u, int64_t v, int64_t* rp)
+{
+    int32_t c1 = 0, c2 = 0;
+    int64_t uu = u, vv = v;
+    int64_t w;
+    int64_t r;
+
+    if (uu < 0) {
+        c1 = ~c1, c2 = ~c2, uu = -uu;
+    }
+    if (vv < 0) {
+        c1 = ~c1, vv = -vv;
+    }
+
+    w = __udivmoddi4(uu, vv, (uint64_t*)&r);
+    if (c1)
+        w = -w;
+    if (c2)
+        r = -r;
+
+    *rp = r;
+    return w;
+}
+#endif
+
+extern "C" float log2f_old(float x);
+#ifdef __i386__
+__asm(".symver log2f_old,log2f@GLIBC_2.1");
+#elif defined(__amd64__)
+__asm(".symver log2f_old,log2f@GLIBC_2.2.5");
+#elif defined(__arm__)
+__asm(".symver log2f_old,log2f@GLIBC_2.4");
+#elif defined(__aarch64__)
+__asm(".symver log2f_old,log2f@GLIBC_2.17");
+#endif
+extern "C" float __wrap_log2f(float x)
+{
+    return log2f_old(x);
+}

From 753c2436bd0a4b0e6a0b38a6675c054ae4b92a9a Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Thu, 12 Jul 2018 17:43:20 +0200
Subject: [PATCH 016/400] Fix MissingPropertyException on Jenkins when no cache
 was found (#2180)

---
 Jenkinsfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Jenkinsfile b/Jenkinsfile
index 3df07ed035ca..237332da361c 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -25,6 +25,7 @@ for(int i = 0; i < targets.size(); i++) {
       def UID = sh(returnStdout: true, script: 'id -u').trim()
       def HOME = sh(returnStdout: true, script: 'echo $HOME').trim()
       def pwd = sh(returnStdout: true, script: 'pwd').trim()
+      def hasCache = false
 
       checkout scm
 

From dac090964fbdd96d896f725932aada71db736abf Mon Sep 17 00:00:00 2001
From: Nathan Marley <nathan.marley@gmail.com>
Date: Fri, 13 Jul 2018 17:00:55 +0700
Subject: [PATCH 017/400] remove dashpay.io dns seed entry (#2181)

---
 src/chainparams.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/chainparams.cpp b/src/chainparams.cpp
index 23054a381a16..f98388947532 100644
--- a/src/chainparams.cpp
+++ b/src/chainparams.cpp
@@ -202,7 +202,6 @@ class CMainParams : public CChainParams {
         vSeeds.push_back(CDNSSeedData("dash.org", "dnsseed.dash.org"));
         vSeeds.push_back(CDNSSeedData("dashdot.io", "dnsseed.dashdot.io"));
         vSeeds.push_back(CDNSSeedData("masternode.io", "dnsseed.masternode.io"));
-        vSeeds.push_back(CDNSSeedData("dashpay.io", "dnsseed.dashpay.io"));
 
         // Dash addresses start with 'X'
         base58Prefixes[PUBKEY_ADDRESS] = std::vector<unsigned char>(1,76);

From 1681d6366fde20f09ddd9be77ad3f80d76da80ad Mon Sep 17 00:00:00 2001
From: UdjinM6 <UdjinM6@users.noreply.github.com>
Date: Mon, 16 Jul 2018 15:47:37 +0300
Subject: [PATCH 018/400] Replace Dash-specific threads with Dash-specific
 scheduled tasks (#2043)

* Replace Dash-specific threads with scheduled tasks

* Fix rare crash when trying to shutdown wallet during mixing

Should stop PS and release all keys _before_ wallet is destroyed.

* fix nowallet

* update doc
---
 doc/developer-notes.md     |  2 --
 src/activemasternode.h     |  2 ++
 src/init.cpp               | 30 ++++++++++++++-----
 src/instantx.h             |  2 ++
 src/masternode-payments.h  |  2 ++
 src/masternode-sync.cpp    |  2 +-
 src/masternode-sync.h      |  2 ++
 src/masternodeman.cpp      | 29 +++++++++++++++++++
 src/masternodeman.h        |  1 +
 src/netfulfilledman.h      |  2 ++
 src/privatesend-client.cpp | 34 +++++++---------------
 src/privatesend-client.h   |  4 +--
 src/privatesend-server.cpp | 25 ++++------------
 src/privatesend-server.h   |  4 +--
 src/privatesend.cpp        | 59 --------------------------------------
 src/privatesend.h          |  2 --
 16 files changed, 84 insertions(+), 118 deletions(-)

diff --git a/doc/developer-notes.md b/doc/developer-notes.md
index a021fd00a724..be67692e2a47 100644
--- a/doc/developer-notes.md
+++ b/doc/developer-notes.md
@@ -189,8 +189,6 @@ Threads
 
 - BitcoinMiner : Generates coins (if wallet is enabled).
 
-- ThreadCheckDarkSendPool : Runs masternode list and sync data update loops
-
 - Shutdown : Does an orderly shutdown of everything.
 
 Ignoring IDE/editor files
diff --git a/src/activemasternode.h b/src/activemasternode.h
index 7617b434d3de..2efd6ec5e116 100644
--- a/src/activemasternode.h
+++ b/src/activemasternode.h
@@ -76,6 +76,8 @@ class CActiveMasternode
 
     bool UpdateSentinelPing(int version);
 
+    void DoMaintenance(CConnman &connman) { ManageState(connman); }
+
 private:
     void ManageStateInitial(CConnman& connman);
     void ManageStateRemote();
diff --git a/src/init.cpp b/src/init.cpp
index 78adc74786c7..0f1d952d3d35 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -241,8 +241,13 @@ void PrepareShutdown()
     peerLogic.reset();
     g_connman.reset();
 
-    // STORE DATA CACHES INTO SERIALIZED DAT FILES
     if (!fLiteMode) {
+#ifdef ENABLE_WALLET
+        // Stop PrivateSend, release keys
+        privateSendClient.fEnablePrivateSend = false;
+        privateSendClient.ResetPool();
+#endif
+        // STORE DATA CACHES INTO SERIALIZED DAT FILES
         CFlatDB<CMasternodeMan> flatdb1("mncache.dat", "magicMasternodeCache");
         flatdb1.Dump(mnodeman);
         CFlatDB<CMasternodePayments> flatdb2("mnpayments.dat", "magicMasternodePaymentsCache");
@@ -1941,15 +1946,26 @@ bool AppInitMain(boost::thread_group& threadGroup, CScheduler& scheduler)
     // GetMainSignals().UpdatedBlockTip(chainActive.Tip());
     pdsNotificationInterface->InitializeCurrentBlockTip();
 
-    // ********************************************************* Step 11d: start dash-ps-<smth> threads
+    // ********************************************************* Step 11d: schedule Dash-specific tasks
+
+    if (!fLiteMode) {
+        scheduler.scheduleEvery(boost::bind(&CNetFulfilledRequestManager::DoMaintenance, boost::ref(netfulfilledman)), 60);
+        scheduler.scheduleEvery(boost::bind(&CMasternodeSync::DoMaintenance, boost::ref(masternodeSync), boost::ref(*g_connman)), MASTERNODE_SYNC_TICK_SECONDS);
+        scheduler.scheduleEvery(boost::bind(&CMasternodeMan::DoMaintenance, boost::ref(mnodeman), boost::ref(*g_connman)), 1);
+        scheduler.scheduleEvery(boost::bind(&CActiveMasternode::DoMaintenance, boost::ref(activeMasternode), boost::ref(*g_connman)), 1);
+
+        scheduler.scheduleEvery(boost::bind(&CMasternodePayments::DoMaintenance, boost::ref(mnpayments)), 60);
+        scheduler.scheduleEvery(boost::bind(&CGovernanceManager::DoMaintenance, boost::ref(governance), boost::ref(*g_connman)), 60 * 5);
 
-    threadGroup.create_thread(boost::bind(&ThreadCheckPrivateSend, boost::ref(*g_connman)));
-    if (fMasternodeMode)
-        threadGroup.create_thread(boost::bind(&ThreadCheckPrivateSendServer, boost::ref(*g_connman)));
+        scheduler.scheduleEvery(boost::bind(&CInstantSend::DoMaintenance, boost::ref(instantsend)), 60);
+
+        if (fMasternodeMode)
+            scheduler.scheduleEvery(boost::bind(&CPrivateSendServer::DoMaintenance, boost::ref(privateSendServer), boost::ref(*g_connman)), 1);
 #ifdef ENABLE_WALLET
-    else
-        threadGroup.create_thread(boost::bind(&ThreadCheckPrivateSendClient, boost::ref(*g_connman)));
+        else
+            scheduler.scheduleEvery(boost::bind(&CPrivateSendClient::DoMaintenance, boost::ref(privateSendClient), boost::ref(*g_connman)), 1);
 #endif // ENABLE_WALLET
+    }
 
     // ********************************************************* Step 12: start node
 
diff --git a/src/instantx.h b/src/instantx.h
index 1c95a03f9221..3448144e1626 100644
--- a/src/instantx.h
+++ b/src/instantx.h
@@ -159,6 +159,8 @@ class CInstantSend
     void SyncTransaction(const CTransaction& tx, const CBlockIndex *pindex, int posInBlock);
 
     std::string ToString() const;
+
+    void DoMaintenance() { CheckAndRemove(); }
 };
 
 /**
diff --git a/src/masternode-payments.h b/src/masternode-payments.h
index d539aad8a017..bd2c0086740d 100644
--- a/src/masternode-payments.h
+++ b/src/masternode-payments.h
@@ -232,6 +232,8 @@ class CMasternodePayments
     int GetStorageLimit() const;
 
     void UpdatedBlockTip(const CBlockIndex *pindex, CConnman& connman);
+
+    void DoMaintenance() { CheckAndRemove(); }
 };
 
 #endif
diff --git a/src/masternode-sync.cpp b/src/masternode-sync.cpp
index 589225260a90..d78bc11f2575 100644
--- a/src/masternode-sync.cpp
+++ b/src/masternode-sync.cpp
@@ -133,7 +133,7 @@ void CMasternodeSync::ProcessMessage(CNode* pfrom, const std::string& strCommand
 void CMasternodeSync::ProcessTick(CConnman& connman)
 {
     static int nTick = 0;
-    if(nTick++ % MASTERNODE_SYNC_TICK_SECONDS != 0) return;
+    nTick++;
 
     // reset the sync process if the last call to this function was more than 60 minutes ago (client was in sleep mode)
     static int64_t nTimeLastProcess = GetTime();
diff --git a/src/masternode-sync.h b/src/masternode-sync.h
index 40b13b2589c3..8a7464f05456 100644
--- a/src/masternode-sync.h
+++ b/src/masternode-sync.h
@@ -77,6 +77,8 @@ class CMasternodeSync
     void AcceptedBlockHeader(const CBlockIndex *pindexNew);
     void NotifyHeaderTip(const CBlockIndex *pindexNew, bool fInitialDownload, CConnman& connman);
     void UpdatedBlockTip(const CBlockIndex *pindexNew, bool fInitialDownload, CConnman& connman);
+
+    void DoMaintenance(CConnman &connman) { ProcessTick(connman); }
 };
 
 #endif
diff --git a/src/masternodeman.cpp b/src/masternodeman.cpp
index 89434e3155df..71f9b4e757e7 100644
--- a/src/masternodeman.cpp
+++ b/src/masternodeman.cpp
@@ -6,6 +6,7 @@
 #include "addrman.h"
 #include "alert.h"
 #include "clientversion.h"
+#include "init.h"
 #include "governance.h"
 #include "masternode-payments.h"
 #include "masternode-sync.h"
@@ -1757,3 +1758,31 @@ void CMasternodeMan::NotifyMasternodeUpdates(CConnman& connman)
     fMasternodesAdded = false;
     fMasternodesRemoved = false;
 }
+
+void CMasternodeMan::DoMaintenance(CConnman& connman)
+{
+    if(fLiteMode) return; // disable all Dash specific functionality
+
+    if(!masternodeSync.IsBlockchainSynced() || ShutdownRequested())
+        return;
+
+    static unsigned int nTick = 0;
+
+    nTick++;
+
+    // make sure to check all masternodes first
+    mnodeman.Check();
+
+    mnodeman.ProcessPendingMnbRequests(connman);
+    mnodeman.ProcessPendingMnvRequests(connman);
+
+    if(nTick % 60 == 0) {
+        mnodeman.ProcessMasternodeConnections(connman);
+        mnodeman.CheckAndRemove(connman);
+        mnodeman.WarnMasternodeDaemonUpdates();
+    }
+
+    if(fMasternodeMode && (nTick % (60 * 5) == 0)) {
+        mnodeman.DoFullVerificationStep(connman);
+    }
+}
diff --git a/src/masternodeman.h b/src/masternodeman.h
index cfceaedb7cc4..11e7751c9e3b 100644
--- a/src/masternodeman.h
+++ b/src/masternodeman.h
@@ -244,6 +244,7 @@ class CMasternodeMan
      */
     void NotifyMasternodeUpdates(CConnman& connman);
 
+    void DoMaintenance(CConnman &connman);
 };
 
 #endif
diff --git a/src/netfulfilledman.h b/src/netfulfilledman.h
index c1b2e1c171e1..2a67d23eb16e 100644
--- a/src/netfulfilledman.h
+++ b/src/netfulfilledman.h
@@ -44,6 +44,8 @@ class CNetFulfilledRequestManager
     void Clear();
 
     std::string ToString() const;
+
+    void DoMaintenance() { CheckAndRemove(); }
 };
 
 #endif
diff --git a/src/privatesend-client.cpp b/src/privatesend-client.cpp
index 61f4f427909f..9a3660c1febb 100644
--- a/src/privatesend-client.cpp
+++ b/src/privatesend-client.cpp
@@ -1449,34 +1449,22 @@ void CPrivateSendClient::UpdatedBlockTip(const CBlockIndex *pindex)
 
 }
 
-//TODO: Rename/move to core
-void ThreadCheckPrivateSendClient(CConnman& connman)
+void CPrivateSendClient::DoMaintenance(CConnman& connman)
 {
     if(fLiteMode) return; // disable all Dash specific functionality
     if(fMasternodeMode) return; // no client-side mixing on masternodes
 
-    static bool fOneThread;
-    if(fOneThread) return;
-    fOneThread = true;
+    if(!masternodeSync.IsBlockchainSynced() || ShutdownRequested())
+        return;
 
-    // Make this thread recognisable as the PrivateSend thread
-    RenameThread("dash-ps-client");
+    static unsigned int nTick = 0;
+    static unsigned int nDoAutoNextRun = nTick + PRIVATESEND_AUTO_TIMEOUT_MIN;
 
-    unsigned int nTick = 0;
-    unsigned int nDoAutoNextRun = nTick + PRIVATESEND_AUTO_TIMEOUT_MIN;
-
-    while (true)
-    {
-        MilliSleep(1000);
-
-        if(masternodeSync.IsBlockchainSynced() && !ShutdownRequested()) {
-            nTick++;
-            privateSendClient.CheckTimeout();
-            privateSendClient.ProcessPendingDsaRequest(connman);
-            if(nDoAutoNextRun == nTick) {
-                privateSendClient.DoAutomaticDenominating(connman);
-                nDoAutoNextRun = nTick + PRIVATESEND_AUTO_TIMEOUT_MIN + GetRandInt(PRIVATESEND_AUTO_TIMEOUT_MAX - PRIVATESEND_AUTO_TIMEOUT_MIN);
-            }
-        }
+    nTick++;
+    privateSendClient.CheckTimeout();
+    privateSendClient.ProcessPendingDsaRequest(connman);
+    if(nDoAutoNextRun == nTick) {
+        privateSendClient.DoAutomaticDenominating(connman);
+        nDoAutoNextRun = nTick + PRIVATESEND_AUTO_TIMEOUT_MIN + GetRandInt(PRIVATESEND_AUTO_TIMEOUT_MAX - PRIVATESEND_AUTO_TIMEOUT_MIN);
     }
 }
diff --git a/src/privatesend-client.h b/src/privatesend-client.h
index 0486a281bd0a..7b9c9f2ce3a1 100644
--- a/src/privatesend-client.h
+++ b/src/privatesend-client.h
@@ -190,8 +190,8 @@ class CPrivateSendClient : public CPrivateSendBase
     void CheckTimeout();
 
     void UpdatedBlockTip(const CBlockIndex *pindex);
-};
 
-void ThreadCheckPrivateSendClient(CConnman& connman);
+    void DoMaintenance(CConnman& connman);
+};
 
 #endif
diff --git a/src/privatesend-server.cpp b/src/privatesend-server.cpp
index c77215a952dc..c6dbff6a2590 100644
--- a/src/privatesend-server.cpp
+++ b/src/privatesend-server.cpp
@@ -890,29 +890,14 @@ void CPrivateSendServer::SetState(PoolState nStateNew)
     nState = nStateNew;
 }
 
-//TODO: Rename/move to core
-void ThreadCheckPrivateSendServer(CConnman& connman)
+void CPrivateSendServer::DoMaintenance(CConnman& connman)
 {
     if(fLiteMode) return; // disable all Dash specific functionality
     if(!fMasternodeMode) return; // only run on masternodes
 
-    static bool fOneThread;
-    if(fOneThread) return;
-    fOneThread = true;
-
-    // Make this thread recognisable as the PrivateSend thread
-    RenameThread("dash-ps-server");
-
-    unsigned int nTick = 0;
-
-    while (true)
-    {
-        MilliSleep(1000);
+    if(!masternodeSync.IsBlockchainSynced() || ShutdownRequested())
+        return;
 
-        if(masternodeSync.IsBlockchainSynced() && !ShutdownRequested()) {
-            nTick++;
-            privateSendServer.CheckTimeout(connman);
-            privateSendServer.CheckForCompleteQueue(connman);
-        }
-    }
+    privateSendServer.CheckTimeout(connman);
+    privateSendServer.CheckForCompleteQueue(connman);
 }
diff --git a/src/privatesend-server.h b/src/privatesend-server.h
index 86af1e77b99a..eb6207692554 100644
--- a/src/privatesend-server.h
+++ b/src/privatesend-server.h
@@ -73,8 +73,8 @@ class CPrivateSendServer : public CPrivateSendBase
 
     void CheckTimeout(CConnman& connman);
     void CheckForCompleteQueue(CConnman& connman);
-};
 
-void ThreadCheckPrivateSendServer(CConnman& connman);
+    void DoMaintenance(CConnman& connman);
+};
 
 #endif
diff --git a/src/privatesend.cpp b/src/privatesend.cpp
index b991667262f0..de585b728f68 100644
--- a/src/privatesend.cpp
+++ b/src/privatesend.cpp
@@ -5,14 +5,10 @@
 
 #include "activemasternode.h"
 #include "consensus/validation.h"
-#include "governance.h"
-#include "init.h"
-#include "instantx.h"
 #include "masternode-payments.h"
 #include "masternode-sync.h"
 #include "masternodeman.h"
 #include "messagesigner.h"
-#include "netfulfilledman.h"
 #include "netmessagemaker.h"
 #include "script/sign.h"
 #include "txmempool.h"
@@ -510,58 +506,3 @@ void CPrivateSend::SyncTransaction(const CTransaction& tx, const CBlockIndex *pi
     mapDSTX[txHash].SetConfirmedHeight(posInBlock == CMainSignals::SYNC_TRANSACTION_NOT_IN_BLOCK ? -1 : pindex->nHeight);
     LogPrint("privatesend", "CPrivateSendClient::SyncTransaction -- txid=%s\n", txHash.ToString());
 }
-
-//TODO: Rename/move to core
-void ThreadCheckPrivateSend(CConnman& connman)
-{
-    if(fLiteMode) return; // disable all Dash specific functionality
-
-    static bool fOneThread;
-    if(fOneThread) return;
-    fOneThread = true;
-
-    // Make this thread recognisable as the PrivateSend thread
-    RenameThread("dash-ps");
-
-    unsigned int nTick = 0;
-
-    while (true)
-    {
-        MilliSleep(1000);
-
-        // try to sync from all available nodes, one step at a time
-        masternodeSync.ProcessTick(connman);
-
-        if(masternodeSync.IsBlockchainSynced() && !ShutdownRequested()) {
-
-            nTick++;
-
-            // make sure to check all masternodes first
-            mnodeman.Check();
-
-            mnodeman.ProcessPendingMnbRequests(connman);
-            mnodeman.ProcessPendingMnvRequests(connman);
-
-            // check if we should activate or ping every few minutes,
-            // slightly postpone first run to give net thread a chance to connect to some peers
-            if(nTick % MASTERNODE_MIN_MNP_SECONDS == 15)
-                activeMasternode.ManageState(connman);
-
-            if(nTick % 60 == 0) {
-                netfulfilledman.CheckAndRemove();
-                mnodeman.ProcessMasternodeConnections(connman);
-                mnodeman.CheckAndRemove(connman);
-                mnodeman.WarnMasternodeDaemonUpdates();
-                mnpayments.CheckAndRemove();
-                instantsend.CheckAndRemove();
-            }
-            if(fMasternodeMode && (nTick % (60 * 5) == 0)) {
-                mnodeman.DoFullVerificationStep(connman);
-            }
-
-            if(nTick % (60 * 5) == 0) {
-                governance.DoMaintenance(connman);
-            }
-        }
-    }
-}
diff --git a/src/privatesend.h b/src/privatesend.h
index 3530c0f70d06..e04f046b5048 100644
--- a/src/privatesend.h
+++ b/src/privatesend.h
@@ -437,6 +437,4 @@ class CPrivateSend
     static void SyncTransaction(const CTransaction& tx, const CBlockIndex *pindex, int posInBlock);
 };
 
-void ThreadCheckPrivateSend(CConnman& connman);
-
 #endif

From d7e210341189bb9e0e0d9ee604003608aac49e7a Mon Sep 17 00:00:00 2001
From: PaulieD <jedipbb1383@gmail.com>
Date: Mon, 16 Jul 2018 07:48:02 -0500
Subject: [PATCH 019/400] Fixes inaccurate round count in CoinControlDialog
 (#2137)

* fixes #2068

* Revert prior and update in correct location
---
 src/qt/coincontroldialog.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/qt/coincontroldialog.cpp b/src/qt/coincontroldialog.cpp
index b5c29fc8814c..afec817dea2d 100644
--- a/src/qt/coincontroldialog.cpp
+++ b/src/qt/coincontroldialog.cpp
@@ -433,7 +433,7 @@ void CoinControlDialog::viewItemChanged(QTreeWidgetItem* item, int column)
             item->setCheckState(COLUMN_CHECKBOX, Qt::Unchecked);
         else {
             coinControl->Select(outpt);
-            int nRounds = pwalletMain->GetCappedOutpointPrivateSendRounds(outpt);
+            int nRounds = pwalletMain->GetRealOutpointPrivateSendRounds(outpt);
             if (coinControl->fUsePrivateSend && nRounds < privateSendClient.nPrivateSendRounds) {
                 QMessageBox::warning(this, windowTitle(),
                     tr("Non-anonymized input selected. <b>PrivateSend will be disabled.</b><br><br>If you still want to use PrivateSend, please deselect all non-nonymized inputs first and then check PrivateSend checkbox again."),
@@ -781,7 +781,7 @@ void CoinControlDialog::updateView()
 
             // PrivateSend rounds
             COutPoint outpoint = COutPoint(out.tx->tx->GetHash(), out.i);
-            int nRounds = pwalletMain->GetCappedOutpointPrivateSendRounds(outpoint);
+            int nRounds = pwalletMain->GetRealOutpointPrivateSendRounds(outpoint);
 
             if (nRounds >= 0 || fDebug) itemOutput->setText(COLUMN_PRIVATESEND_ROUNDS, QString::number(nRounds));
             else itemOutput->setText(COLUMN_PRIVATESEND_ROUNDS, tr("n/a"));

From 7a85e24c3706d6b9db9526848c4e3f228add8856 Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Mon, 16 Jul 2018 14:48:47 +0200
Subject: [PATCH 020/400] Remove deprecated gitian-rpi2.yml descriptor (#2183)

Since backporting Bitcoin 0.14 code, we have the arm-linux-gnueabihf
and aarch64-linux-gnu hosts in gitian-linux.yml
---
 contrib/gitian-descriptors/gitian-rpi2.yml | 112 ---------------------
 1 file changed, 112 deletions(-)
 delete mode 100644 contrib/gitian-descriptors/gitian-rpi2.yml

diff --git a/contrib/gitian-descriptors/gitian-rpi2.yml b/contrib/gitian-descriptors/gitian-rpi2.yml
deleted file mode 100644
index a7119da378fd..000000000000
--- a/contrib/gitian-descriptors/gitian-rpi2.yml
+++ /dev/null
@@ -1,112 +0,0 @@
----
-name: "dash-raspberry-0.12"
-enable_cache: true
-suites:
-- "precise"
-architectures:
-- "amd64"
-packages:
-- "g++-multilib"
-- "git-core"
-- "pkg-config"
-- "autoconf2.13"
-- "libtool"
-- "automake"
-- "faketime"
-- "bsdmainutils"
-- "binutils-gold"
-reference_datetime: "2017-01-01 00:00:00"
-remotes:
-- "url": "https://github.com/dashpay/dash.git"
-  "dir": "dash"
-files:
-- "raspberrypi-tools.tar.gz"
-script: |
-  WRAP_DIR=$HOME/wrapped
-  HOSTS="arm-linux-gnueabihf"
-  CONFIGFLAGS="--enable-upnp-default --enable-glibc-back-compat"
-  FAKETIME_HOST_PROGS=""
-  FAKETIME_PROGS="date ar ranlib nm strip"
-  
-  tar --warning=no-timestamp -xzf raspberrypi-tools.tar.gz
-  export TOOLCHAIN_BIN=$(pwd)/raspberrypi-tools/arm-bcm2708/gcc-linaro-arm-linux-gnueabihf-raspbian-x64/bin
-  export PATH=$PATH:$TOOLCHAIN_BIN
-
-  export QT_RCC_TEST=1
-  export GZIP="-9n"
-  export TAR_OPTIONS="--mtime="$REFERENCE_DATE\\\ $REFERENCE_TIME""
-  export TZ="UTC"
-  export BUILD_DIR=`pwd`
-  mkdir -p ${WRAP_DIR}
-  if test -n "$GBUILD_CACHE_ENABLED"; then
-    export SOURCES_PATH=${GBUILD_COMMON_CACHE}
-    export BASE_CACHE=${GBUILD_PACKAGE_CACHE}
-    mkdir -p ${BASE_CACHE} ${SOURCES_PATH}
-  fi
-
-  # Create global faketime wrappers
-  for prog in ${FAKETIME_PROGS}; do
-    echo '#!/bin/bash' > ${WRAP_DIR}/${prog}
-    echo "REAL=\`which -a ${prog} | grep -v ${WRAP_DIR}/${prog} | head -1\`" >> ${WRAP_DIR}/${prog}
-    echo 'export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1' >> ${WRAP_DIR}/${prog}
-    echo "export FAKETIME=\"${REFERENCE_DATETIME}\"" >> ${WRAP_DIR}/${prog}
-    echo "\$REAL \$@" >> $WRAP_DIR/${prog}
-    chmod +x ${WRAP_DIR}/${prog}
-  done
-
-  # Create per-host faketime wrappers
-  for i in $HOSTS; do
-    for prog in ${FAKETIME_HOST_PROGS}; do
-        echo '#!/bin/bash' > ${WRAP_DIR}/${i}-${prog}
-        echo "REAL=\`which -a ${i}-${prog} | grep -v ${WRAP_DIR}/${i}-${prog} | head -1\`" >> ${WRAP_DIR}/${i}-${prog}
-        echo 'export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1' >> ${WRAP_DIR}/${i}-${prog}
-        echo "export FAKETIME=\"${REFERENCE_DATETIME}\"" >> ${WRAP_DIR}/${i}-${prog}
-        echo "\$REAL \$@" >> $WRAP_DIR/${i}-${prog}
-        chmod +x ${WRAP_DIR}/${i}-${prog}
-    done
-  done
-  export PATH=${WRAP_DIR}:${PATH}
-
-  cd dash
-  BASEPREFIX=`pwd`/depends
-  # Build dependencies for each host
-  for i in $HOSTS; do
-    make ${MAKEOPTS} NO_QT=1 -C ${BASEPREFIX} HOST="${i}"
-  done
-
-  # Create the release tarball using (arbitrarily) the first host
-  ./autogen.sh
-  ./configure --prefix=${BASEPREFIX}/`echo "${HOSTS}" | awk '{print $1;}'`
-  make NO_QT=1 dist
-  SOURCEDIST=`echo dashcore-*.tar.gz`
-  DISTNAME=`echo ${SOURCEDIST} | sed 's/.tar.*//'`
-  # Correct tar file order
-  mkdir -p temp
-  pushd temp
-  tar xf ../$SOURCEDIST
-  find dashcore-* | sort | tar --no-recursion --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 -c -T - | gzip -9n > ../$SOURCEDIST
-  popd
-
-  ORIGPATH="$PATH"
-  # Extract the release tarball into a dir for each host and build
-  for i in ${HOSTS}; do
-    export PATH=${BASEPREFIX}/${i}/native/bin:${ORIGPATH}
-    mkdir -p distsrc-${i}
-    cd distsrc-${i}
-    INSTALLPATH=`pwd`/installed/${DISTNAME}
-    mkdir -p ${INSTALLPATH}
-    tar --strip-components=1 -xf ../$SOURCEDIST
-
-    ./configure --prefix=${BASEPREFIX}/${i} --bindir=${INSTALLPATH}/bin --includedir=${INSTALLPATH}/include --libdir=${INSTALLPATH}/lib --disable-ccache --disable-maintainer-mode --disable-dependency-tracking ${CONFIGFLAGS}
-    make ${MAKEOPTS} NO_QT=1
-    make NO_QT=1 install-strip
-    cd installed
-    find . -name "lib*.la" -delete
-    find . -name "lib*.a" -delete
-    rm -rf ${DISTNAME}/lib/pkgconfig
-    find ${DISTNAME} | sort | tar --no-recursion --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 -c -T - | gzip -9n > ${OUTDIR}/${DISTNAME}-${i}.tar.gz
-    cd ../../
-  done
-  mkdir -p $OUTDIR/src
-  mv $SOURCEDIST $OUTDIR/src
-  mv ${OUTDIR}/${DISTNAME}-arm-*.tar.gz ${OUTDIR}/${DISTNAME}-RPi2.tar.gz

From b476173258d8fb3845ef31bc2d1bd03440c41ebc Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Mon, 16 Jul 2018 14:49:23 +0200
Subject: [PATCH 021/400] Install python3 in gitian builds (#2182)

We mostly switched to python3, so we should also install it in gitian
builds. Especially the osx build needs as it otherwise fails due to
missing setuptools.
---
 contrib/gitian-descriptors/gitian-linux.yml | 1 +
 contrib/gitian-descriptors/gitian-osx.yml   | 4 +++-
 contrib/gitian-descriptors/gitian-win.yml   | 1 +
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/contrib/gitian-descriptors/gitian-linux.yml b/contrib/gitian-descriptors/gitian-linux.yml
index 2c26d4fd60d4..76a66fa3286a 100755
--- a/contrib/gitian-descriptors/gitian-linux.yml
+++ b/contrib/gitian-descriptors/gitian-linux.yml
@@ -27,6 +27,7 @@ packages:
 - "bsdmainutils"
 - "ca-certificates"
 - "python"
+- "python3"
 remotes:
 - "url": "https://github.com/dashpay/dash.git"
   "dir": "dash"
diff --git a/contrib/gitian-descriptors/gitian-osx.yml b/contrib/gitian-descriptors/gitian-osx.yml
index 9abc4776fbbd..5efe3bc3348c 100644
--- a/contrib/gitian-descriptors/gitian-osx.yml
+++ b/contrib/gitian-descriptors/gitian-osx.yml
@@ -25,7 +25,9 @@ packages:
 - "libbz2-dev"
 - "python"
 - "python-dev"
-- "python-setuptools"
+- "python3"
+- "python3-dev"
+- "python3-setuptools"
 - "fonts-tuffy"
 remotes:
 - "url": "https://github.com/dashpay/dash.git"
diff --git a/contrib/gitian-descriptors/gitian-win.yml b/contrib/gitian-descriptors/gitian-win.yml
index 68aa01440880..a97d52152799 100755
--- a/contrib/gitian-descriptors/gitian-win.yml
+++ b/contrib/gitian-descriptors/gitian-win.yml
@@ -21,6 +21,7 @@ packages:
 - "zip"
 - "ca-certificates"
 - "python"
+- "python3"
 remotes:
 - "url": "https://github.com/dashpay/dash.git"
   "dir": "dash"

From ace980834f1e70686cee17b94ed90a6cc946e49c Mon Sep 17 00:00:00 2001
From: gladcow <sergey@dash.org>
Date: Fri, 20 Jul 2018 16:32:41 +0300
Subject: [PATCH 022/400] Extend Bloom Filter support to InstantSend related
 messages (#2184)

* use bloom filters for IX lock votes

* code style fixes
---
 src/instantx.cpp |  6 +++++-
 src/net.cpp      | 15 +++++++++++++++
 src/net.h        |  1 +
 3 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/src/instantx.cpp b/src/instantx.cpp
index afe7f7e10f2d..3f02f4794153 100644
--- a/src/instantx.cpp
+++ b/src/instantx.cpp
@@ -1121,7 +1121,11 @@ bool CTxLockVote::Sign()
 void CTxLockVote::Relay(CConnman& connman) const
 {
     CInv inv(MSG_TXLOCK_VOTE, GetHash());
-    connman.RelayInv(inv);
+    CTxLockRequest request;
+    if(instantsend.GetTxLockRequest(txHash, request))
+        connman.RelayInvFiltered(inv, *request.tx);
+    else
+        connman.RelayInv(inv);
 }
 
 bool CTxLockVote::IsExpired(int nHeight) const
diff --git a/src/net.cpp b/src/net.cpp
index 988230de8e73..630ab50b5b25 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -2640,6 +2640,21 @@ void CConnman::RelayInv(CInv &inv, const int minProtoVersion) {
             pnode->PushInventory(inv);
 }
 
+void CConnman::RelayInvFiltered(CInv &inv, const CTransaction& relatedTx, const int minProtoVersion)
+{
+    LOCK(cs_vNodes);
+    for (const auto& pnode : vNodes) {
+        if(pnode->nVersion < minProtoVersion)
+            continue;
+        {
+            LOCK(pnode->cs_filter);
+            if(pnode->pfilter && !pnode->pfilter->IsRelevantAndUpdate(relatedTx))
+                continue;
+        }
+        pnode->PushInventory(inv);
+    }
+}
+
 void CConnman::RecordBytesRecv(uint64_t bytes)
 {
     LOCK(cs_totalBytesRecv);
diff --git a/src/net.h b/src/net.h
index cd135e5f230d..bc58b4ebac23 100644
--- a/src/net.h
+++ b/src/net.h
@@ -309,6 +309,7 @@ class CConnman
     void RelayTransaction(const CTransaction& tx);
     void RelayTransaction(const CTransaction& tx, const CDataStream& ss);
     void RelayInv(CInv &inv, const int minProtoVersion = MIN_PEER_PROTO_VERSION);
+    void RelayInvFiltered(CInv &inv, const CTransaction &relatedTx, const int minProtoVersion = MIN_PEER_PROTO_VERSION);
 
     // Addrman functions
     size_t GetAddressCount() const;

From eb202e812f9cf936faf79df3b1b48a83599fbdf1 Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Fri, 20 Jul 2018 15:33:02 +0200
Subject: [PATCH 023/400] Use ccache in gitian builds (#2185)

* Use subdirectory for depends cache in gitian builds

* Make timestamps of wrappers deterministic

* Use ccache in gitian builds

* Upgrade ccache to latest version (3.4.2)

* Build the branch that belongs to the Jenkins build instead of develop
---
 Jenkinsfile.gitian                          |  2 +-
 contrib/gitian-descriptors/gitian-linux.yml | 35 ++++++++++++++++--
 contrib/gitian-descriptors/gitian-osx.yml   | 26 ++++++++++++--
 contrib/gitian-descriptors/gitian-win.yml   | 39 +++++++++++++++++++--
 depends/packages/native_ccache.mk           |  4 +--
 5 files changed, 97 insertions(+), 9 deletions(-)

diff --git a/Jenkinsfile.gitian b/Jenkinsfile.gitian
index f7a0c212eab5..27e25693ccbc 100644
--- a/Jenkinsfile.gitian
+++ b/Jenkinsfile.gitian
@@ -12,7 +12,6 @@ def proc = 4
 def mem = 2000
 
 def repositoryUrl = "https://github.com/dashpay/dash.git"
-def commit = "develop"
 
 def tasks = [:]
 for(int i = 0; i < targets.size(); i++) {
@@ -25,6 +24,7 @@ for(int i = 0; i < targets.size(); i++) {
       def pwd = sh(returnStdout: true, script: 'pwd').trim()
       def dockerGid = sh(returnStdout: true, script: "stat -c '%g' /var/run/docker.sock").trim()
       def BRANCH_NAME = sh(returnStdout: true, script: 'echo $BRANCH_NAME').trim()
+      def commit = BRANCH_NAME
       def hasCache = false
 
       def gitianDescriptor
diff --git a/contrib/gitian-descriptors/gitian-linux.yml b/contrib/gitian-descriptors/gitian-linux.yml
index 76a66fa3286a..f69f7063203c 100755
--- a/contrib/gitian-descriptors/gitian-linux.yml
+++ b/contrib/gitian-descriptors/gitian-linux.yml
@@ -51,18 +51,37 @@ script: |
   mkdir -p ${WRAP_DIR}
   if test -n "$GBUILD_CACHE_ENABLED"; then
     export SOURCES_PATH=${GBUILD_COMMON_CACHE}
-    export BASE_CACHE=${GBUILD_PACKAGE_CACHE}
+    export BASE_CACHE=${GBUILD_PACKAGE_CACHE}/depends
     mkdir -p ${BASE_CACHE} ${SOURCES_PATH}
+
+    # Setup ccache to use correct cache directories and fix the compiler check of ccache
+    CONFIGFLAGS="${CONFIGFLAGS} --enable-ccache"
+    export CCACHE_DIR=${GBUILD_PACKAGE_CACHE}/ccache
+    # As we later wrap the gcc binaries, this is fast
+    export CCACHE_COMPILERCHECK="content"
+    if [ -f ${GBUILD_PACKAGE_CACHE}/ccache.tar.gz ]; then
+      pushd ${GBUILD_PACKAGE_CACHE}
+      tar xzf ccache.tar.gz
+      rm ccache.tar.gz
+      popd
+    fi
+  else
+    CONFIGFLAGS="${CONFIGFLAGS} --disable-ccache"
   fi
 
+  # We include the GCC version in all wrappers so that ccache can detect compiler upgrades when hashing the wrappers
+  GCCVERSION=`gcc --version | head -1`
+
   function create_global_faketime_wrappers {
   for prog in ${FAKETIME_PROGS}; do
     echo '#!/bin/bash' > ${WRAP_DIR}/${prog}
+    echo "# GCCVERSION=${GCCVERSION}" >> ${WRAP_DIR}/${prog}
     echo "REAL=\`which -a ${prog} | grep -v ${WRAP_DIR}/${prog} | head -1\`" >> ${WRAP_DIR}/${prog}
     echo 'export LD_PRELOAD=/usr/lib/x86_64-linux-gnu/faketime/libfaketime.so.1' >> ${WRAP_DIR}/${prog}
     echo "export FAKETIME=\"$1\"" >> ${WRAP_DIR}/${prog}
     echo "\$REAL \$@" >> $WRAP_DIR/${prog}
     chmod +x ${WRAP_DIR}/${prog}
+    touch -d "${REFERENCE_DATETIME}" ${WRAP_DIR}/${prog}
   done
   }
 
@@ -70,11 +89,13 @@ script: |
   for i in $HOSTS; do
     for prog in ${FAKETIME_HOST_PROGS}; do
         echo '#!/bin/bash' > ${WRAP_DIR}/${i}-${prog}
+        echo "# GCCVERSION=${GCCVERSION}" >> ${WRAP_DIR}/${i}-${prog}
         echo "REAL=\`which -a ${i}-${prog} | grep -v ${WRAP_DIR}/${i}-${prog} | head -1\`" >> ${WRAP_DIR}/${i}-${prog}
         echo 'export LD_PRELOAD=/usr/lib/x86_64-linux-gnu/faketime/libfaketime.so.1' >> ${WRAP_DIR}/${i}-${prog}
         echo "export FAKETIME=\"$1\"" >> ${WRAP_DIR}/${i}-${prog}
         echo "\$REAL \$@" >> $WRAP_DIR/${i}-${prog}
         chmod +x ${WRAP_DIR}/${i}-${prog}
+        touch -d "${REFERENCE_DATETIME}" ${WRAP_DIR}/${i}-${prog}
     done
   done
   }
@@ -100,6 +121,7 @@ script: |
   rm -f ${WRAP_DIR}/${prog}
   cat << EOF > ${WRAP_DIR}/${prog}
   #!/bin/bash
+  # GCCVERSION=${GCCVERSION}
   REAL="`which -a ${prog} | grep -v ${WRAP_DIR}/${prog} | head -1`"
   for var in "\$@"
   do
@@ -112,6 +134,7 @@ script: |
   \$REAL \$@
   EOF
   chmod +x ${WRAP_DIR}/${prog}
+  touch -d "${REFERENCE_DATETIME}" ${WRAP_DIR}/${prog}
   done
 
   cd dash
@@ -155,7 +178,7 @@ script: |
     mkdir -p ${INSTALLPATH}
     tar --strip-components=1 -xf ../$SOURCEDIST
 
-    CONFIG_SITE=${BASEPREFIX}/${i}/share/config.site ./configure --prefix=/ --disable-ccache --disable-maintainer-mode --disable-dependency-tracking ${CONFIGFLAGS} CFLAGS="${HOST_CFLAGS}" CXXFLAGS="${HOST_CXXFLAGS}" LDFLAGS="${HOST_LDFLAGS}"
+    CONFIG_SITE=${BASEPREFIX}/${i}/share/config.site ./configure --prefix=/ --disable-maintainer-mode --disable-dependency-tracking ${CONFIGFLAGS} CFLAGS="${HOST_CFLAGS}" CXXFLAGS="${HOST_CXXFLAGS}" LDFLAGS="${HOST_LDFLAGS}"
     make ${MAKEOPTS}
     make ${MAKEOPTS} -C src check-security
 
@@ -183,3 +206,11 @@ script: |
   done
   mkdir -p $OUTDIR/src
   mv $SOURCEDIST $OUTDIR/src
+
+  # Compress ccache (otherwise the assert file will get too huge)
+  if [ "$CCACHE_DIR" != "" ]; then
+    pushd ${GBUILD_PACKAGE_CACHE}
+    tar czf ccache.tar.gz ccache
+    rm -rf ccache
+    popd
+  fi
diff --git a/contrib/gitian-descriptors/gitian-osx.yml b/contrib/gitian-descriptors/gitian-osx.yml
index 5efe3bc3348c..28097c609a53 100644
--- a/contrib/gitian-descriptors/gitian-osx.yml
+++ b/contrib/gitian-descriptors/gitian-osx.yml
@@ -49,8 +49,20 @@ script: |
   mkdir -p ${WRAP_DIR}
   if test -n "$GBUILD_CACHE_ENABLED"; then
     export SOURCES_PATH=${GBUILD_COMMON_CACHE}
-    export BASE_CACHE=${GBUILD_PACKAGE_CACHE}
+    export BASE_CACHE=${GBUILD_PACKAGE_CACHE}/depends
     mkdir -p ${BASE_CACHE} ${SOURCES_PATH}
+
+    # Setup ccache to use correct cache directories
+    CONFIGFLAGS="${CONFIGFLAGS} --enable-ccache"
+    export CCACHE_DIR=${GBUILD_PACKAGE_CACHE}/ccache
+    if [ -f ${GBUILD_PACKAGE_CACHE}/ccache.tar.gz ]; then
+      pushd ${GBUILD_PACKAGE_CACHE}
+      tar xzf ccache.tar.gz
+      rm ccache.tar.gz
+      popd
+    fi
+  else
+    CONFIGFLAGS="${CONFIGFLAGS} --disable-ccache"
   fi
 
   export ZERO_AR_DATE=1
@@ -63,6 +75,7 @@ script: |
     echo "export FAKETIME=\"$1\"" >> ${WRAP_DIR}/${prog}
     echo "\$REAL \$@" >> $WRAP_DIR/${prog}
     chmod +x ${WRAP_DIR}/${prog}
+    touch -d "${REFERENCE_DATETIME}" ${WRAP_DIR}/${prog}
   done
   }
 
@@ -75,6 +88,7 @@ script: |
         echo "export FAKETIME=\"$1\"" >> ${WRAP_DIR}/${i}-${prog}
         echo "\$REAL \$@" >> $WRAP_DIR/${i}-${prog}
         chmod +x ${WRAP_DIR}/${i}-${prog}
+        touch -d "${REFERENCE_DATETIME}" ${WRAP_DIR}/${i}-${prog}
     done
   done
   }
@@ -126,7 +140,7 @@ script: |
     mkdir -p ${INSTALLPATH}
     tar --strip-components=1 -xf ../$SOURCEDIST
 
-    CONFIG_SITE=${BASEPREFIX}/${i}/share/config.site ./configure --prefix=/ --disable-ccache --disable-maintainer-mode --disable-dependency-tracking ${CONFIGFLAGS}
+    CONFIG_SITE=${BASEPREFIX}/${i}/share/config.site ./configure --prefix=/ --disable-maintainer-mode --disable-dependency-tracking ${CONFIGFLAGS}
     make ${MAKEOPTS}
     make install-strip DESTDIR=${INSTALLPATH}
 
@@ -158,3 +172,11 @@ script: |
   mkdir -p $OUTDIR/src
   mv $SOURCEDIST $OUTDIR/src
   mv ${OUTDIR}/${DISTNAME}-x86_64-*.tar.gz ${OUTDIR}/${DISTNAME}-osx64.tar.gz
+
+  # Compress ccache (otherwise the assert file will get too huge)
+  if [ "$CCACHE_DIR" != "" ]; then
+    pushd ${GBUILD_PACKAGE_CACHE}
+    tar czf ccache.tar.gz ccache
+    rm -rf ccache
+    popd
+  fi
diff --git a/contrib/gitian-descriptors/gitian-win.yml b/contrib/gitian-descriptors/gitian-win.yml
index a97d52152799..a19c6bbd0946 100755
--- a/contrib/gitian-descriptors/gitian-win.yml
+++ b/contrib/gitian-descriptors/gitian-win.yml
@@ -43,18 +43,37 @@ script: |
   mkdir -p ${WRAP_DIR}
   if test -n "$GBUILD_CACHE_ENABLED"; then
     export SOURCES_PATH=${GBUILD_COMMON_CACHE}
-    export BASE_CACHE=${GBUILD_PACKAGE_CACHE}
+    export BASE_CACHE=${GBUILD_PACKAGE_CACHE}/depends
     mkdir -p ${BASE_CACHE} ${SOURCES_PATH}
+
+    # Setup ccache to use correct cache directories and fix the compiler check of ccache
+    CONFIGFLAGS="${CONFIGFLAGS} --enable-ccache"
+    export CCACHE_DIR=${GBUILD_PACKAGE_CACHE}/ccache
+    # As we later wrap the gcc binaries, this is fast
+    export CCACHE_COMPILERCHECK="content"
+    if [ -f ${GBUILD_PACKAGE_CACHE}/ccache.tar.gz ]; then
+      pushd ${GBUILD_PACKAGE_CACHE}
+      tar xzf ccache.tar.gz
+      rm ccache.tar.gz
+      popd
+    fi
+  else
+    CONFIGFLAGS="${CONFIGFLAGS} --disable-ccache"
   fi
 
+  # We include the GCC version in all wrappers so that ccache can detect compiler upgrades when hashing the wrappers
+  GCCVERSION=`gcc --version | head -1`
+
   function create_global_faketime_wrappers {
   for prog in ${FAKETIME_PROGS}; do
     echo '#!/bin/bash' > ${WRAP_DIR}/${prog}
+    echo "# GCCVERSION=${GCCVERSION}" >> ${WRAP_DIR}/${prog}
     echo "REAL=\`which -a ${prog} | grep -v ${WRAP_DIR}/${prog} | head -1\`" >> ${WRAP_DIR}/${prog}
     echo 'export LD_PRELOAD=/usr/lib/x86_64-linux-gnu/faketime/libfaketime.so.1' >> ${WRAP_DIR}/${prog}
     echo "export FAKETIME=\"$1\"" >> ${WRAP_DIR}/${prog}
     echo "\$REAL \$@" >> $WRAP_DIR/${prog}
     chmod +x ${WRAP_DIR}/${prog}
+    touch -d "${REFERENCE_DATETIME}" ${WRAP_DIR}/${prog}
   done
   }
 
@@ -62,11 +81,13 @@ script: |
   for i in $HOSTS; do
     for prog in ${FAKETIME_HOST_PROGS}; do
         echo '#!/bin/bash' > ${WRAP_DIR}/${i}-${prog}
+        echo "# GCCVERSION=${GCCVERSION}" >> ${WRAP_DIR}/${i}-${prog}
         echo "REAL=\`which -a ${i}-${prog} | grep -v ${WRAP_DIR}/${i}-${prog} | head -1\`" >> ${WRAP_DIR}/${i}-${prog}
         echo 'export LD_PRELOAD=/usr/lib/x86_64-linux-gnu/faketime/libfaketime.so.1' >> ${WRAP_DIR}/${i}-${prog}
         echo "export FAKETIME=\"$1\"" >> ${WRAP_DIR}/${i}-${prog}
         echo "\$REAL \$@" >> $WRAP_DIR/${i}-${prog}
         chmod +x ${WRAP_DIR}/${i}-${prog}
+        touch -d "${REFERENCE_DATETIME}" ${WRAP_DIR}/${i}-${prog}
     done
   done
   }
@@ -78,19 +99,25 @@ script: |
     mkdir -p ${WRAP_DIR}/${i}
     for prog in collect2; do
         echo '#!/bin/bash' > ${WRAP_DIR}/${i}/${prog}
+        echo "# GCCVERSION=${GCCVERSION}" >> ${WRAP_DIR}/${i}/${prog}
         REAL=$(${i}-gcc -print-prog-name=${prog})
         echo "export MALLOC_PERTURB_=255" >> ${WRAP_DIR}/${i}/${prog}
         echo "${REAL} \$@" >> $WRAP_DIR/${i}/${prog}
         chmod +x ${WRAP_DIR}/${i}/${prog}
+        touch -d "${REFERENCE_DATETIME}" ${WRAP_DIR}/${i}/${prog}
     done
     for prog in gcc g++; do
         echo '#!/bin/bash' > ${WRAP_DIR}/${i}-${prog}
+        echo "# GCCVERSION=${GCCVERSION}" >> ${WRAP_DIR}/${i}-${prog}
         echo "REAL=\`which -a ${i}-${prog} | grep -v ${WRAP_DIR}/${i}-${prog} | head -1\`" >> ${WRAP_DIR}/${i}-${prog}
+        echo '# Add the gcc version to the wrapper so that ccache takes this into account (we use CCACHE_COMPILERCHECK=content)' >> ${WRAP_DIR}/${i}-${prog}
+        echo "# `${prog} --version | head -1`" >> ${WRAP_DIR}/${i}-${prog}
         echo 'export LD_PRELOAD=/usr/lib/x86_64-linux-gnu/faketime/libfaketime.so.1' >> ${WRAP_DIR}/${i}-${prog}
         echo "export FAKETIME=\"$1\"" >> ${WRAP_DIR}/${i}-${prog}
         echo "export COMPILER_PATH=${WRAP_DIR}/${i}" >> ${WRAP_DIR}/${i}-${prog}
         echo "\$REAL \$@" >> $WRAP_DIR/${i}-${prog}
         chmod +x ${WRAP_DIR}/${i}-${prog}
+        touch -d "${REFERENCE_DATETIME}" ${WRAP_DIR}/${i}-${prog}
     done
   done
   }
@@ -142,7 +169,7 @@ script: |
     mkdir -p ${INSTALLPATH}
     tar --strip-components=1 -xf ../$SOURCEDIST
 
-    CONFIG_SITE=${BASEPREFIX}/${i}/share/config.site ./configure --prefix=/ --disable-ccache --disable-maintainer-mode --disable-dependency-tracking ${CONFIGFLAGS} CFLAGS="${HOST_CFLAGS}" CXXFLAGS="${HOST_CXXFLAGS}"
+    CONFIG_SITE=${BASEPREFIX}/${i}/share/config.site ./configure --prefix=/ --disable-maintainer-mode --disable-dependency-tracking ${CONFIGFLAGS} CFLAGS="${HOST_CFLAGS}" CXXFLAGS="${HOST_CXXFLAGS}"
     make ${MAKEOPTS}
     make ${MAKEOPTS} -C src check-security
     make deploy
@@ -167,3 +194,11 @@ script: |
   mv ${OUTDIR}/${DISTNAME}-i686-*-debug.zip ${OUTDIR}/${DISTNAME}-win32-debug.zip
   mv ${OUTDIR}/${DISTNAME}-x86_64-*.zip ${OUTDIR}/${DISTNAME}-win64.zip
   mv ${OUTDIR}/${DISTNAME}-i686-*.zip ${OUTDIR}/${DISTNAME}-win32.zip
+
+  # Compress ccache (otherwise the assert file will get too huge)
+  if [ "$CCACHE_DIR" != "" ]; then
+    pushd ${GBUILD_PACKAGE_CACHE}
+    tar czf ccache.tar.gz ccache
+    rm -rf ccache
+    popd
+  fi
diff --git a/depends/packages/native_ccache.mk b/depends/packages/native_ccache.mk
index 4ed61a49e9ca..3be669dc47cb 100644
--- a/depends/packages/native_ccache.mk
+++ b/depends/packages/native_ccache.mk
@@ -1,8 +1,8 @@
 package=native_ccache
-$(package)_version=3.3.3
+$(package)_version=3.4.2
 $(package)_download_path=https://samba.org/ftp/ccache
 $(package)_file_name=ccache-$($(package)_version).tar.bz2
-$(package)_sha256_hash=2985bc5e32ebe38d2958d508eb54ddcad39eed909489c0c2988035214597ca54
+$(package)_sha256_hash=3aa5587793d4c790bd22999bfc678250c029307b3afb9d16f6f4a49c67b78fb3
 
 define $(package)_set_vars
 $(package)_config_opts=

From a5643f899d4a8765fca4594568271950e43f4921 Mon Sep 17 00:00:00 2001
From: UdjinM6 <UdjinM6@users.noreply.github.com>
Date: Wed, 25 Jul 2018 18:09:30 +0300
Subject: [PATCH 024/400] Switch RequestGovernanceObjectVotes from pointers to
 hashes (#2189)

* No need for pointers to gobjects, can simply use hashes in RequestGovernanceObjectVotes

* Drop `swap` and `=` in GovernanceObject

Were used for shuffling, no longer needed
---
 src/governance-object.cpp | 24 -----------------------
 src/governance-object.h   |  8 --------
 src/governance.cpp        | 40 +++++++++++++++++++--------------------
 3 files changed, 19 insertions(+), 53 deletions(-)

diff --git a/src/governance-object.cpp b/src/governance-object.cpp
index 0874139ec0f5..0677ac1e9f08 100644
--- a/src/governance-object.cpp
+++ b/src/governance-object.cpp
@@ -735,30 +735,6 @@ void CGovernanceObject::UpdateSentinelVariables()
     if(GetAbsoluteNoCount(VOTE_SIGNAL_VALID) >= nAbsVoteReq) fCachedValid = false;
 }
 
-void CGovernanceObject::swap(CGovernanceObject& first, CGovernanceObject& second) // nothrow
-{
-    // enable ADL (not necessary in our case, but good practice)
-    using std::swap;
-
-    // by swapping the members of two classes,
-    // the two classes are effectively swapped
-    swap(first.nHashParent, second.nHashParent);
-    swap(first.nRevision, second.nRevision);
-    swap(first.nTime, second.nTime);
-    swap(first.nDeletionTime, second.nDeletionTime);
-    swap(first.nCollateralHash, second.nCollateralHash);
-    swap(first.vchData, second.vchData);
-    swap(first.nObjectType, second.nObjectType);
-
-    // swap all cached valid flags
-    swap(first.fCachedFunding, second.fCachedFunding);
-    swap(first.fCachedValid, second.fCachedValid);
-    swap(first.fCachedDelete, second.fCachedDelete);
-    swap(first.fCachedEndorsed, second.fCachedEndorsed);
-    swap(first.fDirtyCache, second.fDirtyCache);
-    swap(first.fExpired, second.fExpired);
-}
-
 void CGovernanceObject::CheckOrphanVotes(CConnman& connman)
 {
     int64_t nNow = GetAdjustedTime();
diff --git a/src/governance-object.h b/src/governance-object.h
index 1fcb8f2978a1..2ec25e620b0f 100644
--- a/src/governance-object.h
+++ b/src/governance-object.h
@@ -194,8 +194,6 @@ class CGovernanceObject
 
     CGovernanceObject(const CGovernanceObject& other);
 
-    void swap(CGovernanceObject& first, CGovernanceObject& second); // nothrow
-
     // Public Getter methods
 
     int64_t GetCreationTime() const {
@@ -355,12 +353,6 @@ class CGovernanceObject
         // AFTER DESERIALIZATION OCCURS, CACHED VARIABLES MUST BE CALCULATED MANUALLY
     }
 
-    CGovernanceObject& operator=(CGovernanceObject from)
-    {
-        swap(*this, from);
-        return *this;
-    }
-
 private:
     // FUNCTIONS FOR DEALING WITH DATA STRING
     void LoadData();
diff --git a/src/governance.cpp b/src/governance.cpp
index 7909a7a1cb5f..53459b928ca1 100644
--- a/src/governance.cpp
+++ b/src/governance.cpp
@@ -1065,8 +1065,8 @@ int CGovernanceManager::RequestGovernanceObjectVotes(const std::vector<CNode*>&
     int nTimeout = 60 * 60;
     size_t nPeersPerHashMax = 3;
 
-    std::vector<CGovernanceObject*> vpGovObjsTmp;
-    std::vector<CGovernanceObject*> vpGovObjsTriggersTmp;
+    std::vector<uint256> vTriggerObjHashes;
+    std::vector<uint256> vOtherObjHashes;
 
     // This should help us to get some idea about an impact this can bring once deployed on mainnet.
     // Testnet is ~40 times smaller in masternode count, but only ~1000 masternodes usually vote,
@@ -1098,32 +1098,30 @@ int CGovernanceManager::RequestGovernanceObjectVotes(const std::vector<CNode*>&
                 if(mapAskedRecently[nHash].size() >= nPeersPerHashMax) continue;
             }
 
-            auto govObj = objPair.second;
-            if(govObj.nObjectType == GOVERNANCE_OBJECT_TRIGGER) {
-                vpGovObjsTriggersTmp.push_back(&govObj);
+            if(objPair.second.nObjectType == GOVERNANCE_OBJECT_TRIGGER) {
+                vTriggerObjHashes.push_back(nHash);
             } else {
-                vpGovObjsTmp.push_back(&govObj);
+                vOtherObjHashes.push_back(nHash);
             }
         }
     }
 
-    LogPrint("gobject", "CGovernanceManager::RequestGovernanceObjectVotes -- start: vpGovObjsTriggersTmp %d vpGovObjsTmp %d mapAskedRecently %d\n",
-                vpGovObjsTriggersTmp.size(), vpGovObjsTmp.size(), mapAskedRecently.size());
+    LogPrint("gobject", "CGovernanceManager::RequestGovernanceObjectVotes -- start: vTriggerObjHashes %d vOtherObjHashes %d mapAskedRecently %d\n",
+                vTriggerObjHashes.size(), vOtherObjHashes.size(), mapAskedRecently.size());
 
     FastRandomContext insecure_rand;
-    // shuffle pointers
-    std::random_shuffle(vpGovObjsTriggersTmp.begin(), vpGovObjsTriggersTmp.end(), insecure_rand);
-    std::random_shuffle(vpGovObjsTmp.begin(), vpGovObjsTmp.end(), insecure_rand);
+    std::random_shuffle(vTriggerObjHashes.begin(), vTriggerObjHashes.end(), insecure_rand);
+    std::random_shuffle(vOtherObjHashes.begin(), vOtherObjHashes.end(), insecure_rand);
 
     for (int i = 0; i < nMaxObjRequestsPerNode; ++i) {
         uint256 nHashGovobj;
 
         // ask for triggers first
-        if(vpGovObjsTriggersTmp.size()) {
-            nHashGovobj = vpGovObjsTriggersTmp.back()->GetHash();
+        if(vTriggerObjHashes.size()) {
+            nHashGovobj = vTriggerObjHashes.back();
         } else {
-            if(vpGovObjsTmp.empty()) break;
-            nHashGovobj = vpGovObjsTmp.back()->GetHash();
+            if(vOtherObjHashes.empty()) break;
+            nHashGovobj = vOtherObjHashes.back();
         }
         bool fAsked = false;
         for (const auto& pnode : vNodesCopy) {
@@ -1147,17 +1145,17 @@ int CGovernanceManager::RequestGovernanceObjectVotes(const std::vector<CNode*>&
             if(mapAskedRecently[nHashGovobj].size() >= nPeersPerHashMax) break;
         }
         // NOTE: this should match `if` above (the one before `while`)
-        if(vpGovObjsTriggersTmp.size()) {
-            vpGovObjsTriggersTmp.pop_back();
+        if(vTriggerObjHashes.size()) {
+            vTriggerObjHashes.pop_back();
         } else {
-            vpGovObjsTmp.pop_back();
+            vOtherObjHashes.pop_back();
         }
         if(!fAsked) i--;
     }
-    LogPrint("gobject", "CGovernanceManager::RequestGovernanceObjectVotes -- end: vpGovObjsTriggersTmp %d vpGovObjsTmp %d mapAskedRecently %d\n",
-                vpGovObjsTriggersTmp.size(), vpGovObjsTmp.size(), mapAskedRecently.size());
+    LogPrint("gobject", "CGovernanceManager::RequestGovernanceObjectVotes -- end: vTriggerObjHashes %d vOtherObjHashes %d mapAskedRecently %d\n",
+                vTriggerObjHashes.size(), vOtherObjHashes.size(), mapAskedRecently.size());
 
-    return int(vpGovObjsTriggersTmp.size() + vpGovObjsTmp.size());
+    return int(vTriggerObjHashes.size() + vOtherObjHashes.size());
 }
 
 bool CGovernanceManager::AcceptObjectMessage(const uint256& nHash)

From 65b9045269e95478e2b886ca28cd73670e286e12 Mon Sep 17 00:00:00 2001
From: UdjinM6 <UdjinM6@users.noreply.github.com>
Date: Wed, 25 Jul 2018 18:09:48 +0300
Subject: [PATCH 025/400] Add helpers GetSentinelString() and GetDaemonString()
 to CMasternodePing (#2192)

---
 src/masternode.cpp     | 10 ++++++++++
 src/masternode.h       |  3 +++
 src/rpc/masternode.cpp | 12 ++++++------
 3 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/src/masternode.cpp b/src/masternode.cpp
index 53f0e9285664..26fae469b195 100644
--- a/src/masternode.cpp
+++ b/src/masternode.cpp
@@ -930,6 +930,16 @@ void CMasternodePing::Relay(CConnman& connman)
     connman.RelayInv(inv);
 }
 
+std::string CMasternodePing::GetSentinelString() const
+{
+    return nSentinelVersion > DEFAULT_SENTINEL_VERSION ? SafeIntVersionToString(nSentinelVersion) : "Unknown";
+}
+
+std::string CMasternodePing::GetDaemonString() const
+{
+    return nDaemonVersion > DEFAULT_DAEMON_VERSION ? FormatVersion(nDaemonVersion) : "Unknown";
+}
+
 void CMasternode::AddGovernanceVote(uint256 nGovernanceObjectHash)
 {
     if(mapGovernanceObjectsVotedOn.count(nGovernanceObjectHash)) {
diff --git a/src/masternode.h b/src/masternode.h
index 38253aa44a2f..9e738e7d4df6 100644
--- a/src/masternode.h
+++ b/src/masternode.h
@@ -101,6 +101,9 @@ class CMasternodePing
     bool CheckAndUpdate(CMasternode* pmn, bool fFromNewBroadcast, int& nDos, CConnman& connman);
     void Relay(CConnman& connman);
 
+    std::string GetSentinelString() const;
+    std::string GetDaemonString() const;
+
     explicit operator bool() const;
 };
 
diff --git a/src/rpc/masternode.cpp b/src/rpc/masternode.cpp
index 612fe7ce840a..d6dd81c50810 100644
--- a/src/rpc/masternode.cpp
+++ b/src/rpc/masternode.cpp
@@ -557,12 +557,12 @@ UniValue masternodelist(const JSONRPCRequest& request)
                     strOutpoint.find(strFilter) == std::string::npos) continue;
                 obj.push_back(Pair(strOutpoint, strAddress));
             } else if (strMode == "daemon") {
-                std::string strDaemon = mn.lastPing.nDaemonVersion > DEFAULT_DAEMON_VERSION ? FormatVersion(mn.lastPing.nDaemonVersion) : "Unknown";
+                std::string strDaemon = mn.lastPing.GetDaemonString();
                 if (strFilter !="" && strDaemon.find(strFilter) == std::string::npos &&
                     strOutpoint.find(strFilter) == std::string::npos) continue;
                 obj.push_back(Pair(strOutpoint, strDaemon));
             } else if (strMode == "sentinel") {
-                std::string strSentinel = mn.lastPing.nSentinelVersion > DEFAULT_SENTINEL_VERSION ? SafeIntVersionToString(mn.lastPing.nSentinelVersion) : "Unknown";
+                std::string strSentinel = mn.lastPing.GetSentinelString();
                 if (strFilter !="" && strSentinel.find(strFilter) == std::string::npos &&
                     strOutpoint.find(strFilter) == std::string::npos) continue;
                 obj.push_back(Pair(strOutpoint, strSentinel));
@@ -589,7 +589,7 @@ UniValue masternodelist(const JSONRPCRequest& request)
                                CBitcoinAddress(mn.pubKeyCollateralAddress.GetID()).ToString() << " " <<
                                (int64_t)mn.lastPing.sigTime << " " << std::setw(8) <<
                                (int64_t)(mn.lastPing.sigTime - mn.sigTime) << " " <<
-                               SafeIntVersionToString(mn.lastPing.nSentinelVersion) << " "  <<
+                               mn.lastPing.GetSentinelString() << " "  <<
                                (mn.lastPing.fSentinelIsCurrent ? "current" : "expired") << " " <<
                                mn.addr.ToString();
                 std::string strInfo = streamInfo.str();
@@ -603,7 +603,7 @@ UniValue masternodelist(const JSONRPCRequest& request)
                                mn.GetStatus() << " " <<
                                mn.nProtocolVersion << " " <<
                                mn.lastPing.nDaemonVersion << " " <<
-                               SafeIntVersionToString(mn.lastPing.nSentinelVersion) << " " <<
+                               mn.lastPing.GetSentinelString() << " " <<
                                (mn.lastPing.fSentinelIsCurrent ? "current" : "expired") << " " <<
                                (int64_t)mn.lastPing.sigTime << " " <<
                                (int64_t)(mn.lastPing.sigTime - mn.sigTime) << " " <<
@@ -617,8 +617,8 @@ UniValue masternodelist(const JSONRPCRequest& request)
                 objMN.push_back(Pair("payee", CBitcoinAddress(mn.pubKeyCollateralAddress.GetID()).ToString()));
                 objMN.push_back(Pair("status", mn.GetStatus()));
                 objMN.push_back(Pair("protocol", mn.nProtocolVersion));
-                objMN.push_back(Pair("daemonversion", mn.lastPing.nDaemonVersion > DEFAULT_DAEMON_VERSION ? FormatVersion(mn.lastPing.nDaemonVersion) : "Unknown"));
-                objMN.push_back(Pair("sentinelversion", mn.lastPing.nSentinelVersion > DEFAULT_SENTINEL_VERSION ? SafeIntVersionToString(mn.lastPing.nSentinelVersion) : "Unknown"));
+                objMN.push_back(Pair("daemonversion", mn.lastPing.GetDaemonString()));
+                objMN.push_back(Pair("sentinelversion", mn.lastPing.GetSentinelString()));
                 objMN.push_back(Pair("sentinelstate", (mn.lastPing.fSentinelIsCurrent ? "current" : "expired")));
                 objMN.push_back(Pair("lastseen", (int64_t)mn.lastPing.sigTime));
                 objMN.push_back(Pair("activeseconds", (int64_t)(mn.lastPing.sigTime - mn.sigTime)));

From 30fa8bc33c641739e165f646b68ff666fe0e854f Mon Sep 17 00:00:00 2001
From: UdjinM6 <UdjinM6@users.noreply.github.com>
Date: Sat, 28 Jul 2018 16:50:41 +0300
Subject: [PATCH 026/400] Make sure pwalletMain is not null whenever it's used
 in PS client (#2190)

* Make sure pwalletMain is not null whenever it's used in PS client

* partially revert
---
 src/privatesend-client.cpp | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/src/privatesend-client.cpp b/src/privatesend-client.cpp
index 9a3660c1febb..2b41408f6afc 100644
--- a/src/privatesend-client.cpp
+++ b/src/privatesend-client.cpp
@@ -235,6 +235,8 @@ void CPrivateSendClient::SetNull()
 //
 void CPrivateSendClient::UnlockCoins()
 {
+    if (!pwalletMain) return;
+
     while(true) {
         TRY_LOCK(pwalletMain->cs_wallet, lockWallet);
         if(!lockWallet) {MilliSleep(50); continue;}
@@ -486,6 +488,8 @@ bool CPrivateSendClient::CheckPoolStateUpdate(PoolState nStateNew, int nEntriesC
 //
 bool CPrivateSendClient::SignFinalTransaction(const CTransaction& finalTransactionNew, CNode* pnode, CConnman& connman)
 {
+    if (!pwalletMain) return false;
+
     if(fMasternodeMode || pnode == nullptr) return false;
 
     finalMutableTransaction = finalTransactionNew;
@@ -619,6 +623,13 @@ bool CPrivateSendClient::WaitForAnotherBlock()
 
 bool CPrivateSendClient::CheckAutomaticBackup()
 {
+    if (!pwalletMain) {
+        LogPrint("privatesend", "CPrivateSendClient::CheckAutomaticBackup -- Wallet is not initialized, no mixing available.\n");
+        strAutoDenomResult = _("Wallet is not initialized") + ", " + _("no mixing available.");
+        fEnablePrivateSend = false; // no mixing
+        return false;
+    }
+
     switch(nWalletBackups) {
         case 0:
             LogPrint("privatesend", "CPrivateSendClient::CheckAutomaticBackup -- Automatic backups disabled, no mixing available.\n");
@@ -837,6 +848,8 @@ bool CPrivateSendClient::DoAutomaticDenominating(CConnman& connman, bool fDryRun
 
 bool CPrivateSendClient::JoinExistingQueue(CAmount nBalanceNeedsAnonymized, CConnman& connman)
 {
+    if (!pwalletMain)  return false;
+
     std::vector<CAmount> vecStandardDenoms = CPrivateSend::GetStandardDenominations();
     // Look through the queues and see if anything matches
     for (auto& dsq : vecDarksendQueue) {
@@ -917,6 +930,8 @@ bool CPrivateSendClient::JoinExistingQueue(CAmount nBalanceNeedsAnonymized, CCon
 
 bool CPrivateSendClient::StartNewQueue(CAmount nValueMin, CAmount nBalanceNeedsAnonymized, CConnman& connman)
 {
+    if (!pwalletMain) return false;
+
     int nTries = 0;
     int nMnCountEnabled = mnodeman.CountEnabled(MIN_PRIVATESEND_PEER_PROTO_VERSION);
 
@@ -1198,6 +1213,8 @@ bool CPrivateSendClient::PrepareDenominate(int nMinRounds, int nMaxRounds, std::
 // Create collaterals by looping through inputs grouped by addresses
 bool CPrivateSendClient::MakeCollateralAmounts(CConnman& connman)
 {
+    if (!pwalletMain) return false;
+
     std::vector<CompactTallyItem> vecTally;
     if(!pwalletMain->SelectCoinsGrouppedByAddresses(vecTally, false)) {
         LogPrint("privatesend", "CPrivateSendClient::MakeCollateralAmounts -- SelectCoinsGrouppedByAddresses can't find any inputs!\n");
@@ -1224,6 +1241,8 @@ bool CPrivateSendClient::MakeCollateralAmounts(CConnman& connman)
 // Split up large inputs or create fee sized inputs
 bool CPrivateSendClient::MakeCollateralAmounts(const CompactTallyItem& tallyItem, bool fTryDenominated, CConnman& connman)
 {
+    if (!pwalletMain) return false;
+
     LOCK2(cs_main, pwalletMain->cs_wallet);
 
     // denominated input is always a single one, so we can check its amount directly and return early
@@ -1296,6 +1315,8 @@ bool CPrivateSendClient::MakeCollateralAmounts(const CompactTallyItem& tallyItem
 // Create denominations by looping through inputs grouped by addresses
 bool CPrivateSendClient::CreateDenominated(CConnman& connman)
 {
+    if (!pwalletMain) return false;
+
     LOCK2(cs_main, pwalletMain->cs_wallet);
 
     std::vector<CompactTallyItem> vecTally;
@@ -1318,6 +1339,8 @@ bool CPrivateSendClient::CreateDenominated(CConnman& connman)
 // Create denominations
 bool CPrivateSendClient::CreateDenominated(const CompactTallyItem& tallyItem, bool fCreateMixingCollaterals, CConnman& connman)
 {
+    if (!pwalletMain) return false;
+
     std::vector<CRecipient> vecSend;
     CKeyHolderStorage keyHolderStorageDenom;
 

From ac30196bc51901aa6b17282b0fb389a89bc8fb5f Mon Sep 17 00:00:00 2001
From: UdjinM6 <UdjinM6@users.noreply.github.com>
Date: Sat, 28 Jul 2018 16:50:58 +0300
Subject: [PATCH 027/400] Show some info about the wallet dumped via dumpwallet
 (#2191)

Also show a warning that the file must be kept secure.
---
 src/wallet/rpcdump.cpp | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/wallet/rpcdump.cpp b/src/wallet/rpcdump.cpp
index 70dd72c07f47..b21fbf0b5194 100644
--- a/src/wallet/rpcdump.cpp
+++ b/src/wallet/rpcdump.cpp
@@ -771,6 +771,12 @@ UniValue dumpwallet(const JSONRPCRequest& request)
     file << strprintf("#   mined on %s\n", EncodeDumpTime(chainActive.Tip()->GetBlockTime()));
     file << "\n";
 
+    UniValue obj(UniValue::VOBJ);
+    obj.push_back(Pair("dashcoreversion", CLIENT_BUILD));
+    obj.push_back(Pair("lastblockheight", chainActive.Height()));
+    obj.push_back(Pair("lastblockhash", chainActive.Tip()->GetBlockHash().ToString()));
+    obj.push_back(Pair("lastblocktime", EncodeDumpTime(chainActive.Tip()->GetBlockTime())));
+
     // add the base58check encoded extended master if the wallet uses HD
     CHDChain hdChainCurrent;
     if (pwalletMain->GetHDChain(hdChainCurrent))
@@ -813,6 +819,7 @@ UniValue dumpwallet(const JSONRPCRequest& request)
                 file << "# WARNING: ACCOUNT " << i << " IS MISSING!" << "\n\n";
             }
         }
+        obj.push_back(Pair("hdaccounts", int(hdChainCurrent.CountAccounts())));
     }
 
     for (std::vector<std::pair<int64_t, CKeyID> >::const_iterator it = vKeyBirth.begin(); it != vKeyBirth.end(); it++) {
@@ -835,7 +842,13 @@ UniValue dumpwallet(const JSONRPCRequest& request)
     file << "\n";
     file << "# End of dump\n";
     file.close();
-    return NullUniValue;
+
+    std::string strWarning = strprintf(_("%s file contains all private keys from this wallet. Do not share it with anyone!"), request.params[0].get_str().c_str());
+    obj.push_back(Pair("keys", int(vKeyBirth.size())));
+    obj.push_back(Pair("file", request.params[0].get_str().c_str()));
+    obj.push_back(Pair("warning", strWarning));
+
+    return obj;
 }
 
 

From 3d002c94637eec55f68f39b1205fdaf24f4689de Mon Sep 17 00:00:00 2001
From: UdjinM6 <UdjinM6@users.noreply.github.com>
Date: Sat, 28 Jul 2018 16:51:13 +0300
Subject: [PATCH 028/400] Fix active masternode task schedule (#2193)

---
 src/init.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/init.cpp b/src/init.cpp
index 0f1d952d3d35..b9416bcdee43 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -1952,7 +1952,7 @@ bool AppInitMain(boost::thread_group& threadGroup, CScheduler& scheduler)
         scheduler.scheduleEvery(boost::bind(&CNetFulfilledRequestManager::DoMaintenance, boost::ref(netfulfilledman)), 60);
         scheduler.scheduleEvery(boost::bind(&CMasternodeSync::DoMaintenance, boost::ref(masternodeSync), boost::ref(*g_connman)), MASTERNODE_SYNC_TICK_SECONDS);
         scheduler.scheduleEvery(boost::bind(&CMasternodeMan::DoMaintenance, boost::ref(mnodeman), boost::ref(*g_connman)), 1);
-        scheduler.scheduleEvery(boost::bind(&CActiveMasternode::DoMaintenance, boost::ref(activeMasternode), boost::ref(*g_connman)), 1);
+        scheduler.scheduleEvery(boost::bind(&CActiveMasternode::DoMaintenance, boost::ref(activeMasternode), boost::ref(*g_connman)), MASTERNODE_MIN_MNP_SECONDS);
 
         scheduler.scheduleEvery(boost::bind(&CMasternodePayments::DoMaintenance, boost::ref(mnpayments)), 60);
         scheduler.scheduleEvery(boost::bind(&CGovernanceManager::DoMaintenance, boost::ref(governance), boost::ref(*g_connman)), 60 * 5);

From 96435288fa6792f70b55dc248464a267c5f1b776 Mon Sep 17 00:00:00 2001
From: UdjinM6 <UdjinM6@users.noreply.github.com>
Date: Sat, 28 Jul 2018 16:51:29 +0300
Subject: [PATCH 029/400] Move block template specific stuff from CBlock to
 CBlockTemplate (#2195)

---
 src/miner.cpp          |  4 ++--
 src/miner.h            |  2 ++
 src/primitives/block.h |  4 ----
 src/rpc/mining.cpp     | 12 ++++++------
 4 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/src/miner.cpp b/src/miner.cpp
index fcb03eae3ad0..0290dedbca18 100644
--- a/src/miner.cpp
+++ b/src/miner.cpp
@@ -170,9 +170,9 @@ std::unique_ptr<CBlockTemplate> BlockAssembler::CreateNewBlock(const CScript& sc
 
     // Update coinbase transaction with additional info about masternode and governance payments,
     // get some info back to pass to getblocktemplate
-    FillBlockPayments(coinbaseTx, nHeight, blockReward, pblock->txoutMasternode, pblock->voutSuperblock);
+    FillBlockPayments(coinbaseTx, nHeight, blockReward, pblocktemplate->txoutMasternode, pblocktemplate->voutSuperblock);
     // LogPrintf("CreateNewBlock -- nBlockHeight %d blockReward %lld txoutMasternode %s coinbaseTx %s",
-    //             nHeight, blockReward, pblock->txoutMasternode.ToString(), coinbaseTx.ToString());
+    //             nHeight, blockReward, pblocktemplate->txoutMasternode.ToString(), coinbaseTx.ToString());
 
     pblock->vtx[0] = MakeTransactionRef(std::move(coinbaseTx));
     pblocktemplate->vTxFees[0] = -nFees;
diff --git a/src/miner.h b/src/miner.h
index 5934492c77f6..7770e95ba0cf 100644
--- a/src/miner.h
+++ b/src/miner.h
@@ -30,6 +30,8 @@ struct CBlockTemplate
     CBlock block;
     std::vector<CAmount> vTxFees;
     std::vector<int64_t> vTxSigOps;
+    CTxOut txoutMasternode; // masternode payment
+    std::vector<CTxOut> voutSuperblock; // superblock payment
 };
 
 // Container for tracking updates to ancestor feerate as we include (parent)
diff --git a/src/primitives/block.h b/src/primitives/block.h
index dbf80237cdb1..dda9a9d609b7 100644
--- a/src/primitives/block.h
+++ b/src/primitives/block.h
@@ -76,8 +76,6 @@ class CBlock : public CBlockHeader
     std::vector<CTransactionRef> vtx;
 
     // memory only
-    mutable CTxOut txoutMasternode; // masternode payment
-    mutable std::vector<CTxOut> voutSuperblock; // superblock payment
     mutable bool fChecked;
 
     CBlock()
@@ -103,8 +101,6 @@ class CBlock : public CBlockHeader
     {
         CBlockHeader::SetNull();
         vtx.clear();
-        txoutMasternode = CTxOut();
-        voutSuperblock.clear();
         fChecked = false;
     }
 
diff --git a/src/rpc/mining.cpp b/src/rpc/mining.cpp
index 0ded5a6c178d..723fc698f8a5 100644
--- a/src/rpc/mining.cpp
+++ b/src/rpc/mining.cpp
@@ -699,21 +699,21 @@ UniValue getblocktemplate(const JSONRPCRequest& request)
     result.push_back(Pair("height", (int64_t)(pindexPrev->nHeight+1)));
 
     UniValue masternodeObj(UniValue::VOBJ);
-    if(pblock->txoutMasternode != CTxOut()) {
+    if(pblocktemplate->txoutMasternode != CTxOut()) {
         CTxDestination address1;
-        ExtractDestination(pblock->txoutMasternode.scriptPubKey, address1);
+        ExtractDestination(pblocktemplate->txoutMasternode.scriptPubKey, address1);
         CBitcoinAddress address2(address1);
         masternodeObj.push_back(Pair("payee", address2.ToString().c_str()));
-        masternodeObj.push_back(Pair("script", HexStr(pblock->txoutMasternode.scriptPubKey)));
-        masternodeObj.push_back(Pair("amount", pblock->txoutMasternode.nValue));
+        masternodeObj.push_back(Pair("script", HexStr(pblocktemplate->txoutMasternode.scriptPubKey)));
+        masternodeObj.push_back(Pair("amount", pblocktemplate->txoutMasternode.nValue));
     }
     result.push_back(Pair("masternode", masternodeObj));
     result.push_back(Pair("masternode_payments_started", pindexPrev->nHeight + 1 > consensusParams.nMasternodePaymentsStartBlock));
     result.push_back(Pair("masternode_payments_enforced", sporkManager.IsSporkActive(SPORK_8_MASTERNODE_PAYMENT_ENFORCEMENT)));
 
     UniValue superblockObjArray(UniValue::VARR);
-    if(pblock->voutSuperblock.size()) {
-        for (const auto& txout : pblock->voutSuperblock) {
+    if(pblocktemplate->voutSuperblock.size()) {
+        for (const auto& txout : pblocktemplate->voutSuperblock) {
             UniValue entry(UniValue::VOBJ);
             CTxDestination address1;
             ExtractDestination(txout.scriptPubKey, address1);

From a83ab550104499ed68713dbbd5bd4a3f7cf7e99a Mon Sep 17 00:00:00 2001
From: UdjinM6 <UdjinM6@users.noreply.github.com>
Date: Sat, 28 Jul 2018 16:51:45 +0300
Subject: [PATCH 030/400] Fix wallet lock check in DoAutomaticDenominating
 (#2196)

---
 src/privatesend-client.cpp | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/privatesend-client.cpp b/src/privatesend-client.cpp
index 2b41408f6afc..5c915c7a7429 100644
--- a/src/privatesend-client.cpp
+++ b/src/privatesend-client.cpp
@@ -700,7 +700,6 @@ bool CPrivateSendClient::DoAutomaticDenominating(CConnman& connman, bool fDryRun
 {
     if(fMasternodeMode) return false; // no client-side mixing on masternodes
     if(!fEnablePrivateSend) return false;
-    if(!pwalletMain || pwalletMain->IsLocked(true)) return false;
     if(nState != POOL_STATE_IDLE) return false;
 
     if(!masternodeSync.IsMasternodeListSynced()) {
@@ -708,6 +707,16 @@ bool CPrivateSendClient::DoAutomaticDenominating(CConnman& connman, bool fDryRun
         return false;
     }
 
+    if (!pwalletMain) {
+        strAutoDenomResult = _("Wallet is not initialized");
+        return false;
+    }
+
+    if(!fDryRun && pwalletMain->IsLocked(true)) {
+        strAutoDenomResult = _("Wallet is locked.");
+        return false;
+    }
+
     if(!CheckAutomaticBackup())
         return false;
 
@@ -722,11 +731,6 @@ bool CPrivateSendClient::DoAutomaticDenominating(CConnman& connman, bool fDryRun
         return false;
     }
 
-    if(!fDryRun && pwalletMain->IsLocked(true)) {
-        strAutoDenomResult = _("Wallet is locked.");
-        return false;
-    }
-
     if(WaitForAnotherBlock()) {
         LogPrintf("CPrivateSendClient::DoAutomaticDenominating -- Last successful PrivateSend action was too recent\n");
         strAutoDenomResult = _("Last successful PrivateSend action was too recent.");

From 0a6f47323ba9da7a25e6bcb8b11aa4b21e6c71fd Mon Sep 17 00:00:00 2001
From: gladcow <sergey@dash.org>
Date: Sat, 28 Jul 2018 19:39:37 +0300
Subject: [PATCH 031/400] Remove dummy confirmations in RPC API and GUI for
 InstantSend transactions (#2040)

* remove instandsenddepth option

* remove CInstantSend::GetConfirmations

* Explicit IXlocks processing in the code using GetDepthInMainChain

* remove dummy confirmations for IX locks

* remove unused constant

* Track IS status in TransactionStatus

* Highlight IS in tx list

* Customize confirmation icons for IS txes

* Fix issues:

- bring back removed comment;
- simplify 2 complex condition to ose `IsTrusted()` function only;
- rename `IsLockedIX` function to 'IsLockedByInstantSend`;

* Revert condition with IsTrusted()

* code style fix

* remove dummy confirmations from instantsend.md

* fix instantsend.md
---
 doc/instantsend.md               | 54 +------------------
 src/governance-object.cpp        |  5 +-
 src/init.cpp                     |  4 --
 src/instantx.cpp                 |  6 ---
 src/instantx.h                   | 10 ----
 src/qt/guiconstants.h            |  2 +
 src/qt/transactionrecord.cpp     |  1 +
 src/qt/transactionrecord.h       |  2 +
 src/qt/transactiontablemodel.cpp | 34 ++++++++++--
 src/qt/walletmodel.cpp           |  2 +-
 src/wallet/rpcwallet.cpp         | 92 ++++++++++++++++----------------
 src/wallet/wallet.cpp            | 38 +++++++------
 src/wallet/wallet.h              |  9 ++--
 13 files changed, 111 insertions(+), 148 deletions(-)

diff --git a/doc/instantsend.md b/doc/instantsend.md
index d85cbf1393cb..bea11735c098 100644
--- a/doc/instantsend.md
+++ b/doc/instantsend.md
@@ -25,56 +25,4 @@ When a wallet InstantSend transaction is successfully locked a shell command pro
 
 #### RPC
 
-Details pertaining to an observed "Transaction Lock" can also be retrieved through RPC, it’s important however to understand the underlying mechanism.
-
-By default, the Dash Core daemon will launch using the following constant:
-
-```
-static const int DEFAULT_INSTANTSEND_DEPTH = 5;
-```
-
-This value can be overridden by passing the following argument to the Dash Core daemon:
-
-```
--instantsenddepth=<n>
-```
-
-The key thing to understand is that this value indicates the number of "confirmations" a successful Transaction Lock represents. When Wallet RPC commands which support `minconf` and `addlockconf` parameters (such as `listreceivedbyaddress`) are performed and `addlockconf` is `true`, then `instantsenddepth` attribute is taken into account when returning information about the transaction. In this case the value in `confirmations` field you see through RPC is showing the number of `"Blockchain Confirmations" + "InstantSend Depth"` (assuming the funds were sent via InstantSend).
-
-There is also a field named `instantlock` (that is present in commands such as `listsinceblock`). The value in this field indicates whether a given transaction is locked via InstantSend.
-
-**Examples**
-
-1. `listreceivedbyaddress 0 true`
-   * InstantSend transaction just occurred:
-        * confirmations: 5
-   * InstantSend transaction received one confirmation from blockchain:
-        * confirmations: 6
-   * non-InstantSend transaction just occurred:
-        * confirmations: 0
-   * non-InstantSend transaction received one confirmation from blockchain:
-        * confirmations: 1
-
-2. `listreceivedbyaddress 0`
-   * InstantSend transaction just occurred:
-        * confirmations: 0
-   * InstantSend transaction received one confirmation from blockchain:
-        * confirmations: 1
-   * non-InstantSend transaction just occurred:
-        * confirmations: 0
-   * non-InstantSend transaction received one confirmation from blockchain:
-        * confirmations: 1
-
-3. `listsinceblock`
-    * InstantSend transaction just occurred:
-        * confirmations: 0
-        * instantlock: true
-    * InstantSend transaction received one confirmation from blockchain:
-        * confirmations: 1
-        * instantlock: true
-    * non-InstantSend transaction just occurred:
-        * confirmations: 0
-        * instantlock: false
-    * non-InstantSend transaction received one confirmation from blockchain:
-        * confirmations: 1
-        * instantlock: false
+Details pertaining to an observed "Transaction Lock" can also be retrieved through RPC. There is a boolean field named `instantlock` which indicates whether a given transaction is locked via InstantSend. This field is present in the output of some wallet RPC commands e.g. `listsinceblock`, `gettransaction` etc. as well as in the output of some mempool RPC commands e.g. `getmempoolentry` and a couple of others like `getrawmempool` (for `verbose=true` only).
diff --git a/src/governance-object.cpp b/src/governance-object.cpp
index 0677ac1e9f08..c62a28177796 100644
--- a/src/governance-object.cpp
+++ b/src/governance-object.cpp
@@ -605,7 +605,7 @@ bool CGovernanceObject::IsCollateralValid(std::string& strError, bool& fMissingC
     // GET CONFIRMATIONS FOR TRANSACTION
 
     AssertLockHeld(cs_main);
-    int nConfirmationsIn = instantsend.GetConfirmations(nCollateralHash);
+    int nConfirmationsIn = 0;
     if (nBlockHash != uint256()) {
         BlockMap::iterator mi = mapBlockIndex.find(nBlockHash);
         if (mi != mapBlockIndex.end() && (*mi).second) {
@@ -616,7 +616,8 @@ bool CGovernanceObject::IsCollateralValid(std::string& strError, bool& fMissingC
         }
     }
 
-    if(nConfirmationsIn < GOVERNANCE_FEE_CONFIRMATIONS) {
+    if((nConfirmationsIn < GOVERNANCE_FEE_CONFIRMATIONS)  &&
+       (!instantsend.IsLockedInstantSendTransaction(nCollateralHash))){
         strError = strprintf("Collateral requires at least %d confirmations to be relayed throughout the network (it has only %d)", GOVERNANCE_FEE_CONFIRMATIONS, nConfirmationsIn);
         if (nConfirmationsIn >= GOVERNANCE_MIN_RELAY_FEE_CONFIRMATIONS) {
             fMissingConfirmations = true;
diff --git a/src/init.cpp b/src/init.cpp
index b9416bcdee43..cc6f38b7fc99 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -576,7 +576,6 @@ std::string HelpMessage(HelpMessageMode mode)
 
     strUsage += HelpMessageGroup(_("InstantSend options:"));
     strUsage += HelpMessageOpt("-enableinstantsend=<n>", strprintf(_("Enable InstantSend, show confirmations for locked transactions (0-1, default: %u)"), 1));
-    strUsage += HelpMessageOpt("-instantsenddepth=<n>", strprintf(_("Show N confirmations for a successfully locked transaction (%u-%u, default: %u)"), MIN_INSTANTSEND_DEPTH, MAX_INSTANTSEND_DEPTH, DEFAULT_INSTANTSEND_DEPTH));
     strUsage += HelpMessageOpt("-instantsendnotify=<cmd>", _("Execute command when a wallet InstantSend transaction is successfully locked (%s in cmd is replaced by TxID)"));
 
 
@@ -1873,11 +1872,8 @@ bool AppInitMain(boost::thread_group& threadGroup, CScheduler& scheduler)
 #endif // ENABLE_WALLET
 
     fEnableInstantSend = GetBoolArg("-enableinstantsend", 1);
-    nInstantSendDepth = GetArg("-instantsenddepth", DEFAULT_INSTANTSEND_DEPTH);
-    nInstantSendDepth = std::min(std::max(nInstantSendDepth, MIN_INSTANTSEND_DEPTH), MAX_INSTANTSEND_DEPTH);
 
     LogPrintf("fLiteMode %d\n", fLiteMode);
-    LogPrintf("nInstantSendDepth %d\n", nInstantSendDepth);
 #ifdef ENABLE_WALLET
     LogPrintf("PrivateSend liquidityprovider: %d\n", privateSendClient.nLiquidityProvider);
     LogPrintf("PrivateSend rounds: %d\n", privateSendClient.nPrivateSendRounds);
diff --git a/src/instantx.cpp b/src/instantx.cpp
index 3f02f4794153..3ede2725dc7e 100644
--- a/src/instantx.cpp
+++ b/src/instantx.cpp
@@ -33,7 +33,6 @@ extern CWallet* pwalletMain;
 extern CTxMemPool mempool;
 
 bool fEnableInstantSend = true;
-int nInstantSendDepth = DEFAULT_INSTANTSEND_DEPTH;
 int nCompleteTXLocks;
 
 CInstantSend instantsend;
@@ -838,11 +837,6 @@ int CInstantSend::GetTransactionLockSignatures(const uint256& txHash)
     return -1;
 }
 
-int CInstantSend::GetConfirmations(const uint256 &nTXHash)
-{
-    return IsLockedInstantSendTransaction(nTXHash) ? nInstantSendDepth : 0;
-}
-
 bool CInstantSend::IsTxLockCandidateTimedOut(const uint256& txHash)
 {
     if(!fEnableInstantSend) return false;
diff --git a/src/instantx.h b/src/instantx.h
index 3448144e1626..46999443978b 100644
--- a/src/instantx.h
+++ b/src/instantx.h
@@ -26,14 +26,6 @@ extern CInstantSend instantsend;
     (1000/2900.0)**5 = 0.004875397277841433
 */
 
-// The INSTANTSEND_DEPTH is the "pseudo block depth" level assigned to locked
-// txs to indicate the degree of confidence in their eventual confirmation and
-// inability to be double-spent (adjustable via command line argument)
-static const int MIN_INSTANTSEND_DEPTH              = 0;
-static const int MAX_INSTANTSEND_DEPTH              = 60;
-/// Default number of "pseudo-confirmations" for an InstantSend tx
-static const int DEFAULT_INSTANTSEND_DEPTH          = 5;
-
 static const int MIN_INSTANTSEND_PROTO_VERSION      = 70208;
 
 /// For how long we are going to accept votes/locks
@@ -145,8 +137,6 @@ class CInstantSend
     bool IsLockedInstantSendTransaction(const uint256& txHash);
     /// Get the actual number of accepted lock signatures
     int GetTransactionLockSignatures(const uint256& txHash);
-    /// Get instantsend confirmations (only)
-    int GetConfirmations(const uint256 &nTXHash);
 
     /// Remove expired entries from maps
     void CheckAndRemove();
diff --git a/src/qt/guiconstants.h b/src/qt/guiconstants.h
index d1d6ae3c4221..e19910f2aecf 100644
--- a/src/qt/guiconstants.h
+++ b/src/qt/guiconstants.h
@@ -34,6 +34,8 @@ static const bool DEFAULT_SPLASHSCREEN = true;
 #define COLOR_TX_STATUS_DANGER QColor(200, 100, 100)
 /* Transaction list -- TX status decoration - default color */
 #define COLOR_BLACK QColor(0, 0, 0)
+/* Transaction list -- TX status decoration - LockedByInstantSend color */
+#define COLOR_TX_STATUS_LOCKED QColor(0, 128, 255)
 
 /* Tooltips longer than this (in characters) are converted into rich text,
    so that they can be word-wrapped.
diff --git a/src/qt/transactionrecord.cpp b/src/qt/transactionrecord.cpp
index 21ee35593c6f..e61667050471 100644
--- a/src/qt/transactionrecord.cpp
+++ b/src/qt/transactionrecord.cpp
@@ -291,6 +291,7 @@ void TransactionRecord::updateStatus(const CWalletTx &wtx)
     }
     else
     {
+        status.lockedByInstantSend = wtx.IsLockedByInstantSend();
         if (status.depth < 0)
         {
             status.status = TransactionStatus::Conflicted;
diff --git a/src/qt/transactionrecord.h b/src/qt/transactionrecord.h
index 673b01736836..9e6bfc377884 100644
--- a/src/qt/transactionrecord.h
+++ b/src/qt/transactionrecord.h
@@ -42,6 +42,8 @@ class TransactionStatus
 
     /// Transaction counts towards available balance
     bool countsForBalance;
+    /// Transaction was locked via InstantSend
+    bool lockedByInstantSend;
     /// Sorting key based on status
     std::string sortKey;
 
diff --git a/src/qt/transactiontablemodel.cpp b/src/qt/transactiontablemodel.cpp
index d24087aca6de..db16222d9149 100644
--- a/src/qt/transactiontablemodel.cpp
+++ b/src/qt/transactiontablemodel.cpp
@@ -484,6 +484,24 @@ QString TransactionTableModel::formatTxAmount(const TransactionRecord *wtx, bool
     return QString(str);
 }
 
+QIcon IconWithShiftedColor(const QString& filename, bool shift)
+{
+    if (!shift)
+        return QIcon(filename);
+
+    QImage img(filename);
+    img = img.convertToFormat(QImage::Format_ARGB32);
+    for (int x = img.width(); x--; )
+    {
+        for (int y = img.height(); y--; )
+        {
+            const QRgb rgb = img.pixel(x, y);
+            img.setPixel(x, y, qRgba(qRed(rgb), qGreen(rgb), qBlue(rgb)+128, qAlpha(rgb)));
+        }
+    }
+    return QIcon(QPixmap::fromImage(img));
+}
+
 QVariant TransactionTableModel::txStatusDecoration(const TransactionRecord *wtx) const
 {
     QString theme = GUIUtil::getThemeName();
@@ -495,17 +513,19 @@ QVariant TransactionTableModel::txStatusDecoration(const TransactionRecord *wtx)
     case TransactionStatus::Offline:
         return COLOR_TX_STATUS_OFFLINE;
     case TransactionStatus::Unconfirmed:
+        // TODO: use special icon for InstantSend 0-conf
         return QIcon(":/icons/" + theme + "/transaction_0");
     case TransactionStatus::Abandoned:
         return QIcon(":/icons/" + theme + "/transaction_abandoned");
     case TransactionStatus::Confirming:
         switch(wtx->status.depth)
         {
-        case 1: return QIcon(":/icons/" + theme + "/transaction_1");
-        case 2: return QIcon(":/icons/" + theme + "/transaction_2");
-        case 3: return QIcon(":/icons/" + theme + "/transaction_3");
-        case 4: return QIcon(":/icons/" + theme + "/transaction_4");
-        default: return QIcon(":/icons/" + theme + "/transaction_5");
+        // TODO: use special icons for InstantSend instead of color shifting
+        case 1: return IconWithShiftedColor(":/icons/" + theme + "/transaction_1", wtx->status.lockedByInstantSend);
+        case 2: return IconWithShiftedColor(":/icons/" + theme + "/transaction_2", wtx->status.lockedByInstantSend);
+        case 3: return IconWithShiftedColor(":/icons/" + theme + "/transaction_3", wtx->status.lockedByInstantSend);
+        case 4: return IconWithShiftedColor(":/icons/" + theme + "/transaction_4", wtx->status.lockedByInstantSend);
+        default: return IconWithShiftedColor(":/icons/" + theme + "/transaction_5", wtx->status.lockedByInstantSend);
         };
     case TransactionStatus::Confirmed:
         return QIcon(":/icons/" + theme + "/transaction_confirmed");
@@ -608,6 +628,10 @@ QVariant TransactionTableModel::data(const QModelIndex &index, int role) const
         {
             return COLOR_TX_STATUS_DANGER;
         }
+        if(rec->status.lockedByInstantSend)
+        {
+            return COLOR_TX_STATUS_LOCKED;
+        }
         // Non-confirmed (but not immature) as transactions are grey
         if(!rec->status.countsForBalance && rec->status.status != TransactionStatus::Immature)
         {
diff --git a/src/qt/walletmodel.cpp b/src/qt/walletmodel.cpp
index d5e5550b599d..c71bf374e4d3 100644
--- a/src/qt/walletmodel.cpp
+++ b/src/qt/walletmodel.cpp
@@ -754,7 +754,7 @@ bool WalletModel::transactionCanBeAbandoned(uint256 hash) const
 {
     LOCK2(cs_main, wallet->cs_wallet);
     const CWalletTx *wtx = wallet->GetWalletTx(hash);
-    if (!wtx || wtx->isAbandoned() || wtx->GetDepthInMainChain() > 0 || wtx->InMempool())
+    if (!wtx || wtx->isAbandoned() || wtx->GetDepthInMainChain() > 0 || wtx->IsLockedByInstantSend() || wtx->InMempool())
         return false;
     return true;
 }
diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index 54daf6c4a4f6..d3dd34e864bf 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -58,7 +58,7 @@ void EnsureWalletIsUnlocked()
 
 void WalletTxToJSON(const CWalletTx& wtx, UniValue& entry)
 {
-    int confirms = wtx.GetDepthInMainChain(false);
+    int confirms = wtx.GetDepthInMainChain();
     bool fLocked = instantsend.IsLockedInstantSendTransaction(wtx.GetHash());
     entry.push_back(Pair("confirmations", confirms));
     entry.push_back(Pair("instantlock", fLocked));
@@ -657,12 +657,12 @@ UniValue getreceivedbyaddress(const JSONRPCRequest& request)
 
     if (request.fHelp || request.params.size() < 1 || request.params.size() > 3)
         throw std::runtime_error(
-            "getreceivedbyaddress \"address\" ( minconf addlockconf )\n"
+            "getreceivedbyaddress \"address\" ( minconf addlocked )\n"
             "\nReturns the total amount received by the given address in transactions with at least minconf confirmations.\n"
             "\nArguments:\n"
             "1. \"address\"         (string, required) The dash address for transactions.\n"
             "2. minconf             (numeric, optional, default=1) Only include transactions confirmed at least this many times.\n"
-            "3. addlockconf         (bool, optional, default=false) Whether to add " + std::to_string(nInstantSendDepth) + " confirmations to transactions locked via InstantSend.\n"
+            "3. addlocked           (bool, optional, default=false) Whether to include transactions locked via InstantSend.\n"
             "\nResult:\n"
             "amount   (numeric) The total amount in " + CURRENCY_UNIT + " received at this address.\n"
             "\nExamples:\n"
@@ -690,7 +690,7 @@ UniValue getreceivedbyaddress(const JSONRPCRequest& request)
     int nMinDepth = 1;
     if (request.params.size() > 1)
         nMinDepth = request.params[1].get_int();
-    bool fAddLockConf = (request.params.size() > 2 && request.params[2].get_bool());
+    bool fAddLocked = (request.params.size() > 2 && request.params[2].get_bool());
 
     // Tally
     CAmount nAmount = 0;
@@ -702,7 +702,7 @@ UniValue getreceivedbyaddress(const JSONRPCRequest& request)
 
         BOOST_FOREACH(const CTxOut& txout, wtx.tx->vout)
             if (txout.scriptPubKey == scriptPubKey)
-                if (wtx.GetDepthInMainChain(fAddLockConf) >= nMinDepth)
+                if ((wtx.GetDepthInMainChain() >= nMinDepth) || (fAddLocked && wtx.IsLockedByInstantSend()))
                     nAmount += txout.nValue;
     }
 
@@ -717,12 +717,12 @@ UniValue getreceivedbyaccount(const JSONRPCRequest& request)
 
     if (request.fHelp || request.params.size() < 1 || request.params.size() > 3)
         throw std::runtime_error(
-            "getreceivedbyaccount \"account\" ( minconf addlockconf )\n"
+            "getreceivedbyaccount \"account\" ( minconf addlocked )\n"
             "\nDEPRECATED. Returns the total amount received by addresses with <account> in transactions with specified minimum number of confirmations.\n"
             "\nArguments:\n"
             "1. \"account\"      (string, required) The selected account, may be the default account using \"\".\n"
             "2. minconf        (numeric, optional, default=1) Only include transactions confirmed at least this many times.\n"
-            "3. addlockconf    (bool, optional, default=false) Whether to add " + std::to_string(nInstantSendDepth) + " confirmations to transactions locked via InstantSend.\n"
+            "3. addlocked      (bool, optional, default=false) Whether to include transactions locked via InstantSend.\n"
             "\nResult:\n"
             "amount            (numeric) The total amount in " + CURRENCY_UNIT + " received for this account.\n"
             "\nExamples:\n"
@@ -742,7 +742,7 @@ UniValue getreceivedbyaccount(const JSONRPCRequest& request)
     int nMinDepth = 1;
     if (request.params.size() > 1)
         nMinDepth = request.params[1].get_int();
-    bool fAddLockConf = (request.params.size() > 2 && request.params[2].get_bool());
+    bool fAddLocked = (request.params.size() > 2 && request.params[2].get_bool());
 
     // Get the set of pub keys assigned to account
     std::string strAccount = AccountFromValue(request.params[0]);
@@ -760,7 +760,7 @@ UniValue getreceivedbyaccount(const JSONRPCRequest& request)
         {
             CTxDestination address;
             if (ExtractDestination(txout.scriptPubKey, address) && IsMine(*pwalletMain, address) && setAddress.count(address))
-                if (wtx.GetDepthInMainChain(fAddLockConf) >= nMinDepth)
+                if ((wtx.GetDepthInMainChain() >= nMinDepth) || (fAddLocked && wtx.IsLockedByInstantSend()))
                     nAmount += txout.nValue;
         }
     }
@@ -776,7 +776,7 @@ UniValue getbalance(const JSONRPCRequest& request)
 
     if (request.fHelp || request.params.size() > 4)
         throw std::runtime_error(
-            "getbalance ( \"account\" minconf addlockconf include_watchonly )\n"
+            "getbalance ( \"account\" minconf addlocked include_watchonly )\n"
             "\nIf account is not specified, returns the server's total available balance.\n"
             "If account is specified (DEPRECATED), returns the balance in the account.\n"
             "Note that the account \"\" is not the same as leaving the parameter out.\n"
@@ -784,7 +784,7 @@ UniValue getbalance(const JSONRPCRequest& request)
             "\nArguments:\n"
             "1. \"account\"        (string, optional) DEPRECATED. The selected account, or \"*\" for entire wallet. It may be the default account using \"\".\n"
             "2. minconf          (numeric, optional, default=1) Only include transactions confirmed at least this many times.\n"
-            "3. addlockconf      (bool, optional, default=false) Whether to add " + std::to_string(nInstantSendDepth) + " confirmations to transactions locked via InstantSend.\n"
+            "3. addlocked      (bool, optional, default=false) Whether to add  balance from transactions locked via InstantSend.\n"
             "4. include_watchonly (bool, optional, default=false) Also include balance in watch-only addresses (see 'importaddress')\n"
             "\nResult:\n"
             "amount              (numeric) The total amount in " + CURRENCY_UNIT + " received for this account.\n"
@@ -805,7 +805,7 @@ UniValue getbalance(const JSONRPCRequest& request)
     int nMinDepth = 1;
     if (request.params.size() > 1)
         nMinDepth = request.params[1].get_int();
-    bool fAddLockConf = (request.params.size() > 2 && request.params[2].get_bool());
+    bool fAddLocked = (request.params.size() > 2 && request.params[2].get_bool());
     isminefilter filter = ISMINE_SPENDABLE;
     if(request.params.size() > 3)
         if(request.params[3].get_bool())
@@ -827,7 +827,7 @@ UniValue getbalance(const JSONRPCRequest& request)
             std::list<COutputEntry> listReceived;
             std::list<COutputEntry> listSent;
             wtx.GetAmounts(listReceived, listSent, allFee, strSentAccount, filter);
-            if (wtx.GetDepthInMainChain(fAddLockConf) >= nMinDepth)
+            if ((wtx.GetDepthInMainChain() >= nMinDepth) || (fAddLocked && wtx.IsLockedByInstantSend()))
             {
                 BOOST_FOREACH(const COutputEntry& r, listReceived)
                     nBalance += r.amount;
@@ -841,7 +841,7 @@ UniValue getbalance(const JSONRPCRequest& request)
 
     std::string strAccount = AccountFromValue(request.params[0]);
 
-    CAmount nBalance = pwalletMain->GetAccountBalance(strAccount, nMinDepth, filter, fAddLockConf);
+    CAmount nBalance = pwalletMain->GetAccountBalance(strAccount, nMinDepth, filter, fAddLocked);
 
     return ValueFromAmount(nBalance);
 }
@@ -916,7 +916,7 @@ UniValue sendfrom(const JSONRPCRequest& request)
 
     if (request.fHelp || request.params.size() < 3 || request.params.size() > 7)
         throw std::runtime_error(
-            "sendfrom \"fromaccount\" \"toaddress\" amount ( minconf addlockconf \"comment\" \"comment_to\" )\n"
+            "sendfrom \"fromaccount\" \"toaddress\" amount ( minconf addlocked \"comment\" \"comment_to\" )\n"
             "\nDEPRECATED (use sendtoaddress). Sent an amount from an account to a dash address."
             + HelpRequiringPassphrase() + "\n"
             "\nArguments:\n"
@@ -927,7 +927,7 @@ UniValue sendfrom(const JSONRPCRequest& request)
             "2. \"toaddress\"         (string, required) The dash address to send funds to.\n"
             "3. amount              (numeric or string, required) The amount in " + CURRENCY_UNIT + " (transaction fee is added on top).\n"
             "4. minconf             (numeric, optional, default=1) Only use funds with at least this many confirmations.\n"
-            "5. addlockconf         (bool, optional, default=false) Whether to add " + std::to_string(nInstantSendDepth) + " confirmations to transactions locked via InstantSend.\n"
+            "5. addlocked         (bool, optional, default=false) Whether to include transactions locked via InstantSend.\n"
             "6. \"comment\"           (string, optional) A comment used to store what the transaction is for. \n"
             "                       This is not part of the transaction, just kept in your wallet.\n"
             "7. \"comment_to\"        (string, optional) An optional comment to store the name of the person or organization \n"
@@ -956,7 +956,7 @@ UniValue sendfrom(const JSONRPCRequest& request)
     int nMinDepth = 1;
     if (request.params.size() > 3)
         nMinDepth = request.params[3].get_int();
-    bool fAddLockConf = (request.params.size() > 4 && request.params[4].get_bool());
+    bool fAddLocked = (request.params.size() > 4 && request.params[4].get_bool());
 
     CWalletTx wtx;
     wtx.strFromAccount = strAccount;
@@ -968,7 +968,7 @@ UniValue sendfrom(const JSONRPCRequest& request)
     EnsureWalletIsUnlocked();
 
     // Check funds
-    CAmount nBalance = pwalletMain->GetAccountBalance(strAccount, nMinDepth, ISMINE_SPENDABLE, fAddLockConf);
+    CAmount nBalance = pwalletMain->GetAccountBalance(strAccount, nMinDepth, ISMINE_SPENDABLE, fAddLocked);
     if (nAmount > nBalance)
         throw JSONRPCError(RPC_WALLET_INSUFFICIENT_FUNDS, "Account has insufficient funds");
 
@@ -985,7 +985,7 @@ UniValue sendmany(const JSONRPCRequest& request)
 
     if (request.fHelp || request.params.size() < 2 || request.params.size() > 8)
         throw std::runtime_error(
-            "sendmany \"fromaccount\" {\"address\":amount,...} ( minconf addlockconf \"comment\" [\"address\",...] subtractfeefromamount use_is use_ps )\n"
+            "sendmany \"fromaccount\" {\"address\":amount,...} ( minconf addlocked \"comment\" [\"address\",...] subtractfeefromamount use_is use_ps )\n"
             "\nSend multiple times. Amounts are double-precision floating point numbers."
             + HelpRequiringPassphrase() + "\n"
             "\nArguments:\n"
@@ -996,7 +996,7 @@ UniValue sendmany(const JSONRPCRequest& request)
             "      ,...\n"
             "    }\n"
             "3. minconf                 (numeric, optional, default=1) Only use the balance confirmed at least this many times.\n"
-            "4. addlockconf             (bool, optional, default=false) Whether to add " + std::to_string(nInstantSendDepth) + " confirmations to transactions locked via InstantSend.\n"
+            "4. addlocked               (bool, optional, default=false) Whether to include transactions locked via InstantSend.\n"
             "5. \"comment\"               (string, optional) A comment\n"
             "6. subtractfeefromamount   (array, optional) A json array with addresses.\n"
             "                           The fee will be equally deducted from the amount of each selected address.\n"
@@ -1030,7 +1030,7 @@ UniValue sendmany(const JSONRPCRequest& request)
     int nMinDepth = 1;
     if (request.params.size() > 2)
         nMinDepth = request.params[2].get_int();
-    bool fAddLockConf = (request.params.size() > 3 && request.params[3].get_bool());
+    bool fAddLocked = (request.params.size() > 3 && request.params[3].get_bool());
 
     CWalletTx wtx;
     wtx.strFromAccount = strAccount;
@@ -1076,7 +1076,7 @@ UniValue sendmany(const JSONRPCRequest& request)
     EnsureWalletIsUnlocked();
 
     // Check funds
-    CAmount nBalance = pwalletMain->GetAccountBalance(strAccount, nMinDepth, ISMINE_SPENDABLE, fAddLockConf);
+    CAmount nBalance = pwalletMain->GetAccountBalance(strAccount, nMinDepth, ISMINE_SPENDABLE, fAddLocked);
     if (totalAmount > nBalance)
         throw JSONRPCError(RPC_WALLET_INSUFFICIENT_FUNDS, "Account has insufficient funds");
 
@@ -1177,7 +1177,7 @@ UniValue ListReceived(const UniValue& params, bool fByAccounts)
     int nMinDepth = 1;
     if (params.size() > 0)
         nMinDepth = params[0].get_int();
-    bool fAddLockConf = (params.size() > 1 && params[1].get_bool());
+    bool fAddLocked = (params.size() > 1 && params[1].get_bool());
 
     // Whether to include empty accounts
     bool fIncludeEmpty = false;
@@ -1198,8 +1198,8 @@ UniValue ListReceived(const UniValue& params, bool fByAccounts)
         if (wtx.IsCoinBase() || !CheckFinalTx(*wtx.tx))
             continue;
 
-        int nDepth = wtx.GetDepthInMainChain(fAddLockConf);
-        if (nDepth < nMinDepth)
+        int nDepth = wtx.GetDepthInMainChain();
+        if ((nDepth < nMinDepth) && !(fAddLocked && wtx.IsLockedByInstantSend()))
             continue;
 
         BOOST_FOREACH(const CTxOut& txout, wtx.tx->vout)
@@ -1303,11 +1303,11 @@ UniValue listreceivedbyaddress(const JSONRPCRequest& request)
 
     if (request.fHelp || request.params.size() > 4)
         throw std::runtime_error(
-            "listreceivedbyaddress ( minconf addlockconf include_empty include_watchonly)\n"
+            "listreceivedbyaddress ( minconf addlocked include_empty include_watchonly)\n"
             "\nList incoming payments grouped by receiving address.\n"
             "\nArguments:\n"
             "1. minconf           (numeric, optional, default=1) The minimum number of confirmations before payments are included.\n"
-            "2. addlockconf       (bool, optional, default=false) Whether to add " + std::to_string(nInstantSendDepth) + " confirmations to transactions locked via InstantSend.\n"
+            "2. addlocked         (bool, optional, default=false) Whether to include transactions locked via InstantSend.\n"
             "3. include_empty     (bool, optional, default=false) Whether to include addresses that haven't received any payments.\n"
             "4. include_watchonly (bool, optional, default=false) Whether to include watch-only addresses (see 'importaddress').\n"
 
@@ -1319,8 +1319,8 @@ UniValue listreceivedbyaddress(const JSONRPCRequest& request)
             "    \"account\" : \"accountname\",         (string) DEPRECATED. The account of the receiving address. The default account is \"\".\n"
             "    \"amount\" : x.xxx,                  (numeric) The total amount in " + CURRENCY_UNIT + " received by the address\n"
             "    \"confirmations\" : n                (numeric) The number of confirmations of the most recent transaction included.\n"
-            "                                                 If 'addlockconf' is true, the minimum number of confirmations is calculated\n"
-            "                                                 including additional " + std::to_string(nInstantSendDepth) + " confirmations for transactions locked via InstantSend\n"
+            "                                                 If 'addlocked' is true, the number of confirmations can be less than\n"
+            "                                                 configured for transactions locked via InstantSend\n"
             "    \"label\" : \"label\",               (string) A comment for the address/transaction, if any\n"
             "    \"txids\": [\n"
             "       n,                                (numeric) The ids of transactions received with the address \n"
@@ -1348,11 +1348,11 @@ UniValue listreceivedbyaccount(const JSONRPCRequest& request)
 
     if (request.fHelp || request.params.size() > 4)
         throw std::runtime_error(
-            "listreceivedbyaccount ( minconf addlockconf include_empty include_watchonly)\n"
+            "listreceivedbyaccount ( minconf addlocked include_empty include_watchonly)\n"
             "\nDEPRECATED. List incoming payments grouped by account.\n"
             "\nArguments:\n"
             "1. minconf           (numeric, optional, default=1) The minimum number of confirmations before payments are included.\n"
-            "2. addlockconf       (bool, optional, default=false) Whether to add " + std::to_string(nInstantSendDepth) + " confirmations to transactions locked via InstantSend.\n"
+            "2. addlocked         (bool, optional, default=false) Whether to include transactions locked via InstantSend.\n"
             "3. include_empty     (bool, optional, default=false) Whether to include accounts that haven't received any payments.\n"
             "4. include_watchonly (bool, optional, default=false) Whether to include watch-only addresses (see 'importaddress').\n"
 
@@ -1423,7 +1423,7 @@ void ListTransactions(const CWalletTx& wtx, const std::string& strAccount, int n
     }
 
     // Received
-    if (listReceived.size() > 0 && wtx.GetDepthInMainChain() >= nMinDepth)
+    if (listReceived.size() > 0 && ((wtx.GetDepthInMainChain() >= nMinDepth) || wtx.IsLockedByInstantSend()))
     {
         BOOST_FOREACH(const COutputEntry& r, listReceived)
         {
@@ -1615,11 +1615,11 @@ UniValue listaccounts(const JSONRPCRequest& request)
 
     if (request.fHelp || request.params.size() > 3)
         throw std::runtime_error(
-            "listaccounts ( minconf addlockconf include_watchonly)\n"
+            "listaccounts ( minconf addlocked include_watchonly)\n"
             "\nDEPRECATED. Returns Object that has account names as keys, account balances as values.\n"
             "\nArguments:\n"
             "1. minconf             (numeric, optional, default=1) Only include transactions with at least this many confirmations\n"
-            "2. addlockconf         (bool, optional, default=false) Whether to add " + std::to_string(nInstantSendDepth) + " confirmations to transactions locked via InstantSend.\n"
+            "2. addlocked           (bool, optional, default=false) Whether to include transactions locked via InstantSend.\n"
             "3. include_watchonly   (bool, optional, default=false) Include balances in watch-only addresses (see 'importaddress')\n"
             "\nResult:\n"
             "{                    (json object where keys are account names, and values are numeric balances\n"
@@ -1642,7 +1642,7 @@ UniValue listaccounts(const JSONRPCRequest& request)
     int nMinDepth = 1;
     if (request.params.size() > 0)
         nMinDepth = request.params[0].get_int();
-    bool fAddLockConf = (request.params.size() > 1 && request.params[1].get_bool());
+    bool fAddLocked = (request.params.size() > 1 && request.params[1].get_bool());
     isminefilter includeWatchonly = ISMINE_SPENDABLE;
     if(request.params.size() > 2)
         if(request.params[2].get_bool())
@@ -1661,14 +1661,14 @@ UniValue listaccounts(const JSONRPCRequest& request)
         std::string strSentAccount;
         std::list<COutputEntry> listReceived;
         std::list<COutputEntry> listSent;
-        int nDepth = wtx.GetDepthInMainChain(fAddLockConf);
+        int nDepth = wtx.GetDepthInMainChain();
         if (wtx.GetBlocksToMaturity() > 0 || nDepth < 0)
             continue;
         wtx.GetAmounts(listReceived, listSent, nFee, strSentAccount, includeWatchonly);
         mapAccountBalances[strSentAccount] -= nFee;
         BOOST_FOREACH(const COutputEntry& s, listSent)
             mapAccountBalances[strSentAccount] -= s.amount;
-        if (nDepth >= nMinDepth)
+        if ((nDepth >= nMinDepth) || (fAddLocked && wtx.IsLockedByInstantSend()))
         {
             BOOST_FOREACH(const COutputEntry& r, listReceived)
                 if (pwalletMain->mapAddressBook.count(r.destination))
@@ -1784,7 +1784,7 @@ UniValue listsinceblock(const JSONRPCRequest& request)
     {
         CWalletTx tx = (*it).second;
 
-        if (depth == -1 || tx.GetDepthInMainChain(false) < depth)
+        if (depth == -1 || tx.GetDepthInMainChain() < depth)
             ListTransactions(tx, "*", 0, true, transactions, filter);
     }
 
@@ -2856,11 +2856,11 @@ static const CRPCCommand commands[] =
     { "wallet",             "getaccountaddress",        &getaccountaddress,        true,   {"account"} },
     { "wallet",             "getaccount",               &getaccount,               true,   {"address"} },
     { "wallet",             "getaddressesbyaccount",    &getaddressesbyaccount,    true,   {"account"} },
-    { "wallet",             "getbalance",               &getbalance,               false,  {"account","minconf","addlockconf","include_watchonly"} },
+    { "wallet",             "getbalance",               &getbalance,               false,  {"account","minconf","addlocked","include_watchonly"} },
     { "wallet",             "getnewaddress",            &getnewaddress,            true,   {"account"} },
     { "wallet",             "getrawchangeaddress",      &getrawchangeaddress,      true,   {} },
-    { "wallet",             "getreceivedbyaccount",     &getreceivedbyaccount,     false,  {"account","minconf","addlockconf"} },
-    { "wallet",             "getreceivedbyaddress",     &getreceivedbyaddress,     false,  {"address","minconf","addlockconf"} },
+    { "wallet",             "getreceivedbyaccount",     &getreceivedbyaccount,     false,  {"account","minconf","addlocked"} },
+    { "wallet",             "getreceivedbyaddress",     &getreceivedbyaddress,     false,  {"address","minconf","addlocked"} },
     { "wallet",             "gettransaction",           &gettransaction,           false,  {"txid","include_watchonly"} },
     { "wallet",             "getunconfirmedbalance",    &getunconfirmedbalance,    false,  {} },
     { "wallet",             "getwalletinfo",            &getwalletinfo,            false,  {} },
@@ -2871,19 +2871,19 @@ static const CRPCCommand commands[] =
     { "wallet",             "importprunedfunds",        &importprunedfunds,        true,   {"rawtransaction","txoutproof"} },
     { "wallet",             "importpubkey",             &importpubkey,             true,   {"pubkey","label","rescan"} },
     { "wallet",             "keypoolrefill",            &keypoolrefill,            true,   {"newsize"} },
-    { "wallet",             "listaccounts",             &listaccounts,             false,  {"minconf","addlockconf","include_watchonly"} },
+    { "wallet",             "listaccounts",             &listaccounts,             false,  {"minconf","addlocked","include_watchonly"} },
     { "wallet",             "listaddressgroupings",     &listaddressgroupings,     false,  {} },
     { "wallet",             "listaddressbalances",      &listaddressbalances,      false,  {"minamount"} },
     { "wallet",             "listlockunspent",          &listlockunspent,          false,  {} },
-    { "wallet",             "listreceivedbyaccount",    &listreceivedbyaccount,    false,  {"minconf","addlockconf","include_empty","include_watchonly"} },
-    { "wallet",             "listreceivedbyaddress",    &listreceivedbyaddress,    false,  {"minconf","addlockconf","include_empty","include_watchonly"} },
+    { "wallet",             "listreceivedbyaccount",    &listreceivedbyaccount,    false,  {"minconf","addlocked","include_empty","include_watchonly"} },
+    { "wallet",             "listreceivedbyaddress",    &listreceivedbyaddress,    false,  {"minconf","addlocked","include_empty","include_watchonly"} },
     { "wallet",             "listsinceblock",           &listsinceblock,           false,  {"blockhash","target_confirmations","include_watchonly"} },
     { "wallet",             "listtransactions",         &listtransactions,         false,  {"account","count","skip","include_watchonly"} },
     { "wallet",             "listunspent",              &listunspent,              false,  {"minconf","maxconf","addresses","include_unsafe"} },
     { "wallet",             "lockunspent",              &lockunspent,              true,   {"unlock","transactions"} },
     { "wallet",             "move",                     &movecmd,                  false,  {"fromaccount","toaccount","amount","minconf","comment"} },
-    { "wallet",             "sendfrom",                 &sendfrom,                 false,  {"fromaccount","toaddress","amount","minconf","addlockconf","comment","comment_to"} },
-    { "wallet",             "sendmany",                 &sendmany,                 false,  {"fromaccount","amounts","minconf","addlockconf","comment","subtractfeefrom"} },
+    { "wallet",             "sendfrom",                 &sendfrom,                 false,  {"fromaccount","toaddress","amount","minconf","addlocked","comment","comment_to"} },
+    { "wallet",             "sendmany",                 &sendmany,                 false,  {"fromaccount","amounts","minconf","addlocked","comment","subtractfeefrom"} },
     { "wallet",             "sendtoaddress",            &sendtoaddress,            false,  {"address","amount","comment","comment_to","subtractfeefromamount"} },
     { "wallet",             "setaccount",               &setaccount,               true,   {"address","account"} },
     { "wallet",             "settxfee",                 &settxfee,                 true,   {"amount"} },
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
index 2260fc5da9c3..6ae8b8b2499b 100644
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -1259,7 +1259,7 @@ bool CWallet::AbandonTransaction(const uint256& hashTx)
     // Can't mark abandoned if confirmed or in mempool
     assert(mapWallet.count(hashTx));
     CWalletTx& origtx = mapWallet[hashTx];
-    if (origtx.GetDepthInMainChain() > 0 || origtx.InMempool()) {
+    if (origtx.GetDepthInMainChain() > 0 || origtx.InMempool() || origtx.IsLockedByInstantSend()) {
         return false;
     }
 
@@ -1945,7 +1945,7 @@ void CWallet::ReacceptWalletTransactions()
 
         int nDepth = wtx.GetDepthInMainChain();
 
-        if (!wtx.IsCoinBase() && (nDepth == 0 && !wtx.isAbandoned())) {
+        if (!wtx.IsCoinBase() && (nDepth == 0 && !wtx.IsLockedByInstantSend() && !wtx.isAbandoned())) {
             mapSorted.insert(std::make_pair(wtx.nOrderPos, &wtx));
         }
     }
@@ -2194,7 +2194,7 @@ CAmount CWalletTx::GetDenominatedCredit(bool unconfirmed, bool fUseCache) const
     if (IsCoinBase() && GetBlocksToMaturity() > 0)
         return 0;
 
-    int nDepth = GetDepthInMainChain(false);
+    int nDepth = GetDepthInMainChain();
     if(nDepth < 0) return 0;
 
     bool isUnconfirmed = IsTrusted() && nDepth == 0;
@@ -2258,6 +2258,8 @@ bool CWalletTx::IsTrusted() const
         return true;
     if (nDepth < 0)
         return false;
+    if (IsLockedByInstantSend())
+        return true;
     if (!bSpendZeroConfChange || !IsFromMe(ISMINE_ALL)) // using wtx's cached debit
         return false;
 
@@ -2501,7 +2503,7 @@ CAmount CWallet::GetUnconfirmedBalance() const
         for (std::map<uint256, CWalletTx>::const_iterator it = mapWallet.begin(); it != mapWallet.end(); ++it)
         {
             const CWalletTx* pcoin = &(*it).second;
-            if (!pcoin->IsTrusted() && pcoin->GetDepthInMainChain() == 0 && pcoin->InMempool())
+            if (!pcoin->IsTrusted() && pcoin->GetDepthInMainChain() == 0 && !pcoin->IsLockedByInstantSend() && pcoin->InMempool())
                 nTotal += pcoin->GetAvailableCredit();
         }
     }
@@ -2546,7 +2548,7 @@ CAmount CWallet::GetUnconfirmedWatchOnlyBalance() const
         for (std::map<uint256, CWalletTx>::const_iterator it = mapWallet.begin(); it != mapWallet.end(); ++it)
         {
             const CWalletTx* pcoin = &(*it).second;
-            if (!pcoin->IsTrusted() && pcoin->GetDepthInMainChain() == 0 && pcoin->InMempool())
+            if (!pcoin->IsTrusted() && pcoin->GetDepthInMainChain() == 0 && !pcoin->IsLockedByInstantSend() && pcoin->InMempool())
                 nTotal += pcoin->GetAvailableWatchOnlyCredit();
         }
     }
@@ -2589,7 +2591,7 @@ void CWallet::AvailableCoins(std::vector<COutput>& vCoins, bool fOnlyConfirmed,
             if (pcoin->IsCoinBase() && pcoin->GetBlocksToMaturity() > 0)
                 continue;
 
-            int nDepth = pcoin->GetDepthInMainChain(false);
+            int nDepth = pcoin->GetDepthInMainChain();
             // do not use IX for inputs that have less then nInstantSendConfirmationsRequired blockchain confirmations
             if (fUseInstantSend && nDepth < nInstantSendConfirmationsRequired)
                 continue;
@@ -3277,7 +3279,7 @@ int CWallet::CountInputsWithAmount(CAmount nInputAmount)
         {
             const CWalletTx* pcoin = &(*it).second;
             if (pcoin->IsTrusted()){
-                int nDepth = pcoin->GetDepthInMainChain(false);
+                int nDepth = pcoin->GetDepthInMainChain();
 
                 for (unsigned int i = 0; i < pcoin->tx->vout.size(); i++) {
                     COutput out = COutput(pcoin, i, nDepth, true, true);
@@ -4315,7 +4317,7 @@ std::map<CTxDestination, CAmount> CWallet::GetAddressBalances()
                 continue;
 
             int nDepth = pcoin->GetDepthInMainChain();
-            if (nDepth < (pcoin->IsFromMe(ISMINE_ALL) ? 0 : 1))
+            if ((nDepth < (pcoin->IsFromMe(ISMINE_ALL) ? 0 : 1)) && !pcoin->IsLockedByInstantSend())
                 continue;
 
             for (unsigned int i = 0; i < pcoin->tx->vout.size(); i++)
@@ -4431,13 +4433,13 @@ std::set< std::set<CTxDestination> > CWallet::GetAddressGroupings()
     return ret;
 }
 
-CAmount CWallet::GetAccountBalance(const std::string& strAccount, int nMinDepth, const isminefilter& filter, bool fAddLockConf)
+CAmount CWallet::GetAccountBalance(const std::string& strAccount, int nMinDepth, const isminefilter& filter, bool fAddLocked)
 {
     CWalletDB walletdb(strWalletFile);
-    return GetAccountBalance(walletdb, strAccount, nMinDepth, filter, fAddLockConf);
+    return GetAccountBalance(walletdb, strAccount, nMinDepth, filter, fAddLocked);
 }
 
-CAmount CWallet::GetAccountBalance(CWalletDB& walletdb, const std::string& strAccount, int nMinDepth, const isminefilter& filter, bool fAddLockConf)
+CAmount CWallet::GetAccountBalance(CWalletDB& walletdb, const std::string& strAccount, int nMinDepth, const isminefilter& filter, bool fAddLocked)
 {
     CAmount nBalance = 0;
 
@@ -4445,13 +4447,13 @@ CAmount CWallet::GetAccountBalance(CWalletDB& walletdb, const std::string& strAc
     for (std::map<uint256, CWalletTx>::iterator it = mapWallet.begin(); it != mapWallet.end(); ++it)
     {
         const CWalletTx& wtx = (*it).second;
-        if (!CheckFinalTx(wtx) || wtx.GetBlocksToMaturity() > 0 || wtx.GetDepthInMainChain(fAddLockConf) < 0)
+        if (!CheckFinalTx(wtx) || wtx.GetBlocksToMaturity() > 0 || wtx.GetDepthInMainChain() < 0)
             continue;
 
         CAmount nReceived, nSent, nFee;
         wtx.GetAccountAmounts(strAccount, nReceived, nSent, nFee, filter);
 
-        if (nReceived != 0 && wtx.GetDepthInMainChain(fAddLockConf) >= nMinDepth)
+        if (nReceived != 0 && ((wtx.GetDepthInMainChain() >= nMinDepth) || (fAddLocked && wtx.IsLockedByInstantSend())))
             nBalance += nReceived;
         nBalance -= nSent + nFee;
     }
@@ -5349,7 +5351,7 @@ void CMerkleTx::SetMerkleBranch(const CBlockIndex* pindex, int posInBlock)
     nIndex = posInBlock;
 }
 
-int CMerkleTx::GetDepthInMainChain(const CBlockIndex* &pindexRet, bool enableIX) const
+int CMerkleTx::GetDepthInMainChain(const CBlockIndex* &pindexRet) const
 {
     int nResult;
 
@@ -5376,12 +5378,14 @@ int CMerkleTx::GetDepthInMainChain(const CBlockIndex* &pindexRet, bool enableIX)
         }
     }
 
-    if(enableIX && nResult < 6 && instantsend.IsLockedInstantSendTransaction(GetHash()))
-        return nInstantSendDepth + nResult;
-
     return nResult;
 }
 
+bool CMerkleTx::IsLockedByInstantSend() const
+{
+    return instantsend.IsLockedInstantSendTransaction(GetHash());
+}
+
 int CMerkleTx::GetBlocksToMaturity() const
 {
     if (!IsCoinBase())
diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h
index ee7b9376c147..3f443332f685 100644
--- a/src/wallet/wallet.h
+++ b/src/wallet/wallet.h
@@ -271,9 +271,10 @@ class CMerkleTx
      *  0  : in memory pool, waiting to be included in a block
      * >=1 : this many blocks deep in the main chain
      */
-    int GetDepthInMainChain(const CBlockIndex* &pindexRet, bool enableIX = true) const;
-    int GetDepthInMainChain(bool enableIX = true) const { const CBlockIndex *pindexRet; return GetDepthInMainChain(pindexRet, enableIX); }
+    int GetDepthInMainChain(const CBlockIndex* &pindexRet) const;
+    int GetDepthInMainChain() const { const CBlockIndex *pindexRet; return GetDepthInMainChain(pindexRet); }
     bool IsInMainChain() const { const CBlockIndex *pindexRet; return GetDepthInMainChain(pindexRet) > 0; }
+    bool IsLockedByInstantSend() const;
     int GetBlocksToMaturity() const;
     /** Pass this transaction to the mempool. Fails if absolute fee exceeds absurd fee. */
     bool AcceptToMemoryPool(const CAmount& nAbsurdFee, CValidationState& state);
@@ -977,8 +978,8 @@ class CWallet : public CCryptoKeyStore, public CValidationInterface
     std::set< std::set<CTxDestination> > GetAddressGroupings();
     std::map<CTxDestination, CAmount> GetAddressBalances();
 
-    CAmount GetAccountBalance(const std::string& strAccount, int nMinDepth, const isminefilter& filter, bool fAddLockConf);
-    CAmount GetAccountBalance(CWalletDB& walletdb, const std::string& strAccount, int nMinDepth, const isminefilter& filter, bool fAddLockConf);
+    CAmount GetAccountBalance(const std::string& strAccount, int nMinDepth, const isminefilter& filter, bool fAddLocked);
+    CAmount GetAccountBalance(CWalletDB& walletdb, const std::string& strAccount, int nMinDepth, const isminefilter& filter, bool fAddLocked);
     std::set<CTxDestination> GetAccountAddresses(const std::string& strAccount) const;
 
     isminetype IsMine(const CTxIn& txin) const;

From 6bcd868de743141ec7df7b0fce00eaf79ebf7f44 Mon Sep 17 00:00:00 2001
From: UdjinM6 <UdjinM6@users.noreply.github.com>
Date: Sun, 29 Jul 2018 09:39:37 +0300
Subject: [PATCH 032/400] Fix lockedByInstantSend initialization (#2197)

---
 src/qt/transactionrecord.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/qt/transactionrecord.h b/src/qt/transactionrecord.h
index 9e6bfc377884..95027928a7ff 100644
--- a/src/qt/transactionrecord.h
+++ b/src/qt/transactionrecord.h
@@ -20,7 +20,7 @@ class TransactionStatus
 {
 public:
     TransactionStatus():
-        countsForBalance(false), sortKey(""),
+        countsForBalance(false), lockedByInstantSend(false), sortKey(""),
         matures_in(0), status(Offline), depth(0), open_for(0), cur_num_blocks(-1)
     { }
 

From d4d11476aa47c964abccd6ee0c47690cddcae8e9 Mon Sep 17 00:00:00 2001
From: strophy <32928115+strophy@users.noreply.github.com>
Date: Sat, 4 Aug 2018 21:38:57 +0800
Subject: [PATCH 033/400] Fix typo and grammar in PS error message (#2199)

* Fix typo

* Grammar fix
---
 src/qt/coincontroldialog.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/qt/coincontroldialog.cpp b/src/qt/coincontroldialog.cpp
index afec817dea2d..df2611d46224 100644
--- a/src/qt/coincontroldialog.cpp
+++ b/src/qt/coincontroldialog.cpp
@@ -436,7 +436,7 @@ void CoinControlDialog::viewItemChanged(QTreeWidgetItem* item, int column)
             int nRounds = pwalletMain->GetRealOutpointPrivateSendRounds(outpt);
             if (coinControl->fUsePrivateSend && nRounds < privateSendClient.nPrivateSendRounds) {
                 QMessageBox::warning(this, windowTitle(),
-                    tr("Non-anonymized input selected. <b>PrivateSend will be disabled.</b><br><br>If you still want to use PrivateSend, please deselect all non-nonymized inputs first and then check PrivateSend checkbox again."),
+                    tr("Non-anonymized input selected. <b>PrivateSend will be disabled.</b><br><br>If you still want to use PrivateSend, please deselect all non-anonymized inputs first and then check the PrivateSend checkbox again."),
                     QMessageBox::Ok, QMessageBox::Ok);
                 coinControl->fUsePrivateSend = false;
             }

From c4ee2c89ef3be28388211cd661f0bd04e691e3d4 Mon Sep 17 00:00:00 2001
From: UdjinM6 <UdjinM6@users.noreply.github.com>
Date: Sat, 4 Aug 2018 16:39:15 +0300
Subject: [PATCH 034/400] Fix mnsync in regtest (#2202)

---
 src/masternode-sync.cpp | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/masternode-sync.cpp b/src/masternode-sync.cpp
index d78bc11f2575..7b421cb6c13a 100644
--- a/src/masternode-sync.cpp
+++ b/src/masternode-sync.cpp
@@ -184,22 +184,21 @@ void CMasternodeSync::ProcessTick(CConnman& connman)
         // QUICK MODE (REGTEST ONLY!)
         if(Params().NetworkIDString() == CBaseChainParams::REGTEST)
         {
-            if(nRequestedMasternodeAttempt <= 2) {
+            if (nRequestedMasternodeAssets == MASTERNODE_SYNC_WAITING) {
                 connman.PushMessage(pnode, msgMaker.Make(NetMsgType::GETSPORKS)); //get current network sporks
-            } else if(nRequestedMasternodeAttempt < 4) {
+            } else if (nRequestedMasternodeAssets == MASTERNODE_SYNC_LIST) {
                 mnodeman.DsegUpdate(pnode, connman);
-            } else if(nRequestedMasternodeAttempt < 6) {
+            } else if (nRequestedMasternodeAssets == MASTERNODE_SYNC_MNW) {
                 //sync payment votes
                 if(pnode->nVersion == 70208) {
                     connman.PushMessage(pnode, msgMaker.Make(NetMsgType::MASTERNODEPAYMENTSYNC, mnpayments.GetStorageLimit())); //sync payment votes
                 } else {
                     connman.PushMessage(pnode, msgMaker.Make(NetMsgType::MASTERNODEPAYMENTSYNC)); //sync payment votes
                 }
+            } else if (nRequestedMasternodeAssets == MASTERNODE_SYNC_GOVERNANCE) {
                 SendGovernanceSyncRequest(pnode, connman);
-            } else {
-                nRequestedMasternodeAssets = MASTERNODE_SYNC_FINISHED;
             }
-            nRequestedMasternodeAttempt++;
+            SwitchToNextAsset(connman);
             connman.ReleaseNodeVector(vNodesCopy);
             return;
         }

From 4cd969e3d2908f36c9f5ec192e0462fd75e6d1ee Mon Sep 17 00:00:00 2001
From: UdjinM6 <UdjinM6@users.noreply.github.com>
Date: Sat, 11 Aug 2018 01:28:30 +0300
Subject: [PATCH 035/400] Add `previousbits` field to `getblocktemplate` output
 (#2201)

* Add `previousbits` field to `getblocktemplate` output

* add comment to nPrevBits
---
 src/miner.cpp      | 1 +
 src/miner.h        | 1 +
 src/rpc/mining.cpp | 2 ++
 3 files changed, 4 insertions(+)

diff --git a/src/miner.cpp b/src/miner.cpp
index 0290dedbca18..82f1df413cb5 100644
--- a/src/miner.cpp
+++ b/src/miner.cpp
@@ -182,6 +182,7 @@ std::unique_ptr<CBlockTemplate> BlockAssembler::CreateNewBlock(const CScript& sc
     UpdateTime(pblock, chainparams.GetConsensus(), pindexPrev);
     pblock->nBits          = GetNextWorkRequired(pindexPrev, pblock, chainparams.GetConsensus());
     pblock->nNonce         = 0;
+    pblocktemplate->nPrevBits = pindexPrev->nBits;
     pblocktemplate->vTxSigOps[0] = GetLegacySigOpCount(*pblock->vtx[0]);
 
     CValidationState state;
diff --git a/src/miner.h b/src/miner.h
index 7770e95ba0cf..427635057c41 100644
--- a/src/miner.h
+++ b/src/miner.h
@@ -30,6 +30,7 @@ struct CBlockTemplate
     CBlock block;
     std::vector<CAmount> vTxFees;
     std::vector<int64_t> vTxSigOps;
+    uint32_t nPrevBits; // nBits of previous block (for subsidy calculation)
     CTxOut txoutMasternode; // masternode payment
     std::vector<CTxOut> voutSuperblock; // superblock payment
 };
diff --git a/src/rpc/mining.cpp b/src/rpc/mining.cpp
index 723fc698f8a5..9e4a029010ff 100644
--- a/src/rpc/mining.cpp
+++ b/src/rpc/mining.cpp
@@ -385,6 +385,7 @@ UniValue getblocktemplate(const JSONRPCRequest& request)
             "  \"sizelimit\" : n,                  (numeric) limit of block size\n"
             "  \"curtime\" : ttt,                  (numeric) current timestamp in seconds since epoch (Jan 1 1970 GMT)\n"
             "  \"bits\" : \"xxxxxxxx\",              (string) compressed target of next block\n"
+            "  \"previousbits\" : \"xxxxxxxx\",      (string) compressed target of current highest block\n"
             "  \"height\" : n                      (numeric) The height of the next block\n"
             "  \"masternode\" : {                  (json object) required masternode payee that must be included in the next block\n"
             "      \"payee\" : \"xxxx\",             (string) payee address\n"
@@ -696,6 +697,7 @@ UniValue getblocktemplate(const JSONRPCRequest& request)
     result.push_back(Pair("sizelimit", (int64_t)MaxBlockSize(fDIP0001ActiveAtTip)));
     result.push_back(Pair("curtime", pblock->GetBlockTime()));
     result.push_back(Pair("bits", strprintf("%08x", pblock->nBits)));
+    result.push_back(Pair("previousbits", strprintf("%08x", pblocktemplate->nPrevBits)));
     result.push_back(Pair("height", (int64_t)(pindexPrev->nHeight+1)));
 
     UniValue masternodeObj(UniValue::VOBJ);

From 589a77013fc694fe918d3447a08322c3b80d8fe3 Mon Sep 17 00:00:00 2001
From: strophy <32928115+strophy@users.noreply.github.com>
Date: Sat, 11 Aug 2018 06:29:02 +0800
Subject: [PATCH 036/400] Correction to release date for 0.12.0 (#2205)

Dash 0.12.0 went through several releases for testnet, so the first public release for mainnet was 0.12.0.44 on 15 August 2015.
https://www.dash.org/forum/threads/v12-release.5888/
https://github.com/dashpay/dash/tags?after=v0.12.0.48
---
 doc/release-notes.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/release-notes.md b/doc/release-notes.md
index a44a8789e2e0..faf879084f50 100644
--- a/doc/release-notes.md
+++ b/doc/release-notes.md
@@ -126,7 +126,7 @@ These release are considered obsolete. Old release notes can be found here:
 - [v0.12.2.2](https://github.com/dashpay/dash/blob/master/doc/release-notes/dash/release-notes-0.12.2.2.md) released Dec/17/2017
 - [v0.12.2](https://github.com/dashpay/dash/blob/master/doc/release-notes/dash/release-notes-0.12.2.md) released Nov/08/2017
 - [v0.12.1](https://github.com/dashpay/dash/blob/master/doc/release-notes/dash/release-notes-0.12.1.md) released Feb/06/2017
-- [v0.12.0](https://github.com/dashpay/dash/blob/master/doc/release-notes/dash/release-notes-0.12.0.md) released Jun/15/2015
+- [v0.12.0](https://github.com/dashpay/dash/blob/master/doc/release-notes/dash/release-notes-0.12.0.md) released Aug/15/2015
 - [v0.11.2](https://github.com/dashpay/dash/blob/master/doc/release-notes/dash/release-notes-0.11.2.md) released Mar/04/2015
 - [v0.11.1](https://github.com/dashpay/dash/blob/master/doc/release-notes/dash/release-notes-0.11.1.md) released Feb/10/2015
 - [v0.11.0](https://github.com/dashpay/dash/blob/master/doc/release-notes/dash/release-notes-0.11.0.md) released Jan/15/2015

From c4c6107839db242777e6d24d23d7a1145f15964c Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Sat, 11 Aug 2018 00:29:28 +0200
Subject: [PATCH 037/400] Use C++14 standard when building (#2209)

We have upgraded CI to use a recent compiler already and thus can also
increase the C++ standard now. After this, we'll also have to update
Gitian build to work with C++14 as well, but this is going to happen in
separate commits/PRs.
---
 configure.ac | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index 5687cc66fbab..89b19aabe9f1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -54,8 +54,8 @@ case $host in
      lt_cv_deplibs_check_method="pass_all"
   ;;
 esac
-dnl Require C++11 compiler (no GNU extensions)
-AX_CXX_COMPILE_STDCXX([11], [noext], [mandatory], [nodefault])
+dnl Require C++14 compiler (no GNU extensions)
+AX_CXX_COMPILE_STDCXX([14], [noext], [mandatory], [nodefault])
 dnl Check if -latomic is required for <std::atomic>
 CHECK_ATOMIC
 

From 566fa5ec3b12651d769ba4a72f3ae67ac5ac70f6 Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Sat, 11 Aug 2018 00:30:55 +0200
Subject: [PATCH 038/400] Add support for "help command subCommand" (#2210)

---
 src/rpc/server.cpp | 17 ++++++++++++-----
 src/rpc/server.h   |  2 +-
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/src/rpc/server.cpp b/src/rpc/server.cpp
index bf4f30ea8582..9d8b47a429ef 100644
--- a/src/rpc/server.cpp
+++ b/src/rpc/server.cpp
@@ -176,7 +176,7 @@ std::vector<unsigned char> ParseHexO(const UniValue& o, std::string strKey)
  * Note: This interface may still be subject to change.
  */
 
-std::string CRPCTable::help(const std::string& strCommand) const
+std::string CRPCTable::help(const std::string& strCommand, const std::string& strSubCommand) const
 {
     std::string strRet;
     std::string category;
@@ -200,6 +200,10 @@ std::string CRPCTable::help(const std::string& strCommand) const
         {
             JSONRPCRequest jreq;
             jreq.fHelp = true;
+            if (!strSubCommand.empty()) {
+                jreq.params.setArray();
+                jreq.params.push_back(strSubCommand);
+            }
             rpcfn_type pfn = pcmd->actor;
             if (setDone.insert(pfn).second)
                 (*pfn)(jreq);
@@ -234,21 +238,24 @@ std::string CRPCTable::help(const std::string& strCommand) const
 
 UniValue help(const JSONRPCRequest& jsonRequest)
 {
-    if (jsonRequest.fHelp || jsonRequest.params.size() > 1)
+    if (jsonRequest.fHelp || jsonRequest.params.size() > 2)
         throw std::runtime_error(
-            "help ( \"command\" )\n"
+            "help ( \"command\" ) (\"subCommand\")\n"
             "\nList all commands, or get help for a specified command.\n"
             "\nArguments:\n"
             "1. \"command\"     (string, optional) The command to get help on\n"
+            "2. \"subCommand\"  (string, optional) The subcommand to get help on. Please not that not all subcommands support this at the moment\n"
             "\nResult:\n"
             "\"text\"     (string) The help text\n"
         );
 
-    std::string strCommand;
+    std::string strCommand, strSubCommand;
     if (jsonRequest.params.size() > 0)
         strCommand = jsonRequest.params[0].get_str();
+    if (jsonRequest.params.size() > 1)
+        strSubCommand = jsonRequest.params[1].get_str();
 
-    return tableRPC.help(strCommand);
+    return tableRPC.help(strCommand, strSubCommand);
 }
 
 
diff --git a/src/rpc/server.h b/src/rpc/server.h
index fe293a94bfe5..a1080477d274 100644
--- a/src/rpc/server.h
+++ b/src/rpc/server.h
@@ -152,7 +152,7 @@ class CRPCTable
 public:
     CRPCTable();
     const CRPCCommand* operator[](const std::string& name) const;
-    std::string help(const std::string& name) const;
+    std::string help(const std::string& strCommand, const std::string& strSubCommand) const;
 
     /**
      * Execute a method.

From 106bab1ae13406d0e3bcea423be18d7edb0de26b Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Sat, 11 Aug 2018 00:33:56 +0200
Subject: [PATCH 039/400] Add new ParseXXX methods to easily parse UniValue
 values (#2211)

---
 src/rpc/server.cpp | 48 ++++++++++++++++++++++++++++++++++++++++++++++
 src/rpc/server.h   |  5 +++++
 2 files changed, 53 insertions(+)

diff --git a/src/rpc/server.cpp b/src/rpc/server.cpp
index 9d8b47a429ef..d969efdbc20f 100644
--- a/src/rpc/server.cpp
+++ b/src/rpc/server.cpp
@@ -24,6 +24,7 @@
 #include <boost/thread.hpp>
 #include <boost/algorithm/string/case_conv.hpp> // for to_upper()
 
+#include <algorithm>
 #include <memory> // for unique_ptr
 #include <unordered_map>
 
@@ -172,6 +173,53 @@ std::vector<unsigned char> ParseHexO(const UniValue& o, std::string strKey)
     return ParseHexV(find_value(o, strKey), strKey);
 }
 
+int32_t ParseInt32V(const UniValue& v, const std::string &strName)
+{
+    std::string strNum = v.getValStr();
+    int32_t num;
+    if (!ParseInt32(strNum, &num))
+        throw JSONRPCError(RPC_INVALID_PARAMETER, strName+" must be a 32bit integer (not '"+strNum+"')");
+    return num;
+}
+
+int64_t ParseInt64V(const UniValue& v, const std::string &strName)
+{
+    std::string strNum = v.getValStr();
+    int64_t num;
+    if (!ParseInt64(strNum, &num))
+        throw JSONRPCError(RPC_INVALID_PARAMETER, strName+" must be a 64bit integer (not '"+strNum+"')");
+    return num;
+}
+
+double ParseDoubleV(const UniValue& v, const std::string &strName)
+{
+    std::string strNum = v.getValStr();
+    double num;
+    if (!ParseDouble(strNum, &num))
+        throw JSONRPCError(RPC_INVALID_PARAMETER, strName+" must be a be number (not '"+strNum+"')");
+    return num;
+}
+
+bool ParseBoolV(const UniValue& v, const std::string &strName)
+{
+    std::string strBool;
+    if (v.isBool())
+        return v.get_bool();
+    else if (v.isNum())
+        strBool = itostr(v.get_int());
+    else if (v.isStr())
+        strBool = v.get_str();
+
+    std::transform(strBool.begin(), strBool.end(), strBool.begin(), ::tolower);
+
+    if (strBool == "true" || strBool == "yes" || strBool == "1") {
+        return true;
+    } else if (strBool == "false" || strBool == "no" || strBool == "0") {
+        return false;
+    }
+    throw JSONRPCError(RPC_INVALID_PARAMETER, strName+" must be true, false, yes, no, 1 or 0 (not '"+strBool+"')");
+}
+
 /**
  * Note: This interface may still be subject to change.
  */
diff --git a/src/rpc/server.h b/src/rpc/server.h
index a1080477d274..62fb1f8b7f64 100644
--- a/src/rpc/server.h
+++ b/src/rpc/server.h
@@ -187,6 +187,11 @@ extern uint256 ParseHashO(const UniValue& o, std::string strKey);
 extern std::vector<unsigned char> ParseHexV(const UniValue& v, std::string strName);
 extern std::vector<unsigned char> ParseHexO(const UniValue& o, std::string strKey);
 
+extern int32_t ParseInt32V(const UniValue& v, const std::string &strName);
+extern int64_t ParseInt64V(const UniValue& v, const std::string &strName);
+extern double ParseDoubleV(const UniValue& v, const std::string &strName);
+extern bool ParseBoolV(const UniValue& v, const std::string &strName);
+
 extern int64_t nWalletUnlockTime;
 extern CAmount AmountFromValue(const UniValue& value);
 extern UniValue ValueFromAmount(const CAmount& amount);

From 075ca0903f0cffdd58e84f946862040fb3ca0d97 Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Sat, 11 Aug 2018 00:34:28 +0200
Subject: [PATCH 040/400] Protect CSporkManager with critical section (#2213)

---
 src/spork.cpp | 32 +++++++++++++++++++++-----------
 src/spork.h   |  1 +
 2 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/src/spork.cpp b/src/spork.cpp
index 4ecdddc8d1c0..bc86c396f66e 100644
--- a/src/spork.cpp
+++ b/src/spork.cpp
@@ -46,16 +46,18 @@ void CSporkManager::ProcessSpork(CNode* pfrom, const std::string& strCommand, CD
             if(!chainActive.Tip()) return;
             strLogMsg = strprintf("SPORK -- hash: %s id: %d value: %10d bestHeight: %d peer=%d", hash.ToString(), spork.nSporkID, spork.nValue, chainActive.Height(), pfrom->id);
         }
-
-        if(mapSporksActive.count(spork.nSporkID)) {
-            if (mapSporksActive[spork.nSporkID].nTimeSigned >= spork.nTimeSigned) {
-                LogPrint("spork", "%s seen\n", strLogMsg);
-                return;
+        {
+            LOCK(cs); // make sure to not lock this together with cs_main
+            if (mapSporksActive.count(spork.nSporkID)) {
+                if (mapSporksActive[spork.nSporkID].nTimeSigned >= spork.nTimeSigned) {
+                    LogPrint("spork", "%s seen\n", strLogMsg);
+                    return;
+                } else {
+                    LogPrintf("%s updated\n", strLogMsg);
+                }
             } else {
-                LogPrintf("%s updated\n", strLogMsg);
+                LogPrintf("%s new\n", strLogMsg);
             }
-        } else {
-            LogPrintf("%s new\n", strLogMsg);
         }
 
         if(!spork.CheckSignature(sporkPubKeyID)) {
@@ -65,14 +67,18 @@ void CSporkManager::ProcessSpork(CNode* pfrom, const std::string& strCommand, CD
             return;
         }
 
-        mapSporks[hash] = spork;
-        mapSporksActive[spork.nSporkID] = spork;
+        {
+            LOCK(cs); // make sure to not lock this together with cs_main
+            mapSporks[hash] = spork;
+            mapSporksActive[spork.nSporkID] = spork;
+        }
         spork.Relay(connman);
 
         //does a task if needed
         ExecuteSpork(spork.nSporkID, spork.nValue);
 
     } else if (strCommand == NetMsgType::GETSPORKS) {
+        LOCK(cs); // make sure to not lock this together with cs_main
         for (const auto& pair : mapSporksActive) {
             connman.PushMessage(pfrom, CNetMsgMaker(pfrom->GetSendVersion()).Make(NetMsgType::SPORK, pair.second));
         }
@@ -111,11 +117,11 @@ void CSporkManager::ExecuteSpork(int nSporkID, int nValue)
 
 bool CSporkManager::UpdateSpork(int nSporkID, int64_t nValue, CConnman& connman)
 {
-
     CSporkMessage spork = CSporkMessage(nSporkID, nValue, GetAdjustedTime());
 
     if(spork.Sign(sporkPrivKey)) {
         spork.Relay(connman);
+        LOCK(cs);
         mapSporks[spork.GetHash()] = spork;
         mapSporksActive[nSporkID] = spork;
         return true;
@@ -127,6 +133,7 @@ bool CSporkManager::UpdateSpork(int nSporkID, int64_t nValue, CConnman& connman)
 // grab the spork, otherwise say it's off
 bool CSporkManager::IsSporkActive(int nSporkID)
 {
+    LOCK(cs);
     int64_t r = -1;
 
     if(mapSporksActive.count(nSporkID)){
@@ -144,6 +151,7 @@ bool CSporkManager::IsSporkActive(int nSporkID)
 // grab the value of the spork on the network, or the default
 int64_t CSporkManager::GetSporkValue(int nSporkID)
 {
+    LOCK(cs);
     if (mapSporksActive.count(nSporkID))
         return mapSporksActive[nSporkID].nValue;
 
@@ -190,6 +198,7 @@ std::string CSporkManager::GetSporkNameByID(int nSporkID)
 }
 
 bool CSporkManager::SetSporkAddress(const std::string& strAddress) {
+    LOCK(cs);
     CBitcoinAddress address(strAddress);
     if (!address.IsValid() || !address.GetKeyID(sporkPubKeyID)) {
         LogPrintf("CSporkManager::SetSporkAddress -- Failed to parse spork address\n");
@@ -214,6 +223,7 @@ bool CSporkManager::SetPrivKey(const std::string& strPrivKey)
 
     CSporkMessage spork;
     if (spork.Sign(key)) {
+	    LOCK(cs);
         // Test signing successful, proceed
         LogPrintf("CSporkManager::SetPrivKey -- Successfully initialized as spork signer\n");
 
diff --git a/src/spork.h b/src/spork.h
index 0c491b3bd611..a627ef35e049 100644
--- a/src/spork.h
+++ b/src/spork.h
@@ -86,6 +86,7 @@ class CSporkMessage
 class CSporkManager
 {
 private:
+    CCriticalSection cs;
     std::vector<unsigned char> vchSig;
     std::map<int, CSporkMessage> mapSporksActive;
 

From a959f60aa7343198ec1b428ce2b5823d863879f4 Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Sat, 11 Aug 2018 00:35:52 +0200
Subject: [PATCH 041/400] De-duplicate "gobject vote-alias" and "gobject
 "vote-many" code (#2217)

Use same code for both vote modes
---
 src/rpc/governance.cpp | 137 ++++-------------------------------------
 1 file changed, 11 insertions(+), 126 deletions(-)

diff --git a/src/rpc/governance.cpp b/src/rpc/governance.cpp
index a6b1ebaed5d0..c4cd91e33218 100644
--- a/src/rpc/governance.cpp
+++ b/src/rpc/governance.cpp
@@ -399,10 +399,12 @@ UniValue gobject(const JSONRPCRequest& request)
         return returnObj;
     }
 
-    if(strCommand == "vote-many")
+    if(strCommand == "vote-many" || strCommand == "vote-alias")
     {
-        if(request.params.size() != 4)
+        if(strCommand == "vote-many" && request.params.size() != 4)
             throw JSONRPCError(RPC_INVALID_PARAMETER, "Correct usage is 'gobject vote-many <governance-hash> [funding|valid|delete] [yes|no|abstain]'");
+        else if(strCommand == "vote-alias" && request.params.size() != 5)
+            throw JSONRPCError(RPC_INVALID_PARAMETER, "Correct usage is 'gobject vote-alias <governance-hash> [funding|valid|delete] [yes|no|abstain] <alias-name>'");
 
         uint256 hash;
         std::string strVote;
@@ -411,6 +413,10 @@ UniValue gobject(const JSONRPCRequest& request)
         std::string strVoteSignal = request.params[2].get_str();
         std::string strVoteOutcome = request.params[3].get_str();
 
+        std::string strAlias;
+        if (strCommand == "vote-alias") {
+            strAlias = request.params[4].get_str();
+        }
 
         vote_signal_enum_t eVoteSignal = CGovernanceVoting::ConvertVoteSignal(strVoteSignal);
         if(eVoteSignal == VOTE_SIGNAL_NONE) {
@@ -430,6 +436,9 @@ UniValue gobject(const JSONRPCRequest& request)
         UniValue resultsObj(UniValue::VOBJ);
 
         for (const auto& mne : masternodeConfig.getEntries()) {
+            // skip masternode if using "vote-alias" and it's the wrong masternode
+            if(strCommand == "vote-alias" && strAlias != mne.getAlias()) continue;
+
             std::string strError;
             std::vector<unsigned char> vchMasterNodeSignature;
             std::string strMasterNodeSignMessage;
@@ -500,130 +509,6 @@ UniValue gobject(const JSONRPCRequest& request)
         return returnObj;
     }
 
-
-    // MASTERNODES CAN VOTE ON GOVERNANCE OBJECTS ON THE NETWORK FOR VARIOUS SIGNALS AND OUTCOMES
-    if(strCommand == "vote-alias")
-    {
-        if(request.params.size() != 5)
-            throw JSONRPCError(RPC_INVALID_PARAMETER, "Correct usage is 'gobject vote-alias <governance-hash> [funding|valid|delete] [yes|no|abstain] <alias-name>'");
-
-        uint256 hash;
-        std::string strVote;
-
-        // COLLECT NEEDED PARAMETRS FROM USER
-
-        hash = ParseHashV(request.params[1], "Object hash");
-        std::string strVoteSignal = request.params[2].get_str();
-        std::string strVoteOutcome = request.params[3].get_str();
-        std::string strAlias = request.params[4].get_str();
-
-        // CONVERT NAMED SIGNAL/ACTION AND CONVERT
-
-        vote_signal_enum_t eVoteSignal = CGovernanceVoting::ConvertVoteSignal(strVoteSignal);
-        if(eVoteSignal == VOTE_SIGNAL_NONE) {
-            throw JSONRPCError(RPC_INVALID_PARAMETER,
-                               "Invalid vote signal. Please using one of the following: "
-                               "(funding|valid|delete|endorsed)");
-        }
-
-        vote_outcome_enum_t eVoteOutcome = CGovernanceVoting::ConvertVoteOutcome(strVoteOutcome);
-        if(eVoteOutcome == VOTE_OUTCOME_NONE) {
-            throw JSONRPCError(RPC_INVALID_PARAMETER, "Invalid vote outcome. Please use one of the following: 'yes', 'no' or 'abstain'");
-        }
-
-        // EXECUTE VOTE FOR EACH MASTERNODE, COUNT SUCCESSES VS FAILURES
-
-        int nSuccessful = 0;
-        int nFailed = 0;
-
-        UniValue resultsObj(UniValue::VOBJ);
-
-        for (const auto& mne : masternodeConfig.getEntries())
-        {
-            // IF WE HAVE A SPECIFIC NODE REQUESTED TO VOTE, DO THAT
-            if(strAlias != mne.getAlias()) continue;
-
-            // INIT OUR NEEDED VARIABLES TO EXECUTE THE VOTE
-            std::string strError;
-            std::vector<unsigned char> vchMasterNodeSignature;
-            std::string strMasterNodeSignMessage;
-
-            CPubKey pubKeyCollateralAddress;
-            CKey keyCollateralAddress;
-            CPubKey pubKeyMasternode;
-            CKey keyMasternode;
-
-            // SETUP THE SIGNING KEY FROM MASTERNODE.CONF ENTRY
-
-            UniValue statusObj(UniValue::VOBJ);
-
-            if(!CMessageSigner::GetKeysFromSecret(mne.getPrivKey(), keyMasternode, pubKeyMasternode)) {
-                nFailed++;
-                statusObj.push_back(Pair("result", "failed"));
-                statusObj.push_back(Pair("errorMessage", strprintf("Invalid masternode key %s.", mne.getPrivKey())));
-                resultsObj.push_back(Pair(mne.getAlias(), statusObj));
-                continue;
-            }
-
-            // SEARCH FOR THIS MASTERNODE ON THE NETWORK, THE NODE MUST BE ACTIVE TO VOTE
-
-            uint256 nTxHash;
-            nTxHash.SetHex(mne.getTxHash());
-
-            int nOutputIndex = 0;
-            if(!ParseInt32(mne.getOutputIndex(), &nOutputIndex)) {
-                continue;
-            }
-
-            COutPoint outpoint(nTxHash, nOutputIndex);
-
-            CMasternode mn;
-            bool fMnFound = mnodeman.Get(outpoint, mn);
-
-            if(!fMnFound) {
-                nFailed++;
-                statusObj.push_back(Pair("result", "failed"));
-                statusObj.push_back(Pair("errorMessage", "Masternode must be publicly available on network to vote. Masternode not found."));
-                resultsObj.push_back(Pair(mne.getAlias(), statusObj));
-                continue;
-            }
-
-            // CREATE NEW GOVERNANCE OBJECT VOTE WITH OUTCOME/SIGNAL
-
-            CGovernanceVote vote(outpoint, hash, eVoteSignal, eVoteOutcome);
-            if(!vote.Sign(keyMasternode, pubKeyMasternode)) {
-                nFailed++;
-                statusObj.push_back(Pair("result", "failed"));
-                statusObj.push_back(Pair("errorMessage", "Failure to sign."));
-                resultsObj.push_back(Pair(mne.getAlias(), statusObj));
-                continue;
-            }
-
-            // UPDATE LOCAL DATABASE WITH NEW OBJECT SETTINGS
-
-            CGovernanceException exception;
-            if(governance.ProcessVoteAndRelay(vote, exception, *g_connman)) {
-                nSuccessful++;
-                statusObj.push_back(Pair("result", "success"));
-            }
-            else {
-                nFailed++;
-                statusObj.push_back(Pair("result", "failed"));
-                statusObj.push_back(Pair("errorMessage", exception.GetMessage()));
-            }
-
-            resultsObj.push_back(Pair(mne.getAlias(), statusObj));
-        }
-
-        // REPORT STATS TO THE USER
-
-        UniValue returnObj(UniValue::VOBJ);
-        returnObj.push_back(Pair("overall", strprintf("Voted successfully %d time(s) and failed %d time(s).", nSuccessful, nFailed)));
-        returnObj.push_back(Pair("detail", resultsObj));
-
-        return returnObj;
-    }
-
     // USERS CAN QUERY THE SYSTEM FOR A LIST OF VARIOUS GOVERNANCE ITEMS
     if(strCommand == "list" || strCommand == "diff")
     {

From 2d4e18537c33146dc6fbcaa659f41218b799b5b0 Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Sat, 11 Aug 2018 00:36:17 +0200
Subject: [PATCH 042/400] Some useful commits from the DIP3 PR in regard to
 integration tests (#2218)

* Allow changing budget parameters for regtest

* Lift some limitations for local addresses for masternodes in regtest

Needed to make masternodes works in regtest mode

* Add "masternode check" RPC to force invocation of CheckAndRemove

Useful in integration tests where MN lists must be predictable
---
 src/activemasternode.cpp | 30 +++++++++++++++++++-----------
 src/chainparams.cpp      | 12 ++++++++++++
 src/chainparams.h        |  5 +++++
 src/init.cpp             | 25 +++++++++++++++++++++++++
 src/rpc/masternode.cpp   | 23 ++++++++++++++++++++++-
 5 files changed, 83 insertions(+), 12 deletions(-)

diff --git a/src/activemasternode.cpp b/src/activemasternode.cpp
index 726acfa0ea1d..7b262d6bb22c 100644
--- a/src/activemasternode.cpp
+++ b/src/activemasternode.cpp
@@ -8,6 +8,7 @@
 #include "masternodeman.h"
 #include "netbase.h"
 #include "protocol.h"
+#include "netbase.h"
 
 // Keep track of the active Masternode
 CActiveMasternode activeMasternode;
@@ -159,6 +160,12 @@ void CActiveMasternode::ManageStateInitial(CConnman& connman)
         }
     }
 
+    if (!fFoundLocal && Params().NetworkIDString() == CBaseChainParams::REGTEST) {
+        if (Lookup("127.0.0.1", activeMasternode.service, GetListenPort(), false)) {
+            fFoundLocal = true;
+        }
+    }
+
     if(!fFoundLocal) {
         nState = ACTIVE_MASTERNODE_NOT_CAPABLE;
         strNotCapableReason = "Can't detect valid external address. Please consider using the externalip configuration option if problem persists. Make sure to use IPv4 address only.";
@@ -181,19 +188,20 @@ void CActiveMasternode::ManageStateInitial(CConnman& connman)
         return;
     }
 
-    // Check socket connectivity
-    LogPrintf("CActiveMasternode::ManageStateInitial -- Checking inbound connection to '%s'\n", service.ToString());
-    SOCKET hSocket;
-    bool fConnected = ConnectSocket(service, hSocket, nConnectTimeout) && IsSelectableSocket(hSocket);
-    CloseSocket(hSocket);
+    if(Params().NetworkIDString() != CBaseChainParams::REGTEST) {
+        // Check socket connectivity
+        LogPrintf("CActiveMasternode::ManageStateInitial -- Checking inbound connection to '%s'\n", service.ToString());
+        SOCKET hSocket;
+        bool fConnected = ConnectSocket(service, hSocket, nConnectTimeout) && IsSelectableSocket(hSocket);
+        CloseSocket(hSocket);
 
-    if (!fConnected) {
-        nState = ACTIVE_MASTERNODE_NOT_CAPABLE;
-        strNotCapableReason = "Could not connect to " + service.ToString();
-        LogPrintf("CActiveMasternode::ManageStateInitial -- %s: %s\n", GetStateString(), strNotCapableReason);
-        return;
+        if (!fConnected) {
+            nState = ACTIVE_MASTERNODE_NOT_CAPABLE;
+            strNotCapableReason = "Could not connect to " + service.ToString();
+            LogPrintf("CActiveMasternode::ManageStateInitial -- %s: %s\n", GetStateString(), strNotCapableReason);
+            return;
+        }
     }
-
     // Default to REMOTE
     eType = MASTERNODE_REMOTE;
 
diff --git a/src/chainparams.cpp b/src/chainparams.cpp
index f98388947532..c605d7d60d0b 100644
--- a/src/chainparams.cpp
+++ b/src/chainparams.cpp
@@ -639,6 +639,13 @@ class CRegTestParams : public CChainParams {
         consensus.vDeployments[d].nStartTime = nStartTime;
         consensus.vDeployments[d].nTimeout = nTimeout;
     }
+
+    void UpdateBudgetParameters(int nMasternodePaymentsStartBlock, int nBudgetPaymentsStartBlock, int nSuperblockStartBlock)
+    {
+        consensus.nMasternodePaymentsStartBlock = nMasternodePaymentsStartBlock;
+        consensus.nBudgetPaymentsStartBlock = nBudgetPaymentsStartBlock;
+        consensus.nSuperblockStartBlock = nSuperblockStartBlock;
+    }
 };
 static CRegTestParams regTestParams;
 
@@ -678,3 +685,8 @@ void UpdateRegtestBIP9Parameters(Consensus::DeploymentPos d, int64_t nStartTime,
 {
     regTestParams.UpdateBIP9Parameters(d, nStartTime, nTimeout);
 }
+
+void UpdateRegtestBudgetParameters(int nMasternodePaymentsStartBlock, int nBudgetPaymentsStartBlock, int nSuperblockStartBlock)
+{
+    regTestParams.UpdateBudgetParameters(nMasternodePaymentsStartBlock, nBudgetPaymentsStartBlock, nSuperblockStartBlock);
+}
diff --git a/src/chainparams.h b/src/chainparams.h
index a0e0b07b3b0c..fa67c9b73a94 100644
--- a/src/chainparams.h
+++ b/src/chainparams.h
@@ -141,4 +141,9 @@ void SelectParams(const std::string& chain);
  */
 void UpdateRegtestBIP9Parameters(Consensus::DeploymentPos d, int64_t nStartTime, int64_t nTimeout);
 
+/**
+ * Allows modifying the budget regtest parameters.
+ */
+void UpdateRegtestBudgetParameters(int nMasternodePaymentsStartBlock, int nBudgetPaymentsStartBlock, int nSuperblockStartBlock);
+
 #endif // BITCOIN_CHAINPARAMS_H
diff --git a/src/init.cpp b/src/init.cpp
index cc6f38b7fc99..b6430790e7dd 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -1277,6 +1277,31 @@ bool AppInitParameterInteraction()
         }
     }
 
+    if (IsArgSet("-budgetparams")) {
+        // Allow overriding budget parameters for testing
+        if (!chainparams.MineBlocksOnDemand()) {
+            return InitError("Budget parameters may only be overridden on regtest.");
+        }
+
+        std::string strBudgetParams = GetArg("-budgetparams", "");
+        std::vector<std::string> vBudgetParams;
+        boost::split(vBudgetParams, strBudgetParams, boost::is_any_of(":"));
+        if (vBudgetParams.size() != 3) {
+            return InitError("Budget parameters malformed, expecting masternodePaymentsStartBlock:budgetPaymentsStartBlock:superblockStartBlock");
+        }
+        int nMasternodePaymentsStartBlock, nBudgetPaymentsStartBlock, nSuperblockStartBlock;
+        if (!ParseInt32(vBudgetParams[0], &nMasternodePaymentsStartBlock)) {
+            return InitError(strprintf("Invalid nMasternodePaymentsStartBlock (%s)", vBudgetParams[0]));
+        }
+        if (!ParseInt32(vBudgetParams[1], &nBudgetPaymentsStartBlock)) {
+            return InitError(strprintf("Invalid nBudgetPaymentsStartBlock (%s)", vBudgetParams[1]));
+        }
+        if (!ParseInt32(vBudgetParams[2], &nSuperblockStartBlock)) {
+            return InitError(strprintf("Invalid nSuperblockStartBlock (%s)", vBudgetParams[2]));
+        }
+        UpdateRegtestBudgetParameters(nMasternodePaymentsStartBlock, nBudgetPaymentsStartBlock, nSuperblockStartBlock);
+    }
+
     return true;
 }
 
diff --git a/src/rpc/masternode.cpp b/src/rpc/masternode.cpp
index d6dd81c50810..6508df0d95ee 100644
--- a/src/rpc/masternode.cpp
+++ b/src/rpc/masternode.cpp
@@ -135,13 +135,14 @@ UniValue masternode(const JSONRPCRequest& request)
 #endif // ENABLE_WALLET
          strCommand != "list" && strCommand != "list-conf" && strCommand != "count" &&
          strCommand != "debug" && strCommand != "current" && strCommand != "winner" && strCommand != "winners" && strCommand != "genkey" &&
-         strCommand != "connect" && strCommand != "status"))
+         strCommand != "connect" && strCommand != "status" && strCommand != "check"))
             throw std::runtime_error(
                 "masternode \"command\"...\n"
                 "Set of commands to execute masternode related actions\n"
                 "\nArguments:\n"
                 "1. \"command\"        (string or set of strings, required) The command to execute\n"
                 "\nAvailable commands:\n"
+                "  check        - Force check all masternodes and remove invalid ones\n"
                 "  count        - Get information about number of masternodes (DEPRECATED options: 'total', 'ps', 'enabled', 'qualify', 'all')\n"
                 "  current      - Print info on current masternode winner to be paid the next block (calculated locally)\n"
                 "  genkey       - Generate new masternodeprivkey\n"
@@ -477,6 +478,26 @@ UniValue masternode(const JSONRPCRequest& request)
         return obj;
     }
 
+    if (strCommand == "check") {
+        int countBeforeCheck = mnodeman.CountMasternodes();
+        int countEnabledBeforeCheck = mnodeman.CountEnabled();
+
+        mnodeman.CheckAndRemove(*g_connman);
+
+        int countAfterCheck = mnodeman.CountMasternodes();
+        int countEnabledAfterCheck = mnodeman.CountEnabled();
+        int removedCount = std::max(0, countBeforeCheck - countAfterCheck);
+        int removedEnabledCount = std::max(0, countEnabledBeforeCheck - countEnabledAfterCheck);
+
+        UniValue obj(UniValue::VOBJ);
+        obj.push_back(Pair("removedTotalCount", removedCount));
+        obj.push_back(Pair("removedEnabledCount", removedEnabledCount));
+        obj.push_back(Pair("totalCount", countAfterCheck));
+        obj.push_back(Pair("enabledCount", countEnabledAfterCheck));
+
+        return obj;
+    }
+
     return NullUniValue;
 }
 

From 633879cd2856f332819dff82bd3dfa9a9eaebba3 Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Sat, 11 Aug 2018 00:36:36 +0200
Subject: [PATCH 043/400] Only use version 1 and 2 transactions for
 sighash_tests (#2219)

Also regenerated sighash.json with the help of PRINT_SIGHASH_JSON
---
 src/test/data/sighash.json | 1000 ++++++++++++++++++------------------
 src/test/sighash_tests.cpp |    2 +-
 2 files changed, 501 insertions(+), 501 deletions(-)

diff --git a/src/test/data/sighash.json b/src/test/data/sighash.json
index d66a56ac35bd..6e1f740ff0e4 100644
--- a/src/test/data/sighash.json
+++ b/src/test/data/sighash.json
@@ -1,503 +1,503 @@
 [
 	["raw_transaction, script, input_index, hashType, signature_hash (result)"],
-	["907c2bc503ade11cc3b04eb2918b6f547b0630ab569273824748c87ea14b0696526c66ba740200000004ab65ababfd1f9bdd4ef073c7afc4ae00da8a66f429c917a0081ad1e1dabce28d373eab81d8628de802000000096aab5253ab52000052ad042b5f25efb33beec9f3364e8a9139e8439d9d7e26529c3c30b6c3fd89f8684cfd68ea0200000009ab53526500636a52ab599ac2fe02a526ed040000000008535300516352515164370e010000000003006300ab2ec229", "", 2, 1864164639, "31af167a6cf3f9d5f6875caa4d31704ceb0eba078d132b78dab52c3b8997317e"],
-	["a0aa3126041621a6dea5b800141aa696daf28408959dfb2df96095db9fa425ad3f427f2f6103000000015360290e9c6063fa26912c2e7fb6a0ad80f1c5fea1771d42f12976092e7a85a4229fdb6e890000000001abc109f6e47688ac0e4682988785744602b8c87228fcef0695085edf19088af1a9db126e93000000000665516aac536affffffff8fe53e0806e12dfd05d67ac68f4768fdbe23fc48ace22a5aa8ba04c96d58e2750300000009ac51abac63ab5153650524aa680455ce7b000000000000499e50030000000008636a00ac526563ac5051ee030000000003abacabd2b6fe000000000003516563910fb6b5", "65", 0, -1391424484, "48d6a1bd2cd9eec54eb866fc71209418a950402b5d7e52363bfb75c98e141175"],
-	["6e7e9d4b04ce17afa1e8546b627bb8d89a6a7fefd9d892ec8a192d79c2ceafc01694a6a7e7030000000953ac6a51006353636a33bced1544f797f08ceed02f108da22cd24c9e7809a446c61eb3895914508ac91f07053a01000000055163ab516affffffff11dc54eee8f9e4ff0bcf6b1a1a35b1cd10d63389571375501af7444073bcec3c02000000046aab53514a821f0ce3956e235f71e4c69d91abe1e93fb703bd33039ac567249ed339bf0ba0883ef300000000090063ab65000065ac654bec3cc504bcf499020000000005ab6a52abac64eb060100000000076a6a5351650053bbbc130100000000056a6aab53abd6e1380100000000026a51c4e509b8", "acab655151", 0, 479279909, "2a3d95b09237b72034b23f2d2bb29fa32a58ab5c6aa72f6aafdfa178ab1dd01c"],
-	["73107cbd025c22ebc8c3e0a47b2a760739216a528de8d4dab5d45cbeb3051cebae73b01ca10200000007ab6353656a636affffffffe26816dffc670841e6a6c8c61c586da401df1261a330a6c6b3dd9f9a0789bc9e000000000800ac6552ac6aac51ffffffff0174a8f0010000000004ac52515100000000", "5163ac63635151ac", 1, 1190874345, "06e328de263a87b09beabe222a21627a6ea5c7f560030da31610c4611f4a46bc"],
-	["e93bbf6902be872933cb987fc26ba0f914fcfc2f6ce555258554dd9939d12032a8536c8802030000000453ac5353eabb6451e074e6fef9de211347d6a45900ea5aaf2636ef7967f565dce66fa451805c5cd10000000003525253ffffffff047dc3e6020000000007516565ac656aabec9eea010000000001633e46e600000000000015080a030000000001ab00000000", "5300ac6a53ab6a", 1, -886562767, "f03aa4fc5f97e826323d0daa03343ebf8a34ed67a1ce18631f8b88e5c992e798"],
-	["50818f4c01b464538b1e7e7f5ae4ed96ad23c68c830e78da9a845bc19b5c3b0b20bb82e5e9030000000763526a63655352ffffffff023b3f9c040000000008630051516a6a5163a83caf01000000000553ab65510000000000", "6aac", 0, 946795545, "746306f322de2b4b58ffe7faae83f6a72433c22f88062cdde881d4dd8a5a4e2d"],
-	["a93e93440250f97012d466a6cc24839f572def241c814fe6ae94442cf58ea33eb0fdd9bcc1030000000600636a0065acffffffff5dee3a6e7e5ad6310dea3e5b3ddda1a56bf8de7d3b75889fc024b5e233ec10f80300000007ac53635253ab53ffffffff0160468b04000000000800526a5300ac526a00000000", "ac00636a53", 1, 1773442520, "5c9d3a2ce9365bb72cfabbaa4579c843bb8abf200944612cf8ae4b56a908bcbd"],
-	["ce7d371f0476dda8b811d4bf3b64d5f86204725deeaa3937861869d5b2766ea7d17c57e40b0100000003535265ffffffff7e7e9188f76c34a46d0bbe856bde5cb32f089a07a70ea96e15e92abb37e479a10100000006ab6552ab655225bcab06d1c2896709f364b1e372814d842c9c671356a1aa5ca4e060462c65ae55acc02d0000000006abac0063ac5281b33e332f96beebdbc6a379ebe6aea36af115c067461eb99d22ba1afbf59462b59ae0bd0200000004ab635365be15c23801724a1704000000000965006a65ac00000052ca555572", "53ab530051ab", 1, 2030598449, "c336b2f7d3702fbbdeffc014d106c69e3413c7c71e436ba7562d8a7a2871f181"],
-	["d3b7421e011f4de0f1cea9ba7458bf3486bee722519efab711a963fa8c100970cf7488b7bb0200000003525352dcd61b300148be5d05000000000000000000", "535251536aac536a", 0, -1960128125, "29aa6d2d752d3310eba20442770ad345b7f6a35f96161ede5f07b33e92053e2a"],
-	["04bac8c5033460235919a9c63c42b2db884c7c8f2ed8fcd69ff683a0a2cccd9796346a04050200000003655351fcad3a2c5a7cbadeb4ec7acc9836c3f5c3e776e5c566220f7f965cf194f8ef98efb5e3530200000007526a006552526526a2f55ba5f69699ece76692552b399ba908301907c5763d28a15b08581b23179cb01eac03000000075363ab6a516351073942c2025aa98a05000000000765006aabac65abd7ffa6030000000004516a655200000000", "53ac6365ac526a", 1, 764174870, "bf5fdc314ded2372a0ad078568d76c5064bf2affbde0764c335009e56634481b"],
-	["c363a70c01ab174230bbe4afe0c3efa2d7f2feaf179431359adedccf30d1f69efe0c86ed390200000002ab51558648fe0231318b04000000000151662170000000000008ac5300006a63acac00000000", "", 0, 2146479410, "191ab180b0d753763671717d051f138d4866b7cb0d1d4811472e64de595d2c70"],
-	["8d437a7304d8772210a923fd81187c425fc28c17a5052571501db05c7e89b11448b36618cd02000000026a6340fec14ad2c9298fde1477f1e8325e5747b61b7e2ff2a549f3d132689560ab6c45dd43c3010000000963ac00ac000051516a447ed907a7efffebeb103988bf5f947fc688aab2c6a7914f48238cf92c337fad4a79348102000000085352ac526a5152517436edf2d80e3ef06725227c970a816b25d0b58d2cd3c187a7af2cea66d6b27ba69bf33a0300000007000063ab526553f3f0d6140386815d030000000003ab6300de138f00000000000900525153515265abac1f87040300000000036aac6500000000", "51", 3, -315779667, "b6632ac53578a741ae8c36d8b69e79f39b89913a2c781cdf1bf47a8c29d997a5"],
-	["fd878840031e82fdbe1ad1d745d1185622b0060ac56638290ec4f66b1beef4450817114a2c0000000009516a63ab53650051abffffffff37b7a10322b5418bfd64fb09cd8a27ddf57731aeb1f1f920ffde7cb2dfb6cdb70300000008536a5365ac53515369ecc034f1594690dbe189094dc816d6d57ea75917de764cbf8eccce4632cbabe7e116cd0100000003515352ffffffff035777fc000000000003515200abe9140300000000050063005165bed6d10200000000076300536363ab65195e9110", "635265", 0, 1729787658, "6e3735d37a4b28c45919543aabcb732e7a3e1874db5315abb7cc6b143d62ff10"],
-	["f40a750702af06efff3ea68e5d56e42bc41cdb8b6065c98f1221fe04a325a898cb61f3d7ee030000000363acacffffffffb5788174aef79788716f96af779d7959147a0c2e0e5bfb6c2dba2df5b4b97894030000000965510065535163ac6affffffff0445e6fd0200000000096aac536365526a526aa6546b000000000008acab656a6552535141a0fd010000000000c897ea030000000008526500ab526a6a631b39dba3", "00abab5163ac", 1, -1778064747, "d76d0fc0abfa72d646df888bce08db957e627f72962647016eeae5a8412354cf"],
-	["a63bc673049c75211aa2c09ecc38e360eaa571435fedd2af1116b5c1fa3d0629c269ecccbf0000000008ac65ab516352ac52ffffffffbf1a76fdda7f451a5f0baff0f9ccd0fe9136444c094bb8c544b1af0fa2774b06010000000463535253ffffffff13d6b7c3ddceef255d680d87181e100864eeb11a5bb6a3528cb0d70d7ee2bbbc02000000056a0052abab951241809623313b198bb520645c15ec96bfcc74a2b0f3db7ad61d455cc32db04afc5cc702000000016309c9ae25014d9473020000000004abab6aac3bb1e803", "", 3, -232881718, "6e48f3da3a4ac07eb4043a232df9f84e110485d7c7669dd114f679c27d15b97e"],
-	["4c565efe04e7d32bac03ae358d63140c1cfe95de15e30c5b84f31bb0b65bb542d637f49e0f010000000551abab536348ae32b31c7d3132030a510a1b1aacf7b7c3f19ce8dc49944ef93e5fa5fe2d356b4a73a00100000009abac635163ac00ab514c8bc57b6b844e04555c0a4f4fb426df139475cd2396ae418bc7015820e852f711519bc202000000086a00510000abac52488ff4aec72cbcfcc98759c58e20a8d2d9725aa4a80f83964e69bc4e793a4ff25cd75dc701000000086a52ac6aac5351532ec6b10802463e0200000000000553005265523e08680100000000002f39a6b0", "", 3, 70712784, "c6076b6a45e6fcfba14d3df47a34f6aadbacfba107e95621d8d7c9c0e40518ed"],
-	["1233d5e703403b3b8b4dae84510ddfc126b4838dcb47d3b23df815c0b3a07b55bf3098110e010000000163c5c55528041f480f40cf68a8762d6ed3efe2bd402795d5233e5d94bf5ddee71665144898030000000965525165655151656affffffff6381667e78bb74d0880625993bec0ea3bd41396f2bcccc3cc097b240e5e92d6a01000000096363acac6a63536365ffffffff04610ad60200000000065251ab65ab52e90d680200000000046351516ae30e98010000000008abab52520063656a671856010000000004ac6aac514c84e383", "6aabab636300", 1, -114996813, "aeb8c5a62e8a0b572c28f2029db32854c0b614dbecef0eaa726abebb42eebb8d"],
-	["0c69702103b25ceaed43122cc2672de84a3b9aa49872f2a5bb458e19a52f8cc75973abb9f102000000055365656aacffffffff3ffb1cf0f76d9e3397de0942038c856b0ebbea355dc9d8f2b06036e19044b0450100000000ffffffff4b7793f4169617c54b734f2cd905ed65f1ce3d396ecd15b6c426a677186ca0620200000008655263526551006a181a25b703240cce0100000000046352ab53dee22903000000000865526a6a516a51005e121602000000000852ab52ababac655200000000", "6a516aab63", 1, -2040012771, "a6e6cb69f409ec14e10dd476f39167c29e586e99bfac93a37ed2c230fcc1dbbe"],
-	["fd22692802db8ae6ab095aeae3867305a954278f7c076c542f0344b2591789e7e33e4d29f4020000000151ffffffffb9409129cfed9d3226f3b6bab7a2c83f99f48d039100eeb5796f00903b0e5e5e0100000006656552ac63abd226abac0403e649000000000007abab51ac5100ac8035f10000000000095165006a63526a52510d42db030000000007635365ac6a63ab24ef5901000000000453ab6a0000000000", "536a52516aac6a", 1, 309309168, "7ca0f75e6530ec9f80d031fc3513ca4ecd67f20cb38b4dacc6a1d825c3cdbfdb"],
-	["a43f85f701ffa54a3cc57177510f3ea28ecb6db0d4431fc79171cad708a6054f6e5b4f89170000000008ac6a006a536551652bebeaa2013e779c05000000000665ac5363635100000000", "ac", 0, 2028978692, "58294f0d7f2e68fe1fd30c01764fe1619bcc7961d68968944a0e263af6550437"],
-	["c2b0b99001acfecf7da736de0ffaef8134a9676811602a6299ba5a2563a23bb09e8cbedf9300000000026300ffffffff042997c50300000000045252536a272437030000000007655353ab6363ac663752030000000002ab6a6d5c900000000000066a6a5265abab00000000", "52ac525163515251", 0, -894181723, "8b300032a1915a4ac05cea2f7d44c26f2a08d109a71602636f15866563eaafdc"],
-	["82f9f10304c17a9d954cf3380db817814a8c738d2c811f0412284b2c791ec75515f38c4f8c020000000265ab5729ca7db1b79abee66c8a757221f29280d0681355cb522149525f36da760548dbd7080a0100000001510b477bd9ce9ad5bb81c0306273a3a7d051e053f04ecf3a1dbeda543e20601a5755c0cfae030000000451ac656affffffff71141a04134f6c292c2e0d415e6705dfd8dcee892b0d0807828d5aeb7d11f5ef0300000001520b6c6dc802a6f3dd0000000000056aab515163bfb6800300000000015300000000", "", 3, -635779440, "d55ed1e6c53510f2608716c12132a11fb5e662ec67421a513c074537eeccc34b"],
-	["8edcf5a1014b604e53f0d12fe143cf4284f86dc79a634a9f17d7e9f8725f7beb95e8ffcd2403000000046aabac52ffffffff01c402b5040000000005ab6a63525100000000", "6351525251acabab6a", 0, 1520147826, "2765bbdcd3ebb8b1a316c04656b28d637f80bffbe9b040661481d3dc83eea6d6"],
-	["2074bad5011847f14df5ea7b4afd80cd56b02b99634893c6e3d5aaad41ca7c8ee8e5098df003000000026a6affffffff018ad59700000000000900ac656a526551635300000000", "65635265", 0, -1804671183, "663c999a52288c9999bff36c9da2f8b78d5c61b8347538f76c164ccba9868d0a"],
-	["7100b11302e554d4ef249ee416e7510a485e43b2ba4b8812d8fe5529fe33ea75f36d392c4403000000020000ffffffff3d01a37e075e9a7715a657ae1bdf1e44b46e236ad16fd2f4c74eb9bf370368810000000007636553ac536365ffffffff01db696a0400000000065200ac656aac00000000", "63005151", 0, -1210499507, "b9c3aee8515a4a3b439de1ffc9c156824bda12cb75bfe5bc863164e8fd31bd7a"],
-	["02c1017802091d1cb08fec512db7b012fe4220d57a5f15f9e7676358b012786e1209bcff950100000004acab6352ffffffff799bc282724a970a6fea1828984d0aeb0f16b67776fa213cbdc4838a2f1961a3010000000951516a536552ab6aabffffffff016c7b4b03000000000865abac5253ac5352b70195ad", "65655200516a", 0, -241626954, "be567cb47170b34ff81c66c1142cb9d27f9b6898a384d6dfc4fce16b75b6cb14"],
-	["cb3178520136cd294568b83bb2520f78fecc507898f4a2db2674560d72fd69b9858f75b3b502000000066aac00515100ffffffff03ab005a01000000000563526363006e3836030000000001abfbda3200000000000665ab0065006500000000", "ab516a0063006a5300", 0, 1182109299, "2149e79c3f4513da4e4378608e497dcfdfc7f27c21a826868f728abd2b8a637a"],
-	["18a4b0c004702cf0e39686ac98aab78ad788308f1d484b1ddfe70dc1997148ba0e28515c310300000000ffffffff05275a52a23c59da91129093364e275da5616c4070d8a05b96df5a2080ef259500000000096aac51656a6aac53ab66e64966b3b36a07dd2bb40242dd4a3743d3026e7e1e0d9e9e18f11d068464b989661321030000000265ac383339c4fae63379cafb63b0bab2eca70e1f5fc7d857eb5c88ccd6c0465093924bba8b2a000000000300636ab5e0545402bc2c4c010000000000cd41c002000000000000000000", "abac635253656a00", 3, 2052372230, "32db877b6b1ca556c9e859442329406f0f8246706522369839979a9f7a235a32"],
-	["1d9c5df20139904c582285e1ea63dec934251c0f9cf5c47e86abfb2b394ebc57417a81f67c010000000353515222ba722504800d3402000000000353656a3c0b4a0200000000000fb8d20500000000076300ab005200516462f30400000000015200000000", "ab65", 0, -210854112, "edf73e2396694e58f6b619f68595b0c1cdcb56a9b3147845b6d6afdb5a80b736"],
-	["4504cb1904c7a4acf375ddae431a74de72d5436efc73312cf8e9921f431267ea6852f9714a01000000066a656a656553a2fbd587c098b3a1c5bd1d6480f730a0d6d9b537966e20efc0e352d971576d0f87df0d6d01000000016321aeec3c4dcc819f1290edb463a737118f39ab5765800547522708c425306ebfca3f396603000000055300ac656a1d09281d05bfac57b5eb17eb3fa81ffcedfbcd3a917f1be0985c944d473d2c34d245eb350300000007656a51525152ac263078d9032f470f0500000000066aac00000052e12da60200000000003488410200000000076365006300ab539981e432", "52536a52526a", 1, -31909119, "f0a2deee7fd8a3a9fad6927e763ded11c940ee47e9e6d410f94fda5001f82e0c"],
-	["14bc7c3e03322ec0f1311f4327e93059c996275302554473104f3f7b46ca179bfac9ef753503000000016affffffff9d405eaeffa1ca54d9a05441a296e5cc3a3e32bb8307afaf167f7b57190b07e00300000008abab51ab5263abab45533aa242c61bca90dd15d46079a0ab0841d85df67b29ba87f2393cd764a6997c372b55030000000452005263ffffffff0250f40e02000000000651516a0063630e95ab0000000000046a5151ac00000000", "6a65005151", 0, -1460947095, "aa418d096929394c9147be8818d8c9dafe6d105945ab9cd7ec682df537b5dd79"],
-	["2b3bd0dd04a1832f893bf49a776cd567ec4b43945934f4786b615d6cb850dfc0349b33301a000000000565ac000051cf80c670f6ddafab63411adb4d91a69c11d9ac588898cbfb4cb16061821cc104325c895103000000025163ffffffffa9e2d7506d2d7d53b882bd377bbcc941f7a0f23fd15d2edbef3cd9df8a4c39d10200000009ac63006a52526a5265ffffffff44c099cdf10b10ce87d4b38658d002fd6ea17ae4a970053c05401d86d6e75f99000000000963ab53526a5252ab63ffffffff035af69c01000000000100ba9b8b0400000000004cead10500000000026a520b77d667", "ab52abac526553", 3, -1955078165, "eb9ceecc3b401224cb79a44d23aa8f428e29f1405daf69b4e01910b848ef1523"],
-	["35df11f004a48ba439aba878fe9df20cc935b4a761c262b1b707e6f2b33e2bb7565cd68b130000000000ffffffffb2a2f99abf64163bb57ca900500b863f40c02632dfd9ea2590854c5fb4811da90200000006ac006363636affffffffaf9d89b2a8d2670ca37c8f7c140600b81259f2e037cb4590578ec6e37af8bf200000000005abac6a655270a4751eb551f058a93301ffeda2e252b6614a1fdd0e283e1d9fe53c96c5bbaafaac57b8030000000153ffffffff020d9f3b02000000000100ed7008030000000004abac000000000000", "abac", 3, 593793071, "88fdee1c2d4aeead71d62396e28dc4d00e5a23498eea66844b9f5d26d1f21042"],
-	["a08ff466049fb7619e25502ec22fedfb229eaa1fe275aa0b5a23154b318441bf547989d0510000000005ab5363636affffffff2b0e335cb5383886751cdbd993dc0720817745a6b1c9b8ab3d15547fc9aafd03000000000965656a536a52656a532b53d10584c290d3ac1ab74ab0a19201a4a039cb59dc58719821c024f6bf2eb26322b33f010000000965ac6aac0053ab6353ffffffff048decba6ebbd2db81e416e39dde1f821ba69329725e702bcdea20c5cc0ecc6402000000086363ab5351ac6551466e377b0468c0fa00000000000651ab53ac6a513461c6010000000008636a636365535100eeb3dc010000000006526a52ac516a43f362010000000005000063536500000000", "0063516a", 1, -1158911348, "f6a1ecb50bd7c2594ebecea5a1aa23c905087553e40486dade793c2f127fdfae"],
-	["5ac2f17d03bc902e2bac2469907ec7d01a62b5729340bc58c343b7145b66e6b97d434b30fa000000000163ffffffff44028aa674192caa0d0b4ebfeb969c284cb16b80c312d096efd80c6c6b094cca000000000763acabac516a52ffffffff10c809106e04b10f9b43085855521270fb48ab579266e7474657c6c625062d2d030000000351636595a0a97004a1b69603000000000465ab005352ad68010000000008636a5263acac5100da7105010000000002acab90325200000000000000000000", "6a6aab516a63526353", 2, 1518400956, "f7efb74b1dcc49d316b49c632301bc46f98d333c427e55338be60c7ef0d953be"],
-	["aeb2e11902dc3770c218b97f0b1960d6ee70459ecb6a95eff3f05295dc1ef4a0884f10ba460300000005516352526393e9b1b3e6ae834102d699ddd3845a1e159aa7cf7635edb5c02003f7830fee3788b795f20100000009ab006a526553ac006ad8809c570469290e0400000000050000abab00b10fd5040000000008ab655263abac53ab630b180300000000009d9993040000000002516300000000", "5351ababac6a65", 0, 1084852870, "f2286001af0b0170cbdad92693d0a5ebaa8262a4a9d66e002f6d79a8c94026d1"],
-	["9860ca9a0294ff4812534def8c3a3e3db35b817e1a2ddb7f0bf673f70eab71bb79e90a2f3100000000086a636551acac5165ffffffffed4d6d3cd9ff9b2d490e0c089739121161a1445844c3e204296816ab06e0a83702000000035100ac88d0db5201c3b59a050000000005ac6a0051ab00000000", "535263ab006a526aab", 1, -962088116, "30df2473e1403e2b8e637e576825f785528d998af127d501556e5f7f5ed89a2a"],
-	["4ddaa680026ec4d8060640304b86823f1ac760c260cef81d85bd847952863d629a3002b54b0200000008526365636a656aab65457861fc6c24bdc760c8b2e906b6656edaf9ed22b5f50e1fb29ec076ceadd9e8ebcb6b000000000152ffffffff033ff04f00000000000551526a00657a1d900300000000002153af040000000003006a6300000000", "ab526a53acabab", 0, 1055317633, "7f21b62267ed52462e371a917eb3542569a4049b9dfca2de3c75872b39510b26"],
-	["01e76dcd02ad54cbc8c71d68eaf3fa7c883b65d74217b30ba81f1f5144ef80b706c0dc82ca000000000352ab6a078ec18bcd0514825feced2e8b8ea1ccb34429fae41c70cc0b73a2799e85603613c6870002000000086363ab6365536a53ffffffff043acea90000000000016ad20e1803000000000100fa00830200000000056352515351e864ee00000000000865535253ab6a6551d0c46672", "6a6365abacab", 0, -1420559003, "8af0b4cbdbc011be848edf4dbd2cde96f0578d662cfebc42252495387114224a"],
-	["fa00b26402670b97906203434aa967ce1559d9bd097d56dbe760469e6032e7ab61accb54160100000006635163630052fffffffffe0d3f4f0f808fd9cfb162e9f0c004601acf725cd7ea5683bbdc9a9a433ef15a0200000005ab52536563d09c7bef049040f305000000000153a7c7b9020000000004ac63ab52847a2503000000000553ab00655390ed80010000000005006553ab52860671d4", "536565ab52", 0, 799022412, "40ed8e7bbbd893e15f3cce210ae02c97669818de5946ca37eefc7541116e2c78"],
-	["cb5c06dc01b022ee6105ba410f0eb12b9ce5b5aa185b28532492d839a10cef33d06134b91b010000000153ffffffff02cec0530400000000005e1e4504000000000865656551acacac6a00000000", "ab53", 0, -1514251329, "136beb95459fe6b126cd6cefd54eb5d971524b0e883e41a292a78f78015cb8d5"],
-	["f10a0356031cd569d652dbca8e7a4d36c8da33cdff428d003338602b7764fe2c96c505175b010000000465ac516affffffffbb54563c71136fa944ee20452d78dc87073ac2365ba07e638dce29a5d179da600000000003635152ffffffff9a411d8e2d421b1e6085540ee2809901e590940bbb41532fa38bd7a16b68cc350100000007535251635365636195df1603b61c45010000000002ab65bf6a310400000000026352fcbba10200000000016aa30b7ff0", "5351", 0, 1552495929, "9eb8adf2caecb4bf9ac59d7f46bd20e83258472db2f569ee91aba4cf5ee78e29"],
-	["c3325c9b012f659466626ca8f3c61dfd36f34670abc054476b7516a1839ec43cd0870aa0c0000000000753525265005351e7e3f04b0112650500000000000363ac6300000000", "acac", 0, -68961433, "5ca70e727d91b1a42b78488af2ed551642c32d3de4712a51679f60f1456a8647"],
-	["2333e54c044370a8af16b9750ac949b151522ea6029bacc9a34261599549581c7b4e5ece470000000007510052006563abffffffff80630fc0155c750ce20d0ca4a3d0c8e8d83b014a5b40f0b0be0dd4c63ac28126020000000465000000ffffffff1b5f1433d38cdc494093bb1d62d84b10abbdae57e3d04e82e600857ab3b1dc990300000003515100b76564be13e4890a908ea7508afdad92ec1b200a9a67939fadce6eb7a29eb4550a0a28cb0300000001acffffffff02926c930300000000016373800201000000000153d27ee740", "ab6365ab516a53", 3, 598653797, "2be27a686eb7940dd32c44ff3a97c1b28feb7ab9c5c0b1593b2d762361cfc2db"],
-	["b500ca48011ec57c2e5252e5da6432089130603245ffbafb0e4c5ffe6090feb629207eeb0e010000000652ab6a636aab8302c9d2042b44f40500000000015278c05a050000000004ac5251524be080020000000007636aac63ac5252c93a9a04000000000965ab6553636aab5352d91f9ddb", "52005100", 0, -2024394677, "49c8a6940a461cc7225637f1e512cdd174c99f96ec05935a59637ededc77124c"],
-	["f52ff64b02ee91adb01f3936cc42e41e1672778962b68cf013293d649536b519bc3271dd2c00000000020065afee11313784849a7c15f44a61cd5fd51ccfcdae707e5896d131b082dc9322a19e12858501000000036aac654e8ca882022deb7c020000000006006a515352abd3defc0000000000016300000000", "63520063", 0, 1130989496, "7f208df9a5507e98c62cebc5c1e2445eb632e95527594929b9577b53363e96f6"],
-	["ab7d6f36027a7adc36a5cf7528fe4fb5d94b2c96803a4b38a83a675d7806dda62b380df86a0000000003000000ffffffff5bc00131e29e22057c04be854794b4877dda42e416a7a24706b802ff9da521b20000000007ac6a0065ac52ac957cf45501b9f06501000000000500ac6363ab25f1110b", "00526500536a635253", 0, 911316637, "5fa09d43c8aef6f6fa01c383a69a5a61a609cd06e37dce35a39dc9eae3ddfe6c"],
-	["f940888f023dce6360263c850372eb145b864228fdbbb4c1186174fa83aab890ff38f8c9a90300000000ffffffff01e80ccdb081e7bbae1c776531adcbfb77f2e5a7d0e5d0d0e2e6c8758470e85f00000000020053ffffffff03b49088050000000004656a52ab428bd604000000000951630065ab63ac636a0cbacf0400000000070063ac5265ac53d6e16604", "ac63", 0, 39900215, "713ddeeefcfe04929e7b6593c792a4efbae88d2b5280d1f0835d2214eddcbad6"],
-	["530ecd0b01ec302d97ef6f1b5a6420b9a239714013e20d39aa3789d191ef623fc215aa8b940200000005ac5351ab6a3823ab8202572eaa04000000000752ab6a51526563fd8a270100000000036a006581a798f0", "525153656a0063", 0, 1784562684, "fe42f73a8742676e640698222b1bd6b9c338ff1ccd766d3d88d7d3c6c6ac987e"],
-	["5d781d9303acfcce964f50865ddfddab527ea971aee91234c88e184979985c00b4de15204b0100000003ab6352a009c8ab01f93c8ef2447386c434b4498538f061845862c3f9d5751ad0fce52af442b3a902000000045165ababb909c66b5a3e7c81b3c45396b944be13b8aacfc0204f3f3c105a66fa8fa6402f1b5efddb01000000096a65ac636aacab656ac3c677c402b79fa4050000000004006aab5133e35802000000000751ab635163ab0078c2e025", "6aac51636a6a005265", 0, -882306874, "551ce975d58647f10adefb3e529d9bf9cda34751627ec45e690f135ef0034b95"],
-	["25ee54ef0187387564bb86e0af96baec54289ca8d15e81a507a2ed6668dc92683111dfb7a50100000004005263634cecf17d0429aa4d000000000007636a6aabab5263daa75601000000000251ab4df70a01000000000151980a890400000000065253ac6a006377fd24e3", "65ab", 0, 797877378, "069f38fd5d47abff46f04ee3ae27db03275e9aa4737fa0d2f5394779f9654845"],
-	["a9c57b1a018551bcbc781b256642532bbc09967f1cbe30a227d352a19365d219d3f11649a3030000000451655352b140942203182894030000000006ab00ac6aab654add350400000000003d379505000000000553abacac00e1739d36", "5363", 0, -1069721025, "6da32416deb45a0d720a1dbe6d357886eabc44029dd5db74d50feaffbe763245"],
-	["05c4fb94040f5119dc0b10aa9df054871ed23c98c890f1e931a98ffb0683dac45e98619fdc0200000007acab6a525263513e7495651c9794c4d60da835d303eb4ee6e871f8292f6ad0b32e85ef08c9dc7aa4e03c9c010000000500ab52acacfffffffffee953259cf14ced323fe8d567e4c57ba331021a1ef5ac2fa90f7789340d7c550100000007ac6aacac6a6a53ffffffff08d9dc820d00f18998af247319f9de5c0bbd52a475ea587f16101af3afab7c210100000003535363569bca7c0468e34f00000000000863536353ac51ac6584e319010000000006650052ab6a533debea030000000003ac0053ee7070020000000006ac52005253ac00000000", "6351005253", 2, 1386916157, "76c4013c40bfa1481badd9d342b6d4b8118de5ab497995fafbf73144469e5ff0"],
-	["c95ab19104b63986d7303f4363ca8f5d2fa87c21e3c5d462b99f1ebcb7c402fc012f5034780000000009006aac63ac65655265ffffffffbe91afa68af40a8700fd579c86d4b706c24e47f7379dad6133de389f815ef7f501000000046aac00abffffffff1520db0d81be4c631878494668d258369f30b8f2b7a71e257764e9a27f24b48701000000076a515100535300b0a989e1164db9499845bac01d07a3a7d6d2c2a76e4c04abe68f808b6e2ef5068ce6540e0100000009ac53636a63ab65656affffffff0309aac6050000000005ab6563656a6067e8020000000003ac536aec91c8030000000009655251ab65ac6a53acc7a45bc5", "63526a65abac", 1, 512079270, "fb7eca81d816354b6aedec8cafc721d5b107336657acafd0d246049556f9e04b"],
-	["ca66ae10049533c2b39f1449791bd6d3f039efe0a121ab7339d39ef05d6dcb200ec3fb2b3b020000000465006a53ffffffff534b8f97f15cc7fb4f4cea9bf798472dc93135cd5b809e4ca7fe4617a61895980100000000ddd83c1dc96f640929dd5e6f1151dab1aa669128591f153310d3993e562cc7725b6ae3d903000000046a52536582f8ccddb8086d8550f09128029e1782c3f2624419abdeaf74ecb24889cc45ac1a64492a0100000002516a4867b41502ee6ccf03000000000752acacab52ab6a4b7ba80000000000075151ab0052536300000000", "6553", 2, -62969257, "8085e904164ab9a8c20f58f0d387f6adb3df85532e11662c03b53c3df8c943cb"],
-	["ba646d0b0453999f0c70cb0430d4cab0e2120457bb9128ed002b6e9500e9c7f8d7baa20abe0200000001652a4e42935b21db02b56bf6f08ef4be5adb13c38bc6a0c3187ed7f6197607ba6a2c47bc8a03000000040052516affffffffa55c3cbfc19b1667594ac8681ba5d159514b623d08ed4697f56ce8fcd9ca5b0b00000000096a6a5263ac655263ab66728c2720fdeabdfdf8d9fb2bfe88b295d3b87590e26a1e456bad5991964165f888c03a0200000006630051ac00acffffffff0176fafe0100000000070063acac65515200000000", "63", 1, 2002322280, "9db4e320208185ee70edb4764ee195deca00ba46412d5527d9700c1cf1c3d057"],
-	["2ddb8f84039f983b45f64a7a79b74ff939e3b598b38f436def7edd57282d0803c7ef34968d02000000026a537eb00c4187de96e6e397c05f11915270bcc383959877868ba93bac417d9f6ed9f627a7930300000004516551abffffffffacc12f1bb67be3ae9f1d43e55fda8b885340a0df1175392a8bbd9f959ad3605003000000025163ffffffff02ff0f4700000000000070bd99040000000003ac53abf8440b42", "", 2, -393923011, "0133f1a161363b71dfb3a90065c7128c56bd0028b558b610142df79e055ab5c7"],
-	["b21fc15403b4bdaa994204444b59323a7b8714dd471bd7f975a4e4b7b48787e720cbd1f5f00000000000ffffffff311533001cb85c98c1d58de0a5fbf27684a69af850d52e22197b0dc941bc6ca9030000000765ab6363ab5351a8ae2c2c7141ece9a4ff75c43b7ea9d94ec79b7e28f63e015ac584d984a526a73fe1e04e0100000007526352536a5365ffffffff02a0a9ea030000000002ab52cfc4f300000000000465525253e8e0f342", "000000", 1, 1305253970, "d1df1f4bba2484cff8a816012bb6ec91c693e8ca69fe85255e0031711081c46a"],
-	["d1704d6601acf710b19fa753e307cfcee2735eada0d982b5df768573df690f460281aad12d0000000007656300005100acffffffff0232205505000000000351ab632ca1bc0300000000016300000000", "ac65ab65ab51", 0, 165179664, "40b4f03c68288bdc996011b0f0ddb4b48dc3be6762db7388bdc826113266cd6c"],
-	["d2f6c096025cc909952c2400bd83ac3d532bfa8a1f8f3e73c69b1fd7b8913379793f3ce92202000000076a00ab6a53516ade5332d81d58b22ed47b2a249ab3a2cb3a6ce9a6b5a6810e18e3e1283c1a1b3bd73e3ab00300000002acabffffffff01a9b2d40500000000056352abab00dc4b7f69", "ab0065", 0, -78019184, "2ef025e907f0fa454a2b48a4f3b81346ba2b252769b5c35d742d0c8985e0bf5e"],
-	["3e6db1a1019444dba461247224ad5933c997256d15c5d37ade3d700506a0ba0a57824930d7010000000852ab6500ab00ac00ffffffff03389242020000000001aba8465a0200000000086a6a636a5100ab52394e6003000000000953ac51526351000053d21d9800", "abababacab53ab65", 0, 1643661850, "1f8a3aca573a609f4aea0c69522a82fcb4e15835449da24a05886ddc601f4f6a"],
-	["f821a042036ad43634d29913b77c0fc87b4af593ac86e9a816a9d83fd18dfcfc84e1e1d57102000000076a63ac52006351ffffffffbcdaf490fc75086109e2f832c8985716b3a624a422cf9412fe6227c10585d21203000000095252abab5352ac526affffffff2efed01a4b73ad46c7f7bc7fa3bc480f8e32d741252f389eaca889a2e9d2007e000000000353ac53ffffffff032ac8b3020000000009636300000063516300d3d9f2040000000006510065ac656aafa5de0000000000066352ab5300ac9042b57d", "525365", 1, 667065611, "0d17a92c8d5041ba09b506ddf9fd48993be389d000aad54f9cc2a44fcc70426b"],
-	["58e3f0f704a186ef55d3919061459910df5406a9121f375e7502f3be872a449c3f2bb058380100000000f0e858da3ac57b6c973f889ad879ffb2bd645e91b774006dfa366c74e2794aafc8bbc871010000000751ac65516a515131a68f120fd88ca08687ceb4800e1e3fbfea7533d34c84fef70cc5a96b648d580369526d000000000600ac00515363f6191d5b3e460fa541a30a6e83345dedfa3ed31ad8574d46d7bbecd3c9074e6ba5287c24020000000151e3e19d6604162602010000000004005100ac71e17101000000000065b5e90300000000040053ab53f6b7d101000000000200ac00000000", "6563ab", 1, -669018604, "8221d5dfb75fc301a80e919e158e0b1d1e86ffb08870a326c89408d9bc17346b"],
-	["efec1cce044a676c1a3d973f810edb5a9706eb4cf888a240f2b5fb08636bd2db482327cf500000000005ab51656a52ffffffff46ef019d7c03d9456e5134eb0a7b5408d274bd8e33e83df44fab94101f7c5b650200000009ac5100006353630051407aadf6f5aaffbd318fdbbc9cae4bd883e67d524df06bb006ce2f7c7e2725744afb76960100000005536aab53acec0d64eae09e2fa1a7c4960354230d51146cf6dc45ee8a51f489e20508a785cbe6ca86fc000000000651536a516300ffffffff014ef598020000000006636aac655265a6ae1b75", "53516a5363526563ab", 2, -1823982010, "13e8b5ab4e5b2ceeff0045c625e19898bda2d39fd7af682e2d1521303cfe1154"],
-	["3c436c2501442a5b700cbc0622ee5143b34b1b8021ea7bbc29e4154ab1f5bdfb3dff9d640501000000086aab5251ac5252acffffffff0170b9a20300000000066aab6351525114b13791", "63acabab52ab51ac65", 0, -2140612788, "87ddf1f9acb6640448e955bd1968f738b4b3e073983af7b83394ab7557f5cd61"],
-	["d62f183e037e0d52dcf73f9b31f70554bce4f693d36d17552d0e217041e01f15ad3840c838000000000963acac6a6a6a63ab63ffffffffabdfb395b6b4e63e02a763830f536fc09a35ff8a0cf604021c3c751fe4c88f4d0300000006ab63ab65ac53aa4d30de95a2327bccf9039fb1ad976f84e0b4a0936d82e67eafebc108993f1e57d8ae39000000000165ffffffff04364ad30500000000036a005179fd84010000000007ab636aac6363519b9023030000000008510065006563ac6acd2a4a02000000000000000000", "52", 1, 595020383, "da8405db28726dc4e0f82b61b2bfd82b1baa436b4e59300305cc3b090b157504"],
-	["44c200a5021238de8de7d80e7cce905606001524e21c8d8627e279335554ca886454d692e6000000000500acac52abbb8d1dc876abb1f514e96b21c6e83f429c66accd961860dc3aed5071e153e556e6cf076d02000000056553526a51870a928d0360a580040000000004516a535290e1e302000000000851ab6a00510065acdd7fc5040000000007515363ab65636abb1ec182", "6363", 0, -785766894, "ed53cc766cf7cb8071cec9752460763b504b2183442328c5a9761eb005c69501"],
-	["d682d52d034e9b062544e5f8c60f860c18f029df8b47716cabb6c1b4a4b310a0705e754556020000000400656a0016eeb88eef6924fed207fba7ddd321ff3d84f09902ff958c815a2bf2bb692eb52032c4d803000000076365ac516a520099788831f8c8eb2552389839cfb81a9dc55ecd25367acad4e03cfbb06530f8cccf82802701000000085253655300656a53ffffffff02d543200500000000056a510052ac03978b05000000000700ac51525363acfdc4f784", "", 2, -696035135, "e1a256854099907050cfee7778f2018082e735a1f1a3d91437584850a74c87bb"],
-	["e8c0dec5026575ddf31343c20aeeca8770afb33d4e562aa8ee52eeda6b88806fdfd4fe0a97030000000953acabab65ab516552ffffffffdde122c2c3e9708874286465f8105f43019e837746686f442666629088a970e0010000000153ffffffff01f98eee0100000000025251fe87379a", "63", 1, 633826334, "abe441209165d25bc6d8368f2e7e7dc21019056719fef1ace45542aa2ef282e2"],
-	["b288c331011c17569293c1e6448e33a64205fc9dc6e35bc756a1ac8b97d18e912ea88dc0770200000007635300ac6aacabfc3c890903a3ccf8040000000004656500ac9c65c9040000000009ab6a6aabab65abac63ac5f7702000000000365005200000000", "526a63", 0, 1574937329, "0dd1bd5c25533bf5f268aa316ce40f97452cca2061f0b126a59094ca5b65f7a0"],
-	["fc0a092003cb275fa9a25a72cf85d69c19e4590bfde36c2b91cd2c9c56385f51cc545530210000000004ab530063ffffffff729b006eb6d14d6e5e32b1c376acf1c62830a5d9246da38dbdb4db9f51fd1c74020000000463636500ffffffff0ae695c6d12ab7dcb8d3d4b547b03f178c7268765d1de9af8523d244e3836b12030000000151ffffffff0115c1e20100000000066a6aabac6a6a1ff59aec", "ab0053ac", 0, 931831026, "73fe22099c826c34a74edf45591f5d7b3a888c8178cd08facdfd96a9a681261c"],
-	["0fcae7e004a71a4a7c8f66e9450c0c1785268679f5f1a2ee0fb3e72413d70a9049ecff75de020000000452005251ffffffff99c8363c4b95e7ec13b8c017d7bb6e80f7c04b1187d6072961e1c2479b1dc0320200000000ffffffff7cf03b3d66ab53ed740a70c5c392b84f780fff5472aee82971ac3bfeeb09b2df0200000006ab5265636a0058e4fe9257d7c7c7e82ff187757c6eadc14cceb6664dba2de03a018095fd3006682a5b9600000000056353536a636de26b2303ff76de010000000001acdc0a2e020000000001ab0a53ed020000000007530063ab51510088417307", "ac6aacab5165535253", 2, -902160694, "eea96a48ee572aea33d75d0587ce954fcfb425531a7da39df26ef9a6635201be"],
-	["612701500414271138e30a46b7a5d95c70c78cc45bf8e40491dac23a6a1b65a51af04e6b94020000000451655153ffffffffeb72dc0e49b2fad3075c19e1e6e4b387f1365dca43d510f6a02136318ddecb7f0200000003536352e115ffc4f9bae25ef5baf534a890d18106fb07055c4d7ec9553ba89ed1ac2101724e507303000000080063006563acabac2ff07f69a080cf61a9d19f868239e6a4817c0eeb6a4f33fe254045d8af2bca289a8695de0300000000430736c404d317840500000000086a00abac5351ab65306e0503000000000963ab0051536aabab6a6c8aca01000000000565516351ab5dcf960100000000016a00000000", "ab", 2, -604581431, "5ec805e74ee934aa815ca5f763425785ae390282d46b5f6ea076b6ad6255a842"],
-	["6b68ba00023bb4f446365ea04d68d48539aae66f5b04e31e6b38b594d2723ab82d44512460000000000200acffffffff5dfc6febb484fff69c9eeb7c7eb972e91b6d949295571b8235b1da8955f3137b020000000851ac6352516a535325828c8a03365da801000000000800636aabac6551ab0f594d03000000000963ac536365ac63636a45329e010000000005abac53526a00000000", "005151", 0, 1317038910, "42f5ba6f5fe1e00e652a08c46715871dc4b40d89d9799fd7c0ea758f86eab6a7"],
-	["aff5850c0168a67296cc790c1b04a9ed9ad1ba0469263a9432fcb53676d1bb4e0eea8ea1410100000005ac65526a537d5fcb1d01d9c26d0200000000065265ab5153acc0617ca1", "51ab650063", 0, 1712981774, "8449d5247071325e5f8edcc93cb9666c0fecabb130ce0e5bef050575488477eb"],
-	["e6d6b9d8042c27aec99af8c12b6c1f7a80453e2252c02515e1f391da185df0874e133696b50300000006ac5165650065ffffffff6a4b60a5bfe7af72b198eaa3cde2e02aa5fa36bdf5f24ebce79f6ecb51f3b554000000000652656aababac2ec4c5a6cebf86866b1fcc4c5bd5f4b19785a8eea2cdfe58851febf87feacf6f355324a80100000001537100145149ac1e287cef62f6f5343579189fad849dd33f25c25bfca841cb696f10c5a34503000000046a636a63df9d7c4c018d96e20100000000015100000000", "53ab", 1, -1924777542, "f98f95d0c5ec3ac3e699d81f6c440d2e7843eab15393eb023bc5a62835d6dcea"],
-	["046ac25e030a344116489cc48025659a363da60bc36b3a8784df137a93b9afeab91a04c1ed020000000951ab0000526a65ac51ffffffff6c094a03869fde55b9a8c4942a9906683f0a96e2d3e5a03c73614ea3223b2c29020000000500ab636a6affffffff3da7aa5ecef9071600866267674b54af1740c5aeb88a290c459caa257a2683cb0000000004ab6565ab7e2a1b900301b916030000000005abac63656308f4ed03000000000852ab53ac63ac51ac73d620020000000003ab00008deb1285", "6a", 2, 1299505108, "f79e6b776e2592bad45ca328c54abf14050c241d8f822d982c36ea890fd45757"],
-	["bd515acd0130b0ac47c2d87f8d65953ec7d657af8d96af584fc13323d0c182a2e5f9a96573000000000652ac51acac65ffffffff0467aade000000000003655363dc577d050000000006515252ab5300137f60030000000007535163530065004cdc860500000000036a5265241bf53e", "acab", 0, 621090621, "771d4d87f1591a13d77e51858c16d78f1956712fe09a46ff1abcabbc1e7af711"],
-	["ff1ae37103397245ac0fa1c115b079fa20930757f5b6623db3579cb7663313c2dc4a3ffdb300000000076353656a000053ffffffff83c59e38e5ad91216ee1a312d15b4267bae2dd2e57d1a3fd5c2f0f809eeb5d46010000000800abab6a6a53ab51ffffffff9d5e706c032c1e0ca75915f8c6686f64ec995ebcd2539508b7dd8abc3e4d7d2a01000000006b2bdcda02a8fe070500000000045253000019e31d04000000000700ab63acab526a00000000", "53656aab6a525251", 0, 881938872, "726bb88cdf3af2f7603a31f33d2612562306d08972a4412a55dbbc0e3363721c"],
-	["ff5400dd02fec5beb9a396e1cbedc82bedae09ed44bae60ba9bef2ff375a6858212478844b03000000025253ffffffff01e46c203577a79d1172db715e9cc6316b9cfc59b5e5e4d9199fef201c6f9f0f000000000900ab6552656a5165acffffffff02e8ce62040000000002515312ce3e00000000000251513f119316", "", 0, 1541581667, "1e0da47eedbbb381b0e0debbb76e128d042e02e65b11125e17fd127305fc65cd"],
-	["28e3daa603c03626ad91ffd0ff927a126e28d29db5012588b829a06a652ea4a8a5732407030200000004ab6552acffffffff8e643146d3d0568fc2ad854fd7864d43f6f16b84e395db82b739f6f5c84d97b40000000004515165526b01c2dc1469db0198bd884e95d8f29056c48d7e74ff9fd37a9dec53e44b8769a6c99c030200000009ab006a516a53630065eea8738901002398000000000007ac5363516a51abeaef12f5", "52ab52515253ab", 2, 1687390463, "55591346aec652980885a558cc5fc2e3f8d21cbd09f314a798e5a7ead5113ea6"],
-	["b54bf5ac043b62e97817abb892892269231b9b220ba08bc8dbc570937cd1ea7cdc13d9676c010000000451ab5365a10adb7b35189e1e8c00b86250f769319668189b7993d6bdac012800f1749150415b2deb0200000003655300ffffffff60b9f4fb9a7e17069fd00416d421f804e2ef2f2c67de4ca04e0241b9f9c1cc5d0200000003ab6aacfffffffff048168461cce1d40601b42fbc5c4f904ace0d35654b7cc1937ccf53fe78505a0100000008526563525265abacffffffff01dbf4e6040000000007acac656553636500000000", "63", 2, 882302077, "f5b38b0f06e246e47ce622e5ee27d5512c509f8ac0e39651b3389815eff2ab93"],
-	["ebf628b30360bab3fa4f47ce9e0dcbe9ceaf6675350e638baff0c2c197b2419f8e4fb17e16000000000452516365ac4d909a79be207c6e5fb44fbe348acc42fc7fe7ef1d0baa0e4771a3c4a6efdd7e2c118b0100000003acacacffffffffa6166e9101f03975721a3067f1636cc390d72617be72e5c3c4f73057004ee0ee010000000863636a6a516a5252c1b1e82102d8d54500000000000153324c900400000000015308384913", "0063516a51", 1, -1658428367, "eb2d8dea38e9175d4d33df41f4087c6fea038a71572e3bad1ea166353bf22184"],
-	["d6a8500303f1507b1221a91adb6462fb62d741b3052e5e7684ea7cd061a5fc0b0e93549fa50100000004acab65acfffffffffdec79bf7e139c428c7cfd4b35435ae94336367c7b5e1f8e9826fcb0ebaaaea30300000000ffffffffd115fdc00713d52c35ea92805414bd57d1e59d0e6d3b79a77ee18a3228278ada020000000453005151ffffffff040231510300000000085100ac6a6a000063c6041c0400000000080000536a6563acac138a0b04000000000263abd25fbe03000000000900656a00656aac510000000000", "ac526aac6a00", 1, -2007972591, "13d12a51598b34851e7066cd93ab8c5212d60c6ed2dae09d91672c10ccd7f87c"],
-	["658cb1c1049564e728291a56fa79987a4ed3146775fce078bd2e875d1a5ca83baf6166a82302000000056a656351ab2170e7d0826cbdb45fda0457ca7689745fd70541e2137bb4f52e7b432dcfe2112807bd720300000007006a0052536351ffffffff8715ca2977696abf86d433d5c920ef26974f50e9f4a20c584fecbb68e530af5101000000009e49d864155bf1d3c757186d29f3388fd89c7f55cc4d9158b4cf74ca27a35a1dd93f945502000000096a535353ac656351510d29fa870230b809040000000006ab6a6a526a633b41da050000000004ab6a6a65ed63bf62", "52acabac", 2, -1774073281, "53ab197fa7e27b8a3f99ff48305e67081eb90e95d89d7e92d80cee25a03a6689"],
-	["e92492cc01aec4e62df67ea3bc645e2e3f603645b3c5b353e4ae967b562d23d6e043badecd0100000003acab65ffffffff02c7e5ea040000000002ab52e1e584010000000005536365515195d16047", "6551", 0, -424930556, "93c34627f526d73f4bea044392d1a99776b4409f7d3d835f23b03c358f5a61c2"],
-	["02e242db04be2d8ced9179957e98cee395d4767966f71448dd084426844cbc6d15f2182e85030000000200650c8ffce3db9de9c3f9cdb9104c7cb26647a7531ad1ebf7591c259a9c9985503be50f8de30000000007ac6a51636a6353ffffffffa2e33e7ff06fd6469987ddf8a626853dbf30c01719efb259ae768f051f803cd30300000000fffffffffd69d8aead941683ca0b1ee235d09eade960e0b1df3cd99f850afc0af1b73e070300000001ab60bb602a011659670100000000076363526300acac00000000", "6353ab515251", 3, 1451100552, "bbc9069b8615f3a52ac8a77359098dcc6c1ba88c8372d5d5fe080b99eb781e55"],
-	["b28d5f5e015a7f24d5f9e7b04a83cd07277d452e898f78b50aae45393dfb87f94a26ef57720200000008ababac630053ac52ffffffff046475ed040000000008ab5100526363ac65c9834a04000000000251abae26b30100000000040000ac65ceefb900000000000000000000", "ac6551ac6a536553", 0, -1756558188, "5848d93491044d7f21884eef7a244fe7d38886f8ae60df49ce0dfb2a342cd51a"],
-	["efb8b09801f647553b91922a5874f8e4bb2ed8ddb3536ed2d2ed0698fac5e0e3a298012391030000000952ac005263ac52006affffffff04cdfa0f050000000007ac53ab51abac65b68d1b02000000000553ab65ac00d057d50000000000016a9e1fda010000000007ac63ac536552ac00000000", "6aac", 0, 1947322973, "603a9b61cd30fcea43ef0a5c18b88ca372690b971b379ee9e01909c336280511"],
-	["68a59fb901c21946797e7d07a4a3ea86978ce43df0479860d7116ac514ba955460bae78fff0000000001abffffffff03979be80100000000036553639300bc040000000008006552006a656565cfa78d0000000000076552acab63ab5100000000", "ab65ab", 0, 995583673, "3b320dd47f2702452a49a1288bdc74a19a4b849b132b6cad9a1d945d87dfbb23"],
-	["67761f2a014a16f3940dcb14a22ba5dc057fcffdcd2cf6150b01d516be00ef55ef7eb07a830100000004636a6a51ffffffff01af67bd050000000008526553526300510000000000", "6a00", 0, 1570943676, "079fa62e9d9d7654da8b74b065da3154f3e63c315f25751b4d896733a1d67807"],
-	["e20fe96302496eb436eee98cd5a32e1c49f2a379ceb71ada8a48c5382df7c8cd88bdc47ced03000000016556aa0e180660925a841b457aed0aae47fca2a92fa1d7afeda647abf67198a3902a7c80dd00000000085152ac636a535265bd18335e01803c810100000000046500ac52f371025e", "6363ab", 1, -651254218, "2921a0e5e3ba83c57ba57c25569380c17986bf34c366ec216d4188d5ba8b0b47"],
-	["4e1bd9fa011fe7aa14eee8e78f27c9fde5127f99f53d86bc67bdab23ca8901054ee8a8b6eb0300000009ac535153006a6a0063ffffffff044233670500000000000a667205000000000652ab636a51abe5bf35030000000003535351d579e505000000000700630065ab51ac3419ac30", "52abac52", 0, -1807563680, "4aae6648f856994bed252d319932d78db55da50d32b9008216d5366b44bfdf8a"],
-	["ec02fbee03120d02fde12574649660c441b40d330439183430c6feb404064d4f507e704f3c0100000000ffffffffe108d99c7a4e5f75cc35c05debb615d52fac6e3240a6964a29c1704d98017fb60200000002ab63fffffffff726ec890038977adfc9dadbeaf5e486d5fcb65dc23acff0dd90b61b8e2773410000000002ac65e9dace55010f881b010000000005ac00ab650000000000", "51ac525152ac6552", 2, -1564046020, "3f988922d8cd11c7adff1a83ce9499019e5ab5f424752d8d361cf1762e04269b"],
-	["23dbdcc1039c99bf11938d8e3ccec53b60c6c1d10c8eb6c31197d62c6c4e2af17f52115c3a0300000008636352000063ababffffffff17823880e1df93e63ad98c29bfac12e36efd60254346cac9d3f8ada020afc0620300000003ab63631c26f002ac66e86cd22a25e3ed3cb39d982f47c5118f03253054842daadc88a6c41a2e1500000000096a00ab636a53635163195314de015570fd0100000000096a5263acab5200005300000000", "ababac6a6553", 1, 11586329, "bd36a50e0e0a4ecbf2709e68daef41eddc1c0c9769efaee57910e99c0a1d1343"],
-	["33b03bf00222c7ca35c2f8870bbdef2a543b70677e413ce50494ac9b22ea673287b6aa55c50000000005ab00006a52ee4d97b527eb0b427e4514ea4a76c81e68c34900a23838d3e57d0edb5410e62eeb8c92b6000000000553ac6aacac42e59e170326245c000000000009656553536aab516aabb1a10603000000000852ab52ab6a516500cc89c802000000000763ac6a63ac516300000000", "", 0, 557416556, "41bead1b073e1e9fee065dd612a617ca0689e8f9d3fed9d0acfa97398ebb404c"],
-	["813eda1103ac8159850b4524ef65e4644e0fc30efe57a5db0c0365a30446d518d9b9aa8fdd0000000003656565c2f1e89448b374b8f12055557927d5b33339c52228f7108228149920e0b77ef0bcd69da60000000006abac00ab63ab82cdb7978d28630c5e1dc630f332c4245581f787936f0b1e84d38d33892141974c75b4750300000004ac53ab65ffffffff0137edfb02000000000000000000", "0063", 1, -1948560575, "71dfcd2eb7f2e6473aed47b16a6d5fcbd0af22813d892e9765023151e07771ec"],
-	["9e45d9aa0248c16dbd7f435e8c54ae1ad086de50c7b25795a704f3d8e45e1886386c653fbf01000000025352fb4a1acefdd27747b60d1fb79b96d14fb88770c75e0da941b7803a513e6d4c908c6445c7010000000163ffffffff014069a8010000000001520a794fb3", "51ac005363", 1, -719113284, "0d31a221c69bd322ef7193dd7359ddfefec9e0a1521d4a8740326d46e44a5d6a"],
-	["36e42018044652286b19a90e5dd4f8d9f361d0760d080c5c5add1970296ff0f1de630233c8010000000200ac39260c7606017d2246ee14ddb7611586178067e6a4be38e788e33f39a3a95a55a13a6775010000000352ac638bea784f7c2354ed02ea0b93f0240cdfb91796fa77649beee6f7027caa70778b091deee700000000066a65ac656363ffffffff4d9d77ab676d711267ef65363f2d192e1bd55d3cd37f2280a34c72e8b4c559d700000000056a006aab00001764e1020d30220100000000085252516aacab0053472097040000000009635353ab6a636a5100a56407a1", "006a536551ab53ab", 0, 827296034, "daec2af5622bbe220c762da77bab14dc75e7d28aa1ade9b7f100798f7f0fd97a"],
-	["5e06159a02762b5f3a5edcdfc91fd88c3bff08b202e69eb5ba74743e9f4291c4059ab008200000000001ac348f5446bb069ef977f89dbe925795d59fb5d98562679bafd61f5f5f3150c3559582992d0000000008ab5165515353abac762fc67703847ec6010000000000e200cf040000000002abaca64b86010000000008520000515363acabb82b491b", "ab53525352ab6a", 0, -61819505, "75a7db0df41485a28bf6a77a37ca15fa8eccc95b5d6014a731fd8adb9ada0f12"],
-	["a1948872013b543d6d902ccdeead231c585195214ccf5d39f136023855958436a43266911501000000086aac006a6a6a51514951c9b2038a538a04000000000452526563c0f345050000000007526a5252ac526af9be8e03000000000752acac51ab006306198db2", "ab6353", 0, -326384076, "ced7ef84aad4097e1eb96310e0d1c8e512cfcb392a01d9010713459b23bc0cf4"],
-	["c3efabba03cb656f154d1e159aa4a1a4bf9423a50454ebcef07bc3c42a35fb8ad84014864d0000000000d1cc73d260980775650caa272e9103dc6408bdacaddada6b9c67c88ceba6abaa9caa2f7d020000000553536a5265ffffffff9f946e8176d9b11ff854b76efcca0a4c236d29b69fb645ba29d406480427438e01000000066a0065005300ffffffff040419c0010000000003ab6a63cdb5b6010000000009006300ab5352656a63f9fe5e050000000004acac5352611b980100000000086a00acac00006a512d7f0c40", "0053", 0, -59089911, "c503001c16fbff82a99a18d88fe18720af63656fccd8511bca1c3d0d69bd7fc0"],
-	["efb55c2e04b21a0c25e0e29f6586be9ef09f2008389e5257ebf2f5251051cdc6a79fce2dac020000000351006affffffffaba73e5b6e6c62048ba5676d18c33ccbcb59866470bb7911ccafb2238cfd493802000000026563ffffffffe62d7cb8658a6eca8a8babeb0f1f4fa535b62f5fc0ec70eb0111174e72bbec5e0300000009abababac516365526affffffffbf568789e681032d3e3be761642f25e46c20322fa80346c1146cb47ac999cf1b0300000000b3dbd55902528828010000000001ab0aac7b0100000000015300000000", "acac52", 3, 1638140535, "e84444d91580da41c8a7dcf6d32229bb106f1be0c811b2292967ead5a96ce9d4"],
-	["91d3b21903629209b877b3e1aef09cd59aca6a5a0db9b83e6b3472aceec3bc2109e64ab85a0200000003530065ffffffffca5f92de2f1b7d8478b8261eaf32e5656b9eabbc58dcb2345912e9079a33c4cd010000000700ab65ab00536ad530611da41bbd51a389788c46678a265fe85737b8d317a83a8ff7a839debd18892ae5c80300000007ab6aac65ab51008b86c501038b8a9a05000000000263525b3f7a040000000007ab535353ab00abd4e3ff04000000000665ac51ab65630b7b656f", "6551525151516a00", 2, 499657927, "ef4bd7622eb7b2bbbbdc48663c1bc90e01d5bde90ff4cb946596f781eb420a0c"],
-	["5d5c41ad0317aa7e40a513f5141ad5fc6e17d3916eebee4ddb400ddab596175b41a111ead20100000005536a5265acffffffff900ecb5e355c5c9f278c2c6ea15ac1558b041738e4bffe5ae06a9346d66d5b2b00000000080000ab636a65ab6affffffff99f4e08305fa5bd8e38fb9ca18b73f7a33c61ff7b3c68e696b30a04fea87f3ca000000000163d3d1760d019fc13a00000000000000000000", "ab53acabab6aac6a52", 2, 1007461922, "4012f5ff2f1238a0eb84854074670b4703238ebc15bfcdcd47ffa8498105fcd9"],
-	["ceecfa6c02b7e3345445b82226b15b7a097563fa7d15f3b0c979232b138124b62c0be007890200000009abac51536a63525253ffffffffbae481ccb4f15d94db5ec0d8854c24c1cc8642bd0c6300ede98a91ca13a4539a0200000001ac50b0813d023110f5020000000006acabac526563e2b0d0040000000009656aac0063516a536300000000", "0063526500", 0, -1862053821, "e1600e6df8a6160a79ac32aa40bb4644daa88b5f76c0d7d13bf003327223f70c"],
-	["ae62d5fd0380c4083a26642159f51af24bf55dc69008e6b7769442b6a69a603edd980a33000000000005ab5100ab53ffffffff49d048324d899d4b8ed5e739d604f5806a1104fede4cb9f92cc825a7fa7b4bfe0200000005536a000053ffffffff42e5cea5673c650881d0b4005fa4550fd86de5f21509c4564a379a0b7252ac0e0000000007530000526a53525f26a68a03bfacc3010000000000e2496f000000000009ab5253acac52636563b11cc600000000000700510065526a6a00000000", "abab", 1, -1600104856, "05cf0ec9c61f1a15f651a0b3c5c221aa543553ce6c804593f43bb5c50bb91ffb"],
-	["f06f64af04fdcb830464b5efdb3d5ee25869b0744005375481d7b9d7136a0eb8828ad1f0240200000003516563fffffffffd3ba192dabe9c4eb634a1e3079fca4f072ee5ceb4b57deb6ade5527053a92c5000000000165ffffffff39f43401a36ba13a5c6dd7f1190e793933ae32ee3bf3e7bfb967be51e681af760300000009650000536552636a528e34f50b21183952cad945a83d4d56294b55258183e1627d6e8fb3beb8457ec36cadb0630000000005abab530052334a7128014bbfd10100000000085352ab006a63656afc424a7c", "53650051635253ac00", 2, 313255000, "d309da5afd91b7afa257cfd62df3ca9df036b6a9f4b38f5697d1daa1f587312b"],
-	["6dfd2f98046b08e7e2ef5fff153e00545faf7076699012993c7a30cb1a50ec528281a9022f030000000152ffffffff1f535e4851920b968e6c437d84d6ecf586984ebddb7d5db6ae035bd02ba222a8010000000651006a53ab51605072acb3e17939fa0737bc3ee43bc393b4acd58451fc4ffeeedc06df9fc649828822d5010000000253525a4955221715f27788d302382112cf60719be9ae159c51f394519bd5f7e70a4f9816c7020200000009526a6a51636aab656a36d3a5ff0445548e0100000000086a6a00516a52655167030b050000000004ac6a63525cfda8030000000000e158200000000000010000000000", "535263ac6a65515153", 3, 585774166, "72b7da10704c3ca7d1deb60c31b718ee12c70dc9dfb9ae3461edce50789fe2ba"],
-	["187eafed01389a45e75e9dda526d3acbbd41e6414936b3356473d1f9793d161603efdb45670100000002ab00ffffffff04371c8202000000000563630063523b3bde02000000000753516563006300e9e765010000000005516aac656a373f9805000000000665525352acab08d46763", "ab", 0, 122457992, "393aa6c758e0eed15fa4af6d9e2d7c63f49057246dbb92b4268ec24fc87301ca"],
-	["7d50b977035d50411d814d296da9f7965ddc56f3250961ca5ba805cadd0454e7c521e31b0300000000003d0416c2cf115a397bacf615339f0e54f6c35ffec95aa009284d38390bdde1595cc7aa7c0100000005ab52ac5365ffffffff4232c6e796544d5ac848c9dc8d25cfa74e32e847a5fc74c74d8f38ca51188562030000000653ac51006a51ffffffff016bd8bb00000000000465ab5253163526f3", "51ab526a00005353", 1, -1311316785, "60b7544319b42e4159976c35c32c2644f0adf42eff13be1dc2f726fc0b6bb492"],
-	["2a45cd1001bf642a2315d4a427eddcc1e2b0209b1c6abd2db81a800c5f1af32812de42032702000000050051525200ffffffff032177db050000000005530051abac49186f000000000004ab6aab00645c0000000000000765655263acabac00000000", "6a65", 0, -1774715722, "6a9ac3f7da4c7735fbc91f728b52ecbd602233208f96ac5592656074a5db118a"],
-	["479358c202427f3c8d19e2ea3def6d6d3ef2281b4a93cd76214f0c7d8f040aa042fe19f71f0300000001abffffffffa2709be556cf6ecaa5ef530df9e4d056d0ed57ce96de55a5b1f369fa40d4e74a020000000700006a51635365c426be3f02af578505000000000363ab63fd8f590500000000065153abac53632dfb14b3", "520063ab51", 1, -763226778, "cfe147982afacde044ce66008cbc5b1e9f0fd9b8ed52b59fc7c0fecf95a39b0e"],
-	["76179a8e03bec40747ad65ab0f8a21bc0d125b5c3c17ad5565556d5cb03ade7c83b4f32d98030000000151ffffffff99b900504e0c02b97a65e24f3ad8435dfa54e3c368f4e654803b756d011d24150200000003ac5353617a04ac61bb6cf697cfa4726657ba35ed0031432da8c0ffb252a190278830f9bd54f0320100000006656551005153c8e8fc8803677c77020000000007ac6553535253ac70f442030000000001535be0f20200000000026300bf46cb3a", "6aab52", 1, -58495673, "35e94b3776a6729d20aa2f3ddeeb06d3aad1c14cc4cde52fd21a4efc212ea16c"],
-	["75ae53c2042f7546223ce5d5f9e00a968ddc68d52e8932ef2013fa40ce4e8c6ed0b6195cde01000000056563ac630079da0452c20697382e3dba6f4fc300da5f52e95a9dca379bb792907db872ba751b8024ee0300000009655151536500005163ffffffffe091b6d43f51ff00eff0ccfbc99b72d3aff208e0f44b44dfa5e1c7322cfc0c5f01000000075200005363ab63ffffffff7e96c3b83443260ac5cfd18258574fbc4225c630d3950df812bf51dceaeb0f9103000000065365655165639a6bf70b01b3e14305000000000563530063ac00000000", "6300ab00ac", 2, 982422189, "ee4ea49d2aae0dbba05f0b9785172da54408eb1ec67d36759ff7ed25bfc28766"],
-	["1cdfa01e01e1b8078e9c2b0ca5082249bd18fdb8b629ead659adedf9a0dd5a04031871ba120200000008525351536565ab6affffffff011e28430200000000076a5363636aac52b2febd4a", "abacac63656300", 0, 387396350, "299dcaac2bdaa627eba0dfd74767ee6c6f27c9200b49da8ff6270b1041669e7e"],
-	["cc28c1810113dfa6f0fcd9c7d9c9a30fb6f1d774356abeb527a8651f24f4e6b25cf763c4e00300000003ab636affffffff02dfc6050000000000080053636351ab0052afd56903000000000453ab5265f6c90d99", "006551abacacac", 0, 1299280838, "a4c0773204ab418a939e23f493bd4b3e817375d133d307609e9782f2cc38dbcf"],
-	["ca816e7802cd43d66b9374cd9bf99a8da09402d69c688d8dcc5283ace8f147e1672b757e020200000005516aabab5240fb06c95c922342279fcd88ba6cd915933e320d7becac03192e0941e0345b79223e89570300000004005151ac353ecb5d0264dfbd010000000005ac6aacababd5d70001000000000752ac53ac6a5151ec257f71", "63ac", 1, 774695685, "cc180c4f797c16a639962e7aec58ec4b209853d842010e4d090895b22e7a7863"],
-	["b42b955303942fedd7dc77bbd9040aa0de858afa100f399d63c7f167b7986d6c2377f66a7403000000066aac00525100ffffffff0577d04b64880425a3174055f94191031ad6b4ca6f34f6da9be7c3411d8b51fc000000000300526a6391e1cf0f22e45ef1c44298523b516b3e1249df153590f592fcb5c5fc432dc66f3b57cb03000000046a6aac65ffffffff0393a6c9000000000004516a65aca674ac0400000000046a525352c82c370000000000030053538e577f89", "", 1, -1237094944, "566953eb806d40a9fb684d46c1bf8c69dea86273424d562bd407b9461c8509af"],
-	["92c9fe210201e781b72554a0ed5e22507fb02434ddbaa69aff6e74ea8bad656071f1923f3f02000000056a63ac6a514470cef985ba83dcb8eee2044807bedbf0d983ae21286421506ae276142359c8c6a34d68020000000863ac63525265006aa796dd0102ca3f9d05000000000800abab52ab535353cd5c83010000000007ac00525252005322ac75ee", "5165", 0, 97879971, "6e6307cef4f3a9b386f751a6f40acebab12a0e7e17171d2989293cbec7fd45c2"],
-	["ccca1d5b01e40fe2c6b3ee24c660252134601dab785b8f55bd6201ffaf2fddc7b3e2192325030000000365535100496d4703b4b66603000000000665535253ac633013240000000000015212d2a502000000000951abac636353636a5337b82426", "0052", 0, -1691630172, "577bf2b3520b40aef44899a20d37833f1cded6b167e4d648fc5abe203e43b649"],
-	["bc1a7a3c01691e2d0c4266136f12e391422f93655c71831d90935fbda7e840e50770c61da20000000008635253abac516353ffffffff031f32aa020000000003636563786dbc0200000000003e950f00000000000563516a655184b8a1de", "51536a", 0, -1627072905, "730bc25699b46703d7718fd5f5c34c4b5f00f594a9968ddc247fa7d5175124ed"],
-	["076d209e02d904a6c40713c7225d23e7c25d4133c3c3477828f98c7d6dbd68744023dbb66b030000000753ab00536565acffffffff10975f1b8db8861ca94c8cc7c7cff086ddcd83e10b5fffd4fc8f2bdb03f9463c0100000000ffffffff029dff76010000000006526365530051a3be6004000000000000000000", "515253ac65acacac", 1, -1207502445, "66c488603b2bc53f0d22994a1f0f66fb2958203102eba30fe1d37b27a55de7a5"],
-	["690fd1f80476db1f9eebe91317f2f130a60cbc1f4feadd9d6474d438e9cb7f91e4994600af0300000004ab536a63a15ce9fa6622d0c4171d895b42bff884dc6e8a7452f827fdc68a29c3c88e6fdee364eaf50000000002ab52ffffffff022dc39d3c0956b24d7f410b1e387859e7a72955f45d6ffb1e884d77888d18fe0300000005ac6a63656afffffffff10b06bce1800f5c49153d24748fdefb0bf514c12863247d1042d56018c3e25c03000000086a63ac6365536a52ffffffff031f162f0500000000060000655265abffbcd40500000000045151ac001a9c8c05000000000652ac53656a6300000000", "ac51ab63acac", 0, -67986012, "051c0df7ac688c2c930808dabde1f50300aea115f2bb3334f4753d5169b51e46"],
-	["49ac2af00216c0307a29e83aa5de19770e6b20845de329290bd69cf0e0db7aed61ae41b39002000000035163ac8b2558ef84635bfc59635150e90b61fc753d34acfd10d97531043053e229cd720133cd95000000000463516a51ffffffff02458471040000000008abab636a51ac0065545aa80000000000096a6553516a5263ac6a00000000", "51526300ab5363", 1, 1449668540, "ddfd902bba312a06197810da96a0ddccb595f96670b28ded7dba88d8cd0469b8"],
-	["fa4d868b024b010bd5dce46576c2fb489aa60bb797dac3c72a4836f49812c5c564c258414f03000000007a9b3a585e05027bdd89edbadf3c85ac61f8c3a04c773fa746517ae600ff1a9d6b6c02fb0200000004515163abffffffff01b17d020500000000046a65520000000000", "536565ab65635363", 0, -1718953372, "96c2b32f0a00a5925db7ba72d0b5d39922f30ea0f7443b22bc1b734808513c47"],
-	["cac6382d0462375e83b67c7a86c922b569a7473bfced67f17afd96c3cd2d896cf113febf9e0300000003006a53ffffffffaa4913b7eae6821487dd3ca43a514e94dcbbf350f8cc4cafff9c1a88720711b800000000096a6a525300acac6353ffffffff184fc4109c34ea27014cc2c1536ef7ed1821951797a7141ddacdd6e429fae6ff01000000055251655200ffffffff9e7b79b4e6836e290d7b489ead931cba65d1030ccc06f20bd4ca46a40195b33c030000000008f6bc8304a09a2704000000000563655353511dbc73050000000000cf34c500000000000091f76e0000000000085200ab00005100abd07208cb", "0063656a", 2, -1488731031, "bf078519fa87b79f40abc38f1831731422722c59f88d86775535f209cb41b9b1"],
-	["1711146502c1a0b82eaa7893976fefe0fb758c3f0e560447cef6e1bde11e42de91a125f71c030000000015bd8c04703b4030496c7461482481f290c623be3e76ad23d57a955807c9e851aaaa20270300000000d04abaf20326dcb7030000000001632225350400000000075263ac00520063dddad9020000000000af23d148", "52520053510063", 0, 1852122830, "e33d5ee08c0f3c130a44d7ce29606450271b676f4a80c52ab9ffab00cecf67f8"],
-	["8d5b124d0231fbfc640c706ddb1d57bb49a18ba8ca0e1101e32c7e6e65a0d4c7971d93ea360100000008acabac0000abac65ffffffff8fe0fd7696597b845c079c3e7b87d4a44110c445a330d70342a5501955e17dd70100000004ab525363ef22e8a90346629f030000000009516a00ac63acac51657bd57b05000000000200acfd4288050000000009acab5352ab00ab636300000000", "53ac526553ab65", 0, 1253152975, "8b57a7c3170c6c02dd14ae1d392ce3d828197b20e9145c89c1cfd5de050e1562"],
-	["38146dc502c7430e92b6708e9e107b61cd38e5e773d9395e5c8ad8986e7e4c03ee1c1e1e760100000000c8962ce2ac1bb3b1285c0b9ba07f4d2e5ce87c738c42ac0548cd8cec1100e6928cd6b0b6010000000763ab636aab52527cccefbd04e5f6f8020000000006006aabacac65ab2c4a00000000000351635209a6f40100000000026aacce57dc040000000008ab5353ab516a516a00000000", "ab", 0, -1205978252, "3cb5b030e7da0b60ccce5b4a7f3793e6ca56f03e3799fe2d6c3cc22d6d841dcb"],
-	["22d81c740469695a6a83a9a4824f77ecff8804d020df23713990afce2b72591ed7de98500502000000065352526a6a6affffffff90dc85e118379b1005d7bbc7d2b8b0bab104dad7eaa49ff5bead892f17d8c3ba010000000665656300ab51ffffffff965193879e1d5628b52005d8560a35a2ba57a7f19201a4045b7cbab85133311d0200000003ac005348af21a13f9b4e0ad90ed20bf84e4740c8a9d7129632590349afc03799414b76fd6e826200000000025353ffffffff04a0d40d04000000000060702700000000000652655151516ad31f1502000000000365ac0069a1ac0500000000095100655300ab53525100000000", "51636a52ac", 0, -1644680765, "add7f5da27262f13da6a1e2cc2feafdc809bd66a67fb8ae2a6f5e6be95373b6f"],
-	["a27dcbc801e3475174a183586082e0914c314bc9d79d1570f29b54591e5e0dff07fbb45a7f0000000004ac53ab51ffffffff027347f5020000000005535351ab63d0e5c9030000000009ac65ab6a63515200ab7cd632ed", "ac63636553", 0, -686435306, "883a6ea3b2cc53fe8a803c229106366ca14d25ffbab9fef8367340f65b201da6"],
-	["b123ed2204410d4e8aaaa8cdb95234ca86dad9ff77fb4ae0fd4c06ebed36794f0215ede0040100000002ac63ffffffff3b58b81b19b90d8f402701389b238c3a84ff9ba9aeea298bbf15b41a6766d27a01000000056a6553ab00151824d401786153b819831fb15926ff1944ea7b03d884935a8bde01ed069d5fd80220310200000000ffffffffa9c9d246f1eb8b7b382a9032b55567e9a93f86c77f4e32c092aa1738f7f756c30100000002ab65ffffffff011a2b48000000000000ed44d1fb", "630051ab63", 2, -1118263883, "b5dab912bcabedff5f63f6dd395fc2cf030d83eb4dd28214baba68a45b4bfff0"],
-	["1339051503e196f730955c5a39acd6ed28dec89b4dadc3f7c79b203b344511270e5747fa9900000000045151636affffffff378c6090e08a3895cedf1d25453bbe955a274657172491fd2887ed5c9aceca7b0100000000ffffffffcf7cc3c36ddf9d4749edfa9cefed496d2f86e870deb814bfcd3b5637a5496461030000000451006300ffffffff04dcf3fa010000000008526a63005263acabb41d84040000000004abac5153800eff020000000005656a535365106c5e00000000000000000000", "abac5300", 2, 2013719928, "7fc74de39ce6ca46ca25d760d3cec7bb21fd14f7efe1c443b5aa294f2cb5f546"],
-	["0728c606014c1fd6005ccf878196ba71a54e86cc8c53d6db500c3cc0ac369a26fac6fcbc210000000005ab53ac5365ba9668290182d7870100000000066a000053655100000000", "65", 0, 1789961588, "ab6baa6da3b2bc853868d166f8996ad31d63ef981179f9104f49968fd61c8427"],
-	["a1134397034bf4067b6c81c581e2b73fb63835a08819ba24e4e92df73074bf773c94577df7000000000465525251ffffffff8b6608feaa3c1f35f49c6330a769716fa01c5c6f6e0cdc2eb10dfc99bbc21e77010000000952656aac005352655180a0bda4bc72002c2ea8262e26e03391536ec36867258cab968a6fd6ec7523b64fa1d8c001000000056a53ac6353ffffffff04dbeeed05000000000553650052abcd5d0e01000000000463abab51104b2e0500000000066aac53ac5165283ca7010000000004535252ab00000000", "ab515151516552ab", 1, -324598676, "91178482112f94d1c8e929de443e4b9c893e18682998d393ca9ca77950412586"],
-	["bcdafbae04aa18eb75855aeb1f5124f30044741351b33794254a80070940cb10552fa4fa8e0300000001acd0423fe6e3f3f88ae606f2e8cfab7a5ef87caa2a8f0401765ff9a47d718afcfb40c0099b0000000008ac6565ab53ac6aac645308009d680202d600e492b31ee0ab77c7c5883ebad5065f1ce87e4dfe6453e54023a0010000000151ffffffffb9d818b14245899e1d440152827c95268a676f14c3389fc47f5a11a7b38b1bde03000000026300ffffffff03cda22102000000000751ac535263005100a4d20400000000045200536ac8bef405000000000700ab51ab6563ac00000000", "6553516a526aab", 1, -2111409753, "5e1849e7368cf4f042718586d9bd831d61479b775bab97aba9f450042bd9876a"],
-	["ed3bb93802ddbd08cb030ef60a2247f715a0226de390c9c1a81d52e83f8674879065b5f87d0300000003ab6552ffffffff04d2c5e60a21fb6da8de20bf206db43b720e2a24ce26779bca25584c3f765d1e0200000008ab656a6aacab00ab6e946ded025a811d04000000000951abac6352ac00ab5143cfa3030000000005635200636a00000000", "5352ac650065535300", 1, -668727133, "e9995065e1fddef72a796eef5274de62012249660dc9d233a4f24e02a2979c87"],
-	["59f4629d030fa5d115c33e8d55a79ea3cba8c209821f979ed0e285299a9c72a73c5bba00150200000002636affffffffd8aca2176df3f7a96d0dc4ee3d24e6cecde1582323eec2ebef9a11f8162f17ac0000000007ab6565acab6553ffffffffeebc10af4f99c7a21cbc1d1074bd9f0ee032482a71800f44f26ee67491208e0403000000065352ac656351ffffffff0434e955040000000004ab515152caf2b305000000000365ac007b1473030000000003ab530033da970500000000060051536a5253bb08ab51", "", 2, 396340944, "0e9c47973ef2c292b2252c623f465bbb92046fe0b893eebf4e1c9e02cb01c397"],
-	["286e3eb7043902bae5173ac3b39b44c5950bc363f474386a50b98c7bdab26f98dc83449c4a020000000752ac6a00510051ffffffff4339cd6a07f5a5a2cb5815e5845da70300f5c7833788363bf7fe67595d3225520100000000fffffffff9c2dd8b06ad910365ffdee1a966f124378a2b8021065c8764f6138bb1e951380200000005ab5153ac6affffffff0370202aba7a68df85436ea7c945139513384ef391fa33d16020420b8ad40e9a000000000900ab5165526353abacffffffff020c1907000000000004abac526a1b490b040000000000df1528f7", "5353ab", 3, -1407529517, "32154c09174a9906183abf26538c39e78468344ca0848bbd0785e24a3565d932"],
-	["2e245cf80179e2e95cd1b34995c2aff49fe4519cd7cee93ad7587f7f7e8105fc2dff206cd30200000009006a63516a6553ab52350435a201d5ed2d02000000000352ab6558552c89", "00ab53", 0, -233917810, "4605ae5fd3d50f9c45d37db7118a81a9ef6eb475d2333f59df5d3e216f150d49"],
-	["33a98004029d262f951881b20a8d746c8c707ea802cd2c8b02a33b7e907c58699f97e42be80100000007ac53536552abacdee04cc01d205fd8a3687fdf265b064d42ab38046d76c736aad8865ca210824b7c622ecf02000000070065006a536a6affffffff01431c5d010000000000270d48ee", "", 1, 921554116, "ff9d7394002f3f196ea25472ea6c46f753bd879a7244795157bb7235c9322902"],
-	["aac18f2b02b144ed481557c53f2146ae523f24fcde40f3445ab0193b6b276c315dc2894d2300000000075165650000636a233526947dbffc76aec7db1e1baa6868ad4799c76e14794dcbaaec9e713a83967f6a65170200000005abac6551ab27d518be01b652a30000000000015300000000", "52ac5353", 1, 1559377136, "59fc2959bb7bb24576cc8a237961ed95bbb900679d94da6567734c4390cb6ef5"],
-	["5ab79881033555b65fe58c928883f70ce7057426fbdd5c67d7260da0fe8b1b9e6a2674cb850300000009ac516aac6aac006a6affffffffa5be9223b43c2b1a4d120b5c5b6ec0484f637952a3252181d0f8e813e76e11580200000000e4b5ceb8118cb77215bbeedc9a076a4d087bb9cd1473ea32368b71daeeeacc451ec209010000000005acac5153aced7dc34e02bc5d11030000000005ac5363006a54185803000000000552ab00636a00000000", "5100", 1, 1927062711, "e9f53d531c12cce1c50abed4ac521a372b4449b6a12f9327c80020df6bff66c0"],
-	["6c2c8fac0124b0b7d4b610c3c5b91dee32b7c927ac71abdf2d008990ca1ac40de0dfd530660300000006ababac5253656bd7eada01d847ec000000000004ac52006af4232ec8", "6a6a6a0051", 0, -340809707, "fb51eb9d7e47d32ff2086205214f90c7c139e08c257a64829ae4d2b301071c6a"],
-	["6e3880af031735a0059c0bb5180574a7dcc88e522c8b56746d130f8d45a52184045f96793e0100000008acabac6a526a6553fffffffffe05f14cdef7d12a9169ec0fd37524b5fcd3295f73f48ca35a36e671da4a2f560000000008006a526a6351ab63ffffffffdfbd869ac9e472640a84caf28bdd82e8c6797f42d03b99817a705a24fde2736600000000010090a090a503db956b04000000000952ac53ab6a536a63ab358390010000000009656a5200525153ac65353ee204000000000763530052526aaba6ad83fb", "535151ab6300", 2, 222014018, "57a34ddeb1bf36d28c7294dda0432e9228a9c9e5cc5c692db98b6ed2e218d825"],
-	["8df1cd19027db4240718dcaf70cdee33b26ea3dece49ae6917331a028c85c5a1fb7ee3e475020000000865ab6a00510063636157988bc84d8d55a8ba93cdea001b9bf9d0fa65b5db42be6084b5b1e1556f3602f65d4d0100000005ac00ab0052206c852902b2fb54030000000008ac5252536aacac5378c4a5050000000007acabac535163532784439e", "acab6a", 0, 1105620132, "edb7c74223d1f10f9b3b9c1db8064bc487321ff7bb346f287c6bc2fad83682de"],
-	["0e803682024f79337b25c98f276d412bc27e56a300aa422c42994004790cee213008ff1b8303000000080051ac65ac655165f421a331892b19a44c9f88413d057fea03c3c4a6c7de4911fe6fe79cf2e9b3b10184b1910200000005525163630096cb1c670398277204000000000253acf7d5d502000000000963536a6a636a5363ab381092020000000002ac6a911ccf32", "6565", 1, -1492094009, "f0672638a0e568a919e9d8a9cbd7c0189a3e132940beeb52f111a89dcc2daa2c"],
-	["7d71669d03022f9dd90edac323cde9e56354c6804c6b8e687e9ae699f46805aafb8bcaa636000000000253abffffffff698a5fdd3d7f2b8b000c68333e4dd58fa8045b3e2f689b889beeb3156cecdb490300000009525353abab0051acabc53f0aa821cdd69b473ec6e6cf45cf9b38996e1c8f52c27878a01ec8bb02e8cb31ad24e500000000055353ab0052ffffffff0447a23401000000000565ab53ab5133aaa0030000000006515163656563057d110300000000056a6aacac52cf13b5000000000003526a5100000000", "6a6a51", 1, -1349253507, "722efdd69a7d51d3d77bed0ac5544502da67e475ea5857cd5af6bdf640a69945"],
-	["9ff618e60136f8e6bb7eabaaac7d6e2535f5fba95854be6d2726f986eaa9537cb283c701ff02000000026a65ffffffff012d1c0905000000000865ab00ac6a516a652f9ad240", "51515253635351ac", 0, 1571304387, "659cd3203095d4a8672646add7d77831a1926fc5b66128801979939383695a79"],
-	["9fbd43ac025e1462ecd10b1a9182a8e0c542f6d1089322a41822ab94361e214ed7e1dfdd8a020000000263519d0437581538e8e0b6aea765beff5b4f3a4a202fca6e5d19b34c141078c6688f71ba5b8e0100000003ac6552ffffffff02077774050000000009655153655263acab6a0ae4e10100000000035152524c97136b", "635152ab", 0, 1969622955, "d82d4ccd9b67810f26a378ad9592eb7a30935cbbd27e859b00981aefd0a72e08"],
-	["0117c92004314b84ed228fc11e2999e657f953b6de3b233331b5f0d0cf40d5cc149b93c7b30300000005515263516a083e8af1bd540e54bf5b309d36ba80ed361d77bbf4a1805c7aa73667ad9df4f97e2da410020000000600ab6351ab524d04f2179455e794b2fcb3d214670001c885f0802e4b5e015ed13a917514a7618f5f332203000000086a536aab51000063ecf029e65a4a009a5d67796c9f1eb358b0d4bd2620c8ad7330fb98f5a802ab92d0038b1002000000036a6551a184a88804b04490000000000009ab6a5152535165526a33d1ab020000000001518e92320000000000002913df04000000000952abac6353525353ac8b19bfdf", "000051ab0000", 0, 489433059, "8eebac87e60da524bbccaf285a44043e2c9232868dda6c6271a53c153e7f3a55"],
-	["e7f5482903f98f0299e0984b361efb2fddcd9979869102281e705d3001a9d283fe9f3f3a1e02000000025365ffffffffcc5c7fe82feebad32a22715fc30bc584efc9cd9cadd57e5bc4b6a265547e676e0000000001ab579d21235bc2281e08bf5e7f8f64d3afb552839b9aa5c77cf762ba2366fffd7ebb74e49400000000055263ab63633df82cf40100982e05000000000453ac535300000000", "acacab", 2, -1362931214, "046de666545330e50d53083eb78c9336416902f9b96c77cc8d8e543da6dfc7e4"],
-	["09adb2e90175ca0e816326ae2dce7750c1b27941b16f6278023dbc294632ab97977852a09d030000000465ab006affffffff027739cf0100000000075151ab63ac65ab8a5bb601000000000653ac5151520011313cdc", "ac", 0, -76831756, "478ee06501b4965b40bdba6cbaad9b779b38555a970912bb791b86b7191c54bc"],
-	["f973867602e30f857855cd0364b5bbb894c049f44abbfd661d7ae5dbfeaafca89fac8959c20100000005ab52536a51ffffffffbeceb68a4715f99ba50e131884d8d20f4a179313691150adf0ebf29d05f8770303000000066352ab00ac63ffffffff021fddb90000000000036a656322a177000000000008526500ac5100acac84839083", "52acab53ac", 0, 1407879325, "db0329439490efc64b7104d6d009b03fbc6fac597cf54fd786fbbb5fd73b92b4"],
-	["fd22ebaa03bd588ad16795bea7d4aa7f7d48df163d75ea3afebe7017ce2f350f6a0c1cb0bb00000000086aabac5153526363ffffffff488e0bb22e26a565d77ba07178d17d8f85702630ee665ec35d152fa05af3bda10200000004515163abffffffffeb21035849e85ad84b2805e1069a91bb36c425dc9c212d9bae50a95b6bfde1200300000001ab5df262fd02b69848040000000008ab6363636a6363ace23bf2010000000007655263635253534348c1da", "006353526563516a00", 0, -1491036196, "92364ba3c7a85d4e88885b8cb9b520dd81fc29e9d2b750d0790690e9c1246673"],
-	["130b462d01dd49fac019dc4442d0fb54eaa6b1c2d1ad0197590b7df26969a67abd7f3fbb4f0100000008ac65abac53ab6563ffffffff0345f825000000000004ac53acac9d5816020000000002ababeff8e90500000000086aab006552ac6a53a892dc55", "ab0065ac530052", 0, 944483412, "1f4209fd4ce7f13d175fdd522474ae9b34776fe11a5f17a27d0796c77a2a7a9d"],
-	["f8e50c2604609be2a95f6d0f31553081f4e1a49a0a30777fe51eb1c596c1a9a92c053cf28c0300000009656a51ac5252630052fffffffff792ed0132ae2bd2f11d4a2aab9d0c4fbdf9a66d9ae2dc4108afccdc14d2b1700100000007ab6a6563ac636a7bfb2fa116122b539dd6a2ab089f88f3bc5923e5050c8262c112ff9ce0a3cd51c6e3e84f02000000066551ac5352650d5e687ddf4cc9a497087cabecf74d236aa4fc3081c3f67b6d323cba795e10e7a171b725000000000852635351ab635100ffffffff02df5409020000000008ac6a53acab5151004156990200000000045163655200000000", "ac53abac65005300", 0, -173065000, "b596f206d7eba22b7e2d1b7a4f4cf69c7c541b6c84dcc943f84e19a99a923310"],
-	["18020dd1017f149eec65b2ec23300d8df0a7dd64fc8558b36907723c03cd1ba672bbb0f51d0300000005ab65ab6a63ffffffff037cd7ae000000000009ab516a65005352ac65f1e4360400000000056353530053f118f0040000000009536363ab006500abac00000000", "63ab51acab52ac", 0, -550412404, "e19b796c14a0373674968e342f2741d8b51092a5f8409e9bff7dcd52e56fcbcb"],
-	["b04154610363fdade55ceb6942d5e5a723323863b48a0cb04fdcf56210717955763f56b08d0300000009ac526a525151635151ffffffff93a176e76151a9eabdd7af00ef2af72f9e7af5ecb0aa4d45d00618f394cdd03c030000000074d818b332ebe05dc24c44d776cf9d275c61f471cc01efce12fd5a16464157f1842c65cb00000000066a0000ac6352d3c4134f01d8a1c0030000000005520000005200000000", "5200656a656351", 2, -9757957, "6e3e5ba77f760b6b5b5557b13043f1262418f3dd2ce7f0298b012811fc8ad5bc"],
-	["9794b3ce033df7b1e32db62d2f0906b589eacdacf5743963dc2255b6b9a6cba211fadd0d41020000000600ab00650065ffffffffaae00687a6a4131152bbcaafedfaed461c86754b0bde39e2bef720e6d1860a0302000000070065516aac6552ffffffff50e4ef784d6230df7486e972e8918d919f005025bc2d9aacba130f58bed7056703000000075265ab52656a52ffffffff02c6f1a9000000000006005251006363cf450c040000000008abab63510053abac00000000", "ac0063ababab515353", 1, 2063905082, "fad092fc98f17c2c20e10ba9a8eb44cc2bcc964b006f4da45cb9ceb249c69698"],
-	["94533db7015e70e8df715066efa69dbb9c3a42ff733367c18c22ff070392f988f3b93920820000000006535363636300ce4dac3e03169af80300000000080065ac6a53ac65ac39c050020000000006abacab6aacac708a02050000000005ac5251520000000000", "6553", 0, -360458507, "5418cf059b5f15774836edd93571e0eed3855ba67b2b08c99dccab69dc87d3e9"],
-	["c8597ada04f59836f06c224a2640b79f3a8a7b41ef3efa2602592ddda38e7597da6c639fee0300000009005251635351acabacffffffff4c518f347ee694884b9d4072c9e916b1a1f0a7fc74a1c90c63fdf8e5a185b6ae02000000007113af55afb41af7518ea6146786c7c726641c68c8829a52925e8d4afd07d8945f68e7230300000008ab00ab65ab650063ffffffffc28e46d7598312c420e11dfaae12add68b4d85adb182ae5b28f8340185394b63000000000165ffffffff04dbabb7010000000000ee2f6000000000000852ab6500ab6a51acb62a27000000000009ac53515300ac006a6345fb7505000000000752516a0051636a00000000", "", 3, 15199787, "0d66003aff5bf78cf492ecbc8fd40c92891acd58d0a271be9062e035897f317e"],
-	["1a28c4f702c8efaad96d879b38ec65c5283b5c084b819ad7db1c086e85e32446c7818dc7a90300000008656351536a525165fa78cef86c982f1aac9c5eb8b707aee8366f74574c8f42ef240599c955ef4401cf578be30200000002ab518893292204c430eb0100000000016503138a0300000000040053abac60e0eb010000000005525200ab63567c2d030000000004abab52006cf81e85", "ab51525152", 1, 2118315905, "4e4c9a781f626b59b1d3ad8f2c488eb6dee8bb19b9bc138bf0dc33e7799210d4"],
-	["c6c7a87003f772bcae9f3a0ac5e499000b68703e1804b9ddc3e73099663564d53ddc4e1c6e01000000076a536a6aac63636e3102122f4c30056ef8711a6bf11f641ddfa6984c25ac38c3b3e286e74e839198a80a34010000000165867195cd425821dfa2f279cb1390029834c06f018b1e6af73823c867bf3a0524d1d6923b0300000005acab53ab65ffffffff02fa4c49010000000008ab656a0052650053e001100400000000008836d972", "ac526351acab", 1, 978122815, "a869c18a0edf563d6e5eddd5d5ae8686f41d07f394f95c9feb8b7e52761531ca"],
-	["0ea580ac04c9495ab6af3b8d59108bb4194fcb9af90b3511c83f7bb046d87aedbf8423218e02000000085152acac006363ab9063d7dc25704e0caa5edde1c6f2dd137ded379ff597e055b2977b9c559b07a7134fcef2000000000200aca89e50181f86e9854ae3b453f239e2847cf67300fff802707c8e3867ae421df69274449402000000056365abababffffffff47a4760c881a4d7e51c69b69977707bd2fb3bcdc300f0efc61f5840e1ac72cee0000000000ffffffff0460179a020000000004ab53ab52a5250c0500000000096565acac6365ab52ab6c281e02000000000952635100ac006563654e55070400000000046552526500000000", "ab526563acac53ab", 2, 1426964167, "b1c50d58b753e8f6c7513752158e9802cf0a729ebe432b99acc0fe5d9b4e9980"],
-	["c33028b301d5093e1e8397270d75a0b009b2a6509a01861061ab022ca122a6ba935b8513320200000000ffffffff013bcf5a0500000000015200000000", "", 0, -513413204, "6b1459536f51482f5dbf42d7e561896557461e1e3b6bf67871e2b51faae2832c"],
-	["43b2727901a7dd06dd2abf690a1ccedc0b0739cb551200796669d9a25f24f71d8d101379f50300000000ffffffff0418e031040000000000863d770000000000085352ac526563ac5174929e040000000004ac65ac00ec31ac0100000000066a51ababab5300000000", "65", 0, -492874289, "154ff7a9f0875edcfb9f8657a0b98dd9600fabee3c43eb88af37cf99286d516c"],
-	["4763ed4401c3e6ab204bed280528e84d5288f9cac5fb8a2e7bd699c7b98d4df4ac0c40e55303000000066a6aacab5165ffffffff015b57f80400000000046a63535100000000", "ac51abab53", 0, -592611747, "849033a2321b5755e56ef4527ae6f51e30e3bca50149d5707368479723d744f8"],
-	["d24f647b02f71708a880e6819a1dc929c1a50b16447e158f8ff62f9ccd644e0ca3c592593702000000050053536a00ffffffff67868cd5414b6ca792030b18d649de5450a456407242b296d936bcf3db79e07b02000000005af6319c016022f50100000000036a516300000000", "6aab526353516a6a", 0, 1350782301, "8556fe52d1d0782361dc28baaf8774b13f3ce5ed486ae0f124b665111e08e3e3"],
-	["fe6ddf3a02657e42a7496ef170b4a8caf245b925b91c7840fd28e4a22c03cb459cb498b8d603000000065263656a650071ce6bf8d905106f9f1faf6488164f3decac65bf3c5afe1dcee20e6bc3cb6d052561985a030000000163295b117601343dbb0000000000026563dba521df", "", 1, -1696179931, "d9684685c99ce48f398fb467a91a1a59629a850c429046fb3071f1fa9a5fe816"],
-	["c61523ef0129bb3952533cbf22ed797fa2088f307837dd0be1849f20decf709cf98c6f032f03000000026563c0f1d378044338310400000000066363516a5165a14fcb0400000000095163536a6a00ab53657271d60200000000001d953f0500000000010000000000", "53516353005153", 0, 1141615707, "7e975a72db5adaa3c48d525d9c28ac11cf116d0f8b16ce08f735ad75a80aec66"],
-	["ba3dac6c0182562b0a26d475fe1e36315f0913b6869bdad0ecf21f1339a5fcbccd32056c840200000000ffffffff04300351050000000000220ed405000000000851abac636565ac53dbbd19020000000007636363ac6a52acbb005a0500000000016abd0c78a8", "63006a635151005352", 0, 1359658828, "47bc8ab070273e1f4a0789c37b45569a6e16f3f3092d1ce94dddc3c34a28f9f4"],
-	["ac27e7f5025fc877d1d99f7fc18dd4cadbafa50e34e1676748cc89c202f93abf36ed46362101000000036300abffffffff958cd5381962b765e14d87fc9524d751e4752dd66471f973ed38b9d562e525620100000003006500ffffffff02b67120050000000004ac51516adc330c0300000000015200000000", "656352", 1, 15049991, "f3374253d64ac264055bdbcc32e27426416bd595b7c7915936c70f839e504010"],
-	["edb30140029182b80c8c3255b888f7c7f061c4174d1db45879dca98c9aab8c8fed647a6ffc03000000086a53510052ab6300ffffffff82f65f261db62d517362c886c429c8fbbea250bcaad93356be6f86ba573e9d930100000000ffffffff04daaf150400000000016a86d1300100000000096a6353535252ac5165d4ddaf000000000002abab5f1c6201000000000000000000", "ab6a6a00ac", 0, -2058017816, "8d7794703dad18e2e40d83f3e65269834bb293e2d2b8525932d6921884b8f368"],
-	["7e50207303146d1f7ad62843ae8017737a698498d4b9118c7a89bb02e8370307fa4fada41d000000000753006300005152b7afefc85674b1104ba33ef2bf37c6ed26316badbc0b4aa6cb8b00722da4f82ff3555a6c020000000900ac656363ac51ac52ffffffff93fab89973bd322c5d7ad7e2b929315453e5f7ada3072a36d8e33ca8bebee6e0020000000300acab930da52b04384b04000000000004650052ac435e380200000000076a6a515263ab6aa9494705000000000600ab6a525252af8ba90100000000096565acab526353536a279b17ad", "acac005263536aac63", 1, -34754133, "4e6357da0057fb7ff79da2cc0f20c5df27ff8b2f8af4c1709e6530459f7972b0"],
-	["c05764f40244fb4ebe4c54f2c5298c7c798aa90e62c29709acca0b4c2c6ec08430b26167440100000008acab6a6565005253ffffffffc02c2418f398318e7f34a3cf669d034eef2111ea95b9f0978b01493293293a870100000000e563e2e00238ee8d040000000002acab03fb060200000000076500ac656a516aa37f5534", "52ab6a0065", 1, -2033176648, "83deef4a698b62a79d4877dd9afebc3011a5275dbe06e89567e9ef84e8a4ee19"],
-	["5a59e0b9040654a3596d6dab8146462363cd6549898c26e2476b1f6ae42915f73fd9aedfda00000000036363abffffffff9ac9e9ca90be0187be2214251ff08ba118e6bf5e2fd1ba55229d24e50a510d53010000000165ffffffff41d42d799ac4104644969937522873c0834cc2fcdab7cdbecd84d213c0e96fd60000000000ffffffffd838db2c1a4f30e2eaa7876ef778470f8729fcf258ad228b388df2488709f8410300000000fdf2ace002ceb6d903000000000265654c1310040000000003ac00657e91c0ec", "536a63ac", 0, 82144555, "98ccde2dc14d14f5d8b1eeea5364bd18fc84560fec2fcea8de4d88b49c00695e"],
-	["156ebc8202065d0b114984ee98c097600c75c859bfee13af75dc93f57c313a877efb09f230010000000463536a51ffffffff81114e8a697be3ead948b43b5005770dd87ffb1d5ccd4089fa6c8b33d3029e9c03000000066a5251656351ffffffff01a87f140000000000050000ac51ac00000000", "00", 0, -362221092, "a903c84d8c5e71134d1ab6dc1e21ac307c4c1a32c90c90f556f257b8a0ec1bf5"],
-	["15e37793023c7cbf46e073428908fce0331e49550f2a42b92468827852693f0532a01c29f70200000007005353636351acffffffff38426d9cec036f00eb56ec1dcd193647e56a7577278417b8a86a78ac53199bc403000000056353006a53ffffffff04a25ce103000000000900ab5365656a526a63c8eff7030000000004526353537ab6db0200000000016a11a3fa02000000000651acacab526500000000", "53ac6aab6a6551", 0, 1117532791, "83c68b3c5a89260ce16ce8b4dbf02e1f573c532d9a72f5ea57ab419fa2630214"],
-	["f7a09f10027250fc1b70398fb5c6bffd2be9718d3da727e841a73596fdd63810c9e4520a6a010000000963ac516a636a65acac1d2e2c57ab28d311edc4f858c1663972eebc3bbc93ed774801227fda65020a7ec1965f780200000005ac5252516a8299fddc01dcbf7200000000000463ac6551960fda03", "65acab51", 1, 2017321737, "9c5fa02abfd34d0f9dec32bf3edb1089fca70016debdb41f4f54affcb13a2a2a"],
-	["6d97a9a5029220e04f4ccc342d8394c751282c328bf1c132167fc05551d4ca4da4795f6d4e02000000076a0052ab525165ffffffff9516a205e555fa2a16b73e6db6c223a9e759a7e09c9a149a8f376c0a7233fa1b0100000007acab51ab63ac6affffffff04868aed04000000000652ac65ac536a396edf01000000000044386c0000000000076aab5363655200894d48010000000001ab8ebefc23", "6351526aac51", 1, 1943666485, "f0bd4ca8e97203b9b4e86bc24bdc8a1a726db5e99b91000a14519dc83fc55c29"],
-	["8e3fddfb028d9e566dfdda251cd874cd3ce72e9dde837f95343e90bd2a93fe21c5daeb5eed01000000045151525140517dc818181f1e7564b8b1013fd68a2f9a56bd89469686367a0e72c06be435cf99db750000000003635251ffffffff01c051780300000000096552ababac6a65acab099766eb", "5163ab6a52ababab51", 1, 1296295812, "5509eba029cc11d7dd2808b8c9eb47a19022b8d8b7778893459bbc19ab7ea820"],
-	["a603f37b02a35e5f25aae73d0adc0b4b479e68a734cf722723fd4e0267a26644c36faefdab0200000000ffffffff43374ad26838bf733f8302585b0f9c22e5b8179888030de9bdda180160d770650200000001004c7309ce01379099040000000005526552536500000000", "abababab005153", 0, 1409936559, "4ca73da4fcd5f1b10da07998706ffe16408aa5dff7cec40b52081a6514e3827e"],
-	["9eeedaa8034471a3a0e3165620d1743237986f060c4434f095c226114dcb4b4ec78274729f03000000086a5365510052ac6afb505af3736e347e3f299a58b1b968fce0d78f7457f4eab69240cbc40872fd61b5bf8b120200000002ac52df8247cf979b95a4c97ecb8edf26b3833f967020cd2fb25146a70e60f82c9ee4b14e88b103000000008459e2fa0125cbcd05000000000000000000", "52ab5352006353516a", 0, -1832576682, "fb018ae54206fdd20c83ae5873ec82b8e320a27ed0d0662db09cda8a071f9852"],
-	["05921d7c048cf26f76c1219d0237c226454c2a713c18bf152acc83c8b0647a94b13477c07f0300000003ac526afffffffff2f494453afa0cabffd1ba0a626c56f90681087a5c1bd81d6adeb89184b27b7402000000036a6352ffffffff0ad10e2d3ce355481d1b215030820da411d3f571c3f15e8daf22fe15342fed04000000000095f29f7b93ff814a9836f54dc6852ec414e9c4e16a506636715f569151559100ccfec1d100000000055263656a53ffffffff04f4ffef010000000008ac6a6aabacabab6a0e6689040000000006ab536a5352abe364d005000000000965536363655251ab53807e00010000000004526aab63f18003e3", "6363ac51", 3, -375891099, "001b0b176f0451dfe2d9787b42097ceb62c70d324e925ead4c58b09eebdf7f67"],
-	["b9b44d9f04b9f15e787d7704e6797d51bc46382190c36d8845ec68dfd63ee64cf7a467b21e00000000096aac00530052ab636aba1bcb110a80c5cbe073f12c739e3b20836aa217a4507648d133a8eedd3f02cb55c132b203000000076a000063526352b1c288e3a9ff1f2da603f230b32ef7c0d402bdcf652545e2322ac01d725d75f5024048ad0100000000ffffffffffd882d963be559569c94febc0ef241801d09dc69527c9490210f098ed8203c700000000056a006300ab9109298d01719d9a0300000000066a52ab006365d7894c5b", "ac6351650063636a", 3, -622355349, "ac87b1b93a6baab6b2c6624f10e8ebf6849b0378ef9660a3329073e8f5553c8d"],
-	["ff60473b02574f46d3e49814c484081d1adb9b15367ba8487291fc6714fd6e3383d5b335f001000000026a6ae0b82da3dc77e5030db23d77b58c3c20fa0b70aa7d341a0f95f3f72912165d751afd57230300000008ac536563516a6363ffffffff04f86c0200000000000553acab636ab13111000000000003510065f0d3f305000000000951ab516a65516aabab730a3a010000000002515200000000", "ac6a", 1, 1895032314, "0767e09bba8cd66d55915677a1c781acd5054f530d5cf6de2d34320d6c467d80"],
-	["f218026204f4f4fc3d3bd0eada07c57b88570d544a0436ae9f8b753792c0c239810bb30fbc0200000002536affffffff8a468928d6ec4cc10aa0f73047697970e99fa64ae8a3b4dca7551deb0b639149010000000851ab520052650051ffffffffa98dc5df357289c9f6873d0f5afcb5b030d629e8f23aa082cf06ec9a95f3b0cf0000000000ffffffffea2c2850c5107705fd380d6f29b03f533482fd036db88739122aac9eff04e0aa010000000365536a03bd37db034ac4c4020000000007515152655200ac33b27705000000000151efb71e0000000000007b65425b", "515151", 3, -1772252043, "de35c84a58f2458c33f564b9e58bc57c3e028d629f961ad1b3c10ee020166e5a"],
-	["48e7d42103b260b27577b70530d1ac2fed2551e9dd607cbcf66dca34bb8c03862cf8f5fd5401000000075151526aacab00ffffffff1e3d3b841552f7c6a83ee379d9d66636836673ce0b0eda95af8f2d2523c91813030000000665acac006365ffffffff388b3c386cd8c9ef67c83f3eaddc79f1ff910342602c9152ffe8003bce51b28b0100000008636363006a636a52ffffffff04b8f67703000000000852005353ac6552520cef720200000000085151ab6352ab00ab5096d6030000000005516a005100662582020000000001ac6c137280", "6a65", 1, 1513618429, "e2fa3e1976aed82c0987ab30d4542da2cb1cffc2f73be13480132da8c8558d5c"],
-	["91ebc4cf01bc1e068d958d72ee6e954b196f1d85b3faf75a521b88a78021c543a06e056279000000000265ab7c12df0503832121030000000000cc41a6010000000005ab5263516540a951050000000006ab63ab65acac00000000", "526a0065636a6a6aac", 0, -614046478, "7de4ba875b2e584a7b658818c112e51ee5e86226f5a80e5f6b15528c86400573"],
-	["3cd4474201be7a6c25403bf00ca62e2aa8f8f4f700154e1bb4d18c66f7bb7f9b975649f0dc0100000006535151535153ffffffff01febbeb000000000006005151006aac00000000", "", 0, -1674687131, "6b77ca70cc452cc89acb83b69857cda98efbfc221688fe816ef4cb4faf152f86"],
-	["92fc95f00307a6b3e2572e228011b9c9ed41e58ddbaefe3b139343dbfb3b34182e9fcdc3f50200000002acab847bf1935fde8bcfe41c7dd99683289292770e7f163ad09deff0e0665ed473cd2b56b0f40300000006516551ab6351294dab312dd87b9327ce2e95eb44b712cfae0e50fda15b07816c8282e8365b643390eaab01000000026aacffffffff016e0b6b040000000001ac00000000", "650065acac005300", 2, -1885164012, "bd7d26bb3a98fc8c90c972500618bf894cb1b4fe37bf5481ff60eef439d3b970"],
-	["4db591ab018adcef5f4f3f2060e41f7829ce3a07ea41d681e8cb70a0e37685561e4767ac3b0000000005000052acabd280e63601ae6ef20000000000036a636326c908f7", "ac6a51526300630052", 0, 862877446, "355ccaf30697c9c5b966e619a554d3323d7494c3ea280a9b0dfb73f953f5c1cb"],
-	["503fd5ef029e1beb7b242d10032ac2768f9a1aca0b0faffe51cec24770664ec707ef7ede4f01000000045253ac53375e350cc77741b8e96eb1ce2d3ca91858c052e5f5830a0193200ae2a45b413dda31541f0000000003516553ffffffff0175a5ba0500000000015200000000", "6aab65510053ab65", 1, 1603081205, "353ca9619ccb0210ae18b24d0e57efa7abf8e58fa6f7102738e51e8e72c9f0c4"],
-	["c80abebd042cfec3f5c1958ee6970d2b4586e0abec8305e1d99eb9ee69ecc6c2cbd76374380000000007ac53006300ac510acee933b44817db79320df8094af039fd82111c7726da3b33269d3820123694d849ee5001000000056a65ab526562699bea8530dc916f5d61f0babea709dac578774e8a4dcd9c640ec3aceb6cb2443f24f302000000020063ea780e9e57d1e4245c1e5df19b4582f1bf704049c5654f426d783069bcc039f2d8fa659f030000000851ab53635200006a8d00de0b03654e8500000000000463ab635178ebbb0400000000055100636aab239f1d030000000006ab006300536500000000", "6565ac515100", 3, 1460851377, "b35bb1b72d02fab866ed6bbbea9726ab32d968d33a776686df3ac16aa445871e"],
-	["0337b2d5043eb6949a76d6632b8bb393efc7fe26130d7409ef248576708e2d7f9d0ced9d3102000000075352636a5163007034384dfa200f52160690fea6ce6c82a475c0ef1caf5c9e5a39f8f9ddc1c8297a5aa0eb02000000026a51ffffffff38e536298799631550f793357795d432fb2d4231f4effa183c4e2f61a816bcf0030000000463ac5300706f1cd3454344e521fde05b59b96e875c8295294da5d81d6cc7efcfe8128f150aa54d6503000000008f4a98c704c1561600000000000072cfa6000000000000e43def01000000000100cf31cc0500000000066365526a6500cbaa8e2e", "", 3, 2029506437, "7615b4a7b3be865633a31e346bc3db0bcc410502c8358a65b8127089d81b01f8"],
-	["59f6cffd034733f4616a20fe19ea6aaf6abddb30b408a3a6bd86cd343ab6fe90dc58300cc90200000000ffffffffc835430a04c3882066abe7deeb0fa1fdaef035d3233460c67d9eabdb05e95e5a02000000080065ac535353ab00ffffffff4b9a043e89ad1b4a129c8777b0e8d87a014a0ab6a3d03e131c27337bbdcb43b402000000066a5100abac6ad9e9bf62014bb118010000000001526cbe484f", "ab526352ab65", 0, 2103515652, "4f2ccf981598639bec57f885b4c3d8ea8db445ea6e61cfd45789c69374862e5e"],
-	["cbc79b10020b15d605680a24ee11d8098ad94ae5203cb6b0589e432832e20c27b72a926af20300000006ab65516a53acbb854f3146e55c508ece25fa3d99dbfde641a58ed88c051a8a51f3dacdffb1afb827814b02000000026352c43e6ef30302410a020000000000ff4bd90100000000065100ab63000008aa8e0400000000095265526565ac5365abc52c8a77", "53526aac0051", 0, 202662340, "984efe0d8d12e43827b9e4b27e97b3777ece930fd1f589d616c6f9b71dab710e"],
-	["7c07419202fa756d29288c57b5c2b83f3c847a807f4a9a651a3f6cd6c46034ae0aa3a7446b0200000004ab6a6365ffffffff9da83cf4219bb96c76f2d77d5df31c1411a421171d9b59ec02e5c1218f29935403000000008c13879002f8b1ac0400000000086a63536a636553653c584f02000000000000000000", "abac53ab656363", 1, -1038419525, "4a74f365a161bc6c9bddd249cbd70f5dadbe3de70ef4bd745dcb6ee1cd299fbd"],
-	["351cbb57021346e076d2a2889d491e9bfa28c54388c91b46ee8695874ad9aa576f1241874d0200000008ab6563525300516affffffffe13e61b8880b8cd52be4a59e00f9723a4722ea58013ec579f5b3693b9e115b1100000000096363abac5252635351ffffffff027fee02040000000008ab6a5200ab006a65b85f130200000000086a52630053ab52ab00000000", "ab6aab65", 1, 586415826, "08bbb746a596991ab7f53a76e19acad087f19cf3e1db54054aab403c43682d09"],
-	["a8252ea903f1e8ff953adb16c1d1455a5036222c6ea98207fc21818f0ece2e1fac310f9a0100000000095163ac635363ac0000be6619e9fffcde50a0413078821283ce3340b3993ad00b59950bae7a9f931a9b0a3a035f010000000463005300b8b0583fbd6049a1715e7adacf770162811989f2be20af33f5f60f26eba653dc26b024a00000000006525351636552ffffffff046d2acc030000000002636a9a2d430500000000080065005165ab53abecf63204000000000052b9ed050000000008acacac53ab65656500000000", "65ab53635253636a51", 2, 1442639059, "8ca11838775822f9a5beee57bdb352f4ee548f122de4a5ca61c21b01a1d50325"],
-	["2f1a425c0471a5239068c4f38f9df135b1d24bf52d730d4461144b97ea637504495aec360801000000055300515365c71801dd1f49f376dd134a9f523e0b4ae611a4bb122d8b26de66d95203f181d09037974300000000025152ffffffff9bdcea7bc72b6e5262e242c94851e3a5bf8f314b3e5de0e389fc9e5b3eadac030000000009525265655151005153ffffffffdbb53ce99b5a2320a4e6e2d13b01e88ed885a0957d222e508e9ec8e4f83496cb0200000007635200abac63ac04c96237020cc5490100000000080000516a51ac6553074a360200000000025152225520ca", "6551ab65ac65516a", 1, -489869549, "9bc5bb772c553831fb40abe466074e59a469154679c7dee042b8ea3001c20393"],
-	["ef3acfd4024defb48def411b8f8ba2dc408dc9ee97a4e8bde4d6cb8e10280f29c98a6e8e9103000000035100513d5389e3d67e075469dfd9f204a7d16175653a149bd7851619610d7ca6eece85a516b2df0300000005516aac6552ca678bdf02f477f003000000000057e45b0300000000055252525252af35c20a", "5165ac53ab", 1, -1900839569, "78eb6b24365ac1edc386aa4ffd15772f601059581c8776c34f92f8a7763c9ccf"],
-	["ff4468dc0108475fc8d4959a9562879ce4ab4867a419664bf6e065f17ae25043e6016c70480100000000ffffffff02133c6f0400000000000bd0a8020000000004006a520035afa4f6", "51ac65ab", 0, -537664660, "f6da59b9deac63e83728850ac791de61f5dfcaeed384ebcbb20e44afcd8c8910"],
-	["4e8594d803b1d0a26911a2bcdd46d7cbc987b7095a763885b1a97ca9cbb747d32c5ab9aa91030000000353ac53a0cc4b215e07f1d648b6eeb5cdbe9fa32b07400aa773b9696f582cebfd9930ade067b2b200000000060065abab6500fc99833216b8e27a02defd9be47fafae4e4a97f52a9d2a210d08148d2a4e5d02730bcd460100000004516351ac37ce3ae1033baa55040000000006006a636a63acc63c990400000000025265eb1919030000000005656a6a516a00000000", "", 1, -75217178, "04c5ee48514cd033b82a28e336c4d051074f477ef2675ce0ce4bafe565ee9049"],
-	["a88830a7023f13ed19ab14fd757358eb6af10d6520f9a54923a6d613ac4f2c11e249cda8aa030000000851630065abababacffffffff8f5fe0bc04a33504c4b47e3991d25118947a0261a9fa520356731eeabd561dd3020000000363ababffffffff038404bd010000000008ab5153516aab6a63d33a5601000000000263004642dc020000000009655152acac636352004be6f3af", "5253536565006aab6a", 0, 1174417836, "2e42ead953c9f4f81b72c27557e6dc7d48c37ff2f5c46c1dbe9778fb0d79f5b2"],
-	["44e1a2b4010762af23d2027864c784e34ef322b6e24c70308a28c8f2157d90d17b99cd94a401000000085163656565006300ffffffff0198233d020000000002000000000000", "52525153656365", 0, 1119696980, "d9096de94d70c6337da6202e6e588166f31bff5d51bb5adc9468594559d65695"],
-	["44ca65b901259245abd50a745037b17eb51d9ce1f41aa7056b4888285f48c6f26cb97b7a25020000000552636363abffffffff047820350400000000040053acab14f3e603000000000652635100ab630ce66c03000000000001bdc704000000000765650065ac51ac3e886381", "51", 0, -263340864, "ed5622ac642d11f90e68c0feea6a2fe36d880ecae6b8c0d89c4ea4b3d162bd90"],
-	["cfa147d2017fe84122122b4dda2f0d6318e59e60a7207a2d00737b5d89694d480a2c26324b0000000006006351526552ffffffff0456b5b804000000000800516aab525363ab166633000000000004655363ab254c0e02000000000952ab6a6a00ab525151097c1b020000000009656a52ac6300530065ad0d6e50", "6a535165ac6a536500", 0, -574683184, "f926d4036eac7f019a2b0b65356c4ee2fe50e089dd7a70f1843a9f7bc6997b35"],
-	["91c5d5f6022fea6f230cc4ae446ce040d8313071c5ac1749c82982cc1988c94cb1738aa48503000000016a19e204f30cb45dd29e68ff4ae160da037e5fc93538e21a11b92d9dd51cf0b5efacba4dd70000000005656a6aac51ffffffff03db126905000000000953006a53ab6563636a36a273030000000006656a52656552b03ede00000000000352516500000000", "530052526a00", 1, 1437328441, "255c125b60ee85f4718b2972174c83588ee214958c3627f51f13b5fb56c8c317"],
-	["03f20dc202c886907b607e278731ebc5d7373c348c8c66cac167560f19b341b782dfb634cb03000000076a51ac6aab63abea3e8de7adb9f599c9caba95aa3fa852e947fc88ed97ee50e0a0ec0d14d164f44c0115c10100000004ab5153516fdd679e0414edbd000000000005ac636a53512021f2040000000007006a0051536a52c73db2050000000005525265ac5369046e000000000003ab006a1ef7bd1e", "52656a", 0, 1360223035, "5a0a05e32ce4cd0558aabd5d79cd5fcbffa95c07137506e875a9afcba4bef5a2"],
-	["d9611140036881b61e01627078512bc3378386e1d4761f959d480fdb9d9710bebddba2079d020000000763536aab5153ab819271b41e228f5b04daa1d4e72c8e1955230accd790640b81783cfc165116a9f535a74c000000000163ffffffffa2e7bb9a28e810624c251ff5ba6b0f07a356ac082048cf9f39ec036bba3d431a02000000076a000000ac65acffffffff01678a820000000000085363515153ac635100000000", "535353", 2, -82213851, "52b9e0778206af68998cbc4ebdaad5a9469e04d0a0a6cef251abfdbb74e2f031"],
-	["98b3a0bf034233afdcf0df9d46ac65be84ef839e58ee9fa59f32daaa7d684b6bdac30081c60200000007636351acabababffffffffc71cf82ded4d1593e5825618dc1d5752ae30560ecfaa07f192731d68ea768d0f0100000006650052636563f3a2888deb5ddd161430177ce298242c1a86844619bc60ca2590d98243b5385bc52a5b8f00000000095365acacab520052ac50d4722801c3b8a60300000000035165517e563b65", "51", 1, -168940690, "b6b684e2d2ecec8a8dce4ed3fc1147f8b2e45732444222aa8f52d860c2a27a9d"],
-	["97be4f7702dc20b087a1fdd533c7de762a3f2867a8f439bddf0dcec9a374dfd0276f9c55cc0300000000cdfb1dbe6582499569127bda6ca4aaff02c132dc73e15dcd91d73da77e92a32a13d1a0ba0200000002ab51ffffffff048cfbe202000000000900516351515363ac535128ce0100000000076aac5365ab6aabc84e8302000000000863536a53ab6a6552f051230500000000066aac535153510848d813", "ac51", 0, 229541474, "e5da9a416ea883be1f8b8b2d178463633f19de3fa82ae25d44ffb531e35bdbc8"],
-	["085b6e04040b5bff81e29b646f0ed4a45e05890a8d32780c49d09643e69cdccb5bd81357670100000001abffffffffa5c981fe758307648e783217e3b4349e31a557602225e237f62b636ec26df1a80300000004650052ab4792e1da2930cc90822a8d2a0a91ea343317bce5356b6aa8aae6c3956076aa33a5351a9c0300000004abac5265e27ddbcd472a2f13325cc6be40049d53f3e266ac082172f17f6df817db1936d9ff48c02b000000000152ffffffff021aa7670500000000085353635163ab51ac14d584000000000001aca4d136cc", "6a525300536352536a", 0, -1398925877, "41ecca1e8152ec55074f4c39f8f2a7204dda48e9ec1e7f99d5e7e4044d159d43"],
-	["eec32fff03c6a18b12cd7b60b7bdc2dd74a08977e53fdd756000af221228fe736bd9c42d870100000007005353ac515265ffffffff037929791a188e9980e8b9cc154ad1b0d05fb322932501698195ab5b219488fc02000000070063510065ab6a0bfc176aa7e84f771ea3d45a6b9c24887ceea715a0ff10ede63db8f089e97d927075b4f1000000000551abab63abffffffff02eb933c000000000000262c420000000000036563632549c2b6", "6352", 2, 1480445874, "ff8a4016dfdd918f53a45d3a1f62b12c407cd147d68ca5c92b7520e12c353ff5"],
-	["98ea7eac0313d9fb03573fb2b8e718180c70ce647bebcf49b97a8403837a2556cb8c9377f30000000004ac53ac65ffffffff8caac77a5e52f0d8213ef6ce998bedbb50cfdf108954771031c0e0cd2a78423900000000010066e99a44937ebb37015be3693761078ad5c73aa73ec623ac7300b45375cc8eef36087eb80000000007515352acac5100ffffffff0114a51b02000000000000000000", "6aacab", 0, 243527074, "bad77967f98941af4dd52a8517d5ad1e32307c0d511e15461e86465e1b8b5273"],
-	["3ab70f4604e8fc7f9de395ec3e4c3de0d560212e84a63f8d75333b604237aa52a10da17196000000000763526a6553ac63a25de6fd66563d71471716fe59087be0dde98e969e2b359282cf11f82f14b00f1c0ac70f02000000050052516aacdffed6bb6889a13e46956f4b8af20752f10185838fd4654e3191bf49579c961f5597c36c0100000005ac636363abc3a1785bae5b8a1b4be5d0cbfadc240b4f7acaa7dfed6a66e852835df5eb9ac3c553766801000000036a65630733b7530218569602000000000952006a6a6a51acab52777f06030000000007ac0063530052abc08267c9", "000000536aac0000", 1, 1919096509, "df1c87cf3ba70e754d19618a39fdbd2970def0c1bfc4576260cba5f025b87532"],
-	["bdb6b4d704af0b7234ced671c04ba57421aba7ead0a117d925d7ebd6ca078ec6e7b93eea6600000000026565ffffffff3270f5ad8f46495d69b9d71d4ab0238cbf86cc4908927fbb70a71fa3043108e6010000000700516a65655152ffffffff6085a0fdc03ae8567d0562c584e8bfe13a1bd1094c518690ebcb2b7c6ce5f04502000000095251530052536a53aba576a37f2c516aad9911f687fe83d0ae7983686b6269b4dd54701cb5ce9ec91f0e6828390300000000ffffffff04cc76cc020000000002656a01ffb702000000000253ab534610040000000009acab006565516a00521f55f5040000000000389dfee9", "6a525165", 0, 1336204763, "71c294523c48fd7747eebefbf3ca06e25db7b36bff6d95b41c522fecb264a919"],
-	["54258edd017d22b274fbf0317555aaf11318affef5a5f0ae45a43d9ca4aa652c6e85f8a040010000000953ac65ab5251656500ffffffff03321d450000000000085265526a51526a529ede8b030000000003635151ce6065020000000001534c56ec1b", "acac", 0, 2094130012, "110d90fea9470dfe6c5048f45c3af5e8cc0cb77dd58fd13d338268e1c24b1ccc"],
-	["ce0d322e04f0ffc7774218b251530a7b64ebefca55c90db3d0624c0ff4b3f03f918e8cf6f60300000003656500ffffffff9cce943872da8d8af29022d0b6321af5fefc004a281d07b598b95f6dcc07b1830200000007abab515351acab8d926410e69d76b7e584aad1470a97b14b9c879c8b43f9a9238e52a2c2fefc2001c56af8010000000400ab5253cd2cd1fe192ce3a93b5478af82fa250c27064df82ba416dfb0debf4f0eb307a746b6928901000000096500abacac6a0063514214524502947efc0200000000035251652c40340100000000096a6aab52000052656a5231c54c", "51", 2, -2090320538, "0322ca570446869ec7ec6ad66d9838cff95405002d474c0d3c17708c7ee039c6"],
-	["47ac54940313430712ebb32004679d3a512242c2b33d549bf5bbc8420ec1fd0850ed50eb6d0300000009536aac6a65acacab51ffffffffb843e44266ce2462f92e6bff54316661048c8c17ecb092cb493b39bfca9117850000000001519ab348c05e74ebc3f67423724a3371dd99e3bceb4f098f8860148f48ad70000313c4c223000000000653006565656512c2d8dc033f3c97010000000002636aa993aa010000000006526365ab526ab7cf560300000000076a0065ac6a526500000000", "005352535300ab6a", 2, 59531991, "8b5b3d00d9c658f062fe6c5298e54b1fe4ed3a3eab2a87af4f3119edc47b1691"],
-	["233cd90b043916fc41eb870c64543f0111fb31f3c486dc72457689dea58f75c16ae59e9eb2000000000500536a6a6affffffff9ae30de76be7cd57fb81220fce78d74a13b2dbcad4d023f3cadb3c9a0e45a3ce000000000965ac6353ac5165515130834512dfb293f87cb1879d8d1b20ebad9d7d3d5c3e399a291ce86a3b4d30e4e32368a9020000000453005165ffffffff26d84ae93eb58c81158c9b3c3cbc24a84614d731094f38d0eea8686dec02824d0300000005636a65abacf02c784001a0bd5d03000000000900655351ab65ac516a416ef503", "", 1, -295106477, "b79f31c289e95d9dadec48ebf88e27c1d920661e50d090e422957f90ff94cb6e"],
-	["9200e26b03ff36bc4bf908143de5f97d4d02358db642bd5a8541e6ff709c420d1482d471b70000000008abab65536a636553ffffffff61ba6d15f5453b5079fb494af4c48de713a0c3e7f6454d7450074a2a80cb6d880300000007ac6a00ab5165515dfb7574fbce822892c2acb5d978188b1d65f969e4fe874b08db4c791d176113272a5cc10100000000ffffffff0420958d000000000009ac63516a0063516353dd885505000000000465ac00007b79e901000000000066d8bf010000000005525252006a00000000", "ac5152", 0, 2089531339, "89ec7fab7cfe7d8d7d96956613c49dc48bf295269cfb4ea44f7333d88c170e62"],
-	["45f335ba01ce2073a8b0273884eb5b48f56df474fc3dff310d9706a8ac7202cf5ac188272103000000025363ffffffff049d859502000000000365ab6a8e98b1030000000002ac51f3a80603000000000752535151ac00000306e30300000000020051b58b2b3a", "", 0, 1899564574, "78e01310a228f645c23a2ad0acbb8d91cedff4ecdf7ca997662c6031eb702b11"],
-	["d8f652a6043b4faeada05e14b81756cd6920cfcf332e97f4086961d49232ad6ffb6bc6c097000000000453526563ffffffff1ea4d60e5e91193fbbc1a476c8785a79a4c11ec5e5d6c9950c668ceacfe07a15020000000352ab51fffffffffe029a374595c4edd382875a8dd3f20b9820abb3e93f877b622598d11d0b09e503000000095351000052ac515152ffffffff9d65fea491b979699ceb13caf2479cd42a354bd674ded3925e760758e85a756803000000046365acabffffffff0169001d00000000000651636a65656300000000", "ab0063630000ac", 3, 1050965951, "4cc85cbc2863ee7dbce15490d8ca2c5ded61998257b9eeaff968fe38e9f009ae"],
-	["718662be026e1dcf672869ac658fd0c87d6835cfbb34bd854c44e577d5708a7faecda96e260300000004526a636a489493073353b678549adc7640281b9cbcb225037f84007c57e55b874366bb7b0fa03bdc00000000095165ababac65ac00008ab7f2a802eaa53d000000000007acac516aac526ae92f380100000000056aac00536500000000", "ab00", 1, 43296088, "2d642ceee910abff0af2116af75b2e117ffb7469b2f19ad8fef08f558416d8f7"],
-	["94083c840288d40a6983faca876d452f7c52a07de9268ad892e70a81e150d602a773c175ad03000000007ec3637d7e1103e2e7e0c61896cbbf8d7e205b2ecc93dd0d6d7527d39cdbf6d335789f660300000000ffffffff019e1f7b03000000000800ac0051acac0053539cb363", "", 1, -183614058, "a17b66d6bb427f42653d08207a22b02353dd19ccf2c7de6a9a3a2bdb7c49c9e7"],
-	["30e0d4d20493d0cd0e640b757c9c47a823120e012b3b64c9c1890f9a087ae4f2001ca22a61010000000152f8f05468303b8fcfaad1fb60534a08fe90daa79bff51675472528ebe1438b6f60e7f60c10100000009526aab6551ac510053ffffffffaaab73957ea2133e32329795221ed44548a0d3a54d1cf9c96827e7cffd1706df0200000009ab00526a005265526affffffffd19a6fe54352015bf170119742821696f64083b5f14fb5c7d1b5a721a3d7786801000000085265abababac53abffffffff020f39bd030000000004ab6aac52049f6c050000000004ab52516aba5b4c60", "6a6365516a6a655253", 0, -624256405, "8e221a6c4bf81ca0d8a0464562674dcd14a76a32a4b7baf99450dd9195d411e6"],
-	["f9c69d940276ec00f65f9fe08120fc89385d7350388508fd80f4a6ba2b5d4597a9e21c884f010000000663ab63ababab15473ae6d82c744c07fc876ecd53bd0f3018b2dbedad77d757d5bdf3811b23d294e8c0170000000001abafababe00157ede2050000000006ac6a5263635300000000", "ab53", 1, 606547088, "714d8b14699835b26b2f94c58b6ea4c53da3f7adf0c62ea9966b1e1758272c47"],
-	["5c0ac112032d6885b7a9071d3c5f493aa16c610a4a57228b2491258c38de8302014276e8be030000000300ab6a17468315215262ad5c7393bb5e0c5a6429fd1911f78f6f72dafbbbb78f3149a5073e24740300000003ac5100ffffffff33c7a14a062bdea1be3c9c8e973f54ade53fe4a69dcb5ab019df5f3345050be00100000008ac63655163526aab428defc0033ec36203000000000765516365536a00ae55b2000000000002ab53f4c0080400000000095265516a536563536a00000000", "6a005151006a", 2, 272749594, "91082410630337a5d89ff19145097090f25d4a20bdd657b4b953927b2f62c73b"],
-	["e3683329026720010b08d4bec0faa244f159ae10aa582252dd0f3f80046a4e145207d54d31000000000852acac52656aacac3aaf2a5017438ad6adfa3f9d05f53ebed9ceb1b10d809d507bcf75e0604254a8259fc29c020000000653526552ab51f926e52c04b44918030000000000f7679c0100000000090000525152005365539e3f48050000000009516500ab635363ab008396c905000000000253650591024f", "6a6365", 0, 908746924, "458aec3b5089a585b6bad9f99fd37a2b443dc5a2eefac2b7e8c5b06705efc9db"],
-	["48c4afb204204209e1df6805f0697edaa42c0450bbbd767941fe125b9bc40614d63d757e2203000000066a5363005152dc8b6a605a6d1088e631af3c94b8164e36e61445e2c60130292d81dabd30d15f54b355a802000000036a6353ffffffff1d05dcec4f3dedcfd02c042ce5d230587ee92cb22b52b1e59863f3717df2362f0300000005536552ac52ffffffffd4d71c4f0a7d53ba47bb0289ca79b1e33d4c569c1e951dd611fc9c9c1ca8bc6c030000000865536a65ab51abacffffffff042f9aa905000000000753655153656351ab93d8010000000002655337440e0300000000005d4c690000000000015278587acb", "ab006565526a51", 0, 1502064227, "bbed77ff0f808aa8abd946ba9e7ec1ddb003a969fa223dee0af779643cb841a9"],
-	["00b20fd104dd59705b84d67441019fa26c4c3dec5fd3b50eca1aa549e750ef9ddb774dcabe000000000651ac656aac65ffffffff52d4246f2db568fc9eea143e4d260c698a319f0d0670f84c9c83341204fde48b0200000000ffffffffb8aeabb85d3bcbc67b132f1fd815b451ea12dcf7fc169c1bc2e2cf433eb6777a03000000086a51ac6aab6563acd510d209f413da2cf036a31b0def1e4dcd8115abf2e511afbcccb5ddf41d9702f28c52900100000006ac52ab6a0065ffffffff039c8276000000000008ab53655200656a52401561010000000003acab0082b7160100000000035100ab00000000", "535265", 1, -947367579, "3212c6d6dd8d9d3b2ac959dec11f4638ccde9be6ed5d36955769294e23343da0"],
-	["455131860220abbaa72015519090a666faf137a0febce7edd49da1eada41feab1505a0028b02000000036365ab453ead4225724eb69beb590f2ec56a7693a608871e0ab0c34f5e96157f90e0a96148f3c502000000085251ab51535163acffffffff022d1249040000000009abac00acac6565630088b310040000000000e3920e59", "5152ab6a52ac5152", 0, 294375737, "c40fd7dfa72321ac79516502500478d09a35cc22cc264d652c7d18b14400b739"],
-	["624d28cb02c8747915e9af2b13c79b417eb34d2fa2a73547897770ace08c6dd9de528848d3030000000651ab63abab533c69d3f9b75b6ef8ed2df50c2210fd0bf4e889c42477d58682f711cbaece1a626194bb85030000000765acab53ac5353ffffffff018cc280040000000009abacabac52636352ac6859409e", "ac51ac", 1, 1005144875, "919144aada50db8675b7f9a6849c9d263b86450570293a03c245bd1e3095e292"],
-	["8f28471d02f7d41b2e70e9b4c804f2d90d23fb24d53426fa746bcdcfffea864925bdeabe3e0200000001acffffffff76d1d35d04db0e64d65810c808fe40168f8d1f2143902a1cc551034fd193be0e0000000001acffffffff048a5565000000000005005151516afafb610400000000045263ac53648bb30500000000086363516a6a5165513245de01000000000000000000", "6a0053510053", 1, -1525137460, "305fc8ff5dc04ebd9b6448b03c9a3d945a11567206c8d5214666b30ec6d0d6cc"],
-	["10ec50d7046b8b40e4222a3c6449490ebe41513aad2eca7848284a08f3069f3352c2a9954f0000000009526aac656352acac53ffffffff0d979f236155aa972472d43ee6f8ce22a2d052c740f10b59211454ff22cb7fd00200000007acacacab63ab53ffffffffbbf97ebde8969b35725b2e240092a986a2cbfd58de48c4475fe077bdd493a20c010000000663ab5365ababffffffff4600722d33b8dba300d3ad037bcfc6038b1db8abfe8008a15a1de2da2264007302000000035351ac6dbdafaf020d0ccf04000000000663ab6a51ab6ae06e5e0200000000036aabab00000000", "", 0, -1658960232, "2420dd722e229eccafae8508e7b8d75c6920bfdb3b5bac7cb8e23419480637c2"],
-	["fef98b7101bf99277b08a6eff17d08f3fcb862e20e13138a77d66fba55d54f26304143e5360100000006515365abab00ffffffff04265965030000000004655252ace2c775010000000001002b23b4040000000007516a5153ab53ac456a7a00000000000753ab525251acacba521291", "526aacacab00abab53", 0, -1614097109, "4370d05c07e231d6515c7e454a4e401000b99329d22ed7def323976fa1d2eeb5"],
-	["34a2b8830253661b373b519546552a2c3bff7414ea0060df183b1052683d78d8f54e842442000000000152ffffffffd961a8e34cf374151058dfcddc86509b33832bc57267c63489f69ff01199697c0300000002abacba856cfb01b17c2f050000000008515365ac53ab000000000000", "5263ab656a", 1, -2104480987, "2f9993e0a84a6ca560d6d1cc2b63ffe7fd71236d9cfe7d809491cef62bbfad84"],
-	["43559290038f32fda86580dd8a4bc4422db88dd22a626b8bd4f10f1c9dd325c8dc49bf479f01000000026351ffffffff401339530e1ed3ffe996578a17c3ec9d6fccb0723dd63e7b3f39e2c44b976b7b0300000006ab6a65656a51ffffffff6fb9ba041c96b886482009f56c09c22e7b0d33091f2ac5418d05708951816ce7000000000551ac525100ffffffff020921e40500000000035365533986f40500000000016a00000000", "52ac51", 0, 1769771809, "02040283ef2291d8e1f79bb71bdabe7c1546c40d7ed615c375643000a8b9600d"],
-	["6878a6bd02e7e1c8082d5e3ee1b746cfebfac9e8b97e61caa9e0759d8a8ecb3743e36a30de0100000002ab532a911b0f12b73e0071f5d50b6bdaf783f4b9a6ce90ec0cad9eecca27d5abae188241ddec0200000001651c7758d803f7457b0500000000036551515f4e90000000000001007022080200000000035365acc86b6946", "6351ab", 0, -1929374995, "f24be499c58295f3a07f5f1c6e5084496ae160450bd61fdb2934e615289448f1"],
-	["35b6fc06047ebad04783a5167ab5fc9878a00c4eb5e7d70ef297c33d5abd5137a2dea9912402000000036aacacffffffff21dc291763419a584bdb3ed4f6f8c60b218aaa5b99784e4ba8acfec04993e50c03000000046a00ac6affffffff69e04d77e4b662a82db71a68dd72ef0af48ca5bebdcb40f5edf0caf591bb41020200000000b5db78a16d93f5f24d7d932f93a29bb4b784febd0cbb1943f90216dc80bba15a0567684b000000000853ab52ab5100006a1be2208a02f6bdc103000000000265ab8550ea04000000000365636a00000000", "", 0, -1114114836, "1c8655969b241e717b841526f87e6bd68b2329905ba3fc9e9f72526c0b3ea20c"],
-	["bebb90c302bf91fd4501d33555a5fc5f2e1be281d9b7743680979b65c3c919108cc2f517510100000003abab00ffffffff969c30053f1276550532d0aa33cfe80ca63758cd215b740448a9c08a84826f3303000000056565ab5153ffffffff04bf6f2a04000000000565ab5265ab903e760100000000026a6a7103fa020000000006526553525365b05b2c000000000006ab000000535300000000", "51510053ab63635153", 1, 1081291172, "94338cd47a4639be30a71e21a7103cee4c99ef7297e0edd56aaf57a068b004de"],
-	["af48319f031b4eeb4319714a285f44244f283cbff30dcb9275b06f2348ccd0d7f015b54f8500000000066363ac65ac6affffffff2560a9817ebbc738ad01d0c9b9cf657b8f9179b1a7f073eb0b67517409d108180200000005ac6365ab52ffffffff0bdd67cd4ecae96249a2e2a96db1490ee645f042fd9d5579de945e22b799f4d003000000086552ab515153ab00cf187c8202e51abf0300000000066552006a00abadf37d000000000004ac6a535100000000", "63ab65", 1, -1855554446, "60caf46a7625f303c04706cec515a44b68ec319ee92273acb566cca4f66861c1"],
-	["f35befbc03faf8c25cc4bc0b92f6239f477e663b44b83065c9cb7cf231243032cf367ce3130000000005ab65526a517c4c334149a9c9edc39e29276a4b3ffbbab337de7908ea6f88af331228bd90086a6900ba020000000151279d19950d2fe81979b72ce3a33c6d82ebb92f9a2e164b6471ac857f3bbd3c0ea213b542010000000953ab51635363520065052657c20300a9ba04000000000452636a6a0516ea020000000008535253656365ababcfdd3f01000000000865ac516aac00530000000000", "", 2, -99793521, "c834a5485e68dc13edb6c79948784712122440d7fa5bbaa5cd2fc3d4dac8185d"],
-	["d3da18520216601acf885414538ce2fb4d910997eeb91582cac42eb6982c9381589587794f0300000000fffffffff1b1c9880356852e10cf41c02e928748dd8fae2e988be4e1c4cb32d0bfaea6f7000000000465ab6aabffffffff02fb0d69050000000002ababeda8580500000000085163526565ac52522b913c95", "ac", 1, -1247973017, "99b32b5679d91e0f9cdd6737afeb07459806e5acd7630c6a3b9ab5d550d0c003"],
-	["8218eb740229c695c252e3630fc6257c42624f974bc856b7af8208df643a6c520ef681bfd00000000002510066f30f270a09b2b420e274c14d07430008e7886ec621ba45665057120afce58befca96010300000004525153ab84c380a9015d96100000000000076a5300acac526500000000", "ac005263", 0, -1855679695, "5071f8acf96aea41c7518bd1b5b6bbe16258b529df0c03f9e374b83c66b742c6"],
-	["1123e7010240310013c74e5def60d8e14dd67aedff5a57d07a24abc84d933483431b8cf8ea0300000003530051fc6775ff1a23c627a2e605dd2560e84e27f4208300071e90f4589e762ad9c9fe8d0da95e020000000465655200ffffffff04251598030000000004ab65ab639d28d90400000000096563636aacac525153474df801000000000851525165ac51006a75e23b040000000000e5bd3a4a", "6363636565", 0, -467124448, "9cb0dd04e9fe287b112e94a1647590d27e8b164ca13c4fe70c610fd13f82c2fd"],
-	["fd92fe1003083c5179f97e77bf7d71975788138147adbdb283306802e261c0aee080fa22630200000000860c643ba9a1816b9badf36077b4554d11720e284e395a1121bc45279e148b2064c65e49020000000651ab6a53636a2c713088d20f4bc4001264d972cce05b9fe004dc33376ad24d0d013e417b91a5f1b6734e000000000100ffffffff02e3064c0500000000066552006a5165b86e8705000000000665ab65ab53522052eadb", "00ab53525265", 0, 776203277, "47207b48777727532f62e09afcd4104ea6687e723c7657c30504fa2081331cc8"],
-	["d1b6a703038f14d41fcc5cc45455faa135a5322be4bf0f5cbcd526578fc270a236cacb853f0200000001abffffffff135aeff902fa38f202ccf5bd34437ff89c9dc57a028b62447a0a38579383e8ef0000000000ffffffffadf398d2c818d0b90bc474f540c3618a4a643482eeab73d36101987e2ec0335900000000004bd3323504e69fc10000000000055151535251790ada02000000000563ab6aab521337a704000000000963ac63abacac52656a1e9862010000000007656500ac51ab6a8f4ee672", "ab5251656565ac63", 2, 82008394, "b8f3d255549909c07588ecba10a02e55a2d6f2206d831af9da1a7dae64cfbc8b"],
-	["81dadaa7011556683db3fe95262f4fdb20391b7e75b7ffcee51b176af64d83c06f85545d620200000005ab5151ab52ffffffff044805ef0300000000065353516352639702c802000000000900516351515252ab5270db08040000000009ac516aab526553abac4aabc90500000000096365ab0052636a525100000000", "6565ab6a5152", 0, -2126294159, "ad01ec9d6dbae325ec3a8e1fd98e2d03b1188378210efef093dd8b0b0ef3f19d"],
-	["3b937e05032b8895d2f4945cb7e3679be2fbd15311e2414f4184706dbfc0558cf7de7b4d000000000001638b91a12668a3c3ce349788c961c26aa893c862f1e630f18d80e7843686b6e1e6fc396310000000000852635353ab65ac51eeb09dd1c9605391258ee6f74b9ae17b5e8c2ef010dc721c5433dcdc6e93a1593e3b6d1700000000085365ac6553526351ffffffff0308b18e04000000000253acb6dd00040000000008536aac5153ac516ab0a88201000000000500ac006500804e3ff2", "", 0, 416167343, "595a3c02254564634e8085283ec4ea7c23808da97ce9c5da7aecd7b553e7fd7f"],
-	["a48f27ca047997470da74c8ee086ddad82f36d9c22e790bd6f8603ee6e27ad4d3174ea875403000000095153ac636aab6aacabffffffffefc936294e468d2c9a99e09909ba599978a8c0891ad47dc00ba424761627cef202000000056a51630053ffffffff304cae7ed2d3dbb4f2fbd679da442aed06221ffda9aee460a28ceec5a9399f4e0200000000f5bddf82c9c25fc29c5729274c1ff0b43934303e5f595ce86316fc66ad263b96ca46ab8d0100000003536500d7cf226b0146b00c04000000000200ac5c2014ce", "515100636563", 0, 1991799059, "9c051a7092fe17fa62b1720bc2c4cb2ffc1527d9fb0b006d2e142bb8fe07bf3c"],
-	["180cd53101c5074cf0b7f089d139e837fe49932791f73fa2342bd823c6df6a2f72fe6dba1303000000076a6a63ac53acabffffffff03853bc1020000000007ac526a6a6a6a003c4a8903000000000453515163a0fbbd030000000005ab656a5253253d64cf", "ac65", 0, -1548453970, "4d8efb3b99b9064d2f6be33b194a903ffabb9d0e7baa97a48fcec038072aac06"],
-	["c21ec8b60376c47e057f2c71caa90269888d0ffd5c46a471649144a920d0b409e56f190b700000000008acac6a526a536365ffffffff5d315d9da8bf643a9ba11299450b1f87272e6030fdb0c8adc04e6c1bfc87de9a0000000000ea43a9a142e5830c96b0ce827663af36b23b0277244658f8f606e95384574b91750b8e940000000007516a63ac0063acffffffff023c61be0400000000055165ab5263313cc8020000000006006a53526551ed8c3d56", "6a", 1, 1160627414, "a638cc17fd91f4b1e77877e8d82448c84b2a4e100df1373f779de7ad32695112"],
-	["128cd90f04b66a4cbc78bf48748f6eec0f08d5193ee8d0a6f2e8d3e5f138ed12c2c87d01a301000000085200ab6aac00ab00ffffffff09fc88bb1851e3dfb3d30179c38e15aeb1b39929c7c74f6acd071994ed4806490300000000e7fc5ea12ec56f56c0d758ecf4bb88aa95f3b08176b336db3b9bec2f6e27336dce28adbe030000000400530051fffffffffd6ff1adcf1fbe0d883451ee46904f1b7e8820243d395559b2d4ee8190a6e891000000000080fb1ae702f85b400000000000035200ab8d9651010000000006ab6a52536aab00000000", "ab", 1, 1667598199, "c10ccc9db8a92d7d4b133a2980782dab9d9d1d633d0dde9f9612ada57771fd89"],
-	["da9695a403493d3511c10e1fe1286f954db0366b7667c91ef18ae4578056c1bf752114ac5901000000035351519788d91dd1f9c62dc005d80ea54eb13f7131ca5aace3d5d29f9b58ccc5fbc9a27e779950010000000453ac6a00ffffffffe2556ff29ebe83eb42a32c7a8d93bc598043578f491b5935805a33608538845a030000000252ab65d21b3b018f26c4030000000006acab51535352e1cbcb10", "006565ab52", 2, -1550927794, "0ca673a1ee66f9625ceb9ab278ebef772c113c188112b02824570c17fdf48194"],
-	["b240517501334021240427adb0b413433641555424f6d24647211e3e6bfbb22a8045cbda2f000000000071bac8630112717802000000000000000000", "6a5165abac52656551", 0, 1790414254, "2c8be597620d95abd88f9c1cf4967c1ae3ca2309f3afec8928058c9598660e9e"],
-	["96bac43903044a199b4b3efeeec5d196ee23fb05495541fa2cd6fb6405a9432d1723363660010000000151ffffffffe6ce2b66ce1488918a3e880bebb0e750123f007c7bcbac8fcd67ce75cb6fbae80300000000ffffffff9c0955aa07f506455834895c0c56be5a095398f47c62a3d431fe125b161d666a0200000005520000abac7ffdbc540216f2f004000000000165a26dce010000000001ab00000000", "5151ab656a656a6a63", 0, -707123065, "26b22e18d5d9081fde9631594a4f7c49069ed2e429f3d08caf9d834f685ccab2"],
-	["b8fd394001ed255f49ad491fecc990b7f38688e9c837ccbc7714ddbbf5404f42524e68c18f0000000007ab6353535363ab081e15ee02706f7d050000000008515200535351526364c7ec040000000005636a53acac9206cbe1", "655352ac", 0, -1251578838, "8e0697d8cd8a9ccea837fd798cc6c5ed29f6fbd1892ee9bcb6c944772778af19"],
-	["e42a76740264677829e30ed610864160c7f97232c16528fe5610fc08814b21c34eefcea69d010000000653006a6a0052ffffffff647046cf44f217d040e6a8ff3f295312ab4dd5a0df231c66968ad1c6d8f4428000000000025352ffffffff0199a7f900000000000000000000", "655263006a005163", 1, 1122505713, "7cda43f1ff9191c646c56a4e29b1a8c6cb3f7b331da6883ef2f0480a515d0861"],
-	["0f034f32027a8e094119443aa9cfe11737c6d7dda9a52b839bc073dcc0235b847b28e0fab60200000006ac53ac536a63eee63447dfdad80476994b68706e916df1bd9d7cb4f3a4f6b14369de84564bea2e8688bd030000000565636a65acf8434663020b35fe01000000000800abab655163acabb3d6a103000000000353acab345eeda0", "526a51ac63ab51", 1, 66020215, "4435e62ff6531ac73529aac9cf878a7219e0b6e6cac79af8487c5355d1ad6d43"],
-	["a2dfa4690214c1ab25331815a5128f143219de51a47abdc7ce2d367e683eeb93960a31af9f010000000363636affffffff8be0628abb1861b078fcc19c236bc4cc726fa49068b88ad170adb2a97862e7460200000004ac655363ffffffff0441f11103000000000153dbab0c000000000009ab53ac5365526aab63abbb95050000000004ab52516a29a029040000000003ac526a00000000", "6a52ac63", 1, -1302210567, "913060c7454e6c80f5ba3835454b54db2188e37dc4ce72a16b37d11a430b3d23"],
-	["9dbc591f04521670af83fb3bb591c5d4da99206f5d38e020289f7db95414390dddbbeb56680100000004ac5100acffffffffb6a40b5e29d5e459f8e72d39f800089529f0889006cad3d734011991da8ef09d0100000009526a5100acab536a515fc427436df97cc51dc8497642ffc868857ee245314d28b356bd70adba671bd6071301fc0000000000ffffffff487efde2f620566a9b017b2e6e6d42525e4070f73a602f85c6dfd58304518db30000000005516353006a8d8090180244904a0200000000046a65656ab1e9c203000000000451ab63aba06a5449", "", 0, -1414953913, "bae189eb3d64aedbc28a6c28f6c0ccbd58472caaf0cf45a5aabae3e031dd1fea"],
-	["1345fb2c04bb21a35ae33a3f9f295bece34650308a9d8984a989dfe4c977790b0c21ff9a7f0000000006ac52ac6a0053ffffffff7baee9e8717d81d375a43b691e91579be53875350dfe23ba0058ea950029fcb7020000000753ab53ab63ab52ffffffff684b6b3828dfb4c8a92043b49b8cb15dd3a7c98b978da1d314dce5b9570dadd202000000086353ab6a5200ac63d1a8647bf667ceb2eae7ec75569ca249fbfd5d1b582acfbd7e1fcf5886121fca699c011d0100000003ac006affffffff049b1eb00300000000001e46dc0100000000080065ab6a6a630065ca95b40300000000030051520c8499010000000006ab6aac526a6500000000", "53526aac636300", 2, 1809978100, "cfeaa36790bc398783d4ca45e6354e1ea52ee74e005df7f9ebd10a680e9607bf"],
-	["7d75dc8f011e5f9f7313ba6aedef8dbe10d0a471aca88bbfc0c4a448ce424a2c5580cda1560300000003ab5152ffffffff01997f8e0200000000096552ac6a65656563530d93bbcc", "00656a6563", 0, 1414485913, "ec91eda1149f75bffb97612569a78855498c5d5386d473752a2c81454f297fa7"],
-	["1459179504b69f01c066e8ade5e124c748ae5652566b34ed673eea38568c483a5a4c4836ca0100000008ac5352006563656affffffff5d4e037880ab1975ce95ea378d2874dcd49d5e01e1cdbfae3343a01f383fa35800000000095251ac52ac6aac6500ffffffff7de3ae7d97373b7f2aeb4c55137b5e947b2d5fb325e892530cb589bc4f92abd503000000086563ac53ab520052ffffffffb4db36a32d6e543ef49f4bafde46053cb85b2a6c4f0e19fa0860d9083901a1190300000003ab51531bbcfe5504a6dbda040000000008536a5365abac6500d660c80300000000096565abab6a53536a6a54e84e010000000003acac52df2ccf0500000000025351220c857e", "", 2, 1879181631, "3aad18a209fab8db44954eb55fd3cc7689b5ec9c77373a4d5f4dae8f7ae58d14"],
-	["d98b777f04b1b3f4de16b07a05c31d79965579d0edda05600c118908d7cf642c9cd670093f020000000953005351ac65ab5363a268caad6733b7d1718008997f249e1375eb3ab9fe68ab0fe170d8e745ea24f54ce67f9b00000000066500516a5151ffffffff7ef8040dfcc86a0651f5907e8bfd1017c940f51cf8d57e3d3fe78d57e40b1e610200000003535263ffffffff39846cfed4babc098ff465256ba3820c30d710581316afcb67cd31c623b703360300000001acffffffff03d405120100000000056300006a5201a73d050000000004ab636a6a294c8c000000000006ac65536553ac00000000", "63525351abac", 1, 2018694761, "86970af23c89b72a4f9d6281e46b9ef5220816bed71ebf1ae20df53f38fe16ff"],
-	["cabb1b06045a895e6dcfc0c1e971e94130c46feace286759f69a16d298c8b0f6fd0afef8f20300000004ac006352ffffffffa299f5edac903072bfb7d29b663c1dd1345c2a33546a508ba5cf17aab911234602000000056a65515365ffffffff89a20dc2ee0524b361231092a070ace03343b162e7162479c96b757739c8394a0300000002abab92ec524daf73fabee63f95c1b79fa8b84e92d0e8bac57295e1d0adc55dc7af5534ebea410200000001534d70e79b04674f6f00000000000600abacab53517d60cc0200000000035265ab96c51d040000000004ac6300ac62a787050000000008006a516563ab63639e2e7ff7", "6551ac6351ac", 3, 1942663262, "d0c4a780e4e0bc22e2f231e23f01c9d536b09f6e5be51c123d218e906ec518be"],
-	["8b96d7a30132f6005b5bd33ea82aa325e2bcb441f46f63b5fca159ac7094499f380f6b7e2e00000000076aacabac6300acffffffff0158056700000000000465005100c319e6d0", "52006a", 0, -1100733473, "fb4bd26a91b5cf225dd3f170eb09bad0eac314bc1e74503cc2a3f376833f183e"],
-	["112191b7013cfbe18a175eaf09af7a43cbac2c396f3695bbe050e1e5f4250603056d60910e02000000001c8a5bba03738a22010000000005525352656a77a149010000000002510003b52302000000000351ac52722be8e6", "65ac6565", 0, -1847972737, "8e795aeef18f510d117dfa2b9f4a2bd2e2847a343205276cedd2ba14548fd63f"],
-	["ce6e1a9e04b4c746318424705ea69517e5e0343357d131ad55d071562d0b6ebfedafd6cb840100000003656553ffffffff67bd2fa78e2f52d9f8900c58b84c27ef9d7679f67a0a6f78645ce61b883fb8de000000000100d699a56b9861d99be2838e8504884af4d30b909b1911639dd0c5ad47c557a0773155d4d303000000046a5151abffffffff9fdb84b77c326921a8266854f7bbd5a71305b54385e747fe41af8a397e78b7fa010000000863acac6a51ab00ac0d2e9b9d049b8173010000000007ac53526a650063ba9b7e010000000008526a00525263acac0ab3fd030000000000ea8a0303000000000200aca61a97b9", "", 1, -1276952681, "b6ed4a3721be3c3c7305a5128c9d418efa58e419580cec0d83f133a93e3a22c5"],
-	["a7721d94021652d90c79aaf5022d98219337d50f836382403ed313adb1116ba507ac28b0b0010000000551ac6300ab89e6d64a7aa81fb9595368f04d1b36d7020e7adf5807535c80d015f994cce29554fe869b01000000065353ab636500ffffffff024944c90100000000046300635369df9f01000000000000000000", "656a536551ab", 0, -1740151687, "935892c6f02948f3b08bcd463b6acb769b02c1912be4450126768b055e8f183a"],
-	["2f7353dd02e395b0a4d16da0f7472db618857cd3de5b9e2789232952a9b154d249102245fd030000000151617fd88f103280b85b0a198198e438e7cab1a4c92ba58409709997cc7a65a619eb9eec3c0200000003636aabffffffff0397481c0200000000045300636a0dc97803000000000009d389030000000003ac6a53134007bb", "0000536552526a", 0, -1912746174, "30c4cd4bd6b291f7e9489cc4b4440a083f93a7664ea1f93e77a9597dab8ded9c"],
-	["7d95473604fd5267d0e1bb8c9b8be06d7e83ff18ad597e7a568a0aa033fa5b4e1e2b6f1007020000000465006a6affffffffaee008503bfc5708bd557c7e78d2eab4878216a9f19daa87555f175490c40aaf000000000263abffffffffabd74f0cff6e7ceb9acc2ee25e65af1abcebb50c08306e6c78fa8171c37613dd010000000552acacababffffffff54a3069393f7930fa1b331cdff0cb945ec21c11d4605d8eedba1d3e094c6ae1f01000000026300ffffffff0182edeb050000000009526353ab5153530065a247e8cd", "51516aab00", 2, -426210430, "2707ca714af09494bb4cf0794abe33c6cba5f29891d619e76070269d1fa8e690"],
-	["221d4718023d9ca9fe1af178dbfce02b2b369bf823ea3f43f00891b7fef98e215c06b94fdd000000000951005153ab000051acffffffffb1c7ad1c64b7441bf5e70cd0f6eb4ec96821d67fc4997d9e6dfdceadecd36dde01000000070051536a635153ffffffff04e883cd00000000000851ab536553ab0052bbb2f70400000000002f1b2e03000000000165259fcb00000000000010dbde99", "ab", 1, 665721280, "4abce77432a86dfe608e7c1646c18b5253a373392ff962e288e3ab96bba1ba1d"],
-	["6f66c0b3013e6ae6aabae9382a4326df31c981eac169b6bc4f746edaa7fc1f8c796ef4e374000000000665ab6aabac6affffffff0191c8d6030000000002525300000000", "6a5352516a635352ab", 0, -1299629906, "48411efeb133c6b7fec4e7bdbe613f827093cb06ea0dbcc2ffcfde3a9ac4356c"],
-	["89e7928c04363cb520eff4465251fd8e41550cbd0d2cdf18c456a0be3d634382abcfd4a2130200000006ac516a6a656355042a796061ed72db52ae47d1607b1ceef6ca6aea3b7eea48e7e02429f382b378c4e51901000000085351ab6352ab5252ffffffff53631cbda79b40183000d6ede011c778f70147dc6fa1aed3395d4ce9f7a8e69701000000096a6553ab52516a52abad0de418d80afe059aab5da73237e0beb60af4ac490c3394c12d66665d1bac13bdf29aa8000000000153f2b59ab6027a33eb040000000007005351ac5100ac88b941030000000003ab0052e1e8a143", "63656a", 0, 1258533326, "b575a04b0bb56e38bbf26e1a396a76b99fb09db01527651673a073a75f0a7a34"],
-	["ca356e2004bea08ec2dd2df203dc275765dc3f6073f55c46513a588a7abcc4cbde2ff011c7020000000553525100003aefec4860ef5d6c1c6be93e13bd2d2a40c6fb7361694136a7620b020ecbaca9413bcd2a030000000965ac00536352535100ace4289e00e97caaea741f2b89c1143060011a1f93090dc230bee3f05e34fbd8d8b6c399010000000365526affffffff48fc444238bda7a757cb6a98cb89fb44338829d3e24e46a60a36d4e24ba05d9002000000026a53ffffffff03d70b440200000000056a6a526aac853c97010000000002515335552202000000000351635300000000", "0052", 3, -528192467, "fc93cc056c70d5e033933d730965f36ad81ef64f1762e57f0bc5506c5b507e24"],
-	["82d4fa65017958d53e562fac073df233ab154bd0cf6e5a18f57f4badea8200b217975e31030200000004636aab51ac0891a204227cc9050000000006635200655365bfef8802000000000865650051635252acfc2d09050000000006ab65ac51516380195e030000000007ac52525352510063d50572", "53", 0, -713567171, "e095003ca82af89738c1863f0f5488ec56a96fb81ea7df334f9344fcb1d0cf40"],
-	["75f6949503e0e47dd70426ef32002d6cdb564a45abedc1575425a18a8828bf385fa8e808e600000000036aabab82f9fd14e9647d7a1b5284e6c55169c8bd228a7ea335987cef0195841e83da45ec28aa2e0300000002516350dc6fe239d150efdb1b51aa288fe85f9b9f741c72956c11d9dcd176889963d699abd63f0000000001ab429a63f502777d20010000000007abac52ac516a53d081d9020000000003acac630c3cc3a8", "535152516551510000", 1, 973814968, "c6ec1b7cb5c16a1bfd8a3790db227d2acc836300534564252b57bd66acf95092"],
-	["24f24cd90132b2162f938f1c22d3ca5e7daa83515883f31a61a5177aebf99d7db6bdfc398c010000000163ffffffff01d5562d0100000000016300000000", "5265ac5165ac5252ab", 0, 1055129103, "5eeb03e03806cd7bfd44bbba69c30f84c2c5120df9e68cd8facc605fcfbc9693"],
-	["5ff2cac201423064a4d87a96b88f1669b33adddc6fa9acdc840c0d8a243671e0e6de49a5b00300000005ac6353655353b91db50180db5a03000000000663535151006a047a3aff", "52ab51ab5365005163", 0, -1336626596, "b8db8d57fe40ab3a99cf2f8ed57da7a65050fcc1d34d4280e25faf10108d3110"],
-	["10011f150220ad76a50ccc7bb1a015eda0ff987e64cd447f84b0afb8dc3060bdae5b36a6900200000000ffffffff1e92dd814dfafa830187bc8e5b9258de2445ec07b02c420ee5181d0b203bb334000000000565ab536a65ffffffff0124e65401000000000800ab636553ab53ac00000000", "53abab0051", 0, 440222748, "c6675bf229737e005b5c8ffa6f81d9e2c4396840921b6151316f67c4315a4270"],
-	["8b95ec900456648d820a9b8df1d8f816db647df8a8dc9f6e7151ebf6079d90ee3f6861352a02000000085200ab00ac535151ffffffff039b10b845f961225ac0bcaac4f5fe1991029a051aa3d06a3811b5762977a67403000000035252abffffffff8559d65f40d5e261f45aec8aad3d2c56c6114b22b26f7ee54a06f0881be3a7f5010000000765635252536363ffffffff38f8b003b50f6412feb2322b06b270197f81ad69c36af02ca5008b94eee5f650020000000165ffffffff01ae2b00010000000001638eb153a2", "0053ab5300ac53", 2, 1266056769, "205f3653f0142b35ce3ef39625442efebae98cde8cbf0516b97b51073bb0479f"],
-	["babbb7ea01ab5d584727cb44393b17cf66521606dc81e25d85273be0d57bad43e8f6b6d43501000000036a656aba83a68803fb0f4a000000000005536353ab633fcfe4020000000009ac00acab6351006a65182a0c03000000000453ac5363bee74f44", "536a6a6a6365ac51ab", 0, -799187625, "3275e98dca37243b977525a07b5d8e369d6c3bdc08cb948029a635547d0d1a4e"],
-	["e86a24bc03e4fae784cdf81b24d120348cb5e52d937cd9055402fdba7e43281e482e77a1c100000000046363006affffffffa5447e9bdcdab22bd20d88b19795d4c8fb263fbbf7ce8f4f9a85f865953a6325020000000663ac53535253ffffffff9f8b693bc84e0101fc73748e0513a8cecdc264270d8a4ee1a1b6717607ee1eaa00000000026a513417bf980158d82c020000000009005253005351acac5200000000", "6353516365536a6a", 2, -563792735, "508129278ef07b43112ac32faf00170ad38a500eed97615a860fd58baaad174b"],
-	["53bd749603798ed78798ef0f1861b498fc61dcee2ee0f2b37cddb115b118e73bc6a5a47a0201000000096a63656a6aab6a000007ff674a0d74f8b4be9d2e8e654840e99d533263adbdd0cf083fa1d5dd38e44d2d163d900100000007abab5251ac6a51c8b6b63f744a9b9273ccfdd47ceb05d3be6400c1ed0f7283d32b34a7f4f0889cccf06be30000000009516a52636551ab516a9ac1fe63030c677e05000000000027bc610000000000086565636a635100526e2dc60200000000015300000000", "6552536a515351ab", 1, -1617066878, "fe516df92299e995b8e6489be824c6839543071ec5e9286060b2600935bf1f20"],
-	["691bf9fc028ca3099020b79184e70039cf53b3c7b3fe695d661fd62d7b433e65feda2150610000000003ac63abffffffff2c814c15b142bc944192bddccb90a392cd05b968b599c1d8cd99a55a28a243fd0100000009ab5300526a5200abac98516a5803dfd3540500000000046552ac522838120100000000040053ab6a4409a903000000000665636a5300658759621b", "65ac5165ab", 0, -359941441, "d582c442e0ecc400c7ba33a56c93ad9c8cfd45af820350a13623594b793486f0"],
-	["536bc5e60232eb60954587667d6bcdd19a49048d67a027383cc0c2a29a48b960dc38c5a0370300000005ac636300abffffffff8f1cfc102f39b1c9348a2195d496e602c77d9f57e0769dabde7eaaedf9c69e250100000006acabab6a6351ffffffff0432f56f0400000000046a5365517fd54b0400000000035265539484e4050000000003536a5376dc25020000000008ac536aab6aab536ab978e686", "ac0051006a006a006a", 0, -273074082, "f151f1ec305f698d9fdce18ea292b145a58d931f1518cf2a4c83484d9a429638"],
-	["74606eba01c2f98b86c29ba5a32dc7a7807c2abe6ed8d89435b3da875d87c12ae05329e6070200000003510052ffffffff02a1e2c4020000000006516563526a63c68bae04000000000952ab6363ab00006363fe19ae4f", "63ababacac5365", 0, 112323400, "d1b1d79001b4a0324962607b739972d6f39c1493c4500ce814fd3bd72d32a5a0"],
-	["2ed805e20399e52b5bcc9dc075dad5cf19049ff5d7f3de1a77aee9288e59c5f4986751483f020000000165ffffffff967531a5726e7a653a9db75bd3d5208fa3e2c5e6cd5970c4d3aba84eb644c72c0300000000ffffffffd79030d20c65e5f8d3c55b5692e5bdaa2ae78cfa1935a0282efb97515feac43f030000000400006365261ab88c02bdf66a000000000003ab6351d6ad8b000000000005525152abac00000000", "630053ab5265", 0, 2072814938, "1d25d16d84d5793be1ad5cda2de9c9cf70e04a66c3dae618f1a7ca4026198e7f"],
-	["fab796ee03f737f07669160d1f1c8bf0800041157e3ac7961fea33a293f976d79ce49c02ab0200000003ac5252eb097ea1a6d1a7ae9dace338505ba559e579a1ee98a2e9ad96f30696d6337adcda5a85f403000000096500abab656a6a656396d5d41a9b11f571d91e4242ddc0cf2420eca796ad4882ef1251e84e42b930398ec69dd80100000005526551ac6a8e5d0de804f763bb0400000000015288271a010000000001acf2bf2905000000000300ab51c9641500000000000952655363636365ac5100000000", "00ac536552", 0, -1854521113, "f3bbab70b759fe6cfae1bf349ce10716dbc64f6e9b32916904be4386eb461f1f"],
-	["f2b539a401e4e8402869d5e1502dbc3156dbce93583f516a4947b333260d5af1a34810c6a00200000003525363ffffffff01d305e2000000000005acab535200a265fe77", "", 0, -1435650456, "41617b27321a830c712638dbb156dae23d4ef181c7a06728ccbf3153ec53d7dd"],
-	["9f10b1d8033aee81ac04d84ceee0c03416a784d1017a2af8f8a34d2f56b767aea28ff88c8f02000000025352ffffffff748cb29843bea8e9c44ed5ff258df1faf55fbb9146870b8d76454786c4549de100000000016a5ba089417305424d05112c0ca445bc7107339083e7da15e430050d578f034ec0c589223b0200000007abac53ac6565abffffffff025a4ecd010000000006636563ab65ab40d2700000000000056a6553526333fa296c", "", 0, -395044364, "20fd0eee5b5716d6cbc0ddf852614b686e7a1534693570809f6719b6fcb0a626"],
-	["ab81755f02b325cbd2377acd416374806aa51482f9cc5c3b72991e64f459a25d0ddb52e66703000000036a00ab8727056d48c00cc6e6222be6608c721bc2b1e69d0ffbadd51d131f05ec54bcd83003aac5000000000003f2cdb60454630e020000000007526aac63000000e9e25c040000000003516a0088c97e0000000000076a535265655263771b5805000000000851ab00ac6565515100000000", "5151ab00ac", 0, -230931127, "ba0a2c987fcdd74b6915f6462f62c3f126a0750aa70048f7aa20f70726e6a20b"],
-	["7a17e0ef0378dab4c601240639139335da3b7d684600fa682f59b7346ef39386fe9abd69350000000004ac5252ab807f26fb3249326813e18260a603b9ad66f41f05eaa8146f66bcca452162a502aac4aa8b02000000026a534ea460faa7e3d7854ec6c70d7e797025697b547ec500b2c09c873b4d5517767d3f3720660300000000ffffffff01b12e7a02000000000900ab006aab65656a63991c03e2", "6aab6a", 1, -1577994103, "62cd3413d9d819fb7355336365cf8a2a997f7436cc050a7143972044343b3281"],
-	["ff2ecc09041b4cf5abb7b760e910b775268abee2792c7f21cc5301dd3fecc1b4233ee70a2c0200000009acac5300006a51526affffffffeb39c195a5426afff38379fc85369771e4933587218ef4968f3f05c51d6b7c92000000000165453a5f039b8dbef7c1ffdc70ac383b481f72f99f52b0b3a5903c825c45cfa5d2c0642cd50200000001654b5038e6c49daea8c0a9ac8611cfe904fc206dad03a41fb4e5b1d6d85b1ecad73ecd4c0102000000096a51000053ab656565bdb5548302cc719200000000000452655265214a3603000000000300ab6a00000000", "52516a006a63", 1, -2113289251, "37ed6fae36fcb3360c69cac8b359daa62230fc1419b2cf992a32d8f3e079dcff"],
-	["70a8577804e553e462a859375957db68cfdf724d68caeacf08995e80d7fa93db7ebc04519d02000000045352ab53619f4f2a428109c5fcf9fee634a2ab92f4a09dc01a5015e8ecb3fc0d9279c4a77fb27e900000000006ab6a51006a6affffffff3ed1a0a0d03f25c5e8d279bb5d931b7eb7e99c8203306a6c310db113419a69ad010000000565516300abffffffff6bf668d4ff5005ef73a1b0c51f32e8235e67ab31fe019bf131e1382050b39a630000000004536a6563ffffffff02faf0bb00000000000163cf2b4b05000000000752ac635363acac15ab369f", "ac", 0, -1175809030, "1c9d6816c20865849078f9777544b5ddf37c8620fe7bd1618e4b72fb72dddca1"],
-	["a3604e5304caa5a6ba3c257c20b45dcd468f2c732a8ca59016e77b6476ac741ce8b16ca8360200000004acac6553ffffffff695e7006495517e0b79bd4770f955040610e74d35f01e41c9932ab8ccfa3b55d0300000007ac5253515365acffffffff6153120efc5d73cd959d72566fc829a4eb00b3ef1a5bd3559677fb5aae116e38000000000400abab52c29e7abd06ff98372a3a06227386609adc7665a602e511cadcb06377cc6ac0b8f63d4fdb03000000055100acabacffffffff04209073050000000009ab5163ac525253ab6514462e05000000000952abacab636300656a20672c0400000000025153b276990000000000056565ab6a5300000000", "5351", 0, 1460890590, "249c4513a49076c6618aabf736dfd5ae2172be4311844a62cf313950b4ba94be"],
-	["c6a72ed403313b7d027f6864e705ec6b5fa52eb99169f8ea7cd884f5cdb830a150cebade870100000009ac63ab516565ab6a51ffffffff398d5838735ff43c390ca418593dbe43f3445ba69394a6d665b5dc3b4769b5d700000000075265acab515365ffffffff7ee5616a1ee105fd18189806a477300e2a9cf836bf8035464e8192a0d785eea3030000000700ac6a51516a52ffffffff018075fd0000000000015100000000", "005251acac5252", 2, -656067295, "2cc1c7514fdc512fd45ca7ba4f7be8a9fe6d3318328bc1a61ae6e7675047e654"],
-	["93c12cc30270fc4370c960665b8f774e07942a627c83e58e860e38bd6b0aa2cb7a2c1e060901000000036300abffffffff4d9b618035f9175f564837f733a2b108c0f462f28818093372eec070d9f0a5440300000001acffffffff039c2137020000000001525500990100000000055265ab636a07980e0300000000005ba0e9d1", "656a5100", 1, 18954182, "6beca0e0388f824ca33bf3589087a3c8ad0857f9fe7b7609ae3704bef0eb83e2"],
-	["97bddc63015f1767619d56598ad0eb5c7e9f880b24a928fea1e040e95429c930c1dc653bdb0100000008ac53acac00005152aaa94eb90235ed10040000000000287bdd0400000000016a8077673a", "acac6a536352655252", 0, -813649781, "5990b139451847343c9bb89cdba0e6daee6850b60e5b7ea505b04efba15f5d92"],
-	["cc3c9dd303637839fb727270261d8e9ddb8a21b7f6cbdcf07015ba1e5cf01dc3c3a327745d0300000000d2d7804fe20a9fca9659a0e49f258800304580499e8753046276062f69dbbde85d17cd2201000000096352536a520000acabffffffffbc75dfa9b5f81f3552e4143e08f485dfb97ae6187330e6cd6752de6c21bdfd21030000000600ab53650063ffffffff0313d0140400000000096565515253526aacac167f0a040000000008acab00535263536a9a52f8030000000006abab5151ab63f75b66f2", "6a635353636a65ac65", 1, 377286607, "dbc7935d718328d23d73f8a6dc4f53a267b8d4d9816d0091f33823bd1f0233e9"],
-	["236f91b702b8ffea3b890700b6f91af713480769dda5a085ae219c8737ebae90ff25915a3203000000056300ac6300811a6a10230f12c9faa28dae5be2ebe93f37c06a79e76214feba49bb017fb25305ff84eb020000000100ffffffff041e351703000000000351ac004ff53e050000000003ab53636c1460010000000000cb55f701000000000651520051ab0000000000", "acac636a6aac5300", 0, 406448919, "793a3d3c37f6494fab79ff10c16702de002f63e34be25dd8561f424b0ea938c4"],
-	["22e10d2003ab4ea9849a2801921113583b7c35c3710ff49a6003489395789a7cfb1e6051900100000006526a65535151ffffffff82f21e249ec60db33831d33b9ead0d56f6496db64337dcb7f1c3327c47729c4a020000000253abffffffff138f098f0e6a4cf51dc3e7a3b749f487d1ebde71b73b731d1d02ad1180ac7b8c02000000036563acda215011027a9484020000000007635165530000ac4bf6cb0400000000066aacabab65ab3ce3f32c", "ab0052ab", 2, 1136359457, "b5bd080bbcb8cd652f440484311d7a3cb6a973cd48f03c5c00fd6beb52dfc061"],
-	["c47d5ad60485cb2f7a825587b95ea665a593769191382852f3514a486d7a7a11d220b62c54000000000663655253acab8c3cf32b0285b040e50dcf6987ddf7c385b3665048ad2f9317b9e0c5ba0405d8fde4129b00000000095251ab00ac65635300ffffffff549fe963ee410d6435bb2ed3042a7c294d0c7382a83edefba8582a2064af3265000000000152fffffffff7737a85e0e94c2d19cd1cde47328ece04b3e33cd60f24a8a345da7f2a96a6d0000000000865ab6a0051656aab28ff30d5049613ea020000000005ac51000063f06df1050000000008ac63516aabac5153afef5901000000000700656500655253688bc00000000000086aab5352526a53521ff1d5ff", "51ac52", 2, -1296011911, "0c1fd44476ff28bf603ad4f306e8b6c7f0135a441dc3194a6f227cb54598642a"],
-	["0b43f122032f182366541e7ee18562eb5f39bc7a8e5e0d3c398f7e306e551cdef773941918030000000863006351ac51acabffffffffae586660c8ff43355b685dfa8676a370799865fbc4b641c5a962f0849a13d8250100000005abab63acabffffffff0b2b6b800d8e77807cf130de6286b237717957658443674df047a2ab18e413860100000008ab6aac655200ab63ffffffff04f1dbca03000000000800635253ab656a52a6eefd0300000000036365655d8ca90200000000005a0d530400000000015300000000", "65ac65acac", 0, 351448685, "86f26e23822afd1bdfc9fff92840fc1e60089f12f54439e3ab9e5167d0361dcf"],
-	["4b0ecc0c03ba35700d2a30a71f28e432ff6ac7e357533b49f4e97cf28f1071119ad6b97f3e0300000008acab516363ac63acffffffffcd6a2019d99b5c2d639ddca0b1aa5ea7c1326a071255ea226960bd88f45ca57d00000000085253655363005353ffffffffba257635191c9f216de3277be548cb5a2313114cb1a4c563b03b4ef6c0f4f7040300000001abda542edf0495cdc40100000000026353c049e903000000000752516a53ab65512b0f9304000000000963ab516aac65516552fa9ece050000000009acab6500005152530000000000", "65ab51525352510052", 1, -1355414590, "3cd85f84aae6d702436f3f9b8980adcc1f8f202e957759540a27da0a32fc6c87"],
-	["adaac0a803f66811346271c733036d6e0d45e15a9b602092e2e04ad93564f196e7f020b088000000000600526a636a00700ec3f9db07a3a6ce910bf318c7ec87a876e1f2a3366cc69f20cde09203b99c1cb9d15800000000050000ac636a4d0de554ebe95c6cc14faf5ff6361d1deba9474b8b0fd3b93c011cd96aec783abb3f36830200000005ab65005251ffffffff0464eb10050000000007520000ab6a65ab1beaa80300000000005a2f31050000000006526aab65ac52ba7db10000000000045251ab6a0cfb46e7", "ab0051ac52636a", 1, -184733716, "961ff413850336d3987c550404fc1d923266ca36cc9ffee7113edb3a9fea7f30"],
-	["af1c4ab301ec462f76ee69ba419b1b2557b7ded639f3442a3522d4f9170b2d6859765c3df402000000016affffffff01a5ca6c000000000008ab52536aab00005300000000", "6a6351", 0, 110304602, "e88ed2eea9143f2517b15c03db00767eb01a5ce12193b99b964a35700607e5f4"],
-	["0bfd34210451c92cdfa02125a62ba365448e11ff1db3fb8bc84f1c7e5615da40233a8cd368010000000252ac9a070cd88dec5cf9aed1eab10d19529720e12c52d3a21b92c6fdb589d056908e43ea910e0200000009ac516a52656a6a5165ffffffffc3edcca8d2f61f34a5296c405c5f6bc58276416c720c956ff277f1fb81541ddd00000000030063abffffffff811247905cdfc973d179c03014c01e37d44e78f087233444dfdce1d1389d97c302000000065163000063ab1724a26e02ca37c902000000000851ab53525352ac529012a90100000000085200525253535353fa32575b", "5352ac6351", 1, -1087700448, "b8f1e1f35e3e1368bd17008c756e59cced216b3c699bcd7bebdb5b6c8eec4697"],
-	["2c84c0640487a4a695751d3e4be48019dbaea85a6e854f796881697383ea455347d2b2769001000000055265526500ffffffff6aac176d8aa00778d496a7231eeb7d3334f20c512d3db1683276402100d98de5030000000700536a5263526ac1ee9ceb171c0c984ebaf12c234fd1487fbf3b3d73aa0756907f26837efba78d1bed33200300000001ab4d9e8ec0bed837cb929bbed76ee848959cec59de44bd7667b7631a744f880d5c71a20cfd0100000007005363515300abffffffff023753fb0000000000036565532d3873050000000009005152ab6a63acab5200000000", "ab650053ab", 0, -877941183, "c49af297dffe2d80deddf10ceea84b99f8554bd2d55bbdc34e449728c31f0835"],
-	["1f7e4b1b045d3efa6cd7a11d7873a8bab886c19bd11fcb6712f0948f2db3a7be76ff76c8f100000000095265ab6a0065ac5363ffffffffdaafcfa6029336c997680a541725190f09a6f6da21e54560eca4b5b8ae987da1000000000952ac52acac52515165ffffffff825a38d3b1e5bb4d10f33653ab3ab6882c7abdaec74460257d1528ce7be3f98e0100000007526a006a656a63c14adc8f04953a5d3d3f89237f38b857dd357713896d36215f7e8b77b11d98ea3cdc93df02000000015212484f6104bfafae0300000000025263a2b0120000000000056563ab00516c4d2605000000000653ac6500655301cc93030000000002acab14643b1f", "63acac53ab", 0, 333824258, "18da6ceb011cd36f15ad7dd6c55ef07e6f6ed48881ce3bb31416d3c290d9a0e9"],
-	["467a3e7602e6d1a7a531106791845ec3908a29b833598e41f610ef83d02a7da3a1900bf2960000000005ab6a636353ffffffff031db6dac6f0bafafe723b9199420217ad2c94221b6880654f2b35114f44b1df010000000965ab52636a63ac6352ffffffff02b3b95c0100000000026300703216030000000001ab3261c0aa", "6a", 0, 2110869267, "3078b1d1a7713c6d101c64afe35adfae0977a5ab4c7e07a0b170b041258adbf2"],
-	["8713bc4f01b411149d575ebae575f5dd7e456198d61d238695df459dd9b86c4e3b2734b62e0300000004abac6363ffffffff03b58049050000000002ac653c714c04000000000953656a005151526a527b5a9e03000000000652ac5100525300000000", "52", 0, -647281251, "0e0bed1bf2ff255aef6e5c587f879ae0be6222ab33bd75ee365ec6fbb8acbe38"],
-	["f2ba8a8701b9c401efe3dd0695d655e20532b90ac0142768cee4a3bb0a89646758f544aa8102000000036a52527899f4e4040c6f0b030000000008636565ab530051ab52b60c000000000009515200ab630053ac53a49c5f040000000008ab53ab516300ab63fa27340300000000015100000000", "ac63abab5251", 0, -1328936437, "ab61497afd39e61fe06bc5677326919716f9b20083c9f3417dcea905090e0411"],
-	["b5a7df6102107beded33ae7f1dec0531d4829dff7477260925aa2cba54119b7a07d92d5a1d02000000046a516a52803b625c334c1d2107a326538a3db92c6c6ae3f7c3516cd90a09b619ec6f58d10e77bd6703000000056563006a63ffffffff0117484b03000000000853acab52526a65abc1b548a1", "ac006a525100", 0, 2074359913, "680336db57347d8183b8898cd27a83f1ba5884155aeae5ce20b4840b75e12871"],
-	["278cb16204b9dadf400266106392c4aa9df01ba03af988c8139dae4c1818ac009f13fc5f1a00000000065200ac656a52ffffffffd006bbebd8cbd7bdead24cddc9badfcc6bc0c2e63c037e5c29aa858f5d0f3e7d01000000046a0051acffffffffbc62a5f57e58da0b67956003ae81ac97cb4cbd1d694c914fc41515c008c4d8fd020000000165e329c844bcc16164be64b64a81cbf4ffd41ed2934e0daa0040ccb8365bab0b2a9e401c180300000003ab52abffffffff02588460030000000000a25a12030000000005535100005300000000", "6553ab6a5300acab51", 3, 989407546, "1c29f110576f4a3b257f67454d99dfc0dee62ef5517ca702848ce4bd2ea1a1d7"],
-	["49eb2178020a04fca08612c34959fd41447319c190fb7ffed9f71c235aa77bec28703aa1820200000003ac6353abaff326071f07ec6b77fb651af06e8e8bd171068ec96b52ed584de1d71437fed186aecf0300000001acffffffff03da3dbe02000000000652ac63ac6aab8f3b680400000000096a536a65636a53516a5175470100000000016500000000", "6a536365", 0, 1283691249, "c670219a93234929f662ecb9aa148a85a2d281e83f4e53d10509461cdea47979"],
-	["0f96cea9019b4b3233c0485d5b1bad770c246fe8d4a58fb24c3b7dfdb3b0fd90ea4e8e947f0300000006006a5163515303571e1e01906956030000000005ab635353abadc0fbbe", "acac", 0, -1491469027, "716a8180e417228f769dcb49e0491e3fda63badf3d5ea0ceeac7970d483dd7e2"],
-	["9a7d858604577171f5fe3f3fd3e5e039c4b0a06717a5381e9977d80e9f53e025e0f16d2877020000000752636565536353ffffffff5862bd028e8276e63f044be1dddcbb8d0c3fa097678308abf2b0f45104a93dbd0100000001531200667ba8fdd3b28e98a35da73d3ddfe51e210303d8eb580f923de988ee632d77793892030000000752526363526563ffffffffe9744eb44db2658f120847c77f47786d268c302120d269e6004455aa3ea5f5e20200000009ab6300636aab656551ffffffff03c61a3c020000000009ab516a6aab6aab53ab737f1a05000000000853acabab655365ab92a4a00400000000016367edf6c8", "535352ab", 3, 659348595, "d36ee79fc80db2e63e05cdc50357d186181b40ae20e3720878284228a13ee8b3"],
-	["148e68480196eb52529af8e83e14127cbfdbd4a174e60a86ac2d86eac9665f46f4447cf7aa01000000045200ac538f8f871401cf240c0300000000065252ab52656a5266cf61", "", 0, -344314825, "eacc47c5a53734d6ae3aedbc6a7c0a75a1565310851b29ef0342dc4745ceb607"],
-	["e2bc29d4013660631ba14ecf75c60ec5e9bed7237524d8c10f66d0675daa66d1492cb834530200000004ac510065e42d0c9e04f2b26c01000000000951525152acac65ababa35b7504000000000953ac6aac00650053ab94688c0400000000056365526553a1bced0300000000016a00000000", "65ab0063655353", 0, -888431789, "59a34b3ed3a1cce0b104de8f7d733f2d386ffc7445efae67680cd90bc915f7e0"],
-	["0c8a70d70494dca6ab05b2bc941b5b431c43a292bd8f2f02eab5e240a408ca73a676044a4103000000056a51ab006affffffff84496004e54836c035821f14439149f22e1db834f315b24588ba2f031511926c0100000000ffffffffbbc5e70ed1c3060ba1bfe99c1656a3158a7307c3ce8eb362ec32c668596d2bd30000000009636563635351abab00b039344c6fc4f9bec24322e45407af271b2d3dfec5f259ee2fc7227bc5285e22b3be85b40100000009ac00ab53abac6a5352e5ddfcff02d50231020000000005006a51536ab086d9020000000006ababac51ac6a00000000", "abab636565acac6a", 3, 241546088, "643a7b4c8d832e14d5c10762e74ec84f2c3f7ed96c03053157f1bed226614911"],
-	["f98f79cf0274b745e1d6f36da7cbe205a79132a7ad462bdc434cfb1dcd62a6977c3d2a5dbc010000000553516a5365ffffffff4f89f485b53cdad7fb80cc1b7e314b9735b9383bc92c1248bb0e5c6173a55c0d010000000353655293f9b014045ad96d02000000000963ac526a53ac636365f4c27904000000000952536563635152526a2788f0030000000002516aff5add01000000000863530051655351abd04716ba", "ab6552536a53", 1, -2128899945, "56d29f5e300ddfed2cd8dcce5d79826e193981d0b70dc7487772c8a0b3b8d7b1"],
-	["6c7913f902aa3f5f939dd1615114ce961beda7c1e0dd195be36a2f0d9d047c28ac62738c3a020000000453abac00ffffffff477bf2c5b5c6733881447ac1ecaff3a6f80d7016eee3513f382ad7f554015b970100000007ab6563acab5152ffffffff04e58fe1040000000009ab00526aabab526553e59790010000000002ab525a834b03000000000035fdaf0200000000086551ac65515200ab00000000", "63ac53", 1, 1285478169, "1536da582a0b6de017862445e91ba14181bd6bf953f4de2f46b040d351a747c9"],
-	["4624aa9204584f06a8a325c84e3b108cafb97a387af62dc9eab9afd85ae5e2c71e593a3b690200000003636a005eb2b44eabbaeca6257c442fea00107c80e32e8715a1293cc164a42e62ce14fea146220c020000000090b9ee38106e3310037bfc519fd209bdbd21c588522a0e96df5fba4e979392bc993bfe9f01000000086363636a635353ab6f1907d218ef6f3c729d9200e23c1dbff2df58b8b1282c6717b26cf760ee4c880d23f4d100000000086a516a536a525163ffffffff01d6f162050000000000ebbab208", "525365ab0053", 1, -1515409325, "6cf9cd409b7185b1f118171f0a34217af5b612ea54195ea186505b667c19337f"],
-	["16562fc503f1cf9113987040c408bfd4523f1512da699a2ca6ba122dc65677a4c9bf7763830000000003636552ffffffff1ec1fab5ff099d1c8e6b068156f4e39b5543286bab53c6d61e2582d1e07c96cf02000000045163656affffffffd0ef40003524d54c08cb4d13a5ee61c84fbb28cde9eca7a6d11ba3a9335d8c620100000007635153536a6300fbb84fc2012003a601000000000363ab6a00000000", "63636a006a6aab", 0, -1310262675, "1efbf3d37a92bc03d9eb950b792f307e95504f7c4998f668aa250707ebb752ac"],
-	["531665d701f86bacbdb881c317ef60d9cd1baeffb2475e57d3b282cd9225e2a3bf9cbe0ded01000000086300ac515263acabffffffff0453a8500100000000086353acab516a6565e5e9200500000000026a52a44caa00000000000453ac000065e41b0500000000076500ac0065526ab4476f4d", "006563006aab00636a", 0, 1770013777, "0898b26dd3ca08632a5131fa48eb55b44386d0c5070c24d6e329673d5e3693b8"],
-	["0f1227a20140655a3da36e413b9b5d108a866f6f147eb4940f032f5a89854eae6d7c3a91600100000009525363515153515253e37a79480161ab61020000000001ab00000000", "ab65005200", 0, -1996383599, "979782dc3f36d908d37d7e4046a38d306b4b08ddc60a5eba355fe3d6da1b29a9"],
-	["063ff6eb01aff98d0d2a6db224475010edb634c2f3b46257084676adeb84165a4ff8558d7601000000066353006a5165deb3262c042d109c0000000000076363ab52ac005200b9c4050000000007516300ac510063cfffc800000000000200639e815501000000000700526a52ac6365ac7b07b8", "656552abac6500", 0, -1559847112, "674a4bcb04247f8dc98780f1792cac86b8aee41a800fc1e6f5032f6e1dccde65"],
-	["3320f6730132f830c4681d0cae542188e4177cad5d526fae84565c60ceb5c0118e844f90bd030000000163ffffffff0257ec5a040000000005525251ac6538344d000000000002515200000000", "5352656a53ac516a65", 0, 788050308, "3afacaca0ef6be9d39e71d7b1b118994f99e4ea5973c9107ca687d28d8eba485"],
-	["c13aa4b702eedd7cde09d0416e649a890d40e675aa9b5b6d6912686e20e9b9e10dbd40abb1000000000863ab6353515351ac11d24dc4cc22ded7cdbc13edd3f87bd4b226eda3e4408853a57bcd1becf2df2a1671fd1600000000045165516affffffff01baea300100000000076aab52ab53005300000000", "0065", 0, -1195908377, "241a23e7b1982d5f78917ed97a8678087acbbffe7f624b81df78a5fe5e41e754"],
-	["d9a6f20e019dd1b5fae897fb472843903f9c3c2293a0ffb59cff2b413bae6eceab574aaf9d030000000663ab006a515102f54939032df5100100000000056a51ab65530ec28f010000000004ac5100007e874905000000000651005265ac6a00000000", "abacab63acacabab", 0, 271463254, "1326a46f4c21e7619f30a992719a905aa1632aaf481a57e1cbd7d7c22139b41e"],
-	["157c81bf0490432b3fcb3f9a5b79e5f91f67f05efb89fa1c8740a3fe7e9bdc18d7cb6acd2203000000026351ffffffff912e48e72bbcf8a540b693cf8b028e532a950e6e63a28801f6eaad1afcc52ad00000000000b1a4b170a2b9e60e0cad88a0085137309f6807d25d5afb5c1e1d32aa10ba1cdf7df596dd0000000009525165656a51ab65ab3674fba32a76fe09b273618d5f14124465933f4190ba4e0fd09d838daafc6223b31642ac00000000086a53536551ac6565ffffffff01fe9fb6030000000008ab51656a5165636a00000000", "ab00ab6a6551", 3, -64357617, "1ddaab7f973551d71f16bd70c4c4edbf7225e64e784a6da0ee7f7a9fe4f12a0b"],
-	["a2692fff03b2387f5bacd5640c86ba7df574a0ee9ed7f66f22c73cccaef3907eae791cbd230200000004536363abffffffff4d9fe7e5b375de88ba48925d9b2005447a69ea2e00495a96eafb2f144ad475b40000000008000053000052636537259bee3cedd3dcc07c8f423739690c590dc195274a7d398fa196af37f3e9b4a1413f810000000006ac63acac52abffffffff04c65fe60200000000075151536365ab657236fc020000000009005263ab00656a6a5195b8b6030000000007ac5165636aac6a7d7b66010000000002acab00000000", "51", 2, -826546582, "925037c7dc7625f3f12dc83904755a37016560de8e1cdd153c88270a7201cf15"],
-	["2c5b003201b88654ac2d02ff6762446cb5a4af77586f05e65ee5d54680cea13291efcf930d0100000005ab536a006a37423d2504100367000000000004536a515335149800000000000152166aeb03000000000452510063226c8e03000000000000000000", "635251", 0, 1060344799, "7e058ca5dd07640e4aae7dea731cfb7d7fef1bfd0d6d7b6ce109d041f4ca2a31"],
-	["f981b9e104acb93b9a7e2375080f3ea0e7a94ce54cd8fb25c57992fa8042bdf4378572859f0100000002630008604febba7e4837da77084d5d1b81965e0ea0deb6d61278b6be8627b0d9a2ecd7aeb06a0300000005ac5353536a42af3ef15ce7a2cd60482fc0d191c4236e66b4b48c9018d7dbe4db820f5925aad0e8b52a0300000008ab0063510052516301863715efc8608bf69c0343f18fb81a8b0c720898a3563eca8fe630736c0440a179129d03000000086aac6a52ac6a63ac44fec4c00408320a03000000000062c21c030000000007ac6a655263006553835f0100000000015303cd60000000000005535263536558b596e0", "00", 0, -2140385880, "49870a961263354c9baf108c6979b28261f99b374e97605baa532d9fa3848797"],
-	["e7416df901269b7af14a13d9d0507709b3cd751f586ce9d5da8d16a121e1bd481f5a086e1103000000056aab005200ffffffff01aa269c040000000006acac6a6a5263ee718de6", "ab525363", 0, 1309186551, "eea7d2212bda2d408fff146f9ae5e85e6b640a93b9362622bb9d5e6e36798389"],
-	["402a815902193073625ab13d876190d1bbb72aecb0ea733c3330f2a4c2fe6146f322d8843a0300000008656aab0000535363fffffffff9dccdec5d8509d9297d26dfcb1e789cf02236c77dc4b90ebccbf94d1b5821150300000001510bf1f96a03c5c145000000000002ac6ae11b1c0100000000055163516a5239c8a600000000000365636300000000", "63536aacab", 0, -1811424955, "0090803a20102a778ab967a74532faee13e03b702083b090b1497bc2267ee2fe"],
-	["c4b702e502f1a54f235224f0e6de961d2e53b506ab45b9a40805d1dacd35148f0acf24ca5e00000000085200ac65ac53acabf34ba6099135658460de9d9b433b84a8562032723635baf21ca1db561dce1c13a06f4407000000000851ac006a63516aabffffffff02a853a603000000000163d17a67030000000005ab63006a5200000000", "ac5363515153", 1, 480734903, "5c46f7ac3d6460af0da28468fcc5b3c87f2b9093d0f837954b7c8174b4d7b6e7"],
-	["9b83f78704f492b9b353a3faad8d93f688e885030c274856e4037818848b99e490afef27770200000000ffffffff36b60675a5888c0ef4d9e11744ecd90d9fe9e6d8abb4cff5666c898fdce98d9e00000000056aab656352596370fca7a7c139752971e169a1af3e67d7656fc4fc7fd3b98408e607c2f2c836c9f27c030000000653ac51ab6300a0761de7e158947f401b3595b7dc0fe7b75fa9c833d13f1af57b9206e4012de0c41b8124030000000953656a53ab53510052242e5f5601bf83b301000000000465516a6300000000", "63515200ac656365", 3, -150879312, "9cf05990421ea853782e4a2c67118e03434629e7d52ab3f1d55c37cf7d72cdc4"],
-	["f492a9da04f80b679708c01224f68203d5ea2668b1f442ebba16b1aa4301d2fe5b4e2568f3010000000953005351525263ab65ffffffff93b34c3f37d4a66df255b514419105b56d7d60c24bf395415eda3d3d8aa5cd0101000000020065ffffffff9dba34dabdc4f1643b372b6b77fdf2b482b33ed425914bb4b1a61e4fad33cf390000000002ab52ffffffffbbf3dc82f397ef3ee902c5146c8a80d9a1344fa6e38b7abce0f157be7adaefae0000000009515351005365006a51ffffffff021359ba010000000000403fea0200000000095200ac6353abac635300000000", "00ac51acacac", 0, -2115078404, "fd44fc98639ca32c927929196fc3f3594578f4c4bd248156a25c04a65bf3a9f3"],
-	["2f73e0b304f154d3a00fde2fdd40e791295e28d6cb76af9c0fd8547acf3771a02e3a92ba37030000000852ac6351ab6565639aa95467b065cec61b6e7dc4d6192b5536a7c569315fb43f470078b31ed22a55dab8265f02000000080065636a6aab6a53ffffffff9e3addbff52b2aaf9fe49c67017395198a9b71f0aa668c5cb354d06c295a691a0100000000ffffffff45c2b4019abaf05c5e484df982a4a07459204d1343a6ee5badade358141f8f990300000007ac516a6aacac6308655cd601f3bc2f0000000000015200000000", "", 0, -2082053939, "9a95e692e1f78efd3e46bb98f178a1e3a0ef60bd0301d9f064c0e5703dc879c2"],
-	["5a60b9b503553f3c099f775db56af3456330f1e44e67355c4ab290d22764b9144a7b5f959003000000030052acbd63e0564decc8659aa53868be48c1bfcda0a8c9857b0db32a217bc8b46d9e7323fe9649020000000553ac6551abd0ecf806211db989bead96c09c7f3ec5f73c1411d3329d47d12f9e46678f09bac0dc383e0200000000ffffffff01494bb202000000000500516551ac00000000", "ac", 0, 1169947809, "62a36c6e8da037202fa8aeae03e533665376d5a4e0a854fc4624a75ec52e4eb1"],
-	["7e98d353045569c52347ca0ff2fdba608829e744f61eb779ffdb5830aae0e6d6857ab2690e03000000075365acab656352ffffffffa890dd37818776d12da8dca53d02d243ef23b4535c67016f4c58103eed85360f030000000093dbacdc25ca65d2951e047d6102c4a7da5e37f3d5e3c8b87c29b489360725dcd117ee2003000000056a6300ac53c7e99fa1dc2b8b51733034e6555f6d6de47dbbf1026effac7db80cb2080678687380dc1e02000000075352005263516affffffff04423272040000000008ab6353ab65510051e0f53b0500000000086300516552635152f74a5f04000000000853acab0053ab52ab0e8e5f00000000000951ac5363516a6aabab00000000", "6a5163ab52", 3, 890006103, "476868cecd1763c91dade98f17defa42d31049547df45acffa1cc5ae5c3d75d6"],
-	["e3649aa40405e6ffe377dbb1bbbb672a40d8424c430fa6512c6165273a2b9b6afa9949ec430200000007630052ab655153a365f62f2792fa90c784efe3f0981134d72aac0b1e1578097132c7f0406671457c332b84020000000353ab6ad780f40cf51be22bb4ff755434779c7f1def4999e4f289d2bd23d142f36b66fbe5cfbb4b01000000076a5252abac52ab1430ffdc67127c9c0fc97dcd4b578dab64f4fb9550d2b59d599773962077a563e8b6732c02000000016affffffff04cb2687000000000002ab636e320904000000000252acf70e9401000000000100dc3393050000000006ab0063536aacbc231765", "65520053", 3, -2016196547, "f64f805f0ff7f237359fa6b0e58085f3c766d1859003332223444fd29144112a"],
-	["1d033569040700441686672832b531ab55db89b50dc1f9fc00fb72218b652da9dcfbc83be901000000066551ac526a632b390f9ad068e5fdee6563e88e2a8e4e09763c861072713dc069893dc6bbc9db3f00e26502000000096a5363526565525252ffffffff8a36bdd0aaf38f6707592d203e14476ca9f259021e487135c7e8324244057ed90300000000ed3fb2a3dfd4d46b5f3603fe0148653911988457bd0ed7f742b07c452f5476c228ff9f600200000007526aac00525152ffffffff04b88e48030000000000c753d602000000000853510000006553518fda2603000000000853ac52acac5263534839f1030000000006ac006aacac5300000000", "516553635300ab0052", 1, 2075958316, "c2cefaec2293134acbcf6d2a8bf2b3eb42e4ec04ee8f8bf30ff23e65680677c1"],
-	["4c4be7540344050e3044f0f1d628039a334a7c1f7b4573469cfea46101d6888bb6161fe9710200000000ffffffffac85a4fdad641d8e28523f78cf5b0f4dc74e6c5d903c10b358dd13a5a1fd8a06000000000163e0ae75d05616b72467b691dc207fe2e65ea35e2eadb7e06ea442b2adb9715f212c0924f10200000000ffffffff0194ddfe02000000000265ac00000000", "00006500", 1, -479922562, "d66924d49f03a6960d3ca479f3415d638c45889ce9ab05e25b65ac260b51d634"],
-	["202c18eb012bc0a987e69e205aea63f0f0c089f96dd8f0e9fcde199f2f37892b1d4e6da90302000000055352ac6565ffffffff0257e5450100000000025300ad257203000000000000000000", "520052ac6a005265", 0, 168054797, "502967a6f999f7ee25610a443caf8653dda288e6d644a77537bcc115a8a29894"],
-	["32fa0b0804e6ea101e137665a041cc2350b794e59bf42d9b09088b01cde806ec1bbea077df0200000008515153650000006506a11c55904258fa418e57b88b12724b81153260d3f4c9f080439789a391ab147aabb0fa0000000007000052ac51ab510986f2a15c0d5e05d20dc876dd2dafa435276d53da7b47c393f20900e55f163b97ce0b800000000008ab526a520065636a8087df7d4d9c985fb42308fb09dce704650719140aa6050e8955fa5d2ea46b464a333f870000000009636300636a6565006affffffff01994a0d040000000002536500000000", "516563530065", 2, -163068286, "f58637277d2bc42e18358dc55f7e87e7043f5e33f4ce1fc974e715ef0d3d1c2a"],
-	["ae23424d040cd884ebfb9a815d8f17176980ab8015285e03fdde899449f4ae71e04275e9a80100000007ab006553530053ffffffff018e06db6af519dadc5280c07791c0fd33251500955e43fe4ac747a4df5c54df020000000251ac330e977c0fec6149a1768e0d312fdb53ed9953a3737d7b5d06aad4d86e9970346a4feeb5030000000951ab51ac6563ab526a67cabc431ee3d8111224d5ecdbb7d717aa8fe82ce4a63842c9bd1aa848f111910e5ae1eb0100000004ac515300bfb7e0d7048acddc030000000009636a5253636a655363a3428e040000000001525b99c6050000000004655265ab717e6e020000000000d99011eb", "ac6a6a516565", 1, -716251549, "b098eb9aff1bbd375c70a0cbb9497882ab51f3abfebbf4e1f8d74c0739dc7717"],
-	["030f44fc01b4a9267335a95677bd190c1c12655e64df74addc53b753641259af1a54146baa020000000152e004b56c04ba11780300000000026a53f125f001000000000251acd2cc7c03000000000763536563655363c9b9e50500000000015200000000", "ac", 0, -1351818298, "19dd32190ed2a37be22f0224a9b55b91e37290577c6c346d36d32774db0219a3"],
-	["c05f448f02817740b30652c5681a3b128322f9dc97d166bd4402d39c37c0b14506d8adb5890300000003536353ffffffffa188b430357055ba291c648f951cd2f9b28a2e76353bef391b71a889ba68d5fc02000000056565526a6affffffff02745f73010000000001ab3ec34c0400000000036aac5200000000", "516551510053", 0, -267877178, "3a1c6742d4c374f061b1ebe330b1e169a113a19792a1fdde979b53e094cc4a3c"],
-	["163ba45703dd8c2c5a1c1f8b806afdc710a2a8fc40c0138e2d83e329e0e02a9b6c837ff6b8000000000700655151ab6a522b48b8f134eb1a7e6f5a6fa319ce9d11b36327ba427b7d65ead3b4a6a69f85cda8bbcd22030000000563656552acffffffffdbcf4955232bd11eef0cc6954f3f6279675b2956b9bcc24f08c360894027a60201000000066500006500abffffffff04d0ce9d0200000000008380650000000000015233f360040000000003006aabedcf0801000000000000000000", "000065006500ac", 0, 216965323, "9afe3f4978df6a86e9a8ebd62ef6a9d48a2203f02629349f1864ef2b8b92fd55"],
-	["07f7f5530453a12ad0c7eb8fbc3f140c7ab6818144d67d2d8752600ca5d9a9358e2dff87d4000000000663526aab526a9e599c379d455e2da36d0cde88d931a863a3e97e01e93b9edb65856f3d958dc08b92b720000000000165bbc8d66dae3b1b170a6e2457f5b161465cb8706e0e6ffc6af55deb918365f14c5f40d4890100000000a7bd77c069ee4b48638e2363fcf2a86b02bea022047bd9fcb16d2b94ad068308d19b31cb00000000066aab5300ab529672aa8f01dbd8a205000000000663536353006a02e99901", "ac006351006a63ab63", 1, 119789359, "6629a1e75c6ae8f4f9d5f734246b6a71682a5ea57246040ef0584f6b97916175"],
-	["fe647f950311bf8f3a4d90afd7517df306e04a344d2b2a2fea368935faf11fa6882505890d0000000005ab5100516affffffff43c140947d9778718919c49c0535667fc6cc727f5876851cb8f7b6460710c7f60100000000ffffffffce4aa5d90d7ab93cbec2e9626a435afcf2a68dd693c15b0e1ece81a9fcbe025e0300000000ffffffff02f34806020000000002515262e54403000000000965635151ac655363636de5ce24", "6a005100ac516351", 2, 989643518, "818a7ceaf963f52b5c48a7f01681ac6653c26b63a9f491856f090d9d60f2ffe3"],
-	["a1050f8604d0f9d2feefcdb5051ae0052f38e21bf39daf583fd0c3900faa3eab5d431c0bbe030000000653536a005151683d27e5c6e0da8f22125823f32d5d98477d8098ef36263b9694d61d4d85d3f2ac02b7570200000007000052005165abffffffff0cad981542bcb54a87d9400aa63e514c7c6fab7158c2b1fb37821ea755eb162a0200000000b94feb5100e5ef3bf8ed8d43356c8a8d5ac6c7e80d7ff6040f4f0aa19abbe783f4f461240200000007636500000052655686fd70042be3ad02000000000465ab636a15680b000000000004acac53511277c705000000000452635252d27a0102000000000000000000", "6a6aacab65655251", 1, -982144648, "dfcf484111801989eb6df8dc2bafb944d7365ffeb36a575a08f3270d3ef24c9f"],
-	["cef7316804c3e77fe67fc6207a1ea6ae6eb06b3bf1b3a4010a45ae5c7ad677bb8a4ebd16d90200000009ac536a5152ac5263005301ab8a0da2b3e0654d31a30264f9356ba1851c820a403be2948d35cafc7f9fe67a06960300000006526a63636a53ffffffffbada0d85465199fa4232c6e4222df790470c5b7afd54704595a48eedd7a4916b030000000865ab63ac006a006ab28dba4ad55e58b5375053f78b8cdf4879f723ea4068aed3dd4138766cb4d80aab0aff3d0300000003ac6a00ffffffff010f5dd6010000000006ab006aab51ab00000000", "", 1, 889284257, "d0f32a6db43378af84b063a6706d614e2d647031cf066997c48c04de3b493a94"],
-	["7b3ff28004ba3c7590ed6e36f45453ebb3f16636fe716acb2418bb2963df596a50ed954d2e03000000065251515265abffffffff706ee16e32e22179400c9841013971645dabf63a3a6d2d5feb42f83aa468983e030000000653ac51ac5152ffffffffa03a16e5e5de65dfa848b9a64ee8bf8656cc1f96b06a15d35bd5f3d32629876e020000000043c1a3965448b3b46f0f0689f1368f3b2981208a368ec5c30defb35595ef9cf95ffd10e902000000036aac65253a5bbe042e907204000000000800006565656352634203b4020000000002656336b3b7010000000001ab7a063f0100000000026500a233cb76", "006551636a53ac5251", 1, -1144216171, "68c7bd717b399b1ee33a6562a916825a2fed3019cdf4920418bb72ffd7403c8c"],
-	["d5c1b16f0248c60a3ddccf7ebd1b3f260360bbdf2230577d1c236891a1993725e262e1b6cb000000000363636affffffff0a32362cfe68d25b243a015fc9aa172ea9c6b087c9e231474bb01824fd6bd8bc0300000005ab52ab516affffffff0420d9a70200000000045152656a45765d0000000000055252536a5277bad100000000000252ab3f3f3803000000000463acac5200000000", "52636a52ab65", 1, 1305123906, "978dc178ecd03d403b048213d904653979d11c51730381c96c4208e3ea24243a"],
-	["1be8ee5604a9937ebecffc832155d9ba7860d0ca451eaced58ca3688945a31d93420c27c460100000006abac5300535288b65458af2f17cbbf7c5fbcdcfb334ffd84c1510d5500dc7d25a43c36679b702e850f7c0200000003005300ffffffff7c237281cb859653eb5bb0a66dbb7aeb2ac11d99ba9ed0f12c766a8ae2a2157203000000086aabac526365acabfffffffff09d3d6639849f442a6a52ad10a5d0e4cb1f4a6b22a98a8f442f60280c9e5be80200000007ab00ab6565ab52ffffffff0398fe83030000000005526aababacbdd6ec010000000005535252ab6a82c1e6040000000001652b71c40c", "6563526353656351", 2, -853634888, "0d936cceda2f56c7bb87d90a7b508f6208577014ff280910a710580357df25f3"],
-	["9e0f99c504fbca858c209c6d9371ddd78985be1ab52845db0720af9ae5e2664d352f5037d4010000000552ac53636affffffff0e0ce866bc3f5b0a49748f597c18fa47a2483b8a94cef1d7295d9a5d36d31ae7030000000663515263ac635bb5d1698325164cdd3f7f3f7831635a3588f26d47cc30bf0fefd56cd87dc4e84f162ab702000000036a6365ffffffff85c2b1a61de4bcbd1d5332d5f59f338dd5e8accbc466fd860f96eef1f54c28ec030000000165ffffffff04f5cabd010000000007000052ac526563c18f1502000000000465510051dc9157050000000008655363ac525253ac506bb600000000000865656a53ab63006a00000000", "006a6a0052", 0, 1186324483, "2f9b7348600336512686e7271c53015d1cb096ab1a5e0bce49acd35bceb42bc8"],
-	["11ce51f90164b4b54b9278f0337d95c50d16f6828fcb641df9c7a041a2b274aa70b1250f2b0000000008ab6a6a65006551524c9fe7f604af44be050000000005525365006521f79a0300000000015306bb4e04000000000265ac99611a05000000000765acab656500006dc866d0", "", 0, -1710478768, "cfa4b7573559b3b199478880c8013fa713ca81ca8754a3fd68a6d7ee6147dc5a"],
-	["86bc233e02ba3c647e356558e7252481a7769491fb46e883dd547a4ce9898fc9a1ca1b77790000000006ab5351abab51f0c1d09c37696d5c7c257788f5dff5583f4700687bcb7d4acfb48521dc953659e325fa390300000003acac5280f29523027225af03000000000963abac0065ab65acab7e59d90400000000016549dac846", "53006aac52acac", 0, 711159875, "880330ccde00991503ea598a6dfd81135c6cda9d317820352781417f89134d85"],
-	["beac155d03a853bf18cd5c490bb2a245b3b2a501a3ce5967945b0bf388fec2ba9f04c03d68030000000012fe96283aec4d3aafed8f888b0f1534bd903f9cd1af86a7e64006a2fa0d2d30711af770010000000163ffffffffd963a19d19a292104b9021c535d3e302925543fb3b5ed39fb2124ee23a9db00302000000056500ac63acffffffff01ad67f503000000000300ac5189f78db2", "53536a636500", 2, 748992863, "bde3dd0575164d7ece3b5783ce0783ffddb7df98f178fe6468683230314f285a"],
-	["81dab34a039c9e225ba8ef421ec8e0e9d46b5172e892058a9ade579fe0eb239f7d9c97d45b0300000009ac65655351ab526363ffffffff10c0faaf7f597fc8b00bbc67c3fd4c6b70ca6b22718d15946bf6b032e62dae570000000005536a00ab6a02cddec3acf985bbe62c96fccf17012a87026ed63fc6756fa39e286eb4c2dd79b59d37400300000002516affffffff04f18b8d03000000000753abab5152636564411c02000000000400ab6300e965750300000000001bd2cf02000000000565ab526aab00000000", "006551ab", 0, -1488174485, "a3d65a8cd0c1eea8558d01396b929520a2221c29d9f25f29035b8abae874447f"],
-	["489ebbf10478e260ba88c0168bd7509a651b36aaee983e400c7063da39c93bf28100011f280100000004abab63ab2fc856f05f59b257a4445253e0d91b6dffe32302d520ac8e7f6f2467f7f6b4b65f2f59e903000000096353abacab6351656affffffff0122d9480db6c45a2c6fd68b7bc57246edffbf6330c39ccd36aa3aa45ec108fc030000000265ab9a7e78a69aadd6b030b12602dff0739bbc346b466c7c0129b34f50ae1f61e634e11e9f3d0000000006516a53525100ffffffff011271070000000000086563ab6353536352c4dd0e2c", "", 0, -293358504, "4eba3055bc2b58765593ec6e11775cea4b6493d8f785e28d01e2d5470ea71575"],
-	["6911195d04f449e8eade3bc49fd09b6fb4b7b7ec86529918b8593a9f6c34c2f2d301ec378b000000000263ab49162266af054643505b572c24ff6f8e4c920e601b23b3c42095881857d00caf56b28acd030000000565525200ac3ac4d24cb59ee8cfec0950312dcdcc14d1b360ab343e834004a5628d629642422f3c5acc02000000035100accf99b663e3c74787aba1272129a34130668a877cc6516bfb7574af9fa6d07f9b4197303400000000085351ab5152635252ffffffff042b3c95000000000000ff92330200000000046a5252ab884a2402000000000853530065520063000d78be03000000000953abab52ab53ac65aba72cb34b", "6a", 2, -637739405, "6b80d74eb0e7ee59d14f06f30ba7d72a48d3a8ff2d68d3b99e770dec23e9284f"],
-	["746347cf03faa548f4c0b9d2bd96504d2e780292730f690bf0475b188493fb67ca58dcca4f0000000002005336e3521bfb94c254058e852a32fc4cf50d99f9cc7215f7c632b251922104f638aa0b9d080100000008656aac5351635251ffffffff4da22a678bb5bb3ad1a29f97f6f7e5b5de11bb80bcf2f7bb96b67b9f1ac44d09030000000365ababffffffff036f02b30000000000076353ab6aac63ac50b72a050000000002acaba8abf804000000000663006a6a6353797eb999", "acac5100", 1, -1484493812, "164c32a263f357e385bd744619b91c3f9e3ce6c256d6a827d6defcbdff38fa75"],
-	["e17149010239dd33f847bf1f57896db60e955117d8cf013e7553fae6baa9acd3d0f1412ad90200000006516500516500cb7b32a8a67d58dddfb6ceb5897e75ef1c1ff812d8cd73875856487826dec4a4e2d2422a0100000004ac525365196dbb69039229270400000000070000535351636a8b7596020000000006ab51ac52655131e99d040000000003516551ee437f5c", "ac656a53", 1, 1102662601, "8858bb47a042243f369f27d9ab4a9cd6216adeac1c1ac413ed0890e46f23d3f3"],
-	["144971940223597a2d1dec49c7d4ec557e4f4bd207428618bafa3c96c411752d494249e1fb0100000004526a5151ffffffff340a545b1080d4f7e2225ff1c9831f283a7d4ca4d3d0a29d12e07d86d6826f7f0200000003006553ffffffff03c36965000000000000dfa9af00000000000451636aac7f7d140300000000016300000000", "", 1, -108117779, "c84fcaf9d779df736a26cc3cabd04d0e61150d4d5472dd5358d6626e610be57f"],
-	["b11b6752044e650b9c4744fb9c930819227d2ac4040d8c91a133080e090b042a142e93906e0000000003650053ffffffff6b9ce7e29550d3c1676b702e5e1537567354b002c8b7bb3d3535e63ad03b50ea01000000055100516300fffffffffcf7b252fea3ad5a108af3640a9bc2cd724a7a3ce22a760fba95496e88e2f2e801000000036a00ac7c58df5efba193d33d9549547f6ca839f93e14fa0e111f780c28c60cc938f785b363941b000000000863ab51516552ac5265e51fcd0308e9830400000000036a00abab72190300000000016a63d0710000000000050051ab6a6300000000", "53005165ac51ab65", 0, 229563932, "e562579d1a2b10d1c5e45c06513456002a6bec157d7eb42511d30b118103c052"],
-	["2aee6b9a02172a8288e02fac654520c9dd9ab93cf514d73163701f4788b4caeeb9297d2e250300000004ab6363008fb36695528d7482710ea2926412f877a3b20acae31e9d3091406bfa6b62ebf9d9d2a6470100000009535165536a63520065ffffffff03f7b560050000000003acab6a9a8338050000000000206ce90000000000056552516a5100000000", "5252", 1, -1102319963, "fa4676c374ae3a417124b4c970d1ed3319dc3ac91fb36efca1aa9ed981a8aa1b"],
-	["9554595203ad5d687f34474685425c1919e3d2cd05cf2dac89d5f33cd3963e5bb43f8706480100000000ffffffff9de2539c2fe3000d59afbd376cb46cefa8bd01dbc43938ff6089b63d68acdc2b02000000096553655251536a6500fffffffff9695e4016cd4dfeb5f7dadf00968e6a409ef048f81922cec231efed4ac78f5d010000000763abab6a5365006caaf0070162cc640200000000045163ab5100000000", "", 0, -1105256289, "e8e10ed162b1a43bfd23bd06b74a6c2f138b8dc1ab094ffb2fa11d5b22869bee"],
-	["04f51f2a0484cba53d63de1cb0efdcb222999cdf2dd9d19b3542a896ca96e23a643dfc45f00200000007acac53510063002b091fd0bfc0cfb386edf7b9e694f1927d7a3cf4e1d2ce937c1e01610313729ef6419ae7030000000165a3372a913c59b8b3da458335dc1714805c0db98992fd0d93f16a7f28c55dc747fe66a5b503000000095351ab65ab52536351ffffffff5650b318b3e236802a4e41ed9bc0a19c32b7aa3f9b2cda1178f84499963a0cde000000000165ffffffff0383954f04000000000553ac536363a8fc90030000000000a2e315000000000005acab00ab5100000000", "0053", 2, -1424653648, "a5bc0356f56b2b41a2314ec05bee7b91ef57f1074bcd2efc4da442222269d1a3"],
-	["5e4fab42024a27f0544fe11abc781f46596f75086730be9d16ce948b04cc36f86db7ad50fd01000000026a00613330f4916285b5305cc2d3de6f0293946aa6362fc087727e5203e558c676b314ef8dd401000000001af590d202ba496f040000000001009e3c9604000000000351ac51943d64d3", "51acabab5100ab52", 1, -129301207, "556c3f90aa81f9b4df5b92a23399fe6432cf8fecf7bba66fd8fdb0246440036c"],
-	["a115284704b88b45a5f060af429a3a8eab10b26b7c15ed421258f5320fa22f4882817d6c2b0300000003005300ffffffff4162f4d738e973e5d26991452769b2e1be4b2b5b7e8cbeab79b9cf9df2882c040000000006636aac63ac5194abc8aa22f8ddc8a7ab102a58e39671683d1891799d19bd1308d24ea6d365e571172f1e030000000700515352515153ffffffff4da7ad75ce6d8541acbb0226e9818a1784e9c97c54b7d1ff82f791df1c6578f60000000000ffffffff01b1f265040000000009ab0051ac656a516a5300000000", "51abab6352535265", 0, -1269106800, "0ef7b6e87c782fa33fe109aab157a2d9cddc4472864f629510a1c92fa1fe7fc1"],
-	["f3f771ae02939752bfe309d6c652c0d271b7cab14107e98032f269d92b2a8c8853ab057da8010000000563ab6a6365670c305c38f458e30a7c0ab45ee9abd9a8dc03bae1860f965ffced879cb2e5d0bb156821020000000153ffffffff025dc619050000000002ac51ec0d250100000000076a5200636a6363333aecd8", "650053ac515100ab", 1, 1812404608, "a7aa34bf8a5644f03c6dd8801f9b15ba2e07e07256dbf1e02dad59f0d3e17ea9"],
-	["fd3e267203ae7d6d3975e738ca84f12540229bb237dd228d5f688e9d5ba53fce4302b0334d01000000026353ffffffff602a3ab75af7aa951d93093e345ef0037a2863f3f580a9b1a575fffe68e677450300000000239e476d1e8f81e8b6313880d8a49b27c1b00af467f29756e76f675f084a5676539636ab030000000765ab6351acac52d9217747044d773204000000000752ac51526353acc33e45050000000005516500005115d889040000000004ab5163510cbbbd0200000000016500000000", "65ac526aac6a53ab52", 2, -886179388, "bc46f3f83058ddf5bebd9e1f2c117a673847c4dc5e31cfb24bac91adf30877cf"],
-	["f380ae23033646af5dfc186f6599098015139e961919aea28502ea2d69474413d94a555ea2000000000853635265abacac5314da394b99b07733341ddba9e86022637be3b76492992fb0f58f23c915098979250a96620300000003ab6300ffffffff4bb6d1c0a0d84eac7f770d3ad0fdc5369ae42a21bbe4c06e0b5060d5990776220300000000ffffffff0486fd70020000000007ac6500635252acf3fd72010000000005656a6a6551212de90500000000096365006a63635153000fa33100000000000600535151656300000000", "ab52", 2, -740890152, "f804fc4d81f039009ed1f2cccb5c91da797543f235ac71b214c20e763a6d86d7"],
-	["5c45d09801bb4d8e7679d857b86b97697472d514f8b76d862460e7421e8617b15a2df217c6010000000863acacab6565006affffffff01156dbc03000000000952ac63516551ac6aac00000000", "6aabac", 0, 1310125891, "270445ab77258ced2e5e22a6d0d8c36ac7c30fff9beefa4b3e981867b03fa0ad"],
-	["4ecc6bde030ca0f83c0ed3d4b777f94c0c88708c6c933fe1df6874f296d425cac95355c23d0000000006ac6a51536a52f286a0969d6170e20f2a8000193807f5bc556770e9d82341ef8e17b0035eace89c76edd50200000007ac65525100656affffffff5bade6e462fac1927f078d69d3a981f5b4c1e59311a38efcb9a910aa436afaa80000000007ac6a006352ab52ffffffff0331e58902000000000763ac53636352abb8b3ca000000000001637a1d26040000000009535263ac6a5352ab655ae34a39", "6a65ab", 2, 2142728517, "4a3415eb1677ae4e0c939644a4cfd5dc6299780b55cd0dc735967057b6b1526a"],
-	["a59484b501eb50114be0fc79e72ab9bc9f4a5f7acdf274a56d6b68684eb68cf8b07ec5d1c2000000000765abab00ab00639e09aa940141e3530200000000046500ac6500000000", "00516565ab", 0, -1561622405, "d60bbadd2cc0674100baa08d0e0493ee4248f0304b3eb778da942041f503a896"],
-	["53dc1a88046531c7b57a35f4d9adf101d068bf8d63fbbedaf4741dba8bc5e92c8725def571030000000453655251fcdf116a226b3ec240739c4c7493800e4edfe67275234e371a227721eac43d3d9ecaf1b50300000003ac0052ffffffff2c9279ffeea4718d167e9499bd067600715c14484e373ef93ae4a31d2f5671ab0000000009516553ac636a6a65001977752eeba95a8f16b88c571a459c2f2a204e23d48cc7090e4f4cc35846ca7fc0a455ce00000000055165ac0063188143f80205972902000000000765ac63ac516353c7b6a50000000000036a510000000000", "655351536a", 0, 103806788, "b276584d3514e5b4e058167c41dc02915b9d97f6795936a51f40e894ed8508bc"],
-	["53f8959f01ddb36afdcd20167edcbb75a63d18654fdcf10bc0004c761ab450fe236d79cb2702000000065151650063653435003a033a5e34050000000009ac52516a630000516ab86db3030000000002006344ac090500000000046363ab00f3644537", "5263abab63ac656353", 0, -218513553, "f1f2a489682e42a6fc20025dfc89584d17f150b2d7ae3ddedd2bf43d5e24f37f"],
-	["5a06cb4602dcfc85f49b8d14513f33c48f67146f2ee44959bbca092788e6823b2719f3160b0200000001ab3c013f2518035b9ea635f9a1c74ec1a3fb7496a160f46aae2e09bfc5cd5111a0f20969e003000000015158c89ab7049f20d6010000000008ac6a52abac53515349765e00000000000300ab638292630100000000045351ab0086da09010000000006656a6365525300000000", "526a63", 1, 1502936586, "bdfaff8a4e775379c5dc26e024968efa805f923de53fa8272dd53ec582afa0c5"],
-	["ca9d84fa0129011e1bf27d7cb71819650b59fb292b053d625c6f02b0339249b498ff7fd4b601000000025352ffffffff032173a0040000000008525253abab5152639473bb030000000009005153526a53535151d085bd0000000000086a5365ab5165655300000000", "005152ac51", 0, 580353445, "c629d93b02037f40aa110e46d903edb34107f64806aa0c418d435926feef68b8"],
-	["e3cdbfb4014d90ae6a4401e85f7ac717adc2c035858bf6ff48979dd399d155bce1f150daea0300000002ac51a67a0d39017f6c71040000000005535200535200000000", "", 0, -1899950911, "c1c7df8206e661d593f6455db1d61a364a249407f88e99ecad05346e495b38d7"],
-	["b2b6b9ab0283d9d73eeae3d847f41439cd88279c166aa805e44f8243adeb3b09e584efb1df00000000026300ffffffff7dfe653bd67ca094f8dab51007c6adaced09de2af745e175b9714ca1f5c68d050000000003ac6500aa8e596903fd3f3204000000000553ac6a6a533a2e210500000000075253acabab526392d0ee020000000008520065635200ab5200000000", "65acacac65005365", 0, 28298553, "39c2aaa2496212b3ab120ab7d7f37c5e852bfe38d20f5226413a2268663eeae8"],
-	["f30c5c3d01a6edb9e10fafaf7e85db14e7fec558b9dca4a80b05d7c3a2944d282c5018f4680200000003005263ffffffff04aac3530300000000026551bc2419010000000009005163acab6a5100658e7085050000000000c5e4ec050000000007656a6a635365ab2d8e8882", "abac53ab005251ac52", 0, -490287546, "877e347ec7487497769e2581142276d1a8d813b652e4483cf9cc993d16354417"],
-	["4314339e01de40faabcb1b970245a7f19eedbc17c507dac86cf986c2973715035cf95736ae0200000007abababababab65bde67b900151510b04000000000853ac00655200535300000000", "52", 0, 399070095, "47585dc25469d04ff3a60939d0a03779e3e81a411bf0ca18b91bb925ebd30718"],
-	["2d4cf4e9031b3e175b2ff18cd933151379d9cfac4713d8bd0e63b70bd4a92277aa7af901ab000000000565515353abffffffff557666c7f3be9cdecdad44c3df206eb63a2da4ed1f159d21193882a9f0340081020000000963ab53ab5252ac63abffffffff8a8c897bdb87e93886aad5ded9d82a13101d5476554386373646ca5e23612e450300000009006a526552abab6a635ac03fc00198bb02040000000009525100526a6563636a1d052834", "ab52ac00acac6a", 0, -1469882480, "09ed6563a454814ab7e3b4c28d56d8751162b77df1825b37ba66c6147750b2a3"],
-	["f063171b03e1830fdc1d685a30a377537363ccafdc68b42bf2e3acb908dac61ee24b37595c020000000765ac5100ab6aacf447bc8e037b89d6cadd62d960cc442d5ced901d188867b5122b42a862929ce45e7b628d010000000253aba009a1ba42b00f1490b0b857052820976c675f335491cda838fb7934d5eea0257684a2a202000000001e83cf2401a7f777030000000008ab6553526a53526a00000000", "", 2, 1984790332, "c19caada8e71535e29a86fa29cfd9b74a0c7412003fc722a121005e461e01636"],
-	["cf7bdc250249e22cbe23baf6b648328d31773ea0e771b3b76a48b4748d7fbd390e88a004d30000000003ac536a4ab8cce0e097136c90b2037f231b7fde2063017facd40ed4e5896da7ad00e9c71dd70ae600000000096a0063516352525365ffffffff01b71e3e00000000000300536a00000000", "", 1, 546970113, "6a815ba155270af102322c882f26d22da11c5330a751f520807936b320b9af5d"],
-	["ac7a125a0269d35f5dbdab9948c48674616e7507413cd10e1acebeaf85b369cd8c88301b7c030000000963656aac6a530053abffffffffed94c39a582e1a46ce4c6bffda2ccdb16cda485f3a0d94b06206066da12aecfe010000000752abab63536363ef71dcfb02ee07fa0400000000016a6908c802000000000751656a6551abac688c2c2d", "6a6351526551", 0, 858400684, "552ff97d7924f51cda6d1b94be53483153ef725cc0a3a107adbef220c753f9a6"],
-	["3a1f454a03a4591e46cf1f7605a3a130b631bf4dfd81bd2443dc4fac1e0a224e74112884fe0000000005516aac6a53a87e78b55548601ffc941f91d75eab263aa79cd498c88c37fdf275a64feff89fc1710efe03000000016a39d7ef6f2a52c00378b4f8f8301853b61c54792c0f1c4e2cd18a08cb97a7668caa008d970200000002656affffffff017642b20100000000096a63535253abac6a6528271998", "51", 2, 1459585400, "e9a7f21fc2d38be7be47095fbc8f1bf8923660aa4d71df6d797ae0ba5ca4d5b0"],
-	["f59366cc0114c2a18e6bd1347ed9470f2522284e9e835dd5c5f7ef243639ebea95d9b232b6020000000153474b62eb045c00170500000000096352ab516352ab5200038a520400000000086aab5253656a63005b968904000000000963536353ac0053635387106002000000000000000000", "ab52526300ab51", 0, 1834116153, "cdf51f6e3a9dc2be5a59ea4c00f5aac1e1426a5202c325e6cf2567d07d8d8de4"],
-	["6269e0fa0173e76e89657ca495913f1b86af5b8f1c1586bcd6c960aede9bc759718dfd5044000000000352ac530e2c7bd90219849b000000000007ab00ab6a53006319f281000000000007ab00515165ac5200000000", "6a", 0, -2039568300, "62094f98234a05bf1b9c7078c5275ed085656856fb5bdfd1b48090e86b53dd85"],
-	["eb2bc00604815b9ced1c604960d54beea4a3a74b5c0035d4a8b6bfec5d0c9108f143c0e99a0000000000ffffffff22645b6e8da5f11d90e5130fd0a0df8cf79829b2647957471d881c2372c527d8010000000263acffffffff1179dbaf17404109f706ae27ad7ba61e860346f63f0c81cb235d2b05d14f2c1003000000025300264cb23aaffdc4d6fa8ec0bb94eff3a2e50a83418a8e9473a16aaa4ef8b855625ed77ef40100000003ac51acf8414ad404dd328901000000000652526500006ab6261c000000000002526a72a4c9020000000006ac526500656586d2e7000000000006656aac00ac5279cd8908", "51", 1, -399279379, "d37532e7b2b8e7db5c7c534197600397ebcc15a750e3af07a3e2d2e4f84b024f"],
-	["dc9fe6a8038b84209bbdae5d848e8c040433237f415437592907aa798bf30d9dbbddf0ff85010000000153ffffffff23269a7ea29fcf788db483b8d4c4b35669e582608644259e950ce152b0fa6e050000000003acababffffffff65de94857897ae9ea3aa0b938ba6e5adf374d48469922d2b36dbb83d3b8c8261010000000452ac5200ffffffff02856e9b0300000000026a51980c8e02000000000365ab63d2648db4", "00ab0051ac526565", 2, 1562581941, "5cef9d8e18a2d5a70448f17b465d411a19dab78f0ddf1672ffd518b188f52433"],
-	["eba8b0de04ac276293c272d0d3636e81400b1aaa60db5f11561480592f99e6f6fa13ad387002000000070053acab536563bebb23d66fd17d98271b182019864a90e60a54f5a615e40b643a54f8408fa8512cfac927030000000963ac6a6aabac65ababffffffff890a72192bc01255058314f376bab1dc72b5fea104c154a15d6faee75dfa5dba020000000100592b3559b0085387ac7575c05b29b1f35d9a2c26a0c27903cc0f43e7e6e37d5a60d8305a030000000252abffffffff0126518f05000000000000000000", "005300635252635351", 1, 664344756, "26dc2cba4bd5334e5c0b3a520b44cc1640c6b923d10e576062f1197171724097"],
-	["91bd040802c92f6fe97411b159df2cd60fb9571764b001f31657f2d616964637605875c2a901000000055263006a65ffffffff3651df372645f50cf4e32fdf6e61c766e912e16335db2b40c5d52fe89eefe7cd00000000040065ab65ffffffff03ca8625030000000009ab51ac63530052ab52c6bf14020000000006ab00ab52005167d270000000000007ab53525351636a00000000", "5151ab63005252ac", 1, 1983087664, "3e5aa0200248d8d86ede3b315ca1b857018b89184a4bd023bd88ab12e499f6e1"],
-	["185cda1a01ecf7a8a8c28466725b60431545fc7a3367ab68e34d486e8ea85ee3128e0d8384000000000465ac63abec88b7bb031c56eb04000000000965636a51005252006a7c78d5040000000007acac63abac51ac3024a40500000000086300526a51abac51464c0e8c", "0065535265515352", 0, 1594558917, "b5280b9610c0625a65b36a8c2402a95019a7bbb9dd3de77f7c3cb1d82c3263ba"],
-	["a9531f07034091668b65fea8b1a79700d586ac9e2f42ca0455a26abe41f9e1805d009a0f5702000000096365516365ac5263ab3619bac643a9e28ee47855118cf80c3a74531cdf198835d206d0fe41804e325a4f9f105e03000000016a58e3ab0d46375d98994daf0fa7c600d2bb4669e726fca0e3a3f21ea0d9e777396740328f0100000008636a5363ab526a538d3ea7700304cb66030000000007515163ab52ab510184030500000000085353636565ac0051d9cff402000000000751ab52ab5352abf0e36254", "ab5353ac5365acab", 2, 1633101834, "04c9ef72f33668ca449c0415becf62cc0b8e0c75f9c8813852d42a58acf107c8"],
-	["6b5ecc7903fe0ba37ea551df92a59e12bad0a3065846ba69179a8f4a741a2b4fcf679aac810200000004535263529a3d343293b99ab425e7ef8529549d84f480bcd92472bab972ea380a302128ae14dfcd0200000000025163ffffffff24636e4545cab9bf87009119b7fc3ec4d5ee9e206b90f35d1df8a563b6cd097a010000000852abac53005153abc64467860406e832020000000009526300006a53ac6352ac1395010000000002ac53b117f300000000000863655351acab00651edf02030000000008ab51ac6353535252628ef71d", "ab63ab6a52ac526563", 2, -1559697626, "8f07ece7d65e509f1e0780584ef8d271c1c61a13b10335d5faafc7afc8b5b8ec"],
-	["92c9fb780138abc472e589d5b59489303f234acc838ca66ffcdf0164517a8679bb622a4267020000000153468e373d04de03fa020000000009ac006a5265ab5163006af649050000000007515153006a00658ceb59030000000001ac36afa0020000000009ab53006351ab51000000000000", "6a", 0, 2059357502, "e2358dfb51831ee81d7b0bc602a65287d6cd2dbfacf55106e2bf597e22a4b573"],
-	["6f62138301436f33a00b84a26a0457ccbfc0f82403288b9cbae39986b34357cb2ff9b889b302000000045253655335a7ff6701bac9960400000000086552ab656352635200000000", "6aac51", 0, 1444414211, "502a2435fd02898d2ff3ab08a3c19078414b32ec9b73d64a944834efc9dae10c"],
-	["9981143a040a88c2484ac3abe053849e72d04862120f424f373753161997dd40505dcb4783030000000700536365536565a2e10da3f4b1c1ad049d97b33f0ae0ea48c5d7c30cc8810e144ad93be97789706a5ead180100000003636a00ffffffffbdcbac84c4bcc87f03d0ad83fbe13b369d7e42ddb3aecf40870a37e814ad8bb5010000000963536a5100636a53abffffffff883609905a80e34202101544f69b58a0b4576fb7391e12a769f890eef90ffb72020000000651656352526affffffff04243660000000000004ab5352534a9ce001000000000863656363ab6a53652df19d030000000003ac65acedc51700000000000000000000", "ac6300acac", 2, 293672388, "7ba99b289c04718a7283f150d831175ed6303081e191a0608ea81f78926c5bdf"],
-	["a2bb630b01989bc5d643f2da4fb9b55c0cdf846ba06d1dbe372893024dbbe5b9b8a1900af802000000055265ac63aca7a68d2f04916c74010000000003abac007077f0040000000001007d4127010000000005ac516aac000f31e8030000000000571079c9", "65ab0051ac", 0, -1103627693, "92d53b4390262e6b288e8a32e0cfc36cd5adfdfabfe96c7bfd4a19d65e233761"],
-	["49f7d0b6037bba276e910ad3cd74966c7b3bc197ffbcfefd6108d6587006947e97789835ea0300000008526a52006a650053ffffffff8d7b6c07cd10f4c4010eac7946f61aff7fb5f3920bdf3467e939e58a1d4100ab03000000076aac63ac535351ffffffff8f48c3ba2d52ad67fbcdc90d8778f3c8a3894e3c35b9730562d7176b81af23c80100000003ab5265ffffffff0301e3ef0300000000046a525353e899ac0500000000075153ab6a65abac259bea0400000000007b739972", "53516aacac6aac", 1, 955403557, "5d366a7f4346ae18aeb7c9fc4dab5af71173184aa20ed22fcb4ea8511ad25449"],
-	["58a4fed801fbd8d92db9dfcb2e26b6ff10b120204243fee954d7dcb3b4b9b53380e7bb8fb60100000003006351ffffffff02a0795b050000000006536351ac6aac2718d00200000000075151acabac515354d21ba1", "005363515351", 0, -1322430665, "bbee941bbad950424bf40e3623457db47f60ed29deaa43c99dec702317cb3326"],
-	["32765a0b02e455793d9ce530e9f6a44bcbc612e893a875b5da61d822dc56d8245166c398b403000000085353abac6300006a6bdee2a78d0d0b6a5ea666eed70b9bfea99d1d612ba3878f615c4da10d4a521cba27155002000000035363abffffffff043cd42401000000000551656a53653685320100000000030000511881bc0500000000065165abab636a20169f010000000007acab656aac63acdb0706a8", "65ac53ab53", 0, 1936499176, "5c5a9c3a5de7dc7a82bc171c9d3505913b8bcc450bc8b2d11772c1a1d781210b"],
-	["17fad0d303da0d764fedf9f2887a91ea625331b28704940f41e39adf3903d8e75683ef6d46020000000151ffffffffff376eea4e880bcf0f03d33999104aafed2b3daf4907950bb06496af6b51720a020000000900636a63525253525196521684f3b08497bad2c660b00b43a6a517edc58217876eb5e478aa3b5fda0f29ee1bea00000000046aacab6affffffff03dde8e2050000000007ac5365ac51516a14772e000000000005630000abacbbb360010000000006ab5251ab656a50f180f0", "0053", 0, -1043701251, "a3bdf8771c8990971bff9b4e7d59b7829b067ed0b8d3ac1ec203429811384668"],
-	["236c32850300045e292c84ede2b9ab5733ba08315a2bb09ab234c4b4e8894808edbdac0d3b020000000653635363abacffffffffd3f696bb31fdd18a72f3fc2bb9ae54b416a253fc37c1a0f0180b52d35bad49440100000004650053abffffffffa85c75a2406d82a93b12e555b66641c1896a4e83ae41ef1038218311e38ace060200000006abab006a51ac104b5e6701e2842c04000000000800630051ac0000ab00000000", "ab63ac6a516a", 1, -1709887524, "8c29ea8ef60c5a927fccdba8ea385db6b6b84d98e891db45f5d4ee3148d3f5a7"],
-	["b78d5fd601345f3100af494cdf447e7d4076179f940035b0ebe8962587d4d0c9c6c9fc34ee0300000003516a6affffffff03dc5c890100000000085353ac53ac6a52534ac941040000000007ac63656a51ab51d4266b0100000000036aacac70731f2d", "005351ab0053", 0, -1789071265, "d5f1c1cb35956a5711d67bfb4cedbc67e77c089b912d688ad440ff735adb390d"],
-	["5a2257df03554550b774e677f348939b37f8e765a212e566ce6b60b4ea8fed4c9504b7f7d1000000000653655265ab5258b67bb931df15b041177cf9599b0604160b79e30f3d7a594e7826bae2c29700f6d8f8f40300000005515300ac6a159cf8808a41f504eb5c2e0e8a9279f3801a5b5d7bc6a70515fbf1c5edc875bb4c9ffac500000000050063510052ffffffff0422a90105000000000965006a650000516a006417d2020000000006526363ab00524d969d0100000000035153acc4f077040000000005ac5200636500000000", "6a52", 1, -1482463464, "37b794b05d0687c9b93d5917ab068f6b2f0e38406ff04e7154d104fc1fb14cdc"],
-	["e0032ad601269154b3fa72d3888a3151da0aed32fb2e1a15b3ae7bee57c3ddcffff76a1321010000000100110d93ae03f5bd080100000000075263516a6551002871e60100000000046a005252eaa753040000000004ab6aab526e325c71", "630052", 0, -1857873018, "ea117348e94de86381bb8ad1c7f93b8c623f0272104341701bb54e6cb433596c"],
-	["014b2a5304d46764817aca180dca50f5ab25f2e0d5749f21bb74a2f8bf6b8b7b3fa8189cb7030000000965ac5165ab6a51ac6360ecd91e8abc7e700a4c36c1a708a494c94bb20cbe695c408543146566ab22be43beae9103000000045163ab00ffffffffffa48066012829629a9ec06ccd4905a05df0e2b745b966f6a269c9c8e13451fc00000000026565ffffffffc40ccadc21e65fe8a4b1e072f4994738ccaf4881ae6fede2a2844d7da4d199ab02000000065152ab536aabffffffff01b6e054030000000004515352ab3e063432", "", 0, 1056459916, "a7aff48f3b8aeb7a4bfe2e6017c80a84168487a69b69e46681e0d0d8e63a84b6"],
-	["c4ef04c103c5dde65410fced19bf6a569549ecf01ceb0db4867db11f2a3a3eef0320c9e8e001000000085100536a53516aabffffffff2a0354fa5bd96f1e28835ffe30f52e19bd7d5150c687d255021a6bec03cf4cfd03000000056a006300514900c5b01d3d4ae1b97370ff1155b9dd0510e198d266c356d6168109c54c11b4c283dca00300000002ababffffffff02e19e3003000000000451655351fa5c0003000000000163ef1fc64b", "51636a51ab630065", 1, -1754709177, "0a281172d306b6a32e166e6fb2a2cc52c505c5d60ea448e9ba7029aa0a2211e1"],
-	["29083fe00398bd2bb76ceb178f22c51b49b5c029336a51357442ed1bac35b67e1ae6fdf13100000000066a6500acab51ffffffffe4ca45c9dc84fd2c9c47c7281575c2ba4bf33b0b45c7eca8a2a483f9e3ebe4b3010000000200abffffffffdf47ad2b8c263fafb1e3908158b18146357c3a6e0832f718cd464518a219d18303000000096352ac656351ac0052daddfb3b0231c36f00000000000400526a5275c7e0020000000001ab00000000", "acab536aac52", 2, 300802386, "82ebc07b16cff0077e9c1a279373185b3494e39d08fd3194aae6a4a019377509"],
-	["1201ab5d04f89f07c0077abd009762e59db4bb0d86048383ba9e1dad2c9c2ad96ef660e6d00200000007ab6a65ac5200652466fa5143ab13d55886b6cdc3d0f226f47ec1c3020c1c6e32602cd3428aceab544ef43e00000000086a6a6a526a6a5263ffffffffd5be0b0be13ab75001243749c839d779716f46687e2e9978bd6c9e2fe457ee48020000000365abab1e1bac0f72005cf638f71a3df2e3bbc0fa35bf00f32d9c7dc9c39a5e8909f7d53170c8ae0200000008ab6a51516363516affffffff02f0a6210500000000036300ac867356010000000009acab65ac6353536a659356d367", "ac53535252", 0, 917543338, "418acc156c2bc76a5d7baa58db29f1b4cf6c266c9222ed167ef5b4d47f0e0f41"],
-	["344fa11e01c19c4dd232c77742f0dd0aeb3695f18f76da627628741d0ee362b0ea1fb3a2180200000007635151005100529bab25af01937c1f0500000000055153ab53656e7630af", "6351005163ac51", 0, -629732125, "228ca52a0a376fe0527a61cfa8da6d7baf87486bba92d49dfd3899cac8a1034f"],
-	["b2fda1950191358a2b855f5626a0ebc830ab625bea7480f09f9cd3b388102e35c0f303124c030000000565ac65ab53ffffffff03f9c5ec04000000000765ab51516551650e2b9f0500000000045365525284e8f6040000000001ac00000000", "ac51655253", 0, 1433027632, "d2fa7e13c34cecda5105156bd2424c9b84ee0a07162642b0706f83243ff811a8"],
-	["a4a6bbd201aa5d882957ac94f2c74d4747ae32d69fdc765add4acc2b68abd1bdb8ee333d6e0300000008516a6552515152abffffffff02c353cb040000000007ac6351ab51536588bd320500000000066552525253ac00000000", "", 0, 1702060459, "499da7d74032388f820645191ac3c8d20f9dba8e8ded7fa3a5401ea2942392a1"],
-	["584e8d6c035a6b2f9dac2791b980a485994bf38e876d9dda9b77ad156eee02fa39e19224a60300000003ab636529db326cc8686a339b79ab6b6e82794a18e0aabc19d9ad13f31dee9d7aad8eff38288588020000000452530052ffffffff09a41f07755c16cea1c7e193c765807d18cadddca6ec1c2ed7f5dcdca99e90e80000000001acffffffff01cba62305000000000451ac63acccdf1f67", "ab536a6363", 2, -27393461, "1125645b49202dca2df2d76dae51877387903a096a9d3f66b5ac80e042c95788"],
-	["83a583d204d926f2ee587a83dd526cf1e25a44bb668e45370798f91a2907d184f7cddcbbc7030000000700ab6565536a539f71d3776300dffdfa0cdd1c3784c9a1f773e34041ca400193612341a9c42df64e3f550e01000000050052515251ffffffff52dab2034ab0648553a1bb8fc4e924b2c89ed97c18dfc8a63e248b454035564b01000000015139ab54708c7d4d2c2886290f08a5221cf69592a810fd1979d7b63d35c271961e710424fd0300000005ac65ac5251ffffffff01168f7c030000000000a85e5fb0", "6a536353656a00", 0, 179595345, "5350a31ac954a0b49931239d0ecafbf34d035a537fd0c545816b8fdc355e9961"],
-	["ffd35d51042f290108fcb6ea49a560ba0a6560f9181da7453a55dfdbdfe672dc800b39e7320200000006630065516a65f2166db2e3827f44457e86dddfd27a8af3a19074e216348daa0204717d61825f198ec0030100000006ab51abab00abffffffffdf41807adb7dff7db9f14d95fd6dc4e65f8402c002d009a3f1ddedf6f4895fc8030000000500ab006a65a5a848345052f860620abd5fcd074195548ce3bd0839fa9ad8642ed80627bf43a0d47dbd010000000765ab006a656a53b38cdd6502a186da05000000000765ab00ab006a53527c0e0100000000085365ab51acacac52534bd1b1", "6a635253ac0000", 0, 1095082149, "3c05473a816621a3613f0e903faa1a1e44891dd40862b029e41fc520776350fa"],
-	["6c9a4b98013c8f1cae1b1df9f0f2de518d0c50206a0ab871603ac682155504c0e0ce946f460100000000ffffffff04e9266305000000000753535100ac6aacded39e04000000000365ac6ab93ccd010000000002515397bf3d050000000003ab636300000000", "63520052ac656353", 0, -352633155, "936eff8cdfd771be24124da87c7b24feb48da7cbc2c25fb5ba13d1a23255d902"],
-	["e01dc7f0021dc07928906b2946ca3e9ac95f14ad4026887101e2d722c26982c27dc2b59fdb0000000005ac5200516ab5a31ffadcbe74957a5a3f97d7f1475cc6423fc6dbc4f96471bd44c70cc736e7dec0d1ea020000000951636a526a52abac53ffffffff04bc2edd05000000000252ab528c7b02000000000952ac51526500525353324820040000000002005380c713000000000009630065ab00ac525252451bbb48", "53ab65ac", 0, -552384418, "69c0b30f4c630a6c878fde6ea6b74dae94f4eb3bcfbde2dc3649e1a9ada00757"],
-	["009046a1023f266d0113556d604931374d7932b4d6a7952d08fbd9c9b87cbd83f4f4c178b4030000000452ac526346e73b438c4516c60edd5488023131f07acb5f9ea1540b3e84de92f4e3c432289781ea4900000000046500655357dfd6da02baef910100000000026a007d101703000000000800516500abacac5100000000", "6aab6553ac", 0, -802456605, "f8757fbb4448ca34e0cd41b997685b37238d331e70316659a9cc9087d116169d"],
-	["df76ec0801a3fcf3d18862c5f686b878266dd5083f16cf655facab888b4cb3123b3ce5db7e01000000010010e7ac6a0233c83803000000000365ac51faf14a040000000004ac51655100000000", "6353acab", 0, 15705861, "e7d873aa079a19ec712b269a37d2670f60d8cb334c4f97e2e3fd10eeb8ee5f5e"],
-	["828fd3e0031084051ccef9cfdd97fae4d9cc50c0dae36bd22a3ff332881f17e9756c3e288e0200000004ab535363961a2ccccaf0218ec6a16ba0c1d8b5e93cfd025c95b6e72bc629ec0a3f47da7a4c396dad01000000025353ffffffff19ad28747fb32b4caf7b5dbd9b2da5a264bedb6c86d3a4805cd294ae53a86ac40200000009ab53535351ab6551abffffffff04a41650030000000005656aab6aab8331a304000000000700516365ac516a0d2a47010000000007abac516353abacdebc19040000000006ab5300636a6300000000", "51ab52ab53ac52", 0, 1866105980, "311094b4d73e31aefc77e97859ef07ca2f07a7b7e4d7def80c69d3f5d58527e5"],
-	["c4b80f850323022205b3e1582f1ed097911a81be593471a8dce93d5c3a7bded92ef6c7c1260100000002006affffffff70294d62f37c3da7c5eae5d67dce6e1b28fedd7316d03f4f48e1829f78a88ae801000000096a5200530000516351f6b7b544f7c39189d3a2106ca58ce4130605328ce7795204be592a90acd81bef517d6f170200000000ffffffff012ab8080000000000075100006365006335454c1e", "53ac6a536aacac", 0, -1124103895, "06277201504e6bf8b8c94136fad81b6e3dadacb9d4a2c21a8e10017bfa929e0e"],
-	["8ab69ed50351b47b6e04ac05e12320984a63801716739ed7a940b3429c9c9fed44d3398ad40300000006536a516a52638171ef3a46a2adb8025a4884b453889bc457d63499971307a7e834b0e76eec69c943038a0300000000ffffffff566bb96f94904ed8d43d9d44a4a6301073cef2c011bf5a12a89bedbaa03e4724030000000265acb606affd01edea38050000000008515252516aacac6300000000", "65000000006365ac53", 0, -1338942849, "7912573937824058103cb921a59a7f910a854bf2682f4116a393a2045045a8c3"],
-	["2484991e047f1cf3cfe38eab071f915fe86ebd45d111463b315217bf9481daf0e0d10902a402000000006e71a424eb1347ffa638363604c0d5eccbc90447ff371e000bf52fc743ec832851bb564a0100000001abffffffffef7d014fad3ae7927948edbbb3afe247c1bcbe7c4c8f5d6cf97c799696412612020000000851536a5353006a001dfee0d7a0dd46ada63b925709e141863f7338f34f7aebde85d39268ae21b77c3068c01d0000000008535151ab00636563ffffffff018478070200000000095200635365ac52ab5341b08cd3", "", 3, 265623923, "24cb420a53b4f8bb477f7cbb293caabfd2fc47cc400ce37dbbab07f92d3a9575"],
-	["54839ef9026f65db30fc9cfcb71f5f84d7bb3c48731ab9d63351a1b3c7bc1e7da22bbd508e0300000000442ad138f170e446d427d1f64040016032f36d8325c3b2f7a4078766bdd8fb106e52e8d20000000003656500ffffffff02219aa101000000000851ababac52ab00659646bd02000000000552acacabac24c394a5", "ac", 0, 906807497, "69264faadcd1a581f7000570a239a0a26b82f2ad40374c5b9c1f58730514de96"],
-	["5036d7080434eb4eef93efda86b9131b0b4c6a0c421e1e5feb099a28ff9dd8477728639f77030000000951516aab535152ab5391429be9cce85d9f3d358c5605cf8c3666f034af42740e94d495e28b9aaa1001ba0c87580300000008006552ab00ab006affffffffd838978e10c0c78f1cd0a0830d6815f38cdcc631408649c32a25170099669daa0000000002acab8984227e804ad268b5b367285edcdf102d382d027789250a2c0641892b480c21bf84e3fb0100000000b518041e023d8653010000000001004040fb0100000000080051ac5200636a6300000000", "52ac", 0, 366357656, "bd0e88829afa6bdc1e192bb8b2d9d14db69298a4d81d464cbd34df0302c634c6"],
-	["9ad5ccf503fa4facf6a27b538bc910cce83c118d6dfd82f3fb1b8ae364a1aff4dcefabd38f03000000096365655263ac655300807c48130c5937190a996105a69a8eba585e0bd32fadfc57d24029cbed6446d30ebc1f100100000004000053650f0ccfca1356768df7f9210cbf078a53c72e0712736d9a7a238e0115faac0ca383f219d0010000000600ab536552002799982b0221b8280000000000000c41320000000000086552ac6365636a6595f233a3", "6a5152", 2, 553208588, "f99c29a79f1d73d2a69c59abbb5798e987639e36d4c44125d8dc78a94ddcfb13"],
-	["669538a204047214ce058aed6a07ca5ad4866c821c41ac1642c7d63ed0054f84677077a84f030000000853abacab6a655353ffffffff70c2a071c115282924e3cb678b13800c1d29b6a028b3c989a598c491bc7c76c5030000000752ac52ac5163ac80420e8a6e43d39af0163271580df6b936237f15de998e9589ec39fe717553d415ac02a4030000000463635153184ad8a5a4e69a8969f71288c331aff3c2b7d1b677d2ebafad47234840454b624bf7ac1d03000000056a63abab63df38c24a02fbc63a040000000002ab535ec3dc050000000002536500000000", "635153", 3, -190399351, "9615541884dfb1feeb08073a6a6aa73ef694bc5076e52187fdf4138a369f94d9"],
-	["a7f139e502af5894be88158853b7cbea49ba08417fbbca876ca6614b5a41432be34499987b000000000765635165abac63ffffffff8b8d70e96c7f54eb70da0229b548ced438e1ca2ba5ddd648a027f72277ee1efc0100000001abffffffff044f2c4204000000000165e93f550100000000050000526a6a94550304000000000365536aadc21c0300000000016300000000", "6aacac6363ab5265ac", 1, 2143189425, "6e3f97955490d93d6a107c18d7fe402f1cada79993bb0ff0d096357261b3a724"],
-	["3b94438f0366f9f53579a9989b86a95d134256ce271da63ca7cd16f7dd5e4bffa17d35133f010000000100ffffffff1aaad0c721e06ec00d07e61a84fb6dc840b9a968002ce7e142f943f06fd143a10100000008535151ac51ab0053b68b8e9c672daf66041332163e04db3f6048534bd718e1940b3fc3811c4eef5b7a56888b01000000001d58e38c012e38e700000000000852ab53ac6365536a00000000", "ab655352", 1, -935223304, "b3b336de141d4f071313a2207b2a0c7cf54a070dd8d234a511b7f1d13e23b0c4"],
-	["e5dca8a20456de0a67e185fa6ea94085ceae478d2c15c73cb931a500db3a1b6735dd1649ec0200000005ab536aabab32d11bbdcb81361202681df06a6b824b12b5cb40bb1a672cf9af8f2a836e4d95b7839327030000000951005365ab65abacabb345085932939eef0c724adef8a57f9e1bf5813852d957c039b6a12d9c2f201ea520fb030000000009ac5352005165acac6a5efc6072f1a421dc7dc714fc6368f6d763a5d76d0278b95fc0503b9268ccfadb48213a2500000000026a53ffffffff039ee1c4020000000009ac5353ab6353535163184018000000000005655265526a9a4a8a050000000001ac00000000", "65ab53ab6a00ab6553", 2, 1902561212, "7928ae8e86c0b0cad1b2c120ea313087437974382ee6d46443ca5ac3f5878b88"],
-	["972128b904e7b673517e96e98d80c0c8ceceae76e2f5c126d63da77ffd7893fb53308bb2da0300000006ac6552ab52acffffffff4cac767c797d297c079a93d06dc8569f016b4bf7a7d79b605c526e1d36a40e2202000000095365ab636aac6a6a6a69928d2eddc836133a690cfb72ec2d3115bf50fb3b0d10708fa5d2ebb09b4810c426a1db01000000060052526300001e8e89585da7e77b2dd2e30625887f0660accdf29e53a614d23cf698e6fc8ab03310e87700000000076a520051acac6555231ddb0330ec2d03000000000200abfaf457040000000004ab6a6352bdc42400000000000153d6dd2f04", "", 0, 209234698, "4a92fec1eb03f5bd754ee9bfd70707dc4420cc13737374f4675f48529be518e4"],
-	["1fb4085b022c6cfb848f8af7ba3ba8d21bd23ffa9f0bfd181cb68bcaaf2074e66d4974a31602000000090000006a6a6500acab6c12c07d9f3dbd2d93295c3a49e3757119767097e7fd5371f7d1ba9ba32f1a67a5a426f00000000000ffffffff018fd2fc04000000000363ac5100000000", "65ab006a6aab526a", 0, 1431502299, "8b7dd0ff12ca0d8f4dbf9abf0abba00e897c2f6fd3b92c79f5f6a534e0b33b32"],
-	["5374f0c603d727f63006078bd6c3dce48bd5d0a4b6ea00a47e5832292d86af258ea0825c260000000009655353636352526a6af2221067297d42a9f8933dfe07f61a574048ff9d3a44a3535cd8eb7de79fb7c45b6f47320200000003ac006affffffff153d917c447d367e75693c5591e0abf4c94bbdd88a98ab8ad7f75bfe69a08c470200000005ac65516365ffffffff037b5b7b000000000001515dc4d904000000000004bb26010000000004536a6aac00000000", "516552516352ac", 2, 328538756, "8bb7a0129eaf4b8fc23e911c531b9b7637a21ab11a246352c6c053ff6e93fcb6"],
-	["c441132102cc82101b6f31c1025066ab089f28108c95f18fa67db179610247086350c163bd010000000651525263ab00ffffffff9b8d56b1f16746f075249b215bdb3516cbbe190fef6292c75b1ad8a8988897c3000000000751ab6553abab00ffffffff02f9078b000000000009ab0053ac51ac00ab51c0422105000000000651006563525200000000", "ac51", 0, -197051790, "55acd8293ed0be6792150a3d7ced6c5ccd153ca7daf09cee035c1b0dac92bb96"],
-	["ab82ad3b04545bd86b3bb937eb1af304d3ef1a6d1343ed809b4346cafb79b7297c09e1648202000000086351ac5200535353ffffffff95d32795bbaaf5977a81c2128a9ec0b3c7551b9b1c3d952876fcb423b2dfb9e80000000005515363acac47a7d050ec1a603627ce6cd606b3af314fa7964abcc579d92e19c7aba00cf6c3090d6d4601000000056a516551633e794768bfe39277ebc0db18b5afb5f0c8117dde9b4dfd5697e9027210eca76a9be20d63000000000700520063ab6aacffffffff01ec2ddc050000000008ac52ac65ac65ac5100000000", "536300abab", 1, -2070209841, "b362da5634f20be7267de78b545d81773d711b82fe9310f23cd0414a8280801d"],
-	["8bff9d170419fa6d556c65fa227a185fe066efc1decf8a1c490bc5cbb9f742d68da2ab7f320100000007ab000053525365a7a43a80ab9593b9e8b6130a7849603b14b5c9397a190008d89d362250c3a2257504eb810200000007acabacac00ab51ee141be418f003e75b127fd3883dbf4e8c3f6cd05ca4afcaac52edd25dd3027ae70a62a00000000008ac52526a5200536affffffffb8058f4e1d7f220a1d1fa17e96d81dfb9a304a2de4e004250c9a576963a586ae0300000005abacac5363b9bc856c039c01d804000000000951656aac53005365acb0724e00000000000565abab63acea7c7a0000000000036a00ac00000000", "6565", 1, -1349282084, "2b822737c2affeefae13451d7c9db22ff98e06490005aba57013f6b9bbc97250"],
-	["0e1633b4041c50f656e882a53fde964e7f0c853b0ada0964fc89ae124a2b7ffc5bc97ea6230100000006ac6aacacabacffffffff2e35f4dfcad2d53ea1c8ada8041d13ea6c65880860d96a14835b025f76b1fbd9000000000351515121270867ef6bf63a91adbaf790a43465c61a096acc5a776b8e5215d4e5cd1492e611f761000000000600ac6aab5265ffffffff63b5fc39bcac83ca80ac36124abafc5caee608f9f63a12479b68473bd4bae769000000000965ac52acac5263acabffffffff0163153e020000000008ab005165ab65515300000000", "6a6aac00", 0, -968477862, "20732d5073805419f275c53784e78db45e53332ee618a9fcf60a3417a6e2ca69"],
-	["2b052c24022369e956a8d318e38780ef73b487ba6a8f674a56bdb80a9a63634c6110fb5154010000000251acffffffff48fe138fb7fdaa014d67044bc05940f4127e70c113c6744fbd13f8d51d45143e01000000005710db3804e01aa9030000000008acac6a516a5152abfd55aa01000000000751ab510000ac636d6026010000000000b97da9000000000000fddf3b53", "006552", 0, 595461670, "685d67d84755906d67a007a7d4fa311519467b9bdc6a351913246a41e082a29f"],
-	["073bc856015245f03b2ea2da62ccedc44ecb99e4250c7042f596bcb23b294c9dc92cfceb6b02000000095163abab52abab636afe292fb303b7c3f001000000000352636af3c49502000000000400ac6a535851850100000000066aac6553ab6500000000", "ab6aab53006aab52", 0, 247114317, "123916c6485cf23bfea95654a8815fbf04ce4d21a3b7f862805c241472906658"],
-	["7888b71403f6d522e414d4ca2e12786247acf3e78f1918f6d727d081a79813d129ee8befce0100000009ab516a6353ab6365abffffffff4a882791bf6400fda7a8209fb2c83c6eef51831bdf0f5dacde648859090797ec030000000153ffffffffbb08957d59fa15303b681bad19ccf670d7d913697a2f4f51584bf85fcf91f1f30200000008526565ac52ac63acffffffff0227c0e8050000000001ac361dc801000000000800515165ab00ab0000000000", "656a", 2, 1869281295, "f43378a0b7822ad672773944884e866d7a46579ee34f9afc17b20afc1f6cf197"],
-	["cc4dda57047bd0ca6806243a6a4b108f7ced43d8042a1acaa28083c9160911cf47eab910c40200000007526a0000ab6a63e4154e581fcf52567836c9a455e8b41b162a78c85906ccc1c2b2b300b4c69caaaa2ba0230300000008ab5152ac5100ab65ffffffff69696b523ed4bd41ecd4d65b4af73c9cf77edf0e066138712a8e60a04614ea1c0300000004ab6a000016c9045c7df7836e05ac4b2e397e2dd72a5708f4a8bf6d2bc36adc5af3cacefcf074b8b403000000065352ac5252acffffffff01d7e380050000000000cf4e699a", "525163656351", 1, -776533694, "ff18c5bffd086e00917c2234f880034d24e7ea2d1e1933a28973d134ca9e35d2"],
-	["b7877f82019c832707a60cf14fba44cfa254d787501fdd676bd58c744f6e951dbba0b3b77f0200000009ac515263ac53525300a5a36e500148f89c0500000000085265ac6a6a65acab00000000", "6563", 0, -1785108415, "cb6e4322955af12eb29613c70e1a00ddbb559c887ba844df0bcdebed736dffbd"],
-	["aeb14046045a28cc59f244c2347134d3434faaf980961019a084f7547218785a2bd03916f3000000000165f852e6104304955bda5fa0b75826ee176211acc4a78209816bbb4419feff984377b2352200000000003a94a5032df1e0d60390715b4b188c330e4bb7b995f07cdef11ced9d17ee0f60bb7ffc8e0100000002516513e343a5c1dc1c80cd4561e9dddad22391a2dbf9c8d2b6048e519343ca1925a9c6f0800a020000000665516365ac513180144a0290db27000000000006ab655151ab5138b187010000000007ab5363abac516a9e5cd98a", "53ac", 0, 478591320, "e8d89a302ae626898d4775d103867a8d9e81f4fd387af07212adab99946311ef"],
-	["c9270fe004c7911b791a00999d108ce42f9f1b19ec59143f7b7b04a67400888808487bd59103000000066a0052ac6565b905e76687be2dd7723b22c5e8269bc0f2000a332a289cfc40bc0d617cfe3214a61a85a30300000007ac63ac00635251560871209f21eb0268f175b8b4a06edd0b04162a974cf8b5dada43e499a1f22380d35ede0300000000792213fc58b6342cc8100079f9f5f046fb89f2d92cf0a2cb6d07304d32d9da858757037c0000000008abab51636565516affffffff02c72a8b03000000000452acac530dfb9f05000000000096f94307", "5253ab536351", 3, 543688436, "0278adbcc476d135493ae9bdcd7b3c2002df17f2d81c17d631c50c73e546c264"],
-	["57a5a04c0278c8c8e243d2df4bb716f81d41ac41e2df153e7096f5682380c4f441888d9d260300000004ab63ab6afdbe4203525dff42a7b1e628fe22bccaa5edbb34d8ab02faff198e085580ea5fcdb0c61b0000000002ac6affffffff03375e6c05000000000663ab516a6a513cb6260400000000007ca328020000000006516a636a52ab94701cc7", "0053ac5152", 0, -550925626, "b7ca991ab2e20d0158168df2d3dd842a57ab4a3b67cca8f45b07c4b7d1d11126"],
-	["072b75a504ad2550c2e9a02614bc9b2a2f50b5b553af7b87c0ef07c64ddc8d8934c96d216401000000036aabaca1387242a5bcd21099b016ad6045bed7dce603472757d9822cc5f602caa4ae20414d378b02000000026a63e4ac816734acdc969538d6f70b8ab43a2589f55e0177a4dc471bdd0eb61d59f0f46f6bb801000000065351526aab52d9f2977be76a492c3a7617b7a16dc29a3b0a7618f328c2f7d4fd9bafe760dc427a5066ef000000000465635165ffffffff02c5793600000000000165296820050000000002ac6300000000", "53006a6aac0052ab", 2, 66084636, "437e89bb6f70fd2ed2feef33350b6f6483b891305e574da03e580b3efd81ae13"],
-	["7e27c42d0279c1a05eeb9b9faedcc9be0cab6303bde351a19e5cbb26dd0d594b9d74f40d2b020000000200518c8689a08a01e862d5c4dcb294a2331912ff11c13785be7dce3092f154a005624970f84e0200000000500cf5a601e74c1f0000000000076aab52636a6a5200000000", "6500006a5351", 0, 449533391, "535ba819d74770d4d613ee19369001576f98837e18e1777b8246238ff2381dd0"],
-	["11414de403d7f6c0135a9df01cb108c1359b8d4e105be50a3dcba5e6be595c8817217490b20000000003005263ffffffff0c6becb9c3ad301c8dcd92f5cbc07c8bed7973573806d1489316fc77a829da03030000000700005253535352ffffffff2346d74ff9e12e5111aa8779a2025981850d4bf788a48de72baa2e321e4bc9ca00000000056352acab63cc585b64045e0385050000000009ab5253ab516aacac00efa9cf0300000000065200635151acbe80330400000000070063635100ab000be159050000000007525300655300ac00000000", "51656a0051ab", 0, 683137826, "d4737f3b58f3e5081b35f36f91acde89dda00a6a09d447e516b523e7a99264d5"],
-	["1c6b5f29033fc139338658237a42456123727c8430019ca25bd71c6168a9e35a2bf54538d80100000008536aac52ac6a6a52ffffffff3fb36be74036ff0c940a0247c451d923c65f826793d0ac2bb3f01ecbec8033290100000007ab000051ab6363ffffffff5d9eca0cf711685105bd060bf7a67321eaef95367acffab36ce8dedddd632ee2000000000652ac6a63ac517167319e032d26de040000000003516363dc38fb010000000000b37b00000000000006ab520051ac534baba51f", "636300ababac6563", 0, -2049129935, "3282a2ec6b8c87c9303e6060c17b421687db1bd35fbfa0345b48f2490e15b6cc"],
-	["978b9dad0214cfc7ce392d74d9dcc507350dc34007d72e4125861c63071ebf2cc0a6fd4856020000000651ac6a6aab52ffffffff47f20734e3370e733f87a6edab95a7a268ae44db7a8974e255614836b22938720200000008635265ac51516553ffffffff0137b2560100000000035252ac2f3363e9", "006aab6352", 1, 2014249801, "55611a5fb1483bce4c14c33ed15198130e788b72cd8929b2ceef4dd68b1806bf"],
-	["442f1c8703ab39876153c241ab3d69f432ba6db4732bea5002be45c8ca10c3a2356fe0e9590300000001accb2b679cab7c58a660cb6d4b3452c21cd7251a1b77a52c300f655f5baeb6fa27ff5b79880300000003005252e5ccf55712bc8ed6179f6726f8a78f3018a7a0391594b7e286ef5ee99efdcde302a102cc0200000009006352526351536a63ffffffff04443f63030000000006536a63ab63651405fb020000000009ac535351525300ab6a9f172b000000000004ab535263ad5c50050000000008656a65ab630000ac00000000", "65636aab006552", 2, 2125838294, "b3ff10f21e71ebc8b25fe058c4074c42f08617e0dcc03f9e75d20539d3242644"],
-	["2b3470dd028083910117f86614cdcfb459ee56d876572510be4df24c72e8f58c70d5f5948b03000000066aab65635265da2c3aac9d42c9baafd4b655c2f3efc181784d8cba5418e053482132ee798408ba43ccf90300000000ffffffff047dda4703000000000765516a52ac53009384a603000000000651636a63ab6a8cf57a03000000000352ab6a8cf6a405000000000952636a6a6565525100661e09cb", "ac520063ac6a6a52", 1, 1405647183, "9b360c3310d55c845ef537125662b9fe56840c72136891274e9fedfef56f9bb5"],
-	["d74282b501be95d3c19a5d9da3d49c8a88a7049c573f3788f2c42fc6fa594f59715560b9b00000000009655353525265ac52ac9772121f028f8303030000000003510065af5f47040000000007ac516a6551630000000000", "acab53006363ac", 0, -1113209770, "2f482b97178f17286f693796a756f4d7bd2dfcdbecd4142528eec1c7a3e5101a"],
-	["3a5644a9010f199f253f858d65782d3caec0ac64c3262b56893022b9796086275c9d4d097b02000000009d168f7603a67b30050000000007ac51536a0053acd9d88a050000000007655363535263ab3cf1f403000000000352ac6a00000000", "005363536565acac6a", 0, -1383947195, "6390ab0963cf611e0cea35a71dc958b494b084e6fd71d22217fdc5524787ade6"],
-	["67b3cc43049d13007485a8133b90d94648bcf30e83ba174f5486ab42c9107c69c5530c5e1f0000000003005100ffffffff9870ebb65c14263282ea8d41e4f4f40df16b565c2cf86f1d22a9494cad03a67f01000000016a5a121bee5e359da548e808ae1ad6dfccae7c67cbb8898d811638a1f455a671e822f228ef030000000151c1fcc9f9825f27c0dde27ea709da62a80a2ff9f6b1b86a5874c50d6c37d39ae31fb6c8a0030000000163553b8786020ca74a00000000000665635153ab5275c0760000000000020052e659b05d", "636aab6a6a", 0, -342795451, "f77c3322c97b1681c17b1eba461fa27b07e04c1534e8aaf735a49cab72c7c2e2"],
-	["bda1ff6804a3c228b7a12799a4c20917301dd501c67847d35da497533a606701ad31bf9d5e0300000001ac16a6c5d03cf516cd7364e4cbbf5aeccd62f8fd03cb6675883a0636a7daeb650423cb1291010000000500656553ac4a63c30b6a835606909c9efbae1b2597e9db020c5ecfc0642da6dc583fba4e84167539a8020000000865525353515200acffffffff990807720a5803c305b7da08a9f24b92abe343c42ac9e917a84e1f335aad785d00000000026a52ffffffff04981f20030000000001ab8c762200000000000253ab690b9605000000000151ce88b301000000000753526a6a51006500000000", "000052ac52530000", 1, -1809193140, "5299b0fb7fc16f40a5d6b337e71fcd1eb04d2600aefd22c06fe9c71fe0b0ba54"],
-	["2ead28ff0243b3ab285e5d1067f0ec8724224402b21b9cef9be962a8b0d153d401be99bbee0000000004ac635153ffffffff6985987b7c1360c9fa8406dd6e0a61141709f0d5195f946da55ed83be4e3895301000000020053ffffffff016503d20500000000085251ac6a65656a6a00000000", "51abab", 1, 1723793403, "67483ee62516be17a2431a163e96fd88a08ff2ce8634a52e42c1bc04e30f3f8a"],
-	["db4904e6026b6dd8d898f278c6428a176410d1ffbde75a4fa37cda12263108ccd4ca6137440100000007656a0000515263ffffffff1db7d5005c1c40da0ed17b74cf6b2a6ee2c33c9e0bacda76c0da2017dcac2fc70200000004abab6a53ffffffff0454cf2103000000000153463aef000000000009ab6a630065ab52636387e0ed050000000000e8d16f05000000000352ac63e4521b22", "", 1, 1027042424, "48315a95e49277ab6a2d561ee4626820b7bab919eea372b6bf4e9931ab221d04"],
-	["dca31ad10461ead74751e83d9a81dcee08db778d3d79ad9a6d079cfdb93919ac1b0b61871102000000086500525365ab51ac7f7e9aed78e1ef8d213d40a1c50145403d196019985c837ffe83836222fe3e5955e177e70100000006525152525300ffffffff5e98482883cc08a6fe946f674cca479822f0576a43bf4113de9cbf414ca628060100000006ac53516a5253ffffffff07490b0b898198ec16c23b75d606e14fa16aa3107ef9818594f72d5776805ec502000000036a0052ffffffff01932a2803000000000865ab6551ac6a516a2687aa06", "635300ac", 2, -1880362326, "74d6a2fa7866fd8b74b2e34693e2d6fd690410384b7afdcd6461b1ae71d265ce"],
-	["e14e1a9f0442ab44dfc5f6d945ad1ff8a376bc966aad5515421e96ddbe49e529614995cafc03000000055165515165fffffffff97582b8290e5a5cfeb2b0f018882dbe1b43f60b7f45e4dd21dbd3a8b0cfca3b0200000000daa267726fe075db282d694b9fee7d6216d17a8c1f00b2229085495c5dc5b260c8f8cd5d000000000363ac6affffffffaab083d22d0465471c896a438c6ac3abf4d383ae79420617a8e0ba8b9baa872b010000000963526563ac5363ababd948b5ce022113440200000000076a636552006a53229017040000000000e6f62ac8", "526353636a65", 3, -485265025, "1bc8ad76f9b7c366c5d052dc479d6a8a2015566d3a42e93ab12f727692c89d65"],
-	["720d4693025ca3d347360e219e9bc746ef8f7bc88e8795162e5e2f0b0fc99dc17116fc937100000000046353520045cb1fd79824a100d30b6946eab9b219daea2b0cdca6c86367c0c36af98f19ac64f3575002000000008a1c881003ed16f3050000000008536a63630000abac45e0e704000000000151f6551a05000000000963536565515363abab00000000", "6553ab6a6a510000ab", 1, 1249091393, "a575fa4f59a8e90cd07de012c78fe8f981183bb170b9c50fcc292b8c164cbc3b"],
-	["69df842a04c1410bfca10896467ce664cfa31c681a5dac10106b34d4b9d4d6d0dc1eac01c1000000000551536a5165269835ca4ad7268667b16d0a2df154ec81e304290d5ed69e0069b43f8c89e673328005e200000000076a5153006aacabffffffffc9314bd80b176488f3d634360fcba90c3a659e74a52e100ac91d3897072e3509010000000765abac51636363ffffffff0e0768b13f10f0fbd2fa3f68e4b4841809b3b5ba0e53987c3aaffcf09eee12bf0300000008ac535263526a53ac514f4c2402da8fab0400000000001ef15201000000000451526a52d0ec9aca", "525365ac52", 1, 313967049, "a72a760b361af41832d2c667c7488dc9702091918d11e344afc234a4aea3ec44"],
-	["adf2340d03af5c589cb5d28c06635ac07dd0757b884d4777ba85a6a7c410408ad5efa8b19001000000045100ab00ffffffff808dc0231c96e6667c04786865727013922bcb7db20739b686f0c17f5ba70e8f0300000000fd2332a654b580881a5e2bfec8313f5aa878ae94312f37441bf2d226e7fc953dcf0c77ab000000000163aa73dc580412f8c2050000000005636aacac63da02d502000000000153e74b52020000000001536b293d030000000009636552ababacab526500000000", "000052ab52ababab", 0, -568651175, "2c45d021db545df7167ac03c9ee56473f2398d9b2b739cf3ff3e074501d324f8"],
-	["e4fec9f10378a95199c1dd23c6228732c9de0d7997bf1c83918a5cfd36012476c0c3cba24002000000085165536500ac0000ad08ab93fb49d77d12a7ccdbb596bc5110876451b53a79fdce43104ff1c316ad63501de801000000046a6352ab76af9908463444aeecd32516a04dd5803e02680ed7f16307242a794024d93287595250f4000000000089807279041a82e603000000000200521429100200000000055253636a63f20b940400000000004049ed04000000000500ab5265ab43dfaf7d", "6563526aac", 2, -1923470368, "32f3c012eca9a823bebb9b282240aec40ca65df9f38da43b1dcfa0cac0c0df7e"],
-	["4000d3600100b7a3ff5b41ec8d6ccdc8b2775ad034765bad505192f05d1f55d2bc39d0cbe10100000007ab5165ac6a5163ffffffff034949150100000000026a6a92c9f6000000000008ab6553ab6aab635200e697040000000007636a5353525365237ae7d2", "52000063", 0, -880046683, "c76146f68f43037289aaeb2bacf47408cddc0fb326b350eb4f5ef6f0f8564793"],
-	["eabc0aa701fe489c0e4e6222d72b52f083166b49d63ad1410fb98caed027b6a71c02ab830c03000000075253ab63530065ffffffff01a5dc0b05000000000253533e820177", "", 0, 954499283, "1d849b92eedb9bf26bd4ced52ce9cb0595164295b0526842ab1096001fcd31b1"],
-	["d48d55d304aad0139783b44789a771539d052db565379f668def5084daba0dfd348f7dcf6b00000000006826f59e5ffba0dd0ccbac89c1e2d69a346531d7f995dea2ca6d7e6d9225d81aec257c6003000000096a655200ac656552acffffffffa188ffbd5365cae844c8e0dea6213c4d1b2407274ae287b769ab0bf293e049eb0300000005ac6a6aab51ad1c407c5b116ca8f65ed496b476183f85f072c5f8a0193a4273e2015b1cc288bf03e9e2030000000252abffffffff04076f44040000000006655353abab53be6500050000000003ac65ac3c15040500000000095100ab536353516a52ed3aba04000000000900ac53ab53636aabac00000000", "5253526563acac", 2, -1506108646, "bbee17c8582514744bab5df50012c94b0db4aff5984d2e13a8d09421674404e2"],
-	["9746f45b039bfe723258fdb6be77eb85917af808211eb9d43b15475ee0b01253d33fc3bfc502000000065163006a655312b12562dc9c54e11299210266428632a7d0ee31d04dfc7375dcad2da6e9c11947ced0e000000000009074095a5ac4df057554566dd04740c61490e1d3826000ad9d8f777a93373c8dddc4918a00000000025351ffffffff01287564030000000004636a00ab00000000", "52", 2, -1380411075, "84af1623366c4db68d81f452b86346832344734492b9c23fbb89015e516c60b2"],
-	["8731b64903d735ba16da64af537eaf487b57d73977f390baac57c7b567cb2770dfa2ef65870100000001635aedd990c42645482340eacb0bfa4a0a9e888057389c728b5b6a8691cdeb1a6a67b45e140200000008ac53526a52516551ffffffff45c4f567c47b8d999916fd49642cbc5d10d43c304b99e32d044d35091679cb860100000003006a51ffffffff0176d6c200000000000000000000", "ab6a65ab53", 2, -1221546710, "ccfdba36d9445f4451fb7cbf0752cc89c23d4fc6fff0f3930d20e116f9db0b95"],
-	["f5cfc52f016209ab1385e890c2865a74e93076595d1ca77cbe8fbf2022a2f2061a90fb0f3e010000000253acffffffff027de73f0200000000085252ac510052acac49cd6a020000000000e6c2cb56", "516552535300ab63", 0, -1195302704, "5532717402a2da01a1da912d824964024185ca7e8d4ad1748659dc393a14182b"],
-	["df0a32ae01c4672fd1abd0b2623aae0a1a8256028df57e532f9a472d1a9ceb194267b6ee190200000009536a6a51516a525251b545f9e803469a2302000000000465526500810631040000000000441f5b050000000006530051006aaceb183c76", "536a635252ac6a", 0, 1601138113, "9a0435996cc58bdba09643927fe48c1fc908d491a050abbef8daec87f323c58f"],
-	["d102d10c028b9c721abb259fe70bc68962f6cae384dabd77477c59cbeb1fb26266e091ba3e0100000002516affffffffe8d7305a74f43e30c772109849f4cd6fb867c7216e6d92e27605e69a0818899700000000026a65ecf82d58027db4620500000000026552c28ed3010000000001ab00000000", "0051ab515365", 1, -131815460, "1d1757a782cb5860302128bcbe9398243124a2f82d671a113f74f8e582c7a182"],
-	["cef930ed01c36fcb1d62ceef931bef57098f27a77a4299904cc0cbb44504802d535fb11557010000000153ffffffff02c8657403000000000863ac655253520063d593380400000000046aab536a00000000", "656a0051ab6365ab53", 0, -351313308, "e69dba3efb5c02af2ab1087d0a990678784671f4744d01ca097d71aec14dd8e9"],
-	["b1c0b71804dff30812b92eefb533ac77c4b9fdb9ab2f77120a76128d7da43ad70c20bbfb990200000002536392693e6001bc59411aebf15a3dc62a6566ec71a302141b0c730a3ecc8de5d76538b30f55010000000665535252ac514b740c6271fb9fe69fdf82bf98b459a7faa8a3b62f3af34943ad55df4881e0d93d3ce0ac0200000000c4158866eb9fb73da252102d1e64a3ce611b52e873533be43e6883137d0aaa0f63966f060000000001abffffffff04a605b604000000000851006a656a630052f49a0300000000000252515a94e1050000000009abac65ab0052abab00fd8dd002000000000651535163526a2566852d", "ac5363", 0, -1718831517, "b0dc030661783dd9939e4bf1a6dfcba809da2017e1b315a6312e5942d714cf05"],
-	["6a270ee404ebc8d137cfd4bb6b92aa3702213a3139a579c1fc6f56fbc7edd9574ef17b13f30100000009ab00ab656565ababacffffffffaa65b1ab6c6d87260d9e27a472edceb7dd212483e72d90f08857abf1dbfd46d10100000000fffffffff93c4c9c84c4dbbe8a912b99a2830cfe3401aebc919041de063d660e585fc9f002000000096aabacab52ac6a53acfa6dcef3f28355a8d98eee53839455445eeee83eecd2c854e784efa53cee699dbfecaebd0100000003ab6a51ffffffff04f7d71b050000000009ac6a536aac6a6365513c37650500000000065265abab6a53fa742002000000000039ed82030000000009516aac635165ab51ab2fdabd17", "ab535252526563", 1, -1326210506, "1dec0d5eb921bf5b2df39c8576e19c38d0c17254a4a0b78ac4b5422bcc426258"],
-	["3657e4260304ccdc19936e47bdf058d36167ee3d4eb145c52b224eff04c9eb5d1b4e434dfc0000000001ab58aefe57707c66328d3cceef2e6f56ab6b7465e587410c5f73555a513ace2b232793a74400000000036a006522e69d3a785b61ad41a635d59b3a06b2780a92173f85f8ed428491d0aaa436619baa9c4501000000046351abab2609629902eb7793050000000000a1b967040000000003525353a34d6192", "516a", 0, -1761874713, "0a2ff41f6d155d8d0e37cd9438f3b270df9f9214cda8e95c76d5a239ca189df2"],
-	["a0eb6dc402994e493c787b45d1f946d267b09c596c5edde043e620ce3d59e95b2b5b93d43002000000096a5252526aac63ab6555694287a279e29ee491c177a801cd685b8744a2eab83824255a3bcd08fc0e3ea13fb8820000000009abab6365ab52ab0063ffffffff029e424a040000000008acab53ab516a636a23830f0400000000016adf49c1f9", "ac0065ac6500005252", 1, 669294500, "e05e3d383631a7ed1b78210c13c2eb26564e5577db7ddfcea2583c7c014091d4"],
-	["6e67c0d3027701ef71082204c85ed63c700ef1400c65efb62ce3580d187fb348376a23e9710200000001655b91369d3155ba916a0bc6fe4f5d94cad461d899bb8aaac3699a755838bfc229d6828920010000000765536353526a52ffffffff04c0c792000000000005650052535372f79e000000000001527fc0ee010000000005ac5300ab65d1b3e902000000000251aba942b278", "6a5151", 0, 1741407676, "e657e2c8ec4ebc769ddd3198a83267b47d4f2a419fc737e813812acefad92ff7"],
-	["8f53639901f1d643e01fc631f632b7a16e831d846a0184cdcda289b8fa7767f0c292eb221a00000000046a53abacffffffff037a2daa01000000000553ac6a6a51eac349020000000005ac526552638421b3040000000007006a005100ac63048a1492", "ac65", 0, 1033685559, "da86c260d42a692358f46893d6f91563985d86eeb9ea9e21cd38c2d8ffcfcc4d"],
-	["491f99cb01bdfba1aa235e5538dac081fae9ce55f9622de483afe7e65105c2b0db75d360d200000000045251636340b60f0f041421330300000000096351ac000051636553ce2822040000000005516a00ac5180c8e40300000000025100caa8570400000000020000cfdc8da6", "6a5100516aab655365", 0, -953727341, "397c68803b7ce953666830b0221a5e2bcf897aa2ded8e36a6b76c497dcb1a2e1"],
-	["b3cad3a7041c2c17d90a2cd994f6c37307753fa3635e9ef05ab8b1ff121ca11239a0902e700300000009ab635300006aac5163ffffffffcec91722c7468156dce4664f3c783afef147f0e6f80739c83b5f09d5a09a57040200000004516a6552ffffffff969d1c6daf8ef53a70b7cdf1b4102fb3240055a8eaeaed2489617cd84cfd56cf020000000352ab53ffffffff46598b6579494a77b593681c33422a99559b9993d77ca2fa97833508b0c169f80200000009655300655365516351ffffffff04d7ddf800000000000853536a65ac6351ab09f3420300000000056aab65abac33589d04000000000952656a65655151acac944d6f0400000000006a8004ba", "005165", 1, 1035865506, "fe1dc9e8554deecf8f50c417c670b839cc9d650722ebaaf36572418756075d58"],
-	["e1cfd73b0125add9e9d699f5a45dca458355af175a7bd4486ebef28f1928d87864384d02df02000000036a0051ffffffff0357df030100000000036a5365777e2d04000000000763ab6a00005265f434a601000000000351655100000000", "ab53ab", 0, -1936500914, "950f4b4f72ccdf8a6a0f381265d6c8842fdb7e8b3df3e9742905f643b2432b69"],
-	["cf781855040a755f5ba85eef93837236b34a5d3daeb2dbbdcf58bb811828d806ed05754ab8010000000351ac53ffffffffda1e264727cf55c67f06ebcc56dfe7fa12ac2a994fecd0180ce09ee15c480f7d00000000096351516a51acac00ab53dd49ff9f334befd6d6f87f1a832cddfd826a90b78fd8cf19a52cb8287788af94e939d6020000000700525251ac526310d54a7e8900ed633f0f6f0841145aae7ee0cbbb1e2a0cae724ee4558dbabfdc58ba6855010000000552536a53abfd1b101102c51f910500000000096300656a525252656a300bee010000000009ac52005263635151abe19235c9", "53005365", 2, 1422854188, "d5981bd4467817c1330da72ddb8760d6c2556cd809264b2d85e6d274609fc3a3"],
-	["fea256ce01272d125e577c0a09570a71366898280dda279b021000db1325f27edda41a53460100000002ab53c752c21c013c2b3a01000000000000000000", "65", 0, 1145543262, "076b9f844f6ae429de228a2c337c704df1652c292b6c6494882190638dad9efd"]
+	["01000000031ae5cc19e89d6dd4ad74c1834493beeeea6667b84c4b63af6fa5765a4d667435030000000865650051006a0000ffffffff11c135969c8669e14b5de28bc6238b4de36191f6a2e12b8f797f8e276252b80f01000000065365ac0063abffffffffdac1320545cc27ba824a46fd12766bdf98d28f8477da3e7f4366ee57eea594520000000001acffffffff04128e57030000000005656a65515291202f0000000000095365ac53ab655353abaf128c0100000000045353630067bd130200000000066551ab51acab5d76c7b2", "5352516a630063", 1, 255808092, "a4a11ca528ed65641da26615ccc24f029a08b4892f5d7e7caad67fe5251ce82f"],
+	["0100000002e4cf7820299a68d5e4793062545b337d5a13bce85002ae05da8df465e31b9f38020000000453ab0052ffffffff13a640a6be619172a700f9e3bdf3336a9567d73abe48ea42625acc522cf040510000000004536a6363d92a432f04727c030000000000066351ac51516386a698020000000000dba992050000000006ab535165ab53e164540100000000045263ab63de3cafca", "63", 0, 485693280, "6378619d387e8791d32265c3b05404387a7566416e363f957041840227696429"],
+	["010000000285f5d8f90446c86ded6434e368828407eb213615bebcd19eb36c5a6251a68080000000000800005152ac006363db86db8454d25766624c84c4f9c5a0b873340d7bf88f2d6ce30a385fc53f584ee120e30002000000066a535363ac52ffffffff044b72fb030000000003656553bed490020000000004525151521b47d4030000000003516353b74dba0200000000036551536482dadb", "6a6a53ab", 0, -848231796, "e6b85d8a4d47931b1d3bf444b8ca08c616660fde5a94b6c396724215f1d8810d"],
+	["020000000464956c3b0df42c438cd5f12adac2e6f70cca6eca2c26181b1ae9aeddff9bef5e02000000026aab9494ca2b19f2a95d2306151ab2f7956bc1c1cb46d23b7f314a0b8269b9ea83e1ca9edbe3030000000563655200513905ba8482534dbb1c697795a8d8485b26eedb782152ed4ed6c362cd2d902fb253b78bef0300000009abab51ab65516aac51ffffffffb4eb69f4cf8ca5b90b6ddd3d7f7dbf08b2fbd3c3914817d8022c5ef59d4f67b20200000001acffffffff037d6bfb0100000000056300636a5343a26504000000000452006352dd476f02000000000663536352515200000000", "", 2, 204214603, "354f1e4a4cd87ba48686fa166310091082df8f397658222745453c33d9d72453"],
+	["010000000327182385038a109c50b7e72047afb93769ec8394c67c7736d8e97d9c2240d0230200000005acababac65ffffffff3b49b9cedea06af3f179d709ee73f1ad4cf917cc36dac18fcbff5bd75a6b2e45000000000600656500ababffffffff6f332918185395cb71a973e5e74b52c99f0871c0a8a05ed702a6d09c471b4b110100000005acab635100ffffffff01f0705b05000000000553ab005251d1b29ed5", "", 1, -781135472, "c7974a8e181004694be2ef1f2d52c2d356d21242544c90d66e9090d1700b0cc7"],
+	["0100000002fad0a97aa3e233de162f07acf98ac71bcb862c4f829067d1272faaa5b83649a5010000000451ab0065c12e514a5f1c968a6243d106469d492e5d5466e7180808d72d55a91c7c6e28abf10ebb3e02000000076a53ac63515200ffffffff045d8e46040000000001ab5cf3a50300000000026a52d824b3000000000001accb0ee101000000000000000000", "5165", 0, -879957748, "832e824b845eee26e854cb0f37ebc8b7e4bea0ae196c820e5492bcb2c67227ea"],
+	["0100000002450b334082036ad5f896842b69fe667355ed12d845bfd78cd69f171b6f6aa4640100000004ac5163653d3a04aff99f3163f3abf97e1fd6bed6cb4da83863849fa29ab2847742ee21c3f0f2b0ba0000000002abab745d164301c75a5b0000000000030065ab00000000", "ab6a5253", 0, 1412217334, "37965267c6c3f0f7e7336cda4211cb2fe2fe451ec5c567814bc7e9d4622e3d70"],
+	["010000000266fdefd27f8471414b56d9409e9d63dda20e4c50261cc7e723d0b9a9e39fd70303000000045163516affffffffb019a898d96930fa052533e32f11e53d1c6288190002f9c6b97dc256137c94fb02000000096a6a5152ab516552ab01e370ed041593bb05000000000863ac0052ac005163f5bc0204000000000963ac5100ac52acac009604f405000000000952ac63ac5152000051a58eb6000000000006006a6a00636500000000", "630065ab", 1, -1959689869, "b1d880a93505565a8f06753b27ba536929b2909bf3d721d19f3210d77373cb84"],
+	["0200000003991f574c18a8ddf5510a9543e01c5e60a67e11dd3a881b57eee638f4c3ed3a6202000000076363abab6363acffffffff54726f5c2fac2979114b20f04691eec50208a0ea1f2c984e4df32b4ca5f6625802000000080051acac65635252fbc01868001b6734f4b360d0242caf952e402cde9bbe2521faa97c8bce685cbccc398dbd030000000163ffffffff0358c028030000000001ab73ea1a050000000000c987d80500000000040065ac6500000000", "52ab53526a", 2, 1688960160, "8498ab7266c94164e33a89468233ab0533703a8f0bae8ff3afff24fd7c4177d7"],
+	["0100000001d2635f758e110319f4cabbb228bc0cedd09af5ce403a4109ce46e1632acecb5c01000000066aab00acab00894a67d9011cd1060100000000003f81a948", "ac6aab005353", 0, -1962536388, "ac093da67c3f0bc1749940c221a11e091aa89dd2f1ba4d7fc0e1676f763ba37a"],
+	["020000000325c100ef7f8abb40737771a21625fdc8a122832f444d21e50bfd56db310faab10000000003516a53ffffffff67166672b773d45ec22f1176f250385e3a2147a44256ff57ed218d2a8296ac090200000003535300d792d102bfddc1933e662c124c7f8670cecbdb2f9bdff2d4c9f38f81393822391b69108e0100000000fe300d5e01fa3420010000000005656aac63ac0c571bab", "ac6a5152", 1, -2100181403, "c50c3806b335f90dc4feafc47fa2d6acae7d4bb4bf810f2a27409c875507b37d"],
+	["02000000034e7ca8da4de9bb1e072ea7c646a495bcea6102776d960a11a815fa37dfec82210200000001abc9fd4c2419ec2d0bf72242237f83b35b6d4bb155ac27548f382602f4ccf111b5d8cea6fe0200000009ab51516352530053abffffffffd6bca164813754333caeff1892413f044b8f345dae1a33f68e185def28f1f8ab010000000153ffffffff04733be30200000000056a00ac0052144f70050000000003ac52004c44b904000000000040e7660100000000096aab63510052ab52521bf08a66", "6365", 2, 488840860, "ced494a3b4e3f4388eae3eedd393387f8f5dcbb13f0d3110718892434fa01316"],
+	["0100000001aebb18e98aeabba02a191864a73bd575e58490a866a8262a0f911c11dcf6ec24010000000763516353ac53acffffffff0261bf45010000000001528ff3ad030000000009656a5152ac5152635100000000", "", 0, 851573804, "04232347c62aac4c0050cc8543e73f1f25b66d0217ce8f7c5e7636e15d6fa09d"],
+	["0200000004b721d49a1fe2565c73383714b923480ae507f6f9d898096f37b878eb2133940a0100000000ffffffffdc9d4878013310ded66c959fd3bc626abd498174c0cf39032054515f2719396a02000000046a6a65630eb0f55917f1271756ad65962f45af3f55f806070d3916ecc5addbbb6570da0dab7111550300000005ab5351abacffffffff9c4e7f5193cac68c200dbbbb224c3d030fc9891b482e67962a33bf6e3debe74a000000000353006a5cf3224103586c4802000000000753536a526353538752d504000000000096a9e20400000000056a0000006a00000000", "51abab53ac5165ac51", 1, -990855379, "4cfb954baa82128d45bde498d0d791dc0c85bf0ac763e8ae276ecb96edfdd23f"],
+	["0100000001ee3282adeebdbc9b7c610ad06bd5638b37c7ad0258e1a9c632ae9fc380148383030000000665526a00abacffffffff0107daa1020000000006636a526365536619e606", "5153", 0, -625214744, "b4cc68bac81b1bb1e197c35b8a2e94cef59d3c3c7f9017be17c8797e3b448f85"],
+	["01000000039a8b05ba0d598f08ac18390c01df5a9e4eaa324825dbee61cd7b331c707f606c0200000000ffffffffbb602c0b7a657e66c185ce6644aff2b5984f7321709c7ea0e9c9cdc5c19638f6020000000029c465cd8fc419ce7f46c6f49367f1914a621af0ba131c72bbbcdbbee14ba236c8b359c8010000000652516a5353acffffffff03f713b404000000000765650065ab6a537eafad030000000001518245f9020000000002535200000000", "63ab0065526a65", 2, 1034512125, "16879f2d3216590058284c730d3f52b78bb0708cd5be0673c9efdaca6d447c72"],
+	["02000000030a0565b185e4f2ac33975d95357b9346323ad725abe53a1f1c13f173505e4ccd0100000009516a6aac63ab63ab6afef31f3b8bc5cb473b26a9025cf29debfde76fe0ec03e49cc76534615b1cc8b3101abc90020000000963530052636363acab627130e1aa9921c52cbf4accef387b397d1167c9bac29f32b50b9be625d1f57a6b798b8600000000080051636aab65abacffffffff02c5baa6030000000004ac5265001e9a6d02000000000363526500000000", "00636353515253", 1, 566500037, "722532eeb71244301d153a34b4734a546044a9a56b79bb396fd94fce8ea66adf"],
+	["01000000018a0a2e10bbbb1f634c5e12ffe6e4aa707ef1912ae40cc78f6deaaf0e9a208e7703000000036a5365ffffffff0182b2bd0400000000085163536551536565adf9d8b5", "00ac0053ab51", 0, 562883043, "e37ebf997f443dc859999eb8f0095f0a594c8fadeb9e9def6f04c4fd032b38ec"],
+	["0100000004ce40d64bc378d57bf593327cce06c719dffcaeef4328b2bcf24a4efcb00c7c7802000000026353ffffffff5891382f9b83135739d03317c6b8396ff4eeb84de632ace725f2fa72de6144a80000000003526363ef1f2828e430ec309ea81fb2de43b90fd0f36405ddab41000995f18c525db3b4c5c02480010000000251abeb1c6cd395afce6374f166ff1a4ad90d0a1fc2c4c5545d0781115abe3cd61b7eeba43645010000000365ab63c1870b1104a4b752040000000002ab630f51f40500000000003654260400000000020065db867101000000000452515253698bfc79", "535152", 3, 858773725, "c0411817beae25cb456bfd66612dc0da4b8a64506f3b17e7144d010c312a29b3"],
+	["01000000047ba7d52ae60d42cb670e59c1726fa3d7f5e5c82dcd05554c444a4b5df4159f870000000008515251ac635263512e198f3b41e2a4c26b6811699c436ba26540e7da47e15eea4e1a666a2a2a3f7c907f25850000000000ffffffff457c1bfddedabe16f63acf045e6840c9749a3bace5c771dd596d0a98fe99515f010000000151beaaca7e1e3d6dd82864f3f5601e93bedaa61b73f452594e32b9e85a3ae035b636d697f80300000006ac5165acac51ffffffff04527141010000000000d59cca030000000009525353ab516553ab634fe5e1000000000008655200ab6a65abab8c42210300000000026551f355b309", "636a6565ab6565", 3, 663863489, "60f11d0658a3f319d63c124caeb64d6980e933b9339ddd2ec68f759aca69b509"],
+	["0100000003fdba841f1f55b602d5254fc0f0866a4dad0675b24da325a50db7ab203be8b19400000000036a65531a63327b8d4ad361b0f39ab156d3db8e3088603325117be0835eab1e37d42cf66b6b8ade010000000600ab6551ac52bd919514efe08d7875b7f78705b424d17adb3c4308d60cefcae04263dc55c7b2b17ca0280100000007acac53526a52ab8100dc800319ae6305000000000451536aac5df7c8000000000000a7401104000000000765536363006553c7c21122", "006a636352", 0, -872945930, "aa4a1256a25ccb431fcd0626661039c109c367b959e95cfc7443b6a00a99aec7"],
+	["02000000029bc0c6510aefda97d91546128b9aaab6f3f6dcae5dff99814c7152803dc142070300000002536380f4074dd0b4bfaf4fca0724dde46dc30a54789c33f0b1f3faf24b68fdd9690275c7866d0000000008630063535163ac53ffffffff03b5285705000000000700656aac006363e79f9f030000000000f2083f050000000005ac53ac00ac00000000", "6351abab00ac63", 0, -765478768, "b7329eda60f25081e4b24477c87c3847ee274be252c9ed86ec7b2a0c2255a4a3"],
+	["02000000019d7a92d2eeaaee3f6bf864f651a3456e455326b30a3d64cddd161fbac5b4edf00100000008516a5352636a51633b61a07d0363af760300000000000d6258050000000002636a729907000000000003ac516500000000", "6a5251516a52516a65", 0, 1438924377, "04ca984a84352c0ca3d7fc76c7e42b035d797d045ffa8abb6be95d729979390b"],
+	["02000000025d67d20d865f4669403c4622470c8e1ceeb5ee332e12def53eff9e128370f84e00000000076565ac52530052ffffffff17b3c304d8277a26fb659cf805f548dcfbcf703bbd421e5fe6be3a2936e62888010000000151ffffffff028daf3d01000000000863515363ab6500650fc8bd02000000000352635200000000", "6a6553ac00656552ab", 1, -51831032, "ecbc74cf25c3a2ee37e3cc5bd4a2f5a7e5997d420a72cf379d05e784738bb88c"],
+	["02000000034041bf68db43b74cab112fcb56ab3dedafe0fb1758f4847442fe2bd40a0725ee0300000005ac5353ac003cf4fe2dd3032e360ac658d98ee52cc0d0d2f71c21cb42c73a7f1baf57e296b6ef6bee4600000000096aab63526a656300abffffffffe0f7dc68cd77812d7ea3710036d694c304c9b51f29f6a1a8e3c84af33ef9d4800300000000ffffffff02355106050000000002ac5270ffd902000000000953516551526a536aacacbf86d0", "ac", 2, 1798167899, "ef51bd20e894b2a129ab5d6a2a39a073f41d5b7c0736420840e6131a1f421efb"],
+	["02000000045e5c985d7af9a8b77585c0a8776c71076b9f0a80f16e2fdea0b1be235d80a1e900000000056aac6353510ed52420f0ae72bcb5a65710b5b535ee3af93fb3c7ce81f232e0852f5ba26d6efc8f052c0300000000fffffffffc18ad635b8919eaf50a945ed834dcc2ac8e63e88a793a97c7bc8abfc1a2df1900000000066a536565536300943e0289f7d090bd9477db3d13c7242ba9c6ea0c3d56ab76ba56926c6874bda07da10202000000016a8ba47d7f029b98790500000000086a51515300abab6559857e0200000000045152536500000000", "abac006a63ab", 0, -601193396, "4e1c7e20d3a9f95ad797059b129536dc13ee25b9a88989988fe9e0fba254345a"],
+	["010000000122624e8ef8840956eb4848adcb1a593ce08e033be49f057d821e264a4532e0b300000000096a6300ab656a516300ffffffff01f065c3030000000008acac6aab006aac5100000000", "abab5163ab", 0, 547503330, "98336c594ac9301492156e61154c1dcee3032a52b147f82c38361c52315c353e"],
+	["0100000004bf611ae10ba928ac715d38e7feb6f3d0447331fa709c6e41e5ef2dadc4a4b5d20100000009ab65656a6a5352636a76231dc16e00f6892417d2f0b4a065b6f12d42a14ff64e89ffa0526891413e29b7906365010000000653ac536565ace4a97d32cc9b0275cecb48cf2933e5e258b435c02e0ab38e43c610c64f9d66f5d3c485fe0300000002ab0091a01f0250567aae030c4760efaa089c216231e7da42a443bbfc0c6aba4ac425a20df9160000000003abab00cc9935e3016585410300000000095351ac5152ac65005300000000", "ac", 2, 215439119, "12ba36b2b267f4fc87b327ce951050b66ec5aa5c5f49b60096498fd9de7e35ab"],
+	["01000000032812f5302ce98836c0f7711e199b60a2308ed1e39ad943754d9c94ae5902bb6f01000000080063636363526352ffffffffdd23825163ed552286f8122817b915d696f08da6950d7049be8930da3c9401560200000004abacac63ffffffffc2b5595f77ccd99e69b5b78226dab768ad1677aaf61d269de424c3050f1a58f1010000000100ffffffff02362568030000000004635151acda694501000000000165f8a3a2ab", "5365acac53536300", 1, 2119151725, "b84788bad1f7251ac4c7cfe251ec37a5a1214474fd31f12aaba4582cf80f72f7"],
+	["0100000002254a5dc2990e23cb0c58f60b765592f193d8ce6b3c8e986d3be7f52b4712482b0200000006006a6553ab6a64cfdba87265b3a56422411671ee15c874ff06c3b188789bd2cd3a44e9e16aa5b42739560100000002ab51ffffffff04fdc49d050000000002636ab90b5d0300000000026a52bfb9d3010000000002acab53b5a50300000000075363655163ac53f3f59eb4", "63abacacac00ab", 0, 1791253063, "eaa53fc503386c9c2354a9c5ceb63cfad514fe3ef3943bc697a9a9c090978e20"],
+	["0200000003b3682e63f0b0bd9b3c91d5871167e3395d615fb60c314dcc428cbeaa18cf8ed403000000090065ab0000ab53ac00ecc348b2ad3744071881d52d0b97af939073e9dd6589a5062650d6b144a36fb88c847bed0000000007515153acac00633e378787703648fb3ac2a271a0da33cdf040f3f860950d3c27aae74d9842aef965c0baed0000000005536a6a65650bc7484b013470ee0500000000010000000000", "53ab00510051", 1, -2033574883, "6983cfab9cc08479eb6c028279ff9b42cfc9f8600763ea7ae8f1af41319b0e0b"],
+	["0100000001ba0749af74f46acfeefbb7860819c228ae3ebca232674420f67b37f72f80b1cd0100000003ac63ab96991a1a02ee8a60050000000001528aa71c0000000000095251ac6a530052630000000000", "ac", 0, -538330370, "4cb99209005e9b364d7d9b1de7f5877dd204fcead6fcdfac5efebaa8ccbd7763"],
+	["01000000014c59e2e1b53e2efae4356535c2e5dec4cc59f8cf0561705a1e70e1dafdc5e15f010000000653526a5363514d8052ff039f93be000000000003630051454383020000000002ab530002070000000000066300acab51abff22b7d1", "ab", 0, -31432205, "8462d02eb8370975229259f05cb68032435d048b2dcf99a121720590b41f0232"],
+	["01000000022cd140748adf5230a1fcf526ea1701b548459b807384fda30d84d63f5e233b560300000002acab67e7a1abf1e842d0fec89d4fe2885d8d02219766bacf3e02e455d2c500c6c5c87c4e5a3303000000096a000053005265ab63ffffffff042239fa0100000000010066fd920500000000046a636551bde7c1020000000007ac53535152ab53112b8704000000000700006a53ac6a0000000000", "6a", 1, -1679601771, "95904dbc8f6b97183e12a60a20ec3f38deed24e7b130f0891e0034fa4c7cd36b"],
+	["0200000001a3067c385f9e8b75acf477b15b4e52c783f9e387bfe70eee0e7b96bcf063b70703000000036a5352ffffffff03d1afee0000000000065153ab6365ab86079000000000000753535252515265825e3b00000000000300535200000000", "656a005151", 0, -413333699, "fbf5943638f6b38258f02187b33c84edc2b0f79358303ac1efc3fab8f97f1d92"],
+	["01000000033d5f8469aeb187c7fda45999852cc855ed5849154238e2fe64e5e34a793e92250000000000ffffffff5880e2d73d2fe34c34e5dbac3ada7b8b817e30539c65905e760132f50f4f3538000000000765656aac655100191fbe0bb8405c16e2eeca3c10ae16fe0f80fe7bc875fcd8f42c31ac2e2166eca61505a10100000000ffffffff01d3f73801000000000153a97cde4a", "6a5163", 1, 947808628, "b126e001d4efa1d3cf8abd9c3988cb2710a33f845daa10fb0e03260cd851f7ef"],
+	["0100000004930578cb4c32e428a8f92217ae5995a78b4969640e7356b63fb3b2e1a41dd57603000000035200acffffffff952083cd6aaf47a24ee094305ea15818368c77279af0dea09fd9a8190bcd9e1d00000000016affffffff953f347540ee66501b1925e2053b7b1c05be09538db007aef17f3024c9005654000000000751ababab656500ed53ca9d2ceb4c9dba02bf473872df2b033d4d9ad4189c7075a5bc78d2e49946e6400a3401000000056aabab5200ffffffff018dafe60500000000086500636a6a6563632c762eea", "52ab6a63ab635363", 1, -1495482313, "8db8ccda0435e0f77308f9a00c7adca014de6a93a12f74b04252419dcd8a9a41"],
+	["0200000002bf207c35d27e0832c131b698b790bd91d9da1e80b57b172fb8beb2c4cf480386020000000363ab513a14a4675967f01a0456d424f1e007d78b9e2e688af9b68074b95c83f0c0598d56c19001010000000465530053ffffffff0368e80d0200000000080052515251ab5152f17b2a04000000000363abab3c77a7030000000001001ea7b3ec", "00", 0, 349242419, "f920602f8d2dcf566ffc3661139ba545cc4cdc1133ad2445c58b8bbcecb8ada4"],
+	["0100000003e4299fbcc044a7102eaebab8513a0ca3f679c13ccbcbccc8f608c53feeb5caba00000000056a526553006b97e04826aeb6e6f1865c9791f0d74921ea366f5ef4f01600db0f9650b9c47e29e80dff010000000352ab00ffffffff14f00aea83cd07f5ba1bde09d0027530377525a39aa6b343c2f4738b32a7ca4202000000036a5100ffffffff03216a36030000000005ac5352516323bd0602000000000040af2f040000000007006a6a5363636541cb0b39", "0000", 2, -1672012230, "1632e746eab88cd65927e13acddf12fda5d734e885520b020873f1835e410a66"],
+	["02000000029e5c0c5c72b0b92aafa3deaac63869dfd97db320ef61ab84949e4c6a4f20ed60030000000665526a0051513f09d820ae6427b9d35632d5d2db12a4280cc6740f9a6276b7a1bd5cc746c79b582710a2020000000700ac52516a5365ea777c5d0267ecb9000000000000f9e4c305000000000551ab5153656c38c0bc", "ab6aab6a0053535352", 1, -486870682, "19c0ba1541e7e80a5da98e2914b89906b54895fb77afc19c5aa8529e00686204"],
+	["0200000001306a2d0e997e089fc6583113790d23c1898a2bf18128923848c7bd294557c68c000000000765536352655151ffffffff0389f3be0300000000065353655100525af4f60100000000045252536a3203a205000000000351ac6500000000", "635363526a5152ab", 0, 486016165, "1c379b647235535797479f54c34870864d8b6a6b96d00216fcfc5acfb2906905"],
+	["0200000002d8b6b5da530878fcd2ee1f12078730509da4d896e4489cbbd808cb100ef1cb210000000002515357c22eae0d1d5735d287cce078b6296d881fc032e4f62950523675a77de8b07bc65422f40100000006525252ac5251ffffffff01b3796704000000000153e54975d2", "", 1, 1271301181, "db78780010a2c9140b6e8461e8c9ce91e0ebae5a5382db439da6c0808b75224c"],
+	["0200000001b3c71b1b521869c9135d7da3f85d98d3b38c86add4cf367fe463cfe90a0c9d640100000009ab5300656352655363953bcad402126e4d01000000000865ab53630000ab6a5119d4020000000007ac636a6363525300000000", "53ab530052ac51", 0, 510955255, "cc8ec961c807efeeaca67d4d968cadbe95c9804acbdf55bc92dbfe372df4c242"],
+	["0100000002a9c5e2c5a32e72c830ff30cacb90e351cb05534d2ea544d2684fe79d3f7b653d03000000026a52ffffffff6ccea9a83a58f60b9de617e68b97443b4d1bd1baef4a406c7616c253d504152902000000076a636a656a636affffffff049a582603000000000652abac6a526ab6402f030000000008ac515151ab6a6500eb27d9030000000008656a6a6a63636a0028e7f60000000000036353ac3b817ffa", "52ab6aab52005152", 0, -461826524, "c7e3fe4d2af6b90a86939fbca0e38e30b02136c0a96ba7f085ec961340ba20e7"],
+	["01000000022c0e906f7d35db4c89aac8d202fdbc77f5e3289ff28e7f4050590264d8530866020000000263acffffffff9002796a5d1dbf63df4d6ac45178962ebbf849da53d125edf77366992b01126b020000000034a8ce180445fd650100000000016a8f341f0500000000056551ac0063887b720500000000046a5352539d9ca905000000000900ac6a6a6565acac5100000000", "abac0000535165ac", 1, 1097715594, "7490dfeb4432feeb060dd20c655965fc8c0cab7cc76d51a07a5b1a1d54ae5b89"],
+	["02000000019cfa828563dd17941793fddd27438146ad50e6f9105487ba273e4c72e42cf45303000000009700bf940435333f01000000000044e5a201000000000500ac6a51520d55f4000000000009ac5365ac51ab5153ace6e581000000000008ab6aab5351516a6a72993832", "ac5365510052", 0, -884847366, "083c2b9a765c8acf7f61653e275c141c526a41daf30e191a3531ed8109e30907"],
+	["01000000011d991c90ef79246a5cfc40311c7fe029b4e5982d1b36a31fc69b4699d3b8c2700300000004acacac53ffffffff020a13b90200000000005df69e0400000000010004d32400", "65536551630052", 0, -303491680, "4ae70592a28a61d5fa9fd59515a8618f474a62867e4dca8e421f18c74553c7f0"],
+	["0100000003306e6e7e6cd937df287dc1ef6843c77998c4387b45e74a54d38a10ce27704a5b000000000563656a65005fb2111f6150da4db3ce2a42c668d70920e7a754cdf8d8e9a881164fec538eccec53679700000000006b4ae9c55dd518a31142c3db37e331047c715de6a331d86629b0a65c5edd6556abbeee10010000000400656a6a28ba73da01de871804000000000351ab650cd617bf", "", 2, -727822470, "e5912cf1ddd44470bd9cadc406be17fb19b3b7abc9a00ce22b871143fb44398a"],
+	["02000000012731d2baf052bc16fe4c60db5aacd1d700d7f953499ef5f386c25a792b773140000000000451005251ffffffff03f3da0f0100000000036363ac62e5d2000000000002acac70e58d040000000003535153418b9f67", "515353526aabab51ac", 0, 1830785537, "b990eb60a5ef4e594d7fb2b7500ef34611146486ba663f495ee135f981541569"],
+	["0200000003468478dc359f3d16bd776333b5fc91794a0a95be3a411004d142cace0fce60560200000006ab5353ac6a6affffffffedad42f68c97b175da48c55af16fe91480fc8eb7b76ade92a7c74f733a55a9e90300000005536565516ae8084ebf4790ae4ac232302d6c296e132f9760d573e5bbdac6193504ac827a874e3c72540300000009536a53526a526aab6acf4d4faf01e41471030000000000ef4c0444", "ac63ab53636a6a", 2, -314925033, "29146e0d4d83138af288bda843236f0f48023f2fb9d729468033d6ec6f50167c"],
+	["020000000452e27a594f78be6b3fccfec62bd36ed0ee2e7b90fb0272a3530c9cb23a7c014601000000075263516a6a5363ffffffff85ef47e10eb5b2e4f39134af5f82a303aaf93c898cc95c93c3b035537fcccbf301000000066a65acab63513f6593000b7fd9c0de32163f3ff2e2ceb1efea0df4ae008c27e78a54996a307cdb62ea74020000000563536552528ac1be3b9de53f917294541e37b072fdbc43ae61e3da505d65824c78602fefd6301852310000000007655265ac635200ffffffff03221b59030000000005ac63636363e0c1ca02000000000151877b7c040000000008ab526a65ac51525200000000", "", 0, -625770860, "3ba45f61f16187a3d7c40ce0db9882a9be633266c268a7d50c624a7a2fa13f7b"],
+	["01000000047ddd535b9f91669a1a68bbd2f9828b74e4cc77248908d3b3a57db1cf6b797b0a0100000004ab510052a5888f563420b7c714d4553243d2a0c650b2c3ee65347da14be0746213ea8ffd82b98f8e0100000006ab6a00526365d7a2730cb72dcafcc9c09e4b3910aec204aae845401c4e4d126bce1f3a7508c9ecb6ec630000000008acac6500656a536aa4e521976a389ea6504e94999a7819644cb7b24b610dc6a84a9ac2733a0dd13ed57ccb69010000000752ac5200655263ffffffff0302e744020000000004636300ac2fc1ea000000000007636353655165ab05560500000000000665ab5163535100000000", "00656a53abab51", 1, -502583302, "37c0006b49386c8e2ea31072b23321858b8e1f3b9f67b4a31af8eac63f076ad6"],
+	["01000000023ab69585051f5bea6f04d23d0ad7b01b72d0839a28f8c367687af93ee92051d3010000000163ffffffff1fd11406caa890b421f1118d446d5845709a43cee6060bfe9c05a1bf67cb9ae00000000005ac6552ab65ffffffff0314f58d000000000006ab63ac53636ac90b7a05000000000953000051acabab51000b981d01000000000553ab5265abafc9a398", "", 1, -1233525516, "35d1fc6fc11d04a9000d3b867bba40649d5f8af0ce731420ffad41dc31767c64"],
+	["01000000030bbfe029c5ed622859bfeb1b06b48e5a4eded5ef20554493811792a628f61400000000000665ab6a520052ffffffff0afa9acd157b4f7069574cc2c8ab45d1d59267b79e8c662632988b7ad3c24536000000000953ab005151ac5165acffffffff055ed8837dc7480c535380ae064eba832927cbc33aed5f16fa8630940c05fd510200000006ac5363ab51004d053c5303a061e5040000000001ac030356020000000004516363ab20bed0000000000001518a80c863", "65526551", 2, 2040753955, "8cabbe02bb2c66c797c56d1032ae0f0c5eac9390950e5d9cff6c7fc66ac5c349"],
+	["020000000203783577a7a1823dc76d06bc7e4e802b43fa5f40974c8125be259f1737c43c770200000009ab00515251656a6351ffffffff97704dbfe518ca84fd6aebf2d80a91466bbd76adf759fe1e0bafc43a0589f6670300000006636551ac52acffffffff0407854000000000000253ab9d44a90100000000020052c6c7d2050000000009655351ab63abac6a52800a3e0400000000045165510000000000", "", 1, -448396885, "e8fff19f3c99ba85944844dac053c4ab08696a9277df3d79578a0ac17f86494e"],
+	["0100000003cd869f5cb4c4ca8b4af187b87151e2cc88992ac73a8e8f78997b359ab64baa570300000007526365ac5151638dc35964b51a36a9c48594e25618cda01c815f1c5c3165643f37a4917d839a26fcdcc42e010000000463006aacffffffff30b7c91f2fadaa0a7006cd8fb9f774c3e0666d5f18dc33df313e7dfb7f0246fe010000000152ffffffff047c7af202000000000963abac006565650053f89275000000000004636aab51f7ebd901000000000700006a5100526569221305000000000763ac52ac53636300000000", "63656551", 1, -682598304, "cc99bb80a68070ef266ff03c4e4b4f2a37dc6dfd3e0550e1af18ac2685729cd9"],
+	["010000000226e3039d85ccdaae87d33d4bf44be2f66826bb29373e28de252c7c76aec25b20010000000652ac655352abb05f097ba6ca766e7ee36c22104b8ae9e34d55fccb58eb05b9b82317a7c898519d75212b0200000002abacd6a7718904a486a60400000000036aab526a4b400100000000005df4bd0100000000015217a639030000000003510000423c2040", "5351526500", 1, 1174211156, "1e8f1f8d66892c1b9221d14e8bd7d896ea19b4f4e3d33c9280bac4dcf84cf8a4"],
+	["0200000004d24ae54b21d2c515c42db894ac8b84ad04f2bc31cfd3ac0c0fd3ee52c6cf3ee203000000066553005353abffffffff12d76f2e96e8c31893cbabdda58a8e7eefa9e80a42ccc98598da0689bfca00af000000000551536a0063d13ffeda5ad7d6294716634943827d8567a948e7e8b329081d5047bbfcf23f0015c1057b010000000151ffffffff8007e87628b6e1713a39a1efc7c479a4430bba3d34190388bcb2db9e9ce9ac0c03000000026a630d2fe8560291d9990000000000015101cc9d02000000000251ab1540ac35", "00526a65", 3, 717488596, "0e2e527f140f011bebb5e62743298a2f73b09ebb36439a358b69c3fe8b273662"],
+	["0200000001c1e4e3c12ec222c39417d24db930601d5fddbdaccd582f013ac9fece191edd89030000000763655163ab0063ffffffff01aa0ded010000000001ac00000000", "acab", 0, -1936841469, "4f5d93a2cc86145e32a6cee05b8d8040ddfaedb5b00f04e095319889594f5669"],
+	["02000000036498fba0cc5edfd7279fdf58a01e7936ab68567c89802151926f7b83b9b9a5ab030000000165061890b6c6ea49378d26b0d323e47dd23ea655f0f06cdb39d65bb84fc43a2ec6b85425f80200000003ac5251ffffffff63b785518e2166ee223448572db5ac398cdf917af00437669e5ddcc78e6909a202000000086a5300656a006aacffffffff01c1f2d201000000000700650053ac656a00000000", "52536a51", 1, -260058562, "889a5bb12c112e9919b308767cf7445ce6fdc7e8aa3f692c489c7c86d108979b"],
+	["020000000340700c96063a8374dc54e70357ed9b93008d66ec50ceadad8b78324b2cbe30710200000000381fd7bc60e21ead5245c5aab1f98298e685a6c400d7899848611826d92ca5810a6e071702000000006dc8f9459f32dfc4ed4fc7af4a3a95d7af313c648eae2b5de0587fdc58917c3f257a64ed010000000452006a52ffffffff03d2c64505000000000565acac005352bc3e010000000001514b8af1000000000001ac00000000", "65", 1, -1352893060, "ec6acaad0f5fa0ca0a2e171da03535f2f9ab030fbe4b76ea2f2f422b745c44a0"],
+	["01000000037f4c40e101ee7e44198f6362331254ec561d945d0a570fbcb19ff419c262bbb10200000008635263005100ac52acfafa42103553b0d1d0336620bcc3fcb3691c6d2be0751dc61984bd95429bc854bbd34d03000000076a636553acac63ffffffff6b1b985a3da7e31f00c7e2a6d350f2953737c8ce1efed94b0063f56b590fd425000000000551536a6a00ffffffff03aecb7a000000000003abacac41c5c7010000000001acb2ef50040000000006515300635263e8172292", "ac51526551ab63ac", 1, -355062109, "dfadcd780d03b069bec444ca7779fdb5d671cc9427c212e9168294ff82cbf866"],
+	["0200000001a4b439022387779441566a1901279e48735afc0ee78c46104c833303489bc98f01000000016ad32ec01804853e4d04000000000563ab536353ef3c9e02000000000400ab520050d0a801000000000500530000abf24e6802000000000552516a515268ec9ff5", "51ac52", 0, -1872059682, "6131a80ef2be3995fe907fdb46657dcf45d9b773178fb172f42a60f8c3350b64"],
+	["01000000020df98325613d178249889488219b13bb2bd2b1ea91555d1c71591f6e534741440300000006acac63ac53acffffffff68c78edf1800dcb242292061693a0b367d4a7fc819f030ad2057494cae68797b010000000163ffffffff021913d802000000000165c5c123040000000001521169c139", "63ac51535100", 0, -695363908, "744f6892d9fd5ffdc5f25259e29cc31162079a9857d71c3a4629eda7fc41b34e"],
+	["0200000003a20c347b5df8a04467b20408e79aa3150afcc4f71a8af197e8b5c08235953ce703000000016affffffffa54dc25448181afd06febe6a1ebed12de56c3dfa7add762a08dfad298151e91e0100000007006a52ab6a6aabffffffff0b14e37cc5f1e9f54f8b046cc9eb713bc0c7a5f496c012fc7b2a0a6429afa1a1030000000952656aac6a510052acffffffff042c4aee04000000000300ab634a6b5d0300000000025100f7e662040000000006530051abab512af77a010000000008ab530052526a515300000000", "005265", 2, -1279792123, "eb17786d488d02a848283bd4b22fb37761a301c5a8673f8c1966860aee507057"],
+	["0100000001630f55ef2b9ddfc91075aaafd6b26da42a7abf54da996390f2043a29022017380000000002acac95b2b692048a8bbc010000000007525351516365530efd4801000000000865ab635365ab65655a1b4a020000000006ac00005352ac9f607303000000000652ac6552526300000000", "656552656aab", 0, -826076830, "7edca57c2924ea4a8415c152f16eeb6392bf5d81421acbe5a07cf16700cae3cc"],
+	["0100000003d27ca817658839a62fc617cbec9f8467dcd80a53a84c748318a22cac0a5d63ba01000000046a6551ab87eb43ee9ab72bf706d1c0318973bd4d31b9ce170ab0d16bb858c3e78e666f0823665bd40000000006ab0053535251ffffffff05097908343482a4281ba48050052658b0e15b5fa64fd3ee1b315ca5d17e7bdb0100000001ac7bb4ccfa011dad2a02000000000800ac5200ab51516ac5a4668c", "6a6a6a6552ab635351", 1, 1064763661, "e0a1aac2581a8bb62ed4557d7bbe44f6e144e3578bc2ba19d3823314dd9e6d9d"],
+	["01000000027371e163935b82c6709e090eefee67f40f6bdf0dd8691e2056d120bc80b4b9740000000005ab635300acffffffff09f49892eb72ed2751acc9fb2376a631ace8753cc4b86dc8aa0e4a02f6013e5b030000000853ab516365ac5351361f13820462c8ef030000000009536a51636a5151ac007f7005010000000007ab53535151ac6a2cc80f000000000000b483fa020000000007ab65acacacac6300000000", "0000", 1, 370243856, "ac3cf09d3387bffa770e41a5c16aa71439a0a7cb74326b06e3711f497c8cfbce"],
+	["01000000041a75ab90b7f1b02ec8bacb5dad2ec5409ec760d71d0098daabc61959a9f9cbc50200000008526365006a63636affffffff3fe817f577c0586051e663c8ab4c9004fe614b5e3d1eecf72ae038efe6f74c2a000000000763635365ab5151ffffffffd16265c68675d68c85435794302ca77d55b48a7c9e20457313e3a8a5c2339a9c020000000265521b9c970e72d2c13b978c10fe6e57d073e8187d762df8a16c11eca1882fb92841abebbe6402000000076a65ab005200510e443a3f04facdb8020000000003005363efb65e0300000000036300ab20955c0100000000026353b93515000000000001511f242a0d", "6a65", 3, 662729901, "9d4d98f3247ea72a0fa7889995b1776985dfa4423eed3fd1ea4a77e9b35d4636"],
+	["010000000218b4842fd7972b429996510061a23396fdc1e54746aa8cf8e99309d69e3e46570000000000bede0a70a0f132b846b294f69feb5b2a9e03fefd7f726e546835cb1345ba79dc4a0869870000000002ababffffffff03bcae850300000000086352ab5100656aac849a5e04000000000088fd24030000000006abab6aac00ab1285b347", "6a6363", 1, 1297434961, "62f1ecfbfe9e2997d4add664a5689e7af6630598ddb3cb2f6129aae4dcc88d77"],
+	["02000000031f56747e9d94b1bf3cc8b5066a83d86a9597eb9d8db787467cd748eb224bfca70200000000be835516d66c69de1c5881d3d73c9a882afb7fb8e60b849af7cb0db52c143f12b6b7b43f0000000005525151acab31123d765879a99ab5d4dd155f2ea462cef74929a488ab217adb11e528283db937e5a71e0000000001529c230efd0301ff6a030000000003acac6a323a3500000000000765516a650063ab3567d103000000000000000000", "ac", 1, -2009331450, "2ba40ca93c020fe1a28f8567877ca00ac87fe351ec1f3bf1a24df2f7900a6d0d"],
+	["020000000297bab177d08ca82b2412684965ec6face79511764f39f5950b2201d1f7670a680300000003ab6553ffffffffccf02d012162d426263190449b3388b4e07dac85638acaa4d5070ae2f4a9966f0100000000ffffffff014eef21020000000008006500536a515153be1ef78c", "650052510063ab00", 0, -1473796665, "f72c09b2d82efd25add9df758aab14282ae688f531e2e86ad4dc10ec2671abd7"],
+	["02000000049639c9d0836e9ed5d020cab22d54bc0f90f42c2d436a3794cc6c4e460431953c020000000900ab5365006a6353acffffffffd1bae921dd5dfccfe30bba5d9434f8f9e007224835d4cd84d8b8b88e3741e2f50200000000925c9c553f3829f9c2a14f866f3780fae8bdf9410917599ba1a42720d4f2d9e363de57e40200000004acabab51da30f1fcd0172ec2d035605aba5d1d14f04627c660075231b349071aebce8704c1c6807d0300000000d1498cd903f6bd0d010000000008526a51515351635114746601000000000252ac75c319020000000009acab00516a00ac005126f975dc", "", 0, -1718014032, "90541c69737bc1079b9e4b8310c407ebcc443869b1027d7ab975666a7a5cb1b6"],
+	["0200000003bed9bc021e9be66340b54c2213ae537059ee4be60d43a7b211150155f58d4c1900000000025151ce2293f618334eb537ffda83da9495f4c6c5ce23bedcbc4003c68994674040810b90da320000000004536a00516f843381c532c839f9908562c18d27f729d60df81f25be6dec5f7e94f7ee22ce9378c2ad03000000016359392c5d03ab32be03000000000252ac79f92c0400000000076a635200acab53346b5202000000000265ac00000000", "ab", 2, 684754837, "8d6cff327116b4e32cc1ab7cbc260a0d584437df1dd318be17d7254f40d85e0e"],
+	["02000000033bcebaa6da956038b17ed8d8dbbc1ae70d39e7e9e124b72e8e64ea1e5cb8bb5e0100000004ab63535275e3454ca974f4fac8268151af3a4ea8d11281e4371b0e24c5505cfbb06aa5079acc40eb02000000096a6a5151ac6a53ac51ffffffff282b2c21a662adf25e86833f090055a8ac9b55d54f15bdc6d09cdb38cab49f8a01000000025351ee5b9adf044619c1020000000005ab51006a655da07f040000000001ab028d3403000000000057d0a704000000000852516a006563abacfc556acf", "63", 1, 643433928, "b75b1c9f683bba463a259e784c682e522f73a1acd71362807a7a6ef8d86bf93f"],
+	["020000000181f4fc3bf997345dd28075edaecd0ce8f3aa1538215e5c3ea54689fdc56fb6d60300000004516351acffffffff01174a9702000000000252ac00000000", "51ac", 0, -639460243, "e26de7f86d0fa2508f7dc00e197664e59e8c0daf1c1d953f3446ec30d42fec39"],
+	["02000000030533690dfdc8abdafe6b8b0b702ae0fd588321d69274699af4e09f7c50b481430100000009525152516a536aab6affffffff76215a9b833ccb6d1c4a3dbcca52318f66db6bb137b4b1488647928d49bff326030000000852ab630065516353ffffffff8752e1bfcd9c029c08db5979057313cb70f931b75af2a224400bec06a90c15a40300000009ab6aac6aab6563636a1bb1c3c801db79fa0400000000045200acac00000000", "5251ab", 0, -963512391, "50a6ef26be26d260520a4ed05521eefc8a51ee356f3dd25085a81cdd8538bb15"],
+	["0200000001201b45fe59c93a31cb600b4f2757a7872b6057bc766ad535204cc02c577544b90200000003635352aaac5d4d04273c9a030000000009005252655151656a657b46210200000000026363ec0d8c0400000000016a336e6b000000000008ac53abab516300acf0b04055", "006a51", 0, -849291477, "d7550e27ed5d960e58fce2d1e7f93e9f9623118113346cd9774f9cd1a0ebd44b"],
+	["0100000003c04538baa0b0a6df780ec932c1bac235ef864caff3715a7ad523055e76399a280000000009ab526300515151ab63575182ad6dc89279af479b3c3e1fe7cffe08b4350237721747ec522fc268ede4d2f4effa020000000200658b17f022632f30c5db7f44f67b66becebcc9cc6156169eeacf43f89997570ab06c318765020000000363ac5327074bf5036d4916010000000006ab5252acab008a10b60000000000096565acab000052516503765d040000000009536a65635352516551d9f874bf", "6565ab63", 0, -1559093471, "190e48d38826e8f0e77633dc0c5bb1825ee578e144cebad304419844cdeea5f8"],
+	["0100000004823ce8d6ac5ae658df438769f1c84d410dde5a99501a5dd6ef94e2b18872b0e5010000000753636aabac00acb6b1f8ebbd712fc7c88a0407936d436b10c03126836d35ad1ef504b7797580bd12600fa303000000065151ab635263020eaecd832b15b2cc036af3aaa4a90ee714211bce6e18be9e76fe5168aceb090e5d9e1201000000026500d82f1c7c88173f57358cf609844705d5a9e41a646ec707a95dc649cf796cdf87d9ad80430300000008ab535200ab006a00ffffffff03d8c326010000000002ab52c01417020000000002ab51583f7501000000000665ac63656352059dcecf", "ac", 1, -216307583, "e6d8d84358409af800ed042ccea5cb3dfeb674f8cf843b7eddb0d807c70d8aca"],
+	["0100000001bde0c612b806bd749a0ac4d9d86f54d23f4ddd0156219269b19f856f91a73ce5030000000463ac53ac7962270102b21310030000000000e48acb030000000007006aabab5152657b3a9339", "655352655263", 0, -837840233, "f1efe1800ad1ba7e44e52e38a75fa7c20fe22cc9c873470ca76288b8fbe100f3"],
+	["0200000004aa25b603c838ef366da6dbadfec1b3f15788db5ba5e1c778fcc938d365452b8201000000026300bdc27d8b865da1d2da0613ab4ac95ce291839a441dfd8443c454f910030e28200b03e792010000000952acab52abab536500ffffffffb186412a6c17991a2792cb280541eaf4b755adf85ac8d14fe6030e37e2d3dfef020000000600abac526aacffffffff25449f0a467e74415cf48733cbb52a3a95cfa1dd7177edf116e9ccaae2897c21030000000500515152abffffffff01158d630000000000010045fa7af2", "6551ac6a6a5252", 0, 1186753632, "278bd805f170ebbf754e56769e88092c4809c07a0e3e87a3de9450dbd88f6743"],
+	["0200000001a238cfe36071383f9c28a25a32f13c27f98e0b335e60896066b21dfe8afdebe2030000000165b9fd8eff02972c8b02000000000500acab5152a53f2c04000000000265658f45f66a", "52", 0, 1606357640, "99d044d43ac9d349f471fd78428bfa5d328f08bdf627acba0f25c22bd68761e7"],
+	["0100000001d2bb8621617202e71f4dab2423732ad0be5ce1d64c5678378a7da6d0d6946d7600000000025151ffffffff04ea34c20500000000086500536a53006a51ab5a36020000000003525300940a6d02000000000700656aac63ab5202e430000000000007636a6a515363ac00000000", "", 0, 130061149, "eb507f4f71da977c98da1b311f03a975f597886b2961dd0d1f12d9aa283ecbd9"],
+	["02000000011a131f5fa0533116decd1ba30d6957461ddd18c62cacbed8e0d9f877b8c32be00200000000ee4d5094010e541f010000000009516300ab6a635165ab00000000", "ab6a6351", 0, -1897202437, "589c6b3ca0316069ebe9139800055fba22485694a00025eec550efef9b722368"],
+	["02000000020d75dde7a549da0a22624e0db9b33535565a0fd21c9ee2ba4ab58a1e2e54fd1c00000000046a6a6352ffffffffd31c50ad624be7c585fc9b009ac65813e60c3ee8de6a9c1df02f2384254c5e290300000006526aac65ab63ffffffff0425107d030000000006656565520051a66aa3020000000006536365ab52005d70420400000000036a52ac4270d20400000000046353526a00000000", "", 0, -2127031691, "3dd9f71a47d3b4fe2f54154ba0ca462258d0fdf41c17671853921e2ecdf36f00"],
+	["0100000004dcdc917ea60bea1c818276b12c79fc46499ede9582c77e9acbc4a019668e5d4202000000066351005151acffffffff331baa6f7555794acfeeb88a91176335e93709656209a53a03b4baf136f10b4501000000075100acabab51ab3299a504b85dba64eb1bd4e171b6b47a6430d6b328b167d91ea058384ff1c6c16c102b9203000000026565ffffffff9a18844bc6d005273ac908436a4bf82b77bc375a3dfa02439e5ae5eebf84ce9c0300000000ffffffff017de52005000000000652636a00515300000000", "6a635100510052", 2, -1762541760, "3a8a4181c93bfcd4c6467837f899fb5cf930303d466c6bef6404ae018d09879c"],
+	["010000000200a6b499cf62ebbe97e881a1a0af9e480e9edc3ce69824c5470ea1e16498c91f0200000005ab0000ac6aa46b59f14e0df3f218bed73242792613d33efd4f7473f15f3d80f1efb506dde5265b81cd0000000004acac6351ffffffff011974010500000000056a5165656a00000000", "526a0053", 0, -1925031748, "51dc7fc25361c020b83d2965b6d4d6e309523a25e55d291047353c659956118f"],
+	["0200000004ff72781faefc783fba73efe9651fb0616dc07f082a1d92b6bd7663251d681db702000000076a6a6a6aac6352ffffffff6a6c98f8162595b80d2b41d0abf68d911128e677e1447c6e12322454efb8a25501000000001bb82e4f6d8b62203fb1113f9315c6fec8e1129f332e8f7533334f09124a78021447de460100000008ab526a6300536353ffffffff8d98614774ddd14d202ee6ed3d476123312a1be7593faa8960a9b9d41639cd8d01000000066a00636300abffffffff046cf1260200000000036a63ac99c18c02000000000663ab00ab636338df8e050000000007515100005252ab93c639000000000006535253ab6552b5b4386d", "52", 1, -588513923, "7ee77cb5f3620ea1bf6d4bb3ebef63a30ae3653513f94c3d3034d05bc24eab4c"],
+	["020000000301c3cc5e4d5eac702c83ba7db6034f890182b93d079c39b8e3b2d9f12513298b0300000003516aac1b48dd99cc23ca0fcfe519577d4f0c4e1dfce58d852f41f5c284129526e83803cc6c3afd030000000853ab005263ab516a9a1a65f73e39ee6ac4b30edbc44d2c312061c5d4e2fcba4fe9b2c0a641b434b5a0d489770300000000ffffffff01f5efac010000000002515200000000", "00525200", 2, 1767603544, "c63dcf51e70130c77daf3750a67b804ad2853e9f92c74203f471007916dd51af"],
+	["0200000002843667d93839aff2775381dbf868bc1a1b337af0e7d3becf8b7eac9d956b14ad0100000000ffffffff16448e63254be3657336af8bbb079be65cb4cd5cc59822e4f38f5b161d3e2a01030000000553acab5252ffffffff01503ad80000000000016500000000", "00005165", 0, 197107977, "7706407317fbc901432cfb68d69165f2e6447da1d130e414ba637895a394c277"],
+	["020000000312228840dfb778aa35917ac6e2eb5a8c40f0a5ac7b7d86649f14759a8ec6416b010000000953acab0051ab655165ffffffff0c119893c68502bd80471c53f4048fefa0c5bb21c2cc69eb221541b55c474f6102000000050051525363ffffffff6866d339a272c44bf4638fcd6cfb2b2262a8a2a988cfe241a83e4406cebdd3ef0100000000ffffffff0451695904000000000351636348e278020000000003ab6352ab19cd0000000000016aa940aa050000000004ac00655100000000", "630000ac0000", 2, -1472718449, "06c388fa26a28ca3b40c097a076d2e95619dafc5413743ecb38076fdd915265e"],
+	["0100000004a68657e6cf25ef528ccc1d812edafdd4be09bd6c29f0cc40b89f801e09935234030000000563acabac6affffffff1986fb09b2aa8b38cbe920161c3570811a7e42fbcd328aba67f4869fb63b687e020000000752ab00536aac511c488598b900c750c3a72ad0972c3bede6c66133cf1752c0e19620ddf822b9796af59bae0000000003510063ffffffffe84233aaa7e60b2ff079d1b54cc78a62921fdeda80d38ed81b0e6022948796f802000000015279942aec035f61dc030000000000ef6736050000000001632c0c5500000000000863ac5151ac5151abd9207809", "6a", 2, -333890815, "00eaa569927195308d7157057ade9ffdebb05fa259632c62e48a28b22d319ab1"],
+	["01000000025598833c671345c6f008df9653e060da5a2406f728a5edd6fed83da159108f7f0100000005ac0000ab6afffffffff4215d7e3fb09c1ce536f1b439bd2dbac669de98348fb379679e5fec5f8edb740200000006ab53abac52acffffffff0441ccf00500000000086aac6a6300515363f1959c010000000000b79a6503000000000165ef8fed000000000006526a53510000128a8e3d", "00655351656aac", 0, 823464884, "8112dabe1c837a0a997cd5a548a0963a97c1a23cac5dab70a9dd9ba9a7866ccd"],
+	["0100000004ff304b784228c596ebeccd486fac0de1136c89253caf4d4efcb02ac435e031df00000000026a511d148302c9be1980ccf6a711a783d2b3ab5a9b5818b3050f36ff298145cf68b55e650de20300000003ab5300ffffffffd2331c2baaa866d99f9b345af536acbd11106ab71b3954f96ac68218ff6dbe5e0000000009acab536a510000526af2b67ae440ec9f6e8ae6f8e36ccbd203c319bdbcab8e4ce68d4d0b3a11e31684bea4a37f010000000851535151acab5163ffffffff0244728f000000000004005200ac6170540300000000065100636a65abc1f882b1", "516300", 3, 4187748, "471261dbb769bcbad9b3947a857e9ddeb8cc023a6795638e3ac7ef508a7db62d"],
+	["0100000004bc1ed0abb39b537baa8f28fc4d6fa36693a5180928eabbf749fb96240ac004fb020000000151d5c39116aec6fbddbd328154e2bc1809b38d5062f2023494c90204932037bae0db0d3dc20000000008ac00636351635163e5b6b671410613a5496cb5b7afd8f68aede2a23094a699501e963efe7a4ca649e17f0fe6000000000463530052ffffffffa0b4f762d86ec4f3eb5ce65ad58520d169a1229eb30966ee1ec8bf58b554e2f301000000065100ac53005347c069a70289d2dc030000000000bf1e4302000000000763515300636a6a00000000", "6a5100ab", 0, -90668021, "86d6f97840a3557c341a164d50c16a5e8114c7d4316f150c2ba2d70d9d5d5d55"],
+	["0100000004ce961c920a288de024b28d93950af89c0279be591fe17b1a251ebf474ab7cdf00200000007ac51ac52006553ffffffff01e8fab1125046657e0b36204854461f76a9465a134478966312f16692300a3d0000000006636a52ab5253ffffffffa55abb08afd546b0b498fbc7927dfe1595bf3459e5e6021ef4f34458346508520200000004515365ac95e08de4244dfccb82ac9f82c9a65b2bbf2df6fa5724efec18502d63bb2863cfadee5afd00000000003f1c5802040e5d78000000000009656a65ab53ababac5376bf3c00000000000563ac650051a85b9e0400000000026551825402010000000000b25870f7", "5165", 0, 1301167711, "486bd8956537bece801f44c7e50c2553cf62abb72730369588f1b4d5df1bc690"],
+	["02000000011868474d41f888a593091cfa647a9b80f9cfecc8a20fb8699f5c3f98be0f6d89000000000452515153ffffffff0485d5950300000000036351531296860300000000035163651d0a970000000000016af594300500000000010000000000", "", 0, 788185461, "9e01e14f81f39f4af04fbd5797922fc4b5204882e96f6cab8b354fef49babd18"],
+	["01000000042db54dbf055b57dbb5d43a075360afafa84a39f574e1259f1373173ab441eae5030000000565526a530040a76925e633f2cfdcf8eb231c1ae04f8a13de4c84b5873bf8132e72acfb39101b65da73000000000263652d20cb294ae477b54866891c8a6b3adcef2f4029bc4b7b595e7fba56860bddc24b64888902000000036a5300ffffffff9219a50c9655e59b0da0c80e778f21ddcc4cfbf32d90f2b4888eec89624d76f7020000000100ffffffff01f89e8400000000000100729f47ed", "63650063656500acac", 3, -1992198257, "5d7cc5084301146f3c4b3cc900a643e27688df71bdc8f4ff5224d6ec4f7e5696"],
+	["0200000003a0f58510499d9430d45042d3eae55e52a49718283078c4be0cfd1af693e244f6000000000953abac00526a6a006affffffff236c517815f1ebe4e7648eb296cd13546f8b480537127f6aa3bc7d9effa7f7940300000009ab516365ab536363515c4b0cfc71faa190fdc71ec13ef55032698998f284793d0cd25d0be2919b571a3055eda00300000005535351ac53ffffffff01adbd7302000000000363ab0000000000", "00ac6353ab65", 2, 1993698858, "65a4368c57f156ca9713b7b2ae1ac493b7dea0607ca9448d884c93f12862ae82"],
+	["0200000003b37fe1308d7dbc9ff02a7abb7831da5249354123045b89b72dc12857917063330000000005ab5253526affffffff9b20053c34242e7c859133ff87dd5e59219fbad0e2023e500efbc0360ed3b3620100000005525253636affffffff196294513dff8ee25f1e0a2f91dcd8b11e8214b009497aacdb20251a090d80310200000007ab6565005253ab6fbd016a03ac7ca905000000000265ac31518202000000000251ac9c87e903000000000265009b33c588", "655352630000", 1, -1515903603, "389cb18a067d933075be5677e253190990c7c801136e9cffc67d8edac489bf2c"],
+	["010000000434a41d6ccefedab154a889ceb70a48b01b3f8a1b21d3c32e0cc10829ca379bed020000000251acffffffff86e0a93076a52775d097529c76bd42dfb257a6a199e79ddcdd400fe09a883ec8000000000951006a00655263516acd0ba25043fd60376a138ed762f946062d160157d304c87c6d84cb0940be5f511a6cdb1a03000000096365656aab63ac6a65ffffffffffbbe442aaa0f8fcf692bcdd17a09a304733f9f2f80ad6bb120a4c8b6dad4c2a000000000753ab51536a6553a8da718c04c015d8020000000006abacab6a005192efe1050000000004516a516aae2eda0500000000070052ab526500534725d002000000000000000000", "", 2, 196497637, "96d1ef7940c8df6e8afadc8c3d9c99a4b3beac32fba9b6fd53a1fc2beabbd821"],
+	["0200000002491bd9f63e16a5bf8625c20622d33b20fd6d8da875856aa5d051e6bdb2ef73fa020000000352acace2e1a9aceb2197e392d81a41877f8bc5e0160f3d45df502153afc318f460f65cb34b5c2e0100000004ac635152ffffffff04196c53010000000009ac535153635100abac46b396030000000005516aac6a51031c0a0300000000056a6a5353ab4b57570500000000086363006aab6a5352bee905d2", "ac51", 0, 532303399, "f8daab20ccb1af82a194aceb8765e80e9d10c91892a97b7c5bb4a8e30299c637"],
+	["02000000010ad744d8559676068a984e69a9624deee966696d130d2f961d458302aedc3a6e0000000004525351ab6c9b5588012f513304000000000965655353006365636a8a068488", "", 0, 1275835177, "9bc21bfaf641adeff2263504195444f40e5f01b33628a5af4a9836b5ff9e6a7d"],
+	["020000000126eca84c63faa284b502d3eb3eef26468d39225bab1a561288c787a0e38d94910000000009acac00635152535151d2b33147032553640500000000036300521b4dfe040000000007526a635165535274fdb80100000000035263657cf66bf5", "526500ac0065", 0, 672992304, "37937cadc5b34c702d0b57322825b335ff4a2634038cf81d5b087318ac6ecbe6"],
+	["0100000003d770a91ad1f7e1aa82ecdf936b0e9f4df76e77fe1cbdd70d216b1e56e306fe4c02000000076aac6a53636a5102cd78a39b2e9107930857d2b91776411d1553929e6ee0da071d8717424e69520f17262e020000000752525365ab5351ffffffff6eb1eac67429952c18638d0eb82c6747bc98037298dcae9c8e2da21cecd225d903000000026565ed2c9c9e03c51131020000000004636a53ab69505c000000000000a4655e0300000000056aac00525200000000", "63526a51ab6a", 0, 1937152713, "acbdf0cd60447063132f5ffa34c0bd2f27130b8c04525b50a5645a57c1682a9d"],
+	["01000000011d823113c1acadf31794202c8ab14aaed8359616f8f9768fbbc6e26aa702608b020000000600ac53ab53abffffffff04d991a8050000000007ac515265abacabdf4ddd0000000000030052513d555d0200000000076553ac6a5363ab371a35030000000008ac006352516a5100998caf2a", "ac63", 0, -1118365516, "dc5f4e437609cd4b3f97ac176de3299742a550f7014f1847f4cee6e0672161e0"],
+	["0200000001e3799ee16e0703c2d5aa4ce2d547c33e7d0899b8a13dddbac8814f692864352b030000000165ffffffff0321bba00100000000055352655252b602a805000000000563005363abf82f51010000000005635163abac00000000", "ac63", 0, -2031349344, "4470140a9a798f9d6da97026730c0243cfa0176e8d84718d359374bf8daa270d"],
+	["010000000423ad677a0a1e8e06b8368fee7748442bd8a7d4411636496054b1516bb6d86bb50000000006ab6a515352abffffffffc6c9c532c54ec855ee463788f2dbce699dba559fdd3c00ea6c00291549de615f000000000863ab630065655151ffffffffdc6b7e06a4c33996f72726c5d24a9d4cb9079ceec1ad6db3d71232d22613a94b03000000096a630053515353526a92745d7f83c7e183ccba93183c2d1fe751c9659e84c9db78b68cf7d3db31ae7f37468dfd0200000008acab655251005351ffffffff038214fd020000000002ac6a62ff8d00000000000100c733730200000000036a536500000000", "ac00ab", 0, -1084887835, "bb427c9b76ed603b49ec54688c35356ef612ceba155ad5d36d57083f8645d6fe"],
+	["010000000446c716adb971c277130db65a250a795601861a059b81eb0ac43d3c70971a6b790200000001abffffffff882b43c68d0478dfba3d37fab9799db5dc44f0dd54cdc1a0aeb8627360574b9103000000001c06021cfc349249508a90730bc6726daeee17eb112f9914f8e7741e7a38f5921e53ce280000000004ab536363ffffffffba4372a216a84fdd33fcaeb6320df0b2f8c432e3ae08e566a30ed59fdcc8c7d80300000003ab6352ffffffff02790e49030000000000bfdfb60000000000096363656a53acab005300000000", "abab", 1, 1450066778, "4d5917bb69065a266901de44d754492fa9d03bddb6dbabcd547c63eec927f5be"],
+	["0100000001b6bd52f198008cff24910fd232c23eaff1ad87acbb6a53124ebb5702fd55a90e0000000002536a368d42430267638b0200000000036aabab69340e030000000004ab6353ab00000000", "65ac", 0, -661823862, "dbcdd0d35914b7c8b70068054d73ed5ce51eff802a710c5ccae44373faefb651"],
+	["0200000002829aafe8ebe1ab7a857a0342d672c47723109405ddd3ec0216dd30416ba1cc880000000009515265516563525352e82a1da15dc579c9e707c08e028126270ac231419e41183989d540c0391ea733e22b3e420300000007516a63acac635302fafac004c5162302000000000165bbbadf040000000001633ec33700000000000552535365ace6ed7a020000000009656a5165656a6a5253808f3336", "ab5251ab63", 1, -1222269728, "d7c5bcc63b5e4a8012c8bcbf24b2d44994cd4d72a899905e3440c0007566b587"],
+	["01000000024e906313ecb5b3ebe779f23145999f5dc729e41f2bbc8a1b9f216bbc65825313010000000100ffffffffba09eff31a633e9582322c14f1fcdf535d47968c4cf1b2fe6ddf56dea13140e0030000000753acacabac6351ffffffff0123c86e03000000000152b7b0bd81", "6a6a", 1, -1900746302, "e6a8828f78bb0d5375497a76f2079ed99ff170343e33af7536140052566bc7a1"],
+	["0200000004b5d065a6af94edf3c12782ea55a15beae9e96a549c40f2b85fce54dad073c7780100000002516a97d48bc07641336afa50caff4aca2487e1c7c4b276a7cfcd4556572404f3345dd767d014010000000152ffffffff4d62883d88a7d019b81ddbd56e74aec8cfe9e5b760c196238db0e9e70aa26e7c01000000096aacac656352acab53ffffffffb1357e7190760570ffa5582291bf78228a4dcc66071e8289742043b69662eb2b000000000100cf1f8e7104006c600200000000096aac5151acab65ac65550334020000000004536565ac16c8d5000000000001539ad7b701000000000653ac53ac516a3a1b9366", "", 1, 1732219707, "72564fe8a1ebd70800f84636d27bdc846d7ad389283e65295150e13457fd3314"],
+	["01000000019a73d7666231e2dca8118ac4c6d1b9b045a6174a0f697c945d45cbf16e39ac67000000000452525300ffffffff04427dd2010000000009005265abac006563008e600701000000000152fe6bd90400000000086aab5100ac51516a4eed6c020000000007abacab63abac5100000000", "6500", 0, 614458628, "e9cd0f8a0bc502ccefa4d2b45cbbeac8ef32718ba2e1e55f09fbeecd6b560d81"],
+	["0100000002e1fd356bfa4d63b3a9dbabe9f3dd3b4279b84f3c22fc2f37fb3fb7c5a96423330200000007ab6aac516aacac103a6b29fc7a601c3e7e7de35c3c003f9dedc8e2075eeff7c8c753aca62cb5295ce5f6cd020000000452ab52631e632f5a015571a804000000000453ac005100000000", "6a656565", 0, 1124343374, "c80d36d0f316bd960e38ae21e78ccff8d32c06173af57ff862f7ed3a9090fef9"],
+	["01000000034caa24804eb85149167e2d64185fad70e8a822ef29871e2d94da9d84143d6cb802000000004a83e3d3316698cb19e11a08116ac491a75c78fbaf0f9b13ef5186c515c364cf45f2f843000000000565ac516352ffffffff6a80b8d47eabf1c6728a920b5f6ce64de48412a65bad7a1e53cdc405294303940100000003ac5265ffffffff04de6a2b0500000000026352d8516000000000000965655152ab52ab0051d600e601000000000200533ba86f020000000007515265536a6aac00000000", "6363", 0, -1070672074, "72b449d707e6191eef58fcb8797f6eb7575092a1320e2de020a004f45b18c1a2"],
+	["010000000399007b008a80d93481d5f21f31a4c752ed2a35ca328e926285943d0f34635fe3000000000151ffffffffbc20ccb2338c3cac5ed1c86b9bb6faee73a4456bcb4747bc2d0a03e2a2ff859c00000000056aabacab00ffffffffc78c5029bb1c34a9080f71b817a67d76069d84c93f061c0745062383fd8d064101000000030053acf5be90f501e7a9f60300000000015300000000", "6a6a6552ab6552", 0, 1691613657, "f7ae5dbef5a942b87a067ac2ba7cef576a3ac6805184a865fa355686a46c9321"],
+	["02000000043092ace6954e2864c3887cc3be456e900cdfa01ee4185e5fab579c254f572e1f00000000066500abab5365ffffffffb6c43d99a9ff109b562c465d3798c544b232473cde5642d96d0832b5eabc652d0200000009ab006a51535351006a865148a0023467bf3717986673ef7a728d4121a93763e358ac1adc6bd82e6a3c6e68c37601000000055152526a53e209317244b02b975ec5b51e0e72eed0c213e723d84370f201b8c59a625368710581e5720100000004005300abffffffff04fb0dbd050000000000fd396404000000000265525e113102000000000451000063529a7c040000000002650058411b78", "006a535153", 0, 190750575, "56b1c1f38f13f47aea24d3da9630b47fcdc993bfe619543bd3c0347b90ce407b"],
+	["02000000017ff8baf821f2e86847313f88c5c3029721fb5ea739c8a390941dcea77831536a0200000005ab53535363ffffffff044910790100000000003b879005000000000163034030040000000001008f74e1010000000007ab0063526aac5100000000", "630051ac6353", 0, -1717317777, "a6f0d8eb33cfc6f0ba6950345ca1343d148a76065eade95e2f56aa4c1f3cdd88"],
+	["020000000277b679a3bc31591efd6abd4a2709ffb8d94583161d86801c147c9a8e3d3889120200000009000053526500525263ffffffff0e6ae73ce8e4f37efcd8c91848610b5b2ba8874c1146b148a859fbb03d8affa4000000000852abab63ac6352acffffffff026c523d03000000000151031da0020000000003ab63003bb6149f", "", 1, -1909154572, "f6c2bd2fce52721a46c068c7eaa31298746e68f7a1822e4271df81ba8fd26dba"],
+	["01000000043292e1b1d4bbdb64fc33d84b8ce8f355dc099b81e491baadc2f9bc6171e3080b03000000055165ac656affffffff13861cc930a5b228ef0641635d87cf48accb98aab08e6b52ac3c577945f3391a0200000006ac510051ac5396a9bd7f5a9c828dfdf5c9dd7b02b22b5066646c77e14b08391ee05067728b52d26ec1fb0300000007635265516a5151ca26325bd56abcd3a18a04808337f1d3e6b1cf16a1261527087f373a4626f6a5204fb905010000000400ab6352e774697d0389cc760100000000036a635134582a000000000001532f564a020000000003ac00abc2eeba6d", "abac52536565636563", 3, -488975991, "b5a8ef63f114b930c9344a809956a021afb3a3f5282d5712d41f2abaed6559dd"],
+	["0200000001e7edb63a134c5b04decbb11075e00394de88f4e8c9118b655af0d1be653df3e9030000000565ac00636507e864cc020a98ac040000000005526a6553632889bc030000000008005353ab006a6a5200000000", "0000ac", 0, -1238191162, "40627927a06c70193b3756455c941a1889b40190f13d5f37e5e13cabdd9d5b89"],
+	["0100000004a1f2531141f5302ed04bc36ad4fbd141b2a5820bb4b356e2bd8fd6aade41a28000000000025363ffffffff4f0dcfa4a47687eaf70ac85d921b72ea89cb4bd128dbe53ec54d5ea5477ba5570000000003516553c92e67aed8a855d6fe66100677d64507e8b806aff666c2e55e2ec4af4956850eb9f978e602000000085153ac65abac6a63ffffffff86d7c10a02cabab31eb786999767baae1d4f111fee9308c061c24164f96904410300000003636500f407b774032f16200300000000075253ac00abac522b60eb02000000000951006500656a510053f6f36e010000000004ab6a51008e9bba11", "510000abac5100", 2, 913285234, "78bb2e065e91e925a66a6c732f257ac8f6132ed4f500391dbd3644ab3702e752"],
+	["0200000001bf718e829b213d9c6a15004f5e326deb481e4f458c859d4d25d606764f0297ae0100000007526aac00ac650045d2357001be9de405000000000953ab006a6a635263ac00000000", "6553abac", 0, 1743492969, "824caecbaf2875ba42658bb7b10d301217e9b941fab34c296924c4a55908ce75"],
+	["0200000002fcad77b891dc74324e52b7e92de24c120f8609594e379c587264f3e10b98464c00000000046a52ab63ffffffffd5cab110a6cd7a527ae73221e4d63356c42bb3f02f5e7c6b2a3448e209ce195601000000096551655151abab6353ffffffff048e6ee4010000000006515263ab52000750690400000000010021c46e05000000000965ababac655363ac6a0d254001000000000265519cddc4a3", "53636aab63", 0, -635031111, "40848a93e696295a8e8df2190d1b24f7bfd166b8a62669b5476cf4f5d1071397"],
+	["0200000001a6d624628115d46b1a0f4ab0899347de0b27e95878f42bf1d45f521b1ead9c4e010000000153d203970b01e95e91020000000006ac6352006563f9d57e64", "ab65acac6aab", 0, -1678302907, "1fd36efad78a706510d0534eb1dddfb2c4eb7845a301ab2da418a3aecb2584d6"],
+	["0100000001734fa00c51687f0907206141ac9830e5d54f3c293c4d4dce9fc2b9a0c8410de30100000000ffffffff015eb2c703000000000552ab63656a00000000", "", 0, -1355309770, "107a4737e8ec5eea9e005f4cb7234ccefcfc3521b057954414d6232e69ce7d77"],
+	["0200000001d522663db58eec91a251aaab3e3668a722bf400de0e61186635c663dc6ea7c40010000000553ac6aabacffffffff04fe28e0010000000009516aac51ab51526aab16043b02000000000551520000abc6060b010000000003530000847d66000000000004ab516a6394439ab8", "005300", 0, -1469473, "df9ea6b8e5becee0cd32d6c62ae8a7440bc58c8a0d45ada26d1afaf6c79cd3cb"],
+	["02000000026db55862b3514e11fd569687df3446ba97356a9aea3aaadf9d1b922fc8d4156d0300000002655188cd59adedcab8946c8e68dde8e3c1681f73bdac02abb1ec2f8614c5100529058c68f88b0100000004ab53ab6affffffff02a06bf0020000000002ac5265d48502000000000751516a5353635300000000", "6a6a5153", 1, 1601302440, "c5092cdaeb1bfd0ac1040c11f473f9e72e78c3f07e404e6216cca2ef89b543d2"],
+	["02000000020126575c6b861141255e6292c01768a50f5cbfc1e78fbcaa5cb7ac08d044d3c5000000000253acffffffffe2ec9619daf946900a5722ea1aabc25d49e7259307d6223493ce98190f27245d0000000001acffffffff02d417a00400000000035152657edcc500000000000852535251ab6a515300000000", "53ac6565", 1, -798789696, "0d19288c994966bd312f3ef5418e4066ad4c88cda34dffe9426ba919d8444c82"],
+	["01000000033503d8c5f551d761cdf348a12ff605221691ea851d1a428b79fac1e3a0bdd8710100000001acffffffffcaad947ad15b3a7deb4de515a2d5c121bb9a3921ab2a7d0fef822cc6844329ba03000000001f74f8272377c9a48b4804884794b4de1283fdf79486528618ed23b8c0defb5f37aab34c0300000002006affffffff04a3eaf203000000000253004a131e000000000006006aab65656aa7599905000000000451ac005321934100000000000851635252ac6a636a5ab67745", "6a53636a6a63ac00", 0, 384489214, "dec236aabc37ce2c53660a17205924c30415e8d85465d9239138e265c3f5cf4f"],
+	["01000000046b4407493c1975393e991ac04d87fa6fd7a6272294d0a4f2c80f7873833e54640300000008006aac536aac526a1c09be6766f6c1b424e75112ab90f7e802940197a1f6806095387084c10fb7b12e81ca1402000000016533fd65c611fb7f67de73b7d2cab84017839e64ab3199c05f098d66eeb620e44fc18164b600000000046552656affffffffe3af79a2616a6afb6900b52bdaab694ba7389a6e8afe09a50e07235852a0807f020000000251ac475498e90424fccc040000000008ab65ac6553ac6a65f941a1030000000002526a89dd29020000000001ac624001000000000005635153526a6a7667bb", "ab656352006a516a6a", 1, -1932846165, "6572945db2483918b51789dd472647e8dd84d51560c1e465024ab63f99f0d383"],
+	["02000000010879152848597e04345b49e638b180159d12e2049d2794295352ade03da64cf1030000000453630053ffffffff03524ccd0000000000096a5153ab5300ac656522cc1b0500000000016528adac030000000008ab6353636552515200000000", "ab", 0, -1694816276, "949b38920977fbe5c4f45d2366f451225b2bf22c9095ae3092ec2c18c5b1500f"],
+	["01000000040ae215d8945c7ab6b3ada30dfaa423dacbf149d6ca678f2ee8f52b618bc3adad0200000003ab6aacffffffff0d92e16f4d5b6424cfece50eccf0ce27ea992cfa6c06fe603baab3cddec2572a000000000552656aab6ac8f78cfb36be30986613ebad6b665f576692625461b21442d45038a682964f5ca0d0d7db0200000008abab656353ab65512d29c7faa7f5b3694d5d9a55ebcb70d989f5707df7bebe6d7231b52ebacb5ded06a728ca0200000006526551abac63569066a2046fd941030000000004656a6a52f8abae0400000000026aacaaef07030000000002ab6afc4a25050000000006abab65ab636a00000000", "ac5351ac", 3, -1169360239, "557df1019628443d80f2c99ca51f2c8063305ad475b1f2c05c6663d80addb17e"],
+	["0200000002d09a6c80c7858aac671ac3ec3830635fbb88fe0caeda46b028a6667efa74ae280200000006636553536351ffffffff0842466d79319e7311a8af36865880b62cdda90b29cc164768416b5d1a378471000000000651000065ab52ffffffff037dd1950300000000040053ababc104fd0100000000016ab95a4700000000000151e20e8746", "ab515153", 0, 1513984431, "914881b4c2c7a618853bbcd73e4721f1bb91b0c4b70584c78361c77b6f8c9dff"],
+	["0100000002fb377beeb4712ec8b61af7f06a1133bd0fde7d625451eaf3fba512362327edd6010000000663ac53536a00d15a5943e327c09b54b9920567f873b4942d93bcb19f43d583a3e811204483af47bc72130300000009650063ab6a53ab5365b59e3b1b044ccaa0040000000009006aacacac00516a51eb814c03000000000165c5eafd0400000000036500001d9aec020000000001ac00000000", "6a63ac656aac0063ab", 1, 197644119, "b35ea5fbe610fe730043dc2e9a794e16c92730d880a2702b5bf83847358e1e5c"],
+	["020000000496f27629913f087e5d5ccb65e1ebc8a911856e8b6e936b523752b8e3c160956c0000000007acac6563ab53ac86f290b110940068781e2d2eb47015212834c9b7292cf771dc7d5352d9dfcd91df07f8c201000000025263ffffffff97b9d0c5315460c0246ae67c35c3d43da127fea24e49e67dfb3d519ea041d0d9010000000200abbe52b6c79fd05feae8ed681ac3034d1e4407a6c4db6360805d10d5014974c03ef05a8f220300000003ac526affffffff04b4b2ac040000000000c5067c000000000004536a6a6ae56cbf020000000005526aac00007677cf0500000000076a635163abacac45f7d80e", "51ac", 3, -822790401, "982de068265399439b567731bf8df1124bd38b62db50c01c2ab4e45e228edb64"],
+	["0200000004dee025a1eea74dd8875a88bfdac595a020682807e0a967039f15ba48ece3a67d020000000753ab526a536a00ffffffffa479350631044a8617220a42b1f61e2ce8eb98bf3108536b2eb02cd01b00f1cd0200000000ffffffffb95d7a8bdd2839aa945dc37dd3a64489748d52a1939a9631c38e96de6413db780200000007ac5300ab530000ffffffffa4f3a55f72a181150618804dc8a5a7a90e58757f956c1d44fff07bbc00731b4b0300000002ac005a63bd8e0346d3b90500000000050051ac535377499e0300000000076300635153526a2efe57010000000007006aabab6a5300dfbd688b", "536a0065", 2, -1527518032, "a36d7b87a22eb9ed0baf43b7f4bfd61814fd969da6d1538c47edcb06db46eff5"],
+	["0200000001304fd0bce206ca30ae1423ddd1603c6eea6508e579f576e0dd2ed5da23bc28240000000006ab51acabac51aaffefa901716a8602000000000551ab65acab00000000", "6565", 0, 2135318928, "93a6b45e662b5005ace3fee2e017c38cff5eacbc04d638325a57b54caac3bfa1"],
+	["010000000249a36ae5f5bc440e8bb4327226db41dc4fe88184ae42eaa43afe187bc9bfca51030000000163ffffffff7469007b6f0e82f9a260c21bd689609be4af96b631d1726e967d371c8e9ff3b80000000005ab6aab51acffffffff04a4b57e05000000000853530065acab6a6345a060050000000009acab525352abab5153067a9d000000000006ac6a0053536561517704000000000863ab6a6a52635253105ba674", "52ac6a535152ab", 1, 709042824, "c3a3a9c02e8c1a49e7f6bc391500ffb0df697729298a4e1a03cda959f7a205e3"],
+	["0100000003b7d852de10db07d226ae471df53ffcfd08d587f7c07cf0c47eb8270f58a1119e030000000665acab5363511b576927c94adb09353a16a107b91003830cb7b5ee893aeae4d8bbec1cd21cac5f70eb350200000005526a635252ffffffff6c4ad59ea5fa8b5b38ba70f112b26d156fc53331e29acf144016ab76a11f9c4502000000025363ffffffff026ea71e01000000000152555ea805000000000700525251ac6352b6f52af8", "53ac65ab53", 0, -1639592185, "456aefb9cc5d2969b6c6c58b0efad2549017c7a5d756406d6da5839ad40d3c21"],
+	["0100000002cacec6b4c9049d83ea1cb4c8f2cfdfef55e31fcbf8391d24f0d62cd240529b3e01000000036aac63ffffffffb1152c611d68841d08617ce2f41d6dec4086dd986b4c3a395e2c104d625702a5010000000851ac65ac63ac536549c4ea6301ac2939030000000007ab65005353ac0000000000", "63ab515352", 1, -1257271659, "c8db11acc01e4bfc8434dd80fbf46a6b552e906b62bae1b9026487c383f707fe"],
+	["0200000004aa5013da19105b2d9e76a44d8f7e3d6e4d0b5ed453a487810847e730a285ff010200000000ffffffffbce74c174f91615d6447838c13d7fca90cd688ad2a46f8baf62995b3532d95ca00000000066a006aab65000d578ad7510194c4618eecb9f0397ac0364224d09d71b18ff05233ffbcaca0d34c326e3c010000000046d0fb0baa693c78d2addfb7aff98c869bf3bd3243208199ef54677a70302541f643228900000000076a53ab51510053dc89784302555b8b0100000000076365ac656a51511c3aa1010000000008ac0000ab636a005100000000", "51516500ac63ac", 2, -1795166161, "759c2930fe70e1f1fae2f6d042275bd0acbf7656a756f2a7c29977114640a1ba"],
+	["0200000002e8b05daf9428d760dc8b7bf71d20e37a0428bb7deabc55c3dbb41ae2c08860c6000000000100936d7acaa6786b9570e443c64d19d2fcf005dcb3d12101ba508c30ec2b9ae78344e780500200000002ab6affffffff02c120ab0000000000036a51ac93f28e0500000000015238323756", "63515263", 0, 461261861, "e071f882e563893c1648a4bcdf03c32228b16d01de58efea04573467d97033e5"],
+	["010000000210fa8200fbda4d06f3043c0eff9701298955171d81e0e85a4c26bf421e34d31700000000060051ababac00ffffffff0589d4045987b251f99479096cf4258367f459627e719b158f472fe7aaa04e2902000000036a6a52ffffffff035d38dc0100000000055351ab6352ec4d52040000000005ac6352ab00627fe203000000000253ac0f28e1ea", "656353ac65", 0, 1849461826, "d52c3d0baa1805c808a71f6f6ed4faed79475c1545093570d13dc47656fe13e9"],
+	["0100000004c97306a15f8e63c6a0ad856d32ab7520159850d98c8bc48991171d52c510178f01000000075365006aac6352fbc9ab634f22421bd9bb01376fca47fccada27f19ce2304a893be78646bf4e43c8de18170200000008516a53536363ab6affffffff26d18b3d5368a31f20a096198a8e02fedc283ff46089ee1a19b9e28e239fdc790300000006ac5265ab536593e9fa119bc26dd06b15e9f66b013c96828487496be78736ea2faf1e1ccea79838bd439401000000056a52535152ffffffff017d7bbb02000000000353ac5200000000", "52", 3, -496909671, "24ab7f67c488ea6cc1056958698d7194c759b8b76e9b3b5ea5e706d7c2d74fcf"],
+	["0200000003191b74c38f46ca70bd2c293aaa3df9388ab457bbc992a52d3d34c448e6045b92000000000351ab52ffffffff4ba7946e7ab589d9d43eeceeb8be47d3efb8c85fa0abdee227e66b808113dcec02000000056353006a53c1d71251864933a0a0d6fa209280d8eb9785e09168f26f9fc26f4786f7d4e7302fec0bfc0000000003ab6563ffffffff01eb008600000000000400516a530a3c3bd4", "", 1, -397388665, "b99cb9de27895b1f917e4e4f446745b8db2bd68610a1e49077418e6327ddf243"],
+	["0100000004eb6c8a2e88da2fd2ba4b72124f9ee3a11a57b5716d84cfa3eaa511481cc34c180000000003655165cb29dbe40f28f5220b4e992310fd95287638cb9a16ebd8dc686301b1822ec890f968ae090300000008656552526a536a00ae85007f66cb1415bb5ed708ae9bf1bbfa50e0009f4beb50bdfc51269581b44b65723beb030000000963ac006352536565abffffffffda54925f7dbefdcfbe07ecfa5169a8d23a0e62522d36da10030d2fddcadfb38301000000056a52635100ffffffff04bb27ae010000000000ba6c3702000000000800535253536a516a3d2aec010000000000fcdb5d010000000009ac5365655263006a6a00000000", "acab635100", 0, -112809752, "0778a89936d817d683e9e7b3026ae331a3bf230c9a0aae3596cd30406a9626f7"],
+	["0100000002ad15366367d01ce55e0d1437ca7853acfd64cb21935ab7468149c3f366c0f5210300000005655151ab65ffffffff3683fcba6eed839db5d45fdc1607b74a6d1684442535c41a30f6d79f1f55216b0300000008ac636365636a5100ffffffff01a072ee020000000005ac0065ab5300000000", "ac", 0, 945223572, "23fbd0d752e3e1e43e22695f3e64808e2e6dc87f79a0fceac0816338e70f97fc"],
+	["0100000001584f7144a907cfd7e4804ca8012c584f8d6ce86803f047749c1a7bbab940bf990300000000ffffffff0280b63505000000000800ab53ab63ac525393f9f5010000000007656565ab51abaca1841404", "", 0, -808227476, "672deac36e553b76539e21ffdd30d4caf6b7e082f0c7bfafe234d370a71f2c8f"],
+	["0200000003e8721f65e8edbd07d0df81f8517964b75223a83fc9f93637ad65c37a9969f46d000000000552ac63ac533e77a9864d471b306d5027b3e6f7e5665d0dd41aa462e62469fd26e3ad2c678af83a59840100000000ffffffff714fe9e9da241a265dedacbb37f218b0ae25e34d773205bc64d41ccd4af44a780200000003ab6365ffffffff0237620704000000000100cb009301000000000563acab6563c69a1966", "5163ab6a", 0, 155507786, "3eebfae7c26bc550571b8792fc218abbd8a746e2f71d3c24dd5467814ed50d1b"],
+	["0200000003bebb4c81b5749dd2cca19f6bfbd31797da59cf841da99d3355109169cb36d2890100000007515300ac6552abe28c5387d2731ef5343bf00ad5232b0ee09a46cdbde8a1991df00563bf3652bd65eb211b000000000100e95fbc4f9e2af8949b108f8d1416e77517b13c767163ef8594cb47577a2f2faab17a3b600200000008535151005300ababffffffff039e9afe020000000001519aae9c030000000007acab53ac52abacdd2ef30200000000055253acac52af53542d", "52", 1, 656726416, "fa71a5caef12722713ae6a8b4425da67751c74cb09c74cd030a44a8ac0d53212"],
+	["01000000015682372f0984e25f3110dd83f5f270cc618ea95ff4b7ca0e5b7db9c1bdbf6a5f000000000452525353ffffffff02e8f17f03000000000153ae116903000000000551ab5163651b360ea9", "53acab", 0, -1408860736, "b809b046d51e84f00fe157360f621953fc584a7d704febde4f137a114e2ab488"],
+	["0100000004311ef35aee7033124828e9969eed06678535f22738bef90e6fd6075e6f36c2fc0200000007536a535300006affffffff7c8a16c8abd30c59be285b2d94b5bcdc71e2fdc230f3d723b6b7f8e343b6f5950300000006005352636a65f80b99457acaaad7ccb7dc6d418a331dbbe9f5ea1c973e70c66154e307dc13ee9e9d07f1010000000163aed4c4dcef0e05fbc32565a20fbe80be258d4907bdb49195663710cb6b95a9f69ecb9dd50300000000ffffffff03d20b3001000000000763ab65acac516a2e8bf700000000000152fd450d020000000005ac5251536500000000", "65ab00acab63ab", 0, 169090280, "6f0f89b5a25b6819434a71f85ac3c983882f5f9565e18b2cdd40097a81ff1d30"],
+	["01000000019781bb5e2fc71033c1c7ea9be18e36424f958f4945543b2f4e1fe4147aafedfa00000000055363515353ffffffff04a878f402000000000963ab535151ac6a6352ef78df050000000008ac6a63ac52acabac4c046902000000000363ac52b2b8d40100000000025200a3882246", "ab6a", 0, 63141788, "16175d38f2d66578295aed9af2849e663d741fd5bd4459aceeafeb4f9aa23198"],
+	["0200000004912557f95d740d510eefaf27fdcdcb9e81072e3b82c9281236b842dc18d79a1603000000008538628b25d59957873246d0351193315a7a03c83cd66529ab37b9169413243c0a231b28010000000553ab656a6affffffff73680fc5f10cae734646caff1715e283b3a7b7f3627433c9bfe4075892502f310300000008ac636300ab52ab52f1eef96ca3d4e53e615486e567c0f6e74323a9607317ca45bf23887c15daeefcaccd2b7301000000035365abe18ba80504d1a0f1000000000007526a5300ac6352541ded000000000000c822470400000000026a51ac40ea000000000006ab635252526a3a1358ad", "6a656a", 3, -1157134045, "5a3f32f1cb92b62a0a93f269ee0cb77664175f581fde4691db9c0efb3a706d0c"],
+	["0100000004abc905a2c83bcf20b3c838e857a6d0ecda5edb31c1203009686d7ccd85bcdfff0300000004ac51ac6affffffff047d2adfbf66655d6f2c950ea9c8bc9316562cb868ce67b6b23646355383cc590100000007ab006a53acac516f33276206fa5523505ec59ff169d4187385dbc4a85b2be3c08f4913ee9a77c5c6760a4a000000000151ffffffff47fb4d4ed2dedde6e1d2b32e1bf5efa6e1d082a10bdd197a830d8b271f045e290200000002526359e762a604e1a5be0400000000085352636351515152b51e82040000000004ab6a53abde315304000000000163a9890800000000000863635352ab525300e8d9a9d0", "ac6553656a515163", 2, 1579184822, "2337e651c3ddacc19c4cd70fbee7d39bc455a36290a62c3ed37796147b53e06a"],
+	["0200000003c42f2f388b73fa700662def4560d570d8d1067ea1ca704ae799609cd07acf74d020000000363635306fd2548efeb1b0b840439af85ba8913441c81ffcc8a9c45a286e8ded565bd962e67d08e0100000006536352ac5151ffffffff6d792edd66b5b4b49a290ff53904dd50ee6ec63adb1d6718c4b2ae807b18a72901000000056a63526a53ffffffff021e7d4a040000000006515151acac63e569650000000000060052ab6aacac00000000", "5352005265ac", 0, -1349618142, "87c4550d8c0b4bd5816e6fd8334716a96e31f3bf6e97d8d97d5e895e4cec055d"],
+	["02000000017975f6a23c868635d25ce82405fbe2d1962df53201115aed76825d41e87d70470100000004ab525300bcc242ce042215a400000000000151335169020000000002ab52082c3d04000000000152bb94000200000000080053ab530000ab63c459472e", "", 0, 1911314896, "f00c96c68fa44ccf671ce4cd5f1372941feb0bead941a4ee98d1f312d143a13f"],
+	["010000000136cf86d6eb590422a8e681a42799490221b3b4289f001dff9ecada5a71edef61000000000763510065ac6553ffffffff0220b7ca020000000002ac65566a41010000000007526a535352abab00000000", "5252", 0, -1482703781, "7867d18a99190bbe930b82d180ce361f6ea292ef6426a1d5ce876a60c724ddf2"],
+	["0200000002519e53f2464d028bb0e53cb7edaec4ba8a761c15ae55e3292dd830ee6fbc22c50300000009ab00ac52ac636a6363ffffffffb2c027f340147ec39480b9d081051ac3c0e0650a17cecb2569ff62962ce87ec5010000000565acab005158348eca0133f2e7030000000002ac65cee75d51", "635153acac6a5352", 1, 1145668601, "21bcd88aa3ecc5930785d321409bc6fcfb75dc047dc7d38f1112a8e47cbd58ba"],
+	["0100000003aede85dbff503d99453955025adba79b7e36a689c921ad07e57a1b4b22b168960200000001528dbbb0092bb012165b3b9f3ae0111752948f983e85a2935a6d47cd439a85cc0503c7db1b0200000002acabde74c5af0e4debc1e898e6fb668f77dfb54cf4daa979866b5ed24f6f6bf101d8d4a18ae901000000056565536a5396c473f20177e505050000000006530051636a002c5aa88d", "", 0, -462522364, "6bff53a51bfcc2b24df773acee2cfdd24e59a9105d4516a73ffc95a881fb5cd3"],
+	["0100000004d59f915c7e107c595fa883d348aced2805d4788a097de6559e61c29e9f606c8c020000000163f4fd0fdc8bafa1ae402172b16ccea2be98c46b5117824749f04a480ef74be88cc20910d20000000003ab6a6affffffff10e2a84726ebc211e79d265dd653ffbb15ef31481ca0c9b46a75ab50e03b4c8d02000000086a656aabab6a5165ffffffff0d9ba9ca7d71111577b0ea23fe0cd385d275063ecdede93075ef13f88e75e9c102000000004fe0bf3b04a282ec040000000006006a52ac656a3827df02000000000352abac4bec9e020000000009526a535265525265ab83c8f70000000000046565656ab7e344ce", "6aabac00acac5200", 1, -995102105, "2d2f7aa7c6a44660c4ea89a5dedf9c79a2a9396603ad0e4bb22545eff28e981d"],
+	["0200000004b36d2d8a98375281c0ab1b3a0ace918f64be943d792ac20aed7b77fa98d3f92502000000056a52536365ffffffffdaf59aa86df3f6b5a40978da2292ecf004db64bcfbf5680aa1c2b4dac235dc31030000000563536500519edfd06a286b9f9b59e77adf22283a9dc64e8cd22f8d2179d2ec5f51dd92dc35594dcb4700000000066a6a635253abbddda216c21326e8c91e57b42f414c0ebd11eaaaf3058d71b8c03b232b50a8cf2c489644020000000153ffffffff01bf973700000000000551acac635300000000", "", 1, 1215698669, "07bb138469507cffafd1239cecef6f3986281aad3df74c7b1c47ecbcd190c2bd"],
+	["02000000014ab182f2ff5769feb7f7d9a76375b9c80dd641598eda2ac73b87bd1785754733000000000152ffffffff01552c8e0300000000010071ebe18f", "ab0051006a5263ab65", 0, 3533217, "6de1bf0790b318fb74f8791ca40737f3a126bface2c3ce3cc57e4d58c3fd4c7f"],
+	["0100000003239948197ad832a47f9b996cdd77fd729d389db8eef69606980922bd4f989db900000000085351ab6352005351da85b207019257416f2ad391fd1819966808bc2cae3bac3da6f4ed4132b318918d60db670100000002ab006e132625c0492cffe058502dc0f34631eaedb9679711341bdd7446f0879042009753b3160200000009ab00acac5165630000ffffffff02b776a20200000000056a526a656ac7844700000000000963005100ab5365515300000000", "abab516a53ac5200", 0, 278791271, "a4620115eea69a713863ce27ba85cf02c93b667cfe93dad318965d809a48bca4"],
+	["0100000003d872b7adec8c2d117dd3650db8ac925fd13d4184f35569c08a56e756510e8e78010000000165ffffffff480000a7e57e4154b50e0b7501e07bc858a3a370b744cb6b600ff62b7b2ffa930100000006abac52ac5351ffffffff1fc6722b3b804e415dd44d2f3f99d9049a85d4f38762e7b76726127c4d99331f030000000071eccaca022c5c3701000000000051a3f002000000000252ac00000000", "53636551", 2, -642772777, "b62e9fdfbfaca0124b26e6bf435d259c8d1526f277b00707969767339334fc21"],
+	["01000000020a99e72204787c26df19007329c797e3530b5352553d7f5288e7597f426776900200000000ffffffff470aa2d8fd4a53041e3b69934ace87c55940cf20a1aa1448be45720e52812b7e020000000863635200006351abbe45076a03057d06020000000006635365006a652ccc5702000000000452516a523353fb01000000000253535cbd4f78", "636aab6a51656353", 1, -261241237, "3dec8427d0be285769fc9e25d58264ad5b0fe1bfa0e85a0d0c8b6b12ca5a66f5"],
+	["0100000003646b63e3d6166c0e5aa52125df7e7d69065194ac7789772360e03132f605738c00000000056a51ab656a5923ece1f6f193fb6f5a92a7d4fd07a88c98a4ebc03d89e32403b09a74596acb15b6b3f10200000000e188691f5ba81cf056f9ef3ff1537b59621921ec2dbbc69e1448df9b58a19e1423a7e6650100000004510065acffffffff02dfcaeb0200000000066a005253ac51e09f7e050000000009510065ab6352abab5297efb93b", "52516500ac", 0, 1014165714, "3f12e2ce036befee6fe34aec6c040d1600c76ec090912c411d62772f8b4f3ba5"],
+	["010000000290dc9cd11b8900643487a3139a46269af32b77da82d4d269795e45e5983b1cb201000000095165acab515253ab65148b6a0d014de01ca98a99bff9120e07add455ea8ead0371176f96f2ff1b1bf60161868402000000025153ffffffff0251a78d040000000002656ac94a16040000000001537498d829", "ac5165ac51006a6352", 1, -1280122673, "46b693cf0a0ca804211e7988be3e74fe902c01366adf6ea4d76160e1c6d5ab7c"],
+	["01000000019c7c18e1516d2d78870c596d31d3694ffd2dd1acedbc436534aed89ceb701bcf0300000009526a525363acac5100fcc8645a02cbc4500100000000096551656a6500ac6353bbb8aa0200000000010000000000", "", 0, -2053754124, "11d6ebd0fed2808955104a19141cf3c4993c322ee0e6f76cb8365895d54b1328"],
+	["0100000001c20b71c8202df24f69ae78df3b55923fc670c3fefe77178ee2439db354af53f90200000007656365ab00ab52d66d096302371bb8030000000006006a6a52526adafde804000000000000000000", "636a52515263515153", 0, -347149704, "2c653767c3b41ef2a7fbffbd17f0f2d57ced97dd1fbb06eb3157c53afd098643"],
+	["0200000002952832343341619a629b67218739f28e8bb7839bcc41e342754e2c09acdc958d03000000008bbae690d24212bc737c473669d9c7c780bd477986dc954de161703de7c9969b6d2c10a703000000020051ffffffff04d3e14605000000000663ab6a635363a54c540000000000025200dc941c03000000000753ac00abac6a63c54cf604000000000023a1a4c3", "006351ac515363", 1, 2009769444, "1f8ebb99916980a2e411ffb102daef3338f61844cea74bfd4d1e410bf7cc843d"],
+	["0100000004d34f731323b53a9a184795e0baa5701dae03c51e95de12b3f68b5170bddcbb130100000005515352510049b4fcd848c5950c7eea61bda5a23a7675dc8f19023223fbd449c3b8dcdad5bd1c58a4060200000003ab51ab5e8d127abb44d6c0b9c3f1791e3ef8e23d4608f4c471f13e250c8dd7600dd52920f4ca070300000000e08a77f16c3672f086e8bc8b0cc6611a253273428ad75273f19cbea7c87ffabfb574b64a0300000006acab00ab53ab198ffd0101f18b32040000000000d66ce5df", "51630000", 1, 1185664449, "d522e1dc988693996e56272239a6beba86353b3436787ce101a785193828c182"],
+	["0100000001dccbe117af197e340c2a75961dcfbabdecc50a92c38f1f8d175fc35fcd5054800100000001528fe614d901f679cc020000000007ac65acac6aacab00000000", "", 0, -1033256435, "d43f389fd67f73f100c98f14ad6dbe6c233256445a8c7b283bdf114cac7ebd5c"],
+	["0100000001173d15d7ea230b68fa61b74804e0ae922685c1e7e3ca73c3a4f30a7ba65ac3b3020000000165ffffffff03455006050000000007635263ac0052ab3aac7e000000000003abab516b8f2a030000000006ac0051516a532601e7ad", "", 0, 547674670, "e79369ef9542f143c1c4aa7ac3f914972a502e55ec4a08a0082bceaca7208f3b"],
+	["0200000003e82e1fc3f15ba6e68952945675a13c0b5b315898667c01c01cabe729567dfb910300000000ffffffffa971a483bd460d5e75dfab3571807bc28b26ac36378c024248db1bb620b8cda60200000000360343ec035257fb84ed762e42ab7ad5a37dd1fddd6a7dd9dd8fb4aead12280eac2e47ef010000000163b134759404f9357d05000000000463525263bddf7303000000000963006a5352655352ac0729220400000000026a6a610595020000000005ac65ab65acaa350647", "", 2, 1723445415, "f1a29723e76aff3f3a7a72a1437d4a701df701fd842118e7e22f0e00358b8ab6"],
+	["0100000002103e3103bb4ffb8ad9e752a46679c2c33b540da789a9a2502ca76c3cb01746870300000002ab63ffffffffca37979bca160d5618dc29083cf39a56f58224170a923736301d5e5b646db9190000000006acac63ab0051a400587904db761e04000000000765acab636aac63524ca50500000000096aacac5152526a52007acfcb010000000007656552ab63ab52d5c9af020000000009656aab6300516551ab4a935f64", "00", 0, -1398654011, "23967185dcd66c0bd63f5316c9414514f1e5d20a6419ed209318c541e657bab8"],
+	["02000000049b0e91026cf9ee59f30b2ee6b1fe9e49d1c04c365bc3102aaac113846634642e03000000046a535165ffffffff88a9b6b51c2ca78f74eda51677499af96acab15c22a412786047e938aae8435e020000000600655165ac51ffffffffba40760f01cfcae264d7fdf51062bc56d33e9ddd76cf1427fc267e7700f581bb020000000400ab5151c127543afecc5a810cf1e0975709c3f03837acbb2e5beb8e4b7b72ed68c4b37de3011251020000000151ffffffff02043a09050000000004abac6352ecd307010000000009006a5165ab6552ac5100000000", "ac", 2, -2083979130, "5f4742def193fbcdf35b80c2a38a48025cb964420de6b07f644e335ffba1b1d2"],
+	["02000000045cd37575c8d6c7596c18a19974e51f626e237f04448d1094fde87e6302feecb20000000008650063ac6365516a5128450247ce0f65bae8c862b063af631341bb00f54a066265abb0c24658ecf82472f4780300000007005353ab656a6affffffff7247ce25f394be767d5a8922493cc4d4c85df8175266c495fd9dac8a2a22d3370200000005ac6500536a3e3542c5eb73fb9ffab6c7e3af0b40238ecfd4d0b8c5d569c25b2cc84fc38cab585669530200000009526563ac00006a0000ffffffff01e44c6f000000000002ab5213fb74b4", "6a", 2, 783741594, "30ed58b5c5208281414170ea9820aa81b8cb57788d66b3b5e49cead0a848eb40"],
+	["010000000247d566848390bee63dbcdb8feeeb4485e978481ea40b8b7c897a8d5aafafa7660300000004acab6565ffffffff59adb85f94fdb97495b03a838c2008b6b31a955964a069ce9bb75183ec2dea6e010000000463515365ffffffff0296e37b010000000002655363943f0300000000096a5252abac53656aacdf4e00ad", "0051", 1, 1276103491, "ec308b79483771ed6858fc80a17bd1b634bdbb8188d904673f544fc9f441a2ee"],
+	["02000000010d947567fbf24b4a3f01a6d0ba1c3e85c77c3f4f02e6fee08b6b6602be4405010000000007ac65ac6a00ac51caa3bd3c046a7737050000000000f4910b01000000000352526363c88a030000000003ac6a0067f4300200000000016500000000", "526a65", 0, 1729948814, "7c320d67c7009384bcce45cea39036365667c6daf95dfab248eeef6245434081"],
+	["010000000325ee4b9e92af79558205b369380fa11b0f4ad1557c51534841a28b1dbdb20d6e000000000953ac51656553000063ce2b4653759b497865c226db0b86dd3e94283a5c9cd5d1ae9330719918e551afe38204df0100000005636a51abacffffffff0db6329ca754d2e62cf579e833f78e902754071922a0fde2117442dfe318460c020000000152ffffffff03056db204000000000751006aab63006a11697c02000000000351006a4b2f5a03000000000765ab51536352007f14e3e2", "", 0, -1375849579, "4aa0b7d6d1f0425612e75f22a83fda9ff3d50bb505ca2f7cb4a0d9f07c3a7194"],
+	["01000000012a74ed2307db121906cf53f3050ae2f5f600daa15048fd098515771b019f0784020000000851ab6500530065acffffffff0275077e0500000000004e6c530000000000025163d77520ec", "52516a6a00", 0, 1194548809, "2c138280dafcc49cac0e235cf7f426f9ecd462fc4e849ac5458c32e03d63f92a"],
+	["02000000027d0813c58f0647cdb5c80477ad5076bee49e1ae81c752a4e31604ec1b1c6379d010000000263aca9d0c97e5fe3d09c14cf97e06e30e37bcb2681513d9df96997522f3f97cfe58175af423d020000000017f606f1021a609d000000000005abac51ab51368482030000000007535251ab53006508f4472a", "", 0, 1627321907, "b5957f26762cfbe086ce94f6c20d5e9c3c7d93b385552dd3c9946415947bf2f0"],
+	["020000000449a1537e84466b73ea718cf9f86e4c261c49349884648e3d5989d136c7f2136b000000000653abac636300ffffffffc23ba73881205353d7b30f5cfa089327d0f948ada21929ed37122453d0c72ab2000000000952ab53636a65656563d605fcfa019688b1f7d3ac70e9f375172e0333894b127a8c43eb311ea526cbaa888446e10000000008516363520000ac65a8f17802a66445d628e95b89f62d7815060e5e970b796a5ba0bda0f116707646330b4c4c0100000005ac00ab6a5397228e9e03b48c7a0100000000036551ab6b3de3040000000004ab53abac8bcd60020000000002526a19208b62", "6a6aab6aab", 3, 1614793800, "e01c4c4802e4146a8b772d588e604da232a7810c6861cc24804dfba73ae79b32"],
+	["0200000004839eae0453edaf9a89d275e969152d5b2af6ea758669c5b602ad94ac227166a5010000000900abac655263525353ffffffffe93c50137e97639cfe750d236cf390f644874f0e39653bf597490676a0bc49b902000000026353ec1d24a2e561f96adff80a8327487d109a27c51ea5f22cb1ce91e8d7b7f1bbdeec908915020000000352ac636c5e10f3736d5a5faa905365d2ba63fdbf2889b11155d41977f5e265ec5a4e6b4762709f03000000026365ffffffff040cd18101000000000500ac52ab65c24bc4020000000001650bb44c0300000000096a5253ab52636aab65e64a7a03000000000800650063510052512c1293b6", "ac006500", 0, 1723657020, "8ee9a2bd83986ccb9b59f336b27894fad2bbd60c1f3488d244b7dfa321606482"],
+	["01000000018c2348cb11278c44f4cab4a7333f1d9db75535766dee54f3f48f0e6d52d9ed71010000000451535353067275df02d0b44704000000000263529898cd040000000002530000000000", "636552005300", 0, -706801118, "05f15643369cba085af7ffce860db046f19dd7e8229b08fbcd4b82d2ff2e1d64"],
+	["0200000001e840b8e86e34b2213603113675e2298b23e600487bb6e3f8b14ce36d6471b3d0020000000651ab6a5363ace2f1ecc803c100490300000000036500ab1e73270000000000095252636565516353abceb5930100000000086a535265ab53abac392bcfc0", "53acac51005365ab", 0, -472254134, "84da47c1287048e9b5b13dd126c462bfff3d4321d736b157421d2dcd740036b9"],
+	["0100000003598af364e67e290786d398d8926232e83805b1f4a3f77b7b1d521f6980f6f9a50100000009acacacac00635100abffffffff42a033e3374fc7f4039643926de72c0f64eaa1f546df6fb672c30fb37803fe5b0000000008536551acab656365a7ca50587f14a4d988929685854b905d06cdf24381a5bb22da2eba1f8671c6440fe4236b030000000851abab005163abacdbd011fe02022a9d040000000002515331067202000000000653ac6aab6a6a00000000", "516a51ac6a6551", 0, -1861646214, "0d01a2315e77b0420714af7fbfaf5bbf267d2dd1047f565690b5b5c3412238f8"],
+	["02000000020aa17581f580af401abd1b8c074b9ec8bb91044eb1417a100d524defefa523a1030000000165e8f159d2789b6dbb3c68489ee42a51651d5755276298c93a2eccf36faf8ae9a1b688bd9d00000000076563535253ab53f5ef3efa0290eb5503000000000465526aac37d88f030000000009535100abac51ac6a6300000000", "", 1, 511514470, "bdc091bdc05ee6bba8edde627b7ffc87ef2ffc3a7df731e4acbeb11ded749c81"],
+	["0100000002613e567ffd860bcd368ef3ed73a5a4dbb7c89a99ec092b927d333f1d545ecde101000000085251ac006aab006affffffffff4c624a851c9b64abba024a1be9581e6753e67d2475e655d34c3bba9fc14e0603000000095365ac636365ab5251ffffffff0432316302000000000163f0c2b3050000000006535251ababac75a3e4040000000007ac00acabac52ab98af7904000000000000000000", "5152", 0, 44513037, "6294b7af3a0a17310d22a56634e9b28f04075ea42866f3897678aca14f53ac95"],
+	["0200000002fe6c32a2053414ebf5c8f11d19a8ab6222e8c05eebabbaacaec13b95308a139400000000096a5165656a6a5252acffffffff4e36ddc102b2d6c34d604053e120e74b40460311c4cd985be66cd6b100f7a9570300000002ab6ac6caf8510124277d030000000007516a51ab52530000000000", "ac65", 0, -1010923027, "ae307b66360abd9f1e45146ed65ec49984ffe110004d991042095643ce43b125"],
+	["01000000016cf2eac28ce41a64f0356508e87887523f6b9e5f523316a40fef8edafd5dafcd010000000700ac00acacac6a934c10e404e75d1201000000000553ab006500b4106e0000000000016508acd6030000000003ab516a734d19050000000006ab6aab6a52ac00000000", "ac6a65ac6a53", 0, -966661556, "0419f4c033abc3dff8b16386acda263a58b766e7edfc97e7e7a4b193e4eaa0e2"],
+	["010000000287d8d030f459ee98b1882eaaa795500cf394cfed7496475d7450b56ca64705710200000001acefefdd53a82706f7f3266e019bb01872ac895d8ad56817b73020724d6e4bafc4e3d01b76010000000453655253ffffffff0102a2c605000000000153cac7870f", "5153636365", 0, 1293311164, "aab9c484ecc43336266c08ebcca8d44994db66114f3b49b4e6e212b39de0ef68"],
+	["0100000004c5cc175ffbc81921c8a826ec4ff4901ba0ef1e96c66c8d341c77920b5ef82d96020000000900ab63ac636a6aacab1f486eb19d1f73fbed2c27486cdf404bca2f03b50e0ed200fd7eeedfc76f1be813c1d98703000000085263acab0000ab52ffffffff843355391aaf41170871c55c2badf684f4c3ea8d049ef5ee57eec7ccebdcdbaa0300000008ac65ac6565635353ffffffff71b34bb494fb273d928596f33f27e41aa10cb8b10baf15959f74e7fddb83ac74000000000253ac05dd34720353e81b030000000006ac00ac530053543cc40300000000046363ab51044fc4030000000002525200000000", "00ac6a6a65636a006a", 0, -1441775340, "2f0c7b3de46aff4155d38dfe4bf999928eea12725d440567847dc7d36790c63b"],
+	["02000000046c46dc4c2d3dd4a685bca0bfbdaa792e399fec8384908745a85be7bf1491047202000000050053636352800c9dd82f467f75245a469a757ede14f28e668919ef295897e79d2bb25ff45956ef1e6e03000000026500ffffffffeb0f437ed8661fdb1d147ba2c6e39d2540e3837711e527e87464d7a6fa3538990100000006006551516553fffffffffcf3173c6a4545b1fde2cb3f71794b35d892b8b7b883c0c28d681728328c5b9d02000000025100ffffffff030907170200000000096aac536a00635352ac6b45bd0200000000046aacabac5870f001000000000152f4e324a4", "ab520063", 0, -473742548, "bd34cb4e1954254e7a2c56c3dab6046f986a4761389314352d2224c1279277e6"],
+	["02000000045c3d77742904b36ade338015d4ab887d4108ea9c420e233bafb94f23717bca960100000000ffffffff7389f48a66591d8cb8332011e32bce06569f3472cf8f8d2313f726eca4aeebce0100000003ab6a6a0b75ba8e21d358cbae62ce3e2c465f76aebd10c89ba2f48dfd4cf34b29cd27a004f3edc00300000003526551ffffffff5e7e41b918a0ab3548fa760acaf3f41af02e1920c15d3153d175dde9003ac3320100000005ab525200abffffffff025a26030100000000060051ac51ab51b5455901000000000900006300ac5300510000000000", "65", 1, -1092642413, "0553edb99fd6387f00839124b467ff7e2e56fde47776de7f8912ab353df105ed"],
+	["01000000035995f599219ff073ce6327d679c783bc1185fb25abceb3a02cea51ebbf884dbb0000000003ab0063ffffffff6fad07d026f77888bcbeb2eb357719ab79a536514bc02a3ec325c1ff8a57946503000000046aabacacffffffff9d096d16363eafe7dc9947aa773bf223f70f682318b1eeb04b399a1086022f790200000008abac655163acab51bced07fd04ae63d90200000000076a53ac53006352fdb9b00500000000046a6a0000f3318100000000000565006a00007cd6d601000000000094491df4", "", 2, 104137376, "f89b0a9c4835ad833656689f3a618fab9b66a794ca11c732ae1f902a48c95ebf"],
+	["0100000002b16fed7732ce489a6156effda17d5d12ce7da558c0af4c81f820c69a571a354102000000036aac53ffffffff516dc9f7acf73c831b739a0348fb706bc746745577a29253c304b2a01a5fbaa30000000006abab6aababacb85ac66e048dd95f030000000001ab4491d902000000000453ac5253b77dd704000000000451656a63dbaa9a010000000009ac6aabac535363abaccd2e601f", "52ac53655363ab", 0, 1663493216, "ffb41399f999870753d9a08e121535e7f7e2969f5afe028d11f9041eba157750"],
+	["0200000002479f5487626a4204f2266982118f3bd75d5cb6cb041dddea36a968249e551212010000000453005363334b74fe1371422008b3acc589a4a03f9cdda8c7175dbf610d8059da27f8c243be5504f1000000000963ab5265ab655363abffffffff0350bc5e02000000000765ac5352515152c9fdba050000000006acabac535165a9919f0200000000016500000000", "63acac", 1, -1072123096, "d0764c09ae676da499d819e9b19b46eeb9b1d523f4184fc24f09bc1e9d407287"],
+	["0200000001ffa5829144c5f321fb1d10e5b709042e9a6de84d1e76856d9ac1bd4c2c68c69f0200000002516a89103aba01fab6f3010000000006ac51ac53636a00000000", "0000ac", 0, -1312408068, "ef449e0f6add5aaf9af746bc66bb68e62fa598f0c73dd92a99541a0d812f727a"],
+	["0200000001613343a77e0eeb004e77605a80189424ac29d0f0f8a1bcbc5132944a2ae66f05030000000463636a52ffffffff04fabd02010000000003ab5265a8ebc303000000000565536a5263fabbd302000000000451635351059fd605000000000953656353515300536500000000", "ab5252630065635165", 0, 1456076824, "dc7873f59a3ca671e663e113d696c0917b7dbd223f3a442d2c6eb11d20282be8"],
+	["01000000028fd878f24b779c6f20cd02713d22e9641ff11ed54cc463b4af4a0e753b6459bd0100000003acac63ffffffff0c15c6285434f2f62177bb25d54471ed4539dff1abe0efb7995e80e114161d55020000000851ac65516363ab6a2336f8b3033afe9f010000000004ab51ab52a9ef0102000000000453ac6553a0e5990000000000056a6a63abab00000000", "656365", 0, 222417535, "4071747bf998a4934ae705fa37ec781cc7bef30ae2fa7ab750aca5c0b561e88e"],
+	["0100000002065131e4d80bab5c615641d2a80aa53b4d4bd8aec09e75a2815e9a4e747855b90000000001abffffffff15f7c121e87cd6a3a61c3885b687581fe0e5a8fa31ef696438759f47bcfe8be1000000000453ac00acffffffff02f0895604000000000015a50c030000000001631954957b", "53526365ac515253", 1, 1515534188, "f95a47332194ab1242965f58f0218d777c752e58a712fb4d72a7ddcd1df4ff5f"],
+	["0200000001aa09c1e083d20f0ace60d06b062dc96b4ab27d51c268969d70c9c49b0f6b8751000000000900006553006552006affffffff04b366520200000000003437fb010000000001524db42501000000000700510063ac53abce1adc0300000000056500ac65527de31a2b", "6a516352006a655253", 0, -2012299622, "be41158664026fa7924cc9a370fa2d21c8c71c80550208e4cef62ecf528366e6"],
+	["0100000001bae81ef6134c1bf56ac2ce3e89d00e23976a73849c876c42371a1f6e4db2a42201000000056a005263abffffffff039e8fe90200000000096a5152ac5163656565174959030000000000c1af7d02000000000600520051acab30dd290a", "6a", 0, 1114135346, "06e42e396bcb5d9b864727a3497481383157c2bdd06428cc8d0cb47407cf6950"],
+	["0100000003b99d37b44a70e832736114b492fa9811c614364cc25302d23a53609606a464070100000004635251526fbff483977178f83a29cb214289e851cc88a18c80ca1e20eaf77571394c84d200d415ce0000000009ac51005263ac535163e6e2b156def72f0f939cf50ef0f7c619b6e31d5f692e812783598900da63ae51866d6bcd01000000035153abffffffff0220105c0100000000045251ab65d372f203000000000851ab525165abab5331e808ae", "6a00acabac5153", 2, 815400807, "ef04fc04cddc5a4ffc075f58f4575ed60c14aeb2c1509d6942f77952ec966b45"],
+	["020000000311c7a2b03a6feddf8e66098910d64b4dd5f8c6f899c8f0b25839e2e2419582d3010000000152ee1f02990f74ab21b7c043b6e8784229848a20588af5b30ae6c5da1dde3dc3df4c4fcb6d0200000001acfffffffff02c1b9d7fad5816da5f913fa38f776dcb8370b9b1aa62d047dd07876d0124ca0000000002656528a6471c032551d1040000000003516365227c34030000000001655aa31d040000000006abab536a6a6a00000000", "52656351", 1, 1684333854, "4736c7a8db41881191e6b1f1be1bd7122a2c8a2f6fed12a3f27e4d5b3cd69b03"],
+	["0200000002522ed2ebd6d8edbb9fdb391bf6e393e6ba1e0f434719a9caa9a25f9fae3e04c20100000000ffffffff2a40333aeacf7045d80fc11a21f84518138bc1de64aa34ea228a347922d0c50a03000000055263525300ffffffff01bca04a0100000000066500abac636a38919c57", "ababac5152530063", 0, -974314962, "18eb2b2f186e1489f96c18343e7caba5aba86ea2a388abea488f6e042222e249"],
+	["0100000001b43c0c3551165bc487dd7a047edd4eb85df25ec3abd9c3c24f91d93666f5538902000000025200ffffffff025892d20200000000036aac6a8006120000000000066a6a536a536500000000", "53", 0, -738449032, "8807e5720dc936238f6eb0ba9efc53a6d59279b5bf111e2950cfc6e960b16168"],
+	["0100000001a07a5e23819abc602de953e7c1435b570bed3c0c62b13ef1c8e721bc17b66f0b0000000006535353656563ffffffff0194e77a0100000000030052633b428161", "6aac6a0052ab52", 0, 533490619, "80c0a251a5c5b7b7f4714b3b1bde1403871b471786cf3b6ee97f16ea463be0df"],
+	["010000000115da0b35eb70138426fa3f32f4c4cb42aceee5707960240b794ae4aad63c89aa010000000051eadb43022b3eef0300000000076352635352ac523476c2020000000008526aab63ac6aac6a00000000", "ab52650065", 0, 1441004329, "cc9573e1d5c39dab715ea4eccbc0f205b965d5c2f36a7572e33be719652f178e"],
+	["0200000003fe02c124a132fa5f35a6cabd102eabd768ec9aee9e5e47ae1a9200036e4326910200000002536553d5a62beac8c1b190a0e31e6d2466174d8a63980a63e1b199c1ba684482d6769571c56a02000000066aab00005365424d573fabef452131f0759783b5e8d12bd4bbb61e847aec767ddb2d955b4ad4eef513590300000007526a5151ac65ab8482450f01e39035020000000007ab636351acabab00000000", "ac6a6a", 0, 917370940, "067c81f3a00bbdd3b7bd082da158541191b07ac1db71f08dd4adc724f41c96fc"],
+	["0200000003d509bdf32c55449d506310df0be654542735761ba30c745e9250e1e9c4ec8a4c0100000008acacabac5251516acca0b6f8bf1ab3485c9e178c6bdd64646021bc4501c7f0865f31ff803eb40cb19541a36a03000000046a53520064bbb2084a1636385377dd4f9840ef587cede9ad9f72300f84837c4b02018996657c6a31010000000251acc813c45801d150df03000000000400636a65e03909a3", "ac63525253515365", 2, -830296820, "583fb2ec530bfff090489491423ac8b362a1b69535456a7ed0b6888f9d208e76"],
+	["020000000244b3dd6f31726f5193cca348eb606d35f28e060e4492bb7ba9a22a3686eb86710100000004ac5351538e8d5edc4542d4b6c07a2ca9e905781e2ba0a1516c64287970e4ef09b23c30581b092ca00300000000a704ea86024948bb030000000005655252535383ddcd010000000009636563ab52636aab00e9152d71", "ac0063005100ac", 1, -1663652928, "6672650d1c3b2ac2fd1e837e82d8f9c5a2ee680f8a95cef33c316f7efd4650be"],
+	["0100000004d40860f68e8da4abacc34d7a801173650592d1eaf76c58ede926d99cf6c2a3c00200000002515100d66d59084eafdbee52f969caaa41f7d435575bf9214b5ebbd490029ea33fdbfb4f91e102000000086a65ac63ab656a51cdb91339bed3d99291982fd713d81cf89c42a7d652d0c44f8e17f1bd4144fbaac8ec481f0300000000e850fdbdedf6fb7a85087e225929c7230390226a94051e28ea8bf321d8ddea9ad000353b010000000153337056f602ce12d00200000000045153acab67ae29020000000009ab006363ac65ac65abc60f936f", "5200ac", 1, 865469666, "a1cc0e4d4b4a7db24f274add28005d049e24d6af0eda00714f71f2f82be3286d"],
+	["0100000001bf0138dbc38bad78d080b101ef6fb6a88ed23061cac7e4422840cf2ceea80ad30100000004ab520053606e715601f513dc050000000002525100000000", "63006a6351", 0, -1779567042, "b148f4fcdfabcbe537a82a27e52220156804238612d71ae5baa1c2d854cc636f"],
+	["0200000004e9bdacc5084fd74159b5e4cde1774591c5c0c309ca791b761922abce3ded3dad0300000009636352ab5252acab6a1736b604a2df6e6e3af85c98e837dbea33a75f02ff6f6bce0a9954698155a760eda9845f0100000004525365abffffffffa2dd56dd2d9f1a7d1beff75a8815ca417756e7e609a20eebedfeae6d61427f0e0100000000ffffffff47074f65985b8647a50f9f5fb2bab6eab13855aede599c437b1095d1d043e51f0000000000d8bdd15f0325b0bd0500000000004118e7050000000003006551d0f1a50000000000075165006565536300000000", "ab", 1, -1821792667, "1e0f02e1361364d1bbb9e86eec3b5f2b04af4091784252560beb2948259d7072"],
+	["0200000001f0dcc6f435474ea3fa61af4b5faefbc7f5ed576a9402ffe78892b88fd0fdc9ad0200000000ffffffff047733820100000000040052ab52773d7c03000000000163a39e5004000000000152965577050000000002636500000000", "6563", 0, 1517463573, "e17a1c95493cbcc109fb427517dd75982cf69e79a29d9637175d2f8a26cbfb9f"],
+	["0200000002a390bf4afbb74aa73f183b647a3105506a89758129743562f3c383ad99ce7f8a000000000263abffffffff9c1861524051121aebddfba1fa5ded4afa30c0ff062879bb40b10afa96a36fde02000000036a63abffffffff017c9a5f03000000000651ab6351535300000000", "53abac6a63", 1, 1619188972, "ec7af5c8b8d9b1527c588b39d04b7714d63badb308c12be23f9ee3d63dc4930f"],
+	["0200000002697d16bca1178c451dd384dd4574fc4c3dff8c9b225fefb79ffc98ed527f8be70000000003ac5263ffffffff3f302b7655f4c1670842e7df1dbba183158096efa0de818598523c6ca5f77a50010000000900ab51ab536a53006a34151fe1032420bf0500000000086aacab63ac00ac53f5cc0902000000000265538fa17d00000000000200ab00000000", "", 0, 113460979, "7149244c5fadca8d697e3b8f8b32a5369a9a07687a2a7a632bc8e4268f2b3cfc"],
+	["0100000004502f9be62050e426eb28d7791ab8f57c07360d2427bb315bf37d796c6d48aaa801000000035352acffffffffe6cfba0227b8a6ae37c4ecbeab84ad4162f90b1c9affced3d7e9186c6c079ec3030000000753535263ab53abffffffffbf06315555eaa45fcf731dc0a473e036b48daaa8933b73e02f6ebb7d0b1d9d0503000000016affffffffc55943bd624a33c0b483c6c2e61fff404434f167549349b7381c4ac9984edbfc0300000002ac63383d7943044af10200000000000300ac6314077a00000000000952656500ab53ab51ac87224c03000000000500ab00ac63adbc740200000000025151b7206815", "ac6352005253", 0, 1237521186, "acb27bad5e6dd4d0fed54db7bf4e35ee20a5e7dd49573b2c667e641c353760de"],
+	["01000000025d61f84360461e518c65648458a8151f821b1f329629ac5315ee1472d67c97050100000006526a00520052ffffffff6b76b3a17874f6d575424a24537248bb444c5abfcdaa7164f03a795cdd2ca2b302000000026353ffffffff047116da01000000000251635d012e0300000000066a0063635151699446010000000002516337f8ae02000000000851655165ab53636ac1526c5c", "ab", 0, 1612837028, "1d9c85e2efffa8e073a66386dfa60a6cb0108f8e196d0c050e70b0472dc6ee19"],
+	["0100000001097a03fc1808926bdadd08a026a17f2ca483aac9fe0e72f203fcaf87953a0d5c0000000006ab655165526affffffff02ea5507050000000004536aac65ccb95c000000000002536a00000000", "6353ac0065526a", 0, 1855457353, "d76057123b49ab4f1d4bc2451544231c3a912c5d47d74d23b86ab304fbb9646e"],
+	["0100000003080c67d08bf3f1cd5f2c603fbc2948073bb9423d30e30892437600a00749b3df010000000800abac52ac656aabfffffffff2736080cb31320bbef856d3dcb164283c42e19cb54065ca0670d0ac252bca7e00000000003c92fcfca3399a6151e6933b5a9a41e000c7a54616688fad1e197de0b4cb3a6225f5809c030000000165ad8a38d903937eab010000000003ab0051865679000000000008655300656552006a52d7bf000000000008520053006aac65ab00000000", "51acabab00ac", 2, 2064574197, "9d94b13096d8b3d1270c6f060533e0323617ef3cfb6c58b3f2b29ce8cbafc134"],
+	["0100000003629b3b3e772ef4412a1161b96bcb0627d5658cbda799b491b1814b0e100462650100000009ab53ac655300acac53d56bd33832370c5d2dc386ea7fbe4342373928f7b818c2adbfee0f10f54612fee243a1d400000000066a52ab65636a51e1c714dbfeccd553af52e669b18c0428ba734d243e104bed7b34049fb744cc981ff3a801000000035351acffffffff02be88dd010000000006536a5265516390ca340100000000046553ab6300000000", "636aabab516a5200", 2, 1610101981, "32dabdb720fbdf618b92460e93479a68ee9f7eb9cb3f97570649f32c8e6e4320"],
+	["010000000330bc4f68729c3626e8f33d113a0d9f296bcb229245fcec807a11d6f1fce30f230300000009655100006365635153ffffffff2aec68cefd1e4988ff89d575d108d960ffa9be0e08176be60236429b9e85b5ab00000000075152acab5163acffffffff7296a55c9a9c9ec5b5109578d551b1a0421bb7241c4b75342db03eac4a2aac6a0100000003ab0051ffffffff02cfb9c20400000000076a535352ac5363fba8e1030000000006520065535252147e5c7c", "ab00", 2, -2136228069, "a24a572afe64ba4949de65d0178455377cad9dd03ccdb1714d0d61854dc0fd2c"],
+	["0200000002dacfbcc377d4950c2dda1a734c5ce38ad2725a3ad427bfb54ec4ab540494c5ac0300000007ab530065005353ffffffffc2d6cb483226cd2db04d5960293f9005d257116efbd806307c2c68c19e64662d0100000009ab63635100acab6a52ffffffff03e2ed630400000000065365525352523375270100000000007b9fb20100000000015200000000", "ac65ab", 1, 663560022, "34671c32f9ec36fe12a413bf16ea35a49fc9bfa216a72581ee4ab7e3e40d3e32"],
+	["020000000268968f50763897aa6d3805dc9f0b5235b6afc4776ca115d30e443468238f0afd0200000005515300ac63d57d39f69ae7f782aa741d6793895374042a0a26dbcf92ab25161db19ac0748e44f4842500000000076a65acabac65657206dc7e02e6421b050000000007ac6a65526aab52a395170300000000016348904cfc", "ab6a", 1, -2119766325, "9273f2f4b7e61fd444d14f6d62d0e557d0d5e7f7f317786ea8516044a4012c46"],
+	["0100000004543e3a91b677737843ce2437ab8ea452393579f2bd410aa4240b96be72e55857030000000863ab6551ac6500ac2f17c0b1cd4a68fa3a041299712686fb4f79739c9bc33aead5492c5d1576e40115de06850300000003526a53982d642f21a7449858bf2fecafd8366da3e89b3dfb78c5e51a669b8dd70881bbae69636802000000026351a7fff14558a33133180241ca25d1bd0a89163ba61cafe20a264aa39c49dc8f430bb0fad5000000000653000052ac00d5e0d6ab020d36d50200000000076a6553ab6551000a2ede030000000004656563ab00000000", "6a0065ab51", 2, -913040128, "bc7d238df29128c1e9c13e8bf699bef9d153f070a59ba6bdd6215630d334342e"],
+	["010000000102a11234869536ed0f2164556d268d2375139945a88f8808a00108109823ddea00000000000616a240036666720000000000086351655365ac6551bc513b010000000005ab63005251bfe93302000000000000000000", "51ab5163", 0, 1683585228, "f0972528ee768ff576d8a5190866831419b0c963ea70329bcce71100adbd54cd"],
+	["0200000001411876b67e8794e64348f3de4eda5ce536515c4800744c96c7fd542972ac5d4c0200000003005363ffffffff01b05d830400000000025151fa692394", "52536a6a6a", 0, 41748170, "97476baa9fb1e8c748858e86015a36b7ff7d477766963661c6ee1cd2f7a967d8"],
+	["020000000195eff4d788d62aae50fc0a54c2dac5c816e5ecc291d3f9ce07a89e0389c3cd2b01000000055251535251010068ec04e0e017040000000002636344df65050000000000bdf09e05000000000463655351f9e7a10100000000055300acab6a00000000", "5163ac0052ac53", 0, -1816766782, "f32c7ddf47cffae71f5272d24c6e6277417d4013e164da4faf28516126058211"],
+	["020000000119d51ab32a1759390bbdaf1192f1f31f1611792e4f142d672d1beaaeb289bb30010000000763525253005100ffffffff044a1c38030000000004635351ac9f338a0400000000026300e942940000000000086353005252ac63ab9c8cfa030000000002ac5357357313", "5252ac53656353ac52", 0, 550091552, "a11f4f377244069bdbb8f2abdc8bcec643575bbc158832a0fd63765f170f81ba"],
+	["0200000003e4d20afa5c8779f40e077be37cb9de02016c57955e80ce17a9d2647aafbb38070000000002ac63615c1d0a694e58ab277b9030d2d30e64b6d3b505b2f1bc2c343d486b5ff5910001dfa1980100000005ac65ac00534f11ab414fb1abddba39b5932f203f7b58d227c56f0324b30ac1ec9e660a2ec1d70b7d8d0000000005636a6a6353ffffffff018bab7a05000000000200652fc271c2", "63636352006a5263", 2, -1492368316, "b9fb2a1e8f629c0f763f137df46fd03173e98b62b4844b4bde0e25b924253171"],
+	["02000000014128589787c978b998ec995960693aef2ef3057033f97467f70cf77137eca1090000000009ac63526a53ac53acabd43ef85a02f1f3c8000000000000169a840000000000036a6a6500000000", "535200", 0, -1366829315, "793a9678836c321fe9759d77e336da9909192ba39e5c46156f86080cf0970a93"],
+	["0200000001123c3f66d36efed66c1d6c3189e6be86d16a6c0685b4d99a680557f20bd40db30300000004ac00ac51ffffffff02ff82d10300000000075353ab53516aac80d1e0040000000004526a5263b90c0c08", "535265005265", 0, 450560496, "02a9714ac6c15726140afe6e861c665e25918f2ecf9574c121820d7ccf4fa446"],
+	["01000000030bf782f6e78526019f75777fc0ebfb50b93d6adf75fcf1722b321cfbfab327d30100000005636352ac65ffffffffd7993aa8548c78aa3bfc12f62ff95ed5709abf1095c58d47d85130adbd261fb7000000000163ffffffff660c617f055dcc3a4187a6740b48946a757cc4eef8141fdb3b850d26a3b424f301000000001cd5bf70021cc87c000000000009ac51ab53ac6365006a1d552a020000000004abacac0000000000", "530053", 1, -1894282550, "16a440b3b2b46b428fee1aad8aa1f17b532f8668282e8e1cf87e4e47db8e9d23"],
+	["02000000034722711a6992294505390c7ece21d874b28a33398c62bb2e2dcfbb595785ae0900000000040053ac6affffffff51dfd34be876a2c9fc980aaa6cf503a9010db8254e9fe4c85c116140381afc600200000002ac6affffffff75ce93c84c6aace8fc4bb180fa0d3d0b1666b7a1b231dd0e20f18cbbf901a14b00000000015375e3199a018061a3040000000005656a516351f7faf07c", "65ac516aac53", 0, -1665545907, "0cdf7a145c4aae98fdc17020b6784d71be1711d20504c92fdef22a8dd8ed2a31"],
+	["0100000001e6d9156b2b46d0b40bda4f79e326a1b00310428c11b96f27123f02aaf8b1ab050200000006656aacac00533d51b84c010adb2902000000000651516a5165ac0e15259d", "516552636aac", 0, 91357757, "792d16a70670991c4b5f517a207ded40deb2f78721c66c61d96dae76a6675674"],
+	["0100000001b7a9e08d0129549c74777079eaa614d85a5bfd59f96a85a8797477f0a2f2d4b00300000006ac00acab0051a3dcf7f0034f58e501000000000300ab6ac91dbf030000000009ac0065ab6a6a51abacab66e8000000000007536a6a51006a6300000000", "6553", 0, 76736365, "f87659c936ba9be0e9c86f7ad04c2eac401591191c235ee560b882ddea08668c"],
+	["0200000003aa2796d7ad65f9b488faeeb52b7bc937bee71abb2dedc091a0faa8d094fb9171010000000465536aacc12d1e556ac93df67ec1bc2b9f4ae9ee13eb93dbad4a94c9a0afd0b801a0d8a8959f4f00000000000100ffffffff58209261818ac5c5d8a9b4960f5fc0e261980bd2a32380e23df0bf1d0963c23f00000000036a65ac15ad6cec02264161040000000000b13ba1010000000009ac656a510000acac5300000000", "526363006300ab", 0, -1319463170, "35d3025c1936d104d801d9beadb98620a008628db44a7e49191cd48b808e5844"],
+	["010000000149238226a051f5a2ce93dd9d6c8893aedf1fa9ecf0f6c5263233c9cb7b17fe880200000001ab2ba79f69018ff49202000000000963abab526552526a52a86e153e", "5353ac656500", 0, 399099038, "44cca2ae998f8924c5400091c248d79f0a1e7951f9a1720283d5a6592bf4e208"],
+	["02000000018f8f34b34d7380abe22c619933b2169f0203cba4294c1b114b2c71fa5217214d0300000005ac536a0052124ab7b20333413001000000000100a5b4520500000000095251acab6300acacacb5c24c01000000000352ab0000000000", "52", 0, -1306349524, "a37d2e92887ef6be82d05eb1baaba40fd49ade3750d6ee9685ffa21c0c91fd3f"],
+	["0200000001227d2b4efd3e79e02197a6fec383ad444a1555cecb8ab8da549ff6f4ce503d37020000000900006351ab65536363ee9b1c49049c7add0400000000076351acab5300ac612db7050000000004536a5263a52f9805000000000663636553006a15c53200000000000200ac006a4989", "5252", 0, -1506050254, "2afcae080666bbfbf953bde170bbd35a26769b9e85af0e8c8a915ac36033b80c"],
+	["0200000002970f05d65d0b95edbd7a7a5fe15275bac26e8afe7a95128ae62ee09a00953b5b020000000753520052abab00ffffffff5e1f215479ed5d437f3da290f5d19eeb10717556de0d4b056ba765c37879ed3802000000076a0065526553ac352b201903cae2540300000000096300536a00ac656a00dcb4f20300000000085263516a6353ac53efdd5e01000000000751ac6363acab0042c22b1d", "63", 1, 305849281, "281eb50048827aabf8b897d015fc914ecc828242211b15a16c0fd95a5549c3df"],
+	["0200000001bff7d59f5d81f4a93fe61c1c3c1207688c1d3062fa42219d4c55ff83fb6d32c00100000001ac86ce6b120360e61b00000000000253005a609b0300000000026352d054d90500000000004279634f", "6a6365525363ab6a52", 0, -1211522497, "92a3766a1e24c8f92b69463f9d4c26619c0b1427810501bf6b57e6526efe724d"],
+	["01000000038509418d634060f589a6413c1d69da48c581d223832cf2bca0ac1a5890e3d16e0000000008510065ab63ab636aa4bf76960954575f398d4839b76a31cf97f42ea4fae8dc6c9b115ca571ead8d35e1000f90000000003525363ffffffff2c4c62ac36c20f396cc722557c9a0e3578a6f5ed03254c8fbbb6cd59d259db370000000006ababac6553514386c86a02fc9cbf030000000003515152ba882c0100000000016a00000000", "526353acab", 0, 153781130, "50f57719236c333463b6d0c8eb64a30e025e0147c52e84a281c008dbd63d55bb"],
+	["0100000003207497928eaf6248a1ab4f7fbfaf6bbec0dcf662eb258bdf8425fffd74769a600200000001005b4b64ed564b32a4e546a39868699e1bd1d9de9bc20e1a2bd7ce9a5828a3c06b4dd7e50002000000065352ac6a6a51eefa8228f8d75dba00fae3764ca21b4f937688906bf67460125a1e829b349323f641af9a0200000007656a6365636365ffffffff04eabca8000000000006510051ab53534a3ea105000000000963516a6a635353ac53e6db710500000000035263654d28b305000000000651516a6a005100000000", "", 0, 1554235380, "3aa4ecb2a46fa866d111458fa5329e632cf8c3a84aaa00c4d3abd7dc46ca0f43"],
+	["0200000002f5f51e19f9190b4fdbec144f56338ec121f885878a37a408b23a9eb1a1bfa407020000000653ab51ab0052caadff00f6b41c15411da726d33c242cd5d97552518069721edddaf475fd07da002b0bfe0200000001ab502f4dba03d02c7a010000000008636a63ab52ac65acbd7644040000000000a61341050000000008515352ac6a63636a35c2c57a", "6a526300ac656353ab", 0, -767855141, "2f60d2afe9ed7e6facdea8ed617ffe894f405b6c88aefdf1aae6269b4a247e8e"],
+	["02000000011d5a064377f8531bb54e535e6e91dd28396952066dbadfa769300cf5e821241e0200000005ac53520065549d20ca042310a50100000000045253abab7f8d1c050000000005ab6aabac00eb660702000000000763636a656a5153eb8e9701000000000865006a51abac63ab00000000", "6a6551ac6a5165ab", 0, -2098288235, "ff89962e4b7febca3136da408173d164a1935b283c1e86113a8f95f256e62bac"],
+	["0200000003378c1905f7059571f113678e80af5762d91210426a33e36876b24289fb6cee060000000005636353636affffffffa2dceb00af9a592beab9d66122afb5cbd263080d9e42642081bf626a2687de940100000002656a7987c0d7f025402c47bc76e6433bce27b990663163f4e28f18dc8e6c175f7a016f9fb08d0200000002636affffffff013e6303020000000008636365ac6aab63513630507e", "abac", 1, -2146922764, "7acc1d0a2bfebc04855654bfae16170d2caf9ebd8a66e82c59e60937462f8581"],
+	["02000000026e24f151212e30a0321e6c8f77f3412f08c66ec725a13990c588ea10777a07d7000000000952536a6552ab520053ffffffff87fdc4dedce5ee9f7ea3abbb122730d2d5ca70ba041a5b9f32f104d8200d79760200000003ac63005c45fd44016aaee0010000000002536300000000", "ac53ab5165516a53", 1, 916217034, "be16e2c66f9e7106083383ccae9d604b97a84780009740e25bfc5ba2e6b9d97d"],
+	["01000000027dfd515974e1fa1ade9b567642fab29acaaf6ca4ab5625b80ff3bf8e3e146fa90300000009ac656aab655353636affffffffe3308a020a0898756000a4f0de8c8d1ebccae9f4bffe2b20b2974118ac0fa05301000000025163ffffffff04295799040000000006636a006a52538470a00100000000035251511be47205000000000045b86f05000000000000000000", "52526300", 1, -144228316, "24c64eba2cc2e381fdc04d11ea58f54be29f939a6486418e3b60adcbe8dc06ea"],
+	["02000000037571eb5c40117ebe59015bbbc07dde957e6c275d347ccf313d19547ec214c6ca020000000800ac0000005251abc134dede11db3a420899610bfbab073e9f01cdfd5d38d204b00bc89b520e23f5586d4f100000000004ab6a530044832df0d93ed27a7d43b8c4c444fd6a8e70440f60827d10372d0fe1f57dd773bb61b53702000000046a536352ffffffff04108f42000000000001ac87352d0300000000007d39af0200000000095363525263536a5265261f9803000000000365ac005be4e304", "", 2, 2137374074, "799a67538dc73871d5d4cf0648c36c88d0fb73b44e819573854b380a1283a39b"],
+	["0200000001f6958efc6c946bd28c5ba457c5221c61b9889e2c6847c4ecdf7ed0b00a25038003000000025300ffffffff015e89200100000000086aac6351ab65535200000000", "63ac6a", 0, 651402834, "bceedd3f250d22807153184874a707f01d1cde41d80d977d7e1f4f5f5b08491d"],
+	["02000000037401d6ec7603e54a7eb0bd99c43eb57f4c9e1d485363571cf71c0b932241f35503000000026a63ffffffff67ef2ab1f8462aed39deaed9401c479ed08123b5e429473ea071ec888c5fc83a03000000036500ac6e80b7027406a512019fd399c8e458e2ef091a49e929f0471d1c91554d1445955c18e8dc00000000026565009da058039cb7e1050000000008536565516a52ab531be98a030000000006ac516a656a5372461200000000000952005365656a636a00c032c4a8", "", 1, 966177473, "3ae6515e252208e47d92a4f15d14301c05fa37fa28885ba96f54862a3551fd88"],
+	["0200000002be6c5cf5263eabdce1efbea23581fab9e84507630cdf02c917ffbe1f7a0ea1ac010000000100ffffffffee7549c67d116b55dc9ae669797aedf14f65c9a077a28a3d47ce44e5f39feeae0100000005ac53655353690bc5630220dff205000000000100f14e9b04000000000463ac516ae06533b4", "ac65", 0, -1393867832, "1943d6e1d1e197657133b43ca7ab97627e551000d7287705fbd90f59c914a2b9"],
+	["02000000032a1ec0e8d4ba9718068212db2518f2ec0b27c1da58d886915151ac116b0852590200000004ac526a51d1529249e4cc3ccc553f9f832731eb80cfda32aeff627f307eba66e68ae7c82d1f3f089302000000076553006aac5200fffffffffc61d51e10dd118b004c94a346895851ce34d39de70a85821b702d843c6bc66d0100000001acffffffff03d5beb3040000000002acabf7e86e0300000000026a65bcc4c8050000000009006a52ac655252ab65ecfad317", "", 2, 1245347251, "50702fb557646aa1db8c5a00e0f399595c225c5ac5129d9ba807a177e3668c91"],
+	["0100000004899fcb1a6e43c361475aea90d5eecaefea66473002b2733a21115a4a43270221010000000851ab006a6aab00acffffffff86ae26a1c270655fd79bd828ca7bf2c887e6db8d94afa15cc0b0c7961f7069150200000006ab0053ab6500e3b0b1a780491bc3b6d31f2ef47b4be049e34a4d95e812c637a42236d3f63d8d7c7180f60200000000ffffffffb04843454b1e18666891e986914325abd1754172e5a91e0a962ada4f75893eac0100000007655251515165519bc5179601930752040000000003ac6a6500000000", "656aac53", 2, 1346064113, "2ae8add40c090afe26fc776f063ebd875af8d64fd0139009db033941a5c77cb1"],
+	["0200000003af6791ec5c061608d1e8d1188978e1f364a757064f6a51ceaaa32767a18104c901000000076351006352ac52638a7d21aa2e06564f79eeee5d7e15d23281ee548f15f0702f73253c859f2948a5698c890000000004ab6aabac56a7ca5797832580944ea4dcbf43d96371305d4592333cca68d836a31d77537e409496b101000000046aac5165ffffffff0165fa730400000000065351636a6a5300000000", "", 1, -1730509343, "bccfb3f40e500ea431f7872c55ffea9ef93fde2a1fe097feac8d5663b948d7e3"],
+	["0100000002899f03464d46b98b84d2b8e4f92ee1efe7dd31448558e4db10c1b4c33e8839dd0300000000ffffffff247d72543919cd5ce9f7918e5a01d49b3b1c511816fdea601a6df179cd44b4c20000000000750dc02402a8032f000000000001515e733c01000000000000000000", "6a6aac526a63", 0, 1328077020, "35234af8a6b92e60233f4d4c1b81cbd4d285d09319775fc4af3c1ab68e7c7dec"],
+	["01000000013c692f872ffa30b0f3e97320829da503c3b902c693df7eda9d5cd60539662c9c0000000008abac51ac535252525ade9e2d0100992f00000000000865abac0000516a6300000000", "", 0, 1060474179, "bfb7b0dc2487335403b46abe61c3bb4983de95bb928e0c9ea6b5836407e78d82"],
+	["0200000001bcec6d43b7b13f6c39834d6ee2ad9ae4937fadfc2e0221771493206edaae96ee0100000006656500656aacffffffff03483a55040000000006636a516300aca28d0c030000000003ab526a798e6a050000000003525151e1df050f", "520065ac", 0, 477438089, "a6a4c10957c1d5b39c99d295fc5810e80679ae85b8ac6da793cc319f5b8d8dfc"],
+	["01000000024f4ba3f6af2f866d4a821bdcb051f463e3b0fa76c7166dfefb63e318aaa6a2f10000000007ac536551000053ffffffff2da9df4714d2ddb5278163ba82e4639fb47322d16c8990f81c2b9d9afefe9f8c03000000075365005252636affffffff02d7d3400300000000036a63000cce8b030000000008656a65535253006500000000", "536a636552ab52", 1, 1533616977, "3a212bc414f9de4d52dec6987ed7fd95e39c3d8a8cf28d34aa40af44778bd79e"],
+	["01000000028538d9d4171e0df88f5fdca1461a96fdfacc410afa13901eaa3d9080223b00a2010000000263ab74154c2aa9c53872e990cf41e3ef65725bcbde1aa79b5377b870e28dd263891f1d0bb98901000000030065abffffffff02306cd101000000000651635100536323084701000000000351630000000000", "ac63ac", 1, -345127177, "b758d8b6955f889fbaaa8891bcf27d31c78cb008873dfcf37131c60465cbc2d7"],
+	["02000000029b32a0155935459259eaa1c612575690f6082d3c7a4ff6e7b895049dd65831380000000009656aac0053ac53ab52fffffffff29b5a8ebd9674d23eb3ed42a2b75221ed62b6021b0d0bb5787fd02002ac723d010000000037ffedae04116a91010000000000cf73560500000000030000ab50db32040000000008ac525352ab63526a7a36c002000000000453636a6556a9ea7d", "6a6a", 0, -2073758542, "85727232f194a6bc0abdacfff8b9c10637c124caa75afaae24b0298f72c82d89"],
+	["01000000039472e1959e2d08a043d92fb2c5a790d7b65017d6799e74729217441a52eb10d50100000006ac5351005251ffffffffe9f00c12a148ea0af76cd3d5971573000363c5f4f546f682cc465cdb349f1d7102000000065252530053abfffffffff1c0cf253cd4c190c7873b3fe4dd167a7f30f6a8fda2c12fe4aaddc6aa90ef6802000000036aab52a9b66e04024fe375020000000003536a51e1cbd9040000000004ac655151aa3000ec", "ac", 1, 378735510, "8af04a5bde9e866d8545c1698a78fef6b891300d4b7ea5e2fed8db28ed37e8ca"],
+	["0200000003efb867765cbf13ff1fc1d3df60738abd16b74e09f78862a9afb12778bd88104f0200000002ab52ffffffff87f2ddd9c0a02b9e3e87fc8b4493e10ceaf049809628b573c193d22db996b74b02000000085252ac53ab510051b0ef62cddd34ef3e019cf2eca8c2ec0edd8522daf62d329fe5d39f1b5bc024e8c259bab60100000006acac526a6500c214bd5a016fafab0100000000046363005200000000", "636a", 2, 1925357944, "0e0527c81a2d1d2e8c4d364129284abfb4f4e0fce030d1c069dc889c2a05a81a"],
+	["0100000001a992dee1701304d0c552ae701fe8477d1e381382f8b4ea7b7aedffadd7a6428c0100000008abacac51526351acffffffff02c10e0c0000000000090053ac65520053ab53af64490000000000016500000000", "ab6553510051acacac", 0, 1400459007, "62766e439b7e86beacb3c42498b5f614ff31dab2f4874f3b4146ca890bbb6267"],
+	["02000000011dc62ad9b232aa86bbf949579013a6728216416b0d139ace54ecdf9e720ce66f000000000400ac00ab82aef45a04fee38a0200000000060053636a5151725acf05000000000751ac535251536ac5a071040000000009636363526552006300047eac0200000000025353c067aab0", "", 0, 433159872, "129cf8b09e5ac2a54222fe3b9f0836faf4696e519777af61f9a163576f0b5604"],
+	["02000000031b83471d76ff9103e5f168ad1179193d8862105f1acc116cb0a5c116e012118d03000000076351ab63636300ffffffff6c178ecf52fe6d3192eeed75c3d83b51599005dc881b2221bca209e98142f7de030000000153ffffffff7a3597ebb1ab4af9a7f07887c20359a7b6533caf396bb5df75c4b2b1d5cff5440300000005005363ac63de3e7ee0049a0d040400000000045200acacb04dc0030000000005ab63515153c67d96020000000000e9af0b0500000000020065cd51f700", "ac00ac5251", 1, -237948480, "1659abd901fbafdfe42a8575d2b4d2f118780619cbff8b2c53639419e231b0eb"],
+	["02000000021e83bd87f8cb0e5d04504cc2b5a1db8067b5ef9aabc065d3f43794dddaaa556c020000000089cc473b951d10b55fe1306a53b0d5615742fe9049cf2133f231c928c190e2147515b090020000000563526565ac50a3113604e62a7d00000000000800ab5351536565aba6932101000000000165c47f2805000000000100ad09b9010000000002ab63702e6d26", "52536352ac65ab", 1, -1068132150, "6849e48665355c8c722d42eca4b618c2fab1e3f1aac3c0383ac5a7fc1ef1cc6f"],
+	["0100000003bd9309b39d98df6aa89bcd2e65cffb5839b8358756da3b85d2327575d4b6fd01020000000700acab0063ab53ffffffffa800c41300f4364c4077c8d3b029ece5eef143a86c7a053781668b0f19c457550300000000fffffffff282cf913cb7a23f47ecbc9c34e8501f81a2c73e18593c1b0e6f319512fb752b0200000002ab52ffffffff019dd4a701000000000363525271c0ec13", "0065ac", 2, 487086990, "a3e5fc70f1197becc973d7ad9ff23e31016674270ce7659328badda101822170"],
+	["0200000002199238c97106cc7d3ac62a10457c0d3d983b389d320eeeb0514b1db5907f7b2e0100000009ab65635165005153acffffffff0ddcb9289a9131b40983d7fbfd15fd7950f955f4554ec453295a7b9af3ac5017000000000863ab656500ab005257f2e5e0027e9f7901000000000663ac53ab6a52fc444c030000000003ab5200c7bb26b7", "65", 0, 32847090, "e5ca874c5ce770da8f0d56b2273d7d791d6b95232d76550c40e76c4d935154f7"],
+	["02000000020fdfee871744b9917b9114dcc7248776e750ba16d0e6e1cd30686b8b1cce41ac00000000008b87cc2bfa1c2eca1ab4be77249226089ba8574665af99f7cc8a1fa9ad8972563000deff010000000351ababf900362d043052b10400000000065165ac63635314420b03000000000151b85d31030000000004ac6363abfb9585000000000006ab536a51525200000000", "ab5251abab6a00", 1, -1582946491, "45feb94e22cd04a2be08fdd7f2e58fd8bbccb0c5eceb088e2f0ea2c18aeedd87"],
+	["0100000003277d3b46e10e276af3a5a03586f882b4353a7c6e6d2863f32851d5ca78810f260300000001abffffffff4b002ed5c483597cd8aa9feed03724ddf0137d337800efad654baa702be56e3a0200000004ab6a6a53ffffffff79fac65ea907bdde357c1f6898da091074c873ec78b1a628bf69968e913957240300000003005253ffffffff0236f4db0000000000002880e4030000000002656a80d5d521", "ab516aac0051", 2, 348899298, "0ed6ba08c1b1c180c59e4f2dcac6f7d7d2012cd4566b51f4c86ac26adb112746"],
+	["02000000048c2c9098704de9284ef0a0a9d376ceaa27cf16283de13eb21cba39d1765437ab0100000007635251ac006aacbe2a49219b6111fbb3116162af6169533a6d0ca2a3fd7dd2a68509d454f92f765d5f7aea000000000651636a6352ab1c3d38cf7dae214297a930454680d98562f14da9fd29cf2a5605c6550f88e62474dbaa52000000000852630051ab51ac52ffffffff95941c1f607ed4b5b1e5e0bed41b6a98ef6af86387abcfc09dcad7f4661e508f02000000066a516aab5251d1cba666045501d20200000000045365ab63aad3fe0400000000085163ab516565ab6a604c22030000000001526bc18904000000000153f9f4f4ea", "535300", 3, 2063461218, "521d5f0f3799aa4daa23dcd598e6d24d767b7bc465ad23197e39fe7858ae4291"],
+	["0200000001167d27f81a0f21f1967c7450fbe3dde79890e86116182cbce0a3500eb22169e00300000009ab5365656aab635100d36978ab0457aa350200000000036a516565b19a0500000000080053525153535165643d470300000000075253520065ac6544a7dd020000000003516a6500000000", "ab53525163ab005151", 0, 1440132256, "457c22dddea79c9f57edcde30580b8abcf2c56f8be76e3dc15c0f1a9d6e29af1"],
+	["0200000003d2d25347d9f61f8158e9985e2c00e0dfebea8f9c9b22c0f69db423fd9e55dbf80100000003acabacffffffffc1d9876d0a57e918596b8ae88fad75946553f65a90e04f16c578c69d28eeafae0000000007516563655365ab5e2c87a1e2c0cb8d767682d4cb1c7aaf17e5c148438b4fb093ffe4a42ea10c954f03ef5b0000000007acac00526a5251ffffffff02a990c500000000000463515265e7c2800200000000056a5265ac522b7213ce", "6353abab51abab", 2, 1550611021, "4a86c7d8be664259e723e95fa9bf1ea58e8eb3526c2efc4198992a3ab418e89d"],
+	["020000000315e56a97c168f33174c35a3e7c1217c280bb78d95db7549dff6416d2a3f66f0b0100000007ab516365ac51529477eea1eef52676568e57a8e9ab9f472a9c67813b50840ecc2e257de69275a159bd2476030000000952526aab6352536a6a53c0dfc4955abc8bfaebc58b601e613b75d0d71adfa2385a783bc15b7a366939e152723e030000000751ac6551ac5365ffffffff01bf7beb030000000006ac5265006a5100000000", "6a00", 1, 680311327, "06a619d9395f6a9db37995fb5297c6d1649a62f3bf410849a0f7d30b822068ae"],
+	["0100000004d8d38341a452201533c3f17f4dfa0a7a54af745e549e6ddb3ffc6103caabaeee0200000008510052515263006affffffffddf5bcc1d4310aa4d14f890399052193ec2aee54143971c03554e31e45ae07e603000000025151ffffffffbe17fc0ad567bf114f08893309934575ad5cd461086d20a19bfdc0e8c810bb9803000000085163ac6365000053ffffffffe78d591c6691ed1ba8235409323f919baf532090efe1d1310ef8423fc5eed17900000000055352650065e81f5ebd0221673a05000000000253ac5ce0a4030000000004ac52ac5300000000", "6aac006a65ac53ac53", 3, -516909655, "fba7671d3b90b37b272009167abc33e1aa5382d7f71919cba326384dd3287a9f"],
+	["0200000002cab7178435f39511b299277fb6f67eee2ca42c2e5f99384d6bb40b7d4c1e324702000000076a6a636a53acab28ce6745f75e4e13031235eb3d3a01b910db6543c06ed13487e23f8a6d1eb59783a3699b00000000076aac63006aacacffffffff04fc52c2030000000004abac53525506ca02000000000165281f6f04000000000852ab525163525265de33190500000000036aab5229c205d2", "5265ab", 0, 48618737, "707bd60395a8c11e97ee0a13e88ff5e18521dfe31282c24d236c0e8557f137fe"],
+	["010000000410e82bd7599c5a30ccbc5dd2c63b3fb75848364dfd59d052011fde46cf0bcd0601000000016affffffffb7d62f4fcd425d5d8a197a9e02f852c728ce1da97a90e93f4bd2125c004d031f000000000851635353525253acffffffffbbe839bdd82e8a922ced8e105c1375c8213f399d438a34cb13acd353699c472b020000000965ac530052526a00004a95a4786c0bf9ca1cd2e4e26970e68a70d3b623152cbf1be05a05df048d35950e704dc103000000046563656388068161048f898304000000000200ab99a64b020000000001acb50b8a03000000000900acab52006a53ab51dbe8c701000000000951ab65ab636363ab0000000000", "52526a5265526563ab", 0, 229488500, "1dc24c9489e16e6f9729ab0aca30d0fda1d515cf85dd3313c19c8bcfa6e7d5a3"],
+	["0100000003d08d14aa70d383ab2127bf4d7df9788f267018468e132c8e848a3508cb09e206010000000152ffffffffd1b8fb98502017586673657ae365b71266abe01dfba899a6745575fd14ad9d2401000000056a65ab5300278860d0785b5752b817ae31664d2998624c6d126c8b2b6d959ac0d6c428cf168c6f87e900000000002c70283c04dc6bac050000000008ac636551abab6a515a7697030000000001ab715a04030000000007acac635151ab534c637001000000000965536300acab63526a00000000", "abac526565530063", 0, -2107955821, "b2e6b5c9aca0040b7f8ddcea9639700dc060c129bc0a4c73dc1567373c09b52a"],
+	["0100000004504cfde16b367a50fd0a8a2de702d11a8a87680a86a2f3e2280718cc485e7dd0010000000752536363000052ffffffff9b63321e9c509e9f056fb54434841928f2ef92e686dfc6ed560fcc79acde0b8f020000000551655163634fbb5d7ebffd92daf78f943e3d1c7f9cd8ab7ca37c7fbd9a6e53c8173ee0ce8eef85e03101000000040053656a4d075a3d495b681c517114e9cc106f162853dbd4be986445c5de79b2eb9f0eb0d1ab5b1002000000060051ab655353ffffffff01de9ce102000000000652ab5363ab6300000000", "ac", 3, 1386694097, "4f3a4bc73dba2955734a45acd630369423cf42577d5becd4ba182be7bdee778b"],
+	["020000000485a0dc54f0d96ac242412f590cd842b3ba02c77da272abdc3467edf62faf63e401000000095363ac5251ab516a65ffffffff81ecede46112eee9b68e808fd99f0a04d4798f68636c857b98c10b6a846227190000000002ab52ffffffff72287ec6939292bbd3c5eb23b13880312fa24c079992d1df71b0828cbf28c11c030000000253004e9f5352c743e1a376496fa31478f1652a3e13a6e718e6a3148172d3993b981e413dedc80100000006ab63515365acffffffff02f9391202000000000263ab56c67f030000000009ac6a53abab520065517dcc6c59", "65530053000065", 1, 1908815815, "d80c7f6d707bf4fe604510e006e9934e291434e9f7392c8a490b6c03616df6a3"],
+	["0200000004c7f9db541de9e300029e8d840cd44e4691b7651a9924e84647a547f1467976c10000000000ffffffff869117ad2408ef62e0c51fd714049f1d9b09ec7fc121313bcbd61e0701f173270100000005ac63525353ffffffffc79fa3883d5aaf105aad76f0b5deb4394bc88c6643c311f504d64b35b1e515200300000000d43867f5061bf5999a23548d452fe52c17ce9ad7e8fa7fbdb7c54113f6ac495e5bd891d700000000066aabab63acabffffffff0375975c0000000000076a51536351ababa0adaf0400000000036a6351cfd60b03000000000753ab656565005100000000", "5251", 0, -964685234, "6c7132ac25009c81c869f287ff77d471accefe6719216deb92c0a7052d88054c"],
+	["0100000002b4032fc3491dfb3d58dad92010e2debddc26bbfd002e2de21689a26a98c5c3a8010000000365ab52655e57cb05eab0174540bf0e0e2158863129a3e9bc54499b0ed0357bec395b8f6ba7531003000000025251ffffffff034d45ba0400000000004e28340200000000075151635365ac0079f7e804000000000551ab63655100000000", "ab", 1, 605560674, "ecb4553708bde0156974e27d8824b08c696ad46ffa3baafc94d9ad1734c6e343"],
+	["02000000023d49808a920a089dbf8791c959c9a55ecd08cde7e2e8cd89bd3c3d930a99ce1c02000000085253acabab51ac65ffffffffb082d9d70f25d73690570e6094bab1953d025d6bbce9249680bb28219cea0c440300000002635311d5eed901176b7b01000000000000000000", "0063", 0, -1110316386, "6afefe6361bdcc8f09a656ad34ed6c72bfa18de3ecc4eaf38fc46da12f61373e"],
+	["020000000430b2d9d40a27f1cc1557fd307816173a07fef58ad0925edabffac6ccbffbbfb302000000096351655163ac52ab00ffffffff142983be814119e6fb0e5e1e137929a2bb356f9460a2664ab668265bb2ff361f030000000963535200ab51536300ffffffff87547614c4166fba1150a04f8eb778b9014b05887afad9db4965685259689fe900000000007a8e33b45f707d66d3974be0caf02fa9127171236ac47881cd617acfb5ecf5c73a6cd4b60300000000ffffffff0330c22900000000000700ac650051526559b3960200000000026a535b350f03000000000000000000", "52", 2, -527625338, "5c6673e043cba0b40394a03997f588f915349acb97652b6a507a80e9227f58a4"],
+	["02000000048bf477ce1a5a050d1dfc8c65882d69e78f2ea50de3d1c9f4b1e5f54123002a19000000000663ab516a65ab9df04fc37ba54ed1db2c3021581fbd33bd74b6ecdff378f94c4da1b46c0bb7301d6fb512010000000252534871e0663f81cd6609a9d5608c390fa03c17f58a2d02ce2b6d2add618d27b7fc9eaa316000000000075351535363ac65ffffffff891aba2b09eb60d5b4a9cec546d0771d7598ea146f5c97c40e22cf6391603b4e02000000020000b31c47b2038219620300000000026a5330aab6040000000001631f82fe030000000005ab51ab6365e69fdbf8", "6aac535253abab5251", 1, -320978578, "7c22d012dce14f6cb90dcbfc677189210efbd3171804c62073883102d1fb1871"],
+	["0100000004c3f391db798ddcdd10a61d084a45c3c707d141e21a6c355f95c92a22b8fe6f0b000000000100ffffffff56ef902b7149afbe4c86c3cbc435f88eddeb4102809eed64cead905b5295a6d80000000008ab65acacacab6a00ffffffff5c22137b071a0b6a2577873a3c591534c7ddbced17b2db3bc314daaa2e2b5ad901000000026a631e4c5608d7173978e1ca4ded5fc186d045aaa9d0fd60f86ccb8bb46aa54802d6457f52d301000000056353636353ffffffff03a1435c00000000000963006363ab65acab52cc0e44010000000005006a0051538b67dd030000000005ac5263635100000000", "6363635351526aab", 0, 1499639603, "9a505d47899ec7e34464277d60af5f676d2abbe7a1bddd1e8a92e0caec6f642f"],
+	["0100000002c29d5fc9f331ac6ab04848b75ec27306dc9f0da7eb4a81ed6260f65341ba21410100000001abf6134ed372499475e2337e569bd04a8408d346465cc127910927ca2f3def46ae288e8c120100000003ac65ab4727488a0268ff3000000000000451525152cd38f60400000000065351525300ac00000000", "6a656a51", 0, -950379965, "7cdd7f051fb4aa7e2b374218b6e0e333db44dc787e567a03fca91c82e27e1b28"],
+	["0200000003bfc56631b479172a31880380ae0af6f7ed5a6392dfb914bb5e48f6bed43620560300000003ac51529f25f99f057deeb33ed08ae4b9df56b50c3441c184353188fa1109b37c65e5e4d23d72040300000006ac5263006565ffffffff0a6fa2e1b4dba3c76e5f46eeeca555ca7a1aa76f8f7ec33e8c7a83e5836a49b90300000007630063acac6553ffffffff024b08df050000000003536351a79c10000000000005acab6a535200000000", "", 0, -2037862805, "7e94fe68bc0072627852912bbaa6872acb8e88b9b5926da00f32b601b3820335"],
+	["0100000001cf6c8b6c08aa47fcb6d12168efeebacf8526b7696bfda5285d1b07633a2d2cd40100000009ac6351ababac525363ffffffff0460d50c0200000000045363ac6531f820020000000000fdfa0c0300000000045365536516ef0d03000000000563ac52510000000000", "", 0, 1896015792, "225461c9a69f3afca65333e1ea8b87b3e303acf0dd45cca01da68358953935a4"],
+	["0200000003854ef4780c7990e25a1f315b587a4fed84309413d7b4ad79fff4dd2b447a77cd00000000055263515200ffffffff27f6c516756717b236587101d9abdb265e21f81251f5b71135672629d073d3330000000001abffffffffef2f0d0ceecd497d988df8ac38132d347c9a62b62b5a7bcedb8b3e451d51c43e000000000465636a63ffffffff018c38df010000000002005300000000", "6551", 1, -1609573407, "3647cedd67ae65557017958ea1c818cbf2ddcc7e8c112325c4f4db327c402a71"],
+	["01000000049d53241d7c96c7e11e8159b603f16b8315fa7111094cc9d6af8b0768a3f3d72b020000000152cdddf0c4a1a88b850573a9518adb1a33e8330124efd3698a330b1f3c2b4e4cb06296765e010000000500ab0000653df378bad0dea72a70d1e292c2f7a48e061001f8e68d3854e1553a1be7e85df381b8c1480100000001abaccb2a558f0eec250a61f6a8c4cc9af246e59fc6c2901d44108417883180ef28e689ffc203000000096363526a536a656563ffffffff0392017c0100000000046a5163ac8d6e8701000000000200533df3a800000000000300ab5100000000", "5263ac53", 3, -41200023, "3262b5389b3d3b83207380e83dd83b45d2f17684e648c5da0165f6c81de2f4bd"],
+	["020000000117e570c08dcfe64bcd3a03acbbee6cd38834f88a2f7cfb5d16cce7690401d87f020000000500ac005251ffffffff0394d95d030000000009636553ab526551526a8255d003000000000900ab65635363ab51ac534495000000000002005291631058", "636aacac526352", 0, -2068284080, "b64dbd0771f1025e916ab3c588bfc67dce7795e6139295ebaf0197681e93788b"],
+	["0100000001b2f08fd2db17c594ad2910b2ee9112f21d8aa5d9674a08ff49f667283b7b3bb5030000000700ab5151510063ffffffff0140d212050000000002006300000000", "536a00ab5265", 0, -802648157, "71abbdfdbfce195aeea1c7af0f8036afef733c2cd12bd3b8e0147ea83a3e5b08"],
+	["0100000001f62b693f1b3543dd760b56363ee952ff9ea2092353da1e17292b22bba221bbbc02000000050063abab63ffffffff03af625c05000000000400656a6a36675d050000000001ac763e140000000000036365528eb5aa8e", "53", 0, -1240964539, "f34922cb7c1c700a3f808459b9fe55afc1c46aafe5af48ae522e709b9673949b"],
+	["0200000001a55e0820f89e037909726bf0152cb08bc3e93a3c7d3d38a981c2284c0564fdf6030000000353ab00ffffffff0227b8290400000000004bde2b0000000000066a526551630000000000", "51530063ababac", 0, -502175838, "93e09eee910d9aa612f09b29e9f7db316b6b6c5d3ff4c7e8fcafb28e50e806a0"],
+	["0200000004d9e13d065c9418f87146a41deb5cbd4272013425ed84901634e1ebcf91b39345000000000863acacac6a63000008070866438156911302609baa7ef047db8063c1a2482e1262a4cd3e0130f00de7d34778020000000351516affffffff979821c978b68e5bac637dc8db1a94e4465924845b3f2a65e09b1a872a7b7a5200000000055165ac63abffffffff1a75898234bb03fb1b1268be6553ba180e9b0872f615f829d02129f988015d50000000000463ac00abffffffff04cbacc5040000000009ababacac65ab53ab53e7929e05000000000851acacac525152ac777de103000000000563ab005251bbbd590500000000080063ababac5163ab904b3715", "006a006563", 1, 1739091199, "e68134e4af62e1b406e68ee54035e7e39aed07e53cbe4d69fe6a2544a0daf357"],
+	["01000000017ed732fb55bb0bc4b651132ef5d7504b62b4ed28cbbebf3787eafcdde9be56ad010000000100ffffffff0431689c0000000000055253ac52ac0d54ca010000000009006a6565ac655265510914c0020000000005ab53ab5352f0615c000000000001ac00000000", "ac", 0, 1732818257, "68e2edcad7c552e9390a29ad653d7fa4af3989d5bf06fe2a089331ef206c0cce"],
+	["0100000002197d89be11feb795653574d21b9ed8d27b1d814c62d8f83bd4b366c7a9e7b96500000000001e0c91ca650025125c08d7abc9a8ebb7fb548beafe6bc20a0c9f73a4111f1d80e941a21e0200000000285dfb61033f72cf0300000000035253631f4c3b0000000000016a56a733030000000002535100000000", "65536a6353", 0, -1553445046, "b44bbf1eb377fa9838409b67add5541693ecd506686af09821b5aed7790f7c29"],
+	["010000000111526be4b89c3446df6d555cb8282891aea0db60a8000f82e16b45463d0bdcdf0300000005006551acabffffffff0452747704000000000863005163ab63ababb1c941050000000009abac52ab6a00ab53008ba5a10400000000096363abab00656551acb52c3903000000000951acac6353ac52ac6a00000000", "", 0, -1132108195, "2ea3e1b6842b245967dc348298d20a1cbde23b1f3f37b525ae59730dfa976477"],
+	["0100000002f1007d55e6bd049b6cd7bdfc10ae73a0d9b32f2d2612fba197fe27bbec6043000100000007536300536aababffffffff64fcd4424c66f5c10d529e55c3945a0c4aa04ed99fa3e78e0ea4c0ec54045598020000000665006a5163acffffffff01625a3101000000000352526500000000", "abac656a515363", 1, 2120489035, "0c2c654e39cf573c783e9a49efac9ac304663398cae89ef9808505ca8b09eb14"],
+	["01000000020f3553926e6a7b852a4e20ceb18d836b26d0e23a039ba4b244a7cea7b0df935203000000075263abab63516a8b1b6523841af7aa5530717cdfab0b4c927c5a8ca2afc9ba798462b28605428ae225ffc302000000096aab6aab636a525152878ee2620236d4a001000000000263006e70c0050000000003ac6353963a8c2b", "00525351acacab52", 0, -2029057225, "0f1d0f8dfec0a72ea5b906174a2231b1f561937e1a2f4b673ad8c943c3da839a"],
+	["020000000246a9a42d7ac3e44cd184d132d2e8a63227d8f9c9269fc5d5eea917871b6cf6ff000000000953ac656a6a52ac536a6ebd9f6e1872ea685e2222a8517cb3c0b6d58f68f68241ea6fad6ebf3563bc4a5be91b2b03000000026aacffffffff021a242705000000000865ac6a63ac0000ace6afd802000000000000000000", "abab6a", 0, 1892589641, "0b2171fd001cb8bb1ece9d56c9c17ff229f4f418a7cf88fb48ecf8426351330c"],
+	["020000000169988595cb64fe9d7a81d0f26cc18530fddf7c1ea1409ebc11f4664fe7a4d8e60300000005535151636affffffff04b8115f020000000005005200ab528e08e9010000000006526aac53ac00d29fa400000000000100a43ea7000000000008ac635300636aac6500000000", "656353ac63", 0, -1818721708, "43dee883050bb1b4b4bda8ec9f5bf3ec3b5359f2d09e492de417b1a01499521f"],
+	["01000000010967129f70cc7a2cafe9372335ac7feb68731fcafe2753f3420300aff99cd3e2020000000463636aac1889db8e04739a66010000000008acabab51516552527e8b2702000000000551536500512bcf640400000000046aac6365b001430100000000065152525151ab33976fd0", "53abac6a51ab51ab53", 0, -430319778, "caab3e7d5dc0dfbb78cd84012718ab3f600e0a06373a84be70d944f784e6e7fc"],
+	["02000000027ac7054b656e69fcf55555517c02ee60fa655c919dc0c5cba15b59e9bbc338c703000000046a6a5253fffffffff3639ddc359ea5c3070c876dbb68ded3f0e358fd81a926c031553e6167b29bb9000000000300525395e8854402557eec0100000000026a5278efd00200000000015100000000", "52525152ac6551ac", 1, 2147206774, "9c4cffa28b183b8e77f460f0421386603ef200ea9b917a6e339d28753fea4bc3"],
+	["02000000039f87eaa8360ea6570dec8875c8ca9ba71de298fc217a81dc27a26c36a7a77aec010000000352656affffffffbe5efbe1d19e8b5df48ba1a21b067d269bbc2af1ea20509c09032dfeb8123a040200000006656a536351ac4634311910d64c3062b25cc153e601c5c23b3ad07d6cfdee4a726ecce27bba90c63f30b4030000000653526a6a6a53df46c51704ccdc8f04000000000651ab00656a635db8b8040000000000b2b0cd0100000000066a51526a53ab701852020000000004656a00aca25d27c8", "6551", 0, 771923979, "74d7f7abcc846511e579994482c3fcc3dbecc70a6bcdcf251b913e088a404b53"],
+	["020000000374bdf9117ddae2436b8fcd05bf9bbdf32a73b79b1ea2e0752f11e6d892b545ca020000000463656552ffffffff495ab36b16b053ecf7b715f9a02357fc8f55230abdc0a6e19002f1019bee3f24030000000953acab536a6551630086f6b51e49767a1f40a2a68aee4ea55eab39b55b124db16d4418a109bc5c6e9fff9b9742020000000652525163006adbea15de01afb39a040000000002ab530883cb76", "63", 1, 375683310, "34b262b44e5cb92fbc24d9967cd9ea13279add6895bdd9c89a405e41c77b16d2"],
+	["0100000002456c64adf048a1f79216f841831f5e4581178b9823172a4f2d3e6fb2bd624b390100000008655352abac53536affffffff862e4f65f02177b546baea848cfd1b0c28e7a92c334e83de12d1b323690a3c820000000005516a5253acbd6b02b203b8478405000000000066834e010000000008635351526565abab8317f1000000000002636500000000", "5351ab6a65", 1, -1848809601, "f720f33d2da0bf50261e055cfaa4558dbea096e3852f8f6a91ef5f7ddafb0e89"],
+	["01000000039daf266edeffb36a567b1ad2f4defe5edf77403e056b4d67468e3c13c364b45a0300000007ac00ac656a6352bd1fe6c5fdc003e4a137f907ee98dea2962509eab850945b9dc66f2a40bdf21a58e5a3b10000000009520063acab53006a65ffffffffa6eb93c73c904e452edcdfd2afb8d48562d55ee9c1762c970805bce6256733b30200000004acabab63ffffffff03fe79a50300000000095365650063ababac65958b0f0100000000046a6a65519c485d000000000006acabac65636300000000", "656363636a536a63", 2, 1393880067, "4d8ffda893dd554636b6595ffd3c65d6719c69fc16f997b86ebd891c976f2da9"],
+	["020000000390a2c5661e4803c3de2a2b9a3587a48af19ff4e2e806bf3158f1b8d33ad70f4a0300000006ab5365525253dfbea07ec29ef739a964785de1fde1ef31f3bdbbe04d071a3c62c66dbb29e5f838d7426400000000045352ab51ffffffff53be09c064accccd2ab9c2aa6b09fa2c667e10f89e3319196adec42d18712f4502000000026353ffffffff023e91d80500000000001c87f60000000000096a6a51655251006a0000000000", "636a52", 0, 855436405, "2c989b989946ec2def028adaf4ab24b195533542f2a380b9938627dcd4bae37d"],
+	["01000000028719736cc20431a1ce7082b1f606ffcd1612f81767e4d958b9bf42ac754014bd0100000007ac6a52526a6500c0a6d5d525b3fcab3543f0636fab96953fb0ffacfb7b870f5e7bcac521e45c4d91feeca002000000086363525200516352ffffffff0324e05d0500000000055251abab53620a770500000000066a5153ac65ab6b4dfe000000000009650065ac526a63636aa56d4f14", "53ac52", 1, -863593618, "862790152840caa56f708a7caf1dfe7564a46c8e3b0d657051740093cd73793e"],
+	["0100000004827ec0d092d92d974e6492b50efb24ff723cefd8b9be448a98b6318520a5bf9a000000000200ac83218229123ff8b298a3a0da7db512c89a19cacd538bae3c21c254a13663b0ff5ba572890200000001abffffffff086438b02aea2d0c2fa4f454fe3cd93ca82f075082a53597935fcf6147c2679501000000016331d789251d9be499a1a6f3d54e4c0b4961467a58ca34cc639292cd26ec2fe9ef444ed7c30200000003656552b3ef102002be28bc0000000000095351ab5151ab000063a45f5101000000000463ac6a5300000000", "516a65", 0, 1540546069, "34f267bd5996fb6ad2ca855d53ceb2626dde55945f356a88e145854b4dcc5b67"],
+	["0200000004f49211f28098a098451ecaeb7a213dd97e5cfe20f5a93da0e301757a0f1528cd0300000002536538dc8c536c3436a01601208507fde4549a9d5aa8fcf450b47338d91016501ecb077e16020100000006ababac51acace5a9b141eadcaab76ca14d0823b8c566837b5343def2c9c7b50ae65bec89e072f04d66040200000002acab6b3d36458a8d81bb045298d80ad12c1b98b996d47c6c09ee17b5b9bfd4b2b0c7bf9db00402000000076563ac006a52630af3b4f2023d4baf0400000000086a6aac00636a5165fd80a2030000000003006a5100000000", "6a5163ac63", 0, -480977581, "b80214713ac0dd8c4c3df2f70e9022ea0369f42dbb7adc1cb1dc111dcec67995"],
+	["010000000318fea6c97f89b33ab3cba94eaeffa0b5cc7b36f9042312a307e2b489921e4a31000000000953655163abab636a0070b4ecbb6247909a2bf9602c2fc107dfe397661eb5742b248e1c1246b4cdc31f659e77ce0100000000e3f91bcb573847a335e1667fbf4819fa4aec55e28f1baa66061b27b154c110f8bba3556300000000066a516a65acab39702a8003ee2da70300000000026a512d1f7704000000000018f542040000000009ab635300ab516a52abcef3e7e5", "6a63acac00", 1, -1361304118, "b40e7905cdaa701900c5b2c8cb79bc4d069dc7eb1212ca269e31c451fbec2c05"],
+	["0200000001fe28cf2eb5b4bebee25e486622e5d6a3d636cd09402b6bbb7992214750d4213701000000075351516a65abac63cf99d401b89a900000000000076a5151ab656a0057a4ca3b", "51", 0, 1266281766, "c1e997215e705c5c210a625b670b8125ea9e29277121721acd0cefd97e235b8c"],
+	["0100000002f8d60be6ab7a62e7a942771339f590e5812e1dc439ac928379ee84d9d789bd8d0100000001abffffffff5cc6cfc4931bf329ed713b1aec2db05cf424aa86fd67a46dda47a6b2fd4181cf01000000065200515300aba80efc01038e51a101000000000200530c4d6c010000000000ab773c05000000000263522592decb", "", 1, 582229803, "03b57b648370248bdaa52059285cdbc73234d5fdb12e13afb2b77bdf9558d30a"],
+	["0200000004094a1170cbd3ed79071b00ff7644bae3a4238345688da7106e7bf8938a98de510000000007526a536aab0065ffffffff85028bf1ce7a8a1f38996713c3058d25fe0417484d475b6e4a64fa3cb5ca1866020000000753536a005263518530aaf7dd2d6b5624a99b7898b7a28bc117cc70489161a4994b26d9df771d7dc0029274020000000151ffffffff7ca7dbf2ecc9ebe9648c37a25d895af7889176f0fe08f72cb1c2111605622e7f01000000056a006a535242302eab04ad9bba020000000008ab00006a526352abee3f5b0000000000086353536a6365656581c3e6030000000003655163f3e92000000000000965abababab63000065be033a77", "000053", 2, -1795341772, "942b7609d9e90e3838d1e21c64cbc030594fe068393d1ef8a11902e016f6a856"],
+	["0100000004865f7a0f3b789804275dc8e68b35a5620bbb25ff045236206795d604610272f20000000007ab510065000063ffffffff93b1309c2e46cd869c40569a6d945ff65431e347b668a7b504d71a89121ac8ea020000000663ab65635200ffffffff23f8de0cbd011c0dc4c5f81a6fc3ce5a6151857d28c7f63111e7e33de8cdb76a0100000007acac536a6a51abffffffff6b9ab819b9fa74076e92320fc67352f27f90d4c6119c13b9540aa3300b72fd930300000000ffffffff0406fe620400000000096351ab516aab516a65ee54a601000000000652005265ab5195d9e00500000000016ae06645040000000002516320390f39", "6a6352", 2, -755482813, "ef7516f74ac6519e560ec905c49f3bde581ddb8d4cd648542818166453088667"],
+	["0100000001cd1231306c857d698699c8addb12569bd11200f8fd938790aff3efbe5d76d9d00100000000a08b1e420257c66d03000000000652655165655259b2d30400000000075253acab526351424e927a", "636a", 0, -388159877, "0618b6255c23224ebbfc2b802b49afdfdcabbab1c87a203fe311d6ea9005007e"],
+	["020000000403e92801a7ca8db4b311820f3e9a576bdc887e3c7f19dd61e9e3b3c7c988fa0e000000000165092680f5e897067ac62c94772a79735c8e3dd54e6c038b4339a34ba69cfcf37234487cf201000000055253006563b5539b2561b181facb752c796299fd009a7caa2b4a41357fb5f7f096e9fe8f7a31ba611303000000075251acab535300ffffffffefdf9ad8eb03b714c793cd031e901728ca16f5e01509448fa265d26d0b25c20300000000025200ffffffff04db148f04000000000652516a536a6aefaccc000000000003abab5164661c030000000003005152fe8f6a020000000008005251516aabab63fa7c8a53", "51ac", 3, 550227609, "c16e9d0968507dfadd76fc94093fb69e46423aa2b8629c8e4529881703f91385"],
+	["01000000029abc79a8d8bf1b1a53b5f9921b31643a1362633653783afdaae9b16cbfc6acff020000000751abab636aab6a314ff3d50deaf78a939025eb25f05eb88cb3f5fa631c3547461ad66ca164ffd534ffd56103000000095263006565ab00ab5246b973fd030f0f8f030000000002ac5297b42b0100000000076a6a6aab005252bb02a3030000000008515153535253abac509cd934", "6a", 1, 93257775, "f07c38a983ec0d6c95b681dffd54d9d0f4b2ec75d743d12bc8fe0b9e56dd0352"],
+	["01000000015ece3e0c1108d886d585940c7a671a1a2b8bb6cc25b68e2756a15cc588d0d44f010000000865abac536aabab51fe5b945d0324e975020000000005ab63526a5174710e030000000004656565510ee7da050000000005005151ab6a0ceaa72e", "63ac65", 0, 1898441636, "87372273c0001857c7187963021181e9ba0e8d831146b39a9fe46b8a61c55adf"],
+	["0200000002fe3bb48085536a710bbe0ceaf1ecdba50ee58d103d008c96d4fd22799bb9bd400300000000ffffffff14cd638c7ac1ac4943ca9b19022c6470adab9155fc81d0d860a8afef7b68f8280300000006525200515163f84635ac0341cb51030000000000cacdb2020000000009536552acac6aab6363e192cd03000000000153080de405", "6a5252ac00", 1, 1076519502, "2010b304cd6eb1ad4172fb5d6f5a87106736d44c1b8841059cb49e017a49d05d"],
+	["020000000239a7f21e90b77fb558ed34fa464127193dbe1f5207572056ebf48e02dd561e670100000000ffffffff1494f7887faf2473fae3115b0b0735f84400d8e85db3c9ce8469f6baae423f14000000000900ac5252ab6500656affffffff038df9f800000000000465005363180b4a050000000003ab5153d506380400000000016a3d67244c", "", 0, -1899402801, "0aba3d0e69ffec9fca40b39d1a7e64faaf5335309b7c87a7b8c7fe64c371361c"],
+	["01000000021d7884651536d5e8d285b4a31c2bbb70e687dcb56939e0b57ce7758aad8c649b02000000025153cfefc0c8b58e35fe71ee2e7be1b9400a014a91a68403018329f7ea005850f2be276c88bf020000000400525100346c3e7e043bae08040000000000e4ec430500000000001a1f390500000000095251526a63526563abe233670200000000045353ac5309bdd7ed", "", 0, -1414741799, "f23925cef0f641e77ed52f9163ac58cbeb3ea264a647bbf6ec66ceff552b2c3b"],
+	["020000000388961b403614683b752cff4c155399e34e6f390fa6b6d186f3b06367811555df010000000663ac535100abffffffffc6d6c24956bf98544c94d3653038a8c2432b890d81c1783bc0d587d1932007e4010000000963ac5263005363516551c86b6412a3203336a19484854234ac4d474f1a84032ac74c56dfa23e7fb14a34b7f0730000000004ac535252ffffffff045ef5e003000000000018d51a020000000005516aab6aabdc543f050000000009ac63ac656552ab006a171b0205000000000000000000", "516552abacab656551", 2, 1923655797, "e8e850d28287cbd3c22e86a3067226ed9e487d9e8d41ce089c408471521360d6"],
+	["01000000039cafc7a5ac2727cedccf24105ffe8cd3e8009c22d9c7355acf982145e41d9b2f010000000963636352ac52656a6545ca18985f347cb953b58f89d79089a420ffc48212bf87de196f1ca555ffea5761a612a60200000006516a00ac00ac4d91b239bfb45fb447ad8d701877b990166392760abf060d31e008ca4805ca642b495e28020000000363ab6affffffff03d498d201000000000653530000526348e10205000000000853520063635351654282b3040000000006515165ab006a680e915d", "0053526551", 0, -1571642645, "cf7bfa0716c555d89bae7c065047fa2ee69cdf5cfbec8b9d464a5b73616aabf2"],
+	["0100000001e7eb1129f64f7c8a7ce816e9bd81aaced962cbe9a80bd1e56f569460ab08b996030000000953635151ac00ab00ab4ff6439303ff68080300000000065263000063abd9c04804000000000552006500abf7c1a20200000000075200acac53abab7dc208aa", "656a51510051", 0, -1400270926, "1affcc8161f9091d2aacc01e79a0369ef76db1981eef273c4dd85cf7f5e567bc"],
+	["01000000014f72f26ba9a8172203ccf72c890c674e9975ae0f64a9b246720ae6cd124df5220300000001652e29a42b014e574600000000000465ac5151ab305ce4", "ac", 0, -1235233301, "7f96c998a6f57c4ffc5224fdb30f865a77fd60b113c4ede6db79efd83caa9343"],
+	["0200000003dbebe4fa9e16cb48f7b0ab504384b8d45c952869ac8d43cf2df037604a4b168600000000085353ab5252655253ffffffff71e4ae60b7d2adf58b9386a5b1fb2208e8f07c1fa567712299eb5efabfa684fc0100000005ab656a6500b1dbed22d2e4c329f40cef59100fdba7817b34ec4ebc8789c977a01cd642235d6ae659f600000000045363ab51ffffffff01161623020000000003ab6365350b8e1f", "6a63", 1, -858489489, "f49c4db87dd30a400a43cbba5b58b7e1c6a0346543211ef9d55bf32b7a65c302"],
+	["010000000200b3511927ef203e13a913f97c8759b3cd1ae59cffcbe03c200476a5cb486de80300000000ffffffff5929a001f6092a238352b308b20c298b4fc671334ee232c9c6efe58bcdacdd84030000000465515163453455ec038514af040000000003ac656a63ebcb030000000004ac52ab52c1b59c010000000006656a0065516a5d20b496", "00", 1, 1997459792, "83e2c703395a9c3a474a3e83c2a376d5d3ed8f93e5d58364e1541c3e9d7bb443"],
+	["0200000003138f71c7eeb5b6a56a077699b0ca64e82a9495c6b8f8d5abbe98ba14179a07bc0100000009ac52abac63525251ab9eb0407f06b9be586800b5ec3cd04d5b69a0f70578fb6717a8b73c9b49856f47e9ccc8a30300000006636a52656363ffffffff60c4874ad8c232b404d20cd5dfb33b82445bb0722873498b962244bf3cf48f1a0300000006536a526aac001da83b0704b59682040000000002ab6ac12a5805000000000265510d9c01020000000005525200abacd13d6f04000000000851526551ab6a6a5300000000", "0063ac630053", 2, -559350932, "d01ed80356140b6bc44c7d3de1b46c028c396a45bf7f2c2d7abe2746882f6364"],
+	["010000000216fb88895383bb5c8f8aa62236ab67e7c1c8be7a9a75d314a5281c1839b0905f0000000001ac7660bf2c73868610b2b1231ad52c63595e41b6cd85043fac49c2d408a5193084747ea5a9010000000965635263ac63ab5353b0bf3c9a0185107f02000000000853525263536a516500000000", "ab6a00006352", 1, 118781840, "24c5bcc885c24f9c71cdc65ba27f4f4229c98a9922d419354822f5887ac519b7"],
+	["0100000003e314815e98e02f00bcbc0d956a9c314d2ba1e3bbd69fc5c5a1b884412635e43e02000000056352ac65abffffffff44a7707bb0b490d5fe807c74c73cbbec846f910f4e312bbd41d72331e142a0030200000009516a630052635200ac4ea5272c8840d96b1bcf171924270ccd4fc3a7b0d5537d672011dea028c63dd7cecdde080000000005526300ab5212d589ee04d8d83d04000000000951abab51ab6553ab00f10ab800000000000951515352005353006abe152f00000000000352ab6a08403504000000000700acab635300636838a146", "00656a51ab", 2, 1327421626, "5ffc990b72ce6fbe7bab38207f73093aef20029aff8bdf0eeb9c33fe55b231cf"],
+	["0100000004f7d7225630006b6b18178a80fcf180a1b356b6e4aaee3a4e171bb90c5b4de7060200000004ab005265ffffffffe6cd8057ecb08f47d7488f172a177dbe963c21b66f6935db7b64b09d93a603e303000000085152635163655263ffffffff0030160460850f452543507814f18b9ea29f9b827dcaffa28c5a6d5b62d8e0c4030000000263abf3a17d61a260d315500d83c41451c61307da7d6f437feeb8edcda1828d9fda9e15dceaa20300000004ac6a6363ffffffff030266b102000000000453536553310fbc020000000003ac65ab933a5e0300000000086a6351ac00ab65ac3268ee9a", "655100ab6a", 1, -1874719432, "925a903ddf50dd255a492cc7f7a50c023be036a08f1781493e505ac6bd4a6117"],
+	["01000000028cd29e8e90fffd6b40bd0420dedf43adf0bee4eb14b02e3bf0c5cecc3e262f35010000000752006353ac5163615f7d6f922bc17a4aac6743aaeaa70660f3dcad376276ec4e9adb47400b031c69eb70b00300000002635343f7a27b022a18c0000000000005ab6352630088a41803000000000553ab6300539d911fae", "655100ac", 1, -2091895135, "0e48be318045a83c68aed5bafdab15fc04ab8c57ce287e2145f0e6ff46d013b7"],
+	["01000000024116746136a87693182a3a8d2e402c352925ad580d5b57a1a2ae11ff4e81117c00000000085353635352abac52ffffffffe7c94c3c22e2fbee1f4a6eb6124082e31b64a58ca2109a2665442251a4b2c3fd0200000003536aacb487221004109304040000000007ab5100525165ac9317c5010000000009ac53ac6a6a536a6300f4d1d403000000000200abfd6b4c02000000000000000000", "6565ab650051630053", 1, 1781084253, "6ea7ef7b8de0861a3a15f2b176708a8627b2c9165c34596fb7ab066e1130c9a5"],
+	["0200000003dd198253c350e712d09f8ea140b354e986d4b2be11c4465806542f3a684e32260300000000fffffffffa3b3af0164fc5665e814bb8da2e6b44199a92bf0dca9fb8ceb8cb2a58c4da75030000000963636551536363ac6a1c0077f520c46e15c3e86ef596fa8452b24b357343d77898c58bde030ae49b0a424a44410300000001aba68e967e01242bf30400000000040051ab6536ae793c", "abacac00ab5251abab", 2, -117415644, "ce60daff4f43f5ad2276579d7275c591f1e426235d21fac5c09ee0c577566e14"],
+	["0100000001ca17a01edd3dcc03bebc5ab53329440ce971e977b8b73bdbee2d93bdfdec2b4200000000046a530000ffffffff027b9cbd0000000000075351006363ac52555626000000000002656a00000000", "00635365ab", 0, 1178416736, "d53bb4bb89d54b3a02c747eebaf88083b57fa20e25b93685ab66c24eb0213c54"],
+	["01000000036fb4a83b5e42d1ab095fc77f494f3d6aa7063adeaba85f10e1b4f0ef7b199a48030000000151fffffffff20a5e0f6bf6c7ebacb1aa39f672cbe90733bff3c0984616f9998d7c319186fe0200000000d8ad3b2b927783b002d23d042e1db03d624fad2733200acb92ae91959acdfbc16770be3002000000076aac00525251534b84dc2202b9e0c1010000000003516565dbe13304000000000251ac29ebfd7b", "ab656565", 1, 171528129, "cd2d987fd4ef156fd3fa6297623bb2daff1a82fd9f2fbf9abe5a7dca35a453ad"],
+	["010000000103bb1665624a4d0892d70dc6a94a4fdcaf293e1f9eb03705d31548a6aff1077f020000000265ab7f31c8540348d68404000000000200633eb11c000000000000553855040000000006ac6365ab5253fcf5d220", "520053", 0, 1617201769, "2b6ac1ea1cdfd3217b60b9dd532d58f17e8b5cb387e245792b5ee7f5e1c110a8"],
+	["010000000265fb7c63b704a4583623b85a7eee68e08b0612d5c29ad073386cf83c75b3cec70100000001abffffffff21cbf8ed1cb77520f2dc8a3d78db1870c6bca7fd424eabeb7e260c49ae9b99e50200000008635165ab51536553e808e2c604dc86b5020000000000ae07420200000000086300ac655252ab637c05d2040000000001525553bf0000000000086aacab0051ac65aca42a9465", "ac", 1, -139339286, "14428db11d09c0a6760b780a2be7da9c8b80d3b67d244ee44136c12e6ea1e020"],
+	["0100000003cbd44c855f208582977f89b365187f191be5b9cb3fb15996425f6f421cd8a73d03000000026a520d789bd683795b6d68173381884cd56743bdad54897aa15ecfdadfbc837953be759adda8030000000753536a52635153ffffffff71dc789721abdb300d260a6d95ee3e249ce7344c51050f3c3d2bf050054bb17b0300000005526552ac6a3df7de8903db9819010000000008516a5263510053514ec0cb0200000000000a214e04000000000352635352beda80", "6a6a006aab5353", 2, 1417394722, "dc1106babcff8fc0519dd385673773f30fb88b20ee9a0f3e03894fd62944ad01"],
+	["010000000139f9dc507bbdcd3fb3072883a02ccce0c38152a2148a2895ebc34e8370afb4f50100000004ac636a65ffffffff04d1f91c000000000006525363abab638dc541040000000008ac52ac6553005100a1c984030000000001635d79c80200000000056a52ac00abd669c862", "00006a6352abab", 0, 132400782, "2cdb7680635c682fe0822479ae074fa8df28ec707405f7cc08070388e0c44d46"],
+	["01000000035ea9c30def651cd72d47aab34cad9ebb2ea6c8e70f9871e0ac9aa37302c5a79c01000000026353383b0da52bc60dbd80e4bea5b30410d6226b734110a69e3efa1a33a9e40a0b25cde60ae40200000005655163acabffffffff5b953ec8e8e9178179c3b0a44b97119681d457483b9ee37cfce3c294b70e68b4010000000077d3da58010131800000000000003da6e6a9", "520051", 1, -814482219, "784a803821f0084112de19699164d51cfdf6d2e3f5eb364504af1f2ea7c5b3a4"],
+	["0100000001bcd38d3358f15925e34ca87b60ac03cbe07c3c8dc1049814553824b312f7ffa603000000075263abababac6affffffff015c87e900000000000953ac006a6a6aac526500000000", "ac516a53005351ab52", 0, -464946903, "8df8ac1cc53ba849119a7cb5d66cb331db70b33e84154bf380c404b33ce6b4c4"],
+	["01000000037169608713fa30c7faa13db9b4c6a4116cb55131d1c4e4cb303e004f3ef05bf20200000000fffffffff2c1e8b9f4ba95ec58be2adbe4cf6385fd4694fc8f61f88d00ce61964c931b930200000006526a00536a51ffffffff70c034c4daf6c79caaa34051c65f9e76c646d660dc08533bcdeb9ad09aaf411c0300000008535100ac51535152ffffffff040749780500000000046a526a52a19a2205000000000765630053acab00d691ed0200000000026365e9916b020000000006ac65006365ab00000000", "", 2, 998307734, "608699c4425b4b6234aa13f933e970f30b817bfc1ec51ae57326f9fa64d9f225"],
+	["01000000047e2da7a580266ee94babd5946aea65e6438d13c8c9b3c96fd274cef716a2c87500000000026aac9b2bc22551b2ca71ee64f39bcd5461d0ac02d4169be6c507ae41aef92615deb97ff11b570100000006655265ac5151ffffffff625e97536a7ff08c6177501443cf0512b565bc5164be09e74f47bbb6da1b5ff30000000003630000dd1b4f53e9c1243e6cd00e4a9177e2bfc9204103b995ce7be68b945266f11778f94acca70000000001658cb8655801f893250500000000046a53006500000000", "53516363ab63", 3, 1085348301, "607405e7ac68f3ee1172b770a27d115051105a324fdeb9b83a16e65f223ea6ac"],
+	["010000000373716d75a4886e083a75df4c0252d36d4307783ecfd38efe7839444193b3e4d703000000026aabffffffff7cc4797fb10faacd73ee76c5e9a579f707af9e90528109f5395900ce2fad708700000000000f44ae2fa2445f4f80066e75e970420ab0496766b3b211d6cd9fb73083f8152da67883270200000000ebe13a9a04da3d4705000000000652636a51656387be8200000000000300ab635c826a020000000005656a000000887b11020000000005655253abab00000000", "ac635351", 1, 1864968414, "427df956e5456325217b0665212a41cfd636a494372fb7f962b266ec1bd28119"],
+	["01000000027596a645bcbc38b017334b83086276ebcc5cea7cffebb84a0bcf6c9430f3f47c03000000055100abac63231ad4537756dd97d513931f5d2c32574629ae74cf5644cf1bae8c95a0d002a4a4d76ecd0100000009ac51655353515163ac9541521002749c8301000000000500ac63abaced54910200000000030052acd6488ec8", "ab53ac", 0, 68575139, "2f24fdc9dffbf9c8f45b8e43e9af5ce260c5d62f363e6d154fd790fc6efc0ea4"],
+	["01000000022b75a632ca90c6bd406a6b19a2e130f84b9d68dd1c7cd6925e291f12a551679a0200000003656a6a2a21b90d1ece5bbbf64fcc575ca46bb3802abb5d343437d61474ea66eb4d4b7be6397fef010000000652ac65ab51abffffffff01aac3a002000000000353abac00000000", "53ac656a", 0, -2069181109, "d0223709530cbbc4727cde76250f61cb78d51567368e3ba4585ba4616f8e2ffd"],
+	["02000000039b6f1382b35ef66b03e09ed231621f540ddbd5acb973ee1319a82ae48a7fe436000000000752ac5163535251ffffffff1c9f71cb548560b1efc637b0beca7394bca8b3291faca05259c4d212dd413182000000000500ababab00ffffffff1521f9d377fcce5015d03499a66d860fc4e4b4abdfa444bce03c08b33658d59f0300000000b640258504183ceb0000000000056353ac0063c53db301000000000753ab536aacab6334232d0200000000086a63abac6aab526506591a030000000009526a65abac516a53abe46ebe34", "6aac5165ac", 1, -972536778, "09493c3f0c399b3b4ab9c2939818d96c8fce6fd2becdf29768a32db921e32603"],
+	["02000000037d2ce567858a7fe22189662e3cc0051eb12b5a595ef6cdcf7b6fb0f31c4533fd00000000056aabacacacffffffff0ac502def963d8de11f2a0ea4aef26e5626476b5a4d8bbbbed80e5d4f5a187b7030000000465ab52ac891103667403e90844bb45cb1e19677cf8ce0184b3b41d921b8a8f94188cffae154c8a32010000000765ab00acac5353ffffffff015a13b5010000000002525300000000", "ac6353530063", 1, -1349902779, "939d57bab6696c67e274bfd8c419e273990cf80f2f0e3fff12939ea4e321d8ea"],
+	["0100000003ba86d2c825166d50dede39ec4b77187a3fb71c2f03c460372ea6431d7a28c79201000000055100515263e24c1b5065d9f62710c0384dbf4dffa358de5707a58ec463d73fb7587d5687d4435d84cf030000000500525100651e3ddbab860f03db4bd86af7c1ffea84fd14584932368d95b06a3f6d9099659746f3679e020000000500515253ab276663490385f25805000000000651ab5365656aa0e45a03000000000163802d9b0000000000096aac636a656a51516a00000000", "5365", 2, -1347993085, "0c58e118be7e76c7205418b6409da29dc851bedfdc70e1d32acb42e7c9aa3030"],
+	["01000000046b1607bc3365a4ab933e785887c012dae426041c729c09e82d4ad236afcbd1a7000000000400635252ffffffff84330d379dca85f933cd5147a8358399966208b904fd543e69d0cc993d92c6e70000000003635353a780634b3157044657455565f9c21b4321c04f29b19d36e4b2359d6bbb1ed41e5bc008280100000009abab0000ab5300ac530ea3d1f7213827dd9a6fcd1719d351c376f3fcd5627cfd4eaf9ada27827993f177ae265003000000066a6552ac6365fb14b59d0462f0ee030000000000023b4b0200000000075263ac6300acab7582ba0200000000030053ab04f6720100000000030051ac00000000", "52", 2, 314128486, "a583d30bba93f5a95302a0f95ffe5fc70cbc510a9f419344943bda3c07be5bc2"],
+	["0100000001c7ed62d7d91fc55569a8ee26ca93b38c7fc4b4c4a0a5ee3027f0876c0964f12b010000000852536a53656563ab393a7e6803f62df4030000000004635352532dcf1b0000000000096a656a0053ac00acac64ed840100000000066aab5300630000000000", "", 0, -1741644732, "4c91ecabea175460786edf4bd16058509d393b279787b5ec89b9c40ab87ef5e6"],
+	["02000000021b7d7ad5c02002de093780bacd6d1128831f51ef16eb19ee973555c65099b581020000000263abffffffffc4136d31daced9fda32a320c08c618d790af486ab8ca73bf4c5db41c7d6571a90100000005525251ac6affffffff026de3ac0000000000086365536a51006a51abb9b00500000000008b19d95c", "ac0053006a", 1, -887662482, "c12704962d110a3930992f03f54ba08a30d26295119d3789ea5442860be5572d"],
+	["0100000003e0483ca281ca9bea974a69827bc69f8f31bc93a0a4b1e25bfc1cca5ae4ab0d0e01000000046a536500bcd7fb07187d7c5c78b9a251eb936f0f3a804e5d7dc16421f2ebffd11d8912295b37e1720000000004516a6a00ffffffff47f0022b8aef3a83a58153cb91ee205e84a2eebbe057aae52c143446c0c663b8000000000752635363ac6552ffffffff021a962500000000000363630072f713030000000009ab6a526a6563ab530000000000", "ab65006500ac00ab", 2, 1403254335, "174ad9a4df320626df1b5605ad657158b53b179d1057fd92e308a1931100964c"],
+	["0200000004d80c4b9985a0a4b120b951e8e2f9887c9211514ef8b0bb7a922de356a5aa7c450200000002006affffffff216ea5bba0f2804aaa23f8bf117a5d5222833a0a1972aede176125d2cd6fda1a03000000056565655300ffffffff459fd57837308222301193c05f1aada4b7bf607b466687c2774ed9240f7faf990100000000ffffffff0e5e78de1fc07f70615e22fd9917d3b62a4aa5ea8f75f6578be30765e8c19863030000000151ffffffff0275b048020000000001513eaa9805000000000163cb61f516", "ac53", 0, 432951362, "27fb441be86fa599c039b6570f6e9b65f3f5fe745dd759d02463bec2afe46fa7"],
+	["0200000001b70f5797ca33a6773e5418bca2004fb61dd043a8d20b7e4d9d0887c156b537aa0000000000de02d49b021f74c3010000000007536aac0063516acb12f10400000000025265c96b3fc4", "ac515263526a", 0, 1887350139, "43715957a570f8aa32ed27c88b1f63946aa1132d03234afa23c5d7dfbea2d4a2"],
+	["01000000045125f92f10bb312a51ecc2ac489a3ff887d658fdf45d6bbeede26c51341480840000000009636a6a536a65ac53acffffffff3057449390026f81c778c3e3ec704b5a851b4ea0a35e556838a8461ca0b633af00000000096552ab52526aab6a51ffffffff2734c125ff35f007891590881975a11ee4c9d6c84f2ffbf2416df0ea9c2248f40100000005ab6551ac00fffffffff9242c9c690df661ec2e36c07d374d5d5229d7cc6c00bdc7567a62971875adba0200000003650053688a9b850472330f010000000005526552ac517002c404000000000753ab53ac52ac00a0f7bb040000000006656a51636a53986b4a04000000000963636353516a6353acad1afea5", "", 1, 151982316, "4291b22c6b7b50b3f9e932c449141671756806ec63580b58ff70224578c4b24a"],
+	["02000000034587a49c10a03d799889a180f9b617d174c20d3c16b63bb5287dd666f9a7e71800000000096565ac656a53005363ffffffff83862f69c776741ccd98505ba32723bf868941d120a60f4b81d9c3747c00b2340000000000a2468ba10f3c10ca08215a837b8bf3af59ea5001db83563ca42dfa492984f5a6d8cd9ac2010000000751abacac0065abffffffff01a8ce68000000000009510063006a6365ac6ab6133c87", "6a5153ab00ac", 2, -1526548836, "815a163e4b2eebbe67e9d2976a3d1be6d4aca1df1bec362c6b57b3004f0a82fc"],
+	["02000000014ea53b954aefbf9f7447d9c1a615c6e6b4dfb1cc70c1805c355185a645de08a40200000000ffffffff02dedade050000000006516aab65536af6089a020000000002ac6a00000000", "abac5163526552ac", 0, -1199444126, "8d39cb636f4e10d40bed8d9be9c69642ca67670098a95234ed0ff9f71d27d19d"],
+	["0100000001e5b60e34c1a3c4aebcda40a980de839e41d2ae1cfe498247c3610eb900713d740200000003006300ffffffff02ab471000000000000853ac53ab53525251a63247020000000002525100000000", "abac", 0, 275680991, "453be721f9cbdcdffe002e1b50e49fe4fa312692446828427ac5e2f7019e48cd"],
+	["02000000019c87e0f1a3c1cc3e94f1826b7bdea048785a304c793d91f12016c709e710d6a70100000007515263ab63006affffffff0316d4d904000000000553ac515253be066b0300000000056351ab536362fa080500000000010000000000", "6a65000065", 0, 843315372, "a7dabbb3792f5d606f558e908c95c4e7d6fdfd8e8e3aaff7fd6e0a7ca17c4fee"],
+	["02000000012fe7b04505704639123bd6e907145b70492e9cedeca347529bd387184425d923020000000165ffffffff011fa13205000000000352516354b1a156", "ac00", 0, -2007215775, "06ba0103f19d64a80e808ee321c20ddf022a805a9dcfd64a6413061321743953"],
+	["02000000033c44daa8d90b98798cf1d136a238845dc2abe7aad09fb0afa2bff231d6f06b970200000007526a51526a65656bfc02aebc7f44da611b163155c54d9e201d771674d5a4ac6fbb367f8e737d25dcd44661030000000153ffffffff1b160d598c66f1c0c21e72941e7161680391958929b88d312a8cb204a6eb7135000000000663ab51635152ffffffff012ef6d10300000000016a00000000", "ac", 1, 1659391037, "ee4fac9a721dffa9b2ac1d20d04c1333f6d2d5583b233f5312340b6d137da0e9"],
+	["0200000003d0cd565f6417f94accb276f248c8800525e86143e5c17aeaeaec88a86aeeb6fb010000000800ab53ab00525163a93cdd2697bafc237d570486516040fbba9009fa993682e261cd69c4133ac659ecce5fd0020000000565ababacab7ff69a97485bbc8b3c99f35ae4a70c004f2b6acdb8c85bdefae2ac6b0417c48ca9f2ae090200000005ac65ac5253ffffffff03d8fcdc04000000000951635151ac00ac6a52173337030000000009515153abab005265008d69b70400000000066a0052526365fa1c9fe9", "5353ac63536351ab", 0, 1401863071, "e76f923a17980f762fc3dcdc6c40404566c58c1d4732839a26e3b639f5dfc2b5"],
+	["01000000015db9d15f75a1fcea96afb715ffe47fe755686a5654996fd5736784c5e7c0deee020000000765656a656a63525d601cf501f02d8d000000000002006ab2fd1711", "5100535251", 0, -1959118057, "2e852e61b28c0bf9f333467cfb92d75ce946b8a018b8c2068f02b3ad8d428239"],
+	["0100000001c0f074565f47e89308068e942ce988ad23f0dbe4e264b86a98143286f0bd357e000000000653525263ab635810e3490319087d0400000000096352acac52525152525db264050000000001634300cf020000000002516500000000", "0052ac65630063", 0, 1130026586, "a7174d3dcb11ccf14e788475a26fe3ba48a0ee3bfb9f7bcf6cd49a7c2459f05d"],
+	["020000000132aa793b23458f942c95e55a7a56b1483cf80db977677379ec7a8406d4ae154802000000036300528c03e8290241fa7c010000000003656353f9b0690400000000046365005100000000", "5365526353", 0, -593430096, "32a08f4ae61ee3178d9821273b8ae11600ac68eb1e9ff37687c1e40de22b6263"],
+	["01000000020db75f48f8445ede33a144e90795787db7bd9e71a97ea96671ff2030b9a05633010000000865656aab6a536353ca245362753c2cc29cdcf5fb7213e696c13019388b4150ebddc658af88ebb1a3d95d0a21010000000252631660908f013bfaa300000000000765ab5365abababff746428", "", 1, -576252142, "df365b0ebfcba89888b0f4ae7bc155b4dc361a4b75826c5fb9e30a63a40ef0f2"],
+	["0100000001ad1ca5745e3762d2cd3ed60f4c404ff66518031c065f65817c63bb441d5839a0020000000652ab65acac63ffffffff02f2515c02000000000400ab65acf9c7b00000000000085252acac525253ab00000000", "abab53abac510063", 0, -677425, "f954e17dbfe7753175a7a2fef17ec8c4ecc07e98c34c16d07b82c43626aefbd5"],
+	["020000000121d8a245ed29402a6f07656e198b73f38b9a881d25bb22b29fb17823bbb8a57902000000075263acab65516affffffff011bf69b040000000009ab636352000063656500000000", "5100", 0, 1516199914, "ddf9e0cb81879473ac91a4bedfcba538a79730b7900ca0af61eeb2e8875ff4ac"],
+	["010000000449a2cb6a9c04901beee3c080b9d4c9cc509265c369ae6839bb21c399ea7d041d0200000005516a530000ffffffffe1a44bd9fab51ae70cc749417a2d425da20c6ddd90d654fc144c56e8e08fb69b0200000001acffffffffeeac146e0cac3350d1321d1d84e910ba82265a4cce90a4ad026419853f68529b020000000865525351acab006a4617a6c71b2be39a3030b19033bf2aea27093aeaa233ef3dd0071f5c76c4a9b26861ac720300000000ffffffff0238edf1030000000008636aabab65006a52dd0eaa00000000000010ec52d3", "0063abac6a6a656552", 1, 334498682, "3b49e1b46c576fef6f92b3d7adf36f988d8448a5d84cff6e662517d5470c1332"],
+	["0100000004dccf9c899bc5f2fb12f9c5c594ef4f1201232f93d79a118c82bbf6be41fdeeec0200000003006500ffffffff89d29babbf547513dfc7b8b9d00515fcd94efa95fd7e1c56f7b2cb0ca2427f0f0100000008516365ab6552636affffffffc51ebc3228b4867d339b3876e16d045e2185b55d007503fee3783ee0028b479c01000000003d2fe2af1fdfc00d0c929bb0e7f30eb9a5dbecd4b0208502f130834977d9f6adb79bf639030000000451acababa20d3b50036a7c1e030000000000e57b24010000000004636565ab97b1de010000000006005200526a00ba0fc2e5", "6a5365536a516500ac", 2, -1697131938, "fdca1808a09263e781a8a8eb8dfce6984a2971839a46cf2f46354f0d6147b356"],
+	["02000000045b9a7ade7d62a5f094beb4da9131467140101ad623ee848dd4fd0e556850e62a0100000004530053abc55bd54b20936a0dfd82dfd45ae741c7284fb29c4444adf548f5bcc37681eb462532bfce010000000153cb2b9d5cc7a4b93f7563ff8d12285237be8c595fc85c54a1a71ae5474b348621401adf45020000000465520063ffffffff8bb936b7808d1016459ec44d8f200fd7c1a6250fd1b83a94c5df77668e88d4660000000007006a63535151abffffffff01c526e20100000000015100000000", "ab65ab", 2, -621569358, "7513e06dab46b657be1d3d3c7da2ec6339b57bb81077703e979d4f30ad3d4b3c"],
+	["01000000029b9306635e268de509e09be11b2d910ff89ded965f3b905574c5b5ab3f35fdf0000000000100a7c89646e074a4c0771c1d16f50e11bc4a5662103338393df9eaf070507053c6690f8c4a00000000065153526300653428fbfc017848960000000000025352bd32704e", "abab", 0, -1485423366, "7fb26cf774bce8b15d185284e88a99145aa001d8171a883a6259ddae43c8edb7"],
+	["0100000003c5cfaa9e8b0260444b6917ffd25a0e58b9ca3c8e4be4c7f2619dd4e454412b650000000000ffffffff4f7decf94537731e64c3dc861f24364f1f26423be449a3ab131d94ece10bd44300000000076363abac530052ffffffff46c3ca38ebd4363f497780a4bf21fb3e14d0eee721dfe5cc47d17a3d484c5acc03000000009abaecd903c0ff3e0000000000050053acab51195cdd030000000005536aab5300a4c661000000000009ab63536aab65636a6500000000", "6a6500655300", 2, 791357086, "38e570bca2d0ebd451f702cbb764ef5d9d239ef47ae5ab20cabf736516f9183c"],
+	["01000000029a80e3d28aab2b2267af0da033909eb49cb879b0dae4f5a90294228f57b34cd40300000005acab635253ffffffff7cbc76982fe0b3c8c46e6ba227445e634bf0646338ec4f2393d3b03bfaf7fd0a00000000025100ffffffff04f9bc460400000000016ab77534010000000005ac63525351a12402000000000003656a6522415a030000000003656a6300000000", "5353636a", 0, 1197925472, "c39d78315a97dd552397d5ffa92ff09346877440f6b79be154cf4e1a7110952d"],
+	["02000000025e60ac43f4f5f34b207b5b56259f3082dec0b844dfda0ad2e7d242087e5f53990200000000167ffd60c239a000bf16b3a0c385048c46397c7255108d2fb5964b85f645b3c33ae63997000000000004abeee7030a1760030000000008005100630063ab6396857e0500000000066565525200abdbefe003000000000000000000", "00ac63635363ac", 1, -653694398, "6f5154cae6f439d01296c5ed910654a1e25db4779e6b82da8d745c693168dd27"],
+	["0200000004259b9d5ff084390eb0cafa0747aed65b8f554599ca7bed668fe4c58d8f2d7f110100000009ab0052ac525100526537800557384a68b24ab0a4e0973e4706d97040986802ebd1a5bc10017386b25b6945f3930000000003656553ffffffffb41794fc06c02681e92ca65247bb44a50439fd7907d2fceea51d5db9280eb93a0000000000ffffffffcd7e77dc82593c95afa8a1d406d6c7087a21d410722700f33b9a2df021b819e70200000002ac00ffffffff01638e550000000000010000000000", "65006aab", 2, 737353594, "71860811eed051d0b59277d031c748a1a7f2ae56b00b8d51d6e570cb3d054ca3"],
+	["010000000433162f6c2637f6fc221b6ebecfbd40e7ba3acbf238f6aa7fe49a90b4983bdf4d0200000007ab6a6a5363516affffffff4d2dc454e9357511436a9ae88346ddba21338bd6feea494af4e1401b5469dbae00000000096a5252ac516565ab6affffffff0e7be994ab142fbf447e9ddb4ee06ef079c65e7c63f1390e87c3d34799d1064a0000000005636aab0052e17352c3bf2e63fdc01984ce08548c6d3690de3c61c9149de2cc1f8d869e99773a3e5c08000000000653ac516a52acffffffff010900ce010000000005ab6551655211d61864", "520063ac51", 2, -422105599, "8ab3e3ad0257d31c5cfe7dd07c747275e0fdbc2c3569df46bda3b67b62b957ee"],
+	["0100000001508081c45197bc4b30b4b75faec7b9af7ea18e18d6e6cb997b63aa6b436107520000000005656aabacabffffffff03e261b9040000000001ab4e474d000000000008656a5365006353ab88f8310400000000085365636a515100524e2dbe44", "00ac6aabacac00ac", 0, -1832260816, "ebdfd16a34b58a33d09d47ac48bbf6d3e6eb0a040960e2c49f989e226f36d13f"],
+	["02000000049281ff629677087512fa7a9164433584efafc19f95030ceba709752604c7d3050200000006535251516a6aa604a69db4eb7b97e184a41da977e4b4ec05ce9f873ba8e465c7aa349847ff7db655a9f4000000000100ffffffffc20926e0b6d573dddcef55a6861d60a5b9c69b9dc9aea77ec5b8d71a37a719210100000001632d8b2afd3ed6d0ecc9213d86f051d401724970ac47f658f6b3f5c27986d4e2964564e6590100000007ab6aab5200ab52ffffffff04e5ce84040000000008ab516a005165ac5367cba70100000000080063636a6a0053acff1062010000000004526352ab647d7e040000000003516a51a473e496", "ab515152", 2, -470798990, "2e4a55db22b6f26cada6461a4971cf62eb0539ebf98cd67444701a2d8220b60e"],
+	["0200000002ae217d719e03b0c448da6fc4443ea6bd20e845bceb677aa13fe13a635840cd260100000000744925fe5f5115834e9542f812f3247b86da729881e0b079c140fc35701ca457e5a686a9010000000651656aac51abffffffff0114010c040000000008006500656500656500000000", "", 1, -1198429795, "5cead390ef8fd144ab4da05cffb56d7c5d4a1a147a18de31c88048c0af316b2b"],
+	["0100000001bdaab4199a118b8b2380666ed0f0ac3bbdf836b3fda11fcdcae5f63100f324e5020000000651abab63ab63ffffffff037a545b000000000000baabf700000000000253ab96819f0500000000086a6565635153635200000000", "63", 0, -845743454, "5e46b0679d9608aafd4973bbad9a9341fd08e17c0d0b5dba43dfe7a279936316"],
+	["010000000312c3363175a0df9baf3f55facdd94b9954482d4720e900f3692c141df7050b2d0300000004520065acffffffff52301db2fff5c9baa2d5d65c8c79a8462bd7b68b582bb908fe6538aeeb0662430000000000e45316b6a45503e501366655ccf0b5a8de48bd5b5aaffdc1633d065527cd7beae331924d0000000000752cc83201d83bc802000000000453ab53ac00000000", "65525351006a51ab", 1, 435573142, "f5ba43ed2fffa29feed8b72b7dad1905da06ac7c4545986456bb57f795938e44"],
+	["01000000030b5279e6dcb742b153f353f03c8f7f1c9429cf16963adee29e589eae68962332030000000865635351ab006551ffffffff0aacad6c8c2af33c428a5906e32be8b21bac0f64c183a229d3666feb94ea5b45000000000035f5e409f6140e7ec5946eafadf0b43a882f6940668b1bba457b986054aacb12b7d773b90300000005ac65ac5152c22eb96d0113d355000000000009536552abac65520000ac9543b0", "0053ac53006352", 2, 420390579, "0429fcc15989238359c6ae4057b0d5bb8ad82f2d1ccb068ff4519f227256c19d"],
+	["010000000292335e76f3c55d5fa321c0ca0917e207440efa5a06a66e2d0089bfce601a6d8303000000036563abffffffff12ecd36f804254d07cf320650634dd1d28ec376c54b08c463f3a395ab5c78a090100000003510052a6face6204058894020000000003ac0063e2f67c030000000004ab6a6300919cdd00000000000265ab8387a1050000000003536a6a00000000", "51abab6353516365ac", 0, -259546840, "90ee84284f6a7ea148ac0751e57039c7168a5b4b8103dbd935d7d097d9dae1cf"],
+	["01000000040a5aec0fa10f4bf7058d3baf1784a8cce62e7a77a09dbf8132b5ae6c2c2802960300000002ab6358824a844ae653c4a4ba43733fb495f4c848565e7eb0b9ae0ed39cfe6051bb6112d6c8ea0300000004515152abffffffff37d4c47ad62f50d6187402e08d40177994e4cb6079d2174d6f07a99d4c3d5484010000000153bb36f16130942ac32a7ccba04272cdb0b5b652449a4082f60dbc853ffc339dd09ca01071020000000153848d8bb502ca045703000000000011088f030000000004536351ac040909f5", "65515152656553", 0, 465838712, "e19616df36d6595899e9b2967ddc82b9999ded28ef9c5aa0781979a28b9d0b58"],
+	["010000000218895ade1e9510913c7dda30e9bd01eca0319f560e39ab9b388e7a40dd8ff15a0000000004636aacabffffffff032edcfc5f7db53a77fa807653d8af51da896c6548e9c1eca1ec4d5ad32b385203000000030052657e09794804efa77704000000000552526a630042c63e05000000000952abab6563acacac005014ad040000000007006aabab6a51515b20600400000000065353655265ac63dc47b7", "ab6353", 0, -1943946073, "6ac4d1bde69aa3611865ded07461e068d1a8ee46ddb4d2971bf66997a44b2314"],
+	["0200000001625ae3a2b25c8e8e9aba7d7fe50a10c468ff5750ad9becf48c0acec29cfe59ea0200000000ffffffff010321520200000000056363656a6545d99040", "53", 0, -1140438221, "58d6f0d62837a8e6c1e1a84c90f7ce58985328140e00929477b807d24473328b"],
+	["010000000373c057857e934a15a4d1cfed078e4ab1e90c47fd354c81a7f69341e331ebaf0c0100000008ac6a5252acac00acffffffffe1845c7738c4d23904668d8d9a316d392ded2adb27e17720422ca393dc6bc3300000000001abffffffffece1a44441683f505f9abc7251668ded5307908d085198e06c05c4ced1fa2a8600000000026a6387d993e60289d71e050000000000ff9e46030000000004516a656a00000000", "53516551", 0, -1538616268, "7e5e573c99b086fe867cc5af52dd9bf32e407aa4c4f406837e98fbc5b88606e2"],
+	["0200000002996a2bb62ed9e78b9f9c0e3cbd7670f89928eb5d33ccdee964ff0332e69690670300000007516500ab005263d7e97bc50c881f21922645d1e50ac90a8a061417fa7bd7bc930b1e52f40b9e6433be3a14010000000253512d4e4b0203bd06e60300000000009b34c700000000000251511a710e020000000005ab52ab6551fa80ab42", "00ab5251", 1, 1058644277, "0e301ff49e78ab18fb9e5ef51504df6cc912fb741da1f470b6726604c35e2f71"],
+	["0200000003807941ca0c5e7109ac58858de6631f37189e0792787f332d3647710e40a5d154010000000165ffffffffb9a496d4ab51982e990a7ef12e78d81550f9bddbd162e27c39e8b3c874fcde7b030000000451520063ffffffff4a2a6fea836073e8f5e0bfe3d127c70b5fd48252100c2fc1386cdc4a6dbb64b20200000004ab5153635ea5b6e1016dacb70200000000015100000000", "65656a65", 1, 124939325, "d8cf203160603a07250a4af398ef851d97c32a09d6abff1581a6c3a0500b608b"],
+	["020000000425b8194374709c4b97e7cf8936734a14d8ef7da36f318f1a5df27f7b0a6f0a23020000000153fffffffff7ce2b9329f863a61fcabfd738df1535e921e4d735ac092ff6e7ab526c031f700000000002ab00ffffffff367842413de9b549da63076b3ec8e5341dcf27f344805faab8e78c08dee309760300000000ffffffffb8974ef5976b18d189cfe49964e89f6036f5c62259bfaf1b1a71bcdba662cf9203000000095265ac53ab6363ac52ba41cc47016bb4980500000000026353a3347bf7", "63", 2, -1653315751, "3a6bd689fee311b5dd97985cbbcca739145bfa951efb85ecdfb08f17b45024bf"],
+	["02000000031ce517810c47b0b897101d9009b2805ad6c72d9b20fb4beab9ffb19876e653ab0100000000ffffffffcf0c868d196134071f458a2ff5f6bdb65168ef1b2bcddbfdce41f7c901eb62510200000000ffffffffae9bc414e776aa2e16fc04f69f7ad890d1ff6d560f5b1c718021e15eb63633cc0000000001630f8de1f20130b963050000000006516a6365636500000000", "", 2, -562373056, "b32c5cbed9d5331c566441e284853a3e69fcc33ab662e8ed8e4b0e4c83fddea5"],
+	["020000000305a8f7c252df6bdbbaa48fad40439ffb605d0746ed2cbe7c2c741b069043ca1d01000000075252ac53ab52533ac8a0d874e4776621fc6dd6b7337f69ab10b75f6975badd1cde1b9b15e14287378dd71f020000000200ac943a7aa4d5eb25d7f82312e893d2e7196ed5636f984142523992277c494f1a4f03ec987c0100000004ac6a52abffffffff043384e4030000000008ab5352656551ac5104fb66030000000002526ad83c5b0500000000035200ab3fb7de050000000000434459ef", "", 1, 326831777, "845822e35d79d84aefaabe0485351f0393c4b18813ccb444473d036262e192aa"],
+	["0100000004b672aa615cde7c76fe097aa432f52b820192090278ddcf414ed9de22186d3f0f00000000096a515365ac636a6553ae392d91b1662a44a98448676b821bf492d43695ae41ea6407a4e4ca866367234807977d0100000006ab6563ac65ac90115b055f34143c8567c0fee18777e255e3a6c11317e45cf2a9dd7cbd262083752321c10000000000ffffffff2edc8d2d248acac66c3cf471502bb09d92062a588221d2a4da3f60a0e8e81be100000000016affffffff035031b60200000000076a63ac63536a510f51bd050000000003ab6500394b7403000000000453ac53acf64544aa", "00636363520063ab", 3, -1571937822, "c0f984b31230e5cf997ae8466aee2279fd70b6d04754fffaf47f59d5c3fc1230"],
+	["0200000001036de0cb4308b330604c1e3548dad81a26699ee3699b1ae95ee22c116ee7ff8a0300000005516363516affffffff04be5d55040000000005655152ac513501d0000000000003abab6a33afae020000000008535253535153ac514c432003000000000000000000", "6a00656300acac65ac", 0, 457702333, "3d77d386cd068eafa3cb034375a67e430c230a0c3c1f3f40e79e1eeff437a229"],
+	["0200000003270f6a8f35f0685d313a1535c4ccf33c68699a7fe9461986948b00cc690fca0901000000055365ac5163ffffffff2dd97eabbd8721b4c4bbbacb9c531e0c64c81a5d973154cfff1c64bc270d2e50010000000151ffffffff782becadf9e47e838beff47f7f6e9426f5cc6148b6b1fdf5d20a86d6f9f0988202000000065151ab516363ffffffff031db6dd0300000000075165ab6a006300cd447b04000000000852ac515253005263768767050000000009526552ac636a635165879d067f", "52656352ac", 2, 64134754, "5134d12f63a187159420062ee9d73355a3623e6952c2f707c8135e7ed441ab77"],
+	["0100000003f9a0e45a20c102e19db86e140c4cc0078c7d6767d6439b6a81f3b8cf0f849a7d02000000036aab52e3dc3a845abb932ae4b478fa0d981b2fecb6de442502681d3399783a753458381efcb694030000000365006affffffffd3590f20bd908e6398b2eeed1efce4079d51d6e99405996f0899bcf4a8af94f00200000007006a6553ac6365ffffffff022e6d87040000000009525100526a6a6a5352a2de860200000000095152005152636a52ac00000000", "6500635251655251ab", 1, -1868897541, "5d1a3c58fa04b2a529b7753c33e40e8d16e3f6edb6d6a49ce8d6b0232b603155"],
+	["010000000440bb60e939bac09de47f016dbbb6d2fd40d03368e4e9ee26222233d11c06697c0300000003635152ffffffffc3bc255246862cab86f5c1bdbd7f4bcbb56752ae0506ce9d57d42a037bfd8dd802000000055351ac51657f0f633f8f7e8259054af521b4f1c2e31dee20cacd3f0913b0f239f82391d4232b5530600000000007abac6565006a52ffffffff7457afbef9c6a8d0448925d4d77f4f0a3b3c8580f48d098b955f0ef2310ab96e0200000008acab5251abab51abffffffff0492fd8c01000000000165fee254050000000005636300ab6a1edb920500000000009689cd000000000004535100510758523f", "6aac52ab53ac", 0, 1547643705, "cdc6d42f9411968335351df176302cac006439309770873fa4362c9525f5a87e"],
+	["010000000421b8e3b3529b233a34953d06cd872e63438ad8c5be14f61ddd740455ae023bcc0100000002ab52aa686843601204c9f997ae222f1d2824663078ed9529e440ed95065b232463bf98cdf04003000000090051636352526565abffffffffb8101e3cab9364b5b2c2d4578c582aa63798b6737ba452fa0c6cd48d46e365e80000000003526a53674808b7feb17ab0d64f70dfe7ff18a929d2729ac387aec4f3e419a20044ad902ac9052b000000000451ac006a0334c49201c3b4b00400000000086a00ac520053520000000000", "6a5100", 2, -406186260, "68d50c5044f20dec908c130dd564423e1542ca534bd178562359d986372ebf9c"],
+	["02000000030d3da1f191d14dd4246aaaadfa579efd7dfed3e7f79fd6d00b14b89cb7178e170000000007636aab6a63006a97973d6b5f1d240b4edab3b05bc9f9cb441872b06d1498afb722710fb8a0c287b6a314da0000000009000063ac6352526a65c8b33dad1bc3da57557a8193e0966e1b46f7e363b6c86b821141d48f29df95ba57a40d280100000007ab51ac6aac0000b6a4692f048099f601000000000600ac636a5265232a0d040000000005ab5363acab5e5394030000000001ac463f18050000000001ab00000000", "51abacac0063", 1, -526889464, "5cd5d5406a472a4983786fb2be189b9bca61d053533c46694a19bb59a23742b3"],
+	["0200000001b0f2292d81b1dff7729d4f92fec98ddae050b6c47afea1516c9db10503ad9b4e0200000007ac63005251abab9dacfe6701d197e80500000000040000650043376d74", "ab00abac63", 0, 976930118, "81e992df56e6185bce6afebf46d057476c9ffbbce7cfee3b89882c6a6ed19e39"],
+	["0200000004d6c6d5f82cccd52999d528047ecc9ef6043bed38608e9d439045833732b85a6d0100000000a5fbdbd13bb5c9c947befe37e3172c5e61151cabd3ec4b969149ad6fb18f6c37defdc401030000000965536a51ab6aac6a63ffffffffd26738b65b91e90b83792af815cd4781f4c43349aec9c360455e8af300154a880300000003655165ffffffff23705cf72443587f5df67d2a6d5cd7939691e2fac76bc2e695ea0aeb607dda7103000000060052ab63ab65ffffffff04fc890e00000000000565ac005353c5a0e5020000000003acac5114525504000000000200002139da0200000000085265ab6a52ab655100000000", "acac515151ab516365", 1, 1792040527, "221de64d19fd6e73d6d31ae9da221b4c90dcd8c52383f276715127f1d99ef2ac"],
+	["01000000026478682008108f7d465202950ced694534de3ffa4cec4a266f0f20e79e9271a50300000009ab65ac52656353ab52fbb6943d6da041cf6aa18b2763671ae33277a08251aa1e580b5f59836a16ce14048c1849030000000700ac5153005163ffffffff0364457605000000000553526a006a14b33505000000000400abacace4d57105000000000565abab6aab00000000", "000053", 0, -783643302, "e281b5671ceaab4d02f4a914e3f294de22d751eeb32613a93711b14cb60eae61"],
+	["02000000011786406f03f9ba90e5d17291916df1a17b6b002919c4490119d17ec6e5a8520802000000085253636a53530053a30822340198ca0f040000000003515263a704d275", "ac51", 0, 1071539603, "c9bff11c2631f772f06f6dc6a171523b57c2bb5c51ccdcc3bbe3af9db589acf2"],
+	["02000000024cadbab1943d741760455a7b3fd74b4c77ac6d322937c2426233cf9668b616f3020000000663ab6a52635204c05c39adda0956cc022e72857a9ac4d891803179d8996bf59272c3f769f58bc3d721d60000000009515263abac51536552b41df8b102fa061f0200000000036a52ac9f5b0801000000000552acabab658c5a1155", "51abab63656a53", 1, 191341541, "9055b0f98dbf31cafd4a09132e5b411c1a04d4fc24e6532dc1afdd684953ee5c"],
+	["0100000004431aa8b3a0b7b11740969533becf85f442bcf6f8e8f05bf053775ae67ddff1020100000007acab6a6aacab00c2aecb3425c9282b7bf18b68042244bce75d7c6057a1e4239dc7fecc84fd8473cc67575f0200000000ffffffffd901a4122e6dbfa9c6c58c0594e194319dede0f972e494e6f53052b8f0d09b8c0300000002acabffffffff6f79c54f1a671ee3e9e193771ac1bd0dc034a90b5fd90a4daa34b95852a9f36d03000000015348efd5220117f480030000000007ab6a53ab52536a00000000", "63535251", 2, -2057229989, "52e276d938ea5407e8f9238f70181db1924d0283438c6c7dbfca3108c9e7d858"],
+	["02000000027e174dccd248d88051374d4262d1cc06d26f4e358df6d8baf5f13ae3012a8dd802000000075351006aabac5202b4bfd1aad16572847168661b08346cb12ae982951e3cf62f81bba6356eb18bd1ce29de01000000025253891f8cb403a8f92c00000000000200ac71d6150200000000056353abacac3f2ee602000000000093101d3a", "", 0, -1837874484, "54661a6f97dc7e029d0ba296dad9b52fc902c006771f76d18c9cd8fc5b179d75"],
+	["0200000003ea5c5c8d08a62819640226f53d0b910df8c3a0cc9cedbb05def2b4ba8cf7eba1000000000900635153ac6a65ab65ffffffff411bf64005a0c595b129876d7f948970fabcccdf87ec632dc232ebe3f87808010300000004ac635152ffffffff60bc48146d39862f909ce4e01e954106e4952d8f07d757560f04da7534ab62ae0000000007ab52ab6553ac005da8ec020310bd66020000000007abac656352ab53afc0490300000000036a635162ded602000000000251003dea3fec", "ac6a", 1, 2085450019, "3b4344b4069937901cf287d49fcb381f7619eaf0383f68e2e873428313fc9a82"],
+	["0200000001385e4108a193ca409986f5996c06648b0c63cf0244a0133d2f663683b5824ee203000000026aab185f021703aba17d00000000000165f4f51b020000000006515251535165607b810100000000096a006aabac5365636300000000", "ac5153ab", 0, -1237653078, "0145a5bae95c2aa7378de371f82cb8fe95055c1309916a49b50d8cf8e8b98d3d"],
+	["010000000490c8335bca182152021e95c6f36d9cbde6ef0bdf45c5d7c37919a3f52f815f140100000006656aac526a00030ba241ad8dfa6fe36cda34f14a8f86b7c97a030e0ef1f9f0840cdcb78c54c093e69a26020000000600acac53656afffffffffea5a3099e6163404fd96da8ca93dc7bf9816fa5bccd92a8851a90ef889bd13b0200000004ac630053f44242d90e72c7d82aab48212eb7a9b1a00bd0b440575b1a571d9eb77b11ac0254504726030000000953516a635352536a633700630904e5edf80100000000003fafbd0300000000035152ac60768503000000000153b47a98000000000009ab005153655351525100000000", "51abacab6a", 2, 1783800036, "485681bcccd7376e06a0faa72de506415128a844db17239e10a07994ce84ff79"],
+	["0100000003e1904a975bf36796b489e363c258349cfbcd967200d1bf4f5c4a7a6271151c09010000000465005352d55910193971b5f5464f863023e54908101fda36aad39f6631f375c39e47743eebd12508020000000300ac52ffffffff6625d0039f66e6b8cd63ffbce07e3bf69736453bf8cdfebf567064a195a79a0503000000075153abab6500acffffffff01be9818020000000002ac5200000000", "", 2, -2054174851, "7a6f4dcfc5cb7c73afd86e174a1215834cf525755ab14de2d47f9389f966f891"],
+	["02000000039bb6da28199734d321e1777a2ede5f296d8264b11ca0189c323e0cca9eeace730200000008abac515151ac6a654d793e2e04ae6072618272797426ac5e213bb8c0328e3f22497a856206ead1b01c0ec5f50200000009ac52abac5100535163fffffffff6930e6fa61818057986eab16f252ba6293f7b39a2f6037d249e63303027e9d70200000007abac6352006551ee84174b0428b8f3010000000004650063ac8036d4000000000008516a5253635300539ff0ee03000000000600525300acac3d03c70500000000016300000000", "ac", 1, -1113805666, "08167f915bffb569ac7d1973cc7b15c93daff33a6bae07b273b18b7d83f8b34e"],
+	["01000000016229d692889b02cda0ff55aef8bed43e0d585b7d64607c4c6a49f23eefed34b701000000036a52aca4454024022b061f030000000002abaca2b8d50200000000086351655351636353b9ec1966", "5263", 0, 287284499, "b8a62454cd8934a5fd7f457b613a55b1fda7fa0683c5c48313e86554f7224ae6"],
+	["0200000004a6a07181b891e1a5a104553cb52dadb8e4fe8186caf65d18118fab1086f70c550000000004ab0052657208ce4e063a0260638e5636d4f103ec27299ff7813da99b7954a64a4d6517c7839175b8010000000253528d946e951d2b96a0744033625964527b72f15544d48101c62f29c370c1855cff1d5649eb0000000002536394b100c0a460de24d0093647ef46004d26c68ccde9f220aa63d0556eded232de11d7f1060000000006ab6300635200ffffffff036bbacb050000000001ab3fe41c0200000000016a120ff1050000000002ac6500000000", "ac00656551", 1, -1517937862, "099e1bdc28ae672bf0fdb274009b8fef8fc44bffeb3023f708df601525185062"],
+	["010000000487307afb548b71beb22c1328ab70a1af0cf14927c9da05c777cd0352c1bb24bd020000000665516a51636a826982b16a14c8a5938551b8107c93e383c9b6ed74d300942b98b3c7150f626468ee84690200000004ac525152cc906c12f1782da270c8c6297699d68929e5aff53892a7ee047456296b23b5556d891bdb0300000001abffffffff0ad298b3042aa193978de4e673de353499850c484cb8a8a187409400d20978b5030000000452536a008748583c03316a88010000000008636565acac006a538731f50000000000036a5351b7044c010000000008ab63516a005353ac00000000", "", 0, 66377103, "2e1c7fe82a6d8629c8e22e459c19f5b96dacf51f56a27c7ff3add01f2aa67a0e"],
+	["02000000032054190330a378ac147642fed1bb6d1ab9eec85e433ff6407eb05c9a411eae28020000000651636a526a6a6ec4f18cdc0b71945db371664d1fdb2a81a3fc86bc31c870ba4ed599939a7987bb91679e030000000700655253005165d06008dfe88c05c12bd25cf84f45459b04de85df708c6a2ab5a2199d1cfd5aafd96488fc010000000551acac0051d26c574d0103b2eb030000000006636300ac006500000000", "ac5165", 0, -1194681327, "0019578c26a80100b01be4c091d6ca47d251c4ce98892b67336a7cc035bd042d"],
+	["0200000001c6a86d80b8b9fd7b04dc00a877b0481894aa66d783066479459109c7e4dae1ce0100000005ab5252ab6affffffff034269ad040000000006ac005353ab51049378050000000006655351ac52639ba0cc02000000000351ab63ee4dd0e4", "655200ac53536500ab", 0, -1898240252, "a78fc3b30929f50bebef9763c598f72c93eb24e40d6e3b95cb79b8ae94e6fbe3"],
+	["0100000004f112c0e6399013cae9b92afdf06e3bb5da8349ebe6b0ede0d833370e7afd3295000000000163ffffffff2f6a984fbd045bd9cd1fd2846f35b05c8f7950b5ba1801173088fd61ed902f1e02000000070000ab53ac6a521e3bb593143a7cc448ad3cb6fb6370330c1e78ba2332568028a7ec97b6a7080fbcb524280000000007ab655163ab0065ffffffff01b299f686f314dce611bf2e643ef0fb9b1add0b8404d69f18e4a9a14ada826c0100000005ab6aabac65539a808703565a760000000000066aab52ab6a52e7d6a504000000000453516351455bc40000000000065251ab52536a00000000", "525351ac6aacacac00", 1, 2109207276, "2ebc6fcf9e5af00e6078af9b46e07669285c0b227b16e01dfd9a600d1bb0130d"],
+	["01000000025ba68b2bf0aab1caa7b526d878005e0b1ec430a55b7ade84eef292b2ba6cd5e4030000000453636a00ffffffff2684b245293fde20cad8dae629f9c2a53b0ac578eb40ca5906a3e0b13eaf00290000000008516a510052ac51536c21131a015051cb030000000002516a00000000", "5152ab5251", 1, 1500971381, "003d08890de21f4b7db0f1008b4876f019e94fc032d673e0f1aab9d27721a2ba"],
+	["02000000012d765ffe1ffe52b48c6c13fcb6e0354ccb76e3354ef706c3c62efe524914ff0e00000000026a514eeb852c01a38b62050000000007516a526a6a655200000000", "6a536a65", 0, 2002142639, "950078c0e4c37a93e4e761618c3d521cd2e8875698a5d68be5dcde0a264c2242"],
+	["01000000023485c84c8db0ae17b0651941e474c84b78f789d8e7803391ab28401843323cd80300000006abac5351ac00ffffffff84eaeb40b6eeb32f80db1687e486ea04e0936ad12bf40b66a0caaeed61dde497000000000165ffffffff041b72ec020000000008ab5152526aacab5298865c050000000009656363635365530000c6c49d05000000000700536a636a536a5e2bb500000000000565ab630053c6a1a141", "536a53ac", 1, -1671310691, "c2ed98b0b3acf3b271d86c6c32ddffd2719b13b1503d4cc8e9685cd3f9c8da62"],
+	["020000000229cb697202ec8e974cfe3b9b81bdaf5067d97d757ad4b17d95638d653914ea5d0000000005515251ab6affffffffbca557231a20e0d5fa846019923155abf6ed08c8fe0125ff274c55d8b01207ba02000000056aac656a53ffffffff0381a600000000000005ab530052ac525b65050000000005ac52ab6365106f310500000000096365ac65515153abab00000000", "52ac6351656500", 0, -1046067144, "f8b8a85905382b37e842df59e749003c054e549ca3a7b13889c28e7d79aab00f"],
+	["0200000001adebe34a1395c260d8f093848854bf3d1a2e24acb02fa74e75fd2f81fd3cc9e3000000000653ab00ab0051e250a4d304606c2d00000000000465acab637851d40300000000076a005253650053cff6e5040000000005acacac0063482d290200000000086565005252ab52ac781173a2", "", 0, -1740115220, "92b6916b391d6991ec537fea273597c68a0645e91ae7f13b62d9959d3cfc7d31"],
+	["02000000045fb27f739d38c0b3bf62260632e09a4b53bb31bdbf15daef876525cc2abed3860300000006526aacab6565a839612c2ddf06653d3dc97491a495c0f641662515b74d732f98671f32ba5d32f38b9f620200000008526a00ab51ab5251ffffffffcb3c03ca0ae8a2e98a78b527f68cd9300ef8700e0805e7fbdc44b5f0e9693f50020000000552636a6a00a66f18ac3099fb3ec97302acd9c9f8dbc0c318a9e8041ff114bd3c86fb4fdf95d48027e60200000003acacac03d4b46f011c9dee020000000003ac635300000000", "65516363ab63ab", 1, 898742916, "4626038aebc087668daf6733399d0c7b410501f3fb7e9b77e673e76a17ec9459"],
+	["02000000031434193e293f9a5e8996e275e04397066c7d339e0ab12037b036ed26968733550200000004536a0063ffffffffe6b9456660c286ba3e4d43e8436b905ffb2f9402e4814d8674b262a40ef8010c01000000026a6affffffff7d4f2414abd13612755c56e38df087498ee69f92dde85a69b40698c382709e27020000000953ac5263006a655165eff3cea3015b583301000000000351536ab9abf17f", "525363", 0, 1955456161, "22e7e6932d556ee477bc05c9d94f49e5386494bdd38c2a1c047cc05ec1eb99a2"],
+	["0100000003bfc55f8e2e6f44366779f6da27832d876ca2e4cf4a62934a7680cb7434af1db5020000000151ffffffff331f3987488cbdf01aec5d845b9dcbd8cd4ce04ce84997a7eaa7f17e18143ae200000000076a6a5200516552ffffffffa722a8e914114d0a27dac56a174f300b5f24616adcacee4d763ada9ba001754301000000008503001b01e9b78602000000000552526a6a65118a98fc", "6aab510000ac5151", 2, 443336050, "ddf079d304e9d681212e1ad424146bce6d418eb77aee8bfeace4ba9522fad1d0"],
+	["0200000003da2468c1ce0775cf53eb7b21e2e31cc5dba9a3c0e52453d646dea300f858ce6b0300000000ccadacba0ab890c573e9b897cee40eecdb82df03eb144c0062668913846584f0b33ea6e700000000085253005300abab53ffffffffa492b4bde69d6922536d40e1519371c99385b79ddd7c712feb1d4604df5e2ee20200000000ffffffff0336515d0500000000055352536563445f8b02000000000152fefb4305000000000552ab00ab5100000000", "65636a53", 0, -1555918153, "8b64c7b180c0dc8a145215059b6e401588bfc1ca0fd581a32aa46dfae4291fcf"],
+	["010000000156d1cee75b7fa67479f50645068ccfb92de7291a4d6766bce58cde35da09cc9e0100000004000051656c15b80b0262b40e010000000002526a0b7c35030000000005636a526a5100000000", "636365ab006a65", 0, -1707866812, "8db42028db14439900ad3f304d9e24db57fbc1c93ade68ec7542912a90dbf906"],
+	["0100000003359b695c0762ebc5505669ccc12971912491f9840c72690ef7c2d79729c75e8b0200000007ac005300ab536a42b466d5645ae47886c4f1048f62ee850c581fea75afc751b54a70c4ccf0501ea9b9b38d0100000004006351abffffffff3e4016a6836cfcf7401d43ba82646b45f60f0d8f51e868d9084dd396d2943aa5020000000151c0eb140f019ed99f0400000000096365005100630051ac00000000", "6a5153535351", 2, 1113319490, "b7be14ee5efdc26438b97d337d060872563d1867db7c3987af6d8c0974de2267"],
+	["01000000020cc9dbd66b47fdae5e440ae489dedc0bef531f8e68fec477c295b1ad88a27e640100000008ab53006a63535300ffffffff6e21ae44c4fb3d128d4714d9549aa47ec81850d12d35b74dfa27cb060c47155402000000066500536a63abff3e5a4401ab4c99050000000008acac53ac5353abac9a1eb0d6", "", 0, 272111636, "3b1d8fe41cea7ed46b659939bce377e94c0796e11eec8b5df04af826f3ed24c4"],
+	["0200000003ce2a11aed310079f4ee8adcc49511679dc3b22dee98557f8d80bfbe20ce2105b0200000005ab63ac63acdc4030086d8a4f051fba68eb11d63a2766e45fe3b5f2b17a2a8878f891eeebe0885d5b4801000000015384dfb8165a56d22541d5f116ea2052fc83f742b03f49b385c3175bc842243d45a4af5188030000000763636aab516563c2346e54048fd0c5050000000003abab52dd859d010000000002ab6a8f1c88050000000005ab6aac516a3f5b31050000000009acac006aab52516565f217cede", "51656a", 0, 1362729559, "b853a631e3b89cddda8ee31f316029adb99f34877d8094a6bd65f0ed9e167cc7"],
+	["0100000001246e3a83b744e16728d08abf6efd632227a80f38359ffc9f0f8eb7df809698bc0100000002ac65d1b81c25023cc9c802000000000752ab6551ab6a653b42ce02000000000153ca55a0eb", "0000656a52", 0, 1150771644, "bc556fe8d3632d5d5c9d8728ae6d56ebef06b5eb5fa5a93b0ca8fee75f63e160"],
+	["01000000041f65707964520fab3995b7d6e2ce190f23ad6b455aff7296f998d936de54d9dc000000000352ab52bea35abd3cfedf37de9b640a0f015764235f6d4be67cf9c2e95fb5e8c6473480e8ae7229000000000853516a510065abac6de7560cfbfbbe1986ccbbe53ed16d66bd27e9a3650ade37ae8957fb17c6d5bec2ee98810100000001ac3c60f35532d3ff34676d81d88fc21ec7d09e2aa6e55a911f88e8d2c50b78229fafc2d9d903000000026aab7feb9806037c47170100000000066a6300ac6a6a417ecc03000000000200ab5fd9c4030000000006526a536a006abe1e039c", "", 3, -1306782123, "fa78c7d82573a1b09f873cf17ac8a744a5b3aa946ec67e6856c2d4d653177eb8"],
+	["0100000002ab0e86404691a1c83041f7d2121423bdd018007c4b938cd9d7dcde77180723680100000000ffffffff67d5227becba4993301acb5de32cf266380c7365426b0b89b83811be39e3fdb40100000000097fcf5904d12a5101000000000600ab0052abac9c415404000000000551535251ac22159f02000000000253000df81e04000000000863526353530053ac243fee27", "", 0, -291599067, "e65638f696e477fec8129f532ad83ddfa9aca0f93089f303166dc66cc6b28fa8"],
+	["01000000010ee7079df78c199b64bbafef5636271dad3bd6cb38a74ea9015a7852accc67b702000000025251ffffffff0279cec501000000000453515152e2f72501000000000851ab636551ac525200000000", "5163515265ac", 0, 1924885263, "c1a8555f461ee638fd4f461cd6eeaa0d3a5c942d4b0162ed8dad3c8a1bb90949"],
+	["01000000027dd88566c1cb5a2f4ec3e5ee7307e000cba036f9af9246c0bbafc9c28234c76a0100000004ab525363ffffffffe558186d30db180ec09e595093f9fe242da990680b7419e366cce4be30909e1f02000000085351536a52525265f0d28e7203f020ff040000000002ac5162e290010000000006536a53515365eb5fee0300000000076a526a636a516334137e81", "6a51ab", 0, 976548022, "bf583dba8642ff8b8be76c5d68fe4faface885922940fc29ba9a14fcbd2c34b5"],
+	["01000000049ee9e92515fb823adc3acd8f88fed1be11d21d3bf51e61b2abb748ccfbdcf6c502000000046a636553dae527d7b38b4a2bfd14acb1f71654c215608c4f994245afb720eeeeb020559bbcb2f04a0100000000ffffffff501d797e7cdbbfa4fe20c7644eb61acb4008e7f39531bcfde72623d0cae2fb9f02000000008b0358fb51a4bea6b4de1630d7bf6b9c5086649031cc1b76f353919ab1b180bd1a36c21a030000000951ab526a5300636353ffffffff03ae9ef80300000000026353523d650300000000036aacac8d591705000000000953535363515251ab6a00000000", "53ac", 1, -48945216, "afa38d178c98d4aeb959294c91d0c8c31a1068a78c4397ceea152e0386c6ce60"],
+	["010000000481de201481a015f5e2c36543cb3d31b8beaa8e99cb6cfb4fc7798b24ff0109920100000000c8cbce54f7436f2120c6844800388158dbbe80de7b37922cd4e16f3f364020274121d93e0200000008ac51516aab63526ad5809d04a28a1303b59b3d86bb3be82533a70581583b0dd783e27925c5035caa6a2ba729020000000751abab53006aab7a090c0445a1e9f161e1d20d0437f29ea1e7c228294668fcd9dab36847e3855f90c8f98c030000000752ab630063ab52ffffffff0444e7b9050000000007515252ac5251ab60c49d02000000000653acab63ac519a7d7c0400000000096552656a6300ab53537c55750200000000046363ab524f1c75dc", "ab", 1, 1076485766, "9f2c5d930883093022a33359d835a83972bba6285edc79e59f4dc16787990a77"],
+	["02000000026cc9bcc7a70cfcd746aa4289a4f3ece21fd3655304b0c1a43954b169ec23832400000000076aabab0053ab51ffffffffcfdc71638b07561f99fa971d7b1a164e0fface289b5b9bbc83e9a856b6f7e7bf00000000046a005365540dba04014f37ad010000000006ab006565535100000000", "", 1, -662245314, "b9fa90104f6b552e8ef77cdde760b2cd9057754c5b388ca9346b72a730b2dbff"],
+	["02000000019f39745baff747727f61a40a3901c4a86498b94aaeebcd1810c80e7cd602769e0100000003ac535199426af2034f60860200000000009c0a9f0400000000016acb13c301000000000652ac516a006a00000000", "00ac52ab52516353ab", 0, 1127519573, "32e1b68b8824294eea6582ccc05300bd4d370056b5cd10e33a5c2c41211d934d"],
+	["0200000001bd31e467599e391ef98588d11c4598c498b874582a8541470923c8aef0fee4e602000000076a52656aab6365ffffffff01c4a89e050000000001ab492453b9", "6a655300ac51acac", 0, -2101772118, "4b5c5cf0614eba49dab074c1ba5ab9e1250d3fc71537abee9cccd77ef9df1787"],
+	["020000000431301234a0a07b177c27b6c05678120a797de409d56e4ab70b512519d8806134030000000163ccd3399a087503b544e1b0d18c454a7f20ba86e0b20ef1feded2fef8e4268c539bbf3cd60300000000d0afeb17da0697f67da5ddf8fc19eae86b338b177fef36114706d4acecdae0e94e0b0a0b020000000352ac521e5e76fd703adc844797d2c7bb79a9beafdfc02d6bec89c2510593cbc1ff188d25ab79e10200000003526a63274061ff02fd7992020000000009006552acac535252ac95f4bd050000000005ac6352acacb3db365c", "5100655163", 1, 478290184, "2d2e2ca2558dc73173af6bef8559a3b5c67d38de796321a18de4b8747c46457b"],
+	["02000000042d38184883577bd5d5809f6ccb2936c0a7d33a7c2e55a5c19439c62781054e0e00000000016357494f15a3244f14beee7d408f78cca8c721e757b53a6d6b01f52476370a47da942b9b1303000000086352635253655365b9a0975570d0ec8fffe5b2e12c688254c43b9b197a732406e152c791bc40d33e21af20dc0200000000ffffffff8c691601dd56b0102bf3992213e9243563c59c0993993aef225228660572ccef0300000001634e9d6a290126d9eb03000000000453006aab00000000", "65ab65ab", 2, -1717571363, "051adccf354a223eac81a8ace79b8cf4c22d4959d22950bf69a57738d1b9920b"],
+	["01000000016adeb36953c0b416c7c4e6c6517bf6aeb9a45520a119dbccf964e37c179253d60000000000ffffffff0451fbc301000000000152322adc030000000003ab6a65dfc74801000000000053b9ba020000000002636abec211f5", "", 0, -1808040290, "db5e00c73c6e50139201d696e444d0bc569a181a24c096f102c5e6c0b221670c"],
+	["020000000283c60087ed96e3042e077fbd8af73bed8cb16ec06c0a22dfea748d65a81bc0ec000000000863536a536352535307241c5921ee465161cf5a7e507a41ef1888c41490daf3e382bf2925f738786bc5ee3062030000000753526353515153ffffffff04d85c6a030000000006526a5351630018feef010000000004515153ac360beb0000000000056a0053acacbd72f0000000000008ab006553006a0065ad0a3978", "005265535252", 0, 1755874496, "68cf1b978a15a165a4e9d8c6543bed41ba05acc7ca17bf20020a4a9c3bc3b925"],
+	["0200000004f9e6238fbd7a124025e366caed4c0574f6a0166286d0d96fe7abb3aa20be3bbb000000000165ffffffff9e78b25a941e90484dcf21bf722071990615d2c1cb88a4ce3334bb3b24b09d2401000000075300515265ac52ffffffff3c376bd3ca2a074f3e0c267328d8b6e340e62c8c716d1e23c176a5ffad1eea140000000006ab0063ac51abffffffffd87087bd4f109e4054846ad5eebbb156842a6820832b93775c6bbd0fb9686ea200000000066a5153acac63c3c0307b01cbae6c0100000000016a00000000", "00", 0, -1039306889, "123d89f5772b28a4706b0956fc7ce5b06142b5ebe2bb22de272232a7035a8f1b"],
+	["0200000003d57a57e2e29c99fa2137b7b71aab708bf7183849af61216cfcc1bb09d237e26b00000000035351002f777442dec8df64de736ebfd7436611df5d0c0c77e90e522f9ca83857f60948c0c3ff9c000000000353006a32d66504c06167b484a848e6ed535cf61704daca16d153598695cc3483af5da3c56812180000000000ffffffff01ea3dd0030000000006ab00ac65516500000000", "ac51ab52ac65", 2, 700729943, "882d7a86081bd60434a0b12992051ee3801c7f7bf2ec21401d5b7b305bb2c10b"],
+	["0200000004350451de2ac8daa12be8741774165e5f956a6c30b6656389fcc30c8f5ceadd1c030000000100ffffffff91c5ad2a8bb1ab605744cc2108d97a9830601e57ac05d1ca5ca79a02667ce5430100000009526a6a6a6a00ac52531282777b86c2a5fad88d18f687ad50d673394a74021f941ee91673727962598c0cca99380200000005636565ac65ffffffff0a839c24521958be6cda94a6c72e9b3a9c18865f21c3c49582f4fe46b820409e0100000000ffffffff024ce00402000000000953ac6a655152526565b30c6203000000000151fe12e0eb", "5165ac0051656563", 0, -2014179624, "0e9d18a51ace1771f32f457c6f6a723bf2a2793dfdbe272910221b3eaf6921dc"],
+	["010000000144a4c7c25652b22daed606c753e6e32069eed26dbf8540cadafb50f4040958090000000007515153530065514ea4441902cae6640000000000056a53ac525239ce6b0400000000002df5da88", "ac6a6aab6351ac006a", 0, -1010353860, "448f971190ba6301523c5badd73c6ce7079c168a134e11a853360da11c11e9fa"],
+	["02000000019ddbd6db61cdca8d529a4970f9fda20c19c305804104d46f495d0f1f0efc57800300000009656a00630065ab6553e263467204347d0d0400000000066a63510065510bfbf6030000000002526a962815040000000002636591ea160300000000000905ecbf", "6a52005263650063ac", 0, -1172862841, "e571aafefa7f95c76e2b838034d7dfc99ec4270ebe6ac2dda03454dd8b216d6f"],
+	["0100000001700318fb35789fac6f2c6703c3a50c30d77185fa094f9960189ed3df25805c3b0300000009630000ac6a65636a52d5e96c3c03c99dad050000000009ab00ac6351abac63635f42bf00000000000900006aabab63535365b2bd730200000000020063390ead82", "6a65515351", 0, 282451787, "a32dac9f6c3928cdbe1b812d5c46e2da0e909fe43c87e684ebbe52fbbb9f68b4"],
+	["0200000003cecada5025a61fbd5295aaf7666d2d9163d6cbb8b270f12fe1bb9e5c5b0fec7a010000000552535265acffffffff7b12842077571bec86c0d4b511554aafc935072986d2fe12249f023ab5754a9f010000000153ffffffff58d7906d1e82cf899048db829fd7fef3fd7baedb27ba9c2bca6d136ef3c0783b0000000009ab5300526a6a526a51ffffffff040c1b1f0000000000066aacac63630080c95a030000000002ac6a93412e01000000000553636a005373799505000000000265acd68a35bb", "abac", 2, 284825211, "c6eedfcc16d30291dd1a86241d90315176ce01bd4357fd8b6feadd8a35f08395"],
+	["0200000003202d9199a70c62da6b609c8138b6fd6e52995b83f159f2ccd2401e46f493a8a40200000008530053ab655352abffffffffbc321bbcb708a233833d72d55b6194f89b1f2365d10d17ece626e793c17d1d99000000000165ffffffffebf417c86f4c571b5958e12fa094d080ff65a3357064a8cdc13f3bdb3837cf8300000000020000ffffffff0474f497050000000008ac51656a5100526323d8a503000000000563ab53abacab8ea80300000000036365ab03eae101000000000000000000", "636aab63635200", 1, 1890352756, "f8539d6fbf1e65ebe86f8b057e82bc3e4a9ef4499be9dfb33a75c7ee5415ac54"],
+	["0200000001db0b0ea1ec0613d4be33105965a557bc8f77f31849bdbfa9f4ccafee65fc3d910300000000ffffffff04ea964905000000000253650e0be40400000000096553ab6a5153ab65ab98c65b040000000003abab6530f6550200000000010000000000", "ac655265ab6aabab", 0, 1624944571, "82b62f41368accefca3fbcb8b9a6cef7bc2be191bf171099d79560f241416316"],
+	["01000000033a86237b56f10fa593cf95c19d4573879b1c44ac33160aced98091b9d4a3cf9b020000000400006a52cfaac9bb09ddcff0ebdaab0610b9e739c0031f8dc4eb661db92ac646824807aeeefec2ce02000000065351ac526363869b6eb174764c2ecfdecf130a2bb483ad9501df0596a5df5df124860881cc37ce35c7690300000000e0c251eb0298cbdf0300000000046a535100402604040000000004525253519359834d", "ac00516365636365", 1, 1609440258, "7d936383ebff501e4ee0c8025ddba4c4da4bb147404a0f3194eb9d7bc12ae23e"],
+	["0200000003ea4dc384231b376de2da9dcef72f8255be8ae6d980705f9b9fd4fe7f00d1890e0300000006630065655200ffffffff05e9df6d7ddd36a283d0723acce93f51c8c4238da5086d5f5b0573a4a4e43bc80200000006ab6aab6551acffffffff2ee1574b1c7d07cb9b66a6ef69031e1a1226e24ba6a8eb78f132f63c8653e9f70100000003abab51a31f57cc01734b270000000000030053ac9d5cb657", "00ab00006551acab", 2, 572495442, "1586ba9543f61ad759bef49ea3eb68e57fed0ed630c3f378ae8f1b4dcb0153e8"],
+	["0200000004cda9f7d14b29cb83c87a55b8c8baaa488433e4ceeb40ae4c0d3c84c88af6d97502000000066aacabab6a00ffffffff14ceecdc25e9518877db35708bb350cebd3b98f3b63c9f7bc40a411fc8f73c80020000000600516a65ab65ffffffff5c5aab71d663e1e2659ae1f6062d6494543ab829c362354cc3d9618fa14695ff020000000752515151ac5351ffffffff7a4c1807416f5bdfafbe2a28e19080ea20f5092009ea3d9d6114126fa12e935600000000016affffffff021dfea5020000000001658271da04000000000465ac655218b1829f", "", 3, -1856740566, "118cf02008d6499517113058e8aa5daa10d8a811cdc38fc51d9df8a71fe0bdb3"],
+	["02000000012d0e9483849550b11346c73156b82a0e50e8602aa8acd889984ac6c3d2523225020000000353ac6affffffff03411067010000000006abab630053ab0a97a6020000000001ab33605c03000000000300ac513222df37", "0065", 0, 1332731574, "960ca6d26c624348885e344511ef8c06f46726a28d9b1b45cb26de7f2d98112c"],
+	["01000000013fe00aec44ef8bfe5a1fee512f4165631e44df68c9cc044e92515a34478866100100000008656300ab6a6aab533e465cd004240a4102000000000653ab5353526a8796eb030000000005ac52ac53ab34471c020000000006ababab0052ab23448b04000000000865ac6565006a6a6aaf28ccd8", "abacac6551", 0, 99774902, "61294d1b98e88100e94851997c4a2b965b6ea4827c0cbc9818149f9f9fa02af8"],
+	["020000000176eb169d3a00a8c41a6b4aef605c74f0022dada8202391ae26a0e7504ea1a91d0100000003526353ffffffff02c57ee701000000000400535352d84e1c01000000000453abac5200000000", "ac6552ac5152520063", 0, -2139822938, "74feffd5170e96d6ffd369871ac1aea894f7f864e3cc5e3b9c12c5072e905aeb"],
+	["0200000002f853eee828e51c5fe0b53c64c0367172d63eb0246ecef931248e77471affca460200000003abac63ffffffff7efecc76778a489e226ac8ed8ed7f8e2ddb10bfd00244549c90018ee916074f200000000040000656affffffff03a2499601000000000800005152535151631fd52701000000000852ab63ac52005252a00f94050000000006abab6aac6a6300000000", "ac5351ab52", 0, -1611572682, "9845b64f3f08cd2f213784d3d6573255449fc7f6c199a2c96a3c6f52f502aacf"],
+	["01000000036833feeed954452380bff7418e099df11198b4bc5bd3ef9c2f15e6af421026870300000009abacab006551abac65c0b0715d51bbf3b2b25b48b447d65095c846f2aaad40dfb7704002d8ee7a57301aa12311030000000500ab00ac650012dd754d2af915ad0677847d02d1ce0af99225dab09d3c16060f02c5bca7184e2533ed0100000008acab63ab655153519218324803506839040000000006ab525353abac9432f9030000000007005165ab000063b67a33000000000009abab6363005363530000000000", "6a6551516a52", 0, 423285726, "9f1a6c8b1011e1012f77bae83ea4948b863e885814832d5849b1ef4e69329fd1"],
+	["020000000479f246fbf186ce477d1d70f3a11b86e258c3a5cd14c5d8bbabd14ef344c727b50200000005ac5152abab77e46acf48abe83a5c4b22f5bc8598b5bb98fd55742fd710e11b671bc35dd52d6c1313dc03000000056a655153651e3b897002bf33767adcd9596fcf09d2bafd0cceae284668ea083822bb8569a2cc817caf0100000006005300ab6563ffffffff4a6be6d1e7fefd316287a1688fdc8e51f00394d20f9cc8d819fddb9b7fe19e670300000008635100ac0000abacffffffff03fd360301000000000763ab00510053ab99046200000000000400ab52ac241579040000000007ab6500ac65516500000000", "63ac0053536a6a00", 3, -1718297630, "364abd9d00d6058440524896f74ad7822858b5fccf499b49d7a972158c353315"],
+	["020000000176c12e73f9ebe02197cb7c80c9f9cbd54fb55330e5f1d7e8a3e5739f3cdbf23603000000035200aceee3779602ecbaaa02000000000952655151515152656372e7d7040000000001abc3880a41", "52", 0, -2025073260, "ef7caa75fc8bc3ee68a0bd19b3142dc1ffc83a2f900427a4750f0a6c57082200"],
+	["02000000043571e1054f92a721a2bf105622f4b03ebad7d7997eac390fc98484582bdfcf9b0200000006006a526a63acee4c80acfc4e3762b7f2d53f369adac073a9ae7519b328c4695789942890cbebd56a96050300000000aa987660f53a7084fb9e760fc0dfaa6f2ea41cd666bf7f4d02f033ab17593b77adb3364b020000000200abffffffff4bad8d00150abda1d79238d37e2d34f320492235732cf9822897218e20b9aa5501000000025351ffffffff0416f2e7050000000004006300ab98bf74010000000008acab63ab53536363ba975e02000000000665656363ac634dd12a02000000000553536aac0000000000", "5300", 0, 723084505, "5c9bea6857f711439da991561840019f531eddba49615ceb3c222528fa2163fa"],
+	["0100000004e2972679caac1a5f458e5229115434c8ffb8333fa618e95c91b7e3fc9405e1fd03000000016afffffffff1aea7a66e84870a73fb16a0ce04a692fc86bfd956e29b14b5c49903586d10240100000004ab65006affffffff6d2d7927b49d142ba6085569eadb74d4222a3f38db9fd397cce46240699572a60100000009535251655363520065ffffffff79b46851b1f0b02bbe11eef1b2021c3e1a2575f66d85f663eedba3719d75a131010000000351ab00ffffffff042d9b8f000000000004acabab52148bee010000000005ab6a535365c119cf030000000001ac3dd06f040000000002acac00000000", "52acac6351516a", 1, -444097911, "8d9d867d878268549b0a8739f4db96189875c6e24b26ab04f8c776a99d545d9d"],
+	["0100000002c050eb51a0b95dfc0fb5f3512ee9f37bca681fcb0575c01fb6383a1a4ea52f9c0000000005ab51ac636557774ab67fc263a8c2103b6337096515af94459bf98a4a640247f61568efb6a6494b445b010000000700656a6553ac00ffffffff041b90fe0100000000016a7f48c70100000000036565639c712d050000000001519ee338010000000001530639523a", "ab", 1, -1137467087, "72ca428f3497fa83011cd70feecff46ad46eeb2caa82c7b6a23a94a978da83f8"],
+	["0200000001ee7e4c7aaf8041ccfa537815746185d9627e506e3462d2a664d72ba6f27920390300000006656365ab51acffffffff0352e7f70200000000076a00abab005153ce2c10000000000008656353510051636a80b440030000000003ab6553797ad5db", "65ac510053ab63", 0, 500678194, "08e1d79e739e2fe23f9d67a2809148e587ae2c4c1cbf95fe65830be9b5ee72a2"],
+	["020000000200624e196d3d258148c3eb9b364a7b32ff56ab5e0cb153828d8eb6dc3820b363020000000863515365ab63ac6affffffff3a2be611251ca66afcbe85dece9c8d99368a3c7b7aa241f7b862adec0c3ab06a010000000300ab53d6224cf202035dc1000000000005acac00acacd4f7a801000000000600636552635100000000", "ac5265ab5163ac6a", 0, -629302397, "ad4b9e666e1f1063e6d5d0609960ba5f8170a620f91d46bbd81f40f21c94024b"],
+	["0200000004c0a9ae8929a05f674f31dff15305d6e2c7cc7d41e173f97980e77f3efbe31975020000000165b4ccea27ff27f98e5c7c19c598d70fd1797797625e3593e1cd278d99a7b8f71cb006f2a80200000001abffffffff3d25314dfe45fdd063b4cb899ed173f35f71db9fd3e8daa4b5d1759b61a0a23f010000000865656aab52650052e903285d80975f4daeeef4fbe9907e3d84b2c5d6a556b9976ce43ca757356a04a34a776c01000000015370f82af0046c0f450200000000030053632616760200000000080000516aacac6552ed096e0500000000096aac52ac525300636af2a62800000000000851ac5363ababac5300000000", "ac6a", 2, -1961665423, "a64e4fd31f87df1123f58cfecb7c73d9a9a1464473a69be600c6fc9478fa5cf2"],
+	["0100000002c0195e2d09f916ac4230f0be718f3811145a0ce9e63d091bffd990daf91f5980000000000151ffffffffd67bf6004297f0c9a82bc970ee408315bfc8829447017c7adad518d568488bfe01000000086351ac516aab5253aded47900278830b000000000001517f0484040000000006abab005265ac00000000", "510063", 0, 1486335500, "a32d778a2a491d1046ffebe8ad13deda879ea454f63905eecf03d0d46d3b5790"],
+	["02000000026fb6f39de5abd1c18a6ede2bbb6c970a6c28d3c8e41d6163c4714bb4e37df1cb0100000008630052ab53636363ffffffff5e9716b20ff4bcdd8a15ae02a123ca95ce8b6c9c0e4fdffe8fc2fd475b2853fa0000000007ab51520063516ab86e1c6b03ee9b860100000000076a536551655253de6f21050000000001ac36ce89040000000006ab525363650000000000", "5163ac636352ab", 1, 1623104627, "1be1c2a7c1aae559fb1478eac26932bbabc15a90374669dbdd4314eed62473cc"],
+	["010000000224f18c7435e21af1429197ff06d68ee24ebaf705b26e84f4bcc47620b7a17bdb00000000055300516551fffffffff47656500755316fa271604b07060d883443740bbb89166486a17e2b9c0943af0000000009ab52005200ab63526affffffff019b94fb030000000003ab525100000000", "5200", 1, -1544938889, "7652e1b2d33755e90174c6fe1984d9d5b7e79d1359f161cfbd55715e612ab1bc"],
+	["010000000393e67e33c27ff2a569ad2cc4e7da1f873dc3f91b5f4c8b207eae03be5b2339700100000004ac5151008f2f34168b0d0460ebb82298a9ad29d1039a82be8a2666afadd3918d7c09fe1ac82390e90100000001abffffffff665e7b898ce6462ef785bf0e5a9abb90fb5901e5ecc830589e16e47e0031b6360300000005526363acacb1a1172603d4b9e20400000000009ec69b020000000003655153c45bd703000000000863516300006a65530ed7c485", "52acac", 0, -954987013, "cfe19e6b8e92fa332df754d543a6d5a76d20258657f39cee9e81f4ca0c10ef0c"],
+	["020000000467f24a1d8348604bdcd121e1cd69c84f4ad6980c3034647145be108c38341868010000000800656363656a65abffffffff78cd448652c32be8ba8a0fbbe0a01109181d73f0f40ed837f703113152c290e70000000000ffffffff9e19d3d5cdd18ac9be0d880a1ec6745da163207431e46db5ce8bf3edce83f9da000000000351ab00ffffffff909c9cab6580823e3f7ce29df3218b10c0cc58ef599428dfb1afb3f71f5477830300000002acabffffffff028ff3b202000000000097780c05000000000763acac52520053d5859248", "ac6a006a6aac6a", 2, -507148742, "3c4e9ac3400fab90e9d6e5679f077b01578b590cee8e4d5fc60e018bba965cef"],
+	["020000000362086760751f24591432c030edf964d31828f771feedd9eac367916fa349aa210100000003536a51ac0a4128fa519d88fef33135c94d5ffcf7ab7513e6f0732517e11815482c6e6bf3a718a20300000000ffffffff5627c5e3ca5a856d8cc980a986ba94c039b909be88a86ad73a18e1afaa6411dc02000000066a0051655363b1d9a5b90404b483000000000002ac520a1ba7020000000004526563519f2b29000000000009ac6a005252636553ab46dfc6010000000000134aae9f", "5151", 2, 349590567, "1281961fb5bf06b854746e352a785b93370248dcd4f488ba30f45836e12fcdc5"],
+	["02000000030716268bdb33c042a3beb465e934b120f7cf38dbfaae19716c41ae32154178da0300000000ffffffff71c2d1e758ca65699892655fcfdd107e8fdc8c7d9c6cd2ba0312fb3d87a1c110020000000252abffffffff5be3a36c0f6db027199653ca59302d94fac172b8a02ac8575051c6bc21c4af4a0300000007ab530053ab526affffffff014366ef02000000000800005152ab00655100000000", "6a650051636a65", 2, -1266412110, "a9eef99cf4b5ea12f47ae8fd9ba1cc4713423098164dc438b5f14a5547db5332"],
+	["02000000027f86f2baac3844f3d2a8f7f6cb09df437555e0e2d2664aea71b5ee4bda27e9e201000000016afffffffffbe15d2d4004466f992ca3122fb389c52583ae1abb60f78fa71af5271b767ceb020000000263acffffffff0382b767050000000001632b6e350000000000026553e6fd760100000000075100530053000000000000", "655253636565516352", 0, -587195013, "74aaadcd682a90d8dd8b03cfc0ab5a7fc757027d2656b268aaf95bba80cacdfa"],
+	["0100000003093988f73d5c0c72e9b3e517c5b44fb5675b6ddf03ff9df53e7437156dabae60020000000752acac526352acffffffffc506707e4b73c5baf9ce136c48059b5931ba67fe99cc829ce5a6c6233d51befe0300000006535200acac00fffffffff182453ebea0c72f7fcb4ff48d4543d3702270922d3bac16ef1626fadbb90b520000000006ab6aacab63abffffffff04fd8ec2000000000003655365aec9c2030000000005526a65526a595239030000000007ab65ac65ac6a6390abb001000000000100909c8ecb", "", 2, -426939433, "eba1a3eba4552626e131c068a764ad0567681a05ff8fdff76638dcccdd268d0b"],
+	["02000000035d286021f63c81fe46edb7c3a12d35e837703c3430e705529f6345820513ee8400000000056553006565fffffffff67652e0c0d4d9b94799ad8ab776a8db2be3a002655f73a4e6539838667246430100000003526551a7984aba755e425e9671212019b3413932764750f25e675087773ae6d6d83dce2cff66de030000000100ffffffff03ecbc59010000000005ac6aab63652ac2b8040000000003536aabef76060000000000026563b7e2e984", "536a5152ac", 1, 631327355, "b42f3c54cf124d51d65f95f98f0fafb7d970d2b6cd82bd9587996bd2a478f09d"],
+	["02000000047a6179c6ea2b861ed284feb278e244a686a27f5e247ea84b4e53a017c61ef9a5030000000900ac52525151536aab47e6eb875edb6f7a7c1aef8cdb02cdf399472cc553e22a7a9c3375cc2a6868637d7d910d020000000651526a6a5200ee6a2887325837fb057ac6ea251f7e7cae6aac33f7dbf5e72b2e7d843371dce122d5e3fe0300000000c1cef7dfddcea86b89eaea5b8302431c31922ec5230c3e94adaebef5048557b480e47418000000000752635352005165ffffffff03cc4cf001000000000851005365656352517d696e0300000000009a2b42020000000004acabab534824291a", "635252516565", 0, 1107121172, "1b926c18a49bc954db9978708d87ff07aea9d5f11bd1ac242805c323920719a9"],
+	["02000000022ac065c962c12e53a8627f12e126d2c9d2cdd0ae4f204b5e38313b30bc7eb7480000000006ababab536300ffffffff2eb51b04d9b2c0143cfc518b2ce96518ce1cfc6b64a211200bc7e283ba9d30bd0300000001ab57de2a5a045560440400000000035251524e1e7a03000000000951ab636a51536a0063979923000000000000233054010000000005ac0063636300000000", "52ab006300", 0, 1400427974, "6d010682693017f65c5bcdc3ae79ed030eb7a328cf69b8e01ec784eae7e8e507"],
+	["01000000020e760d2fe84d27eab844b1e8eb03b647ef9f387cba695d53ca900326bbe4eefd010000000465636a52ffffffff5bc3dd42389bd0404bfd70a7b5907787aed19bb75757861d6b2f347b54c98a3300000000026551ffffffff010b0adc010000000006526a0053ab5300000000", "", 0, -2061588591, "6bd282b69577caefff717fffe406c022ecda7f0e7f5c5ded674ea098f203b40d"],
+	["010000000130cbe2880eb8678f5bd0a5a9ba1b697be70fdc6aeab2db147f2ca725edef21d6010000000465ac53abee01a60703d3dc520200000000076551535300656a3f18c80200000000009d45b1000000000002536300000000", "006365536353", 0, 489837972, "66cdc393516e3b32815d1848c363a7731fe7e846beb10ee3931c9746fb836493"],
+	["020000000444dc8449d39419eb03235a8ef94cfe7e69c66695539e20ea5a2b4ef2b4bb6c5a0300000000ffffffffb6317c206fa322f90fe6b2ee948c4fe727240848d180ff018947bd734caca60e03000000096552520053abac65ab04ca33642df4fbe93300bec4c8cf1dd0f6a2be0fc5effdc5dd7df901b884e50283f8b3f60000000009526565ab6a52530053ffffffffe7edd32bce9d815ed943041c031946819a0ff0533312e6893ca07963390002950300000008ac63006a00006a65ffffffff04d0730704000000000953ab6a655165515265e05e170200000000030053abca314c0500000000056565525263a3864101000000000000000000", "52abab6365ab", 3, -1174342318, "ad9b2dad4d0829f53ae86717ca18d62798f5cac5f75fc8f98d6107f8a1ac2a9d"]
 ]
diff --git a/src/test/sighash_tests.cpp b/src/test/sighash_tests.cpp
index c98ed57759d0..89a731f567ce 100644
--- a/src/test/sighash_tests.cpp
+++ b/src/test/sighash_tests.cpp
@@ -96,7 +96,7 @@ void static RandomScript(CScript &script) {
 }
 
 void static RandomTransaction(CMutableTransaction &tx, bool fSingle) {
-    tx.nVersion = insecure_rand();
+    tx.nVersion = (insecure_rand() % 2) + 1;
     tx.vin.clear();
     tx.vout.clear();
     tx.nLockTime = (insecure_rand() % 2) ? insecure_rand() : 0;

From d946f21bd9d2884bed70a46a3cef5256ab31e0ee Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Sat, 11 Aug 2018 21:55:56 +0200
Subject: [PATCH 044/400] Masternode related refactorings in preparation of
 DIP3 (#2212)

* Split CActiveMasternode into CActiveMasternodeInfo and CLegacyActiveMasternodeManager

* Use CKeyID instead of CPubKey whenever possible in masternode code

* Rename activeMasternode to activeMasternodeInfo and make it a struct

* Rename pubKeyIDXXX to keyIDXXX

* Bump SERIALIZATION_VERSION_STRING

* Fix build error after rebase

* Fix compilation warning/error with clang
---
 src/activemasternode.cpp    | 108 ++++++++++++++++++------------------
 src/activemasternode.h      |  32 +++++------
 src/governance-object.cpp   |  22 ++++----
 src/governance-object.h     |   4 +-
 src/governance-vote.cpp     |  16 +++---
 src/governance-vote.h       |   4 +-
 src/init.cpp                |   9 ++-
 src/instantx.cpp            |  22 ++++----
 src/masternode-payments.cpp |  30 +++++-----
 src/masternode-payments.h   |   2 +-
 src/masternode-sync.cpp     |   2 +-
 src/masternode.cpp          |  77 ++++++++++++-------------
 src/masternode.h            |  32 ++++++++---
 src/masternodeman.cpp       |  72 ++++++++++++------------
 src/masternodeman.h         |   3 +-
 src/net_processing.cpp      |   2 +-
 src/privatesend-client.cpp  |   2 +-
 src/privatesend-server.cpp  |  10 ++--
 src/privatesend.cpp         |  28 +++++-----
 src/privatesend.h           |   4 +-
 src/qt/masternodelist.cpp   |   4 +-
 src/rpc/governance.cpp      |  18 +++---
 src/rpc/masternode.cpp      |  30 +++++-----
 23 files changed, 277 insertions(+), 256 deletions(-)

diff --git a/src/activemasternode.cpp b/src/activemasternode.cpp
index 7b262d6bb22c..c221dae07bc5 100644
--- a/src/activemasternode.cpp
+++ b/src/activemasternode.cpp
@@ -11,19 +11,19 @@
 #include "netbase.h"
 
 // Keep track of the active Masternode
-CActiveMasternode activeMasternode;
+CActiveMasternodeInfo activeMasternodeInfo;
+CActiveLegacyMasternodeManager legacyActiveMasternodeManager;
 
-void CActiveMasternode::ManageState(CConnman& connman)
+void CActiveLegacyMasternodeManager::ManageState(CConnman& connman)
 {
-    LogPrint("masternode", "CActiveMasternode::ManageState -- Start\n");
+    LogPrint("masternode", "CActiveLegacyMasternodeManager::ManageState -- Start\n");
     if(!fMasternodeMode) {
-        LogPrint("masternode", "CActiveMasternode::ManageState -- Not a masternode, returning\n");
+        LogPrint("masternode", "CActiveLegacyMasternodeManager::ManageState -- Not a masternode, returning\n");
         return;
     }
-
     if(Params().NetworkIDString() != CBaseChainParams::REGTEST && !masternodeSync.IsBlockchainSynced()) {
         nState = ACTIVE_MASTERNODE_SYNC_IN_PROCESS;
-        LogPrintf("CActiveMasternode::ManageState -- %s: %s\n", GetStateString(), GetStatus());
+        LogPrintf("CActiveLegacyMasternodeManager::ManageState -- %s: %s\n", GetStateString(), GetStatus());
         return;
     }
 
@@ -31,7 +31,7 @@ void CActiveMasternode::ManageState(CConnman& connman)
         nState = ACTIVE_MASTERNODE_INITIAL;
     }
 
-    LogPrint("masternode", "CActiveMasternode::ManageState -- status = %s, type = %s, pinger enabled = %d\n", GetStatus(), GetTypeString(), fPingerEnabled);
+    LogPrint("masternode", "CActiveLegacyMasternodeManager::ManageState -- status = %s, type = %s, pinger enabled = %d\n", GetStatus(), GetTypeString(), fPingerEnabled);
 
     if(eType == MASTERNODE_UNKNOWN) {
         ManageStateInitial(connman);
@@ -44,7 +44,7 @@ void CActiveMasternode::ManageState(CConnman& connman)
     SendMasternodePing(connman);
 }
 
-std::string CActiveMasternode::GetStateString() const
+std::string CActiveLegacyMasternodeManager::GetStateString() const
 {
     switch (nState) {
         case ACTIVE_MASTERNODE_INITIAL:         return "INITIAL";
@@ -56,7 +56,7 @@ std::string CActiveMasternode::GetStateString() const
     }
 }
 
-std::string CActiveMasternode::GetStatus() const
+std::string CActiveLegacyMasternodeManager::GetStatus() const
 {
     switch (nState) {
         case ACTIVE_MASTERNODE_INITIAL:         return "Node just started, not yet activated";
@@ -68,7 +68,7 @@ std::string CActiveMasternode::GetStatus() const
     }
 }
 
-std::string CActiveMasternode::GetTypeString() const
+std::string CActiveLegacyMasternodeManager::GetTypeString() const
 {
     std::string strType;
     switch(eType) {
@@ -82,44 +82,44 @@ std::string CActiveMasternode::GetTypeString() const
     return strType;
 }
 
-bool CActiveMasternode::SendMasternodePing(CConnman& connman)
+bool CActiveLegacyMasternodeManager::SendMasternodePing(CConnman& connman)
 {
     if(!fPingerEnabled) {
-        LogPrint("masternode", "CActiveMasternode::SendMasternodePing -- %s: masternode ping service is disabled, skipping...\n", GetStateString());
+        LogPrint("masternode", "CActiveLegacyMasternodeManager::SendMasternodePing -- %s: masternode ping service is disabled, skipping...\n", GetStateString());
         return false;
     }
 
-    if(!mnodeman.Has(outpoint)) {
+    if(!mnodeman.Has(activeMasternodeInfo.outpoint)) {
         strNotCapableReason = "Masternode not in masternode list";
         nState = ACTIVE_MASTERNODE_NOT_CAPABLE;
-        LogPrintf("CActiveMasternode::SendMasternodePing -- %s: %s\n", GetStateString(), strNotCapableReason);
+        LogPrintf("CActiveLegacyMasternodeManager::SendMasternodePing -- %s: %s\n", GetStateString(), strNotCapableReason);
         return false;
     }
 
-    CMasternodePing mnp(outpoint);
+    CMasternodePing mnp(activeMasternodeInfo.outpoint);
     mnp.nSentinelVersion = nSentinelVersion;
     mnp.fSentinelIsCurrent =
             (abs(GetAdjustedTime() - nSentinelPingTime) < MASTERNODE_SENTINEL_PING_MAX_SECONDS);
-    if(!mnp.Sign(keyMasternode, pubKeyMasternode)) {
-        LogPrintf("CActiveMasternode::SendMasternodePing -- ERROR: Couldn't sign Masternode Ping\n");
+    if(!mnp.Sign(activeMasternodeInfo.keyMasternode, activeMasternodeInfo.keyIDMasternode)) {
+        LogPrintf("CActiveLegacyMasternodeManager::SendMasternodePing -- ERROR: Couldn't sign Masternode Ping\n");
         return false;
     }
 
     // Update lastPing for our masternode in Masternode list
-    if(mnodeman.IsMasternodePingedWithin(outpoint, MASTERNODE_MIN_MNP_SECONDS, mnp.sigTime)) {
-        LogPrintf("CActiveMasternode::SendMasternodePing -- Too early to send Masternode Ping\n");
+    if(mnodeman.IsMasternodePingedWithin(activeMasternodeInfo.outpoint, MASTERNODE_MIN_MNP_SECONDS, mnp.sigTime)) {
+        LogPrintf("CActiveLegacyMasternodeManager::SendMasternodePing -- Too early to send Masternode Ping\n");
         return false;
     }
 
-    mnodeman.SetMasternodeLastPing(outpoint, mnp);
+    mnodeman.SetMasternodeLastPing(activeMasternodeInfo.outpoint, mnp);
 
-    LogPrintf("CActiveMasternode::SendMasternodePing -- Relaying ping, collateral=%s\n", outpoint.ToStringShort());
+    LogPrintf("CActiveLegacyMasternodeManager::SendMasternodePing -- Relaying ping, collateral=%s\n", activeMasternodeInfo.outpoint.ToStringShort());
     mnp.Relay(connman);
 
     return true;
 }
 
-bool CActiveMasternode::UpdateSentinelPing(int version)
+bool CActiveLegacyMasternodeManager::UpdateSentinelPing(int version)
 {
     nSentinelVersion = version;
     nSentinelPingTime = GetAdjustedTime();
@@ -127,41 +127,41 @@ bool CActiveMasternode::UpdateSentinelPing(int version)
     return true;
 }
 
-void CActiveMasternode::ManageStateInitial(CConnman& connman)
+void CActiveLegacyMasternodeManager::ManageStateInitial(CConnman& connman)
 {
-    LogPrint("masternode", "CActiveMasternode::ManageStateInitial -- status = %s, type = %s, pinger enabled = %d\n", GetStatus(), GetTypeString(), fPingerEnabled);
+    LogPrint("masternode", "CActiveLegacyMasternodeManager::ManageStateInitial -- status = %s, type = %s, pinger enabled = %d\n", GetStatus(), GetTypeString(), fPingerEnabled);
 
     // Check that our local network configuration is correct
     if (!fListen) {
         // listen option is probably overwritten by smth else, no good
         nState = ACTIVE_MASTERNODE_NOT_CAPABLE;
         strNotCapableReason = "Masternode must accept connections from outside. Make sure listen configuration option is not overwritten by some another parameter.";
-        LogPrintf("CActiveMasternode::ManageStateInitial -- %s: %s\n", GetStateString(), strNotCapableReason);
+        LogPrintf("CActiveLegacyMasternodeManager::ManageStateInitial -- %s: %s\n", GetStateString(), strNotCapableReason);
         return;
     }
 
     // First try to find whatever local address is specified by externalip option
-    bool fFoundLocal = GetLocal(service) && CMasternode::IsValidNetAddr(service);
+    bool fFoundLocal = GetLocal(activeMasternodeInfo.service) && CMasternode::IsValidNetAddr(activeMasternodeInfo.service);
     if(!fFoundLocal) {
         bool empty = true;
         // If we have some peers, let's try to find our local address from one of them
         connman.ForEachNodeContinueIf(CConnman::AllNodes, [&fFoundLocal, &empty, this](CNode* pnode) {
             empty = false;
             if (pnode->addr.IsIPv4())
-                fFoundLocal = GetLocal(service, &pnode->addr) && CMasternode::IsValidNetAddr(service);
+                fFoundLocal = GetLocal(activeMasternodeInfo.service, &pnode->addr) && CMasternode::IsValidNetAddr(activeMasternodeInfo.service);
             return !fFoundLocal;
         });
         // nothing and no live connections, can't do anything for now
         if (empty) {
             nState = ACTIVE_MASTERNODE_NOT_CAPABLE;
             strNotCapableReason = "Can't detect valid external address. Will retry when there are some connections available.";
-            LogPrintf("CActiveMasternode::ManageStateInitial -- %s: %s\n", GetStateString(), strNotCapableReason);
+            LogPrintf("CActiveLegacyMasternodeManager::ManageStateInitial -- %s: %s\n", GetStateString(), strNotCapableReason);
             return;
         }
     }
 
     if (!fFoundLocal && Params().NetworkIDString() == CBaseChainParams::REGTEST) {
-        if (Lookup("127.0.0.1", activeMasternode.service, GetListenPort(), false)) {
+        if (Lookup("127.0.0.1", activeMasternodeInfo.service, GetListenPort(), false)) {
             fFoundLocal = true;
         }
     }
@@ -169,75 +169,75 @@ void CActiveMasternode::ManageStateInitial(CConnman& connman)
     if(!fFoundLocal) {
         nState = ACTIVE_MASTERNODE_NOT_CAPABLE;
         strNotCapableReason = "Can't detect valid external address. Please consider using the externalip configuration option if problem persists. Make sure to use IPv4 address only.";
-        LogPrintf("CActiveMasternode::ManageStateInitial -- %s: %s\n", GetStateString(), strNotCapableReason);
+        LogPrintf("CActiveLegacyMasternodeManager::ManageStateInitial -- %s: %s\n", GetStateString(), strNotCapableReason);
         return;
     }
 
     int mainnetDefaultPort = Params(CBaseChainParams::MAIN).GetDefaultPort();
     if(Params().NetworkIDString() == CBaseChainParams::MAIN) {
-        if(service.GetPort() != mainnetDefaultPort) {
+        if(activeMasternodeInfo.service.GetPort() != mainnetDefaultPort) {
             nState = ACTIVE_MASTERNODE_NOT_CAPABLE;
-            strNotCapableReason = strprintf("Invalid port: %u - only %d is supported on mainnet.", service.GetPort(), mainnetDefaultPort);
-            LogPrintf("CActiveMasternode::ManageStateInitial -- %s: %s\n", GetStateString(), strNotCapableReason);
+            strNotCapableReason = strprintf("Invalid port: %u - only %d is supported on mainnet.", activeMasternodeInfo.service.GetPort(), mainnetDefaultPort);
+            LogPrintf("CActiveLegacyMasternodeManager::ManageStateInitial -- %s: %s\n", GetStateString(), strNotCapableReason);
             return;
         }
-    } else if(service.GetPort() == mainnetDefaultPort) {
+    } else if(activeMasternodeInfo.service.GetPort() == mainnetDefaultPort) {
         nState = ACTIVE_MASTERNODE_NOT_CAPABLE;
-        strNotCapableReason = strprintf("Invalid port: %u - %d is only supported on mainnet.", service.GetPort(), mainnetDefaultPort);
-        LogPrintf("CActiveMasternode::ManageStateInitial -- %s: %s\n", GetStateString(), strNotCapableReason);
+        strNotCapableReason = strprintf("Invalid port: %u - %d is only supported on mainnet.", activeMasternodeInfo.service.GetPort(), mainnetDefaultPort);
+        LogPrintf("CActiveLegacyMasternodeManager::ManageStateInitial -- %s: %s\n", GetStateString(), strNotCapableReason);
         return;
     }
 
     if(Params().NetworkIDString() != CBaseChainParams::REGTEST) {
         // Check socket connectivity
-        LogPrintf("CActiveMasternode::ManageStateInitial -- Checking inbound connection to '%s'\n", service.ToString());
+        LogPrintf("CActiveLegacyMasternodeManager::ManageStateInitial -- Checking inbound connection to '%s'\n", activeMasternodeInfo.service.ToString());
         SOCKET hSocket;
-        bool fConnected = ConnectSocket(service, hSocket, nConnectTimeout) && IsSelectableSocket(hSocket);
+        bool fConnected = ConnectSocket(activeMasternodeInfo.service, hSocket, nConnectTimeout) && IsSelectableSocket(hSocket);
         CloseSocket(hSocket);
 
         if (!fConnected) {
             nState = ACTIVE_MASTERNODE_NOT_CAPABLE;
-            strNotCapableReason = "Could not connect to " + service.ToString();
-            LogPrintf("CActiveMasternode::ManageStateInitial -- %s: %s\n", GetStateString(), strNotCapableReason);
+            strNotCapableReason = "Could not connect to " + activeMasternodeInfo.service.ToString();
+            LogPrintf("CActiveLegacyMasternodeManager::ManageStateInitial -- %s: %s\n", GetStateString(), strNotCapableReason);
             return;
         }
     }
     // Default to REMOTE
     eType = MASTERNODE_REMOTE;
 
-    LogPrint("masternode", "CActiveMasternode::ManageStateInitial -- End status = %s, type = %s, pinger enabled = %d\n", GetStatus(), GetTypeString(), fPingerEnabled);
+    LogPrint("masternode", "CActiveLegacyMasternodeManager::ManageStateInitial -- End status = %s, type = %s, pinger enabled = %d\n", GetStatus(), GetTypeString(), fPingerEnabled);
 }
 
-void CActiveMasternode::ManageStateRemote()
+void CActiveLegacyMasternodeManager::ManageStateRemote()
 {
-    LogPrint("masternode", "CActiveMasternode::ManageStateRemote -- Start status = %s, type = %s, pinger enabled = %d, pubKeyMasternode.GetID() = %s\n", 
-             GetStatus(), GetTypeString(), fPingerEnabled, pubKeyMasternode.GetID().ToString());
+    LogPrint("masternode", "CActiveLegacyMasternodeManager::ManageStateRemote -- Start status = %s, type = %s, pinger enabled = %d, keyIDMasternode = %s\n",
+             GetStatus(), GetTypeString(), fPingerEnabled, activeMasternodeInfo.keyIDMasternode.ToString());
 
-    mnodeman.CheckMasternode(pubKeyMasternode, true);
+    mnodeman.CheckMasternode(activeMasternodeInfo.keyIDMasternode, true);
     masternode_info_t infoMn;
-    if(mnodeman.GetMasternodeInfo(pubKeyMasternode, infoMn)) {
+    if(mnodeman.GetMasternodeInfo(activeMasternodeInfo.keyIDMasternode, infoMn)) {
         if(infoMn.nProtocolVersion != PROTOCOL_VERSION) {
             nState = ACTIVE_MASTERNODE_NOT_CAPABLE;
             strNotCapableReason = "Invalid protocol version";
-            LogPrintf("CActiveMasternode::ManageStateRemote -- %s: %s\n", GetStateString(), strNotCapableReason);
+            LogPrintf("CActiveLegacyMasternodeManager::ManageStateRemote -- %s: %s\n", GetStateString(), strNotCapableReason);
             return;
         }
-        if(service != infoMn.addr) {
+        if(activeMasternodeInfo.service != infoMn.addr) {
             nState = ACTIVE_MASTERNODE_NOT_CAPABLE;
             strNotCapableReason = "Broadcasted IP doesn't match our external address. Make sure you issued a new broadcast if IP of this masternode changed recently.";
-            LogPrintf("CActiveMasternode::ManageStateRemote -- %s: %s\n", GetStateString(), strNotCapableReason);
+            LogPrintf("CActiveLegacyMasternodeManager::ManageStateRemote -- %s: %s\n", GetStateString(), strNotCapableReason);
             return;
         }
         if(!CMasternode::IsValidStateForAutoStart(infoMn.nActiveState)) {
             nState = ACTIVE_MASTERNODE_NOT_CAPABLE;
             strNotCapableReason = strprintf("Masternode in %s state", CMasternode::StateToString(infoMn.nActiveState));
-            LogPrintf("CActiveMasternode::ManageStateRemote -- %s: %s\n", GetStateString(), strNotCapableReason);
+            LogPrintf("CActiveLegacyMasternodeManager::ManageStateRemote -- %s: %s\n", GetStateString(), strNotCapableReason);
             return;
         }
         if(nState != ACTIVE_MASTERNODE_STARTED) {
-            LogPrintf("CActiveMasternode::ManageStateRemote -- STARTED!\n");
-            outpoint = infoMn.outpoint;
-            service = infoMn.addr;
+            LogPrintf("CActiveLegacyMasternodeManager::ManageStateRemote -- STARTED!\n");
+            activeMasternodeInfo.outpoint = infoMn.outpoint;
+            activeMasternodeInfo.service = infoMn.addr;
             fPingerEnabled = true;
             nState = ACTIVE_MASTERNODE_STARTED;
         }
@@ -245,6 +245,6 @@ void CActiveMasternode::ManageStateRemote()
     else {
         nState = ACTIVE_MASTERNODE_NOT_CAPABLE;
         strNotCapableReason = "Masternode not in masternode list";
-        LogPrintf("CActiveMasternode::ManageStateRemote -- %s: %s\n", GetStateString(), strNotCapableReason);
+        LogPrintf("CActiveLegacyMasternodeManager::ManageStateRemote -- %s: %s\n", GetStateString(), strNotCapableReason);
     }
 }
diff --git a/src/activemasternode.h b/src/activemasternode.h
index 2efd6ec5e116..4189be734b95 100644
--- a/src/activemasternode.h
+++ b/src/activemasternode.h
@@ -10,7 +10,8 @@
 #include "net.h"
 #include "primitives/transaction.h"
 
-class CActiveMasternode;
+struct CActiveMasternodeInfo;
+class CActiveLegacyMasternodeManager;
 
 static const int ACTIVE_MASTERNODE_INITIAL          = 0; // initial state
 static const int ACTIVE_MASTERNODE_SYNC_IN_PROCESS  = 1;
@@ -18,10 +19,21 @@ static const int ACTIVE_MASTERNODE_INPUT_TOO_NEW    = 2;
 static const int ACTIVE_MASTERNODE_NOT_CAPABLE      = 3;
 static const int ACTIVE_MASTERNODE_STARTED          = 4;
 
-extern CActiveMasternode activeMasternode;
+extern CActiveMasternodeInfo activeMasternodeInfo;
+extern CActiveLegacyMasternodeManager legacyActiveMasternodeManager;
+
+struct CActiveMasternodeInfo {
+    // Keys for the active Masternode
+    CKeyID keyIDMasternode;
+    CKey keyMasternode;
+
+    // Initialized while registering Masternode
+    COutPoint outpoint;
+    CService service;
+};
 
 // Responsible for activating the Masternode and pinging the network
-class CActiveMasternode
+class CActiveLegacyMasternodeManager
 {
 public:
     enum masternode_type_enum_t {
@@ -45,25 +57,13 @@ class CActiveMasternode
     uint32_t nSentinelVersion;
 
 public:
-    // Keys for the active Masternode
-    CPubKey pubKeyMasternode;
-    CKey keyMasternode;
-
-    // Initialized while registering Masternode
-    COutPoint outpoint;
-    CService service;
-
     int nState; // should be one of ACTIVE_MASTERNODE_XXXX
     std::string strNotCapableReason;
 
 
-    CActiveMasternode()
+    CActiveLegacyMasternodeManager()
         : eType(MASTERNODE_UNKNOWN),
           fPingerEnabled(false),
-          pubKeyMasternode(),
-          keyMasternode(),
-          outpoint(),
-          service(),
           nState(ACTIVE_MASTERNODE_INITIAL)
     {}
 
diff --git a/src/governance-object.cpp b/src/governance-object.cpp
index c62a28177796..04185db4c640 100644
--- a/src/governance-object.cpp
+++ b/src/governance-object.cpp
@@ -265,7 +265,7 @@ void CGovernanceObject::SetMasternodeOutpoint(const COutPoint& outpoint)
     masternodeOutpoint = outpoint;
 }
 
-bool CGovernanceObject::Sign(const CKey& keyMasternode, const CPubKey& pubKeyMasternode)
+bool CGovernanceObject::Sign(const CKey& keyMasternode, const CKeyID& keyIDMasternode)
 {
     std::string strError;
 
@@ -277,7 +277,7 @@ bool CGovernanceObject::Sign(const CKey& keyMasternode, const CPubKey& pubKeyMas
             return false;
         }
 
-        if (!CHashSigner::VerifyHash(hash, pubKeyMasternode, vchSig, strError)) {
+        if (!CHashSigner::VerifyHash(hash, keyIDMasternode, vchSig, strError)) {
             LogPrintf("CGovernanceObject::Sign -- VerifyHash() failed, error: %s\n", strError);
             return false;
         }
@@ -288,30 +288,30 @@ bool CGovernanceObject::Sign(const CKey& keyMasternode, const CPubKey& pubKeyMas
             return false;
         }
 
-        if (!CMessageSigner::VerifyMessage(pubKeyMasternode, vchSig, strMessage, strError)) {
+        if(!CMessageSigner::VerifyMessage(keyIDMasternode, vchSig, strMessage, strError)) {
             LogPrintf("CGovernanceObject::Sign -- VerifyMessage() failed, error: %s\n", strError);
             return false;
         }
     }
 
     LogPrint("gobject", "CGovernanceObject::Sign -- pubkey id = %s, masternode = %s\n",
-             pubKeyMasternode.GetID().ToString(), masternodeOutpoint.ToStringShort());
+             keyIDMasternode.ToString(), masternodeOutpoint.ToStringShort());
 
     return true;
 }
 
-bool CGovernanceObject::CheckSignature(const CPubKey& pubKeyMasternode) const
+bool CGovernanceObject::CheckSignature(const CKeyID& keyIDMasternode) const
 {
     std::string strError;
 
     if (sporkManager.IsSporkActive(SPORK_6_NEW_SIGS)) {
         uint256 hash = GetSignatureHash();
 
-        if (!CHashSigner::VerifyHash(hash, pubKeyMasternode, vchSig, strError)) {
+        if (!CHashSigner::VerifyHash(hash, keyIDMasternode, vchSig, strError)) {
             // could be an old object
             std::string strMessage = GetSignatureMessage();
 
-            if (!CMessageSigner::VerifyMessage(pubKeyMasternode, vchSig, strMessage, strError)) {
+            if(!CMessageSigner::VerifyMessage(keyIDMasternode, vchSig, strMessage, strError)) {
                 // nope, not in old format either
                 LogPrintf("CGovernance::CheckSignature -- VerifyMessage() failed, error: %s\n", strError);
                 return false;
@@ -320,7 +320,7 @@ bool CGovernanceObject::CheckSignature(const CPubKey& pubKeyMasternode) const
     } else {
         std::string strMessage = GetSignatureMessage();
 
-        if (!CMessageSigner::VerifyMessage(pubKeyMasternode, vchSig, strMessage, strError)) {
+        if (!CMessageSigner::VerifyMessage(keyIDMasternode, vchSig, strMessage, strError)) {
             LogPrintf("CGovernance::CheckSignature -- VerifyMessage() failed, error: %s\n", strError);
             return false;
         }
@@ -490,7 +490,7 @@ bool CGovernanceObject::IsValidLocally(std::string& strError, bool& fMissingMast
             masternode_info_t infoMn;
             if (!mnodeman.GetMasternodeInfo(masternodeOutpoint, infoMn)) {
 
-                CMasternode::CollateralStatus err = CMasternode::CheckCollateral(masternodeOutpoint, CPubKey());
+                CMasternode::CollateralStatus err = CMasternode::CheckCollateral(masternodeOutpoint, CKeyID());
                 if (err == CMasternode::COLLATERAL_UTXO_NOT_FOUND) {
                     strError = "Failed to find Masternode UTXO, missing masternode=" + strOutpoint + "\n";
                 } else if (err == CMasternode::COLLATERAL_INVALID_AMOUNT) {
@@ -507,8 +507,8 @@ bool CGovernanceObject::IsValidLocally(std::string& strError, bool& fMissingMast
             }
 
             // Check that we have a valid MN signature
-            if (!CheckSignature(infoMn.pubKeyMasternode)) {
-                strError = "Invalid masternode signature for: " + strOutpoint + ", pubkey id = " + infoMn.pubKeyMasternode.GetID().ToString();
+            if (!CheckSignature(infoMn.keyIDMasternode)) {
+                strError = "Invalid masternode signature for: " + strOutpoint + ", pubkey id = " + infoMn.keyIDMasternode.ToString();
                 return false;
             }
 
diff --git a/src/governance-object.h b/src/governance-object.h
index 2ec25e620b0f..8738a1c99ae1 100644
--- a/src/governance-object.h
+++ b/src/governance-object.h
@@ -251,8 +251,8 @@ class CGovernanceObject
     // Signature related functions
 
     void SetMasternodeOutpoint(const COutPoint& outpoint);
-    bool Sign(const CKey& keyMasternode, const CPubKey& pubKeyMasternode);
-    bool CheckSignature(const CPubKey& pubKeyMasternode) const;
+    bool Sign(const CKey& keyMasternode, const CKeyID& keyIDMasternode);
+    bool CheckSignature(const CKeyID& keyIDMasternode) const;
 
     std::string GetSignatureMessage() const;
     uint256 GetSignatureHash() const;
diff --git a/src/governance-vote.cpp b/src/governance-vote.cpp
index f20760fcb904..7d45fa9df46e 100644
--- a/src/governance-vote.cpp
+++ b/src/governance-vote.cpp
@@ -152,7 +152,7 @@ uint256 CGovernanceVote::GetSignatureHash() const
     return SerializeHash(*this);
 }
 
-bool CGovernanceVote::Sign(const CKey& keyMasternode, const CPubKey& pubKeyMasternode)
+bool CGovernanceVote::Sign(const CKey& keyMasternode, const CKeyID& keyIDMasternode)
 {
     std::string strError;
 
@@ -164,7 +164,7 @@ bool CGovernanceVote::Sign(const CKey& keyMasternode, const CPubKey& pubKeyMaste
             return false;
         }
 
-        if (!CHashSigner::VerifyHash(hash, pubKeyMasternode, vchSig, strError)) {
+        if (!CHashSigner::VerifyHash(hash, keyIDMasternode, vchSig, strError)) {
             LogPrintf("CGovernanceVote::Sign -- VerifyHash() failed, error: %s\n", strError);
             return false;
         }
@@ -178,7 +178,7 @@ bool CGovernanceVote::Sign(const CKey& keyMasternode, const CPubKey& pubKeyMaste
             return false;
         }
 
-        if(!CMessageSigner::VerifyMessage(pubKeyMasternode, vchSig, strMessage, strError)) {
+        if(!CMessageSigner::VerifyMessage(keyIDMasternode, vchSig, strMessage, strError)) {
             LogPrintf("CGovernanceVote::Sign -- VerifyMessage() failed, error: %s\n", strError);
             return false;
         }
@@ -187,21 +187,21 @@ bool CGovernanceVote::Sign(const CKey& keyMasternode, const CPubKey& pubKeyMaste
     return true;
 }
 
-bool CGovernanceVote::CheckSignature(const CPubKey& pubKeyMasternode) const
+bool CGovernanceVote::CheckSignature(const CKeyID& keyIDMasternode) const
 {
     std::string strError;
 
     if (sporkManager.IsSporkActive(SPORK_6_NEW_SIGS)) {
         uint256 hash = GetSignatureHash();
 
-        if (!CHashSigner::VerifyHash(hash, pubKeyMasternode, vchSig, strError)) {
+        if (!CHashSigner::VerifyHash(hash, keyIDMasternode, vchSig, strError)) {
             // could be a signature in old format
             std::string strMessage = masternodeOutpoint.ToStringShort() + "|" + nParentHash.ToString() + "|" +
                 std::to_string(nVoteSignal) + "|" +
                 std::to_string(nVoteOutcome) + "|" +
                 std::to_string(nTime);
 
-            if(!CMessageSigner::VerifyMessage(pubKeyMasternode, vchSig, strMessage, strError)) {
+            if(!CMessageSigner::VerifyMessage(keyIDMasternode, vchSig, strMessage, strError)) {
                 // nope, not in old format either
                 LogPrint("gobject", "CGovernanceVote::IsValid -- VerifyMessage() failed, error: %s\n", strError);
                 return false;
@@ -213,7 +213,7 @@ bool CGovernanceVote::CheckSignature(const CPubKey& pubKeyMasternode) const
             std::to_string(nVoteOutcome) + "|" +
             std::to_string(nTime);
 
-        if(!CMessageSigner::VerifyMessage(pubKeyMasternode, vchSig, strMessage, strError)) {
+        if(!CMessageSigner::VerifyMessage(keyIDMasternode, vchSig, strMessage, strError)) {
             LogPrint("gobject", "CGovernanceVote::IsValid -- VerifyMessage() failed, error: %s\n", strError);
             return false;
         }
@@ -251,7 +251,7 @@ bool CGovernanceVote::IsValid(bool fSignatureCheck) const
 
     if(!fSignatureCheck) return true;
 
-    return CheckSignature(infoMn.pubKeyMasternode);
+    return CheckSignature(infoMn.keyIDMasternode);
 }
 
 bool operator==(const CGovernanceVote& vote1, const CGovernanceVote& vote2)
diff --git a/src/governance-vote.h b/src/governance-vote.h
index 3b851cad2222..193ec26093be 100644
--- a/src/governance-vote.h
+++ b/src/governance-vote.h
@@ -90,8 +90,8 @@ class CGovernanceVote
 
     void SetSignature(const std::vector<unsigned char>& vchSigIn) { vchSig = vchSigIn; }
 
-    bool Sign(const CKey& keyMasternode, const CPubKey& pubKeyMasternode);
-    bool CheckSignature(const CPubKey& pubKeyMasternode) const;
+    bool Sign(const CKey& keyMasternode, const CKeyID& keyIDMasternode);
+    bool CheckSignature(const CKeyID& keyIDMasternode) const;
     bool IsValid(bool fSignatureCheck) const;
     void Relay(CConnman& connman) const;
 
diff --git a/src/init.cpp b/src/init.cpp
index b6430790e7dd..f88419bf27b8 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -1851,10 +1851,13 @@ bool AppInitMain(boost::thread_group& threadGroup, CScheduler& scheduler)
 
         std::string strMasterNodePrivKey = GetArg("-masternodeprivkey", "");
         if(!strMasterNodePrivKey.empty()) {
-            if(!CMessageSigner::GetKeysFromSecret(strMasterNodePrivKey, activeMasternode.keyMasternode, activeMasternode.pubKeyMasternode))
+            CPubKey pubKeyMasternode;
+            if(!CMessageSigner::GetKeysFromSecret(strMasterNodePrivKey, activeMasternodeInfo.keyMasternode, pubKeyMasternode))
                 return InitError(_("Invalid masternodeprivkey. Please see documenation."));
 
-            LogPrintf("  pubKeyMasternode: %s\n", CBitcoinAddress(activeMasternode.pubKeyMasternode.GetID()).ToString());
+            activeMasternodeInfo.keyIDMasternode = pubKeyMasternode.GetID();
+
+            LogPrintf("  keyIDMasternode: %s\n", CBitcoinAddress(activeMasternodeInfo.keyIDMasternode).ToString());
         } else {
             return InitError(_("You must specify a masternodeprivkey in the configuration. Please see documentation for help."));
         }
@@ -1973,7 +1976,7 @@ bool AppInitMain(boost::thread_group& threadGroup, CScheduler& scheduler)
         scheduler.scheduleEvery(boost::bind(&CNetFulfilledRequestManager::DoMaintenance, boost::ref(netfulfilledman)), 60);
         scheduler.scheduleEvery(boost::bind(&CMasternodeSync::DoMaintenance, boost::ref(masternodeSync), boost::ref(*g_connman)), MASTERNODE_SYNC_TICK_SECONDS);
         scheduler.scheduleEvery(boost::bind(&CMasternodeMan::DoMaintenance, boost::ref(mnodeman), boost::ref(*g_connman)), 1);
-        scheduler.scheduleEvery(boost::bind(&CActiveMasternode::DoMaintenance, boost::ref(activeMasternode), boost::ref(*g_connman)), MASTERNODE_MIN_MNP_SECONDS);
+        scheduler.scheduleEvery(boost::bind(&CActiveLegacyMasternodeManager::DoMaintenance, boost::ref(legacyActiveMasternodeManager), boost::ref(*g_connman)), MASTERNODE_MIN_MNP_SECONDS);
 
         scheduler.scheduleEvery(boost::bind(&CMasternodePayments::DoMaintenance, boost::ref(mnpayments)), 60);
         scheduler.scheduleEvery(boost::bind(&CGovernanceManager::DoMaintenance, boost::ref(governance), boost::ref(*g_connman)), 60 * 5);
diff --git a/src/instantx.cpp b/src/instantx.cpp
index 3ede2725dc7e..7cdc274c01b7 100644
--- a/src/instantx.cpp
+++ b/src/instantx.cpp
@@ -233,8 +233,8 @@ void CInstantSend::Vote(CTxLockCandidate& txLockCandidate, CConnman& connman)
 
         int nRank;
         int nMinRequiredProtocol = std::max(MIN_INSTANTSEND_PROTO_VERSION, mnpayments.GetMinMasternodePaymentsProto());
-        if(!mnodeman.GetMasternodeRank(activeMasternode.outpoint, nRank, nLockInputHeight, nMinRequiredProtocol)) {
-            LogPrint("instantsend", "CInstantSend::Vote -- Can't calculate rank for masternode %s\n", activeMasternode.outpoint.ToStringShort());
+        if(!mnodeman.GetMasternodeRank(activeMasternodeInfo.outpoint, nRank, nLockInputHeight, nMinRequiredProtocol)) {
+            LogPrint("instantsend", "CInstantSend::Vote -- Can't calculate rank for masternode %s\n", activeMasternodeInfo.outpoint.ToStringShort());
             continue;
         }
 
@@ -254,7 +254,7 @@ void CInstantSend::Vote(CTxLockCandidate& txLockCandidate, CConnman& connman)
         if(itVoted != mapVotedOutpoints.end()) {
             for (const auto& hash : itVoted->second) {
                 std::map<uint256, CTxLockCandidate>::iterator it2 = mapTxLockCandidates.find(hash);
-                if(it2->second.HasMasternodeVoted(outpointLockPair.first, activeMasternode.outpoint)) {
+                if(it2->second.HasMasternodeVoted(outpointLockPair.first, activeMasternodeInfo.outpoint)) {
                     // we already voted for this outpoint to be included either in the same tx or in a competing one,
                     // skip it anyway
                     fAlreadyVoted = true;
@@ -269,7 +269,7 @@ void CInstantSend::Vote(CTxLockCandidate& txLockCandidate, CConnman& connman)
         }
 
         // we haven't voted for this outpoint yet, let's try to do this now
-        CTxLockVote vote(txHash, outpointLockPair.first, activeMasternode.outpoint);
+        CTxLockVote vote(txHash, outpointLockPair.first, activeMasternodeInfo.outpoint);
 
         if(!vote.Sign()) {
             LogPrintf("CInstantSend::Vote -- Failed to sign consensus vote\n");
@@ -1059,10 +1059,10 @@ bool CTxLockVote::CheckSignature() const
     if (sporkManager.IsSporkActive(SPORK_6_NEW_SIGS)) {
         uint256 hash = GetSignatureHash();
 
-        if (!CHashSigner::VerifyHash(hash, infoMn.pubKeyMasternode, vchMasternodeSignature, strError)) {
+        if (!CHashSigner::VerifyHash(hash, infoMn.keyIDMasternode, vchMasternodeSignature, strError)) {
             // could be a signature in old format
             std::string strMessage = txHash.ToString() + outpoint.ToStringShort();
-            if(!CMessageSigner::VerifyMessage(infoMn.pubKeyMasternode, vchMasternodeSignature, strMessage, strError)) {
+        if(!CMessageSigner::VerifyMessage(infoMn.keyIDMasternode, vchMasternodeSignature, strMessage, strError)) {
                 // nope, not in old format either
                 LogPrintf("CTxLockVote::CheckSignature -- VerifyMessage() failed, error: %s\n", strError);
                 return false;
@@ -1070,7 +1070,7 @@ bool CTxLockVote::CheckSignature() const
         }
     } else {
         std::string strMessage = txHash.ToString() + outpoint.ToStringShort();
-        if(!CMessageSigner::VerifyMessage(infoMn.pubKeyMasternode, vchMasternodeSignature, strMessage, strError)) {
+        if(!CMessageSigner::VerifyMessage(infoMn.keyIDMasternode, vchMasternodeSignature, strMessage, strError)) {
             LogPrintf("CTxLockVote::CheckSignature -- VerifyMessage() failed, error: %s\n", strError);
             return false;
         }
@@ -1086,24 +1086,24 @@ bool CTxLockVote::Sign()
     if (sporkManager.IsSporkActive(SPORK_6_NEW_SIGS)) {
         uint256 hash = GetSignatureHash();
 
-        if(!CHashSigner::SignHash(hash, activeMasternode.keyMasternode, vchMasternodeSignature)) {
+        if(!CHashSigner::SignHash(hash, activeMasternodeInfo.keyMasternode, vchMasternodeSignature)) {
             LogPrintf("CTxLockVote::Sign -- SignHash() failed\n");
             return false;
         }
 
-        if (!CHashSigner::VerifyHash(hash, activeMasternode.pubKeyMasternode, vchMasternodeSignature, strError)) {
+        if (!CHashSigner::VerifyHash(hash, activeMasternodeInfo.keyIDMasternode, vchMasternodeSignature, strError)) {
             LogPrintf("CTxLockVote::Sign -- VerifyHash() failed, error: %s\n", strError);
             return false;
         }
     } else {
         std::string strMessage = txHash.ToString() + outpoint.ToStringShort();
 
-        if(!CMessageSigner::SignMessage(strMessage, vchMasternodeSignature, activeMasternode.keyMasternode)) {
+        if(!CMessageSigner::SignMessage(strMessage, vchMasternodeSignature, activeMasternodeInfo.keyMasternode)) {
             LogPrintf("CTxLockVote::Sign -- SignMessage() failed\n");
             return false;
         }
 
-        if(!CMessageSigner::VerifyMessage(activeMasternode.pubKeyMasternode, vchMasternodeSignature, strMessage, strError)) {
+        if(!CMessageSigner::VerifyMessage(activeMasternodeInfo.keyIDMasternode, vchMasternodeSignature, strMessage, strError)) {
             LogPrintf("CTxLockVote::Sign -- VerifyMessage() failed, error: %s\n", strError);
             return false;
         }
diff --git a/src/masternode-payments.cpp b/src/masternode-payments.cpp
index 34e6b6e51541..e737de6effc7 100644
--- a/src/masternode-payments.cpp
+++ b/src/masternode-payments.cpp
@@ -264,7 +264,7 @@ void CMasternodePayments::FillBlockPayee(CMutableTransaction& txNew, int nBlockH
             return;
         }
         // fill payee with locally calculated winner and hope for the best
-        payee = GetScriptForDestination(mnInfo.pubKeyCollateralAddress.GetID());
+        payee = GetScriptForDestination(mnInfo.keyIDCollateralAddress);
     }
 
     // GET MASTERNODE PAYMENT VARIABLES SETUP
@@ -384,7 +384,7 @@ void CMasternodePayments::ProcessMessage(CNode* pfrom, const std::string& strCom
         }
 
         int nDos = 0;
-        if(!vote.CheckSignature(mnInfo.pubKeyMasternode, nCachedBlockHeight, nDos)) {
+        if(!vote.CheckSignature(mnInfo.keyIDMasternode, nCachedBlockHeight, nDos)) {
             if(nDos) {
                 LOCK(cs_main);
                 LogPrintf("MASTERNODEPAYMENTVOTE -- ERROR: invalid signature\n");
@@ -444,12 +444,12 @@ bool CMasternodePaymentVote::Sign()
     if (sporkManager.IsSporkActive(SPORK_6_NEW_SIGS)) {
         uint256 hash = GetSignatureHash();
 
-        if(!CHashSigner::SignHash(hash, activeMasternode.keyMasternode, vchSig)) {
+        if(!CHashSigner::SignHash(hash, activeMasternodeInfo.keyMasternode, vchSig)) {
             LogPrintf("CMasternodePaymentVote::Sign -- SignHash() failed\n");
             return false;
         }
 
-        if (!CHashSigner::VerifyHash(hash, activeMasternode.pubKeyMasternode, vchSig, strError)) {
+        if (!CHashSigner::VerifyHash(hash, activeMasternodeInfo.keyIDMasternode, vchSig, strError)) {
             LogPrintf("CMasternodePaymentVote::Sign -- VerifyHash() failed, error: %s\n", strError);
             return false;
         }
@@ -458,12 +458,12 @@ bool CMasternodePaymentVote::Sign()
                     std::to_string(nBlockHeight) +
                     ScriptToAsmStr(payee);
 
-        if(!CMessageSigner::SignMessage(strMessage, vchSig, activeMasternode.keyMasternode)) {
+        if(!CMessageSigner::SignMessage(strMessage, vchSig, activeMasternodeInfo.keyMasternode)) {
             LogPrintf("CMasternodePaymentVote::Sign -- SignMessage() failed\n");
             return false;
         }
 
-        if(!CMessageSigner::VerifyMessage(activeMasternode.pubKeyMasternode, vchSig, strMessage, strError)) {
+        if(!CMessageSigner::VerifyMessage(activeMasternodeInfo.keyIDMasternode, vchSig, strMessage, strError)) {
             LogPrintf("CMasternodePaymentVote::Sign -- VerifyMessage() failed, error: %s\n", strError);
             return false;
         }
@@ -489,7 +489,7 @@ bool CMasternodePayments::IsScheduled(const masternode_info_t& mnInfo, int nNotB
     if(!masternodeSync.IsMasternodeListSynced()) return false;
 
     CScript mnpayee;
-    mnpayee = GetScriptForDestination(mnInfo.pubKeyCollateralAddress.GetID());
+    mnpayee = GetScriptForDestination(mnInfo.keyIDCollateralAddress);
 
     CScript payee;
     for(int64_t h = nCachedBlockHeight; h <= nCachedBlockHeight + 8; h++){
@@ -759,7 +759,7 @@ bool CMasternodePayments::ProcessBlock(int nBlockHeight, CConnman& connman)
 
     int nRank;
 
-    if (!mnodeman.GetMasternodeRank(activeMasternode.outpoint, nRank, nBlockHeight - 101, GetMinMasternodePaymentsProto())) {
+    if (!mnodeman.GetMasternodeRank(activeMasternodeInfo.outpoint, nRank, nBlockHeight - 101, GetMinMasternodePaymentsProto())) {
         LogPrint("mnpayments", "CMasternodePayments::ProcessBlock -- Unknown Masternode\n");
         return false;
     }
@@ -772,7 +772,7 @@ bool CMasternodePayments::ProcessBlock(int nBlockHeight, CConnman& connman)
 
     // LOCATE THE NEXT MASTERNODE WHICH SHOULD BE PAID
 
-    LogPrintf("CMasternodePayments::ProcessBlock -- Start: nBlockHeight=%d, masternode=%s\n", nBlockHeight, activeMasternode.outpoint.ToStringShort());
+    LogPrintf("CMasternodePayments::ProcessBlock -- Start: nBlockHeight=%d, masternode=%s\n", nBlockHeight, activeMasternodeInfo.outpoint.ToStringShort());
 
     // pay to the oldest MN that still had no payment but its input is old enough and it was active long enough
     int nCount = 0;
@@ -786,9 +786,9 @@ bool CMasternodePayments::ProcessBlock(int nBlockHeight, CConnman& connman)
     LogPrintf("CMasternodePayments::ProcessBlock -- Masternode found by GetNextMasternodeInQueueForPayment(): %s\n", mnInfo.outpoint.ToStringShort());
 
 
-    CScript payee = GetScriptForDestination(mnInfo.pubKeyCollateralAddress.GetID());
+    CScript payee = GetScriptForDestination(mnInfo.keyIDCollateralAddress);
 
-    CMasternodePaymentVote voteNew(activeMasternode.outpoint, nBlockHeight, payee);
+    CMasternodePaymentVote voteNew(activeMasternodeInfo.outpoint, nBlockHeight, payee);
 
     CTxDestination address1;
     ExtractDestination(payee, address1);
@@ -893,7 +893,7 @@ void CMasternodePaymentVote::Relay(CConnman& connman) const
     connman.RelayInv(inv);
 }
 
-bool CMasternodePaymentVote::CheckSignature(const CPubKey& pubKeyMasternode, int nValidationHeight, int &nDos) const
+bool CMasternodePaymentVote::CheckSignature(const CKeyID& keyIDMasternode, int nValidationHeight, int &nDos) const
 {
     // do not ban by default
     nDos = 0;
@@ -902,12 +902,12 @@ bool CMasternodePaymentVote::CheckSignature(const CPubKey& pubKeyMasternode, int
     if (sporkManager.IsSporkActive(SPORK_6_NEW_SIGS)) {
         uint256 hash = GetSignatureHash();
 
-        if (!CHashSigner::VerifyHash(hash, pubKeyMasternode, vchSig, strError)) {
+        if (!CHashSigner::VerifyHash(hash, keyIDMasternode, vchSig, strError)) {
             // could be a signature in old format
             std::string strMessage = masternodeOutpoint.ToStringShort() +
                         std::to_string(nBlockHeight) +
                         ScriptToAsmStr(payee);
-            if(!CMessageSigner::VerifyMessage(pubKeyMasternode, vchSig, strMessage, strError)) {
+            if(!CMessageSigner::VerifyMessage(keyIDMasternode, vchSig, strMessage, strError)) {
                 // nope, not in old format either
                 // Only ban for future block vote when we are already synced.
                 // Otherwise it could be the case when MN which signed this vote is using another key now
@@ -924,7 +924,7 @@ bool CMasternodePaymentVote::CheckSignature(const CPubKey& pubKeyMasternode, int
                     std::to_string(nBlockHeight) +
                     ScriptToAsmStr(payee);
 
-        if (!CMessageSigner::VerifyMessage(pubKeyMasternode, vchSig, strMessage, strError)) {
+        if (!CMessageSigner::VerifyMessage(keyIDMasternode, vchSig, strMessage, strError)) {
             // Only ban for future block vote when we are already synced.
             // Otherwise it could be the case when MN which signed this vote is using another key now
             // and we have no idea about the old one.
diff --git a/src/masternode-payments.h b/src/masternode-payments.h
index bd2c0086740d..3db062d6ffe0 100644
--- a/src/masternode-payments.h
+++ b/src/masternode-payments.h
@@ -159,7 +159,7 @@ class CMasternodePaymentVote
     uint256 GetSignatureHash() const;
 
     bool Sign();
-    bool CheckSignature(const CPubKey& pubKeyMasternode, int nValidationHeight, int &nDos) const;
+    bool CheckSignature(const CKeyID& keyIDMasternode, int nValidationHeight, int &nDos) const;
 
     bool IsValid(CNode* pnode, int nValidationHeight, std::string& strError, CConnman& connman) const;
     void Relay(CConnman& connman) const;
diff --git a/src/masternode-sync.cpp b/src/masternode-sync.cpp
index 7b421cb6c13a..272a31da387c 100644
--- a/src/masternode-sync.cpp
+++ b/src/masternode-sync.cpp
@@ -87,7 +87,7 @@ void CMasternodeSync::SwitchToNextAsset(CConnman& connman)
             nRequestedMasternodeAssets = MASTERNODE_SYNC_FINISHED;
             uiInterface.NotifyAdditionalDataSyncProgressChanged(1);
             //try to activate our masternode if possible
-            activeMasternode.ManageState(connman);
+            legacyActiveMasternodeManager.ManageState(connman);
 
             connman.ForEachNode(CConnman::AllNodes, [](CNode* pnode) {
                 netfulfilledman.AddFulfilledRequest(pnode->addr, "full-sync");
diff --git a/src/masternode.cpp b/src/masternode.cpp
index 26fae469b195..9fc59baf7dff 100644
--- a/src/masternode.cpp
+++ b/src/masternode.cpp
@@ -26,9 +26,9 @@ CMasternode::CMasternode() :
     fAllowMixingTx(true)
 {}
 
-CMasternode::CMasternode(CService addr, COutPoint outpoint, CPubKey pubKeyCollateralAddress, CPubKey pubKeyMasternode, int nProtocolVersionIn) :
+CMasternode::CMasternode(CService addr, COutPoint outpoint, CPubKey pubKeyCollateralAddressNew, CPubKey pubKeyMasternodeNew, int nProtocolVersionIn) :
     masternode_info_t{ MASTERNODE_ENABLED, nProtocolVersionIn, GetAdjustedTime(),
-                       outpoint, addr, pubKeyCollateralAddress, pubKeyMasternode},
+                       outpoint, addr, pubKeyCollateralAddressNew, pubKeyMasternodeNew},
     fAllowMixingTx(true)
 {}
 
@@ -60,6 +60,7 @@ bool CMasternode::UpdateFromNewBroadcast(CMasternodeBroadcast& mnb, CConnman& co
     if(mnb.sigTime <= sigTime && !mnb.fRecovery) return false;
 
     pubKeyMasternode = mnb.pubKeyMasternode;
+    keyIDMasternode = mnb.pubKeyMasternode.GetID();
     sigTime = mnb.sigTime;
     vchSig = mnb.vchSig;
     nProtocolVersion = mnb.nProtocolVersion;
@@ -73,11 +74,11 @@ bool CMasternode::UpdateFromNewBroadcast(CMasternodeBroadcast& mnb, CConnman& co
         mnodeman.mapSeenMasternodePing.insert(std::make_pair(lastPing.GetHash(), lastPing));
     }
     // if it matches our Masternode privkey...
-    if(fMasternodeMode && pubKeyMasternode == activeMasternode.pubKeyMasternode) {
+    if(fMasternodeMode && keyIDMasternode == activeMasternodeInfo.keyIDMasternode) {
         nPoSeBanScore = -MASTERNODE_POSE_BAN_MAX_SCORE;
         if(nProtocolVersion == PROTOCOL_VERSION) {
             // ... and PROTOCOL_VERSION, then we've been remotely activated ...
-            activeMasternode.ManageState(connman);
+            legacyActiveMasternodeManager.ManageState(connman);
         } else {
             // ... otherwise we need to reactivate our node, do not add it to the list and do not relay
             // but also do not ban the node we get this message from
@@ -101,13 +102,13 @@ arith_uint256 CMasternode::CalculateScore(const uint256& blockHash) const
     return UintToArith256(ss.GetHash());
 }
 
-CMasternode::CollateralStatus CMasternode::CheckCollateral(const COutPoint& outpoint, const CPubKey& pubkey)
+CMasternode::CollateralStatus CMasternode::CheckCollateral(const COutPoint& outpoint, const CKeyID& keyID)
 {
     int nHeight;
-    return CheckCollateral(outpoint, pubkey, nHeight);
+    return CheckCollateral(outpoint, keyID, nHeight);
 }
 
-CMasternode::CollateralStatus CMasternode::CheckCollateral(const COutPoint& outpoint, const CPubKey& pubkey, int& nHeightRet)
+CMasternode::CollateralStatus CMasternode::CheckCollateral(const COutPoint& outpoint, const CKeyID& keyID, int& nHeightRet)
 {
     AssertLockHeld(cs_main);
 
@@ -120,7 +121,7 @@ CMasternode::CollateralStatus CMasternode::CheckCollateral(const COutPoint& outp
         return COLLATERAL_INVALID_AMOUNT;
     }
 
-    if(pubkey == CPubKey() || coin.out.scriptPubKey != GetScriptForDestination(pubkey.GetID())) {
+    if(keyID.IsNull() || coin.out.scriptPubKey != GetScriptForDestination(keyID)) {
         return COLLATERAL_INVALID_PUBKEY;
     }
 
@@ -171,7 +172,7 @@ void CMasternode::Check(bool fForce)
     }
 
     int nActiveStatePrev = nActiveState;
-    bool fOurMasternode = fMasternodeMode && activeMasternode.pubKeyMasternode == pubKeyMasternode;
+    bool fOurMasternode = fMasternodeMode && activeMasternodeInfo.keyIDMasternode == keyIDMasternode;
 
                    // masternode doesn't meet payment protocol requirements ...
     bool fRequireUpdate = nProtocolVersion < mnpayments.GetMinMasternodePaymentsProto() ||
@@ -319,7 +320,7 @@ void CMasternode::UpdateLastPaid(const CBlockIndex *pindex, int nMaxBlocksToScan
 
     const CBlockIndex *BlockReading = pindex;
 
-    CScript mnpayee = GetScriptForDestination(pubKeyCollateralAddress.GetID());
+    CScript mnpayee = GetScriptForDestination(keyIDCollateralAddress);
     // LogPrint("mnpayments", "CMasternode::UpdateLastPaidBlock -- searching for block with payment to %s\n", outpoint.ToStringShort());
 
     LOCK(cs_mapMasternodeBlocks);
@@ -396,7 +397,7 @@ bool CMasternodeBroadcast::Create(const COutPoint& outpoint, const CService& ser
     // wait for reindex and/or import to finish
     if (fImporting || fReindex) return false;
 
-    LogPrint("masternode", "CMasternodeBroadcast::Create -- pubKeyCollateralAddressNew = %s, pubKeyMasternodeNew.GetID() = %s\n",
+    LogPrint("masternode", "CMasternodeBroadcast::Create -- pubKeyCollateralAddressNew = %s, keyIDMasternode = %s\n",
              CBitcoinAddress(pubKeyCollateralAddressNew.GetID()).ToString(),
              pubKeyMasternodeNew.GetID().ToString());
 
@@ -409,7 +410,7 @@ bool CMasternodeBroadcast::Create(const COutPoint& outpoint, const CService& ser
     };
 
     CMasternodePing mnp(outpoint);
-    if (!mnp.Sign(keyMasternodeNew, pubKeyMasternodeNew))
+    if (!mnp.Sign(keyMasternodeNew, pubKeyMasternodeNew.GetID()))
         return Log(strprintf("Failed to sign ping, masternode=%s", outpoint.ToStringShort()));
 
     mnbRet = CMasternodeBroadcast(service, outpoint, pubKeyCollateralAddressNew, pubKeyMasternodeNew, PROTOCOL_VERSION);
@@ -457,19 +458,19 @@ bool CMasternodeBroadcast::SimpleCheck(int& nDos)
     }
 
     CScript pubkeyScript;
-    pubkeyScript = GetScriptForDestination(pubKeyCollateralAddress.GetID());
+    pubkeyScript = GetScriptForDestination(keyIDCollateralAddress);
 
     if(pubkeyScript.size() != 25) {
-        LogPrintf("CMasternodeBroadcast::SimpleCheck -- pubKeyCollateralAddress has the wrong size\n");
+        LogPrintf("CMasternodeBroadcast::SimpleCheck -- keyIDCollateralAddress has the wrong size\n");
         nDos = 100;
         return false;
     }
 
     CScript pubkeyScript2;
-    pubkeyScript2 = GetScriptForDestination(pubKeyMasternode.GetID());
+    pubkeyScript2 = GetScriptForDestination(keyIDMasternode);
 
     if(pubkeyScript2.size() != 25) {
-        LogPrintf("CMasternodeBroadcast::SimpleCheck -- pubKeyMasternode has the wrong size\n");
+        LogPrintf("CMasternodeBroadcast::SimpleCheck -- keyIDMasternode has the wrong size\n");
         nDos = 100;
         return false;
     }
@@ -511,8 +512,8 @@ bool CMasternodeBroadcast::Update(CMasternode* pmn, int& nDos, CConnman& connman
     }
 
     // IsVnAssociatedWithPubkey is validated once in CheckOutpoint, after that they just need to match
-    if(pmn->pubKeyCollateralAddress != pubKeyCollateralAddress) {
-        LogPrintf("CMasternodeBroadcast::Update -- Got mismatched pubKeyCollateralAddress and outpoint\n");
+    if(pmn->keyIDCollateralAddress != keyIDCollateralAddress) {
+        LogPrintf("CMasternodeBroadcast::Update -- Got mismatched keyIDCollateralAddress and outpoint\n");
         nDos = 33;
         return false;
     }
@@ -523,7 +524,7 @@ bool CMasternodeBroadcast::Update(CMasternode* pmn, int& nDos, CConnman& connman
     }
 
     // if ther was no masternode broadcast recently or if it matches our Masternode privkey...
-    if(!pmn->IsBroadcastedWithin(MASTERNODE_MIN_MNB_SECONDS) || (fMasternodeMode && pubKeyMasternode == activeMasternode.pubKeyMasternode)) {
+    if(!pmn->IsBroadcastedWithin(MASTERNODE_MIN_MNB_SECONDS) || (fMasternodeMode && keyIDMasternode == activeMasternodeInfo.keyIDMasternode)) {
         // take the newest entry
         LogPrintf("CMasternodeBroadcast::Update -- Got UPDATED Masternode entry: addr=%s\n", addr.ToString());
         if(pmn->UpdateFromNewBroadcast(*this, connman)) {
@@ -540,14 +541,14 @@ bool CMasternodeBroadcast::CheckOutpoint(int& nDos)
 {
     // we are a masternode with the same outpoint (i.e. already activated) and this mnb is ours (matches our Masternode privkey)
     // so nothing to do here for us
-    if(fMasternodeMode && outpoint == activeMasternode.outpoint && pubKeyMasternode == activeMasternode.pubKeyMasternode) {
+    if(fMasternodeMode && outpoint == activeMasternodeInfo.outpoint && keyIDMasternode == activeMasternodeInfo.keyIDMasternode) {
         return false;
     }
 
     AssertLockHeld(cs_main);
 
     int nHeight;
-    CollateralStatus err = CheckCollateral(outpoint, pubKeyCollateralAddress, nHeight);
+    CollateralStatus err = CheckCollateral(outpoint, keyIDCollateralAddress, nHeight);
     if (err == COLLATERAL_UTXO_NOT_FOUND) {
         LogPrint("masternode", "CMasternodeBroadcast::CheckOutpoint -- Failed to find Masternode UTXO, masternode=%s\n", outpoint.ToStringShort());
         return false;
@@ -560,7 +561,7 @@ bool CMasternodeBroadcast::CheckOutpoint(int& nDos)
     }
 
     if(err == COLLATERAL_INVALID_PUBKEY) {
-        LogPrint("masternode", "CMasternodeBroadcast::CheckOutpoint -- Masternode UTXO should match pubKeyCollateralAddress, masternode=%s\n", outpoint.ToStringShort());
+        LogPrint("masternode", "CMasternodeBroadcast::CheckOutpoint -- Masternode UTXO should match keyIDCollateralAddress, masternode=%s\n", outpoint.ToStringShort());
         nDos = 33;
         return false;
     }
@@ -635,13 +636,13 @@ bool CMasternodeBroadcast::Sign(const CKey& keyCollateralAddress)
             return false;
         }
 
-        if (!CHashSigner::VerifyHash(hash, pubKeyCollateralAddress, vchSig, strError)) {
+        if (!CHashSigner::VerifyHash(hash, keyIDCollateralAddress, vchSig, strError)) {
             LogPrintf("CMasternodeBroadcast::Sign -- VerifyMessage() failed, error: %s\n", strError);
             return false;
         }
     } else {
         std::string strMessage = addr.ToString(false) + std::to_string(sigTime) +
-                        pubKeyCollateralAddress.GetID().ToString() + pubKeyMasternode.GetID().ToString() +
+                        keyIDCollateralAddress.ToString() + keyIDMasternode.ToString() +
                         std::to_string(nProtocolVersion);
 
         if (!CMessageSigner::SignMessage(strMessage, vchSig, keyCollateralAddress)) {
@@ -649,7 +650,7 @@ bool CMasternodeBroadcast::Sign(const CKey& keyCollateralAddress)
             return false;
         }
 
-        if (!CMessageSigner::VerifyMessage(pubKeyCollateralAddress, vchSig, strMessage, strError)) {
+        if(!CMessageSigner::VerifyMessage(keyIDCollateralAddress, vchSig, strMessage, strError)) {
             LogPrintf("CMasternodeBroadcast::Sign -- VerifyMessage() failed, error: %s\n", strError);
             return false;
         }
@@ -666,13 +667,13 @@ bool CMasternodeBroadcast::CheckSignature(int& nDos) const
     if (sporkManager.IsSporkActive(SPORK_6_NEW_SIGS)) {
         uint256 hash = GetSignatureHash();
 
-        if (!CHashSigner::VerifyHash(hash, pubKeyCollateralAddress, vchSig, strError)) {
+        if (!CHashSigner::VerifyHash(hash, keyIDCollateralAddress, vchSig, strError)) {
             // maybe it's in old format
             std::string strMessage = addr.ToString(false) + std::to_string(sigTime) +
-                            pubKeyCollateralAddress.GetID().ToString() + pubKeyMasternode.GetID().ToString() +
+                            keyIDCollateralAddress.ToString() + keyIDMasternode.ToString() +
                             std::to_string(nProtocolVersion);
 
-            if (!CMessageSigner::VerifyMessage(pubKeyCollateralAddress, vchSig, strMessage, strError)){
+            if (!CMessageSigner::VerifyMessage(keyIDCollateralAddress, vchSig, strMessage, strError)){
                 // nope, not in old format either
                 LogPrintf("CMasternodeBroadcast::CheckSignature -- Got bad Masternode announce signature, error: %s\n", strError);
                 nDos = 100;
@@ -681,10 +682,10 @@ bool CMasternodeBroadcast::CheckSignature(int& nDos) const
         }
     } else {
         std::string strMessage = addr.ToString(false) + std::to_string(sigTime) +
-                        pubKeyCollateralAddress.GetID().ToString() + pubKeyMasternode.GetID().ToString() +
+                        keyIDCollateralAddress.ToString() + keyIDMasternode.ToString() +
                         std::to_string(nProtocolVersion);
 
-        if (!CMessageSigner::VerifyMessage(pubKeyCollateralAddress, vchSig, strMessage, strError)){
+        if(!CMessageSigner::VerifyMessage(keyIDCollateralAddress, vchSig, strMessage, strError)){
             LogPrintf("CMasternodeBroadcast::CheckSignature -- Got bad Masternode announce signature, error: %s\n", strError);
             nDos = 100;
             return false;
@@ -742,7 +743,7 @@ CMasternodePing::CMasternodePing(const COutPoint& outpoint)
     nDaemonVersion = CLIENT_VERSION;
 }
 
-bool CMasternodePing::Sign(const CKey& keyMasternode, const CPubKey& pubKeyMasternode)
+bool CMasternodePing::Sign(const CKey& keyMasternode, const CKeyID& keyIDMasternode)
 {
     std::string strError;
 
@@ -756,7 +757,7 @@ bool CMasternodePing::Sign(const CKey& keyMasternode, const CPubKey& pubKeyMaste
             return false;
         }
 
-        if (!CHashSigner::VerifyHash(hash, pubKeyMasternode, vchSig, strError)) {
+        if (!CHashSigner::VerifyHash(hash, keyIDMasternode, vchSig, strError)) {
             LogPrintf("CMasternodePing::Sign -- VerifyHash() failed, error: %s\n", strError);
             return false;
         }
@@ -769,7 +770,7 @@ bool CMasternodePing::Sign(const CKey& keyMasternode, const CPubKey& pubKeyMaste
             return false;
         }
 
-        if (!CMessageSigner::VerifyMessage(pubKeyMasternode, vchSig, strMessage, strError)) {
+        if(!CMessageSigner::VerifyMessage(keyIDMasternode, vchSig, strMessage, strError)) {
             LogPrintf("CMasternodePing::Sign -- VerifyMessage() failed, error: %s\n", strError);
             return false;
         }
@@ -778,7 +779,7 @@ bool CMasternodePing::Sign(const CKey& keyMasternode, const CPubKey& pubKeyMaste
     return true;
 }
 
-bool CMasternodePing::CheckSignature(const CPubKey& pubKeyMasternode, int &nDos) const
+bool CMasternodePing::CheckSignature(CKeyID& keyIDMasternode, int &nDos) const
 {
     std::string strError = "";
     nDos = 0;
@@ -786,11 +787,11 @@ bool CMasternodePing::CheckSignature(const CPubKey& pubKeyMasternode, int &nDos)
     if (sporkManager.IsSporkActive(SPORK_6_NEW_SIGS)) {
         uint256 hash = GetSignatureHash();
 
-        if (!CHashSigner::VerifyHash(hash, pubKeyMasternode, vchSig, strError)) {
+        if (!CHashSigner::VerifyHash(hash, keyIDMasternode, vchSig, strError)) {
             std::string strMessage = CTxIn(masternodeOutpoint).ToString() + blockHash.ToString() +
                         std::to_string(sigTime);
 
-            if (!CMessageSigner::VerifyMessage(pubKeyMasternode, vchSig, strMessage, strError)) {
+            if(!CMessageSigner::VerifyMessage(keyIDMasternode, vchSig, strMessage, strError)) {
                 LogPrintf("CMasternodePing::CheckSignature -- Got bad Masternode ping signature, masternode=%s, error: %s\n", masternodeOutpoint.ToStringShort(), strError);
                 nDos = 33;
                 return false;
@@ -800,7 +801,7 @@ bool CMasternodePing::CheckSignature(const CPubKey& pubKeyMasternode, int &nDos)
         std::string strMessage = CTxIn(masternodeOutpoint).ToString() + blockHash.ToString() +
                     std::to_string(sigTime);
 
-        if (!CMessageSigner::VerifyMessage(pubKeyMasternode, vchSig, strMessage, strError)) {
+        if (!CMessageSigner::VerifyMessage(keyIDMasternode, vchSig, strMessage, strError)) {
             LogPrintf("CMasternodePing::CheckSignature -- Got bad Masternode ping signature, masternode=%s, error: %s\n", masternodeOutpoint.ToStringShort(), strError);
             nDos = 33;
             return false;
@@ -884,7 +885,7 @@ bool CMasternodePing::CheckAndUpdate(CMasternode* pmn, bool fFromNewBroadcast, i
         return false;
     }
 
-    if (!CheckSignature(pmn->pubKeyMasternode, nDos)) return false;
+    if (!CheckSignature(pmn->keyIDMasternode, nDos)) return false;
 
     // so, ping seems to be ok
 
diff --git a/src/masternode.h b/src/masternode.h
index 9e738e7d4df6..6b60b93e18f5 100644
--- a/src/masternode.h
+++ b/src/masternode.h
@@ -95,8 +95,8 @@ class CMasternodePing
 
     bool IsExpired() const { return GetAdjustedTime() - sigTime > MASTERNODE_NEW_START_REQUIRED_SECONDS; }
 
-    bool Sign(const CKey& keyMasternode, const CPubKey& pubKeyMasternode);
-    bool CheckSignature(const CPubKey& pubKeyMasternode, int &nDos) const;
+    bool Sign(const CKey& keyMasternode, const CKeyID& keyIDMasternode);
+    bool CheckSignature(CKeyID& keyIDMasternode, int &nDos) const;
     bool SimpleCheck(int& nDos);
     bool CheckAndUpdate(CMasternode* pmn, bool fFromNewBroadcast, int& nDos, CConnman& connman);
     void Relay(CConnman& connman);
@@ -130,12 +130,21 @@ struct masternode_info_t
     masternode_info_t(int activeState, int protoVer, int64_t sTime) :
         nActiveState{activeState}, nProtocolVersion{protoVer}, sigTime{sTime} {}
 
+    // only called when the network is in legacy MN list mode
     masternode_info_t(int activeState, int protoVer, int64_t sTime,
                       COutPoint const& outpnt, CService const& addr,
                       CPubKey const& pkCollAddr, CPubKey const& pkMN) :
         nActiveState{activeState}, nProtocolVersion{protoVer}, sigTime{sTime},
         outpoint{outpnt}, addr{addr},
-        pubKeyCollateralAddress{pkCollAddr}, pubKeyMasternode{pkMN} {}
+        pubKeyCollateralAddress{pkCollAddr}, pubKeyMasternode{pkMN}, keyIDCollateralAddress{pkCollAddr.GetID()}, keyIDMasternode{pkMN.GetID()} {}
+
+    // only called when the network is in deterministic MN list mode
+    masternode_info_t(int activeState, int protoVer, int64_t sTime,
+                      COutPoint const& outpnt, CService const& addr,
+                      CKeyID const& pkCollAddr, CKeyID const& pkMN) :
+        nActiveState{activeState}, nProtocolVersion{protoVer}, sigTime{sTime},
+        outpoint{outpnt}, addr{addr},
+        pubKeyCollateralAddress{}, pubKeyMasternode{}, keyIDCollateralAddress{pkCollAddr}, keyIDMasternode{pkMN} {}
 
     int nActiveState = 0;
     int nProtocolVersion = 0;
@@ -143,8 +152,10 @@ struct masternode_info_t
 
     COutPoint outpoint{};
     CService addr{};
-    CPubKey pubKeyCollateralAddress{};
-    CPubKey pubKeyMasternode{};
+    CPubKey pubKeyCollateralAddress{}; // this will be invalid/unset when the network switches to deterministic MNs (luckely it's only important for the broadcast hash)
+    CPubKey pubKeyMasternode{}; // this will be invalid/unset when the network switches to deterministic MNs (luckely it's only important for the broadcast hash)
+    CKeyID keyIDCollateralAddress{};
+    CKeyID keyIDMasternode{};
 
     int64_t nLastDsq = 0; //the dsq count from the last dsq broadcast of this node
     int64_t nTimeLastChecked = 0;
@@ -224,6 +235,8 @@ class CMasternode : public masternode_info_t
         READWRITE(addr);
         READWRITE(pubKeyCollateralAddress);
         READWRITE(pubKeyMasternode);
+        READWRITE(keyIDCollateralAddress);
+        READWRITE(keyIDMasternode);
         READWRITE(lastPing);
         READWRITE(vchSig);
         READWRITE(sigTime);
@@ -246,8 +259,8 @@ class CMasternode : public masternode_info_t
 
     bool UpdateFromNewBroadcast(CMasternodeBroadcast& mnb, CConnman& connman);
 
-    static CollateralStatus CheckCollateral(const COutPoint& outpoint, const CPubKey& pubkey);
-    static CollateralStatus CheckCollateral(const COutPoint& outpoint, const CPubKey& pubkey, int& nHeightRet);
+    static CollateralStatus CheckCollateral(const COutPoint& outpoint, const CKeyID& keyID);
+    static CollateralStatus CheckCollateral(const COutPoint& outpoint, const CKeyID& keyID, int& nHeightRet);
     void Check(bool fForce = false);
 
     bool IsBroadcastedWithin(int nSeconds) { return GetAdjustedTime() - sigTime < nSeconds; }
@@ -389,6 +402,11 @@ class CMasternodeBroadcast : public CMasternode
         if (!(s.GetType() & SER_GETHASH)) {
             READWRITE(lastPing);
         }
+
+        if (ser_action.ForRead()) {
+            keyIDCollateralAddress = pubKeyCollateralAddress.GetID();
+            keyIDMasternode = pubKeyMasternode.GetID();
+        }
     }
 
     uint256 GetHash() const;
diff --git a/src/masternodeman.cpp b/src/masternodeman.cpp
index 71f9b4e757e7..bd89f275820d 100644
--- a/src/masternodeman.cpp
+++ b/src/masternodeman.cpp
@@ -25,7 +25,7 @@
 /** Masternode manager */
 CMasternodeMan mnodeman;
 
-const std::string CMasternodeMan::SERIALIZATION_VERSION_STRING = "CMasternodeMan-Version-8";
+const std::string CMasternodeMan::SERIALIZATION_VERSION_STRING = "CMasternodeMan-Version-9";
 const int CMasternodeMan::LAST_PAID_SCAN_BLOCKS = 100;
 
 struct CompareLastPaidBlock
@@ -471,11 +471,10 @@ bool CMasternodeMan::GetMasternodeInfo(const COutPoint& outpoint, masternode_inf
     return true;
 }
 
-bool CMasternodeMan::GetMasternodeInfo(const CPubKey& pubKeyMasternode, masternode_info_t& mnInfoRet)
-{
+bool CMasternodeMan::GetMasternodeInfo(const CKeyID& keyIDMasternode, masternode_info_t& mnInfoRet) {
     LOCK(cs);
     for (const auto& mnpair : mapMasternodes) {
-        if (mnpair.second.pubKeyMasternode == pubKeyMasternode) {
+        if (mnpair.second.keyIDMasternode == keyIDMasternode) {
             mnInfoRet = mnpair.second.GetInfo();
             return true;
         }
@@ -483,17 +482,18 @@ bool CMasternodeMan::GetMasternodeInfo(const CPubKey& pubKeyMasternode, masterno
     return false;
 }
 
+bool CMasternodeMan::GetMasternodeInfo(const CPubKey& pubKeyMasternode, masternode_info_t& mnInfoRet)
+{
+    return GetMasternodeInfo(pubKeyMasternode.GetID(), mnInfoRet);
+}
+
 bool CMasternodeMan::GetMasternodeInfo(const CScript& payee, masternode_info_t& mnInfoRet)
 {
-    LOCK(cs);
-    for (const auto& mnpair : mapMasternodes) {
-        CScript scriptCollateralAddress = GetScriptForDestination(mnpair.second.pubKeyCollateralAddress.GetID());
-        if (scriptCollateralAddress == payee) {
-            mnInfoRet = mnpair.second.GetInfo();
-            return true;
-        }
-    }
-    return false;
+    CTxDestination dest;
+    if (!ExtractDestination(payee, dest) || !boost::get<CKeyID>(&dest))
+        return false;
+    CKeyID keyId = *boost::get<CKeyID>(&dest);
+    return GetMasternodeInfo(keyId, mnInfoRet);
 }
 
 bool CMasternodeMan::Has(const COutPoint& outpoint)
@@ -994,7 +994,7 @@ void CMasternodeMan::PushDsegInvs(CNode* pnode, const CMasternode& mn)
 
 void CMasternodeMan::DoFullVerificationStep(CConnman& connman)
 {
-    if(activeMasternode.outpoint.IsNull()) return;
+    if(activeMasternodeInfo.outpoint.IsNull()) return;
     if(!masternodeSync.IsSynced()) return;
 
     rank_pair_vec_t vecMasternodeRanks;
@@ -1014,7 +1014,7 @@ void CMasternodeMan::DoFullVerificationStep(CConnman& connman)
                         (int)MAX_POSE_RANK);
             return;
         }
-        if(rankPair.second.outpoint == activeMasternode.outpoint) {
+        if(rankPair.second.outpoint == activeMasternodeInfo.outpoint) {
             nMyRank = rankPair.first;
             LogPrint("masternode", "CMasternodeMan::DoFullVerificationStep -- Found self at rank %d/%d, verifying up to %d masternodes\n",
                         nMyRank, nRanksTotal, (int)MAX_POSE_CONNECTIONS);
@@ -1199,24 +1199,24 @@ void CMasternodeMan::SendVerifyReply(CNode* pnode, CMasternodeVerification& mnv,
     if (sporkManager.IsSporkActive(SPORK_6_NEW_SIGS)) {
         uint256 hash = mnv.GetSignatureHash1(blockHash);
 
-        if(!CHashSigner::SignHash(hash, activeMasternode.keyMasternode, mnv.vchSig1)) {
+        if(!CHashSigner::SignHash(hash, activeMasternodeInfo.keyMasternode, mnv.vchSig1)) {
             LogPrintf("CMasternodeMan::SendVerifyReply -- SignHash() failed\n");
             return;
         }
 
-        if (!CHashSigner::VerifyHash(hash, activeMasternode.pubKeyMasternode, mnv.vchSig1, strError)) {
+        if (!CHashSigner::VerifyHash(hash, activeMasternodeInfo.keyIDMasternode, mnv.vchSig1, strError)) {
             LogPrintf("CMasternodeMan::SendVerifyReply -- VerifyHash() failed, error: %s\n", strError);
             return;
         }
     } else {
-        std::string strMessage = strprintf("%s%d%s", activeMasternode.service.ToString(false), mnv.nonce, blockHash.ToString());
+        std::string strMessage = strprintf("%s%d%s", activeMasternodeInfo.service.ToString(false), mnv.nonce, blockHash.ToString());
 
-        if(!CMessageSigner::SignMessage(strMessage, mnv.vchSig1, activeMasternode.keyMasternode)) {
+        if(!CMessageSigner::SignMessage(strMessage, mnv.vchSig1, activeMasternodeInfo.keyMasternode)) {
             LogPrintf("MasternodeMan::SendVerifyReply -- SignMessage() failed\n");
             return;
         }
 
-        if(!CMessageSigner::VerifyMessage(activeMasternode.pubKeyMasternode, mnv.vchSig1, strMessage, strError)) {
+        if(!CMessageSigner::VerifyMessage(activeMasternodeInfo.keyIDMasternode, mnv.vchSig1, strMessage, strError)) {
             LogPrintf("MasternodeMan::SendVerifyReply -- VerifyMessage() failed, error: %s\n", strError);
             return;
         }
@@ -1283,10 +1283,10 @@ void CMasternodeMan::ProcessVerifyReply(CNode* pnode, CMasternodeVerification& m
             if(CAddress(mnpair.second.addr, NODE_NETWORK) == pnode->addr) {
                 bool fFound = false;
                 if (sporkManager.IsSporkActive(SPORK_6_NEW_SIGS)) {
-                    fFound = CHashSigner::VerifyHash(hash1, mnpair.second.pubKeyMasternode, mnv.vchSig1, strError);
+                    fFound = CHashSigner::VerifyHash(hash1, mnpair.second.keyIDMasternode, mnv.vchSig1, strError);
                     // we don't care about mnv with signature in old format
                 } else {
-                    fFound = CMessageSigner::VerifyMessage(mnpair.second.pubKeyMasternode, mnv.vchSig1, strMessage1, strError);
+                    fFound = CMessageSigner::VerifyMessage(mnpair.second.keyIDMasternode, mnv.vchSig1, strMessage1, strError);
                 }
                 if (fFound) {
                     // found it!
@@ -1297,23 +1297,23 @@ void CMasternodeMan::ProcessVerifyReply(CNode* pnode, CMasternodeVerification& m
                     netfulfilledman.AddFulfilledRequest(pnode->addr, strprintf("%s", NetMsgType::MNVERIFY)+"-done");
 
                     // we can only broadcast it if we are an activated masternode
-                    if(activeMasternode.outpoint.IsNull()) continue;
+                    if(activeMasternodeInfo.outpoint.IsNull()) continue;
                     // update ...
                     mnv.addr = mnpair.second.addr;
                     mnv.masternodeOutpoint1 = mnpair.second.outpoint;
-                    mnv.masternodeOutpoint2 = activeMasternode.outpoint;
+                    mnv.masternodeOutpoint2 = activeMasternodeInfo.outpoint;
                     // ... and sign it
                     std::string strError;
 
                     if (sporkManager.IsSporkActive(SPORK_6_NEW_SIGS)) {
                         uint256 hash2 = mnv.GetSignatureHash2(blockHash);
 
-                        if(!CHashSigner::SignHash(hash2, activeMasternode.keyMasternode, mnv.vchSig2)) {
+                        if(!CHashSigner::SignHash(hash2, activeMasternodeInfo.keyMasternode, mnv.vchSig2)) {
                             LogPrintf("MasternodeMan::ProcessVerifyReply -- SignHash() failed\n");
                             return;
                         }
 
-                        if(!CHashSigner::VerifyHash(hash2, activeMasternode.pubKeyMasternode, mnv.vchSig2, strError)) {
+                        if(!CHashSigner::VerifyHash(hash2, activeMasternodeInfo.keyIDMasternode, mnv.vchSig2, strError)) {
                             LogPrintf("MasternodeMan::ProcessVerifyReply -- VerifyHash() failed, error: %s\n", strError);
                             return;
                         }
@@ -1321,12 +1321,12 @@ void CMasternodeMan::ProcessVerifyReply(CNode* pnode, CMasternodeVerification& m
                         std::string strMessage2 = strprintf("%s%d%s%s%s", mnv.addr.ToString(false), mnv.nonce, blockHash.ToString(),
                                                 mnv.masternodeOutpoint1.ToStringShort(), mnv.masternodeOutpoint2.ToStringShort());
 
-                        if(!CMessageSigner::SignMessage(strMessage2, mnv.vchSig2, activeMasternode.keyMasternode)) {
+                        if(!CMessageSigner::SignMessage(strMessage2, mnv.vchSig2, activeMasternodeInfo.keyMasternode)) {
                             LogPrintf("MasternodeMan::ProcessVerifyReply -- SignMessage() failed\n");
                             return;
                         }
 
-                        if(!CMessageSigner::VerifyMessage(activeMasternode.pubKeyMasternode, mnv.vchSig2, strMessage2, strError)) {
+                        if(!CMessageSigner::VerifyMessage(activeMasternodeInfo.keyIDMasternode, mnv.vchSig2, strMessage2, strError)) {
                             LogPrintf("MasternodeMan::ProcessVerifyReply -- VerifyMessage() failed, error: %s\n", strError);
                             return;
                         }
@@ -1436,12 +1436,12 @@ void CMasternodeMan::ProcessVerifyBroadcast(CNode* pnode, const CMasternodeVerif
             uint256 hash1 = mnv.GetSignatureHash1(blockHash);
             uint256 hash2 = mnv.GetSignatureHash2(blockHash);
 
-            if(!CHashSigner::VerifyHash(hash1, pmn1->pubKeyMasternode, mnv.vchSig1, strError)) {
+            if(!CHashSigner::VerifyHash(hash1, pmn1->keyIDMasternode, mnv.vchSig1, strError)) {
                 LogPrintf("MasternodeMan::ProcessVerifyBroadcast -- VerifyHash() failed, error: %s\n", strError);
                 return;
             }
 
-            if(!CHashSigner::VerifyHash(hash2, pmn2->pubKeyMasternode, mnv.vchSig2, strError)) {
+            if(!CHashSigner::VerifyHash(hash2, pmn2->keyIDMasternode, mnv.vchSig2, strError)) {
                 LogPrintf("MasternodeMan::ProcessVerifyBroadcast -- VerifyHash() failed, error: %s\n", strError);
                 return;
             }
@@ -1450,12 +1450,12 @@ void CMasternodeMan::ProcessVerifyBroadcast(CNode* pnode, const CMasternodeVerif
             std::string strMessage2 = strprintf("%s%d%s%s%s", mnv.addr.ToString(false), mnv.nonce, blockHash.ToString(),
                                     mnv.masternodeOutpoint1.ToStringShort(), mnv.masternodeOutpoint2.ToStringShort());
 
-            if(!CMessageSigner::VerifyMessage(pmn1->pubKeyMasternode, mnv.vchSig1, strMessage1, strError)) {
+            if(!CMessageSigner::VerifyMessage(pmn1->keyIDMasternode, mnv.vchSig1, strMessage1, strError)) {
                 LogPrintf("CMasternodeMan::ProcessVerifyBroadcast -- VerifyMessage() for masternode1 failed, error: %s\n", strError);
                 return;
             }
 
-            if(!CMessageSigner::VerifyMessage(pmn2->pubKeyMasternode, mnv.vchSig2, strMessage2, strError)) {
+            if(!CMessageSigner::VerifyMessage(pmn2->keyIDMasternode, mnv.vchSig2, strMessage2, strError)) {
                 LogPrintf("CMasternodeMan::ProcessVerifyBroadcast -- VerifyMessage() for masternode2 failed, error: %s\n", strError);
                 return;
             }
@@ -1567,13 +1567,13 @@ bool CMasternodeMan::CheckMnbAndUpdateMasternodeList(CNode* pfrom, CMasternodeBr
         Add(mnb);
         masternodeSync.BumpAssetLastTime("CMasternodeMan::CheckMnbAndUpdateMasternodeList - new");
         // if it matches our Masternode privkey...
-        if(fMasternodeMode && mnb.pubKeyMasternode == activeMasternode.pubKeyMasternode) {
+        if(fMasternodeMode && mnb.keyIDMasternode == activeMasternodeInfo.keyIDMasternode) {
             mnb.nPoSeBanScore = -MASTERNODE_POSE_BAN_MAX_SCORE;
             if(mnb.nProtocolVersion == PROTOCOL_VERSION) {
                 // ... and PROTOCOL_VERSION, then we've been remotely activated ...
                 LogPrintf("CMasternodeMan::CheckMnbAndUpdateMasternodeList -- Got NEW Masternode entry: masternode=%s  sigTime=%lld  addr=%s\n",
                             mnb.outpoint.ToStringShort(), mnb.sigTime, mnb.addr.ToString());
-                activeMasternode.ManageState(connman);
+                legacyActiveMasternodeManager.ManageState(connman);
             } else {
                 // ... otherwise we need to reactivate our node, do not add it to the list and do not relay
                 // but also do not ban the node we get this message from
@@ -1643,11 +1643,11 @@ void CMasternodeMan::RemoveGovernanceObject(uint256 nGovernanceObjectHash)
     }
 }
 
-void CMasternodeMan::CheckMasternode(const CPubKey& pubKeyMasternode, bool fForce)
+void CMasternodeMan::CheckMasternode(const CKeyID& keyIDMasternode, bool fForce)
 {
     LOCK2(cs_main, cs);
     for (auto& mnpair : mapMasternodes) {
-        if (mnpair.second.pubKeyMasternode == pubKeyMasternode) {
+        if (mnpair.second.keyIDMasternode == keyIDMasternode) {
             mnpair.second.Check(fForce);
             return;
         }
diff --git a/src/masternodeman.h b/src/masternodeman.h
index 11e7751c9e3b..e3bf617a1709 100644
--- a/src/masternodeman.h
+++ b/src/masternodeman.h
@@ -169,6 +169,7 @@ class CMasternodeMan
     bool Has(const COutPoint& outpoint);
 
     bool GetMasternodeInfo(const COutPoint& outpoint, masternode_info_t& mnInfoRet);
+    bool GetMasternodeInfo(const CKeyID& keyIDMasternode, masternode_info_t& mnInfoRet);
     bool GetMasternodeInfo(const CPubKey& pubKeyMasternode, masternode_info_t& mnInfoRet);
     bool GetMasternodeInfo(const CScript& payee, masternode_info_t& mnInfoRet);
 
@@ -229,7 +230,7 @@ class CMasternodeMan
     bool AddGovernanceVote(const COutPoint& outpoint, uint256 nGovernanceObjectHash);
     void RemoveGovernanceObject(uint256 nGovernanceObjectHash);
 
-    void CheckMasternode(const CPubKey& pubKeyMasternode, bool fForce);
+    void CheckMasternode(const CKeyID& keyIDMasternode, bool fForce);
 
     bool IsMasternodePingedWithin(const COutPoint& outpoint, int nSeconds, int64_t nTimeToCheckAt = -1);
     void SetMasternodeLastPing(const COutPoint& outpoint, const CMasternodePing& mnp);
diff --git a/src/net_processing.cpp b/src/net_processing.cpp
index a4e8446f8ce8..7fb8f1202b63 100644
--- a/src/net_processing.cpp
+++ b/src/net_processing.cpp
@@ -1973,7 +1973,7 @@ bool static ProcessMessage(CNode* pfrom, const std::string& strCommand, CDataStr
                 // we have no idea about (e.g we were offline)? How to handle them?
             }
 
-            if(!dstx.CheckSignature(mn.pubKeyMasternode)) {
+            if(!dstx.CheckSignature(mn.keyIDMasternode)) {
                 LogPrint("privatesend", "DSTX -- CheckSignature() failed for %s\n", hashTx.ToString());
                 return false;
             }
diff --git a/src/privatesend-client.cpp b/src/privatesend-client.cpp
index 5c915c7a7429..253e7aae6a44 100644
--- a/src/privatesend-client.cpp
+++ b/src/privatesend-client.cpp
@@ -56,7 +56,7 @@ void CPrivateSendClient::ProcessMessage(CNode* pfrom, const std::string& strComm
         masternode_info_t infoMn;
         if(!mnodeman.GetMasternodeInfo(dsq.masternodeOutpoint, infoMn)) return;
 
-        if(!dsq.CheckSignature(infoMn.pubKeyMasternode)) {
+        if(!dsq.CheckSignature(infoMn.keyIDMasternode)) {
             // we probably have outdated info
             mnodeman.AskForMN(pfrom, dsq.masternodeOutpoint, connman);
             return;
diff --git a/src/privatesend-server.cpp b/src/privatesend-server.cpp
index c6dbff6a2590..0b544466249a 100644
--- a/src/privatesend-server.cpp
+++ b/src/privatesend-server.cpp
@@ -48,7 +48,7 @@ void CPrivateSendServer::ProcessMessage(CNode* pfrom, const std::string& strComm
         if(dsa.nInputCount < 0 || dsa.nInputCount > PRIVATESEND_ENTRY_MAX_SIZE) return;
 
         masternode_info_t mnInfo;
-        if(!mnodeman.GetMasternodeInfo(activeMasternode.outpoint, mnInfo)) {
+        if(!mnodeman.GetMasternodeInfo(activeMasternodeInfo.outpoint, mnInfo)) {
             PushStatus(pfrom, STATUS_REJECTED, ERR_MN_LIST, connman);
             return;
         }
@@ -105,7 +105,7 @@ void CPrivateSendServer::ProcessMessage(CNode* pfrom, const std::string& strComm
         masternode_info_t mnInfo;
         if(!mnodeman.GetMasternodeInfo(dsq.masternodeOutpoint, mnInfo)) return;
 
-        if(!dsq.CheckSignature(mnInfo.pubKeyMasternode)) {
+        if(!dsq.CheckSignature(mnInfo.keyIDMasternode)) {
             // we probably have outdated info
             mnodeman.AskForMN(pfrom, dsq.masternodeOutpoint, connman);
             return;
@@ -363,7 +363,7 @@ void CPrivateSendServer::CommitFinalTransaction(CConnman& connman)
 
     // create and sign masternode dstx transaction
     if(!CPrivateSend::GetDSTX(hashTx)) {
-        CDarksendBroadcastTx dstxNew(finalTransaction, activeMasternode.outpoint, GetAdjustedTime());
+        CDarksendBroadcastTx dstxNew(finalTransaction, activeMasternodeInfo.outpoint, GetAdjustedTime());
         dstxNew.Sign();
         CPrivateSend::AddDSTX(dstxNew);
     }
@@ -524,7 +524,7 @@ void CPrivateSendServer::CheckForCompleteQueue(CConnman& connman)
     if(nState == POOL_STATE_QUEUE && IsSessionReady()) {
         SetState(POOL_STATE_ACCEPTING_ENTRIES);
 
-        CDarksendQueue dsq(nSessionDenom, nSessionInputCount, activeMasternode.outpoint, GetAdjustedTime(), true);
+        CDarksendQueue dsq(nSessionDenom, nSessionInputCount, activeMasternodeInfo.outpoint, GetAdjustedTime(), true);
         LogPrint("privatesend", "CPrivateSendServer::CheckForCompleteQueue -- queue is ready, signing and relaying (%s)\n", dsq.ToString());
         dsq.Sign();
         dsq.Relay(connman);
@@ -739,7 +739,7 @@ bool CPrivateSendServer::CreateNewSession(const CDarksendAccept& dsa, PoolMessag
 
     if(!fUnitTest) {
         //broadcast that I'm accepting entries, only if it's the first entry through
-        CDarksendQueue dsq(dsa.nDenom, dsa.nInputCount, activeMasternode.outpoint, GetAdjustedTime(), false);
+        CDarksendQueue dsq(dsa.nDenom, dsa.nInputCount, activeMasternodeInfo.outpoint, GetAdjustedTime(), false);
         LogPrint("privatesend", "CPrivateSendServer::CreateNewSession -- signing and relaying new queue: %s\n", dsq.ToString());
         dsq.Sign();
         dsq.Relay(connman);
diff --git a/src/privatesend.cpp b/src/privatesend.cpp
index de585b728f68..1d08836addba 100644
--- a/src/privatesend.cpp
+++ b/src/privatesend.cpp
@@ -47,12 +47,12 @@ bool CDarksendQueue::Sign()
     if (sporkManager.IsSporkActive(SPORK_6_NEW_SIGS)) {
         uint256 hash = GetSignatureHash();
 
-        if (!CHashSigner::SignHash(hash, activeMasternode.keyMasternode, vchSig)) {
+        if (!CHashSigner::SignHash(hash, activeMasternodeInfo.keyMasternode, vchSig)) {
             LogPrintf("CDarksendQueue::Sign -- SignHash() failed\n");
             return false;
         }
 
-        if (!CHashSigner::VerifyHash(hash, activeMasternode.pubKeyMasternode, vchSig, strError)) {
+        if (!CHashSigner::VerifyHash(hash, activeMasternodeInfo.keyIDMasternode, vchSig, strError)) {
             LogPrintf("CDarksendQueue::Sign -- VerifyHash() failed, error: %s\n", strError);
             return false;
         }
@@ -62,12 +62,12 @@ bool CDarksendQueue::Sign()
                         std::to_string(nTime) +
                         std::to_string(fReady);
 
-        if(!CMessageSigner::SignMessage(strMessage, vchSig, activeMasternode.keyMasternode)) {
+        if(!CMessageSigner::SignMessage(strMessage, vchSig, activeMasternodeInfo.keyMasternode)) {
             LogPrintf("CDarksendQueue::Sign -- SignMessage() failed, %s\n", ToString());
             return false;
         }
 
-        if(!CMessageSigner::VerifyMessage(activeMasternode.pubKeyMasternode, vchSig, strMessage, strError)) {
+        if(!CMessageSigner::VerifyMessage(activeMasternodeInfo.keyIDMasternode, vchSig, strMessage, strError)) {
             LogPrintf("CDarksendQueue::Sign -- VerifyMessage() failed, error: %s\n", strError);
             return false;
         }
@@ -76,14 +76,14 @@ bool CDarksendQueue::Sign()
     return true;
 }
 
-bool CDarksendQueue::CheckSignature(const CPubKey& pubKeyMasternode) const
+bool CDarksendQueue::CheckSignature(const CKeyID& keyIDMasternode) const
 {
     std::string strError = "";
 
     if (sporkManager.IsSporkActive(SPORK_6_NEW_SIGS)) {
         uint256 hash = GetSignatureHash();
 
-        if (!CHashSigner::VerifyHash(hash, pubKeyMasternode, vchSig, strError)) {
+        if (!CHashSigner::VerifyHash(hash, keyIDMasternode, vchSig, strError)) {
             // we don't care about queues with old signature format
             LogPrintf("CDarksendQueue::CheckSignature -- VerifyHash() failed, error: %s\n", strError);
             return false;
@@ -94,7 +94,7 @@ bool CDarksendQueue::CheckSignature(const CPubKey& pubKeyMasternode) const
                         std::to_string(nTime) +
                         std::to_string(fReady);
 
-        if(!CMessageSigner::VerifyMessage(pubKeyMasternode, vchSig, strMessage, strError)) {
+        if(!CMessageSigner::VerifyMessage(keyIDMasternode, vchSig, strMessage, strError)) {
             LogPrintf("CDarksendQueue::CheckSignature -- Got bad Masternode queue signature: %s; error: %s\n", ToString(), strError);
             return false;
         }
@@ -127,24 +127,24 @@ bool CDarksendBroadcastTx::Sign()
     if (sporkManager.IsSporkActive(SPORK_6_NEW_SIGS)) {
         uint256 hash = GetSignatureHash();
 
-        if (!CHashSigner::SignHash(hash, activeMasternode.keyMasternode, vchSig)) {
+        if (!CHashSigner::SignHash(hash, activeMasternodeInfo.keyMasternode, vchSig)) {
             LogPrintf("CDarksendBroadcastTx::Sign -- SignHash() failed\n");
             return false;
         }
 
-        if (!CHashSigner::VerifyHash(hash, activeMasternode.pubKeyMasternode, vchSig, strError)) {
+        if (!CHashSigner::VerifyHash(hash, activeMasternodeInfo.keyIDMasternode, vchSig, strError)) {
             LogPrintf("CDarksendBroadcastTx::Sign -- VerifyHash() failed, error: %s\n", strError);
             return false;
         }
     } else {
         std::string strMessage = tx->GetHash().ToString() + std::to_string(sigTime);
 
-        if(!CMessageSigner::SignMessage(strMessage, vchSig, activeMasternode.keyMasternode)) {
+        if(!CMessageSigner::SignMessage(strMessage, vchSig, activeMasternodeInfo.keyMasternode)) {
             LogPrintf("CDarksendBroadcastTx::Sign -- SignMessage() failed\n");
             return false;
         }
 
-        if(!CMessageSigner::VerifyMessage(activeMasternode.pubKeyMasternode, vchSig, strMessage, strError)) {
+        if(!CMessageSigner::VerifyMessage(activeMasternodeInfo.keyIDMasternode, vchSig, strMessage, strError)) {
             LogPrintf("CDarksendBroadcastTx::Sign -- VerifyMessage() failed, error: %s\n", strError);
             return false;
         }
@@ -153,14 +153,14 @@ bool CDarksendBroadcastTx::Sign()
     return true;
 }
 
-bool CDarksendBroadcastTx::CheckSignature(const CPubKey& pubKeyMasternode) const
+bool CDarksendBroadcastTx::CheckSignature(const CKeyID& keyIDMasternode) const
 {
     std::string strError = "";
 
     if (sporkManager.IsSporkActive(SPORK_6_NEW_SIGS)) {
         uint256 hash = GetSignatureHash();
 
-        if (!CHashSigner::VerifyHash(hash, pubKeyMasternode, vchSig, strError)) {
+        if (!CHashSigner::VerifyHash(hash, keyIDMasternode, vchSig, strError)) {
             // we don't care about dstxes with old signature format
             LogPrintf("CDarksendBroadcastTx::CheckSignature -- VerifyHash() failed, error: %s\n", strError);
             return false;
@@ -168,7 +168,7 @@ bool CDarksendBroadcastTx::CheckSignature(const CPubKey& pubKeyMasternode) const
     } else {
         std::string strMessage = tx->GetHash().ToString() + std::to_string(sigTime);
 
-        if(!CMessageSigner::VerifyMessage(pubKeyMasternode, vchSig, strMessage, strError)) {
+        if(!CMessageSigner::VerifyMessage(keyIDMasternode, vchSig, strMessage, strError)) {
             LogPrintf("CDarksendBroadcastTx::CheckSignature -- Got bad dstx signature, error: %s\n", strError);
             return false;
         }
diff --git a/src/privatesend.h b/src/privatesend.h
index e04f046b5048..b2e2474f46de 100644
--- a/src/privatesend.h
+++ b/src/privatesend.h
@@ -249,7 +249,7 @@ class CDarksendQueue
      */
     bool Sign();
     /// Check if we have a valid Masternode address
-    bool CheckSignature(const CPubKey& pubKeyMasternode) const;
+    bool CheckSignature(const CKeyID& keyIDMasternode) const;
 
     bool Relay(CConnman &connman);
 
@@ -341,7 +341,7 @@ class CDarksendBroadcastTx
     uint256 GetSignatureHash() const;
 
     bool Sign();
-    bool CheckSignature(const CPubKey& pubKeyMasternode) const;
+    bool CheckSignature(const CKeyID& keyIDMasternode) const;
 
     void SetConfirmedHeight(int nConfirmedHeightIn) { nConfirmedHeight = nConfirmedHeightIn; }
     bool IsExpired(int nHeight);
diff --git a/src/qt/masternodelist.cpp b/src/qt/masternodelist.cpp
index 6805c320b0f8..266a143351a4 100644
--- a/src/qt/masternodelist.cpp
+++ b/src/qt/masternodelist.cpp
@@ -215,7 +215,7 @@ void MasternodeList::updateMyMasternodeInfo(QString strAlias, QString strAddr, c
     QTableWidgetItem *activeSecondsItem = new QTableWidgetItem(QString::fromStdString(DurationToDHMS(fFound ? (infoMn.nTimeLastPing - infoMn.sigTime) : 0)));
     QTableWidgetItem *lastSeenItem = new QTableWidgetItem(QString::fromStdString(DateTimeStrFormat("%Y-%m-%d %H:%M",
                                                                                                    fFound ? infoMn.nTimeLastPing + GetOffsetFromUtc() : 0)));
-    QTableWidgetItem *pubkeyItem = new QTableWidgetItem(QString::fromStdString(fFound ? CBitcoinAddress(infoMn.pubKeyCollateralAddress.GetID()).ToString() : ""));
+    QTableWidgetItem *pubkeyItem = new QTableWidgetItem(QString::fromStdString(fFound ? CBitcoinAddress(infoMn.keyIDCollateralAddress).ToString() : ""));
 
     ui->tableWidgetMyMasternodes->setItem(nNewRow, 0, aliasItem);
     ui->tableWidgetMyMasternodes->setItem(nNewRow, 1, addrItem);
@@ -302,7 +302,7 @@ void MasternodeList::updateNodeList()
         QTableWidgetItem *statusItem = new QTableWidgetItem(QString::fromStdString(mn.GetStatus()));
         QTableWidgetItem *activeSecondsItem = new QTableWidgetItem(QString::fromStdString(DurationToDHMS(mn.lastPing.sigTime - mn.sigTime)));
         QTableWidgetItem *lastSeenItem = new QTableWidgetItem(QString::fromStdString(DateTimeStrFormat("%Y-%m-%d %H:%M", mn.lastPing.sigTime + offsetFromUtc)));
-        QTableWidgetItem *pubkeyItem = new QTableWidgetItem(QString::fromStdString(CBitcoinAddress(mn.pubKeyCollateralAddress.GetID()).ToString()));
+        QTableWidgetItem *pubkeyItem = new QTableWidgetItem(QString::fromStdString(CBitcoinAddress(mn.keyIDCollateralAddress).ToString()));
 
         if (strCurrentFilter != "")
         {
diff --git a/src/rpc/governance.cpp b/src/rpc/governance.cpp
index c4cd91e33218..d9248859d5c0 100644
--- a/src/rpc/governance.cpp
+++ b/src/rpc/governance.cpp
@@ -223,10 +223,10 @@ UniValue gobject(const JSONRPCRequest& request)
             throw JSONRPCError(RPC_CLIENT_IN_INITIAL_DOWNLOAD, "Must wait for client to sync with masternode network. Try again in a minute or so.");
         }
 
-        bool fMnFound = mnodeman.Has(activeMasternode.outpoint);
+        bool fMnFound = mnodeman.Has(activeMasternodeInfo.outpoint);
 
-        DBG( std::cout << "gobject: submit activeMasternode.pubKeyMasternode = " << activeMasternode.pubKeyMasternode.GetHash().ToString()
-             << ", outpoint = " << activeMasternode.outpoint.ToStringShort()
+        DBG( std::cout << "gobject: submit activeMasternodeInfo.keyIDMasternode = " << activeMasternodeInfo.keyIDMasternode.ToString()
+             << ", outpoint = " << activeMasternodeInfo.outpoint.ToStringShort()
              << ", params.size() = " << request.params.size()
              << ", fMnFound = " << fMnFound << std::endl; );
 
@@ -274,8 +274,8 @@ UniValue gobject(const JSONRPCRequest& request)
         // Attempt to sign triggers if we are a MN
         if(govobj.GetObjectType() == GOVERNANCE_OBJECT_TRIGGER) {
             if(fMnFound) {
-                govobj.SetMasternodeOutpoint(activeMasternode.outpoint);
-                govobj.Sign(activeMasternode.keyMasternode, activeMasternode.pubKeyMasternode);
+                govobj.SetMasternodeOutpoint(activeMasternodeInfo.outpoint);
+                govobj.Sign(activeMasternodeInfo.keyMasternode, activeMasternodeInfo.keyIDMasternode);
             }
             else {
                 LogPrintf("gobject(submit) -- Object submission rejected because node is not a masternode\n");
@@ -357,7 +357,7 @@ UniValue gobject(const JSONRPCRequest& request)
         UniValue returnObj(UniValue::VOBJ);
 
         CMasternode mn;
-        bool fMnFound = mnodeman.Get(activeMasternode.outpoint, mn);
+        bool fMnFound = mnodeman.Get(activeMasternodeInfo.outpoint, mn);
 
         if(!fMnFound) {
             nFailed++;
@@ -370,7 +370,7 @@ UniValue gobject(const JSONRPCRequest& request)
         }
 
         CGovernanceVote vote(mn.outpoint, hash, eVoteSignal, eVoteOutcome);
-        if(!vote.Sign(activeMasternode.keyMasternode, activeMasternode.pubKeyMasternode)) {
+        if(!vote.Sign(activeMasternodeInfo.keyMasternode, activeMasternodeInfo.keyIDMasternode)) {
             nFailed++;
             statusObj.push_back(Pair("result", "failed"));
             statusObj.push_back(Pair("errorMessage", "Failure to sign."));
@@ -443,8 +443,6 @@ UniValue gobject(const JSONRPCRequest& request)
             std::vector<unsigned char> vchMasterNodeSignature;
             std::string strMasterNodeSignMessage;
 
-            CPubKey pubKeyCollateralAddress;
-            CKey keyCollateralAddress;
             CPubKey pubKeyMasternode;
             CKey keyMasternode;
 
@@ -480,7 +478,7 @@ UniValue gobject(const JSONRPCRequest& request)
             }
 
             CGovernanceVote vote(mn.outpoint, hash, eVoteSignal, eVoteOutcome);
-            if(!vote.Sign(keyMasternode, pubKeyMasternode)){
+            if(!vote.Sign(keyMasternode, pubKeyMasternode.GetID())){
                 nFailed++;
                 statusObj.push_back(Pair("result", "failed"));
                 statusObj.push_back(Pair("errorMessage", "Failure to sign."));
diff --git a/src/rpc/masternode.cpp b/src/rpc/masternode.cpp
index 6508df0d95ee..97cf1d1c71fd 100644
--- a/src/rpc/masternode.cpp
+++ b/src/rpc/masternode.cpp
@@ -253,7 +253,7 @@ UniValue masternode(const JSONRPCRequest& request)
         obj.push_back(Pair("IP:port",       mnInfo.addr.ToString()));
         obj.push_back(Pair("protocol",      mnInfo.nProtocolVersion));
         obj.push_back(Pair("outpoint",      mnInfo.outpoint.ToStringShort()));
-        obj.push_back(Pair("payee",         CBitcoinAddress(mnInfo.pubKeyCollateralAddress.GetID()).ToString()));
+        obj.push_back(Pair("payee",         CBitcoinAddress(mnInfo.keyIDCollateralAddress).ToString()));
         obj.push_back(Pair("lastseen",      mnInfo.nTimeLastPing));
         obj.push_back(Pair("activeseconds", mnInfo.nTimeLastPing - mnInfo.sigTime));
         return obj;
@@ -430,15 +430,15 @@ UniValue masternode(const JSONRPCRequest& request)
 
         UniValue mnObj(UniValue::VOBJ);
 
-        mnObj.push_back(Pair("outpoint", activeMasternode.outpoint.ToStringShort()));
-        mnObj.push_back(Pair("service", activeMasternode.service.ToString()));
+        mnObj.push_back(Pair("outpoint", activeMasternodeInfo.outpoint.ToStringShort()));
+        mnObj.push_back(Pair("service", activeMasternodeInfo.service.ToString()));
 
         CMasternode mn;
-        if(mnodeman.Get(activeMasternode.outpoint, mn)) {
-            mnObj.push_back(Pair("payee", CBitcoinAddress(mn.pubKeyCollateralAddress.GetID()).ToString()));
+        if(mnodeman.Get(activeMasternodeInfo.outpoint, mn)) {
+            mnObj.push_back(Pair("payee", CBitcoinAddress(mn.keyIDCollateralAddress).ToString()));
         }
 
-        mnObj.push_back(Pair("status", activeMasternode.GetStatus()));
+        mnObj.push_back(Pair("status", legacyActiveMasternodeManager.GetStatus()));
         return mnObj;
     }
 
@@ -538,7 +538,7 @@ UniValue masternodelist(const JSONRPCRequest& request)
                 "  payee          - Print Dash address associated with a masternode (can be additionally filtered,\n"
                 "                   partial match)\n"
                 "  protocol       - Print protocol of a masternode (can be additionally filtered, exact match)\n"
-                "  pubkey         - Print the masternode (not collateral) public key\n"
+                "  keyid          - Print the masternode (not collateral) key id\n"
                 "  rank           - Print rank of a masternode based on current block\n"
                 "  sentinel       - Print sentinel version of a masternode (can be additionally filtered, exact match)\n"
                 "  status         - Print masternode status: PRE_ENABLED / ENABLED / EXPIRED / SENTINEL_PING_EXPIRED / NEW_START_REQUIRED /\n"
@@ -592,7 +592,7 @@ UniValue masternodelist(const JSONRPCRequest& request)
                 streamFull << std::setw(18) <<
                                mn.GetStatus() << " " <<
                                mn.nProtocolVersion << " " <<
-                               CBitcoinAddress(mn.pubKeyCollateralAddress.GetID()).ToString() << " " <<
+                               CBitcoinAddress(mn.keyIDCollateralAddress).ToString() << " " <<
                                (int64_t)mn.lastPing.sigTime << " " << std::setw(8) <<
                                (int64_t)(mn.lastPing.sigTime - mn.sigTime) << " " << std::setw(10) <<
                                mn.GetLastPaidTime() << " "  << std::setw(6) <<
@@ -607,7 +607,7 @@ UniValue masternodelist(const JSONRPCRequest& request)
                 streamInfo << std::setw(18) <<
                                mn.GetStatus() << " " <<
                                mn.nProtocolVersion << " " <<
-                               CBitcoinAddress(mn.pubKeyCollateralAddress.GetID()).ToString() << " " <<
+                               CBitcoinAddress(mn.keyIDCollateralAddress).ToString() << " " <<
                                (int64_t)mn.lastPing.sigTime << " " << std::setw(8) <<
                                (int64_t)(mn.lastPing.sigTime - mn.sigTime) << " " <<
                                mn.lastPing.GetSentinelString() << " "  <<
@@ -656,7 +656,7 @@ UniValue masternodelist(const JSONRPCRequest& request)
                 if (strFilter !="" && strOutpoint.find(strFilter) == std::string::npos) continue;
                 obj.push_back(Pair(strOutpoint, (int64_t)mn.lastPing.sigTime));
             } else if (strMode == "payee") {
-                CBitcoinAddress address(mn.pubKeyCollateralAddress.GetID());
+                CBitcoinAddress address(mn.keyIDCollateralAddress);
                 std::string strPayee = address.ToString();
                 if (strFilter !="" && strPayee.find(strFilter) == std::string::npos &&
                     strOutpoint.find(strFilter) == std::string::npos) continue;
@@ -665,9 +665,9 @@ UniValue masternodelist(const JSONRPCRequest& request)
                 if (strFilter !="" && strFilter != strprintf("%d", mn.nProtocolVersion) &&
                     strOutpoint.find(strFilter) == std::string::npos) continue;
                 obj.push_back(Pair(strOutpoint, mn.nProtocolVersion));
-            } else if (strMode == "pubkey") {
+            } else if (strMode == "keyid") {
                 if (strFilter !="" && strOutpoint.find(strFilter) == std::string::npos) continue;
-                obj.push_back(Pair(strOutpoint, HexStr(mn.pubKeyMasternode)));
+                obj.push_back(Pair(strOutpoint, HexStr(mn.keyIDMasternode)));
             } else if (strMode == "status") {
                 std::string strStatus = mn.GetStatus();
                 if (strFilter !="" && strStatus.find(strFilter) == std::string::npos &&
@@ -852,8 +852,8 @@ UniValue masternodebroadcast(const JSONRPCRequest& request)
                 nSuccessful++;
                 resultObj.push_back(Pair("outpoint", mnb.outpoint.ToStringShort()));
                 resultObj.push_back(Pair("addr", mnb.addr.ToString()));
-                resultObj.push_back(Pair("pubKeyCollateralAddress", CBitcoinAddress(mnb.pubKeyCollateralAddress.GetID()).ToString()));
-                resultObj.push_back(Pair("pubKeyMasternode", CBitcoinAddress(mnb.pubKeyMasternode.GetID()).ToString()));
+                resultObj.push_back(Pair("keyIDCollateralAddress", CBitcoinAddress(mnb.keyIDCollateralAddress).ToString()));
+                resultObj.push_back(Pair("keyIDMasternode", CBitcoinAddress(mnb.keyIDMasternode).ToString()));
                 resultObj.push_back(Pair("vchSig", EncodeBase64(&mnb.vchSig[0], mnb.vchSig.size())));
                 resultObj.push_back(Pair("sigTime", mnb.sigTime));
                 resultObj.push_back(Pair("protocolVersion", mnb.nProtocolVersion));
@@ -944,7 +944,7 @@ UniValue sentinelping(const JSONRPCRequest& request)
         );
     }
 
-    activeMasternode.UpdateSentinelPing(StringVersionToInt(request.params[0].get_str()));
+    legacyActiveMasternodeManager.UpdateSentinelPing(StringVersionToInt(request.params[0].get_str()));
     return true;
 }
 

From 4d3518fe0486cd1a764b5b734115318bad7053ec Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Sun, 12 Aug 2018 17:27:09 +0200
Subject: [PATCH 045/400] Refactor MN payee logic in preparation for DIP3
 (#2215)

* Refactor block payee filling/validation

1. Move out old budget validation into it's own function (IsOldBudgetBlockValueValid)
2. Refactor IsBlockValueValid to bail out early instead of using deep
   nested if/else blocks. IMHO, I feel that this makes the code much easier
   to read and less error prone.
3. Refactor/rename CreateSuperblock and CMasternodePayments::FillBlockPayee
   to be getters without actually modifying the coinbase TX. The coinbase
   is now only modified from the global FillBlockPayments function. Makes
   later changes in DIP3 easier (allowing superblock and MN rewards in same block)

* Use __func__ for logging in block payee code

* Fix code style nit
---
 src/governance-classes.cpp  |  41 ++---
 src/governance-classes.h    |   2 +-
 src/masternode-payments.cpp | 289 ++++++++++++++++++++----------------
 src/masternode-payments.h   |   4 +-
 4 files changed, 184 insertions(+), 152 deletions(-)

diff --git a/src/governance-classes.cpp b/src/governance-classes.cpp
index 6722efe26622..e21232fa6252 100644
--- a/src/governance-classes.cpp
+++ b/src/governance-classes.cpp
@@ -366,14 +366,14 @@ bool CSuperblockManager::GetBestSuperblock(CSuperblock_sptr& pSuperblockRet, int
 }
 
 /**
-*   Create Superblock Payments
+*   Get Superblock Payments
 *
-*   - Create the correct payment structure for a given superblock
+*   - Returns payments for superblock
 */
 
-void CSuperblockManager::CreateSuperblock(CMutableTransaction& txNewRet, int nBlockHeight, std::vector<CTxOut>& voutSuperblockRet)
+bool CSuperblockManager::GetSuperblockPayments(int nBlockHeight, std::vector<CTxOut>& voutSuperblockRet)
 {
-    DBG( std::cout << "CSuperblockManager::CreateSuperblock Start" << std::endl; );
+    DBG( std::cout << "CSuperblockManager::GetSuperblockPayments Start" << std::endl; );
 
     LOCK(governance.cs);
 
@@ -381,18 +381,18 @@ void CSuperblockManager::CreateSuperblock(CMutableTransaction& txNewRet, int nBl
 
     CSuperblock_sptr pSuperblock;
     if(!CSuperblockManager::GetBestSuperblock(pSuperblock, nBlockHeight)) {
-        LogPrint("gobject", "CSuperblockManager::CreateSuperblock -- Can't find superblock for height %d\n", nBlockHeight);
-        DBG( std::cout << "CSuperblockManager::CreateSuperblock Failed to get superblock for height, returning" << std::endl; );
-        return;
+        LogPrint("gobject", "CSuperblockManager::GetSuperblockPayments -- Can't find superblock for height %d\n", nBlockHeight);
+        DBG( std::cout << "CSuperblockManager::GetSuperblockPayments Failed to get superblock for height, returning" << std::endl; );
+        return false;
     }
 
     // make sure it's empty, just in case
     voutSuperblockRet.clear();
 
-    // CONFIGURE SUPERBLOCK OUTPUTS
+    // GET SUPERBLOCK OUTPUTS
 
-    // Superblock payments are appended to the end of the coinbase vout vector
-    DBG( std::cout << "CSuperblockManager::CreateSuperblock Number payments: " << pSuperblock->CountPayments() << std::endl; );
+    // Superblock payments will be appended to the end of the coinbase vout vector
+    DBG( std::cout << "CSuperblockManager::GetSuperblockPayments Number payments: " << pSuperblock->CountPayments() << std::endl; );
 
     // TODO: How many payments can we add before things blow up?
     //       Consider at least following limits:
@@ -400,13 +400,12 @@ void CSuperblockManager::CreateSuperblock(CMutableTransaction& txNewRet, int nBl
     //          - max "budget" available
     for(int i = 0; i < pSuperblock->CountPayments(); i++) {
         CGovernancePayment payment;
-        DBG( std::cout << "CSuperblockManager::CreateSuperblock i = " << i << std::endl; );
+        DBG( std::cout << "CSuperblockManager::GetSuperblockPayments i = " << i << std::endl; );
         if(pSuperblock->GetPayment(i, payment)) {
-            DBG( std::cout << "CSuperblockManager::CreateSuperblock Payment found " << std::endl; );
+            DBG( std::cout << "CSuperblockManager::GetSuperblockPayments Payment found " << std::endl; );
             // SET COINBASE OUTPUT TO SUPERBLOCK SETTING
 
             CTxOut txout = CTxOut(payment.nAmount, payment.script);
-            txNewRet.vout.push_back(txout);
             voutSuperblockRet.push_back(txout);
 
             // PRINT NICE LOG OUTPUT FOR SUPERBLOCK PAYMENT
@@ -417,15 +416,17 @@ void CSuperblockManager::CreateSuperblock(CMutableTransaction& txNewRet, int nBl
 
             // TODO: PRINT NICE N.N DASH OUTPUT
 
-            DBG( std::cout << "CSuperblockManager::CreateSuperblock Before LogPrintf call, nAmount = " << payment.nAmount << std::endl; );
+            DBG( std::cout << "CSuperblockManager::GetSuperblockPayments Before LogPrintf call, nAmount = " << payment.nAmount << std::endl; );
             LogPrintf("NEW Superblock : output %d (addr %s, amount %d)\n", i, address2.ToString(), payment.nAmount);
-            DBG( std::cout << "CSuperblockManager::CreateSuperblock After LogPrintf call " << std::endl; );
+            DBG( std::cout << "CSuperblockManager::GetSuperblockPayments After LogPrintf call " << std::endl; );
         } else {
-            DBG( std::cout << "CSuperblockManager::CreateSuperblock Payment not found " << std::endl; );
+            DBG( std::cout << "CSuperblockManager::GetSuperblockPayments Payment not found " << std::endl; );
         }
     }
 
-    DBG( std::cout << "CSuperblockManager::CreateSuperblock End" << std::endl; );
+    DBG( std::cout << "CSuperblockManager::GetSuperblockPayments End" << std::endl; );
+
+    return true;
 }
 
 bool CSuperblockManager::IsValid(const CTransaction& txNew, int nBlockHeight, CAmount blockReward)
@@ -679,7 +680,7 @@ bool CSuperblock::IsValid(const CTransaction& txNew, int nBlockHeight, CAmount b
 
     int nOutputs = txNew.vout.size();
     int nPayments = CountPayments();
-    int nMinerPayments = nOutputs - nPayments;
+    int nMinerAndMasternodePayments = nOutputs - nPayments;
 
     LogPrint("gobject", "CSuperblock::IsValid nOutputs = %d, nPayments = %d, GetDataAsHexString = %s\n",
              nOutputs, nPayments, GetGovernanceObject()->GetDataAsHexString());
@@ -687,7 +688,7 @@ bool CSuperblock::IsValid(const CTransaction& txNew, int nBlockHeight, CAmount b
     // We require an exact match (including order) between the expected
     // superblock payments and the payments actually in the block.
 
-    if(nMinerPayments < 0) {
+    if(nMinerAndMasternodePayments < 0) {
         // This means the block cannot have all the superblock payments
         // so it is not valid.
         // TODO: could that be that we just hit coinbase size limit?
@@ -703,7 +704,7 @@ bool CSuperblock::IsValid(const CTransaction& txNew, int nBlockHeight, CAmount b
         return false;
     }
 
-    // miner should not get more than he would usually get
+    // miner and masternodes should not get more than they would usually get
     CAmount nBlockValue = txNew.GetValueOut();
     if(nBlockValue > blockReward + nPaymentsTotalAmount) {
         LogPrintf("CSuperblock::IsValid -- ERROR: Block invalid, block value limit exceeded: block %lld, limit %lld\n", nBlockValue, blockReward + nPaymentsTotalAmount);
diff --git a/src/governance-classes.h b/src/governance-classes.h
index bb6aa0d45255..ccd14f793c4d 100644
--- a/src/governance-classes.h
+++ b/src/governance-classes.h
@@ -67,7 +67,7 @@ class CSuperblockManager
 
     static bool IsSuperblockTriggered(int nBlockHeight);
 
-    static void CreateSuperblock(CMutableTransaction& txNewRet, int nBlockHeight, std::vector<CTxOut>& voutSuperblockRet);
+    static bool GetSuperblockPayments(int nBlockHeight, std::vector<CTxOut>& voutSuperblockRet);
     static void ExecuteBestSuperblock(int nBlockHeight);
 
     static std::string GetRequiredPaymentsString(int nBlockHeight);
diff --git a/src/masternode-payments.cpp b/src/masternode-payments.cpp
index e737de6effc7..dd28b5e41011 100644
--- a/src/masternode-payments.cpp
+++ b/src/masternode-payments.cpp
@@ -23,6 +23,45 @@ CCriticalSection cs_vecPayees;
 CCriticalSection cs_mapMasternodeBlocks;
 CCriticalSection cs_mapMasternodePaymentVotes;
 
+bool IsOldBudgetBlockValueValid(const CBlock& block, int nBlockHeight, CAmount blockReward, std::string& strErrorRet) {
+    const Consensus::Params& consensusParams = Params().GetConsensus();
+
+    if (nBlockHeight >= consensusParams.nSuperblockStartBlock) {
+        // switched to new budget system (superblocks)
+        return true;
+    }
+
+    bool isBlockRewardValueMet = (block.vtx[0]->GetValueOut() <= blockReward);
+
+    // we are still using budgets, but we have no data about them anymore,
+    // all we know is predefined budget cycle and window
+
+    int nOffset = nBlockHeight % consensusParams.nBudgetPaymentsCycleBlocks;
+    if(nBlockHeight >= consensusParams.nBudgetPaymentsStartBlock &&
+       nOffset < consensusParams.nBudgetPaymentsWindowBlocks) {
+        // NOTE: old budget system is disabled since 12.1
+        if(masternodeSync.IsSynced()) {
+            // no old budget blocks should be accepted here on mainnet,
+            // testnet/devnet/regtest should produce regular blocks only
+            LogPrint("gobject", "%s -- WARNING: Client synced but old budget system is disabled, checking block value against block reward\n", __func__);
+            if(!isBlockRewardValueMet) {
+                strErrorRet = strprintf("coinbase pays too much at height %d (actual=%d vs limit=%d), exceeded block reward, old budgets are disabled",
+                                        nBlockHeight, block.vtx[0]->GetValueOut(), blockReward);
+            }
+            return isBlockRewardValueMet;
+        }
+        // when not synced, rely on online nodes (all networks)
+        LogPrint("gobject", "%s -- WARNING: Skipping old budget block value checks, accepting block\n", __func__);
+        return true;
+    }
+    // LogPrint("gobject", "%s -- Block is not in budget cycle window, checking block value against block reward\n", __func__);
+    if(!isBlockRewardValueMet) {
+        strErrorRet = strprintf("coinbase pays too much at height %d (actual=%d vs limit=%d), exceeded block reward, block is not in old budget cycle window",
+                                nBlockHeight, block.vtx[0]->GetValueOut(), blockReward);
+    }
+    return isBlockRewardValueMet;
+}
+
 /**
 * IsBlockValueValid
 *
@@ -38,105 +77,82 @@ bool IsBlockValueValid(const CBlock& block, int nBlockHeight, CAmount blockRewar
 {
     strErrorRet = "";
 
+    if (!IsOldBudgetBlockValueValid(block, nBlockHeight, blockReward, strErrorRet)) {
+        return false;
+    }
+
     bool isBlockRewardValueMet = (block.vtx[0]->GetValueOut() <= blockReward);
     if(fDebug) LogPrintf("block.vtx[0]->GetValueOut() %lld <= blockReward %lld\n", block.vtx[0]->GetValueOut(), blockReward);
 
-    // we are still using budgets, but we have no data about them anymore,
-    // all we know is predefined budget cycle and window
+    CAmount nSuperblockMaxValue =  blockReward + CSuperblock::GetPaymentsLimit(nBlockHeight);
+    bool isSuperblockMaxValueMet = (block.vtx[0]->GetValueOut() <= nSuperblockMaxValue);
 
-    const Consensus::Params& consensusParams = Params().GetConsensus();
+    LogPrint("gobject", "block.vtx[0]->GetValueOut() %lld <= nSuperblockMaxValue %lld\n", block.vtx[0]->GetValueOut(), nSuperblockMaxValue);
 
-    if(nBlockHeight < consensusParams.nSuperblockStartBlock) {
-        int nOffset = nBlockHeight % consensusParams.nBudgetPaymentsCycleBlocks;
-        if(nBlockHeight >= consensusParams.nBudgetPaymentsStartBlock &&
-            nOffset < consensusParams.nBudgetPaymentsWindowBlocks) {
-            // NOTE: old budget system is disabled since 12.1
-            if(masternodeSync.IsSynced()) {
-                // no old budget blocks should be accepted here on mainnet,
-                // testnet/devnet/regtest should produce regular blocks only
-                LogPrint("gobject", "IsBlockValueValid -- WARNING: Client synced but old budget system is disabled, checking block value against block reward\n");
-                if(!isBlockRewardValueMet) {
-                    strErrorRet = strprintf("coinbase pays too much at height %d (actual=%d vs limit=%d), exceeded block reward, old budgets are disabled",
-                                            nBlockHeight, block.vtx[0]->GetValueOut(), blockReward);
-                }
-                return isBlockRewardValueMet;
-            }
-            // when not synced, rely on online nodes (all networks)
-            LogPrint("gobject", "IsBlockValueValid -- WARNING: Skipping old budget block value checks, accepting block\n");
-            return true;
-        }
-        // LogPrint("gobject", "IsBlockValueValid -- Block is not in budget cycle window, checking block value against block reward\n");
-        if(!isBlockRewardValueMet) {
-            strErrorRet = strprintf("coinbase pays too much at height %d (actual=%d vs limit=%d), exceeded block reward, block is not in old budget cycle window",
+    if (!CSuperblock::IsValidBlockHeight(nBlockHeight)) {
+        // can't possibly be a superblock, so lets just check for block reward limits
+        if (!isBlockRewardValueMet) {
+            strErrorRet = strprintf("coinbase pays too much at height %d (actual=%d vs limit=%d), exceeded block reward, only regular blocks are allowed at this height",
                                     nBlockHeight, block.vtx[0]->GetValueOut(), blockReward);
         }
         return isBlockRewardValueMet;
     }
 
-    // superblocks started
+    // bail out in case superblock limits were exceeded
+    if (!isSuperblockMaxValueMet) {
+        strErrorRet = strprintf("coinbase pays too much at height %d (actual=%d vs limit=%d), exceeded superblock max value",
+                                nBlockHeight, block.vtx[0]->GetValueOut(), nSuperblockMaxValue);
+        return false;
+    }
 
-    CAmount nSuperblockMaxValue =  blockReward + CSuperblock::GetPaymentsLimit(nBlockHeight);
-    bool isSuperblockMaxValueMet = (block.vtx[0]->GetValueOut() <= nSuperblockMaxValue);
+    if(!masternodeSync.IsSynced() || fLiteMode) {
+        if(fDebug) LogPrintf("%s -- WARNING: Not enough data, checked superblock max bounds only\n", __func__);
+        // not enough data for full checks but at least we know that the superblock limits were honored.
+        // We rely on the network to have followed the correct chain in this case
+        return true;
+    }
 
-    LogPrint("gobject", "block.vtx[0]->GetValueOut() %lld <= nSuperblockMaxValue %lld\n", block.vtx[0]->GetValueOut(), nSuperblockMaxValue);
+    // we are synced and possibly on a superblock now
 
-    if(!masternodeSync.IsSynced() || fLiteMode) {
-        // not enough data but at least it must NOT exceed superblock max value
-        if(CSuperblock::IsValidBlockHeight(nBlockHeight)) {
-            if(fDebug) LogPrintf("IsBlockPayeeValid -- WARNING: Not enough data, checking superblock max bounds only\n");
-            if(!isSuperblockMaxValueMet) {
-                strErrorRet = strprintf("coinbase pays too much at height %d (actual=%d vs limit=%d), exceeded superblock max value",
-                                        nBlockHeight, block.vtx[0]->GetValueOut(), nSuperblockMaxValue);
-            }
-            return isSuperblockMaxValueMet;
-        }
+    if (!sporkManager.IsSporkActive(SPORK_9_SUPERBLOCKS_ENABLED)) {
+        // should NOT allow superblocks at all, when superblocks are disabled
+        // revert to block reward limits in this case
+        LogPrint("gobject", "%s -- Superblocks are disabled, no superblocks allowed\n", __func__);
         if(!isBlockRewardValueMet) {
-            strErrorRet = strprintf("coinbase pays too much at height %d (actual=%d vs limit=%d), exceeded block reward, only regular blocks are allowed at this height",
+            strErrorRet = strprintf("coinbase pays too much at height %d (actual=%d vs limit=%d), exceeded block reward, superblocks are disabled",
                                     nBlockHeight, block.vtx[0]->GetValueOut(), blockReward);
         }
-        // it MUST be a regular block otherwise
         return isBlockRewardValueMet;
     }
 
-    // we are synced, let's try to check as much data as we can
-
-    if(sporkManager.IsSporkActive(SPORK_9_SUPERBLOCKS_ENABLED)) {
-        if(CSuperblockManager::IsSuperblockTriggered(nBlockHeight)) {
-            if(CSuperblockManager::IsValid(*block.vtx[0], nBlockHeight, blockReward)) {
-                LogPrint("gobject", "IsBlockValueValid -- Valid superblock at height %d: %s", nBlockHeight, block.vtx[0]->ToString());
-                // all checks are done in CSuperblock::IsValid, nothing to do here
-                return true;
-            }
-
-            // triggered but invalid? that's weird
-            LogPrintf("IsBlockValueValid -- ERROR: Invalid superblock detected at height %d: %s", nBlockHeight, block.vtx[0]->ToString());
-            // should NOT allow invalid superblocks, when superblocks are enabled
-            strErrorRet = strprintf("invalid superblock detected at height %d", nBlockHeight);
-            return false;
-        }
-        LogPrint("gobject", "IsBlockValueValid -- No triggered superblock detected at height %d\n", nBlockHeight);
+    if (!CSuperblockManager::IsSuperblockTriggered(nBlockHeight)) {
+        // we are on a valid superblock height but a superblock was not triggered
+        // revert to block reward limits in this case
         if(!isBlockRewardValueMet) {
             strErrorRet = strprintf("coinbase pays too much at height %d (actual=%d vs limit=%d), exceeded block reward, no triggered superblock detected",
                                     nBlockHeight, block.vtx[0]->GetValueOut(), blockReward);
         }
-    } else {
-        // should NOT allow superblocks at all, when superblocks are disabled
-        LogPrint("gobject", "IsBlockValueValid -- Superblocks are disabled, no superblocks allowed\n");
-        if(!isBlockRewardValueMet) {
-            strErrorRet = strprintf("coinbase pays too much at height %d (actual=%d vs limit=%d), exceeded block reward, superblocks are disabled",
-                                    nBlockHeight, block.vtx[0]->GetValueOut(), blockReward);
-        }
+        return isBlockRewardValueMet;
     }
 
-    // it MUST be a regular block
-    return isBlockRewardValueMet;
+    // this actually also checks for correct payees and not only amount
+    if (!CSuperblockManager::IsValid(*block.vtx[0], nBlockHeight, blockReward)) {
+        // triggered but invalid? that's weird
+        LogPrintf("%s -- ERROR: Invalid superblock detected at height %d: %s", __func__, nBlockHeight, block.vtx[0]->ToString());
+        // should NOT allow invalid superblocks, when superblocks are enabled
+        strErrorRet = strprintf("invalid superblock detected at height %d", nBlockHeight);
+        return false;
+    }
+
+    // we got a valid superblock
+    return true;
 }
 
 bool IsBlockPayeeValid(const CTransaction& txNew, int nBlockHeight, CAmount blockReward)
 {
     if(!masternodeSync.IsSynced() || fLiteMode) {
         //there is no budget data to use to check anything, let's just accept the longest chain
-        if(fDebug) LogPrintf("IsBlockPayeeValid -- WARNING: Not enough data, skipping block payee checks\n");
+        if(fDebug) LogPrintf("%s -- WARNING: Not enough data, skipping block payee checks\n", __func__);
         return true;
     }
 
@@ -149,7 +165,7 @@ bool IsBlockPayeeValid(const CTransaction& txNew, int nBlockHeight, CAmount bloc
         // NOTE: old budget system is disabled since 12.1 and we should never enter this branch
         // anymore when sync is finished (on mainnet). We have no old budget data but these blocks
         // have tons of confirmations and can be safely accepted without payee verification
-        LogPrint("gobject", "IsBlockPayeeValid -- WARNING: Client synced but old budget system is disabled, accepting any payee\n");
+        LogPrint("gobject", "%s -- WARNING: Client synced but old budget system is disabled, accepting any payee\n", __func__);
         return true;
     }
 
@@ -159,33 +175,33 @@ bool IsBlockPayeeValid(const CTransaction& txNew, int nBlockHeight, CAmount bloc
     if(sporkManager.IsSporkActive(SPORK_9_SUPERBLOCKS_ENABLED)) {
         if(CSuperblockManager::IsSuperblockTriggered(nBlockHeight)) {
             if(CSuperblockManager::IsValid(txNew, nBlockHeight, blockReward)) {
-                LogPrint("gobject", "IsBlockPayeeValid -- Valid superblock at height %d: %s", nBlockHeight, txNew.ToString());
+                LogPrint("gobject", "%s -- Valid superblock at height %d: %s", __func__, nBlockHeight, txNew.ToString());
                 return true;
+            } else {
+                LogPrintf("%s -- ERROR: Invalid superblock detected at height %d: %s", __func__, nBlockHeight, txNew.ToString());
+                // should NOT allow such superblocks, when superblocks are enabled
+                return false;
             }
-
-            LogPrintf("IsBlockPayeeValid -- ERROR: Invalid superblock detected at height %d: %s", nBlockHeight, txNew.ToString());
-            // should NOT allow such superblocks, when superblocks are enabled
-            return false;
+        } else {
+            LogPrint("gobject", "%s -- No triggered superblock detected at height %d\n", __func__, nBlockHeight);
         }
-        // continue validation, should pay MN
-        LogPrint("gobject", "IsBlockPayeeValid -- No triggered superblock detected at height %d\n", nBlockHeight);
     } else {
         // should NOT allow superblocks at all, when superblocks are disabled
-        LogPrint("gobject", "IsBlockPayeeValid -- Superblocks are disabled, no superblocks allowed\n");
+        LogPrint("gobject", "%s -- Superblocks are disabled, no superblocks allowed\n", __func__);
     }
 
-    // IF THIS ISN'T A SUPERBLOCK OR SUPERBLOCK IS INVALID, IT SHOULD PAY A MASTERNODE DIRECTLY
-    if(mnpayments.IsTransactionValid(txNew, nBlockHeight)) {
-        LogPrint("mnpayments", "IsBlockPayeeValid -- Valid masternode payment at height %d: %s", nBlockHeight, txNew.ToString());
+    // If this isn't a superblock or spork15 is activated, check for correct masternode payment
+    if(mnpayments.IsTransactionValid(txNew, nBlockHeight, blockReward)) {
+        LogPrint("mnpayments", "%s -- Valid masternode payment at height %d: %s", __func__, nBlockHeight, txNew.ToString());
         return true;
     }
 
     if(sporkManager.IsSporkActive(SPORK_8_MASTERNODE_PAYMENT_ENFORCEMENT)) {
-        LogPrintf("IsBlockPayeeValid -- ERROR: Invalid masternode payment detected at height %d: %s", nBlockHeight, txNew.ToString());
+        LogPrintf("%s -- ERROR: Invalid masternode payment detected at height %d: %s", __func__, nBlockHeight, txNew.ToString());
         return false;
     }
 
-    LogPrintf("IsBlockPayeeValid -- WARNING: Masternode payment enforcement is disabled, accepting any payee\n");
+    LogPrintf("%s -- WARNING: Masternode payment enforcement is disabled, accepting any payee\n", __func__);
     return true;
 }
 
@@ -195,14 +211,33 @@ void FillBlockPayments(CMutableTransaction& txNew, int nBlockHeight, CAmount blo
     // (height should be validated inside)
     if(sporkManager.IsSporkActive(SPORK_9_SUPERBLOCKS_ENABLED) &&
         CSuperblockManager::IsSuperblockTriggered(nBlockHeight)) {
-            LogPrint("gobject", "FillBlockPayments -- triggered superblock creation at height %d\n", nBlockHeight);
-            CSuperblockManager::CreateSuperblock(txNew, nBlockHeight, voutSuperblockRet);
-            return;
+            LogPrint("gobject", "%s -- triggered superblock creation at height %d\n", __func__, nBlockHeight);
+            CSuperblockManager::GetSuperblockPayments(nBlockHeight, voutSuperblockRet);
+    }
+
+    // TODO this is a placeholder until DIP3 is merged, which will allow superblock payments and MN reward payments
+    // in the same block. We set this to false for now, which means that we'll always get into the next if statement
+    // when a superblock payment is present
+    bool allowSuperblockAndMNReward = false;
+
+    // don't allow payments to superblocks AND masternodes before spork15 activation
+    if (!voutSuperblockRet.empty() && !allowSuperblockAndMNReward) {
+        txNew.vout.insert(txNew.vout.end(), voutSuperblockRet.begin(), voutSuperblockRet.end());
+        return;
     }
 
-    // FILL BLOCK PAYEE WITH MASTERNODE PAYMENT OTHERWISE
-    mnpayments.FillBlockPayee(txNew, nBlockHeight, blockReward, txoutMasternodeRet);
-    LogPrint("mnpayments", "FillBlockPayments -- nBlockHeight %d blockReward %lld txoutMasternodeRet %s txNew %s",
+    if (!mnpayments.GetMasternodeTxOut(nBlockHeight, blockReward, txoutMasternodeRet)) {
+        // no idea whom to pay (MN list empty?), lets hope for the best
+        return;
+    }
+
+    txNew.vout.emplace_back(txoutMasternodeRet);
+    txNew.vout.insert(txNew.vout.end(), voutSuperblockRet.begin(), voutSuperblockRet.end());
+
+    // subtract MN payment from miner reward
+    txNew.vout[0].nValue -= txoutMasternodeRet.nValue;
+
+    LogPrint("mnpayments", "%s -- nBlockHeight %d blockReward %lld txoutMasternodeRet %s txNew %s", __func__,
                             nBlockHeight, blockReward, txoutMasternodeRet.ToString(), txNew.ToString());
 }
 
@@ -244,10 +279,10 @@ bool CMasternodePayments::UpdateLastVote(const CMasternodePaymentVote& vote)
 /**
 *   FillBlockPayee
 *
-*   Fill Masternode ONLY payment block
+*   Get masternode payment tx output
 */
 
-void CMasternodePayments::FillBlockPayee(CMutableTransaction& txNew, int nBlockHeight, CAmount blockReward, CTxOut& txoutMasternodeRet) const
+bool CMasternodePayments::GetMasternodeTxOut(int nBlockHeight, CAmount blockReward, CTxOut& txoutMasternodeRet) const
 {
     // make sure it's not filled yet
     txoutMasternodeRet = CTxOut();
@@ -260,8 +295,8 @@ void CMasternodePayments::FillBlockPayee(CMutableTransaction& txNew, int nBlockH
         masternode_info_t mnInfo;
         if(!mnodeman.GetNextMasternodeInQueueForPayment(nBlockHeight, true, nCount, mnInfo)) {
             // ...and we can't calculate it on our own
-            LogPrintf("CMasternodePayments::FillBlockPayee -- Failed to detect masternode to pay\n");
-            return;
+            LogPrintf("CMasternodePayments::%s -- Failed to detect masternode to pay\n", __func__);
+            return false;
         }
         // fill payee with locally calculated winner and hope for the best
         payee = GetScriptForDestination(mnInfo.keyIDCollateralAddress);
@@ -269,18 +304,15 @@ void CMasternodePayments::FillBlockPayee(CMutableTransaction& txNew, int nBlockH
 
     // GET MASTERNODE PAYMENT VARIABLES SETUP
     CAmount masternodePayment = GetMasternodePayment(nBlockHeight, blockReward);
-
-    // split reward between miner ...
-    txNew.vout[0].nValue -= masternodePayment;
-    // ... and masternode
     txoutMasternodeRet = CTxOut(masternodePayment, payee);
-    txNew.vout.push_back(txoutMasternodeRet);
 
     CTxDestination address1;
     ExtractDestination(payee, address1);
     CBitcoinAddress address2(address1);
 
-    LogPrintf("CMasternodePayments::FillBlockPayee -- Masternode payment %lld to %s\n", masternodePayment, address2.ToString());
+    LogPrintf("CMasternodePayments::%s -- Masternode payment %lld to %s\n", __func__, masternodePayment, address2.ToString());
+
+    return true;
 }
 
 int CMasternodePayments::GetMinMasternodePaymentsProto() const {
@@ -445,12 +477,12 @@ bool CMasternodePaymentVote::Sign()
         uint256 hash = GetSignatureHash();
 
         if(!CHashSigner::SignHash(hash, activeMasternodeInfo.keyMasternode, vchSig)) {
-            LogPrintf("CMasternodePaymentVote::Sign -- SignHash() failed\n");
+            LogPrintf("CMasternodePaymentVote::%s -- SignHash() failed\n", __func__);
             return false;
         }
 
         if (!CHashSigner::VerifyHash(hash, activeMasternodeInfo.keyIDMasternode, vchSig, strError)) {
-            LogPrintf("CMasternodePaymentVote::Sign -- VerifyHash() failed, error: %s\n", strError);
+            LogPrintf("CMasternodePaymentVote::%s -- VerifyHash() failed, error: %s\n", __func__, strError);
             return false;
         }
     } else {
@@ -459,12 +491,12 @@ bool CMasternodePaymentVote::Sign()
                     ScriptToAsmStr(payee);
 
         if(!CMessageSigner::SignMessage(strMessage, vchSig, activeMasternodeInfo.keyMasternode)) {
-            LogPrintf("CMasternodePaymentVote::Sign -- SignMessage() failed\n");
+            LogPrintf("CMasternodePaymentVote::%s -- SignMessage() failed\n", __func__);
             return false;
         }
 
         if(!CMessageSigner::VerifyMessage(activeMasternodeInfo.keyIDMasternode, vchSig, strMessage, strError)) {
-            LogPrintf("CMasternodePaymentVote::Sign -- VerifyMessage() failed, error: %s\n", strError);
+            LogPrintf("CMasternodePaymentVote::%s -- VerifyMessage() failed, error: %s\n", __func__, strError);
             return false;
         }
     }
@@ -518,7 +550,7 @@ bool CMasternodePayments::AddOrUpdatePaymentVote(const CMasternodePaymentVote& v
     auto it = mapMasternodeBlocks.emplace(vote.nBlockHeight, CMasternodeBlockPayees(vote.nBlockHeight)).first;
     it->second.AddPayee(vote);
 
-    LogPrint("mnpayments", "CMasternodePayments::AddOrUpdatePaymentVote -- added, hash=%s\n", nVoteHash.ToString());
+    LogPrint("mnpayments", "CMasternodePayments::%s -- added, hash=%s\n", __func__, nVoteHash.ToString());
 
     return true;
 }
@@ -551,7 +583,7 @@ bool CMasternodeBlockPayees::GetBestPayee(CScript& payeeRet) const
     LOCK(cs_vecPayees);
 
     if(vecPayees.empty()) {
-        LogPrint("mnpayments", "CMasternodeBlockPayees::GetBestPayee -- ERROR: couldn't find any payee\n");
+        LogPrint("mnpayments", "CMasternodeBlockPayees::%s -- ERROR: couldn't find any payee\n", __func__);
         return false;
     }
 
@@ -576,7 +608,7 @@ bool CMasternodeBlockPayees::HasPayeeWithVotes(const CScript& payeeIn, int nVote
         }
     }
 
-    LogPrint("mnpayments", "CMasternodeBlockPayees::HasPayeeWithVotes -- ERROR: couldn't find any payee with %d+ votes\n", nVotesReq);
+    LogPrint("mnpayments", "CMasternodeBlockPayees::%s -- ERROR: couldn't find any payee with %d+ votes\n", __func__, nVotesReq);
     return false;
 }
 
@@ -604,7 +636,7 @@ bool CMasternodeBlockPayees::IsTransactionValid(const CTransaction& txNew) const
         if (payee.GetVoteCount() >= MNPAYMENTS_SIGNATURES_REQUIRED) {
             for (const auto& txout : txNew.vout) {
                 if (payee.GetPayee() == txout.scriptPubKey && nMasternodePayment == txout.nValue) {
-                    LogPrint("mnpayments", "CMasternodeBlockPayees::IsTransactionValid -- Found required payment\n");
+                    LogPrint("mnpayments", "CMasternodeBlockPayees::%s -- Found required payment\n", __func__);
                     return true;
                 }
             }
@@ -621,7 +653,7 @@ bool CMasternodeBlockPayees::IsTransactionValid(const CTransaction& txNew) const
         }
     }
 
-    LogPrintf("CMasternodeBlockPayees::IsTransactionValid -- ERROR: Missing required payment, possible payees: '%s', amount: %f DASH\n", strPayeesPossible, (float)nMasternodePayment/COIN);
+    LogPrintf("CMasternodeBlockPayees::%s -- ERROR: Missing required payment, possible payees: '%s', amount: %f DASH\n", __func__, strPayeesPossible, (float)nMasternodePayment/COIN);
     return false;
 }
 
@@ -657,10 +689,9 @@ std::string CMasternodePayments::GetRequiredPaymentsString(int nBlockHeight) con
     return it == mapMasternodeBlocks.end() ? "Unknown" : it->second.GetRequiredPaymentsString();
 }
 
-bool CMasternodePayments::IsTransactionValid(const CTransaction& txNew, int nBlockHeight) const
+bool CMasternodePayments::IsTransactionValid(const CTransaction& txNew, int nBlockHeight, CAmount blockReward) const
 {
     LOCK(cs_mapMasternodeBlocks);
-
     const auto it = mapMasternodeBlocks.find(nBlockHeight);
     return it == mapMasternodeBlocks.end() ? true : it->second.IsTransactionValid(txNew);
 }
@@ -678,14 +709,14 @@ void CMasternodePayments::CheckAndRemove()
         CMasternodePaymentVote vote = (*it).second;
 
         if(nCachedBlockHeight - vote.nBlockHeight > nLimit) {
-            LogPrint("mnpayments", "CMasternodePayments::CheckAndRemove -- Removing old Masternode payment: nBlockHeight=%d\n", vote.nBlockHeight);
+            LogPrint("mnpayments", "CMasternodePayments::%s -- Removing old Masternode payment: nBlockHeight=%d\n", __func__, vote.nBlockHeight);
             mapMasternodePaymentVotes.erase(it++);
             mapMasternodeBlocks.erase(vote.nBlockHeight);
         } else {
             ++it;
         }
     }
-    LogPrintf("CMasternodePayments::CheckAndRemove -- %s\n", ToString());
+    LogPrintf("CMasternodePayments::%s -- %s\n", __func__, ToString());
 }
 
 bool CMasternodePaymentVote::IsValid(CNode* pnode, int nValidationHeight, std::string& strError, CConnman& connman) const
@@ -723,7 +754,7 @@ bool CMasternodePaymentVote::IsValid(CNode* pnode, int nValidationHeight, std::s
     int nRank;
 
     if(!mnodeman.GetMasternodeRank(masternodeOutpoint, nRank, nBlockHeight - 101, nMinRequiredProtocol)) {
-        LogPrint("mnpayments", "CMasternodePaymentVote::IsValid -- Can't calculate rank for masternode %s\n",
+        LogPrint("mnpayments", "CMasternodePaymentVote::%s -- Can't calculate rank for masternode %s\n", __func__,
                     masternodeOutpoint.ToStringShort());
         return false;
     }
@@ -736,7 +767,7 @@ bool CMasternodePaymentVote::IsValid(CNode* pnode, int nValidationHeight, std::s
         if(nRank > MNPAYMENTS_SIGNATURES_TOTAL*2 && nBlockHeight > nValidationHeight) {
             LOCK(cs_main);
             strError = strprintf("Masternode %s is not in the top %d (%d)", masternodeOutpoint.ToStringShort(), MNPAYMENTS_SIGNATURES_TOTAL*2, nRank);
-            LogPrintf("CMasternodePaymentVote::IsValid -- Error: %s\n", strError);
+            LogPrintf("CMasternodePaymentVote::%s -- Error: %s\n", __func__, strError);
             Misbehaving(pnode->GetId(), 20);
         }
         // Still invalid however
@@ -760,30 +791,30 @@ bool CMasternodePayments::ProcessBlock(int nBlockHeight, CConnman& connman)
     int nRank;
 
     if (!mnodeman.GetMasternodeRank(activeMasternodeInfo.outpoint, nRank, nBlockHeight - 101, GetMinMasternodePaymentsProto())) {
-        LogPrint("mnpayments", "CMasternodePayments::ProcessBlock -- Unknown Masternode\n");
+        LogPrint("mnpayments", "CMasternodePayments::%s -- Unknown Masternode\n", __func__);
         return false;
     }
 
     if (nRank > MNPAYMENTS_SIGNATURES_TOTAL) {
-        LogPrint("mnpayments", "CMasternodePayments::ProcessBlock -- Masternode not in the top %d (%d)\n", MNPAYMENTS_SIGNATURES_TOTAL, nRank);
+        LogPrint("mnpayments", "CMasternodePayments::%s -- Masternode not in the top %d (%d)\n", __func__, MNPAYMENTS_SIGNATURES_TOTAL, nRank);
         return false;
     }
 
 
     // LOCATE THE NEXT MASTERNODE WHICH SHOULD BE PAID
 
-    LogPrintf("CMasternodePayments::ProcessBlock -- Start: nBlockHeight=%d, masternode=%s\n", nBlockHeight, activeMasternodeInfo.outpoint.ToStringShort());
+    LogPrintf("CMasternodePayments::%s -- Start: nBlockHeight=%d, masternode=%s\n", __func__, nBlockHeight, activeMasternodeInfo.outpoint.ToStringShort());
 
     // pay to the oldest MN that still had no payment but its input is old enough and it was active long enough
     int nCount = 0;
     masternode_info_t mnInfo;
 
     if (!mnodeman.GetNextMasternodeInQueueForPayment(nBlockHeight, true, nCount, mnInfo)) {
-        LogPrintf("CMasternodePayments::ProcessBlock -- ERROR: Failed to find masternode to pay\n");
+        LogPrintf("CMasternodePayments::%s -- ERROR: Failed to find masternode to pay\n", __func__);
         return false;
     }
 
-    LogPrintf("CMasternodePayments::ProcessBlock -- Masternode found by GetNextMasternodeInQueueForPayment(): %s\n", mnInfo.outpoint.ToStringShort());
+    LogPrintf("CMasternodePayments::%s -- Masternode found by GetNextMasternodeInQueueForPayment(): %s\n", __func__, mnInfo.outpoint.ToStringShort());
 
 
     CScript payee = GetScriptForDestination(mnInfo.keyIDCollateralAddress);
@@ -794,13 +825,13 @@ bool CMasternodePayments::ProcessBlock(int nBlockHeight, CConnman& connman)
     ExtractDestination(payee, address1);
     CBitcoinAddress address2(address1);
 
-    LogPrintf("CMasternodePayments::ProcessBlock -- vote: payee=%s, nBlockHeight=%d\n", address2.ToString(), nBlockHeight);
+    LogPrintf("CMasternodePayments::%s -- vote: payee=%s, nBlockHeight=%d\n", address2.ToString(), nBlockHeight);
 
     // SIGN MESSAGE TO NETWORK WITH OUR MASTERNODE KEYS
 
-    LogPrintf("CMasternodePayments::ProcessBlock -- Signing vote\n");
+    LogPrintf("CMasternodePayments::%s -- Signing vote\n", __func__);
     if (voteNew.Sign()) {
-        LogPrintf("CMasternodePayments::ProcessBlock -- AddOrUpdatePaymentVote()\n");
+        LogPrintf("CMasternodePayments::%s -- AddOrUpdatePaymentVote()\n", __func__);
 
         if (AddOrUpdatePaymentVote(voteNew)) {
             voteNew.Relay(connman);
@@ -817,13 +848,13 @@ void CMasternodePayments::CheckBlockVotes(int nBlockHeight)
 
     CMasternodeMan::rank_pair_vec_t mns;
     if (!mnodeman.GetMasternodeRanks(mns, nBlockHeight - 101, GetMinMasternodePaymentsProto())) {
-        LogPrintf("CMasternodePayments::CheckBlockVotes -- nBlockHeight=%d, GetMasternodeRanks failed\n", nBlockHeight);
+        LogPrintf("CMasternodePayments::%s -- nBlockHeight=%d, GetMasternodeRanks failed\n", __func__, nBlockHeight);
         return;
     }
 
     std::string debugStr;
 
-    debugStr += strprintf("CMasternodePayments::CheckBlockVotes -- nBlockHeight=%d,\n  Expected voting MNs:\n", nBlockHeight);
+    debugStr += strprintf("CMasternodePayments::%s -- nBlockHeight=%d,\n  Expected voting MNs:\n", __func__, nBlockHeight);
 
     LOCK2(cs_mapMasternodeBlocks, cs_mapMasternodePaymentVotes);
 
@@ -885,7 +916,7 @@ void CMasternodePaymentVote::Relay(CConnman& connman) const
 {
     // Do not relay until fully synced
     if(!masternodeSync.IsSynced()) {
-        LogPrint("mnpayments", "CMasternodePayments::Relay -- won't relay until fully synced\n");
+        LogPrint("mnpayments", "CMasternodePayments::%s -- won't relay until fully synced\n", __func__);
         return;
     }
 
@@ -974,7 +1005,7 @@ void CMasternodePayments::Sync(CNode* pnode, CConnman& connman) const
         }
     }
 
-    LogPrintf("CMasternodePayments::Sync -- Sent %d votes to peer=%d\n", nInvCount, pnode->id);
+    LogPrintf("CMasternodePayments::%s -- Sent %d votes to peer=%d\n", __func__, nInvCount, pnode->id);
     CNetMsgMaker msgMaker(pnode->GetSendVersion());
     connman.PushMessage(pnode, msgMaker.Make(NetMsgType::SYNCSTATUSCOUNT, MASTERNODE_SYNC_MNW, nInvCount));
 }
@@ -999,7 +1030,7 @@ void CMasternodePayments::RequestLowDataPaymentBlocks(CNode* pnode, CConnman& co
             vToFetch.push_back(CInv(MSG_MASTERNODE_PAYMENT_BLOCK, pindex->GetBlockHash()));
             // We should not violate GETDATA rules
             if(vToFetch.size() == MAX_INV_SZ) {
-                LogPrintf("CMasternodePayments::RequestLowDataPaymentBlocks -- asking peer=%d for %d blocks\n", pnode->id, MAX_INV_SZ);
+                LogPrintf("CMasternodePayments::%s -- asking peer=%d for %d blocks\n", __func__, pnode->id, MAX_INV_SZ);
                 connman.PushMessage(pnode, msgMaker.Make(NetMsgType::GETDATA, vToFetch));
                 // Start filling new batch
                 vToFetch.clear();
@@ -1045,7 +1076,7 @@ void CMasternodePayments::RequestLowDataPaymentBlocks(CNode* pnode, CConnman& co
         }
         // We should not violate GETDATA rules
         if(vToFetch.size() == MAX_INV_SZ) {
-            LogPrintf("CMasternodePayments::RequestLowDataPaymentBlocks -- asking peer=%d for %d payment blocks\n", pnode->id, MAX_INV_SZ);
+            LogPrintf("CMasternodePayments::%s -- asking peer=%d for %d payment blocks\n", __func__, pnode->id, MAX_INV_SZ);
             connman.PushMessage(pnode, msgMaker.Make(NetMsgType::GETDATA, vToFetch));
             // Start filling new batch
             vToFetch.clear();
@@ -1053,7 +1084,7 @@ void CMasternodePayments::RequestLowDataPaymentBlocks(CNode* pnode, CConnman& co
     }
     // Ask for the rest of it
     if(!vToFetch.empty()) {
-        LogPrintf("CMasternodePayments::RequestLowDataPaymentBlocks -- asking peer=%d for %d payment blocks\n", pnode->id, vToFetch.size());
+        LogPrintf("CMasternodePayments::%s -- asking peer=%d for %d payment blocks\n", __func__, pnode->id, vToFetch.size());
         connman.PushMessage(pnode, msgMaker.Make(NetMsgType::GETDATA, vToFetch));
     }
 }
@@ -1085,7 +1116,7 @@ void CMasternodePayments::UpdatedBlockTip(const CBlockIndex *pindex, CConnman& c
     if(!pindex) return;
 
     nCachedBlockHeight = pindex->nHeight;
-    LogPrint("mnpayments", "CMasternodePayments::UpdatedBlockTip -- nCachedBlockHeight=%d\n", nCachedBlockHeight);
+    LogPrint("mnpayments", "CMasternodePayments::%s -- nCachedBlockHeight=%d\n", __func__, nCachedBlockHeight);
 
     int nFutureBlock = nCachedBlockHeight + 10;
 
diff --git a/src/masternode-payments.h b/src/masternode-payments.h
index 3db062d6ffe0..dca936a12378 100644
--- a/src/masternode-payments.h
+++ b/src/masternode-payments.h
@@ -214,7 +214,7 @@ class CMasternodePayments
     void CheckAndRemove();
 
     bool GetBlockPayee(int nBlockHeight, CScript& payeeRet) const;
-    bool IsTransactionValid(const CTransaction& txNew, int nBlockHeight) const;
+    bool IsTransactionValid(const CTransaction& txNew, int nBlockHeight, CAmount blockReward) const;
     bool IsScheduled(const masternode_info_t& mnInfo, int nNotBlockHeight) const;
 
     bool UpdateLastVote(const CMasternodePaymentVote& vote);
@@ -222,7 +222,7 @@ class CMasternodePayments
     int GetMinMasternodePaymentsProto() const;
     void ProcessMessage(CNode* pfrom, const std::string& strCommand, CDataStream& vRecv, CConnman& connman);
     std::string GetRequiredPaymentsString(int nBlockHeight) const;
-    void FillBlockPayee(CMutableTransaction& txNew, int nBlockHeight, CAmount blockReward, CTxOut& txoutMasternodeRet) const;
+    bool GetMasternodeTxOut(int nBlockHeight, CAmount blockReward, CTxOut& txoutMasternodeRet) const;
     std::string ToString() const;
 
     int GetBlockCount() const { return mapMasternodeBlocks.size(); }

From 7cf9572c26dfbae456ad2c749418a8a70f9e0113 Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Mon, 13 Aug 2018 18:07:52 +0200
Subject: [PATCH 046/400] Backport Bitcoin #11881: Remove Python2 support
 (#2224)

* Merge #11881: Remove Python2 support

1874058 Make base58 python contrib code work with python3 (Evan Klitzke)
bc6fdf2 Change all python files to use Python3 (John Newbery)

Pull request description:

  Following discussion here: https://github.com/bitcoin/bitcoin/pull/11843#issuecomment-351033742

  It's easier for maintainers if all python tools/scripts support only a single version of Python. There are only a few scripts that aren't explicitly python3 at this point, so this PR changes those remaining scripts to explicitly require python3.

Tree-SHA512: 5d38eef6e0fc7d8515e23a1f4c75e8b4160fd0fe23cba52a1f41689b114e54a9e503e0724829e8b41982ef98f2d113df80d9e238213b74f09ceaed0344a19e24

* Merge #12829: Python3 fixup

f50975b [contrib] fixup symbol-check.py Python3 support (John Newbery)
5de2b18 [contrib] fixup security-check.py Python3 support (John Newbery)

Pull request description:

  security-check.py and symbol-check.py were broken by #11881. Fix them.

Tree-SHA512: 86de3d6dc3292b1ae4cc04c2d7d7dbbf39c9270551d7b224b8d8b19e3184c30c897dbf823200403706d06bb405c0decad5cfd690cb2c0312992a235a4ffcf6bf
---
 contrib/devtools/check-doc.py              | 24 ++++----
 contrib/devtools/clang-format-diff.py      | 19 +++---
 contrib/devtools/optimize-pngs.py          | 30 +++++-----
 contrib/devtools/security-check.py         | 47 ++++++++-------
 contrib/devtools/symbol-check.py           | 69 +++++++++++-----------
 contrib/devtools/update-translations.py    |  3 +-
 contrib/macdeploy/custom_dsstore.py        |  3 +-
 contrib/macdeploy/macdeployqtplus          | 27 ++-------
 contrib/testgen/base58.py                  | 20 ++++---
 contrib/testgen/gen_base58_test_vectors.py | 25 ++++----
 doc/release-notes.md                       |  5 ++
 share/qt/extract_strings_qt.py             |  3 +-
 share/rpcuser/rpcuser.py                   |  2 +-
 13 files changed, 135 insertions(+), 142 deletions(-)

diff --git a/contrib/devtools/check-doc.py b/contrib/devtools/check-doc.py
index fa1e137587a6..464e2a8a46b6 100755
--- a/contrib/devtools/check-doc.py
+++ b/contrib/devtools/check-doc.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # Copyright (c) 2015 The Bitcoin Core developers
 # Distributed under the MIT software license, see the accompanying
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
@@ -15,29 +15,29 @@
 
 FOLDER_GREP = 'src'
 FOLDER_TEST = 'src/test/'
-CMD_ROOT_DIR = '`git rev-parse --show-toplevel`/%s' % FOLDER_GREP
-CMD_GREP_ARGS = r"egrep -r -I '(map(Multi)?Args(\.count\(|\[)|Get(Bool)?Arg\()\"\-[^\"]+?\"' %s | grep -v '%s'" % (CMD_ROOT_DIR, FOLDER_TEST)
-CMD_GREP_DOCS = r"egrep -r -I 'HelpMessageOpt\(\"\-[^\"=]+?(=|\")' %s" % (CMD_ROOT_DIR)
+CMD_ROOT_DIR = '`git rev-parse --show-toplevel`/{}'.format(FOLDER_GREP)
+CMD_GREP_ARGS = r"egrep -r -I '(map(Multi)?Args(\.count\(|\[)|Get(Bool)?Arg\()\"\-[^\"]+?\"' {} | grep -v '{}'".format(CMD_ROOT_DIR, FOLDER_TEST)
+CMD_GREP_DOCS = r"egrep -r -I 'HelpMessageOpt\(\"\-[^\"=]+?(=|\")' {}".format(CMD_ROOT_DIR)
 REGEX_ARG = re.compile(r'(?:map(?:Multi)?Args(?:\.count\(|\[)|Get(?:Bool)?Arg\()\"(\-[^\"]+?)\"')
 REGEX_DOC = re.compile(r'HelpMessageOpt\(\"(\-[^\"=]+?)(?:=|\")')
 # list unsupported, deprecated and duplicate args as they need no documentation
 SET_DOC_OPTIONAL = set(['-rpcssl', '-benchmark', '-h', '-help', '-socks', '-tor', '-debugnet', '-whitelistalwaysrelay', '-blockminsize'])
 
 def main():
-  used = check_output(CMD_GREP_ARGS, shell=True)
-  docd = check_output(CMD_GREP_DOCS, shell=True)
+  used = check_output(CMD_GREP_ARGS, shell=True, universal_newlines=True)
+  docd = check_output(CMD_GREP_DOCS, shell=True, universal_newlines=True)
 
   args_used = set(re.findall(REGEX_ARG,used))
   args_docd = set(re.findall(REGEX_DOC,docd)).union(SET_DOC_OPTIONAL)
   args_need_doc = args_used.difference(args_docd)
   args_unknown = args_docd.difference(args_used)
 
-  print "Args used        : %s" % len(args_used)
-  print "Args documented  : %s" % len(args_docd)
-  print "Args undocumented: %s" % len(args_need_doc)
-  print args_need_doc
-  print "Args unknown     : %s" % len(args_unknown)
-  print args_unknown
+  print("Args used        : {}".format(len(args_used)))
+  print("Args documented  : {}".format(len(args_docd)))
+  print("Args undocumented: {}".format(len(args_need_doc)))
+  print(args_need_doc)
+  print("Args unknown     : {}".format(len(args_unknown)))
+  print(args_unknown)
 
   exit(len(args_need_doc))
 
diff --git a/contrib/devtools/clang-format-diff.py b/contrib/devtools/clang-format-diff.py
index 7ea49b65e177..ca1bd8854fc6 100755
--- a/contrib/devtools/clang-format-diff.py
+++ b/contrib/devtools/clang-format-diff.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 #
 #===- clang-format-diff.py - ClangFormat Diff Reformatter ----*- python -*--===#
 #
@@ -69,10 +69,10 @@
 
 import argparse
 import difflib
+import io
 import re
 import string
 import subprocess
-import StringIO
 import sys
 
 
@@ -133,9 +133,9 @@ def main():
           ['-lines', str(start_line) + ':' + str(end_line)])
 
   # Reformat files containing changes in place.
-  for filename, lines in lines_by_file.iteritems():
+  for filename, lines in lines_by_file.items():
     if args.i and args.verbose:
-      print 'Formatting', filename
+      print('Formatting {}'.format(filename))
     command = [binary, filename]
     if args.i:
       command.append('-i')
@@ -143,8 +143,11 @@ def main():
       command.append('-sort-includes')
     command.extend(lines)
     command.extend(['-style=file', '-fallback-style=none'])
-    p = subprocess.Popen(command, stdout=subprocess.PIPE,
-                         stderr=None, stdin=subprocess.PIPE)
+    p = subprocess.Popen(command,
+                         stdout=subprocess.PIPE,
+                         stderr=None,
+                         stdin=subprocess.PIPE,
+                         universal_newlines=True)
     stdout, stderr = p.communicate()
     if p.returncode != 0:
       sys.exit(p.returncode)
@@ -152,11 +155,11 @@ def main():
     if not args.i:
       with open(filename) as f:
         code = f.readlines()
-      formatted_code = StringIO.StringIO(stdout).readlines()
+      formatted_code = io.StringIO(stdout).readlines()
       diff = difflib.unified_diff(code, formatted_code,
                                   filename, filename,
                                   '(before formatting)', '(after formatting)')
-      diff_string = string.join(diff, '')
+      diff_string = ''.join(diff)
       if len(diff_string) > 0:
         sys.stdout.write(diff_string)
 
diff --git a/contrib/devtools/optimize-pngs.py b/contrib/devtools/optimize-pngs.py
index ce4cca8e5136..e8375a78bebd 100755
--- a/contrib/devtools/optimize-pngs.py
+++ b/contrib/devtools/optimize-pngs.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # Copyright (c) 2014-2015 The Bitcoin Core developers
 # Distributed under the MIT software license, see the accompanying
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
@@ -10,7 +10,7 @@
 import sys
 import subprocess
 import hashlib
-from PIL import Image
+from PIL import Image  # pip3 install Pillow
 
 def file_hash(filename):
     '''Return hash of raw file contents'''
@@ -27,7 +27,7 @@ def content_hash(filename):
 pngcrush = 'pngcrush'
 git = 'git'
 folders = ["src/qt/res/movies", "src/qt/res/icons", "src/qt/res/icons/crownium", "src/qt/res/icons/drkblue", "src/qt/res/icons/light", "src/qt/res/icons/light-retro", "src/qt/res/icons/trad", "src/qt/res/images", "src/qt/res/images/crownium", "src/qt/res/images/drkblue", "src/qt/res/images/light", "src/qt/res/images/light-retro", "src/qt/res/images/trad", "share/pixmaps"]
-basePath = subprocess.check_output([git, 'rev-parse', '--show-toplevel']).rstrip('\n')
+basePath = subprocess.check_output([git, 'rev-parse', '--show-toplevel'], universal_newlines=True).rstrip('\n')
 totalSaveBytes = 0
 noHashChange = True
 
@@ -37,42 +37,40 @@ def content_hash(filename):
     for file in os.listdir(absFolder):
         extension = os.path.splitext(file)[1]
         if extension.lower() == '.png':
-            print("optimizing "+file+"..."),
+            print("optimizing {}...".format(file), end =' ')
             file_path = os.path.join(absFolder, file)
             fileMetaMap = {'file' : file, 'osize': os.path.getsize(file_path), 'sha256Old' : file_hash(file_path)}
             fileMetaMap['contentHashPre'] = content_hash(file_path)
         
-            pngCrushOutput = ""
             try:
-                pngCrushOutput = subprocess.check_output(
-                        [pngcrush, "-brute", "-ow", "-rem", "gAMA", "-rem", "cHRM", "-rem", "iCCP", "-rem", "sRGB", "-rem", "alla", "-rem", "text", file_path],
-                        stderr=subprocess.STDOUT).rstrip('\n')
+                subprocess.call([pngcrush, "-brute", "-ow", "-rem", "gAMA", "-rem", "cHRM", "-rem", "iCCP", "-rem", "sRGB", "-rem", "alla", "-rem", "text", file_path],
+                                stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
             except:
-                print "pngcrush is not installed, aborting..."
+                print("pngcrush is not installed, aborting...")
                 sys.exit(0)
         
             #verify
-            if "Not a PNG file" in subprocess.check_output([pngcrush, "-n", "-v", file_path], stderr=subprocess.STDOUT):
-                print "PNG file "+file+" is corrupted after crushing, check out pngcursh version"
+            if "Not a PNG file" in subprocess.check_output([pngcrush, "-n", "-v", file_path], stderr=subprocess.STDOUT, universal_newlines=True):
+                print("PNG file "+file+" is corrupted after crushing, check out pngcursh version")
                 sys.exit(1)
             
             fileMetaMap['sha256New'] = file_hash(file_path)
             fileMetaMap['contentHashPost'] = content_hash(file_path)
 
             if fileMetaMap['contentHashPre'] != fileMetaMap['contentHashPost']:
-                print "Image contents of PNG file "+file+" before and after crushing don't match"
+                print("Image contents of PNG file {} before and after crushing don't match".format(file))
                 sys.exit(1)
 
             fileMetaMap['psize'] = os.path.getsize(file_path)
             outputArray.append(fileMetaMap)
-            print("done\n"),
+            print("done")
 
-print "summary:\n+++++++++++++++++"
+print("summary:\n+++++++++++++++++")
 for fileDict in outputArray:
     oldHash = fileDict['sha256Old']
     newHash = fileDict['sha256New']
     totalSaveBytes += fileDict['osize'] - fileDict['psize']
     noHashChange = noHashChange and (oldHash == newHash)
-    print fileDict['file']+"\n  size diff from: "+str(fileDict['osize'])+" to: "+str(fileDict['psize'])+"\n  old sha256: "+oldHash+"\n  new sha256: "+newHash+"\n"
+    print(fileDict['file']+"\n  size diff from: "+str(fileDict['osize'])+" to: "+str(fileDict['psize'])+"\n  old sha256: "+oldHash+"\n  new sha256: "+newHash+"\n")
     
-print "completed. Checksum stable: "+str(noHashChange)+". Total reduction: "+str(totalSaveBytes)+" bytes"
+print("completed. Checksum stable: "+str(noHashChange)+". Total reduction: "+str(totalSaveBytes)+" bytes")
diff --git a/contrib/devtools/security-check.py b/contrib/devtools/security-check.py
index c90541e27119..aa73bc61d0ec 100755
--- a/contrib/devtools/security-check.py
+++ b/contrib/devtools/security-check.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # Copyright (c) 2015-2016 The Bitcoin Core developers
 # Distributed under the MIT software license, see the accompanying
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
@@ -8,7 +8,6 @@
 Otherwise the exit status will be 1 and it will log which executables failed which checks.
 Needs `readelf` (for ELF) and `objdump` (for PE).
 '''
-from __future__ import division,print_function,unicode_literals
 import subprocess
 import sys
 import os
@@ -21,38 +20,38 @@ def check_ELF_PIE(executable):
     '''
     Check for position independent executable (PIE), allowing for address space randomization.
     '''
-    p = subprocess.Popen([READELF_CMD, '-h', '-W', executable], stdout=subprocess.PIPE, stderr=subprocess.PIPE, stdin=subprocess.PIPE)
+    p = subprocess.Popen([READELF_CMD, '-h', '-W', executable], stdout=subprocess.PIPE, stderr=subprocess.PIPE, stdin=subprocess.PIPE, universal_newlines=True)
     (stdout, stderr) = p.communicate()
     if p.returncode:
         raise IOError('Error opening file')
 
     ok = False
-    for line in stdout.split(b'\n'):
+    for line in stdout.splitlines():
         line = line.split()
-        if len(line)>=2 and line[0] == b'Type:' and line[1] == b'DYN':
+        if len(line)>=2 and line[0] == 'Type:' and line[1] == 'DYN':
             ok = True
     return ok
 
 def get_ELF_program_headers(executable):
     '''Return type and flags for ELF program headers'''
-    p = subprocess.Popen([READELF_CMD, '-l', '-W', executable], stdout=subprocess.PIPE, stderr=subprocess.PIPE, stdin=subprocess.PIPE)
+    p = subprocess.Popen([READELF_CMD, '-l', '-W', executable], stdout=subprocess.PIPE, stderr=subprocess.PIPE, stdin=subprocess.PIPE, universal_newlines=True)
     (stdout, stderr) = p.communicate()
     if p.returncode:
         raise IOError('Error opening file')
     in_headers = False
     count = 0
     headers = []
-    for line in stdout.split(b'\n'):
-        if line.startswith(b'Program Headers:'):
+    for line in stdout.splitlines():
+        if line.startswith('Program Headers:'):
             in_headers = True
-        if line == b'':
+        if line == '':
             in_headers = False
         if in_headers:
             if count == 1: # header line
-                ofs_typ = line.find(b'Type')
-                ofs_offset = line.find(b'Offset')
-                ofs_flags = line.find(b'Flg')
-                ofs_align = line.find(b'Align')
+                ofs_typ = line.find('Type')
+                ofs_offset = line.find('Offset')
+                ofs_flags = line.find('Flg')
+                ofs_align = line.find('Align')
                 if ofs_typ == -1 or ofs_offset == -1 or ofs_flags == -1 or ofs_align  == -1:
                     raise ValueError('Cannot parse elfread -lW output')
             elif count > 1:
@@ -69,9 +68,9 @@ def check_ELF_NX(executable):
     have_wx = False
     have_gnu_stack = False
     for (typ, flags) in get_ELF_program_headers(executable):
-        if typ == b'GNU_STACK':
+        if typ == 'GNU_STACK':
             have_gnu_stack = True
-        if b'W' in flags and b'E' in flags: # section is both writable and executable
+        if 'W' in flags and 'E' in flags: # section is both writable and executable
             have_wx = True
     return have_gnu_stack and not have_wx
 
@@ -88,17 +87,17 @@ def check_ELF_RELRO(executable):
         # However, the dynamic linker need to write to this area so these are RW.
         # Glibc itself takes care of mprotecting this area R after relocations are finished.
         # See also http://permalink.gmane.org/gmane.comp.gnu.binutils/71347
-        if typ == b'GNU_RELRO':
+        if typ == 'GNU_RELRO':
             have_gnu_relro = True
 
     have_bindnow = False
-    p = subprocess.Popen([READELF_CMD, '-d', '-W', executable], stdout=subprocess.PIPE, stderr=subprocess.PIPE, stdin=subprocess.PIPE)
+    p = subprocess.Popen([READELF_CMD, '-d', '-W', executable], stdout=subprocess.PIPE, stderr=subprocess.PIPE, stdin=subprocess.PIPE, universal_newlines=True)
     (stdout, stderr) = p.communicate()
     if p.returncode:
         raise IOError('Error opening file')
-    for line in stdout.split(b'\n'):
+    for line in stdout.splitlines():
         tokens = line.split()
-        if len(tokens)>1 and tokens[1] == b'(BIND_NOW)' or (len(tokens)>2 and tokens[1] == b'(FLAGS)' and b'BIND_NOW' in tokens[2]):
+        if len(tokens)>1 and tokens[1] == '(BIND_NOW)' or (len(tokens)>2 and tokens[1] == '(FLAGS)' and 'BIND_NOW' in tokens[2]):
             have_bindnow = True
     return have_gnu_relro and have_bindnow
 
@@ -106,13 +105,13 @@ def check_ELF_Canary(executable):
     '''
     Check for use of stack canary
     '''
-    p = subprocess.Popen([READELF_CMD, '--dyn-syms', '-W', executable], stdout=subprocess.PIPE, stderr=subprocess.PIPE, stdin=subprocess.PIPE)
+    p = subprocess.Popen([READELF_CMD, '--dyn-syms', '-W', executable], stdout=subprocess.PIPE, stderr=subprocess.PIPE, stdin=subprocess.PIPE, universal_newlines=True)
     (stdout, stderr) = p.communicate()
     if p.returncode:
         raise IOError('Error opening file')
     ok = False
-    for line in stdout.split(b'\n'):
-        if b'__stack_chk_fail' in line:
+    for line in stdout.splitlines():
+        if '__stack_chk_fail' in line:
             ok = True
     return ok
 
@@ -122,13 +121,13 @@ def get_PE_dll_characteristics(executable):
     Returns a tuple (arch,bits) where arch is 'i386:x86-64' or 'i386'
     and bits is the DllCharacteristics value.
     '''
-    p = subprocess.Popen([OBJDUMP_CMD, '-x',  executable], stdout=subprocess.PIPE, stderr=subprocess.PIPE, stdin=subprocess.PIPE)
+    p = subprocess.Popen([OBJDUMP_CMD, '-x',  executable], stdout=subprocess.PIPE, stderr=subprocess.PIPE, stdin=subprocess.PIPE, universal_newlines=True)
     (stdout, stderr) = p.communicate()
     if p.returncode:
         raise IOError('Error opening file')
     arch = ''
     bits = 0
-    for line in stdout.split('\n'):
+    for line in stdout.splitlines():
         tokens = line.split()
         if len(tokens)>=2 and tokens[0] == 'architecture:':
             arch = tokens[1].rstrip(',')
diff --git a/contrib/devtools/symbol-check.py b/contrib/devtools/symbol-check.py
index 8f8685006e11..c23ee5624c00 100755
--- a/contrib/devtools/symbol-check.py
+++ b/contrib/devtools/symbol-check.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # Copyright (c) 2014 Wladimir J. van der Laan
 # Distributed under the MIT software license, see the accompanying
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
@@ -11,7 +11,6 @@
 
     find ../gitian-builder/build -type f -executable | xargs python contrib/devtools/symbol-check.py
 '''
-from __future__ import division, print_function, unicode_literals
 import subprocess
 import re
 import sys
@@ -47,28 +46,28 @@
 
 # Ignore symbols that are exported as part of every executable
 IGNORE_EXPORTS = {
-b'_edata', b'_end', b'_init', b'__bss_start', b'_fini', b'_IO_stdin_used'
+'_edata', '_end', '_init', '__bss_start', '_fini', '_IO_stdin_used'
 }
 READELF_CMD = os.getenv('READELF', '/usr/bin/readelf')
 CPPFILT_CMD = os.getenv('CPPFILT', '/usr/bin/c++filt')
 # Allowed NEEDED libraries
 ALLOWED_LIBRARIES = {
 # bitcoind and bitcoin-qt
-b'libgcc_s.so.1', # GCC base support
-b'libc.so.6', # C library
-b'libpthread.so.0', # threading
-b'libanl.so.1', # DNS resolve
-b'libm.so.6', # math library
-b'librt.so.1', # real-time (clock)
-b'ld-linux-x86-64.so.2', # 64-bit dynamic linker
-b'ld-linux.so.2', # 32-bit dynamic linker
+'libgcc_s.so.1', # GCC base support
+'libc.so.6', # C library
+'libpthread.so.0', # threading
+'libanl.so.1', # DNS resolve
+'libm.so.6', # math library
+'librt.so.1', # real-time (clock)
+'ld-linux-x86-64.so.2', # 64-bit dynamic linker
+'ld-linux.so.2', # 32-bit dynamic linker
 # bitcoin-qt only
-b'libX11-xcb.so.1', # part of X11
-b'libX11.so.6', # part of X11
-b'libxcb.so.1', # part of X11
-b'libfontconfig.so.1', # font support
-b'libfreetype.so.6', # font parsing
-b'libdl.so.2' # programming interface to dynamic linker
+'libX11-xcb.so.1', # part of X11
+'libX11.so.6', # part of X11
+'libxcb.so.1', # part of X11
+'libfontconfig.so.1', # font support
+'libfreetype.so.6', # font parsing
+'libdl.so.2' # programming interface to dynamic linker
 }
 
 class CPPFilt(object):
@@ -78,10 +77,10 @@ class CPPFilt(object):
     Use a pipe to the 'c++filt' command.
     '''
     def __init__(self):
-        self.proc = subprocess.Popen(CPPFILT_CMD, stdin=subprocess.PIPE, stdout=subprocess.PIPE)
+        self.proc = subprocess.Popen(CPPFILT_CMD, stdin=subprocess.PIPE, stdout=subprocess.PIPE, universal_newlines=True)
 
     def __call__(self, mangled):
-        self.proc.stdin.write(mangled + b'\n')
+        self.proc.stdin.write(mangled + '\n')
         self.proc.stdin.flush()
         return self.proc.stdout.readline().rstrip()
 
@@ -95,43 +94,43 @@ def read_symbols(executable, imports=True):
     Parse an ELF executable and return a list of (symbol,version) tuples
     for dynamic, imported symbols.
     '''
-    p = subprocess.Popen([READELF_CMD, '--dyn-syms', '-W', executable], stdout=subprocess.PIPE, stderr=subprocess.PIPE, stdin=subprocess.PIPE)
+    p = subprocess.Popen([READELF_CMD, '--dyn-syms', '-W', executable], stdout=subprocess.PIPE, stderr=subprocess.PIPE, stdin=subprocess.PIPE, universal_newlines=True)
     (stdout, stderr) = p.communicate()
     if p.returncode:
         raise IOError('Could not read symbols for %s: %s' % (executable, stderr.strip()))
     syms = []
-    for line in stdout.split(b'\n'):
+    for line in stdout.splitlines():
         line = line.split()
-        if len(line)>7 and re.match(b'[0-9]+:$', line[0]):
-            (sym, _, version) = line[7].partition(b'@')
-            is_import = line[6] == b'UND'
-            if version.startswith(b'@'):
+        if len(line)>7 and re.match('[0-9]+:$', line[0]):
+            (sym, _, version) = line[7].partition('@')
+            is_import = line[6] == 'UND'
+            if version.startswith('@'):
                 version = version[1:]
             if is_import == imports:
                 syms.append((sym, version))
     return syms
 
 def check_version(max_versions, version):
-    if b'_' in version:
-        (lib, _, ver) = version.rpartition(b'_')
+    if '_' in version:
+        (lib, _, ver) = version.rpartition('_')
     else:
         lib = version
         ver = '0'
-    ver = tuple([int(x) for x in ver.split(b'.')])
+    ver = tuple([int(x) for x in ver.split('.')])
     if not lib in max_versions:
         return False
     return ver <= max_versions[lib]
 
 def read_libraries(filename):
-    p = subprocess.Popen([READELF_CMD, '-d', '-W', filename], stdout=subprocess.PIPE, stderr=subprocess.PIPE, stdin=subprocess.PIPE)
+    p = subprocess.Popen([READELF_CMD, '-d', '-W', filename], stdout=subprocess.PIPE, stderr=subprocess.PIPE, stdin=subprocess.PIPE, universal_newlines=True)
     (stdout, stderr) = p.communicate()
     if p.returncode:
         raise IOError('Error opening file')
     libraries = []
-    for line in stdout.split(b'\n'):
+    for line in stdout.splitlines():
         tokens = line.split()
-        if len(tokens)>2 and tokens[1] == b'(NEEDED)':
-            match = re.match(b'^Shared library: \[(.*)\]$', b' '.join(tokens[2:]))
+        if len(tokens)>2 and tokens[1] == '(NEEDED)':
+            match = re.match('^Shared library: \[(.*)\]$', ' '.join(tokens[2:]))
             if match:
                 libraries.append(match.group(1))
             else:
@@ -145,18 +144,18 @@ def read_libraries(filename):
         # Check imported symbols
         for sym,version in read_symbols(filename, True):
             if version and not check_version(MAX_VERSIONS, version):
-                print('%s: symbol %s from unsupported version %s' % (filename, cppfilt(sym).decode('utf-8'), version.decode('utf-8')))
+                print('%s: symbol %s from unsupported version %s' % (filename, cppfilt(sym), version))
                 retval = 1
         # Check exported symbols
         for sym,version in read_symbols(filename, False):
             if sym in IGNORE_EXPORTS:
                 continue
-            print('%s: export of symbol %s not allowed' % (filename, cppfilt(sym).decode('utf-8')))
+            print('%s: export of symbol %s not allowed' % (filename, cppfilt(sym)))
             retval = 1
         # Check dependency libraries
         for library_name in read_libraries(filename):
             if library_name not in ALLOWED_LIBRARIES:
-                print('%s: NEEDED library %s is not allowed' % (filename, library_name.decode('utf-8')))
+                print('%s: NEEDED library %s is not allowed' % (filename, library_name))
                 retval = 1
 
     exit(retval)
diff --git a/contrib/devtools/update-translations.py b/contrib/devtools/update-translations.py
index 75c60faf7438..67a7dffe4c0c 100755
--- a/contrib/devtools/update-translations.py
+++ b/contrib/devtools/update-translations.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # Copyright (c) 2014 Wladimir J. van der Laan
 # Distributed under the MIT software license, see the accompanying
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
@@ -15,7 +15,6 @@
 TODO:
 - auto-add new translations to the build system according to the translation process
 '''
-from __future__ import division, print_function
 import subprocess
 import re
 import sys
diff --git a/contrib/macdeploy/custom_dsstore.py b/contrib/macdeploy/custom_dsstore.py
index f0bdbd85debc..8b70cf7c684e 100755
--- a/contrib/macdeploy/custom_dsstore.py
+++ b/contrib/macdeploy/custom_dsstore.py
@@ -1,8 +1,7 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # Copyright (c) 2013-2015 The Bitcoin Core developers
 # Distributed under the MIT software license, see the accompanying
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
-from __future__ import division,print_function,unicode_literals
 import biplist
 from ds_store import DSStore
 from mac_alias import Alias
diff --git a/contrib/macdeploy/macdeployqtplus b/contrib/macdeploy/macdeployqtplus
index 71d43d8f4750..61654c849da0 100755
--- a/contrib/macdeploy/macdeployqtplus
+++ b/contrib/macdeploy/macdeployqtplus
@@ -1,5 +1,4 @@
-#!/usr/bin/env python
-from __future__ import division, print_function, unicode_literals
+#!/usr/bin/env python3
 #
 # Copyright (C) 2011  Patrick "p2k" Schneider <me@p2k-network.org>
 #
@@ -203,7 +202,7 @@ def getFrameworks(binaryPath, verbose):
     if verbose >= 3:
         print("Inspecting with otool: " + binaryPath)
     otoolbin=os.getenv("OTOOL", "otool")
-    otool = subprocess.Popen([otoolbin, "-L", binaryPath], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+    otool = subprocess.Popen([otoolbin, "-L", binaryPath], stdout=subprocess.PIPE, stderr=subprocess.PIPE, universal_newlines=True)
     o_stdout, o_stderr = otool.communicate()
     if otool.returncode != 0:
         if verbose >= 1:
@@ -211,7 +210,7 @@ def getFrameworks(binaryPath, verbose):
             sys.stderr.flush()
             raise RuntimeError("otool failed with return code %d" % otool.returncode)
 
-    otoolLines = o_stdout.decode().split("\n")
+    otoolLines = o_stdout.split("\n")
     otoolLines.pop(0) # First line is the inspected binary
     if ".framework" in binaryPath or binaryPath.endswith(".dylib"):
         otoolLines.pop(0) # Frameworks and dylibs list themselves as a dependency.
@@ -716,22 +715,6 @@ elif config.sign:
 
 if config.dmg is not None:
 
-    #Patch in check_output for Python 2.6
-    if "check_output" not in dir( subprocess ):
-        def f(*popenargs, **kwargs):
-            if 'stdout' in kwargs:
-                raise ValueError('stdout argument not allowed, it will be overridden.')
-            process = subprocess.Popen(stdout=subprocess.PIPE, *popenargs, **kwargs)
-            output, unused_err = process.communicate()
-            retcode = process.poll()
-            if retcode:
-                cmd = kwargs.get("args")
-                if cmd is None:
-                    cmd = popenargs[0]
-                raise CalledProcessError(retcode, cmd)
-            return output
-        subprocess.check_output = f
-
     def runHDIUtil(verb, image_basename, **kwargs):
         hdiutil_args = ["hdiutil", verb, image_basename + ".dmg"]
         if "capture_stdout" in kwargs:
@@ -749,7 +732,7 @@ if config.dmg is not None:
             if not value is True:
                 hdiutil_args.append(str(value))
 
-        return run(hdiutil_args)
+        return run(hdiutil_args, universal_newlines=True)
 
     if verbose >= 2:
         if fancy is None:
@@ -791,7 +774,7 @@ if config.dmg is not None:
         except subprocess.CalledProcessError as e:
             sys.exit(e.returncode)
 
-        m = re.search("/Volumes/(.+$)", output.decode())
+        m = re.search("/Volumes/(.+$)", output)
         disk_root = m.group(0)
         disk_name = m.group(1)
 
diff --git a/contrib/testgen/base58.py b/contrib/testgen/base58.py
index 56edf292c106..a11d63e2bcb8 100644
--- a/contrib/testgen/base58.py
+++ b/contrib/testgen/base58.py
@@ -28,7 +28,9 @@ def b58encode(v):
     """
     long_value = 0
     for (i, c) in enumerate(v[::-1]):
-        long_value += (256**i) * ord(c)
+        if isinstance(c, str):
+            c = ord(c)
+        long_value += (256**i) * c
 
     result = ''
     while long_value >= __b58base:
@@ -41,7 +43,7 @@ def b58encode(v):
     # leading 0-bytes in the input become leading-1s
     nPad = 0
     for c in v:
-        if c == '\0': nPad += 1
+        if c == 0: nPad += 1
         else: break
 
     return (__b58chars[0]*nPad) + result
@@ -50,8 +52,10 @@ def b58decode(v, length = None):
     """ decode v into a string of len bytes
     """
     long_value = 0
-    for (i, c) in enumerate(v[::-1]):
-        long_value += __b58chars.find(c) * (__b58base**i)
+    for i, c in enumerate(v[::-1]):
+        pos = __b58chars.find(c)
+        assert pos != -1
+        long_value += pos * (__b58base**i)
 
     result = bytes()
     while long_value >= 256:
@@ -62,10 +66,12 @@ def b58decode(v, length = None):
 
     nPad = 0
     for c in v:
-        if c == __b58chars[0]: nPad += 1
-        else: break
+        if c == __b58chars[0]:
+            nPad += 1
+            continue
+        break
 
-    result = chr(0)*nPad + result
+    result = bytes(nPad) + result
     if length is not None and len(result) != length:
         return None
 
diff --git a/contrib/testgen/gen_base58_test_vectors.py b/contrib/testgen/gen_base58_test_vectors.py
index a0b4b7d20105..ccdcfa5269c1 100755
--- a/contrib/testgen/gen_base58_test_vectors.py
+++ b/contrib/testgen/gen_base58_test_vectors.py
@@ -1,11 +1,11 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # Copyright (c) 2012 The Bitcoin Core developers
 # Distributed under the MIT software license, see the accompanying
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
 '''
 Generate valid and invalid base58 address and private key test vectors.
 
-Usage: 
+Usage:
     gen_base58_test_vectors.py valid 50 > ../../src/test/data/base58_keys_valid.json
     gen_base58_test_vectors.py invalid 50 > ../../src/test/data/base58_keys_invalid.json
 '''
@@ -46,8 +46,8 @@ def is_valid(v):
     if result is None:
         return False
     for template in templates:
-        prefix = str(bytearray(template[0]))
-        suffix = str(bytearray(template[2]))
+        prefix = bytearray(template[0])
+        suffix = bytearray(template[2])
         if result.startswith(prefix) and result.endswith(suffix):
             if (len(result) - len(prefix) - len(suffix)) == template[1]:
                 return True
@@ -57,20 +57,23 @@ def gen_valid_vectors():
     '''Generate valid test vectors'''
     while True:
         for template in templates:
-            prefix = str(bytearray(template[0]))
-            payload = os.urandom(template[1]) 
-            suffix = str(bytearray(template[2]))
+            prefix = bytearray(template[0])
+            payload = bytearray(os.urandom(template[1]))
+            suffix = bytearray(template[2])
             rv = b58encode_chk(prefix + payload + suffix)
             assert is_valid(rv)
-            metadata = dict([(x,y) for (x,y) in zip(metadata_keys,template[3]) if y is not None])
-            yield (rv, b2a_hex(payload), metadata)
+            metadata = {x: y for x, y in zip(metadata_keys,template[3]) if y is not None}
+            hexrepr = b2a_hex(payload)
+            if isinstance(hexrepr, bytes):
+                hexrepr = hexrepr.decode('utf8')
+            yield (rv, hexrepr, metadata)
 
 def gen_invalid_vector(template, corrupt_prefix, randomize_payload_size, corrupt_suffix):
     '''Generate possibly invalid vector'''
     if corrupt_prefix:
         prefix = os.urandom(1)
     else:
-        prefix = str(bytearray(template[0]))
+        prefix = bytearray(template[0])
     
     if randomize_payload_size:
         payload = os.urandom(max(int(random.expovariate(0.5)), 50))
@@ -80,7 +83,7 @@ def gen_invalid_vector(template, corrupt_prefix, randomize_payload_size, corrupt
     if corrupt_suffix:
         suffix = os.urandom(len(template[2]))
     else:
-        suffix = str(bytearray(template[2]))
+        suffix = bytearray(template[2])
 
     return b58encode_chk(prefix + payload + suffix)
 
diff --git a/doc/release-notes.md b/doc/release-notes.md
index faf879084f50..a27374915620 100644
--- a/doc/release-notes.md
+++ b/doc/release-notes.md
@@ -86,6 +86,11 @@ See detailed [change log](https://github.com/dashpay/dash/compare/v0.12.3.1...da
 - [`f833e2ed6`](https://github.com/dashpay/dash/commit/f833e2ed6) Bump to 0.12.3.2 (#2173)
 
 
+Python Support
+--------------
+
+Support for Python 2 has been discontinued for all test files and tools.
+
 Credits
 =======
 
diff --git a/share/qt/extract_strings_qt.py b/share/qt/extract_strings_qt.py
index 43b43e76c7cd..811c88f5a3a1 100755
--- a/share/qt/extract_strings_qt.py
+++ b/share/qt/extract_strings_qt.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # Copyright (c) 2012-2016 The Bitcoin Core developers
 # Distributed under the MIT software license, see the accompanying
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
@@ -6,7 +6,6 @@
 Extract _("...") strings for translation and convert to Qt stringdefs so that
 they can be picked up by Qt linguist.
 '''
-from __future__ import division,print_function,unicode_literals
 from subprocess import Popen, PIPE
 import operator
 import os
diff --git a/share/rpcuser/rpcuser.py b/share/rpcuser/rpcuser.py
index f806a810e08c..ab3d8c4ed3de 100755
--- a/share/rpcuser/rpcuser.py
+++ b/share/rpcuser/rpcuser.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2 
+#!/usr/bin/env python3
 # Copyright (c) 2015 The Bitcoin Core developers
 # Distributed under the MIT software license, see the accompanying 
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.

From 1767e3457edbf685c5dce27611f5c9b503a0be5e Mon Sep 17 00:00:00 2001
From: gladcow <sergey@dash.org>
Date: Mon, 13 Aug 2018 23:21:21 +0300
Subject: [PATCH 047/400] Save/load spork cache (#2206)

* CSporkManager class serialization

* Read/write sporks.dat file

* Move mapSporks into CSporkManager and serialize it

* fix GetSporkByHash

* spork tests

* add missed cs lock

* clear mapSporksByHash in CSporkManager::Clear

* use spork active rpc call to hide spork inner logic

* set small pause between rpc calls in cycles
---
 qa/pull-tester/rpc-tests.py |  1 +
 qa/rpc-tests/sporks.py      | 87 +++++++++++++++++++++++++++++++++++++
 src/init.cpp                |  9 ++++
 src/net_processing.cpp      | 10 +++--
 src/spork.cpp               | 35 +++++++++++++--
 src/spork.h                 | 23 ++++++++--
 6 files changed, 156 insertions(+), 9 deletions(-)
 create mode 100755 qa/rpc-tests/sporks.py

diff --git a/qa/pull-tester/rpc-tests.py b/qa/pull-tester/rpc-tests.py
index 3d2916d0d368..2bd823f688ac 100755
--- a/qa/pull-tester/rpc-tests.py
+++ b/qa/pull-tester/rpc-tests.py
@@ -167,6 +167,7 @@
     'listsinceblock.py',
     'p2p-leaktests.py',
     'p2p-compactblocks.py',
+    'sporks.py',
 ]
 if ENABLE_ZMQ:
     testScripts.append('zmq_test.py')
diff --git a/qa/rpc-tests/sporks.py b/qa/rpc-tests/sporks.py
new file mode 100755
index 000000000000..ceae32914d2f
--- /dev/null
+++ b/qa/rpc-tests/sporks.py
@@ -0,0 +1,87 @@
+#!/usr/bin/env python3
+# Copyright (c) 2018 The Dash Core developers
+# Distributed under the MIT software license, see the accompanying
+# file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+from test_framework.mininode import *
+from test_framework.test_framework import BitcoinTestFramework
+from test_framework.util import *
+from time import *
+
+'''
+'''
+
+class SporkTest(BitcoinTestFramework):
+    def __init__(self):
+        super().__init__()
+        self.num_nodes = 3
+        self.setup_clean_chain = True
+        self.is_network_split = False
+
+    def setup_network(self):
+        self.nodes = []
+        self.nodes.append(start_node(0, self.options.tmpdir,
+                                     ["-debug", "-sporkkey=cP4EKFyJsHT39LDqgdcB43Y3YXjNyjb5Fuas1GQSeAtjnZWmZEQK"]))
+        self.nodes.append(start_node(1, self.options.tmpdir,
+                                     ["-debug"]))
+        self.nodes.append(start_node(2, self.options.tmpdir,
+                                     ["-debug"]))
+        # connect only 2 first nodes at start
+        connect_nodes(self.nodes[0], 1)
+
+    def get_test_spork_state(self, node):
+        info = node.spork('active')
+        # use InstantSend spork for tests
+        return info['SPORK_2_INSTANTSEND_ENABLED']
+
+    def set_test_spork_state(self, node, state):
+        if state:
+            value = 0
+        else:
+            value = 4070908800
+        # use InstantSend spork for tests
+        node.spork('SPORK_2_INSTANTSEND_ENABLED', value)
+
+    def run_test(self):
+        # check test spork default state
+        assert(self.get_test_spork_state(self.nodes[0]))
+        assert(self.get_test_spork_state(self.nodes[1]))
+        assert(self.get_test_spork_state(self.nodes[2]))
+
+        # check spork propagation for connected nodes
+        self.set_test_spork_state(self.nodes[0], False)
+        start = time()
+        sent = False
+        while True:
+            if not self.get_test_spork_state(self.nodes[1]):
+                sent = True
+                break
+            if time() > start + 10:
+                break
+            sleep(0.1)
+        assert(sent)
+
+        # restart nodes to check spork persistence
+        stop_node(self.nodes[0], 0)
+        stop_node(self.nodes[1], 1)
+        self.nodes[0] = start_node(0, self.options.tmpdir, ["-debug"])
+        self.nodes[1] = start_node(1, self.options.tmpdir, ["-debug"])
+        assert(not self.get_test_spork_state(self.nodes[0]))
+        assert(not self.get_test_spork_state(self.nodes[1]))
+
+        # connect new node and check spork propagation after restoring from cache
+        connect_nodes(self.nodes[1], 2)
+        start = time()
+        sent = False
+        while True:
+            if not self.get_test_spork_state(self.nodes[2]):
+                sent = True
+                break
+            if time() > start + 10:
+                break
+            sleep(0.1)
+        assert(sent)
+
+
+if __name__ == '__main__':
+    SporkTest().main()
diff --git a/src/init.cpp b/src/init.cpp
index f88419bf27b8..187e7555fe2b 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -261,6 +261,8 @@ void PrepareShutdown()
             CFlatDB<CInstantSend> flatdb5("instantsend.dat", "magicInstantSendCache");
             flatdb5.Dump(instantsend);
         }
+        CFlatDB<CSporkManager> flatdb6("sporks.dat", "magicSporkCache");
+        flatdb6.Dump(sporkManager);
     }
 
     UnregisterNodeSignals(GetNodeSignals());
@@ -1960,6 +1962,13 @@ bool AppInitMain(boost::thread_group& threadGroup, CScheduler& scheduler)
                 return InitError(_("Failed to load InstantSend data cache from") + "\n" + (pathDB / strDBName).string());
             }
         }
+
+        strDBName = "sporks.dat";
+        uiInterface.InitMessage(_("Loading sporks cache..."));
+        CFlatDB<CSporkManager> flatdb6(strDBName, "magicSporkCache");
+        if(!flatdb6.Load(sporkManager)) {
+            return InitError(_("Failed to load sporks cache from") + "\n" + (pathDB / strDBName).string());
+        }
     }
 
 
diff --git a/src/net_processing.cpp b/src/net_processing.cpp
index 7fb8f1202b63..2373141cb74f 100644
--- a/src/net_processing.cpp
+++ b/src/net_processing.cpp
@@ -929,7 +929,10 @@ bool static AlreadyHave(const CInv& inv) EXCLUSIVE_LOCKS_REQUIRED(cs_main)
         return instantsend.AlreadyHave(inv.hash);
 
     case MSG_SPORK:
-        return mapSporks.count(inv.hash);
+        {
+            CSporkMessage spork;
+            return sporkManager.GetSporkByHash(inv.hash, spork);
+        }
 
     case MSG_MASTERNODE_PAYMENT_VOTE:
         return mnpayments.mapMasternodePaymentVotes.count(inv.hash);
@@ -1165,8 +1168,9 @@ void static ProcessGetData(CNode* pfrom, const Consensus::Params& consensusParam
                 }
 
                 if (!push && inv.type == MSG_SPORK) {
-                    if(mapSporks.count(inv.hash)) {
-                        connman.PushMessage(pfrom, msgMaker.Make(NetMsgType::SPORK, mapSporks[inv.hash]));
+                    CSporkMessage spork;
+                    if(sporkManager.GetSporkByHash(inv.hash, spork)) {
+                        connman.PushMessage(pfrom, msgMaker.Make(NetMsgType::SPORK, spork));
                         push = true;
                     }
                 }
diff --git a/src/spork.cpp b/src/spork.cpp
index bc86c396f66e..dd8ed7c07f5a 100644
--- a/src/spork.cpp
+++ b/src/spork.cpp
@@ -15,7 +15,6 @@
 
 CSporkManager sporkManager;
 
-std::map<uint256, CSporkMessage> mapSporks;
 std::map<int, int64_t> mapSporkDefaults = {
     {SPORK_2_INSTANTSEND_ENABLED,            0},             // ON
     {SPORK_3_INSTANTSEND_BLOCK_FILTERING,    0},             // ON
@@ -28,6 +27,15 @@ std::map<int, int64_t> mapSporkDefaults = {
     {SPORK_14_REQUIRE_SENTINEL_FLAG,         4070908800ULL}, // OFF
 };
 
+void CSporkManager::Clear()
+{
+    LOCK(cs);
+    mapSporksActive.clear();
+    mapSporksByHash.clear();
+    sporkPubKeyID.SetNull();
+    sporkPrivKey = CKey();
+}
+
 void CSporkManager::ProcessSpork(CNode* pfrom, const std::string& strCommand, CDataStream& vRecv, CConnman& connman)
 {
     if(fLiteMode) return; // disable all Dash specific functionality
@@ -69,7 +77,7 @@ void CSporkManager::ProcessSpork(CNode* pfrom, const std::string& strCommand, CD
 
         {
             LOCK(cs); // make sure to not lock this together with cs_main
-            mapSporks[hash] = spork;
+            mapSporksByHash[hash] = spork;
             mapSporksActive[spork.nSporkID] = spork;
         }
         spork.Relay(connman);
@@ -122,7 +130,7 @@ bool CSporkManager::UpdateSpork(int nSporkID, int64_t nValue, CConnman& connman)
     if(spork.Sign(sporkPrivKey)) {
         spork.Relay(connman);
         LOCK(cs);
-        mapSporks[spork.GetHash()] = spork;
+        mapSporksByHash[spork.GetHash()] = spork;
         mapSporksActive[nSporkID] = spork;
         return true;
     }
@@ -197,6 +205,20 @@ std::string CSporkManager::GetSporkNameByID(int nSporkID)
     }
 }
 
+bool CSporkManager::GetSporkByHash(const uint256& hash, CSporkMessage &sporkRet)
+{
+    LOCK(cs);
+
+    const auto it = mapSporksByHash.find(hash);
+
+    if (it == mapSporksByHash.end())
+        return false;
+
+    sporkRet = it->second;
+
+    return true;
+}
+
 bool CSporkManager::SetSporkAddress(const std::string& strAddress) {
     LOCK(cs);
     CBitcoinAddress address(strAddress);
@@ -235,6 +257,13 @@ bool CSporkManager::SetPrivKey(const std::string& strPrivKey)
     }
 }
 
+std::string CSporkManager::ToString() const
+{
+    LOCK(cs);
+    return strprintf("Sporks: %llu", mapSporksActive.size());
+}
+
+
 uint256 CSporkMessage::GetHash() const
 {
     return SerializeHash(*this);
diff --git a/src/spork.h b/src/spork.h
index a627ef35e049..338fed334719 100644
--- a/src/spork.h
+++ b/src/spork.h
@@ -31,7 +31,6 @@ static const int SPORK_START                                            = SPORK_
 static const int SPORK_END                                              = SPORK_14_REQUIRE_SENTINEL_FLAG;
 
 extern std::map<int, int64_t> mapSporkDefaults;
-extern std::map<uint256, CSporkMessage> mapSporks;
 extern CSporkManager sporkManager;
 
 //
@@ -86,8 +85,8 @@ class CSporkMessage
 class CSporkManager
 {
 private:
-    CCriticalSection cs;
-    std::vector<unsigned char> vchSig;
+    mutable CCriticalSection cs;
+    std::map<uint256, CSporkMessage> mapSporksByHash;
     std::map<int, CSporkMessage> mapSporksActive;
 
     CKeyID sporkPubKeyID;
@@ -97,6 +96,20 @@ class CSporkManager
 
     CSporkManager() {}
 
+    ADD_SERIALIZE_METHODS;
+
+    template <typename Stream, typename Operation>
+    inline void SerializationOp(Stream& s, Operation ser_action) {
+        READWRITE(sporkPubKeyID);
+        READWRITE(mapSporksByHash);
+        READWRITE(mapSporksActive);
+        // we don't serialize private key to prevent its leakage
+    }
+
+    void Clear();
+    /// Dummy implementation for CFlatDB
+    void CheckAndRemove() {}
+
     void ProcessSpork(CNode* pfrom, const std::string& strCommand, CDataStream& vRecv, CConnman& connman);
     void ExecuteSpork(int nSporkID, int nValue);
     bool UpdateSpork(int nSporkID, int64_t nValue, CConnman& connman);
@@ -106,8 +119,12 @@ class CSporkManager
     int GetSporkIDByName(const std::string& strName);
     std::string GetSporkNameByID(int nSporkID);
 
+    bool GetSporkByHash(const uint256& hash, CSporkMessage &sporkRet);
+
     bool SetSporkAddress(const std::string& strAddress);
     bool SetPrivKey(const std::string& strPrivKey);
+
+    std::string ToString() const;
 };
 
 #endif

From c09f57bd78eb8415e9f17a39838b124889eb5203 Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Mon, 13 Aug 2018 22:21:42 +0200
Subject: [PATCH 048/400] Backport move to Ubuntu Bionic and GCC7 in Gitian
 builds (#2225)

* Add stdin, stdout, stderr to ignored export list

* Merge #13171: Change gitian-descriptors to use bionic instead

c1afe3232fa10e290fb355cf37ea4c7bc1084065 Change gitian-descriptors to use bionic instead (Chun Kuan Lee)

Pull request description:

  I have tested this with Ubuntu Bionic host with lxc 3.0.0, the gitian-build for Windows and MacOSX work fine, but there is an issue about it for Linux. Failed at check-symbol:
  ```
  test/test_bitcoin: symbol __divmoddi4 from unsupported version GCC_7.0.0
  test/test_bitcoin: symbol log2f from unsupported version GLIBC_2.27
  qt/bitcoin-qt: symbol __divmoddi4 from unsupported version GCC_7.0.0
  qt/bitcoin-qt: symbol log2f from unsupported version GLIBC_2.27
  ```
  I think this should be fixed in `./configure --enable-glibc-back-compat`

  Should not be merged before #13177 devrandom/gitian-builder#178

  Close #12511

Tree-SHA512: 257d75d5b6864e105279f7a7b992fbbd7903cdbe3300b66dacec0a783d267707d9dbbfe0e64a36983ca1eca50a2a5e1cdb222b6d3745ccc3e5fc5636c88b581f

* Use IN6ADDR_ANY_INIT instead of in6addr_any

This is the same fix as https://github.com/bitcoin/bitcoin/commit/fc6a9f2ab18ca8466d65d14c263c4f78f9ccebbf
Couldn't backport the original commit as we are missing some refactorings.
---
 contrib/devtools/symbol-check.py                 |  2 +-
 contrib/gitian-build.sh                          |  6 +++---
 contrib/gitian-descriptors/gitian-linux.yml      | 16 ++++++++--------
 contrib/gitian-descriptors/gitian-osx-signer.yml |  2 +-
 contrib/gitian-descriptors/gitian-osx.yml        |  4 ++--
 contrib/gitian-descriptors/gitian-win-signer.yml |  2 +-
 contrib/gitian-descriptors/gitian-win.yml        |  9 +++++----
 src/init.cpp                                     |  2 +-
 8 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/contrib/devtools/symbol-check.py b/contrib/devtools/symbol-check.py
index c23ee5624c00..c945fcbde94d 100755
--- a/contrib/devtools/symbol-check.py
+++ b/contrib/devtools/symbol-check.py
@@ -46,7 +46,7 @@
 
 # Ignore symbols that are exported as part of every executable
 IGNORE_EXPORTS = {
-'_edata', '_end', '_init', '__bss_start', '_fini', '_IO_stdin_used'
+'_edata', '_end', '_init', '__bss_start', '_fini', '_IO_stdin_used', 'stdin', 'stdout', 'stderr'
 }
 READELF_CMD = os.getenv('READELF', '/usr/bin/readelf')
 CPPFILT_CMD = os.getenv('CPPFILT', '/usr/bin/c++filt')
diff --git a/contrib/gitian-build.sh b/contrib/gitian-build.sh
index b0d9b5ca485e..8044fbf57575 100755
--- a/contrib/gitian-build.sh
+++ b/contrib/gitian-build.sh
@@ -259,13 +259,13 @@ then
     if [[ -n "$USE_LXC" ]]
     then
         sudo apt-get install lxc
-        bin/make-base-vm --suite trusty --arch amd64 --lxc
+        bin/make-base-vm --suite bionic --arch amd64 --lxc
     elif [[ -n "$USE_DOCKER" ]]
     then
         sudo apt-get install docker-ce
-        bin/make-base-vm --suite trusty --arch amd64 --docker
+        bin/make-base-vm --suite bionic --arch amd64 --docker
     else
-        bin/make-base-vm --suite trusty --arch amd64
+        bin/make-base-vm --suite bionic --arch amd64
     fi
     popd
 fi
diff --git a/contrib/gitian-descriptors/gitian-linux.yml b/contrib/gitian-descriptors/gitian-linux.yml
index f69f7063203c..f9993948c4d0 100755
--- a/contrib/gitian-descriptors/gitian-linux.yml
+++ b/contrib/gitian-descriptors/gitian-linux.yml
@@ -2,23 +2,23 @@
 name: "dash-linux-0.12"
 enable_cache: true
 suites:
-- "trusty"
+- "bionic"
 architectures:
 - "amd64"
 packages:
 - "curl"
 - "g++-aarch64-linux-gnu"
-- "g++-4.8-aarch64-linux-gnu"
-- "gcc-4.8-aarch64-linux-gnu"
+- "g++-7-aarch64-linux-gnu"
+- "gcc-7-aarch64-linux-gnu"
 - "binutils-aarch64-linux-gnu"
 - "g++-arm-linux-gnueabihf"
-- "g++-4.8-arm-linux-gnueabihf"
-- "gcc-4.8-arm-linux-gnueabihf"
+- "g++-7-arm-linux-gnueabihf"
+- "gcc-7-arm-linux-gnueabihf"
 - "binutils-arm-linux-gnueabihf"
-- "g++-4.8-multilib"
-- "gcc-4.8-multilib"
+- "g++-7-multilib"
+- "gcc-7-multilib"
 - "binutils-gold"
-- "git-core"
+- "git"
 - "pkg-config"
 - "autoconf"
 - "libtool"
diff --git a/contrib/gitian-descriptors/gitian-osx-signer.yml b/contrib/gitian-descriptors/gitian-osx-signer.yml
index 8fb6beeda8e2..214c5425ff63 100644
--- a/contrib/gitian-descriptors/gitian-osx-signer.yml
+++ b/contrib/gitian-descriptors/gitian-osx-signer.yml
@@ -1,7 +1,7 @@
 ---
 name: "dash-dmg-signer"
 suites:
-- "trusty"
+- "bionic"
 architectures:
 - "amd64"
 packages:
diff --git a/contrib/gitian-descriptors/gitian-osx.yml b/contrib/gitian-descriptors/gitian-osx.yml
index 28097c609a53..5218e9047dfc 100644
--- a/contrib/gitian-descriptors/gitian-osx.yml
+++ b/contrib/gitian-descriptors/gitian-osx.yml
@@ -2,14 +2,14 @@
 name: "dash-osx-0.12"
 enable_cache: true
 suites:
-- "trusty"
+- "bionic"
 architectures:
 - "amd64"
 packages:
 - "ca-certificates"
 - "curl"
 - "g++"
-- "git-core"
+- "git"
 - "pkg-config"
 - "autoconf"
 - "librsvg2-bin"
diff --git a/contrib/gitian-descriptors/gitian-win-signer.yml b/contrib/gitian-descriptors/gitian-win-signer.yml
index 16750642cb11..feb94ff920c8 100644
--- a/contrib/gitian-descriptors/gitian-win-signer.yml
+++ b/contrib/gitian-descriptors/gitian-win-signer.yml
@@ -1,7 +1,7 @@
 ---
 name: "dash-win-signer"
 suites:
-- "trusty"
+- "bionic"
 architectures:
 - "amd64"
 packages:
diff --git a/contrib/gitian-descriptors/gitian-win.yml b/contrib/gitian-descriptors/gitian-win.yml
index a19c6bbd0946..1fc5afa1833d 100755
--- a/contrib/gitian-descriptors/gitian-win.yml
+++ b/contrib/gitian-descriptors/gitian-win.yml
@@ -2,13 +2,13 @@
 name: "dash-win-0.12"
 enable_cache: true
 suites:
-- "trusty"
+- "bionic"
 architectures:
 - "amd64"
 packages:
 - "curl"
 - "g++"
-- "git-core"
+- "git"
 - "pkg-config"
 - "autoconf"
 - "libtool"
@@ -22,6 +22,7 @@ packages:
 - "ca-certificates"
 - "python"
 - "python3"
+- "rename"
 remotes:
 - "url": "https://github.com/dashpay/dash.git"
   "dir": "dash"
@@ -30,7 +31,7 @@ script: |
   WRAP_DIR=$HOME/wrapped
   HOSTS="i686-w64-mingw32 x86_64-w64-mingw32"
   CONFIGFLAGS="--enable-reduce-exports --disable-bench --disable-gui-tests"
-  FAKETIME_HOST_PROGS="g++ ar ranlib nm windres strip objcopy"
+  FAKETIME_HOST_PROGS="ar ranlib nm windres strip objcopy"
   FAKETIME_PROGS="date makensis zip"
   HOST_CFLAGS="-O2 -g"
   HOST_CXXFLAGS="-O2 -g"
@@ -109,7 +110,7 @@ script: |
     for prog in gcc g++; do
         echo '#!/bin/bash' > ${WRAP_DIR}/${i}-${prog}
         echo "# GCCVERSION=${GCCVERSION}" >> ${WRAP_DIR}/${i}-${prog}
-        echo "REAL=\`which -a ${i}-${prog} | grep -v ${WRAP_DIR}/${i}-${prog} | head -1\`" >> ${WRAP_DIR}/${i}-${prog}
+        echo "REAL=\`which -a ${i}-${prog}-posix | grep -v ${WRAP_DIR}/${i}-${prog} | head -1\`" >> ${WRAP_DIR}/${i}-${prog}
         echo '# Add the gcc version to the wrapper so that ccache takes this into account (we use CCACHE_COMPILERCHECK=content)' >> ${WRAP_DIR}/${i}-${prog}
         echo "# `${prog} --version | head -1`" >> ${WRAP_DIR}/${i}-${prog}
         echo 'export LD_PRELOAD=/usr/lib/x86_64-linux-gnu/faketime/libfaketime.so.1' >> ${WRAP_DIR}/${i}-${prog}
diff --git a/src/init.cpp b/src/init.cpp
index 187e7555fe2b..26b80208ddec 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -1546,7 +1546,7 @@ bool AppInitMain(boost::thread_group& threadGroup, CScheduler& scheduler)
         if (!mapMultiArgs.count("-bind") && !mapMultiArgs.count("-whitebind")) {
             struct in_addr inaddr_any;
             inaddr_any.s_addr = INADDR_ANY;
-            fBound |= Bind(connman, CService(in6addr_any, GetListenPort()), BF_NONE);
+            fBound |= Bind(connman, CService((in6_addr)IN6ADDR_ANY_INIT, GetListenPort()), BF_NONE);
             fBound |= Bind(connman, CService(inaddr_any, GetListenPort()), !fBound ? BF_REPORT_ERROR : BF_NONE);
         }
         if (!fBound)

From 50eb98d9017b99579d0150197a479cb754c69b56 Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Tue, 14 Aug 2018 11:58:38 +0200
Subject: [PATCH 049/400] Prepare for DIP3 operator reward payments and switch
 to array in getblocktemplate (#2216)

* Prepare for DIP3 operator reward payments and switch to array in getblocktemplate

This commit allows to later split MN rewards into multiple recipients, e.g.
the owner reward and operator reward. It also updates the getblocktemplate
output to return an array of MN payments instead of a single entry.

This should allow MN miners and pool operators to prepare themself for the
upcoming changes in regard to operator rewards.

* txoutsMasternode -> voutMasternode

* More renaming

* Consider all masternode payments when looking for a known masternode
---
 src/masternode-payments.cpp | 108 ++++++++++++++++++++++++------------
 src/masternode-payments.h   |   6 +-
 src/miner.cpp               |   4 +-
 src/miner.h                 |   4 +-
 src/rpc/mining.cpp          |  34 +++++++-----
 src/validation.cpp          |  13 ++++-
 6 files changed, 109 insertions(+), 60 deletions(-)

diff --git a/src/masternode-payments.cpp b/src/masternode-payments.cpp
index dd28b5e41011..e4894e4ea68f 100644
--- a/src/masternode-payments.cpp
+++ b/src/masternode-payments.cpp
@@ -205,14 +205,14 @@ bool IsBlockPayeeValid(const CTransaction& txNew, int nBlockHeight, CAmount bloc
     return true;
 }
 
-void FillBlockPayments(CMutableTransaction& txNew, int nBlockHeight, CAmount blockReward, CTxOut& txoutMasternodeRet, std::vector<CTxOut>& voutSuperblockRet)
+void FillBlockPayments(CMutableTransaction& txNew, int nBlockHeight, CAmount blockReward, std::vector<CTxOut>& voutMasternodePaymentsRet, std::vector<CTxOut>& voutSuperblockPaymentsRet)
 {
     // only create superblocks if spork is enabled AND if superblock is actually triggered
     // (height should be validated inside)
     if(sporkManager.IsSporkActive(SPORK_9_SUPERBLOCKS_ENABLED) &&
         CSuperblockManager::IsSuperblockTriggered(nBlockHeight)) {
             LogPrint("gobject", "%s -- triggered superblock creation at height %d\n", __func__, nBlockHeight);
-            CSuperblockManager::GetSuperblockPayments(nBlockHeight, voutSuperblockRet);
+            CSuperblockManager::GetSuperblockPayments(nBlockHeight, voutSuperblockPaymentsRet);
     }
 
     // TODO this is a placeholder until DIP3 is merged, which will allow superblock payments and MN reward payments
@@ -221,24 +221,30 @@ void FillBlockPayments(CMutableTransaction& txNew, int nBlockHeight, CAmount blo
     bool allowSuperblockAndMNReward = false;
 
     // don't allow payments to superblocks AND masternodes before spork15 activation
-    if (!voutSuperblockRet.empty() && !allowSuperblockAndMNReward) {
-        txNew.vout.insert(txNew.vout.end(), voutSuperblockRet.begin(), voutSuperblockRet.end());
+    if (!voutSuperblockPaymentsRet.empty() && !allowSuperblockAndMNReward) {
+        txNew.vout.insert(txNew.vout.end(), voutSuperblockPaymentsRet.begin(), voutSuperblockPaymentsRet.end());
         return;
     }
 
-    if (!mnpayments.GetMasternodeTxOut(nBlockHeight, blockReward, txoutMasternodeRet)) {
+    if (!mnpayments.GetMasternodeTxOuts(nBlockHeight, blockReward, voutMasternodePaymentsRet)) {
         // no idea whom to pay (MN list empty?), lets hope for the best
         return;
     }
 
-    txNew.vout.emplace_back(txoutMasternodeRet);
-    txNew.vout.insert(txNew.vout.end(), voutSuperblockRet.begin(), voutSuperblockRet.end());
+    txNew.vout.insert(txNew.vout.end(), voutMasternodePaymentsRet.begin(), voutMasternodePaymentsRet.end());
+    txNew.vout.insert(txNew.vout.end(), voutSuperblockPaymentsRet.begin(), voutSuperblockPaymentsRet.end());
 
-    // subtract MN payment from miner reward
-    txNew.vout[0].nValue -= txoutMasternodeRet.nValue;
+    std::string voutMasternodeStr;
+    for (const auto& txout : voutMasternodePaymentsRet) {
+        // subtract MN payment from miner reward
+        txNew.vout[0].nValue -= txout.nValue;
+        if (!voutMasternodeStr.empty())
+            voutMasternodeStr += ",";
+        voutMasternodeStr += txout.ToString();
+    }
 
-    LogPrint("mnpayments", "%s -- nBlockHeight %d blockReward %lld txoutMasternodeRet %s txNew %s", __func__,
-                            nBlockHeight, blockReward, txoutMasternodeRet.ToString(), txNew.ToString());
+    LogPrint("mnpayments", "%s -- nBlockHeight %d blockReward %lld voutMasternodePaymentsRet \"%s\" txNew %s", __func__,
+                            nBlockHeight, blockReward, voutMasternodeStr, txNew.ToString());
 }
 
 std::string GetRequiredPaymentsString(int nBlockHeight)
@@ -277,19 +283,17 @@ bool CMasternodePayments::UpdateLastVote(const CMasternodePaymentVote& vote)
 }
 
 /**
-*   FillBlockPayee
+*   GetMasternodeTxOuts
 *
-*   Get masternode payment tx output
+*   Get masternode payment tx outputs
 */
 
-bool CMasternodePayments::GetMasternodeTxOut(int nBlockHeight, CAmount blockReward, CTxOut& txoutMasternodeRet) const
+bool CMasternodePayments::GetMasternodeTxOuts(int nBlockHeight, CAmount blockReward, std::vector<CTxOut>& voutMasternodePaymentsRet) const
 {
     // make sure it's not filled yet
-    txoutMasternodeRet = CTxOut();
-
-    CScript payee;
+    voutMasternodePaymentsRet.clear();
 
-    if(!GetBlockPayee(nBlockHeight, payee)) {
+    if(!GetBlockTxOuts(nBlockHeight, blockReward, voutMasternodePaymentsRet)) {
         // no masternode detected...
         int nCount = 0;
         masternode_info_t mnInfo;
@@ -299,18 +303,18 @@ bool CMasternodePayments::GetMasternodeTxOut(int nBlockHeight, CAmount blockRewa
             return false;
         }
         // fill payee with locally calculated winner and hope for the best
-        payee = GetScriptForDestination(mnInfo.keyIDCollateralAddress);
+        CScript payee = GetScriptForDestination(mnInfo.keyIDCollateralAddress);
+        CAmount masternodePayment = GetMasternodePayment(nBlockHeight, blockReward);
+        voutMasternodePaymentsRet.emplace_back(masternodePayment, payee);
     }
 
-    // GET MASTERNODE PAYMENT VARIABLES SETUP
-    CAmount masternodePayment = GetMasternodePayment(nBlockHeight, blockReward);
-    txoutMasternodeRet = CTxOut(masternodePayment, payee);
-
-    CTxDestination address1;
-    ExtractDestination(payee, address1);
-    CBitcoinAddress address2(address1);
+    for (const auto& txout : voutMasternodePaymentsRet) {
+        CTxDestination address1;
+        ExtractDestination(txout.scriptPubKey, address1);
+        CBitcoinAddress address2(address1);
 
-    LogPrintf("CMasternodePayments::%s -- Masternode payment %lld to %s\n", __func__, masternodePayment, address2.ToString());
+        LogPrintf("CMasternodePayments::%s -- Masternode payment %lld to %s\n", __func__, txout.nValue, address2.ToString());
+    }
 
     return true;
 }
@@ -504,12 +508,20 @@ bool CMasternodePaymentVote::Sign()
     return true;
 }
 
-bool CMasternodePayments::GetBlockPayee(int nBlockHeight, CScript& payeeRet) const
+bool CMasternodePayments::GetBlockTxOuts(int nBlockHeight, CAmount blockReward, std::vector<CTxOut>& voutMasternodePaymentsRet) const
 {
-    LOCK(cs_mapMasternodeBlocks);
+    voutMasternodePaymentsRet.clear();
+
+    CAmount masternodeReward = GetMasternodePayment(nBlockHeight, blockReward);
 
+    LOCK(cs_mapMasternodeBlocks);
     auto it = mapMasternodeBlocks.find(nBlockHeight);
-    return it != mapMasternodeBlocks.end() && it->second.GetBestPayee(payeeRet);
+    CScript payee;
+    if (it == mapMasternodeBlocks.end() || !it->second.GetBestPayee(payee)) {
+        return false;
+    }
+    voutMasternodePaymentsRet.emplace_back(masternodeReward, payee);
+    return true;
 }
 
 // Is this masternode scheduled to get paid soon?
@@ -523,11 +535,14 @@ bool CMasternodePayments::IsScheduled(const masternode_info_t& mnInfo, int nNotB
     CScript mnpayee;
     mnpayee = GetScriptForDestination(mnInfo.keyIDCollateralAddress);
 
-    CScript payee;
     for(int64_t h = nCachedBlockHeight; h <= nCachedBlockHeight + 8; h++){
         if(h == nNotBlockHeight) continue;
-        if(GetBlockPayee(h, payee) && mnpayee == payee) {
-            return true;
+        std::vector<CTxOut> voutMasternodePayments;
+        if(GetBlockTxOuts(h, 0, voutMasternodePayments)) {
+            for (const auto& txout : voutMasternodePayments) {
+                if (txout.scriptPubKey == mnpayee)
+                    return true;
+            }
         }
     }
 
@@ -691,9 +706,30 @@ std::string CMasternodePayments::GetRequiredPaymentsString(int nBlockHeight) con
 
 bool CMasternodePayments::IsTransactionValid(const CTransaction& txNew, int nBlockHeight, CAmount blockReward) const
 {
-    LOCK(cs_mapMasternodeBlocks);
-    const auto it = mapMasternodeBlocks.find(nBlockHeight);
-    return it == mapMasternodeBlocks.end() ? true : it->second.IsTransactionValid(txNew);
+    std::vector<CTxOut> voutMasternodePayments;
+    if (!GetBlockTxOuts(nBlockHeight, blockReward, voutMasternodePayments)) {
+        LogPrintf("CMasternodePayments::%s -- ERROR failed to get payees for block at height %s\n", __func__, nBlockHeight);
+        return false;
+    }
+
+    for (const auto& txout : voutMasternodePayments) {
+        bool found = false;
+        for (const auto& txout2 : txNew.vout) {
+            if (txout == txout2) {
+                found = true;
+                break;
+            }
+        }
+        if (!found) {
+            CTxDestination dest;
+            if (!ExtractDestination(txout.scriptPubKey, dest))
+                assert(false);
+            LogPrintf("CMasternodePayments::%s -- ERROR failed to find expected payee %s in block at height %s\n", __func__, CBitcoinAddress(dest).ToString(), nBlockHeight);
+            return false;
+        }
+    }
+
+    return true;
 }
 
 void CMasternodePayments::CheckAndRemove()
diff --git a/src/masternode-payments.h b/src/masternode-payments.h
index dca936a12378..93d25901627b 100644
--- a/src/masternode-payments.h
+++ b/src/masternode-payments.h
@@ -35,7 +35,7 @@ extern CMasternodePayments mnpayments;
 /// TODO: all 4 functions do not belong here really, they should be refactored/moved somewhere (main.cpp ?)
 bool IsBlockValueValid(const CBlock& block, int nBlockHeight, CAmount blockReward, std::string& strErrorRet);
 bool IsBlockPayeeValid(const CTransaction& txNew, int nBlockHeight, CAmount blockReward);
-void FillBlockPayments(CMutableTransaction& txNew, int nBlockHeight, CAmount blockReward, CTxOut& txoutMasternodeRet, std::vector<CTxOut>& voutSuperblockRet);
+void FillBlockPayments(CMutableTransaction& txNew, int nBlockHeight, CAmount blockReward, std::vector<CTxOut>& voutMasternodePaymentsRet, std::vector<CTxOut>& voutSuperblockPaymentsRet);
 std::string GetRequiredPaymentsString(int nBlockHeight);
 
 class CMasternodePayee
@@ -213,7 +213,7 @@ class CMasternodePayments
     void RequestLowDataPaymentBlocks(CNode* pnode, CConnman& connman) const;
     void CheckAndRemove();
 
-    bool GetBlockPayee(int nBlockHeight, CScript& payeeRet) const;
+    bool GetBlockTxOuts(int nBlockHeight, CAmount blockReward, std::vector<CTxOut>& voutMasternodePaymentsRet) const;
     bool IsTransactionValid(const CTransaction& txNew, int nBlockHeight, CAmount blockReward) const;
     bool IsScheduled(const masternode_info_t& mnInfo, int nNotBlockHeight) const;
 
@@ -222,7 +222,7 @@ class CMasternodePayments
     int GetMinMasternodePaymentsProto() const;
     void ProcessMessage(CNode* pfrom, const std::string& strCommand, CDataStream& vRecv, CConnman& connman);
     std::string GetRequiredPaymentsString(int nBlockHeight) const;
-    bool GetMasternodeTxOut(int nBlockHeight, CAmount blockReward, CTxOut& txoutMasternodeRet) const;
+    bool GetMasternodeTxOuts(int nBlockHeight, CAmount blockReward, std::vector<CTxOut>& voutMasternodePaymentsRet) const;
     std::string ToString() const;
 
     int GetBlockCount() const { return mapMasternodeBlocks.size(); }
diff --git a/src/miner.cpp b/src/miner.cpp
index 82f1df413cb5..73a127125338 100644
--- a/src/miner.cpp
+++ b/src/miner.cpp
@@ -170,9 +170,9 @@ std::unique_ptr<CBlockTemplate> BlockAssembler::CreateNewBlock(const CScript& sc
 
     // Update coinbase transaction with additional info about masternode and governance payments,
     // get some info back to pass to getblocktemplate
-    FillBlockPayments(coinbaseTx, nHeight, blockReward, pblocktemplate->txoutMasternode, pblocktemplate->voutSuperblock);
+    FillBlockPayments(coinbaseTx, nHeight, blockReward, pblocktemplate->voutMasternodePayments, pblocktemplate->voutSuperblockPayments);
     // LogPrintf("CreateNewBlock -- nBlockHeight %d blockReward %lld txoutMasternode %s coinbaseTx %s",
-    //             nHeight, blockReward, pblocktemplate->txoutMasternode.ToString(), coinbaseTx.ToString());
+    //             nHeight, blockReward, pblocktemplate->txoutsMasternode.ToString(), coinbaseTx.ToString());
 
     pblock->vtx[0] = MakeTransactionRef(std::move(coinbaseTx));
     pblocktemplate->vTxFees[0] = -nFees;
diff --git a/src/miner.h b/src/miner.h
index 427635057c41..9b78776a00d5 100644
--- a/src/miner.h
+++ b/src/miner.h
@@ -31,8 +31,8 @@ struct CBlockTemplate
     std::vector<CAmount> vTxFees;
     std::vector<int64_t> vTxSigOps;
     uint32_t nPrevBits; // nBits of previous block (for subsidy calculation)
-    CTxOut txoutMasternode; // masternode payment
-    std::vector<CTxOut> voutSuperblock; // superblock payment
+    std::vector<CTxOut> voutMasternodePayments; // masternode payment
+    std::vector<CTxOut> voutSuperblockPayments; // superblock payment
 };
 
 // Container for tracking updates to ancestor feerate as we include (parent)
diff --git a/src/rpc/mining.cpp b/src/rpc/mining.cpp
index 9e4a029010ff..b0f83b225bc3 100644
--- a/src/rpc/mining.cpp
+++ b/src/rpc/mining.cpp
@@ -387,10 +387,12 @@ UniValue getblocktemplate(const JSONRPCRequest& request)
             "  \"bits\" : \"xxxxxxxx\",              (string) compressed target of next block\n"
             "  \"previousbits\" : \"xxxxxxxx\",      (string) compressed target of current highest block\n"
             "  \"height\" : n                      (numeric) The height of the next block\n"
-            "  \"masternode\" : {                  (json object) required masternode payee that must be included in the next block\n"
-            "      \"payee\" : \"xxxx\",             (string) payee address\n"
-            "      \"script\" : \"xxxx\",            (string) payee scriptPubKey\n"
-            "      \"amount\": n                   (numeric) required amount to pay\n"
+            "  \"masternode\" : [                  (array) required masternode payments that must be included in the next block\n"
+            "      {\n"
+            "         \"payee\" : \"xxxx\",          (string) payee address\n"
+            "         \"script\" : \"xxxx\",         (string) payee scriptPubKey\n"
+            "         \"amount\": n                (numeric) required amount to pay\n"
+            "      }\n"
             "  },\n"
             "  \"masternode_payments_started\" :  true|false, (boolean) true, if masternode payments started\n"
             "  \"masternode_payments_enforced\" : true|false, (boolean) true, if masternode payments are enforced\n"
@@ -491,10 +493,10 @@ UniValue getblocktemplate(const JSONRPCRequest& request)
     }
 
     // when enforcement is on we need information about a masternode payee or otherwise our block is going to be orphaned by the network
-    CScript payee;
+    std::vector<CTxOut> voutMasternodePayments;
     if (sporkManager.IsSporkActive(SPORK_8_MASTERNODE_PAYMENT_ENFORCEMENT)
         && !masternodeSync.IsWinnersListSynced()
-        && !mnpayments.GetBlockPayee(chainActive.Height() + 1, payee))
+        && !mnpayments.GetBlockTxOuts(chainActive.Height() + 1, 0, voutMasternodePayments))
             throw JSONRPCError(RPC_CLIENT_IN_INITIAL_DOWNLOAD, "Dash Core is downloading masternode winners...");
 
     // next bock is a superblock and we need governance info to correctly construct it
@@ -700,22 +702,26 @@ UniValue getblocktemplate(const JSONRPCRequest& request)
     result.push_back(Pair("previousbits", strprintf("%08x", pblocktemplate->nPrevBits)));
     result.push_back(Pair("height", (int64_t)(pindexPrev->nHeight+1)));
 
-    UniValue masternodeObj(UniValue::VOBJ);
-    if(pblocktemplate->txoutMasternode != CTxOut()) {
+    UniValue masternodeObj(UniValue::VARR);
+    for (const auto& txout : pblocktemplate->voutMasternodePayments) {
         CTxDestination address1;
-        ExtractDestination(pblocktemplate->txoutMasternode.scriptPubKey, address1);
+        ExtractDestination(txout.scriptPubKey, address1);
         CBitcoinAddress address2(address1);
-        masternodeObj.push_back(Pair("payee", address2.ToString().c_str()));
-        masternodeObj.push_back(Pair("script", HexStr(pblocktemplate->txoutMasternode.scriptPubKey)));
-        masternodeObj.push_back(Pair("amount", pblocktemplate->txoutMasternode.nValue));
+
+        UniValue obj(UniValue::VOBJ);
+        obj.push_back(Pair("payee", address2.ToString().c_str()));
+        obj.push_back(Pair("script", HexStr(txout.scriptPubKey)));
+        obj.push_back(Pair("amount", txout.nValue));
+        masternodeObj.push_back(obj);
     }
+
     result.push_back(Pair("masternode", masternodeObj));
     result.push_back(Pair("masternode_payments_started", pindexPrev->nHeight + 1 > consensusParams.nMasternodePaymentsStartBlock));
     result.push_back(Pair("masternode_payments_enforced", sporkManager.IsSporkActive(SPORK_8_MASTERNODE_PAYMENT_ENFORCEMENT)));
 
     UniValue superblockObjArray(UniValue::VARR);
-    if(pblocktemplate->voutSuperblock.size()) {
-        for (const auto& txout : pblocktemplate->voutSuperblock) {
+    if(pblocktemplate->voutSuperblockPayments.size()) {
+        for (const auto& txout : pblocktemplate->voutSuperblockPayments) {
             UniValue entry(UniValue::VOBJ);
             CTxDestination address1;
             ExtractDestination(txout.scriptPubKey, address1);
diff --git a/src/validation.cpp b/src/validation.cpp
index d5d9f4d0fc72..73080a4751ab 100644
--- a/src/validation.cpp
+++ b/src/validation.cpp
@@ -1948,13 +1948,20 @@ int32_t ComputeBlockVersion(const CBlockIndex* pindexPrev, const Consensus::Para
         ThresholdState state = VersionBitsState(pindexPrev, params, pos, versionbitscache);
         const struct BIP9DeploymentInfo& vbinfo = VersionBitsDeploymentInfo[pos];
         if (vbinfo.check_mn_protocol && state == THRESHOLD_STARTED && !fAssumeMasternodeIsUpgraded) {
-            CScript payee;
+            std::vector<CTxOut> voutMasternodePayments;
             masternode_info_t mnInfo;
-            if (!mnpayments.GetBlockPayee(pindexPrev->nHeight + 1, payee)) {
+            if (!mnpayments.GetBlockTxOuts(pindexPrev->nHeight + 1, 0, voutMasternodePayments)) {
                 // no votes for this block
                 continue;
             }
-            if (!mnodeman.GetMasternodeInfo(payee, mnInfo)) {
+            bool mnKnown = false;
+            for (const auto& txout : voutMasternodePayments) {
+                if (mnodeman.GetMasternodeInfo(txout.scriptPubKey, mnInfo)) {
+                    mnKnown = true;
+                    break;
+                }
+            }
+            if (!mnKnown) {
                 // unknown masternode
                 continue;
             }

From 3d654b981441d355e8cf4f3606dbf6602fadcae1 Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Tue, 14 Aug 2018 21:36:15 +0200
Subject: [PATCH 050/400] Build bionic base image in Jenkinsfile.gitian &
 update docs (#2226)

* Build bionic base image in Jenkinsfile.gitian

We updated gitian builds to use bionic, so we should also update the Jenkinsfile

* Update docs
---
 Jenkinsfile.gitian                   |  2 +-
 contrib/gitian-descriptors/README.md |  2 +-
 doc/gitian-building.md               | 14 +++++++-------
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/Jenkinsfile.gitian b/Jenkinsfile.gitian
index 27e25693ccbc..7e1a6117f79b 100644
--- a/Jenkinsfile.gitian
+++ b/Jenkinsfile.gitian
@@ -88,7 +88,7 @@ for(int i = 0; i < targets.size(); i++) {
         }
         stage("${target}/base-vm") {
           dir('gitian-builder') {
-            sh "./bin/make-base-vm --suite trusty --arch amd64 --docker"
+            sh "./bin/make-base-vm --suite bionic --arch amd64 --docker"
           }
         }
 
diff --git a/contrib/gitian-descriptors/README.md b/contrib/gitian-descriptors/README.md
index 1660cd3db0ff..7b4993b6694e 100644
--- a/contrib/gitian-descriptors/README.md
+++ b/contrib/gitian-descriptors/README.md
@@ -26,7 +26,7 @@ Once you've got the right hardware and software:
 
     # Create base images
     cd gitian-builder
-    bin/make-base-vm --suite trusty --arch amd64
+    bin/make-base-vm --suite bionic --arch amd64
     cd ..
 
     # Get inputs (see doc/release-process.md for exact inputs needed and where to get them)
diff --git a/doc/gitian-building.md b/doc/gitian-building.md
index 60ea38464d44..2538751a4e14 100644
--- a/doc/gitian-building.md
+++ b/doc/gitian-building.md
@@ -326,7 +326,7 @@ Execute the following as user `debian`:
 
 ```bash
 cd gitian-builder
-bin/make-base-vm --lxc --arch amd64 --suite trusty
+bin/make-base-vm --lxc --arch amd64 --suite bionic
 ```
 
 There will be a lot of warnings printed during the build of the image. These can be ignored.
@@ -378,7 +378,7 @@ Output from `gbuild` will look something like
     Resolving deltas: 100% (41590/41590), done.
     From https://github.com/dashpay/dash
     ... (new tags, new branch etc)
-    --- Building for trusty amd64 ---
+    --- Building for bionic amd64 ---
     Stopping target if it is up
     Making a new image copy
     stdin: is not a tty
@@ -427,14 +427,14 @@ So, if you use LXC:
 export PATH="$PATH":/path/to/gitian-builder/libexec
 export USE_LXC=1
 cd /path/to/gitian-builder
-./libexec/make-clean-vm --suite trusty --arch amd64
+./libexec/make-clean-vm --suite bionic --arch amd64
 
-LXC_ARCH=amd64 LXC_SUITE=trusty on-target -u root apt-get update
-LXC_ARCH=amd64 LXC_SUITE=trusty on-target -u root \
+LXC_ARCH=amd64 LXC_SUITE=bionic on-target -u root apt-get update
+LXC_ARCH=amd64 LXC_SUITE=bionic on-target -u root \
   -e DEBIAN_FRONTEND=noninteractive apt-get --no-install-recommends -y install \
   $( sed -ne '/^packages:/,/[^-] .*/ {/^- .*/{s/"//g;s/- //;p}}' ../dash/contrib/gitian-descriptors/*|sort|uniq )
-LXC_ARCH=amd64 LXC_SUITE=trusty on-target -u root apt-get -q -y purge grub
-LXC_ARCH=amd64 LXC_SUITE=trusty on-target -u root -e DEBIAN_FRONTEND=noninteractive apt-get -y dist-upgrade
+LXC_ARCH=amd64 LXC_SUITE=bionic on-target -u root apt-get -q -y purge grub
+LXC_ARCH=amd64 LXC_SUITE=bionic on-target -u root -e DEBIAN_FRONTEND=noninteractive apt-get -y dist-upgrade
 ```
 
 And then set offline mode for apt-cacher-ng:

From 2e06f8133f6c7dbb5ec9aef8712bbc315900fb3d Mon Sep 17 00:00:00 2001
From: gladcow <sergey@dash.org>
Date: Tue, 21 Aug 2018 17:07:32 +0300
Subject: [PATCH 051/400] fix missed format parameter (#2229)

---
 src/masternode-payments.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/masternode-payments.cpp b/src/masternode-payments.cpp
index e4894e4ea68f..d52c49dda61c 100644
--- a/src/masternode-payments.cpp
+++ b/src/masternode-payments.cpp
@@ -861,7 +861,7 @@ bool CMasternodePayments::ProcessBlock(int nBlockHeight, CConnman& connman)
     ExtractDestination(payee, address1);
     CBitcoinAddress address2(address1);
 
-    LogPrintf("CMasternodePayments::%s -- vote: payee=%s, nBlockHeight=%d\n", address2.ToString(), nBlockHeight);
+    LogPrintf("CMasternodePayments::%s -- vote: payee=%s, nBlockHeight=%d\n", __func__, address2.ToString(), nBlockHeight);
 
     // SIGN MESSAGE TO NETWORK WITH OUR MASTERNODE KEYS
 

From 98ed90cbb427440186f02f578d9a0e5d9f9cd4b1 Mon Sep 17 00:00:00 2001
From: PastaPastaPasta <pasta@dashboost.org>
Date: Tue, 21 Aug 2018 09:07:54 -0500
Subject: [PATCH 052/400] adds rpc calls for `setprivatesendrounds` and
 `setprivatesendamount` (#2230)

* adds rpc calls for `setprivatesendrounds` and `setprivatesendamount`

* tabs -> spaces

* @gladcow change request

* Whops tab -> spaces

* @Udjin changes, not the CAmount -> int

* int stuff

* Throw error when rounds / amount isn't within range
---
 src/rpc/client.cpp       |  2 ++
 src/wallet/rpcwallet.cpp | 57 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 59 insertions(+)

diff --git a/src/rpc/client.cpp b/src/rpc/client.cpp
index c5b07d6d0da6..e1c6fb2ad544 100644
--- a/src/rpc/client.cpp
+++ b/src/rpc/client.cpp
@@ -139,6 +139,8 @@ static const CRPCConvertParam vRPCConvertParams[] =
     { "setban", 3, "absolute" },
     { "setbip69enabled", 0, "enabled" },
     { "setnetworkactive", 0, "state" },
+    { "setprivatesendrounds", 0, "rounds" },
+    { "setprivatesendamount", 0, "amount" },
     { "getmempoolancestors", 1, "verbose" },
     { "getmempooldescendants", 1, "verbose" },
     { "spork", 1, "value" },
diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index d3dd34e864bf..33d500dcae06 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -21,6 +21,7 @@
 #include "wallet.h"
 #include "walletdb.h"
 #include "keepass.h"
+#include "privatesend-client.h"
 
 #include <stdint.h>
 
@@ -2364,6 +2365,60 @@ UniValue settxfee(const JSONRPCRequest& request)
     return true;
 }
 
+UniValue setprivatesendrounds(const JSONRPCRequest& request)
+{
+    if (!EnsureWalletIsAvailable(request.fHelp))
+        return NullUniValue;
+
+    if (request.fHelp || request.params.size() != 1)
+        throw std::runtime_error(
+            "setprivatesendrounds rounds\n"
+            "\nSet the number of rounds for PrivateSend mixing.\n"
+            "\nArguments:\n"
+            "1. rounds         (numeric, required) The default number of rounds is " + std::to_string(DEFAULT_PRIVATESEND_ROUNDS) + 
+            " Cannot be more than " + std::to_string(MAX_PRIVATESEND_ROUNDS) + " nor less than " + std::to_string(MIN_PRIVATESEND_ROUNDS) +
+            "\nExamples:\n"
+            + HelpExampleCli("setprivatesendrounds", "4")
+            + HelpExampleRpc("setprivatesendrounds", "16")
+        );
+
+    int nRounds = request.params[0].get_int();
+
+    if (nRounds > MAX_PRIVATESEND_ROUNDS || nRounds < MIN_PRIVATESEND_ROUNDS)
+        throw JSONRPCError(RPC_INVALID_PARAMETER, "Invalid number of rounds");
+
+    privateSendClient.nPrivateSendRounds = nRounds;
+
+    return NullUniValue;
+}
+
+UniValue setprivatesendamount(const JSONRPCRequest& request)
+{
+    if (!EnsureWalletIsAvailable(request.fHelp))
+        return NullUniValue;
+
+    if (request.fHelp || request.params.size() != 1)
+        throw std::runtime_error(
+            "setprivatesendamount amount\n"
+            "\nSet the goal amount in " + CURRENCY_UNIT + " for PrivateSend mixing.\n"
+            "\nArguments:\n"
+            "1. amount         (numeric, required) The default amount is " + std::to_string(DEFAULT_PRIVATESEND_AMOUNT) +
+            " Cannot be more than " + std::to_string(MAX_PRIVATESEND_AMOUNT) + " nor less than " + std::to_string(MIN_PRIVATESEND_AMOUNT) +
+            "\nExamples:\n"
+            + HelpExampleCli("setprivatesendamount", "500")
+            + HelpExampleRpc("setprivatesendamount", "208")
+        );
+
+    int nAmount = request.params[0].get_int();
+
+    if (nAmount > MAX_PRIVATESEND_AMOUNT || nAmount < MIN_PRIVATESEND_AMOUNT)
+        throw JSONRPCError(RPC_INVALID_PARAMETER, "Invalid amount of " + CURRENCY_UNIT + " as mixing goal amount");
+
+    privateSendClient.nPrivateSendAmount = nAmount;
+
+    return NullUniValue;
+}
+
 UniValue getwalletinfo(const JSONRPCRequest& request)
 {
     if (!EnsureWalletIsAvailable(request.fHelp))
@@ -2887,6 +2942,8 @@ static const CRPCCommand commands[] =
     { "wallet",             "sendtoaddress",            &sendtoaddress,            false,  {"address","amount","comment","comment_to","subtractfeefromamount"} },
     { "wallet",             "setaccount",               &setaccount,               true,   {"address","account"} },
     { "wallet",             "settxfee",                 &settxfee,                 true,   {"amount"} },
+    { "wallet",             "setprivatesendrounds",     &setprivatesendrounds,     true,   {"rounds"} },
+    { "wallet",             "setprivatesendamount",     &setprivatesendamount,     true,   {"amount"} },
     { "wallet",             "signmessage",              &signmessage,              true,   {"address","message"} },
     { "wallet",             "walletlock",               &walletlock,               true,   {} },
     { "wallet",             "walletpassphrasechange",   &walletpassphrasechange,   true,   {"oldpassphrase","newpassphrase"} },

From 2997d6d268395de6831f87f87fc21195f8da1920 Mon Sep 17 00:00:00 2001
From: Nathan Marley <nathan.marley@gmail.com>
Date: Tue, 21 Aug 2018 07:08:11 -0700
Subject: [PATCH 053/400] add compressed option to `masternode genkey` (#2232)

* add compressed option to `masternode genkey`

* use ParseBoolV method

* adjust help message for masternode genkey
---
 src/rpc/masternode.cpp | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/rpc/masternode.cpp b/src/rpc/masternode.cpp
index 97cf1d1c71fd..aedfce5772e5 100644
--- a/src/rpc/masternode.cpp
+++ b/src/rpc/masternode.cpp
@@ -145,7 +145,7 @@ UniValue masternode(const JSONRPCRequest& request)
                 "  check        - Force check all masternodes and remove invalid ones\n"
                 "  count        - Get information about number of masternodes (DEPRECATED options: 'total', 'ps', 'enabled', 'qualify', 'all')\n"
                 "  current      - Print info on current masternode winner to be paid the next block (calculated locally)\n"
-                "  genkey       - Generate new masternodeprivkey\n"
+                "  genkey       - Generate new masternodeprivkey, optional param: 'compressed' (boolean, optional, default=false) generate compressed privkey\n"
 #ifdef ENABLE_WALLET
                 "  outputs      - Print masternode compatible outputs\n"
                 "  start-alias  - Start single remote masternode by assigned alias configured in masternode.conf\n"
@@ -375,8 +375,13 @@ UniValue masternode(const JSONRPCRequest& request)
 
     if (strCommand == "genkey")
     {
+        bool fCompressed = false;
+        if (request.params.size() > 1) {
+            fCompressed = ParseBoolV(request.params[1], "compressed");
+        }
+
         CKey secret;
-        secret.MakeNewKey(false);
+        secret.MakeNewKey(fCompressed);
 
         return CBitcoinSecret(secret).ToString();
     }

From b92bd8997a224b34fca9b073cc8ec5a5d158492c Mon Sep 17 00:00:00 2001
From: gladcow <sergey@dash.org>
Date: Tue, 21 Aug 2018 17:08:42 +0300
Subject: [PATCH 054/400] Fix mninfo search by payee (#2233)

---
 src/masternodeman.cpp | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/masternodeman.cpp b/src/masternodeman.cpp
index bd89f275820d..386f2969e921 100644
--- a/src/masternodeman.cpp
+++ b/src/masternodeman.cpp
@@ -493,7 +493,14 @@ bool CMasternodeMan::GetMasternodeInfo(const CScript& payee, masternode_info_t&
     if (!ExtractDestination(payee, dest) || !boost::get<CKeyID>(&dest))
         return false;
     CKeyID keyId = *boost::get<CKeyID>(&dest);
-    return GetMasternodeInfo(keyId, mnInfoRet);
+    LOCK(cs);
+    for (const auto& mnpair : mapMasternodes) {
+        if (mnpair.second.keyIDCollateralAddress == keyId) {
+            mnInfoRet = mnpair.second.GetInfo();
+            return true;
+        }
+    }
+    return false;
 }
 
 bool CMasternodeMan::Has(const COutPoint& outpoint)

From 8da88ecf680e7c42d56a1b0b4701115ae18b8563 Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Tue, 21 Aug 2018 17:34:26 +0200
Subject: [PATCH 055/400] Don't crash when formatting in logging throws
 exceptions (#2231)

* Don't crash when formatting in logging throws exceptions

* Preserve exception like output
---
 src/util.h | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/src/util.h b/src/util.h
index 468613100e87..98c924328c62 100644
--- a/src/util.h
+++ b/src/util.h
@@ -94,20 +94,33 @@ bool LogAcceptCategory(const char* category);
 /** Send a string to the log output */
 int LogPrintStr(const std::string &str);
 
+/** Formats a string without throwing exceptions. Instead, it'll return an error string instead of formatted string. */
+template<typename... Args>
+std::string SafeStringFormat(const std::string& fmt, const Args&... args)
+{
+    try {
+        return tinyformat::format(fmt, args...);
+    } catch (std::runtime_error& e) {
+        std::string message = tinyformat::format("\n****TINYFORMAT ERROR****\n    err=\"%s\"\n    fmt=\"%s\"\n", e.what(), fmt);
+        fprintf(stderr, "%s", message.c_str());
+        return message;
+    }
+}
+
 #define LogPrint(category, ...) do { \
     if (LogAcceptCategory((category))) { \
-        LogPrintStr(tinyformat::format(__VA_ARGS__)); \
+        LogPrintStr(SafeStringFormat(__VA_ARGS__)); \
     } \
 } while(0)
 
 #define LogPrintf(...) do { \
-    LogPrintStr(tinyformat::format(__VA_ARGS__)); \
+    LogPrintStr(SafeStringFormat(__VA_ARGS__)); \
 } while(0)
 
 template<typename... Args>
 bool error(const char* fmt, const Args&... args)
 {
-    LogPrintStr("ERROR: " + tinyformat::format(fmt, args...) + "\n");
+    LogPrintStr("ERROR: " + SafeStringFormat(fmt, args...) + "\n");
     return false;
 }
 

From 73c2ddde7a818e08d0dc55045f92b346ffaef698 Mon Sep 17 00:00:00 2001
From: Nathan Marley <nathan.marley@gmail.com>
Date: Wed, 22 Aug 2018 07:46:27 -0700
Subject: [PATCH 056/400] extract sporkmanager from sporkmessage (#2234)

The SporkMessage is a lower-level construct which shouldn't be aware of
SporkManager. This commit moves the `sporkManager.IsSporkActive()` calls
outside the SporkMessage functions. This follows the dependency injection
pattern and makes it easier to test SporkMessage as well.
---
 src/spork.cpp | 14 +++++++-------
 src/spork.h   |  4 ++--
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/spork.cpp b/src/spork.cpp
index dd8ed7c07f5a..adf3f315e1eb 100644
--- a/src/spork.cpp
+++ b/src/spork.cpp
@@ -68,7 +68,7 @@ void CSporkManager::ProcessSpork(CNode* pfrom, const std::string& strCommand, CD
             }
         }
 
-        if(!spork.CheckSignature(sporkPubKeyID)) {
+        if(!spork.CheckSignature(sporkPubKeyID, IsSporkActive(SPORK_6_NEW_SIGS))) {
             LOCK(cs_main);
             LogPrintf("CSporkManager::ProcessSpork -- ERROR: invalid signature\n");
             Misbehaving(pfrom->GetId(), 100);
@@ -127,7 +127,7 @@ bool CSporkManager::UpdateSpork(int nSporkID, int64_t nValue, CConnman& connman)
 {
     CSporkMessage spork = CSporkMessage(nSporkID, nValue, GetAdjustedTime());
 
-    if(spork.Sign(sporkPrivKey)) {
+    if(spork.Sign(sporkPrivKey, IsSporkActive(SPORK_6_NEW_SIGS))) {
         spork.Relay(connman);
         LOCK(cs);
         mapSporksByHash[spork.GetHash()] = spork;
@@ -244,7 +244,7 @@ bool CSporkManager::SetPrivKey(const std::string& strPrivKey)
     }
 
     CSporkMessage spork;
-    if (spork.Sign(key)) {
+    if (spork.Sign(key, IsSporkActive(SPORK_6_NEW_SIGS))) {
 	    LOCK(cs);
         // Test signing successful, proceed
         LogPrintf("CSporkManager::SetPrivKey -- Successfully initialized as spork signer\n");
@@ -274,7 +274,7 @@ uint256 CSporkMessage::GetSignatureHash() const
     return GetHash();
 }
 
-bool CSporkMessage::Sign(const CKey& key)
+bool CSporkMessage::Sign(const CKey& key, bool fSporkSixActive)
 {
     if (!key.IsValid()) {
         LogPrintf("CSporkMessage::Sign -- signing key is not valid\n");
@@ -284,7 +284,7 @@ bool CSporkMessage::Sign(const CKey& key)
     CKeyID pubKeyId = key.GetPubKey().GetID();
     std::string strError = "";
 
-    if (sporkManager.IsSporkActive(SPORK_6_NEW_SIGS)) {
+    if (fSporkSixActive) {
         uint256 hash = GetSignatureHash();
 
         if(!CHashSigner::SignHash(hash, key, vchSig)) {
@@ -313,11 +313,11 @@ bool CSporkMessage::Sign(const CKey& key)
     return true;
 }
 
-bool CSporkMessage::CheckSignature(const CKeyID& pubKeyId) const
+bool CSporkMessage::CheckSignature(const CKeyID& pubKeyId, bool fSporkSixActive) const
 {
     std::string strError = "";
 
-    if (sporkManager.IsSporkActive(SPORK_6_NEW_SIGS)) {
+    if (fSporkSixActive) {
         uint256 hash = GetSignatureHash();
 
         if (!CHashSigner::VerifyHash(hash, pubKeyId, vchSig, strError)) {
diff --git a/src/spork.h b/src/spork.h
index 338fed334719..60153efc0694 100644
--- a/src/spork.h
+++ b/src/spork.h
@@ -76,8 +76,8 @@ class CSporkMessage
     uint256 GetHash() const;
     uint256 GetSignatureHash() const;
 
-    bool Sign(const CKey& key);
-    bool CheckSignature(const CKeyID& pubKeyId) const;
+    bool Sign(const CKey& key, bool fSporkSixActive);
+    bool CheckSignature(const CKeyID& pubKeyId, bool fSporkSixActive) const;
     void Relay(CConnman& connman);
 };
 

From e415fd049a9d9111034356c049eca181bcb850d1 Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Mon, 27 Aug 2018 14:48:45 +0200
Subject: [PATCH 057/400] Revert CMasternodePayments::IsTransactionValid to the
 logic before the recent refactorings (#2237)

partially reverts #2216
---
 src/masternode-payments.cpp | 27 +++------------------------
 1 file changed, 3 insertions(+), 24 deletions(-)

diff --git a/src/masternode-payments.cpp b/src/masternode-payments.cpp
index d52c49dda61c..5548f328e364 100644
--- a/src/masternode-payments.cpp
+++ b/src/masternode-payments.cpp
@@ -706,30 +706,9 @@ std::string CMasternodePayments::GetRequiredPaymentsString(int nBlockHeight) con
 
 bool CMasternodePayments::IsTransactionValid(const CTransaction& txNew, int nBlockHeight, CAmount blockReward) const
 {
-    std::vector<CTxOut> voutMasternodePayments;
-    if (!GetBlockTxOuts(nBlockHeight, blockReward, voutMasternodePayments)) {
-        LogPrintf("CMasternodePayments::%s -- ERROR failed to get payees for block at height %s\n", __func__, nBlockHeight);
-        return false;
-    }
-
-    for (const auto& txout : voutMasternodePayments) {
-        bool found = false;
-        for (const auto& txout2 : txNew.vout) {
-            if (txout == txout2) {
-                found = true;
-                break;
-            }
-        }
-        if (!found) {
-            CTxDestination dest;
-            if (!ExtractDestination(txout.scriptPubKey, dest))
-                assert(false);
-            LogPrintf("CMasternodePayments::%s -- ERROR failed to find expected payee %s in block at height %s\n", __func__, CBitcoinAddress(dest).ToString(), nBlockHeight);
-            return false;
-        }
-    }
-
-    return true;
+    LOCK(cs_mapMasternodeBlocks);
+    const auto it = mapMasternodeBlocks.find(nBlockHeight);
+    return it == mapMasternodeBlocks.end() ? true : it->second.IsTransactionValid(txNew);
 }
 
 void CMasternodePayments::CheckAndRemove()

From b6896387ae5985fd24af8db89a9faba82fe6a2ae Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Tue, 28 Aug 2018 13:43:58 +0200
Subject: [PATCH 058/400] Move DIP1 transaction size checks out of
 ContextualCheckBlock and use ContextualCheckTransaction instead (#2238)

* Pass consensus params to ContextualCheckTransaction

As we do with ContextualCheckBlock

* Use ContextualCheckTransaction in ContextualCheckBlock instead of duplicating the check

* Fix pindexPrev parameter signature in ContextualCheckTransaction
---
 src/validation.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/validation.cpp b/src/validation.cpp
index 73080a4751ab..a1a138416dc9 100644
--- a/src/validation.cpp
+++ b/src/validation.cpp
@@ -556,10 +556,10 @@ bool CheckTransaction(const CTransaction& tx, CValidationState &state, bool fChe
     return true;
 }
 
-bool ContextualCheckTransaction(const CTransaction& tx, CValidationState &state, CBlockIndex * const pindexPrev)
+bool ContextualCheckTransaction(const CTransaction& tx, CValidationState &state, const Consensus::Params& consensusParams, const CBlockIndex* pindexPrev)
 {
     int nHeight = pindexPrev == NULL ? 0 : pindexPrev->nHeight + 1;
-    bool fDIP0001Active_context = nHeight >= Params().GetConsensus().DIP0001Height;
+    bool fDIP0001Active_context = nHeight >= consensusParams.DIP0001Height;
 
     // Size limits
     if (fDIP0001Active_context && ::GetSerializeSize(tx, SER_NETWORK, PROTOCOL_VERSION) > MAX_STANDARD_TX_SIZE)
@@ -614,7 +614,7 @@ bool AcceptToMemoryPoolWorker(CTxMemPool& pool, CValidationState& state, const C
     if (!CheckTransaction(tx, state))
         return false; // state filled in by CheckTransaction
 
-    if (!ContextualCheckTransaction(tx, state, chainActive.Tip()))
+    if (!ContextualCheckTransaction(tx, state, Params().GetConsensus(), chainActive.Tip()))
         return error("%s: ContextualCheckTransaction: %s, %s", __func__, hash.ToString(), FormatStateMessage(state));
 
     // Coinbase is only valid in a block, not as a loose transaction
@@ -3470,8 +3470,8 @@ bool ContextualCheckBlock(const CBlock& block, CValidationState& state, const Co
         if (!IsFinalTx(*tx, nHeight, nLockTimeCutoff)) {
             return state.DoS(10, false, REJECT_INVALID, "bad-txns-nonfinal", false, "non-final transaction");
         }
-        if (fDIP0001Active_context && ::GetSerializeSize(*tx, SER_NETWORK, PROTOCOL_VERSION) > MAX_STANDARD_TX_SIZE) {
-            return state.DoS(10, false, REJECT_INVALID, "bad-txns-oversized", false, "contains an over-sized transaction");
+        if (!ContextualCheckTransaction(*tx, state, consensusParams, pindexPrev)) {
+            return false;
         }
         nSigOps += GetLegacySigOpCount(*tx);
     }

From d20100ecd4590d54b0be1b0012e269ea93ea83a4 Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Wed, 14 Feb 2018 21:31:42 +0100
Subject: [PATCH 059/400] DIP0003 deployment

---
 src/chainparams.cpp             | 10 ++++++++++
 src/consensus/params.h          |  1 +
 src/dsnotificationinterface.cpp |  1 +
 src/init.cpp                    |  5 +++++
 src/rpc/blockchain.cpp          |  1 +
 src/validation.cpp              | 10 ++++++++++
 src/validation.h                |  2 ++
 src/versionbits.cpp             |  5 +++++
 8 files changed, 35 insertions(+)

diff --git a/src/chainparams.cpp b/src/chainparams.cpp
index c605d7d60d0b..b7edaa7bda0f 100644
--- a/src/chainparams.cpp
+++ b/src/chainparams.cpp
@@ -457,6 +457,13 @@ class CDevNetParams : public CChainParams {
         consensus.vDeployments[Consensus::DEPLOYMENT_BIP147].nWindowSize = 100;
         consensus.vDeployments[Consensus::DEPLOYMENT_BIP147].nThreshold = 50; // 50% of 100
 
+        // Deployment of DIP0003
+        consensus.vDeployments[Consensus::DEPLOYMENT_DIP0003].bit = 3;
+        consensus.vDeployments[Consensus::DEPLOYMENT_DIP0003].nStartTime = 1535752800; // Sep 1st, 2018
+        consensus.vDeployments[Consensus::DEPLOYMENT_DIP0003].nTimeout = 1567288800; // Sep 1st, 2019
+        consensus.vDeployments[Consensus::DEPLOYMENT_DIP0003].nWindowSize = 100;
+        consensus.vDeployments[Consensus::DEPLOYMENT_DIP0003].nThreshold = 50; // 50% of 100
+
         // The best chain should have at least this much work.
         consensus.nMinimumChainWork = uint256S("0x000000000000000000000000000000000000000000000000000000000000000");
 
@@ -573,6 +580,9 @@ class CRegTestParams : public CChainParams {
         consensus.vDeployments[Consensus::DEPLOYMENT_BIP147].bit = 2;
         consensus.vDeployments[Consensus::DEPLOYMENT_BIP147].nStartTime = 0;
         consensus.vDeployments[Consensus::DEPLOYMENT_BIP147].nTimeout = 999999999999ULL;
+        consensus.vDeployments[Consensus::DEPLOYMENT_DIP0003].bit = 3;
+        consensus.vDeployments[Consensus::DEPLOYMENT_DIP0003].nStartTime = 0;
+        consensus.vDeployments[Consensus::DEPLOYMENT_DIP0003].nTimeout = 999999999999ULL;
 
         // The best chain should have at least this much work.
         consensus.nMinimumChainWork = uint256S("0x00");
diff --git a/src/consensus/params.h b/src/consensus/params.h
index ccba1d4996c7..524d094fd8ab 100644
--- a/src/consensus/params.h
+++ b/src/consensus/params.h
@@ -18,6 +18,7 @@ enum DeploymentPos
     DEPLOYMENT_CSV, // Deployment of BIP68, BIP112, and BIP113.
     DEPLOYMENT_DIP0001, // Deployment of DIP0001 and lower transaction fees.
     DEPLOYMENT_BIP147, // Deployment of BIP147 (NULLDUMMY)
+    DEPLOYMENT_DIP0003, // Deployment of DIP0002 and DIP0003 (txv3 and deterministic MN lists)
     // NOTE: Also add new deployments to VersionBitsDeploymentInfo in versionbits.cpp
     MAX_VERSION_BITS_DEPLOYMENTS
 };
diff --git a/src/dsnotificationinterface.cpp b/src/dsnotificationinterface.cpp
index d417c80c7261..00be55b55652 100644
--- a/src/dsnotificationinterface.cpp
+++ b/src/dsnotificationinterface.cpp
@@ -39,6 +39,7 @@ void CDSNotificationInterface::UpdatedBlockTip(const CBlockIndex *pindexNew, con
 
     // Update global DIP0001 activation status
     fDIP0001ActiveAtTip = pindexNew->nHeight >= Params().GetConsensus().DIP0001Height;
+    fDIP0003ActiveAtTip = (VersionBitsState(pindexNew->pprev, Params().GetConsensus(), Consensus::DEPLOYMENT_DIP0003, versionbitscache) == THRESHOLD_ACTIVE);
 
     if (fInitialDownload)
         return;
diff --git a/src/init.cpp b/src/init.cpp
index 26b80208ddec..b35f6fa825ba 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -1704,6 +1704,11 @@ bool AppInitMain(boost::thread_group& threadGroup, CScheduler& scheduler)
                     break;
                 }
 
+                // Needs to be called after chain is initialized
+                if (chainActive.Tip() && chainActive.Tip()->pprev) {
+                    fDIP0003ActiveAtTip = VersionBitsState(chainActive.Tip()->pprev, Params().GetConsensus(), Consensus::DEPLOYMENT_DIP0003, versionbitscache) == THRESHOLD_ACTIVE;
+                }
+
                 uiInterface.InitMessage(_("Verifying blocks..."));
                 if (fHavePruned && GetArg("-checkblocks", DEFAULT_CHECKBLOCKS) > MIN_BLOCKS_TO_KEEP) {
                     LogPrintf("Prune: pruned datadir may not have more than %d blocks; only checking available blocks",
diff --git a/src/rpc/blockchain.cpp b/src/rpc/blockchain.cpp
index 481402b176f5..de5aee549dcf 100644
--- a/src/rpc/blockchain.cpp
+++ b/src/rpc/blockchain.cpp
@@ -1274,6 +1274,7 @@ UniValue getblockchaininfo(const JSONRPCRequest& request)
     softforks.push_back(SoftForkDesc("bip65", 4, tip, consensusParams));
     BIP9SoftForkDescPushBack(bip9_softforks, "csv", consensusParams, Consensus::DEPLOYMENT_CSV);
     BIP9SoftForkDescPushBack(bip9_softforks, "dip0001", consensusParams, Consensus::DEPLOYMENT_DIP0001);
+    BIP9SoftForkDescPushBack(bip9_softforks, "dip0003", consensusParams, Consensus::DEPLOYMENT_DIP0003);
     BIP9SoftForkDescPushBack(bip9_softforks, "bip147", consensusParams, Consensus::DEPLOYMENT_BIP147);
     obj.push_back(Pair("softforks",             softforks));
     obj.push_back(Pair("bip9_softforks", bip9_softforks));
diff --git a/src/validation.cpp b/src/validation.cpp
index a1a138416dc9..c616ce83b7d8 100644
--- a/src/validation.cpp
+++ b/src/validation.cpp
@@ -89,6 +89,7 @@ int64_t nMaxTipAge = DEFAULT_MAX_TIP_AGE;
 bool fEnableReplacement = DEFAULT_ENABLE_REPLACEMENT;
 
 std::atomic<bool> fDIP0001ActiveAtTip{false};
+std::atomic<bool> fDIP0003ActiveAtTip{false};
 
 uint256 hashAssumeValid;
 
@@ -1885,6 +1886,9 @@ static DisconnectResult DisconnectBlock(const CBlock& block, CValidationState& s
         }
     }
 
+    if (pindex->pprev && pindex->pprev->pprev && VersionBitsState(pindex->pprev->pprev, Params().GetConsensus(), Consensus::DEPLOYMENT_DIP0003, versionbitscache) != THRESHOLD_ACTIVE) {
+        fDIP0003ActiveAtTip = false;
+    }
 
     // move best block pointer to prevout block
     view.SetBestBlock(pindex->pprev->GetBlockHash());
@@ -2153,6 +2157,12 @@ static bool ConnectBlock(const CBlock& block, CValidationState& state, CBlockInd
         flags |= SCRIPT_VERIFY_NULLDUMMY;
     }
 
+    if (!fJustCheck && VersionBitsState(pindex->pprev, chainparams.GetConsensus(), Consensus::DEPLOYMENT_DIP0003, versionbitscache) == THRESHOLD_ACTIVE) {
+        if (!fDIP0003ActiveAtTip)
+            LogPrintf("ConnectBlock -- DIP0003 got activated at height %d\n", pindex->nHeight);
+        fDIP0003ActiveAtTip = true;
+    }
+
     int64_t nTime2 = GetTimeMicros(); nTimeForks += nTime2 - nTime1;
     LogPrint("bench", "    - Fork checks: %.2fms [%.2fs]\n", 0.001 * (nTime2 - nTime1), nTimeForks * 0.000001);
 
diff --git a/src/validation.h b/src/validation.h
index 18d7b8b8881f..8c45bbb4e2f3 100644
--- a/src/validation.h
+++ b/src/validation.h
@@ -189,6 +189,8 @@ extern bool fLargeWorkInvalidChainFound;
 extern std::map<uint256, int64_t> mapRejectedBlocks;
 
 extern std::atomic<bool> fDIP0001ActiveAtTip;
+extern std::atomic<bool> fDIP0003ActiveAtTip;
+
 
 /** Block hash whose ancestors we will assume to have valid scripts without checking them. */
 extern uint256 hashAssumeValid;
diff --git a/src/versionbits.cpp b/src/versionbits.cpp
index af37b6350ae3..f7a5ce1d2bf9 100644
--- a/src/versionbits.cpp
+++ b/src/versionbits.cpp
@@ -26,6 +26,11 @@ const struct BIP9DeploymentInfo VersionBitsDeploymentInfo[Consensus::MAX_VERSION
         /*.name =*/ "bip147",
         /*.gbt_force =*/ true,
         /*.check_mn_protocol =*/ false,
+    },
+    {
+        /*.name =*/ "dip0003",
+        /*.gbt_force =*/ true,
+        /*.check_mn_protocol =*/ false,
     }
 };
 

From a3c4ee3fda66710f64d593ff9026ff4ad8b5c096 Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Mon, 12 Feb 2018 14:44:32 +0100
Subject: [PATCH 060/400] DIP2 changes to CTransaction and CMutableTransaction

---
 src/consensus/consensus.h      |  2 ++
 src/primitives/transaction.cpp | 22 +++++++++++++---------
 src/primitives/transaction.h   | 30 +++++++++++++++++++++++++-----
 src/rpc/rawtransaction.cpp     |  7 +++++++
 src/script/interpreter.cpp     |  5 ++++-
 5 files changed, 51 insertions(+), 15 deletions(-)

diff --git a/src/consensus/consensus.h b/src/consensus/consensus.h
index ee199b875ce3..0efe580c1e08 100644
--- a/src/consensus/consensus.h
+++ b/src/consensus/consensus.h
@@ -18,6 +18,8 @@ inline unsigned int MaxBlockSigOps(bool fDIP0001Active /*= false */)
 {
     return MaxBlockSize(fDIP0001Active) / 50;
 }
+/** The maximum allowed size of version 3 extra payload */
+static const unsigned int MAX_TX_EXTRA_PAYLOAD = 10000;
 /** Coinbase transaction outputs can only be spent after this number of new blocks (network rule) */
 static const int COINBASE_MATURITY = 100;
 
diff --git a/src/primitives/transaction.cpp b/src/primitives/transaction.cpp
index f2afae047c8e..892cec4f690a 100644
--- a/src/primitives/transaction.cpp
+++ b/src/primitives/transaction.cpp
@@ -60,8 +60,8 @@ std::string CTxOut::ToString() const
     return strprintf("CTxOut(nValue=%d.%08d, scriptPubKey=%s)", nValue / COIN, nValue % COIN, HexStr(scriptPubKey).substr(0, 30));
 }
 
-CMutableTransaction::CMutableTransaction() : nVersion(CTransaction::CURRENT_VERSION), nLockTime(0) {}
-CMutableTransaction::CMutableTransaction(const CTransaction& tx) : nVersion(tx.nVersion), vin(tx.vin), vout(tx.vout), nLockTime(tx.nLockTime) {}
+CMutableTransaction::CMutableTransaction() : nVersion(CTransaction::CURRENT_VERSION), nType(TRANSACTION_NORMAL), nLockTime(0) {}
+CMutableTransaction::CMutableTransaction(const CTransaction& tx) : nVersion(tx.nVersion), nType(tx.nType), vin(tx.vin), vout(tx.vout), nLockTime(tx.nLockTime), vExtraPayload(tx.vExtraPayload) {}
 
 uint256 CMutableTransaction::GetHash() const
 {
@@ -71,12 +71,14 @@ uint256 CMutableTransaction::GetHash() const
 std::string CMutableTransaction::ToString() const
 {
     std::string str;
-    str += strprintf("CMutableTransaction(hash=%s, ver=%d, vin.size=%u, vout.size=%u, nLockTime=%u)\n",
+    str += strprintf("CMutableTransaction(hash=%s, ver=%d, type=%d, vin.size=%u, vout.size=%u, nLockTime=%u, vExtraPayload.size=%d)\n",
         GetHash().ToString().substr(0,10),
         nVersion,
+        nType,
         vin.size(),
         vout.size(),
-        nLockTime);
+        nLockTime,
+        vExtraPayload.size());
     for (unsigned int i = 0; i < vin.size(); i++)
         str += "    " + vin[i].ToString() + "\n";
     for (unsigned int i = 0; i < vout.size(); i++)
@@ -90,9 +92,9 @@ uint256 CTransaction::ComputeHash() const
 }
 
 /* For backward compatibility, the hash is initialized to 0. TODO: remove the need for this default constructor entirely. */
-CTransaction::CTransaction() : nVersion(CTransaction::CURRENT_VERSION), vin(), vout(), nLockTime(0), hash() {}
-CTransaction::CTransaction(const CMutableTransaction &tx) : nVersion(tx.nVersion), vin(tx.vin), vout(tx.vout), nLockTime(tx.nLockTime), hash(ComputeHash()) {}
-CTransaction::CTransaction(CMutableTransaction &&tx) : nVersion(tx.nVersion), vin(std::move(tx.vin)), vout(std::move(tx.vout)), nLockTime(tx.nLockTime), hash(ComputeHash()) {}
+CTransaction::CTransaction() : nVersion(CTransaction::CURRENT_VERSION), nType(TRANSACTION_NORMAL), vin(), vout(), nLockTime(0), hash() {}
+CTransaction::CTransaction(const CMutableTransaction &tx) : nVersion(tx.nVersion), nType(tx.nType), vin(tx.vin), vout(tx.vout), nLockTime(tx.nLockTime), vExtraPayload(tx.vExtraPayload), hash(ComputeHash()) {}
+CTransaction::CTransaction(CMutableTransaction &&tx) : nVersion(tx.nVersion), nType(tx.nType), vin(std::move(tx.vin)), vout(std::move(tx.vout)), nLockTime(tx.nLockTime), vExtraPayload(tx.vExtraPayload), hash(ComputeHash()) {}
 
 CAmount CTransaction::GetValueOut() const
 {
@@ -140,12 +142,14 @@ unsigned int CTransaction::GetTotalSize() const
 std::string CTransaction::ToString() const
 {
     std::string str;
-    str += strprintf("CTransaction(hash=%s, ver=%d, vin.size=%u, vout.size=%u, nLockTime=%u)\n",
+    str += strprintf("CTransaction(hash=%s, ver=%d, type=%d, vin.size=%u, vout.size=%u, nLockTime=%u, vExtraPayload.size=%d)\n",
         GetHash().ToString().substr(0,10),
         nVersion,
+        nType,
         vin.size(),
         vout.size(),
-        nLockTime);
+        nLockTime,
+        vExtraPayload.size());
     for (unsigned int i = 0; i < vin.size(); i++)
         str += "    " + vin[i].ToString() + "\n";
     for (unsigned int i = 0; i < vout.size(); i++)
diff --git a/src/primitives/transaction.h b/src/primitives/transaction.h
index e29af2bcef65..23ec4f698b3f 100644
--- a/src/primitives/transaction.h
+++ b/src/primitives/transaction.h
@@ -11,6 +11,11 @@
 #include "serialize.h"
 #include "uint256.h"
 
+/** Transaction types */
+enum {
+    TRANSACTION_NORMAL = 0,
+};
+
 /** An outpoint - a combination of a transaction hash and an index n into its vout */
 class COutPoint
 {
@@ -215,17 +220,19 @@ class CTransaction
     // adapting relay policy by bumping MAX_STANDARD_VERSION, and then later date
     // bumping the default CURRENT_VERSION at which point both CURRENT_VERSION and
     // MAX_STANDARD_VERSION will be equal.
-    static const int32_t MAX_STANDARD_VERSION=2;
+    static const int32_t MAX_STANDARD_VERSION=3;
 
     // The local variables are made const to prevent unintended modification
     // without updating the cached hash value. However, CTransaction is not
     // actually immutable; deserialization and assignment are implemented,
     // and bypass the constness. This is safe, as they update the entire
     // structure, including the hash.
-    const int32_t nVersion;
+    const int16_t nVersion;
+    const int16_t nType;
     const std::vector<CTxIn> vin;
     const std::vector<CTxOut> vout;
     const uint32_t nLockTime;
+    const std::vector<uint8_t> vExtraPayload; // only available for special transaction types
 
 private:
     /** Memory only. */
@@ -243,10 +250,13 @@ class CTransaction
 
     template <typename Stream>
     inline void Serialize(Stream& s) const {
-        s << this->nVersion;
+        int32_t n32bitVersion = this->nVersion | (this->nType << 16);
+        s << n32bitVersion;
         s << vin;
         s << vout;
         s << nLockTime;
+        if (this->nVersion >= 3 && this->nType != TRANSACTION_NORMAL)
+            s << vExtraPayload;
     }
 
     /** This deserializing constructor is provided instead of an Unserialize method.
@@ -301,10 +311,12 @@ class CTransaction
 /** A mutable version of CTransaction. */
 struct CMutableTransaction
 {
-    int32_t nVersion;
+    int16_t nVersion;
+    int16_t nType;
     std::vector<CTxIn> vin;
     std::vector<CTxOut> vout;
     uint32_t nLockTime;
+    std::vector<uint8_t> vExtraPayload; // only available for special transaction types
 
     CMutableTransaction();
     CMutableTransaction(const CTransaction& tx);
@@ -313,10 +325,18 @@ struct CMutableTransaction
 
     template <typename Stream, typename Operation>
     inline void SerializationOp(Stream& s, Operation ser_action) {
-        READWRITE(this->nVersion);
+        int32_t n32bitVersion = this->nVersion | (this->nType << 16);
+        READWRITE(n32bitVersion);
+        if (ser_action.ForRead()) {
+            this->nVersion = (int16_t) (n32bitVersion & 0xffff);
+            this->nType = (int16_t) ((n32bitVersion >> 16) & 0xffff);
+        }
         READWRITE(vin);
         READWRITE(vout);
         READWRITE(nLockTime);
+        if (this->nVersion >= 3 && this->nType != TRANSACTION_NORMAL) {
+            READWRITE(vExtraPayload);
+        }
     }
 
     template <typename Stream>
diff --git a/src/rpc/rawtransaction.cpp b/src/rpc/rawtransaction.cpp
index e773e6518c5f..0c02ce00ff14 100644
--- a/src/rpc/rawtransaction.cpp
+++ b/src/rpc/rawtransaction.cpp
@@ -65,6 +65,7 @@ void TxToJSON(const CTransaction& tx, const uint256 hashBlock, UniValue& entry)
     entry.push_back(Pair("txid", txid.GetHex()));
     entry.push_back(Pair("size", (int)::GetSerializeSize(tx, SER_NETWORK, PROTOCOL_VERSION)));
     entry.push_back(Pair("version", tx.nVersion));
+    entry.push_back(Pair("type", tx.nType));
     entry.push_back(Pair("locktime", (int64_t)tx.nLockTime));
     UniValue vin(UniValue::VARR);
     BOOST_FOREACH(const CTxIn& txin, tx.vin) {
@@ -121,6 +122,11 @@ void TxToJSON(const CTransaction& tx, const uint256 hashBlock, UniValue& entry)
     }
     entry.push_back(Pair("vout", vout));
 
+    if (!tx.vExtraPayload.empty()) {
+        entry.push_back(Pair("extraPayloadSize", (int)tx.vExtraPayload.size()));
+        entry.push_back(Pair("extraPayload", HexStr(tx.vExtraPayload)));
+    }
+
     if (!hashBlock.IsNull()) {
         entry.push_back(Pair("blockhash", hashBlock.GetHex()));
         BlockMap::iterator mi = mapBlockIndex.find(hashBlock);
@@ -500,6 +506,7 @@ UniValue decoderawtransaction(const JSONRPCRequest& request)
             "  \"txid\" : \"id\",        (string) The transaction id\n"
             "  \"size\" : n,             (numeric) The transaction size\n"
             "  \"version\" : n,          (numeric) The version\n"
+            "  \"type\" : n,             (numeric) The type\n"
             "  \"locktime\" : ttt,       (numeric) The lock time\n"
             "  \"vin\" : [               (array of json objects)\n"
             "     {\n"
diff --git a/src/script/interpreter.cpp b/src/script/interpreter.cpp
index 80c804b92948..d86696cb8b56 100644
--- a/src/script/interpreter.cpp
+++ b/src/script/interpreter.cpp
@@ -1098,7 +1098,8 @@ class CTransactionSignatureSerializer {
     template<typename S>
     void Serialize(S &s) const {
         // Serialize nVersion
-        ::Serialize(s, txTo.nVersion);
+        int32_t n32bitVersion = txTo.nVersion | (txTo.nType << 16);
+        ::Serialize(s, n32bitVersion);
         // Serialize vin
         unsigned int nInputs = fAnyoneCanPay ? 1 : txTo.vin.size();
         ::WriteCompactSize(s, nInputs);
@@ -1111,6 +1112,8 @@ class CTransactionSignatureSerializer {
              SerializeOutput(s, nOutput);
         // Serialize nLockTime
         ::Serialize(s, txTo.nLockTime);
+        if (txTo.nVersion >= 3 && txTo.nType != TRANSACTION_NORMAL)
+            ::Serialize(s, txTo.vExtraPayload);
     }
 };
 

From d6c5a72e2f725d81d365729a804b55c4834899df Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Tue, 13 Feb 2018 13:33:23 +0100
Subject: [PATCH 061/400] Basic validation of version 3 TXs in CheckTransaction

---
 src/validation.cpp | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/src/validation.cpp b/src/validation.cpp
index c616ce83b7d8..998d800e8970 100644
--- a/src/validation.cpp
+++ b/src/validation.cpp
@@ -518,6 +518,8 @@ bool CheckTransaction(const CTransaction& tx, CValidationState &state, bool fChe
     // Size limits
     if (::GetSerializeSize(tx, SER_NETWORK, PROTOCOL_VERSION) > MAX_LEGACY_BLOCK_SIZE)
         return state.DoS(100, false, REJECT_INVALID, "bad-txns-oversize");
+    if (tx.vExtraPayload.size() > MAX_TX_EXTRA_PAYLOAD)
+        return state.DoS(100, false, REJECT_INVALID, "bad-txns-payload-oversize");
 
     // Check for negative or overflow output values
     CAmount nValueOut = 0;
@@ -561,6 +563,20 @@ bool ContextualCheckTransaction(const CTransaction& tx, CValidationState &state,
 {
     int nHeight = pindexPrev == NULL ? 0 : pindexPrev->nHeight + 1;
     bool fDIP0001Active_context = nHeight >= consensusParams.DIP0001Height;
+    bool fDIP0003Active_context = VersionBitsState(pindexPrev, consensusParams, Consensus::DEPLOYMENT_DIP0003, versionbitscache) == THRESHOLD_ACTIVE;
+
+    if (fDIP0003Active_context) {
+        // check version 3 transaction types
+        if (tx.nVersion >= 3) {
+            if (tx.nType != TRANSACTION_NORMAL) {
+                return state.DoS(100, false, REJECT_INVALID, "bad-txns-type");
+            }
+            if (tx.IsCoinBase() && tx.nType != TRANSACTION_NORMAL)
+                return state.DoS(100, false, REJECT_INVALID, "bad-txns-cb-type");
+        } else if (tx.nType != TRANSACTION_NORMAL) {
+            return state.DoS(100, false, REJECT_INVALID, "bad-txns-type");
+        }
+    }
 
     // Size limits
     if (fDIP0001Active_context && ::GetSerializeSize(tx, SER_NETWORK, PROTOCOL_VERSION) > MAX_STANDARD_TX_SIZE)

From cebf71bbc3b5e4206a2c7046a1b84897d4618031 Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Tue, 13 Feb 2018 13:34:35 +0100
Subject: [PATCH 062/400] Stubs for special TX validation and processing

---
 src/Makefile.am       |  2 ++
 src/evo/specialtx.cpp | 84 +++++++++++++++++++++++++++++++++++++++++++
 src/evo/specialtx.h   | 19 ++++++++++
 src/validation.cpp    | 12 +++++++
 4 files changed, 117 insertions(+)
 create mode 100644 src/evo/specialtx.cpp
 create mode 100644 src/evo/specialtx.h

diff --git a/src/Makefile.am b/src/Makefile.am
index b015c2388077..9b4ef09fc5c0 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -106,6 +106,7 @@ BITCOIN_CORE_H = \
   core_io.h \
   core_memusage.h \
   cuckoocache.h \
+  evo/specialtx.h \
   privatesend.h \
   privatesend-client.h \
   privatesend-server.h \
@@ -216,6 +217,7 @@ libdash_server_a_SOURCES = \
   chain.cpp \
   checkpoints.cpp \
   dsnotificationinterface.cpp \
+  evo/specialtx.cpp \
   httprpc.cpp \
   httpserver.cpp \
   init.cpp \
diff --git a/src/evo/specialtx.cpp b/src/evo/specialtx.cpp
new file mode 100644
index 000000000000..f648f7f106be
--- /dev/null
+++ b/src/evo/specialtx.cpp
@@ -0,0 +1,84 @@
+// Copyright (c) 2017 The Dash Core developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+#include "primitives/transaction.h"
+#include "primitives/block.h"
+#include "consensus/validation.h"
+#include "hash.h"
+#include "clientversion.h"
+#include "validation.h"
+#include "chainparams.h"
+
+#include "specialtx.h"
+
+bool CheckSpecialTx(const CTransaction& tx, const CBlockIndex* pindex, CValidationState& state)
+{
+    AssertLockHeld(cs_main);
+
+    if (tx.nVersion < 3 || tx.nType == TRANSACTION_NORMAL)
+        return true;
+
+    if (pindex && VersionBitsState(pindex->pprev, Params().GetConsensus(), Consensus::DEPLOYMENT_DIP0003, versionbitscache) != THRESHOLD_ACTIVE) {
+        return state.DoS(10, false, REJECT_INVALID, "bad-tx-type");
+    }
+
+    switch (tx.nType) {
+    }
+
+    return state.DoS(10, false, REJECT_INVALID, "bad-tx-type");
+}
+
+bool ProcessSpecialTx(const CTransaction& tx, const CBlockIndex* pindex, CValidationState& state)
+{
+    if (tx.nVersion < 3 || tx.nType == TRANSACTION_NORMAL)
+        return true;
+
+    switch (tx.nType) {
+    }
+
+    return state.DoS(100, false, REJECT_INVALID, "bad-tx-type");
+}
+
+bool UndoSpecialTx(const CTransaction& tx, const CBlockIndex* pindex)
+{
+    if (tx.nVersion < 3 || tx.nType == TRANSACTION_NORMAL)
+        return true;
+
+    switch (tx.nType) {
+    }
+
+    return false;
+}
+
+bool ProcessSpecialTxsInBlock(const CBlock& block, const CBlockIndex* pindex, CValidationState& state)
+{
+    for (int i = 0; i < (int)block.vtx.size(); i++) {
+        const CTransaction& tx = *block.vtx[i];
+        if (!CheckSpecialTx(tx, pindex, state))
+            return false;
+        if (!ProcessSpecialTx(tx, pindex, state))
+            return false;
+    }
+
+    return true;
+}
+
+bool UndoSpecialTxsInBlock(const CBlock& block, const CBlockIndex* pindex)
+{
+    for (int i = (int)block.vtx.size() - 1; i >= 0; --i) {
+        const CTransaction& tx = *block.vtx[i];
+        if (!UndoSpecialTx(tx, pindex))
+            return false;
+    }
+    return true;
+}
+
+uint256 CalcTxInputsHash(const CTransaction& tx)
+{
+    CHashWriter hw(CLIENT_VERSION, SER_GETHASH);
+    for (const auto& in : tx.vin) {
+        hw << in.prevout;
+    }
+    return hw.GetHash();
+}
diff --git a/src/evo/specialtx.h b/src/evo/specialtx.h
new file mode 100644
index 000000000000..2eaf2c9cc57d
--- /dev/null
+++ b/src/evo/specialtx.h
@@ -0,0 +1,19 @@
+// Copyright (c) 2017 The Dash Core developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+#ifndef DASH_SPECIALTX_H
+#define DASH_SPECIALTX_H
+
+class CTransaction;
+class CBlock;
+class CBlockIndex;
+class CValidationState;
+
+bool CheckSpecialTx(const CTransaction& tx, const CBlockIndex* pindex, CValidationState& state);
+bool ProcessSpecialTxsInBlock(const CBlock& block, const CBlockIndex* pindex, CValidationState& state);
+bool UndoSpecialTxsInBlock(const CBlock& block, const CBlockIndex* pindex);
+
+uint256 CalcTxInputsHash(const CTransaction& tx);
+
+#endif//DASH_SPECIALTX_H
diff --git a/src/validation.cpp b/src/validation.cpp
index 998d800e8970..315ba19405c6 100644
--- a/src/validation.cpp
+++ b/src/validation.cpp
@@ -42,6 +42,8 @@
 #include "masternodeman.h"
 #include "masternode-payments.h"
 
+#include "evo/specialtx.h"
+
 #include <atomic>
 #include <sstream>
 
@@ -634,6 +636,9 @@ bool AcceptToMemoryPoolWorker(CTxMemPool& pool, CValidationState& state, const C
     if (!ContextualCheckTransaction(tx, state, Params().GetConsensus(), chainActive.Tip()))
         return error("%s: ContextualCheckTransaction: %s, %s", __func__, hash.ToString(), FormatStateMessage(state));
 
+    if (!CheckSpecialTx(tx, chainActive.Tip(), state))
+        return false;
+
     // Coinbase is only valid in a block, not as a loose transaction
     if (tx.IsCoinBase())
         return state.DoS(100, false, REJECT_INVALID, "coinbase");
@@ -1791,6 +1796,10 @@ static DisconnectResult DisconnectBlock(const CBlock& block, CValidationState& s
     std::vector<std::pair<CAddressUnspentKey, CAddressUnspentValue> > addressUnspentIndex;
     std::vector<std::pair<CSpentIndexKey, CSpentIndexValue> > spentIndex;
 
+    if (!UndoSpecialTxsInBlock(block, pindex)) {
+        return DISCONNECT_FAILED;
+    }
+
     // undo transactions in reverse order
     for (int i = block.vtx.size() - 1; i >= 0; i--) {
         const CTransaction &tx = *(block.vtx[i]);
@@ -2336,6 +2345,9 @@ static bool ConnectBlock(const CBlock& block, CValidationState& state, CBlockInd
     int64_t nTime3 = GetTimeMicros(); nTimeConnect += nTime3 - nTime2;
     LogPrint("bench", "      - Connect %u transactions: %.2fms (%.3fms/tx, %.3fms/txin) [%.2fs]\n", (unsigned)block.vtx.size(), 0.001 * (nTime3 - nTime2), 0.001 * (nTime3 - nTime2) / block.vtx.size(), nInputs <= 1 ? 0 : 0.001 * (nTime3 - nTime2) / (nInputs-1), nTimeConnect * 0.000001);
 
+    if (!ProcessSpecialTxsInBlock(block, pindex, state))
+        return false;
+
     // DASH : MODIFIED TO CHECK MASTERNODE PAYMENTS AND SUPERBLOCKS
 
     // It's possible that we simply don't have enough data and this could fail

From 61bbe54ab3b0f00712311749c21a8666d5a2dd08 Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Wed, 14 Feb 2018 12:05:25 +0100
Subject: [PATCH 063/400] Add Get-/SetTxPayload helpers

---
 src/evo/specialtx.h | 35 ++++++++++++++++++++++++++++++++++-
 1 file changed, 34 insertions(+), 1 deletion(-)

diff --git a/src/evo/specialtx.h b/src/evo/specialtx.h
index 2eaf2c9cc57d..903380124bcc 100644
--- a/src/evo/specialtx.h
+++ b/src/evo/specialtx.h
@@ -5,7 +5,10 @@
 #ifndef DASH_SPECIALTX_H
 #define DASH_SPECIALTX_H
 
-class CTransaction;
+#include "streams.h"
+#include "version.h"
+#include "primitives/transaction.h"
+
 class CBlock;
 class CBlockIndex;
 class CValidationState;
@@ -14,6 +17,36 @@ bool CheckSpecialTx(const CTransaction& tx, const CBlockIndex* pindex, CValidati
 bool ProcessSpecialTxsInBlock(const CBlock& block, const CBlockIndex* pindex, CValidationState& state);
 bool UndoSpecialTxsInBlock(const CBlock& block, const CBlockIndex* pindex);
 
+template <typename T>
+inline bool GetTxPayload(const std::vector<unsigned char>& payload, T& obj)
+{
+    CDataStream ds(payload, SER_NETWORK, PROTOCOL_VERSION);
+    try {
+        ds >> obj;
+    } catch (std::exception& e) {
+        return false;
+    }
+    return ds.empty();
+}
+template <typename T>
+inline bool GetTxPayload(const CMutableTransaction& tx, T& obj)
+{
+    return GetTxPayload(tx.vExtraPayload, obj);
+}
+template <typename T>
+inline bool GetTxPayload(const CTransaction& tx, T& obj)
+{
+    return GetTxPayload(tx.vExtraPayload, obj);
+}
+
+template <typename T>
+void SetTxPayload(CMutableTransaction& tx, const T& payload)
+{
+    CDataStream ds(SER_NETWORK, PROTOCOL_VERSION);
+    ds << payload;
+    tx.vExtraPayload.assign(ds.begin(), ds.end());
+}
+
 uint256 CalcTxInputsHash(const CTransaction& tx);
 
 #endif//DASH_SPECIALTX_H

From b606bde9a99a26e8bf8b5eb33376043b00a973f1 Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Fri, 23 Feb 2018 11:37:14 +0100
Subject: [PATCH 064/400] Support version 3 transaction serialization in
 mininode.py

---
 qa/rpc-tests/test_framework/mininode.py | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/qa/rpc-tests/test_framework/mininode.py b/qa/rpc-tests/test_framework/mininode.py
index 668326286f02..d2fd22718d64 100755
--- a/qa/rpc-tests/test_framework/mininode.py
+++ b/qa/rpc-tests/test_framework/mininode.py
@@ -357,33 +357,44 @@ class CTransaction(object):
     def __init__(self, tx=None):
         if tx is None:
             self.nVersion = 1
+            self.nType = 0
             self.vin = []
             self.vout = []
             self.nLockTime = 0
+            self.vExtraPayload = None
             self.sha256 = None
             self.hash = None
         else:
             self.nVersion = tx.nVersion
+            self.nType = tx.nType
             self.vin = copy.deepcopy(tx.vin)
             self.vout = copy.deepcopy(tx.vout)
             self.nLockTime = tx.nLockTime
+            self.vExtraPayload = tx.vExtraPayload
             self.sha256 = tx.sha256
             self.hash = tx.hash
 
     def deserialize(self, f):
-        self.nVersion = struct.unpack("<i", f.read(4))[0]
+        ver32bit = struct.unpack("<i", f.read(4))[0]
+        self.nVersion = ver32bit & 0xffff
+        self.nType = (ver32bit >> 16) & 0xffff
         self.vin = deser_vector(f, CTxIn)
         self.vout = deser_vector(f, CTxOut)
         self.nLockTime = struct.unpack("<I", f.read(4))[0]
+        if self.nType != 0:
+            self.vExtraPayload = deser_string(f)
         self.sha256 = None
         self.hash = None
 
     def serialize(self):
         r = b""
-        r += struct.pack("<i", self.nVersion)
+        ver32bit = int(self.nVersion | (self.nType << 16))
+        r += struct.pack("<i", ver32bit)
         r += ser_vector(self.vin)
         r += ser_vector(self.vout)
         r += struct.pack("<I", self.nLockTime)
+        if self.nType != 0:
+            r += ser_string(self.vExtraPayload)
         return r
 
     def rehash(self):

From 8af7f6223263ef956d38186433c53e20d78c59a1 Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Wed, 28 Feb 2018 10:10:36 +0100
Subject: [PATCH 065/400] Account for extraPayload when calculating fees in
 FundTransaction

---
 src/wallet/wallet.cpp | 13 +++++++++++--
 src/wallet/wallet.h   |  2 +-
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
index 6ae8b8b2499b..85c9ac1dd5d7 100644
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -2962,9 +2962,13 @@ bool CWallet::FundTransaction(CMutableTransaction& tx, CAmount& nFeeRet, bool ov
     BOOST_FOREACH(const CTxIn& txin, tx.vin)
         coinControl.Select(txin.prevout);
 
+    int nExtraPayloadSize = 0;
+    if (tx.nVersion >= 3 && tx.nType != TRANSACTION_NORMAL)
+        nExtraPayloadSize = (int)tx.vExtraPayload.size();
+
     CReserveKey reservekey(this);
     CWalletTx wtx;
-    if (!CreateTransaction(vecSend, wtx, reservekey, nFeeRet, nChangePosInOut, strFailReason, &coinControl, false))
+    if (!CreateTransaction(vecSend, wtx, reservekey, nFeeRet, nChangePosInOut, strFailReason, &coinControl, false, ALL_COINS, false, nExtraPayloadSize))
         return false;
 
     if (nChangePosInOut != -1)
@@ -3403,7 +3407,7 @@ bool CWallet::ConvertList(std::vector<CTxIn> vecTxIn, std::vector<CAmount>& vecA
 }
 
 bool CWallet::CreateTransaction(const std::vector<CRecipient>& vecSend, CWalletTx& wtxNew, CReserveKey& reservekey, CAmount& nFeeRet,
-                                int& nChangePosInOut, std::string& strFailReason, const CCoinControl* coinControl, bool sign, AvailableCoinsType nCoinType, bool fUseInstantSend)
+                                int& nChangePosInOut, std::string& strFailReason, const CCoinControl* coinControl, bool sign, AvailableCoinsType nCoinType, bool fUseInstantSend, int nExtraPayloadSize)
 {
     CAmount nFeePay = fUseInstantSend ? CTxLockRequest().GetMinFee() : 0;
 
@@ -3705,6 +3709,11 @@ bool CWallet::CreateTransaction(const std::vector<CRecipient>& vecSend, CWalletT
 
                 unsigned int nBytes = ::GetSerializeSize(txNew, SER_NETWORK, PROTOCOL_VERSION);
 
+                if (nExtraPayloadSize != 0) {
+                    // account for extra payload in fee calculation
+                    nBytes += GetSizeOfCompactSize(nExtraPayloadSize) + nExtraPayloadSize;
+                }
+
                 if (nBytes > MAX_STANDARD_TX_SIZE) {
                     // Do not create oversized transactions (bad-txns-oversize).
                     strFailReason = _("Transaction too large");
diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h
index 3f443332f685..2fe6be7314af 100644
--- a/src/wallet/wallet.h
+++ b/src/wallet/wallet.h
@@ -936,7 +936,7 @@ class CWallet : public CCryptoKeyStore, public CValidationInterface
      * @note passing nChangePosInOut as -1 will result in setting a random position
      */
     bool CreateTransaction(const std::vector<CRecipient>& vecSend, CWalletTx& wtxNew, CReserveKey& reservekey, CAmount& nFeeRet, int& nChangePosInOut,
-                           std::string& strFailReason, const CCoinControl *coinControl = NULL, bool sign = true, AvailableCoinsType nCoinType=ALL_COINS, bool fUseInstantSend=false);
+                           std::string& strFailReason, const CCoinControl *coinControl = NULL, bool sign = true, AvailableCoinsType nCoinType=ALL_COINS, bool fUseInstantSend=false, int nExtraPayloadSize = 0);
     bool CommitTransaction(CWalletTx& wtxNew, CReserveKey& reservekey, CConnman* connman, CValidationState& state, const std::string& strCommand="tx");
 
     bool CreateCollateralTransaction(CMutableTransaction& txCollateral, std::string& strReason);

From fb4d301a2069b3d90c5138bc4d12e40bd250c91d Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Tue, 28 Aug 2018 15:45:29 +0200
Subject: [PATCH 066/400] Add extraPayloadSize/extraPayload fields to RPC help

---
 src/rpc/rawtransaction.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/rpc/rawtransaction.cpp b/src/rpc/rawtransaction.cpp
index 0c02ce00ff14..283afacf89e3 100644
--- a/src/rpc/rawtransaction.cpp
+++ b/src/rpc/rawtransaction.cpp
@@ -202,6 +202,8 @@ UniValue getrawtransaction(const JSONRPCRequest& request)
             "     }\n"
             "     ,...\n"
             "  ],\n"
+            "  \"extraPayloadSize\" : n    (numeric) Size of DIP2 extra payload. Only present if it's a special TX\n"
+            "  \"extraPayload\" : \"hex\"    (string) Hex encoded DIP2 extra payload data. Only present if it's a special TX\n"
             "  \"blockhash\" : \"hash\",   (string) the block hash\n"
             "  \"confirmations\" : n,      (numeric) The confirmations\n"
             "  \"time\" : ttt,             (numeric) The transaction time in seconds since epoch (Jan 1 1970 GMT)\n"
@@ -537,6 +539,8 @@ UniValue decoderawtransaction(const JSONRPCRequest& request)
             "     }\n"
             "     ,...\n"
             "  ],\n"
+            "  \"extraPayloadSize\" : n           (numeric) Size of DIP2 extra payload. Only present if it's a special TX\n"
+            "  \"extraPayload\" : \"hex\"           (string) Hex encoded DIP2 extra payload data. Only present if it's a special TX\n"
             "}\n"
 
             "\nExamples:\n"

From 40eee1775fc711d9e049bdc33e1f1aee9e413e73 Mon Sep 17 00:00:00 2001
From: UdjinM6 <UdjinM6@users.noreply.github.com>
Date: Wed, 29 Aug 2018 13:02:54 +0300
Subject: [PATCH 067/400] Fix sync in regtest (again) (#2241)

Should only call SwitchToNextAsset() while being in specific state and not on every tick
---
 src/masternode-sync.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/masternode-sync.cpp b/src/masternode-sync.cpp
index 272a31da387c..e9ecf8ebde66 100644
--- a/src/masternode-sync.cpp
+++ b/src/masternode-sync.cpp
@@ -186,8 +186,10 @@ void CMasternodeSync::ProcessTick(CConnman& connman)
         {
             if (nRequestedMasternodeAssets == MASTERNODE_SYNC_WAITING) {
                 connman.PushMessage(pnode, msgMaker.Make(NetMsgType::GETSPORKS)); //get current network sporks
+                SwitchToNextAsset(connman);
             } else if (nRequestedMasternodeAssets == MASTERNODE_SYNC_LIST) {
                 mnodeman.DsegUpdate(pnode, connman);
+                SwitchToNextAsset(connman);
             } else if (nRequestedMasternodeAssets == MASTERNODE_SYNC_MNW) {
                 //sync payment votes
                 if(pnode->nVersion == 70208) {
@@ -195,10 +197,11 @@ void CMasternodeSync::ProcessTick(CConnman& connman)
                 } else {
                     connman.PushMessage(pnode, msgMaker.Make(NetMsgType::MASTERNODEPAYMENTSYNC)); //sync payment votes
                 }
+                SwitchToNextAsset(connman);
             } else if (nRequestedMasternodeAssets == MASTERNODE_SYNC_GOVERNANCE) {
                 SendGovernanceSyncRequest(pnode, connman);
+                SwitchToNextAsset(connman);
             }
-            SwitchToNextAsset(connman);
             connman.ReleaseNodeVector(vNodesCopy);
             return;
         }

From 799e3c3126f42db17cf5160641498665690c51e0 Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Wed, 29 Aug 2018 12:03:18 +0200
Subject: [PATCH 068/400] Perform Jenkins builds in /dash-src all the time to
 fix caching issues (#2242)

---
 Jenkinsfile | 70 +++++++++++++++++++++++++++++------------------------
 1 file changed, 38 insertions(+), 32 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 237332da361c..a27dae758be4 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -25,29 +25,9 @@ for(int i = 0; i < targets.size(); i++) {
       def UID = sh(returnStdout: true, script: 'id -u').trim()
       def HOME = sh(returnStdout: true, script: 'echo $HOME').trim()
       def pwd = sh(returnStdout: true, script: 'pwd').trim()
-      def hasCache = false
 
       checkout scm
 
-      // restore cache
-      try {
-        copyArtifacts(projectName: "dashpay-dash/${BRANCH_NAME}", optional: true, selector: lastSuccessful(), filter: "ci-cache-${target}.tar.gz")
-      } catch (Exception e) {
-      }
-      if (fileExists("ci-cache-${target}.tar.gz")) {
-        hasCache = true
-        echo "Using cache from dashpay-dash/${BRANCH_NAME}"
-      } else {
-        try {
-          copyArtifacts(projectName: 'dashpay-dash/develop', optional: true, selector: lastSuccessful(), filter: "ci-cache-${target}.tar.gz");
-        } catch (Exception e) {
-        }
-        if (fileExists("ci-cache-${target}.tar.gz")) {
-          hasCache = true
-          echo "Using cache from dashpay-dash/develop"
-        }
-      }
-
       def env = [
         "BUILD_TARGET=${target}",
         "PULL_REQUEST=false",
@@ -61,29 +41,55 @@ for(int i = 0; i < targets.size(); i++) {
           builderImage = docker.build("${builderImageName}", "--build-arg BUILD_TARGET=${target} ci -f ci/Dockerfile.builder")
         }
 
-        if (hasCache) {
-          sh "cd ${pwd} && tar xzfv ci-cache-${target}.tar.gz"
-        } else {
-          sh "mkdir -p ${pwd}/ci-cache-${target}"
-        }
-
         builderImage.inside("-t") {
+          // copy source into fixed path
+          // we must build under the same path everytime as otherwise caches won't work properly
+          sh "cp -ra ${pwd}/. /dash-src/"
+
+          // restore cache
+          def hasCache = false
+          try {
+            copyArtifacts(projectName: "dashpay-dash/${BRANCH_NAME}", optional: true, selector: lastSuccessful(), filter: "ci-cache-${target}.tar.gz")
+          } catch (Exception e) {
+          }
+          if (fileExists("ci-cache-${target}.tar.gz")) {
+            hasCache = true
+            echo "Using cache from dashpay-dash/${BRANCH_NAME}"
+          } else {
+            try {
+              copyArtifacts(projectName: 'dashpay-dash/develop', optional: true, selector: lastSuccessful(), filter: "ci-cache-${target}.tar.gz");
+            } catch (Exception e) {
+            }
+            if (fileExists("ci-cache-${target}.tar.gz")) {
+              hasCache = true
+              echo "Using cache from dashpay-dash/develop"
+            }
+          }
+
+          if (hasCache) {
+            sh "cd /dash-src && tar xzf ${pwd}/ci-cache-${target}.tar.gz"
+          } else {
+            sh "mkdir -p /dash-src/ci-cache-${target}"
+          }
+
           stage("${target}/depends") {
-            sh './ci/build_depends.sh'
+            sh 'cd /dash-src && ./ci/build_depends.sh'
           }
           stage("${target}/build") {
-            sh './ci/build_src.sh'
+            sh 'cd /dash-src && ./ci/build_src.sh'
           }
           stage("${target}/test") {
-            sh './ci/test_unittests.sh'
+            sh 'cd /dash-src && ./ci/test_unittests.sh'
           }
           stage("${target}/test") {
-            sh './ci/test_integrationtests.sh'
+            sh 'cd /dash-src && ./ci/test_integrationtests.sh'
           }
+
+          // archive cache and copy it into the jenkins workspace
+          sh "cd /dash-src && tar czfv ci-cache-${target}.tar.gz ci-cache-${target} && cp ci-cache-${target}.tar.gz ${pwd}/"
         }
 
-        // archive cache
-        sh "tar czfv ci-cache-${target}.tar.gz ci-cache-${target}"
+        // upload cache
         archiveArtifacts artifacts: "ci-cache-${target}.tar.gz", fingerprint: true
       }
     }

From 1c256580445881c7084367e5b6da5a70cae8a1ea Mon Sep 17 00:00:00 2001
From: gladcow <sergey@dash.org>
Date: Wed, 29 Aug 2018 14:36:35 +0300
Subject: [PATCH 069/400] Refactor `masternode` and `gobject` RPCs to support
 `help command subCommand` syntax (#2240)

* Support help for masternode rpc call subcommands

* Support help for gobject rpc call subcommands

* squash ifs for conditions to show help

* remove code duplication for masternode list and masternodelist help calls
---
 src/rpc/governance.cpp | 1285 +++++++++++++++++++++++-----------------
 src/rpc/masternode.cpp |  901 ++++++++++++++++++----------
 2 files changed, 1332 insertions(+), 854 deletions(-)

diff --git a/src/rpc/governance.cpp b/src/rpc/governance.cpp
index d9248859d5c0..536ac551d4f6 100644
--- a/src/rpc/governance.cpp
+++ b/src/rpc/governance.cpp
@@ -26,358 +26,449 @@
 
 bool EnsureWalletIsAvailable(bool avoidException);
 
-UniValue gobject(const JSONRPCRequest& request)
+void gobject_count_help()
 {
-    std::string strCommand;
-    if (request.params.size() >= 1)
-        strCommand = request.params[0].get_str();
-
-    if (request.fHelp  ||
-        (
-#ifdef ENABLE_WALLET
-         strCommand != "prepare" &&
-#endif // ENABLE_WALLET
-         strCommand != "vote-many" && strCommand != "vote-conf" && strCommand != "vote-alias" && strCommand != "submit" && strCommand != "count" &&
-         strCommand != "deserialize" && strCommand != "get" && strCommand != "getvotes" && strCommand != "getcurrentvotes" && strCommand != "list" && strCommand != "diff" &&
-         strCommand != "check" ))
-        throw std::runtime_error(
-                "gobject \"command\"...\n"
-                "Manage governance objects\n"
-                "\nAvailable commands:\n"
-                "  check              - Validate governance object data (proposal only)\n"
-#ifdef ENABLE_WALLET
-                "  prepare            - Prepare governance object by signing and creating tx\n"
-#endif // ENABLE_WALLET
-                "  submit             - Submit governance object to network\n"
-                "  deserialize        - Deserialize governance object from hex string to JSON\n"
-                "  count              - Count governance objects and votes (additional param: 'json' or 'all', default: 'json')\n"
-                "  get                - Get governance object by hash\n"
-                "  getvotes           - Get all votes for a governance object hash (including old votes)\n"
-                "  getcurrentvotes    - Get only current (tallying) votes for a governance object hash (does not include old votes)\n"
-                "  list               - List governance objects (can be filtered by signal and/or object type)\n"
-                "  diff               - List differences since last diff\n"
-                "  vote-alias         - Vote on a governance object by masternode alias (using masternode.conf setup)\n"
-                "  vote-conf          - Vote on a governance object by masternode configured in dash.conf\n"
-                "  vote-many          - Vote on a governance object by all masternodes (using masternode.conf setup)\n"
+    throw std::runtime_error(
+                "gobject count (\"mode\")\n"
+                "Count governance objects and votes\n"
+                "\nArguments:\n"
+                "1. \"mode\"   (string, optional, default: \"json\") Output format: json (\"json\") or string in free form (\"all\")\n"
                 );
+}
 
+UniValue gobject_count(const JSONRPCRequest& request)
+{
+    if (request.fHelp || request.params.size() > 2)
+        gobject_count_help();
 
-    if(strCommand == "count") {
-        std::string strMode{"json"};
+    std::string strMode{"json"};
 
-        if (request.params.size() == 2) {
-            strMode = request.params[1].get_str();
-        }
+    if (request.params.size() == 2) {
+        strMode = request.params[1].get_str();
+    }
 
-        if (request.params.size() > 2 || (strMode != "json" && strMode != "all")) {
-            throw JSONRPCError(RPC_INVALID_PARAMETER, "Correct usage is 'gobject count ( \"json\"|\"all\" )'");
-        }
+    if (strMode != "json" && strMode != "all")
+        gobject_count_help();
 
-        return strMode == "json" ? governance.ToJson() : governance.ToString();
-    }
-    /*
-        ------ Example Governance Item ------
+    return strMode == "json" ? governance.ToJson() : governance.ToString();
+}
 
-        gobject submit 6e622bb41bad1fb18e7f23ae96770aeb33129e18bd9efe790522488e580a0a03 0 1 1464292854 "beer-reimbursement" 5b5b22636f6e7472616374222c207b2270726f6a6563745f6e616d65223a20225c22626565722d7265696d62757273656d656e745c22222c20227061796d656e745f61646472657373223a20225c225879324c4b4a4a64655178657948726e34744744514238626a6876464564615576375c22222c2022656e645f64617465223a202231343936333030343030222c20226465736372697074696f6e5f75726c223a20225c227777772e646173687768616c652e6f72672f702f626565722d7265696d62757273656d656e745c22222c2022636f6e74726163745f75726c223a20225c22626565722d7265696d62757273656d656e742e636f6d2f3030312e7064665c22222c20227061796d656e745f616d6f756e74223a20223233342e323334323232222c2022676f7665726e616e63655f6f626a6563745f6964223a2037342c202273746172745f64617465223a202231343833323534303030227d5d5d1
-    */
+void gobject_deserialize_help()
+{
+    throw std::runtime_error(
+                "gobject deserialize \"hex_data\"\n"
+                "Deserialize governance object from hex string to JSON\n"
+                "\nArguments:\n"
+                "1. \"hex_data\"   (string, required) data in hex string form\n"
+                );
+}
 
-    // DEBUG : TEST DESERIALIZATION OF GOVERNANCE META DATA
-    if(strCommand == "deserialize")
-    {
-        if (request.params.size() != 2) {
-            throw JSONRPCError(RPC_INVALID_PARAMETER, "Correct usage is 'gobject deserialize <data-hex>'");
-        }
+UniValue gobject_deserialize(const JSONRPCRequest& request)
+{
+    if (request.fHelp || request.params.size() != 2)
+        gobject_deserialize_help();
 
-        std::string strHex = request.params[1].get_str();
+    std::string strHex = request.params[1].get_str();
 
-        std::vector<unsigned char> v = ParseHex(strHex);
-        std::string s(v.begin(), v.end());
+    std::vector<unsigned char> v = ParseHex(strHex);
+    std::string s(v.begin(), v.end());
 
-        UniValue u(UniValue::VOBJ);
-        u.read(s);
+    UniValue u(UniValue::VOBJ);
+    u.read(s);
 
-        return u.write().c_str();
-    }
+    return u.write().c_str();
+}
 
-    // VALIDATE A GOVERNANCE OBJECT PRIOR TO SUBMISSION
-    if(strCommand == "check")
-    {
-        if (request.params.size() != 2) {
-            throw JSONRPCError(RPC_INVALID_PARAMETER, "Correct usage is 'gobject check <data-hex>'");
-        }
+void gobject_check_help()
+{
+    throw std::runtime_error(
+                "gobject check \"hex_data\"\n"
+                "Validate governance object data (proposal only)\n"
+                "\nArguments:\n"
+                "1. \"hex_data\"   (string, required) data in hex string form\n"
+                );
+}
 
-        // ASSEMBLE NEW GOVERNANCE OBJECT FROM USER PARAMETERS
+UniValue gobject_check(const JSONRPCRequest& request)
+{
+    if (request.fHelp || request.params.size() != 2)
+        gobject_check_help();
 
-        uint256 hashParent;
+    // ASSEMBLE NEW GOVERNANCE OBJECT FROM USER PARAMETERS
 
-        int nRevision = 1;
+    uint256 hashParent;
 
-        int64_t nTime = GetAdjustedTime();
-        std::string strDataHex = request.params[1].get_str();
+    int nRevision = 1;
 
-        CGovernanceObject govobj(hashParent, nRevision, nTime, uint256(), strDataHex);
+    int64_t nTime = GetAdjustedTime();
+    std::string strDataHex = request.params[1].get_str();
 
-        if(govobj.GetObjectType() == GOVERNANCE_OBJECT_PROPOSAL) {
-            CProposalValidator validator(strDataHex);
-            if(!validator.Validate())  {
-                throw JSONRPCError(RPC_INVALID_PARAMETER, "Invalid proposal data, error messages:" + validator.GetErrorMessages());
-            }
-        }
-        else {
-            throw JSONRPCError(RPC_INVALID_PARAMETER, "Invalid object type, only proposals can be validated");
+    CGovernanceObject govobj(hashParent, nRevision, nTime, uint256(), strDataHex);
+
+    if(govobj.GetObjectType() == GOVERNANCE_OBJECT_PROPOSAL) {
+        CProposalValidator validator(strDataHex);
+        if(!validator.Validate())  {
+            throw JSONRPCError(RPC_INVALID_PARAMETER, "Invalid proposal data, error messages:" + validator.GetErrorMessages());
         }
+    }
+    else {
+        throw JSONRPCError(RPC_INVALID_PARAMETER, "Invalid object type, only proposals can be validated");
+    }
 
-        UniValue objResult(UniValue::VOBJ);
+    UniValue objResult(UniValue::VOBJ);
 
-        objResult.push_back(Pair("Object status", "OK"));
+    objResult.push_back(Pair("Object status", "OK"));
 
-        return objResult;
-    }
+    return objResult;
+}
 
 #ifdef ENABLE_WALLET
-    // PREPARE THE GOVERNANCE OBJECT BY CREATING A COLLATERAL TRANSACTION
-    if(strCommand == "prepare")
-    {
-        if (!EnsureWalletIsAvailable(request.fHelp))
-            return NullUniValue;
-
-        if (request.params.size() != 5) {
-            throw JSONRPCError(RPC_INVALID_PARAMETER, "Correct usage is 'gobject prepare <parent-hash> <revision> <time> <data-hex>'");
-        }
+void gobject_prepare_help()
+{
+    throw std::runtime_error(
+                "gobject prepare <parent-hash> <revision> <time> <data-hex>\n"
+                "Prepare governance object by signing and creating tx\n"
+                "\nArguments:\n"
+                "1. parent-hash   (string, required) hash of the parent object, \"0\" is root\n"
+                "2. revision      (numeric, required) object revision in the system\n"
+                "3. time          (numeric, required) time this object was created\n"
+                "4. data-hex      (string, required)  data in hex string form\n"
+                );
+}
 
-        // ASSEMBLE NEW GOVERNANCE OBJECT FROM USER PARAMETERS
+UniValue gobject_prepare(const JSONRPCRequest& request)
+{
+    if (request.fHelp || request.params.size() != 5)
+        gobject_prepare_help();
 
-        uint256 hashParent;
+    if (!EnsureWalletIsAvailable(request.fHelp))
+        return NullUniValue;
 
-        // -- attach to root node (root node doesn't really exist, but has a hash of zero)
-        if(request.params[1].get_str() == "0") {
-            hashParent = uint256();
-        } else {
-            hashParent = ParseHashV(request.params[1], "fee-txid, parameter 1");
-        }
+    // ASSEMBLE NEW GOVERNANCE OBJECT FROM USER PARAMETERS
 
-        std::string strRevision = request.params[2].get_str();
-        std::string strTime = request.params[3].get_str();
-        int nRevision = atoi(strRevision);
-        int64_t nTime = atoi64(strTime);
-        std::string strDataHex = request.params[4].get_str();
+    uint256 hashParent;
 
-        // CREATE A NEW COLLATERAL TRANSACTION FOR THIS SPECIFIC OBJECT
+    // -- attach to root node (root node doesn't really exist, but has a hash of zero)
+    if(request.params[1].get_str() == "0") {
+        hashParent = uint256();
+    } else {
+        hashParent = ParseHashV(request.params[1], "fee-txid, parameter 1");
+    }
 
-        CGovernanceObject govobj(hashParent, nRevision, nTime, uint256(), strDataHex);
+    std::string strRevision = request.params[2].get_str();
+    std::string strTime = request.params[3].get_str();
+    int nRevision = atoi(strRevision);
+    int64_t nTime = atoi64(strTime);
+    std::string strDataHex = request.params[4].get_str();
 
-        if(govobj.GetObjectType() == GOVERNANCE_OBJECT_PROPOSAL) {
-            CProposalValidator validator(strDataHex);
-            if(!validator.Validate())  {
-                throw JSONRPCError(RPC_INVALID_PARAMETER, "Invalid proposal data, error messages:" + validator.GetErrorMessages());
-            }
-        }
+    // CREATE A NEW COLLATERAL TRANSACTION FOR THIS SPECIFIC OBJECT
 
-        if(govobj.GetObjectType() == GOVERNANCE_OBJECT_TRIGGER) {
-            throw JSONRPCError(RPC_INVALID_PARAMETER, "Trigger objects need not be prepared (however only masternodes can create them)");
-        }
+    CGovernanceObject govobj(hashParent, nRevision, nTime, uint256(), strDataHex);
 
-        if(govobj.GetObjectType() == GOVERNANCE_OBJECT_WATCHDOG) {
-            throw JSONRPCError(RPC_INVALID_PARAMETER, "Watchdogs are deprecated");
+    if(govobj.GetObjectType() == GOVERNANCE_OBJECT_PROPOSAL) {
+        CProposalValidator validator(strDataHex);
+        if(!validator.Validate())  {
+            throw JSONRPCError(RPC_INVALID_PARAMETER, "Invalid proposal data, error messages:" + validator.GetErrorMessages());
         }
+    }
 
-        LOCK2(cs_main, pwalletMain->cs_wallet);
+    if(govobj.GetObjectType() == GOVERNANCE_OBJECT_TRIGGER) {
+        throw JSONRPCError(RPC_INVALID_PARAMETER, "Trigger objects need not be prepared (however only masternodes can create them)");
+    }
 
-        std::string strError = "";
-        if(!govobj.IsValidLocally(strError, false))
-            throw JSONRPCError(RPC_INTERNAL_ERROR, "Governance object is not valid - " + govobj.GetHash().ToString() + " - " + strError);
+    if(govobj.GetObjectType() == GOVERNANCE_OBJECT_WATCHDOG) {
+        throw JSONRPCError(RPC_INVALID_PARAMETER, "Watchdogs are deprecated");
+    }
 
-        EnsureWalletIsUnlocked();
+    LOCK2(cs_main, pwalletMain->cs_wallet);
 
-        CWalletTx wtx;
-        if(!pwalletMain->GetBudgetSystemCollateralTX(wtx, govobj.GetHash(), govobj.GetMinCollateralFee(), false)) {
-            throw JSONRPCError(RPC_INTERNAL_ERROR, "Error making collateral transaction for governance object. Please check your wallet balance and make sure your wallet is unlocked.");
-        }
+    std::string strError = "";
+    if(!govobj.IsValidLocally(strError, false))
+        throw JSONRPCError(RPC_INTERNAL_ERROR, "Governance object is not valid - " + govobj.GetHash().ToString() + " - " + strError);
 
-        // -- make our change address
-        CReserveKey reservekey(pwalletMain);
-        // -- send the tx to the network
-        CValidationState state;
-        if (!pwalletMain->CommitTransaction(wtx, reservekey, g_connman.get(), state, NetMsgType::TX)) {
-            throw JSONRPCError(RPC_INTERNAL_ERROR, "CommitTransaction failed! Reason given: " + state.GetRejectReason());
-        }
+    EnsureWalletIsUnlocked();
 
-        DBG( std::cout << "gobject: prepare "
-             << " GetDataAsPlainString = " << govobj.GetDataAsPlainString()
-             << ", hash = " << govobj.GetHash().GetHex()
-             << ", txidFee = " << wtx.GetHash().GetHex()
-             << std::endl; );
+    CWalletTx wtx;
+    if(!pwalletMain->GetBudgetSystemCollateralTX(wtx, govobj.GetHash(), govobj.GetMinCollateralFee(), false)) {
+        throw JSONRPCError(RPC_INTERNAL_ERROR, "Error making collateral transaction for governance object. Please check your wallet balance and make sure your wallet is unlocked.");
+    }
 
-        return wtx.GetHash().ToString();
+    // -- make our change address
+    CReserveKey reservekey(pwalletMain);
+    // -- send the tx to the network
+    CValidationState state;
+    if (!pwalletMain->CommitTransaction(wtx, reservekey, g_connman.get(), state, NetMsgType::TX)) {
+        throw JSONRPCError(RPC_INTERNAL_ERROR, "CommitTransaction failed! Reason given: " + state.GetRejectReason());
     }
+
+    DBG( std::cout << "gobject: prepare "
+         << " GetDataAsPlainString = " << govobj.GetDataAsPlainString()
+         << ", hash = " << govobj.GetHash().GetHex()
+         << ", txidFee = " << wtx.GetHash().GetHex()
+         << std::endl; );
+
+    return wtx.GetHash().ToString();
+}
 #endif // ENABLE_WALLET
 
-    // AFTER COLLATERAL TRANSACTION HAS MATURED USER CAN SUBMIT GOVERNANCE OBJECT TO PROPAGATE NETWORK
-    if(strCommand == "submit")
-    {
-        if ((request.params.size() < 5) || (request.params.size() > 6))  {
-            throw JSONRPCError(RPC_INVALID_PARAMETER, "Correct usage is 'gobject submit <parent-hash> <revision> <time> <data-hex> <fee-txid>'");
-        }
+void gobject_submit_help()
+{
+    throw std::runtime_error(
+                "gobject submit <parent-hash> <revision> <time> <data-hex> <fee-txid>\n"
+                "Submit governance object to network\n"
+                "\nArguments:\n"
+                "1. parent-hash   (string, required) hash of the parent object, \"0\" is root\n"
+                "2. revision      (numeric, required) object revision in the system\n"
+                "3. time          (numeric, required) time this object was created\n"
+                "4. data-hex      (string, required) data in hex string form\n"
+                "5. fee-txid      (string, optional) fee-tx id, required for all objects except triggers"
+                );
+}
 
-        if(!masternodeSync.IsBlockchainSynced()) {
-            throw JSONRPCError(RPC_CLIENT_IN_INITIAL_DOWNLOAD, "Must wait for client to sync with masternode network. Try again in a minute or so.");
-        }
+UniValue gobject_submit(const JSONRPCRequest& request)
+{
+    if (request.fHelp || ((request.params.size() < 5) || (request.params.size() > 6)))
+        gobject_submit_help();
 
-        bool fMnFound = mnodeman.Has(activeMasternodeInfo.outpoint);
+    if(!masternodeSync.IsBlockchainSynced()) {
+        throw JSONRPCError(RPC_CLIENT_IN_INITIAL_DOWNLOAD, "Must wait for client to sync with masternode network. Try again in a minute or so.");
+    }
 
-        DBG( std::cout << "gobject: submit activeMasternodeInfo.keyIDMasternode = " << activeMasternodeInfo.keyIDMasternode.ToString()
-             << ", outpoint = " << activeMasternodeInfo.outpoint.ToStringShort()
-             << ", params.size() = " << request.params.size()
-             << ", fMnFound = " << fMnFound << std::endl; );
+    bool fMnFound = mnodeman.Has(activeMasternodeInfo.outpoint);
 
-        // ASSEMBLE NEW GOVERNANCE OBJECT FROM USER PARAMETERS
+    DBG( std::cout << "gobject: submit activeMasternodeInfo.keyIDMasternode = " << activeMasternodeInfo.keyIDMasternode.ToString()
+         << ", outpoint = " << activeMasternodeInfo.outpoint.ToStringShort()
+         << ", params.size() = " << request.params.size()
+         << ", fMnFound = " << fMnFound << std::endl; );
 
-        uint256 txidFee;
+    // ASSEMBLE NEW GOVERNANCE OBJECT FROM USER PARAMETERS
 
-        if(request.params.size() == 6) {
-            txidFee = ParseHashV(request.params[5], "fee-txid, parameter 6");
-        }
-        uint256 hashParent;
-        if(request.params[1].get_str() == "0") { // attach to root node (root node doesn't really exist, but has a hash of zero)
-            hashParent = uint256();
-        } else {
-            hashParent = ParseHashV(request.params[1], "parent object hash, parameter 2");
-        }
+    uint256 txidFee;
+
+    if(request.params.size() == 6) {
+        txidFee = ParseHashV(request.params[5], "fee-txid, parameter 6");
+    }
+    uint256 hashParent;
+    if(request.params[1].get_str() == "0") { // attach to root node (root node doesn't really exist, but has a hash of zero)
+        hashParent = uint256();
+    } else {
+        hashParent = ParseHashV(request.params[1], "parent object hash, parameter 2");
+    }
 
-        // GET THE PARAMETERS FROM USER
+    // GET THE PARAMETERS FROM USER
 
-        std::string strRevision = request.params[2].get_str();
-        std::string strTime = request.params[3].get_str();
-        int nRevision = atoi(strRevision);
-        int64_t nTime = atoi64(strTime);
-        std::string strDataHex = request.params[4].get_str();
+    std::string strRevision = request.params[2].get_str();
+    std::string strTime = request.params[3].get_str();
+    int nRevision = atoi(strRevision);
+    int64_t nTime = atoi64(strTime);
+    std::string strDataHex = request.params[4].get_str();
 
-        CGovernanceObject govobj(hashParent, nRevision, nTime, txidFee, strDataHex);
+    CGovernanceObject govobj(hashParent, nRevision, nTime, txidFee, strDataHex);
 
-        DBG( std::cout << "gobject: submit "
-             << " GetDataAsPlainString = " << govobj.GetDataAsPlainString()
-             << ", hash = " << govobj.GetHash().GetHex()
-             << ", txidFee = " << txidFee.GetHex()
-             << std::endl; );
+    DBG( std::cout << "gobject: submit "
+         << " GetDataAsPlainString = " << govobj.GetDataAsPlainString()
+         << ", hash = " << govobj.GetHash().GetHex()
+         << ", txidFee = " << txidFee.GetHex()
+         << std::endl; );
 
-        if(govobj.GetObjectType() == GOVERNANCE_OBJECT_PROPOSAL) {
-            CProposalValidator validator(strDataHex);
-            if(!validator.Validate())  {
-                throw JSONRPCError(RPC_INVALID_PARAMETER, "Invalid proposal data, error messages:" + validator.GetErrorMessages());
-            }
+    if(govobj.GetObjectType() == GOVERNANCE_OBJECT_PROPOSAL) {
+        CProposalValidator validator(strDataHex);
+        if(!validator.Validate())  {
+            throw JSONRPCError(RPC_INVALID_PARAMETER, "Invalid proposal data, error messages:" + validator.GetErrorMessages());
         }
+    }
 
-        if(govobj.GetObjectType() == GOVERNANCE_OBJECT_WATCHDOG) {
-            throw JSONRPCError(RPC_INVALID_PARAMETER, "Watchdogs are deprecated");
-        }
+    if(govobj.GetObjectType() == GOVERNANCE_OBJECT_WATCHDOG) {
+        throw JSONRPCError(RPC_INVALID_PARAMETER, "Watchdogs are deprecated");
+    }
 
-        // Attempt to sign triggers if we are a MN
-        if(govobj.GetObjectType() == GOVERNANCE_OBJECT_TRIGGER) {
-            if(fMnFound) {
-                govobj.SetMasternodeOutpoint(activeMasternodeInfo.outpoint);
-                govobj.Sign(activeMasternodeInfo.keyMasternode, activeMasternodeInfo.keyIDMasternode);
-            }
-            else {
-                LogPrintf("gobject(submit) -- Object submission rejected because node is not a masternode\n");
-                throw JSONRPCError(RPC_INVALID_PARAMETER, "Only valid masternodes can submit this type of object");
-            }
+    // Attempt to sign triggers if we are a MN
+    if(govobj.GetObjectType() == GOVERNANCE_OBJECT_TRIGGER) {
+        if(fMnFound) {
+            govobj.SetMasternodeOutpoint(activeMasternodeInfo.outpoint);
+            govobj.Sign(activeMasternodeInfo.keyMasternode, activeMasternodeInfo.keyIDMasternode);
         }
         else {
-            if(request.params.size() != 6) {
-                LogPrintf("gobject(submit) -- Object submission rejected because fee tx not provided\n");
-                throw JSONRPCError(RPC_INVALID_PARAMETER, "The fee-txid parameter must be included to submit this type of object");
-            }
+            LogPrintf("gobject(submit) -- Object submission rejected because node is not a masternode\n");
+            throw JSONRPCError(RPC_INVALID_PARAMETER, "Only valid masternodes can submit this type of object");
         }
+    }
+    else {
+        if(request.params.size() != 6) {
+            LogPrintf("gobject(submit) -- Object submission rejected because fee tx not provided\n");
+            throw JSONRPCError(RPC_INVALID_PARAMETER, "The fee-txid parameter must be included to submit this type of object");
+        }
+    }
 
-        std::string strHash = govobj.GetHash().ToString();
+    std::string strHash = govobj.GetHash().ToString();
 
-        std::string strError = "";
-        bool fMissingMasternode;
-        bool fMissingConfirmations;
-        {
-            LOCK(cs_main);
-            if(!govobj.IsValidLocally(strError, fMissingMasternode, fMissingConfirmations, true) && !fMissingConfirmations) {
-                LogPrintf("gobject(submit) -- Object submission rejected because object is not valid - hash = %s, strError = %s\n", strHash, strError);
-                throw JSONRPCError(RPC_INTERNAL_ERROR, "Governance object is not valid - " + strHash + " - " + strError);
-            }
+    std::string strError = "";
+    bool fMissingMasternode;
+    bool fMissingConfirmations;
+    {
+        LOCK(cs_main);
+        if(!govobj.IsValidLocally(strError, fMissingMasternode, fMissingConfirmations, true) && !fMissingConfirmations) {
+            LogPrintf("gobject(submit) -- Object submission rejected because object is not valid - hash = %s, strError = %s\n", strHash, strError);
+            throw JSONRPCError(RPC_INTERNAL_ERROR, "Governance object is not valid - " + strHash + " - " + strError);
         }
+    }
 
-        // RELAY THIS OBJECT
-        // Reject if rate check fails but don't update buffer
-        if(!governance.MasternodeRateCheck(govobj)) {
-            LogPrintf("gobject(submit) -- Object submission rejected because of rate check failure - hash = %s\n", strHash);
-            throw JSONRPCError(RPC_INVALID_PARAMETER, "Object creation rate limit exceeded");
-        }
+    // RELAY THIS OBJECT
+    // Reject if rate check fails but don't update buffer
+    if(!governance.MasternodeRateCheck(govobj)) {
+        LogPrintf("gobject(submit) -- Object submission rejected because of rate check failure - hash = %s\n", strHash);
+        throw JSONRPCError(RPC_INVALID_PARAMETER, "Object creation rate limit exceeded");
+    }
 
-        LogPrintf("gobject(submit) -- Adding locally created governance object - %s\n", strHash);
+    LogPrintf("gobject(submit) -- Adding locally created governance object - %s\n", strHash);
 
-        if(fMissingConfirmations) {
-            governance.AddPostponedObject(govobj);
-            govobj.Relay(*g_connman);
-        } else {
-            governance.AddGovernanceObject(govobj, *g_connman);
-        }
+    if(fMissingConfirmations) {
+        governance.AddPostponedObject(govobj);
+        govobj.Relay(*g_connman);
+    } else {
+        governance.AddGovernanceObject(govobj, *g_connman);
+    }
+
+    return govobj.GetHash().ToString();
+}
 
-        return govobj.GetHash().ToString();
+void gobject_vote_conf_help()
+{
+    throw std::runtime_error(
+                "gobject vote-conf <governance-hash> <vote> <vote-outcome>\n"
+                "Vote on a governance object by masternode configured in dash.conf\n"
+                "\nArguments:\n"
+                "1. governance-hash   (string, required) hash of the governance object\n"
+                "2. vote              (string, required) vote, possible values: [funding|valid|delete|endorsed]\n"
+                "3. vote-outcome      (string, required) vote outcome, possible values: [yes|no|abstain]\n"
+                );
+}
+
+UniValue gobject_vote_conf(const JSONRPCRequest& request)
+{
+    if (request.fHelp || request.params.size() != 4)
+        gobject_vote_conf_help();
+
+    uint256 hash;
+
+    hash = ParseHashV(request.params[1], "Object hash");
+    std::string strVoteSignal = request.params[2].get_str();
+    std::string strVoteOutcome = request.params[3].get_str();
+
+    vote_signal_enum_t eVoteSignal = CGovernanceVoting::ConvertVoteSignal(strVoteSignal);
+    if(eVoteSignal == VOTE_SIGNAL_NONE) {
+        throw JSONRPCError(RPC_INVALID_PARAMETER,
+                           "Invalid vote signal. Please using one of the following: "
+                           "(funding|valid|delete|endorsed)");
     }
 
-    if(strCommand == "vote-conf")
-    {
-        if(request.params.size() != 4)
-            throw JSONRPCError(RPC_INVALID_PARAMETER, "Correct usage is 'gobject vote-conf <governance-hash> [funding|valid|delete] [yes|no|abstain]'");
+    vote_outcome_enum_t eVoteOutcome = CGovernanceVoting::ConvertVoteOutcome(strVoteOutcome);
+    if(eVoteOutcome == VOTE_OUTCOME_NONE) {
+        throw JSONRPCError(RPC_INVALID_PARAMETER, "Invalid vote outcome. Please use one of the following: 'yes', 'no' or 'abstain'");
+    }
 
-        uint256 hash;
-        std::string strVote;
+    int nSuccessful = 0;
+    int nFailed = 0;
 
-        hash = ParseHashV(request.params[1], "Object hash");
-        std::string strVoteSignal = request.params[2].get_str();
-        std::string strVoteOutcome = request.params[3].get_str();
+    UniValue resultsObj(UniValue::VOBJ);
 
-        vote_signal_enum_t eVoteSignal = CGovernanceVoting::ConvertVoteSignal(strVoteSignal);
-        if(eVoteSignal == VOTE_SIGNAL_NONE) {
-            throw JSONRPCError(RPC_INVALID_PARAMETER,
-                               "Invalid vote signal. Please using one of the following: "
-                               "(funding|valid|delete|endorsed)");
-        }
+    UniValue statusObj(UniValue::VOBJ);
+    UniValue returnObj(UniValue::VOBJ);
 
-        vote_outcome_enum_t eVoteOutcome = CGovernanceVoting::ConvertVoteOutcome(strVoteOutcome);
-        if(eVoteOutcome == VOTE_OUTCOME_NONE) {
-            throw JSONRPCError(RPC_INVALID_PARAMETER, "Invalid vote outcome. Please use one of the following: 'yes', 'no' or 'abstain'");
-        }
+    CMasternode mn;
+    bool fMnFound = mnodeman.Get(activeMasternodeInfo.outpoint, mn);
+
+    if(!fMnFound) {
+        nFailed++;
+        statusObj.push_back(Pair("result", "failed"));
+        statusObj.push_back(Pair("errorMessage", "Can't find masternode by collateral output"));
+        resultsObj.push_back(Pair("dash.conf", statusObj));
+        returnObj.push_back(Pair("overall", strprintf("Voted successfully %d time(s) and failed %d time(s).", nSuccessful, nFailed)));
+        returnObj.push_back(Pair("detail", resultsObj));
+        return returnObj;
+    }
 
-        int nSuccessful = 0;
-        int nFailed = 0;
+    CGovernanceVote vote(mn.outpoint, hash, eVoteSignal, eVoteOutcome);
+    if(!vote.Sign(activeMasternodeInfo.keyMasternode, activeMasternodeInfo.keyIDMasternode)) {
+        nFailed++;
+        statusObj.push_back(Pair("result", "failed"));
+        statusObj.push_back(Pair("errorMessage", "Failure to sign."));
+        resultsObj.push_back(Pair("dash.conf", statusObj));
+        returnObj.push_back(Pair("overall", strprintf("Voted successfully %d time(s) and failed %d time(s).", nSuccessful, nFailed)));
+        returnObj.push_back(Pair("detail", resultsObj));
+        return returnObj;
+    }
 
-        UniValue resultsObj(UniValue::VOBJ);
+    CGovernanceException exception;
+    if(governance.ProcessVoteAndRelay(vote, exception, *g_connman)) {
+        nSuccessful++;
+        statusObj.push_back(Pair("result", "success"));
+    }
+    else {
+        nFailed++;
+        statusObj.push_back(Pair("result", "failed"));
+        statusObj.push_back(Pair("errorMessage", exception.GetMessage()));
+    }
+
+    resultsObj.push_back(Pair("dash.conf", statusObj));
+
+    returnObj.push_back(Pair("overall", strprintf("Voted successfully %d time(s) and failed %d time(s).", nSuccessful, nFailed)));
+    returnObj.push_back(Pair("detail", resultsObj));
+
+    return returnObj;
+}
+
+UniValue VoteWithMasternodeList(const std::vector<CMasternodeConfig::CMasternodeEntry>& entries,
+                                const uint256& hash, vote_signal_enum_t eVoteSignal,
+                                vote_outcome_enum_t eVoteOutcome)
+{
+    int nSuccessful = 0;
+    int nFailed = 0;
 
-        std::vector<unsigned char> vchMasterNodeSignature;
-        std::string strMasterNodeSignMessage;
+    UniValue resultsObj(UniValue::VOBJ);
+
+    for (const auto& mne : entries) {
+        CPubKey pubKeyMasternode;
+        CKey keyMasternode;
 
         UniValue statusObj(UniValue::VOBJ);
-        UniValue returnObj(UniValue::VOBJ);
+
+        if(!CMessageSigner::GetKeysFromSecret(mne.getPrivKey(), keyMasternode, pubKeyMasternode)){
+            nFailed++;
+            statusObj.push_back(Pair("result", "failed"));
+            statusObj.push_back(Pair("errorMessage", "Masternode signing error, could not set key correctly"));
+            resultsObj.push_back(Pair(mne.getAlias(), statusObj));
+            continue;
+        }
+
+        uint256 nTxHash;
+        nTxHash.SetHex(mne.getTxHash());
+
+        int nOutputIndex = 0;
+        if(!ParseInt32(mne.getOutputIndex(), &nOutputIndex)) {
+            continue;
+        }
+
+        COutPoint outpoint(nTxHash, nOutputIndex);
 
         CMasternode mn;
-        bool fMnFound = mnodeman.Get(activeMasternodeInfo.outpoint, mn);
+        bool fMnFound = mnodeman.Get(outpoint, mn);
 
         if(!fMnFound) {
             nFailed++;
             statusObj.push_back(Pair("result", "failed"));
             statusObj.push_back(Pair("errorMessage", "Can't find masternode by collateral output"));
-            resultsObj.push_back(Pair("dash.conf", statusObj));
-            returnObj.push_back(Pair("overall", strprintf("Voted successfully %d time(s) and failed %d time(s).", nSuccessful, nFailed)));
-            returnObj.push_back(Pair("detail", resultsObj));
-            return returnObj;
+            resultsObj.push_back(Pair(mne.getAlias(), statusObj));
+            continue;
         }
 
         CGovernanceVote vote(mn.outpoint, hash, eVoteSignal, eVoteOutcome);
-        if(!vote.Sign(activeMasternodeInfo.keyMasternode, activeMasternodeInfo.keyIDMasternode)) {
+        if(!vote.Sign(keyMasternode, pubKeyMasternode.GetID())){
             nFailed++;
             statusObj.push_back(Pair("result", "failed"));
             statusObj.push_back(Pair("errorMessage", "Failure to sign."));
-            resultsObj.push_back(Pair("dash.conf", statusObj));
-            returnObj.push_back(Pair("overall", strprintf("Voted successfully %d time(s) and failed %d time(s).", nSuccessful, nFailed)));
-            returnObj.push_back(Pair("detail", resultsObj));
-            return returnObj;
+            resultsObj.push_back(Pair(mne.getAlias(), statusObj));
+            continue;
         }
 
         CGovernanceException exception;
@@ -391,357 +482,475 @@ UniValue gobject(const JSONRPCRequest& request)
             statusObj.push_back(Pair("errorMessage", exception.GetMessage()));
         }
 
-        resultsObj.push_back(Pair("dash.conf", statusObj));
+        resultsObj.push_back(Pair(mne.getAlias(), statusObj));
+    }
 
-        returnObj.push_back(Pair("overall", strprintf("Voted successfully %d time(s) and failed %d time(s).", nSuccessful, nFailed)));
-        returnObj.push_back(Pair("detail", resultsObj));
+    UniValue returnObj(UniValue::VOBJ);
+    returnObj.push_back(Pair("overall", strprintf("Voted successfully %d time(s) and failed %d time(s).", nSuccessful, nFailed)));
+    returnObj.push_back(Pair("detail", resultsObj));
 
-        return returnObj;
-    }
+    return returnObj;
+}
 
-    if(strCommand == "vote-many" || strCommand == "vote-alias")
-    {
-        if(strCommand == "vote-many" && request.params.size() != 4)
-            throw JSONRPCError(RPC_INVALID_PARAMETER, "Correct usage is 'gobject vote-many <governance-hash> [funding|valid|delete] [yes|no|abstain]'");
-        else if(strCommand == "vote-alias" && request.params.size() != 5)
-            throw JSONRPCError(RPC_INVALID_PARAMETER, "Correct usage is 'gobject vote-alias <governance-hash> [funding|valid|delete] [yes|no|abstain] <alias-name>'");
+void gobject_vote_many_help()
+{
+    throw std::runtime_error(
+                "gobject vote-many <governance-hash> <vote> <vote-outcome>\n"
+                "Vote on a governance object by all masternodes (using masternode.conf setup)\n"
+                "\nArguments:\n"
+                "1. governance-hash   (string, required) hash of the governance object\n"
+                "2. vote              (string, required) vote, possible values: [funding|valid|delete|endorsed]\n"
+                "3. vote-outcome      (string, required) vote outcome, possible values: [yes|no|abstain]\n"
+                );
+}
 
-        uint256 hash;
-        std::string strVote;
+UniValue gobject_vote_many(const JSONRPCRequest& request)
+{
+    if (request.fHelp || request.params.size() != 4)
+        gobject_vote_many_help();
 
-        hash = ParseHashV(request.params[1], "Object hash");
-        std::string strVoteSignal = request.params[2].get_str();
-        std::string strVoteOutcome = request.params[3].get_str();
+    uint256 hash = ParseHashV(request.params[1], "Object hash");
+    std::string strVoteSignal = request.params[2].get_str();
+    std::string strVoteOutcome = request.params[3].get_str();
 
-        std::string strAlias;
-        if (strCommand == "vote-alias") {
-            strAlias = request.params[4].get_str();
-        }
+    vote_signal_enum_t eVoteSignal = CGovernanceVoting::ConvertVoteSignal(strVoteSignal);
+    if(eVoteSignal == VOTE_SIGNAL_NONE) {
+        throw JSONRPCError(RPC_INVALID_PARAMETER,
+                           "Invalid vote signal. Please using one of the following: "
+                           "(funding|valid|delete|endorsed)");
+    }
 
-        vote_signal_enum_t eVoteSignal = CGovernanceVoting::ConvertVoteSignal(strVoteSignal);
-        if(eVoteSignal == VOTE_SIGNAL_NONE) {
-            throw JSONRPCError(RPC_INVALID_PARAMETER,
-                               "Invalid vote signal. Please using one of the following: "
-                               "(funding|valid|delete|endorsed)");
-        }
+    vote_outcome_enum_t eVoteOutcome = CGovernanceVoting::ConvertVoteOutcome(strVoteOutcome);
+    if(eVoteOutcome == VOTE_OUTCOME_NONE) {
+        throw JSONRPCError(RPC_INVALID_PARAMETER, "Invalid vote outcome. Please use one of the following: 'yes', 'no' or 'abstain'");
+    }
 
-        vote_outcome_enum_t eVoteOutcome = CGovernanceVoting::ConvertVoteOutcome(strVoteOutcome);
-        if(eVoteOutcome == VOTE_OUTCOME_NONE) {
-            throw JSONRPCError(RPC_INVALID_PARAMETER, "Invalid vote outcome. Please use one of the following: 'yes', 'no' or 'abstain'");
-        }
+    return VoteWithMasternodeList(masternodeConfig.getEntries(), hash, eVoteSignal, eVoteOutcome);
+}
 
-        int nSuccessful = 0;
-        int nFailed = 0;
-
-        UniValue resultsObj(UniValue::VOBJ);
-
-        for (const auto& mne : masternodeConfig.getEntries()) {
-            // skip masternode if using "vote-alias" and it's the wrong masternode
-            if(strCommand == "vote-alias" && strAlias != mne.getAlias()) continue;
-
-            std::string strError;
-            std::vector<unsigned char> vchMasterNodeSignature;
-            std::string strMasterNodeSignMessage;
-
-            CPubKey pubKeyMasternode;
-            CKey keyMasternode;
-
-            UniValue statusObj(UniValue::VOBJ);
-
-            if(!CMessageSigner::GetKeysFromSecret(mne.getPrivKey(), keyMasternode, pubKeyMasternode)){
-                nFailed++;
-                statusObj.push_back(Pair("result", "failed"));
-                statusObj.push_back(Pair("errorMessage", "Masternode signing error, could not set key correctly"));
-                resultsObj.push_back(Pair(mne.getAlias(), statusObj));
-                continue;
-            }
-
-            uint256 nTxHash;
-            nTxHash.SetHex(mne.getTxHash());
-
-            int nOutputIndex = 0;
-            if(!ParseInt32(mne.getOutputIndex(), &nOutputIndex)) {
-                continue;
-            }
-
-            COutPoint outpoint(nTxHash, nOutputIndex);
-
-            CMasternode mn;
-            bool fMnFound = mnodeman.Get(outpoint, mn);
-
-            if(!fMnFound) {
-                nFailed++;
-                statusObj.push_back(Pair("result", "failed"));
-                statusObj.push_back(Pair("errorMessage", "Can't find masternode by collateral output"));
-                resultsObj.push_back(Pair(mne.getAlias(), statusObj));
-                continue;
-            }
-
-            CGovernanceVote vote(mn.outpoint, hash, eVoteSignal, eVoteOutcome);
-            if(!vote.Sign(keyMasternode, pubKeyMasternode.GetID())){
-                nFailed++;
-                statusObj.push_back(Pair("result", "failed"));
-                statusObj.push_back(Pair("errorMessage", "Failure to sign."));
-                resultsObj.push_back(Pair(mne.getAlias(), statusObj));
-                continue;
-            }
-
-            CGovernanceException exception;
-            if(governance.ProcessVoteAndRelay(vote, exception, *g_connman)) {
-                nSuccessful++;
-                statusObj.push_back(Pair("result", "success"));
-            }
-            else {
-                nFailed++;
-                statusObj.push_back(Pair("result", "failed"));
-                statusObj.push_back(Pair("errorMessage", exception.GetMessage()));
-            }
+void gobject_vote_alias_help()
+{
+    throw std::runtime_error(
+                "gobject vote-alias <governance-hash> <vote> <vote-outcome> <alias-name>\n"
+                "Vote on a governance object by masternode alias (using masternode.conf setup)\n"
+                "\nArguments:\n"
+                "1. governance-hash   (string, required) hash of the governance object\n"
+                "2. vote              (string, required) vote, possible values: [funding|valid|delete|endorsed]\n"
+                "3. vote-outcome      (string, required) vote outcome, possible values: [yes|no|abstain]\n"
+                "4. alias-name        (string, required) masternode alias"
+                );
+}
 
-            resultsObj.push_back(Pair(mne.getAlias(), statusObj));
-        }
+UniValue gobject_vote_alias(const JSONRPCRequest& request)
+{
+    if (request.fHelp || request.params.size() != 5)
+        gobject_vote_alias_help();
 
-        UniValue returnObj(UniValue::VOBJ);
-        returnObj.push_back(Pair("overall", strprintf("Voted successfully %d time(s) and failed %d time(s).", nSuccessful, nFailed)));
-        returnObj.push_back(Pair("detail", resultsObj));
+    uint256 hash = ParseHashV(request.params[1], "Object hash");
+    std::string strVoteSignal = request.params[2].get_str();
+    std::string strVoteOutcome = request.params[3].get_str();
 
-        return returnObj;
+    std::string strAlias = request.params[4].get_str();
+
+    vote_signal_enum_t eVoteSignal = CGovernanceVoting::ConvertVoteSignal(strVoteSignal);
+    if(eVoteSignal == VOTE_SIGNAL_NONE) {
+        throw JSONRPCError(RPC_INVALID_PARAMETER,
+                           "Invalid vote signal. Please using one of the following: "
+                           "(funding|valid|delete|endorsed)");
     }
 
-    // USERS CAN QUERY THE SYSTEM FOR A LIST OF VARIOUS GOVERNANCE ITEMS
-    if(strCommand == "list" || strCommand == "diff")
-    {
-        if (request.params.size() > 3)
-            throw JSONRPCError(RPC_INVALID_PARAMETER, "Correct usage is 'gobject [list|diff] ( signal type )'");
+    vote_outcome_enum_t eVoteOutcome = CGovernanceVoting::ConvertVoteOutcome(strVoteOutcome);
+    if(eVoteOutcome == VOTE_OUTCOME_NONE) {
+        throw JSONRPCError(RPC_INVALID_PARAMETER, "Invalid vote outcome. Please use one of the following: 'yes', 'no' or 'abstain'");
+    }
 
-        // GET MAIN PARAMETER FOR THIS MODE, VALID OR ALL?
+    std::vector<CMasternodeConfig::CMasternodeEntry> entries;
+    for (const auto& mne : masternodeConfig.getEntries()) {
+        if(strAlias == mne.getAlias())
+            entries.push_back(mne);
+    }
 
-        std::string strCachedSignal = "valid";
-        if (request.params.size() >= 2) strCachedSignal = request.params[1].get_str();
-        if (strCachedSignal != "valid" && strCachedSignal != "funding" && strCachedSignal != "delete" && strCachedSignal != "endorsed" && strCachedSignal != "all")
-            return "Invalid signal, should be 'valid', 'funding', 'delete', 'endorsed' or 'all'";
+    return VoteWithMasternodeList(entries, hash, eVoteSignal, eVoteOutcome);
+}
 
-        std::string strType = "all";
-        if (request.params.size() == 3) strType = request.params[2].get_str();
-        if (strType != "proposals" && strType != "triggers" && strType != "all")
-            return "Invalid type, should be 'proposals', 'triggers' or 'all'";
+UniValue ListObjects(const std::string& strCachedSignal, const std::string& strType, int nStartTime)
+{
+    UniValue objResult(UniValue::VOBJ);
 
-        // GET STARTING TIME TO QUERY SYSTEM WITH
+    // GET MATCHING GOVERNANCE OBJECTS
 
-        int nStartTime = 0; //list
-        if(strCommand == "diff") nStartTime = governance.GetLastDiffTime();
+    LOCK2(cs_main, governance.cs);
 
-        // SETUP BLOCK INDEX VARIABLE / RESULTS VARIABLE
+    std::vector<const CGovernanceObject*> objs = governance.GetAllNewerThan(nStartTime);
+    governance.UpdateLastDiffTime(GetTime());
 
-        UniValue objResult(UniValue::VOBJ);
+    // CREATE RESULTS FOR USER
 
-        // GET MATCHING GOVERNANCE OBJECTS
+    for (const auto& pGovObj : objs)
+    {
+        if(strCachedSignal == "valid" && !pGovObj->IsSetCachedValid()) continue;
+        if(strCachedSignal == "funding" && !pGovObj->IsSetCachedFunding()) continue;
+        if(strCachedSignal == "delete" && !pGovObj->IsSetCachedDelete()) continue;
+        if(strCachedSignal == "endorsed" && !pGovObj->IsSetCachedEndorsed()) continue;
+
+        if(strType == "proposals" && pGovObj->GetObjectType() != GOVERNANCE_OBJECT_PROPOSAL) continue;
+        if(strType == "triggers" && pGovObj->GetObjectType() != GOVERNANCE_OBJECT_TRIGGER) continue;
+
+        UniValue bObj(UniValue::VOBJ);
+        bObj.push_back(Pair("DataHex",  pGovObj->GetDataAsHexString()));
+        bObj.push_back(Pair("DataString",  pGovObj->GetDataAsPlainString()));
+        bObj.push_back(Pair("Hash",  pGovObj->GetHash().ToString()));
+        bObj.push_back(Pair("CollateralHash",  pGovObj->GetCollateralHash().ToString()));
+        bObj.push_back(Pair("ObjectType", pGovObj->GetObjectType()));
+        bObj.push_back(Pair("CreationTime", pGovObj->GetCreationTime()));
+        const COutPoint& masternodeOutpoint = pGovObj->GetMasternodeOutpoint();
+        if(masternodeOutpoint != COutPoint()) {
+            bObj.push_back(Pair("SigningMasternode", masternodeOutpoint.ToStringShort()));
+        }
 
-        LOCK2(cs_main, governance.cs);
+        // REPORT STATUS FOR FUNDING VOTES SPECIFICALLY
+        bObj.push_back(Pair("AbsoluteYesCount",  pGovObj->GetAbsoluteYesCount(VOTE_SIGNAL_FUNDING)));
+        bObj.push_back(Pair("YesCount",  pGovObj->GetYesCount(VOTE_SIGNAL_FUNDING)));
+        bObj.push_back(Pair("NoCount",  pGovObj->GetNoCount(VOTE_SIGNAL_FUNDING)));
+        bObj.push_back(Pair("AbstainCount",  pGovObj->GetAbstainCount(VOTE_SIGNAL_FUNDING)));
 
-        std::vector<const CGovernanceObject*> objs = governance.GetAllNewerThan(nStartTime);
-        governance.UpdateLastDiffTime(GetTime());
+        // REPORT VALIDITY AND CACHING FLAGS FOR VARIOUS SETTINGS
+        std::string strError = "";
+        bObj.push_back(Pair("fBlockchainValidity",  pGovObj->IsValidLocally(strError, false)));
+        bObj.push_back(Pair("IsValidReason",  strError.c_str()));
+        bObj.push_back(Pair("fCachedValid",  pGovObj->IsSetCachedValid()));
+        bObj.push_back(Pair("fCachedFunding",  pGovObj->IsSetCachedFunding()));
+        bObj.push_back(Pair("fCachedDelete",  pGovObj->IsSetCachedDelete()));
+        bObj.push_back(Pair("fCachedEndorsed",  pGovObj->IsSetCachedEndorsed()));
+
+        objResult.push_back(Pair(pGovObj->GetHash().ToString(), bObj));
+    }
 
-        // CREATE RESULTS FOR USER
+    return objResult;
+}
 
-        for (const auto& pGovObj : objs)
-        {
-            if(strCachedSignal == "valid" && !pGovObj->IsSetCachedValid()) continue;
-            if(strCachedSignal == "funding" && !pGovObj->IsSetCachedFunding()) continue;
-            if(strCachedSignal == "delete" && !pGovObj->IsSetCachedDelete()) continue;
-            if(strCachedSignal == "endorsed" && !pGovObj->IsSetCachedEndorsed()) continue;
+void gobject_list_help()
+{
+    throw std::runtime_error(
+                "gobject list ( <signal> <type> )\n"
+                "List governance objects (can be filtered by signal and/or object type)\n"
+                "\nArguments:\n"
+                "1. signal   (string, optional, default=valid) cached signal, possible values: [valid|funding|delete|endorsed|all]\n"
+                "2. type     (string, optional, default=all) object type, possible values: [proposals|triggers|all]\n"
+                );
+}
 
-            if(strType == "proposals" && pGovObj->GetObjectType() != GOVERNANCE_OBJECT_PROPOSAL) continue;
-            if(strType == "triggers" && pGovObj->GetObjectType() != GOVERNANCE_OBJECT_TRIGGER) continue;
+UniValue gobject_list(const JSONRPCRequest& request)
+{
+    if (request.fHelp || request.params.size() > 3)
+        gobject_list_help();
 
-            UniValue bObj(UniValue::VOBJ);
-            bObj.push_back(Pair("DataHex",  pGovObj->GetDataAsHexString()));
-            bObj.push_back(Pair("DataString",  pGovObj->GetDataAsPlainString()));
-            bObj.push_back(Pair("Hash",  pGovObj->GetHash().ToString()));
-            bObj.push_back(Pair("CollateralHash",  pGovObj->GetCollateralHash().ToString()));
-            bObj.push_back(Pair("ObjectType", pGovObj->GetObjectType()));
-            bObj.push_back(Pair("CreationTime", pGovObj->GetCreationTime()));
-            const COutPoint& masternodeOutpoint = pGovObj->GetMasternodeOutpoint();
-            if(masternodeOutpoint != COutPoint()) {
-                bObj.push_back(Pair("SigningMasternode", masternodeOutpoint.ToStringShort()));
-            }
+    std::string strCachedSignal = "valid";
+    if (request.params.size() >= 2) strCachedSignal = request.params[1].get_str();
+    if (strCachedSignal != "valid" && strCachedSignal != "funding" && strCachedSignal != "delete" && strCachedSignal != "endorsed" && strCachedSignal != "all")
+        return "Invalid signal, should be 'valid', 'funding', 'delete', 'endorsed' or 'all'";
 
-            // REPORT STATUS FOR FUNDING VOTES SPECIFICALLY
-            bObj.push_back(Pair("AbsoluteYesCount",  pGovObj->GetAbsoluteYesCount(VOTE_SIGNAL_FUNDING)));
-            bObj.push_back(Pair("YesCount",  pGovObj->GetYesCount(VOTE_SIGNAL_FUNDING)));
-            bObj.push_back(Pair("NoCount",  pGovObj->GetNoCount(VOTE_SIGNAL_FUNDING)));
-            bObj.push_back(Pair("AbstainCount",  pGovObj->GetAbstainCount(VOTE_SIGNAL_FUNDING)));
+    std::string strType = "all";
+    if (request.params.size() == 3) strType = request.params[2].get_str();
+    if (strType != "proposals" && strType != "triggers" && strType != "all")
+        return "Invalid type, should be 'proposals', 'triggers' or 'all'";
 
-            // REPORT VALIDITY AND CACHING FLAGS FOR VARIOUS SETTINGS
-            std::string strError = "";
-            bObj.push_back(Pair("fBlockchainValidity",  pGovObj->IsValidLocally(strError, false)));
-            bObj.push_back(Pair("IsValidReason",  strError.c_str()));
-            bObj.push_back(Pair("fCachedValid",  pGovObj->IsSetCachedValid()));
-            bObj.push_back(Pair("fCachedFunding",  pGovObj->IsSetCachedFunding()));
-            bObj.push_back(Pair("fCachedDelete",  pGovObj->IsSetCachedDelete()));
-            bObj.push_back(Pair("fCachedEndorsed",  pGovObj->IsSetCachedEndorsed()));
+    return ListObjects(strCachedSignal, strType, 0);
+}
 
-            objResult.push_back(Pair(pGovObj->GetHash().ToString(), bObj));
-        }
+void gobject_diff_help()
+{
+    throw std::runtime_error(
+                "gobject diff ( <signal> <type> )\n"
+                "List differences since last diff or list\n"
+                "\nArguments:\n"
+                "1. signal   (string, optional, default=valid) cached signal, possible values: [valid|funding|delete|endorsed|all]\n"
+                "2. type     (string, optional, default=all) object type, possible values: [proposals|triggers|all]\n"
+                );
+}
 
-        return objResult;
-    }
+UniValue gobject_diff(const JSONRPCRequest& request)
+{
+    if (request.fHelp || request.params.size() > 3)
+        gobject_diff_help();
 
-    // GET SPECIFIC GOVERNANCE ENTRY
-    if(strCommand == "get")
-    {
-        if (request.params.size() != 2)
-            throw JSONRPCError(RPC_INVALID_PARAMETER, "Correct usage is 'gobject get <governance-hash>'");
+    std::string strCachedSignal = "valid";
+    if (request.params.size() >= 2) strCachedSignal = request.params[1].get_str();
+    if (strCachedSignal != "valid" && strCachedSignal != "funding" && strCachedSignal != "delete" && strCachedSignal != "endorsed" && strCachedSignal != "all")
+        return "Invalid signal, should be 'valid', 'funding', 'delete', 'endorsed' or 'all'";
 
-        // COLLECT VARIABLES FROM OUR USER
-        uint256 hash = ParseHashV(request.params[1], "GovObj hash");
+    std::string strType = "all";
+    if (request.params.size() == 3) strType = request.params[2].get_str();
+    if (strType != "proposals" && strType != "triggers" && strType != "all")
+        return "Invalid type, should be 'proposals', 'triggers' or 'all'";
 
-        LOCK2(cs_main, governance.cs);
+    return ListObjects(strCachedSignal, strType, governance.GetLastDiffTime());
+}
 
-        // FIND THE GOVERNANCE OBJECT THE USER IS LOOKING FOR
-        CGovernanceObject* pGovObj = governance.FindGovernanceObject(hash);
+void gobject_get_help()
+{
+    throw std::runtime_error(
+                "gobject get <governance-hash>\n"
+                "Get governance object by hash\n"
+                "\nArguments:\n"
+                "1. governance-hash   (string, required) object id\n"
+                );
+}
 
-        if(pGovObj == nullptr)
-            throw JSONRPCError(RPC_INVALID_PARAMETER, "Unknown governance object");
+UniValue gobject_get(const JSONRPCRequest& request)
+{
+    if (request.fHelp || request.params.size() != 2)
+        gobject_get_help();
 
-        // REPORT BASIC OBJECT STATS
+    // COLLECT VARIABLES FROM OUR USER
+    uint256 hash = ParseHashV(request.params[1], "GovObj hash");
 
-        UniValue objResult(UniValue::VOBJ);
-        objResult.push_back(Pair("DataHex",  pGovObj->GetDataAsHexString()));
-        objResult.push_back(Pair("DataString",  pGovObj->GetDataAsPlainString()));
-        objResult.push_back(Pair("Hash",  pGovObj->GetHash().ToString()));
-        objResult.push_back(Pair("CollateralHash",  pGovObj->GetCollateralHash().ToString()));
-        objResult.push_back(Pair("ObjectType", pGovObj->GetObjectType()));
-        objResult.push_back(Pair("CreationTime", pGovObj->GetCreationTime()));
-        const COutPoint& masternodeOutpoint = pGovObj->GetMasternodeOutpoint();
-        if(masternodeOutpoint != COutPoint()) {
-            objResult.push_back(Pair("SigningMasternode", masternodeOutpoint.ToStringShort()));
-        }
+    LOCK2(cs_main, governance.cs);
 
-        // SHOW (MUCH MORE) INFORMATION ABOUT VOTES FOR GOVERNANCE OBJECT (THAN LIST/DIFF ABOVE)
-        // -- FUNDING VOTING RESULTS
-
-        UniValue objFundingResult(UniValue::VOBJ);
-        objFundingResult.push_back(Pair("AbsoluteYesCount",  pGovObj->GetAbsoluteYesCount(VOTE_SIGNAL_FUNDING)));
-        objFundingResult.push_back(Pair("YesCount",  pGovObj->GetYesCount(VOTE_SIGNAL_FUNDING)));
-        objFundingResult.push_back(Pair("NoCount",  pGovObj->GetNoCount(VOTE_SIGNAL_FUNDING)));
-        objFundingResult.push_back(Pair("AbstainCount",  pGovObj->GetAbstainCount(VOTE_SIGNAL_FUNDING)));
-        objResult.push_back(Pair("FundingResult", objFundingResult));
-
-        // -- VALIDITY VOTING RESULTS
-        UniValue objValid(UniValue::VOBJ);
-        objValid.push_back(Pair("AbsoluteYesCount",  pGovObj->GetAbsoluteYesCount(VOTE_SIGNAL_VALID)));
-        objValid.push_back(Pair("YesCount",  pGovObj->GetYesCount(VOTE_SIGNAL_VALID)));
-        objValid.push_back(Pair("NoCount",  pGovObj->GetNoCount(VOTE_SIGNAL_VALID)));
-        objValid.push_back(Pair("AbstainCount",  pGovObj->GetAbstainCount(VOTE_SIGNAL_VALID)));
-        objResult.push_back(Pair("ValidResult", objValid));
-
-        // -- DELETION CRITERION VOTING RESULTS
-        UniValue objDelete(UniValue::VOBJ);
-        objDelete.push_back(Pair("AbsoluteYesCount",  pGovObj->GetAbsoluteYesCount(VOTE_SIGNAL_DELETE)));
-        objDelete.push_back(Pair("YesCount",  pGovObj->GetYesCount(VOTE_SIGNAL_DELETE)));
-        objDelete.push_back(Pair("NoCount",  pGovObj->GetNoCount(VOTE_SIGNAL_DELETE)));
-        objDelete.push_back(Pair("AbstainCount",  pGovObj->GetAbstainCount(VOTE_SIGNAL_DELETE)));
-        objResult.push_back(Pair("DeleteResult", objDelete));
-
-        // -- ENDORSED VIA MASTERNODE-ELECTED BOARD
-        UniValue objEndorsed(UniValue::VOBJ);
-        objEndorsed.push_back(Pair("AbsoluteYesCount",  pGovObj->GetAbsoluteYesCount(VOTE_SIGNAL_ENDORSED)));
-        objEndorsed.push_back(Pair("YesCount",  pGovObj->GetYesCount(VOTE_SIGNAL_ENDORSED)));
-        objEndorsed.push_back(Pair("NoCount",  pGovObj->GetNoCount(VOTE_SIGNAL_ENDORSED)));
-        objEndorsed.push_back(Pair("AbstainCount",  pGovObj->GetAbstainCount(VOTE_SIGNAL_ENDORSED)));
-        objResult.push_back(Pair("EndorsedResult", objEndorsed));
-
-        // --
-        std::string strError = "";
-        objResult.push_back(Pair("fLocalValidity",  pGovObj->IsValidLocally(strError, false)));
-        objResult.push_back(Pair("IsValidReason",  strError.c_str()));
-        objResult.push_back(Pair("fCachedValid",  pGovObj->IsSetCachedValid()));
-        objResult.push_back(Pair("fCachedFunding",  pGovObj->IsSetCachedFunding()));
-        objResult.push_back(Pair("fCachedDelete",  pGovObj->IsSetCachedDelete()));
-        objResult.push_back(Pair("fCachedEndorsed",  pGovObj->IsSetCachedEndorsed()));
-        return objResult;
+    // FIND THE GOVERNANCE OBJECT THE USER IS LOOKING FOR
+    CGovernanceObject* pGovObj = governance.FindGovernanceObject(hash);
+
+    if(pGovObj == nullptr)
+        throw JSONRPCError(RPC_INVALID_PARAMETER, "Unknown governance object");
+
+    // REPORT BASIC OBJECT STATS
+
+    UniValue objResult(UniValue::VOBJ);
+    objResult.push_back(Pair("DataHex",  pGovObj->GetDataAsHexString()));
+    objResult.push_back(Pair("DataString",  pGovObj->GetDataAsPlainString()));
+    objResult.push_back(Pair("Hash",  pGovObj->GetHash().ToString()));
+    objResult.push_back(Pair("CollateralHash",  pGovObj->GetCollateralHash().ToString()));
+    objResult.push_back(Pair("ObjectType", pGovObj->GetObjectType()));
+    objResult.push_back(Pair("CreationTime", pGovObj->GetCreationTime()));
+    const COutPoint& masternodeOutpoint = pGovObj->GetMasternodeOutpoint();
+    if(masternodeOutpoint != COutPoint()) {
+        objResult.push_back(Pair("SigningMasternode", masternodeOutpoint.ToStringShort()));
     }
 
-    // GETVOTES FOR SPECIFIC GOVERNANCE OBJECT
-    if(strCommand == "getvotes")
-    {
-        if (request.params.size() != 2)
-            throw std::runtime_error(
-                "Correct usage is 'gobject getvotes <governance-hash>'"
+    // SHOW (MUCH MORE) INFORMATION ABOUT VOTES FOR GOVERNANCE OBJECT (THAN LIST/DIFF ABOVE)
+    // -- FUNDING VOTING RESULTS
+
+    UniValue objFundingResult(UniValue::VOBJ);
+    objFundingResult.push_back(Pair("AbsoluteYesCount",  pGovObj->GetAbsoluteYesCount(VOTE_SIGNAL_FUNDING)));
+    objFundingResult.push_back(Pair("YesCount",  pGovObj->GetYesCount(VOTE_SIGNAL_FUNDING)));
+    objFundingResult.push_back(Pair("NoCount",  pGovObj->GetNoCount(VOTE_SIGNAL_FUNDING)));
+    objFundingResult.push_back(Pair("AbstainCount",  pGovObj->GetAbstainCount(VOTE_SIGNAL_FUNDING)));
+    objResult.push_back(Pair("FundingResult", objFundingResult));
+
+    // -- VALIDITY VOTING RESULTS
+    UniValue objValid(UniValue::VOBJ);
+    objValid.push_back(Pair("AbsoluteYesCount",  pGovObj->GetAbsoluteYesCount(VOTE_SIGNAL_VALID)));
+    objValid.push_back(Pair("YesCount",  pGovObj->GetYesCount(VOTE_SIGNAL_VALID)));
+    objValid.push_back(Pair("NoCount",  pGovObj->GetNoCount(VOTE_SIGNAL_VALID)));
+    objValid.push_back(Pair("AbstainCount",  pGovObj->GetAbstainCount(VOTE_SIGNAL_VALID)));
+    objResult.push_back(Pair("ValidResult", objValid));
+
+    // -- DELETION CRITERION VOTING RESULTS
+    UniValue objDelete(UniValue::VOBJ);
+    objDelete.push_back(Pair("AbsoluteYesCount",  pGovObj->GetAbsoluteYesCount(VOTE_SIGNAL_DELETE)));
+    objDelete.push_back(Pair("YesCount",  pGovObj->GetYesCount(VOTE_SIGNAL_DELETE)));
+    objDelete.push_back(Pair("NoCount",  pGovObj->GetNoCount(VOTE_SIGNAL_DELETE)));
+    objDelete.push_back(Pair("AbstainCount",  pGovObj->GetAbstainCount(VOTE_SIGNAL_DELETE)));
+    objResult.push_back(Pair("DeleteResult", objDelete));
+
+    // -- ENDORSED VIA MASTERNODE-ELECTED BOARD
+    UniValue objEndorsed(UniValue::VOBJ);
+    objEndorsed.push_back(Pair("AbsoluteYesCount",  pGovObj->GetAbsoluteYesCount(VOTE_SIGNAL_ENDORSED)));
+    objEndorsed.push_back(Pair("YesCount",  pGovObj->GetYesCount(VOTE_SIGNAL_ENDORSED)));
+    objEndorsed.push_back(Pair("NoCount",  pGovObj->GetNoCount(VOTE_SIGNAL_ENDORSED)));
+    objEndorsed.push_back(Pair("AbstainCount",  pGovObj->GetAbstainCount(VOTE_SIGNAL_ENDORSED)));
+    objResult.push_back(Pair("EndorsedResult", objEndorsed));
+
+    // --
+    std::string strError = "";
+    objResult.push_back(Pair("fLocalValidity",  pGovObj->IsValidLocally(strError, false)));
+    objResult.push_back(Pair("IsValidReason",  strError.c_str()));
+    objResult.push_back(Pair("fCachedValid",  pGovObj->IsSetCachedValid()));
+    objResult.push_back(Pair("fCachedFunding",  pGovObj->IsSetCachedFunding()));
+    objResult.push_back(Pair("fCachedDelete",  pGovObj->IsSetCachedDelete()));
+    objResult.push_back(Pair("fCachedEndorsed",  pGovObj->IsSetCachedEndorsed()));
+    return objResult;
+}
+
+void gobject_getvotes_help()
+{
+    throw std::runtime_error(
+                "gobject getvotes <governance-hash>\n"
+                "Get all votes for a governance object hash (including old votes)\n"
+                "\nArguments:\n"
+                "1. governance-hash   (string, required) object id\n"
                 );
+}
 
-        // COLLECT PARAMETERS FROM USER
+UniValue gobject_getvotes(const JSONRPCRequest& request)
+{
+    if (request.fHelp || request.params.size() != 2)
+        gobject_getvotes_help();
 
-        uint256 hash = ParseHashV(request.params[1], "Governance hash");
+    // COLLECT PARAMETERS FROM USER
 
-        // FIND OBJECT USER IS LOOKING FOR
+    uint256 hash = ParseHashV(request.params[1], "Governance hash");
 
-        LOCK(governance.cs);
+    // FIND OBJECT USER IS LOOKING FOR
 
-        CGovernanceObject* pGovObj = governance.FindGovernanceObject(hash);
+    LOCK(governance.cs);
 
-        if(pGovObj == nullptr) {
-            throw JSONRPCError(RPC_INVALID_PARAMETER, "Unknown governance-hash");
-        }
+    CGovernanceObject* pGovObj = governance.FindGovernanceObject(hash);
 
-        // REPORT RESULTS TO USER
+    if(pGovObj == nullptr) {
+        throw JSONRPCError(RPC_INVALID_PARAMETER, "Unknown governance-hash");
+    }
 
-        UniValue bResult(UniValue::VOBJ);
+    // REPORT RESULTS TO USER
 
-        // GET MATCHING VOTES BY HASH, THEN SHOW USERS VOTE INFORMATION
+    UniValue bResult(UniValue::VOBJ);
 
-        std::vector<CGovernanceVote> vecVotes = governance.GetMatchingVotes(hash);
-        for (const auto& vote : vecVotes) {
-            bResult.push_back(Pair(vote.GetHash().ToString(),  vote.ToString()));
-        }
+    // GET MATCHING VOTES BY HASH, THEN SHOW USERS VOTE INFORMATION
 
-        return bResult;
+    std::vector<CGovernanceVote> vecVotes = governance.GetMatchingVotes(hash);
+    for (const auto& vote : vecVotes) {
+        bResult.push_back(Pair(vote.GetHash().ToString(),  vote.ToString()));
     }
 
-    // GETVOTES FOR SPECIFIC GOVERNANCE OBJECT
-    if(strCommand == "getcurrentvotes")
-    {
-        if (request.params.size() != 2 && request.params.size() != 4)
-            throw std::runtime_error(
-                "Correct usage is 'gobject getcurrentvotes <governance-hash> [txid vout_index]'"
+    return bResult;
+}
+
+void gobject_getcurrentvotes_help()
+{
+    throw std::runtime_error(
+                "gobject getcurrentvotes <governance-hash> (<txid> <vout>)\n"
+                "Get only current (tallying) votes for a governance object hash (does not include old votes)\n"
+                "\nArguments:\n"
+                "1. governance-hash   (string, required) object id\n"
+                "2. txid              (string, optional) masternode collateral txid\n"
+                "3. vout              (string, optional) masternode collateral output index, required if <txid> presents\n"
                 );
+}
 
-        // COLLECT PARAMETERS FROM USER
+UniValue gobject_getcurrentvotes(const JSONRPCRequest& request)
+{
+    if (request.fHelp || (request.params.size() != 2 && request.params.size() != 4))
+        gobject_getcurrentvotes_help();
 
-        uint256 hash = ParseHashV(request.params[1], "Governance hash");
+    // COLLECT PARAMETERS FROM USER
 
-        COutPoint mnCollateralOutpoint;
-        if (request.params.size() == 4) {
-            uint256 txid = ParseHashV(request.params[2], "Masternode Collateral hash");
-            std::string strVout = request.params[3].get_str();
-            mnCollateralOutpoint = COutPoint(txid, (uint32_t)atoi(strVout));
-        }
+    uint256 hash = ParseHashV(request.params[1], "Governance hash");
 
-        // FIND OBJECT USER IS LOOKING FOR
+    COutPoint mnCollateralOutpoint;
+    if (request.params.size() == 4) {
+        uint256 txid = ParseHashV(request.params[2], "Masternode Collateral hash");
+        std::string strVout = request.params[3].get_str();
+        mnCollateralOutpoint = COutPoint(txid, (uint32_t)atoi(strVout));
+    }
 
-        LOCK(governance.cs);
+    // FIND OBJECT USER IS LOOKING FOR
 
-        CGovernanceObject* pGovObj = governance.FindGovernanceObject(hash);
+    LOCK(governance.cs);
 
-        if(pGovObj == nullptr) {
-            throw JSONRPCError(RPC_INVALID_PARAMETER, "Unknown governance-hash");
-        }
+    CGovernanceObject* pGovObj = governance.FindGovernanceObject(hash);
 
-        // REPORT RESULTS TO USER
+    if(pGovObj == nullptr) {
+        throw JSONRPCError(RPC_INVALID_PARAMETER, "Unknown governance-hash");
+    }
 
-        UniValue bResult(UniValue::VOBJ);
+    // REPORT RESULTS TO USER
 
-        // GET MATCHING VOTES BY HASH, THEN SHOW USERS VOTE INFORMATION
+    UniValue bResult(UniValue::VOBJ);
 
-        std::vector<CGovernanceVote> vecVotes = governance.GetCurrentVotes(hash, mnCollateralOutpoint);
-        for (const auto& vote : vecVotes) {
-            bResult.push_back(Pair(vote.GetHash().ToString(),  vote.ToString()));
-        }
+    // GET MATCHING VOTES BY HASH, THEN SHOW USERS VOTE INFORMATION
+
+    std::vector<CGovernanceVote> vecVotes = governance.GetCurrentVotes(hash, mnCollateralOutpoint);
+    for (const auto& vote : vecVotes) {
+        bResult.push_back(Pair(vote.GetHash().ToString(),  vote.ToString()));
+    }
+
+    return bResult;
+}
+
+void gobject_help()
+{
+    throw std::runtime_error(
+            "gobject \"command\"...\n"
+            "Manage governance objects\n"
+            "\nAvailable commands:\n"
+            "  check              - Validate governance object data (proposal only)\n"
+#ifdef ENABLE_WALLET
+            "  prepare            - Prepare governance object by signing and creating tx\n"
+#endif // ENABLE_WALLET
+            "  submit             - Submit governance object to network\n"
+            "  deserialize        - Deserialize governance object from hex string to JSON\n"
+            "  count              - Count governance objects and votes (additional param: 'json' or 'all', default: 'json')\n"
+            "  get                - Get governance object by hash\n"
+            "  getvotes           - Get all votes for a governance object hash (including old votes)\n"
+            "  getcurrentvotes    - Get only current (tallying) votes for a governance object hash (does not include old votes)\n"
+            "  list               - List governance objects (can be filtered by signal and/or object type)\n"
+            "  diff               - List differences since last diff\n"
+            "  vote-alias         - Vote on a governance object by masternode alias (using masternode.conf setup)\n"
+            "  vote-conf          - Vote on a governance object by masternode configured in dash.conf\n"
+            "  vote-many          - Vote on a governance object by all masternodes (using masternode.conf setup)\n"
+            );
+}
 
-        return bResult;
+UniValue gobject(const JSONRPCRequest& request)
+{
+    std::string strCommand;
+    if (request.params.size() >= 1)
+        strCommand = request.params[0].get_str();
+
+    if ((request.fHelp && strCommand.empty())  ||
+        (
+#ifdef ENABLE_WALLET
+         strCommand != "prepare" &&
+#endif // ENABLE_WALLET
+         strCommand != "vote-many" && strCommand != "vote-conf" && strCommand != "vote-alias" && strCommand != "submit" && strCommand != "count" &&
+         strCommand != "deserialize" && strCommand != "get" && strCommand != "getvotes" && strCommand != "getcurrentvotes" && strCommand != "list" && strCommand != "diff" &&
+         strCommand != "check" ))
+            gobject_help();
+
+    if(strCommand == "count") {
+        return gobject_count(request);
+    } else if(strCommand == "deserialize") {
+        // DEBUG : TEST DESERIALIZATION OF GOVERNANCE META DATA
+        return gobject_deserialize(request);
+    } else if(strCommand == "check") {
+        // VALIDATE A GOVERNANCE OBJECT PRIOR TO SUBMISSION
+        return gobject_check(request);
+#ifdef ENABLE_WALLET
+    } else if(strCommand == "prepare") {
+        // PREPARE THE GOVERNANCE OBJECT BY CREATING A COLLATERAL TRANSACTION
+        return gobject_prepare(request);
+#endif // ENABLE_WALLET
+    } else if(strCommand == "submit") {
+        // AFTER COLLATERAL TRANSACTION HAS MATURED USER CAN SUBMIT GOVERNANCE OBJECT TO PROPAGATE NETWORK
+        /*
+            ------ Example Governance Item ------
+
+            gobject submit 6e622bb41bad1fb18e7f23ae96770aeb33129e18bd9efe790522488e580a0a03 0 1 1464292854 "beer-reimbursement" 5b5b22636f6e7472616374222c207b2270726f6a6563745f6e616d65223a20225c22626565722d7265696d62757273656d656e745c22222c20227061796d656e745f61646472657373223a20225c225879324c4b4a4a64655178657948726e34744744514238626a6876464564615576375c22222c2022656e645f64617465223a202231343936333030343030222c20226465736372697074696f6e5f75726c223a20225c227777772e646173687768616c652e6f72672f702f626565722d7265696d62757273656d656e745c22222c2022636f6e74726163745f75726c223a20225c22626565722d7265696d62757273656d656e742e636f6d2f3030312e7064665c22222c20227061796d656e745f616d6f756e74223a20223233342e323334323232222c2022676f7665726e616e63655f6f626a6563745f6964223a2037342c202273746172745f64617465223a202231343833323534303030227d5d5d1
+        */
+        return gobject_submit(request);
+    } else if(strCommand == "vote-conf") {
+        return gobject_vote_conf(request);
+    } else if(strCommand == "vote-many") {
+        return gobject_vote_many(request);
+    } else if(strCommand == "vote-alias") {
+        return gobject_vote_alias(request);
+    } else if(strCommand == "list") {
+        // USERS CAN QUERY THE SYSTEM FOR A LIST OF VARIOUS GOVERNANCE ITEMS
+        return gobject_list(request);
+    } else if(strCommand == "diff") {
+        return gobject_diff(request);
+    } else if(strCommand == "get") {
+        // GET SPECIFIC GOVERNANCE ENTRY
+        return gobject_get(request);
+    } else if(strCommand == "getvotes") {
+        // GETVOTES FOR SPECIFIC GOVERNANCE OBJECT
+        return gobject_getvotes(request);
+    } else if(strCommand == "getcurrentvotes") {
+        // GETVOTES FOR SPECIFIC GOVERNANCE OBJECT
+        return gobject_getcurrentvotes(request);
     }
 
-    return NullUniValue;
+    throw std::runtime_error("invalid command: " + strCommand);
 }
 
 UniValue voteraw(const JSONRPCRequest& request)
diff --git a/src/rpc/masternode.cpp b/src/rpc/masternode.cpp
index aedfce5772e5..576c41f259a2 100644
--- a/src/rpc/masternode.cpp
+++ b/src/rpc/masternode.cpp
@@ -114,234 +114,241 @@ UniValue getpoolinfo(const JSONRPCRequest& request)
     return obj;
 }
 
+void masternode_list_help()
+{
+    throw std::runtime_error(
+            "masternode list ( \"mode\" \"filter\" )\n"
+            "Get a list of masternodes in different modes. This call is identical to masternodelist call.\n"
+            "\nArguments:\n"
+            "1. \"mode\"      (string, optional/required to use filter, defaults = json) The mode to run list in\n"
+            "2. \"filter\"    (string, optional) Filter results. Partial match by outpoint by default in all modes,\n"
+            "                                    additional matches in some modes are also available\n"
+            "\nAvailable modes:\n"
+            "  activeseconds  - Print number of seconds masternode recognized by the network as enabled\n"
+            "                   (since latest issued \"masternode start/start-many/start-alias\")\n"
+            "  addr           - Print ip address associated with a masternode (can be additionally filtered, partial match)\n"
+            "  daemon         - Print daemon version of a masternode (can be additionally filtered, exact match)\n"
+            "  full           - Print info in format 'status protocol payee lastseen activeseconds lastpaidtime lastpaidblock IP'\n"
+            "                   (can be additionally filtered, partial match)\n"
+            "  info           - Print info in format 'status protocol payee lastseen activeseconds sentinelversion sentinelstate IP'\n"
+            "                   (can be additionally filtered, partial match)\n"
+            "  json           - Print info in JSON format (can be additionally filtered, partial match)\n"
+            "  lastpaidblock  - Print the last block height a node was paid on the network\n"
+            "  lastpaidtime   - Print the last time a node was paid on the network\n"
+            "  lastseen       - Print timestamp of when a masternode was last seen on the network\n"
+            "  payee          - Print Dash address associated with a masternode (can be additionally filtered,\n"
+            "                   partial match)\n"
+            "  protocol       - Print protocol of a masternode (can be additionally filtered, exact match)\n"
+            "  keyid          - Print the masternode (not collateral) key id\n"
+            "  rank           - Print rank of a masternode based on current block\n"
+            "  sentinel       - Print sentinel version of a masternode (can be additionally filtered, exact match)\n"
+            "  status         - Print masternode status: PRE_ENABLED / ENABLED / EXPIRED / SENTINEL_PING_EXPIRED / NEW_START_REQUIRED /\n"
+            "                   UPDATE_REQUIRED / POSE_BAN / OUTPOINT_SPENT (can be additionally filtered, partial match)\n"
+        );
+}
 
-UniValue masternode(const JSONRPCRequest& request)
+UniValue masternode_list(const JSONRPCRequest& request)
 {
-    std::string strCommand;
-    if (request.params.size() >= 1) {
-        strCommand = request.params[0].get_str();
+    if(request.fHelp)
+        masternode_list_help();
+    JSONRPCRequest newRequest = request;
+    newRequest.params.setArray();
+    // forward params but skip "list"
+    for (unsigned int i = 1; i < request.params.size(); i++) {
+        newRequest.params.push_back(request.params[i]);
     }
+    return masternodelist(newRequest);
+}
 
-#ifdef ENABLE_WALLET
-    if (strCommand == "start-many")
-        throw JSONRPCError(RPC_INVALID_PARAMETER, "DEPRECATED, please use start-all instead");
-#endif // ENABLE_WALLET
+void masternode_connect_help()
+{
+    throw std::runtime_error(
+            "masternode connect \"address\"\n"
+            "Connect to given masternode\n"
+            "\nArguments:\n"
+            "1. \"address\"      (string, required) The address of the masternode to connect\n"
+        );
+}
 
-    if (request.fHelp  ||
-        (
-#ifdef ENABLE_WALLET
-            strCommand != "start-alias" && strCommand != "start-all" && strCommand != "start-missing" &&
-         strCommand != "start-disabled" && strCommand != "outputs" &&
-#endif // ENABLE_WALLET
-         strCommand != "list" && strCommand != "list-conf" && strCommand != "count" &&
-         strCommand != "debug" && strCommand != "current" && strCommand != "winner" && strCommand != "winners" && strCommand != "genkey" &&
-         strCommand != "connect" && strCommand != "status" && strCommand != "check"))
-            throw std::runtime_error(
-                "masternode \"command\"...\n"
-                "Set of commands to execute masternode related actions\n"
-                "\nArguments:\n"
-                "1. \"command\"        (string or set of strings, required) The command to execute\n"
-                "\nAvailable commands:\n"
-                "  check        - Force check all masternodes and remove invalid ones\n"
-                "  count        - Get information about number of masternodes (DEPRECATED options: 'total', 'ps', 'enabled', 'qualify', 'all')\n"
-                "  current      - Print info on current masternode winner to be paid the next block (calculated locally)\n"
-                "  genkey       - Generate new masternodeprivkey, optional param: 'compressed' (boolean, optional, default=false) generate compressed privkey\n"
-#ifdef ENABLE_WALLET
-                "  outputs      - Print masternode compatible outputs\n"
-                "  start-alias  - Start single remote masternode by assigned alias configured in masternode.conf\n"
-                "  start-<mode> - Start remote masternodes configured in masternode.conf (<mode>: 'all', 'missing', 'disabled')\n"
-#endif // ENABLE_WALLET
-                "  status       - Print masternode status information\n"
-                "  list         - Print list of all known masternodes (see masternodelist for more info)\n"
-                "  list-conf    - Print masternode.conf in JSON format\n"
-                "  winner       - Print info on next masternode winner to vote for\n"
-                "  winners      - Print list of masternode winners\n"
-                );
+UniValue masternode_connect(const JSONRPCRequest& request)
+{
+    if(request.fHelp || request.params.size() < 2)
+        masternode_connect_help();
 
-    if (strCommand == "list")
-    {
-        JSONRPCRequest newRequest = request;
-        newRequest.params.setArray();
-        // forward params but skip "list"
-        for (unsigned int i = 1; i < request.params.size(); i++) {
-            newRequest.params.push_back(request.params[i]);
-        }
-        return masternodelist(newRequest);
-    }
+    std::string strAddress = request.params[1].get_str();
 
-    if(strCommand == "connect")
-    {
-        if (request.params.size() < 2)
-            throw JSONRPCError(RPC_INVALID_PARAMETER, "Masternode address required");
+    CService addr;
+    if (!Lookup(strAddress.c_str(), addr, 0, false))
+        throw JSONRPCError(RPC_INTERNAL_ERROR, strprintf("Incorrect masternode address %s", strAddress));
 
-        std::string strAddress = request.params[1].get_str();
+    // TODO: Pass CConnman instance somehow and don't use global variable.
+    g_connman->OpenMasternodeConnection(CAddress(addr, NODE_NETWORK));
+    if (!g_connman->IsConnected(CAddress(addr, NODE_NETWORK), CConnman::AllNodes))
+        throw JSONRPCError(RPC_INTERNAL_ERROR, strprintf("Couldn't connect to masternode %s", strAddress));
 
-        CService addr;
-        if (!Lookup(strAddress.c_str(), addr, 0, false))
-            throw JSONRPCError(RPC_INTERNAL_ERROR, strprintf("Incorrect masternode address %s", strAddress));
+    return "successfully connected";
+}
 
-        // TODO: Pass CConnman instance somehow and don't use global variable.
-        g_connman->OpenMasternodeConnection(CAddress(addr, NODE_NETWORK));
-        if (!g_connman->IsConnected(CAddress(addr, NODE_NETWORK), CConnman::AllNodes))
-            throw JSONRPCError(RPC_INTERNAL_ERROR, strprintf("Couldn't connect to masternode %s", strAddress));
+void masternode_count_help()
+{
+    throw std::runtime_error(
+            "masternode count (\"mode\")\n"
+            "  Get information about number of masternodes. Mode\n"
+            "  usage is depricated, call without mode params returns\n"
+            "  all values in JSON format.\n"
+            "\nArguments:\n"
+            "1. \"mode\"      (string, optional, DEPRICATED) Option to get number of masternodes in different states\n"
+            "\nAvailable modes:\n"
+            "  total         - total number of masternodes"
+            "  ps            - number of PrivateSend compatible masternodes"
+            "  enabled       - number of enabled masternodes"
+            "  qualify       - number of qualified masternodes"
+            "  all           - all above in one string"
+        );
+}
 
-        return "successfully connected";
-    }
+UniValue masternode_count(const JSONRPCRequest& request)
+{
+    if(request.fHelp || request.params.size() > 2)
+        masternode_count_help();
 
-    if (strCommand == "count")
-    {
-        if (request.params.size() > 2)
-            throw JSONRPCError(RPC_INVALID_PARAMETER, "Too many parameters");
+    int nCount;
+    masternode_info_t mnInfo;
+    mnodeman.GetNextMasternodeInQueueForPayment(true, nCount, mnInfo);
 
-        int nCount;
-        masternode_info_t mnInfo;
-        mnodeman.GetNextMasternodeInQueueForPayment(true, nCount, mnInfo);
+    int total = mnodeman.size();
+    int ps = mnodeman.CountEnabled(MIN_PRIVATESEND_PEER_PROTO_VERSION);
+    int enabled = mnodeman.CountEnabled();
 
-        int total = mnodeman.size();
-        int ps = mnodeman.CountEnabled(MIN_PRIVATESEND_PEER_PROTO_VERSION);
-        int enabled = mnodeman.CountEnabled();
+    if (request.params.size() == 1) {
+        UniValue obj(UniValue::VOBJ);
 
-        if (request.params.size() == 1) {
-            UniValue obj(UniValue::VOBJ);
+        obj.push_back(Pair("total", total));
+        obj.push_back(Pair("ps_compatible", ps));
+        obj.push_back(Pair("enabled", enabled));
+        obj.push_back(Pair("qualify", nCount));
 
-            obj.push_back(Pair("total", total));
-            obj.push_back(Pair("ps_compatible", ps));
-            obj.push_back(Pair("enabled", enabled));
-            obj.push_back(Pair("qualify", nCount));
+        return obj;
+    }
 
-            return obj;
-        }
+    std::string strMode = request.params[1].get_str();
 
-        std::string strMode = request.params[1].get_str();
+    if (strMode == "total")
+        return total;
 
-        if (strMode == "total")
-            return total;
+    if (strMode == "ps")
+        return ps;
 
-        if (strMode == "ps")
-            return ps;
+    if (strMode == "enabled")
+        return enabled;
 
-        if (strMode == "enabled")
-            return enabled;
+    if (strMode == "qualify")
+        return nCount;
 
-        if (strMode == "qualify")
-            return nCount;
+    if (strMode == "all")
+        return strprintf("Total: %d (PS Compatible: %d / Enabled: %d / Qualify: %d)",
+            total, ps, enabled, nCount);
 
-        if (strMode == "all")
-            return strprintf("Total: %d (PS Compatible: %d / Enabled: %d / Qualify: %d)",
-                total, ps, enabled, nCount);
-    }
+    throw JSONRPCError(RPC_INVALID_PARAMETER, "Unknown mode value");
+}
 
-    if (strCommand == "current" || strCommand == "winner")
+UniValue GetNextMasternodeForPayment(int heightShift)
+{
+    int nCount;
+    int nHeight;
+    masternode_info_t mnInfo;
+    CBlockIndex* pindex = NULL;
     {
-        int nCount;
-        int nHeight;
-        masternode_info_t mnInfo;
-        CBlockIndex* pindex = NULL;
-        {
-            LOCK(cs_main);
-            pindex = chainActive.Tip();
-        }
-        nHeight = pindex->nHeight + (strCommand == "current" ? 1 : 10);
-        mnodeman.UpdateLastPaid(pindex);
-
-        if(!mnodeman.GetNextMasternodeInQueueForPayment(nHeight, true, nCount, mnInfo))
-            return "unknown";
-
-        UniValue obj(UniValue::VOBJ);
-
-        obj.push_back(Pair("height",        nHeight));
-        obj.push_back(Pair("IP:port",       mnInfo.addr.ToString()));
-        obj.push_back(Pair("protocol",      mnInfo.nProtocolVersion));
-        obj.push_back(Pair("outpoint",      mnInfo.outpoint.ToStringShort()));
-        obj.push_back(Pair("payee",         CBitcoinAddress(mnInfo.keyIDCollateralAddress).ToString()));
-        obj.push_back(Pair("lastseen",      mnInfo.nTimeLastPing));
-        obj.push_back(Pair("activeseconds", mnInfo.nTimeLastPing - mnInfo.sigTime));
-        return obj;
+        LOCK(cs_main);
+        pindex = chainActive.Tip();
     }
+    nHeight = pindex->nHeight + heightShift;
+    mnodeman.UpdateLastPaid(pindex);
 
-#ifdef ENABLE_WALLET
-    if (strCommand == "start-alias")
-    {
-        if (!EnsureWalletIsAvailable(request.fHelp))
-            return NullUniValue;
-
-        if (request.params.size() < 2)
-            throw JSONRPCError(RPC_INVALID_PARAMETER, "Please specify an alias");
+    if(!mnodeman.GetNextMasternodeInQueueForPayment(nHeight, true, nCount, mnInfo))
+        return "unknown";
 
-        {
-            LOCK(pwalletMain->cs_wallet);
-            EnsureWalletIsUnlocked();
-        }
+    UniValue obj(UniValue::VOBJ);
 
-        std::string strAlias = request.params[1].get_str();
+    obj.push_back(Pair("height",        nHeight));
+    obj.push_back(Pair("IP:port",       mnInfo.addr.ToString()));
+    obj.push_back(Pair("protocol",      mnInfo.nProtocolVersion));
+    obj.push_back(Pair("outpoint",      mnInfo.outpoint.ToStringShort()));
+    obj.push_back(Pair("payee",         CBitcoinAddress(mnInfo.keyIDCollateralAddress).ToString()));
+    obj.push_back(Pair("lastseen",      mnInfo.nTimeLastPing));
+    obj.push_back(Pair("activeseconds", mnInfo.nTimeLastPing - mnInfo.sigTime));
+    return obj;
+}
 
-        bool fFound = false;
+void masternode_winner_help()
+{
+    throw std::runtime_error(
+            "masternode winner\n"
+            "Print info on next masternode winner to vote for\n"
+        );
+}
 
-        UniValue statusObj(UniValue::VOBJ);
-        statusObj.push_back(Pair("alias", strAlias));
+UniValue masternode_winner(const JSONRPCRequest& request)
+{
+    if(request.fHelp)
+        masternode_winner_help();
 
-        for (const auto& mne : masternodeConfig.getEntries()) {
-            if(mne.getAlias() == strAlias) {
-                fFound = true;
-                std::string strError;
-                CMasternodeBroadcast mnb;
+    return GetNextMasternodeForPayment(10);
+}
 
-                bool fResult = CMasternodeBroadcast::Create(mne.getIp(), mne.getPrivKey(), mne.getTxHash(), mne.getOutputIndex(), strError, mnb);
+void masternode_current_help()
+{
+    throw std::runtime_error(
+            "masternode current\n"
+            "Print info on current masternode winner to be paid the next block (calculated locally)\n"
+        );
+}
 
-                int nDoS;
-                if (fResult && !mnodeman.CheckMnbAndUpdateMasternodeList(NULL, mnb, nDoS, *g_connman)) {
-                    strError = "Failed to verify MNB";
-                    fResult = false;
-                }
+UniValue masternode_current(const JSONRPCRequest& request)
+{
+    if(request.fHelp)
+        masternode_current_help();
 
-                statusObj.push_back(Pair("result", fResult ? "successful" : "failed"));
-                if(!fResult) {
-                    statusObj.push_back(Pair("errorMessage", strError));
-                }
-                mnodeman.NotifyMasternodeUpdates(*g_connman);
-                break;
-            }
-        }
+    return GetNextMasternodeForPayment(1);
+}
 
-        if(!fFound) {
-            statusObj.push_back(Pair("result", "failed"));
-            statusObj.push_back(Pair("errorMessage", "Could not find alias in config. Verify with list-conf."));
-        }
+#ifdef ENABLE_WALLET
+void masternode_start_alias_help()
+{
+    throw std::runtime_error(
+            "masternode start-alias \"alias\"\n"
+            "Start single remote masternode by assigned alias\n"
+            "\nArguments:\n"
+            "1. \"alias\"      (string, required) The alias of the remote masternode configured in masternode.conf\n"
+        );
+}
 
-        return statusObj;
+UniValue masternode_start_alias(const JSONRPCRequest& request)
+{
+    if(request.fHelp || request.params.size() < 2)
+        masternode_start_alias_help();
 
-    }
+    if (!EnsureWalletIsAvailable(request.fHelp))
+        return NullUniValue;
 
-    if (strCommand == "start-all" || strCommand == "start-missing" || strCommand == "start-disabled")
     {
-        if (!EnsureWalletIsAvailable(request.fHelp))
-            return NullUniValue;
-
-        {
-            LOCK(pwalletMain->cs_wallet);
-            EnsureWalletIsUnlocked();
-        }
+        LOCK(pwalletMain->cs_wallet);
+        EnsureWalletIsUnlocked();
+    }
 
-        if((strCommand == "start-missing" || strCommand == "start-disabled") && !masternodeSync.IsMasternodeListSynced()) {
-            throw JSONRPCError(RPC_CLIENT_IN_INITIAL_DOWNLOAD, "You can't use this command until masternode list is synced");
-        }
+    std::string strAlias = request.params[1].get_str();
 
-        int nSuccessful = 0;
-        int nFailed = 0;
+    bool fFound = false;
 
-        UniValue resultsObj(UniValue::VOBJ);
+    UniValue statusObj(UniValue::VOBJ);
+    statusObj.push_back(Pair("alias", strAlias));
 
-        for (const auto& mne : masternodeConfig.getEntries()) {
+    for (const auto& mne : masternodeConfig.getEntries()) {
+        if(mne.getAlias() == strAlias) {
+            fFound = true;
             std::string strError;
-
-            COutPoint outpoint = COutPoint(uint256S(mne.getTxHash()), (uint32_t)atoi(mne.getOutputIndex()));
-            CMasternode mn;
-            bool fFound = mnodeman.Get(outpoint, mn);
             CMasternodeBroadcast mnb;
 
-            if(strCommand == "start-missing" && fFound) continue;
-            if(strCommand == "start-disabled" && fFound && mn.IsEnabled()) continue;
-
             bool fResult = CMasternodeBroadcast::Create(mne.getIp(), mne.getPrivKey(), mne.getTxHash(), mne.getOutputIndex(), strError, mnb);
 
             int nDoS;
@@ -350,160 +357,450 @@ UniValue masternode(const JSONRPCRequest& request)
                 fResult = false;
             }
 
-            UniValue statusObj(UniValue::VOBJ);
-            statusObj.push_back(Pair("alias", mne.getAlias()));
             statusObj.push_back(Pair("result", fResult ? "successful" : "failed"));
-
-            if (fResult) {
-                nSuccessful++;
-            } else {
-                nFailed++;
+            if(!fResult) {
                 statusObj.push_back(Pair("errorMessage", strError));
             }
+            mnodeman.NotifyMasternodeUpdates(*g_connman);
+            break;
+        }
+    }
 
-            resultsObj.push_back(Pair("status", statusObj));
+    if(!fFound) {
+        statusObj.push_back(Pair("result", "failed"));
+        statusObj.push_back(Pair("errorMessage", "Could not find alias in config. Verify with list-conf."));
+    }
+
+    return statusObj;
+}
+
+void masternode_start_all_help()
+{
+    throw std::runtime_error(
+            "masternode start-all\n"
+            "Start remote masternodes configured in masternode.conf\n"
+        );
+}
+
+UniValue StartMasternodeList(const std::vector<CMasternodeConfig::CMasternodeEntry>& entries)
+{
+    int nSuccessful = 0;
+    int nFailed = 0;
+
+    UniValue resultsObj(UniValue::VOBJ);
+
+    for (const auto& mne : entries) {
+        std::string strError;
+        CMasternodeBroadcast mnb;
+
+        bool fResult = CMasternodeBroadcast::Create(mne.getIp(), mne.getPrivKey(), mne.getTxHash(), mne.getOutputIndex(), strError, mnb);
+
+        int nDoS;
+        if (fResult && !mnodeman.CheckMnbAndUpdateMasternodeList(NULL, mnb, nDoS, *g_connman)) {
+            strError = "Failed to verify MNB";
+            fResult = false;
         }
-        mnodeman.NotifyMasternodeUpdates(*g_connman);
 
-        UniValue returnObj(UniValue::VOBJ);
-        returnObj.push_back(Pair("overall", strprintf("Successfully started %d masternodes, failed to start %d, total %d", nSuccessful, nFailed, nSuccessful + nFailed)));
-        returnObj.push_back(Pair("detail", resultsObj));
+        UniValue statusObj(UniValue::VOBJ);
+        statusObj.push_back(Pair("alias", mne.getAlias()));
+        statusObj.push_back(Pair("result", fResult ? "successful" : "failed"));
+
+        if (fResult) {
+            nSuccessful++;
+        } else {
+            nFailed++;
+            statusObj.push_back(Pair("errorMessage", strError));
+        }
 
-        return returnObj;
+        resultsObj.push_back(Pair("status", statusObj));
     }
-#endif // ENABLE_WALLET
+    mnodeman.NotifyMasternodeUpdates(*g_connman);
+
+    UniValue returnObj(UniValue::VOBJ);
+    returnObj.push_back(Pair("overall", strprintf("Successfully started %d masternodes, failed to start %d, total %d", nSuccessful, nFailed, nSuccessful + nFailed)));
+    returnObj.push_back(Pair("detail", resultsObj));
+
+    return returnObj;
+}
+
+UniValue masternode_start_all(const JSONRPCRequest& request)
+{
+    if(request.fHelp)
+        masternode_start_all_help();
+
+    if (!EnsureWalletIsAvailable(request.fHelp))
+        return NullUniValue;
 
-    if (strCommand == "genkey")
     {
-        bool fCompressed = false;
-        if (request.params.size() > 1) {
-            fCompressed = ParseBoolV(request.params[1], "compressed");
-        }
+        LOCK(pwalletMain->cs_wallet);
+        EnsureWalletIsUnlocked();
+    }
+
+    return StartMasternodeList(masternodeConfig.getEntries());
+}
+
+void masternode_start_missing_help()
+{
+    throw std::runtime_error(
+            "masternode start-missing\n"
+            "Start not started remote masternodes configured in masternode.conf\n"
+        );
+}
+
+UniValue masternode_start_missing(const JSONRPCRequest& request)
+{
+    if(request.fHelp)
+        masternode_start_missing_help();
+
+    if (!EnsureWalletIsAvailable(request.fHelp))
+        return NullUniValue;
+
+    {
+        LOCK(pwalletMain->cs_wallet);
+        EnsureWalletIsUnlocked();
+    }
 
-        CKey secret;
-        secret.MakeNewKey(fCompressed);
+    if(!masternodeSync.IsMasternodeListSynced()) {
+        throw JSONRPCError(RPC_CLIENT_IN_INITIAL_DOWNLOAD, "You can't use this command until masternode list is synced");
+    }
 
-        return CBitcoinSecret(secret).ToString();
+    std::vector<CMasternodeConfig::CMasternodeEntry> entries;
+    for (const auto& mne : masternodeConfig.getEntries()) {
+        COutPoint outpoint = COutPoint(uint256S(mne.getTxHash()), (uint32_t)atoi(mne.getOutputIndex()));
+        CMasternode mn;
+        bool fFound = mnodeman.Get(outpoint, mn);
+        if(fFound)
+            entries.push_back(mne);
     }
+    return StartMasternodeList(entries);
+}
+
+void masternode_start_disabled_help()
+{
+    throw std::runtime_error(
+            "masternode start-disabled\n"
+            "Start not started and disabled remote masternodes configured in masternode.conf\n"
+        );
+}
+
+UniValue masternode_start_disabled(const JSONRPCRequest& request)
+{
+    if(request.fHelp)
+        masternode_start_disabled_help();
+
+    if (!EnsureWalletIsAvailable(request.fHelp))
+        return NullUniValue;
 
-    if (strCommand == "list-conf")
     {
-        UniValue resultObj(UniValue::VOBJ);
+        LOCK(pwalletMain->cs_wallet);
+        EnsureWalletIsUnlocked();
+    }
 
-        for (const auto& mne : masternodeConfig.getEntries()) {
-            COutPoint outpoint = COutPoint(uint256S(mne.getTxHash()), (uint32_t)atoi(mne.getOutputIndex()));
-            CMasternode mn;
-            bool fFound = mnodeman.Get(outpoint, mn);
-
-            std::string strStatus = fFound ? mn.GetStatus() : "MISSING";
-
-            UniValue mnObj(UniValue::VOBJ);
-            mnObj.push_back(Pair("alias", mne.getAlias()));
-            mnObj.push_back(Pair("address", mne.getIp()));
-            mnObj.push_back(Pair("privateKey", mne.getPrivKey()));
-            mnObj.push_back(Pair("txHash", mne.getTxHash()));
-            mnObj.push_back(Pair("outputIndex", mne.getOutputIndex()));
-            mnObj.push_back(Pair("status", strStatus));
-            resultObj.push_back(Pair("masternode", mnObj));
-        }
+    if(!masternodeSync.IsMasternodeListSynced()) {
+        throw JSONRPCError(RPC_CLIENT_IN_INITIAL_DOWNLOAD, "You can't use this command until masternode list is synced");
+    }
+
+    std::vector<CMasternodeConfig::CMasternodeEntry> entries;
+    for (const auto& mne : masternodeConfig.getEntries()) {
+        COutPoint outpoint = COutPoint(uint256S(mne.getTxHash()), (uint32_t)atoi(mne.getOutputIndex()));
+        CMasternode mn;
+        bool fFound = mnodeman.Get(outpoint, mn);
 
-        return resultObj;
+        if(fFound && mn.IsEnabled()) continue;
+
+        entries.push_back(mne);
     }
+    return StartMasternodeList(entries);
+}
 
-#ifdef ENABLE_WALLET
-    if (strCommand == "outputs") {
-        if (!EnsureWalletIsAvailable(request.fHelp))
-            return NullUniValue;
+void masternode_outputs_help()
+{
+    throw std::runtime_error(
+            "masternode outputs\n"
+            "Print masternode compatible outputs\n"
+        );
+}
 
-        // Find possible candidates
-        std::vector<COutput> vPossibleCoins;
-        pwalletMain->AvailableCoins(vPossibleCoins, true, NULL, false, ONLY_1000);
+UniValue masternode_outputs(const JSONRPCRequest& request)
+{
+    if(request.fHelp)
+        masternode_outputs_help();
 
-        UniValue obj(UniValue::VOBJ);
-        for (const auto& out : vPossibleCoins) {
-            obj.push_back(Pair(out.tx->GetHash().ToString(), strprintf("%d", out.i)));
-        }
+    if (!EnsureWalletIsAvailable(request.fHelp))
+        return NullUniValue;
 
-        return obj;
+    // Find possible candidates
+    std::vector<COutput> vPossibleCoins;
+    pwalletMain->AvailableCoins(vPossibleCoins, true, NULL, false, ONLY_1000);
+
+    UniValue obj(UniValue::VOBJ);
+    for (const auto& out : vPossibleCoins) {
+        obj.push_back(Pair(out.tx->GetHash().ToString(), strprintf("%d", out.i)));
     }
+
+    return obj;
+}
+
 #endif // ENABLE_WALLET
 
-    if (strCommand == "status")
-    {
-        if (!fMasternodeMode)
-            throw JSONRPCError(RPC_INTERNAL_ERROR, "This is not a masternode");
+void masternode_genkey_help()
+{
+    throw std::runtime_error(
+            "masternode genkey (compressed)\n"
+            "Generate new masternodeprivkey\n"
+            "\nArguments:\n"
+            "1. compressed        (boolean, optional, default=false) generate compressed privkey\n"
+        );
+}
 
-        UniValue mnObj(UniValue::VOBJ);
+UniValue masternode_genkey(const JSONRPCRequest& request)
+{
+    if(request.fHelp)
+        masternode_genkey_help();
+
+    bool fCompressed = false;
+    if (request.params.size() > 1) {
+        fCompressed = ParseBoolV(request.params[1], "compressed");
+    }
+
+    CKey secret;
+    secret.MakeNewKey(fCompressed);
+
+    return CBitcoinSecret(secret).ToString();
+}
+
+void masternode_list_conf_help()
+{
+    throw std::runtime_error(
+            "masternode list-conf\n"
+            "Print masternode.conf in JSON format\n"
+        );
+}
+
+UniValue masternode_list_conf(const JSONRPCRequest& request)
+{
+    if(request.fHelp)
+        masternode_list_conf_help();
 
-        mnObj.push_back(Pair("outpoint", activeMasternodeInfo.outpoint.ToStringShort()));
-        mnObj.push_back(Pair("service", activeMasternodeInfo.service.ToString()));
+    UniValue resultObj(UniValue::VOBJ);
 
+    for (const auto& mne : masternodeConfig.getEntries()) {
+        COutPoint outpoint = COutPoint(uint256S(mne.getTxHash()), (uint32_t)atoi(mne.getOutputIndex()));
         CMasternode mn;
-        if(mnodeman.Get(activeMasternodeInfo.outpoint, mn)) {
-            mnObj.push_back(Pair("payee", CBitcoinAddress(mn.keyIDCollateralAddress).ToString()));
-        }
+        bool fFound = mnodeman.Get(outpoint, mn);
+
+        std::string strStatus = fFound ? mn.GetStatus() : "MISSING";
 
-        mnObj.push_back(Pair("status", legacyActiveMasternodeManager.GetStatus()));
-        return mnObj;
+        UniValue mnObj(UniValue::VOBJ);
+        mnObj.push_back(Pair("alias", mne.getAlias()));
+        mnObj.push_back(Pair("address", mne.getIp()));
+        mnObj.push_back(Pair("privateKey", mne.getPrivKey()));
+        mnObj.push_back(Pair("txHash", mne.getTxHash()));
+        mnObj.push_back(Pair("outputIndex", mne.getOutputIndex()));
+        mnObj.push_back(Pair("status", strStatus));
+        resultObj.push_back(Pair("masternode", mnObj));
     }
 
-    if (strCommand == "winners")
-    {
-        int nHeight;
-        {
-            LOCK(cs_main);
-            CBlockIndex* pindex = chainActive.Tip();
-            if(!pindex) return NullUniValue;
+    return resultObj;
+}
 
-            nHeight = pindex->nHeight;
-        }
+void masternode_status_help()
+{
+    throw std::runtime_error(
+            "masternode status\n"
+            "Print masternode status information\n"
+        );
+}
 
-        int nLast = 10;
-        std::string strFilter = "";
+UniValue masternode_status(const JSONRPCRequest& request)
+{
+    if(request.fHelp)
+        masternode_status_help();
 
-        if (request.params.size() >= 2) {
-            nLast = atoi(request.params[1].get_str());
-        }
+    if (!fMasternodeMode)
+        throw JSONRPCError(RPC_INTERNAL_ERROR, "This is not a masternode");
 
-        if (request.params.size() == 3) {
-            strFilter = request.params[2].get_str();
-        }
+    UniValue mnObj(UniValue::VOBJ);
 
-        if (request.params.size() > 3)
-            throw JSONRPCError(RPC_INVALID_PARAMETER, "Correct usage is 'masternode winners ( \"count\" \"filter\" )'");
+    mnObj.push_back(Pair("outpoint", activeMasternodeInfo.outpoint.ToStringShort()));
+    mnObj.push_back(Pair("service", activeMasternodeInfo.service.ToString()));
 
-        UniValue obj(UniValue::VOBJ);
+    CMasternode mn;
+    if(mnodeman.Get(activeMasternodeInfo.outpoint, mn)) {
+        mnObj.push_back(Pair("payee", CBitcoinAddress(mn.keyIDCollateralAddress).ToString()));
+    }
 
-        for(int i = nHeight - nLast; i < nHeight + 20; i++) {
-            std::string strPayment = GetRequiredPaymentsString(i);
-            if (strFilter !="" && strPayment.find(strFilter) == std::string::npos) continue;
-            obj.push_back(Pair(strprintf("%d", i), strPayment));
-        }
+    mnObj.push_back(Pair("status", legacyActiveMasternodeManager.GetStatus()));
+    return mnObj;
+}
 
-        return obj;
+void masternode_winners_help()
+{
+    throw std::runtime_error(
+            "masternode winners ( count \"filter\" )\n"
+            "Print list of masternode winners\n"
+            "\nArguments:\n"
+            "1. count        (numeric, optional) number of last winners to return\n"
+            "2. filter       (string, optional) filter for returned winners\n"
+        );
+}
+
+UniValue masternode_winners(const JSONRPCRequest& request)
+{
+    if(request.fHelp)
+        masternode_winners_help();
+
+    int nHeight;
+    {
+        LOCK(cs_main);
+        CBlockIndex* pindex = chainActive.Tip();
+        if(!pindex) return NullUniValue;
+
+        nHeight = pindex->nHeight;
     }
 
-    if (strCommand == "check") {
-        int countBeforeCheck = mnodeman.CountMasternodes();
-        int countEnabledBeforeCheck = mnodeman.CountEnabled();
+    int nLast = 10;
+    std::string strFilter = "";
 
-        mnodeman.CheckAndRemove(*g_connman);
+    if (request.params.size() >= 2) {
+        nLast = atoi(request.params[1].get_str());
+    }
 
-        int countAfterCheck = mnodeman.CountMasternodes();
-        int countEnabledAfterCheck = mnodeman.CountEnabled();
-        int removedCount = std::max(0, countBeforeCheck - countAfterCheck);
-        int removedEnabledCount = std::max(0, countEnabledBeforeCheck - countEnabledAfterCheck);
+    if (request.params.size() == 3) {
+        strFilter = request.params[2].get_str();
+    }
 
-        UniValue obj(UniValue::VOBJ);
-        obj.push_back(Pair("removedTotalCount", removedCount));
-        obj.push_back(Pair("removedEnabledCount", removedEnabledCount));
-        obj.push_back(Pair("totalCount", countAfterCheck));
-        obj.push_back(Pair("enabledCount", countEnabledAfterCheck));
+    if (request.params.size() > 3)
+        throw JSONRPCError(RPC_INVALID_PARAMETER, "Correct usage is 'masternode winners ( \"count\" \"filter\" )'");
 
-        return obj;
+    UniValue obj(UniValue::VOBJ);
+
+    for(int i = nHeight - nLast; i < nHeight + 20; i++) {
+        std::string strPayment = GetRequiredPaymentsString(i);
+        if (strFilter !="" && strPayment.find(strFilter) == std::string::npos) continue;
+        obj.push_back(Pair(strprintf("%d", i), strPayment));
     }
 
-    return NullUniValue;
+    return obj;
+}
+
+void masternode_check_help()
+{
+    throw std::runtime_error(
+            "masternode check\n"
+            "Force check all masternodes and remove invalid ones\n"
+        );
+}
+
+UniValue masternode_check(const JSONRPCRequest& request)
+{
+    if(request.fHelp)
+        masternode_check_help();
+
+    int countBeforeCheck = mnodeman.CountMasternodes();
+    int countEnabledBeforeCheck = mnodeman.CountEnabled();
+
+    mnodeman.CheckAndRemove(*g_connman);
+
+    int countAfterCheck = mnodeman.CountMasternodes();
+    int countEnabledAfterCheck = mnodeman.CountEnabled();
+    int removedCount = std::max(0, countBeforeCheck - countAfterCheck);
+    int removedEnabledCount = std::max(0, countEnabledBeforeCheck - countEnabledAfterCheck);
+
+    UniValue obj(UniValue::VOBJ);
+    obj.push_back(Pair("removedTotalCount", removedCount));
+    obj.push_back(Pair("removedEnabledCount", removedEnabledCount));
+    obj.push_back(Pair("totalCount", countAfterCheck));
+    obj.push_back(Pair("enabledCount", countEnabledAfterCheck));
+
+    return obj;
+}
+
+void masternode_help()
+{
+    throw std::runtime_error(
+        "masternode \"command\"...\n"
+        "Set of commands to execute masternode related actions\n"
+        "\nArguments:\n"
+        "1. \"command\"        (string or set of strings, required) The command to execute\n"
+        "\nAvailable commands:\n"
+        "  check        - Force check all masternodes and remove invalid ones\n"
+        "  count        - Get information about number of masternodes (DEPRECATED options: 'total', 'ps', 'enabled', 'qualify', 'all')\n"
+        "  current      - Print info on current masternode winner to be paid the next block (calculated locally)\n"
+        "  genkey       - Generate new masternodeprivkey, optional param: 'compressed' (boolean, optional, default=false) generate compressed privkey\n"
+#ifdef ENABLE_WALLET
+        "  outputs      - Print masternode compatible outputs\n"
+        "  start-alias  - Start single remote masternode by assigned alias configured in masternode.conf\n"
+        "  start-<mode> - Start remote masternodes configured in masternode.conf (<mode>: 'all', 'missing', 'disabled')\n"
+#endif // ENABLE_WALLET
+        "  status       - Print masternode status information\n"
+        "  list         - Print list of all known masternodes (see masternodelist for more info)\n"
+        "  list-conf    - Print masternode.conf in JSON format\n"
+        "  winner       - Print info on next masternode winner to vote for\n"
+        "  winners      - Print list of masternode winners\n"
+        );
+}
+
+UniValue masternode(const JSONRPCRequest& request)
+{
+    std::string strCommand;
+    if (request.params.size() >= 1) {
+        strCommand = request.params[0].get_str();
+    }
+
+#ifdef ENABLE_WALLET
+    if (strCommand == "start-many")
+        throw JSONRPCError(RPC_INVALID_PARAMETER, "DEPRECATED, please use start-all instead");
+#endif // ENABLE_WALLET
+
+    if ((request.fHelp && strCommand.empty())  ||
+        (
+#ifdef ENABLE_WALLET
+            strCommand != "start-alias" && strCommand != "start-all" && strCommand != "start-missing" &&
+         strCommand != "start-disabled" && strCommand != "outputs" &&
+#endif // ENABLE_WALLET
+         strCommand != "list" && strCommand != "list-conf" && strCommand != "count" &&
+         strCommand != "debug" && strCommand != "current" && strCommand != "winner" && strCommand != "winners" && strCommand != "genkey" &&
+         strCommand != "connect" && strCommand != "status" && strCommand != "check"))
+            masternode_help();
+
+    if (strCommand == "list") {
+        return masternode_list(request);
+    } else if (strCommand == "connect") {
+        return masternode_connect(request);
+    } else if (strCommand == "count") {
+        return masternode_count(request);
+    } else if (strCommand == "current") {
+        return masternode_current(request);
+    } else if (strCommand == "winner") {
+        return masternode_winner(request);
+#ifdef ENABLE_WALLET
+    } else if (strCommand == "start-alias") {
+        return masternode_start_alias(request);
+    } else if (strCommand == "start-all") {
+        return masternode_start_all(request);
+    } else if (strCommand == "start-missing") {
+        return masternode_start_missing(request);
+    } else if (strCommand == "start-disabled") {
+        return masternode_start_disabled(request);
+#endif // ENABLE_WALLET
+    } else if (strCommand == "genkey") {
+        return masternode_genkey(request);
+    } else if (strCommand == "list-conf") {
+        return masternode_list_conf(request);
+#ifdef ENABLE_WALLET
+    } else if (strCommand == "outputs") {
+        return masternode_outputs(request);
+#endif // ENABLE_WALLET
+    } else if (strCommand == "status") {
+        return masternode_status(request);
+    } else if (strCommand == "winners") {
+        return masternode_winners(request);
+    } else if (strCommand == "check") {
+        return masternode_check(request);
+    }
+
+    throw std::runtime_error("invalid command: " + strCommand);
 }
 
 UniValue masternodelist(const JSONRPCRequest& request)
@@ -520,35 +817,7 @@ UniValue masternodelist(const JSONRPCRequest& request)
                 strMode != "protocol" && strMode != "payee" && strMode != "pubkey" &&
                 strMode != "rank" && strMode != "sentinel" && strMode != "status"))
     {
-        throw std::runtime_error(
-                "masternodelist ( \"mode\" \"filter\" )\n"
-                "Get a list of masternodes in different modes\n"
-                "\nArguments:\n"
-                "1. \"mode\"      (string, optional/required to use filter, defaults = json) The mode to run list in\n"
-                "2. \"filter\"    (string, optional) Filter results. Partial match by outpoint by default in all modes,\n"
-                "                                    additional matches in some modes are also available\n"
-                "\nAvailable modes:\n"
-                "  activeseconds  - Print number of seconds masternode recognized by the network as enabled\n"
-                "                   (since latest issued \"masternode start/start-many/start-alias\")\n"
-                "  addr           - Print ip address associated with a masternode (can be additionally filtered, partial match)\n"
-                "  daemon         - Print daemon version of a masternode (can be additionally filtered, exact match)\n"
-                "  full           - Print info in format 'status protocol payee lastseen activeseconds lastpaidtime lastpaidblock IP'\n"
-                "                   (can be additionally filtered, partial match)\n"
-                "  info           - Print info in format 'status protocol payee lastseen activeseconds sentinelversion sentinelstate IP'\n"
-                "                   (can be additionally filtered, partial match)\n"
-                "  json           - Print info in JSON format (can be additionally filtered, partial match)\n"
-                "  lastpaidblock  - Print the last block height a node was paid on the network\n"
-                "  lastpaidtime   - Print the last time a node was paid on the network\n"
-                "  lastseen       - Print timestamp of when a masternode was last seen on the network\n"
-                "  payee          - Print Dash address associated with a masternode (can be additionally filtered,\n"
-                "                   partial match)\n"
-                "  protocol       - Print protocol of a masternode (can be additionally filtered, exact match)\n"
-                "  keyid          - Print the masternode (not collateral) key id\n"
-                "  rank           - Print rank of a masternode based on current block\n"
-                "  sentinel       - Print sentinel version of a masternode (can be additionally filtered, exact match)\n"
-                "  status         - Print masternode status: PRE_ENABLED / ENABLED / EXPIRED / SENTINEL_PING_EXPIRED / NEW_START_REQUIRED /\n"
-                "                   UPDATE_REQUIRED / POSE_BAN / OUTPOINT_SPENT (can be additionally filtered, partial match)\n"
-                );
+        masternode_list_help();
     }
 
     if (strMode == "full" || strMode == "json" || strMode == "lastpaidtime" || strMode == "lastpaidblock") {

From e225cebcdb8fd2f3a7a62199b3291da2f8b28dc7 Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Wed, 29 Aug 2018 15:26:16 +0200
Subject: [PATCH 070/400] Use previous block for CheckSpecialTx (#2243)

We actually can't use the current block as that one might not be fully
processed/built yet.
---
 src/evo/specialtx.cpp | 6 +++---
 src/evo/specialtx.h   | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/evo/specialtx.cpp b/src/evo/specialtx.cpp
index f648f7f106be..a07a1e1d3845 100644
--- a/src/evo/specialtx.cpp
+++ b/src/evo/specialtx.cpp
@@ -12,14 +12,14 @@
 
 #include "specialtx.h"
 
-bool CheckSpecialTx(const CTransaction& tx, const CBlockIndex* pindex, CValidationState& state)
+bool CheckSpecialTx(const CTransaction& tx, const CBlockIndex* pindexPrev, CValidationState& state)
 {
     AssertLockHeld(cs_main);
 
     if (tx.nVersion < 3 || tx.nType == TRANSACTION_NORMAL)
         return true;
 
-    if (pindex && VersionBitsState(pindex->pprev, Params().GetConsensus(), Consensus::DEPLOYMENT_DIP0003, versionbitscache) != THRESHOLD_ACTIVE) {
+    if (pindexPrev && VersionBitsState(pindexPrev, Params().GetConsensus(), Consensus::DEPLOYMENT_DIP0003, versionbitscache) != THRESHOLD_ACTIVE) {
         return state.DoS(10, false, REJECT_INVALID, "bad-tx-type");
     }
 
@@ -55,7 +55,7 @@ bool ProcessSpecialTxsInBlock(const CBlock& block, const CBlockIndex* pindex, CV
 {
     for (int i = 0; i < (int)block.vtx.size(); i++) {
         const CTransaction& tx = *block.vtx[i];
-        if (!CheckSpecialTx(tx, pindex, state))
+        if (!CheckSpecialTx(tx, pindex->pprev, state))
             return false;
         if (!ProcessSpecialTx(tx, pindex, state))
             return false;
diff --git a/src/evo/specialtx.h b/src/evo/specialtx.h
index 903380124bcc..bd761720f9ac 100644
--- a/src/evo/specialtx.h
+++ b/src/evo/specialtx.h
@@ -13,7 +13,7 @@ class CBlock;
 class CBlockIndex;
 class CValidationState;
 
-bool CheckSpecialTx(const CTransaction& tx, const CBlockIndex* pindex, CValidationState& state);
+bool CheckSpecialTx(const CTransaction& tx, const CBlockIndex* pindexPrev, CValidationState& state);
 bool ProcessSpecialTxsInBlock(const CBlock& block, const CBlockIndex* pindex, CValidationState& state);
 bool UndoSpecialTxsInBlock(const CBlock& block, const CBlockIndex* pindex);
 

From e002c50b043ed70f1c1db4ebc497211a9d06a36b Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Wed, 29 Aug 2018 15:31:21 +0200
Subject: [PATCH 071/400] Add "immer" functional/immutable containers library
 (#2244)

Add "immer" functional/immutable containers library
---
 src/Makefile.am                               |    3 +
 src/immer/algorithm.hpp                       |  214 ++
 src/immer/array.hpp                           |  311 +++
 src/immer/array_transient.hpp                 |  187 ++
 src/immer/box.hpp                             |  159 ++
 src/immer/config.hpp                          |   58 +
 src/immer/detail/arrays/no_capacity.hpp       |  192 ++
 src/immer/detail/arrays/node.hpp              |  129 +
 src/immer/detail/arrays/with_capacity.hpp     |  297 +++
 src/immer/detail/combine_standard_layout.hpp  |  196 ++
 src/immer/detail/hamts/bits.hpp               |   55 +
 src/immer/detail/hamts/champ.hpp              |  474 ++++
 src/immer/detail/hamts/champ_iterator.hpp     |  143 +
 src/immer/detail/hamts/node.hpp               |  712 +++++
 src/immer/detail/iterator_facade.hpp          |  202 ++
 src/immer/detail/rbts/bits.hpp                |   33 +
 src/immer/detail/rbts/node.hpp                |  942 +++++++
 src/immer/detail/rbts/operations.hpp          | 2304 +++++++++++++++++
 src/immer/detail/rbts/position.hpp            | 1838 +++++++++++++
 src/immer/detail/rbts/rbtree.hpp              |  528 ++++
 src/immer/detail/rbts/rbtree_iterator.hpp     |  100 +
 src/immer/detail/rbts/rrbtree.hpp             | 1272 +++++++++
 src/immer/detail/rbts/rrbtree_iterator.hpp    |  100 +
 src/immer/detail/rbts/visitor.hpp             |   83 +
 src/immer/detail/ref_count_base.hpp           |   36 +
 src/immer/detail/util.hpp                     |  123 +
 .../experimental/detail/dvektor_impl.hpp      |  512 ++++
 src/immer/experimental/dvektor.hpp            |   63 +
 src/immer/flex_vector.hpp                     |  500 ++++
 src/immer/flex_vector_transient.hpp           |  232 ++
 src/immer/heap/cpp_heap.hpp                   |   41 +
 src/immer/heap/debug_size_heap.hpp            |   50 +
 src/immer/heap/free_list_heap.hpp             |   83 +
 src/immer/heap/free_list_node.hpp             |   25 +
 src/immer/heap/gc_heap.hpp                    |  130 +
 src/immer/heap/heap_policy.hpp                |  148 ++
 src/immer/heap/identity_heap.hpp              |   34 +
 src/immer/heap/malloc_heap.hpp                |   47 +
 src/immer/heap/split_heap.hpp                 |   41 +
 src/immer/heap/tags.hpp                       |   15 +
 .../heap/thread_local_free_list_heap.hpp      |   55 +
 src/immer/heap/unsafe_free_list_heap.hpp      |  108 +
 src/immer/heap/with_data.hpp                  |   43 +
 src/immer/map.hpp                             |  311 +++
 src/immer/map_transient.hpp                   |   29 +
 src/immer/memory_policy.hpp                   |  138 +
 src/immer/refcount/enable_intrusive_ptr.hpp   |   37 +
 src/immer/refcount/no_refcount_policy.hpp     |   30 +
 src/immer/refcount/refcount_policy.hpp        |   52 +
 src/immer/refcount/unsafe_refcount_policy.hpp |   35 +
 src/immer/set.hpp                             |  161 ++
 src/immer/set_transient.hpp                   |   28 +
 src/immer/transience/gc_transience_policy.hpp |  110 +
 src/immer/transience/no_transience_policy.hpp |   48 +
 src/immer/vector.hpp                          |  352 +++
 src/immer/vector_transient.hpp                |  189 ++
 src/uint256.h                                 |   10 +
 57 files changed, 14348 insertions(+)
 create mode 100644 src/immer/algorithm.hpp
 create mode 100644 src/immer/array.hpp
 create mode 100644 src/immer/array_transient.hpp
 create mode 100644 src/immer/box.hpp
 create mode 100644 src/immer/config.hpp
 create mode 100644 src/immer/detail/arrays/no_capacity.hpp
 create mode 100644 src/immer/detail/arrays/node.hpp
 create mode 100644 src/immer/detail/arrays/with_capacity.hpp
 create mode 100644 src/immer/detail/combine_standard_layout.hpp
 create mode 100644 src/immer/detail/hamts/bits.hpp
 create mode 100644 src/immer/detail/hamts/champ.hpp
 create mode 100644 src/immer/detail/hamts/champ_iterator.hpp
 create mode 100644 src/immer/detail/hamts/node.hpp
 create mode 100644 src/immer/detail/iterator_facade.hpp
 create mode 100644 src/immer/detail/rbts/bits.hpp
 create mode 100644 src/immer/detail/rbts/node.hpp
 create mode 100644 src/immer/detail/rbts/operations.hpp
 create mode 100644 src/immer/detail/rbts/position.hpp
 create mode 100644 src/immer/detail/rbts/rbtree.hpp
 create mode 100644 src/immer/detail/rbts/rbtree_iterator.hpp
 create mode 100644 src/immer/detail/rbts/rrbtree.hpp
 create mode 100644 src/immer/detail/rbts/rrbtree_iterator.hpp
 create mode 100644 src/immer/detail/rbts/visitor.hpp
 create mode 100644 src/immer/detail/ref_count_base.hpp
 create mode 100644 src/immer/detail/util.hpp
 create mode 100644 src/immer/experimental/detail/dvektor_impl.hpp
 create mode 100644 src/immer/experimental/dvektor.hpp
 create mode 100644 src/immer/flex_vector.hpp
 create mode 100644 src/immer/flex_vector_transient.hpp
 create mode 100644 src/immer/heap/cpp_heap.hpp
 create mode 100644 src/immer/heap/debug_size_heap.hpp
 create mode 100644 src/immer/heap/free_list_heap.hpp
 create mode 100644 src/immer/heap/free_list_node.hpp
 create mode 100644 src/immer/heap/gc_heap.hpp
 create mode 100644 src/immer/heap/heap_policy.hpp
 create mode 100644 src/immer/heap/identity_heap.hpp
 create mode 100644 src/immer/heap/malloc_heap.hpp
 create mode 100644 src/immer/heap/split_heap.hpp
 create mode 100644 src/immer/heap/tags.hpp
 create mode 100644 src/immer/heap/thread_local_free_list_heap.hpp
 create mode 100644 src/immer/heap/unsafe_free_list_heap.hpp
 create mode 100644 src/immer/heap/with_data.hpp
 create mode 100644 src/immer/map.hpp
 create mode 100644 src/immer/map_transient.hpp
 create mode 100644 src/immer/memory_policy.hpp
 create mode 100644 src/immer/refcount/enable_intrusive_ptr.hpp
 create mode 100644 src/immer/refcount/no_refcount_policy.hpp
 create mode 100644 src/immer/refcount/refcount_policy.hpp
 create mode 100644 src/immer/refcount/unsafe_refcount_policy.hpp
 create mode 100644 src/immer/set.hpp
 create mode 100644 src/immer/set_transient.hpp
 create mode 100644 src/immer/transience/gc_transience_policy.hpp
 create mode 100644 src/immer/transience/no_transience_policy.hpp
 create mode 100644 src/immer/vector.hpp
 create mode 100644 src/immer/vector_transient.hpp

diff --git a/src/Makefile.am b/src/Makefile.am
index 9b4ef09fc5c0..23db64addacb 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -542,9 +542,12 @@ CLEANFILES += wallet/*.gcda wallet/*.gcno
 CLEANFILES += wallet/test/*.gcda wallet/test/*.gcno
 CLEANFILES += zmq/*.gcda zmq/*.gcno
 
+IMMER_DIST = immer
+
 DISTCLEANFILES = obj/build.h
 
 EXTRA_DIST = $(CTAES_DIST)
+EXTRA_DIST += $(IMMER_DIST)
 
 
 config/dash-config.h: config/stamp-h1
diff --git a/src/immer/algorithm.hpp b/src/immer/algorithm.hpp
new file mode 100644
index 000000000000..df9ff28a8314
--- /dev/null
+++ b/src/immer/algorithm.hpp
@@ -0,0 +1,214 @@
+//
+// immer: immutable data structures for C++
+// Copyright (C) 2016, 2017, 2018 Juan Pedro Bolivar Puente
+//
+// This software is distributed under the Boost Software License, Version 1.0.
+// See accompanying file LICENSE or copy at http://boost.org/LICENSE_1_0.txt
+//
+
+#pragma once
+
+#include <algorithm>
+#include <numeric>
+#include <type_traits>
+
+namespace immer {
+
+/**
+ * @defgroup algorithm
+ * @{
+ */
+
+/*@{*/
+// Right now these algorithms dispatch directly to the vector
+// implementations unconditionally.  This will be changed in the
+// future to support other kinds of containers.
+
+/*!
+ * Apply operation `fn` for every contiguous *chunk* of data in the
+ * range sequentially.  Each time, `Fn` is passed two `value_type`
+ * pointers describing a range over a part of the vector.  This allows
+ * iterating over the elements in the most efficient way.
+ *
+ * @rst
+ *
+ * .. tip:: This is a low level method. Most of the time, :doc:`other
+ *    wrapper algorithms <algorithms>` should be used instead.
+ *
+ * @endrst
+ */
+template <typename Range, typename Fn>
+void for_each_chunk(const Range& r, Fn&& fn)
+{
+    r.impl().for_each_chunk(std::forward<Fn>(fn));
+}
+
+template <typename Iterator, typename Fn>
+void for_each_chunk(const Iterator& first, const Iterator& last, Fn&& fn)
+{
+    assert(&first.impl() == &last.impl());
+    first.impl().for_each_chunk(first.index(), last.index(),
+                                std::forward<Fn>(fn));
+}
+
+template <typename T, typename Fn>
+void for_each_chunk(const T* first, const T* last, Fn&& fn)
+{
+    std::forward<Fn>(fn)(first, last);
+}
+
+/*!
+ * Apply operation `fn` for every contiguous *chunk* of data in the
+ * range sequentially, until `fn` returns `false`.  Each time, `Fn` is
+ * passed two `value_type` pointers describing a range over a part of
+ * the vector.  This allows iterating over the elements in the most
+ * efficient way.
+ *
+ * @rst
+ *
+ * .. tip:: This is a low level method. Most of the time, :doc:`other
+ *    wrapper algorithms <algorithms>` should be used instead.
+ *
+ * @endrst
+ */
+template <typename Range, typename Fn>
+bool for_each_chunk_p(const Range& r, Fn&& fn)
+{
+    return r.impl().for_each_chunk_p(std::forward<Fn>(fn));
+}
+
+template <typename Iterator, typename Fn>
+bool for_each_chunk_p(const Iterator& first, const Iterator& last, Fn&& fn)
+{
+    assert(&first.impl() == &last.impl());
+    return first.impl().for_each_chunk_p(first.index(), last.index(),
+                                         std::forward<Fn>(fn));
+}
+
+template <typename T, typename Fn>
+bool for_each_chunk_p(const T* first, const T* last, Fn&& fn)
+{
+    return std::forward<Fn>(fn)(first, last);
+}
+
+/*!
+ * Equivalent of `std::accumulate` applied to the range `r`.
+ */
+template <typename Range, typename T>
+T accumulate(Range&& r, T init)
+{
+    for_each_chunk(r, [&] (auto first, auto last) {
+        init = std::accumulate(first, last, init);
+    });
+    return init;
+}
+
+template <typename Range, typename T, typename Fn>
+T accumulate(Range&& r, T init, Fn fn)
+{
+    for_each_chunk(r, [&] (auto first, auto last) {
+        init = std::accumulate(first, last, init, fn);
+    });
+    return init;
+}
+
+/*!
+ * Equivalent of `std::accumulate` applied to the range @f$ [first,
+ * last) @f$.
+ */
+template <typename Iterator, typename T>
+T accumulate(Iterator first, Iterator last, T init)
+{
+    for_each_chunk(first, last, [&] (auto first, auto last) {
+        init = std::accumulate(first, last, init);
+    });
+    return init;
+}
+
+template <typename Iterator, typename T, typename Fn>
+T accumulate(Iterator first, Iterator last, T init, Fn fn)
+{
+    for_each_chunk(first, last, [&] (auto first, auto last) {
+        init = std::accumulate(first, last, init, fn);
+    });
+    return init;
+}
+
+/*!
+ * Equivalent of `std::for_each` applied to the range `r`.
+ */
+template <typename Range, typename Fn>
+Fn&& for_each(Range&& r, Fn&& fn)
+{
+    for_each_chunk(r, [&] (auto first, auto last) {
+        for (; first != last; ++first)
+            fn(*first);
+    });
+    return std::forward<Fn>(fn);
+}
+
+/*!
+ * Equivalent of `std::for_each` applied to the range @f$ [first,
+ * last) @f$.
+ */
+template <typename Iterator, typename Fn>
+Fn&& for_each(Iterator first, Iterator last, Fn&& fn)
+{
+    for_each_chunk(first, last, [&] (auto first, auto last) {
+        for (; first != last; ++first)
+            fn(*first);
+    });
+    return std::forward<Fn>(fn);
+}
+
+/*!
+ * Equivalent of `std::copy` applied to the range `r`.
+ */
+template <typename Range, typename OutIter>
+OutIter copy(Range&& r, OutIter out)
+{
+    for_each_chunk(r, [&] (auto first, auto last) {
+        out = std::copy(first, last, out);
+    });
+    return out;
+}
+
+/*!
+ * Equivalent of `std::copy` applied to the range @f$ [first,
+ * last) @f$.
+ */
+template <typename InIter, typename OutIter>
+OutIter copy(InIter first, InIter last, OutIter out)
+{
+    for_each_chunk(first, last, [&] (auto first, auto last) {
+        out = std::copy(first, last, out);
+    });
+    return out;
+}
+
+/*!
+ * Equivalent of `std::all_of` applied to the range `r`.
+ */
+template <typename Range, typename Pred>
+bool all_of(Range&& r, Pred p)
+{
+    return for_each_chunk_p(r, [&] (auto first, auto last) {
+        return std::all_of(first, last, p);
+    });
+}
+
+/*!
+ * Equivalent of `std::all_of` applied to the range @f$ [first, last)
+ * @f$.
+ */
+template <typename Iter, typename Pred>
+bool all_of(Iter first, Iter last, Pred p)
+{
+    return for_each_chunk_p(first, last, [&] (auto first, auto last) {
+        return std::all_of(first, last, p);
+    });
+}
+
+/** @} */ // group: algorithm
+
+} // namespace immer
diff --git a/src/immer/array.hpp b/src/immer/array.hpp
new file mode 100644
index 000000000000..08a8b0916751
--- /dev/null
+++ b/src/immer/array.hpp
@@ -0,0 +1,311 @@
+//
+// immer: immutable data structures for C++
+// Copyright (C) 2016, 2017, 2018 Juan Pedro Bolivar Puente
+//
+// This software is distributed under the Boost Software License, Version 1.0.
+// See accompanying file LICENSE or copy at http://boost.org/LICENSE_1_0.txt
+//
+
+#pragma once
+
+#include <immer/memory_policy.hpp>
+#include <immer/detail/arrays/with_capacity.hpp>
+
+namespace immer {
+
+template <typename T, typename MemoryPolicy>
+class array_transient;
+
+/*!
+ * Immutable container that stores a sequence of elements in
+ * contiguous memory.
+ *
+ * @tparam T The type of the values to be stored in the container.
+ *
+ * @rst
+ *
+ * It supports the most efficient iteration and random access,
+ * equivalent to a ``std::vector`` or ``std::array``, but all
+ * manipulations are :math:`O(size)`.
+ *
+ * .. tip:: Don't be fooled by the bad complexity of this data
+ *    structure.  It is a great choice for short sequence or when it
+ *    is seldom or never changed.  This depends on the ``sizeof(T)``
+ *    and the expensiveness of its ``T``'s copy constructor, in case
+ *    of doubt, measure.  For basic types, using an `array` when
+ *    :math:`n < 100` is a good heuristic.
+ *
+ * .. warning:: The current implementation depends on
+ *    ``boost::intrusive_ptr`` and does not support :doc:`memory
+ *    policies<memory>`.  This will be fixed soon.
+ *
+ * @endrst
+ */
+template <typename T, typename MemoryPolicy = default_memory_policy>
+class array
+{
+    using impl_t = std::conditional_t<
+        MemoryPolicy::use_transient_rvalues,
+        detail::arrays::with_capacity<T, MemoryPolicy>,
+        detail::arrays::no_capacity<T, MemoryPolicy>>;
+
+    using move_t =
+        std::integral_constant<bool, MemoryPolicy::use_transient_rvalues>;
+
+public:
+    using value_type = T;
+    using reference = const T&;
+    using size_type = std::size_t;
+    using difference_type = std::ptrdiff_t;
+    using const_reference = const T&;
+
+    using iterator         = const T*;
+    using const_iterator   = iterator;
+    using reverse_iterator = std::reverse_iterator<iterator>;
+
+    using memory_policy  = MemoryPolicy;
+    using transient_type = array_transient<T, MemoryPolicy>;
+
+    /*!
+     * Default constructor.  It creates an array of `size() == 0`.  It
+     * does not allocate memory and its complexity is @f$ O(1) @f$.
+     */
+    array() = default;
+
+    /*!
+     * Constructs a vector containing the elements in `values`.
+     */
+    array(std::initializer_list<T> values)
+        : impl_{impl_t::from_initializer_list(values)}
+    {}
+
+    /*!
+     * Constructs a vector containing the elements in the range
+     * defined by the input iterators `first` and `last`.
+     */
+    template <typename Iter>
+    array(Iter first, Iter last)
+        : impl_{impl_t::from_range(first, last)}
+    {}
+
+    /*!
+     * Constructs a vector containing the element `val` repeated `n`
+     * times.
+     */
+    array(size_type n, T v = {})
+        : impl_{impl_t::from_fill(n, v)}
+    {}
+
+    /*!
+     * Returns an iterator pointing at the first element of the
+     * collection. It does not allocate memory and its complexity is
+     * @f$ O(1) @f$.
+     */
+    iterator begin() const { return impl_.data(); }
+
+    /*!
+     * Returns an iterator pointing just after the last element of the
+     * collection. It does not allocate and its complexity is @f$ O(1) @f$.
+     */
+    iterator end()   const { return impl_.data() + impl_.size; }
+
+    /*!
+     * Returns an iterator that traverses the collection backwards,
+     * pointing at the first element of the reversed collection. It
+     * does not allocate memory and its complexity is @f$ O(1) @f$.
+     */
+    reverse_iterator rbegin() const { return reverse_iterator{end()}; }
+
+    /*!
+     * Returns an iterator that traverses the collection backwards,
+     * pointing after the last element of the reversed collection. It
+     * does not allocate memory and its complexity is @f$ O(1) @f$.
+     */
+    reverse_iterator rend()   const { return reverse_iterator{begin()}; }
+
+    /*!
+     * Returns the number of elements in the container.  It does
+     * not allocate memory and its complexity is @f$ O(1) @f$.
+     */
+    std::size_t size() const { return impl_.size; }
+
+    /*!
+     * Returns `true` if there are no elements in the container.  It
+     * does not allocate memory and its complexity is @f$ O(1) @f$.
+     */
+    bool empty() const { return impl_.d->empty(); }
+
+    /*!
+     * Access the raw data.
+     */
+    const T* data() const { return impl_.data(); }
+
+    /*!
+     * Access the last element.
+     */
+    const T& back() const { return data()[size() - 1]; }
+
+    /*!
+     * Access the first element.
+     */
+    const T& front() const { return data()[0]; }
+
+    /*!
+     * Returns a `const` reference to the element at position `index`.
+     * It is undefined when @f$ 0 index \geq size() @f$.  It does not
+     * allocate memory and its complexity is *effectively* @f$ O(1)
+     * @f$.
+     */
+    reference operator[] (size_type index) const
+    { return impl_.get(index); }
+
+    /*!
+     * Returns a `const` reference to the element at position
+     * `index`. It throws an `std::out_of_range` exception when @f$
+     * index \geq size() @f$.  It does not allocate memory and its
+     * complexity is *effectively* @f$ O(1) @f$.
+     */
+    reference at(size_type index) const
+    { return impl_.get_check(index); }
+
+    /*!
+     * Returns whether the vectors are equal.
+     */
+    bool operator==(const array& other) const
+    { return impl_.equals(other.impl_); }
+    bool operator!=(const array& other) const
+    { return !(*this == other); }
+
+    /*!
+     * Returns an array with `value` inserted at the end.  It may
+     * allocate memory and its complexity is @f$ O(size) @f$.
+     *
+     * @rst
+     *
+     * **Example**
+     *   .. literalinclude:: ../example/array/array.cpp
+     *      :language: c++
+     *      :dedent: 8
+     *      :start-after: push-back/start
+     *      :end-before:  push-back/end
+     *
+     * @endrst
+     */
+    array push_back(value_type value) const&
+    { return impl_.push_back(std::move(value)); }
+
+    decltype(auto) push_back(value_type value) &&
+    { return push_back_move(move_t{}, std::move(value)); }
+
+    /*!
+     * Returns an array containing value `value` at position `idx`.
+     * Undefined for `index >= size()`.
+     * It may allocate memory and its complexity is @f$ O(size) @f$.
+     *
+     * @rst
+     *
+     * **Example**
+     *   .. literalinclude:: ../example/array/array.cpp
+     *      :language: c++
+     *      :dedent: 8
+     *      :start-after: set/start
+     *      :end-before:  set/end
+     *
+     * @endrst
+     */
+    array set(std::size_t index, value_type value) const&
+    { return impl_.assoc(index, std::move(value)); }
+
+    decltype(auto) set(size_type index, value_type value) &&
+    { return set_move(move_t{}, index, std::move(value)); }
+
+    /*!
+     * Returns an array containing the result of the expression
+     * `fn((*this)[idx])` at position `idx`.
+     * Undefined for `index >= size()`.
+     * It may allocate memory and its complexity is @f$ O(size) @f$.
+     *
+     * @rst
+     *
+     * **Example**
+     *   .. literalinclude:: ../example/array/array.cpp
+     *      :language: c++
+     *      :dedent: 8
+     *      :start-after: update/start
+     *      :end-before:  update/end
+     *
+     * @endrst
+     */
+    template <typename FnT>
+    array update(std::size_t index, FnT&& fn) const&
+    { return impl_.update(index, std::forward<FnT>(fn)); }
+
+    template <typename FnT>
+    decltype(auto) update(size_type index, FnT&& fn) &&
+    { return update_move(move_t{}, index, std::forward<FnT>(fn)); }
+
+    /*!
+     * Returns a array containing only the first `min(elems, size())`
+     * elements. It may allocate memory and its complexity is
+     * *effectively* @f$ O(1) @f$.
+     *
+     * @rst
+     *
+     * **Example**
+     *   .. literalinclude:: ../example/array/array.cpp
+     *      :language: c++
+     *      :dedent: 8
+     *      :start-after: take/start
+     *      :end-before:  take/end
+     *
+     * @endrst
+     */
+    array take(size_type elems) const&
+    { return impl_.take(elems); }
+
+    decltype(auto) take(size_type elems) &&
+    { return take_move(move_t{}, elems); }
+
+    /*!
+     * Returns an @a transient form of this container, an
+     * `immer::array_transient`.
+     */
+    transient_type transient() const&
+    { return transient_type{ impl_ }; }
+    transient_type transient() &&
+    { return transient_type{ std::move(impl_) }; }
+
+    // Semi-private
+    const impl_t& impl() const { return impl_; }
+
+private:
+    friend transient_type;
+
+    array(impl_t impl) : impl_(std::move(impl)) {}
+
+    array&& push_back_move(std::true_type, value_type value)
+    { impl_.push_back_mut({}, std::move(value)); return std::move(*this); }
+    array push_back_move(std::false_type, value_type value)
+    { return impl_.push_back(std::move(value)); }
+
+    array&& set_move(std::true_type, size_type index, value_type value)
+    { impl_.assoc_mut({}, index, std::move(value)); return std::move(*this); }
+    array set_move(std::false_type, size_type index, value_type value)
+    { return impl_.assoc(index, std::move(value)); }
+
+    template <typename Fn>
+    array&& update_move(std::true_type, size_type index, Fn&& fn)
+    { impl_.update_mut({}, index, std::forward<Fn>(fn)); return std::move(*this); }
+    template <typename Fn>
+    array update_move(std::false_type, size_type index, Fn&& fn)
+    { return impl_.update(index, std::forward<Fn>(fn)); }
+
+    array&& take_move(std::true_type, size_type elems)
+    { impl_.take_mut({}, elems); return std::move(*this); }
+    array take_move(std::false_type, size_type elems)
+    { return impl_.take(elems); }
+
+    impl_t impl_ = impl_t::empty;
+};
+
+} /* namespace immer */
diff --git a/src/immer/array_transient.hpp b/src/immer/array_transient.hpp
new file mode 100644
index 000000000000..0084e47dddc8
--- /dev/null
+++ b/src/immer/array_transient.hpp
@@ -0,0 +1,187 @@
+//
+// immer: immutable data structures for C++
+// Copyright (C) 2016, 2017, 2018 Juan Pedro Bolivar Puente
+//
+// This software is distributed under the Boost Software License, Version 1.0.
+// See accompanying file LICENSE or copy at http://boost.org/LICENSE_1_0.txt
+//
+
+#pragma once
+
+#include <immer/memory_policy.hpp>
+#include <immer/detail/arrays/with_capacity.hpp>
+
+namespace immer {
+
+template <typename T, typename MemoryPolicy>
+class array;
+
+/*!
+ * Mutable version of `immer::array`.
+ *
+ * @rst
+ *
+ * Refer to :doc:`transients` to learn more about when and how to use
+ * the mutable versions of immutable containers.
+ *
+ * @endrst
+ */
+template <typename T, typename MemoryPolicy = default_memory_policy>
+class array_transient
+    : MemoryPolicy::transience_t::owner
+{
+    using impl_t = detail::arrays::with_capacity<T, MemoryPolicy>;
+    using impl_no_capacity_t = detail::arrays::no_capacity<T, MemoryPolicy>;
+    using owner_t = typename MemoryPolicy::transience_t::owner;
+
+public:
+    using value_type = T;
+    using reference = const T&;
+    using size_type = std::size_t;
+    using difference_type = std::ptrdiff_t;
+    using const_reference = const T&;
+
+    using iterator         = const T*;
+    using const_iterator   = iterator;
+    using reverse_iterator = std::reverse_iterator<iterator>;
+
+    using memory_policy   = MemoryPolicy;
+    using persistent_type = array<T, MemoryPolicy>;
+
+    /*!
+     * Default constructor.  It creates a mutable array of `size() ==
+     * 0`.  It does not allocate memory and its complexity is
+     * @f$ O(1) @f$.
+     */
+    array_transient() = default;
+
+    /*!
+     * Returns an iterator pointing at the first element of the
+     * collection. It does not allocate memory and its complexity is
+     * @f$ O(1) @f$.
+     */
+    iterator begin() const { return impl_.data(); }
+
+    /*!
+     * Returns an iterator pointing just after the last element of the
+     * collection. It does not allocate and its complexity is @f$ O(1) @f$.
+     */
+    iterator end()   const { return impl_.data() + impl_.size; }
+
+    /*!
+     * Returns an iterator that traverses the collection backwards,
+     * pointing at the first element of the reversed collection. It
+     * does not allocate memory and its complexity is @f$ O(1) @f$.
+     */
+    reverse_iterator rbegin() const { return reverse_iterator{end()}; }
+
+    /*!
+     * Returns an iterator that traverses the collection backwards,
+     * pointing after the last element of the reversed collection. It
+     * does not allocate memory and its complexity is @f$ O(1) @f$.
+     */
+    reverse_iterator rend()   const { return reverse_iterator{begin()}; }
+
+    /*!
+     * Returns the number of elements in the container.  It does
+     * not allocate memory and its complexity is @f$ O(1) @f$.
+     */
+    std::size_t size() const { return impl_.size; }
+
+    /*!
+     * Returns `true` if there are no elements in the container.  It
+     * does not allocate memory and its complexity is @f$ O(1) @f$.
+     */
+    bool empty() const { return impl_.d->empty(); }
+
+    /*!
+     * Access the raw data.
+     */
+    const T* data() const { return impl_.data(); }
+
+    /*!
+     * Access the last element.
+     */
+    const T& back() const { return data()[size() - 1]; }
+
+    /*!
+     * Access the first element.
+     */
+    const T& front() const { return data()[0]; }
+
+    /*!
+     * Returns a `const` reference to the element at position `index`.
+     * It is undefined when @f$ 0 index \geq size() @f$.  It does not
+     * allocate memory and its complexity is *effectively* @f$ O(1)
+     * @f$.
+     */
+    reference operator[] (size_type index) const
+    { return impl_.get(index); }
+
+    /*!
+     * Returns a `const` reference to the element at position
+     * `index`. It throws an `std::out_of_range` exception when @f$
+     * index \geq size() @f$.  It does not allocate memory and its
+     * complexity is *effectively* @f$ O(1) @f$.
+     */
+    reference at(size_type index) const
+    { return impl_.get_check(index); }
+
+    /*!
+     * Inserts `value` at the end.  It may allocate memory and its
+     * complexity is *effectively* @f$ O(1) @f$.
+     */
+    void push_back(value_type value)
+    { impl_.push_back_mut(*this, std::move(value)); }
+
+    /*!
+     * Sets to the value `value` at position `idx`.
+     * Undefined for `index >= size()`.
+     * It may allocate memory and its complexity is
+     * *effectively* @f$ O(1) @f$.
+     */
+    void set(size_type index, value_type value)
+    { impl_.assoc_mut(*this, index, std::move(value)); }
+
+    /*!
+     * Updates the array to contain the result of the expression
+     * `fn((*this)[idx])` at position `idx`.
+     * Undefined for `0 >= size()`.
+     * It may allocate memory and its complexity is
+     * *effectively* @f$ O(1) @f$.
+     */
+    template <typename FnT>
+    void update(size_type index, FnT&& fn)
+    { impl_.update_mut(*this, index, std::forward<FnT>(fn)); }
+
+    /*!
+     * Resizes the array to only contain the first `min(elems, size())`
+     * elements. It may allocate memory and its complexity is
+     * *effectively* @f$ O(1) @f$.
+     */
+    void take(size_type elems)
+    { impl_.take_mut(*this, elems); }
+
+    /*!
+     * Returns an @a immutable form of this container, an
+     * `immer::array`.
+     */
+    persistent_type persistent() &
+    {
+        this->owner_t::operator=(owner_t{});
+        return persistent_type{ impl_ };
+    }
+    persistent_type persistent() &&
+    { return persistent_type{ std::move(impl_) }; }
+
+private:
+    friend persistent_type;
+
+    array_transient(impl_t impl)
+        : impl_(std::move(impl))
+    {}
+
+    impl_t  impl_  = impl_t::empty;
+};
+
+} // namespace immer
diff --git a/src/immer/box.hpp b/src/immer/box.hpp
new file mode 100644
index 000000000000..2d9f159db474
--- /dev/null
+++ b/src/immer/box.hpp
@@ -0,0 +1,159 @@
+//
+// immer: immutable data structures for C++
+// Copyright (C) 2016, 2017, 2018 Juan Pedro Bolivar Puente
+//
+// This software is distributed under the Boost Software License, Version 1.0.
+// See accompanying file LICENSE or copy at http://boost.org/LICENSE_1_0.txt
+//
+
+#pragma once
+
+#include <immer/detail/util.hpp>
+#include <immer/memory_policy.hpp>
+
+namespace immer {
+
+/*!
+ * Immutable box for a single value of type `T`.
+ *
+ * The box is always copiable and movable. The `T` copy or move
+ * operations are never called.  Since a box is immutable, copying or
+ * moving just copy the underlying pointers.
+ */
+template <typename T,
+          typename MemoryPolicy   = default_memory_policy>
+class box
+{
+    struct holder : MemoryPolicy::refcount
+    {
+        T value;
+
+        template <typename... Args>
+        holder(Args&&... args) : value{std::forward<Args>(args)...} {}
+    };
+
+    using heap = typename MemoryPolicy::heap::type;
+
+    holder* impl_ = nullptr;
+
+    box(holder* impl) : impl_{impl} {}
+
+public:
+    using value_type    = T;
+    using memory_policy = MemoryPolicy;
+
+    /*!
+     * Constructs a box holding `T{}`.
+     */
+    box() : impl_{detail::make<heap, holder>()} {}
+
+    /*!
+     * Constructs a box holding `T{arg}`
+     */
+    template <typename Arg,
+              typename Enable=std::enable_if_t<
+                  !std::is_same<box, std::decay_t<Arg>>::value &&
+                  std::is_constructible<T, Arg>::value>>
+    box(Arg&& arg)
+        : impl_{detail::make<heap, holder>(std::forward<Arg>(arg))} {}
+
+    /*!
+     * Constructs a box holding `T{arg1, arg2, args...}`
+     */
+    template <typename Arg1, typename Arg2, typename... Args>
+    box(Arg1&& arg1, Arg2&& arg2, Args&& ...args)
+        : impl_{detail::make<heap, holder>(
+            std::forward<Arg1>(arg1),
+            std::forward<Arg2>(arg2),
+            std::forward<Args>(args)...)}
+    {}
+
+    friend void swap(box& a, box& b)
+    { using std::swap; swap(a.impl_, b.impl_); }
+
+    box(box&& other) { swap(*this, other); }
+    box(const box& other) : impl_(other.impl_) { impl_->inc(); }
+    box& operator=(box&& other) { swap(*this, other); return *this; }
+    box& operator=(const box& other)
+    {
+        auto aux = other;
+        swap(*this, aux);
+        return *this;
+    }
+    ~box()
+    {
+        if (impl_ && impl_->dec()) {
+            impl_->~holder();
+            heap::deallocate(sizeof(holder), impl_);
+        }
+    }
+
+    /*! Query the current value. */
+    const T& get() const { return impl_->value; }
+
+    /*! Conversion to the boxed type. */
+    operator const T&() const { return get(); }
+
+    /*! Access via dereference */
+    const T& operator* () const { return get(); }
+
+    /*! Access via pointer member access */
+    const T* operator-> () const { return &get(); }
+
+    /*! Comparison. */
+    bool operator==(detail::exact_t<const box&> other) const
+    { return impl_ == other.value.impl_ || get() == other.value.get(); }
+    // Note that the `exact_t` disambiguates comparisons against `T{}`
+    // directly.  In that case we want to use `operator T&` and
+    // compare directly.  We definitely never want to convert a value
+    // to a box (which causes an allocation) just to compare it.
+    bool operator!=(detail::exact_t<const box&> other) const
+    { return !(*this == other.value); }
+    bool operator<(detail::exact_t<const box&> other) const
+    { return get() < other.value.get(); }
+
+    /*!
+     * Returns a new box built by applying the `fn` to the underlying
+     * value.
+     *
+     * @rst
+     *
+     * **Example**
+     *   .. literalinclude:: ../example/box/box.cpp
+     *      :language: c++
+     *      :dedent: 8
+     *      :start-after: update/start
+     *      :end-before:  update/end
+     *
+     * @endrst
+     */
+    template <typename Fn>
+    box update(Fn&& fn) const&
+    {
+        return std::forward<Fn>(fn)(get());
+    }
+    template <typename Fn>
+    box&& update(Fn&& fn) &&
+    {
+        if (impl_->unique())
+            impl_->value = std::forward<Fn>(fn)(std::move(impl_->value));
+        else
+            *this = std::forward<Fn>(fn)(impl_->value);
+        return std::move(*this);
+    }
+};
+
+} // namespace immer
+
+namespace std {
+
+template <typename T, typename MP>
+struct hash<immer::box<T, MP>>
+{
+    std::size_t operator() (const immer::box<T, MP>& x) const
+    {
+        return std::hash<T>{}(*x);
+    }
+};
+
+} // namespace std
diff --git a/src/immer/config.hpp b/src/immer/config.hpp
new file mode 100644
index 000000000000..f3f19f1ad584
--- /dev/null
+++ b/src/immer/config.hpp
@@ -0,0 +1,58 @@
+//
+// immer: immutable data structures for C++
+// Copyright (C) 2016, 2017, 2018 Juan Pedro Bolivar Puente
+//
+// This software is distributed under the Boost Software License, Version 1.0.
+// See accompanying file LICENSE or copy at http://boost.org/LICENSE_1_0.txt
+//
+
+#pragma once
+
+#ifndef IMMER_DEBUG_TRACES
+#define IMMER_DEBUG_TRACES 0
+#endif
+
+#ifndef IMMER_DEBUG_PRINT
+#define IMMER_DEBUG_PRINT 0
+#endif
+
+#ifndef IMMER_DEBUG_DEEP_CHECK
+#define IMMER_DEBUG_DEEP_CHECK 0
+#endif
+
+#if IMMER_DEBUG_TRACES || IMMER_DEBUG_PRINT
+#include <iostream>
+#include <prettyprint.hpp>
+#endif
+
+#if IMMER_DEBUG_TRACES
+#define IMMER_TRACE(...) std::cout << __VA_ARGS__ << std::endl
+#else
+#define IMMER_TRACE(...)
+#endif
+#define IMMER_TRACE_F(...)                                              \
+    IMMER_TRACE(__FILE__ << ":" << __LINE__ << ": " << __VA_ARGS__)
+#define IMMER_TRACE_E(expr)                             \
+    IMMER_TRACE("    " << #expr << " = " << (expr))
+
+#define IMMER_UNREACHABLE    __builtin_unreachable()
+#define IMMER_LIKELY(cond)   __builtin_expect(!!(cond), 1)
+#define IMMER_UNLIKELY(cond) __builtin_expect(!!(cond), 0)
+// #define IMMER_PREFETCH(p)    __builtin_prefetch(p)
+#define IMMER_PREFETCH(p)
+#define IMMER_FORCEINLINE    inline __attribute__ ((always_inline))
+
+#define IMMER_DESCENT_DEEP 0
+
+#ifdef NDEBUG
+#define IMMER_ENABLE_DEBUG_SIZE_HEAP 0
+#else
+#define IMMER_ENABLE_DEBUG_SIZE_HEAP 1
+#endif
+
+namespace immer {
+
+const auto default_bits = 5;
+const auto default_free_list_size = 1 << 10;
+
+} // namespace immer
diff --git a/src/immer/detail/arrays/no_capacity.hpp b/src/immer/detail/arrays/no_capacity.hpp
new file mode 100644
index 000000000000..e056739c35b3
--- /dev/null
+++ b/src/immer/detail/arrays/no_capacity.hpp
@@ -0,0 +1,192 @@
+//
+// immer: immutable data structures for C++
+// Copyright (C) 2016, 2017, 2018 Juan Pedro Bolivar Puente
+//
+// This software is distributed under the Boost Software License, Version 1.0.
+// See accompanying file LICENSE or copy at http://boost.org/LICENSE_1_0.txt
+//
+
+#pragma once
+
+#include <immer/detail/arrays/node.hpp>
+
+namespace immer {
+namespace detail {
+namespace arrays {
+
+template <typename T, typename MemoryPolicy>
+struct no_capacity
+{
+    using node_t      = node<T, MemoryPolicy>;
+    using edit_t      = typename MemoryPolicy::transience_t::edit;
+    using size_t      = std::size_t;
+
+    node_t* ptr;
+    size_t  size;
+
+    static const no_capacity empty;
+
+    no_capacity(node_t* p, size_t s)
+        : ptr{p}, size{s}
+    {}
+
+    no_capacity(const no_capacity& other)
+        : no_capacity{other.ptr, other.size}
+    {
+        inc();
+    }
+
+    no_capacity(no_capacity&& other)
+        : no_capacity{empty}
+    {
+        swap(*this, other);
+    }
+
+    no_capacity& operator=(const no_capacity& other)
+    {
+        auto next = other;
+        swap(*this, next);
+        return *this;
+    }
+
+    no_capacity& operator=(no_capacity&& other)
+    {
+        swap(*this, other);
+        return *this;
+    }
+
+    friend void swap(no_capacity& x, no_capacity& y)
+    {
+        using std::swap;
+        swap(x.ptr, y.ptr);
+        swap(x.size, y.size);
+    }
+
+    ~no_capacity()
+    {
+        dec();
+    }
+
+    void inc()
+    {
+        using immer::detail::get;
+        ptr->refs().inc();
+    }
+
+    void dec()
+    {
+        using immer::detail::get;
+        if (ptr->refs().dec())
+            node_t::delete_n(ptr, size, size);
+    }
+
+    T* data() { return ptr->data(); }
+    const T* data() const { return ptr->data(); }
+
+    template <typename Iter>
+    static no_capacity from_range(Iter first, Iter last)
+    {
+        auto count = static_cast<size_t>(std::distance(first, last));
+        return {
+            node_t::copy_n(count, first, last),
+            count,
+        };
+    }
+
+    static no_capacity from_fill(size_t n, T v)
+    {
+        return { node_t::fill_n(n, v), n };
+    }
+
+    template <typename U>
+    static no_capacity from_initializer_list(std::initializer_list<U> values)
+    {
+        using namespace std;
+        return from_range(begin(values), end(values));
+    }
+
+    template <typename Fn>
+    void for_each_chunk(Fn&& fn) const
+    {
+        std::forward<Fn>(fn)(data(), data() + size);
+    }
+
+    template <typename Fn>
+    bool for_each_chunk_p(Fn&& fn) const
+    {
+        return std::forward<Fn>(fn)(data(), data() + size);
+    }
+
+    const T& get(std::size_t index) const
+    {
+        return data()[index];
+    }
+
+    const T& get_check(std::size_t index) const
+    {
+        if (index >= size)
+            throw std::out_of_range{"out of range"};
+        return data()[index];
+    }
+
+    bool equals(const no_capacity& other) const
+    {
+        return ptr == other.ptr ||
+            (size == other.size &&
+             std::equal(data(), data() + size, other.data()));
+    }
+
+    no_capacity push_back(T value) const
+    {
+        auto p = node_t::copy_n(size + 1, ptr, size);
+        try {
+            new (p->data() + size) T{std::move(value)};
+            return { p, size + 1 };
+        } catch (...) {
+            node_t::delete_n(p, size, size + 1);
+            throw;
+        }
+    }
+
+    no_capacity assoc(std::size_t idx, T value) const
+    {
+        auto p = node_t::copy_n(size, ptr, size);
+        try {
+            p->data()[idx] = std::move(value);
+            return { p, size };
+        } catch (...) {
+            node_t::delete_n(p, size, size);
+            throw;
+        }
+    }
+
+    template <typename Fn>
+    no_capacity update(std::size_t idx, Fn&& op) const
+    {
+        auto p = node_t::copy_n(size, ptr, size);
+        try {
+            auto& elem = p->data()[idx];
+            elem = std::forward<Fn>(op)(std::move(elem));
+            return { p, size };
+        } catch (...) {
+            node_t::delete_n(p, size, size);
+            throw;
+        }
+    }
+
+    no_capacity take(std::size_t sz) const
+    {
+        auto p = node_t::copy_n(sz, ptr, sz);
+        return { p, sz };
+    }
+};
+
+template <typename T, typename MP>
+const no_capacity<T, MP> no_capacity<T, MP>::empty = {
+    node_t::make_n(0),
+    0,
+};
+
+} // namespace arrays
+} // namespace detail
+} // namespace immer
diff --git a/src/immer/detail/arrays/node.hpp b/src/immer/detail/arrays/node.hpp
new file mode 100644
index 000000000000..5721f5779d30
--- /dev/null
+++ b/src/immer/detail/arrays/node.hpp
@@ -0,0 +1,129 @@
+//
+// immer: immutable data structures for C++
+// Copyright (C) 2016, 2017, 2018 Juan Pedro Bolivar Puente
+//
+// This software is distributed under the Boost Software License, Version 1.0.
+// See accompanying file LICENSE or copy at http://boost.org/LICENSE_1_0.txt
+//
+
+#pragma once
+
+#include <immer/detail/util.hpp>
+#include <immer/detail/combine_standard_layout.hpp>
+
+#include <limits>
+
+namespace immer {
+namespace detail {
+namespace arrays {
+
+template <typename T, typename MemoryPolicy>
+struct node
+{
+    using memory      = MemoryPolicy;
+    using heap        = typename MemoryPolicy::heap::type;
+    using transience  = typename memory::transience_t;
+    using refs_t      = typename memory::refcount;
+    using ownee_t     = typename transience::ownee;
+    using node_t      = node;
+    using edit_t      = typename transience::edit;
+
+    struct data_t
+    {
+        aligned_storage_for<T> buffer;
+    };
+
+    using impl_t = combine_standard_layout_t<data_t,
+                                             refs_t,
+                                             ownee_t>;
+
+    impl_t impl;
+
+    constexpr static std::size_t sizeof_n(size_t count)
+    {
+        return immer_offsetof(impl_t, d.buffer) + sizeof(T) * count;
+    }
+
+    refs_t& refs() const
+    {
+        return auto_const_cast(get<refs_t>(impl));
+    }
+
+    const ownee_t& ownee() const { return get<ownee_t>(impl); }
+    ownee_t& ownee()             { return get<ownee_t>(impl); }
+
+    const T* data() const { return reinterpret_cast<const T*>(&impl.d.buffer); }
+    T* data()             { return reinterpret_cast<T*>(&impl.d.buffer); }
+
+    bool can_mutate(edit_t e) const
+    {
+        return refs().unique()
+            || ownee().can_mutate(e);
+    }
+
+    static void delete_n(node_t* p, size_t sz, size_t cap)
+    {
+        destroy_n(p->data(), sz);
+        heap::deallocate(sizeof_n(cap), p);
+    }
+
+
+    static node_t* make_n(size_t n)
+    {
+        return new (heap::allocate(sizeof_n(n))) node_t{};
+    }
+
+    static node_t* make_e(edit_t e, size_t n)
+    {
+        auto p = make_n(n);
+        p->ownee() = e;
+        return p;
+    }
+
+    static node_t* fill_n(size_t n, T v)
+    {
+        auto p = make_n(n);
+        try {
+            std::uninitialized_fill_n(p->data(), n, v);
+            return p;
+        } catch (...) {
+            heap::deallocate(sizeof_n(n), p);
+            throw;
+        }
+    }
+
+    template <typename Iter>
+    static node_t* copy_n(size_t n, Iter first, Iter last)
+    {
+        auto p = make_n(n);
+        try {
+            std::uninitialized_copy(first, last, p->data());
+            return p;
+        } catch (...) {
+            heap::deallocate(sizeof_n(n), p);
+            throw;
+        }
+    }
+
+    static node_t* copy_n(size_t n, node_t* p, size_t count)
+    {
+        return copy_n(n, p->data(), p->data() + count);
+    }
+
+    template <typename Iter>
+    static node_t* copy_e(edit_t e, size_t n, Iter first, Iter last)
+    {
+        auto p = copy_n(n, first, last);
+        p->ownee() = e;
+        return p;
+    }
+
+    static node_t* copy_e(edit_t e, size_t n, node_t* p, size_t count)
+    {
+        return copy_e(e, n, p->data(), p->data() + count);
+    }
+};
+
+} // namespace arrays
+} // namespace detail
+} // namespace immer
diff --git a/src/immer/detail/arrays/with_capacity.hpp b/src/immer/detail/arrays/with_capacity.hpp
new file mode 100644
index 000000000000..fc97f1f9f4d2
--- /dev/null
+++ b/src/immer/detail/arrays/with_capacity.hpp
@@ -0,0 +1,297 @@
+//
+// immer: immutable data structures for C++
+// Copyright (C) 2016, 2017, 2018 Juan Pedro Bolivar Puente
+//
+// This software is distributed under the Boost Software License, Version 1.0.
+// See accompanying file LICENSE or copy at http://boost.org/LICENSE_1_0.txt
+//
+
+#pragma once
+
+#include <immer/detail/arrays/no_capacity.hpp>
+
+namespace immer {
+namespace detail {
+namespace arrays {
+
+template <typename T, typename MemoryPolicy>
+struct with_capacity
+{
+    using no_capacity_t = no_capacity<T, MemoryPolicy>;
+
+    using node_t      = node<T, MemoryPolicy>;
+    using edit_t      = typename MemoryPolicy::transience_t::edit;
+    using size_t      = std::size_t;
+
+    node_t* ptr;
+    size_t  size;
+    size_t  capacity;
+
+    static const with_capacity empty;
+
+    with_capacity(node_t* p, size_t s, size_t c)
+        : ptr{p}, size{s}, capacity{c}
+    {}
+
+    with_capacity(const with_capacity& other)
+        : with_capacity{other.ptr, other.size, other.capacity}
+    {
+        inc();
+    }
+
+    with_capacity(const no_capacity_t& other)
+        : with_capacity{other.ptr, other.size, other.size}
+    {
+        inc();
+    }
+
+    with_capacity(with_capacity&& other)
+        : with_capacity{empty}
+    {
+        swap(*this, other);
+    }
+
+    with_capacity& operator=(const with_capacity& other)
+    {
+        auto next = other;
+        swap(*this, next);
+        return *this;
+    }
+
+    with_capacity& operator=(with_capacity&& other)
+    {
+        swap(*this, other);
+        return *this;
+    }
+
+    friend void swap(with_capacity& x, with_capacity& y)
+    {
+        using std::swap;
+        swap(x.ptr, y.ptr);
+        swap(x.size, y.size);
+        swap(x.capacity, y.capacity);
+    }
+
+    ~with_capacity()
+    {
+        dec();
+    }
+
+    void inc()
+    {
+        using immer::detail::get;
+        ptr->refs().inc();
+    }
+
+    void dec()
+    {
+        using immer::detail::get;
+        if (ptr->refs().dec())
+            node_t::delete_n(ptr, size, capacity);
+    }
+
+    const T* data() const { return ptr->data(); }
+    T* data()             { return ptr->data(); }
+
+    operator no_capacity_t() const
+    {
+        if (size == capacity) {
+            ptr->refs().inc();
+            return { ptr, size };
+        } else {
+            return { node_t::copy_n(size, ptr, size), size };
+        }
+    }
+
+    template <typename Iter>
+    static with_capacity from_range(Iter first, Iter last)
+    {
+        auto count = static_cast<size_t>(std::distance(first, last));
+        return {
+            node_t::copy_n(count, first, last),
+            count,
+            count
+        };
+    }
+
+    template <typename U>
+    static with_capacity from_initializer_list(std::initializer_list<U> values)
+    {
+        using namespace std;
+        return from_range(begin(values), end(values));
+    }
+
+    static with_capacity from_fill(size_t n, T v)
+    {
+        return { node_t::fill_n(n, v), n, n };
+    }
+
+    template <typename Fn>
+    void for_each_chunk(Fn&& fn) const
+    {
+        std::forward<Fn>(fn)(data(), data() + size);
+    }
+
+    template <typename Fn>
+    bool for_each_chunk_p(Fn&& fn) const
+    {
+        return std::forward<Fn>(fn)(data(), data() + size);
+    }
+
+    const T& get(std::size_t index) const
+    {
+        return data()[index];
+    }
+
+    const T& get_check(std::size_t index) const
+    {
+        if (index >= size)
+            throw std::out_of_range{"out of range"};
+        return data()[index];
+    }
+
+    bool equals(const with_capacity& other) const
+    {
+        return ptr == other.ptr ||
+            (size == other.size &&
+             std::equal(data(), data() + size, other.data()));
+    }
+
+    static size_t recommend_up(size_t sz, size_t cap)
+    {
+        auto max = std::numeric_limits<size_t>::max();
+        return
+            sz <= cap       ? cap :
+            cap >= max / 2  ? max
+            /* otherwise */ : std::max(2 * cap, sz);
+    }
+
+    static size_t recommend_down(size_t sz, size_t cap)
+    {
+        return sz == 0      ? 1 :
+            sz < cap / 2    ? sz * 2 :
+            /* otherwise */   cap;
+    }
+
+    with_capacity push_back(T value) const
+    {
+        auto cap = recommend_up(size + 1, capacity);
+        auto p = node_t::copy_n(cap, ptr, size);
+        try {
+            new (p->data() + size) T{std::move(value)};
+            return { p, size + 1, cap };
+        } catch (...) {
+            node_t::delete_n(p, size, cap);
+            throw;
+        }
+    }
+
+    void push_back_mut(edit_t e, T value)
+    {
+        if (ptr->can_mutate(e) && capacity > size) {
+            new (data() + size) T{std::move(value)};
+            ++size;
+        } else {
+            auto cap = recommend_up(size + 1, capacity);
+            auto p = node_t::copy_e(e, cap, ptr, size);
+            try {
+                new (p->data() + size) T{std::move(value)};
+                *this = { p, size + 1, cap };
+            } catch (...) {
+                node_t::delete_n(p, size, cap);
+                throw;
+            }
+        }
+    }
+
+    with_capacity assoc(std::size_t idx, T value) const
+    {
+        auto p = node_t::copy_n(capacity, ptr, size);
+        try {
+            p->data()[idx] = std::move(value);
+            return { p, size, capacity };
+        } catch (...) {
+            node_t::delete_n(p, size, capacity);
+            throw;
+        }
+    }
+
+    void assoc_mut(edit_t e, std::size_t idx, T value)
+    {
+        if (ptr->can_mutate(e)) {
+            data()[idx] = std::move(value);
+        } else {
+            auto p = node_t::copy_n(capacity, ptr, size);
+            try {
+                p->data()[idx] = std::move(value);
+                *this = { p, size, capacity };
+            } catch (...) {
+                node_t::delete_n(p, size, capacity);
+                throw;
+            }
+        }
+    }
+
+    template <typename Fn>
+    with_capacity update(std::size_t idx, Fn&& op) const
+    {
+        auto p = node_t::copy_n(capacity, ptr, size);
+        try {
+            auto& elem = p->data()[idx];
+            elem = std::forward<Fn>(op)(std::move(elem));
+            return { p, size, capacity };
+        } catch (...) {
+            node_t::delete_n(p, size, capacity);
+            throw;
+        }
+    }
+
+    template <typename Fn>
+    void update_mut(edit_t e, std::size_t idx, Fn&& op)
+    {
+        if (ptr->can_mutate(e)) {
+            auto& elem = data()[idx];
+            elem = std::forward<Fn>(op)(std::move(elem));
+        } else {
+            auto p = node_t::copy_e(e, capacity, ptr, size);
+            try {
+                auto& elem = p->data()[idx];
+                elem = std::forward<Fn>(op)(std::move(elem));
+                *this = { p, size, capacity };
+            } catch (...) {
+                node_t::delete_n(p, size, capacity);
+                throw;
+            }
+        }
+    }
+
+    with_capacity take(std::size_t sz) const
+    {
+        auto cap = recommend_down(sz, capacity);
+        auto p = node_t::copy_n(cap, ptr, sz);
+        return { p, sz, cap };
+    }
+
+    void take_mut(edit_t e, std::size_t sz)
+    {
+        if (ptr->can_mutate(e)) {
+            destroy_n(data() + size, size - sz);
+            size = sz;
+        } else {
+            auto cap = recommend_down(sz, capacity);
+            auto p = node_t::copy_e(e, cap, ptr, sz);
+            *this = { p, sz, cap };
+        }
+    }
+};
+
+template <typename T, typename MP>
+const with_capacity<T, MP> with_capacity<T, MP>::empty = {
+    node_t::make_n(1),
+    0,
+    1,
+};
+
+} // namespace arrays
+} // namespace detail
+} // namespace immer
diff --git a/src/immer/detail/combine_standard_layout.hpp b/src/immer/detail/combine_standard_layout.hpp
new file mode 100644
index 000000000000..be8e698accb2
--- /dev/null
+++ b/src/immer/detail/combine_standard_layout.hpp
@@ -0,0 +1,196 @@
+//
+// immer: immutable data structures for C++
+// Copyright (C) 2016, 2017, 2018 Juan Pedro Bolivar Puente
+//
+// This software is distributed under the Boost Software License, Version 1.0.
+// See accompanying file LICENSE or copy at http://boost.org/LICENSE_1_0.txt
+//
+
+#pragma once
+
+#include <type_traits>
+
+#if __GNUC__ == 7 || __GNUC_MINOR__ == 1
+#define IMMER_BROKEN_STANDARD_LAYOUT_DETECTION 1
+#define immer_offsetof(st, m) ((std::size_t) &(((st*)0)->m))
+#else
+#define IMMER_BROKEN_STANDARD_LAYOUT_DETECTION 0
+#define immer_offsetof offsetof
+#endif
+
+namespace immer {
+namespace detail {
+
+//
+// Metafunction that returns a standard layout struct that combines
+// all the standard layout types in `Ts...`, while making sure that
+// empty base optimizations are used.
+//
+// To query a part of the type do `get<my_part>(x)`;
+//
+// This is useful when putting together a type that merges various
+// types coming from different policies.  Some of them might be empty,
+// so we shall enable empty base optimizations.  But if we just
+// inherit from all of them, we would break the "standard layout"
+// rules, preventing us from using `offseof(...)`.  So metafunction
+// will generate the type by sometimes inheriting, sometimes adding as
+// member.
+//
+// Note that the types are added to the combined type from right to
+// left!
+//
+template <typename... Ts>
+struct combine_standard_layout;
+
+template <typename... Ts>
+using combine_standard_layout_t = typename combine_standard_layout<Ts...>::type;
+
+namespace csl {
+
+template <typename T>
+struct type_t {};
+
+template <typename U, typename T>
+U& get(T& x);
+
+template <typename U, typename T>
+const U& get(const T& x);
+
+template <typename T, typename Next=void>
+struct inherit
+{
+    struct type : T, Next
+    {
+        using Next::get_;
+
+        template <typename U>
+        friend decltype(auto) get(type& x) { return x.get_(type_t<U>{}); }
+        template <typename U>
+        friend decltype(auto) get(const type& x) { return x.get_(type_t<U>{}); }
+
+        T& get_(type_t<T>) { return *this; }
+        const T& get_(type_t<T>) const { return *this; }
+    };
+};
+
+template <typename T>
+struct inherit<T, void>
+{
+    struct type : T
+    {
+        template <typename U>
+        friend decltype(auto) get(type& x) { return x.get_(type_t<U>{}); }
+        template <typename U>
+        friend decltype(auto) get(const type& x) { return x.get_(type_t<U>{}); }
+
+        T& get_(type_t<T>) { return *this; }
+        const T& get_(type_t<T>) const { return *this; }
+    };
+};
+
+template <typename T, typename Next=void>
+struct member
+{
+    struct type : Next
+    {
+        T d;
+
+        using Next::get_;
+
+        template <typename U>
+        friend decltype(auto) get(type& x) { return x.get_(type_t<U>{}); }
+        template <typename U>
+        friend decltype(auto) get(const type& x) { return x.get_(type_t<U>{}); }
+
+        T& get_(type_t<T>) { return d; }
+        const T& get_(type_t<T>) const { return d; }
+    };
+};
+
+template <typename T>
+struct member<T, void>
+{
+    struct type
+    {
+        T d;
+
+        template <typename U>
+        friend decltype(auto) get(type& x) { return x.get_(type_t<U>{}); }
+        template <typename U>
+        friend decltype(auto) get(const type& x) { return x.get_(type_t<U>{}); }
+
+        T& get_(type_t<T>) { return d; }
+        const T& get_(type_t<T>) const { return d; }
+    };
+};
+
+template <typename T, typename Next>
+struct member_two
+{
+    struct type
+    {
+        Next n;
+        T d;
+
+        template <typename U>
+        friend decltype(auto) get(type& x) { return x.get_(type_t<U>{}); }
+        template <typename U>
+        friend decltype(auto) get(const type& x) { return x.get_(type_t<U>{}); }
+
+        T& get_(type_t<T>) { return d; }
+        const T& get_(type_t<T>) const { return d; }
+
+        template <typename U>
+        auto get_(type_t<U> t) -> decltype(auto) { return n.get_(t); }
+        template <typename U>
+        auto get_(type_t<U> t) const -> decltype(auto) { return n.get_(t); }
+    };
+};
+
+template <typename... Ts>
+struct combine_standard_layout_aux;
+
+template <typename T>
+struct combine_standard_layout_aux<T>
+{
+    static_assert(std::is_standard_layout<T>::value, "");
+
+    using type = typename std::conditional_t<
+        std::is_empty<T>::value,
+        csl::inherit<T>,
+        csl::member<T>>::type;
+};
+
+template <typename T, typename... Ts>
+struct combine_standard_layout_aux<T, Ts...>
+{
+    static_assert(std::is_standard_layout<T>::value, "");
+
+    using this_t = T;
+    using next_t = typename combine_standard_layout_aux<Ts...>::type;
+
+    static constexpr auto empty_this = std::is_empty<this_t>::value;
+    static constexpr auto empty_next = std::is_empty<next_t>::value;
+
+    using type = typename std::conditional_t<
+        empty_this, inherit<this_t, next_t>,
+        std::conditional_t<
+            empty_next, member<this_t, next_t>,
+            member_two<this_t, next_t>>>::type;
+};
+
+} // namespace csl
+
+using csl::get;
+
+template <typename... Ts>
+struct combine_standard_layout
+{
+    using type = typename csl::combine_standard_layout_aux<Ts...>::type;
+#if !IMMER_BROKEN_STANDARD_LAYOUT_DETECTION
+    static_assert(std::is_standard_layout<type>::value, "");
+#endif
+};
+
+} // namespace detail
+} // namespace immer
diff --git a/src/immer/detail/hamts/bits.hpp b/src/immer/detail/hamts/bits.hpp
new file mode 100644
index 000000000000..a308b1517255
--- /dev/null
+++ b/src/immer/detail/hamts/bits.hpp
@@ -0,0 +1,55 @@
+//
+// immer: immutable data structures for C++
+// Copyright (C) 2016, 2017, 2018 Juan Pedro Bolivar Puente
+//
+// This software is distributed under the Boost Software License, Version 1.0.
+// See accompanying file LICENSE or copy at http://boost.org/LICENSE_1_0.txt
+//
+
+#pragma once
+
+#include <cstdint>
+
+namespace immer {
+namespace detail {
+namespace hamts {
+
+using bits_t   = std::uint32_t;
+using bitmap_t = std::uint32_t;
+using count_t  = std::uint32_t;
+using shift_t  = std::uint32_t;
+using size_t   = std::size_t;
+using hash_t   = std::size_t;
+
+template <bits_t B, typename T=count_t>
+constexpr T branches = T{1} << B;
+
+template <bits_t B, typename T=size_t>
+constexpr T mask = branches<B, T> - 1;
+
+template <bits_t B, typename T=count_t>
+constexpr T max_depth = (sizeof(hash_t) * 8 + B - 1) / B;
+
+template <bits_t B, typename T=count_t>
+constexpr T max_shift = max_depth<B, count_t> * B;
+
+#define IMMER_HAS_BUILTIN_POPCOUNT 1
+
+inline count_t popcount(bitmap_t x)
+{
+#if IMMER_HAS_BUILTIN_POPCOUNT
+    return __builtin_popcount(x);
+#else
+    // More alternatives:
+    // https://en.wikipedia.org/wiki/Hamming_weight
+    // http://wm.ite.pl/articles/sse-popcount.html
+    // http://graphics.stanford.edu/~seander/bithacks.html#CountBitsSetParallel
+    x = x - ((x >> 1) & 0x55555555);
+    x = (x & 0x33333333) + ((x >> 2) & 0x33333333);
+    return ((x + (x >> 4) & 0xF0F0F0F) * 0x1010101) >> 24;
+#endif
+}
+
+} // namespace hamts
+} // namespace detail
+} // namespace immer
diff --git a/src/immer/detail/hamts/champ.hpp b/src/immer/detail/hamts/champ.hpp
new file mode 100644
index 000000000000..fb5c9bb6f974
--- /dev/null
+++ b/src/immer/detail/hamts/champ.hpp
@@ -0,0 +1,474 @@
+//
+// immer: immutable data structures for C++
+// Copyright (C) 2016, 2017, 2018 Juan Pedro Bolivar Puente
+//
+// This software is distributed under the Boost Software License, Version 1.0.
+// See accompanying file LICENSE or copy at http://boost.org/LICENSE_1_0.txt
+//
+
+#pragma once
+
+#include <immer/config.hpp>
+#include <immer/detail/hamts/node.hpp>
+
+#include <algorithm>
+
+namespace immer {
+namespace detail {
+namespace hamts {
+
+template <typename T,
+          typename Hash,
+          typename Equal,
+          typename MemoryPolicy,
+          bits_t B>
+struct champ
+{
+    static_assert(branches<B> <= sizeof(bitmap_t) * 8, "");
+
+    static constexpr auto bits = B;
+
+    using node_t = node<T, Hash, Equal, MemoryPolicy, B>;
+
+    node_t* root;
+    size_t  size;
+
+    static const champ empty;
+
+    champ(node_t* r, size_t sz)
+        : root{r}, size{sz}
+    {
+    }
+
+    champ(const champ& other)
+        : champ{other.root, other.size}
+    {
+        inc();
+    }
+
+    champ(champ&& other)
+        : champ{empty}
+    {
+        swap(*this, other);
+    }
+
+    champ& operator=(const champ& other)
+    {
+        auto next = other;
+        swap(*this, next);
+        return *this;
+    }
+
+    champ& operator=(champ&& other)
+    {
+        swap(*this, other);
+        return *this;
+    }
+
+    friend void swap(champ& x, champ& y)
+    {
+        using std::swap;
+        swap(x.root, y.root);
+        swap(x.size, y.size);
+    }
+
+    ~champ()
+    {
+        dec();
+    }
+
+    void inc() const
+    {
+        root->inc();
+    }
+
+    void dec() const
+    {
+        if (root->dec())
+            node_t::delete_deep(root, 0);
+    }
+
+    template <typename Fn>
+    void for_each_chunk(Fn&& fn) const
+    {
+        for_each_chunk_traversal(root, 0, fn);
+    }
+
+    template <typename Fn>
+    void for_each_chunk_traversal(node_t* node, count_t depth, Fn&& fn) const
+    {
+        if (depth < max_depth<B>) {
+            auto datamap = node->datamap();
+            if (datamap)
+                fn(node->values(), node->values() + popcount(datamap));
+            auto nodemap = node->nodemap();
+            if (nodemap) {
+                auto fst = node->children();
+                auto lst = fst + popcount(nodemap);
+                for (; fst != lst; ++fst)
+                    for_each_chunk_traversal(*fst, depth + 1, fn);
+            }
+        } else {
+            fn(node->collisions(), node->collisions() + node->collision_count());
+        }
+    }
+
+    template <typename Project, typename Default, typename K>
+    decltype(auto) get(const K& k) const
+    {
+        auto node = root;
+        auto hash = Hash{}(k);
+        for (auto i = count_t{}; i < max_depth<B>; ++i) {
+            auto bit = 1 << (hash & mask<B>);
+            if (node->nodemap() & bit) {
+                auto offset = popcount(node->nodemap() & (bit - 1));
+                node = node->children() [offset];
+                hash = hash >> B;
+            } else if (node->datamap() & bit) {
+                auto offset = popcount(node->datamap() & (bit - 1));
+                auto val    = node->values() + offset;
+                if (Equal{}(*val, k))
+                    return Project{}(*val);
+                else
+                    return Default{}();
+            } else {
+                return Default{}();
+            }
+        }
+        auto fst = node->collisions();
+        auto lst = fst + node->collision_count();
+        for (; fst != lst; ++fst)
+            if (Equal{}(*fst, k))
+                return Project{}(*fst);
+        return Default{}();
+    }
+
+    std::pair<node_t*, bool>
+    do_add(node_t* node, T v, hash_t hash, shift_t shift) const
+    {
+        if (shift == max_shift<B>) {
+            auto fst = node->collisions();
+            auto lst = fst + node->collision_count();
+            for (; fst != lst; ++fst)
+                if (Equal{}(*fst, v))
+                    return {
+                        node_t::copy_collision_replace(node, fst, std::move(v)),
+                        false
+                    };
+            return {
+                node_t::copy_collision_insert(node, std::move(v)),
+                true
+            };
+        } else {
+            auto idx = (hash & (mask<B> << shift)) >> shift;
+            auto bit = 1 << idx;
+            if (node->nodemap() & bit) {
+                auto offset = popcount(node->nodemap() & (bit - 1));
+                auto result = do_add(node->children() [offset],
+                                     std::move(v), hash,
+                                     shift + B);
+                try {
+                    result.first = node_t::copy_inner_replace(
+                        node, offset, result.first);
+                    return result;
+                } catch (...) {
+                    node_t::delete_deep_shift(result.first, shift + B);
+                    throw;
+                }
+            } else if (node->datamap() & bit) {
+                auto offset = popcount(node->datamap() & (bit - 1));
+                auto val    = node->values() + offset;
+                if (Equal{}(*val, v))
+                    return {
+                        node_t::copy_inner_replace_value(
+                            node, offset, std::move(v)),
+                        false
+                    };
+                else {
+                    auto child = node_t::make_merged(shift + B,
+                                                    std::move(v), hash,
+                                                    *val, Hash{}(*val));
+                    try {
+                        return {
+                            node_t::copy_inner_replace_merged(
+                                node, bit, offset, child),
+                            true
+                        };
+                    } catch (...) {
+                        node_t::delete_deep_shift(child, shift + B);
+                        throw;
+                    }
+                }
+            } else {
+                return {
+                    node_t::copy_inner_insert_value(node, bit, std::move(v)),
+                    true
+                };
+            }
+        }
+    }
+
+    champ add(T v) const
+    {
+        auto hash = Hash{}(v);
+        auto res = do_add(root, std::move(v), hash, 0);
+        auto new_size = size + (res.second ? 1 : 0);
+        return { res.first, new_size };
+    }
+
+    template <typename Project, typename Default, typename Combine,
+              typename K, typename Fn>
+    std::pair<node_t*, bool>
+    do_update(node_t* node, K&& k, Fn&& fn,
+              hash_t hash, shift_t shift) const
+    {
+        if (shift == max_shift<B>) {
+            auto fst = node->collisions();
+            auto lst = fst + node->collision_count();
+            for (; fst != lst; ++fst)
+                if (Equal{}(*fst, k))
+                    return {
+                        node_t::copy_collision_replace(
+                            node, fst, Combine{}(std::forward<K>(k),
+                                                 std::forward<Fn>(fn)(
+                                                     Project{}(*fst)))),
+                        false
+                    };
+            return {
+                node_t::copy_collision_insert(
+                    node, Combine{}(std::forward<K>(k),
+                                    std::forward<Fn>(fn)(
+                                        Default{}()))),
+                true
+            };
+        } else {
+            auto idx = (hash & (mask<B> << shift)) >> shift;
+            auto bit = 1 << idx;
+            if (node->nodemap() & bit) {
+                auto offset = popcount(node->nodemap() & (bit - 1));
+                auto result = do_update<Project, Default, Combine>(
+                    node->children() [offset], k, std::forward<Fn>(fn),
+                    hash, shift + B);
+                try {
+                    result.first = node_t::copy_inner_replace(
+                        node, offset, result.first);
+                    return result;
+                } catch (...) {
+                    node_t::delete_deep_shift(result.first, shift + B);
+                    throw;
+                }
+            } else if (node->datamap() & bit) {
+                auto offset = popcount(node->datamap() & (bit - 1));
+                auto val    = node->values() + offset;
+                if (Equal{}(*val, k))
+                    return {
+                        node_t::copy_inner_replace_value(
+                            node, offset, Combine{}(std::forward<K>(k),
+                                                    std::forward<Fn>(fn)(
+                                                        Project{}(*val)))),
+                        false
+                    };
+                else {
+                    auto child = node_t::make_merged(
+                        shift + B, Combine{}(std::forward<K>(k),
+                                             std::forward<Fn>(fn)(
+                                                 Default{}())),
+                        hash, *val, Hash{}(*val));
+                    try {
+                        return {
+                            node_t::copy_inner_replace_merged(
+                                node, bit, offset, child),
+                            true
+                        };
+                    } catch (...) {
+                        node_t::delete_deep_shift(child, shift + B);
+                        throw;
+                    }
+                }
+            } else {
+                return {
+                    node_t::copy_inner_insert_value(
+                        node, bit, Combine{}(std::forward<K>(k),
+                                             std::forward<Fn>(fn)(
+                                                 Default{}()))),
+                    true
+                };
+            }
+        }
+    }
+
+    template <typename Project, typename Default, typename Combine,
+              typename K, typename Fn>
+    champ update(const K& k, Fn&& fn) const
+    {
+        auto hash = Hash{}(k);
+        auto res = do_update<Project, Default, Combine>(
+            root, k, std::forward<Fn>(fn), hash, 0);
+        auto new_size = size + (res.second ? 1 : 0);
+        return { res.first, new_size };
+    }
+
+    // basically:
+    //      variant<monostate_t, T*, node_t*>
+    // boo bad we are not using... C++17 :'(
+    struct sub_result
+    {
+        enum kind_t
+        {
+            nothing,
+            singleton,
+            tree
+        };
+
+        union data_t
+        {
+            T*      singleton;
+            node_t* tree;
+        };
+
+        kind_t kind;
+        data_t data;
+
+        sub_result()          : kind{nothing}   {};
+        sub_result(T* x)      : kind{singleton} { data.singleton = x; };
+        sub_result(node_t* x) : kind{tree}      { data.tree = x; };
+    };
+
+    template <typename K>
+    sub_result do_sub(node_t* node, const K& k, hash_t hash, shift_t shift) const
+    {
+        if (shift == max_shift<B>) {
+            auto fst = node->collisions();
+            auto lst = fst + node->collision_count();
+            for (auto cur = fst; cur != lst; ++cur)
+                if (Equal{}(*cur, k))
+                    return node->collision_count() > 2
+                        ? node_t::copy_collision_remove(node, cur)
+                        : sub_result{fst + (cur == fst)};
+            return {};
+        } else {
+            auto idx = (hash & (mask<B> << shift)) >> shift;
+            auto bit = 1 << idx;
+            if (node->nodemap() & bit) {
+                auto offset = popcount(node->nodemap() & (bit - 1));
+                auto result = do_sub(node->children() [offset],
+                                     k, hash, shift + B);
+                switch (result.kind) {
+                case sub_result::nothing:
+                    return {};
+                case sub_result::singleton:
+                    return node->datamap() == 0 &&
+                           popcount(node->nodemap()) == 1 &&
+                           shift > 0
+                        ? result
+                        : node_t::copy_inner_replace_inline(
+                            node, bit, offset, *result.data.singleton);
+                case sub_result::tree:
+                    try {
+                        return node_t::copy_inner_replace(node, offset,
+                                                          result.data.tree);
+                    } catch (...) {
+                        node_t::delete_deep_shift(result.data.tree, shift + B);
+                        throw;
+                    }
+                }
+            } else if (node->datamap() & bit) {
+                auto offset = popcount(node->datamap() & (bit - 1));
+                auto val    = node->values() + offset;
+                if (Equal{}(*val, k)) {
+                    auto nv = popcount(node->datamap());
+                    if (node->nodemap() || nv > 2)
+                        return node_t::copy_inner_remove_value(node, bit, offset);
+                    else if (nv == 2) {
+                        return shift > 0
+                            ? sub_result{node->values() + !offset}
+                            : node_t::make_inner_n(0,
+                                                  node->datamap() & ~bit,
+                                                  node->values()[!offset]);
+                    } else {
+                        assert(shift == 0);
+                        return empty.root->inc();
+                    }
+                }
+            }
+            return {};
+        }
+    }
+
+    template <typename K>
+    champ sub(const K& k) const
+    {
+        auto hash = Hash{}(k);
+        auto res = do_sub(root, k, hash, 0);
+        switch (res.kind) {
+        case sub_result::nothing:
+            return *this;
+        case sub_result::tree:
+            return {
+                res.data.tree,
+                size - 1
+            };
+        default:
+            IMMER_UNREACHABLE;
+        }
+    }
+
+    template <typename Eq=Equal>
+    bool equals(const champ& other) const
+    {
+        return size == other.size && equals_tree<Eq>(root, other.root, 0);
+    }
+
+    template <typename Eq>
+    static bool equals_tree(const node_t* a, const node_t* b, count_t depth)
+    {
+        if (a == b)
+            return true;
+        else if (depth == max_depth<B>) {
+            auto nv = a->collision_count();
+            return nv == b->collision_count() &&
+                equals_collisions<Eq>(a->collisions(), b->collisions(), nv);
+        } else {
+            if (a->nodemap() != b->nodemap() ||
+                a->datamap() != b->datamap())
+                return false;
+            auto n = popcount(a->nodemap());
+            for (auto i = count_t{}; i < n; ++i)
+                if (!equals_tree<Eq>(a->children()[i], b->children()[i], depth + 1))
+                    return false;
+            auto nv = popcount(a->datamap());
+            return equals_values<Eq>(a->values(), b->values(), nv);
+        }
+    }
+
+    template <typename Eq>
+    static bool equals_values(const T* a, const T* b, count_t n)
+    {
+        return std::equal(a, a + n, b, Eq{});
+    }
+
+    template <typename Eq>
+    static bool equals_collisions(const T* a, const T* b, count_t n)
+    {
+        auto ae = a + n;
+        auto be = b + n;
+        for (; a != ae; ++a) {
+            for (auto fst = b; fst != be; ++fst)
+                if (Eq{}(*a, *fst))
+                    goto good;
+            return false;
+        good: continue;
+        }
+        return true;
+    }
+};
+
+template <typename T, typename H, typename Eq, typename MP, bits_t B>
+const champ<T, H, Eq, MP, B> champ<T, H, Eq, MP, B>::empty = {
+    node_t::make_inner_n(0),
+    0,
+};
+
+} // namespace hamts
+} // namespace detail
+} // namespace immer
diff --git a/src/immer/detail/hamts/champ_iterator.hpp b/src/immer/detail/hamts/champ_iterator.hpp
new file mode 100644
index 000000000000..a0f101bfaf96
--- /dev/null
+++ b/src/immer/detail/hamts/champ_iterator.hpp
@@ -0,0 +1,143 @@
+//
+// immer: immutable data structures for C++
+// Copyright (C) 2016, 2017, 2018 Juan Pedro Bolivar Puente
+//
+// This software is distributed under the Boost Software License, Version 1.0.
+// See accompanying file LICENSE or copy at http://boost.org/LICENSE_1_0.txt
+//
+
+#pragma once
+
+#include <immer/detail/hamts/champ.hpp>
+#include <immer/detail/iterator_facade.hpp>
+
+namespace immer {
+namespace detail {
+namespace hamts {
+
+template <typename T, typename Hash, typename Eq, typename MP, bits_t B>
+struct champ_iterator
+    : iterator_facade<champ_iterator<T, Hash, Eq, MP, B>,
+                      std::forward_iterator_tag,
+                      T,
+                      const T&>
+{
+    using tree_t = champ<T, Hash, Eq, MP, B>;
+    using node_t = typename tree_t::node_t;
+
+    struct end_t {};
+
+    champ_iterator() = default;
+
+    champ_iterator(const tree_t& v)
+        : cur_   { v.root->values()  }
+        , end_   { v.root->values() + popcount(v.root->datamap()) }
+        , depth_ { 0 }
+    {
+        path_[0] = &v.root;
+        ensure_valid_();
+    }
+
+    champ_iterator(const tree_t& v, end_t)
+        : cur_   { nullptr }
+        , end_   { nullptr }
+        , depth_ { 0 }
+    {
+        path_[0] = &v.root;
+    }
+
+    champ_iterator(const champ_iterator& other)
+        : cur_   { other.cur_ }
+        , end_   { other.end_ }
+        , depth_ { other.depth_ }
+    {
+        std::copy(other.path_, other.path_ + depth_ + 1, path_);
+    }
+
+private:
+    friend iterator_core_access;
+
+    T* cur_;
+    T* end_;
+    count_t depth_;
+    node_t* const* path_[max_depth<B> + 1];
+
+    void increment()
+    {
+        ++cur_;
+        ensure_valid_();
+    }
+
+    bool step_down()
+    {
+        if (depth_ < max_depth<B>) {
+            auto parent = *path_[depth_];
+            if (parent->nodemap()) {
+                ++depth_;
+                path_[depth_] = parent->children();
+                auto child = *path_[depth_];
+                if (depth_ < max_depth<B>) {
+                    cur_ = child->values();
+                    end_ = cur_ + popcount(child->datamap());
+                } else {
+                    cur_ = child->collisions();
+                    end_ = cur_ + child->collision_count();
+                }
+                return true;
+            }
+        }
+        return false;
+    }
+
+    bool step_right()
+    {
+        while (depth_ > 0) {
+            auto parent = *path_[depth_ - 1];
+            auto last   = parent->children() + popcount(parent->nodemap());
+            auto next   = path_[depth_] + 1;
+            if (next < last) {
+                path_[depth_] = next;
+                auto child = *path_[depth_];
+                if (depth_ < max_depth<B>) {
+                    cur_ = child->values();
+                    end_ = cur_ + popcount(child->datamap());
+                } else {
+                    cur_ = child->collisions();
+                    end_ = cur_ + child->collision_count();
+                }
+                return true;
+            }
+            -- depth_;
+        }
+        return false;
+    }
+
+    void ensure_valid_()
+    {
+        while (cur_ == end_) {
+            while (step_down())
+                if (cur_ != end_)
+                    return;
+            if (!step_right()) {
+                // end of sequence
+                assert(depth_ == 0);
+                cur_ = end_ = nullptr;
+                return;
+            }
+        }
+    }
+
+    bool equal(const champ_iterator& other) const
+    {
+        return cur_ == other.cur_;
+    }
+
+    const T& dereference() const
+    {
+        return *cur_;
+    }
+};
+
+} // namespace hamts
+} // namespace detail
+} // namespace immer
diff --git a/src/immer/detail/hamts/node.hpp b/src/immer/detail/hamts/node.hpp
new file mode 100644
index 000000000000..cfe7d195fd29
--- /dev/null
+++ b/src/immer/detail/hamts/node.hpp
@@ -0,0 +1,712 @@
+//
+// immer: immutable data structures for C++
+// Copyright (C) 2016, 2017, 2018 Juan Pedro Bolivar Puente
+//
+// This software is distributed under the Boost Software License, Version 1.0.
+// See accompanying file LICENSE or copy at http://boost.org/LICENSE_1_0.txt
+//
+
+#pragma once
+
+#include <immer/detail/combine_standard_layout.hpp>
+#include <immer/detail/util.hpp>
+#include <immer/detail/hamts/bits.hpp>
+
+#include <cassert>
+
+#ifdef NDEBUG
+#define IMMER_HAMTS_TAGGED_NODE 0
+#else
+#define IMMER_HAMTS_TAGGED_NODE 1
+#endif
+
+namespace immer {
+namespace detail {
+namespace hamts {
+
+template <typename T,
+          typename Hash,
+          typename Equal,
+          typename MemoryPolicy,
+          bits_t B>
+struct node
+{
+    using node_t      = node;
+
+    using memory      = MemoryPolicy;
+    using heap_policy = typename memory::heap;
+    using heap        = typename heap_policy::type;
+    using transience  = typename memory::transience_t;
+    using refs_t      = typename memory::refcount;
+    using ownee_t     = typename transience::ownee;
+    using edit_t      = typename transience::edit;
+    using value_t     = T;
+
+    enum class kind_t
+    {
+        collision,
+        inner
+    };
+
+    struct collision_t
+    {
+        count_t count;
+        aligned_storage_for<T> buffer;
+    };
+
+    struct values_data_t
+    {
+        aligned_storage_for<T> buffer;
+    };
+
+    using values_t = combine_standard_layout_t<
+        values_data_t, refs_t>;
+
+    struct inner_t
+    {
+        bitmap_t  nodemap;
+        bitmap_t  datamap;
+        values_t* values;
+        aligned_storage_for<node_t*> buffer;
+    };
+
+    union data_t
+    {
+        inner_t inner;
+        collision_t collision;
+    };
+
+    struct impl_data_t
+    {
+#if IMMER_HAMTS_TAGGED_NODE
+        kind_t kind;
+#endif
+        data_t data;
+    };
+
+    using impl_t = combine_standard_layout_t<
+        impl_data_t, refs_t>;
+
+    impl_t impl;
+
+    constexpr static std::size_t sizeof_values_n(count_t count)
+    {
+        return immer_offsetof(values_t, d.buffer)
+            + sizeof(values_data_t::buffer) * count;
+    }
+
+    constexpr static std::size_t sizeof_collision_n(count_t count)
+    {
+        return immer_offsetof(impl_t, d.data.collision.buffer)
+            + sizeof(collision_t::buffer) * count;
+    }
+
+    constexpr static std::size_t sizeof_inner_n(count_t count)
+    {
+        return immer_offsetof(impl_t, d.data.inner.buffer)
+            + sizeof(inner_t::buffer) * count;
+    }
+
+#if IMMER_HAMTS_TAGGED_NODE
+    kind_t kind() const
+    {
+        return impl.d.kind;
+    }
+#endif
+
+    auto values()
+    {
+        assert(kind() == kind_t::inner);
+        return (T*) &impl.d.data.inner.values->d.buffer;
+    }
+
+    auto values() const
+    {
+        assert(kind() == kind_t::inner);
+        return (const T*) &impl.d.data.inner.values->d.buffer;
+    }
+
+    auto children()
+    {
+        assert(kind() == kind_t::inner);
+        return (node_t**) &impl.d.data.inner.buffer;
+    }
+
+    auto children() const
+    {
+        assert(kind() == kind_t::inner);
+        return (const node_t* const*) &impl.d.data.inner.buffer;
+    }
+
+    auto datamap() const
+    {
+        assert(kind() == kind_t::inner);
+        return impl.d.data.inner.datamap;
+    }
+
+    auto nodemap() const
+    {
+        assert(kind() == kind_t::inner);
+        return impl.d.data.inner.nodemap;
+    }
+
+    auto collision_count() const
+    {
+        assert(kind() == kind_t::collision);
+        return impl.d.data.collision.count;
+    }
+
+    T* collisions()
+    {
+        assert(kind() == kind_t::collision);
+        return (T*)&impl.d.data.collision.buffer;
+    }
+
+    const T* collisions() const
+    {
+        assert(kind() == kind_t::collision);
+        return (const T*)&impl.d.data.collision.buffer;
+    }
+
+    static refs_t& refs(const values_t* x) { return auto_const_cast(get<refs_t>(*x)); }
+    static const ownee_t& ownee(const values_t* x) { return get<ownee_t>(*x); }
+    static ownee_t& ownee(values_t* x) { return get<ownee_t>(*x); }
+
+    static refs_t& refs(const node_t* x) { return auto_const_cast(get<refs_t>(x->impl)); }
+    static const ownee_t& ownee(const node_t* x) { return get<ownee_t>(x->impl); }
+    static ownee_t& ownee(node_t* x) { return get<ownee_t>(x->impl); }
+
+    static node_t* make_inner_n(count_t n)
+    {
+        assert(n <= branches<B>);
+        auto m = heap::allocate(sizeof_inner_n(n));
+        auto p = new (m) node_t;
+#if IMMER_HAMTS_TAGGED_NODE
+        p->impl.d.kind = node_t::kind_t::inner;
+#endif
+        p->impl.d.data.inner.nodemap = 0;
+        p->impl.d.data.inner.datamap = 0;
+        p->impl.d.data.inner.values  = nullptr;
+        return p;
+    }
+
+    static node_t* make_inner_n(count_t n, values_t* values)
+    {
+        auto p = make_inner_n(n);
+        if (values) {
+            p->impl.d.data.inner.values = values;
+            refs(values).inc();
+        }
+        return p;
+    }
+
+    static node_t* make_inner_n(count_t n, count_t nv)
+    {
+        assert(nv <= branches<B>);
+        auto p = make_inner_n(n);
+        if (nv) {
+            try {
+                p->impl.d.data.inner.values =
+                    new (heap::allocate(sizeof_values_n(nv))) values_t{};
+            } catch (...) {
+                deallocate_inner(p, n);
+                throw;
+            }
+        }
+        return p;
+    }
+
+    static node_t* make_inner_n(count_t n, count_t idx, node_t* child)
+    {
+        assert(n >= 1);
+        auto p = make_inner_n(n);
+        p->impl.d.data.inner.nodemap = 1 << idx;
+        p->children()[0] = child;
+        return p;
+    }
+
+    static node_t* make_inner_n(count_t n,
+                                bitmap_t bitmap,
+                                T x)
+    {
+        auto p = make_inner_n(n, 1);
+        p->impl.d.data.inner.datamap = bitmap;
+        try {
+            new (p->values()) T{std::move(x)};
+        } catch (...) {
+            deallocate_inner(p, n, 1);
+            throw;
+        }
+        return p;
+    }
+
+    static node_t* make_inner_n(count_t n,
+                                count_t idx1, T x1,
+                                count_t idx2, T x2)
+    {
+        assert(idx1 != idx2);
+        auto p = make_inner_n(n, 2);
+        p->impl.d.data.inner.datamap = (1 << idx1) | (1 << idx2);
+        auto assign = [&] (auto&& x1, auto&& x2) {
+            auto vp = p->values();
+            try {
+                new (vp) T{std::move(x1)};
+                try {
+                    new (vp + 1) T{std::move(x2)};
+                } catch (...) {
+                    vp->~T();
+                    throw;
+                }
+            } catch (...) {
+                deallocate_inner(p, n, 2);
+                throw;
+            }
+        };
+        if (idx1 < idx2)
+            assign(x1, x2);
+        else
+            assign(x2, x1);
+        return p;
+    }
+
+    static node_t* make_collision_n(count_t n)
+    {
+        assert(n <= branches<B>);
+        auto m = heap::allocate(sizeof_collision_n(n));
+        auto p = new (m) node_t;
+#if IMMER_HAMTS_TAGGED_NODE
+        p->impl.d.kind = node_t::kind_t::collision;
+#endif
+        p->impl.d.data.collision.count = n;
+        return p;
+    }
+
+    static node_t* make_collision(T v1, T v2)
+    {
+        auto m = heap::allocate(sizeof_collision_n(2));
+        auto p = new (m) node_t;
+#if IMMER_HAMTS_TAGGED_NODE
+        p->impl.d.kind = node_t::kind_t::collision;
+#endif
+        p->impl.d.data.collision.count = 2;
+        auto cols = p->collisions();
+        try {
+            new (cols) T{std::move(v1)};
+            try {
+                new (cols + 1) T{std::move(v2)};
+            } catch (...) {
+                cols->~T();
+                throw;
+            }
+        } catch (...) {
+            deallocate_collision(p, 2);
+            throw;
+        }
+        return p;
+    }
+
+    static node_t* copy_collision_insert(node_t* src, T v)
+    {
+        assert(src->kind() == kind_t::collision);
+        auto n    = src->collision_count();
+        auto dst  = make_collision_n(n + 1);
+        auto srcp = src->collisions();
+        auto dstp = dst->collisions();
+        try {
+            new (dstp) T{std::move(v)};
+            try {
+                std::uninitialized_copy(srcp, srcp + n, dstp + 1);
+            } catch (...) {
+                dstp->~T();
+                throw;
+            }
+        } catch (...) {
+            deallocate_collision(dst, n + 1);
+            throw;
+        }
+        return dst;
+    }
+
+    static node_t* copy_collision_remove(node_t* src, T* v)
+    {
+        assert(src->kind() == kind_t::collision);
+        assert(src->collision_count() > 1);
+        auto n    = src->collision_count();
+        auto dst  = make_collision_n(n - 1);
+        auto srcp = src->collisions();
+        auto dstp = dst->collisions();
+        try {
+            dstp = std::uninitialized_copy(srcp, v, dstp);
+            try {
+                std::uninitialized_copy(v + 1, srcp + n, dstp);
+            } catch (...) {
+                destroy(dst->collisions(), dstp);
+                throw;
+            }
+        } catch (...) {
+            deallocate_collision(dst, n - 1);
+            throw;
+        }
+        return dst;
+    }
+
+    static node_t* copy_collision_replace(node_t* src, T* pos, T v)
+    {
+        assert(src->kind() == kind_t::collision);
+        auto n    = src->collision_count();
+        auto dst  = make_collision_n(n);
+        auto srcp = src->collisions();
+        auto dstp = dst->collisions();
+        assert(pos >= srcp && pos < srcp + n);
+        try {
+            new (dstp) T{std::move(v)};
+            try {
+                dstp = std::uninitialized_copy(srcp, pos, dstp + 1);
+                try {
+                    std::uninitialized_copy(pos + 1, srcp + n, dstp);
+                } catch (...) {
+                    destroy(dst->collisions(), dstp);
+                    throw;
+                }
+            } catch (...) {
+                dst->collisions()->~T();
+                throw;
+            }
+        } catch (...) {
+            deallocate_collision(dst, n);
+            throw;
+        }
+        return dst;
+    }
+
+    static node_t* copy_inner_replace(node_t* src,
+                                      count_t offset, node_t* child)
+    {
+        assert(src->kind() == kind_t::inner);
+        auto n    = popcount(src->nodemap());
+        auto dst  = make_inner_n(n, src->impl.d.data.inner.values);
+        auto srcp = src->children();
+        auto dstp = dst->children();
+        dst->impl.d.data.inner.datamap = src->datamap();
+        dst->impl.d.data.inner.nodemap = src->nodemap();
+        std::uninitialized_copy(srcp, srcp + n, dstp);
+        inc_nodes(srcp, n);
+        srcp[offset]->dec_unsafe();
+        dstp[offset] = child;
+        return dst;
+    }
+
+    static node_t* copy_inner_replace_value(node_t* src,
+                                            count_t offset, T v)
+    {
+        assert(src->kind() == kind_t::inner);
+        assert(offset < popcount(src->datamap()));
+        auto n    = popcount(src->nodemap());
+        auto nv   = popcount(src->datamap());
+        auto dst  = make_inner_n(n, nv);
+        dst->impl.d.data.inner.datamap = src->datamap();
+        dst->impl.d.data.inner.nodemap = src->nodemap();
+        try {
+            std::uninitialized_copy(
+                src->values(), src->values() + nv, dst->values());
+            try {
+                dst->values()[offset] = std::move(v);
+            } catch (...) {
+                destroy_n(dst->values(), nv);
+                throw;
+            }
+        } catch (...) {
+            deallocate_inner(dst, n, nv);
+            throw;
+        }
+        inc_nodes(src->children(), n);
+        std::uninitialized_copy(
+            src->children(), src->children() + n, dst->children());
+        return dst;
+    }
+
+    static node_t* copy_inner_replace_merged(
+        node_t* src, bitmap_t bit, count_t voffset, node_t* node)
+    {
+        assert(src->kind() == kind_t::inner);
+        assert(!(src->nodemap() & bit));
+        assert(src->datamap() & bit);
+        assert(voffset == popcount(src->datamap() & (bit - 1)));
+        auto n       = popcount(src->nodemap());
+        auto nv      = popcount(src->datamap());
+        auto dst     = make_inner_n(n + 1, nv - 1);
+        auto noffset = popcount(src->nodemap() & (bit - 1));
+        dst->impl.d.data.inner.datamap = src->datamap() & ~bit;
+        dst->impl.d.data.inner.nodemap = src->nodemap() | bit;
+        try {
+            std::uninitialized_copy(
+                    src->values(), src->values() + voffset,
+                    dst->values());
+            try {
+                std::uninitialized_copy(
+                    src->values() + voffset + 1, src->values() + nv,
+                    dst->values() + voffset);
+            } catch (...) {
+                destroy_n(dst->values(), voffset);
+                throw;
+            }
+        } catch (...) {
+            deallocate_inner(dst, n + 1, nv - 1);
+            throw;
+        }
+        inc_nodes(src->children(), n);
+        std::uninitialized_copy(
+            src->children(), src->children() + noffset,
+            dst->children());
+        std::uninitialized_copy(
+            src->children() + noffset, src->children() + n,
+            dst->children() + noffset + 1);
+        dst->children()[noffset] = node;
+        return dst;
+    }
+
+    static node_t* copy_inner_replace_inline(
+        node_t* src, bitmap_t bit, count_t noffset, T value)
+    {
+        assert(src->kind() == kind_t::inner);
+        assert(!(src->datamap() & bit));
+        assert(src->nodemap() & bit);
+        assert(noffset == popcount(src->nodemap() & (bit - 1)));
+        auto n       = popcount(src->nodemap());
+        auto nv      = popcount(src->datamap());
+        auto dst     = make_inner_n(n - 1, nv + 1);
+        auto voffset = popcount(src->datamap() & (bit - 1));
+        dst->impl.d.data.inner.nodemap = src->nodemap() & ~bit;
+        dst->impl.d.data.inner.datamap = src->datamap() | bit;
+        try {
+            std::uninitialized_copy(
+                src->values(), src->values() + voffset,
+                dst->values());
+            try {
+                new (dst->values() + voffset) T{std::move(value)};
+                try {
+                    std::uninitialized_copy(
+                        src->values() + voffset, src->values() + nv,
+                        dst->values() + voffset + 1);
+                } catch (...) {
+                    dst->values()[voffset].~T();
+                    throw;
+                }
+            } catch (...) {
+                destroy_n(dst->values(), voffset);
+                throw;
+            }
+        } catch (...) {
+            deallocate_inner(dst, n - 1, nv + 1);
+            throw;
+        }
+        inc_nodes(src->children(), n);
+        src->children()[noffset]->dec_unsafe();
+        std::uninitialized_copy(
+            src->children(), src->children() + noffset,
+            dst->children());
+        std::uninitialized_copy(
+            src->children() + noffset + 1, src->children() + n,
+            dst->children() + noffset);
+        return dst;
+    }
+
+    static node_t* copy_inner_remove_value(
+        node_t* src, bitmap_t bit, count_t voffset)
+    {
+        assert(src->kind() == kind_t::inner);
+        assert(!(src->nodemap() & bit));
+        assert(src->datamap() & bit);
+        assert(voffset == popcount(src->datamap() & (bit - 1)));
+        auto n       = popcount(src->nodemap());
+        auto nv      = popcount(src->datamap());
+        auto dst     = make_inner_n(n, nv - 1);
+        dst->impl.d.data.inner.datamap = src->datamap() & ~bit;
+        dst->impl.d.data.inner.nodemap = src->nodemap();
+        try {
+            std::uninitialized_copy(
+                src->values(), src->values() + voffset,
+                dst->values());
+            try {
+                std::uninitialized_copy(
+                    src->values() + voffset + 1, src->values() + nv,
+                    dst->values() + voffset);
+            } catch (...) {
+                destroy_n(dst->values(), voffset);
+                throw;
+            }
+        } catch (...) {
+            deallocate_inner(dst, n, nv - 1);
+            throw;
+        }
+        inc_nodes(src->children(), n);
+        std::uninitialized_copy(
+            src->children(), src->children() + n, dst->children());
+        return dst;
+    }
+
+    static node_t* copy_inner_insert_value(node_t* src, bitmap_t bit, T v)
+    {
+        assert(src->kind() == kind_t::inner);
+        auto n      = popcount(src->nodemap());
+        auto nv     = popcount(src->datamap());
+        auto offset = popcount(src->datamap() & (bit - 1));
+        auto dst    = make_inner_n(n, nv + 1);
+        dst->impl.d.data.inner.datamap = src->datamap() | bit;
+        dst->impl.d.data.inner.nodemap = src->nodemap();
+        try {
+            std::uninitialized_copy(
+                src->values(), src->values() + offset, dst->values());
+            try {
+                new (dst->values() + offset) T{std::move(v)};
+                try {
+                    std::uninitialized_copy(
+                        src->values() + offset, src->values() + nv,
+                        dst->values() + offset + 1);
+                } catch (...) {
+                    dst->values()[offset].~T();
+                    throw;
+                }
+            } catch (...) {
+                destroy_n(dst->values(), offset);
+                throw;
+            }
+        } catch (...) {
+            deallocate_inner(dst, n, nv + 1);
+            throw;
+        }
+        inc_nodes(src->children(), n);
+        std::uninitialized_copy(
+            src->children(), src->children() + n, dst->children());
+        return dst;
+    }
+
+    static node_t* make_merged(shift_t shift,
+                               T v1, hash_t hash1,
+                               T v2, hash_t hash2)
+    {
+        if (shift < max_shift<B>) {
+            auto idx1 = hash1 & (mask<B> << shift);
+            auto idx2 = hash2 & (mask<B> << shift);
+            if (idx1 == idx2) {
+                auto merged = make_merged(shift + B,
+                                          std::move(v1), hash1,
+                                          std::move(v2), hash2);
+                try {
+                    return make_inner_n(1, idx1 >> shift, merged);
+                } catch (...) {
+                    delete_deep_shift(merged, shift + B);
+                    throw;
+                }
+            } else {
+                return make_inner_n(0,
+                                    idx1 >> shift, std::move(v1),
+                                    idx2 >> shift, std::move(v2));
+            }
+        } else {
+            return make_collision(std::move(v1), std::move(v2));
+        }
+    }
+
+    node_t* inc()
+    {
+        refs(this).inc();
+        return this;
+    }
+
+    const node_t* inc() const
+    {
+        refs(this).inc();
+        return this;
+    }
+
+    bool dec() const { return refs(this).dec(); }
+    void dec_unsafe() const { refs(this).dec_unsafe(); }
+
+    static void inc_nodes(node_t** p, count_t n)
+    {
+        for (auto i = p, e = i + n; i != e; ++i)
+            refs(*i).inc();
+    }
+
+    static void delete_values(values_t* p, count_t n)
+    {
+        assert(p);
+        destroy_n(&p->d.buffer, n);
+        deallocate_values(p, n);
+    }
+
+    static void delete_inner(node_t* p)
+    {
+        assert(p);
+        assert(p->kind() == kind_t::inner);
+        auto vp = p->impl.d.data.inner.values;
+        if (vp && refs(vp).dec())
+            delete_values(vp, popcount(p->datamap()));
+        deallocate_inner(p, popcount(p->nodemap()));
+    }
+
+    static void delete_collision(node_t* p)
+    {
+        assert(p);
+        assert(p->kind() == kind_t::collision);
+        auto n = p->collision_count();
+        destroy_n(p->collisions(), n);
+        deallocate_collision(p, n);
+    }
+
+    static void delete_deep(node_t* p, shift_t s)
+    {
+        if (s == max_depth<B>)
+            delete_collision(p);
+        else {
+            auto fst = p->children();
+            auto lst = fst + popcount(p->nodemap());
+            for (; fst != lst; ++fst)
+                if ((*fst)->dec())
+                    delete_deep(*fst, s + 1);
+            delete_inner(p);
+        }
+    }
+
+    static void delete_deep_shift(node_t* p, shift_t s)
+    {
+        if (s == max_shift<B>)
+            delete_collision(p);
+        else {
+            auto fst = p->children();
+            auto lst = fst + popcount(p->nodemap());
+            for (; fst != lst; ++fst)
+                if ((*fst)->dec())
+                    delete_deep_shift(*fst, s + B);
+            delete_inner(p);
+        }
+    }
+
+    static void deallocate_values(values_t* p, count_t n)
+    {
+        destroy_n((T*) &p->d.buffer, n);
+        heap::deallocate(node_t::sizeof_values_n(n), p);
+    }
+
+    static void deallocate_collision(node_t* p, count_t n)
+    {
+        destroy_n(p->collisions(), n);
+        heap::deallocate(node_t::sizeof_collision_n(n), p);
+    }
+
+    static void deallocate_inner(node_t* p, count_t n)
+    {
+        heap::deallocate(node_t::sizeof_inner_n(n), p);
+    }
+
+    static void deallocate_inner(node_t* p, count_t n, count_t nv)
+    {
+        deallocate_values(p->impl.d.data.inner.values, nv);
+        heap::deallocate(node_t::sizeof_inner_n(n), p);
+    }
+};
+
+} // namespace hamts
+} // namespace detail
+} // namespace immer
diff --git a/src/immer/detail/iterator_facade.hpp b/src/immer/detail/iterator_facade.hpp
new file mode 100644
index 000000000000..985b2f17ae65
--- /dev/null
+++ b/src/immer/detail/iterator_facade.hpp
@@ -0,0 +1,202 @@
+//
+// immer: immutable data structures for C++
+// Copyright (C) 2016, 2017, 2018 Juan Pedro Bolivar Puente
+//
+// This software is distributed under the Boost Software License, Version 1.0.
+// See accompanying file LICENSE or copy at http://boost.org/LICENSE_1_0.txt
+//
+
+#pragma once
+
+#include <cstddef>
+#include <iterator>
+#include <type_traits>
+
+namespace immer {
+namespace detail {
+
+struct iterator_core_access
+{
+    template <typename T>
+    static decltype(auto) dereference(T&& x)
+    { return x.dereference(); }
+
+    template <typename T>
+    static decltype(auto) increment(T&& x)
+    { return x.increment(); }
+
+    template <typename T>
+    static decltype(auto) decrement(T&& x)
+    { return x.decrement(); }
+
+    template <typename T1, typename T2>
+    static decltype(auto) equal(T1&& x1, T2&& x2)
+    { return x1.equal(x2); }
+
+    template <typename T, typename D>
+    static decltype(auto) advance(T&& x, D d)
+    { return x.advance(d); }
+
+    template <typename T1, typename T2>
+    static decltype(auto) distance_to(T1&& x1, T2&& x2)
+    { return x1.distance_to(x2); }
+};
+
+/*!
+ * Minimalistic reimplementation of boost::iterator_facade
+ */
+template <typename DerivedT,
+          typename IteratorCategoryT,
+          typename T,
+          typename ReferenceT = T&,
+          typename DifferenceTypeT = std::ptrdiff_t,
+          typename PointerT = T*>
+class iterator_facade
+    : public std::iterator<IteratorCategoryT,
+                           T,
+                           DifferenceTypeT,
+                           PointerT,
+                           ReferenceT>
+{
+protected:
+    using access_t = iterator_core_access;
+
+    constexpr static auto is_random_access =
+        std::is_base_of<std::random_access_iterator_tag,
+                        IteratorCategoryT>::value;
+    constexpr static auto is_bidirectional =
+        std::is_base_of<std::bidirectional_iterator_tag,
+                        IteratorCategoryT>::value;
+
+    class reference_proxy
+    {
+        friend iterator_facade;
+        DerivedT iter_;
+
+        reference_proxy(DerivedT iter)
+            : iter_{std::move(iter)} {}
+    public:
+        operator ReferenceT() const { return *iter_; }
+    };
+
+    const DerivedT& derived() const
+    {
+        static_assert(std::is_base_of<iterator_facade, DerivedT>::value,
+                      "must pass a derived thing");
+        return *static_cast<const DerivedT*>(this);
+    }
+    DerivedT& derived()
+    {
+        static_assert(std::is_base_of<iterator_facade, DerivedT>::value,
+                      "must pass a derived thing");
+        return *static_cast<DerivedT*>(this);
+    }
+
+public:
+    ReferenceT operator*() const
+    {
+        return access_t::dereference(derived());
+    }
+    PointerT operator->() const
+    {
+        return &access_t::dereference(derived());
+    }
+    reference_proxy operator[](DifferenceTypeT n) const
+    {
+        static_assert(is_random_access, "");
+        return derived() + n;
+    }
+
+    bool operator==(const DerivedT& rhs) const
+    {
+        return access_t::equal(derived(), rhs);
+    }
+    bool operator!=(const DerivedT& rhs) const
+    {
+        return !access_t::equal(derived(), rhs);
+    }
+
+    DerivedT& operator++()
+    {
+        access_t::increment(derived());
+        return derived();
+    }
+    DerivedT operator++(int)
+    {
+        auto tmp = derived();
+        access_t::increment(derived());
+        return tmp;
+    }
+
+    DerivedT& operator--()
+    {
+        static_assert(is_bidirectional || is_random_access, "");
+        access_t::decrement(derived());
+        return derived();
+    }
+    DerivedT operator--(int)
+    {
+        static_assert(is_bidirectional || is_random_access, "");
+        auto tmp = derived();
+        access_t::decrement(derived());
+        return tmp;
+    }
+
+    DerivedT& operator+=(DifferenceTypeT n)
+    {
+        access_t::advance(derived(), n);
+        return derived();
+    }
+    DerivedT& operator-=(DifferenceTypeT n)
+    {
+        access_t::advance(derived(), -n);
+        return derived();
+    }
+
+    DerivedT operator+(DifferenceTypeT n) const
+    {
+        static_assert(is_random_access, "");
+        auto tmp = derived();
+        return tmp += n;
+    }
+    friend DerivedT operator+(DifferenceTypeT n, const DerivedT& i)
+    {
+        static_assert(is_random_access, "");
+        return i + n;
+    }
+    DerivedT operator-(DifferenceTypeT n) const
+    {
+        static_assert(is_random_access, "");
+        auto tmp = derived();
+        return tmp -= n;
+    }
+    DifferenceTypeT operator-(const DerivedT& rhs) const
+    {
+        static_assert(is_random_access, "");
+        return access_t::distance_to(rhs, derived());
+    }
+
+    bool operator<(const DerivedT& rhs) const
+    {
+        static_assert(is_random_access, "");
+        return access_t::distance_to(derived(), rhs) > 0;
+    }
+    bool operator<=(const DerivedT& rhs) const
+    {
+        static_assert(is_random_access, "");
+        return access_t::distance_to(derived(), rhs) >= 0;
+    }
+    bool operator>(const DerivedT& rhs) const
+    {
+        static_assert(is_random_access, "");
+        return access_t::distance_to(derived(), rhs) < 0;
+    }
+    bool operator>=(const DerivedT& rhs) const
+    {
+        static_assert(is_random_access, "");
+        return access_t::distance_to(derived(), rhs) <= 0;
+    }
+};
+
+} // namespace detail
+} // namespace immer
diff --git a/src/immer/detail/rbts/bits.hpp b/src/immer/detail/rbts/bits.hpp
new file mode 100644
index 000000000000..549319ae793a
--- /dev/null
+++ b/src/immer/detail/rbts/bits.hpp
@@ -0,0 +1,33 @@
+//
+// immer: immutable data structures for C++
+// Copyright (C) 2016, 2017, 2018 Juan Pedro Bolivar Puente
+//
+// This software is distributed under the Boost Software License, Version 1.0.
+// See accompanying file LICENSE or copy at http://boost.org/LICENSE_1_0.txt
+//
+
+#pragma once
+
+#include <cstdint>
+
+namespace immer {
+namespace detail {
+namespace rbts {
+
+using bits_t  = std::uint32_t;
+using shift_t = std::uint32_t;
+using count_t = std::uint32_t;
+using size_t  = std::size_t;
+
+template <bits_t B, typename T=count_t>
+constexpr T branches = T{1} << B;
+
+template <bits_t B, typename T=size_t>
+constexpr T mask = branches<B, T> - 1;
+
+template <bits_t B, bits_t BL>
+constexpr shift_t endshift = shift_t{BL} - shift_t{B};
+
+} // namespace rbts
+} // namespace detail
+} // namespace immer
diff --git a/src/immer/detail/rbts/node.hpp b/src/immer/detail/rbts/node.hpp
new file mode 100644
index 000000000000..229b1d9d48d7
--- /dev/null
+++ b/src/immer/detail/rbts/node.hpp
@@ -0,0 +1,942 @@
+//
+// immer: immutable data structures for C++
+// Copyright (C) 2016, 2017, 2018 Juan Pedro Bolivar Puente
+//
+// This software is distributed under the Boost Software License, Version 1.0.
+// See accompanying file LICENSE or copy at http://boost.org/LICENSE_1_0.txt
+//
+
+#pragma once
+
+#include <immer/heap/tags.hpp>
+#include <immer/detail/combine_standard_layout.hpp>
+#include <immer/detail/util.hpp>
+#include <immer/detail/rbts/bits.hpp>
+
+#include <cassert>
+#include <cstddef>
+#include <memory>
+#include <type_traits>
+
+#ifdef NDEBUG
+#define IMMER_RBTS_TAGGED_NODE 0
+#else
+#define IMMER_RBTS_TAGGED_NODE 1
+#endif
+
+namespace immer {
+namespace detail {
+namespace rbts {
+
+template <typename T,
+          typename MemoryPolicy,
+          bits_t   B,
+          bits_t   BL>
+struct node
+{
+    static constexpr auto bits      = B;
+    static constexpr auto bits_leaf = BL;
+
+    using node_t      = node;
+    using memory      = MemoryPolicy;
+    using heap_policy = typename memory::heap;
+    using transience  = typename memory::transience_t;
+    using refs_t      = typename memory::refcount;
+    using ownee_t     = typename transience::ownee;
+    using edit_t      = typename transience::edit;
+    using value_t     = T;
+
+    static constexpr bool embed_relaxed = memory::prefer_fewer_bigger_objects;
+
+    enum class kind_t
+    {
+        leaf,
+        inner
+    };
+
+    struct relaxed_data_t
+    {
+        count_t count;
+        size_t  sizes[branches<B>];
+    };
+
+    using relaxed_data_with_meta_t =
+        combine_standard_layout_t<relaxed_data_t,
+                                  refs_t,
+                                  ownee_t>;
+
+    using relaxed_data_no_meta_t =
+        combine_standard_layout_t<relaxed_data_t>;
+
+    using relaxed_t = std::conditional_t<embed_relaxed,
+                                         relaxed_data_no_meta_t,
+                                         relaxed_data_with_meta_t>;
+
+    struct leaf_t
+    {
+        aligned_storage_for<T> buffer;
+    };
+
+    struct inner_t
+    {
+        relaxed_t*  relaxed;
+        aligned_storage_for<node_t*> buffer;
+    };
+
+    union data_t
+    {
+        inner_t inner;
+        leaf_t  leaf;
+    };
+
+    struct impl_data_t
+    {
+#if IMMER_RBTS_TAGGED_NODE
+        kind_t kind;
+#endif
+        data_t data;
+    };
+
+    using impl_t = combine_standard_layout_t<
+        impl_data_t, refs_t, ownee_t>;
+
+    impl_t impl;
+
+    // assume that we need to keep headroom space in the node when we
+    // are doing reference counting, since any node may become
+    // transient when it has only one reference
+    constexpr static bool keep_headroom = !std::is_empty<refs_t>{};
+
+    constexpr static std::size_t sizeof_packed_leaf_n(count_t count)
+    {
+        return immer_offsetof(impl_t, d.data.leaf.buffer)
+            +  sizeof(leaf_t::buffer) * count;
+    }
+
+    constexpr static std::size_t sizeof_packed_inner_n(count_t count)
+    {
+        return immer_offsetof(impl_t, d.data.inner.buffer)
+            +  sizeof(inner_t::buffer) * count;
+    }
+
+    constexpr static std::size_t sizeof_packed_relaxed_n(count_t count)
+    {
+        return immer_offsetof(relaxed_t, d.sizes)
+            +  sizeof(size_t) * count;
+    }
+
+    constexpr static std::size_t sizeof_packed_inner_r_n(count_t count)
+    {
+        return embed_relaxed
+            ? sizeof_packed_inner_n(count) + sizeof_packed_relaxed_n(count)
+            : sizeof_packed_inner_n(count);
+    }
+
+    constexpr static std::size_t max_sizeof_leaf  =
+        sizeof_packed_leaf_n(branches<BL>);
+
+    constexpr static std::size_t max_sizeof_inner =
+        sizeof_packed_inner_n(branches<B>);
+
+    constexpr static std::size_t max_sizeof_relaxed =
+        sizeof_packed_relaxed_n(branches<B>);
+
+    constexpr static std::size_t max_sizeof_inner_r =
+        sizeof_packed_inner_r_n(branches<B>);
+
+    constexpr static std::size_t sizeof_inner_n(count_t n)
+    { return keep_headroom ? max_sizeof_inner : sizeof_packed_inner_n(n); }
+
+    constexpr static std::size_t sizeof_inner_r_n(count_t n)
+    { return keep_headroom ? max_sizeof_inner_r : sizeof_packed_inner_r_n(n); }
+
+    constexpr static std::size_t sizeof_relaxed_n(count_t n)
+    { return keep_headroom ? max_sizeof_relaxed : sizeof_packed_relaxed_n(n); }
+
+    constexpr static std::size_t sizeof_leaf_n(count_t n)
+    { return keep_headroom ? max_sizeof_leaf : sizeof_packed_leaf_n(n); }
+
+    using heap = typename heap_policy::template
+        optimized<max_sizeof_inner>::type;
+
+#if IMMER_RBTS_TAGGED_NODE
+    kind_t kind() const
+    {
+        return impl.d.kind;
+    }
+#endif
+
+    relaxed_t* relaxed()
+    {
+        assert(kind() == kind_t::inner);
+        return impl.d.data.inner.relaxed;
+    }
+
+    const relaxed_t* relaxed() const
+    {
+        assert(kind() == kind_t::inner);
+        return impl.d.data.inner.relaxed;
+    }
+
+    node_t** inner()
+    {
+        assert(kind() == kind_t::inner);
+        return reinterpret_cast<node_t**>(&impl.d.data.inner.buffer);
+    }
+
+    T* leaf()
+    {
+        assert(kind() == kind_t::leaf);
+        return reinterpret_cast<T*>(&impl.d.data.leaf.buffer);
+    }
+
+    static refs_t& refs(const relaxed_t* x) { return auto_const_cast(get<refs_t>(*x)); }
+    static const ownee_t& ownee(const relaxed_t* x) { return get<ownee_t>(*x); }
+    static ownee_t& ownee(relaxed_t* x) { return get<ownee_t>(*x); }
+
+    static refs_t& refs(const node_t* x) { return auto_const_cast(get<refs_t>(x->impl)); }
+    static const ownee_t& ownee(const node_t* x) { return get<ownee_t>(x->impl); }
+    static ownee_t& ownee(node_t* x) { return get<ownee_t>(x->impl); }
+
+    static node_t* make_inner_n(count_t n)
+    {
+        assert(n <= branches<B>);
+        auto m = heap::allocate(sizeof_inner_n(n));
+        auto p = new (m) node_t;
+        p->impl.d.data.inner.relaxed = nullptr;
+#if IMMER_RBTS_TAGGED_NODE
+        p->impl.d.kind = node_t::kind_t::inner;
+#endif
+        return p;
+    }
+
+    static node_t* make_inner_e(edit_t e)
+    {
+        auto m = heap::allocate(max_sizeof_inner);
+        auto p = new (m) node_t;
+        ownee(p) = e;
+        p->impl.d.data.inner.relaxed = nullptr;
+#if IMMER_RBTS_TAGGED_NODE
+        p->impl.d.kind = node_t::kind_t::inner;
+#endif
+        return p;
+    }
+
+    static node_t* make_inner_r_n(count_t n)
+    {
+        assert(n <= branches<B>);
+        auto mp = heap::allocate(sizeof_inner_r_n(n));
+        auto mr = static_cast<void*>(nullptr);
+        if (embed_relaxed) {
+            mr = reinterpret_cast<unsigned char*>(mp) + sizeof_inner_n(n);
+        } else {
+            try {
+                mr = heap::allocate(sizeof_relaxed_n(n), norefs_tag{});
+            } catch (...) {
+                heap::deallocate(sizeof_inner_r_n(n), mp);
+                throw;
+            }
+        }
+        auto p = new (mp) node_t;
+        auto r = new (mr) relaxed_t;
+        r->d.count = 0;
+        p->impl.d.data.inner.relaxed = r;
+#if IMMER_RBTS_TAGGED_NODE
+        p->impl.d.kind = node_t::kind_t::inner;
+#endif
+        return p;
+    }
+
+    static node_t* make_inner_sr_n(count_t n, relaxed_t* r)
+    {
+        return static_if<embed_relaxed, node_t*>(
+            [&] (auto) {
+                return node_t::make_inner_r_n(n);
+            },
+            [&] (auto) {
+                auto p = new (heap::allocate(node_t::sizeof_inner_r_n(n))) node_t;
+                assert(r->d.count >= n);
+                node_t::refs(r).inc();
+                p->impl.d.data.inner.relaxed = r;
+#if IMMER_RBTS_TAGGED_NODE
+                p->impl.d.kind = node_t::kind_t::inner;
+#endif
+                return p;
+            });
+    }
+
+    static node_t* make_inner_r_e(edit_t e)
+    {
+        auto mp = heap::allocate(max_sizeof_inner_r);
+        auto mr = static_cast<void*>(nullptr);
+        if (embed_relaxed) {
+            mr = reinterpret_cast<unsigned char*>(mp) + max_sizeof_inner;
+        } else {
+            try {
+                mr = heap::allocate(max_sizeof_relaxed, norefs_tag{});
+            } catch (...) {
+                heap::deallocate(max_sizeof_inner_r, mp);
+                throw;
+            }
+        }
+        auto p = new (mp) node_t;
+        auto r = new (mr) relaxed_t;
+        ownee(p) = e;
+        static_if<!embed_relaxed>([&](auto){ node_t::ownee(r) = e; });
+        r->d.count = 0;
+        p->impl.d.data.inner.relaxed = r;
+#if IMMER_RBTS_TAGGED_NODE
+        p->impl.d.kind = node_t::kind_t::inner;
+#endif
+        return p;
+    }
+
+    static node_t* make_inner_sr_e(edit_t e, relaxed_t* r)
+    {
+        return static_if<embed_relaxed, node_t*>(
+            [&] (auto) {
+                return node_t::make_inner_r_e(e);
+            },
+            [&] (auto) {
+                auto p = new (heap::allocate(node_t::max_sizeof_inner_r)) node_t;
+                node_t::refs(r).inc();
+                p->impl.d.data.inner.relaxed = r;
+                node_t::ownee(p) = e;
+#if IMMER_RBTS_TAGGED_NODE
+                p->impl.d.kind = node_t::kind_t::inner;
+#endif
+                return p;
+            });
+    }
+
+    static node_t* make_leaf_n(count_t n)
+    {
+        assert(n <= branches<BL>);
+        auto p = new (heap::allocate(sizeof_leaf_n(n))) node_t;
+#if IMMER_RBTS_TAGGED_NODE
+        p->impl.d.kind = node_t::kind_t::leaf;
+#endif
+        return p;
+    }
+
+    static node_t* make_leaf_e(edit_t e)
+    {
+        auto p = new (heap::allocate(max_sizeof_leaf)) node_t;
+        ownee(p) = e;
+#if IMMER_RBTS_TAGGED_NODE
+        p->impl.d.kind = node_t::kind_t::leaf;
+#endif
+        return p;
+    }
+
+    static node_t* make_inner_n(count_t n, node_t* x)
+    {
+        assert(n >= 1);
+        auto p = make_inner_n(n);
+        p->inner() [0] = x;
+        return p;
+    }
+
+    static node_t* make_inner_n(edit_t n, node_t* x)
+    {
+        assert(n >= 1);
+        auto p = make_inner_n(n);
+        p->inner() [0] = x;
+        return p;
+    }
+
+    static node_t* make_inner_n(count_t n, node_t* x, node_t* y)
+    {
+        assert(n >= 2);
+        auto p = make_inner_n(n);
+        p->inner() [0] = x;
+        p->inner() [1] = y;
+        return p;
+    }
+
+    static node_t* make_inner_r_n(count_t n, node_t* x)
+    {
+        assert(n >= 1);
+        auto p = make_inner_r_n(n);
+        auto r = p->relaxed();
+        p->inner() [0] = x;
+        r->d.count = 1;
+        return p;
+    }
+
+    static node_t* make_inner_r_n(count_t n, node_t* x, size_t xs)
+    {
+        assert(n >= 1);
+        auto p = make_inner_r_n(n);
+        auto r = p->relaxed();
+        p->inner() [0] = x;
+        r->d.sizes [0] = xs;
+        r->d.count = 1;
+        return p;
+    }
+
+    static node_t* make_inner_r_n(count_t n, node_t* x, node_t* y)
+    {
+        assert(n >= 2);
+        auto p = make_inner_r_n(n);
+        auto r = p->relaxed();
+        p->inner() [0] = x;
+        p->inner() [1] = y;
+        r->d.count = 2;
+        return p;
+    }
+
+    static node_t* make_inner_r_n(count_t n,
+                                  node_t* x, size_t xs,
+                                  node_t* y)
+    {
+        assert(n >= 2);
+        auto p = make_inner_r_n(n);
+        auto r = p->relaxed();
+        p->inner() [0] = x;
+        p->inner() [1] = y;
+        r->d.sizes [0] = xs;
+        r->d.count = 2;
+        return p;
+    }
+
+    static node_t* make_inner_r_n(count_t n,
+                                  node_t* x, size_t xs,
+                                  node_t* y, size_t ys)
+    {
+        assert(n >= 2);
+        auto p = make_inner_r_n(n);
+        auto r = p->relaxed();
+        p->inner() [0] = x;
+        p->inner() [1] = y;
+        r->d.sizes [0] = xs;
+        r->d.sizes [1] = xs + ys;
+        r->d.count = 2;
+        return p;
+    }
+
+    static node_t* make_inner_r_n(count_t n,
+                                  node_t* x, size_t xs,
+                                  node_t* y, size_t ys,
+                                  node_t* z, size_t zs)
+    {
+        assert(n >= 3);
+        auto p = make_inner_r_n(n);
+        auto r = p->relaxed();
+        p->inner() [0] = x;
+        p->inner() [1] = y;
+        p->inner() [2] = z;
+        r->d.sizes [0] = xs;
+        r->d.sizes [1] = xs + ys;
+        r->d.sizes [2] = xs + ys + zs;
+        r->d.count = 3;
+        return p;
+    }
+
+    template <typename U>
+    static node_t* make_leaf_n(count_t n, U&& x)
+    {
+        assert(n >= 1);
+        auto p = make_leaf_n(n);
+        try {
+            new (p->leaf()) T{ std::forward<U>(x) };
+        } catch (...) {
+            heap::deallocate(node_t::sizeof_leaf_n(n), p);
+            throw;
+        }
+        return p;
+    }
+
+    template <typename U>
+    static node_t* make_leaf_e(edit_t e, U&& x)
+    {
+        auto p = make_leaf_e(e);
+        try {
+            new (p->leaf()) T{ std::forward<U>(x) };
+        } catch (...) {
+            heap::deallocate(node_t::max_sizeof_leaf, p);
+            throw;
+        }
+        return p;
+    }
+
+    static node_t* make_path(shift_t shift, node_t* node)
+    {
+        assert(node->kind() == kind_t::leaf);
+        if (shift == endshift<B, BL>)
+            return node;
+        else {
+            auto n = node_t::make_inner_n(1);
+            try {
+                n->inner() [0] = make_path(shift - B, node);
+            } catch (...) {
+                heap::deallocate(node_t::sizeof_inner_n(1), n);
+                throw;
+            }
+            return n;
+        }
+    }
+
+    static node_t* make_path_e(edit_t e, shift_t shift, node_t* node)
+    {
+        assert(node->kind() == kind_t::leaf);
+        if (shift == endshift<B, BL>)
+            return node;
+        else {
+            auto n = node_t::make_inner_e(e);
+            try {
+                n->inner() [0] = make_path_e(e, shift - B, node);
+            } catch (...) {
+                heap::deallocate(node_t::max_sizeof_inner, n);
+                throw;
+            }
+            return n;
+        }
+    }
+
+    static node_t* copy_inner(node_t* src, count_t n)
+    {
+        assert(src->kind() == kind_t::inner);
+        auto dst = make_inner_n(n);
+        inc_nodes(src->inner(), n);
+        std::uninitialized_copy(src->inner(), src->inner() + n, dst->inner());
+        return dst;
+    }
+
+    static node_t* copy_inner_n(count_t allocn, node_t* src, count_t n)
+    {
+        assert(allocn >= n);
+        assert(src->kind() == kind_t::inner);
+        auto dst = make_inner_n(allocn);
+        return do_copy_inner(dst, src, n);
+    }
+
+    static node_t* copy_inner_e(edit_t e, node_t* src, count_t n)
+    {
+        assert(src->kind() == kind_t::inner);
+        auto dst = make_inner_e(e);
+        return do_copy_inner(dst, src, n);
+    }
+
+    static node_t* do_copy_inner(node_t* dst, node_t* src, count_t n)
+    {
+        assert(dst->kind() == kind_t::inner);
+        assert(src->kind() == kind_t::inner);
+        auto p = src->inner();
+        inc_nodes(p, n);
+        std::uninitialized_copy(p, p + n, dst->inner());
+        return dst;
+    }
+
+    static node_t* copy_inner_r(node_t* src, count_t n)
+    {
+        assert(src->kind() == kind_t::inner);
+        auto dst = make_inner_r_n(n);
+        return do_copy_inner_r(dst, src, n);
+    }
+
+    static node_t* copy_inner_r_n(count_t allocn, node_t* src, count_t n)
+    {
+        assert(allocn >= n);
+        assert(src->kind() == kind_t::inner);
+        auto dst = make_inner_r_n(allocn);
+        return do_copy_inner_r(dst, src, n);
+    }
+
+    static node_t* copy_inner_r_e(edit_t e, node_t* src, count_t n)
+    {
+        assert(src->kind() == kind_t::inner);
+        auto dst = make_inner_r_e(e);
+        return do_copy_inner_r(dst, src, n);
+    }
+
+    static node_t* copy_inner_sr_e(edit_t e, node_t* src, count_t n)
+    {
+        assert(src->kind() == kind_t::inner);
+        auto dst = make_inner_sr_e(e, src->relaxed());
+        return do_copy_inner_sr(dst, src, n);
+    }
+
+    static node_t* do_copy_inner_r(node_t* dst, node_t* src, count_t n)
+    {
+        assert(dst->kind() == kind_t::inner);
+        assert(src->kind() == kind_t::inner);
+        auto src_r = src->relaxed();
+        auto dst_r = dst->relaxed();
+        inc_nodes(src->inner(), n);
+        std::copy(src->inner(), src->inner() + n, dst->inner());
+        std::copy(src_r->d.sizes, src_r->d.sizes + n, dst_r->d.sizes);
+        dst_r->d.count = n;
+        return dst;
+    }
+
+    static node_t* do_copy_inner_sr(node_t* dst, node_t* src, count_t n)
+    {
+        if (embed_relaxed)
+            return do_copy_inner_r(dst, src, n);
+        else {
+            inc_nodes(src->inner(), n);
+            std::copy(src->inner(), src->inner() + n, dst->inner());
+            return dst;
+        }
+    }
+
+    static node_t* copy_leaf(node_t* src, count_t n)
+    {
+        assert(src->kind() == kind_t::leaf);
+        auto dst = make_leaf_n(n);
+        try {
+            std::uninitialized_copy(src->leaf(), src->leaf() + n, dst->leaf());
+        } catch (...) {
+            heap::deallocate(node_t::sizeof_leaf_n(n), dst);
+            throw;
+        }
+        return dst;
+    }
+
+    static node_t* copy_leaf_e(edit_t e, node_t* src, count_t n)
+    {
+        assert(src->kind() == kind_t::leaf);
+        auto dst = make_leaf_e(e);
+        try {
+            std::uninitialized_copy(src->leaf(), src->leaf() + n, dst->leaf());
+        } catch (...) {
+            heap::deallocate(node_t::max_sizeof_leaf, dst);
+            throw;
+        }
+        return dst;
+    }
+
+    static node_t* copy_leaf_n(count_t allocn, node_t* src, count_t n)
+    {
+        assert(allocn >= n);
+        assert(src->kind() == kind_t::leaf);
+        auto dst = make_leaf_n(allocn);
+        try {
+            std::uninitialized_copy(src->leaf(), src->leaf() + n, dst->leaf());
+        } catch (...) {
+            heap::deallocate(node_t::sizeof_leaf_n(allocn), dst);
+            throw;
+        }
+        return dst;
+    }
+
+    static node_t* copy_leaf(node_t* src1, count_t n1,
+                             node_t* src2, count_t n2)
+    {
+        assert(src1->kind() == kind_t::leaf);
+        assert(src2->kind() == kind_t::leaf);
+        auto dst = make_leaf_n(n1 + n2);
+        try {
+            std::uninitialized_copy(
+                src1->leaf(), src1->leaf() + n1, dst->leaf());
+        } catch (...) {
+            heap::deallocate(node_t::sizeof_leaf_n(n1 + n2), dst);
+            throw;
+        }
+        try {
+            std::uninitialized_copy(
+                src2->leaf(), src2->leaf() + n2, dst->leaf() + n1);
+        } catch (...) {
+            destroy_n(dst->leaf(), n1);
+            heap::deallocate(node_t::sizeof_leaf_n(n1 + n2), dst);
+            throw;
+        }
+        return dst;
+    }
+
+    static node_t* copy_leaf_e(edit_t e,
+                               node_t* src1, count_t n1,
+                               node_t* src2, count_t n2)
+    {
+        assert(src1->kind() == kind_t::leaf);
+        assert(src2->kind() == kind_t::leaf);
+        auto dst = make_leaf_e(e);
+        try {
+            std::uninitialized_copy(
+                src1->leaf(), src1->leaf() + n1, dst->leaf());
+        } catch (...) {
+            heap::deallocate(max_sizeof_leaf, dst);
+            throw;
+        }
+        try {
+            std::uninitialized_copy(
+                src2->leaf(), src2->leaf() + n2, dst->leaf() + n1);
+        } catch (...) {
+            destroy_n(dst->leaf(), n1);
+            heap::deallocate(max_sizeof_leaf, dst);
+            throw;
+        }
+        return dst;
+    }
+
+    static node_t* copy_leaf_e(edit_t e, node_t* src, count_t idx, count_t last)
+    {
+        assert(src->kind() == kind_t::leaf);
+        auto dst = make_leaf_e(e);
+        try {
+            std::uninitialized_copy(
+                src->leaf() + idx, src->leaf() + last, dst->leaf());
+        } catch (...) {
+            heap::deallocate(max_sizeof_leaf, dst);
+            throw;
+        }
+        return dst;
+    }
+
+    static node_t* copy_leaf(node_t* src, count_t idx, count_t last)
+    {
+        assert(src->kind() == kind_t::leaf);
+        auto dst = make_leaf_n(last - idx);
+        try {
+            std::uninitialized_copy(
+                src->leaf() + idx, src->leaf() + last, dst->leaf());
+        } catch (...) {
+            heap::deallocate(node_t::sizeof_leaf_n(last - idx), dst);
+            throw;
+        }
+        return dst;
+    }
+
+    template <typename U>
+    static node_t* copy_leaf_emplace(node_t* src, count_t n, U&& x)
+    {
+        auto dst = copy_leaf_n(n + 1, src, n);
+        try {
+            new (dst->leaf() + n) T{std::forward<U>(x)};
+        } catch (...) {
+            destroy_n(dst->leaf(), n);
+            heap::deallocate(node_t::sizeof_leaf_n(n + 1), dst);
+            throw;
+        }
+        return dst;
+    }
+
+    static void delete_inner(node_t* p, count_t n)
+    {
+        assert(p->kind() == kind_t::inner);
+        assert(!p->relaxed());
+        heap::deallocate(ownee(p).owned()
+                         ? node_t::max_sizeof_inner
+                         : node_t::sizeof_inner_n(n), p);
+    }
+
+    static void delete_inner_e(node_t* p)
+    {
+        assert(p->kind() == kind_t::inner);
+        assert(!p->relaxed());
+        heap::deallocate(node_t::max_sizeof_inner, p);
+    }
+
+    static void delete_inner_any(node_t* p, count_t n)
+    {
+        if (p->relaxed())
+            delete_inner_r(p, n);
+        else
+            delete_inner(p, n);
+    }
+
+    static void delete_inner_r(node_t* p, count_t n)
+    {
+        assert(p->kind() == kind_t::inner);
+        auto r = p->relaxed();
+        assert(r);
+        static_if<!embed_relaxed>([&] (auto) {
+            if (node_t::refs(r).dec())
+                heap::deallocate(node_t::ownee(r).owned()
+                                 ? node_t::max_sizeof_relaxed
+                                 : node_t::sizeof_relaxed_n(n), r);
+        });
+        heap::deallocate(ownee(p).owned()
+                         ? node_t::max_sizeof_inner_r
+                         : node_t::sizeof_inner_r_n(n), p);
+    }
+
+    static void delete_inner_r_e(node_t* p)
+    {
+        assert(p->kind() == kind_t::inner);
+        auto r = p->relaxed();
+        assert(r);
+        static_if<!embed_relaxed>([&] (auto) {
+            if (node_t::refs(r).dec())
+                heap::deallocate(node_t::max_sizeof_relaxed, r);
+        });
+        heap::deallocate(node_t::max_sizeof_inner_r, p);
+    }
+
+    static void delete_leaf(node_t* p, count_t n)
+    {
+        assert(p->kind() == kind_t::leaf);
+        destroy_n(p->leaf(), n);
+        heap::deallocate(ownee(p).owned()
+                         ? node_t::max_sizeof_leaf
+                         : node_t::sizeof_leaf_n(n), p);
+    }
+
+    bool can_mutate(edit_t e) const
+    {
+        return refs(this).unique()
+            || ownee(this).can_mutate(e);
+    }
+
+    bool can_relax() const
+    {
+        return !embed_relaxed || relaxed();
+    }
+
+    relaxed_t* ensure_mutable_relaxed(edit_t e)
+    {
+        auto src_r = relaxed();
+        return static_if<embed_relaxed, relaxed_t*>(
+            [&] (auto) { return src_r; },
+            [&] (auto) {
+                if (node_t::refs(src_r).unique() ||
+                    node_t::ownee(src_r).can_mutate(e))
+                    return src_r;
+                else {
+                    if (src_r)
+                        node_t::refs(src_r).dec_unsafe();
+                    auto dst_r = impl.d.data.inner.relaxed =
+                        new (heap::allocate(max_sizeof_relaxed)) relaxed_t;
+                    node_t::ownee(dst_r) = e;
+                    return dst_r;
+                }
+            });
+    }
+
+    relaxed_t* ensure_mutable_relaxed_e(edit_t e, edit_t ec)
+    {
+        auto src_r = relaxed();
+        return static_if<embed_relaxed, relaxed_t*>(
+            [&] (auto) { return src_r; },
+            [&] (auto) {
+                if (src_r && (node_t::refs(src_r).unique() ||
+                              node_t::ownee(src_r).can_mutate(e))) {
+                    node_t::ownee(src_r) = ec;
+                    return src_r;
+                } else {
+                    if (src_r)
+                        node_t::refs(src_r).dec_unsafe();
+                    auto dst_r = impl.d.data.inner.relaxed =
+                        new (heap::allocate(max_sizeof_relaxed)) relaxed_t;
+                    node_t::ownee(dst_r) = ec;
+                    return dst_r;
+                }
+            });
+    }
+
+    relaxed_t* ensure_mutable_relaxed_n(edit_t e, count_t n)
+    {
+        auto src_r = relaxed();
+        return static_if<embed_relaxed, relaxed_t*>(
+            [&] (auto) { return src_r; },
+            [&] (auto) {
+                if (node_t::refs(src_r).unique() ||
+                    node_t::ownee(src_r).can_mutate(e))
+                    return src_r;
+                else {
+                    if (src_r)
+                        node_t::refs(src_r).dec_unsafe();
+                    auto dst_r =
+                        new (heap::allocate(max_sizeof_relaxed)) relaxed_t;
+                    std::copy(src_r->d.sizes, src_r->d.sizes + n, dst_r->d.sizes);
+                    node_t::ownee(dst_r) = e;
+                    return impl.d.data.inner.relaxed = dst_r;
+                }
+            });
+    }
+
+    node_t* inc()
+    {
+        refs(this).inc();
+        return this;
+    }
+
+    const node_t* inc() const
+    {
+        refs(this).inc();
+        return this;
+    }
+
+    bool dec() const { return refs(this).dec(); }
+    void dec_unsafe() const { refs(this).dec_unsafe(); }
+
+    static void inc_nodes(node_t** p, count_t n)
+    {
+        for (auto i = p, e = i + n; i != e; ++i)
+            refs(*i).inc();
+    }
+
+#if IMMER_RBTS_TAGGED_NODE
+    shift_t compute_shift()
+    {
+        if (kind() == kind_t::leaf)
+            return endshift<B, BL>;
+        else
+            return B + inner() [0]->compute_shift();
+    }
+#endif
+
+    bool check(shift_t shift, size_t size)
+    {
+#if IMMER_DEBUG_DEEP_CHECK
+        assert(size > 0);
+        if (shift == endshift<B, BL>) {
+            assert(kind() == kind_t::leaf);
+            assert(size <= branches<BL>);
+        } else if (auto r = relaxed()) {
+            auto count = r->d.count;
+            assert(count > 0);
+            assert(count <= branches<B>);
+            if (r->d.sizes[count - 1] != size) {
+                IMMER_TRACE_F("check");
+                IMMER_TRACE_E(r->d.sizes[count - 1]);
+                IMMER_TRACE_E(size);
+            }
+            assert(r->d.sizes[count - 1] == size);
+            for (auto i = 1; i < count; ++i)
+                assert(r->d.sizes[i - 1] < r->d.sizes[i]);
+            auto last_size = size_t{};
+            for (auto i = 0; i < count; ++i) {
+                assert(inner()[i]->check(
+                           shift - B,
+                           r->d.sizes[i] - last_size));
+                last_size = r->d.sizes[i];
+            }
+        } else {
+            assert(size <= branches<B> << shift);
+            auto count = (size >> shift)
+                + (size - ((size >> shift) << shift) > 0);
+            assert(count <= branches<B>);
+            if (count) {
+                for (auto i = 1; i < count - 1; ++i)
+                    assert(inner()[i]->check(
+                               shift - B,
+                               1 << shift));
+                assert(inner()[count - 1]->check(
+                           shift - B,
+                           size - ((count - 1) << shift)));
+            }
+        }
+#endif // IMMER_DEBUG_DEEP_CHECK
+        return true;
+    }
+};
+
+template <typename T, typename MP, bits_t B>
+constexpr bits_t derive_bits_leaf_aux()
+{
+    using node_t = node<T, MP, B, B>;
+    constexpr auto sizeof_elem = sizeof(T);
+    constexpr auto space = node_t::max_sizeof_inner - node_t::sizeof_packed_leaf_n(0);
+    constexpr auto full_elems = space / sizeof_elem;
+    constexpr auto BL = log2(full_elems);
+    return BL;
+}
+
+template <typename T, typename MP, bits_t B>
+constexpr bits_t derive_bits_leaf = derive_bits_leaf_aux<T, MP, B>();
+
+} // namespace rbts
+} // namespace detail
+} // namespace immer
diff --git a/src/immer/detail/rbts/operations.hpp b/src/immer/detail/rbts/operations.hpp
new file mode 100644
index 000000000000..e07a3dabfee6
--- /dev/null
+++ b/src/immer/detail/rbts/operations.hpp
@@ -0,0 +1,2304 @@
+//
+// immer: immutable data structures for C++
+// Copyright (C) 2016, 2017, 2018 Juan Pedro Bolivar Puente
+//
+// This software is distributed under the Boost Software License, Version 1.0.
+// See accompanying file LICENSE or copy at http://boost.org/LICENSE_1_0.txt
+//
+
+#pragma once
+
+#include <algorithm>
+#include <memory>
+#include <numeric>
+#include <utility>
+
+#include <immer/config.hpp>
+#include <immer/heap/tags.hpp>
+#include <immer/detail/rbts/position.hpp>
+#include <immer/detail/rbts/visitor.hpp>
+
+namespace immer {
+namespace detail {
+namespace rbts {
+
+template <typename T>
+struct array_for_visitor
+{
+    using this_t = array_for_visitor;
+
+    template <typename PosT>
+    friend T* visit_inner(this_t, PosT&& pos, size_t idx)
+    { return pos.descend(this_t{}, idx); }
+
+    template <typename PosT>
+    friend T* visit_leaf(this_t, PosT&& pos, size_t)
+    { return pos.node()->leaf(); }
+};
+
+template <typename T>
+struct region_for_visitor
+{
+    using this_t = region_for_visitor;
+    using result_t = std::tuple<T*, size_t, size_t>;
+
+    template <typename PosT>
+    friend result_t visit_inner(this_t, PosT&& pos, size_t idx)
+    { return pos.towards(this_t{}, idx); }
+
+    template <typename PosT>
+    friend result_t visit_leaf(this_t, PosT&& pos, size_t idx)
+    { return { pos.node()->leaf(), pos.index(idx), pos.count() }; }
+};
+
+template <typename T>
+struct get_visitor
+{
+    using this_t = get_visitor;
+
+    template <typename PosT>
+    friend const T& visit_inner(this_t, PosT&& pos, size_t idx)
+    { return pos.descend(this_t{}, idx); }
+
+    template <typename PosT>
+    friend const T& visit_leaf(this_t, PosT&& pos, size_t idx)
+    { return pos.node()->leaf() [pos.index(idx)]; }
+};
+
+struct for_each_chunk_visitor
+{
+    using this_t = for_each_chunk_visitor;
+
+    template <typename Pos, typename Fn>
+    friend void visit_inner(this_t, Pos&& pos, Fn&& fn)
+    { pos.each(this_t{}, fn); }
+
+    template <typename Pos, typename Fn>
+    friend void visit_leaf(this_t, Pos&& pos, Fn&& fn)
+    {
+        auto data = pos.node()->leaf();
+        fn(data, data + pos.count());
+    }
+};
+
+struct for_each_chunk_p_visitor
+{
+    using this_t = for_each_chunk_p_visitor;
+
+    template <typename Pos, typename Fn>
+    friend bool visit_inner(this_t, Pos&& pos, Fn&& fn)
+    { return pos.each_pred(this_t{}, fn); }
+
+    template <typename Pos, typename Fn>
+    friend bool visit_leaf(this_t, Pos&& pos, Fn&& fn)
+    {
+        auto data = pos.node()->leaf();
+        return fn(data, data + pos.count());
+    }
+};
+
+struct for_each_chunk_left_visitor
+{
+    using this_t = for_each_chunk_left_visitor;
+
+    template <typename Pos, typename Fn>
+    friend void visit_inner(this_t, Pos&& pos,
+                            size_t last, Fn&& fn)
+    {
+        auto l = pos.index(last);
+        pos.each_left(for_each_chunk_visitor{}, l, fn);
+        pos.towards_oh(this_t{}, last, l, fn);
+    }
+
+    template <typename Pos, typename Fn>
+    friend void visit_leaf(this_t, Pos&& pos,
+                           size_t last,
+                           Fn&& fn)
+    {
+        auto data = pos.node()->leaf();
+        auto l = pos.index(last);
+        fn(data, data + l + 1);
+    }
+};
+
+struct for_each_chunk_right_visitor
+{
+    using this_t = for_each_chunk_right_visitor;
+
+    template <typename Pos, typename Fn>
+    friend void visit_inner(this_t, Pos&& pos,
+                            size_t first, Fn&& fn)
+    {
+        auto f = pos.index(first);
+        pos.towards_oh(this_t{}, first, f, fn);
+        pos.each_right(for_each_chunk_visitor{}, f + 1, fn);
+    }
+
+    template <typename Pos, typename Fn>
+    friend void visit_leaf(this_t, Pos&& pos,
+                           size_t first,
+                           Fn&& fn)
+    {
+        auto data = pos.node()->leaf();
+        auto f = pos.index(first);
+        fn(data + f, data + pos.count());
+    }
+};
+
+struct for_each_chunk_i_visitor
+{
+    using this_t = for_each_chunk_i_visitor;
+
+    template <typename Pos, typename Fn>
+    friend void visit_relaxed(this_t, Pos&& pos,
+                              size_t first, size_t last,
+                              Fn&& fn)
+    {
+        // we are going towards *two* indices, so we need to do the
+        // relaxed as a special case to correct the second index
+        if (first < last)  {
+            auto f = pos.index(first);
+            auto l = pos.index(last - 1);
+            if (f == l) {
+                auto sbh = pos.size_before(f);
+                pos.towards_oh_sbh(this_t{}, first, f, sbh, last - sbh, fn);
+            } else {
+                assert(f < l);
+                pos.towards_oh(for_each_chunk_right_visitor{}, first, f, fn);
+                pos.each_i(for_each_chunk_visitor{}, f + 1, l, fn);
+                pos.towards_oh(for_each_chunk_left_visitor{}, last - 1, l, fn);
+            }
+        }
+    }
+
+    template <typename Pos, typename Fn>
+    friend void visit_regular(this_t, Pos&& pos,
+                              size_t first, size_t last,
+                              Fn&& fn)
+    {
+        if (first < last)  {
+            auto f = pos.index(first);
+            auto l = pos.index(last - 1);
+            if (f == l)
+                pos.towards_oh(this_t{}, first, f, last, fn);
+            else {
+                assert(f < l);
+                pos.towards_oh(for_each_chunk_right_visitor{}, first, f, fn);
+                pos.each_i(for_each_chunk_visitor{}, f + 1, l, fn);
+                pos.towards_oh(for_each_chunk_left_visitor{}, last - 1, l, fn);
+            }
+        }
+    }
+
+    template <typename Pos, typename Fn>
+    friend void visit_leaf(this_t, Pos&& pos,
+                           size_t first, size_t last,
+                           Fn&& fn)
+    {
+        auto data = pos.node()->leaf();
+        if (first < last) {
+            auto f = pos.index(first);
+            auto l = pos.index(last - 1);
+            fn(data + f, data + l + 1);
+        }
+    }
+};
+
+struct for_each_chunk_p_left_visitor
+{
+    using this_t = for_each_chunk_p_left_visitor;
+
+    template <typename Pos, typename Fn>
+    friend bool visit_inner(this_t, Pos&& pos,
+                            size_t last, Fn&& fn)
+    {
+        auto l = pos.index(last);
+        return pos.each_pred_left(for_each_chunk_p_visitor{}, l, fn)
+            && pos.towards_oh(this_t{}, last, l, fn);
+    }
+
+    template <typename Pos, typename Fn>
+    friend bool visit_leaf(this_t, Pos&& pos,
+                           size_t last,
+                           Fn&& fn)
+    {
+        auto data = pos.node()->leaf();
+        auto l = pos.index(last);
+        return fn(data, data + l + 1);
+    }
+};
+
+struct for_each_chunk_p_right_visitor
+{
+    using this_t = for_each_chunk_p_right_visitor;
+
+    template <typename Pos, typename Fn>
+    friend bool visit_inner(this_t, Pos&& pos,
+                            size_t first, Fn&& fn)
+    {
+        auto f = pos.index(first);
+        return pos.towards_oh(this_t{}, first, f, fn)
+            && pos.each_pred_right(for_each_chunk_p_visitor{}, f + 1, fn);
+    }
+
+    template <typename Pos, typename Fn>
+    friend bool visit_leaf(this_t, Pos&& pos,
+                           size_t first,
+                           Fn&& fn)
+    {
+        auto data = pos.node()->leaf();
+        auto f = pos.index(first);
+        return fn(data + f, data + pos.count());
+    }
+};
+
+struct for_each_chunk_p_i_visitor
+{
+    using this_t = for_each_chunk_p_i_visitor;
+
+    template <typename Pos, typename Fn>
+    friend bool visit_relaxed(this_t, Pos&& pos,
+                              size_t first, size_t last,
+                              Fn&& fn)
+    {
+        // we are going towards *two* indices, so we need to do the
+        // relaxed as a special case to correct the second index
+        if (first < last)  {
+            auto f = pos.index(first);
+            auto l = pos.index(last - 1);
+            if (f == l) {
+                auto sbh = pos.size_before(f);
+                return pos.towards_oh_sbh(this_t{}, first, f, sbh, last - sbh, fn);
+            } else {
+                assert(f < l);
+                return pos.towards_oh(for_each_chunk_p_right_visitor{}, first, f, fn)
+                    && pos.each_pred_i(for_each_chunk_p_visitor{}, f + 1, l, fn)
+                    && pos.towards_oh(for_each_chunk_p_left_visitor{}, last - 1, l, fn);
+            }
+        }
+        return true;
+    }
+
+    template <typename Pos, typename Fn>
+    friend bool visit_regular(this_t, Pos&& pos,
+                              size_t first, size_t last,
+                              Fn&& fn)
+    {
+        if (first < last)  {
+            auto f = pos.index(first);
+            auto l = pos.index(last - 1);
+            if (f == l)
+                return pos.towards_oh(this_t{}, first, f, last, fn);
+            else {
+                assert(f < l);
+                return pos.towards_oh(for_each_chunk_p_right_visitor{}, first, f, fn)
+                    && pos.each_pred_i(for_each_chunk_p_visitor{}, f + 1, l, fn)
+                    && pos.towards_oh(for_each_chunk_p_left_visitor{}, last - 1, l, fn);
+            }
+        }
+        return true;
+    }
+
+    template <typename Pos, typename Fn>
+    friend bool visit_leaf(this_t, Pos&& pos,
+                           size_t first, size_t last,
+                           Fn&& fn)
+    {
+        auto data = pos.node()->leaf();
+        if (first < last) {
+            auto f = pos.index(first);
+            auto l = pos.index(last - 1);
+            return fn(data + f, data + l + 1);
+        }
+        return true;
+    }
+};
+
+struct equals_visitor
+{
+    using this_t = equals_visitor;
+
+    struct this_aux_t
+    {
+        template <typename PosR, typename PosL,typename Iter>
+        friend bool visit_inner(this_aux_t, PosR&& posr,
+                               count_t i, PosL&& posl,
+                               Iter&& first, size_t idx)
+        { return posl.nth_sub(i, this_t{}, posr, first, idx); }
+
+        template <typename PosR, typename PosL,typename Iter>
+        friend bool visit_leaf(this_aux_t, PosR&& posr,
+                               count_t i, PosL&& posl,
+                               Iter&& first, size_t idx)
+        { return posl.nth_sub_leaf(i, this_t{}, posr, first, idx); }
+    };
+
+    struct rrb
+    {
+        template <typename PosR, typename Iter, typename Node>
+        friend bool visit_node(rrb, PosR&& posr, Iter&& first,
+                               Node* rootl, shift_t shiftl, size_t sizel)
+        {
+            assert(shiftl <= posr.shift());
+            return shiftl == posr.shift()
+                ? visit_maybe_relaxed_sub(rootl, shiftl, sizel,
+                                          this_t{}, posr, first, size_t{})
+                : posr.first_sub_inner(rrb{}, first, rootl, shiftl, sizel);
+        }
+    };
+
+    template <typename Iter>
+    static auto equal_chunk_p(Iter&& iter)
+    {
+        return [iter] (auto f, auto e) mutable {
+            if (f == &*iter) {
+                iter += e - f;
+                return true;
+            }
+            for (; f != e; ++f, ++iter)
+                if (*f != *iter)
+                    return false;
+            return true;
+        };
+    }
+
+    template <typename PosL, typename PosR, typename Iter>
+    friend bool visit_relaxed(this_t, PosL&& posl, PosR&& posr,
+                              Iter&& first, size_t idx)
+    {
+        auto nl = posl.node();
+        auto nr = posr.node();
+        if (nl == nr)
+            return true;
+        auto cl = posl.count();
+        auto cr = posr.count();
+        assert(cr > 0);
+        auto sbr = size_t{};
+        auto i = count_t{};
+        auto j = count_t{};
+        for (; i < cl; ++i) {
+            auto sbl = posl.size_before(i);
+            for (; j + 1 < cr && (sbr = posr.size_before(j)) < sbl; ++j);
+            auto res = sbl == sbr
+                ? posr.nth_sub(j, this_aux_t{}, i, posl, first, idx + sbl)
+                : posl.nth_sub(i, for_each_chunk_p_visitor{},
+                               this_t::equal_chunk_p(first + (idx + sbl)));
+            if (!res) return false;
+        }
+        return true;
+    }
+
+    template <typename PosL, typename PosR, typename Iter>
+    friend std::enable_if_t<is_relaxed_v<PosR>, bool>
+    visit_regular(this_t, PosL&& posl, PosR&& posr, Iter&& first, size_t idx)
+    {
+        return visit_relaxed(this_t{}, posl, posr, first, idx);
+    }
+
+    template <typename PosL, typename PosR, typename Iter>
+    friend std::enable_if_t<!is_relaxed_v<PosR>, bool>
+    visit_regular(this_t, PosL&& posl, PosR&& posr, Iter&& first, size_t idx)
+    {
+        return posl.count() >= posr.count()
+            ? visit_regular(this_t{}, posl, posr.node())
+            : visit_regular(this_t{}, posr, posl.node());
+    }
+
+    template <typename PosL, typename PosR, typename Iter>
+    friend bool visit_leaf(this_t, PosL&& posl,
+                           PosR&& posr, Iter&& first, size_t idx)
+    {
+        if (posl.node() == posr.node())
+            return true;
+        auto cl = posl.count();
+        auto cr = posr.count();
+        auto mp = std::min(cl, cr);
+        return
+            std::equal(posl.node()->leaf(),
+                       posl.node()->leaf() + mp,
+                       posr.node()->leaf()) &&
+            std::equal(posl.node()->leaf() + mp,
+                       posl.node()->leaf() + posl.count(),
+                       first + (idx + mp));
+    }
+
+    template <typename Pos, typename NodeT>
+    friend bool visit_regular(this_t, Pos&& pos, NodeT* other)
+    {
+        auto node = pos.node();
+        return node == other
+            || pos.each_pred_zip(this_t{}, other);
+    }
+
+    template <typename Pos, typename NodeT>
+    friend bool visit_leaf(this_t, Pos&& pos, NodeT* other)
+    {
+        auto node = pos.node();
+        return node == other
+            || std::equal(node->leaf(), node->leaf() + pos.count(),
+                          other->leaf());
+    }
+};
+
+template <typename NodeT>
+struct update_visitor
+{
+    using node_t = NodeT;
+    using this_t = update_visitor;
+
+    template <typename Pos, typename Fn>
+    friend node_t* visit_relaxed(this_t, Pos&& pos, size_t idx, Fn&& fn)
+    {
+        auto offset  = pos.index(idx);
+        auto count   = pos.count();
+        auto node    = node_t::make_inner_sr_n(count, pos.relaxed());
+        try {
+            auto child = pos.towards_oh(this_t{}, idx, offset, fn);
+            node_t::do_copy_inner_sr(node, pos.node(), count);
+            node->inner()[offset]->dec_unsafe();
+            node->inner()[offset] = child;
+            return node;
+        } catch (...) {
+            node_t::delete_inner_r(node, count);
+            throw;
+        }
+    }
+
+    template <typename Pos, typename Fn>
+    friend node_t* visit_regular(this_t, Pos&& pos, size_t idx, Fn&& fn)
+    {
+        auto offset  = pos.index(idx);
+        auto count   = pos.count();
+        auto node    = node_t::make_inner_n(count);
+        try {
+            auto child = pos.towards_oh_ch(this_t{}, idx, offset, count, fn);
+            node_t::do_copy_inner(node, pos.node(), count);
+            node->inner()[offset]->dec_unsafe();
+            node->inner()[offset] = child;
+            return node;
+        } catch (...) {
+            node_t::delete_inner(node, count);
+            throw;
+        }
+    }
+
+    template <typename Pos, typename Fn>
+    friend node_t* visit_leaf(this_t, Pos&& pos, size_t idx, Fn&& fn)
+    {
+        auto offset  = pos.index(idx);
+        auto node    = node_t::copy_leaf(pos.node(), pos.count());
+        try {
+            node->leaf()[offset] = std::forward<Fn>(fn) (
+                std::move(node->leaf()[offset]));
+            return node;
+        } catch (...) {
+            node_t::delete_leaf(node, pos.count());
+            throw;
+        }
+    }
+};
+
+struct dec_visitor
+{
+    using this_t = dec_visitor;
+
+    template <typename Pos>
+    friend void visit_relaxed(this_t, Pos&& p)
+    {
+        using node_t = node_type<Pos>;
+        auto node = p.node();
+        if (node->dec()) {
+            p.each(this_t{});
+            node_t::delete_inner_r(node, p.count());
+        }
+    }
+
+    template <typename Pos>
+    friend void visit_regular(this_t, Pos&& p)
+    {
+        using node_t = node_type<Pos>;
+        auto node = p.node();
+        if (node->dec()) {
+            p.each(this_t{});
+            node_t::delete_inner(node, p.count());
+        }
+    }
+
+    template <typename Pos>
+    friend void visit_leaf(this_t, Pos&& p)
+    {
+        using node_t = node_type<Pos>;
+        auto node = p.node();
+        if (node->dec()) {
+            node_t::delete_leaf(node, p.count());
+        }
+    }
+};
+
+template <typename NodeT>
+void dec_leaf(NodeT* node, count_t n)
+{
+    make_leaf_sub_pos(node, n).visit(dec_visitor{});
+}
+
+template <typename NodeT>
+void dec_inner(NodeT* node, shift_t shift, size_t size)
+{
+    visit_maybe_relaxed_sub(node, shift, size, dec_visitor());
+}
+
+template <typename NodeT>
+void dec_relaxed(NodeT* node, shift_t shift)
+{
+    make_relaxed_pos(node, shift, node->relaxed()).visit(dec_visitor());
+}
+
+template <typename NodeT>
+void dec_regular(NodeT* node, shift_t shift, size_t size)
+{
+    make_regular_pos(node, shift, size).visit(dec_visitor());
+}
+
+template <typename NodeT>
+void dec_empty_regular(NodeT* node)
+{
+    make_empty_regular_pos(node).visit(dec_visitor());
+}
+
+template <typename NodeT>
+struct get_mut_visitor
+{
+    using node_t  = NodeT;
+    using this_t  = get_mut_visitor;
+    using value_t = typename NodeT::value_t;
+    using edit_t  = typename NodeT::edit_t;
+
+    template <typename Pos>
+    friend value_t& visit_relaxed(this_t, Pos&& pos, size_t idx,
+                                  edit_t e, node_t** location)
+    {
+        auto offset  = pos.index(idx);
+        auto count   = pos.count();
+        auto node    = pos.node();
+        if (node->can_mutate(e)) {
+            return pos.towards_oh(this_t{}, idx, offset,
+                                  e, &node->inner()[offset]);
+        } else {
+            auto new_node = node_t::copy_inner_sr_e(e, node, count);
+            try {
+                auto& res = pos.towards_oh(this_t{}, idx, offset,
+                                           e, &new_node->inner()[offset]);
+                pos.visit(dec_visitor{});
+                *location = new_node;
+                return res;
+            } catch (...) {
+                dec_relaxed(new_node, pos.shift());
+                throw;
+            }
+        }
+    }
+
+    template <typename Pos>
+    friend value_t& visit_regular(this_t, Pos&& pos, size_t idx,
+                                  edit_t e, node_t** location)
+    {
+        assert(pos.node() == *location);
+        auto offset  = pos.index(idx);
+        auto count   = pos.count();
+        auto node    = pos.node();
+        if (node->can_mutate(e)) {
+            return pos.towards_oh_ch(this_t{}, idx, offset, count,
+                                     e, &node->inner()[offset]);
+        } else {
+            auto new_node = node_t::copy_inner_e(e, node, count);
+            try {
+                auto& res = pos.towards_oh_ch(this_t{}, idx, offset, count,
+                                              e, &new_node->inner()[offset]);
+                pos.visit(dec_visitor{});
+                *location = new_node;
+                return res;
+            } catch (...) {
+                dec_regular(new_node, pos.shift(), pos.size());
+                throw;
+            }
+        }
+    }
+
+    template <typename Pos>
+    friend value_t& visit_leaf(this_t, Pos&& pos, size_t idx,
+                               edit_t e, node_t** location)
+    {
+        assert(pos.node() == *location);
+        auto node = pos.node();
+        if (node->can_mutate(e)) {
+            return node->leaf() [pos.index(idx)];
+        } else {
+            auto new_node = node_t::copy_leaf_e(e, pos.node(), pos.count());
+            pos.visit(dec_visitor{});
+            *location = new_node;
+            return new_node->leaf() [pos.index(idx)];
+        }
+    }
+};
+
+template <typename NodeT, bool Mutating = true>
+struct push_tail_mut_visitor
+{
+    static constexpr auto B  = NodeT::bits;
+    static constexpr auto BL = NodeT::bits_leaf;
+
+    using this_t = push_tail_mut_visitor;
+    using this_no_mut_t = push_tail_mut_visitor<NodeT, false>;
+    using node_t = NodeT;
+    using edit_t = typename NodeT::edit_t;
+
+    template <typename Pos>
+    friend node_t* visit_relaxed(this_t, Pos&& pos, edit_t e, node_t* tail, count_t ts)
+    {
+        auto node        = pos.node();
+        auto level       = pos.shift();
+        auto idx         = pos.count() - 1;
+        auto children    = pos.size(idx);
+        auto new_idx     = children == size_t{1} << level || level == BL
+            ? idx + 1 : idx;
+        auto new_child = static_cast<node_t*>(nullptr);
+        auto mutate      = Mutating && node->can_mutate(e);
+
+        if (new_idx >= branches<B>)
+            return nullptr;
+        else if (idx == new_idx) {
+            new_child = mutate
+                ? pos.last_oh_csh(this_t{}, idx, children, e, tail, ts)
+                : pos.last_oh_csh(this_no_mut_t{}, idx, children, e, tail, ts);
+            if (!new_child) {
+                if (++new_idx < branches<B>)
+                    new_child = node_t::make_path_e(e, level - B, tail);
+                else
+                    return nullptr;
+            }
+        } else
+            new_child = node_t::make_path_e(e, level - B, tail);
+
+        if (mutate) {
+            auto count = new_idx + 1;
+            auto relaxed = node->ensure_mutable_relaxed_n(e, new_idx);
+            node->inner()[new_idx]  = new_child;
+            relaxed->d.sizes[new_idx] = pos.size() + ts;
+            relaxed->d.count = count;
+            return node;
+        } else {
+            try {
+                auto count    = new_idx + 1;
+                auto new_node = node_t::copy_inner_r_e(e, pos.node(), new_idx);
+                auto relaxed  = new_node->relaxed();
+                new_node->inner()[new_idx] = new_child;
+                relaxed->d.sizes[new_idx] = pos.size() + ts;
+                relaxed->d.count = count;
+                if (Mutating) pos.visit(dec_visitor{});
+                return new_node;
+            } catch (...) {
+                auto shift = pos.shift();
+                auto size  = new_idx == idx ? children + ts : ts;
+                if (shift > BL) {
+                    tail->inc();
+                    dec_inner(new_child, shift - B, size);
+                }
+                throw;
+            }
+        }
+    }
+
+    template <typename Pos, typename... Args>
+    friend node_t* visit_regular(this_t, Pos&& pos, edit_t e, node_t* tail, Args&&...)
+    {
+        assert((pos.size() & mask<BL>) == 0);
+        auto node        = pos.node();
+        auto idx         = pos.index(pos.size() - 1);
+        auto new_idx     = pos.index(pos.size() + branches<BL> - 1);
+        auto mutate      = Mutating && node->can_mutate(e);
+        if (mutate) {
+            node->inner()[new_idx] =
+                idx == new_idx  ? pos.last_oh(this_t{}, idx, e, tail)
+                /* otherwise */ : node_t::make_path_e(e, pos.shift() - B, tail);
+            return node;
+        } else {
+            auto new_parent  = node_t::make_inner_e(e);
+            try {
+                new_parent->inner()[new_idx] =
+                    idx == new_idx  ? pos.last_oh(this_no_mut_t{}, idx, e, tail)
+                    /* otherwise */ : node_t::make_path_e(e, pos.shift() - B, tail);
+                node_t::do_copy_inner(new_parent, node, new_idx);
+                if (Mutating) pos.visit(dec_visitor{});
+                return new_parent;
+            } catch (...) {
+                node_t::delete_inner_e(new_parent);
+                throw;
+            }
+        }
+    }
+
+    template <typename Pos, typename... Args>
+    friend node_t* visit_leaf(this_t, Pos&& pos, edit_t e, node_t* tail, Args&&...)
+    { IMMER_UNREACHABLE; }
+};
+
+template <typename NodeT>
+struct push_tail_visitor
+{
+    static constexpr auto B  = NodeT::bits;
+    static constexpr auto BL = NodeT::bits_leaf;
+
+    using this_t = push_tail_visitor;
+    using node_t = NodeT;
+
+    template <typename Pos>
+    friend node_t* visit_relaxed(this_t, Pos&& pos, node_t* tail, count_t ts)
+    {
+        auto level       = pos.shift();
+        auto idx         = pos.count() - 1;
+        auto children    = pos.size(idx);
+        auto new_idx     = children == size_t{1} << level || level == BL
+            ? idx + 1 : idx;
+        auto new_child = static_cast<node_t*>(nullptr);
+        if (new_idx >= branches<B>)
+            return nullptr;
+        else if (idx == new_idx) {
+            new_child = pos.last_oh_csh(this_t{}, idx, children, tail, ts);
+            if (!new_child) {
+                if (++new_idx < branches<B>)
+                    new_child = node_t::make_path(level - B, tail);
+                else
+                    return nullptr;
+            }
+        } else
+            new_child = node_t::make_path(level - B, tail);
+        try {
+            auto count       = new_idx + 1;
+            auto new_parent  = node_t::copy_inner_r_n(count, pos.node(), new_idx);
+            auto new_relaxed = new_parent->relaxed();
+            new_parent->inner()[new_idx] = new_child;
+            new_relaxed->d.sizes[new_idx] = pos.size() + ts;
+            new_relaxed->d.count = count;
+            return new_parent;
+        } catch (...) {
+            auto shift = pos.shift();
+            auto size  = new_idx == idx ? children + ts : ts;
+            if (shift > BL) {
+                tail->inc();
+                dec_inner(new_child, shift - B, size);
+            }
+            throw;
+        }
+    }
+
+    template <typename Pos, typename... Args>
+    friend node_t* visit_regular(this_t, Pos&& pos, node_t* tail, Args&&...)
+    {
+        assert((pos.size() & mask<BL>) == 0);
+        auto idx         = pos.index(pos.size() - 1);
+        auto new_idx     = pos.index(pos.size() + branches<BL> - 1);
+        auto count       = new_idx + 1;
+        auto new_parent  = node_t::make_inner_n(count);
+        try {
+            new_parent->inner()[new_idx] =
+                idx == new_idx  ? pos.last_oh(this_t{}, idx, tail)
+                /* otherwise */ : node_t::make_path(pos.shift() - B, tail);
+        } catch (...) {
+            node_t::delete_inner(new_parent, count);
+            throw;
+        }
+        return node_t::do_copy_inner(new_parent, pos.node(), new_idx);
+    }
+
+    template <typename Pos, typename... Args>
+    friend node_t* visit_leaf(this_t, Pos&& pos, node_t* tail, Args&&...)
+    { IMMER_UNREACHABLE; }
+};
+
+struct dec_right_visitor
+{
+    using this_t = dec_right_visitor;
+    using dec_t  = dec_visitor;
+
+    template <typename Pos>
+    friend void visit_relaxed(this_t, Pos&& p, count_t idx)
+    {
+        using node_t = node_type<Pos>;
+        auto node = p.node();
+        if (node->dec()) {
+            p.each_right(dec_t{}, idx);
+            node_t::delete_inner_r(node, p.count());
+        }
+    }
+
+    template <typename Pos>
+    friend void visit_regular(this_t, Pos&& p, count_t idx)
+    {
+        using node_t = node_type<Pos>;
+        auto node = p.node();
+        if (node->dec()) {
+            p.each_right(dec_t{}, idx);
+            node_t::delete_inner(node, p.count());
+        }
+    }
+
+    template <typename Pos>
+    friend void visit_leaf(this_t, Pos&& p, count_t idx)
+    { IMMER_UNREACHABLE; }
+};
+
+template <typename NodeT, bool Collapse=true, bool Mutating=true>
+struct slice_right_mut_visitor
+{
+    using node_t = NodeT;
+    using this_t = slice_right_mut_visitor;
+    using edit_t = typename NodeT::edit_t;
+
+    // returns a new shift, new root, the new tail size and the new tail
+    using result_t = std::tuple<shift_t, NodeT*, count_t, NodeT*>;
+    using no_collapse_t = slice_right_mut_visitor<NodeT, false, true>;
+    using no_collapse_no_mut_t = slice_right_mut_visitor<NodeT, false, false>;
+    using no_mut_t = slice_right_mut_visitor<NodeT, Collapse, false>;
+
+    static constexpr auto B  = NodeT::bits;
+    static constexpr auto BL = NodeT::bits_leaf;
+
+    template <typename PosT>
+    friend result_t visit_relaxed(this_t, PosT&& pos, size_t last, edit_t e)
+    {
+        auto idx = pos.index(last);
+        auto node = pos.node();
+        auto mutate = Mutating && node->can_mutate(e);
+        if (Collapse && idx == 0) {
+            auto res = mutate
+                ? pos.towards_oh(this_t{}, last, idx, e)
+                : pos.towards_oh(no_mut_t{}, last, idx, e);
+            if (Mutating) pos.visit(dec_right_visitor{}, count_t{1});
+            return res;
+        } else {
+            using std::get;
+            auto subs = mutate
+                ? pos.towards_oh(no_collapse_t{}, last, idx, e)
+                : pos.towards_oh(no_collapse_no_mut_t{}, last, idx, e);
+            auto next = get<1>(subs);
+            auto ts   = get<2>(subs);
+            auto tail = get<3>(subs);
+            try {
+                if (next) {
+                    if (mutate) {
+                        auto nodr = node->ensure_mutable_relaxed_n(e, idx);
+                        pos.each_right(dec_visitor{}, idx + 1);
+                        node->inner()[idx] = next;
+                        nodr->d.sizes[idx] = last + 1 - ts;
+                        nodr->d.count = idx + 1;
+                        return { pos.shift(), node, ts, tail };
+                    } else {
+                        auto newn = node_t::copy_inner_r_e(e, node, idx);
+                        auto newr = newn->relaxed();
+                        newn->inner()[idx] = next;
+                        newr->d.sizes[idx] = last + 1 - ts;
+                        newr->d.count = idx + 1;
+                        if (Mutating) pos.visit(dec_visitor{});
+                        return { pos.shift(), newn, ts, tail };
+                    }
+                } else if (idx == 0) {
+                    if (Mutating) pos.visit(dec_right_visitor{}, count_t{1});
+                    return { pos.shift(), nullptr, ts, tail };
+                } else if (Collapse && idx == 1 && pos.shift() > BL) {
+                    auto newn = pos.node()->inner()[0];
+                    if (!mutate) newn->inc();
+                    if (Mutating) pos.visit(dec_right_visitor{}, count_t{2});
+                    return { pos.shift() - B, newn, ts, tail };
+                } else {
+                    if (mutate) {
+                        pos.each_right(dec_visitor{}, idx + 1);
+                        node->ensure_mutable_relaxed_n(e, idx)->d.count = idx;
+                        return { pos.shift(), node, ts, tail };
+                    } else {
+                        auto newn = node_t::copy_inner_r_e(e, node, idx);
+                        if (Mutating) pos.visit(dec_visitor{});
+                        return { pos.shift(), newn, ts, tail };
+                    }
+                }
+            } catch (...) {
+                assert(!mutate);
+                assert(!next || pos.shift() > BL);
+                if (next)
+                    dec_inner(next, pos.shift() - B,
+                              last + 1 - ts - pos.size_before(idx));
+                dec_leaf(tail, ts);
+                throw;
+            }
+        }
+    }
+
+    template <typename PosT>
+    friend result_t visit_regular(this_t, PosT&& pos, size_t last, edit_t e)
+    {
+        auto idx = pos.index(last);
+        auto node = pos.node();
+        auto mutate = Mutating && node->can_mutate(e);
+        if (Collapse && idx == 0) {
+            auto res = mutate
+                ? pos.towards_oh(this_t{}, last, idx, e)
+                : pos.towards_oh(no_mut_t{}, last, idx, e);
+            if (Mutating) pos.visit(dec_right_visitor{}, count_t{1});
+            return res;
+        } else {
+            using std::get;
+            auto subs = mutate
+                ? pos.towards_oh(no_collapse_t{}, last, idx, e)
+                : pos.towards_oh(no_collapse_no_mut_t{}, last, idx, e);
+            auto next = get<1>(subs);
+            auto ts   = get<2>(subs);
+            auto tail = get<3>(subs);
+            try {
+                if (next) {
+                    if (mutate) {
+                        node->inner()[idx] = next;
+                        pos.each_right(dec_visitor{}, idx + 1);
+                        return { pos.shift(), node, ts, tail };
+                    } else {
+                        auto newn  = node_t::copy_inner_e(e, node, idx);
+                        newn->inner()[idx] = next;
+                        if (Mutating) pos.visit(dec_visitor{});
+                        return { pos.shift(), newn, ts, tail };
+                    }
+                } else if (idx == 0) {
+                    if (Mutating) pos.visit(dec_right_visitor{}, count_t{1});
+                    return { pos.shift(), nullptr, ts, tail };
+                } else if (Collapse && idx == 1 && pos.shift() > BL) {
+                    auto newn = pos.node()->inner()[0];
+                    if (!mutate) newn->inc();
+                    if (Mutating) pos.visit(dec_right_visitor{}, count_t{2});
+                    return { pos.shift() - B, newn, ts, tail };
+                } else {
+                    if (mutate) {
+                        pos.each_right(dec_visitor{}, idx + 1);
+                        return { pos.shift(), node, ts, tail };
+                    } else {
+                        auto newn = node_t::copy_inner_e(e, node, idx);
+                        if (Mutating) pos.visit(dec_visitor{});
+                        return { pos.shift(), newn, ts, tail };
+                    }
+                }
+            } catch (...) {
+                assert(!mutate);
+                assert(!next || pos.shift() > BL);
+                assert(tail);
+                if (next) dec_regular(next, pos.shift() - B, last + 1 - ts);
+                dec_leaf(tail, ts);
+                throw;
+            }
+        }
+    }
+
+    template <typename PosT>
+    friend result_t visit_leaf(this_t, PosT&& pos, size_t last, edit_t e)
+    {
+        auto old_tail_size = pos.count();
+        auto new_tail_size = pos.index(last) + 1;
+        auto node          = pos.node();
+        auto mutate        = Mutating && node->can_mutate(e);
+        if (new_tail_size == old_tail_size) {
+            if (!Mutating) node->inc();
+            return { 0, nullptr, new_tail_size, node };
+        } else if (mutate) {
+            destroy_n(node->leaf() + new_tail_size,
+                      old_tail_size - new_tail_size);
+            return { 0, nullptr, new_tail_size, node };
+        } else {
+            auto new_tail = node_t::copy_leaf_e(e, node, new_tail_size);
+            if (Mutating) pos.visit(dec_visitor{});
+            return { 0, nullptr, new_tail_size, new_tail };
+        }
+    }
+};
+
+template <typename NodeT, bool Collapse=true>
+struct slice_right_visitor
+{
+    using node_t = NodeT;
+    using this_t = slice_right_visitor;
+
+    // returns a new shift, new root, the new tail size and the new tail
+    using result_t = std::tuple<shift_t, NodeT*, count_t, NodeT*>;
+    using no_collapse_t = slice_right_visitor<NodeT, false>;
+
+    static constexpr auto B  = NodeT::bits;
+    static constexpr auto BL = NodeT::bits_leaf;
+
+    template <typename PosT>
+    friend result_t visit_relaxed(this_t, PosT&& pos, size_t last)
+    {
+        auto idx = pos.index(last);
+        if (Collapse && idx == 0) {
+            return pos.towards_oh(this_t{}, last, idx);
+        } else {
+            using std::get;
+            auto subs = pos.towards_oh(no_collapse_t{}, last, idx);
+            auto next = get<1>(subs);
+            auto ts   = get<2>(subs);
+            auto tail = get<3>(subs);
+            try {
+                if (next) {
+                    auto count = idx + 1;
+                    auto newn  = node_t::copy_inner_r_n(count, pos.node(), idx);
+                    auto newr  = newn->relaxed();
+                    newn->inner()[idx] = next;
+                    newr->d.sizes[idx] = last + 1 - ts;
+                    newr->d.count = count;
+                    return { pos.shift(), newn, ts, tail };
+                } else if (idx == 0) {
+                    return { pos.shift(), nullptr, ts, tail };
+                } else if (Collapse && idx == 1 && pos.shift() > BL) {
+                    auto newn = pos.node()->inner()[0];
+                    return { pos.shift() - B, newn->inc(), ts, tail };
+                } else {
+                    auto newn = node_t::copy_inner_r(pos.node(), idx);
+                    return { pos.shift(), newn, ts, tail };
+                }
+            } catch (...) {
+                assert(!next || pos.shift() > BL);
+                if (next) dec_inner(next, pos.shift() - B,
+                                    last + 1 - ts - pos.size_before(idx));
+                if (tail) dec_leaf(tail, ts);
+                throw;
+            }
+        }
+    }
+
+    template <typename PosT>
+    friend result_t visit_regular(this_t, PosT&& pos, size_t last)
+    {
+        auto idx = pos.index(last);
+        if (Collapse && idx == 0) {
+            return pos.towards_oh(this_t{}, last, idx);
+        } else {
+            using std::get;
+            auto subs = pos.towards_oh(no_collapse_t{}, last, idx);
+            auto next = get<1>(subs);
+            auto ts   = get<2>(subs);
+            auto tail = get<3>(subs);
+            try {
+                if (next) {
+                    auto newn  = node_t::copy_inner_n(idx + 1, pos.node(), idx);
+                    newn->inner()[idx] = next;
+                    return { pos.shift(), newn, ts, tail };
+                } else if (idx == 0) {
+                    return { pos.shift(), nullptr, ts, tail };
+                } else if (Collapse && idx == 1 && pos.shift() > BL) {
+                    auto newn = pos.node()->inner()[0];
+                    return { pos.shift() - B, newn->inc(), ts, tail };
+                } else {
+                    auto newn = node_t::copy_inner_n(idx, pos.node(), idx);
+                    return { pos.shift(), newn, ts, tail };
+                }
+            } catch (...) {
+                assert(!next || pos.shift() > BL);
+                assert(tail);
+                if (next) dec_regular(next, pos.shift() - B, last + 1 - ts);
+                dec_leaf(tail, ts);
+                throw;
+            }
+        }
+    }
+
+    template <typename PosT>
+    friend result_t visit_leaf(this_t, PosT&& pos, size_t last)
+    {
+        auto old_tail_size = pos.count();
+        auto new_tail_size = pos.index(last) + 1;
+        auto new_tail      = new_tail_size == old_tail_size
+            ? pos.node()->inc()
+            : node_t::copy_leaf(pos.node(), new_tail_size);
+        return { 0, nullptr, new_tail_size, new_tail };
+    }
+};
+
+struct dec_left_visitor
+{
+    using this_t = dec_left_visitor;
+    using dec_t  = dec_visitor;
+
+    template <typename Pos>
+    friend void visit_relaxed(this_t, Pos&& p, count_t idx)
+    {
+        using node_t = node_type<Pos>;
+        auto node = p.node();
+        if (node->dec()) {
+            p.each_left(dec_t{}, idx);
+            node_t::delete_inner_r(node, p.count());
+        }
+    }
+
+    template <typename Pos>
+    friend void visit_regular(this_t, Pos&& p, count_t idx)
+    {
+        using node_t = node_type<Pos>;
+        auto node = p.node();
+        if (node->dec()) {
+            p.each_left(dec_t{}, idx);
+            node_t::delete_inner(node, p.count());
+        }
+    }
+
+    template <typename Pos>
+    friend void visit_leaf(this_t, Pos&& p, count_t idx)
+    { IMMER_UNREACHABLE; }
+};
+
+template <typename NodeT, bool Collapse=true, bool Mutating=true>
+struct slice_left_mut_visitor
+{
+    using node_t = NodeT;
+    using this_t = slice_left_mut_visitor;
+    using edit_t = typename NodeT::edit_t;
+    using value_t = typename NodeT::value_t;
+    using relaxed_t = typename NodeT::relaxed_t;
+    // returns a new shift and new root
+    using result_t = std::tuple<shift_t, NodeT*>;
+
+    using no_collapse_t = slice_left_mut_visitor<NodeT, false, true>;
+    using no_collapse_no_mut_t = slice_left_mut_visitor<NodeT, false, false>;
+    using no_mut_t = slice_left_mut_visitor<NodeT, Collapse, false>;
+
+    static constexpr auto B  = NodeT::bits;
+    static constexpr auto BL = NodeT::bits_leaf;
+
+    template <typename PosT>
+    friend result_t visit_relaxed(this_t, PosT&& pos, size_t first, edit_t e)
+    {
+        auto idx    = pos.subindex(first);
+        auto count  = pos.count();
+        auto node   = pos.node();
+        auto mutate = Mutating && node->can_mutate(e);
+        auto left_size  = pos.size_before(idx);
+        auto child_size = pos.size_sbh(idx, left_size);
+        auto dropped_size = first;
+        auto child_dropped_size = dropped_size - left_size;
+        if (Collapse && pos.shift() > BL && idx == pos.count() - 1) {
+            auto r = mutate
+                ? pos.towards_sub_oh(this_t{}, first, idx, e)
+                : pos.towards_sub_oh(no_mut_t{}, first, idx, e);
+            if (Mutating) pos.visit(dec_left_visitor{}, idx);
+            return r;
+        } else {
+            using std::get;
+            auto newn = mutate
+                ? (node->ensure_mutable_relaxed(e), node)
+                : node_t::make_inner_r_e(e);
+            auto newr = newn->relaxed();
+            auto newcount = count - idx;
+            auto new_child_size = child_size - child_dropped_size;
+            try {
+                auto subs  = mutate
+                    ? pos.towards_sub_oh(no_collapse_t{}, first, idx, e)
+                    : pos.towards_sub_oh(no_collapse_no_mut_t{}, first, idx, e);
+                if (mutate) pos.each_left(dec_visitor{}, idx);
+                pos.copy_sizes(idx + 1, newcount - 1,
+                               new_child_size, newr->d.sizes + 1);
+                std::uninitialized_copy(node->inner() + idx + 1,
+                                        node->inner() + count,
+                                        newn->inner() + 1);
+                newn->inner()[0] = get<1>(subs);
+                newr->d.sizes[0] = new_child_size;
+                newr->d.count = newcount;
+                if (!mutate) {
+                    node_t::inc_nodes(newn->inner() + 1, newcount - 1);
+                    if (Mutating) pos.visit(dec_visitor{});
+                }
+                return { pos.shift(), newn };
+            } catch (...) {
+                if (!mutate) node_t::delete_inner_r_e(newn);
+                throw;
+            }
+        }
+    }
+
+    template <typename PosT>
+    friend result_t visit_regular(this_t, PosT&& pos, size_t first, edit_t e)
+    {
+        auto idx    = pos.subindex(first);
+        auto count  = pos.count();
+        auto node   = pos.node();
+        auto mutate = Mutating
+            // this is more restrictive than actually needed because
+            // it causes the algorithm to also avoid mutating the leaf
+            // in place
+            && !node_t::embed_relaxed
+            && node->can_mutate(e);
+        auto left_size  = pos.size_before(idx);
+        auto child_size = pos.size_sbh(idx, left_size);
+        auto dropped_size = first;
+        auto child_dropped_size = dropped_size - left_size;
+        if (Collapse && pos.shift() > BL && idx == pos.count() - 1) {
+            auto r = mutate
+                ? pos.towards_sub_oh(this_t{}, first, idx, e)
+                : pos.towards_sub_oh(no_mut_t{}, first, idx, e);
+            if (Mutating) pos.visit(dec_left_visitor{}, idx);
+            return r;
+        } else {
+            using std::get;
+            // if possible, we convert the node to a relaxed one
+            // simply by allocating a `relaxed_t` size table for
+            // it... maybe some of this magic should be moved as a
+            // `node<...>` static method...
+            auto newcount = count - idx;
+            auto newn = mutate
+                ? (node->impl.d.data.inner.relaxed = new (
+                       node_t::heap::allocate(
+                           node_t::max_sizeof_relaxed,
+                           norefs_tag{})) relaxed_t,
+                   node)
+                : node_t::make_inner_r_e(e);
+            auto newr = newn->relaxed();
+            try {
+                auto subs = mutate
+                    ? pos.towards_sub_oh(no_collapse_t{}, first, idx, e)
+                    : pos.towards_sub_oh(no_collapse_no_mut_t{}, first, idx, e);
+                if (mutate) pos.each_left(dec_visitor{}, idx);
+                newr->d.sizes[0] = child_size - child_dropped_size;
+                pos.copy_sizes(idx + 1, newcount - 1,
+                               newr->d.sizes[0], newr->d.sizes + 1);
+                newr->d.count = newcount;
+                newn->inner()[0] = get<1>(subs);
+                std::uninitialized_copy(node->inner() + idx + 1,
+                                        node->inner() + count,
+                                        newn->inner() + 1);
+                if (!mutate) {
+                    node_t::inc_nodes(newn->inner() + 1, newcount - 1);
+                    if (Mutating) pos.visit(dec_visitor{});
+                }
+                return { pos.shift(), newn };
+            } catch (...) {
+                if (!mutate) node_t::delete_inner_r_e(newn);
+                else {
+                    // restore the regular node that we were
+                    // attempting to relax...
+                    node_t::heap::deallocate(node_t::max_sizeof_relaxed,
+                                             node->impl.d.data.inner.relaxed);
+                    node->impl.d.data.inner.relaxed = nullptr;
+                }
+                throw;
+            }
+        }
+    }
+
+    template <typename PosT>
+    friend result_t visit_leaf(this_t, PosT&& pos, size_t first, edit_t e)
+    {
+        auto node   = pos.node();
+        auto idx    = pos.index(first);
+        auto count  = pos.count();
+        auto mutate = Mutating
+            && std::is_nothrow_move_constructible<value_t>::value
+            && node->can_mutate(e);
+        if (mutate) {
+            auto data = node->leaf();
+            auto newcount = count - idx;
+            std::move(data + idx, data + count, data);
+            destroy_n(data + newcount, idx);
+            return { 0, node };
+        } else {
+            auto newn = node_t::copy_leaf_e(e, node, idx, count);
+            if (Mutating) pos.visit(dec_visitor{});
+            return { 0, newn };
+        }
+    }
+};
+
+template <typename NodeT, bool Collapse=true>
+struct slice_left_visitor
+{
+    using node_t = NodeT;
+    using this_t = slice_left_visitor;
+
+    // returns a new shift and new root
+    using result_t = std::tuple<shift_t, NodeT*>;
+    using no_collapse_t = slice_left_visitor<NodeT, false>;
+
+    static constexpr auto B  = NodeT::bits;
+    static constexpr auto BL = NodeT::bits_leaf;
+
+    template <typename PosT>
+    friend result_t visit_inner(this_t, PosT&& pos, size_t first)
+    {
+        auto idx    = pos.subindex(first);
+        auto count  = pos.count();
+        auto left_size  = pos.size_before(idx);
+        auto child_size = pos.size_sbh(idx, left_size);
+        auto dropped_size = first;
+        auto child_dropped_size = dropped_size - left_size;
+        if (Collapse && pos.shift() > BL && idx == pos.count() - 1) {
+            return pos.towards_sub_oh(this_t{}, first, idx);
+        } else {
+            using std::get;
+            auto n     = pos.node();
+            auto newc  = count - idx;
+            auto newn  = node_t::make_inner_r_n(newc);
+            try {
+                auto subs  = pos.towards_sub_oh(no_collapse_t{}, first, idx);
+                auto newr  = newn->relaxed();
+                newr->d.count = count - idx;
+                newr->d.sizes[0] = child_size - child_dropped_size;
+                pos.copy_sizes(idx + 1, newr->d.count - 1,
+                               newr->d.sizes[0], newr->d.sizes + 1);
+                assert(newr->d.sizes[newr->d.count - 1] == pos.size() - dropped_size);
+                newn->inner()[0] = get<1>(subs);
+                std::uninitialized_copy(n->inner() + idx + 1,
+                                        n->inner() + count,
+                                        newn->inner() + 1);
+                node_t::inc_nodes(newn->inner() + 1, newr->d.count - 1);
+                return { pos.shift(), newn };
+            } catch (...) {
+                node_t::delete_inner_r(newn, newc);
+                throw;
+            }
+        }
+    }
+
+    template <typename PosT>
+    friend result_t visit_leaf(this_t, PosT&& pos, size_t first)
+    {
+        auto n = node_t::copy_leaf(pos.node(), pos.index(first), pos.count());
+        return { 0, n };
+    }
+};
+
+template <typename Node>
+struct concat_center_pos
+{
+    static constexpr auto B  = Node::bits;
+    static constexpr auto BL = Node::bits_leaf;
+
+    static constexpr count_t max_children = 3;
+
+    using node_t = Node;
+    using edit_t = typename Node::edit_t;
+
+    shift_t shift_ = 0u;
+    count_t count_ = 0u;
+    node_t* nodes_[max_children];
+    size_t  sizes_[max_children];
+
+    auto shift() const { return shift_; }
+
+    concat_center_pos(shift_t s,
+                      Node* n0, size_t s0)
+        : shift_{s}, count_{1}, nodes_{n0}, sizes_{s0} {}
+
+    concat_center_pos(shift_t s,
+                      Node* n0, size_t s0,
+                      Node* n1, size_t s1)
+        : shift_{s}, count_{2}, nodes_{n0, n1}, sizes_{s0, s1}  {}
+
+    concat_center_pos(shift_t s,
+                      Node* n0, size_t s0,
+                      Node* n1, size_t s1,
+                      Node* n2, size_t s2)
+        : shift_{s}, count_{3}, nodes_{n0, n1, n2}, sizes_{s0, s1, s2} {}
+
+    template <typename Visitor, typename... Args>
+    void each_sub(Visitor v, Args&& ...args)
+    {
+        if (shift_ == BL) {
+            for (auto i = count_t{0}; i < count_; ++i)
+                make_leaf_sub_pos(nodes_[i], sizes_[i]).visit(v, args...);
+        } else {
+            for (auto i = count_t{0}; i < count_; ++i)
+                make_relaxed_pos(nodes_[i], shift_ - B, nodes_[i]->relaxed()).visit(v, args...);
+        }
+    }
+
+    relaxed_pos<Node> realize() &&
+    {
+        if (count_ > 1) {
+            try {
+                auto result = node_t::make_inner_r_n(count_);
+                auto r      = result->relaxed();
+                r->d.count    = count_;
+                std::copy(nodes_, nodes_ + count_, result->inner());
+                std::copy(sizes_, sizes_ + count_, r->d.sizes);
+                return { result, shift_, r };
+            } catch (...) {
+                each_sub(dec_visitor{});
+                throw;
+            }
+        } else {
+            assert(shift_ >= B + BL);
+            return { nodes_[0], shift_ - B, nodes_[0]->relaxed() };
+        }
+    }
+
+    relaxed_pos<Node> realize_e(edit_t e)
+    {
+        if (count_ > 1) {
+            auto result = node_t::make_inner_r_e(e);
+            auto r      = result->relaxed();
+            r->d.count    = count_;
+            std::copy(nodes_, nodes_ + count_, result->inner());
+            std::copy(sizes_, sizes_ + count_, r->d.sizes);
+            return { result, shift_, r };
+        } else {
+            assert(shift_ >= B + BL);
+            return { nodes_[0], shift_ - B, nodes_[0]->relaxed() };
+        }
+    }
+};
+
+template <typename Node>
+struct concat_merger
+{
+    using node_t = Node;
+    static constexpr auto B  = Node::bits;
+    static constexpr auto BL = Node::bits_leaf;
+
+    using result_t = concat_center_pos<Node>;
+
+    count_t* curr_;
+    count_t  n_;
+    result_t result_;
+
+    concat_merger(shift_t shift, count_t* counts, count_t n)
+        : curr_{counts}
+        , n_{n}
+        , result_{shift + B, node_t::make_inner_r_n(std::min(n_, branches<B>)), 0}
+    {}
+
+    node_t*  to_        = {};
+    count_t  to_offset_ = {};
+    size_t   to_size_   = {};
+
+    void add_child(node_t* p, size_t size)
+    {
+        ++curr_;
+        auto parent  = result_.nodes_[result_.count_ - 1];
+        auto relaxed = parent->relaxed();
+        if (relaxed->d.count == branches<B>) {
+            assert(result_.count_ < result_t::max_children);
+            n_ -= branches<B>;
+            parent  = node_t::make_inner_r_n(std::min(n_, branches<B>));
+            relaxed = parent->relaxed();
+            result_.nodes_[result_.count_] = parent;
+            result_.sizes_[result_.count_] = result_.sizes_[result_.count_ - 1];
+            ++result_.count_;
+        }
+        auto idx = relaxed->d.count++;
+        result_.sizes_[result_.count_ - 1] += size;
+        relaxed->d.sizes[idx] = size + (idx ? relaxed->d.sizes[idx - 1] : 0);
+        parent->inner() [idx] = p;
+    };
+
+    template <typename Pos>
+    void merge_leaf(Pos&& p)
+    {
+        auto from       = p.node();
+        auto from_size  = p.size();
+        auto from_count = p.count();
+        assert(from_size);
+        if (!to_ && *curr_ == from_count) {
+            add_child(from, from_size);
+            from->inc();
+        } else {
+            auto from_offset = count_t{};
+            auto from_data   = from->leaf();
+            do {
+                if (!to_) {
+                    to_ = node_t::make_leaf_n(*curr_);
+                    to_offset_ = 0;
+                }
+                auto data = to_->leaf();
+                auto to_copy = std::min(from_count - from_offset,
+                                        *curr_ - to_offset_);
+                std::uninitialized_copy(from_data + from_offset,
+                                        from_data + from_offset + to_copy,
+                                        data + to_offset_);
+                to_offset_  += to_copy;
+                from_offset += to_copy;
+                if (*curr_ == to_offset_) {
+                    add_child(to_, to_offset_);
+                    to_ = nullptr;
+                }
+            } while (from_offset != from_count);
+        }
+    }
+
+    template <typename Pos>
+    void merge_inner(Pos&& p)
+    {
+        auto from       = p.node();
+        auto from_size  = p.size();
+        auto from_count = p.count();
+        assert(from_size);
+        if (!to_ && *curr_ == from_count) {
+            add_child(from, from_size);
+            from->inc();
+        } else {
+            auto from_offset = count_t{};
+            auto from_data  = from->inner();
+            do {
+                if (!to_) {
+                    to_ = node_t::make_inner_r_n(*curr_);
+                    to_offset_ = 0;
+                    to_size_   = 0;
+                }
+                auto data    = to_->inner();
+                auto to_copy = std::min(from_count - from_offset,
+                                        *curr_ - to_offset_);
+                std::uninitialized_copy(from_data + from_offset,
+                                        from_data + from_offset + to_copy,
+                                        data + to_offset_);
+                node_t::inc_nodes(from_data + from_offset, to_copy);
+                auto sizes   = to_->relaxed()->d.sizes;
+                p.copy_sizes(from_offset, to_copy,
+                             to_size_, sizes + to_offset_);
+                to_offset_  += to_copy;
+                from_offset += to_copy;
+                to_size_     = sizes[to_offset_ - 1];
+                if (*curr_ == to_offset_) {
+                    to_->relaxed()->d.count = to_offset_;
+                    add_child(to_, to_size_);
+                    to_ = nullptr;
+                }
+            } while (from_offset != from_count);
+        }
+    }
+
+    concat_center_pos<Node> finish() const
+    {
+        assert(!to_);
+        return result_;
+    }
+
+    void abort()
+    {
+        auto shift = result_.shift_ - B;
+        if (to_) {
+            if (shift == BL)
+                node_t::delete_leaf(to_, to_offset_);
+            else {
+                to_->relaxed()->d.count = to_offset_;
+                dec_relaxed(to_, shift - B);
+            }
+        }
+        result_.each_sub(dec_visitor());
+    }
+};
+
+struct concat_merger_visitor
+{
+    using this_t = concat_merger_visitor;
+
+    template <typename Pos, typename Merger>
+    friend void visit_inner(this_t, Pos&& p, Merger& merger)
+    { merger.merge_inner(p); }
+
+    template <typename Pos, typename Merger>
+    friend void visit_leaf(this_t, Pos&& p, Merger& merger)
+    { merger.merge_leaf(p); }
+};
+
+struct concat_rebalance_plan_fill_visitor
+{
+    using this_t = concat_rebalance_plan_fill_visitor;
+
+    template <typename Pos, typename Plan>
+    friend void visit_node(this_t, Pos&& p, Plan& plan)
+    {
+        auto count = p.count();
+        assert(plan.n < Plan::max_children);
+        plan.counts[plan.n++] = count;
+        plan.total += count;
+    }
+};
+
+template <bits_t B, bits_t BL>
+struct concat_rebalance_plan
+{
+    static constexpr auto max_children = 2 * branches<B> + 1;
+
+    count_t counts [max_children];
+    count_t n = 0u;
+    count_t total = 0u;
+
+    template <typename LPos, typename CPos, typename RPos>
+    void fill(LPos&& lpos, CPos&& cpos, RPos&& rpos)
+    {
+        assert(n == 0u);
+        assert(total == 0u);
+        using visitor_t = concat_rebalance_plan_fill_visitor;
+        lpos.each_left_sub(visitor_t{}, *this);
+        cpos.each_sub(visitor_t{}, *this);
+        rpos.each_right_sub(visitor_t{}, *this);
+    }
+
+    void shuffle(shift_t shift)
+    {
+        // gcc seems to not really understand this code... :(
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Warray-bounds"
+        constexpr count_t rrb_extras    = 2;
+        constexpr count_t rrb_invariant = 1;
+        const auto bits     = shift == BL ? BL : B;
+        const auto branches = count_t{1} << bits;
+        const auto optimal  = ((total - 1) >> bits) + 1;
+        count_t i = 0;
+        while (n >= optimal + rrb_extras) {
+            // skip ok nodes
+            while (counts[i] > branches - rrb_invariant) i++;
+            // short node, redistribute
+            auto remaining = counts[i];
+            do {
+                auto count = std::min(remaining + counts[i+1], branches);
+                counts[i] = count;
+                remaining +=  counts[i + 1] - count;
+                ++i;
+            } while (remaining > 0);
+            // remove node
+            std::move(counts + i + 1, counts + n, counts + i);
+            --n;
+            --i;
+        }
+#pragma GCC diagnostic pop
+    }
+
+    template <typename LPos, typename CPos, typename RPos>
+    concat_center_pos<node_type<CPos>>
+    merge(LPos&& lpos, CPos&& cpos, RPos&& rpos)
+    {
+        using node_t    = node_type<CPos>;
+        using merger_t  = concat_merger<node_t>;
+        using visitor_t = concat_merger_visitor;
+        auto merger = merger_t{cpos.shift(), counts, n};
+        try {
+            lpos.each_left_sub(visitor_t{}, merger);
+            cpos.each_sub(visitor_t{}, merger);
+            rpos.each_right_sub(visitor_t{}, merger);
+            cpos.each_sub(dec_visitor{});
+            return merger.finish();
+        } catch (...) {
+            merger.abort();
+            throw;
+        }
+    }
+};
+
+template <typename Node, typename LPos, typename CPos, typename RPos>
+concat_center_pos<Node>
+concat_rebalance(LPos&& lpos, CPos&& cpos, RPos&& rpos)
+{
+    auto plan = concat_rebalance_plan<Node::bits, Node::bits_leaf>{};
+    plan.fill(lpos, cpos, rpos);
+    plan.shuffle(cpos.shift());
+    try {
+        return plan.merge(lpos, cpos, rpos);
+    } catch (...) {
+        cpos.each_sub(dec_visitor{});
+        throw;
+    }
+}
+
+template <typename Node, typename LPos, typename TPos, typename RPos>
+concat_center_pos<Node>
+concat_leafs(LPos&& lpos, TPos&& tpos, RPos&& rpos)
+{
+    static_assert(Node::bits >= 2, "");
+    assert(lpos.shift() == tpos.shift());
+    assert(lpos.shift() == rpos.shift());
+    assert(lpos.shift() == 0);
+    if (tpos.count() > 0)
+        return {
+            Node::bits_leaf,
+            lpos.node()->inc(), lpos.count(),
+            tpos.node()->inc(), tpos.count(),
+            rpos.node()->inc(), rpos.count(),
+        };
+    else
+        return {
+            Node::bits_leaf,
+            lpos.node()->inc(), lpos.count(),
+            rpos.node()->inc(), rpos.count(),
+        };
+}
+
+template <typename Node>
+struct concat_left_visitor;
+template <typename Node>
+struct concat_right_visitor;
+template <typename Node>
+struct concat_both_visitor;
+
+template <typename Node, typename LPos, typename TPos, typename RPos>
+concat_center_pos<Node>
+concat_inners(LPos&& lpos, TPos&& tpos, RPos&& rpos)
+{
+    auto lshift = lpos.shift();
+    auto rshift = rpos.shift();
+    if (lshift > rshift) {
+        auto cpos = lpos.last_sub(concat_left_visitor<Node>{}, tpos, rpos);
+        return concat_rebalance<Node>(lpos, cpos, null_sub_pos{});
+    } else if (lshift < rshift) {
+        auto cpos = rpos.first_sub(concat_right_visitor<Node>{}, lpos, tpos);
+        return concat_rebalance<Node>(null_sub_pos{}, cpos, rpos);
+    } else {
+        assert(lshift == rshift);
+        assert(Node::bits_leaf == 0u || lshift > 0);
+        auto cpos = lpos.last_sub(concat_both_visitor<Node>{}, tpos, rpos);
+        return concat_rebalance<Node>(lpos, cpos, rpos);
+    }
+}
+
+template <typename Node>
+struct concat_left_visitor
+{
+    using this_t = concat_left_visitor;
+
+    template <typename LPos, typename TPos, typename RPos>
+    friend concat_center_pos<Node>
+    visit_inner(this_t, LPos&& lpos, TPos&& tpos, RPos&& rpos)
+    { return concat_inners<Node>(lpos, tpos, rpos); }
+
+    template <typename LPos, typename TPos, typename RPos>
+    friend concat_center_pos<Node>
+    visit_leaf(this_t, LPos&& lpos, TPos&& tpos, RPos&& rpos)
+    { IMMER_UNREACHABLE; }
+};
+
+template <typename Node>
+struct concat_right_visitor
+{
+    using this_t = concat_right_visitor;
+
+    template <typename RPos, typename LPos, typename TPos>
+    friend concat_center_pos<Node>
+    visit_inner(this_t, RPos&& rpos, LPos&& lpos, TPos&& tpos)
+    { return concat_inners<Node>(lpos, tpos, rpos); }
+
+    template <typename RPos, typename LPos, typename TPos>
+    friend concat_center_pos<Node>
+    visit_leaf(this_t, RPos&& rpos, LPos&& lpos, TPos&& tpos)
+    { return concat_leafs<Node>(lpos, tpos, rpos); }
+};
+
+template <typename Node>
+struct concat_both_visitor
+{
+    using this_t = concat_both_visitor;
+
+    template <typename LPos, typename TPos, typename RPos>
+    friend concat_center_pos<Node>
+    visit_inner(this_t, LPos&& lpos, TPos&& tpos, RPos&& rpos)
+    { return rpos.first_sub(concat_right_visitor<Node>{}, lpos, tpos); }
+
+    template <typename LPos, typename TPos, typename RPos>
+    friend concat_center_pos<Node>
+    visit_leaf(this_t, LPos&& lpos, TPos&& tpos, RPos&& rpos)
+    { return rpos.first_sub_leaf(concat_right_visitor<Node>{}, lpos, tpos); }
+};
+
+template <typename Node>
+struct concat_trees_right_visitor
+{
+    using this_t = concat_trees_right_visitor;
+
+    template <typename RPos, typename LPos, typename TPos>
+    friend concat_center_pos<Node>
+    visit_node(this_t, RPos&& rpos, LPos&& lpos, TPos&& tpos)
+    { return concat_inners<Node>(lpos, tpos, rpos); }
+};
+
+template <typename Node>
+struct concat_trees_left_visitor
+{
+    using this_t = concat_trees_left_visitor;
+
+    template <typename LPos, typename TPos, typename... Args>
+    friend concat_center_pos<Node>
+    visit_node(this_t, LPos&& lpos, TPos&& tpos, Args&& ...args)
+    { return visit_maybe_relaxed_sub(
+            args...,
+            concat_trees_right_visitor<Node>{},
+            lpos, tpos); }
+};
+
+template <typename Node>
+relaxed_pos<Node>
+concat_trees(Node* lroot, shift_t lshift, size_t lsize,
+             Node* ltail, count_t ltcount,
+             Node* rroot, shift_t rshift, size_t rsize)
+{
+    return visit_maybe_relaxed_sub(
+        lroot, lshift, lsize,
+        concat_trees_left_visitor<Node>{},
+        make_leaf_pos(ltail, ltcount),
+        rroot, rshift, rsize)
+        .realize();
+}
+
+template <typename Node>
+relaxed_pos<Node>
+concat_trees(Node* ltail, count_t ltcount,
+             Node* rroot, shift_t rshift, size_t rsize)
+{
+    return make_singleton_regular_sub_pos(ltail, ltcount).visit(
+        concat_trees_left_visitor<Node>{},
+        empty_leaf_pos<Node>{},
+        rroot, rshift, rsize)
+        .realize();
+}
+
+template <typename Node>
+using concat_center_mut_pos = concat_center_pos<Node>;
+
+template <typename Node>
+struct concat_merger_mut
+{
+    using node_t = Node;
+    using edit_t = typename Node::edit_t;
+
+    static constexpr auto B  = Node::bits;
+    static constexpr auto BL = Node::bits_leaf;
+
+    using result_t = concat_center_pos<Node>;
+
+    edit_t ec_  = {};
+
+    count_t* curr_;
+    count_t  n_;
+    result_t result_;
+    count_t  count_ = 0;
+    node_t*  candidate_ = nullptr;
+    edit_t   candidate_e_ = Node::memory::transience_t::noone;
+
+    concat_merger_mut(edit_t ec, shift_t shift,
+                      count_t* counts, count_t n,
+                      edit_t candidate_e, node_t* candidate)
+        : ec_{ec}
+        , curr_{counts}
+        , n_{n}
+        , result_{shift + B, nullptr, 0}
+    {
+        if (candidate) {
+            candidate->ensure_mutable_relaxed_e(candidate_e, ec);
+            result_.nodes_[0] = candidate;
+        } else {
+            result_.nodes_[0] = node_t::make_inner_r_e(ec);
+        }
+    }
+
+    node_t*  to_        = {};
+    count_t  to_offset_ = {};
+    size_t   to_size_   = {};
+
+    void set_candidate(edit_t candidate_e, node_t* candidate)
+    { candidate_ = candidate; candidate_e_ = candidate_e; }
+
+    void add_child(node_t* p, size_t size)
+    {
+        ++curr_;
+        auto parent  = result_.nodes_[result_.count_ - 1];
+        auto relaxed = parent->relaxed();
+        if (count_ == branches<B>) {
+            parent->relaxed()->d.count = count_;
+            assert(result_.count_ < result_t::max_children);
+            n_ -= branches<B>;
+            if (candidate_) {
+                parent = candidate_;
+                parent->ensure_mutable_relaxed_e(candidate_e_, ec_);
+                candidate_ = nullptr;
+            } else
+                parent  = node_t::make_inner_r_e(ec_);
+            count_ = 0;
+            relaxed = parent->relaxed();
+            result_.nodes_[result_.count_] = parent;
+            result_.sizes_[result_.count_] = result_.sizes_[result_.count_ - 1];
+            ++result_.count_;
+        }
+        auto idx = count_++;
+        result_.sizes_[result_.count_ - 1] += size;
+        relaxed->d.sizes[idx] = size + (idx ? relaxed->d.sizes[idx - 1] : 0);
+        parent->inner() [idx] = p;
+    };
+
+    template <typename Pos>
+    void merge_leaf(Pos&& p, edit_t e)
+    {
+        auto from       = p.node();
+        auto from_size  = p.size();
+        auto from_count = p.count();
+        assert(from_size);
+        if (!to_ && *curr_ == from_count) {
+            add_child(from, from_size);
+        } else {
+            auto from_offset  = count_t{};
+            auto from_data    = from->leaf();
+            auto from_mutate  = from->can_mutate(e);
+            do {
+                if (!to_) {
+                    if (from_mutate) {
+                        node_t::ownee(from) = ec_;
+                        to_ = from->inc();
+                        assert(from_count);
+                    } else {
+                        to_ = node_t::make_leaf_e(ec_);
+                    }
+                    to_offset_ = 0;
+                }
+                auto data = to_->leaf();
+                auto to_copy = std::min(from_count - from_offset,
+                                        *curr_ - to_offset_);
+                if (from == to_) {
+                    if (from_offset != to_offset_)
+                        std::move(from_data + from_offset,
+                                  from_data + from_offset + to_copy,
+                                  data + to_offset_);
+                } else {
+                    if (!from_mutate)
+                        std::uninitialized_copy(from_data + from_offset,
+                                                from_data + from_offset + to_copy,
+                                                data + to_offset_);
+                    else
+                        uninitialized_move(from_data + from_offset,
+                                           from_data + from_offset + to_copy,
+                                           data + to_offset_);
+                }
+                to_offset_  += to_copy;
+                from_offset += to_copy;
+                if (*curr_ == to_offset_) {
+                    add_child(to_, to_offset_);
+                    to_ = nullptr;
+                }
+            } while (from_offset != from_count);
+        }
+    }
+
+    template <typename Pos>
+    void merge_inner(Pos&& p, edit_t e)
+    {
+        auto from       = p.node();
+        auto from_size  = p.size();
+        auto from_count = p.count();
+        assert(from_size);
+        if (!to_ && *curr_ == from_count) {
+            add_child(from, from_size);
+        } else {
+            auto from_offset  = count_t{};
+            auto from_data    = from->inner();
+            auto from_mutate = from->can_relax() && from->can_mutate(e);
+            do {
+                if (!to_) {
+                    if (from_mutate) {
+                        node_t::ownee(from) = ec_;
+                        from->ensure_mutable_relaxed_e(e, ec_);
+                        to_ = from;
+                    } else {
+                        to_ = node_t::make_inner_r_e(ec_);
+                    }
+                    to_offset_ = 0;
+                    to_size_   = 0;
+                }
+                auto data    = to_->inner();
+                auto to_copy = std::min(from_count - from_offset,
+                                        *curr_ - to_offset_);
+                auto sizes   = to_->relaxed()->d.sizes;
+                if (from != to_ || from_offset != to_offset_) {
+                    std::copy(from_data + from_offset,
+                              from_data + from_offset + to_copy,
+                              data + to_offset_);
+                    p.copy_sizes(from_offset, to_copy,
+                                 to_size_, sizes + to_offset_);
+                }
+                to_offset_  += to_copy;
+                from_offset += to_copy;
+                to_size_     = sizes[to_offset_ - 1];
+                if (*curr_ == to_offset_) {
+                    to_->relaxed()->d.count = to_offset_;
+                    add_child(to_, to_size_);
+                    to_ = nullptr;
+                }
+            } while (from_offset != from_count);
+        }
+    }
+
+    concat_center_pos<Node> finish() const
+    {
+        assert(!to_);
+        result_.nodes_[result_.count_ - 1]->relaxed()->d.count = count_;
+        return result_;
+    }
+
+    void abort()
+    {
+        // We may have mutated stuff the tree in place, leaving
+        // everything in a corrupted state...  It should be possible
+        // to define cleanup properly, but that is a task for some
+        // other day... ;)
+        std::terminate();
+    }
+};
+
+struct concat_merger_mut_visitor
+{
+    using this_t = concat_merger_mut_visitor;
+
+    template <typename Pos, typename Merger>
+    friend void visit_inner(this_t, Pos&& p,
+                            Merger& merger, edit_type<Pos> e)
+    { merger.merge_inner(p, e); }
+
+    template <typename Pos, typename Merger>
+    friend void visit_leaf(this_t, Pos&& p,
+                           Merger& merger, edit_type<Pos> e)
+    { merger.merge_leaf(p, e); }
+};
+
+template <bits_t B, bits_t BL>
+struct concat_rebalance_plan_mut : concat_rebalance_plan<B, BL>
+{
+    using this_t = concat_rebalance_plan_mut;
+
+    template <typename LPos, typename CPos, typename RPos>
+    concat_center_mut_pos<node_type<CPos>>
+    merge(edit_type<CPos> ec,
+          edit_type<CPos> el, LPos&& lpos, CPos&& cpos,
+          edit_type<CPos> er, RPos&& rpos)
+    {
+        using node_t    = node_type<CPos>;
+        using merger_t  = concat_merger_mut<node_t>;
+        using visitor_t = concat_merger_mut_visitor;
+        auto lnode = ((node_t*)lpos.node());
+        auto rnode = ((node_t*)rpos.node());
+        auto lmut2 = lnode && lnode->can_relax() && lnode->can_mutate(el);
+        auto rmut2 = rnode && rnode->can_relax() && rnode->can_mutate(er);
+        auto merger = merger_t{
+            ec, cpos.shift(), this->counts, this->n,
+            el, lmut2 ? lnode : nullptr
+        };
+        try {
+            lpos.each_left_sub(visitor_t{}, merger, el);
+            cpos.each_sub(visitor_t{}, merger, ec);
+            if (rmut2) merger.set_candidate(er, rnode);
+            rpos.each_right_sub(visitor_t{}, merger, er);
+            return merger.finish();
+        } catch (...) {
+            merger.abort();
+            throw;
+        }
+    }
+};
+
+template <typename Node, typename LPos, typename CPos, typename RPos>
+concat_center_pos<Node>
+concat_rebalance_mut(edit_type<Node> ec,
+                     edit_type<Node> el, LPos&& lpos, CPos&& cpos,
+                     edit_type<Node> er, RPos&& rpos)
+{
+    auto plan = concat_rebalance_plan_mut<Node::bits, Node::bits_leaf>{};
+    plan.fill(lpos, cpos, rpos);
+    plan.shuffle(cpos.shift());
+    return plan.merge(ec, el, lpos, cpos, er, rpos);
+}
+
+template <typename Node, typename LPos, typename TPos, typename RPos>
+concat_center_mut_pos<Node>
+concat_leafs_mut(edit_type<Node> ec,
+                 edit_type<Node> el, LPos&& lpos, TPos&& tpos,
+                 edit_type<Node> er, RPos&& rpos)
+{
+    static_assert(Node::bits >= 2, "");
+    assert(lpos.shift() == tpos.shift());
+    assert(lpos.shift() == rpos.shift());
+    assert(lpos.shift() == 0);
+    if (tpos.count() > 0)
+        return {
+            Node::bits_leaf,
+            lpos.node(), lpos.count(),
+            tpos.node(), tpos.count(),
+            rpos.node(), rpos.count(),
+        };
+    else
+        return {
+            Node::bits_leaf,
+            lpos.node(), lpos.count(),
+            rpos.node(), rpos.count(),
+        };
+}
+
+template <typename Node>
+struct concat_left_mut_visitor;
+template <typename Node>
+struct concat_right_mut_visitor;
+template <typename Node>
+struct concat_both_mut_visitor;
+
+template <typename Node, typename LPos, typename TPos, typename RPos>
+concat_center_mut_pos<Node>
+concat_inners_mut(edit_type<Node> ec,
+                  edit_type<Node> el, LPos&& lpos, TPos&& tpos,
+                  edit_type<Node> er, RPos&& rpos)
+{
+    auto lshift = lpos.shift();
+    auto rshift = rpos.shift();
+    // lpos.node() can be null it is a singleton_regular_sub_pos<...>,
+    // this is, when the tree is just a tail...
+    if (lshift > rshift) {
+        auto cpos = lpos.last_sub(concat_left_mut_visitor<Node>{},
+                                  ec, el, tpos, er, rpos);
+        return concat_rebalance_mut<Node>(ec,
+                                          el, lpos, cpos,
+                                          er, null_sub_pos{});
+    } else if (lshift < rshift) {
+        auto cpos = rpos.first_sub(concat_right_mut_visitor<Node>{},
+                                   ec, el, lpos, tpos, er);
+        return concat_rebalance_mut<Node>(ec,
+                                          el, null_sub_pos{}, cpos,
+                                          er, rpos);
+    } else {
+        assert(lshift == rshift);
+        assert(Node::bits_leaf == 0u || lshift > 0);
+        auto cpos = lpos.last_sub(concat_both_mut_visitor<Node>{},
+                                  ec, el, tpos, er, rpos);
+        return concat_rebalance_mut<Node>(ec,
+                                          el, lpos, cpos,
+                                          er, rpos);
+    }
+}
+
+template <typename Node>
+struct concat_left_mut_visitor
+{
+    using this_t = concat_left_mut_visitor;
+    using edit_t = typename Node::edit_t;
+
+    template <typename LPos, typename TPos, typename RPos>
+    friend concat_center_mut_pos<Node>
+    visit_inner(this_t, LPos&& lpos, edit_t ec,
+                edit_t el, TPos&& tpos,
+                edit_t er, RPos&& rpos)
+    { return concat_inners_mut<Node>(
+            ec, el, lpos, tpos, er, rpos); }
+
+    template <typename LPos, typename TPos, typename RPos>
+    friend concat_center_mut_pos<Node>
+    visit_leaf(this_t, LPos&& lpos, edit_t ec,
+               edit_t el, TPos&& tpos,
+               edit_t er, RPos&& rpos)
+    { IMMER_UNREACHABLE; }
+};
+
+template <typename Node>
+struct concat_right_mut_visitor
+{
+    using this_t = concat_right_mut_visitor;
+    using edit_t = typename Node::edit_t;
+
+    template <typename RPos, typename LPos, typename TPos>
+    friend concat_center_mut_pos<Node>
+    visit_inner(this_t, RPos&& rpos, edit_t ec,
+                edit_t el, LPos&& lpos, TPos&& tpos,
+                edit_t er)
+    { return concat_inners_mut<Node>(
+            ec, el, lpos, tpos, er, rpos); }
+
+    template <typename RPos, typename LPos, typename TPos>
+    friend concat_center_mut_pos<Node>
+    visit_leaf(this_t, RPos&& rpos, edit_t ec,
+               edit_t el, LPos&& lpos, TPos&& tpos,
+               edit_t er)
+    { return concat_leafs_mut<Node>(
+            ec, el, lpos, tpos, er, rpos); }
+};
+
+template <typename Node>
+struct concat_both_mut_visitor
+{
+    using this_t = concat_both_mut_visitor;
+    using edit_t = typename Node::edit_t;
+
+    template <typename LPos, typename TPos, typename RPos>
+    friend concat_center_mut_pos<Node>
+    visit_inner(this_t, LPos&& lpos, edit_t ec,
+                edit_t el, TPos&& tpos,
+                edit_t er, RPos&& rpos)
+    { return rpos.first_sub(concat_right_mut_visitor<Node>{},
+                            ec, el, lpos, tpos, er); }
+
+    template <typename LPos, typename TPos, typename RPos>
+    friend concat_center_mut_pos<Node>
+    visit_leaf(this_t, LPos&& lpos, edit_t ec,
+               edit_t el, TPos&& tpos,
+               edit_t er, RPos&& rpos)
+    { return rpos.first_sub_leaf(concat_right_mut_visitor<Node>{},
+                                 ec, el, lpos, tpos, er); }
+};
+
+template <typename Node>
+struct concat_trees_right_mut_visitor
+{
+    using this_t = concat_trees_right_mut_visitor;
+    using edit_t = typename Node::edit_t;
+
+    template <typename RPos, typename LPos, typename TPos>
+    friend concat_center_mut_pos<Node>
+    visit_node(this_t, RPos&& rpos, edit_t ec,
+               edit_t el, LPos&& lpos, TPos&& tpos,
+               edit_t er)
+    { return concat_inners_mut<Node>(
+            ec, el, lpos, tpos, er, rpos); }
+};
+
+template <typename Node>
+struct concat_trees_left_mut_visitor
+{
+    using this_t = concat_trees_left_mut_visitor;
+    using edit_t = typename Node::edit_t;
+
+    template <typename LPos, typename TPos, typename... Args>
+    friend concat_center_mut_pos<Node>
+    visit_node(this_t, LPos&& lpos, edit_t ec,
+               edit_t el, TPos&& tpos,
+               edit_t er, Args&& ...args)
+    { return visit_maybe_relaxed_sub(
+            args...,
+            concat_trees_right_mut_visitor<Node>{},
+            ec, el, lpos, tpos, er); }
+};
+
+template <typename Node>
+relaxed_pos<Node>
+concat_trees_mut(edit_type<Node> ec,
+                 edit_type<Node> el,
+                 Node* lroot, shift_t lshift, size_t lsize,
+                 Node* ltail, count_t ltcount,
+                 edit_type<Node> er,
+                 Node* rroot, shift_t rshift, size_t rsize)
+{
+    return visit_maybe_relaxed_sub(
+        lroot, lshift, lsize,
+        concat_trees_left_mut_visitor<Node>{},
+        ec,
+        el, make_leaf_pos(ltail, ltcount),
+        er, rroot, rshift, rsize)
+        .realize_e(ec);
+}
+
+template <typename Node>
+relaxed_pos<Node>
+concat_trees_mut(edit_type<Node> ec,
+                 edit_type<Node> el,
+                 Node* ltail, count_t ltcount,
+                 edit_type<Node> er,
+                 Node* rroot, shift_t rshift, size_t rsize)
+{
+    return make_singleton_regular_sub_pos(ltail, ltcount).visit(
+        concat_trees_left_mut_visitor<Node>{},
+        ec,
+        el, empty_leaf_pos<Node>{},
+        er, rroot, rshift, rsize)
+        .realize_e(ec);
+}
+
+} // namespace rbts
+} // namespace detail
+} // namespace immer
diff --git a/src/immer/detail/rbts/position.hpp b/src/immer/detail/rbts/position.hpp
new file mode 100644
index 000000000000..f4cdf88db68d
--- /dev/null
+++ b/src/immer/detail/rbts/position.hpp
@@ -0,0 +1,1838 @@
+//
+// immer: immutable data structures for C++
+// Copyright (C) 2016, 2017, 2018 Juan Pedro Bolivar Puente
+//
+// This software is distributed under the Boost Software License, Version 1.0.
+// See accompanying file LICENSE or copy at http://boost.org/LICENSE_1_0.txt
+//
+
+#pragma once
+
+#include <immer/config.hpp>
+#include <immer/detail/rbts/bits.hpp>
+
+#include <cassert>
+#include <utility>
+#include <type_traits>
+
+namespace immer {
+namespace detail {
+namespace rbts {
+
+template <typename Pos>
+constexpr auto bits = std::decay_t<Pos>::node_t::bits;
+
+template <typename Pos>
+constexpr auto bits_leaf = std::decay_t<Pos>::node_t::bits_leaf;
+
+template <typename Pos>
+using node_type = typename std::decay<Pos>::type::node_t;
+
+template <typename Pos>
+using edit_type = typename std::decay<Pos>::type::node_t::edit_t;
+
+template <typename NodeT>
+struct empty_regular_pos
+{
+    using node_t = NodeT;
+    node_t* node_;
+
+    count_t count() const { return 0; }
+    node_t* node()  const { return node_; }
+    shift_t shift() const { return 0; }
+    size_t  size()  const { return 0; }
+
+    template <typename Visitor, typename... Args>
+    void each(Visitor, Args&&...) {}
+    template <typename Visitor, typename... Args>
+    bool each_pred(Visitor, Args&&...) { return true; }
+
+    template <typename Visitor, typename... Args>
+    decltype(auto) visit(Visitor v, Args&& ...args)
+    {
+        return visit_regular(v, *this, std::forward<Args>(args)...);
+    }
+};
+
+template <typename NodeT>
+empty_regular_pos<NodeT> make_empty_regular_pos(NodeT* node)
+{
+    return {node};
+}
+
+template <typename NodeT>
+struct empty_leaf_pos
+{
+    using node_t = NodeT;
+    node_t* node_;
+
+    count_t count() const { return 0; }
+    node_t* node()  const { return node_; }
+    shift_t shift() const { return 0; }
+    size_t  size()  const { return 0; }
+
+    template <typename Visitor, typename ...Args>
+    decltype(auto) visit(Visitor v, Args&& ...args)
+    {
+        return visit_leaf(v, *this, std::forward<Args>(args)...);
+    }
+};
+
+template <typename NodeT>
+empty_leaf_pos<NodeT> make_empty_leaf_pos(NodeT* node)
+{
+    assert(node);
+    return {node};
+}
+
+template <typename NodeT>
+struct leaf_pos
+{
+    static constexpr auto B  = NodeT::bits;
+    static constexpr auto BL = NodeT::bits_leaf;
+
+    using node_t = NodeT;
+    node_t* node_;
+    size_t size_;
+
+    count_t count() const { return index(size_ - 1) + 1; }
+    node_t* node()  const { return node_; }
+    size_t  size()  const { return size_; }
+    shift_t shift() const { return 0; }
+    count_t index(size_t idx) const { return idx & mask<BL>; }
+    count_t subindex(size_t idx) const { return idx; }
+
+    template <typename Visitor, typename ...Args>
+    decltype(auto) visit(Visitor v, Args&& ...args)
+    {
+        return visit_leaf(v, *this, std::forward<Args>(args)...);
+    }
+};
+
+template <typename NodeT>
+leaf_pos<NodeT> make_leaf_pos(NodeT* node, size_t size)
+{
+    assert(node);
+    assert(size > 0);
+    return {node, size};
+}
+
+template <typename NodeT>
+struct leaf_sub_pos
+{
+    static constexpr auto B  = NodeT::bits;
+    static constexpr auto BL = NodeT::bits_leaf;
+
+    using node_t = NodeT;
+    node_t* node_;
+    count_t count_;
+
+    count_t count() const { return count_; }
+    node_t* node()  const { return node_; }
+    size_t  size()  const { return count_; }
+    shift_t shift() const { return 0; }
+    count_t index(size_t idx) const { return idx & mask<BL>; }
+    count_t subindex(size_t idx) const { return idx; }
+
+    template <typename Visitor, typename ...Args>
+    decltype(auto) visit(Visitor v, Args&& ...args)
+    {
+        return visit_leaf(v, *this, std::forward<Args>(args)...);
+    }
+};
+
+template <typename NodeT>
+leaf_sub_pos<NodeT> make_leaf_sub_pos(NodeT* node, count_t count)
+{
+    assert(node);
+    assert(count <= branches<NodeT::bits_leaf>);
+    return {node, count};
+}
+
+template <typename NodeT>
+struct leaf_descent_pos
+{
+    static constexpr auto B  = NodeT::bits;
+    static constexpr auto BL = NodeT::bits_leaf;
+
+    using node_t = NodeT;
+    node_t* node_;
+
+    node_t* node()  const { return node_; }
+    shift_t shift() const { return 0; }
+    count_t index(size_t idx) const { return idx & mask<BL>; }
+
+    template <typename... Args>
+    decltype(auto) descend(Args&&...) {}
+
+    template <typename Visitor, typename ...Args>
+    decltype(auto) visit(Visitor v, Args&& ...args)
+    {
+        return visit_leaf(v, *this, std::forward<Args>(args)...);
+    }
+};
+
+template <typename NodeT>
+leaf_descent_pos<NodeT> make_leaf_descent_pos(NodeT* node)
+{
+    assert(node);
+    return {node};
+}
+
+template <typename NodeT>
+struct full_leaf_pos
+{
+    static constexpr auto B  = NodeT::bits;
+    static constexpr auto BL = NodeT::bits_leaf;
+
+    using node_t = NodeT;
+    node_t* node_;
+
+    count_t count() const { return branches<BL>; }
+    node_t* node()  const { return node_; }
+    size_t  size()  const { return branches<BL>; }
+    shift_t shift() const { return 0; }
+    count_t index(size_t idx) const { return idx & mask<BL>; }
+    count_t subindex(size_t idx) const { return idx; }
+
+    template <typename Visitor, typename ...Args>
+    decltype(auto) visit(Visitor v, Args&& ...args)
+    {
+        return visit_leaf(v, *this, std::forward<Args>(args)...);
+    }
+};
+
+template <typename NodeT>
+full_leaf_pos<NodeT> make_full_leaf_pos(NodeT* node)
+{
+    assert(node);
+    return {node};
+}
+
+template <typename NodeT>
+struct regular_pos
+{
+    static constexpr auto B  = NodeT::bits;
+    static constexpr auto BL = NodeT::bits_leaf;
+
+    using node_t = NodeT;
+    node_t* node_;
+    shift_t shift_;
+    size_t size_;
+
+    count_t count() const { return index(size_ - 1) + 1; }
+    node_t* node()  const { return node_; }
+    size_t  size()  const { return size_; }
+    shift_t shift() const { return shift_; }
+    count_t index(size_t idx) const { return (idx >> shift_) & mask<B>; }
+    count_t subindex(size_t idx) const { return idx >> shift_; }
+    size_t  this_size() const { return ((size_ - 1) & ~(~size_t{} << (shift_ + B))) + 1; }
+
+    template <typename Visitor, typename... Args>
+    void each(Visitor v, Args&&... args)
+    { return each_regular(*this, v, args...); }
+
+    template <typename Visitor, typename... Args>
+    bool each_pred(Visitor v, Args&&... args)
+    { return each_pred_regular(*this, v, args...); }
+
+    template <typename Visitor, typename... Args>
+    bool each_pred_zip(Visitor v, node_t* other, Args&&... args)
+    { return each_pred_zip_regular(*this, v, other, args...); }
+
+    template <typename Visitor, typename... Args>
+    bool each_pred_i(Visitor v, count_t i, count_t n, Args&&... args)
+    { return each_pred_i_regular(*this, v, i, n, args...); }
+
+    template <typename Visitor, typename... Args>
+    bool each_pred_right(Visitor v, count_t start, Args&&... args)
+    { return each_pred_right_regular(*this, v, start, args...); }
+
+    template <typename Visitor, typename... Args>
+    bool each_pred_left(Visitor v, count_t n, Args&&... args)
+    { return each_pred_left_regular(*this, v, n, args...); }
+
+    template <typename Visitor, typename... Args>
+    void each_i(Visitor v, count_t i, count_t n, Args&&... args)
+    { return each_i_regular(*this, v, i, n, args...); }
+
+    template <typename Visitor, typename... Args>
+    void each_right(Visitor v, count_t start, Args&&... args)
+    { return each_right_regular(*this, v, start, args...); }
+
+    template <typename Visitor, typename... Args>
+    void each_left(Visitor v, count_t n, Args&&... args)
+    { return each_left_regular(*this, v, n, args...); }
+
+    template <typename Visitor, typename... Args>
+    decltype(auto) towards(Visitor v, size_t idx, Args&&... args)
+    { return towards_oh_ch_regular(*this, v, idx, index(idx), count(), args...); }
+
+    template <typename Visitor, typename... Args>
+    decltype(auto) towards_oh(Visitor v, size_t idx,
+                              count_t offset_hint,
+                              Args&&... args)
+    { return towards_oh_ch_regular(*this, v, idx, offset_hint, count(), args...); }
+
+    template <typename Visitor, typename... Args>
+    decltype(auto) towards_oh_ch(Visitor v, size_t idx,
+                                 count_t offset_hint,
+                                 count_t count_hint,
+                                 Args&&... args)
+    { return towards_oh_ch_regular(*this, v, idx, offset_hint, count(), args...); }
+
+    template <typename Visitor, typename... Args>
+    decltype(auto) towards_sub_oh(Visitor v, size_t idx,
+                                  count_t offset_hint,
+                                  Args&&... args)
+    { return towards_sub_oh_regular(*this, v, idx, offset_hint, args...); }
+
+    template <typename Visitor, typename... Args>
+    decltype(auto) last_oh(Visitor v, count_t offset_hint, Args&&... args)
+    { return last_oh_regular(*this, v, offset_hint, args...); }
+
+    template <typename Visitor, typename ...Args>
+    decltype(auto) visit(Visitor v, Args&& ...args)
+    {
+        return visit_regular(v, *this, std::forward<Args>(args)...);
+    }
+};
+
+template <typename Pos, typename Visitor, typename... Args>
+void each_regular(Pos&& p, Visitor v, Args&&... args)
+{
+    constexpr auto B  = bits<Pos>;
+    constexpr auto BL = bits_leaf<Pos>;
+    auto n = p.node()->inner();
+    auto last = p.count() - 1;
+    auto e = n + last;
+    if (p.shift() == BL) {
+        for (; n != e; ++n) {
+            IMMER_PREFETCH(n + 1);
+            make_full_leaf_pos(*n).visit(v, args...);
+        }
+        make_leaf_pos(*n, p.size()).visit(v, args...);
+    } else {
+        auto ss = p.shift() - B;
+        for (; n != e; ++n)
+            make_full_pos(*n, ss).visit(v, args...);
+        make_regular_pos(*n, ss, p.size()).visit(v, args...);
+    }
+}
+
+template <typename Pos, typename Visitor, typename... Args>
+bool each_pred_regular(Pos&& p, Visitor v, Args&&... args)
+{
+    constexpr auto B  = bits<Pos>;
+    constexpr auto BL = bits_leaf<Pos>;
+    auto n = p.node()->inner();
+    auto last = p.count() - 1;
+    auto e = n + last;
+    if (p.shift() == BL) {
+        for (; n != e; ++n) {
+            IMMER_PREFETCH(n + 1);
+            if (!make_full_leaf_pos(*n).visit(v, args...))
+                return false;
+        }
+        return make_leaf_pos(*n, p.size()).visit(v, args...);
+    } else {
+        auto ss = p.shift() - B;
+        for (; n != e; ++n)
+            if (!make_full_pos(*n, ss).visit(v, args...))
+                return false;
+        return make_regular_pos(*n, ss, p.size()).visit(v, args...);
+    }
+}
+
+template <typename Pos, typename Visitor, typename... Args>
+bool each_pred_zip_regular(Pos&& p, Visitor v, node_type<Pos>* other, Args&&... args)
+{
+    constexpr auto B  = bits<Pos>;
+    constexpr auto BL = bits_leaf<Pos>;
+
+    auto n = p.node()->inner();
+    auto n2 = other->inner();
+    auto last = p.count() - 1;
+    auto e = n + last;
+    if (p.shift() == BL) {
+        for (; n != e; ++n, ++n2) {
+            IMMER_PREFETCH(n + 1);
+            IMMER_PREFETCH(n2 + 1);
+            if (!make_full_leaf_pos(*n).visit(v, *n2, args...))
+                return false;
+        }
+        return make_leaf_pos(*n, p.size()).visit(v, *n2, args...);
+    } else {
+        auto ss = p.shift() - B;
+        for (; n != e; ++n, ++n2)
+            if (!make_full_pos(*n, ss).visit(v, *n2, args...))
+                return false;
+        return make_regular_pos(*n, ss, p.size()).visit(v, *n2, args...);
+    }
+}
+
+template <typename Pos, typename Visitor, typename... Args>
+bool each_pred_i_regular(Pos&& p, Visitor v, count_t f, count_t l, Args&&... args)
+{
+    constexpr auto B  = bits<Pos>;
+    constexpr auto BL = bits_leaf<Pos>;
+
+    if (p.shift() == BL) {
+        if (l > f) {
+            if (l < p.count()) {
+                auto n = p.node()->inner() + f;
+                auto e = p.node()->inner() + l;
+                for (; n < e; ++n) {
+                    IMMER_PREFETCH(n + 1);
+                    if (!make_full_leaf_pos(*n).visit(v, args...))
+                        return false;
+                }
+            } else {
+                auto n = p.node()->inner() + f;
+                auto e = p.node()->inner() + l - 1;
+                for (; n < e; ++n) {
+                    IMMER_PREFETCH(n + 1);
+                    if (!make_full_leaf_pos(*n).visit(v, args...))
+                        return false;
+                }
+                if (!make_leaf_pos(*n, p.size()).visit(v, args...))
+                    return false;
+            }
+        }
+    } else {
+        if (l > f) {
+            auto ss = p.shift() - B;
+            if (l < p.count()) {
+                auto n = p.node()->inner() + f;
+                auto e = p.node()->inner() + l;
+                for (; n < e; ++n)
+                    if (!make_full_pos(*n, ss).visit(v, args...))
+                        return false;
+            } else {
+                auto n = p.node()->inner() + f;
+                auto e = p.node()->inner() + l - 1;
+                for (; n < e; ++n)
+                    if (!make_full_pos(*n, ss).visit(v, args...))
+                        return false;
+                if (!make_regular_pos(*n, ss, p.size()).visit(v, args...))
+                    return false;
+            }
+        }
+    }
+    return true;
+}
+
+template <typename Pos, typename Visitor, typename... Args>
+bool each_pred_left_regular(Pos&& p, Visitor v, count_t last, Args&&... args)
+{
+    constexpr auto B  = bits<Pos>;
+    constexpr auto BL = bits_leaf<Pos>;
+    assert(last < p.count());
+    if (p.shift() == BL) {
+        auto n = p.node()->inner();
+        auto e = n + last;
+        for (; n != e; ++n) {
+            IMMER_PREFETCH(n + 1);
+            if (!make_full_leaf_pos(*n).visit(v, args...))
+                return false;
+        }
+    } else {
+        auto n = p.node()->inner();
+        auto e = n + last;
+        auto ss = p.shift() - B;
+        for (; n != e; ++n)
+            if (!make_full_pos(*n, ss).visit(v, args...))
+                return false;
+    }
+    return true;
+}
+
+template <typename Pos, typename Visitor, typename... Args>
+bool each_pred_right_regular(Pos&& p, Visitor v, count_t start, Args&&... args)
+{
+    constexpr auto B  = bits<Pos>;
+    constexpr auto BL = bits_leaf<Pos>;
+
+    if (p.shift() == BL) {
+        auto n = p.node()->inner() + start;
+        auto last = p.count() - 1;
+        auto e = p.node()->inner() + last;
+        if (n <= e) {
+            for (; n != e; ++n) {
+                IMMER_PREFETCH(n + 1);
+                if (!make_full_leaf_pos(*n).visit(v, args...))
+                    return false;
+            }
+            if (!make_leaf_pos(*n, p.size()).visit(v, args...))
+                return false;
+        }
+    } else {
+        auto n = p.node()->inner() + start;
+        auto last = p.count() - 1;
+        auto e = p.node()->inner() + last;
+        auto ss = p.shift() - B;
+        if (n <= e) {
+            for (; n != e; ++n)
+                if (!make_full_pos(*n, ss).visit(v, args...))
+                    return false;
+            if (!make_regular_pos(*n, ss, p.size()).visit(v, args...))
+                return false;
+        }
+    }
+    return true;
+}
+
+template <typename Pos, typename Visitor, typename... Args>
+void each_i_regular(Pos&& p, Visitor v, count_t f, count_t l, Args&&... args)
+{
+    constexpr auto B  = bits<Pos>;
+    constexpr auto BL = bits_leaf<Pos>;
+
+    if (p.shift() == BL) {
+        if (l > f) {
+            if (l < p.count()) {
+                auto n = p.node()->inner() + f;
+                auto e = p.node()->inner() + l;
+                for (; n < e; ++n) {
+                    IMMER_PREFETCH(n + 1);
+                    make_full_leaf_pos(*n).visit(v, args...);
+                }
+            } else {
+                auto n = p.node()->inner() + f;
+                auto e = p.node()->inner() + l - 1;
+                for (; n < e; ++n) {
+                    IMMER_PREFETCH(n + 1);
+                    make_full_leaf_pos(*n).visit(v, args...);
+                }
+                make_leaf_pos(*n, p.size()).visit(v, args...);
+            }
+        }
+    } else {
+        if (l > f) {
+            auto ss = p.shift() - B;
+            if (l < p.count()) {
+                auto n = p.node()->inner() + f;
+                auto e = p.node()->inner() + l;
+                for (; n < e; ++n)
+                    make_full_pos(*n, ss).visit(v, args...);
+            } else {
+                auto n = p.node()->inner() + f;
+                auto e = p.node()->inner() + l - 1;
+                for (; n < e; ++n)
+                    make_full_pos(*n, ss).visit(v, args...);
+                make_regular_pos(*n, ss, p.size()).visit(v, args...);
+            }
+        }
+    }
+}
+
+template <typename Pos, typename Visitor, typename... Args>
+void each_left_regular(Pos&& p, Visitor v, count_t last, Args&&... args)
+{
+    constexpr auto B  = bits<Pos>;
+    constexpr auto BL = bits_leaf<Pos>;
+    assert(last < p.count());
+    if (p.shift() == BL) {
+        auto n = p.node()->inner();
+        auto e = n + last;
+        for (; n != e; ++n) {
+            IMMER_PREFETCH(n + 1);
+            make_full_leaf_pos(*n).visit(v, args...);
+        }
+    } else {
+        auto n = p.node()->inner();
+        auto e = n + last;
+        auto ss = p.shift() - B;
+        for (; n != e; ++n)
+            make_full_pos(*n, ss).visit(v, args...);
+    }
+}
+
+template <typename Pos, typename Visitor, typename... Args>
+void each_right_regular(Pos&& p, Visitor v, count_t start, Args&&... args)
+{
+    constexpr auto B  = bits<Pos>;
+    constexpr auto BL = bits_leaf<Pos>;
+
+    if (p.shift() == BL) {
+        auto n = p.node()->inner() + start;
+        auto last = p.count() - 1;
+        auto e = p.node()->inner() + last;
+        if (n <= e) {
+            for (; n != e; ++n) {
+                IMMER_PREFETCH(n + 1);
+                make_full_leaf_pos(*n).visit(v, args...);
+            }
+            make_leaf_pos(*n, p.size()).visit(v, args...);
+        }
+    } else {
+        auto n = p.node()->inner() + start;
+        auto last = p.count() - 1;
+        auto e = p.node()->inner() + last;
+        auto ss = p.shift() - B;
+        if (n <= e) {
+            for (; n != e; ++n)
+                make_full_pos(*n, ss).visit(v, args...);
+            make_regular_pos(*n, ss, p.size()).visit(v, args...);
+        }
+    }
+}
+
+template <typename Pos, typename Visitor, typename... Args>
+decltype(auto) towards_oh_ch_regular(Pos&& p, Visitor v, size_t idx,
+                                     count_t offset_hint,
+                                     count_t count_hint,
+                                     Args&&... args)
+{
+    constexpr auto B  = bits<Pos>;
+    constexpr auto BL = bits_leaf<Pos>;
+    assert(offset_hint == p.index(idx));
+    assert(count_hint  == p.count());
+    auto is_leaf = p.shift() == BL;
+    auto child   = p.node()->inner() [offset_hint];
+    auto is_full = offset_hint + 1 != count_hint;
+    return is_full
+        ? (is_leaf
+           ? make_full_leaf_pos(child).visit(v, idx, args...)
+           : make_full_pos(child, p.shift() - B).visit(v, idx, args...))
+        : (is_leaf
+           ? make_leaf_pos(child, p.size()).visit(v, idx, args...)
+           : make_regular_pos(child, p.shift() - B, p.size()).visit(v, idx, args...));
+}
+
+template <typename Pos, typename Visitor, typename... Args>
+decltype(auto) towards_sub_oh_regular(Pos&& p, Visitor v, size_t idx,
+                                      count_t offset_hint,
+                                      Args&&... args)
+{
+    constexpr auto B  = bits<Pos>;
+    constexpr auto BL = bits_leaf<Pos>;
+    assert(offset_hint == p.index(idx));
+    auto is_leaf = p.shift() == BL;
+    auto child   = p.node()->inner() [offset_hint];
+    auto lsize   = offset_hint << p.shift();
+    auto size    = p.this_size();
+    auto is_full = (size - lsize) >= (size_t{1} << p.shift());
+    return is_full
+        ? (is_leaf
+           ? make_full_leaf_pos(child).visit(
+               v, idx - lsize, args...)
+           : make_full_pos(child, p.shift() - B).visit(
+               v, idx - lsize, args...))
+        : (is_leaf
+           ? make_leaf_sub_pos(child, size - lsize).visit(
+               v, idx - lsize, args...)
+           : make_regular_sub_pos(child, p.shift() - B, size - lsize).visit(
+               v, idx - lsize, args...));
+}
+
+template <typename Pos, typename Visitor, typename... Args>
+decltype(auto) last_oh_regular(Pos&& p, Visitor v,
+                               count_t offset_hint,
+                               Args&&... args)
+{
+    assert(offset_hint == p.count() - 1);
+    constexpr auto B  = bits<Pos>;
+    constexpr auto BL = bits_leaf<Pos>;
+    auto child     = p.node()->inner() [offset_hint];
+    auto is_leaf   = p.shift() == BL;
+    return is_leaf
+        ? make_leaf_pos(child, p.size()).visit(v, args...)
+        : make_regular_pos(child, p.shift() - B, p.size()).visit(v, args...);
+}
+
+template <typename NodeT>
+regular_pos<NodeT> make_regular_pos(NodeT* node,
+                                    shift_t shift,
+                                    size_t size)
+{
+    assert(node);
+    assert(shift >= NodeT::bits_leaf);
+    assert(size > 0);
+    return {node, shift, size};
+}
+
+struct null_sub_pos
+{
+    auto node() const { return nullptr; }
+
+    template <typename Visitor, typename... Args>
+    void each_sub(Visitor, Args&&...) {}
+    template <typename Visitor, typename... Args>
+    void each_right_sub(Visitor, Args&&...) {}
+    template <typename Visitor, typename... Args>
+    void each_left_sub(Visitor, Args&&...) {}
+    template <typename Visitor, typename... Args>
+    void visit(Visitor, Args&&...) {}
+};
+
+template <typename NodeT>
+struct singleton_regular_sub_pos
+{
+    // this is a fake regular pos made out of a single child... useful
+    // to treat a single leaf node as a whole tree
+
+    static constexpr auto B  = NodeT::bits;
+    static constexpr auto BL = NodeT::bits_leaf;
+
+    using node_t = NodeT;
+    node_t* leaf_;
+    count_t count_;
+
+    count_t count() const { return 1; }
+    node_t* node()  const { return nullptr; }
+    size_t  size()  const { return count_; }
+    shift_t shift() const { return BL; }
+    count_t index(size_t idx) const { return 0; }
+    count_t subindex(size_t idx) const { return 0; }
+    size_t  size_before(count_t offset) const { return 0; }
+    size_t  this_size() const { return count_; }
+    size_t  size(count_t offset) { return count_; }
+
+    template <typename Visitor, typename... Args>
+    void each_left_sub(Visitor v, Args&&... args) {}
+    template <typename Visitor, typename... Args>
+    void each(Visitor v, Args&&... args) {}
+
+    template <typename Visitor, typename... Args>
+    decltype(auto) last_sub(Visitor v, Args&&... args)
+    {
+        return make_leaf_sub_pos(leaf_, count_).visit(v, args...);
+    }
+
+    template <typename Visitor, typename ...Args>
+    decltype(auto) visit(Visitor v, Args&& ...args)
+    {
+        return visit_regular(v, *this, std::forward<Args>(args)...);
+    }
+};
+
+template <typename NodeT>
+auto make_singleton_regular_sub_pos(NodeT* leaf, count_t count)
+{
+    assert(leaf);
+    assert(leaf->kind() == NodeT::kind_t::leaf);
+    assert(count > 0);
+    return singleton_regular_sub_pos<NodeT>{leaf, count};
+}
+
+template <typename NodeT>
+struct regular_sub_pos
+{
+    static constexpr auto B  = NodeT::bits;
+    static constexpr auto BL = NodeT::bits_leaf;
+
+    using node_t = NodeT;
+    node_t* node_;
+    shift_t shift_;
+    size_t size_;
+
+    count_t count() const { return subindex(size_ - 1) + 1; }
+    node_t* node()  const { return node_; }
+    size_t  size()  const { return size_; }
+    shift_t shift() const { return shift_; }
+    count_t index(size_t idx) const { return (idx >> shift_) & mask<B>; }
+    count_t subindex(size_t idx) const { return idx >> shift_; }
+    size_t  size_before(count_t offset) const { return offset << shift_; }
+    size_t  this_size() const { return size_; }
+
+    auto size(count_t offset)
+    {
+        return offset == subindex(size_ - 1)
+            ? size_ - size_before(offset)
+            : 1 << shift_;
+    }
+
+    auto size_sbh(count_t offset, size_t size_before_hint)
+    {
+        assert(size_before_hint == size_before(offset));
+        return offset == subindex(size_ - 1)
+            ? size_ - size_before_hint
+            : 1 << shift_;
+    }
+
+    void copy_sizes(count_t offset,
+                    count_t n,
+                    size_t init,
+                    size_t* sizes)
+    {
+        if (n) {
+            auto last = offset + n - 1;
+            auto e = sizes + n - 1;
+            for (; sizes != e; ++sizes)
+                init = *sizes = init + (1 << shift_);
+            *sizes = init + size(last);
+        }
+    }
+
+    template <typename Visitor, typename... Args>
+    void each(Visitor v, Args&& ...args)
+    { return each_regular(*this, v, args...); }
+
+    template <typename Visitor, typename... Args>
+    bool each_pred(Visitor v, Args&& ...args)
+    { return each_pred_regular(*this, v, args...); }
+
+    template <typename Visitor, typename... Args>
+    bool each_pred_zip(Visitor v, node_t* other, Args&&... args)
+    { return each_pred_zip_regular(*this, v, other, args...); }
+
+    template <typename Visitor, typename... Args>
+    bool each_pred_i(Visitor v, count_t i, count_t n, Args&& ...args)
+    { return each_pred_i_regular(*this, v, i, n, args...); }
+
+    template <typename Visitor, typename... Args>
+    bool each_pred_right(Visitor v, count_t start, Args&& ...args)
+    { return each_pred_right_regular(*this, v, start, args...); }
+
+    template <typename Visitor, typename... Args>
+    bool each_pred_left(Visitor v, count_t last, Args&& ...args)
+    { return each_pred_left_regular(*this, v, last, args...); }
+
+    template <typename Visitor, typename... Args>
+    void each_i(Visitor v, count_t i, count_t n, Args&& ...args)
+    { return each_i_regular(*this, v, i, n, args...); }
+
+    template <typename Visitor, typename... Args>
+    void each_right(Visitor v, count_t start, Args&& ...args)
+    { return each_right_regular(*this, v, start, args...); }
+
+    template <typename Visitor, typename... Args>
+    void each_left(Visitor v, count_t last, Args&& ...args)
+    { return each_left_regular(*this, v, last, args...); }
+
+    template <typename Visitor, typename... Args>
+    void each_right_sub_(Visitor v, count_t i, Args&& ...args)
+    {
+        auto last  = count() - 1;
+        auto lsize = size_ - (last << shift_);
+        auto n = node()->inner() + i;
+        auto e = node()->inner() + last;
+        if (shift() == BL) {
+            for (; n != e; ++n) {
+                IMMER_PREFETCH(n + 1);
+                make_full_leaf_pos(*n).visit(v, args...);
+            }
+            make_leaf_sub_pos(*n, lsize).visit(v, args...);
+        } else {
+            auto ss = shift_ - B;
+            for (; n != e; ++n)
+                make_full_pos(*n, ss).visit(v, args...);
+            make_regular_sub_pos(*n, ss, lsize).visit(v, args...);
+        }
+    }
+
+    template <typename Visitor, typename... Args>
+    void each_sub(Visitor v, Args&& ...args)
+    { each_right_sub_(v, 0, args...); }
+
+    template <typename Visitor, typename... Args>
+    void each_right_sub(Visitor v, Args&& ...args)
+    { if (count() > 1) each_right_sub_(v, 1, args...); }
+
+    template <typename Visitor, typename... Args>
+    void each_left_sub(Visitor v, Args&& ...args)
+    { each_left(v, count() - 1, args...); }
+
+    template <typename Visitor, typename... Args>
+    decltype(auto) towards(Visitor v, size_t idx, Args&&... args)
+    { return towards_oh_ch_regular(*this, v, idx, index(idx), count(), args...); }
+
+    template <typename Visitor, typename... Args>
+    decltype(auto) towards_oh(Visitor v, size_t idx,
+                              count_t offset_hint,
+                              Args&&... args)
+    { return towards_oh_ch_regular(*this, v, idx, offset_hint, count(), args...); }
+
+    template <typename Visitor, typename... Args>
+    decltype(auto) towards_oh_ch(Visitor v, size_t idx,
+                                 count_t offset_hint,
+                                 count_t count_hint,
+                                 Args&&... args)
+    { return towards_oh_ch_regular(*this, v, idx, offset_hint, count(), args...); }
+
+    template <typename Visitor, typename... Args>
+    decltype(auto) towards_sub_oh(Visitor v, size_t idx,
+                                  count_t offset_hint,
+                                  Args&& ...args)
+    { return towards_sub_oh_regular(*this, v, idx, offset_hint, args...); }
+
+    template <typename Visitor, typename... Args>
+    decltype(auto) last_oh(Visitor v, count_t offset_hint, Args&&... args)
+    { return last_oh_regular(*this, v, offset_hint, args...); }
+
+    template <typename Visitor, typename... Args>
+    decltype(auto) last_sub(Visitor v, Args&&... args)
+    {
+        auto offset    = count() - 1;
+        auto child     = node_->inner() [offset];
+        auto is_leaf   = shift_ == BL;
+        auto lsize     = size_ - (offset << shift_);
+        return is_leaf
+            ? make_leaf_sub_pos(child, lsize).visit(v, args...)
+            : make_regular_sub_pos(child, shift_ - B, lsize).visit(v, args...);
+    }
+
+    template <typename Visitor, typename... Args>
+    decltype(auto) first_sub(Visitor v, Args&&... args)
+    {
+        auto is_leaf = shift_ == BL;
+        auto child   = node_->inner() [0];
+        auto is_full = size_ >= (size_t{1} << shift_);
+        return is_full
+            ? (is_leaf
+               ? make_full_leaf_pos(child).visit(v, args...)
+               : make_full_pos(child, shift_ - B).visit(v, args...))
+            : (is_leaf
+               ? make_leaf_sub_pos(child, size_).visit(v, args...)
+               : make_regular_sub_pos(child, shift_ - B, size_).visit(v, args...));
+    }
+
+    template <typename Visitor, typename... Args>
+    decltype(auto) first_sub_leaf(Visitor v, Args&&... args)
+    {
+        assert(shift_ == BL);
+        auto child   = node_->inner() [0];
+        auto is_full = size_ >= branches<BL>;
+        return is_full
+            ? make_full_leaf_pos(child).visit(v, args...)
+            : make_leaf_sub_pos(child, size_).visit(v, args...);
+    }
+
+    template <typename Visitor, typename... Args>
+    decltype(auto) first_sub_inner(Visitor v, Args&&... args)
+    {
+        assert(shift_ >= BL);
+        auto child   = node_->inner() [0];
+        auto is_full = size_ >= branches<BL>;
+        return is_full
+            ? make_full_pos(child, shift_ - B).visit(v, args...)
+            : make_regular_sub_pos(child, shift_ - B, size_).visit(v, args...);
+    }
+
+    template <typename Visitor, typename... Args>
+    decltype(auto) nth_sub(count_t idx, Visitor v, Args&&... args)
+    {
+        assert(idx < count());
+        auto is_leaf = shift_ == BL;
+        auto child   = node_->inner() [idx];
+        auto lsize   = size(idx);
+        auto is_full = idx + 1 < count();
+        return is_full
+            ? (is_leaf
+               ? make_full_leaf_pos(child).visit(v, args...)
+               : make_full_pos(child, shift_ - B).visit(v, args...))
+            : (is_leaf
+               ? make_leaf_sub_pos(child, lsize).visit(v, args...)
+               : make_regular_sub_pos(child, shift_ - B, lsize).visit(v, args...));
+    }
+
+    template <typename Visitor, typename... Args>
+    decltype(auto) nth_sub_leaf(count_t idx, Visitor v, Args&&... args)
+    {
+        assert(shift_ == BL);
+        auto child   = node_->inner() [idx];
+        auto lsize   = size(idx);
+        auto is_full = idx + 1 < count();
+        return is_full
+            ? make_full_leaf_pos(child).visit(v, args...)
+            : make_leaf_sub_pos(child, lsize).visit(v, args...);
+    }
+
+    template <typename Visitor, typename ...Args>
+    decltype(auto) visit(Visitor v, Args&& ...args)
+    {
+        return visit_regular(v, *this, std::forward<Args>(args)...);
+    }
+};
+
+template <typename NodeT>
+regular_sub_pos<NodeT> make_regular_sub_pos(NodeT* node,
+                                            shift_t shift,
+                                            size_t size)
+{
+    assert(node);
+    assert(shift >= NodeT::bits_leaf);
+    assert(size > 0);
+    assert(size <= (branches<NodeT::bits, size_t> << shift));
+    return {node, shift, size};
+}
+
+template <typename NodeT, shift_t Shift,
+          bits_t B  = NodeT::bits,
+          bits_t BL = NodeT::bits_leaf>
+struct regular_descent_pos
+{
+    static_assert(Shift > 0, "not leaf...");
+
+    using node_t = NodeT;
+    node_t* node_;
+
+    node_t* node()  const { return node_; }
+    shift_t shift() const { return Shift; }
+    count_t index(size_t idx) const {
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wshift-count-overflow"
+        return (idx >> Shift) & mask<B>;
+#pragma GCC diagnostic pop
+    }
+
+    template <typename Visitor>
+    decltype(auto) descend(Visitor v, size_t idx)
+    {
+        auto offset = index(idx);
+        auto child  = node_->inner()[offset];
+        return regular_descent_pos<NodeT, Shift - B>{child}.visit(v, idx);
+    }
+
+    template <typename Visitor, typename ...Args>
+    decltype(auto) visit(Visitor v, Args&& ...args)
+    {
+        return visit_regular(v, *this, std::forward<Args>(args)...);
+    }
+};
+
+template <typename NodeT, bits_t B, bits_t BL>
+struct regular_descent_pos<NodeT, BL, B, BL>
+{
+    using node_t = NodeT;
+    node_t* node_;
+
+    node_t* node()  const { return node_; }
+    shift_t shift() const { return BL; }
+    count_t index(size_t idx) const { return (idx >> BL) & mask<B>; }
+
+    template <typename Visitor>
+    decltype(auto) descend(Visitor v, size_t idx)
+    {
+        auto offset = index(idx);
+        auto child  = node_->inner()[offset];
+        return make_leaf_descent_pos(child).visit(v, idx);
+    }
+
+    template <typename Visitor, typename ...Args>
+    decltype(auto) visit(Visitor v, Args&& ...args)
+    {
+        return visit_regular(v, *this, std::forward<Args>(args)...);
+    }
+};
+
+template <typename NodeT, typename Visitor>
+decltype(auto) visit_regular_descent(NodeT* node, shift_t shift, Visitor v,
+                                     size_t idx)
+{
+    constexpr auto B  = NodeT::bits;
+    constexpr auto BL = NodeT::bits_leaf;
+    assert(node);
+    assert(shift >= BL);
+    switch (shift) {
+    case BL + B * 0: return regular_descent_pos<NodeT, BL + B * 0>{node}.visit(v, idx);
+    case BL + B * 1: return regular_descent_pos<NodeT, BL + B * 1>{node}.visit(v, idx);
+    case BL + B * 2: return regular_descent_pos<NodeT, BL + B * 2>{node}.visit(v, idx);
+    case BL + B * 3: return regular_descent_pos<NodeT, BL + B * 3>{node}.visit(v, idx);
+    case BL + B * 4: return regular_descent_pos<NodeT, BL + B * 4>{node}.visit(v, idx);
+    case BL + B * 5: return regular_descent_pos<NodeT, BL + B * 5>{node}.visit(v, idx);
+#if IMMER_DESCENT_DEEP
+    default:
+        for (auto level = shift; level != endshift<B, BL>; level -= B)
+            node = node->inner() [(idx >> level) & mask<B>];
+        return make_leaf_descent_pos(node).visit(v, idx);
+#endif // IMMER_DEEP_DESCENT
+    }
+    IMMER_UNREACHABLE;
+}
+
+template <typename NodeT>
+struct full_pos
+{
+    static constexpr auto B  = NodeT::bits;
+    static constexpr auto BL = NodeT::bits_leaf;
+
+    using node_t = NodeT;
+    node_t* node_;
+    shift_t shift_;
+
+    count_t count() const { return branches<B>; }
+    node_t* node()  const { return node_; }
+    size_t  size()  const { return branches<B> << shift_; }
+    shift_t shift() const { return shift_; }
+    count_t index(size_t idx) const { return (idx >> shift_) & mask<B>; }
+    count_t subindex(size_t idx) const { return idx >> shift_; }
+    size_t  size(count_t offset) const { return 1 << shift_; }
+    size_t  size_sbh(count_t offset, size_t) const { return 1 << shift_; }
+    size_t  size_before(count_t offset) const { return offset << shift_; }
+
+    void copy_sizes(count_t offset,
+                    count_t n,
+                    size_t init,
+                    size_t* sizes)
+    {
+        auto e = sizes + n;
+        for (; sizes != e; ++sizes)
+            init = *sizes = init + (1 << shift_);
+    }
+
+    template <typename Visitor, typename... Args>
+    void each(Visitor v, Args&&... args)
+    {
+        auto p = node_->inner();
+        auto e = p + branches<B>;
+        if (shift_ == BL) {
+            for (; p != e; ++p) {
+                IMMER_PREFETCH(p + 1);
+                make_full_leaf_pos(*p).visit(v, args...);
+            }
+        } else {
+            auto ss = shift_ - B;
+            for (; p != e; ++p)
+                make_full_pos(*p, ss).visit(v, args...);
+        }
+    }
+
+    template <typename Visitor, typename... Args>
+    bool each_pred(Visitor v, Args&&... args)
+    {
+        auto p = node_->inner();
+        auto e = p + branches<B>;
+        if (shift_ == BL) {
+            for (; p != e; ++p) {
+                IMMER_PREFETCH(p + 1);
+                if (!make_full_leaf_pos(*p).visit(v, args...))
+                    return false;
+            }
+        } else {
+            auto ss = shift_ - B;
+            for (; p != e; ++p)
+                if (!make_full_pos(*p, ss).visit(v, args...))
+                    return false;
+        }
+        return true;
+    }
+
+    template <typename Visitor, typename... Args>
+    bool each_pred_zip(Visitor v, node_t* other, Args&&... args)
+    {
+        auto p = node_->inner();
+        auto p2 = other->inner();
+        auto e = p + branches<B>;
+        if (shift_ == BL) {
+            for (; p != e; ++p, ++p2) {
+                IMMER_PREFETCH(p + 1);
+                if (!make_full_leaf_pos(*p).visit(v, *p2, args...))
+                    return false;
+            }
+        } else {
+            auto ss = shift_ - B;
+            for (; p != e; ++p, ++p2)
+                if (!make_full_pos(*p, ss).visit(v, *p2, args...))
+                    return false;
+        }
+        return true;
+    }
+
+    template <typename Visitor, typename... Args>
+    bool each_pred_i(Visitor v, count_t i, count_t n, Args&&... args)
+    {
+        auto p = node_->inner() + i;
+        auto e = node_->inner() + n;
+        if (shift_ == BL) {
+            for (; p != e; ++p) {
+                IMMER_PREFETCH(p + 1);
+                if (!make_full_leaf_pos(*p).visit(v, args...))
+                    return false;
+            }
+        } else {
+            auto ss = shift_ - B;
+            for (; p != e; ++p)
+                if (!make_full_pos(*p, ss).visit(v, args...))
+                    return false;
+        }
+        return true;
+    }
+
+    template <typename Visitor, typename... Args>
+    void each_i(Visitor v, count_t i, count_t n, Args&&... args)
+    {
+        auto p = node_->inner() + i;
+        auto e = node_->inner() + n;
+        if (shift_ == BL) {
+            for (; p != e; ++p) {
+                IMMER_PREFETCH(p + 1);
+                make_full_leaf_pos(*p).visit(v, args...);
+            }
+        } else {
+            auto ss = shift_ - B;
+            for (; p != e; ++p)
+                make_full_pos(*p, ss).visit(v, args...);
+        }
+    }
+
+    template <typename Visitor, typename... Args>
+    bool each_pred_right(Visitor v, count_t start, Args&&... args)
+    { return each_pred_i(v, start, branches<B>, args...); }
+
+    template <typename Visitor, typename... Args>
+    bool each_pred_left(Visitor v, count_t last, Args&&... args)
+    { return each_pred_i(v, 0, last, args...); }
+
+    template <typename Visitor, typename... Args>
+    void each_sub(Visitor v, Args&&... args)
+    { each(v, args...); }
+
+    template <typename Visitor, typename... Args>
+    void each_left_sub(Visitor v, Args&&... args)
+    { each_i(v, 0, branches<B> - 1, args...); }
+
+    template <typename Visitor, typename... Args>
+    void each_right_sub(Visitor v, Args&&... args)
+    { each_i(v, 1, branches<B>, args...); }
+
+    template <typename Visitor, typename... Args>
+    void each_right(Visitor v, count_t start, Args&&... args)
+    { each_i(v, start, branches<B>, args...); }
+
+    template <typename Visitor, typename... Args>
+    void each_left(Visitor v, count_t last, Args&&... args)
+    { each_i(v, 0, last, args...); }
+
+    template <typename Visitor, typename... Args>
+    decltype(auto) towards(Visitor v, size_t idx, Args&&... args)
+    { return towards_oh(v, idx, index(idx), args...); }
+
+    template <typename Visitor, typename... Args>
+    decltype(auto) towards_oh_ch(Visitor v, size_t idx,
+                                 count_t offset_hint, count_t,
+                                 Args&&... args)
+    { return towards_oh(v, idx, offset_hint, args...); }
+
+    template <typename Visitor, typename... Args>
+    decltype(auto) towards_oh(Visitor v, size_t idx,
+                              count_t offset_hint,
+                              Args&&... args)
+    {
+        assert(offset_hint == index(idx));
+        auto is_leaf = shift_ == BL;
+        auto child   = node_->inner() [offset_hint];
+        return is_leaf
+            ? make_full_leaf_pos(child).visit(v, idx, args...)
+            : make_full_pos(child, shift_ - B).visit(v, idx, args...);
+    }
+
+    template <typename Visitor, typename... Args>
+    decltype(auto) towards_sub_oh(Visitor v, size_t idx,
+                                  count_t offset_hint,
+                                  Args&&... args)
+    {
+        assert(offset_hint == index(idx));
+        auto is_leaf = shift_ == BL;
+        auto child   = node_->inner() [offset_hint];
+        auto lsize   = offset_hint << shift_;
+        return is_leaf
+            ? make_full_leaf_pos(child).visit(v, idx - lsize, args...)
+            : make_full_pos(child, shift_ - B).visit(v, idx - lsize, args...);
+    }
+
+    template <typename Visitor, typename... Args>
+    decltype(auto) first_sub(Visitor v, Args&&... args)
+    {
+        auto is_leaf = shift_ == BL;
+        auto child   = node_->inner() [0];
+        return is_leaf
+            ? make_full_leaf_pos(child).visit(v, args...)
+            : make_full_pos(child, shift_ - B).visit(v, args...);
+    }
+
+    template <typename Visitor, typename... Args>
+    decltype(auto) first_sub_leaf(Visitor v, Args&&... args)
+    {
+        assert(shift_ == BL);
+        auto child   = node_->inner() [0];
+        return make_full_leaf_pos(child).visit(v, args...);
+    }
+
+    template <typename Visitor, typename... Args>
+    decltype(auto) first_sub_inner(Visitor v, Args&&... args)
+    {
+        assert(shift_ >= BL);
+        auto child   = node_->inner() [0];
+        return make_full_pos(child, shift_ - B).visit(v, args...);
+    }
+
+    template <typename Visitor, typename... Args>
+    decltype(auto) nth_sub(count_t idx, Visitor v, Args&&... args)
+    {
+        assert(idx < count());
+        auto is_leaf = shift_ == BL;
+        auto child   = node_->inner() [idx];
+        return is_leaf
+            ? make_full_leaf_pos(child).visit(v, args...)
+            : make_full_pos(child, shift_ - B).visit(v, args...);
+    }
+
+    template <typename Visitor, typename... Args>
+    decltype(auto) nth_sub_leaf(count_t idx, Visitor v, Args&&... args)
+    {
+        assert(shift_ == BL);
+        assert(idx < count());
+        auto child   = node_->inner() [idx];
+        return make_full_leaf_pos(child).visit(v, args...);
+    }
+
+    template <typename Visitor, typename ...Args>
+    decltype(auto) visit(Visitor v, Args&& ...args)
+    {
+        return visit_regular(v, *this, std::forward<Args>(args)...);
+    }
+};
+
+template <typename NodeT>
+full_pos<NodeT> make_full_pos(NodeT* node, shift_t shift)
+{
+    assert(node);
+    assert(shift >= NodeT::bits_leaf);
+    return {node, shift};
+}
+
+template <typename NodeT>
+struct relaxed_pos
+{
+    static constexpr auto B  = NodeT::bits;
+    static constexpr auto BL = NodeT::bits_leaf;
+
+    using node_t = NodeT;
+    using relaxed_t = typename NodeT::relaxed_t;
+    node_t* node_;
+    shift_t shift_;
+    relaxed_t* relaxed_;
+
+    count_t count() const { return relaxed_->d.count; }
+    node_t* node()  const { return node_; }
+    size_t  size()  const { return relaxed_->d.sizes[relaxed_->d.count - 1]; }
+    shift_t shift() const { return shift_; }
+    count_t subindex(size_t idx) const { return index(idx); }
+    relaxed_t* relaxed() const { return relaxed_; }
+
+    size_t size_before(count_t offset) const
+    { return offset ? relaxed_->d.sizes[offset - 1] : 0; }
+
+    size_t size(count_t offset) const
+    { return size_sbh(offset, size_before(offset)); }
+
+    size_t size_sbh(count_t offset, size_t size_before_hint) const
+    {
+        assert(size_before_hint == size_before(offset));
+        return relaxed_->d.sizes[offset] - size_before_hint;
+    }
+
+    count_t index(size_t idx) const
+    {
+        auto offset = idx >> shift_;
+        while (relaxed_->d.sizes[offset] <= idx) ++offset;
+        return offset;
+    }
+
+    void copy_sizes(count_t offset,
+                    count_t n,
+                    size_t init,
+                    size_t* sizes)
+    {
+        auto e = sizes + n;
+        auto prev = size_before(offset);
+        auto these = relaxed_->d.sizes + offset;
+        for (; sizes != e; ++sizes, ++these) {
+            auto this_size = *these;
+            init = *sizes = init + (this_size - prev);
+            prev = this_size;
+        }
+    }
+
+    template <typename Visitor, typename... Args>
+    void each(Visitor v, Args&&... args)
+    { each_left(v, relaxed_->d.count, args...); }
+
+    template <typename Visitor, typename... Args>
+    bool each_pred(Visitor v, Args&&... args)
+    {
+        auto p = node_->inner();
+        auto s = size_t{};
+        auto n = count();
+        if (shift_ == BL) {
+            for (auto i = count_t{0}; i < n; ++i) {
+                IMMER_PREFETCH(p + i + 1);
+                if (!make_leaf_sub_pos(p[i], relaxed_->d.sizes[i] - s)
+                    .visit(v, args...))
+                    return false;
+                s = relaxed_->d.sizes[i];
+            }
+        } else {
+            auto ss = shift_ - B;
+            for (auto i = count_t{0}; i < n; ++i) {
+                if (!visit_maybe_relaxed_sub(p[i], ss, relaxed_->d.sizes[i] - s,
+                                             v, args...))
+                    return false;
+                s = relaxed_->d.sizes[i];
+            }
+        }
+        return true;
+    }
+
+    template <typename Visitor, typename... Args>
+    bool each_pred_i(Visitor v, count_t i, count_t n, Args&&... args)
+    {
+        if (shift_ == BL) {
+            auto p = node_->inner();
+            auto s = i > 0 ? relaxed_->d.sizes[i - 1] : 0;
+            for (; i < n; ++i) {
+                IMMER_PREFETCH(p + i + 1);
+                if (!make_leaf_sub_pos(p[i], relaxed_->d.sizes[i] - s)
+                    .visit(v, args...))
+                    return false;
+                s = relaxed_->d.sizes[i];
+            }
+        } else {
+            auto p = node_->inner();
+            auto s = i > 0 ? relaxed_->d.sizes[i - 1] : 0;
+            auto ss = shift_ - B;
+            for (; i < n; ++i) {
+                if (!visit_maybe_relaxed_sub(p[i], ss, relaxed_->d.sizes[i] - s,
+                                             v, args...))
+                    return false;
+                s = relaxed_->d.sizes[i];
+            }
+        }
+        return true;
+    }
+
+    template <typename Visitor, typename... Args>
+    bool each_pred_left(Visitor v, count_t n, Args&&... args)
+    {
+        auto p = node_->inner();
+        auto s = size_t{};
+        if (shift_ == BL) {
+            for (auto i = count_t{0}; i < n; ++i) {
+                IMMER_PREFETCH(p + i + 1);
+                if (!make_leaf_sub_pos(p[i], relaxed_->d.sizes[i] - s)
+                    .visit(v, args...))
+                    return false;
+                s = relaxed_->d.sizes[i];
+            }
+        } else {
+            auto ss = shift_ - B;
+            for (auto i = count_t{0}; i < n; ++i) {
+                if (!visit_maybe_relaxed_sub(p[i], ss, relaxed_->d.sizes[i] - s,
+                                             v, args...))
+                    return false;
+                s = relaxed_->d.sizes[i];
+            }
+        }
+        return true;
+    }
+
+    template <typename Visitor, typename... Args>
+    bool each_pred_right(Visitor v, count_t start, Args&&... args)
+    {
+        assert(start > 0);
+        assert(start <= relaxed_->d.count);
+        auto s = relaxed_->d.sizes[start - 1];
+        auto p = node_->inner();
+        if (shift_ == BL) {
+            for (auto i = start; i < relaxed_->d.count; ++i) {
+                IMMER_PREFETCH(p + i + 1);
+                if (!make_leaf_sub_pos(p[i], relaxed_->d.sizes[i] - s)
+                    .visit(v, args...))
+                    return false;
+                s = relaxed_->d.sizes[i];
+            }
+        } else {
+            auto ss = shift_ - B;
+            for (auto i = start; i < relaxed_->d.count; ++i) {
+                if (!visit_maybe_relaxed_sub(p[i], ss, relaxed_->d.sizes[i] - s,
+                                             v, args...))
+                    return false;
+                s = relaxed_->d.sizes[i];
+            }
+        }
+        return true;
+    }
+
+    template <typename Visitor, typename... Args>
+    void each_i(Visitor v, count_t i, count_t n, Args&&... args)
+    {
+        if (shift_ == BL) {
+            auto p = node_->inner();
+            auto s = i > 0 ? relaxed_->d.sizes[i - 1] : 0;
+            for (; i < n; ++i) {
+                IMMER_PREFETCH(p + i + 1);
+                make_leaf_sub_pos(p[i], relaxed_->d.sizes[i] - s)
+                    .visit(v, args...);
+                s = relaxed_->d.sizes[i];
+            }
+        } else {
+            auto p = node_->inner();
+            auto s = i > 0 ? relaxed_->d.sizes[i - 1] : 0;
+            auto ss = shift_ - B;
+            for (; i < n; ++i) {
+                visit_maybe_relaxed_sub(p[i], ss, relaxed_->d.sizes[i] - s,
+                                        v, args...);
+                s = relaxed_->d.sizes[i];
+            }
+        }
+    }
+
+    template <typename Visitor, typename... Args>
+    void each_sub(Visitor v, Args&&... args)
+    { each_left(v, relaxed_->d.count, args...); }
+
+    template <typename Visitor, typename... Args>
+    void each_left_sub(Visitor v, Args&&... args)
+    { each_left(v, relaxed_->d.count - 1, args...); }
+
+    template <typename Visitor, typename... Args>
+    void each_left(Visitor v, count_t n, Args&&... args)
+    {
+        auto p = node_->inner();
+        auto s = size_t{};
+        if (shift_ == BL) {
+            for (auto i = count_t{0}; i < n; ++i) {
+                IMMER_PREFETCH(p + i + 1);
+                make_leaf_sub_pos(p[i], relaxed_->d.sizes[i] - s)
+                    .visit(v, args...);
+                s = relaxed_->d.sizes[i];
+            }
+        } else {
+            auto ss = shift_ - B;
+            for (auto i = count_t{0}; i < n; ++i) {
+                visit_maybe_relaxed_sub(p[i], ss, relaxed_->d.sizes[i] - s,
+                                        v, args...);
+                s = relaxed_->d.sizes[i];
+            }
+        }
+    }
+
+    template <typename Visitor, typename... Args>
+    void each_right_sub(Visitor v, Args&&... args)
+    { each_right(v, 1, std::forward<Args>(args)...); }
+
+    template <typename Visitor, typename... Args>
+    void each_right(Visitor v, count_t start, Args&&... args)
+    {
+        assert(start > 0);
+        assert(start <= relaxed_->d.count);
+        auto s = relaxed_->d.sizes[start - 1];
+        auto p = node_->inner();
+        if (shift_ == BL) {
+            for (auto i = start; i < relaxed_->d.count; ++i) {
+                IMMER_PREFETCH(p + i + 1);
+                make_leaf_sub_pos(p[i], relaxed_->d.sizes[i] - s)
+                    .visit(v, args...);
+                s = relaxed_->d.sizes[i];
+            }
+        } else {
+            auto ss = shift_ - B;
+            for (auto i = start; i < relaxed_->d.count; ++i) {
+                visit_maybe_relaxed_sub(p[i], ss, relaxed_->d.sizes[i] - s,
+                                        v, args...);
+                s = relaxed_->d.sizes[i];
+            }
+        }
+    }
+
+    template <typename Visitor, typename... Args>
+    decltype(auto) towards(Visitor v, size_t idx, Args&&... args)
+    { return towards_oh(v, idx, subindex(idx), args...); }
+
+    template <typename Visitor, typename... Args>
+    decltype(auto) towards_oh(Visitor v, size_t idx,
+                              count_t offset_hint,
+                              Args&&... args)
+    {
+        assert(offset_hint == index(idx));
+        auto left_size = offset_hint ? relaxed_->d.sizes[offset_hint - 1] : 0;
+        return towards_oh_sbh(v, idx, offset_hint, left_size, args...);
+    }
+
+    template <typename Visitor, typename... Args>
+    decltype(auto) towards_oh_sbh(Visitor v, size_t idx,
+                                  count_t offset_hint,
+                                  size_t left_size_hint,
+                                  Args&&... args)
+    { return towards_sub_oh_sbh(v, idx, offset_hint, left_size_hint, args...); }
+
+    template <typename Visitor, typename... Args>
+    decltype(auto) towards_sub_oh(Visitor v, size_t idx,
+                                  count_t offset_hint,
+                                  Args&&... args)
+    {
+        assert(offset_hint == index(idx));
+        auto left_size = offset_hint ? relaxed_->d.sizes[offset_hint - 1] : 0;
+        return towards_sub_oh_sbh(v, idx, offset_hint, left_size, args...);
+    }
+
+    template <typename Visitor, typename... Args>
+    decltype(auto) towards_sub_oh_sbh(Visitor v, size_t idx,
+                                      count_t offset_hint,
+                                      size_t left_size_hint,
+                                      Args&&... args)
+    {
+        assert(offset_hint == index(idx));
+        assert(left_size_hint ==
+               (offset_hint ? relaxed_->d.sizes[offset_hint - 1] : 0));
+        auto child     = node_->inner() [offset_hint];
+        auto is_leaf   = shift_ == BL;
+        auto next_size = relaxed_->d.sizes[offset_hint] - left_size_hint;
+        auto next_idx  = idx - left_size_hint;
+        return is_leaf
+            ? make_leaf_sub_pos(child, next_size).visit(
+                v, next_idx, args...)
+            : visit_maybe_relaxed_sub(child, shift_ - B, next_size,
+                                      v, next_idx, args...);
+    }
+
+    template <typename Visitor, typename... Args>
+    decltype(auto) last_oh_csh(Visitor v,
+                               count_t offset_hint,
+                               size_t child_size_hint,
+                               Args&&... args)
+    {
+        assert(offset_hint == count() - 1);
+        assert(child_size_hint == size(offset_hint));
+        auto child     = node_->inner() [offset_hint];
+        auto is_leaf   = shift_ == BL;
+        return is_leaf
+            ? make_leaf_sub_pos(child, child_size_hint).visit(v, args...)
+            : visit_maybe_relaxed_sub(child, shift_ - B, child_size_hint,
+                                      v, args...);
+    }
+
+    template <typename Visitor, typename... Args>
+    decltype(auto) last_sub(Visitor v, Args&&... args)
+    {
+        auto offset     = relaxed_->d.count - 1;
+        auto child      = node_->inner() [offset];
+        auto child_size = size(offset);
+        auto is_leaf    = shift_ == BL;
+        return is_leaf
+            ? make_leaf_sub_pos(child, child_size).visit(v, args...)
+            : visit_maybe_relaxed_sub(child, shift_ - B, child_size, v, args...);
+    }
+
+    template <typename Visitor, typename... Args>
+    decltype(auto) first_sub(Visitor v, Args&&... args)
+    {
+        auto child      = node_->inner() [0];
+        auto child_size = relaxed_->d.sizes[0];
+        auto is_leaf    = shift_ == BL;
+        return is_leaf
+            ? make_leaf_sub_pos(child, child_size).visit(v, args...)
+            : visit_maybe_relaxed_sub(child, shift_ - B, child_size, v, args...);
+    }
+
+    template <typename Visitor, typename... Args>
+    decltype(auto) first_sub_leaf(Visitor v, Args&&... args)
+    {
+        assert(shift_ == BL);
+        auto child      = node_->inner() [0];
+        auto child_size = relaxed_->d.sizes[0];
+        return make_leaf_sub_pos(child, child_size).visit(v, args...);
+    }
+
+    template <typename Visitor, typename... Args>
+    decltype(auto) first_sub_inner(Visitor v, Args&&... args)
+    {
+        assert(shift_ > BL);
+        auto child      = node_->inner() [0];
+        auto child_size = relaxed_->d.sizes[0];
+        return visit_maybe_relaxed_sub(child, shift_ - B, child_size, v, args...);
+    }
+
+    template <typename Visitor, typename... Args>
+    decltype(auto) nth_sub(count_t offset, Visitor v, Args&&... args)
+    {
+        auto child      = node_->inner() [offset];
+        auto child_size = size(offset);
+        auto is_leaf    = shift_ == BL;
+        return is_leaf
+            ? make_leaf_sub_pos(child, child_size).visit(v, args...)
+            : visit_maybe_relaxed_sub(child, shift_ - B, child_size, v, args...);
+    }
+
+    template <typename Visitor, typename... Args>
+    decltype(auto) nth_sub_leaf(count_t offset, Visitor v, Args&&... args)
+    {
+        assert(shift_ == BL);
+        auto child      = node_->inner() [offset];
+        auto child_size = size(offset);
+        return make_leaf_sub_pos(child, child_size).visit(v, args...);
+    }
+
+    template <typename Visitor, typename ...Args>
+    decltype(auto) visit(Visitor v, Args&& ...args)
+    {
+        return visit_relaxed(v, *this, std::forward<Args>(args)...);
+    }
+};
+
+template <typename Pos>
+using is_relaxed = std::is_same<relaxed_pos<typename std::decay_t<Pos>::node_t>,
+                                std::decay_t<Pos>>;
+
+template <typename Pos>
+constexpr auto is_relaxed_v = is_relaxed<Pos>::value;
+
+template <typename NodeT>
+relaxed_pos<NodeT> make_relaxed_pos(NodeT* node,
+                                    shift_t shift,
+                                    typename NodeT::relaxed_t* relaxed)
+{
+    assert(node);
+    assert(relaxed);
+    assert(shift >= NodeT::bits_leaf);
+    return {node, shift, relaxed};
+}
+
+template <typename NodeT, typename Visitor, typename... Args>
+decltype(auto) visit_maybe_relaxed_sub(NodeT* node, shift_t shift, size_t size,
+                                       Visitor v, Args&& ...args)
+{
+    assert(node);
+    auto relaxed = node->relaxed();
+    if (relaxed) {
+        assert(size == relaxed->d.sizes[relaxed->d.count - 1]);
+        return make_relaxed_pos(node, shift, relaxed)
+            .visit(v, std::forward<Args>(args)...);
+    } else {
+        return make_regular_sub_pos(node, shift, size)
+            .visit(v, std::forward<Args>(args)...);
+    }
+}
+
+template <typename NodeT, shift_t Shift,
+          bits_t B  = NodeT::bits,
+          bits_t BL = NodeT::bits_leaf>
+struct relaxed_descent_pos
+{
+    static_assert(Shift > 0, "not leaf...");
+
+    using node_t = NodeT;
+    using relaxed_t = typename NodeT::relaxed_t;
+    node_t* node_;
+    relaxed_t* relaxed_;
+
+    count_t count() const { return relaxed_->d.count; }
+    node_t* node()  const { return node_; }
+    shift_t shift() const { return Shift; }
+    size_t  size()  const { return relaxed_->d.sizes[relaxed_->d.count - 1]; }
+
+    count_t index(size_t idx) const
+    {
+        // make gcc happy
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wshift-count-overflow"
+        auto offset = idx >> Shift;
+#pragma GCC diagnostic pop
+        while (relaxed_->d.sizes[offset] <= idx) ++offset;
+        return offset;
+    }
+
+    template <typename Visitor>
+    decltype(auto) descend(Visitor v, size_t idx)
+    {
+        auto offset    = index(idx);
+        auto child     = node_->inner() [offset];
+        auto left_size = offset ? relaxed_->d.sizes[offset - 1] : 0;
+        auto next_idx  = idx - left_size;
+        auto r  = child->relaxed();
+        return r
+            ? relaxed_descent_pos<NodeT, Shift - B>{child, r}.visit(v, next_idx)
+            : regular_descent_pos<NodeT, Shift - B>{child}.visit(v, next_idx);
+    }
+
+    template <typename Visitor, typename ...Args>
+    decltype(auto) visit(Visitor v, Args&& ...args)
+    {
+        return visit_relaxed(v, *this, std::forward<Args>(args)...);
+    }
+};
+
+template <typename NodeT, bits_t B, bits_t BL>
+struct relaxed_descent_pos<NodeT, BL, B, BL>
+{
+    using node_t = NodeT;
+    using relaxed_t = typename NodeT::relaxed_t;
+    node_t* node_;
+    relaxed_t* relaxed_;
+
+    count_t count() const { return relaxed_->d.count; }
+    node_t* node()  const { return node_; }
+    shift_t shift() const { return BL; }
+    size_t  size()  const { return relaxed_->d.sizes[relaxed_->d.count - 1]; }
+
+    count_t index(size_t idx) const
+    {
+        auto offset = (idx >> BL) & mask<B>;
+        while (relaxed_->d.sizes[offset] <= idx) ++offset;
+        return offset;
+    }
+
+    template <typename Visitor>
+    decltype(auto) descend(Visitor v, size_t idx)
+    {
+        auto offset    = index(idx);
+        auto child     = node_->inner() [offset];
+        auto left_size = offset ? relaxed_->d.sizes[offset - 1] : 0;
+        auto next_idx  = idx - left_size;
+        return leaf_descent_pos<NodeT>{child}.visit(v, next_idx);
+    }
+
+    template <typename Visitor, typename ...Args>
+    decltype(auto) visit(Visitor v, Args&& ...args)
+    {
+        return visit_relaxed(v, *this, std::forward<Args>(args)...);
+    }
+};
+
+template <typename NodeT, typename Visitor, typename... Args>
+decltype(auto) visit_maybe_relaxed_descent(NodeT* node, shift_t shift,
+                                           Visitor v, size_t idx)
+{
+    constexpr auto B  = NodeT::bits;
+    constexpr auto BL = NodeT::bits_leaf;
+    assert(node);
+    assert(shift >= BL);
+    auto r = node->relaxed();
+    if (r) {
+        switch (shift) {
+        case BL + B * 0: return relaxed_descent_pos<NodeT, BL + B * 0>{node, r}.visit(v, idx);
+        case BL + B * 1: return relaxed_descent_pos<NodeT, BL + B * 1>{node, r}.visit(v, idx);
+        case BL + B * 2: return relaxed_descent_pos<NodeT, BL + B * 2>{node, r}.visit(v, idx);
+        case BL + B * 3: return relaxed_descent_pos<NodeT, BL + B * 3>{node, r}.visit(v, idx);
+        case BL + B * 4: return relaxed_descent_pos<NodeT, BL + B * 4>{node, r}.visit(v, idx);
+        case BL + B * 5: return relaxed_descent_pos<NodeT, BL + B * 5>{node, r}.visit(v, idx);
+#if IMMER_DESCENT_DEEP
+        default:
+            for (auto level = shift; level != endshift<B, BL>; level -= B) {
+                auto r = node->relaxed();
+                if (r) {
+                    auto node_idx = (idx >> level) & mask<B>;
+                    while (r->d.sizes[node_idx] <= idx) ++node_idx;
+                    if (node_idx) idx -= r->d.sizes[node_idx - 1];
+                    node = node->inner() [node_idx];
+                } else {
+                    do {
+                        node = node->inner() [(idx >> level) & mask<B>];
+                    } while ((level -= B) != endshift<B, BL>);
+                    return make_leaf_descent_pos(node).visit(v, idx);
+                }
+            }
+            return make_leaf_descent_pos(node).visit(v, idx);
+#endif // IMMER_DESCENT_DEEP
+        }
+        IMMER_UNREACHABLE;
+    } else {
+        return visit_regular_descent(node, shift, v, idx);
+    }
+}
+
+} // namespace rbts
+} // namespace detail
+} // namespace immer
diff --git a/src/immer/detail/rbts/rbtree.hpp b/src/immer/detail/rbts/rbtree.hpp
new file mode 100644
index 000000000000..d4f3bcf9a01a
--- /dev/null
+++ b/src/immer/detail/rbts/rbtree.hpp
@@ -0,0 +1,528 @@
+//
+// immer: immutable data structures for C++
+// Copyright (C) 2016, 2017, 2018 Juan Pedro Bolivar Puente
+//
+// This software is distributed under the Boost Software License, Version 1.0.
+// See accompanying file LICENSE or copy at http://boost.org/LICENSE_1_0.txt
+//
+
+#pragma once
+
+#include <immer/detail/rbts/node.hpp>
+#include <immer/detail/rbts/position.hpp>
+#include <immer/detail/rbts/operations.hpp>
+
+#include <cassert>
+#include <memory>
+#include <numeric>
+
+namespace immer {
+namespace detail {
+namespace rbts {
+
+template <typename T,
+          typename MemoryPolicy,
+          bits_t B,
+          bits_t BL>
+struct rbtree
+{
+    using node_t  = node<T, MemoryPolicy, B, BL>;
+    using edit_t  = typename node_t::edit_t;
+    using owner_t = typename MemoryPolicy::transience_t::owner;
+
+    size_t   size;
+    shift_t  shift;
+    node_t*  root;
+    node_t*  tail;
+
+    static const rbtree empty;
+
+    template <typename U>
+    static auto from_initializer_list(std::initializer_list<U> values)
+    {
+        auto e = owner_t{};
+        auto result = rbtree{empty};
+        for (auto&& v : values)
+            result.push_back_mut(e, v);
+        return result;
+    }
+
+    template <typename Iter>
+    static auto from_range(Iter first, Iter last)
+    {
+        auto e = owner_t{};
+        auto result = rbtree{empty};
+        for (; first != last; ++first)
+            result.push_back_mut(e, *first);
+        return result;
+    }
+
+    static auto from_fill(size_t n, T v)
+    {
+        auto e = owner_t{};
+        auto result = rbtree{empty};
+        while (n --> 0)
+            result.push_back_mut(e, v);
+        return result;
+    }
+
+    rbtree(size_t sz, shift_t sh, node_t* r, node_t* t)
+        : size{sz}, shift{sh}, root{r}, tail{t}
+    {
+        assert(check_tree());
+    }
+
+    rbtree(const rbtree& other)
+        : rbtree{other.size, other.shift, other.root, other.tail}
+    {
+        inc();
+    }
+
+    rbtree(rbtree&& other)
+        : rbtree{empty}
+    {
+        swap(*this, other);
+    }
+
+    rbtree& operator=(const rbtree& other)
+    {
+        auto next = other;
+        swap(*this, next);
+        return *this;
+    }
+
+    rbtree& operator=(rbtree&& other)
+    {
+        swap(*this, other);
+        return *this;
+    }
+
+    friend void swap(rbtree& x, rbtree& y)
+    {
+        using std::swap;
+        swap(x.size,  y.size);
+        swap(x.shift, y.shift);
+        swap(x.root,  y.root);
+        swap(x.tail,  y.tail);
+    }
+
+    ~rbtree()
+    {
+        dec();
+    }
+
+    void inc() const
+    {
+        root->inc();
+        tail->inc();
+    }
+
+    void dec() const
+    {
+        traverse(dec_visitor());
+    }
+
+    auto tail_size() const
+    {
+        return size ? ((size - 1) & mask<BL>) + 1 : 0;
+    }
+
+    auto tail_offset() const
+    {
+        return size ? (size - 1) & ~mask<BL> : 0;
+    }
+
+    template <typename Visitor, typename... Args>
+    void traverse(Visitor v, Args&&... args) const
+    {
+        auto tail_off  = tail_offset();
+        auto tail_size = size - tail_off;
+
+        if (tail_off) make_regular_sub_pos(root, shift, tail_off).visit(v, args...);
+        else make_empty_regular_pos(root).visit(v, args...);
+
+        make_leaf_sub_pos(tail, tail_size).visit(v, args...);
+    }
+
+    template <typename Visitor, typename... Args>
+    void traverse(Visitor v, size_t first, size_t last, Args&&... args) const
+    {
+        auto tail_off  = tail_offset();
+        auto tail_size = size - tail_off;
+
+        if (first < tail_off)
+            make_regular_sub_pos(root, shift, tail_off).visit(
+                v,
+                first,
+                last < tail_off ? last : tail_off,
+                args...);
+        if (last > tail_off)
+            make_leaf_sub_pos(tail, tail_size).visit(
+                v,
+                first > tail_off ? first - tail_off : 0,
+                last - tail_off,
+                args...);
+    }
+
+    template <typename Visitor, typename... Args>
+    bool traverse_p(Visitor v, Args&&... args) const
+    {
+        auto tail_off  = tail_offset();
+        auto tail_size = size - tail_off;
+        return (tail_off
+                ? make_regular_sub_pos(root, shift, tail_off).visit(v, args...)
+                : make_empty_regular_pos(root).visit(v, args...))
+            && make_leaf_sub_pos(tail, tail_size).visit(v, args...);
+    }
+
+    template <typename Visitor, typename... Args>
+    bool traverse_p(Visitor v, size_t first, size_t last, Args&&... args) const
+    {
+        auto tail_off  = tail_offset();
+        auto tail_size = size - tail_off;
+
+        return
+            (first < tail_off
+             ? make_regular_sub_pos(root, shift, tail_off).visit(
+                 v,
+                 first,
+                 last < tail_off ? last : tail_off,
+                 args...)
+             : true)
+         && (last > tail_off
+             ? make_leaf_sub_pos(tail, tail_size).visit(
+                 v,
+                 first > tail_off ? first - tail_off : 0,
+                 last - tail_off,
+                 args...)
+             : true);
+    }
+
+    template <typename Visitor>
+    decltype(auto) descend(Visitor v, size_t idx) const
+    {
+        auto tail_off  = tail_offset();
+        return idx >= tail_off
+            ? make_leaf_descent_pos(tail).visit(v, idx)
+            : visit_regular_descent(root, shift, v, idx);
+    }
+
+    template <typename Fn>
+    void for_each_chunk(Fn&& fn) const
+    {
+        traverse(for_each_chunk_visitor{}, std::forward<Fn>(fn));
+    }
+
+    template <typename Fn>
+    void for_each_chunk(size_t first, size_t last, Fn&& fn) const
+    {
+        traverse(for_each_chunk_i_visitor{}, first, last, std::forward<Fn>(fn));
+    }
+
+    template <typename Fn>
+    bool for_each_chunk_p(Fn&& fn) const
+    {
+        return traverse_p(for_each_chunk_p_visitor{}, std::forward<Fn>(fn));
+    }
+
+    template <typename Fn>
+    bool for_each_chunk_p(size_t first, size_t last, Fn&& fn) const
+    {
+        return traverse_p(for_each_chunk_p_i_visitor{}, first, last, std::forward<Fn>(fn));
+    }
+
+    bool equals(const rbtree& other) const
+    {
+        if (size != other.size) return false;
+        if (size == 0) return true;
+        return (size <= branches<B>
+                || make_regular_sub_pos(root, shift, tail_offset()).visit(
+                    equals_visitor{}, other.root))
+            && make_leaf_sub_pos(tail, tail_size()).visit(
+                equals_visitor{}, other.tail);
+    }
+
+    void ensure_mutable_tail(edit_t e, count_t n)
+    {
+        if (!tail->can_mutate(e)) {
+            auto new_tail = node_t::copy_leaf_e(e, tail, n);
+            dec_leaf(tail, n);
+            tail = new_tail;
+        }
+    }
+
+    void push_back_mut(edit_t e, T value)
+    {
+        auto tail_off = tail_offset();
+        auto ts = size - tail_off;
+        if (ts < branches<BL>) {
+            ensure_mutable_tail(e, ts);
+            new (&tail->leaf()[ts]) T{std::move(value)};
+        } else {
+            auto new_tail = node_t::make_leaf_e(e, std::move(value));
+            try {
+                if (tail_off == size_t{branches<B>} << shift) {
+                    auto new_root = node_t::make_inner_e(e);
+                    try {
+                        auto path = node_t::make_path_e(e, shift, tail);
+                        new_root->inner() [0] = root;
+                        new_root->inner() [1] = path;
+                        root = new_root;
+                        tail = new_tail;
+                        shift += B;
+                    } catch (...) {
+                        node_t::delete_inner_e(new_root);
+                        throw;
+                    }
+                } else if (tail_off) {
+                    auto new_root = make_regular_sub_pos(root, shift, tail_off)
+                        .visit(push_tail_mut_visitor<node_t>{}, e, tail);
+                    root = new_root;
+                    tail = new_tail;
+                } else {
+                    auto new_root = node_t::make_path_e(e, shift, tail);
+                    assert(tail_off == 0);
+                    dec_empty_regular(root);
+                    root = new_root;
+                    tail = new_tail;
+                }
+            } catch (...) {
+                node_t::delete_leaf(new_tail, 1);
+                throw;
+            }
+        }
+        ++size;
+    }
+
+    rbtree push_back(T value) const
+    {
+        auto tail_off = tail_offset();
+        auto ts = size - tail_off;
+        if (ts < branches<BL>) {
+            auto new_tail = node_t::copy_leaf_emplace(tail, ts,
+                                                      std::move(value));
+            return { size + 1, shift, root->inc(), new_tail };
+        } else {
+            auto new_tail = node_t::make_leaf_n(1, std::move(value));
+            try {
+                if (tail_off == size_t{branches<B>} << shift) {
+                    auto new_root = node_t::make_inner_n(2);
+                    try {
+                        auto path = node_t::make_path(shift, tail);
+                        new_root->inner() [0] = root;
+                        new_root->inner() [1] = path;
+                        root->inc();
+                        tail->inc();
+                        return { size + 1, shift + B, new_root, new_tail };
+                    } catch (...) {
+                        node_t::delete_inner(new_root, 2);
+                        throw;
+                    }
+                } else if (tail_off) {
+                    auto new_root = make_regular_sub_pos(root, shift, tail_off)
+                        .visit(push_tail_visitor<node_t>{}, tail);
+                    tail->inc();
+                    return { size + 1, shift, new_root, new_tail };
+                } else {
+                    auto new_root = node_t::make_path(shift, tail);
+                    tail->inc();
+                    return { size + 1, shift, new_root, new_tail };
+                }
+            } catch (...) {
+                node_t::delete_leaf(new_tail, 1);
+                throw;
+            }
+        }
+    }
+
+    const T* array_for(size_t index) const
+    {
+        return descend(array_for_visitor<T>(), index);
+    }
+
+    T& get_mut(edit_t e, size_t idx)
+    {
+        auto tail_off = tail_offset();
+        if (idx >= tail_off) {
+            ensure_mutable_tail(e, size - tail_off);
+            return tail->leaf() [idx & mask<BL>];
+        } else {
+            return make_regular_sub_pos(root, shift, tail_off)
+                .visit(get_mut_visitor<node_t>{}, idx, e, &root);
+        }
+    }
+
+    const T& get(size_t index) const
+    {
+        return descend(get_visitor<T>(), index);
+    }
+
+    const T& get_check(size_t index) const
+    {
+        if (index >= size)
+            throw std::out_of_range{"index out of range"};
+        return descend(get_visitor<T>(), index);
+    }
+
+    const T& front() const
+    {
+        return get(0);
+    }
+
+    const T& back() const
+    {
+        return tail->leaf()[(size - 1) & mask<BL>];
+    }
+
+    template <typename FnT>
+    void update_mut(edit_t e, size_t idx, FnT&& fn)
+    {
+        auto& elem = get_mut(e, idx);
+        elem = std::forward<FnT>(fn) (std::move(elem));
+    }
+
+    template <typename FnT>
+    rbtree update(size_t idx, FnT&& fn) const
+    {
+        auto tail_off  = tail_offset();
+        if (idx >= tail_off) {
+            auto tail_size = size - tail_off;
+            auto new_tail  = make_leaf_sub_pos(tail, tail_size)
+                .visit(update_visitor<node_t>{}, idx - tail_off, fn);
+            return { size, shift, root->inc(), new_tail };
+        } else {
+            auto new_root  = make_regular_sub_pos(root, shift, tail_off)
+                .visit(update_visitor<node_t>{}, idx, fn);
+            return { size, shift, new_root, tail->inc() };
+        }
+    }
+
+    void assoc_mut(edit_t e, size_t idx, T value)
+    {
+        update_mut(e, idx, [&] (auto&&) {
+                return std::move(value);
+            });
+    }
+
+    rbtree assoc(size_t idx, T value) const
+    {
+        return update(idx, [&] (auto&&) {
+                return std::move(value);
+            });
+    }
+
+    rbtree take(size_t new_size) const
+    {
+        auto tail_off = tail_offset();
+        if (new_size == 0) {
+            return empty;
+        } else if (new_size >= size) {
+            return *this;
+        } else if (new_size > tail_off) {
+            auto new_tail = node_t::copy_leaf(tail, new_size - tail_off);
+            return { new_size, shift, root->inc(), new_tail };
+        } else {
+            using std::get;
+            auto l = new_size - 1;
+            auto v = slice_right_visitor<node_t>();
+            auto r = make_regular_sub_pos(root, shift, tail_off).visit(v, l);
+            auto new_shift = get<0>(r);
+            auto new_root  = get<1>(r);
+            auto new_tail  = get<3>(r);
+            if (new_root) {
+                assert(new_root->compute_shift() == get<0>(r));
+                assert(new_root->check(new_shift, new_size - get<2>(r)));
+                return { new_size, new_shift, new_root, new_tail };
+            } else {
+                return { new_size, BL, empty.root->inc(), new_tail };
+            }
+        }
+    }
+
+    void take_mut(edit_t e, size_t new_size)
+    {
+        auto tail_off = tail_offset();
+        if (new_size == 0) {
+            // todo: more efficient?
+            *this = empty;
+        } else if (new_size >= size) {
+            return;
+        } else if (new_size > tail_off) {
+            auto ts    = size - tail_off;
+            auto newts = new_size - tail_off;
+            if (tail->can_mutate(e)) {
+                destroy_n(tail->leaf() + newts, ts - newts);
+            } else {
+                auto new_tail = node_t::copy_leaf_e(e, tail, newts);
+                dec_leaf(tail, ts);
+                tail = new_tail;
+            }
+            size = new_size;
+            return;
+        } else {
+            using std::get;
+            auto l = new_size - 1;
+            auto v = slice_right_mut_visitor<node_t>();
+            auto r = make_regular_sub_pos(root, shift, tail_off).visit(v, l, e);
+            auto new_shift = get<0>(r);
+            auto new_root  = get<1>(r);
+            auto new_tail  = get<3>(r);
+            if (new_root) {
+                root  = new_root;
+                shift = new_shift;
+            } else {
+                root  = empty.root->inc();
+                shift = BL;
+            }
+            dec_leaf(tail, size - tail_off);
+            size  = new_size;
+            tail  = new_tail;
+            return;
+        }
+    }
+
+    bool check_tree() const
+    {
+#if IMMER_DEBUG_DEEP_CHECK
+        assert(shift >= BL);
+        assert(tail_offset() <= size);
+        assert(check_root());
+        assert(check_tail());
+#endif
+        return true;
+    }
+
+    bool check_tail() const
+    {
+#if IMMER_DEBUG_DEEP_CHECK
+        if (tail_size() > 0)
+            assert(tail->check(0, tail_size()));
+#endif
+        return true;
+    }
+
+    bool check_root() const
+    {
+#if IMMER_DEBUG_DEEP_CHECK
+        if (tail_offset() > 0)
+            assert(root->check(shift, tail_offset()));
+        else {
+            assert(root->kind() == node_t::kind_t::inner);
+            assert(shift == BL);
+        }
+#endif
+        return true;
+    }
+};
+
+template <typename T, typename MP, bits_t B, bits_t BL>
+const rbtree<T, MP, B, BL> rbtree<T, MP, B, BL>::empty = {
+    0,
+    BL,
+    node_t::make_inner_n(0),
+    node_t::make_leaf_n(0)
+};
+
+} // namespace rbts
+} // namespace detail
+} // namespace immer
diff --git a/src/immer/detail/rbts/rbtree_iterator.hpp b/src/immer/detail/rbts/rbtree_iterator.hpp
new file mode 100644
index 000000000000..f1890dc053a1
--- /dev/null
+++ b/src/immer/detail/rbts/rbtree_iterator.hpp
@@ -0,0 +1,100 @@
+//
+// immer: immutable data structures for C++
+// Copyright (C) 2016, 2017, 2018 Juan Pedro Bolivar Puente
+//
+// This software is distributed under the Boost Software License, Version 1.0.
+// See accompanying file LICENSE or copy at http://boost.org/LICENSE_1_0.txt
+//
+
+#pragma once
+
+#include <immer/detail/rbts/rbtree.hpp>
+#include <immer/detail/iterator_facade.hpp>
+
+namespace immer {
+namespace detail {
+namespace rbts {
+
+template <typename T, typename MP, bits_t B, bits_t BL>
+struct rbtree_iterator
+    : iterator_facade<rbtree_iterator<T, MP, B, BL>,
+                      std::random_access_iterator_tag,
+                      T,
+                      const T&>
+{
+    using tree_t = rbtree<T, MP, B, BL>;
+
+    struct end_t {};
+
+    rbtree_iterator() = default;
+
+    rbtree_iterator(const tree_t& v)
+        : v_    { &v }
+        , i_    { 0 }
+        , base_ { ~size_t{} }
+        , curr_ { nullptr }
+    {}
+
+    rbtree_iterator(const tree_t& v, end_t)
+        : v_    { &v }
+        , i_    { v.size }
+        , base_ { ~size_t{} }
+        , curr_ { nullptr }
+    {}
+
+    const tree_t& impl() const { return *v_; }
+    size_t index() const { return i_; }
+
+private:
+    friend iterator_core_access;
+
+    const tree_t*    v_;
+    size_t           i_;
+    mutable size_t   base_;
+    mutable const T* curr_ = nullptr;
+
+    void increment()
+    {
+        assert(i_ < v_->size);
+        ++i_;
+    }
+
+    void decrement()
+    {
+        assert(i_ > 0);
+        --i_;
+    }
+
+    void advance(std::ptrdiff_t n)
+    {
+        assert(n <= 0 || i_ + static_cast<size_t>(n) <= v_->size);
+        assert(n >= 0 || static_cast<size_t>(-n) <= i_);
+        i_ += n;
+    }
+
+    bool equal(const rbtree_iterator& other) const
+    {
+        return i_ == other.i_;
+    }
+
+    std::ptrdiff_t distance_to(const rbtree_iterator& other) const
+    {
+        return other.i_ > i_
+            ?   static_cast<std::ptrdiff_t>(other.i_ - i_)
+            : - static_cast<std::ptrdiff_t>(i_ - other.i_);
+    }
+
+    const T& dereference() const
+    {
+        auto base = i_ & ~mask<BL>;
+        if (base_ != base) {
+            base_ = base;
+            curr_ = v_->array_for(i_);
+        }
+        return curr_[i_ & mask<BL>];
+    }
+};
+
+} // namespace rbts
+} // namespace detail
+} // namespace immer
diff --git a/src/immer/detail/rbts/rrbtree.hpp b/src/immer/detail/rbts/rrbtree.hpp
new file mode 100644
index 000000000000..5766cffc50b7
--- /dev/null
+++ b/src/immer/detail/rbts/rrbtree.hpp
@@ -0,0 +1,1272 @@
+//
+// immer: immutable data structures for C++
+// Copyright (C) 2016, 2017, 2018 Juan Pedro Bolivar Puente
+//
+// This software is distributed under the Boost Software License, Version 1.0.
+// See accompanying file LICENSE or copy at http://boost.org/LICENSE_1_0.txt
+//
+
+#pragma once
+
+#include <immer/config.hpp>
+#include <immer/detail/rbts/node.hpp>
+#include <immer/detail/rbts/position.hpp>
+#include <immer/detail/rbts/operations.hpp>
+
+#include <cassert>
+#include <memory>
+#include <numeric>
+
+namespace immer {
+namespace detail {
+namespace rbts {
+
+template <typename T,
+          typename MemoryPolicy,
+          bits_t   B,
+          bits_t   BL>
+struct rrbtree_iterator;
+
+template <typename T,
+          typename MemoryPolicy,
+          bits_t   B,
+          bits_t   BL>
+struct rrbtree
+{
+    using node_t  = node<T, MemoryPolicy, B, BL>;
+    using edit_t  = typename node_t::edit_t;
+    using owner_t = typename MemoryPolicy::transience_t::owner;
+
+    size_t  size;
+    shift_t shift;
+    node_t* root;
+    node_t* tail;
+
+    static const rrbtree empty;
+
+    template <typename U>
+    static auto from_initializer_list(std::initializer_list<U> values)
+    {
+        auto e = owner_t{};
+        auto result = rrbtree{empty};
+        for (auto&& v : values)
+            result.push_back_mut(e, v);
+        return result;
+    }
+
+    template <typename Iter>
+    static auto from_range(Iter first, Iter last)
+    {
+        auto e = owner_t{};
+        auto result = rrbtree{empty};
+        for (; first != last; ++first)
+            result.push_back_mut(e, *first);
+        return result;
+    }
+
+    static auto from_fill(size_t n, T v)
+    {
+        auto e = owner_t{};
+        auto result = rrbtree{empty};
+        while (n --> 0)
+            result.push_back_mut(e, v);
+        return result;
+    }
+
+    rrbtree(size_t sz, shift_t sh, node_t* r, node_t* t)
+        : size{sz}, shift{sh}, root{r}, tail{t}
+    {
+        assert(check_tree());
+    }
+
+    rrbtree(const rrbtree& other)
+        : rrbtree{other.size, other.shift, other.root, other.tail}
+    {
+        inc();
+    }
+
+    rrbtree(rrbtree&& other)
+        : rrbtree{empty}
+    {
+        swap(*this, other);
+    }
+
+    rrbtree& operator=(const rrbtree& other)
+    {
+        auto next{other};
+        swap(*this, next);
+        return *this;
+    }
+
+    rrbtree& operator=(rrbtree&& other)
+    {
+        swap(*this, other);
+        return *this;
+    }
+
+    friend void swap(rrbtree& x, rrbtree& y)
+    {
+        using std::swap;
+        swap(x.size,  y.size);
+        swap(x.shift, y.shift);
+        swap(x.root,  y.root);
+        swap(x.tail,  y.tail);
+    }
+
+    ~rrbtree()
+    {
+        dec();
+    }
+
+    void inc() const
+    {
+        root->inc();
+        tail->inc();
+    }
+
+    void dec() const
+    {
+        traverse(dec_visitor());
+    }
+
+    auto tail_size() const
+    {
+        return size - tail_offset();
+    }
+
+    auto tail_offset() const
+    {
+        auto r = root->relaxed();
+        assert(r == nullptr || r->d.count);
+        return
+            r               ? r->d.sizes[r->d.count - 1] :
+            size            ? (size - 1) & ~mask<BL>
+            /* otherwise */ : 0;
+    }
+
+    template <typename Visitor, typename... Args>
+    void traverse(Visitor v, Args&&... args) const
+    {
+        auto tail_off  = tail_offset();
+        auto tail_size = size - tail_off;
+
+        if (tail_off) visit_maybe_relaxed_sub(root, shift, tail_off, v, args...);
+        else make_empty_regular_pos(root).visit(v, args...);
+
+        if (tail_size) make_leaf_sub_pos(tail, tail_size).visit(v, args...);
+        else make_empty_leaf_pos(tail).visit(v, args...);
+    }
+
+    template <typename Visitor, typename... Args>
+    void traverse(Visitor v, size_t first, size_t last, Args&&... args) const
+    {
+        auto tail_off  = tail_offset();
+        auto tail_size = size - tail_off;
+
+        if (first < tail_off)
+            visit_maybe_relaxed_sub(root, shift, tail_off, v,
+                                    first,
+                                    last < tail_off ? last : tail_off,
+                                    args...);
+        if (last > tail_off)
+            make_leaf_sub_pos(tail, tail_size).visit(
+                v,
+                first > tail_off ? first - tail_off : 0,
+                last - tail_off,
+                args...);
+    }
+
+    template <typename Visitor, typename... Args>
+    bool traverse_p(Visitor v, Args&&... args) const
+    {
+        auto tail_off  = tail_offset();
+        auto tail_size = size - tail_off;
+        return (tail_off
+                ? visit_maybe_relaxed_sub(root, shift, tail_off, v, args...)
+                : make_empty_regular_pos(root).visit(v, args...))
+            && (tail_size
+                ? make_leaf_sub_pos(tail, tail_size).visit(v, args...)
+                : make_empty_leaf_pos(tail).visit(v, args...));
+    }
+
+    template <typename Visitor, typename... Args>
+    bool traverse_p(Visitor v, size_t first, size_t last, Args&&... args) const
+    {
+        auto tail_off  = tail_offset();
+        auto tail_size = size - tail_off;
+        return
+            (first < tail_off
+             ? visit_maybe_relaxed_sub(root, shift, tail_off, v,
+                                       first,
+                                       last < tail_off ? last : tail_off,
+                                       args...)
+             : true)
+         && (last > tail_off
+             ? make_leaf_sub_pos(tail, tail_size).visit(
+                 v,
+                 first > tail_off ? first - tail_off : 0,
+                 last - tail_off,
+                 args...)
+             : true);
+    }
+
+    template <typename Visitor>
+    decltype(auto) descend(Visitor v, size_t idx) const
+    {
+        auto tail_off  = tail_offset();
+        return idx >= tail_off
+            ? make_leaf_descent_pos(tail).visit(v, idx - tail_off)
+            : visit_maybe_relaxed_descent(root, shift, v, idx);
+    }
+
+    template <typename Fn>
+    void for_each_chunk(Fn&& fn) const
+    {
+        traverse(for_each_chunk_visitor{}, std::forward<Fn>(fn));
+    }
+
+    template <typename Fn>
+    void for_each_chunk(size_t first, size_t last, Fn&& fn) const
+    {
+        traverse(for_each_chunk_i_visitor{}, first, last, std::forward<Fn>(fn));
+    }
+
+    template <typename Fn>
+    bool for_each_chunk_p(Fn&& fn) const
+    {
+        return traverse_p(for_each_chunk_p_visitor{}, std::forward<Fn>(fn));
+    }
+
+    template <typename Fn>
+    bool for_each_chunk_p(size_t first, size_t last, Fn&& fn) const
+    {
+        return traverse_p(for_each_chunk_p_i_visitor{}, first, last, std::forward<Fn>(fn));
+    }
+
+    bool equals(const rrbtree& other) const
+    {
+        using iter_t = rrbtree_iterator<T, MemoryPolicy, B, BL>;
+        if (size != other.size) return false;
+        if (size == 0) return true;
+        auto tail_off = tail_offset();
+        auto tail_off_other = other.tail_offset();
+        // compare trees
+        if (tail_off > 0 && tail_off_other > 0) {
+            // other.shift != shift is a theoretical possibility for
+            // relaxed trees that sadly we haven't managed to exercise
+            // in tests yet...
+            if (other.shift >= shift) {
+                if (!visit_maybe_relaxed_sub(
+                        other.root, other.shift, tail_off_other,
+                        equals_visitor::rrb{}, iter_t{other},
+                        root, shift, tail_off))
+                    return false;
+            } else {
+                if (!visit_maybe_relaxed_sub(
+                        root, shift, tail_off,
+                        equals_visitor::rrb{}, iter_t{*this},
+                        other.root, other.shift, tail_off_other))
+                    return false;
+            }
+        }
+        return
+            tail_off == tail_off_other ? make_leaf_sub_pos(
+                tail, tail_size()).visit(
+                    equals_visitor{}, other.tail) :
+            tail_off > tail_off_other  ? std::equal(
+                tail->leaf(), tail->leaf() + (size - tail_off),
+                other.tail->leaf() + (tail_off - tail_off_other))
+            /* otherwise */            : std::equal(
+                tail->leaf(), tail->leaf() + (size - tail_off),
+                iter_t{other} + tail_off);
+    }
+
+    std::tuple<shift_t, node_t*>
+    push_tail(node_t* root, shift_t shift, size_t size,
+              node_t* tail, count_t tail_size) const
+    {
+        if (auto r = root->relaxed()) {
+            auto new_root = make_relaxed_pos(root, shift, r)
+                .visit(push_tail_visitor<node_t>{}, tail, tail_size);
+            if (new_root)
+                return { shift, new_root };
+            else {
+                auto new_root = node_t::make_inner_r_n(2);
+                try {
+                    auto new_path = node_t::make_path(shift, tail);
+                    new_root->inner() [0] = root->inc();
+                    new_root->inner() [1] = new_path;
+                    new_root->relaxed()->d.sizes [0] = size;
+                    new_root->relaxed()->d.sizes [1] = size + tail_size;
+                    new_root->relaxed()->d.count = 2u;
+                } catch (...) {
+                    node_t::delete_inner_r(new_root, 2);
+                    throw;
+                }
+                return { shift + B, new_root };
+            }
+        } else if (size == size_t{branches<B>} << shift) {
+            auto new_root = node_t::make_inner_n(2);
+            try {
+                auto new_path = node_t::make_path(shift, tail);
+                new_root->inner() [0] = root->inc();
+                new_root->inner() [1] = new_path;
+            } catch (...) {
+                node_t::delete_inner(new_root, 2);
+                throw;
+            }
+            return { shift + B, new_root };
+        } else if (size) {
+            auto new_root = make_regular_sub_pos(root, shift, size)
+                .visit(push_tail_visitor<node_t>{}, tail);
+            return { shift, new_root };
+        } else {
+            return { shift, node_t::make_path(shift, tail) };
+        }
+    }
+
+    void push_tail_mut(edit_t e, size_t tail_off,
+                       node_t* tail, count_t tail_size)
+    {
+        if (auto r = root->relaxed()) {
+            auto new_root = make_relaxed_pos(root, shift, r)
+                .visit(push_tail_mut_visitor<node_t>{}, e, tail, tail_size);
+            if (new_root) {
+                root = new_root;
+            } else {
+                auto new_root = node_t::make_inner_r_e(e);
+                try {
+                    auto new_path = node_t::make_path_e(e, shift, tail);
+                    new_root->inner() [0] = root;
+                    new_root->inner() [1] = new_path;
+                    new_root->relaxed()->d.sizes [0] = tail_off;
+                    new_root->relaxed()->d.sizes [1] = tail_off + tail_size;
+                    new_root->relaxed()->d.count = 2u;
+                    root = new_root;
+                    shift += B;
+                } catch (...) {
+                    node_t::delete_inner_r_e(new_root);
+                    throw;
+                }
+            }
+        } else if (tail_off == size_t{branches<B>} << shift) {
+            auto new_root = node_t::make_inner_e(e);
+            try {
+                auto new_path = node_t::make_path_e(e, shift, tail);
+                new_root->inner() [0] = root;
+                new_root->inner() [1] = new_path;
+                root = new_root;
+                shift += B;
+            } catch (...) {
+                node_t::delete_inner_e(new_root);
+                throw;
+            }
+        } else if (tail_off) {
+            auto new_root = make_regular_sub_pos(root, shift, tail_off)
+                .visit(push_tail_mut_visitor<node_t>{}, e, tail);
+            root = new_root;
+        } else {
+            auto new_root = node_t::make_path_e(e, shift, tail);
+            dec_empty_regular(root);
+            root = new_root;
+        }
+    }
+
+    void ensure_mutable_tail(edit_t e, count_t n)
+    {
+        if (!tail->can_mutate(e)) {
+            auto new_tail = node_t::copy_leaf_e(e, tail, n);
+            dec_leaf(tail, n);
+            tail = new_tail;
+        }
+    }
+
+    void push_back_mut(edit_t e, T value)
+    {
+        auto ts = tail_size();
+        if (ts < branches<BL>) {
+            ensure_mutable_tail(e, ts);
+            new (&tail->leaf()[ts]) T{std::move(value)};
+        } else {
+            using std::get;
+            auto new_tail = node_t::make_leaf_e(e, std::move(value));
+            auto tail_off = tail_offset();
+            try {
+                push_tail_mut(e, tail_off, tail, ts);
+                tail = new_tail;
+            } catch (...) {
+                node_t::delete_leaf(new_tail, 1u);
+                throw;
+            }
+        }
+        ++size;
+    }
+
+    rrbtree push_back(T value) const
+    {
+        auto ts = tail_size();
+        if (ts < branches<BL>) {
+            auto new_tail = node_t::copy_leaf_emplace(tail, ts,
+                                                      std::move(value));
+            return { size + 1, shift, root->inc(), new_tail };
+        } else {
+            using std::get;
+            auto new_tail = node_t::make_leaf_n(1u, std::move(value));
+            auto tail_off = tail_offset();
+            try {
+                auto new_root = push_tail(root, shift, tail_off,
+                                          tail, size - tail_off);
+                tail->inc();
+                return { size + 1, get<0>(new_root), get<1>(new_root), new_tail };
+            } catch (...) {
+                node_t::delete_leaf(new_tail, 1u);
+                throw;
+            }
+        }
+    }
+
+    std::tuple<const T*, size_t, size_t>
+    region_for(size_t idx) const
+    {
+        using std::get;
+        auto tail_off = tail_offset();
+        if (idx >= tail_off) {
+            return { tail->leaf(), tail_off, size };
+        } else {
+            auto subs = visit_maybe_relaxed_sub(
+                root, shift, tail_off,
+                region_for_visitor<T>(), idx);
+            auto first = idx - get<1>(subs);
+            auto end   = first + get<2>(subs);
+            return { get<0>(subs), first, end };
+        }
+    }
+
+    T& get_mut(edit_t e, size_t idx)
+    {
+        auto tail_off = tail_offset();
+        if (idx >= tail_off) {
+            ensure_mutable_tail(e, size - tail_off);
+            return tail->leaf() [(idx - tail_off) & mask<BL>];
+        } else {
+            return visit_maybe_relaxed_sub(
+                root, shift, tail_off,
+                get_mut_visitor<node_t>{}, idx, e, &root);
+        }
+    }
+
+    const T& get(size_t index) const
+    {
+        return descend(get_visitor<T>(), index);
+    }
+
+    const T& get_check(size_t index) const
+    {
+        if (index >= size)
+            throw std::out_of_range{"out of range"};
+        return descend(get_visitor<T>(), index);
+    }
+
+    const T& front() const
+    {
+        return get(0);
+    }
+
+    const T& back() const
+    {
+        return get(size - 1);
+    }
+
+    template <typename FnT>
+    void update_mut(edit_t e, size_t idx, FnT&& fn)
+    {
+        auto& elem = get_mut(e, idx);
+        elem = std::forward<FnT>(fn) (std::move(elem));
+    }
+
+    template <typename FnT>
+    rrbtree update(size_t idx, FnT&& fn) const
+    {
+        auto tail_off  = tail_offset();
+        if (idx >= tail_off) {
+            auto tail_size = size - tail_off;
+            auto new_tail  = make_leaf_sub_pos(tail, tail_size)
+                .visit(update_visitor<node_t>{}, idx - tail_off, fn);
+            return { size, shift, root->inc(), new_tail };
+        } else {
+            auto new_root  = visit_maybe_relaxed_sub(
+                root, shift, tail_off,
+                update_visitor<node_t>{}, idx, fn);
+            return { size, shift, new_root, tail->inc() };
+        }
+    }
+
+    void assoc_mut(edit_t e, size_t idx, T value)
+    {
+        update_mut(e, idx, [&] (auto&&) {
+                return std::move(value);
+            });
+    }
+
+    rrbtree assoc(size_t idx, T value) const
+    {
+        return update(idx, [&] (auto&&) {
+                return std::move(value);
+            });
+    }
+
+    void take_mut(edit_t e, size_t new_size)
+    {
+        auto tail_off = tail_offset();
+        if (new_size == 0) {
+            *this = empty;
+        } else if (new_size >= size) {
+            return;
+        } else if (new_size > tail_off) {
+            auto ts    = size - tail_off;
+            auto newts = new_size - tail_off;
+            if (tail->can_mutate(e)) {
+                destroy_n(tail->leaf() + newts, ts - newts);
+            } else {
+                auto new_tail = node_t::copy_leaf_e(e, tail, newts);
+                dec_leaf(tail, ts);
+                tail = new_tail;
+            }
+            size = new_size;
+            return;
+        } else {
+            using std::get;
+            auto l = new_size - 1;
+            auto v = slice_right_mut_visitor<node_t>();
+            auto r = visit_maybe_relaxed_sub(root, shift, tail_off, v, l, e);
+            auto new_shift = get<0>(r);
+            auto new_root  = get<1>(r);
+            auto new_tail  = get<3>(r);
+            if (new_root) {
+                root  = new_root;
+                shift = new_shift;
+            } else {
+                root  = empty.root->inc();
+                shift = BL;
+            }
+            dec_leaf(tail, size - tail_off);
+            size  = new_size;
+            tail  = new_tail;
+            return;
+        }
+    }
+
+    rrbtree take(size_t new_size) const
+    {
+        auto tail_off = tail_offset();
+        if (new_size == 0) {
+            return empty;
+        } else if (new_size >= size) {
+            return *this;
+        } else if (new_size > tail_off) {
+            auto new_tail = node_t::copy_leaf(tail, new_size - tail_off);
+            return { new_size, shift, root->inc(), new_tail };
+        } else {
+            using std::get;
+            auto l = new_size - 1;
+            auto v = slice_right_visitor<node_t>();
+            auto r = visit_maybe_relaxed_sub(root, shift, tail_off, v, l);
+            auto new_shift = get<0>(r);
+            auto new_root  = get<1>(r);
+            auto new_tail  = get<3>(r);
+            if (new_root) {
+                assert(new_root->compute_shift() == get<0>(r));
+                assert(new_root->check(new_shift, new_size - get<2>(r)));
+                return { new_size, new_shift, new_root, new_tail };
+            } else {
+                return { new_size, BL, empty.root->inc(), new_tail };
+            }
+        }
+    }
+
+    void drop_mut(edit_t e, size_t elems)
+    {
+        using std::get;
+        auto tail_off = tail_offset();
+        if (elems == 0) {
+            return;
+        } else if (elems >= size) {
+            *this = empty;
+        } else if (elems == tail_off) {
+            dec_inner(root, shift, tail_off);
+            shift = BL;
+            root  = empty.root->inc();
+            size -= elems;
+            return;
+        } else if (elems > tail_off) {
+            auto v = slice_left_mut_visitor<node_t>();
+            tail = get<1>(make_leaf_sub_pos(tail, size - tail_off).visit(
+                              v, elems - tail_off, e));
+            if (root != empty.root) {
+                dec_inner(root, shift, tail_off);
+                shift = BL;
+                root  = empty.root->inc();
+            }
+            size -= elems;
+            return;
+        } else {
+            auto v = slice_left_mut_visitor<node_t>();
+            auto r = visit_maybe_relaxed_sub(root, shift, tail_off, v, elems, e);
+            shift = get<0>(r);
+            root  = get<1>(r);
+            size -= elems;
+            return;
+        }
+    }
+
+    rrbtree drop(size_t elems) const
+    {
+        if (elems == 0) {
+            return *this;
+        } else if (elems >= size) {
+            return empty;
+        } else if (elems == tail_offset()) {
+            return { size - elems, BL, empty.root->inc(), tail->inc() };
+        } else if (elems > tail_offset()) {
+            auto tail_off = tail_offset();
+            auto new_tail = node_t::copy_leaf(tail, elems - tail_off,
+                                              size - tail_off);
+            return { size - elems, BL, empty.root->inc(), new_tail };
+        } else {
+            using std::get;
+            auto v = slice_left_visitor<node_t>();
+            auto r = visit_maybe_relaxed_sub(root, shift, tail_offset(), v, elems);
+            auto new_root  = get<1>(r);
+            auto new_shift = get<0>(r);
+            return { size - elems, new_shift, new_root, tail->inc() };
+        }
+        return *this;
+    }
+
+    rrbtree concat(const rrbtree& r) const
+    {
+        assert(r.size < (std::numeric_limits<size_t>::max() - size));
+        using std::get;
+        if (size == 0)
+            return r;
+        else if (r.size == 0)
+            return *this;
+        else if (r.tail_offset() == 0) {
+            // just concat the tail, similar to push_back
+            auto tail_offst = tail_offset();
+            auto tail_size  = size - tail_offst;
+            if (tail_size == branches<BL>) {
+                auto new_root = push_tail(root, shift, tail_offst,
+                                          tail, tail_size);
+                tail->inc();
+                return { size + r.size, get<0>(new_root), get<1>(new_root),
+                         r.tail->inc() };
+            } else if (tail_size + r.size <= branches<BL>) {
+                auto new_tail = node_t::copy_leaf(tail, tail_size,
+                                                  r.tail, r.size);
+                return { size + r.size, shift, root->inc(), new_tail };
+            } else {
+                auto remaining = branches<BL> - tail_size;
+                auto add_tail  = node_t::copy_leaf(tail, tail_size,
+                                                   r.tail, remaining);
+                try {
+                    auto new_tail = node_t::copy_leaf(r.tail, remaining, r.size);
+                    try {
+                        auto new_root  = push_tail(root, shift, tail_offst,
+                                                   add_tail, branches<BL>);
+                        return { size + r.size,
+                                 get<0>(new_root), get<1>(new_root),
+                                 new_tail };
+                    } catch (...) {
+                        node_t::delete_leaf(new_tail, r.size - remaining);
+                        throw;
+                    }
+                } catch (...) {
+                    node_t::delete_leaf(add_tail, branches<BL>);
+                    throw;
+                }
+            }
+        } else if (tail_offset() == 0) {
+            auto tail_offst = tail_offset();
+            auto tail_size  = size - tail_offst;
+            auto concated   = concat_trees(tail, tail_size,
+                                           r.root, r.shift, r.tail_offset());
+            auto new_shift  = concated.shift();
+            auto new_root   = concated.node();
+            assert(new_shift == new_root->compute_shift());
+            assert(new_root->check(new_shift, size + r.tail_offset()));
+            return { size + r.size, new_shift, new_root, r.tail->inc() };
+        } else {
+            auto tail_offst = tail_offset();
+            auto tail_size  = size - tail_offst;
+            auto concated   = concat_trees(root, shift, tail_offst,
+                                           tail, tail_size,
+                                           r.root, r.shift, r.tail_offset());
+            auto new_shift  = concated.shift();
+            auto new_root   = concated.node();
+            assert(new_shift == new_root->compute_shift());
+            assert(new_root->check(new_shift, size + r.tail_offset()));
+            return { size + r.size, new_shift, new_root, r.tail->inc() };
+        }
+    }
+
+    constexpr static bool supports_transient_concat =
+        !std::is_empty<edit_t>::value;
+
+    friend void concat_mut_l(rrbtree& l, edit_t el, const rrbtree& r)
+    {
+        assert(&l != &r);
+        assert(r.size < (std::numeric_limits<size_t>::max() - l.size));
+        using std::get;
+        if (l.size == 0)
+            l = r;
+        else if (r.size == 0)
+            return;
+        else if (r.tail_offset() == 0) {
+            // just concat the tail, similar to push_back
+            auto tail_offst = l.tail_offset();
+            auto tail_size  = l.size - tail_offst;
+            if (tail_size == branches<BL>) {
+                l.push_tail_mut(el, tail_offst, l.tail, tail_size);
+                l.tail = r.tail->inc();
+                l.size += r.size;
+                return;
+            } else if (tail_size + r.size <= branches<BL>) {
+                l.ensure_mutable_tail(el, tail_size);
+                std::uninitialized_copy(r.tail->leaf(),
+                                        r.tail->leaf() + r.size,
+                                        l.tail->leaf() + tail_size);
+                l.size += r.size;
+                return;
+            } else {
+                auto remaining = branches<BL> - tail_size;
+                l.ensure_mutable_tail(el, tail_size);
+                std::uninitialized_copy(r.tail->leaf(),
+                                        r.tail->leaf() + remaining,
+                                        l.tail->leaf() + tail_size);
+                try {
+                    auto new_tail = node_t::copy_leaf_e(el, r.tail, remaining, r.size);
+                    try {
+                        l.push_tail_mut(el, tail_offst, l.tail, branches<BL>);
+                        l.tail = new_tail;
+                        l.size += r.size;
+                        return;
+                    } catch (...) {
+                        node_t::delete_leaf(new_tail, r.size - remaining);
+                        throw;
+                    }
+                } catch (...) {
+                    destroy_n(r.tail->leaf() + tail_size, remaining);
+                    throw;
+                }
+            }
+        } else if (l.tail_offset() == 0) {
+            if (supports_transient_concat) {
+                auto tail_offst = l.tail_offset();
+                auto tail_size  = l.size - tail_offst;
+                auto concated   = concat_trees_mut(
+                    el,
+                    el, l.tail, tail_size,
+                    MemoryPolicy::transience_t::noone,
+                    r.root, r.shift, r.tail_offset());
+                assert(concated.shift() == concated.node()->compute_shift());
+                assert(concated.node()->check(concated.shift(), l.size + r.tail_offset()));
+                l.size += r.size;
+                l.shift = concated.shift();
+                l.root  = concated.node();
+                l.tail  = r.tail;
+            } else {
+                auto tail_offst = l.tail_offset();
+                auto tail_size  = l.size - tail_offst;
+                auto concated   = concat_trees(l.tail, tail_size,
+                                               r.root, r.shift, r.tail_offset());
+                l = { l.size + r.size, concated.shift(),
+                      concated.node(), r.tail->inc() };
+                return;
+            }
+        } else {
+            if (supports_transient_concat) {
+                auto tail_offst = l.tail_offset();
+                auto tail_size  = l.size - tail_offst;
+                auto concated   = concat_trees_mut(
+                    el,
+                    el, l.root, l.shift, tail_offst, l.tail, tail_size,
+                    MemoryPolicy::transience_t::noone,
+                    r.root, r.shift, r.tail_offset());
+                assert(concated.shift() == concated.node()->compute_shift());
+                assert(concated.node()->check(concated.shift(), l.size + r.tail_offset()));
+                l.size += r.size;
+                l.shift = concated.shift();
+                l.root  = concated.node();
+                l.tail  = r.tail;
+            } else {
+                auto tail_offst = l.tail_offset();
+                auto tail_size  = l.size - tail_offst;
+                auto concated   = concat_trees(l.root, l.shift, tail_offst,
+                                               l.tail, tail_size,
+                                               r.root, r.shift, r.tail_offset());
+                l = { l.size + r.size, concated.shift(),
+                      concated.node(), r.tail->inc() };
+            }
+        }
+    }
+
+    friend void concat_mut_r(const rrbtree& l, rrbtree& r, edit_t er)
+    {
+        assert(&l != &r);
+        assert(r.size < (std::numeric_limits<size_t>::max() - l.size));
+        using std::get;
+        if (r.size == 0)
+            r = std::move(l);
+        else if (l.size == 0)
+            return;
+        else if (r.tail_offset() == 0) {
+            // just concat the tail, similar to push_back
+            auto tail_offst = l.tail_offset();
+            auto tail_size  = l.size - tail_offst;
+            if (tail_size == branches<BL>) {
+                // this could be improved by making sure that the
+                // newly created nodes as part of the `push_tail()`
+                // are tagged with `er`
+                auto res = l.push_tail(l.root, l.shift, tail_offst,
+                                       l.tail, tail_size);
+                l.tail->inc(); // note: leak if mutably concatenated
+                               // with itself, but this is forbidden
+                               // by the interface
+                r = { l.size + r.size, get<0>(res), get<1>(res),
+                      r.tail->inc() };
+                return;
+            } else if (tail_size + r.size <= branches<BL>) {
+                // doing this in a exception way mutating way is very
+                // tricky while potential performance gains are
+                // minimal (we need to move every element of the right
+                // tail anyways to make space for the left tail)
+                //
+                // we could however improve this by at least moving the
+                // elements of the right tail...
+                auto new_tail = node_t::copy_leaf(l.tail, tail_size,
+                                                  r.tail, r.size);
+                r = { l.size + r.size, l.shift, l.root->inc(), new_tail };
+                return;
+            } else {
+                // like the immutable version
+                auto remaining = branches<BL> - tail_size;
+                auto add_tail  = node_t::copy_leaf_e(er,
+                                                     l.tail, tail_size,
+                                                     r.tail, remaining);
+                try {
+                    auto new_tail = node_t::copy_leaf_e(er, r.tail, remaining, r.size);
+                    try {
+                        // this could be improved by making sure that the
+                        // newly created nodes as part of the `push_tail()`
+                        // are tagged with `er`
+                        auto new_root = l.push_tail(l.root, l.shift, tail_offst,
+                                                    add_tail, branches<BL>);
+                        r = { l.size + r.size,
+                              get<0>(new_root), get<1>(new_root),
+                              new_tail };
+                        return;
+                    } catch (...) {
+                        node_t::delete_leaf(new_tail, r.size - remaining);
+                        throw;
+                    }
+                } catch (...) {
+                    node_t::delete_leaf(add_tail, branches<BL>);
+                    throw;
+                }
+                return;
+            }
+        } else if (l.tail_offset() == 0) {
+            if (supports_transient_concat) {
+                auto tail_offst = l.tail_offset();
+                auto tail_size  = l.size - tail_offst;
+                auto concated   = concat_trees_mut(
+                    er,
+                    MemoryPolicy::transience_t::noone, l.tail, tail_size,
+                    er,r.root, r.shift, r.tail_offset());
+                assert(concated.shift() == concated.node()->compute_shift());
+                assert(concated.node()->check(concated.shift(), l.size + r.tail_offset()));
+                r.size += l.size;
+                r.shift = concated.shift();
+                r.root  = concated.node();
+            } else {
+                auto tail_offst = l.tail_offset();
+                auto tail_size  = l.size - tail_offst;
+                auto concated   = concat_trees(l.tail, tail_size,
+                                               r.root, r.shift, r.tail_offset());
+                r = { l.size + r.size, concated.shift(),
+                      concated.node(), r.tail->inc() };
+                return;
+            }
+        } else {
+            if (supports_transient_concat) {
+                auto tail_offst = l.tail_offset();
+                auto tail_size  = l.size - tail_offst;
+                auto concated   = concat_trees_mut(
+                    er,
+                    MemoryPolicy::transience_t::noone,
+                    l.root, l.shift, tail_offst, l.tail, tail_size,
+                    er, r.root, r.shift, r.tail_offset());
+                assert(concated.shift() == concated.node()->compute_shift());
+                assert(concated.node()->check(concated.shift(), l.size + r.tail_offset()));
+                r.size += l.size;
+                r.shift = concated.shift();
+                r.root  = concated.node();
+                return;
+            } else {
+                auto tail_offst = l.tail_offset();
+                auto tail_size  = l.size - tail_offst;
+                auto concated   = concat_trees(l.root, l.shift, tail_offst,
+                                               l.tail, tail_size,
+                                               r.root, r.shift, r.tail_offset());
+                r = { l.size + r.size, concated.shift(),
+                      concated.node(), r.tail->inc() };
+                return;
+            }
+        }
+    }
+
+    friend void concat_mut_lr_l(rrbtree& l, edit_t el, rrbtree& r, edit_t er)
+    {
+        assert(&l != &r);
+        assert(r.size < (std::numeric_limits<size_t>::max() - l.size));
+        using std::get;
+        if (l.size == 0)
+            l = r;
+        else if (r.size == 0)
+            return;
+        else if (r.tail_offset() == 0) {
+            // just concat the tail, similar to push_back
+            auto tail_offst = l.tail_offset();
+            auto tail_size  = l.size - tail_offst;
+            if (tail_size == branches<BL>) {
+                l.push_tail_mut(el, tail_offst, l.tail, tail_size);
+                l.tail = r.tail->inc();
+                l.size += r.size;
+                return;
+            } else if (tail_size + r.size <= branches<BL>) {
+                l.ensure_mutable_tail(el, tail_size);
+                if (r.tail->can_mutate(er))
+                    uninitialized_move(r.tail->leaf(),
+                                       r.tail->leaf() + r.size,
+                                       l.tail->leaf() + tail_size);
+                else
+                    std::uninitialized_copy(r.tail->leaf(),
+                                            r.tail->leaf() + r.size,
+                                            l.tail->leaf() + tail_size);
+                l.size += r.size;
+                return;
+            } else {
+                auto remaining = branches<BL> - tail_size;
+                l.ensure_mutable_tail(el, tail_size);
+                if (r.tail->can_mutate(er))
+                    uninitialized_move(r.tail->leaf(),
+                                       r.tail->leaf() + remaining,
+                                       l.tail->leaf() + tail_size);
+                else
+                    std::uninitialized_copy(r.tail->leaf(),
+                                            r.tail->leaf() + remaining,
+                                            l.tail->leaf() + tail_size);
+                try {
+                    auto new_tail = node_t::copy_leaf_e(el, r.tail, remaining, r.size);
+                    try {
+                        l.push_tail_mut(el, tail_offst, l.tail, branches<BL>);
+                        l.tail = new_tail;
+                        l.size += r.size;
+                        return;
+                    } catch (...) {
+                        node_t::delete_leaf(new_tail, r.size - remaining);
+                        throw;
+                    }
+                } catch (...) {
+                    destroy_n(r.tail->leaf() + tail_size, remaining);
+                    throw;
+                }
+            }
+        } else if (l.tail_offset() == 0) {
+            if (supports_transient_concat) {
+                auto tail_offst = l.tail_offset();
+                auto tail_size  = l.size - tail_offst;
+                auto concated   = concat_trees_mut(
+                    el,
+                    el, l.tail, tail_size,
+                    er, r.root, r.shift, r.tail_offset());
+                assert(concated.shift() == concated.node()->compute_shift());
+                assert(concated.node()->check(concated.shift(), l.size + r.tail_offset()));
+                l.size += r.size;
+                l.shift = concated.shift();
+                l.root  = concated.node();
+                l.tail  = r.tail;
+                r.hard_reset();
+            } else {
+                auto tail_offst = l.tail_offset();
+                auto tail_size  = l.size - tail_offst;
+                auto concated   = concat_trees(l.tail, tail_size,
+                                               r.root, r.shift, r.tail_offset());
+                l = { l.size + r.size, concated.shift(),
+                      concated.node(), r.tail->inc() };
+                return;
+            }
+        } else {
+            if (supports_transient_concat) {
+                auto tail_offst = l.tail_offset();
+                auto tail_size  = l.size - tail_offst;
+                auto concated   = concat_trees_mut(
+                    el,
+                    el, l.root, l.shift, tail_offst, l.tail, tail_size,
+                    er, r.root, r.shift, r.tail_offset());
+                assert(concated.shift() == concated.node()->compute_shift());
+                assert(concated.node()->check(concated.shift(), l.size + r.tail_offset()));
+                l.size += r.size;
+                l.shift = concated.shift();
+                l.root  = concated.node();
+                l.tail  = r.tail;
+                r.hard_reset();
+            } else {
+                auto tail_offst = l.tail_offset();
+                auto tail_size  = l.size - tail_offst;
+                auto concated   = concat_trees(l.root, l.shift, tail_offst,
+                                               l.tail, tail_size,
+                                               r.root, r.shift, r.tail_offset());
+                l = { l.size + r.size, concated.shift(),
+                      concated.node(), r.tail->inc() };
+            }
+        }
+    }
+
+    friend void concat_mut_lr_r(rrbtree& l, edit_t el, rrbtree& r, edit_t er)
+    {
+        assert(&l != &r);
+        assert(r.size < (std::numeric_limits<size_t>::max() - l.size));
+        using std::get;
+        if (r.size == 0)
+            r = l;
+        else if (l.size == 0)
+            return;
+        else if (r.tail_offset() == 0) {
+            // just concat the tail, similar to push_back
+            auto tail_offst = l.tail_offset();
+            auto tail_size  = l.size - tail_offst;
+            if (tail_size == branches<BL>) {
+                // this could be improved by making sure that the
+                // newly created nodes as part of the `push_tail()`
+                // are tagged with `er`
+                auto res = l.push_tail(l.root, l.shift, tail_offst,
+                                       l.tail, tail_size);
+                r = { l.size + r.size, get<0>(res), get<1>(res),
+                      r.tail->inc() };
+                return;
+            } else if (tail_size + r.size <= branches<BL>) {
+                // doing this in a exception way mutating way is very
+                // tricky while potential performance gains are
+                // minimal (we need to move every element of the right
+                // tail anyways to make space for the left tail)
+                //
+                // we could however improve this by at least moving the
+                // elements of the mutable tails...
+                auto new_tail = node_t::copy_leaf(l.tail, tail_size,
+                                                  r.tail, r.size);
+                r = { l.size + r.size, l.shift, l.root->inc(), new_tail };
+                return;
+            } else {
+                // like the immutable version.
+                // we could improve this also by moving elements
+                // instead of just copying them
+                auto remaining = branches<BL> - tail_size;
+                auto add_tail  = node_t::copy_leaf_e(er,
+                                                     l.tail, tail_size,
+                                                     r.tail, remaining);
+                try {
+                    auto new_tail = node_t::copy_leaf_e(er, r.tail, remaining, r.size);
+                    try {
+                        // this could be improved by making sure that the
+                        // newly created nodes as part of the `push_tail()`
+                        // are tagged with `er`
+                        auto new_root = l.push_tail(l.root, l.shift, tail_offst,
+                                                    add_tail, branches<BL>);
+                        r = { l.size + r.size,
+                              get<0>(new_root), get<1>(new_root),
+                              new_tail };
+                        return;
+                    } catch (...) {
+                        node_t::delete_leaf(new_tail, r.size - remaining);
+                        throw;
+                    }
+                } catch (...) {
+                    node_t::delete_leaf(add_tail, branches<BL>);
+                    throw;
+                }
+                return;
+            }
+        } else if (l.tail_offset() == 0) {
+            if (supports_transient_concat) {
+                auto tail_offst = l.tail_offset();
+                auto tail_size  = l.size - tail_offst;
+                auto concated   = concat_trees_mut(
+                    er,
+                    el, l.tail, tail_size,
+                    er,r.root, r.shift, r.tail_offset());
+                assert(concated.shift() == concated.node()->compute_shift());
+                assert(concated.node()->check(concated.shift(), l.size + r.tail_offset()));
+                r.size += l.size;
+                r.shift = concated.shift();
+                r.root  = concated.node();
+                l.hard_reset();
+            } else {
+                auto tail_offst = l.tail_offset();
+                auto tail_size  = l.size - tail_offst;
+                auto concated   = concat_trees(l.tail, tail_size,
+                                               r.root, r.shift, r.tail_offset());
+                r = { l.size + r.size, concated.shift(),
+                      concated.node(), r.tail->inc() };
+                return;
+            }
+        } else {
+            if (supports_transient_concat) {
+                auto tail_offst = l.tail_offset();
+                auto tail_size  = l.size - tail_offst;
+                auto concated   = concat_trees_mut(
+                    er,
+                    el, l.root, l.shift, tail_offst, l.tail, tail_size,
+                    er, r.root, r.shift, r.tail_offset());
+                assert(concated.shift() == concated.node()->compute_shift());
+                assert(concated.node()->check(concated.shift(), l.size + r.tail_offset()));
+                r.size += l.size;
+                r.shift = concated.shift();
+                r.root  = concated.node();
+                l.hard_reset();
+            } else {
+                auto tail_offst = l.tail_offset();
+                auto tail_size  = l.size - tail_offst;
+                auto concated   = concat_trees(l.root, l.shift, tail_offst,
+                                               l.tail, tail_size,
+                                               r.root, r.shift, r.tail_offset());
+                r = { l.size + r.size, concated.shift(),
+                      concated.node(), r.tail->inc() };
+            }
+        }
+    }
+
+    void hard_reset()
+    {
+        assert(supports_transient_concat);
+        size = empty.size;
+        shift = empty.shift;
+        root = empty.root;
+        tail = empty.tail;
+    }
+
+    bool check_tree() const
+    {
+        assert(shift <= sizeof(size_t) * 8 - BL);
+        assert(shift >= BL);
+        assert(tail_offset() <= size);
+        assert(tail_size() <= branches<BL>);
+#if IMMER_DEBUG_DEEP_CHECK
+        assert(check_root());
+        assert(check_tail());
+#endif
+        return true;
+    }
+
+    bool check_tail() const
+    {
+#if IMMER_DEBUG_DEEP_CHECK
+        if (tail_size() > 0)
+            assert(tail->check(endshift<B, BL>, tail_size()));
+#endif
+        return true;
+    }
+
+    bool check_root() const
+    {
+#if IMMER_DEBUG_DEEP_CHECK
+        if (tail_offset() > 0)
+            assert(root->check(shift, tail_offset()));
+        else {
+            assert(root->kind() == node_t::kind_t::inner);
+            assert(shift == BL);
+        }
+#endif
+        return true;
+    }
+
+#if IMMER_DEBUG_PRINT
+    void debug_print() const
+    {
+        std::cerr
+            << "--" << std::endl
+            << "{" << std::endl
+            << "  size  = " << size << std::endl
+            << "  shift = " << shift << std::endl
+            << "  root  = " << std::endl;
+        debug_print_node(root, shift, tail_offset());
+        std::cerr << "  tail  = " << std::endl;
+        debug_print_node(tail, endshift<B, BL>, tail_size());
+        std::cerr << "}" << std::endl;
+    }
+
+    void debug_print_indent(unsigned indent) const
+    {
+        while (indent --> 0)
+            std::cerr << ' ';
+    }
+
+    void debug_print_node(node_t* node,
+                          shift_t shift,
+                          size_t size,
+                          unsigned indent = 8) const
+    {
+        const auto indent_step = 4;
+
+        if (shift == endshift<B, BL>) {
+            debug_print_indent(indent);
+            std::cerr << "- {" << size << "} "
+                      << pretty_print_array(node->leaf(), size)
+                      << std::endl;
+        } else if (auto r = node->relaxed()) {
+            auto count = r->d.count;
+            debug_print_indent(indent);
+            std::cerr << "# {" << size << "} "
+                      << pretty_print_array(r->d.sizes, r->d.count)
+                      << std::endl;
+            auto last_size = size_t{};
+            for (auto i = 0; i < count; ++i) {
+                debug_print_node(node->inner()[i],
+                                 shift - B,
+                                 r->d.sizes[i] - last_size,
+                                 indent + indent_step);
+                last_size = r->d.sizes[i];
+            }
+        } else {
+            debug_print_indent(indent);
+            std::cerr << "+ {" << size << "}" << std::endl;
+            auto count = (size >> shift)
+                + (size - ((size >> shift) << shift) > 0);
+            if (count) {
+                for (auto i = 0; i < count - 1; ++i)
+                    debug_print_node(node->inner()[i],
+                                     shift - B,
+                                     1 << shift,
+                                     indent + indent_step);
+                debug_print_node(node->inner()[count - 1],
+                                 shift - B,
+                                 size - ((count - 1) << shift),
+                                 indent + indent_step);
+            }
+        }
+    }
+#endif // IMMER_DEBUG_PRINT
+};
+
+template <typename T, typename MP, bits_t B, bits_t BL>
+const rrbtree<T, MP, B, BL> rrbtree<T, MP, B, BL>::empty = {
+    0,
+    BL,
+    node_t::make_inner_n(0u),
+    node_t::make_leaf_n(0u)
+};
+
+} // namespace rbts
+} // namespace detail
+} // namespace immer
diff --git a/src/immer/detail/rbts/rrbtree_iterator.hpp b/src/immer/detail/rbts/rrbtree_iterator.hpp
new file mode 100644
index 000000000000..36222f976839
--- /dev/null
+++ b/src/immer/detail/rbts/rrbtree_iterator.hpp
@@ -0,0 +1,100 @@
+//
+// immer: immutable data structures for C++
+// Copyright (C) 2016, 2017, 2018 Juan Pedro Bolivar Puente
+//
+// This software is distributed under the Boost Software License, Version 1.0.
+// See accompanying file LICENSE or copy at http://boost.org/LICENSE_1_0.txt
+//
+
+#pragma once
+
+#include <immer/detail/rbts/rrbtree.hpp>
+#include <immer/detail/iterator_facade.hpp>
+
+namespace immer {
+namespace detail {
+namespace rbts {
+
+template <typename T, typename MP, bits_t B, bits_t BL>
+struct rrbtree_iterator
+    : iterator_facade<rrbtree_iterator<T, MP, B, BL>,
+                      std::random_access_iterator_tag,
+                      T,
+                      const T&>
+{
+    using tree_t   = rrbtree<T, MP, B, BL>;
+    using region_t = std::tuple<const T*, size_t, size_t>;
+
+    struct end_t {};
+
+    const tree_t& impl() const { return *v_; }
+    size_t index() const { return i_; }
+
+    rrbtree_iterator() = default;
+
+    rrbtree_iterator(const tree_t& v)
+        : v_    { &v }
+        , i_    { 0 }
+        , curr_ { nullptr, ~size_t{}, ~size_t{} }
+    {
+    }
+
+    rrbtree_iterator(const tree_t& v, end_t)
+        : v_    { &v }
+        , i_    { v.size }
+        , curr_ { nullptr, ~size_t{}, ~size_t{} }
+    {}
+
+private:
+    friend iterator_core_access;
+
+    const tree_t* v_;
+    size_t   i_;
+    mutable region_t curr_;
+
+    void increment()
+    {
+        using std::get;
+        assert(i_ < v_->size);
+        ++i_;
+    }
+
+    void decrement()
+    {
+        using std::get;
+        assert(i_ > 0);
+        --i_;
+    }
+
+    void advance(std::ptrdiff_t n)
+    {
+        using std::get;
+        assert(n <= 0 || i_ + static_cast<size_t>(n) <= v_->size);
+        assert(n >= 0 || static_cast<size_t>(-n) <= i_);
+        i_ += n;
+    }
+
+    bool equal(const rrbtree_iterator& other) const
+    {
+        return i_ == other.i_;
+    }
+
+    std::ptrdiff_t distance_to(const rrbtree_iterator& other) const
+    {
+        return other.i_ > i_
+            ?   static_cast<std::ptrdiff_t>(other.i_ - i_)
+            : - static_cast<std::ptrdiff_t>(i_ - other.i_);
+    }
+
+    const T& dereference() const
+    {
+        using std::get;
+        if (i_ < get<1>(curr_) || i_ >= get<2>(curr_))
+            curr_ = v_->region_for(i_);
+        return get<0>(curr_)[i_ - get<1>(curr_)];
+    }
+};
+
+} // namespace rbts
+} // namespace detail
+} // namespace immer
diff --git a/src/immer/detail/rbts/visitor.hpp b/src/immer/detail/rbts/visitor.hpp
new file mode 100644
index 000000000000..d85f96d865ed
--- /dev/null
+++ b/src/immer/detail/rbts/visitor.hpp
@@ -0,0 +1,83 @@
+//
+// immer: immutable data structures for C++
+// Copyright (C) 2016, 2017, 2018 Juan Pedro Bolivar Puente
+//
+// This software is distributed under the Boost Software License, Version 1.0.
+// See accompanying file LICENSE or copy at http://boost.org/LICENSE_1_0.txt
+//
+
+#pragma once
+
+#include <tuple>
+#include <utility>
+
+namespace immer {
+namespace detail {
+namespace rbts {
+
+struct visitor_tag {};
+
+template <typename... Fns>
+using fn_visitor = std::tuple<visitor_tag, Fns...>;
+
+template <typename... Fns>
+auto make_visitor(Fns&& ...fns)
+{
+    return std::make_tuple(visitor_tag{}, std::forward<Fns>(fns)...);
+}
+
+template <typename FnR, typename FnI, typename FnL, typename... Args>
+decltype(auto) visit_relaxed(fn_visitor<FnR, FnI, FnL> v, Args&& ...args)
+{ return std::get<1>(v)(v, std::forward<Args>(args)...); }
+
+template <typename FnR, typename FnI, typename FnL, typename... Args>
+decltype(auto) visit_regular(fn_visitor<FnR, FnI, FnL> v, Args&& ...args)
+{ return std::get<2>(v)(v, std::forward<Args>(args)...); }
+
+template <typename FnR, typename FnI, typename FnL, typename... Args>
+decltype(auto) visit_leaf(fn_visitor<FnR, FnI, FnL> v, Args&& ...args)
+{ return std::get<3>(v)(v, std::forward<Args>(args)...); }
+
+template <typename FnI, typename FnL, typename... Args>
+decltype(auto) visit_inner(fn_visitor<FnI, FnL> v, Args&& ...args)
+{ return std::get<1>(v)(v, std::forward<Args>(args)...); }
+
+template <typename FnI, typename FnL, typename... Args>
+decltype(auto) visit_leaf(fn_visitor<FnI, FnL> v, Args&& ...args)
+{ return std::get<2>(v)(v, std::forward<Args>(args)...); }
+
+template <typename Fn, typename... Args>
+decltype(auto) visit_node(fn_visitor<Fn> v, Args&& ...args)
+{ return std::get<1>(v)(v, std::forward<Args>(args)...); }
+
+template <typename Visitor, typename... Args>
+decltype(auto) visit_relaxed(Visitor&& v, Args&& ...args)
+{
+    return visit_inner(std::forward<Visitor>(v),
+                       std::forward<Args>(args)...);
+}
+
+template <typename Visitor, typename... Args>
+decltype(auto) visit_regular(Visitor&& v, Args&& ...args)
+{
+    return visit_inner(std::forward<Visitor>(v),
+                       std::forward<Args>(args)...);
+}
+
+template <typename Visitor, typename... Args>
+decltype(auto) visit_inner(Visitor&& v, Args&& ...args)
+{
+    return visit_node(std::forward<Visitor>(v),
+                      std::forward<Args>(args)...);
+}
+
+template <typename Visitor, typename... Args>
+decltype(auto) visit_leaf(Visitor&& v, Args&& ...args)
+{
+    return visit_node(std::forward<Visitor>(v),
+                      std::forward<Args>(args)...);
+}
+
+} // namespace rbts
+} // namespace detail
+} // namespace immer
diff --git a/src/immer/detail/ref_count_base.hpp b/src/immer/detail/ref_count_base.hpp
new file mode 100644
index 000000000000..a20428b13f70
--- /dev/null
+++ b/src/immer/detail/ref_count_base.hpp
@@ -0,0 +1,36 @@
+//
+// immer: immutable data structures for C++
+// Copyright (C) 2016, 2017, 2018 Juan Pedro Bolivar Puente
+//
+// This software is distributed under the Boost Software License, Version 1.0.
+// See accompanying file LICENSE or copy at http://boost.org/LICENSE_1_0.txt
+//
+
+#pragma once
+
+#include <atomic>
+
+namespace immer {
+namespace detail {
+
+template <typename Deriv>
+struct ref_count_base
+{
+    mutable std::atomic<int> ref_count { 0 };
+
+    friend void intrusive_ptr_add_ref(const Deriv* x)
+    {
+        x->ref_count.fetch_add(1, std::memory_order_relaxed);
+    }
+
+    friend void intrusive_ptr_release(const Deriv* x)
+    {
+        if (x->ref_count.fetch_sub(1, std::memory_order_release) == 1) {
+            std::atomic_thread_fence(std::memory_order_acquire);
+            delete x;
+        }
+    }
+};
+
+} /* namespace detail */
+} /* namespace immer */
diff --git a/src/immer/detail/util.hpp b/src/immer/detail/util.hpp
new file mode 100644
index 000000000000..7490357dbf60
--- /dev/null
+++ b/src/immer/detail/util.hpp
@@ -0,0 +1,123 @@
+//
+// immer: immutable data structures for C++
+// Copyright (C) 2016, 2017, 2018 Juan Pedro Bolivar Puente
+//
+// This software is distributed under the Boost Software License, Version 1.0.
+// See accompanying file LICENSE or copy at http://boost.org/LICENSE_1_0.txt
+//
+
+#pragma once
+
+#include <immer/config.hpp>
+
+#include <cstddef>
+#include <new>
+#include <type_traits>
+#include <memory>
+
+namespace immer {
+namespace detail {
+
+template <typename T>
+using aligned_storage_for =
+    typename std::aligned_storage<sizeof(T), alignof(T)>::type;
+
+template <typename T>
+T& auto_const_cast(const T& x) { return const_cast<T&>(x); }
+template <typename T>
+T&& auto_const_cast(const T&& x) { return const_cast<T&&>(std::move(x)); }
+
+template <typename Iter1, typename Iter2>
+auto uninitialized_move(Iter1 in1, Iter1 in2, Iter2 out)
+{
+    return std::uninitialized_copy(std::make_move_iterator(in1),
+                                   std::make_move_iterator(in2),
+                                   out);
+}
+
+template <class T>
+void destroy(T* first, T* last)
+{
+    for (; first != last; ++first)
+        first->~T();
+}
+
+template <class T, class Size>
+void destroy_n(T* p, Size n)
+{
+    auto e = p + n;
+    for (; p != e; ++p)
+        p->~T();
+}
+
+template <typename Heap, typename T, typename... Args>
+T* make(Args&& ...args)
+{
+    auto ptr = Heap::allocate(sizeof(T));
+    try {
+        return new (ptr) T{std::forward<Args>(args)...};
+    } catch (...) {
+        Heap::deallocate(sizeof(T), ptr);
+        throw;
+    }
+}
+
+struct not_supported_t {};
+struct empty_t {};
+
+template <typename T>
+struct exact_t
+{
+    T value;
+    exact_t(T v) : value{v} {};
+};
+
+template <typename T>
+inline constexpr auto clz_(T) -> not_supported_t { IMMER_UNREACHABLE; return {}; }
+inline constexpr auto clz_(unsigned int x) { return __builtin_clz(x); }
+inline constexpr auto clz_(unsigned long x) { return __builtin_clzl(x); }
+inline constexpr auto clz_(unsigned long long x) { return __builtin_clzll(x); }
+
+template <typename T>
+inline constexpr T log2_aux(T x, T r = 0)
+{
+    return x <= 1 ? r : log2(x >> 1, r + 1);
+}
+
+template <typename T>
+inline constexpr auto log2(T x)
+    -> std::enable_if_t<!std::is_same<decltype(clz_(x)), not_supported_t>{}, T>
+{
+    return x == 0 ? 0 : sizeof(std::size_t) * 8 - 1 - clz_(x);
+}
+
+template <typename T>
+inline constexpr auto log2(T x)
+    -> std::enable_if_t<std::is_same<decltype(clz_(x)), not_supported_t>{}, T>
+{
+    return log2_aux(x);
+}
+
+template <bool b, typename F>
+auto static_if(F&& f) -> std::enable_if_t<b>
+{ std::forward<F>(f)(empty_t{}); }
+template <bool b, typename F>
+auto static_if(F&& f) -> std::enable_if_t<!b>
+{}
+
+template <bool b, typename R=void, typename F1, typename F2>
+auto static_if(F1&& f1, F2&& f2) -> std::enable_if_t<b, R>
+{ return std::forward<F1>(f1)(empty_t{}); }
+template <bool b, typename R=void, typename F1, typename F2>
+auto static_if(F1&& f1, F2&& f2) -> std::enable_if_t<!b, R>
+{ return std::forward<F2>(f2)(empty_t{}); }
+
+template <typename T, T value>
+struct constantly
+{
+    template <typename... Args>
+    T operator() (Args&&...) const { return value; }
+};
+
+} // namespace detail
+} // namespace immer
diff --git a/src/immer/experimental/detail/dvektor_impl.hpp b/src/immer/experimental/detail/dvektor_impl.hpp
new file mode 100644
index 000000000000..df273aab71c9
--- /dev/null
+++ b/src/immer/experimental/detail/dvektor_impl.hpp
@@ -0,0 +1,512 @@
+//
+// immer: immutable data structures for C++
+// Copyright (C) 2016, 2017, 2018 Juan Pedro Bolivar Puente
+//
+// This software is distributed under the Boost Software License, Version 1.0.
+// See accompanying file LICENSE or copy at http://boost.org/LICENSE_1_0.txt
+//
+
+#pragma once
+
+#include <immer/heap/heap_policy.hpp>
+#include <immer/refcount/enable_intrusive_ptr.hpp>
+#include <immer/refcount/refcount_policy.hpp>
+
+#include <boost/intrusive_ptr.hpp>
+#include <boost/iterator/iterator_facade.hpp>
+#include <boost/smart_ptr/intrusive_ref_counter.hpp>
+
+#include <cassert>
+#include <limits>
+
+namespace immer {
+namespace detail {
+namespace dvektor {
+
+constexpr auto fast_log2(std::size_t x)
+{
+    return x == 0 ? 0 : sizeof(std::size_t) * 8 - 1 - __builtin_clzl(x);
+}
+
+template <int B, typename T=std::size_t>
+constexpr T branches = T{1} << B;
+
+template <int B, typename T=std::size_t>
+constexpr T mask = branches<B, T> - 1;
+
+template <int B, typename T=std::size_t>
+constexpr auto max_depth =
+    fast_log2(std::numeric_limits<std::size_t>::max()) / B;
+
+template <typename T, int B, typename MP>
+struct node;
+
+template <typename T, int B, typename MP>
+using node_ptr = boost::intrusive_ptr<node<T, B, MP> >;
+
+template <typename T, int B>
+using leaf_node  = std::array<T, 1 << B>;
+
+template <typename T, int B, typename MP>
+using inner_node = std::array<node_ptr<T, B, MP>, 1 << B>;
+
+template <typename T, int B, typename MP>
+struct node : enable_intrusive_ptr<node<T, B, MP>, typename MP::refcount>
+            , enable_optimized_heap_policy<node<T, B, MP>, typename MP::heap>
+{
+    using leaf_node_t  = leaf_node<T, B>;
+    using inner_node_t = inner_node<T, B, MP>;
+
+    enum
+    {
+        leaf_kind,
+        inner_kind
+    } kind;
+
+    union data_t
+    {
+        leaf_node_t  leaf;
+        inner_node_t inner;
+        data_t(leaf_node_t n)  : leaf(std::move(n)) {}
+        data_t(inner_node_t n) : inner(std::move(n)) {}
+        ~data_t() {}
+    } data;
+
+    ~node()
+    {
+        switch (kind) {
+        case leaf_kind:
+            data.leaf.~leaf_node_t();
+            break;
+        case inner_kind:
+            data.inner.~inner_node_t();
+            break;
+        }
+    }
+
+    node(leaf_node<T, B> n)
+        : kind{leaf_kind}
+        , data{std::move(n)}
+    {}
+
+    node(inner_node<T, B, MP> n)
+        : kind{inner_kind}
+        , data{std::move(n)}
+    {}
+
+    inner_node_t& inner() & {
+        assert(kind == inner_kind);
+        return data.inner;
+    }
+    const inner_node_t& inner() const& {
+        assert(kind == inner_kind);
+        return data.inner;
+    }
+    inner_node_t&& inner() && {
+        assert(kind == inner_kind);
+        return std::move(data.inner);
+    }
+
+    leaf_node_t& leaf() & {
+        assert(kind == leaf_kind);
+        return data.leaf;
+    }
+    const leaf_node_t& leaf() const& {
+        assert(kind == leaf_kind);
+        return data.leaf;
+    }
+    leaf_node_t&& leaf() && {
+        assert(kind == leaf_kind);
+        return std::move(data.leaf);
+    }
+};
+
+template <typename T, int B, typename MP,
+          typename ...Ts>
+auto make_node(Ts&& ...xs)
+    -> boost::intrusive_ptr<node<T, B, MP>>
+{
+    return new node<T, B, MP>(std::forward<Ts>(xs)...);
+}
+
+template <typename T, int B, typename MP>
+struct ref
+{
+    using inner_t    = inner_node<T, B, MP>;
+    using leaf_t     = leaf_node<T, B>;
+    using node_t     = node<T, B, MP>;
+    using node_ptr_t = node_ptr<T, B, MP>;
+
+    unsigned depth;
+    std::array<node_ptr_t, max_depth<B>> display;
+
+    template <typename ...Ts>
+    static auto make_node(Ts&& ...xs)
+    {
+        return dvektor::make_node<T, B, MP>(std::forward<Ts>(xs)...);
+    }
+
+    const T& get_elem(std::size_t index, std::size_t xr) const
+    {
+        auto display_idx = fast_log2(xr) / B;
+        auto node        = display[display_idx].get();
+        auto shift       = display_idx * B;
+        while (display_idx--) {
+            node = node->inner() [(index >> shift) & mask<B>].get();
+            shift -= B;
+        }
+        return node->leaf() [index & mask<B>];
+    }
+
+    node_ptr_t null_slot_and_copy_inner(node_ptr_t& node, std::size_t idx)
+    {
+        auto& n = node->inner();
+        auto x = node_ptr_t{};
+        x.swap(n[idx]);
+        return copy_of_inner(x);
+    }
+
+    node_ptr_t null_slot_and_copy_leaf(node_ptr_t& node, std::size_t idx)
+    {
+        auto& n = node->inner();
+        auto x = node_ptr_t{};
+        x.swap(n[idx]);
+        return copy_of_leaf(x);
+    }
+
+    node_ptr_t copy_of_inner(const node_ptr_t& n)
+    {
+        return make_node(n->inner());
+    }
+
+    node_ptr_t copy_of_leaf(const node_ptr_t& n)
+    {
+        return make_node(n->leaf());
+    }
+
+    void stabilize(std::size_t index)
+    {
+        auto shift = B;
+        for (auto i = 1u; i < depth; ++i)
+        {
+            display[i] = copy_of_inner(display[i]);
+            display[i]->inner() [(index >> shift) & mask<B>]
+                = display[i - 1];
+            shift += B;
+        }
+    }
+
+    void goto_pos_writable_from_clean(std::size_t old_index,
+                                      std::size_t index,
+                                      std::size_t xr)
+    {
+        assert(depth);
+        auto d = depth - 1;
+        if (d == 0) {
+            display[0] = copy_of_leaf(display[0]);
+        } else {
+            IMMER_UNREACHABLE;
+            display[d] = copy_of_inner(display[d]);
+            auto shift = B * d;
+            while (--d) {
+                display[d] = null_slot_and_copy_inner(
+                    display[d + 1],
+                    (index >> shift) & mask<B>);
+                shift -= B;
+            }
+            display[0] = null_slot_and_copy_leaf(
+                display[1],
+                (index >> B) & mask<B>);
+        }
+    }
+
+    void goto_pos_writable_from_dirty(std::size_t old_index,
+                                      std::size_t new_index,
+                                      std::size_t xr)
+    {
+        assert(depth);
+        if (xr < (1 << B)) {
+            display[0] = copy_of_leaf(display[0]);
+        } else {
+            auto display_idx = fast_log2(xr) / B;
+            auto shift       = B;
+            for (auto i = 1u; i <= display_idx; ++i) {
+                display[i] = copy_of_inner(display[i]);
+                display[i]->inner() [(old_index >> shift) & mask<B>]
+                    = display[i - 1];
+                shift += B;
+            }
+            for (auto i = display_idx - 1; i > 0; --i) {
+                shift -= B;
+                display[i] = null_slot_and_copy_inner(
+                    display[i + 1],
+                    (new_index >> shift) & mask<B>);
+            }
+            display[0] = null_slot_and_copy_leaf(
+                display[1],
+                (new_index >> B) & mask<B>);
+        }
+    }
+
+    void goto_fresh_pos_writable_from_clean(std::size_t old_index,
+                                            std::size_t new_index,
+                                            std::size_t xr)
+    {
+        auto display_idx = fast_log2(xr) / B;
+        if (display_idx > 0) {
+            auto shift       = display_idx * B;
+            if (display_idx == depth) {
+                display[display_idx] = make_node(inner_t{});
+                display[display_idx]->inner()
+                    [(old_index >> shift) & mask<B>] =
+                    display[display_idx - 1];
+                ++depth;
+            }
+            while (--display_idx) {
+                auto node = display[display_idx + 1]->inner()
+                    [(new_index >> shift) & mask<B>];
+                display[display_idx] = node
+                    ? std::move(node)
+                    : make_node(inner_t{});
+
+            }
+            display[0] = make_node(leaf_t{});
+        }
+    }
+
+    void goto_fresh_pos_writable_from_dirty(std::size_t old_index,
+                                            std::size_t new_index,
+                                            std::size_t xr)
+    {
+        stabilize(old_index);
+        goto_fresh_pos_writable_from_clean(old_index, new_index, xr);
+    }
+
+    void goto_next_block_start(std::size_t index, std::size_t xr)
+    {
+        auto display_idx = fast_log2(xr) / B;
+        auto shift = display_idx * B;
+        if (display_idx > 0) {
+            display[display_idx - 1] = display[display_idx]->inner()
+                [(index >> shift) & mask<B>];
+            while (--display_idx)
+                display[display_idx - 1] = display[display_idx]->inner()[0];
+        }
+    }
+
+    void goto_pos(std::size_t index, std::size_t xr)
+    {
+        auto display_idx = fast_log2(xr) / B;
+        auto shift = display_idx * B;
+        if (display_idx) {
+            do {
+                display[display_idx - 1] = display[display_idx]->inner()
+                    [(index >> shift) & mask<B>];
+                shift -= B;
+            } while (--display_idx);
+        }
+    }
+};
+
+template <typename T, int B, typename MP>
+struct impl
+{
+    using inner_t    = inner_node<T, B, MP>;
+    using leaf_t     = leaf_node<T, B>;
+    using node_t     = node<T, B, MP>;
+    using node_ptr_t = node_ptr<T, B, MP>;
+    using ref_t      = ref<T, B, MP>;
+
+    std::size_t size;
+    std::size_t focus;
+    bool        dirty;
+    ref_t       p;
+
+    template <typename ...Ts>
+    static auto make_node(Ts&& ...xs)
+    {
+        return dvektor::make_node<T, B, MP>(std::forward<Ts>(xs)...);
+    }
+
+    void goto_pos_writable(std::size_t old_index,
+                           std::size_t new_index,
+                           std::size_t xr)
+    {
+        if (dirty) {
+            p.goto_pos_writable_from_dirty(old_index, new_index, xr);
+        } else {
+            p.goto_pos_writable_from_clean(old_index, new_index, xr);
+            dirty = true;
+        }
+    }
+
+    void goto_fresh_pos_writable(std::size_t old_index,
+                                 std::size_t new_index,
+                                 std::size_t xr)
+    {
+        if (dirty) {
+            p.goto_fresh_pos_writable_from_dirty(old_index, new_index, xr);
+        } else {
+            p.goto_fresh_pos_writable_from_clean(old_index, new_index, xr);
+            dirty = true;
+        }
+    }
+
+    impl push_back(T value) const
+    {
+        if (size) {
+            auto block_index = size & ~mask<B>;
+            auto lo = size & mask<B>;
+            if (size != block_index) {
+                auto s = impl{ size + 1, block_index, dirty, p };
+                s.goto_pos_writable(focus, block_index, focus ^ block_index);
+                s.p.display[0]->leaf() [lo] = std::move(value);
+                return s;
+            } else {
+                auto s = impl{ size + 1, block_index, dirty, p };
+                s.goto_fresh_pos_writable(focus, block_index, focus ^ block_index);
+                s.p.display[0]->leaf() [lo] = std::move(value);
+                return s;
+            }
+        } else {
+            return impl{
+                1, 0, false,
+                { 1, {{ make_node(leaf_t{{std::move(value)}}) }} }
+            };
+        }
+    }
+
+    const T& get(std::size_t index) const
+    {
+        return p.get_elem(index, index ^ focus);
+    }
+
+    template <typename FnT>
+    impl update(std::size_t idx, FnT&& fn) const
+    {
+        auto s = impl{ size, idx, dirty, p };
+        s.goto_pos_writable(focus, idx, focus ^ idx);
+        auto& v = s.p.display[0]->leaf() [idx & mask<B>];
+        v = fn(std::move(v));
+        return s;
+    }
+
+    impl assoc(std::size_t idx, T value) const
+    {
+        return update(idx, [&] (auto&&) {
+            return std::move(value);
+        });
+    }
+};
+
+template <typename T, int B, typename MP>
+const impl<T, B, MP> empty = {
+    0,
+    0,
+    false,
+    ref<T, B, MP> {1, {}}
+};
+
+template <typename T, int B, typename MP>
+struct iterator : boost::iterator_facade<
+    iterator<T, B, MP>,
+    T,
+    boost::random_access_traversal_tag,
+    const T&>
+{
+    struct end_t {};
+
+    iterator() = default;
+
+    iterator(const impl<T, B, MP>& v)
+        : p_{ v.p }
+        , i_{ 0 }
+        , base_{ 0 }
+    {
+        if (v.dirty)
+            p_.stabilize(v.focus);
+        p_.goto_pos(0, 0 ^ v.focus);
+        curr_ = p_.display[0]->leaf().begin();
+    }
+
+    iterator(const impl<T, B, MP>& v, end_t)
+        : p_{ v.p }
+        , i_{ v.size }
+        , base_{ (v.size-1) & ~mask<B> }
+    {
+        if (v.dirty)
+            p_.stabilize(v.focus);
+        p_.goto_pos(base_, base_ ^ v.focus);
+        curr_ = p_.display[0]->leaf().begin() + (i_ - base_);
+    }
+
+private:
+    friend class boost::iterator_core_access;
+    using leaf_iterator = typename leaf_node<T, B>::const_iterator;
+
+    ref<T, B, MP> p_;
+    std::size_t   i_;
+    std::size_t   base_;
+    leaf_iterator curr_;
+
+    void increment()
+    {
+        ++i_;
+        if (i_ - base_ < branches<B>) {
+            ++curr_;
+        } else {
+            auto new_base = base_ + branches<B>;
+            p_.goto_next_block_start(new_base, base_ ^ new_base);
+            base_ = new_base;
+            curr_ = p_.display[0]->leaf().begin();
+        }
+    }
+
+    void decrement()
+    {
+        assert(i_ > 0);
+        --i_;
+        if (i_ >= base_) {
+            --curr_;
+        } else {
+            auto new_base = base_ - branches<B>;
+            p_.goto_pos(new_base, base_ ^ new_base);
+            base_ = new_base;
+            curr_ = std::prev(p_.display[0]->leaf().end());
+        }
+    }
+
+    void advance(std::ptrdiff_t n)
+    {
+        i_ += n;
+        if (i_ <= base_ && i_ - base_ < branches<B>) {
+            curr_ += n;
+        } else {
+            auto new_base = i_ & ~mask<B>;
+            p_.goto_pos(new_base, base_ ^ new_base);
+            base_ = new_base;
+            curr_ = p_.display[0]->leaf().begin() + (i_ - base_);
+        }
+    }
+
+    bool equal(const iterator& other) const
+    {
+        return i_ == other.i_;
+    }
+
+    std::ptrdiff_t distance_to(const iterator& other) const
+    {
+        return other.i_ > i_
+            ?   static_cast<std::ptrdiff_t>(other.i_ - i_)
+            : - static_cast<std::ptrdiff_t>(i_ - other.i_);
+    }
+
+    const T& dereference() const
+    {
+        return *curr_;
+    }
+};
+
+} /* namespace dvektor */
+} /* namespace detail */
+} /* namespace immer */
diff --git a/src/immer/experimental/dvektor.hpp b/src/immer/experimental/dvektor.hpp
new file mode 100644
index 000000000000..7aa0bde7b3da
--- /dev/null
+++ b/src/immer/experimental/dvektor.hpp
@@ -0,0 +1,63 @@
+//
+// immer: immutable data structures for C++
+// Copyright (C) 2016, 2017, 2018 Juan Pedro Bolivar Puente
+//
+// This software is distributed under the Boost Software License, Version 1.0.
+// See accompanying file LICENSE or copy at http://boost.org/LICENSE_1_0.txt
+//
+
+#pragma once
+
+#include <immer/experimental/detail/dvektor_impl.hpp>
+#include <immer/memory_policy.hpp>
+
+namespace immer {
+
+template <typename T,
+          int B = 5,
+          typename MemoryPolicy = default_memory_policy>
+class dvektor
+{
+    using impl_t = detail::dvektor::impl<T, B, MemoryPolicy>;
+
+public:
+    using value_type = T;
+    using reference = const T&;
+    using size_type = std::size_t;
+    using difference_type = std::ptrdiff_t;
+    using const_reference = const T&;
+
+    using iterator         = detail::dvektor::iterator<T, B, MemoryPolicy>;
+    using const_iterator   = iterator;
+    using reverse_iterator = std::reverse_iterator<iterator>;
+
+    dvektor() = default;
+
+    iterator begin() const { return {impl_}; }
+    iterator end()   const { return {impl_, typename iterator::end_t{}}; }
+
+    reverse_iterator rbegin() const { return reverse_iterator{end()}; }
+    reverse_iterator rend()   const { return reverse_iterator{begin()}; }
+
+    std::size_t size() const { return impl_.size; }
+    bool empty() const { return impl_.size == 0; }
+
+    reference operator[] (size_type index) const
+    { return impl_.get(index); }
+
+    dvektor push_back(value_type value) const
+    { return { impl_.push_back(std::move(value)) }; }
+
+    dvektor assoc(std::size_t idx, value_type value) const
+    { return { impl_.assoc(idx, std::move(value)) }; }
+
+    template <typename FnT>
+    dvektor update(std::size_t idx, FnT&& fn) const
+    { return { impl_.update(idx, std::forward<FnT>(fn)) }; }
+
+private:
+    dvektor(impl_t impl) : impl_(std::move(impl)) {}
+    impl_t impl_ = detail::dvektor::empty<T, B, MemoryPolicy>;
+};
+
+} // namespace immer
diff --git a/src/immer/flex_vector.hpp b/src/immer/flex_vector.hpp
new file mode 100644
index 000000000000..77313267b13f
--- /dev/null
+++ b/src/immer/flex_vector.hpp
@@ -0,0 +1,500 @@
+//
+// immer: immutable data structures for C++
+// Copyright (C) 2016, 2017, 2018 Juan Pedro Bolivar Puente
+//
+// This software is distributed under the Boost Software License, Version 1.0.
+// See accompanying file LICENSE or copy at http://boost.org/LICENSE_1_0.txt
+//
+
+#pragma once
+
+#include <immer/detail/rbts/rrbtree.hpp>
+#include <immer/detail/rbts/rrbtree_iterator.hpp>
+#include <immer/memory_policy.hpp>
+
+namespace immer {
+
+template <typename T,
+          typename MP,
+          detail::rbts::bits_t B,
+          detail::rbts::bits_t BL>
+class vector;
+
+template <typename T,
+          typename MP,
+          detail::rbts::bits_t B,
+          detail::rbts::bits_t BL>
+class flex_vector_transient;
+
+/*!
+ * Immutable sequential container supporting both random access,
+ * structural sharing and efficient concatenation and slicing.
+ *
+ * @tparam T The type of the values to be stored in the container.
+ * @tparam MemoryPolicy Memory management policy. See @ref
+ *         memory_policy.
+ *
+ * @rst
+ *
+ * This container is very similar to `vector`_ but also supports
+ * :math:`O(log(size))` *concatenation*, *slicing* and *insertion* at
+ * any point. Its performance characteristics are almost identical
+ * until one of these operations is performed.  After that,
+ * performance is degraded by a constant factor that usually oscilates
+ * in the range :math:`[1, 2)` depending on the operation and the
+ * amount of flexible operations that have been performed.
+ *
+ * .. tip:: A `vector`_ can be converted to a `flex_vector`_ in
+ *    constant time without any allocation.  This is so because the
+ *    internal structure of a *vector* is a strict subset of the
+ *    internal structure of a *flexible vector*.  You can take
+ *    advantage of this property by creating normal vectors as long as
+ *    the flexible operations are not needed, and convert later in
+ *    your processing pipeline once and if these are needed.
+ *
+ * @endrst
+ */
+template <typename T,
+          typename MemoryPolicy   = default_memory_policy,
+          detail::rbts::bits_t B  = default_bits,
+          detail::rbts::bits_t BL = detail::rbts::derive_bits_leaf<T, MemoryPolicy, B>>
+class flex_vector
+{
+    using impl_t = detail::rbts::rrbtree<T, MemoryPolicy, B, BL>;
+
+    using move_t =
+        std::integral_constant<bool, MemoryPolicy::use_transient_rvalues>;
+
+public:
+    static constexpr auto bits = B;
+    static constexpr auto bits_leaf = BL;
+    using memory_policy = MemoryPolicy;
+
+    using value_type = T;
+    using reference = const T&;
+    using size_type = detail::rbts::size_t;
+    using difference_type = std::ptrdiff_t;
+    using const_reference = const T&;
+
+    using iterator         = detail::rbts::rrbtree_iterator<T, MemoryPolicy, B, BL>;
+    using const_iterator   = iterator;
+    using reverse_iterator = std::reverse_iterator<iterator>;
+
+    using transient_type   = flex_vector_transient<T, MemoryPolicy, B, BL>;
+
+    /*!
+     * Default constructor.  It creates a flex_vector of `size() == 0`.
+     * It does not allocate memory and its complexity is @f$ O(1) @f$.
+     */
+    flex_vector() = default;
+
+    /*!
+     * Constructs a vector containing the elements in `values`.
+     */
+    flex_vector(std::initializer_list<T> values)
+        : impl_{impl_t::from_initializer_list(values)}
+    {}
+
+    /*!
+     * Constructs a vector containing the elements in the range
+     * defined by the input iterators `first` and `last`.
+     */
+    template <typename Iter>
+    flex_vector(Iter first, Iter last)
+        : impl_{impl_t::from_range(first, last)}
+    {}
+
+    /*!
+     * Constructs a vector containing the element `val` repeated `n`
+     * times.
+     */
+    flex_vector(size_type n, T v = {})
+        : impl_{impl_t::from_fill(n, v)}
+    {}
+
+    /*!
+     * Default constructor.  It creates a flex_vector with the same
+     * contents as `v`.  It does not allocate memory and is
+     * @f$ O(1) @f$.
+     */
+    flex_vector(vector<T, MemoryPolicy, B, BL> v)
+        : impl_ { v.impl_.size, v.impl_.shift,
+                  v.impl_.root->inc(), v.impl_.tail->inc() }
+    {}
+
+    /*!
+     * Returns an iterator pointing at the first element of the
+     * collection. It does not allocate memory and its complexity is
+     * @f$ O(1) @f$.
+     */
+    iterator begin() const { return {impl_}; }
+
+    /*!
+     * Returns an iterator pointing just after the last element of the
+     * collection. It does not allocate and its complexity is @f$ O(1) @f$.
+     */
+    iterator end()   const { return {impl_, typename iterator::end_t{}}; }
+
+    /*!
+     * Returns an iterator that traverses the collection backwards,
+     * pointing at the first element of the reversed collection. It
+     * does not allocate memory and its complexity is @f$ O(1) @f$.
+     */
+    reverse_iterator rbegin() const { return reverse_iterator{end()}; }
+
+    /*!
+     * Returns an iterator that traverses the collection backwards,
+     * pointing after the last element of the reversed collection. It
+     * does not allocate memory and its complexity is @f$ O(1) @f$.
+     */
+    reverse_iterator rend()   const { return reverse_iterator{begin()}; }
+
+    /*!
+     * Returns the number of elements in the container.  It does
+     * not allocate memory and its complexity is @f$ O(1) @f$.
+     */
+    size_type size() const { return impl_.size; }
+
+    /*!
+     * Returns `true` if there are no elements in the container.  It
+     * does not allocate memory and its complexity is @f$ O(1) @f$.
+     */
+    bool empty() const { return impl_.size == 0; }
+
+    /*!
+     * Access the last element.
+     */
+    const T& back() const { return impl_.back(); }
+
+    /*!
+     * Access the first element.
+     */
+    const T& front() const { return impl_.front(); }
+
+    /*!
+     * Returns a `const` reference to the element at position `index`.
+     * It is undefined when @f$ 0 index \geq size() @f$.  It does not
+     * allocate memory and its complexity is *effectively* @f$ O(1)
+     * @f$.
+     */
+    reference operator[] (size_type index) const
+    { return impl_.get(index); }
+
+    /*!
+     * Returns a `const` reference to the element at position
+     * `index`. It throws an `std::out_of_range` exception when @f$
+     * index \geq size() @f$.  It does not allocate memory and its
+     * complexity is *effectively* @f$ O(1) @f$.
+     */
+    reference at(size_type index) const
+    { return impl_.get_check(index); }
+
+    /*!
+     * Returns whether the vectors are equal.
+     */
+    bool operator==(const flex_vector& other) const
+    { return impl_.equals(other.impl_); }
+    bool operator!=(const flex_vector& other) const
+    { return !(*this == other); }
+
+    /*!
+     * Returns a flex_vector with `value` inserted at the end.  It may
+     * allocate memory and its complexity is *effectively* @f$ O(1) @f$.
+     *
+     * @rst
+     *
+     * **Example**
+     *   .. literalinclude:: ../example/flex-vector/flex-vector.cpp
+     *      :language: c++
+     *      :dedent: 8
+     *      :start-after: push-back/start
+     *      :end-before:  push-back/end
+     *
+     * @endrst
+     */
+    flex_vector push_back(value_type value) const&
+    { return impl_.push_back(std::move(value)); }
+
+    decltype(auto) push_back(value_type value) &&
+    { return push_back_move(move_t{}, std::move(value)); }
+
+    /*!
+     * Returns a flex_vector with `value` inserted at the frony.  It may
+     * allocate memory and its complexity is @f$ O(log(size)) @f$.
+     *
+     * @rst
+     *
+     * **Example**
+     *   .. literalinclude:: ../example/flex-vector/flex-vector.cpp
+     *      :language: c++
+     *      :dedent: 8
+     *      :start-after: push-front/start
+     *      :end-before:  push-front/end
+     *
+     * @endrst
+     */
+    flex_vector push_front(value_type value) const
+    { return flex_vector{}.push_back(value) + *this; }
+
+    /*!
+     * Returns a flex_vector containing value `value` at position `index`.
+     * Undefined for `index >= size()`.
+     * It may allocate memory and its complexity is
+     * *effectively* @f$ O(1) @f$.
+     *
+     * @rst
+     *
+     * **Example**
+     *   .. literalinclude:: ../example/flex-vector/flex-vector.cpp
+     *      :language: c++
+     *      :dedent: 8
+     *      :start-after: set/start
+     *      :end-before:  set/end
+     *
+     * @endrst
+     */
+    flex_vector set(size_type index, value_type value) const&
+    { return impl_.assoc(index, std::move(value)); }
+
+    decltype(auto) set(size_type index, value_type value) &&
+    { return set_move(move_t{}, index, std::move(value)); }
+
+    /*!
+     * Returns a vector containing the result of the expression
+     * `fn((*this)[idx])` at position `idx`.
+     * Undefined for `index >= size()`.
+     * It may allocate memory and its complexity is
+     * *effectively* @f$ O(1) @f$.
+     *
+     * @rst
+     *
+     * **Example**
+     *   .. literalinclude:: ../example/flex-vector/flex-vector.cpp
+     *      :language: c++
+     *      :dedent: 8
+     *      :start-after: update/start
+     *      :end-before:  update/end
+     *
+     * @endrst
+
+     */
+    template <typename FnT>
+    flex_vector update(size_type index, FnT&& fn) const&
+    { return impl_.update(index, std::forward<FnT>(fn)); }
+
+    template <typename FnT>
+    decltype(auto) update(size_type index, FnT&& fn) &&
+    { return update_move(move_t{}, index, std::forward<FnT>(fn)); }
+
+    /*!
+     * Returns a vector containing only the first `min(elems, size())`
+     * elements. It may allocate memory and its complexity is
+     * *effectively* @f$ O(1) @f$.
+     *
+     * @rst
+     *
+     * **Example**
+     *   .. literalinclude:: ../example/flex-vector/flex-vector.cpp
+     *      :language: c++
+     *      :dedent: 8
+     *      :start-after: take/start
+     *      :end-before:  take/end
+     *
+     * @endrst
+     */
+    flex_vector take(size_type elems) const&
+    { return impl_.take(elems); }
+
+    decltype(auto) take(size_type elems) &&
+    { return take_move(move_t{}, elems); }
+
+    /*!
+     * Returns a vector without the first `min(elems, size())`
+     * elements. It may allocate memory and its complexity is
+     * *effectively* @f$ O(1) @f$.
+     *
+     * @rst
+     *
+     * **Example**
+     *   .. literalinclude:: ../example/flex-vector/flex-vector.cpp
+     *      :language: c++
+     *      :dedent: 8
+     *      :start-after: drop/start
+     *      :end-before:  drop/end
+     *
+     * @endrst
+     */
+    flex_vector drop(size_type elems) const&
+    { return impl_.drop(elems); }
+
+    decltype(auto) drop(size_type elems) &&
+    { return drop_move(move_t{}, elems); }
+
+    /*!
+     * Concatenation operator. Returns a flex_vector with the contents
+     * of `l` followed by those of `r`.  It may allocate memory
+     * and its complexity is @f$ O(log(max(size_r, size_l))) @f$
+     *
+     * @rst
+     *
+     * **Example**
+     *   .. literalinclude:: ../example/flex-vector/flex-vector.cpp
+     *      :language: c++
+     *      :dedent: 8
+     *      :start-after: concat/start
+     *      :end-before:  concat/end
+     *
+     * @endrst
+     */
+    friend flex_vector operator+ (const flex_vector& l, const flex_vector& r)
+    { return l.impl_.concat(r.impl_); }
+
+    friend decltype(auto) operator+ (flex_vector&& l, const flex_vector& r)
+    { return concat_move(move_t{}, std::move(l), r); }
+
+    friend decltype(auto) operator+ (const flex_vector& l, flex_vector&& r)
+    { return concat_move(move_t{}, l, std::move(r)); }
+
+    friend decltype(auto) operator+ (flex_vector&& l, flex_vector&& r)
+    { return concat_move(move_t{}, std::move(l), std::move(r)); }
+
+    /*!
+     * Returns a flex_vector with the `value` inserted at index
+     * `pos`. It may allocate memory and its complexity is @f$
+     * O(log(size)) @f$
+     *
+     * @rst
+     *
+     * **Example**
+     *   .. literalinclude:: ../example/flex-vector/flex-vector.cpp
+     *      :language: c++
+     *      :dedent: 8
+     *      :start-after: insert/start
+     *      :end-before:  insert/end
+     *
+     * @endrst
+     */
+    flex_vector insert(size_type pos, T value) const&
+    { return take(pos).push_back(std::move(value)) + drop(pos); }
+    decltype(auto) insert(size_type pos, T value) &&
+    {
+        using std::move;
+        auto rs = drop(pos);
+        return std::move(*this).take(pos).push_back(
+            std::move(value)) + std::move(rs);
+    }
+
+    flex_vector insert(size_type pos, flex_vector value) const&
+    { return take(pos) + std::move(value) + drop(pos); }
+    decltype(auto) insert(size_type pos, flex_vector value) &&
+    {
+        using std::move;
+        auto rs = drop(pos);
+        return std::move(*this).take(pos) + std::move(value) + std::move(rs);
+    }
+
+    /*!
+     * Returns a flex_vector without the element at index `pos`. It
+     * may allocate memory and its complexity is @f$ O(log(size)) @f$
+     *
+     * @rst
+     *
+     * **Example**
+     *   .. literalinclude:: ../example/flex-vector/flex-vector.cpp
+     *      :language: c++
+     *      :dedent: 8
+     *      :start-after: erase/start
+     *      :end-before:  erase/end
+     *
+     * @endrst
+     */
+    flex_vector erase(size_type pos) const&
+    { return take(pos) + drop(pos + 1); }
+    decltype(auto) erase(size_type pos) &&
+    {
+        auto rs = drop(pos + 1);
+        return std::move(*this).take(pos) + std::move(rs);
+    }
+
+    flex_vector erase(size_type pos, size_type lpos) const&
+    { return lpos > pos ? take(pos) + drop(lpos) : *this; }
+    decltype(auto) erase(size_type pos, size_type lpos) &&
+    {
+        if (lpos > pos) {
+            auto rs = drop(lpos);
+            return std::move(*this).take(pos) + std::move(rs);
+        } else {
+            return std::move(*this);
+        }
+    }
+
+    /*!
+     * Returns an @a transient form of this container, an
+     * `immer::flex_vector_transient`.
+     */
+    transient_type transient() const&
+    { return transient_type{ impl_ }; }
+    transient_type transient() &&
+    { return transient_type{ std::move(impl_) }; }
+
+    // Semi-private
+    const impl_t& impl() const { return impl_; }
+
+#if IMMER_DEBUG_PRINT
+    void debug_print() const
+    { impl_.debug_print(); }
+#endif
+
+private:
+    friend transient_type;
+
+    flex_vector(impl_t impl)
+        : impl_(std::move(impl))
+    {
+#if IMMER_DEBUG_PRINT
+        // force the compiler to generate debug_print, so we can call
+        // it from a debugger
+        [](volatile auto){}(&flex_vector::debug_print);
+#endif
+    }
+
+    flex_vector&& push_back_move(std::true_type, value_type value)
+    { impl_.push_back_mut({}, std::move(value)); return std::move(*this); }
+    flex_vector push_back_move(std::false_type, value_type value)
+    { return impl_.push_back(std::move(value)); }
+
+    flex_vector&& set_move(std::true_type, size_type index, value_type value)
+    { impl_.assoc_mut({}, index, std::move(value)); return std::move(*this); }
+    flex_vector set_move(std::false_type, size_type index, value_type value)
+    { return impl_.assoc(index, std::move(value)); }
+
+    template <typename Fn>
+    flex_vector&& update_move(std::true_type, size_type index, Fn&& fn)
+    { impl_.update_mut({}, index, std::forward<Fn>(fn)); return std::move(*this); }
+    template <typename Fn>
+    flex_vector update_move(std::false_type, size_type index, Fn&& fn)
+    { return impl_.update(index, std::forward<Fn>(fn)); }
+
+    flex_vector&& take_move(std::true_type, size_type elems)
+    { impl_.take_mut({}, elems); return std::move(*this); }
+    flex_vector take_move(std::false_type, size_type elems)
+    { return impl_.take(elems); }
+
+    flex_vector&& drop_move(std::true_type, size_type elems)
+    { impl_.drop_mut({}, elems); return std::move(*this); }
+    flex_vector drop_move(std::false_type, size_type elems)
+    { return impl_.drop(elems); }
+
+    static flex_vector&& concat_move(std::true_type, flex_vector&& l, const flex_vector& r)
+    { concat_mut_l(l.impl_, {}, r.impl_); return std::move(l); }
+    static flex_vector&& concat_move(std::true_type, const flex_vector& l, flex_vector&& r)
+    { concat_mut_r(l.impl_, r.impl_, {}); return std::move(r); }
+    static flex_vector&& concat_move(std::true_type, flex_vector&& l, flex_vector&& r)
+    { concat_mut_lr_l(l.impl_, {}, r.impl_, {}); return std::move(l); }
+    static flex_vector concat_move(std::false_type, const flex_vector& l, const flex_vector& r)
+    { return l.impl_.concat(r.impl_); }
+
+    impl_t impl_ = impl_t::empty;
+};
+
+} // namespace immer
diff --git a/src/immer/flex_vector_transient.hpp b/src/immer/flex_vector_transient.hpp
new file mode 100644
index 000000000000..19c088d9bd10
--- /dev/null
+++ b/src/immer/flex_vector_transient.hpp
@@ -0,0 +1,232 @@
+//
+// immer: immutable data structures for C++
+// Copyright (C) 2016, 2017, 2018 Juan Pedro Bolivar Puente
+//
+// This software is distributed under the Boost Software License, Version 1.0.
+// See accompanying file LICENSE or copy at http://boost.org/LICENSE_1_0.txt
+//
+
+#pragma once
+
+#include <immer/detail/rbts/rrbtree.hpp>
+#include <immer/detail/rbts/rrbtree_iterator.hpp>
+#include <immer/memory_policy.hpp>
+
+namespace immer {
+
+template <typename T,
+          typename MemoryPolicy,
+          detail::rbts::bits_t B,
+          detail::rbts::bits_t BL>
+class flex_vector;
+
+template <typename T,
+          typename MemoryPolicy,
+          detail::rbts::bits_t B,
+          detail::rbts::bits_t BL>
+class vector_transient;
+
+/*!
+ * Mutable version of `immer::flex_vector`.
+ *
+ * @rst
+ *
+ * Refer to :doc:`transients` to learn more about when and how to use
+ * the mutable versions of immutable containers.
+ *
+ * @endrst
+ */
+template <typename T,
+          typename MemoryPolicy   = default_memory_policy,
+          detail::rbts::bits_t B  = default_bits,
+          detail::rbts::bits_t BL = detail::rbts::derive_bits_leaf<T, MemoryPolicy, B>>
+class flex_vector_transient
+    : MemoryPolicy::transience_t::owner
+{
+    using impl_t = detail::rbts::rrbtree<T, MemoryPolicy, B, BL>;
+    using base_t = typename MemoryPolicy::transience_t::owner;
+    using owner_t = typename MemoryPolicy::transience_t::owner;
+
+public:
+    static constexpr auto bits = B;
+    static constexpr auto bits_leaf = BL;
+    using memory_policy = MemoryPolicy;
+
+    using value_type = T;
+    using reference = const T&;
+    using size_type = detail::rbts::size_t;
+    using difference_type = std::ptrdiff_t;
+    using const_reference = const T&;
+
+    using iterator         = detail::rbts::rrbtree_iterator<T, MemoryPolicy, B, BL>;
+    using const_iterator   = iterator;
+    using reverse_iterator = std::reverse_iterator<iterator>;
+
+    using persistent_type  = flex_vector<T, MemoryPolicy, B, BL>;
+
+    /*!
+     * Default constructor.  It creates a flex_vector of `size() == 0`.  It
+     * does not allocate memory and its complexity is @f$ O(1) @f$.
+     */
+    flex_vector_transient() = default;
+
+    /*!
+     * Default constructor.  It creates a flex_vector with the same
+     * contents as `v`.  It does not allocate memory and is
+     * @f$ O(1) @f$.
+     */
+    flex_vector_transient(vector_transient<T, MemoryPolicy, B, BL> v)
+        : base_t { std::move(static_cast<base_t&>(v)) }
+        , impl_ { v.impl_.size, v.impl_.shift,
+                  v.impl_.root->inc(), v.impl_.tail->inc() }
+    {}
+
+    /*!
+     * Returns an iterator pointing at the first element of the
+     * collection. It does not allocate memory and its complexity is
+     * @f$ O(1) @f$.
+     */
+    iterator begin() const { return {impl_}; }
+
+    /*!
+     * Returns an iterator pointing just after the last element of the
+     * collection. It does not allocate and its complexity is @f$ O(1) @f$.
+     */
+    iterator end()   const { return {impl_, typename iterator::end_t{}}; }
+
+    /*!
+     * Returns an iterator that traverses the collection backwards,
+     * pointing at the first element of the reversed collection. It
+     * does not allocate memory and its complexity is @f$ O(1) @f$.
+     */
+    reverse_iterator rbegin() const { return reverse_iterator{end()}; }
+
+    /*!
+     * Returns an iterator that traverses the collection backwards,
+     * pointing after the last element of the reversed collection. It
+     * does not allocate memory and its complexity is @f$ O(1) @f$.
+     */
+    reverse_iterator rend()   const { return reverse_iterator{begin()}; }
+
+    /*!
+     * Returns the number of elements in the container.  It does
+     * not allocate memory and its complexity is @f$ O(1) @f$.
+     */
+    size_type size() const { return impl_.size; }
+
+    /*!
+     * Returns `true` if there are no elements in the container.  It
+     * does not allocate memory and its complexity is @f$ O(1) @f$.
+     */
+    bool empty() const { return impl_.size == 0; }
+
+    /*!
+     * Returns a `const` reference to the element at position `index`.
+     * It is undefined when @f$ 0 index \geq size() @f$.  It does not
+     * allocate memory and its complexity is *effectively* @f$ O(1)
+     * @f$.
+     */
+    reference operator[] (size_type index) const
+    { return impl_.get(index); }
+
+    /*!
+     * Returns a `const` reference to the element at position
+     * `index`. It throws an `std::out_of_range` exception when @f$
+     * index \geq size() @f$.  It does not allocate memory and its
+     * complexity is *effectively* @f$ O(1) @f$.
+     */
+    reference at(size_type index) const
+    { return impl_.get_check(index); }
+
+    /*!
+     * Inserts `value` at the end.  It may allocate memory and its
+     * complexity is *effectively* @f$ O(1) @f$.
+     */
+    void push_back(value_type value)
+    { impl_.push_back_mut(*this, std::move(value)); }
+
+    /*!
+     * Sets to the value `value` at position `idx`.
+     * Undefined for `index >= size()`.
+     * It may allocate memory and its complexity is
+     * *effectively* @f$ O(1) @f$.
+     */
+    void set(size_type index, value_type value)
+    { impl_.assoc_mut(*this, index, std::move(value)); }
+
+    /*!
+     * Updates the vector to contain the result of the expression
+     * `fn((*this)[idx])` at position `idx`.
+     * Undefined for `0 >= size()`.
+     * It may allocate memory and its complexity is
+     * *effectively* @f$ O(1) @f$.
+     */
+    template <typename FnT>
+    void update(size_type index, FnT&& fn)
+    { impl_.update_mut(*this, index, std::forward<FnT>(fn)); }
+
+    /*!
+     * Resizes the vector to only contain the first `min(elems, size())`
+     * elements. It may allocate memory and its complexity is
+     * *effectively* @f$ O(1) @f$.
+     */
+    void take(size_type elems)
+    { impl_.take_mut(*this, elems); }
+
+    /*!
+     * Removes the first the first `min(elems, size())`
+     * elements. It may allocate memory and its complexity is
+     * *effectively* @f$ O(1) @f$.
+     */
+    void drop(size_type elems)
+    { impl_.drop_mut(*this, elems); }
+
+    /*!
+     * Returns an @a immutable form of this container, an
+     * `immer::flex_vector`.
+     */
+    persistent_type persistent() &
+    {
+        this->owner_t::operator=(owner_t{});
+        return persistent_type{ impl_ };
+    }
+    persistent_type persistent() &&
+    { return persistent_type{ std::move(impl_) }; }
+
+    /*!
+     * Appends the contents of the `r` at the end.  It may allocate
+     * memory and its complexity is:
+     * @f$ O(log(max(size_r, size_l))) @f$
+     */
+    void append(flex_vector_transient& r)
+    {
+        r.owner_t::operator=(owner_t{});
+        concat_mut_l(impl_, *this, r.impl_);
+    }
+    void append(flex_vector_transient&& r)
+    { concat_mut_lr_l(impl_, *this, r.impl_, r); }
+
+    /*!
+     * Prepends the contents of the `l` at the beginning.  It may
+     * allocate memory and its complexity is:
+     * @f$ O(log(max(size_r, size_l))) @f$
+     */
+    void prepend(flex_vector_transient& l)
+    {
+        l.owner_t::operator=(owner_t{});
+        concat_mut_r(l.impl_, impl_, *this);
+    }
+    void prepend(flex_vector_transient&& l)
+    { concat_mut_lr_r(l.impl_, l, impl_, *this); }
+
+private:
+    friend persistent_type;
+
+    flex_vector_transient(impl_t impl)
+        : impl_(std::move(impl))
+    {}
+
+    impl_t  impl_  = impl_t::empty;
+};
+
+} // namespace immer
diff --git a/src/immer/heap/cpp_heap.hpp b/src/immer/heap/cpp_heap.hpp
new file mode 100644
index 000000000000..cd129b406bea
--- /dev/null
+++ b/src/immer/heap/cpp_heap.hpp
@@ -0,0 +1,41 @@
+//
+// immer: immutable data structures for C++
+// Copyright (C) 2016, 2017, 2018 Juan Pedro Bolivar Puente
+//
+// This software is distributed under the Boost Software License, Version 1.0.
+// See accompanying file LICENSE or copy at http://boost.org/LICENSE_1_0.txt
+//
+
+#pragma once
+
+#include <memory>
+
+namespace immer {
+
+/*!
+ * A heap that uses `operator new` and `operator delete`.
+ */
+struct cpp_heap
+{
+    /*!
+     * Returns a pointer to a memory region of size `size`, if the
+     * allocation was successful, and throws otherwise.
+     */
+    template <typename... Tags>
+    static void* allocate(std::size_t size, Tags...)
+    {
+        return ::operator new(size);
+    }
+
+    /*!
+     * Releases a memory region `data` that was previously returned by
+     * `allocate`.  One must not use nor deallocate again a memory
+     * region that once it has been deallocated.
+     */
+    static void deallocate(std::size_t size, void* data)
+    {
+        ::operator delete(data);
+    }
+};
+
+} // namespace immer
diff --git a/src/immer/heap/debug_size_heap.hpp b/src/immer/heap/debug_size_heap.hpp
new file mode 100644
index 000000000000..124beb81b419
--- /dev/null
+++ b/src/immer/heap/debug_size_heap.hpp
@@ -0,0 +1,50 @@
+//
+// immer: immutable data structures for C++
+// Copyright (C) 2016, 2017, 2018 Juan Pedro Bolivar Puente
+//
+// This software is distributed under the Boost Software License, Version 1.0.
+// See accompanying file LICENSE or copy at http://boost.org/LICENSE_1_0.txt
+//
+
+#pragma once
+
+#include <immer/config.hpp>
+#include <immer/heap/identity_heap.hpp>
+#include <cassert>
+
+namespace immer {
+
+#if IMMER_ENABLE_DEBUG_SIZE_HEAP
+
+/*!
+ * A heap that in debug mode ensures that the sizes for allocation and
+ * deallocation do match.
+ */
+template <typename Base>
+struct debug_size_heap
+{
+    template <typename... Tags>
+    static void* allocate(std::size_t size, Tags... tags)
+    {
+        auto p = (std::size_t*) Base::allocate(size + sizeof(std::size_t), tags...);
+        *p = size;
+        return p + 1;
+    }
+
+    template <typename... Tags>
+    static void deallocate(std::size_t size, void* data, Tags... tags)
+    {
+        auto p = ((std::size_t*) data) - 1;
+        assert(*p == size);
+        Base::deallocate(size + sizeof(std::size_t), p, tags...);
+    }
+};
+
+#else // IMMER_ENABLE_DEBUG_SIZE_HEAP
+
+template <typename Base>
+using debug_size_heap = identity_heap<Base>;
+
+#endif // !IMMER_ENABLE_DEBUG_SIZE_HEAP
+
+} // namespace immer
diff --git a/src/immer/heap/free_list_heap.hpp b/src/immer/heap/free_list_heap.hpp
new file mode 100644
index 000000000000..d82d0967b00c
--- /dev/null
+++ b/src/immer/heap/free_list_heap.hpp
@@ -0,0 +1,83 @@
+//
+// immer: immutable data structures for C++
+// Copyright (C) 2016, 2017, 2018 Juan Pedro Bolivar Puente
+//
+// This software is distributed under the Boost Software License, Version 1.0.
+// See accompanying file LICENSE or copy at http://boost.org/LICENSE_1_0.txt
+//
+
+#pragma once
+
+#include <immer/heap/with_data.hpp>
+#include <immer/heap/free_list_node.hpp>
+
+#include <atomic>
+#include <cassert>
+
+namespace immer {
+
+/*!
+ * Adaptor that does not release the memory to the parent heap but
+ * instead it keeps the memory in a thread-safe global free list. Must
+ * be preceded by a `with_data<free_list_node, ...>` heap adaptor.
+ *
+ * @tparam Size Maximum size of the objects to be allocated.
+ * @tparam Base Type of the parent heap.
+ */
+template <std::size_t Size, std::size_t Limit, typename Base>
+struct free_list_heap : Base
+{
+    using base_t = Base;
+
+    template <typename... Tags>
+    static void* allocate(std::size_t size, Tags...)
+    {
+        assert(size <= sizeof(free_list_node) + Size);
+        assert(size >= sizeof(free_list_node));
+
+        free_list_node* n;
+        do {
+            n = head().data;
+            if (!n) {
+                auto p = base_t::allocate(Size + sizeof(free_list_node));
+                return static_cast<free_list_node*>(p);
+            }
+        } while (!head().data.compare_exchange_weak(n, n->next));
+        head().count.fetch_sub(1u, std::memory_order_relaxed);
+        return n;
+    }
+
+    template <typename... Tags>
+    static void deallocate(std::size_t size, void* data, Tags...)
+    {
+        assert(size <= sizeof(free_list_node) + Size);
+        assert(size >= sizeof(free_list_node));
+
+        // we use relaxed, because we are fine with temporarily having
+        // a few more/less buffers in free list
+        if (head().count.load(std::memory_order_relaxed) >= Limit) {
+            base_t::deallocate(Size + sizeof(free_list_node), data);
+        } else {
+            auto n = static_cast<free_list_node*>(data);
+            do {
+                n->next = head().data;
+            } while (!head().data.compare_exchange_weak(n->next, n));
+            head().count.fetch_add(1u, std::memory_order_relaxed);
+        }
+    }
+
+private:
+    struct head_t
+    {
+        std::atomic<free_list_node*> data;
+        std::atomic<std::size_t> count;
+    };
+
+    static head_t& head()
+    {
+        static head_t head_{{nullptr}, {0}};
+        return head_;
+    }
+};
+
+} // namespace immer
diff --git a/src/immer/heap/free_list_node.hpp b/src/immer/heap/free_list_node.hpp
new file mode 100644
index 000000000000..5c2f5b7529d9
--- /dev/null
+++ b/src/immer/heap/free_list_node.hpp
@@ -0,0 +1,25 @@
+//
+// immer: immutable data structures for C++
+// Copyright (C) 2016, 2017, 2018 Juan Pedro Bolivar Puente
+//
+// This software is distributed under the Boost Software License, Version 1.0.
+// See accompanying file LICENSE or copy at http://boost.org/LICENSE_1_0.txt
+//
+
+#pragma once
+
+#include <immer/heap/with_data.hpp>
+
+namespace immer {
+
+struct free_list_node
+{
+    free_list_node* next;
+};
+
+template <typename Base>
+struct with_free_list_node
+    : with_data<free_list_node, Base>
+{};
+
+} // namespace immer
diff --git a/src/immer/heap/gc_heap.hpp b/src/immer/heap/gc_heap.hpp
new file mode 100644
index 000000000000..f37da2f6e3dd
--- /dev/null
+++ b/src/immer/heap/gc_heap.hpp
@@ -0,0 +1,130 @@
+//
+// immer: immutable data structures for C++
+// Copyright (C) 2016, 2017, 2018 Juan Pedro Bolivar Puente
+//
+// This software is distributed under the Boost Software License, Version 1.0.
+// See accompanying file LICENSE or copy at http://boost.org/LICENSE_1_0.txt
+//
+
+#pragma once
+
+#include <immer/config.hpp>
+#include <immer/heap/tags.hpp>
+
+#if IMMER_HAS_LIBGC
+#include <gc/gc.h>
+#else
+#error "Using garbage collection requires libgc"
+#endif
+
+#include <cstdlib>
+#include <memory>
+
+namespace immer {
+
+#ifdef __APPLE__
+#define IMMER_GC_REQUIRE_INIT 1
+#else
+#define IMMER_GC_REQUIRE_INIT 0
+#endif
+
+#if IMMER_GC_REQUIRE_INIT
+
+namespace detail {
+
+template <int Dummy=0>
+struct gc_initializer
+{
+    gc_initializer() { GC_init(); }
+    static gc_initializer init;
+};
+
+template <int D>
+gc_initializer<D> gc_initializer<D>::init {};
+
+inline void gc_initializer_guard()
+{
+    static gc_initializer<> init_ = gc_initializer<>::init;
+    (void) init_;
+}
+
+} // namespace detail
+
+#define IMMER_GC_INIT_GUARD_ ::immer::detail::gc_initializer_guard()
+
+#else
+
+#define IMMER_GC_INIT_GUARD_
+
+#endif // IMMER_GC_REQUIRE_INIT
+
+/*!
+ * Heap that uses a tracing garbage collector.
+ *
+ * @rst
+ *
+ * This heap uses the `Boehm's conservative garbage collector`_ under
+ * the hood.  This is a tracing garbage collector that automatically
+ * reclaims unused memory.  Thus, it is not needed to call
+ * ``deallocate()`` in order to release memory.
+ *
+ * .. admonition:: Dependencies
+ *    :class: tip
+ *
+ *    In order to use this header file, you need to make sure that
+ *    Boehm's ``libgc`` is your include path and link to its binary
+ *    library.
+ *
+ * .. caution:: Memory that is allocated with the standard ``malloc``
+ *    and ``free`` is not visible to ``libgc`` when it is looking for
+ *    references.  This means that if, let's say, you store a
+ *    :cpp:class:`immer::vector` using a ``gc_heap`` inside a
+ *    ``std::vector`` that uses a standard allocator, the memory of
+ *    the former might be released automatically at unexpected times
+ *    causing crashes.
+ *
+ * .. caution:: When using a ``gc_heap`` in combination with immutable
+ *    containers, the destructors of the contained objects will never
+ *    be called.  It is ok to store containers inside containers as
+ *    long as all of them use a ``gc_heap`` consistently, but storing
+ *    other kinds of objects with relevant destructors
+ *    (e.g. containers with reference counting or other kinds of
+ *    *resource handles*) might cause memory leaks and other problems.
+ *
+ * .. _boehm's conservative garbage collector: https://github.com/ivmai/bdwgc
+ *
+ * @endrst
+ */
+class gc_heap
+{
+public:
+    static void* allocate(std::size_t n)
+    {
+        IMMER_GC_INIT_GUARD_;
+        auto p = GC_malloc(n);
+        if (IMMER_UNLIKELY(!p))
+            throw std::bad_alloc{};
+        return p;
+    }
+
+    static void* allocate(std::size_t n, norefs_tag)
+    {
+        IMMER_GC_INIT_GUARD_;
+        auto p = GC_malloc_atomic(n);
+        if (IMMER_UNLIKELY(!p))
+            throw std::bad_alloc{};
+        return p;
+    }
+
+    static void deallocate(std::size_t, void* data)
+    {
+        GC_free(data);
+    }
+
+    static void deallocate(std::size_t, void* data, norefs_tag)
+    {
+        GC_free(data);
+    }
+};
+
+} // namespace immer
diff --git a/src/immer/heap/heap_policy.hpp b/src/immer/heap/heap_policy.hpp
new file mode 100644
index 000000000000..a0723cbcf2b9
--- /dev/null
+++ b/src/immer/heap/heap_policy.hpp
@@ -0,0 +1,148 @@
+//
+// immer: immutable data structures for C++
+// Copyright (C) 2016, 2017, 2018 Juan Pedro Bolivar Puente
+//
+// This software is distributed under the Boost Software License, Version 1.0.
+// See accompanying file LICENSE or copy at http://boost.org/LICENSE_1_0.txt
+//
+
+#pragma once
+
+#include <immer/heap/debug_size_heap.hpp>
+#include <immer/heap/free_list_heap.hpp>
+#include <immer/heap/split_heap.hpp>
+#include <immer/heap/thread_local_free_list_heap.hpp>
+#include <immer/config.hpp>
+
+#include <cstdlib>
+#include <algorithm>
+
+namespace immer {
+
+/*!
+ * Heap policy that unconditionally uses its `Heap` argument.
+ */
+template <typename Heap>
+struct heap_policy
+{
+    using type = Heap;
+
+    template <std::size_t>
+    struct optimized
+    {
+        using type = Heap;
+    };
+};
+
+template <typename Deriv, typename HeapPolicy>
+struct enable_optimized_heap_policy
+{
+    static void* operator new (std::size_t size)
+    {
+        using heap_type = typename HeapPolicy
+            ::template optimized<sizeof(Deriv)>::type;
+
+        return heap_type::allocate(size);
+    }
+
+    static void operator delete (void* data, std::size_t size)
+    {
+        using heap_type = typename HeapPolicy
+            ::template optimized<sizeof(Deriv)>::type;
+
+        heap_type::deallocate(size, data);
+    }
+};
+
+/*!
+ * Heap policy that returns a heap with a free list of objects
+ * of `max_size = max(Sizes...)` on top an underlying `Heap`.  Note
+ * these two properties of the resulting heap:
+ *
+ * - Allocating an object that is bigger than `max_size` may trigger
+ *   *undefined behavior*.
+ *
+ * - Allocating an object of size less than `max_size` still
+ *   returns an object of `max_size`.
+ *
+ * Basically, this heap will always return objects of `max_size`.
+ * When an object is freed, it does not directly invoke `std::free`,
+ * but it keeps the object in a global linked list instead.  When a
+ * new object is requested, it does not need to call `std::malloc` but
+ * it can directly pop and return the other object from the global
+ * list, a much faster operation.
+ *
+ * This actually creates a hierarchy with two free lists:
+ *
+ * - A `thread_local` free list is used first.  It does not need any
+ *   kind of synchronization and is very fast.  When the thread
+ *   finishes, its contents are returned to the next free list.
+ *
+ * - A global free list using lock-free access via atomics.
+ *
+ * @tparam Heap Heap to be used when the free list is empty.
+ *
+ * @rst
+ *
+ * .. tip:: For many applications that use immutable data structures
+ *    significantly, this is actually the best heap policy, and it
+ *    might become the default in the future.
+ *
+ *    Note that most our data structures internally use trees with the
+ *    same big branching factors.  This means that all *vectors*,
+ *    *maps*, etc. can just allocate elements from the same free-list
+ *    optimized heap.  Not only does this lowers the allocation time,
+ *    but also makes up for more efficient *cache utilization*.  When
+ *    a new node is needed, there are high chances the allocator will
+ *    return a node that was just accessed.  When batches of immutable
+ *    updates are made, this can make a significant difference.
+ *
+ * @endrst
+ */
+template <typename Heap,
+          std::size_t Limit = default_free_list_size>
+struct free_list_heap_policy
+{
+    using type = debug_size_heap<Heap>;
+
+    template <std::size_t Size>
+    struct optimized
+    {
+        using type = split_heap<
+            Size,
+            with_free_list_node<
+                thread_local_free_list_heap<
+                    Size,
+                    Limit,
+                    free_list_heap<
+                        Size, Limit,
+                        debug_size_heap<Heap>>>>,
+            debug_size_heap<Heap>>;
+    };
+};
+
+/*!
+ * Similar to @ref free_list_heap_policy, but it assumes no
+ * multi-threading, so a single global free list with no concurrency
+ * checks is used.
+ */
+template <typename Heap,
+          std::size_t Limit = default_free_list_size>
+struct unsafe_free_list_heap_policy
+{
+    using type = Heap;
+
+    template <std::size_t Size>
+    struct optimized
+    {
+        using type = split_heap<
+            Size,
+            with_free_list_node<
+                unsafe_free_list_heap<
+                    Size, Limit,
+                    debug_size_heap<Heap>>>,
+            debug_size_heap<Heap>>;
+    };
+};
+
+} // namespace immer
diff --git a/src/immer/heap/identity_heap.hpp b/src/immer/heap/identity_heap.hpp
new file mode 100644
index 000000000000..032cb3f221d0
--- /dev/null
+++ b/src/immer/heap/identity_heap.hpp
@@ -0,0 +1,34 @@
+//
+// immer: immutable data structures for C++
+// Copyright (C) 2016, 2017, 2018 Juan Pedro Bolivar Puente
+//
+// This software is distributed under the Boost Software License, Version 1.0.
+// See accompanying file LICENSE or copy at http://boost.org/LICENSE_1_0.txt
+//
+
+#pragma once
+
+#include <cstdlib>
+
+namespace immer {
+
+/*!
+ * A heap that simply passes on to the parent heap.
+ */
+template <typename Base>
+struct identity_heap : Base
+{
+    template <typename... Tags>
+    static void* allocate(std::size_t size, Tags... tags)
+    {
+        return Base::allocate(size, tags...);
+    }
+
+    template <typename... Tags>
+    static void deallocate(std::size_t size, void* data, Tags... tags)
+    {
+        Base::deallocate(size, data, tags...);
+    }
+};
+
+} // namespace immer
diff --git a/src/immer/heap/malloc_heap.hpp b/src/immer/heap/malloc_heap.hpp
new file mode 100644
index 000000000000..73909058dec3
--- /dev/null
+++ b/src/immer/heap/malloc_heap.hpp
@@ -0,0 +1,47 @@
+//
+// immer: immutable data structures for C++
+// Copyright (C) 2016, 2017, 2018 Juan Pedro Bolivar Puente
+//
+// This software is distributed under the Boost Software License, Version 1.0.
+// See accompanying file LICENSE or copy at http://boost.org/LICENSE_1_0.txt
+//
+
+#pragma once
+
+#include <immer/config.hpp>
+
+#include <memory>
+#include <cstdlib>
+
+namespace immer {
+
+/*!
+ * A heap that uses `std::malloc` and `std::free` to manage memory.
+ */
+struct malloc_heap
+{
+    /*!
+     * Returns a pointer to a memory region of size `size`, if the
+     * allocation was successful and throws `std::bad_alloc` otherwise.
+     */
+    template <typename... Tags>
+    static void* allocate(std::size_t size, Tags...)
+    {
+        auto p = std::malloc(size);
+        if (IMMER_UNLIKELY(!p))
+            throw std::bad_alloc{};
+        return p;
+    }
+
+    /*!
+     * Releases a memory region `data` that was previously returned by
+     * `allocate`.  One must not use nor deallocate again a memory
+     * region that once it has been deallocated.
+     */
+    static void deallocate(std::size_t, void* data)
+    {
+        std::free(data);
+    }
+};
+
+} // namespace immer
diff --git a/src/immer/heap/split_heap.hpp b/src/immer/heap/split_heap.hpp
new file mode 100644
index 000000000000..8ce210815f4c
--- /dev/null
+++ b/src/immer/heap/split_heap.hpp
@@ -0,0 +1,41 @@
+//
+// immer: immutable data structures for C++
+// Copyright (C) 2016, 2017, 2018 Juan Pedro Bolivar Puente
+//
+// This software is distributed under the Boost Software License, Version 1.0.
+// See accompanying file LICENSE or copy at http://boost.org/LICENSE_1_0.txt
+//
+
+#pragma once
+
+#include <atomic>
+#include <cassert>
+
+namespace immer {
+
+/*!
+ * Adaptor that uses `SmallHeap` for allocations that are smaller or
+ * equal to `Size` and `BigHeap` otherwise.
+ */
+template <std::size_t Size, typename SmallHeap, typename BigHeap>
+struct split_heap
+{
+    template <typename... Tags>
+    static void* allocate(std::size_t size, Tags... tags)
+    {
+        return size <= Size
+            ? SmallHeap::allocate(size, tags...)
+            : BigHeap::allocate(size, tags...);
+    }
+
+    template <typename... Tags>
+    static void deallocate(std::size_t size, void* data, Tags... tags)
+    {
+        if (size <= Size)
+            SmallHeap::deallocate(size, data, tags...);
+        else
+            BigHeap::deallocate(size, data, tags...);
+    }
+};
+
+} // namespace immer
diff --git a/src/immer/heap/tags.hpp b/src/immer/heap/tags.hpp
new file mode 100644
index 000000000000..a3012bd3ef35
--- /dev/null
+++ b/src/immer/heap/tags.hpp
@@ -0,0 +1,15 @@
+//
+// immer: immutable data structures for C++
+// Copyright (C) 2016, 2017, 2018 Juan Pedro Bolivar Puente
+//
+// This software is distributed under the Boost Software License, Version 1.0.
+// See accompanying file LICENSE or copy at http://boost.org/LICENSE_1_0.txt
+//
+
+#pragma once
+
+namespace immer {
+
+struct norefs_tag {};
+
+} // namespace immer
diff --git a/src/immer/heap/thread_local_free_list_heap.hpp b/src/immer/heap/thread_local_free_list_heap.hpp
new file mode 100644
index 000000000000..2539ce73c102
--- /dev/null
+++ b/src/immer/heap/thread_local_free_list_heap.hpp
@@ -0,0 +1,55 @@
+//
+// immer: immutable data structures for C++
+// Copyright (C) 2016, 2017, 2018 Juan Pedro Bolivar Puente
+//
+// This software is distributed under the Boost Software License, Version 1.0.
+// See accompanying file LICENSE or copy at http://boost.org/LICENSE_1_0.txt
+//
+
+#pragma once
+
+#include <immer/heap/unsafe_free_list_heap.hpp>
+
+namespace immer {
+namespace detail {
+
+template <typename Heap>
+struct thread_local_free_list_storage
+{
+    struct head_t
+    {
+        free_list_node* data;
+        std::size_t count;
+
+        ~head_t() { Heap::clear(); }
+    };
+
+    static head_t& head()
+    {
+        thread_local static head_t head_{nullptr, 0};
+        return head_;
+    }
+};
+
+} // namespace detail
+
+/*!
+ * Adaptor that does not release the memory to the parent heap but
+ * instead it keeps the memory in a `thread_local` global free
+ * list. Must be preceded by a `with_data<free_list_node, ...>` heap
+ * adaptor.  When the current thread finishes, the memory is returned
+ * to the parent heap.
+ *
+ * @tparam Size  Maximum size of the objects to be allocated.
+ * @tparam Limit Maximum number of elements to keep in the free list.
+ * @tparam Base  Type of the parent heap.
+ */
+template <std::size_t Size, std::size_t Limit, typename Base>
+struct thread_local_free_list_heap : detail::unsafe_free_list_heap_impl<
+    detail::thread_local_free_list_storage,
+    Size,
+    Limit,
+    Base>
+{};
+
+} // namespace immer
diff --git a/src/immer/heap/unsafe_free_list_heap.hpp b/src/immer/heap/unsafe_free_list_heap.hpp
new file mode 100644
index 000000000000..9a1fdd73e44d
--- /dev/null
+++ b/src/immer/heap/unsafe_free_list_heap.hpp
@@ -0,0 +1,108 @@
+//
+// immer: immutable data structures for C++
+// Copyright (C) 2016, 2017, 2018 Juan Pedro Bolivar Puente
+//
+// This software is distributed under the Boost Software License, Version 1.0.
+// See accompanying file LICENSE or copy at http://boost.org/LICENSE_1_0.txt
+//
+
+#pragma once
+
+#include <immer/config.hpp>
+#include <immer/heap/free_list_node.hpp>
+#include <cassert>
+
+namespace immer {
+namespace detail {
+
+template <typename Heap>
+struct unsafe_free_list_storage
+{
+    struct head_t
+    {
+        free_list_node* data;
+        std::size_t count;
+    };
+
+    static head_t& head()
+    {
+        static head_t head_ {nullptr, 0};
+        return head_;
+    }
+};
+
+template <template<class>class Storage,
+          std::size_t Size,
+          std::size_t Limit,
+          typename Base>
+class unsafe_free_list_heap_impl : Base
+{
+    using storage = Storage<unsafe_free_list_heap_impl>;
+
+public:
+    using base_t = Base;
+
+    template <typename... Tags>
+    static void* allocate(std::size_t size, Tags...)
+    {
+        assert(size <= sizeof(free_list_node) + Size);
+        assert(size >= sizeof(free_list_node));
+
+        auto n = storage::head().data;
+        if (!n) {
+            auto p = base_t::allocate(Size + sizeof(free_list_node));
+            return static_cast<free_list_node*>(p);
+        }
+        --storage::head().count;
+        storage::head().data = n->next;
+        return n;
+    }
+
+    template <typename... Tags>
+    static void deallocate(std::size_t size, void* data, Tags...)
+    {
+        assert(size <= sizeof(free_list_node) + Size);
+        assert(size >= sizeof(free_list_node));
+
+        if (storage::head().count >= Limit)
+            base_t::deallocate(Size + sizeof(free_list_node), data);
+        else {
+            auto n = static_cast<free_list_node*>(data);
+            n->next = storage::head().data;
+            storage::head().data = n;
+            ++storage::head().count;
+        }
+    }
+
+    static void clear()
+    {
+        while (storage::head().data) {
+            auto n = storage::head().data->next;
+            base_t::deallocate(Size + sizeof(free_list_node), storage::head().data);
+            storage::head().data = n;
+            --storage::head().count;
+        }
+    }
+};
+
+} // namespace detail
+
+/*!
+ * Adaptor that does not release the memory to the parent heap but
+ * instead it keeps the memory in a global free list that **is not
+ * thread-safe**. Must be preceded by a `with_data<free_list_node,
+ * ...>` heap adaptor.
+ *
+ * @tparam Size  Maximum size of the objects to be allocated.
+ * @tparam Limit Maximum number of elements to keep in the free list.
+ * @tparam Base  Type of the parent heap.
+ */
+template <std::size_t Size, std::size_t Limit, typename Base>
+struct unsafe_free_list_heap : detail::unsafe_free_list_heap_impl<
+    detail::unsafe_free_list_storage,
+    Size,
+    Limit,
+    Base>
+{};
+
+} // namespace immer
diff --git a/src/immer/heap/with_data.hpp b/src/immer/heap/with_data.hpp
new file mode 100644
index 000000000000..1e8c2abb082e
--- /dev/null
+++ b/src/immer/heap/with_data.hpp
@@ -0,0 +1,43 @@
+//
+// immer: immutable data structures for C++
+// Copyright (C) 2016, 2017, 2018 Juan Pedro Bolivar Puente
+//
+// This software is distributed under the Boost Software License, Version 1.0.
+// See accompanying file LICENSE or copy at http://boost.org/LICENSE_1_0.txt
+//
+
+#pragma once
+
+#include <cstdio>
+
+namespace immer {
+
+/*!
+ * Appends a default constructed extra object of type `T` at the
+ * *before* the requested region.
+ *
+ * @tparam T Type of the appended data.
+ * @tparam Base Type of the parent heap.
+ */
+template <typename T, typename Base>
+struct with_data : Base
+{
+    using base_t = Base;
+
+    template <typename... Tags>
+    static void* allocate(std::size_t size, Tags... tags)
+    {
+        auto p = base_t::allocate(size + sizeof(T), tags...);
+        return new (p) T{} + 1;
+    }
+
+    template <typename... Tags>
+    static void deallocate(std::size_t size, void* p, Tags... tags)
+    {
+        auto dp = static_cast<T*>(p) - 1;
+        dp->~T();
+        base_t::deallocate(size + sizeof(T), dp, tags...);
+    }
+};
+
+} // namespace immer
diff --git a/src/immer/map.hpp b/src/immer/map.hpp
new file mode 100644
index 000000000000..553bfcd54495
--- /dev/null
+++ b/src/immer/map.hpp
@@ -0,0 +1,311 @@
+//
+// immer: immutable data structures for C++
+// Copyright (C) 2016, 2017, 2018 Juan Pedro Bolivar Puente
+//
+// This software is distributed under the Boost Software License, Version 1.0.
+// See accompanying file LICENSE or copy at http://boost.org/LICENSE_1_0.txt
+//
+
+#pragma once
+
+#include <immer/memory_policy.hpp>
+#include <immer/detail/hamts/champ.hpp>
+#include <immer/detail/hamts/champ_iterator.hpp>
+
+#include <functional>
+
+namespace immer {
+
+template <typename K,
+          typename T,
+          typename Hash,
+          typename Equal,
+          typename MemoryPolicy,
+          detail::hamts::bits_t B>
+class map_transient;
+
+/*!
+ * Immutable unordered mapping of values from type `K` to type `T`.
+ *
+ * @tparam K    The type of the keys.
+ * @tparam T    The type of the values to be stored in the container.
+ * @tparam Hash The type of a function object capable of hashing
+ *              values of type `T`.
+ * @tparam Equal The type of a function object capable of comparing
+ *              values of type `T`.
+ * @tparam MemoryPolicy Memory management policy. See @ref
+ *              memory_policy.
+ *
+ * @rst
+ *
+ * This cotainer provides a good trade-off between cache locality,
+ * search, update performance and structural sharing.  It does so by
+ * storing the data in contiguous chunks of :math:`2^{B}` elements.
+ * When storing big objects, the size of these contiguous chunks can
+ * become too big, damaging performance.  If this is measured to be
+ * problematic for a specific use-case, it can be solved by using a
+ * `immer::box` to wrap the type `T`.
+ *
+ * **Example**
+ *   .. literalinclude:: ../example/map/intro.cpp
+ *      :language: c++
+ *      :start-after: intro/start
+ *      :end-before:  intro/end
+ *
+ * @endrst
+ *
+ */
+template <typename K,
+          typename T,
+          typename Hash          = std::hash<K>,
+          typename Equal         = std::equal_to<K>,
+          typename MemoryPolicy  = default_memory_policy,
+          detail::hamts::bits_t B = default_bits>
+class map
+{
+    using value_t = std::pair<K, T>;
+
+    struct project_value
+    {
+        const T& operator() (const value_t& v) const noexcept
+        {
+            return v.second;
+        }
+    };
+
+    struct project_value_ptr
+    {
+        const T* operator() (const value_t& v) const noexcept
+        {
+            return &v.second;
+        }
+    };
+
+    struct combine_value
+    {
+        template <typename Kf, typename Tf>
+        value_t operator() (Kf&& k, Tf&& v) const
+        {
+            return { std::forward<Kf>(k), std::forward<Tf>(v) };
+        }
+    };
+
+    struct default_value
+    {
+        const T& operator() () const
+        {
+            static T v{};
+            return v;
+        }
+    };
+
+    struct error_value
+    {
+        const T& operator() () const
+        {
+            throw std::out_of_range{"key not found"};
+        }
+    };
+
+    struct hash_key
+    {
+        auto operator() (const value_t& v)
+        { return Hash{}(v.first); }
+
+        auto operator() (const K& v)
+        { return Hash{}(v); }
+    };
+
+    struct equal_key
+    {
+        auto operator() (const value_t& a, const value_t& b)
+        { return Equal{}(a.first, b.first); }
+
+        auto operator() (const value_t& a, const K& b)
+        { return Equal{}(a.first, b); }
+    };
+
+    struct equal_value
+    {
+        auto operator() (const value_t& a, const value_t& b)
+        { return Equal{}(a.first, b.first) && a.second == b.second; }
+    };
+
+    using impl_t = detail::hamts::champ<
+        value_t, hash_key, equal_key, MemoryPolicy, B>;
+
+public:
+    using key_type = K;
+    using mapped_type = T;
+    using value_type = std::pair<K, T>;
+    using size_type = detail::hamts::size_t;
+    using diference_type = std::ptrdiff_t;
+    using hasher = Hash;
+    using key_equal = Equal;
+    using reference = const value_type&;
+    using const_reference = const value_type&;
+
+    using iterator         = detail::hamts::champ_iterator<
+        value_t, hash_key, equal_key, MemoryPolicy, B>;
+    using const_iterator   = iterator;
+
+    using transient_type   = map_transient<K, T, Hash, Equal, MemoryPolicy, B>;
+
+    /*!
+     * Default constructor.  It creates a set of `size() == 0`.  It
+     * does not allocate memory and its complexity is @f$ O(1) @f$.
+     */
+    map() = default;
+
+    /*!
+     * Returns an iterator pointing at the first element of the
+     * collection. It does not allocate memory and its complexity is
+     * @f$ O(1) @f$.
+     */
+    iterator begin() const { return {impl_}; }
+
+    /*!
+     * Returns an iterator pointing just after the last element of the
+     * collection. It does not allocate and its complexity is @f$ O(1) @f$.
+     */
+    iterator end() const { return {impl_, typename iterator::end_t{}}; }
+
+    /*!
+     * Returns the number of elements in the container.  It does
+     * not allocate memory and its complexity is @f$ O(1) @f$.
+     */
+    size_type size() const { return impl_.size; }
+
+    /*!
+     * Returns `1` when the key `k` is contained in the map or `0`
+     * otherwise. It won't allocate memory and its complexity is
+     * *effectively* @f$ O(1) @f$.
+     */
+    size_type count(const K& k) const
+    { return impl_.template get<detail::constantly<size_type, 1>,
+                                detail::constantly<size_type, 0>>(k); }
+
+    /*!
+     * Returns a `const` reference to the values associated to the key
+     * `k`.  If the key is not contained in the map, it returns a
+     * default constructed value.  It does not allocate memory and its
+     * complexity is *effectively* @f$ O(1) @f$.
+     */
+    const T& operator[] (const K& k) const
+    { return impl_.template get<project_value, default_value>(k); }
+
+    /*!
+     * Returns a `const` reference to the values associated to the key
+     * `k`.  If the key is not contained in the map, throws an
+     * `std::out_of_range` error.  It does not allocate memory and its
+     * complexity is *effectively* @f$ O(1) @f$.
+     */
+    const T& at(const K& k) const
+    { return impl_.template get<project_value, error_value>(k); }
+
+
+    /*!
+     * Returns a pointer to the value associated with the key `k`.  If
+     * the key is not contained in the map, a `nullptr` is returned.
+     * It does not allocate memory and its complexity is *effectively*
+     * @f$ O(1) @f$.
+     *
+     * @rst
+     *
+     * .. admonition:: Why doesn't this function return an iterator?
+     *
+     *   Associative containers from the C++ standard library provide a
+     *   ``find`` method that returns an iterator pointing to the
+     *   element in the container or ``end()`` when the key is missing.
+     *   In the case of an unordered container, the only meaningful
+     *   thing one may do with it is to compare it with the end, to
+     *   test if the find was succesfull, and dereference it.  This
+     *   comparison is cumbersome compared to testing for a non-empty
+     *   optional value.  Furthermore, for an immutable container,
+     *   returning an iterator would have some additional performance
+     *   cost, with no benefits otherwise.
+     *
+     *   In our opinion, this function should return a
+     *   ``std::optional<const T&>`` but this construction is not valid
+     *   in any current standard.  As a compromise we return a
+     *   pointer, which has similar syntactic properties yet it is
+     *   unfortunatelly unnecessarily unrestricted.
+     *
+     * @endrst
+     */
+    const T* find(const K& k) const
+    { return impl_.template get<project_value_ptr,
+                                detail::constantly<const T*, nullptr>>(k); }
+
+    /*!
+     * Returns whether the sets are equal.
+     */
+    bool operator==(const map& other) const
+    { return impl_.template equals<equal_value>(other.impl_); }
+    bool operator!=(const map& other) const
+    { return !(*this == other); }
+
+    /*!
+     * Returns a map containing the association `value`.  If the key is
+     * already in the map, it replaces its association in the map.
+     * It may allocate memory and its complexity is *effectively* @f$
+     * O(1) @f$.
+     */
+    map insert(value_type value) const
+    { return impl_.add(std::move(value)); }
+
+    /*!
+     * Returns a map containing the association `(k, v)`.  If the key
+     * is already in the map, it replaces its association in the map.
+     * It may allocate memory and its complexity is *effectively* @f$
+     * O(1) @f$.
+     */
+    map set(key_type k, mapped_type v) const
+    { return impl_.add({std::move(k), std::move(v)}); }
+
+    /*!
+     * Returns a map replacing the association `(k, v)` by the
+     * association new association `(k, fn(v))`, where `v` is the
+     * currently associated value for `k` in the map or a default
+     * constructed value otherwise. It may allocate memory
+     * and its complexity is *effectively* @f$ O(1) @f$.
+     */
+    template <typename Fn>
+    map update(key_type k, Fn&& fn) const
+    {
+        return impl_
+            .template update<project_value, default_value, combine_value>(
+                std::move(k), std::forward<Fn>(fn));
+    }
+
+    /*!
+     * Returns a map without the key `k`.  If the key is not
+     * associated in the map it returns the same map.  It may allocate
+     * memory and its complexity is *effectively* @f$ O(1) @f$.
+     */
+    map erase(const K& k) const
+    { return impl_.sub(k); }
+
+    /*!
+     * Returns an @a transient form of this container, a
+     * `immer::map_transient`.
+     */
+    transient_type transient() const&
+    { return transient_type{ impl_ }; }
+    transient_type transient() &&
+    { return transient_type{ std::move(impl_) }; }
+
+    // Semi-private
+    const impl_t& impl() const { return impl_; }
+
+private:
+    friend transient_type;
+
+    map(impl_t impl)
+        : impl_(std::move(impl))
+    {}
+
+    impl_t impl_ = impl_t::empty;
+};
+
+} // namespace immer
diff --git a/src/immer/map_transient.hpp b/src/immer/map_transient.hpp
new file mode 100644
index 000000000000..542dac1d5deb
--- /dev/null
+++ b/src/immer/map_transient.hpp
@@ -0,0 +1,29 @@
+//
+// immer: immutable data structures for C++
+// Copyright (C) 2016, 2017, 2018 Juan Pedro Bolivar Puente
+//
+// This software is distributed under the Boost Software License, Version 1.0.
+// See accompanying file LICENSE or copy at http://boost.org/LICENSE_1_0.txt
+//
+
+#pragma once
+
+#include <immer/memory_policy.hpp>
+#include <immer/detail/hamts/champ.hpp>
+
+#include <functional>
+
+namespace immer {
+
+/*!
+ * **WORK IN PROGRESS**
+ */
+template <typename K,
+          typename T,
+          typename Hash          = std::hash<K>,
+          typename Equal         = std::equal_to<K>,
+          typename MemoryPolicy  = default_memory_policy,
+          detail::hamts::bits_t B = default_bits>
+class map_transient;
+
+} // namespace immer
diff --git a/src/immer/memory_policy.hpp b/src/immer/memory_policy.hpp
new file mode 100644
index 000000000000..9d95f56a0e48
--- /dev/null
+++ b/src/immer/memory_policy.hpp
@@ -0,0 +1,138 @@
+//
+// immer: immutable data structures for C++
+// Copyright (C) 2016, 2017, 2018 Juan Pedro Bolivar Puente
+//
+// This software is distributed under the Boost Software License, Version 1.0.
+// See accompanying file LICENSE or copy at http://boost.org/LICENSE_1_0.txt
+//
+
+#pragma once
+
+#include <immer/heap/cpp_heap.hpp>
+#include <immer/heap/heap_policy.hpp>
+#include <immer/refcount/refcount_policy.hpp>
+#include <immer/refcount/unsafe_refcount_policy.hpp>
+#include <immer/refcount/no_refcount_policy.hpp>
+#include <immer/transience/no_transience_policy.hpp>
+#include <immer/transience/gc_transience_policy.hpp>
+#include <type_traits>
+
+namespace immer {
+
+/*!
+ * Metafunction that returns the best *transience policy* to use for a
+ * given *refcount policy*.
+ */
+template <typename RefcountPolicy>
+struct get_transience_policy
+    : std::conditional<std::is_same<RefcountPolicy,
+                                    no_refcount_policy>::value,
+                       gc_transience_policy,
+                       no_transience_policy>
+{};
+
+template <typename T>
+using get_transience_policy_t = typename get_transience_policy<T>::type;
+
+/*!
+ * Metafunction that returns wether to *prefer fewer bigger objects*
+ * to use for a given *heap policy*.
+ */
+template <typename HeapPolicy>
+struct get_prefer_fewer_bigger_objects
+    : std::integral_constant<bool,
+                             std::is_same<
+                                 HeapPolicy,
+                                 heap_policy<cpp_heap>
+                                 >::value>
+{};
+
+template <typename T>
+constexpr auto get_prefer_fewer_bigger_objects_v =
+    get_prefer_fewer_bigger_objects<T>::value;
+
+/*!
+ * Metafunction that returns wether to use *transient R-Values*
+ * for a given *refcount policy*.
+ */
+template <typename RefcountPolicy>
+struct get_use_transient_rvalues
+    : std::integral_constant<bool,
+                             !std::is_same<
+                                 RefcountPolicy,
+                                 no_refcount_policy>::value>
+{};
+
+template <typename T>
+constexpr auto get_use_transient_rvalues_v = get_use_transient_rvalues<T>::value;
+
+/*!
+ * This is a default implementation of a *memory policy*.  A memory
+ * policy is just a bag of other policies plus some flags with hints
+ * to the user about the best way to use these strategies.
+ *
+ * @tparam HeapPolicy A *heap policy*, for example, @ref heap_policy.
+ * @tparam RefcountPolicy A *reference counting policy*, for example,
+ *         @ref refcount_policy.
+ * @tparam TransiencePolicy A *transience policy*, for example,
+ *         @ref no_transience_policy.
+ * @tparam PreferFewerBiggerObjects Boolean flag indicating whether
+ *         the user should prefer to allocate memory in bigger chungs
+ *         --e.g. by putting various objects in the same memory
+ *         region-- or not.
+ * @tparam UseTransientRValues Boolean flag indicating whether
+ *         immutable containers should try to modify contents in-place
+ *         when manipulating an r-value reference.
+ */
+template <typename HeapPolicy,
+          typename RefcountPolicy,
+          typename TransiencePolicy     = get_transience_policy_t<RefcountPolicy>,
+          bool PreferFewerBiggerObjects = get_prefer_fewer_bigger_objects_v<HeapPolicy>,
+          bool UseTransientRValues      = get_use_transient_rvalues_v<RefcountPolicy>>
+struct memory_policy
+{
+    using heap       = HeapPolicy;
+    using refcount   = RefcountPolicy;
+    using transience = TransiencePolicy;
+
+    static constexpr bool prefer_fewer_bigger_objects =
+        PreferFewerBiggerObjects;
+
+    static constexpr bool use_transient_rvalues =
+        UseTransientRValues;
+
+    using transience_t = typename transience::template apply<heap>::type;
+};
+
+/*!
+ * The default *heap policy* just uses the standard heap with a
+ * @ref free_list_heap_policy.  If `IMMER_NO_FREE_LIST` is defined to `1`
+ * then it just uses the standard heap.
+ */
+#if IMMER_NO_FREE_LIST
+using default_heap_policy = heap_policy<debug_size_heap<cpp_heap>>;
+#else
+#if IMMER_NO_THREAD_SAFETY
+using default_heap_policy = unsafe_free_list_heap_policy<cpp_heap>;
+#else
+using default_heap_policy = free_list_heap_policy<cpp_heap>;
+#endif
+#endif
+
+/*!
+ * By default we use thread safe reference counting.
+ */
+#if IMMER_NO_THREAD_SAFETY
+using default_refcount_policy = unsafe_refcount_policy;
+#else
+using default_refcount_policy = refcount_policy;
+#endif
+
+/*!
+ * The default memory policy.
+ */
+using default_memory_policy = memory_policy<
+    default_heap_policy,
+    default_refcount_policy>;
+
+} // namespace immer
diff --git a/src/immer/refcount/enable_intrusive_ptr.hpp b/src/immer/refcount/enable_intrusive_ptr.hpp
new file mode 100644
index 000000000000..1185a219fd9b
--- /dev/null
+++ b/src/immer/refcount/enable_intrusive_ptr.hpp
@@ -0,0 +1,37 @@
+//
+// immer: immutable data structures for C++
+// Copyright (C) 2016, 2017, 2018 Juan Pedro Bolivar Puente
+//
+// This software is distributed under the Boost Software License, Version 1.0.
+// See accompanying file LICENSE or copy at http://boost.org/LICENSE_1_0.txt
+//
+
+#pragma once
+
+#include <immer/refcount/no_refcount_policy.hpp>
+
+namespace immer {
+
+template <typename Deriv, typename RefcountPolicy>
+class enable_intrusive_ptr
+{
+    mutable RefcountPolicy refcount_data_;
+
+public:
+    enable_intrusive_ptr()
+        : refcount_data_{disowned{}}
+    {}
+
+    friend void intrusive_ptr_add_ref(const Deriv* x)
+    {
+        x->refcount_data_.inc();
+    }
+
+    friend void intrusive_ptr_release(const Deriv* x)
+    {
+        if (x->refcount_data_.dec())
+            delete x;
+    }
+};
+
+} // namespace immer
diff --git a/src/immer/refcount/no_refcount_policy.hpp b/src/immer/refcount/no_refcount_policy.hpp
new file mode 100644
index 000000000000..188fb9f5594e
--- /dev/null
+++ b/src/immer/refcount/no_refcount_policy.hpp
@@ -0,0 +1,30 @@
+//
+// immer: immutable data structures for C++
+// Copyright (C) 2016, 2017, 2018 Juan Pedro Bolivar Puente
+//
+// This software is distributed under the Boost Software License, Version 1.0.
+// See accompanying file LICENSE or copy at http://boost.org/LICENSE_1_0.txt
+//
+
+#pragma once
+
+namespace immer {
+
+struct disowned {};
+
+/*!
+ * Disables reference counting, to be used with an alternative garbage
+ * collection strategy like a `gc_heap`.
+ */
+struct no_refcount_policy
+{
+    no_refcount_policy() {};
+    no_refcount_policy(disowned) {}
+
+    void inc() {}
+    bool dec() { return false; }
+    void dec_unsafe() {}
+    bool unique() { return false; }
+};
+
+} // namespace immer
diff --git a/src/immer/refcount/refcount_policy.hpp b/src/immer/refcount/refcount_policy.hpp
new file mode 100644
index 000000000000..b143cbf7e43a
--- /dev/null
+++ b/src/immer/refcount/refcount_policy.hpp
@@ -0,0 +1,52 @@
+//
+// immer: immutable data structures for C++
+// Copyright (C) 2016, 2017, 2018 Juan Pedro Bolivar Puente
+//
+// This software is distributed under the Boost Software License, Version 1.0.
+// See accompanying file LICENSE or copy at http://boost.org/LICENSE_1_0.txt
+//
+
+#pragma once
+
+#include <immer/refcount/no_refcount_policy.hpp>
+
+#include <atomic>
+#include <utility>
+#include <cassert>
+
+namespace immer {
+
+/*!
+ * A reference counting policy implemented using an *atomic* `int`
+ * count.  It is **thread-safe**.
+ */
+struct refcount_policy
+{
+    mutable std::atomic<int> refcount;
+
+    refcount_policy() : refcount{1} {};
+    refcount_policy(disowned) : refcount{0} {}
+
+    void inc()
+    {
+        refcount.fetch_add(1, std::memory_order_relaxed);
+    }
+
+    bool dec()
+    {
+        return 1 == refcount.fetch_sub(1, std::memory_order_acq_rel);
+    }
+
+    void dec_unsafe()
+    {
+        assert(refcount.load() > 1);
+        refcount.fetch_sub(1, std::memory_order_relaxed);
+    }
+
+    bool unique()
+    {
+        return refcount == 1;
+    }
+};
+
+} // namespace immer
diff --git a/src/immer/refcount/unsafe_refcount_policy.hpp b/src/immer/refcount/unsafe_refcount_policy.hpp
new file mode 100644
index 000000000000..9a77f06a512a
--- /dev/null
+++ b/src/immer/refcount/unsafe_refcount_policy.hpp
@@ -0,0 +1,35 @@
+//
+// immer: immutable data structures for C++
+// Copyright (C) 2016, 2017, 2018 Juan Pedro Bolivar Puente
+//
+// This software is distributed under the Boost Software License, Version 1.0.
+// See accompanying file LICENSE or copy at http://boost.org/LICENSE_1_0.txt
+//
+
+#pragma once
+
+#include <immer/refcount/no_refcount_policy.hpp>
+
+#include <atomic>
+#include <utility>
+
+namespace immer {
+
+/*!
+ * A reference counting policy implemented using a raw `int` count.
+ * It is **not thread-safe**.
+ */
+struct unsafe_refcount_policy
+{
+    mutable int refcount;
+
+    unsafe_refcount_policy() : refcount{1} {};
+    unsafe_refcount_policy(disowned) : refcount{0} {}
+
+    void inc() { ++refcount; }
+    bool dec() { return --refcount == 0; }
+    void dec_unsafe() { --refcount; }
+    bool unique() { return refcount == 1; }
+};
+
+} // namespace immer
diff --git a/src/immer/set.hpp b/src/immer/set.hpp
new file mode 100644
index 000000000000..0de09614d3d5
--- /dev/null
+++ b/src/immer/set.hpp
@@ -0,0 +1,161 @@
+//
+// immer: immutable data structures for C++
+// Copyright (C) 2016, 2017, 2018 Juan Pedro Bolivar Puente
+//
+// This software is distributed under the Boost Software License, Version 1.0.
+// See accompanying file LICENSE or copy at http://boost.org/LICENSE_1_0.txt
+//
+
+#pragma once
+
+#include <immer/memory_policy.hpp>
+#include <immer/detail/hamts/champ.hpp>
+#include <immer/detail/hamts/champ_iterator.hpp>
+
+#include <functional>
+
+namespace immer {
+
+template <typename T,
+          typename Hash,
+          typename Equal,
+          typename MemoryPolicy,
+          detail::hamts::bits_t B>
+class set_transient;
+
+/*!
+ * Immutable set representing an unordered bag of values.
+ *
+ * @tparam T    The type of the values to be stored in the container.
+ * @tparam Hash The type of a function object capable of hashing
+ *              values of type `T`.
+ * @tparam Equal The type of a function object capable of comparing
+ *              values of type `T`.
+ * @tparam MemoryPolicy Memory management policy. See @ref
+ *              memory_policy.
+ *
+ * @rst
+ *
+ * This cotainer provides a good trade-off between cache locality,
+ * membership checks, update performance and structural sharing.  It
+ * does so by storing the data in contiguous chunks of :math:`2^{B}`
+ * elements.  When storing big objects, the size of these contiguous
+ * chunks can become too big, damaging performance.  If this is
+ * measured to be problematic for a specific use-case, it can be
+ * solved by using a `immer::box` to wrap the type `T`.
+ *
+ * **Example**
+ *   .. literalinclude:: ../example/set/intro.cpp
+ *      :language: c++
+ *      :start-after: intro/start
+ *      :end-before:  intro/end
+ *
+ * @endrst
+ *
+ */
+template <typename T,
+          typename Hash          = std::hash<T>,
+          typename Equal         = std::equal_to<T>,
+          typename MemoryPolicy  = default_memory_policy,
+          detail::hamts::bits_t B = default_bits>
+class set
+{
+    using impl_t = detail::hamts::champ<T, Hash, Equal, MemoryPolicy, B>;
+
+public:
+    using key_type = T;
+    using value_type = T;
+    using size_type = detail::hamts::size_t;
+    using diference_type = std::ptrdiff_t;
+    using hasher = Hash;
+    using key_equal = Equal;
+    using reference = const T&;
+    using const_reference = const T&;
+
+    using iterator         = detail::hamts::champ_iterator<T, Hash, Equal,
+                                                         MemoryPolicy, B>;
+    using const_iterator   = iterator;
+
+    using transient_type   = set_transient<T, Hash, Equal, MemoryPolicy, B>;
+
+    /*!
+     * Default constructor.  It creates a set of `size() == 0`.  It
+     * does not allocate memory and its complexity is @f$ O(1) @f$.
+     */
+    set() = default;
+
+    /*!
+     * Returns an iterator pointing at the first element of the
+     * collection. It does not allocate memory and its complexity is
+     * @f$ O(1) @f$.
+     */
+    iterator begin() const { return {impl_}; }
+
+    /*!
+     * Returns an iterator pointing just after the last element of the
+     * collection. It does not allocate and its complexity is @f$ O(1) @f$.
+     */
+    iterator end() const { return {impl_, typename iterator::end_t{}}; }
+
+    /*!
+     * Returns the number of elements in the container.  It does
+     * not allocate memory and its complexity is @f$ O(1) @f$.
+     */
+    size_type size() const { return impl_.size; }
+
+    /*!
+     * Returns `1` when `value` is contained in the set or `0`
+     * otherwise. It won't allocate memory and its complexity is
+     * *effectively* @f$ O(1) @f$.
+     */
+    size_type count(const T& value) const
+    { return impl_.template get<detail::constantly<size_type, 1>,
+                                detail::constantly<size_type, 0>>(value); }
+
+    /*!
+     * Returns whether the sets are equal.
+     */
+    bool operator==(const set& other) const
+    { return impl_.equals(other.impl_); }
+    bool operator!=(const set& other) const
+    { return !(*this == other); }
+
+    /*!
+     * Returns a set containing `value`.  If the `value` is already in
+     * the set, it returns the same set.  It may allocate memory and
+     * its complexity is *effectively* @f$ O(1) @f$.
+     */
+    set insert(T value) const
+    { return impl_.add(std::move(value)); }
+
+    /*!
+     * Returns a set without `value`.  If the `value` is not in the
+     * set it returns the same set.  It may allocate memory and its
+     * complexity is *effectively* @f$ O(1) @f$.
+     */
+    set erase(const T& value) const
+    { return impl_.sub(value); }
+
+    /*!
+     * Returns an @a transient form of this container, a
+     * `immer::set_transient`.
+     */
+    transient_type transient() const&
+    { return transient_type{ impl_ }; }
+    transient_type transient() &&
+    { return transient_type{ std::move(impl_) }; }
+
+    // Semi-private
+    const impl_t& impl() const { return impl_; }
+
+private:
+    friend transient_type;
+
+    set(impl_t impl)
+        : impl_(std::move(impl))
+    {}
+
+    impl_t impl_ = impl_t::empty;
+};
+
+} // namespace immer
diff --git a/src/immer/set_transient.hpp b/src/immer/set_transient.hpp
new file mode 100644
index 000000000000..cba41601c694
--- /dev/null
+++ b/src/immer/set_transient.hpp
@@ -0,0 +1,28 @@
+//
+// immer: immutable data structures for C++
+// Copyright (C) 2016, 2017, 2018 Juan Pedro Bolivar Puente
+//
+// This software is distributed under the Boost Software License, Version 1.0.
+// See accompanying file LICENSE or copy at http://boost.org/LICENSE_1_0.txt
+//
+
+#pragma once
+
+#include <immer/memory_policy.hpp>
+#include <immer/detail/hamts/champ.hpp>
+
+#include <functional>
+
+namespace immer {
+
+/*!
+ * **WORK IN PROGRESS**
+ */
+template <typename T,
+          typename Hash          = std::hash<T>,
+          typename Equal         = std::equal_to<T>,
+          typename MemoryPolicy  = default_memory_policy,
+          detail::hamts::bits_t B = default_bits>
+class set_transient;
+
+} // namespace immer
diff --git a/src/immer/transience/gc_transience_policy.hpp b/src/immer/transience/gc_transience_policy.hpp
new file mode 100644
index 000000000000..7137bed83952
--- /dev/null
+++ b/src/immer/transience/gc_transience_policy.hpp
@@ -0,0 +1,110 @@
+//
+// immer: immutable data structures for C++
+// Copyright (C) 2016, 2017, 2018 Juan Pedro Bolivar Puente
+//
+// This software is distributed under the Boost Software License, Version 1.0.
+// See accompanying file LICENSE or copy at http://boost.org/LICENSE_1_0.txt
+//
+
+#pragma once
+
+#include <immer/heap/tags.hpp>
+
+#include <memory>
+#include <utility>
+#include <atomic>
+
+namespace immer {
+
+/*!
+ * Provides transience ownership tracking when a *tracing garbage
+ * collector* is used instead of reference counting.
+ *
+ * @rst
+ *
+ * .. warning:: Using this policy without an allocation scheme that
+ *    includes automatic tracing garbage collection may cause memory
+ *    leaks.
+ *
+ * @endrst
+ */
+struct gc_transience_policy
+{
+    template <typename HeapPolicy>
+    struct apply
+    {
+        struct type
+        {
+            using heap_ = typename HeapPolicy::type;
+
+            struct edit
+            {
+                void* v;
+                edit() = delete;
+                bool operator==(edit x) const { return v == x.v; }
+                bool operator!=(edit x) const { return v != x.v; }
+            };
+
+            struct owner
+            {
+                void* make_token_()
+                {
+                    return heap_::allocate(1, norefs_tag{});
+                };
+
+                mutable std::atomic<void*> token_;
+
+                operator edit () { return { token_ }; }
+
+                owner()
+                    : token_{make_token_()}
+                {}
+                owner(const owner& o)
+                    : token_{make_token_()}
+                {
+                    o.token_ = make_token_();
+                }
+                owner(owner&& o) noexcept
+                    : token_{o.token_.load()}
+                {}
+                owner& operator=(const owner& o)
+                {
+                    o.token_ = make_token_();
+                    token_   = make_token_();
+                    return *this;
+                }
+                owner& operator=(owner&& o) noexcept
+                {
+                    token_ = o.token_.load();
+                    return *this;
+                }
+            };
+
+            struct ownee
+            {
+                edit token_ {nullptr};
+
+                ownee& operator=(edit e)
+                {
+                    assert(e != noone);
+                    // This would be a nice safety plug but it sadly
+                    // does not hold during transient concatenation.
+                    // assert(token_ == e || token_ == edit{nullptr});
+                    token_ = e;
+                    return *this;
+                }
+
+                bool can_mutate(edit t) const { return token_ == t; }
+                bool owned() const { return token_ != edit{nullptr}; }
+            };
+
+            static owner noone;
+        };
+    };
+};
+
+template <typename HP>
+typename gc_transience_policy::apply<HP>::type::owner
+gc_transience_policy::apply<HP>::type::noone = {};
+
+} // namespace immer
diff --git a/src/immer/transience/no_transience_policy.hpp b/src/immer/transience/no_transience_policy.hpp
new file mode 100644
index 000000000000..aa3d44ed4287
--- /dev/null
+++ b/src/immer/transience/no_transience_policy.hpp
@@ -0,0 +1,48 @@
+//
+// immer: immutable data structures for C++
+// Copyright (C) 2016, 2017, 2018 Juan Pedro Bolivar Puente
+//
+// This software is distributed under the Boost Software License, Version 1.0.
+// See accompanying file LICENSE or copy at http://boost.org/LICENSE_1_0.txt
+//
+
+#pragma once
+
+namespace immer {
+
+/*!
+ * Disables any special *transience* tracking.  To be used when
+ * *reference counting* is available instead.
+ */
+struct no_transience_policy
+{
+    template <typename>
+    struct apply
+    {
+        struct type
+        {
+            struct edit {};
+
+            struct owner
+            {
+                operator edit () const { return {}; }
+                owner& operator=(const owner&) { return *this; };
+            };
+
+            struct ownee
+            {
+                ownee& operator=(edit) { return *this; };
+                bool can_mutate(edit) const { return false; }
+                bool owned() const { return false; }
+            };
+
+            static owner noone;
+        };
+    };
+};
+
+template <typename HP>
+typename no_transience_policy::apply<HP>::type::owner
+no_transience_policy::apply<HP>::type::noone = {};
+
+} // namespace immer
diff --git a/src/immer/vector.hpp b/src/immer/vector.hpp
new file mode 100644
index 000000000000..f808a3242f70
--- /dev/null
+++ b/src/immer/vector.hpp
@@ -0,0 +1,352 @@
+//
+// immer: immutable data structures for C++
+// Copyright (C) 2016, 2017, 2018 Juan Pedro Bolivar Puente
+//
+// This software is distributed under the Boost Software License, Version 1.0.
+// See accompanying file LICENSE or copy at http://boost.org/LICENSE_1_0.txt
+//
+
+#pragma once
+
+#include <immer/detail/rbts/rbtree.hpp>
+#include <immer/detail/rbts/rbtree_iterator.hpp>
+#include <immer/memory_policy.hpp>
+
+#if IMMER_DEBUG_PRINT
+#include <immer/flex_vector.hpp>
+#endif
+
+namespace immer {
+
+template <typename T,
+          typename MemoryPolicy,
+          detail::rbts::bits_t B,
+          detail::rbts::bits_t BL>
+class flex_vector;
+
+template <typename T,
+          typename MemoryPolicy,
+          detail::rbts::bits_t B,
+          detail::rbts::bits_t BL>
+class vector_transient;
+
+/*!
+ * Immutable sequential container supporting both random access and
+ * structural sharing.
+ *
+ * @tparam T The type of the values to be stored in the container.
+ * @tparam MemoryPolicy Memory management policy. See @ref
+ *         memory_policy.
+ *
+ * @rst
+ *
+ * This cotainer provides a good trade-off between cache locality,
+ * random access, update performance and structural sharing.  It does
+ * so by storing the data in contiguous chunks of :math:`2^{BL}`
+ * elements.  By default, when ``sizeof(T) == sizeof(void*)`` then
+ * :math:`B=BL=5`, such that data would be stored in contiguous
+ * chunks of :math:`32` elements.
+ *
+ * You may learn more about the meaning and implications of ``B`` and
+ * ``BL`` parameters in the :doc:`implementation` section.
+ *
+ * .. note:: In several methods we say that their complexity is
+ *    *effectively* :math:`O(...)`. Do not confuse this with the word
+ *    *amortized*, which has a very different meaning.  In this
+ *    context, *effective* means that while the
+ *    mathematically rigurous
+ *    complexity might be higher, for all practical matters the
+ *    provided complexity is more useful to think about the actual
+ *    cost of the operation.
+ *
+ * **Example**
+ *   .. literalinclude:: ../example/vector/intro.cpp
+ *      :language: c++
+ *      :start-after: intro/start
+ *      :end-before:  intro/end
+ *
+ * @endrst
+ */
+template <typename T,
+          typename MemoryPolicy   = default_memory_policy,
+          detail::rbts::bits_t B  = default_bits,
+          detail::rbts::bits_t BL = detail::rbts::derive_bits_leaf<T, MemoryPolicy, B>>
+class vector
+{
+    using impl_t = detail::rbts::rbtree<T, MemoryPolicy, B, BL>;
+    using flex_t = flex_vector<T, MemoryPolicy, B, BL>;
+
+    using move_t =
+        std::integral_constant<bool, MemoryPolicy::use_transient_rvalues>;
+
+public:
+    static constexpr auto bits = B;
+    static constexpr auto bits_leaf = BL;
+    using memory_policy = MemoryPolicy;
+
+    using value_type = T;
+    using reference = const T&;
+    using size_type = detail::rbts::size_t;
+    using difference_type = std::ptrdiff_t;
+    using const_reference = const T&;
+
+    using iterator         = detail::rbts::rbtree_iterator<T, MemoryPolicy, B, BL>;
+    using const_iterator   = iterator;
+    using reverse_iterator = std::reverse_iterator<iterator>;
+
+    using transient_type   = vector_transient<T, MemoryPolicy, B, BL>;
+
+    /*!
+     * Default constructor.  It creates a vector of `size() == 0`.  It
+     * does not allocate memory and its complexity is @f$ O(1) @f$.
+     */
+    vector() = default;
+
+    /*!
+     * Constructs a vector containing the elements in `values`.
+     */
+    vector(std::initializer_list<T> values)
+        : impl_{impl_t::from_initializer_list(values)}
+    {}
+
+    /*!
+     * Constructs a vector containing the elements in the range
+     * defined by the input iterators `first` and `last`.
+     */
+    template <typename Iter>
+    vector(Iter first, Iter last)
+        : impl_{impl_t::from_range(first, last)}
+    {}
+
+    /*!
+     * Constructs a vector containing the element `val` repeated `n`
+     * times.
+     */
+    vector(size_type n, T v = {})
+        : impl_{impl_t::from_fill(n, v)}
+    {}
+
+    /*!
+     * Returns an iterator pointing at the first element of the
+     * collection. It does not allocate memory and its complexity is
+     * @f$ O(1) @f$.
+     */
+    iterator begin() const { return {impl_}; }
+
+    /*!
+     * Returns an iterator pointing just after the last element of the
+     * collection. It does not allocate and its complexity is @f$ O(1) @f$.
+     */
+    iterator end() const { return {impl_, typename iterator::end_t{}}; }
+
+    /*!
+     * Returns an iterator that traverses the collection backwards,
+     * pointing at the first element of the reversed collection. It
+     * does not allocate memory and its complexity is @f$ O(1) @f$.
+     */
+    reverse_iterator rbegin() const { return reverse_iterator{end()}; }
+
+    /*!
+     * Returns an iterator that traverses the collection backwards,
+     * pointing after the last element of the reversed collection. It
+     * does not allocate memory and its complexity is @f$ O(1) @f$.
+     */
+    reverse_iterator rend()   const { return reverse_iterator{begin()}; }
+
+    /*!
+     * Returns the number of elements in the container.  It does
+     * not allocate memory and its complexity is @f$ O(1) @f$.
+     */
+    size_type size() const { return impl_.size; }
+
+    /*!
+     * Returns `true` if there are no elements in the container.  It
+     * does not allocate memory and its complexity is @f$ O(1) @f$.
+     */
+    bool empty() const { return impl_.size == 0; }
+
+    /*!
+     * Access the last element.
+     */
+    const T& back() const { return impl_.back(); }
+
+    /*!
+     * Access the first element.
+     */
+    const T& front() const { return impl_.front(); }
+
+    /*!
+     * Returns a `const` reference to the element at position `index`.
+     * It is undefined when @f$ 0 index \geq size() @f$.  It does not
+     * allocate memory and its complexity is *effectively* @f$ O(1)
+     * @f$.
+     */
+    reference operator[] (size_type index) const
+    { return impl_.get(index); }
+
+    /*!
+     * Returns a `const` reference to the element at position
+     * `index`. It throws an `std::out_of_range` exception when @f$
+     * index \geq size() @f$.  It does not allocate memory and its
+     * complexity is *effectively* @f$ O(1) @f$.
+     */
+    reference at(size_type index) const
+    { return impl_.get_check(index); }
+
+    /*!
+     * Returns whether the vectors are equal.
+     */
+    bool operator==(const vector& other) const
+    { return impl_.equals(other.impl_); }
+    bool operator!=(const vector& other) const
+    { return !(*this == other); }
+
+    /*!
+     * Returns a vector with `value` inserted at the end.  It may
+     * allocate memory and its complexity is *effectively* @f$ O(1) @f$.
+     *
+     * @rst
+     *
+     * **Example**
+     *   .. literalinclude:: ../example/vector/vector.cpp
+     *      :language: c++
+     *      :dedent: 8
+     *      :start-after: push-back/start
+     *      :end-before:  push-back/end
+     *
+     * @endrst
+     */
+    vector push_back(value_type value) const&
+    { return impl_.push_back(std::move(value)); }
+
+    decltype(auto) push_back(value_type value) &&
+    { return push_back_move(move_t{}, std::move(value)); }
+
+    /*!
+     * Returns a vector containing value `value` at position `idx`.
+     * Undefined for `index >= size()`.
+     * It may allocate memory and its complexity is
+     * *effectively* @f$ O(1) @f$.
+     *
+     * @rst
+     *
+     * **Example**
+     *   .. literalinclude:: ../example/vector/vector.cpp
+     *      :language: c++
+     *      :dedent: 8
+     *      :start-after: set/start
+     *      :end-before:  set/end
+     *
+     * @endrst
+     */
+    vector set(size_type index, value_type value) const&
+    { return impl_.assoc(index, std::move(value)); }
+
+    decltype(auto) set(size_type index, value_type value) &&
+    { return set_move(move_t{}, index, std::move(value)); }
+
+    /*!
+     * Returns a vector containing the result of the expression
+     * `fn((*this)[idx])` at position `idx`.
+     * Undefined for `0 >= size()`.
+     * It may allocate memory and its complexity is
+     * *effectively* @f$ O(1) @f$.
+     *
+     * @rst
+     *
+     * **Example**
+     *   .. literalinclude:: ../example/vector/vector.cpp
+     *      :language: c++
+     *      :dedent: 8
+     *      :start-after: update/start
+     *      :end-before:  update/end
+     *
+     * @endrst
+     */
+    template <typename FnT>
+    vector update(size_type index, FnT&& fn) const&
+    { return impl_.update(index, std::forward<FnT>(fn)); }
+
+    template <typename FnT>
+    decltype(auto) update(size_type index, FnT&& fn) &&
+    { return update_move(move_t{}, index, std::forward<FnT>(fn)); }
+
+    /*!
+     * Returns a vector containing only the first `min(elems, size())`
+     * elements. It may allocate memory and its complexity is
+     * *effectively* @f$ O(1) @f$.
+     *
+     * @rst
+     *
+     * **Example**
+     *   .. literalinclude:: ../example/vector/vector.cpp
+     *      :language: c++
+     *      :dedent: 8
+     *      :start-after: take/start
+     *      :end-before:  take/end
+     *
+     * @endrst
+     */
+    vector take(size_type elems) const&
+    { return impl_.take(elems); }
+
+    decltype(auto) take(size_type elems) &&
+    { return take_move(move_t{}, elems); }
+
+    /*!
+     * Returns an @a transient form of this container, an
+     * `immer::vector_transient`.
+     */
+    transient_type transient() const&
+    { return transient_type{ impl_ }; }
+    transient_type transient() &&
+    { return transient_type{ std::move(impl_) }; }
+
+    // Semi-private
+    const impl_t& impl() const { return impl_; }
+
+#if IMMER_DEBUG_PRINT
+    void debug_print() const
+    { flex_t{*this}.debug_print(); }
+#endif
+
+private:
+    friend flex_t;
+    friend transient_type;
+
+    vector(impl_t impl)
+        : impl_(std::move(impl))
+    {
+#if IMMER_DEBUG_PRINT
+        // force the compiler to generate debug_print, so we can call
+        // it from a debugger
+        [](volatile auto){}(&vector::debug_print);
+#endif
+    }
+
+    vector&& push_back_move(std::true_type, value_type value)
+    { impl_.push_back_mut({}, std::move(value)); return std::move(*this); }
+    vector push_back_move(std::false_type, value_type value)
+    { return impl_.push_back(std::move(value)); }
+
+    vector&& set_move(std::true_type, size_type index, value_type value)
+    { impl_.assoc_mut({}, index, std::move(value)); return std::move(*this); }
+    vector set_move(std::false_type, size_type index, value_type value)
+    { return impl_.assoc(index, std::move(value)); }
+
+    template <typename Fn>
+    vector&& update_move(std::true_type, size_type index, Fn&& fn)
+    { impl_.update_mut({}, index, std::forward<Fn>(fn)); return std::move(*this); }
+    template <typename Fn>
+    vector update_move(std::false_type, size_type index, Fn&& fn)
+    { return impl_.update(index, std::forward<Fn>(fn)); }
+
+    vector&& take_move(std::true_type, size_type elems)
+    { impl_.take_mut({}, elems); return std::move(*this); }
+    vector take_move(std::false_type, size_type elems)
+    { return impl_.take(elems); }
+
+    impl_t impl_ = impl_t::empty;
+};
+
+} // namespace immer
diff --git a/src/immer/vector_transient.hpp b/src/immer/vector_transient.hpp
new file mode 100644
index 000000000000..3d6f2fd6f1bc
--- /dev/null
+++ b/src/immer/vector_transient.hpp
@@ -0,0 +1,189 @@
+//
+// immer: immutable data structures for C++
+// Copyright (C) 2016, 2017, 2018 Juan Pedro Bolivar Puente
+//
+// This software is distributed under the Boost Software License, Version 1.0.
+// See accompanying file LICENSE or copy at http://boost.org/LICENSE_1_0.txt
+//
+
+#pragma once
+
+#include <immer/detail/rbts/rbtree.hpp>
+#include <immer/detail/rbts/rbtree_iterator.hpp>
+#include <immer/memory_policy.hpp>
+
+namespace immer {
+
+template <typename T,
+          typename MemoryPolicy,
+          detail::rbts::bits_t B,
+          detail::rbts::bits_t BL>
+class vector;
+
+template <typename T,
+          typename MemoryPolicy,
+          detail::rbts::bits_t B,
+          detail::rbts::bits_t BL>
+class flex_vector_transient;
+
+/*!
+ * Mutable version of `immer::vector`.
+ *
+ * @rst
+ *
+ * Refer to :doc:`transients` to learn more about when and how to use
+ * the mutable versions of immutable containers.
+ *
+ * @endrst
+ */
+template <typename T,
+          typename MemoryPolicy   = default_memory_policy,
+          detail::rbts::bits_t B  = default_bits,
+          detail::rbts::bits_t BL = detail::rbts::derive_bits_leaf<T, MemoryPolicy, B>>
+class vector_transient
+    : MemoryPolicy::transience_t::owner
+{
+    using impl_t = detail::rbts::rbtree<T, MemoryPolicy, B, BL>;
+    using flex_t = flex_vector_transient<T, MemoryPolicy, B, BL>;
+    using owner_t = typename MemoryPolicy::transience_t::owner;
+
+public:
+    static constexpr auto bits = B;
+    static constexpr auto bits_leaf = BL;
+    using memory_policy = MemoryPolicy;
+
+    using value_type = T;
+    using reference = const T&;
+    using size_type = detail::rbts::size_t;
+    using difference_type = std::ptrdiff_t;
+    using const_reference = const T&;
+
+    using iterator         = detail::rbts::rbtree_iterator<T, MemoryPolicy, B, BL>;
+    using const_iterator   = iterator;
+    using reverse_iterator = std::reverse_iterator<iterator>;
+
+    using persistent_type  = vector<T, MemoryPolicy, B, BL>;
+
+    /*!
+     * Default constructor.  It creates a mutable vector of `size() ==
+     * 0`.  It does not allocate memory and its complexity is
+     * @f$ O(1) @f$.
+     */
+    vector_transient() = default;
+
+    /*!
+     * Returns an iterator pointing at the first element of the
+     * collection. It does not allocate memory and its complexity is
+     * @f$ O(1) @f$.
+     */
+    iterator begin() const { return {impl_}; }
+
+    /*!
+     * Returns an iterator pointing just after the last element of the
+     * collection. It does not allocate and its complexity is @f$ O(1) @f$.
+     */
+    iterator end()   const { return {impl_, typename iterator::end_t{}}; }
+
+    /*!
+     * Returns an iterator that traverses the collection backwards,
+     * pointing at the first element of the reversed collection. It
+     * does not allocate memory and its complexity is @f$ O(1) @f$.
+     */
+    reverse_iterator rbegin() const { return reverse_iterator{end()}; }
+
+    /*!
+     * Returns an iterator that traverses the collection backwards,
+     * pointing after the last element of the reversed collection. It
+     * does not allocate memory and its complexity is @f$ O(1) @f$.
+     */
+    reverse_iterator rend()   const { return reverse_iterator{begin()}; }
+
+    /*!
+     * Returns the number of elements in the container.  It does
+     * not allocate memory and its complexity is @f$ O(1) @f$.
+     */
+    size_type size() const { return impl_.size; }
+
+    /*!
+     * Returns `true` if there are no elements in the container.  It
+     * does not allocate memory and its complexity is @f$ O(1) @f$.
+     */
+    bool empty() const { return impl_.size == 0; }
+
+    /*!
+     * Returns a `const` reference to the element at position `index`.
+     * It is undefined when @f$ 0 index \geq size() @f$.  It does not
+     * allocate memory and its complexity is *effectively* @f$ O(1)
+     * @f$.
+     */
+    reference operator[] (size_type index) const
+    { return impl_.get(index); }
+
+    /*!
+     * Returns a `const` reference to the element at position
+     * `index`. It throws an `std::out_of_range` exception when @f$
+     * index \geq size() @f$.  It does not allocate memory and its
+     * complexity is *effectively* @f$ O(1) @f$.
+     */
+    reference at(size_type index) const
+    { return impl_.get_check(index); }
+
+    /*!
+     * Inserts `value` at the end.  It may allocate memory and its
+     * complexity is *effectively* @f$ O(1) @f$.
+     */
+    void push_back(value_type value)
+    { impl_.push_back_mut(*this, std::move(value)); }
+
+    /*!
+     * Sets to the value `value` at position `idx`.
+     * Undefined for `index >= size()`.
+     * It may allocate memory and its complexity is
+     * *effectively* @f$ O(1) @f$.
+     */
+    void set(size_type index, value_type value)
+    { impl_.assoc_mut(*this, index, std::move(value)); }
+
+    /*!
+     * Updates the vector to contain the result of the expression
+     * `fn((*this)[idx])` at position `idx`.
+     * Undefined for `0 >= size()`.
+     * It may allocate memory and its complexity is
+     * *effectively* @f$ O(1) @f$.
+     */
+    template <typename FnT>
+    void update(size_type index, FnT&& fn)
+    { impl_.update_mut(*this, index, std::forward<FnT>(fn)); }
+
+    /*!
+     * Resizes the vector to only contain the first `min(elems, size())`
+     * elements. It may allocate memory and its complexity is
+     * *effectively* @f$ O(1) @f$.
+     */
+    void take(size_type elems)
+    { impl_.take_mut(*this, elems); }
+
+    /*!
+     * Returns an @a immutable form of this container, an
+     * `immer::vector`.
+     */
+    persistent_type persistent() &
+    {
+        this->owner_t::operator=(owner_t{});
+        return persistent_type{ impl_ };
+    }
+    persistent_type persistent() &&
+    { return persistent_type{ std::move(impl_) }; }
+
+private:
+    friend flex_t;
+    friend persistent_type;
+
+    vector_transient(impl_t impl)
+        : impl_(std::move(impl))
+    {}
+
+    impl_t  impl_  = impl_t::empty;
+};
+
+} // namespace immer
diff --git a/src/uint256.h b/src/uint256.h
index 58c94055dfb0..3691ae7feeb8 100644
--- a/src/uint256.h
+++ b/src/uint256.h
@@ -174,5 +174,15 @@ class uint512 : public base_blob<512> {
     }
 };
 
+namespace std {
+    template <>
+    struct hash<uint256>
+    {
+        std::size_t operator()(const uint256& k) const
+        {
+            return (std::size_t)k.GetCheapHash();
+        }
+    };
+}
 
 #endif // BITCOIN_UINT256_H

From 4531f6b896119b2b8f33c03a50cb4d4ee62a6acb Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Wed, 14 Feb 2018 12:04:24 +0100
Subject: [PATCH 072/400] Implement CDBTransaction and CScopedDBTransaction

Allows easier commit/rollback handling, especially useful when AcceptBlock
fails and things need to be reverted.
---
 src/dbwrapper.h | 215 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 215 insertions(+)

diff --git a/src/dbwrapper.h b/src/dbwrapper.h
index 1d590ec73135..240c6cfe4c27 100644
--- a/src/dbwrapper.h
+++ b/src/dbwrapper.h
@@ -12,6 +12,8 @@
 #include "utilstrencodings.h"
 #include "version.h"
 
+#include <typeindex>
+
 #include <boost/filesystem/path.hpp>
 
 #include <leveldb/db.h>
@@ -342,4 +344,217 @@ class CDBWrapper
 
 };
 
+class CDBTransaction {
+private:
+    CDBWrapper &db;
+
+    struct KeyHolder {
+        virtual ~KeyHolder() = default;
+        virtual bool Less(const KeyHolder &b) const = 0;
+        virtual void Erase(CDBBatch &batch) = 0;
+    };
+    typedef std::unique_ptr<KeyHolder> KeyHolderPtr;
+
+    template <typename K>
+    struct KeyHolderImpl : KeyHolder {
+        KeyHolderImpl(const K &_key)
+                : key(_key) {
+        }
+        virtual bool Less(const KeyHolder &b) const {
+            auto *b2 = dynamic_cast<const KeyHolderImpl<K>*>(&b);
+            return key < b2->key;
+        }
+        virtual void Erase(CDBBatch &batch) {
+            batch.Erase(key);
+        }
+        K key;
+    };
+
+    struct KeyValueHolder {
+        virtual void Write(CDBBatch &batch) = 0;
+    };
+    typedef std::unique_ptr<KeyValueHolder> KeyValueHolderPtr;
+
+    template <typename K, typename V>
+    struct KeyValueHolderImpl : KeyValueHolder {
+        KeyValueHolderImpl(const KeyHolderImpl<K> &_key, const V &_value)
+                : key(_key),
+                  value(_value) { }
+        virtual void Write(CDBBatch &batch) {
+            batch.Write(key.key, value);
+        }
+        const KeyHolderImpl<K> &key;
+        V value;
+    };
+
+    struct keyCmp {
+        bool operator()(const KeyHolderPtr &a, const KeyHolderPtr &b) const {
+            return a->Less(*b);
+        }
+    };
+
+    typedef std::map<KeyHolderPtr, KeyValueHolderPtr, keyCmp> KeyValueMap;
+    typedef std::map<std::type_index, KeyValueMap> TypeKeyValueMap;
+
+    TypeKeyValueMap writes;
+    TypeKeyValueMap deletes;
+
+    template <typename K>
+    KeyValueMap *getMapForType(TypeKeyValueMap &m, bool create) {
+        auto it = m.find(typeid(K));
+        if (it != m.end()) {
+            return &it->second;
+        }
+        if (!create)
+            return nullptr;
+        auto it2 = m.emplace(typeid(K), KeyValueMap());
+        return &it2.first->second;
+    }
+
+    template <typename K>
+    KeyValueMap *getWritesMap(bool create) {
+        return getMapForType<K>(writes, create);
+    }
+
+    template <typename K>
+    KeyValueMap *getDeletesMap(bool create) {
+        return getMapForType<K>(deletes, create);
+    }
+
+public:
+    CDBTransaction(CDBWrapper &_db) : db(_db) {}
+
+    template <typename K, typename V>
+    void Write(const K& key, const V& value) {
+        KeyHolderPtr k(new KeyHolderImpl<K>(key));
+        KeyHolderImpl<K>* k2 = dynamic_cast<KeyHolderImpl<K>*>(k.get());
+        KeyValueHolderPtr kv(new KeyValueHolderImpl<K,V>(*k2, value));
+
+        KeyValueMap *ds = getDeletesMap<K>(false);
+        if (ds)
+            ds->erase(k);
+
+        KeyValueMap *ws = getWritesMap<K>(true);
+        ws->erase(k);
+        ws->emplace(std::make_pair(std::move(k), std::move(kv)));
+    }
+
+    template <typename K, typename V>
+    bool Read(const K& key, V& value) {
+        KeyHolderPtr k(new KeyHolderImpl<K>(key));
+
+        KeyValueMap *ds = getDeletesMap<K>(false);
+        if (ds && ds->count(k))
+            return false;
+
+        KeyValueMap *ws = getWritesMap<K>(false);
+        if (ws) {
+            KeyValueMap::iterator it = ws->find(k);
+            if (it != ws->end()) {
+                auto *impl = dynamic_cast<KeyValueHolderImpl<K, V> *>(it->second.get());
+                if (!impl)
+                    return false;
+                value = impl->value;
+                return true;
+            }
+        }
+
+        return db.Read(key, value);
+    }
+
+    template <typename K>
+    bool Exists(const K& key) {
+        KeyHolderPtr k(new KeyHolderImpl<K>(key));
+
+        KeyValueMap *ds = getDeletesMap<K>(false);
+        if (ds && ds->count(k))
+            return false;
+
+        KeyValueMap *ws = getWritesMap<K>(false);
+        if (ws && ws->count(k))
+            return true;
+
+        return db.Exists(key);
+    }
+
+    template <typename K>
+    void Erase(const K& key) {
+        KeyHolderPtr k(new KeyHolderImpl<K>(key));
+
+        KeyValueMap *ws = getWritesMap<K>(false);
+        if (ws)
+            ws->erase(k);
+        KeyValueMap *ds = getDeletesMap<K>(true);
+        ds->emplace(std::move(k), nullptr);
+    }
+
+    void Clear() {
+        writes.clear();
+        deletes.clear();
+    }
+
+    bool Commit() {
+        CDBBatch batch(db);
+        for (auto &p : deletes) {
+            for (auto &p2 : p.second) {
+                p2.first->Erase(batch);
+            }
+        }
+        for (auto &p : writes) {
+            for (auto &p2 : p.second) {
+                p2.second->Write(batch);
+            }
+        }
+        bool ret = db.WriteBatch(batch, true);
+        Clear();
+        return ret;
+    }
+
+    bool IsClean() {
+        return writes.empty() && deletes.empty();
+    }
+};
+
+class CScopedDBTransaction {
+private:
+    CDBTransaction &dbTransaction;
+    std::function<void ()> commitHandler;
+    std::function<void ()> rollbackHandler;
+    bool didCommitOrRollback{};
+
+public:
+    CScopedDBTransaction(CDBTransaction &dbTx) : dbTransaction(dbTx) {}
+    ~CScopedDBTransaction() {
+        if (!didCommitOrRollback)
+            Rollback();
+    }
+    bool Commit() {
+        assert(!didCommitOrRollback);
+        didCommitOrRollback = true;
+        bool result = dbTransaction.Commit();
+        if (commitHandler)
+            commitHandler();
+        return result;
+    }
+    void Rollback() {
+        assert(!didCommitOrRollback);
+        didCommitOrRollback = true;
+        dbTransaction.Clear();
+        if (rollbackHandler)
+            rollbackHandler();
+    }
+
+    static std::unique_ptr<CScopedDBTransaction> Begin(CDBTransaction &dbTx) {
+        assert(dbTx.IsClean());
+        return std::unique_ptr<CScopedDBTransaction>(new CScopedDBTransaction(dbTx));
+    }
+
+    void SetCommitHandler(const std::function<void ()> &h) {
+        commitHandler = h;
+    }
+    void SetRollbackHandler(const std::function<void ()> &h) {
+        rollbackHandler = h;
+    }
+};
+
 #endif // BITCOIN_DBWRAPPER_H

From c9a72e8880fe88f07b64aecfc059f08ec14440fc Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Thu, 24 May 2018 14:28:23 +0200
Subject: [PATCH 073/400] Introduce CEvoDB for all evo related things, e.g.
 DIP3

Also add transaction handling to ConnectTip and DisconnectTip and a few
other places where blocks are processed.
---
 src/Makefile.am                |  2 ++
 src/evo/evodb.cpp              | 13 +++++++
 src/evo/evodb.h                | 64 ++++++++++++++++++++++++++++++++++
 src/init.cpp                   |  6 ++++
 src/qt/test/rpcnestedtests.cpp |  1 +
 src/test/test_dash.cpp         |  2 ++
 src/validation.cpp             | 14 ++++++++
 7 files changed, 102 insertions(+)
 create mode 100644 src/evo/evodb.cpp
 create mode 100644 src/evo/evodb.h

diff --git a/src/Makefile.am b/src/Makefile.am
index 23db64addacb..d4b7d31cbb0b 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -106,6 +106,7 @@ BITCOIN_CORE_H = \
   core_io.h \
   core_memusage.h \
   cuckoocache.h \
+  evo/evodb.h \
   evo/specialtx.h \
   privatesend.h \
   privatesend-client.h \
@@ -217,6 +218,7 @@ libdash_server_a_SOURCES = \
   chain.cpp \
   checkpoints.cpp \
   dsnotificationinterface.cpp \
+  evo/evodb.cpp \
   evo/specialtx.cpp \
   httprpc.cpp \
   httpserver.cpp \
diff --git a/src/evo/evodb.cpp b/src/evo/evodb.cpp
new file mode 100644
index 000000000000..c53b139e8407
--- /dev/null
+++ b/src/evo/evodb.cpp
@@ -0,0 +1,13 @@
+// Copyright (c) 2018 The Dash Core developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+#include "evodb.h"
+
+CEvoDB* evoDb;
+
+CEvoDB::CEvoDB(size_t nCacheSize, bool fMemory, bool fWipe) :
+        db(GetDataDir() / "evodb", nCacheSize, fMemory, fWipe),
+        dbTransaction(db)
+{
+}
diff --git a/src/evo/evodb.h b/src/evo/evodb.h
new file mode 100644
index 000000000000..a830513e5078
--- /dev/null
+++ b/src/evo/evodb.h
@@ -0,0 +1,64 @@
+// Copyright (c) 2018 The Dash Core developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+#ifndef DASH_EVODB_H
+#define DASH_EVODB_H
+
+#include "dbwrapper.h"
+#include "sync.h"
+
+class CEvoDB
+{
+private:
+    CCriticalSection cs;
+    CDBWrapper db;
+    CDBTransaction dbTransaction;
+
+public:
+    CEvoDB(size_t nCacheSize, bool fMemory = false, bool fWipe = false);
+
+    std::unique_ptr<CScopedDBTransaction> BeginTransaction()
+    {
+        LOCK(cs);
+        auto t = CScopedDBTransaction::Begin(dbTransaction);
+        return t;
+    }
+
+    template<typename K, typename V>
+    bool Read(const K& key, V& value)
+    {
+        LOCK(cs);
+        return dbTransaction.Read(key, value);
+    }
+
+    template<typename K, typename V>
+    void Write(const K& key, const V& value)
+    {
+        LOCK(cs);
+        dbTransaction.Write(key, value);
+    }
+
+    template <typename K>
+    bool Exists(const K& key)
+    {
+        LOCK(cs);
+        return dbTransaction.Exists(key);
+    }
+
+    template <typename K>
+    void Erase(const K& key)
+    {
+        LOCK(cs);
+        dbTransaction.Erase(key);
+    }
+
+    CDBWrapper& GetRawDB()
+    {
+        return db;
+    }
+};
+
+extern CEvoDB* evoDb;
+
+#endif//DASH_EVODB_H
diff --git a/src/init.cpp b/src/init.cpp
index b35f6fa825ba..10d985b9a649 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -293,6 +293,8 @@ void PrepareShutdown()
         pcoinsdbview = NULL;
         delete pblocktree;
         pblocktree = NULL;
+        delete evoDb;
+        evoDb = NULL;
     }
 #ifdef ENABLE_WALLET
     if (pwalletMain)
@@ -1630,6 +1632,7 @@ bool AppInitMain(boost::thread_group& threadGroup, CScheduler& scheduler)
     nTotalCache -= nCoinDBCache;
     nCoinCacheUsage = nTotalCache; // the rest goes to in-memory cache
     int64_t nMempoolSizeMax = GetArg("-maxmempool", DEFAULT_MAX_MEMPOOL_SIZE) * 1000000;
+    int64_t nEvoDbCache = 1024 * 1024 * 16; // TODO
     LogPrintf("Cache configuration:\n");
     LogPrintf("* Using %.1fMiB for block index database\n", nBlockTreeDBCache * (1.0 / 1024 / 1024));
     LogPrintf("* Using %.1fMiB for chain state database\n", nCoinDBCache * (1.0 / 1024 / 1024));
@@ -1652,6 +1655,9 @@ bool AppInitMain(boost::thread_group& threadGroup, CScheduler& scheduler)
                 delete pcoinsdbview;
                 delete pcoinscatcher;
                 delete pblocktree;
+                delete evoDb;
+
+                evoDb = new CEvoDB(nEvoDbCache, false, fReindex || fReindexChainState);
 
                 pblocktree = new CBlockTreeDB(nBlockTreeDBCache, false, fReindex);
                 pcoinsdbview = new CCoinsViewDB(nCoinDBCache, false, fReindex || fReindexChainState);
diff --git a/src/qt/test/rpcnestedtests.cpp b/src/qt/test/rpcnestedtests.cpp
index 407f0f4544e9..a758d29d7174 100644
--- a/src/qt/test/rpcnestedtests.cpp
+++ b/src/qt/test/rpcnestedtests.cpp
@@ -47,6 +47,7 @@ void RPCNestedTests::rpcNestedTests()
     dir.mkpath(".");
     ForceSetArg("-datadir", path);
     //mempool.setSanityCheck(1.0);
+    evoDb = new CEvoDB(1 << 20, true, true);
     pblocktree = new CBlockTreeDB(1 << 20, true);
     pcoinsdbview = new CCoinsViewDB(1 << 23, true);
     pcoinsTip = new CCoinsViewCache(pcoinsdbview);
diff --git a/src/test/test_dash.cpp b/src/test/test_dash.cpp
index ae459123078a..f769aed20a4a 100644
--- a/src/test/test_dash.cpp
+++ b/src/test/test_dash.cpp
@@ -65,6 +65,7 @@ TestingSetup::TestingSetup(const std::string& chainName) : BasicTestingSetup(cha
         boost::filesystem::create_directories(pathTemp);
         ForceSetArg("-datadir", pathTemp.string());
         mempool.setSanityCheck(1.0);
+        evoDb = new CEvoDB(1 << 20, true, true);
         pblocktree = new CBlockTreeDB(1 << 20, true);
         pcoinsdbview = new CCoinsViewDB(1 << 23, true);
         pcoinsTip = new CCoinsViewCache(pcoinsdbview);
@@ -91,6 +92,7 @@ TestingSetup::~TestingSetup()
         delete pcoinsTip;
         delete pcoinsdbview;
         delete pblocktree;
+        delete evoDb;
         boost::filesystem::remove_all(pathTemp);
 }
 
diff --git a/src/validation.cpp b/src/validation.cpp
index 315ba19405c6..a709b9f1afc5 100644
--- a/src/validation.cpp
+++ b/src/validation.cpp
@@ -2631,11 +2631,15 @@ bool static DisconnectTip(CValidationState& state, const CChainParams& chainpara
     // Apply the block atomically to the chain state.
     int64_t nStart = GetTimeMicros();
     {
+        auto dbTx = evoDb->BeginTransaction();
+
         CCoinsViewCache view(pcoinsTip);
         if (DisconnectBlock(block, state, pindexDelete, view) != DISCONNECT_OK)
             return error("DisconnectTip(): DisconnectBlock %s failed", pindexDelete->GetBlockHash().ToString());
         bool flushed = view.Flush();
         assert(flushed);
+        bool committed = dbTx->Commit();
+        assert(committed);
     }
     LogPrint("bench", "- Disconnect block: %.2fms\n", (GetTimeMicros() - nStart) * 0.001);
     // Write the chain state to disk, if necessary.
@@ -2710,6 +2714,8 @@ bool static ConnectTip(CValidationState& state, const CChainParams& chainparams,
     int64_t nTime3;
     LogPrint("bench", "  - Load block from disk: %.2fms [%.2fs]\n", (nTime2 - nTime1) * 0.001, nTimeReadFromDisk * 0.000001);
     {
+        auto dbTx = evoDb->BeginTransaction();
+
         CCoinsViewCache view(pcoinsTip);
         bool rv = ConnectBlock(blockConnecting, state, pindexNew, view, chainparams);
         GetMainSignals().BlockChecked(blockConnecting, state);
@@ -2722,6 +2728,8 @@ bool static ConnectTip(CValidationState& state, const CChainParams& chainparams,
         LogPrint("bench", "  - Connect total: %.2fms [%.2fs]\n", (nTime3 - nTime2) * 0.001, nTimeConnectTotal * 0.000001);
         bool flushed = view.Flush();
         assert(flushed);
+        bool committed = dbTx->Commit();
+        assert(committed);
     }
     int64_t nTime4 = GetTimeMicros(); nTimeFlush += nTime4 - nTime3;
     LogPrint("bench", "  - Flush: %.2fms [%.2fs]\n", (nTime4 - nTime3) * 0.001, nTimeFlush * 0.000001);
@@ -3729,6 +3737,9 @@ bool TestBlockValidity(CValidationState& state, const CChainParams& chainparams,
     indexDummy.pprev = pindexPrev;
     indexDummy.nHeight = pindexPrev->nHeight + 1;
 
+    // begin tx and let it rollback
+    auto dbTx = evoDb->BeginTransaction();
+
     // NOTE: CheckBlockHeader is called by CheckBlock
     if (!ContextualCheckBlockHeader(block, state, chainparams.GetConsensus(), pindexPrev, GetAdjustedTime()))
         return error("%s: Consensus::ContextualCheckBlockHeader: %s", __func__, FormatStateMessage(state));
@@ -4082,6 +4093,9 @@ bool CVerifyDB::VerifyDB(const CChainParams& chainparams, CCoinsView *coinsview,
     if (chainActive.Tip() == NULL || chainActive.Tip()->pprev == NULL)
         return true;
 
+    // begin tx and let it rollback
+    auto dbTx = evoDb->BeginTransaction();
+
     // Verify blocks in the best chain
     if (nCheckDepth <= 0)
         nCheckDepth = 1000000000; // suffices until the year 19000

From 958b84ace3ba7ef9ad191f63c769729ef59960eb Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Tue, 13 Feb 2018 13:36:36 +0100
Subject: [PATCH 074/400] Implementation of ProRegTx with basic validation (no
 processing)

---
 src/Makefile.am              |   2 +
 src/evo/providertx.cpp       | 122 +++++++++++++++++++++++++++++++++++
 src/evo/providertx.h         |  62 ++++++++++++++++++
 src/evo/specialtx.cpp        |   6 ++
 src/primitives/transaction.h |   1 +
 src/validation.cpp           |   4 +-
 src/version.h                |   6 ++
 7 files changed, 202 insertions(+), 1 deletion(-)
 create mode 100644 src/evo/providertx.cpp
 create mode 100644 src/evo/providertx.h

diff --git a/src/Makefile.am b/src/Makefile.am
index d4b7d31cbb0b..e93c2a24dc73 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -108,6 +108,7 @@ BITCOIN_CORE_H = \
   cuckoocache.h \
   evo/evodb.h \
   evo/specialtx.h \
+  evo/providertx.h \
   privatesend.h \
   privatesend-client.h \
   privatesend-server.h \
@@ -220,6 +221,7 @@ libdash_server_a_SOURCES = \
   dsnotificationinterface.cpp \
   evo/evodb.cpp \
   evo/specialtx.cpp \
+  evo/providertx.cpp \
   httprpc.cpp \
   httpserver.cpp \
   init.cpp \
diff --git a/src/evo/providertx.cpp b/src/evo/providertx.cpp
new file mode 100644
index 000000000000..6140906bab15
--- /dev/null
+++ b/src/evo/providertx.cpp
@@ -0,0 +1,122 @@
+// Copyright (c) 2018 The Dash Core developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+#include "providertx.h"
+#include "specialtx.h"
+
+#include "hash.h"
+#include "clientversion.h"
+#include "streams.h"
+#include "messagesigner.h"
+#include "chainparams.h"
+#include "validation.h"
+#include "univalue.h"
+#include "core_io.h"
+#include "script/standard.h"
+#include "base58.h"
+
+template <typename ProTx>
+static bool CheckService(const uint256& proTxHash, const ProTx& proTx, const CBlockIndex* pindexPrev, CValidationState& state)
+{
+    if (proTx.nProtocolVersion < MIN_PROTX_PROTO_VERSION || proTx.nProtocolVersion > MAX_PROTX_PROTO_VERSION)
+        return state.DoS(10, false, REJECT_INVALID, "bad-protx-proto-version");
+
+    if (!proTx.addr.IsValid())
+        return state.DoS(10, false, REJECT_INVALID, "bad-protx-addr");
+    if (Params().NetworkIDString() != CBaseChainParams::REGTEST && !proTx.addr.IsRoutable())
+        return state.DoS(10, false, REJECT_INVALID, "bad-protx-addr");
+
+    if (!proTx.addr.IsIPv4())
+        return state.DoS(10, false, REJECT_INVALID, "bad-protx-addr");
+
+    return true;
+}
+
+template <typename ProTx>
+static bool CheckInputsHashAndSig(const CTransaction &tx, const ProTx& proTx, const CKeyID &keyID, CValidationState& state)
+{
+    uint256 inputsHash = CalcTxInputsHash(tx);
+    if (inputsHash != proTx.inputsHash)
+        return state.DoS(100, false, REJECT_INVALID, "bad-protx-inputs-hash");
+
+    std::string strError;
+    if (!CHashSigner::VerifyHash(::SerializeHash(proTx), keyID, proTx.vchSig, strError))
+        return state.DoS(100, false, REJECT_INVALID, "bad-protx-sig", false, strError);
+
+    return true;
+}
+
+bool CheckProRegTx(const CTransaction& tx, const CBlockIndex* pindexPrev, CValidationState& state)
+{
+    AssertLockHeld(cs_main);
+
+    CProRegTx ptx;
+    if (!GetTxPayload(tx, ptx))
+        return state.DoS(100, false, REJECT_INVALID, "bad-tx-payload");
+
+    if (ptx.nVersion > CProRegTx::CURRENT_VERSION)
+        return state.DoS(100, false, REJECT_INVALID, "bad-protx-version");
+
+    if (ptx.nCollateralIndex >= tx.vout.size())
+        return state.DoS(10, false, REJECT_INVALID, "bad-protx-collateral-index");
+    if (tx.vout[ptx.nCollateralIndex].nValue != 1000 * COIN)
+        return state.DoS(10, false, REJECT_INVALID, "bad-protx-collateral");
+    if (ptx.keyIDOwner.IsNull() || ptx.keyIDOperator.IsNull() || ptx.keyIDVoting.IsNull())
+        return state.DoS(10, false, REJECT_INVALID, "bad-protx-key-null");
+    // we may support P2SH later, but restrict it for now (while in transitioning phase from old MN list to deterministic list)
+    if (!ptx.scriptPayout.IsPayToPublicKeyHash())
+        return state.DoS(10, false, REJECT_INVALID, "bad-protx-payee");
+
+    // This is a temporary restriction that will be lifted later
+    // It is required while we are transitioning from the old MN list to the deterministic list
+    if (tx.vout[ptx.nCollateralIndex].scriptPubKey != ptx.scriptPayout)
+        return state.DoS(10, false, REJECT_INVALID, "bad-protx-payee-collateral");
+
+    // It's allowed to set addr/protocolVersion to 0, which will put the MN into PoSe-banned state and require a ProUpServTx to be issues later
+    // If any of both is set, it must be valid however
+    if ((ptx.addr != CService() || ptx.nProtocolVersion != 0) && !CheckService(tx.GetHash(), ptx, pindexPrev, state))
+        return false;
+
+    if (ptx.nOperatorReward > 10000)
+        return state.DoS(10, false, REJECT_INVALID, "bad-protx-operator-reward");
+
+    if (!CheckInputsHashAndSig(tx, ptx, ptx.keyIDOwner, state))
+        return false;
+
+    return true;
+}
+
+std::string CProRegTx::ToString() const
+{
+    CTxDestination dest;
+    std::string payee = "unknown";
+    if (ExtractDestination(scriptPayout, dest)) {
+        payee = CBitcoinAddress(dest).ToString();
+    }
+
+    return strprintf("CProRegTx(nVersion=%d, nProtocolVersion=%d, nCollateralIndex=%d, addr=%s, nOperatorReward=%f, keyIDOwner=%s, keyIDOperator=%s, keyIDVoting=%s, scriptPayout=%s)",
+        nVersion, nProtocolVersion, nCollateralIndex, addr.ToString(), (double)nOperatorReward / 100, keyIDOwner.ToString(), keyIDOperator.ToString(), keyIDVoting.ToString(), payee);
+}
+
+void CProRegTx::ToJson(UniValue& obj) const
+{
+    obj.clear();
+    obj.setObject();
+    obj.push_back(Pair("version", nVersion));
+    obj.push_back(Pair("protocolVersion", nProtocolVersion));
+    obj.push_back(Pair("collateralIndex", (int)nCollateralIndex));
+    obj.push_back(Pair("service", addr.ToString(false)));
+    obj.push_back(Pair("keyIDOwner", keyIDOwner.ToString()));
+    obj.push_back(Pair("keyIDOperator", keyIDOperator.ToString()));
+    obj.push_back(Pair("keyIDVoting", keyIDVoting.ToString()));
+
+    CTxDestination dest;
+    if (ExtractDestination(scriptPayout, dest)) {
+        CBitcoinAddress bitcoinAddress(dest);
+        obj.push_back(Pair("payoutAddress", bitcoinAddress.ToString()));
+    }
+    obj.push_back(Pair("operatorReward", (double)nOperatorReward / 100));
+
+    obj.push_back(Pair("inputsHash", inputsHash.ToString()));
+}
diff --git a/src/evo/providertx.h b/src/evo/providertx.h
new file mode 100644
index 000000000000..6c34f801fc22
--- /dev/null
+++ b/src/evo/providertx.h
@@ -0,0 +1,62 @@
+// Copyright (c) 2018 The Dash Core developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+#ifndef DASH_PROVIDERTX_H
+#define DASH_PROVIDERTX_H
+
+#include "primitives/transaction.h"
+#include "consensus/validation.h"
+
+#include "netaddress.h"
+#include "pubkey.h"
+
+class CBlockIndex;
+class UniValue;
+
+class CProRegTx
+{
+public:
+    static const uint16_t CURRENT_VERSION = 1;
+
+public:
+    uint16_t nVersion{CURRENT_VERSION}; // message version
+    int32_t nProtocolVersion{0};
+    uint32_t nCollateralIndex{(uint32_t) - 1};
+    CService addr;
+    CKeyID keyIDOwner;
+    CKeyID keyIDOperator;
+    CKeyID keyIDVoting;
+    uint16_t nOperatorReward{0};
+    CScript scriptPayout;
+    uint256 inputsHash; // replay protection
+    std::vector<unsigned char> vchSig;
+
+public:
+    ADD_SERIALIZE_METHODS;
+
+    template <typename Stream, typename Operation>
+    inline void SerializationOp(Stream& s, Operation ser_action)
+    {
+        READWRITE(nVersion);
+        READWRITE(nProtocolVersion);
+        READWRITE(nCollateralIndex);
+        READWRITE(addr);
+        READWRITE(keyIDOwner);
+        READWRITE(keyIDOperator);
+        READWRITE(keyIDVoting);
+        READWRITE(*(CScriptBase*)(&scriptPayout));
+        READWRITE(nOperatorReward);
+        READWRITE(inputsHash);
+        if (!(s.GetType() & SER_GETHASH)) {
+            READWRITE(vchSig);
+        }
+    }
+
+    std::string ToString() const;
+    void ToJson(UniValue& obj) const;
+};
+
+bool CheckProRegTx(const CTransaction& tx, const CBlockIndex* pindexPrev, CValidationState& state);
+
+#endif//DASH_PROVIDERTX_H
diff --git a/src/evo/specialtx.cpp b/src/evo/specialtx.cpp
index a07a1e1d3845..a5887b35af3f 100644
--- a/src/evo/specialtx.cpp
+++ b/src/evo/specialtx.cpp
@@ -24,6 +24,8 @@ bool CheckSpecialTx(const CTransaction& tx, const CBlockIndex* pindexPrev, CVali
     }
 
     switch (tx.nType) {
+        case TRANSACTION_PROVIDER_REGISTER:
+            return CheckProRegTx(tx, pindexPrev, state);
     }
 
     return state.DoS(10, false, REJECT_INVALID, "bad-tx-type");
@@ -35,6 +37,8 @@ bool ProcessSpecialTx(const CTransaction& tx, const CBlockIndex* pindex, CValida
         return true;
 
     switch (tx.nType) {
+        case TRANSACTION_PROVIDER_REGISTER:
+            return true; // handled in batches per block
     }
 
     return state.DoS(100, false, REJECT_INVALID, "bad-tx-type");
@@ -46,6 +50,8 @@ bool UndoSpecialTx(const CTransaction& tx, const CBlockIndex* pindex)
         return true;
 
     switch (tx.nType) {
+        case TRANSACTION_PROVIDER_REGISTER:
+            return true; // handled in batches per block
     }
 
     return false;
diff --git a/src/primitives/transaction.h b/src/primitives/transaction.h
index 23ec4f698b3f..129a0c473e3b 100644
--- a/src/primitives/transaction.h
+++ b/src/primitives/transaction.h
@@ -14,6 +14,7 @@
 /** Transaction types */
 enum {
     TRANSACTION_NORMAL = 0,
+    TRANSACTION_PROVIDER_REGISTER = 1,
 };
 
 /** An outpoint - a combination of a transaction hash and an index n into its vout */
diff --git a/src/validation.cpp b/src/validation.cpp
index a709b9f1afc5..16ecbc53a538 100644
--- a/src/validation.cpp
+++ b/src/validation.cpp
@@ -43,6 +43,7 @@
 #include "masternode-payments.h"
 
 #include "evo/specialtx.h"
+#include "evo/providertx.h"
 
 #include <atomic>
 #include <sstream>
@@ -570,7 +571,8 @@ bool ContextualCheckTransaction(const CTransaction& tx, CValidationState &state,
     if (fDIP0003Active_context) {
         // check version 3 transaction types
         if (tx.nVersion >= 3) {
-            if (tx.nType != TRANSACTION_NORMAL) {
+            if (tx.nType != TRANSACTION_NORMAL &&
+                tx.nType != TRANSACTION_PROVIDER_REGISTER) {
                 return state.DoS(100, false, REJECT_INVALID, "bad-txns-type");
             }
             if (tx.IsCoinBase() && tx.nType != TRANSACTION_NORMAL)
diff --git a/src/version.h b/src/version.h
index afcd8f315443..dc4360bd3d79 100644
--- a/src/version.h
+++ b/src/version.h
@@ -44,4 +44,10 @@ static const int DIP0001_PROTOCOL_VERSION = 70208;
 //! short-id-based block download starts with this version
 static const int SHORT_IDS_BLOCKS_VERSION = 70209;
 
+//! minimum ProTx proto version
+static const int MIN_PROTX_PROTO_VERSION = 70211;
+
+//! maximum ProTx proto version (slightly higher then current PROTOCOL_VERSION to ensure masternodes can upgrade)
+static const int MAX_PROTX_PROTO_VERSION = PROTOCOL_VERSION + 2;
+
 #endif // BITCOIN_VERSION_H

From c772423468e7c2b9e04cf96494c19306f747f6d3 Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Tue, 13 Feb 2018 13:36:59 +0100
Subject: [PATCH 075/400] Implement "protx register" RPC

---
 src/Makefile.am    |   1 +
 src/rpc/register.h |   3 +
 src/rpc/rpcevo.cpp | 279 +++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 283 insertions(+)
 create mode 100644 src/rpc/rpcevo.cpp

diff --git a/src/Makefile.am b/src/Makefile.am
index e93c2a24dc73..2d55f8e15ae0 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -258,6 +258,7 @@ libdash_server_a_SOURCES = \
   rpc/misc.cpp \
   rpc/net.cpp \
   rpc/rawtransaction.cpp \
+  rpc/rpcevo.cpp \
   rpc/server.cpp \
   script/sigcache.cpp \
   script/ismine.cpp \
diff --git a/src/rpc/register.h b/src/rpc/register.h
index 44151f508aa4..de5cd4f2e5ea 100644
--- a/src/rpc/register.h
+++ b/src/rpc/register.h
@@ -23,6 +23,8 @@ void RegisterRawTransactionRPCCommands(CRPCTable &tableRPC);
 void RegisterMasternodeRPCCommands(CRPCTable &tableRPC);
 /** Register governance RPC commands */
 void RegisterGovernanceRPCCommands(CRPCTable &tableRPC);
+/** Register Evo RPC commands */
+void RegisterEvoRPCCommands(CRPCTable &tableRPC);
 
 static inline void RegisterAllCoreRPCCommands(CRPCTable &t)
 {
@@ -33,6 +35,7 @@ static inline void RegisterAllCoreRPCCommands(CRPCTable &t)
     RegisterRawTransactionRPCCommands(t);
     RegisterMasternodeRPCCommands(t);
     RegisterGovernanceRPCCommands(t);
+    RegisterEvoRPCCommands(t);
 }
 
 #endif
diff --git a/src/rpc/rpcevo.cpp b/src/rpc/rpcevo.cpp
new file mode 100644
index 000000000000..079cf1130f27
--- /dev/null
+++ b/src/rpc/rpcevo.cpp
@@ -0,0 +1,279 @@
+// Copyright (c) 2018 The Dash Core developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+#include "base58.h"
+#include "consensus/validation.h"
+#include "core_io.h"
+#include "init.h"
+#include "messagesigner.h"
+#include "rpc/server.h"
+#include "utilmoneystr.h"
+#include "validation.h"
+
+#ifdef ENABLE_WALLET
+#include "wallet/wallet.h"
+#endif//ENABLE_WALLET
+
+#include "netbase.h"
+
+#include "evo/specialtx.h"
+#include "evo/providertx.h"
+
+#ifdef ENABLE_WALLET
+extern UniValue signrawtransaction(const JSONRPCRequest& request);
+extern UniValue sendrawtransaction(const JSONRPCRequest& request);
+#endif//ENABLE_WALLET
+
+// Allows to specify Dash address or priv key. In case of Dash address, the priv key is taken from the wallet
+static CKey ParsePrivKey(const std::string &strKeyOrAddress, bool allowAddresses = true) {
+    CBitcoinAddress address;
+    if (allowAddresses && address.SetString(strKeyOrAddress) && address.IsValid()) {
+#ifdef ENABLE_WALLET
+        CKeyID keyId;
+        CKey key;
+        if (!address.GetKeyID(keyId) || !pwalletMain->GetKey(keyId, key))
+            throw std::runtime_error(strprintf("non-wallet or invalid address %s", strKeyOrAddress));
+        return key;
+#else//ENABLE_WALLET
+        throw std::runtime_error("addresses not supported in no-wallet builds");
+#endif//ENABLE_WALLET
+    }
+
+    CBitcoinSecret secret;
+    if (!secret.SetString(strKeyOrAddress) || !secret.IsValid())
+        throw std::runtime_error(strprintf("invalid priv-key/address %s", strKeyOrAddress));
+    return secret.GetKey();
+}
+
+static CKeyID ParsePubKeyIDFromAddress(const std::string& strAddress, const std::string& paramName)
+{
+    CBitcoinAddress address(strAddress);
+    CKeyID keyID;
+    if (!address.IsValid() || !address.GetKeyID(keyID))
+        throw JSONRPCError(RPC_INVALID_PARAMETER, strprintf("%s must be a valid P2PKH address, not %s", paramName, strAddress));
+    return keyID;
+}
+
+
+#ifdef ENABLE_WALLET
+
+template<typename SpecialTxPayload>
+static void FundSpecialTx(CMutableTransaction& tx, SpecialTxPayload payload)
+{
+    // resize so that fee calculation is correct
+    payload.vchSig.resize(65);
+
+    CDataStream ds(SER_NETWORK, PROTOCOL_VERSION);
+    ds << payload;
+    tx.vExtraPayload.assign(ds.begin(), ds.end());
+
+    static CTxOut dummyTxOut(0, CScript() << OP_RETURN);
+    bool dummyTxOutAdded = false;
+    if (tx.vout.empty()) {
+        // add dummy txout as FundTransaction requires at least one output
+        tx.vout.emplace_back(dummyTxOut);
+        dummyTxOutAdded = true;
+    }
+
+    CAmount nFee;
+    CFeeRate feeRate = CFeeRate(0);
+    int nChangePos = -1;
+    std::string strFailReason;
+    std::set<int> setSubtractFeeFromOutputs;
+    if (!pwalletMain->FundTransaction(tx, nFee, false, feeRate, nChangePos, strFailReason, false, false, setSubtractFeeFromOutputs, true, CNoDestination()))
+        throw JSONRPCError(RPC_INTERNAL_ERROR, strFailReason);
+
+    if (dummyTxOutAdded && tx.vout.size() > 1) {
+        // FundTransaction added a change output, so we don't need the dummy txout anymore
+        // Removing it results in slight overpayment of fees, but we ignore this for now (as it's a very low amount)
+        auto it = std::find(tx.vout.begin(), tx.vout.end(), dummyTxOut);
+        assert(it != tx.vout.end());
+        tx.vout.erase(it);
+    }
+}
+
+template<typename SpecialTxPayload>
+static void SignSpecialTxPayload(const CMutableTransaction& tx, SpecialTxPayload& payload, const CKey& key)
+{
+    payload.inputsHash = CalcTxInputsHash(tx);
+    payload.vchSig.clear();
+
+    uint256 hash = ::SerializeHash(payload);
+    if (!CHashSigner::SignHash(hash, key, payload.vchSig)) {
+        throw JSONRPCError(RPC_INTERNAL_ERROR, "failed to sign special tx");
+    }
+}
+
+static std::string SignAndSendSpecialTx(const CMutableTransaction& tx)
+{
+    LOCK(cs_main);
+    CValidationState state;
+    if (!CheckSpecialTx(tx, NULL, state))
+        throw std::runtime_error(FormatStateMessage(state));
+
+    CDataStream ds(SER_NETWORK, PROTOCOL_VERSION);
+    ds << tx;
+
+    JSONRPCRequest signReqeust;
+    signReqeust.params.setArray();
+    signReqeust.params.push_back(HexStr(ds.begin(), ds.end()));
+    UniValue signResult = signrawtransaction(signReqeust);
+
+    JSONRPCRequest sendRequest;
+    sendRequest.params.setArray();
+    sendRequest.params.push_back(signResult["hex"].get_str());
+    return sendrawtransaction(sendRequest).get_str();
+}
+
+void protx_register_help()
+{
+    throw std::runtime_error(
+            "protx register \"collateralAddress\" collateralAmount \"ipAndPort\" protocolVersion \"ownerKeyAddr\" \"operatorKeyAddr\" \"votingKeyAddr\" operatorReward \"payoutAddress\"\n"
+            "\nCreates and sends a ProTx to the network. The resulting transaction will move the specified amount\n"
+            "to the address specified by collateralAddress and will then function as the collateral of your\n"
+            "masternode.\n"
+            "A few of the limitations you see in the arguments are temporary and might be lifted after DIP3\n"
+            "is fully deployed.\n"
+            "\nArguments:\n"
+            "1. \"collateralAddress\"   (string, required) The dash address to send the collateral to.\n"
+            "                         Must be a P2PKH address.\n"
+            "2. \"collateralAmount\"    (numeric or string, required) The collateral amount.\n"
+            "                         Must be exactly 1000 Dash.\n"
+            "3. \"ipAndPort\"           (string, required) IP and port in the form \"IP:PORT\".\n"
+            "                         Must be unique on the network. Can be set to 0, which will require a ProUpServTx afterwards.\n"
+            "4. \"protocolVersion\"     (numeric, required) The protocol version of your masternode.\n"
+            "                         Can be 0 to default to the clients protocol version.\n"
+            "5. \"ownerKeyAddr\"        (string, required) The owner key used for payee updates and proposal voting.\n"
+            "                         The private key belonging to this address be known in your wallet. The address must\n"
+            "                         be unused and must differ from the collateralAddress\n"
+            "6. \"operatorKeyAddr\"     (string, required) The operator key address. The private key does not have to be known by your wallet.\n"
+            "                         It has to match the private key which is later used when operating the masternode.\n"
+            "                         If set to \"0\" or an empty string, ownerAddr will be used.\n"
+            "7. \"votingKeyAddr\"       (string, required) The voting key address. The private key does not have to be known by your wallet.\n"
+            "                         It has to match the private key which is later used when voting on proposals.\n"
+            "                         If set to \"0\" or an empty string, ownerAddr will be used.\n"
+            "8. \"operatorReward\"      (numeric, required) The fraction in %% to share with the operator. If non-zero,\n"
+            "                         \"ipAndPort\" and \"protocolVersion\" must be zero as well. The value must be between 0 and 100.\n"
+            "9. \"payoutAddress\"       (string, required) The dash address to use for masternode reward payments\n"
+            "                         Must match \"collateralAddress\"."
+            "\nExamples:\n"
+            + HelpExampleCli("protx", "register \"XwnLY9Tf7Zsef8gMGL2fhWA9ZmMjt4KPwG\" 1000 \"1.2.3.4:1234\" 0 \"93Fd7XY2zF4q9YKTZUSFxLgp4Xs7MuaMnvY9kpvH7V8oXWqsCC1\" XwnLY9Tf7Zsef8gMGL2fhWA9ZmMjt4KPwG")
+    );
+}
+
+UniValue protx_register(const JSONRPCRequest& request)
+{
+    if (request.fHelp || request.params.size() != 10)
+        protx_register_help();
+
+    CBitcoinAddress collateralAddress(request.params[1].get_str());
+    if (!collateralAddress.IsValid())
+        throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, strprintf("invalid collaterall address: %s", request.params[1].get_str()));
+    CScript collateralScript = GetScriptForDestination(collateralAddress.Get());
+
+    CAmount collateralAmount;
+    if (!ParseMoney(request.params[2].get_str(), collateralAmount))
+        throw std::runtime_error(strprintf("invalid collateral amount %s", request.params[2].get_str()));
+    if (collateralAmount != 1000 * COIN)
+        throw std::runtime_error(strprintf("invalid collateral amount %d. only 1000 DASH is supported at the moment", collateralAmount));
+
+    CTxOut collateralTxOut(collateralAmount, collateralScript);
+
+    CMutableTransaction tx;
+    tx.nVersion = 3;
+    tx.nType = TRANSACTION_PROVIDER_REGISTER;
+    tx.vout.emplace_back(collateralTxOut);
+
+    CProRegTx ptx;
+    ptx.nVersion = CProRegTx::CURRENT_VERSION;
+
+    if (request.params[3].get_str() != "0" && request.params[3].get_str() != "") {
+        if (!Lookup(request.params[3].get_str().c_str(), ptx.addr, Params().GetDefaultPort(), false))
+            throw std::runtime_error(strprintf("invalid network address %s", request.params[3].get_str()));
+    }
+
+    ptx.nProtocolVersion = ParseInt32V(request.params[4], "protocolVersion");
+    if (ptx.nProtocolVersion == 0 && ptx.addr != CService())
+        ptx.nProtocolVersion = PROTOCOL_VERSION;
+
+    CKey keyOwner = ParsePrivKey(request.params[5].get_str(), true);
+    CKeyID keyIDOperator = keyOwner.GetPubKey().GetID();
+    CKeyID keyIDVoting = keyOwner.GetPubKey().GetID();
+    if (request.params[6].get_str() != "0" && request.params[6].get_str() != "") {
+        keyIDOperator = ParsePubKeyIDFromAddress(request.params[6].get_str(), "operator address");
+    }
+    if (request.params[7].get_str() != "0" && request.params[7].get_str() != "") {
+        keyIDVoting = ParsePubKeyIDFromAddress(request.params[7].get_str(), "voting address");
+    }
+
+    double operatorReward = ParseDoubleV(request.params[8], "operatorReward");
+    if (operatorReward < 0 || operatorReward > 100)
+        throw JSONRPCError(RPC_INVALID_PARAMETER, "operatorReward must be between 0 and 100");
+    ptx.nOperatorReward = (uint16_t)(operatorReward * 100);
+
+    CBitcoinAddress payoutAddress(request.params[9].get_str());
+    if (!payoutAddress.IsValid())
+        throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, strprintf("invalid payout address: %s", request.params[9].get_str()));
+
+    ptx.keyIDOwner = keyOwner.GetPubKey().GetID();
+    ptx.keyIDOperator = keyIDOperator;
+    ptx.keyIDVoting = keyIDVoting;
+    ptx.scriptPayout = GetScriptForDestination(payoutAddress.Get());
+
+    FundSpecialTx(tx, ptx);
+
+    uint32_t collateralIndex = (uint32_t) - 1;
+    for (uint32_t i = 0; i < tx.vout.size(); i++) {
+        if (tx.vout[i] == collateralTxOut) {
+            collateralIndex = i;
+            break;
+        }
+    }
+    assert(collateralIndex != (uint32_t) - 1);
+    ptx.nCollateralIndex = collateralIndex;
+
+    SignSpecialTxPayload(tx, ptx, keyOwner);
+    SetTxPayload(tx, ptx);
+
+    return SignAndSendSpecialTx(tx);
+}
+
+UniValue protx(const JSONRPCRequest& request)
+{
+    if (request.params.empty()) {
+        throw std::runtime_error(
+                "protx \"command\" ...\n"
+                "Set of commands to execute ProTx related actions.\n"
+                "To get help on individual commands, use \"help protx command\".\n"
+                "\nArguments:\n"
+                "1. \"command\"        (string, required) The command to execute\n"
+                "\nAvailable commands:\n"
+                "  register    - Create and send ProTx to network\n"
+        );
+    }
+
+    std::string command = request.params[0].get_str();
+
+    if (command == "register") {
+        return protx_register(request);
+    } else {
+        throw std::runtime_error("invalid command: " + command);
+    }
+}
+#endif//ENABLE_WALLET
+
+static const CRPCCommand commands[] =
+{ //  category              name                      actor (function)         okSafeMode
+  //  --------------------- ------------------------  -----------------------  ----------
+#ifdef ENABLE_WALLET
+    // these require the wallet to be enabled to fund the transactions
+    { "evo",                "protx",                  &protx,                  false, {}  },
+#endif//ENABLE_WALLET
+};
+
+void RegisterEvoRPCCommands(CRPCTable &tableRPC)
+{
+    for (unsigned int vcidx = 0; vcidx < ARRAYLEN(commands); vcidx++)
+        tableRPC.appendCommand(commands[vcidx].name, &commands[vcidx]);
+}

From cdd723ede6bf6b13ff19142e9f0e210c0bb4a139 Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Wed, 14 Feb 2018 14:42:06 +0100
Subject: [PATCH 076/400] Conflict handling for ProRegTx in mempool

---
 src/txmempool.cpp  | 66 ++++++++++++++++++++++++++++++++++++++++++++++
 src/txmempool.h    |  7 +++++
 src/validation.cpp |  4 +++
 3 files changed, 77 insertions(+)

diff --git a/src/txmempool.cpp b/src/txmempool.cpp
index f06eb56d0a63..42b6246dd600 100644
--- a/src/txmempool.cpp
+++ b/src/txmempool.cpp
@@ -21,6 +21,9 @@
 #include "version.h"
 #include "hash.h"
 
+#include "evo/specialtx.h"
+#include "evo/providertx.h"
+
 CTxMemPoolEntry::CTxMemPoolEntry(const CTransactionRef& _tx, const CAmount& _nFee,
                                  int64_t _nTime, double _entryPriority, unsigned int _entryHeight,
                                  CAmount _inChainInputValue,
@@ -438,6 +441,16 @@ bool CTxMemPool::addUnchecked(const uint256& hash, const CTxMemPoolEntry &entry,
     vTxHashes.emplace_back(hash, newit);
     newit->vTxHashesIdx = vTxHashes.size() - 1;
 
+    if (tx.nType == TRANSACTION_PROVIDER_REGISTER) {
+        CProRegTx proTx;
+        if (!GetTxPayload(tx, proTx)) {
+            assert(false);
+        }
+        mapProTxRegisterAddresses.emplace(proTx.addr, tx.GetHash());
+        mapProTxPubKeyIDs.emplace(proTx.keyIDOwner, tx.GetHash());
+        mapProTxPubKeyIDs.emplace(proTx.keyIDOperator, tx.GetHash());
+    }
+
     return true;
 }
 
@@ -613,6 +626,16 @@ void CTxMemPool::removeUnchecked(txiter it, MemPoolRemovalReason reason)
     } else
         vTxHashes.clear();
 
+    if (it->GetTx().nVersion >= 3 && it->GetTx().nType == TRANSACTION_PROVIDER_REGISTER) {
+        CProRegTx proTx;
+        if (!GetTxPayload(it->GetTx(), proTx)) {
+            assert(false);
+        }
+        mapProTxRegisterAddresses.erase(proTx.addr);
+        mapProTxPubKeyIDs.erase(proTx.keyIDOwner);
+        mapProTxPubKeyIDs.erase(proTx.keyIDOperator);
+    }
+
     totalTxSize -= it->GetTxSize();
     cachedInnerUsage -= it->DynamicMemoryUsage();
     cachedInnerUsage -= memusage::DynamicUsage(mapLinks[it].parents) + memusage::DynamicUsage(mapLinks[it].children);
@@ -739,6 +762,36 @@ void CTxMemPool::removeConflicts(const CTransaction &tx)
     }
 }
 
+void CTxMemPool::removeProTxConflicts(const CTransaction &tx)
+{
+    if (tx.nType != TRANSACTION_PROVIDER_REGISTER)
+        return;
+
+    CProRegTx proTx;
+    if (!GetTxPayload(tx, proTx)) {
+        assert(false);
+    }
+
+    if (mapProTxRegisterAddresses.count(proTx.addr)) {
+        uint256 conflictHash = mapProTxRegisterAddresses[proTx.addr];
+        if (conflictHash != tx.GetHash() && mapTx.count(conflictHash)) {
+            removeRecursive(mapTx.find(conflictHash)->GetTx(), MemPoolRemovalReason::CONFLICT);
+        }
+    }
+    if (mapProTxPubKeyIDs.count(proTx.keyIDOwner)) {
+        uint256 conflictHash = mapProTxPubKeyIDs[proTx.keyIDOwner];
+        if (conflictHash != tx.GetHash() && mapTx.count(conflictHash)) {
+            removeRecursive(mapTx.find(conflictHash)->GetTx(), MemPoolRemovalReason::CONFLICT);
+        }
+    }
+    if (mapProTxPubKeyIDs.count(proTx.keyIDOperator)) {
+        uint256 conflictHash = mapProTxPubKeyIDs[proTx.keyIDOperator];
+        if (conflictHash != tx.GetHash() && mapTx.count(conflictHash)) {
+            removeRecursive(mapTx.find(conflictHash)->GetTx(), MemPoolRemovalReason::CONFLICT);
+        }
+    }
+}
+
 /**
  * Called when a block is connected. Removes from mempool and updates the miner fee estimator.
  */
@@ -765,6 +818,7 @@ void CTxMemPool::removeForBlock(const std::vector<CTransactionRef>& vtx, unsigne
             RemoveStaged(stage, true, MemPoolRemovalReason::BLOCK);
         }
         removeConflicts(*tx);
+        removeProTxConflicts(*tx);
         ClearPrioritisation(tx->GetHash());
     }
     lastRollingFeeUpdate = GetTime();
@@ -776,6 +830,8 @@ void CTxMemPool::_clear()
     mapLinks.clear();
     mapTx.clear();
     mapNextTx.clear();
+    mapProTxRegisterAddresses.clear();
+    mapProTxPubKeyIDs.clear();
     totalTxSize = 0;
     cachedInnerUsage = 0;
     lastRollingFeeUpdate = GetTime();
@@ -1013,6 +1069,16 @@ TxMempoolInfo CTxMemPool::info(const uint256& hash) const
     return GetInfo(i);
 }
 
+bool CTxMemPool::existsProviderTxConflict(const CTransaction &tx) const {
+    LOCK(cs);
+    if (tx.nVersion < 3 || tx.nType != TRANSACTION_PROVIDER_REGISTER)
+        return false;
+    CProRegTx proTx;
+    if (!GetTxPayload(tx, proTx))
+        assert(false);
+    return mapProTxRegisterAddresses.count(proTx.addr) || mapProTxPubKeyIDs.count(proTx.keyIDOwner) || mapProTxPubKeyIDs.count(proTx.keyIDOperator);
+}
+
 CFeeRate CTxMemPool::estimateFee(int nBlocks) const
 {
     LOCK(cs);
diff --git a/src/txmempool.h b/src/txmempool.h
index 93a78a8fcbdb..b741dfd5c373 100644
--- a/src/txmempool.h
+++ b/src/txmempool.h
@@ -21,6 +21,7 @@
 #include "primitives/transaction.h"
 #include "sync.h"
 #include "random.h"
+#include "netaddress.h"
 
 #undef foreach
 #include "boost/multi_index_container.hpp"
@@ -534,6 +535,9 @@ class CTxMemPool
     typedef std::map<uint256, std::vector<CSpentIndexKey> > mapSpentIndexInserted;
     mapSpentIndexInserted mapSpentInserted;
 
+    std::map<CService, uint256> mapProTxRegisterAddresses;
+    std::map<CKeyID, uint256> mapProTxPubKeyIDs;
+
     void UpdateParent(txiter entry, txiter parent, bool add);
     void UpdateChild(txiter entry, txiter child, bool add);
 
@@ -576,6 +580,7 @@ class CTxMemPool
     void removeRecursive(const CTransaction &tx, MemPoolRemovalReason reason = MemPoolRemovalReason::UNKNOWN);
     void removeForReorg(const CCoinsViewCache *pcoins, unsigned int nMemPoolHeight, int flags);
     void removeConflicts(const CTransaction &tx);
+    void removeProTxConflicts(const CTransaction &tx);
     void removeForBlock(const std::vector<CTransactionRef>& vtx, unsigned int nBlockHeight);
 
     void clear();
@@ -684,6 +689,8 @@ class CTxMemPool
     TxMempoolInfo info(const uint256& hash) const;
     std::vector<TxMempoolInfo> infoAll() const;
 
+    bool existsProviderTxConflict(const CTransaction &tx) const;
+
     /** Estimate fee rate needed to get into the next nBlocks
      *  If no answer can be given at nBlocks, return an estimate
      *  at the lowest number of blocks where one can be given
diff --git a/src/validation.cpp b/src/validation.cpp
index 16ecbc53a538..b747ea3a7e73 100644
--- a/src/validation.cpp
+++ b/src/validation.cpp
@@ -650,6 +650,10 @@ bool AcceptToMemoryPoolWorker(CTxMemPool& pool, CValidationState& state, const C
     if (fRequireStandard && !IsStandardTx(tx, reason))
         return state.DoS(0, false, REJECT_NONSTANDARD, reason);
 
+    if (pool.existsProviderTxConflict(tx)) {
+        return state.DoS(0, false, REJECT_DUPLICATE, "protx-dup");
+    }
+
     // Only accept nLockTime-using transactions that can be mined in the next
     // block; we don't want our mempool filled up with transactions that can't
     // be mined yet.

From 76fd308947e45f00e94a8ec40b487b0540746422 Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Fri, 2 Mar 2018 10:09:59 +0100
Subject: [PATCH 077/400] Automatically lock ProTx collaterals when TX is
 added/loaded to wallet

Avoid accidential spending of ProTx collaterals.
---
 src/evo/providertx.cpp | 15 +++++++++++++++
 src/evo/providertx.h   |  3 +++
 src/wallet/wallet.cpp  | 11 +++++++++++
 3 files changed, 29 insertions(+)

diff --git a/src/evo/providertx.cpp b/src/evo/providertx.cpp
index 6140906bab15..94b0d76c0a86 100644
--- a/src/evo/providertx.cpp
+++ b/src/evo/providertx.cpp
@@ -120,3 +120,18 @@ void CProRegTx::ToJson(UniValue& obj) const
 
     obj.push_back(Pair("inputsHash", inputsHash.ToString()));
 }
+
+bool IsProTxCollateral(const CTransaction& tx, uint32_t n)
+{
+    return GetProTxCollateralIndex(tx) == n;
+}
+
+uint32_t GetProTxCollateralIndex(const CTransaction& tx)
+{
+    if (tx.nVersion < 3 || tx.nType != TRANSACTION_PROVIDER_REGISTER)
+        return (uint32_t) - 1;
+    CProRegTx proTx;
+    if (!GetTxPayload(tx, proTx))
+        assert(false);
+    return proTx.nCollateralIndex;
+}
diff --git a/src/evo/providertx.h b/src/evo/providertx.h
index 6c34f801fc22..7c37de358516 100644
--- a/src/evo/providertx.h
+++ b/src/evo/providertx.h
@@ -59,4 +59,7 @@ class CProRegTx
 
 bool CheckProRegTx(const CTransaction& tx, const CBlockIndex* pindexPrev, CValidationState& state);
 
+bool IsProTxCollateral(const CTransaction& tx, uint32_t n);
+uint32_t GetProTxCollateralIndex(const CTransaction& tx);
+
 #endif//DASH_PROVIDERTX_H
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
index 85c9ac1dd5d7..42c54df669d9 100644
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -33,6 +33,8 @@
 #include "privatesend-client.h"
 #include "spork.h"
 
+#include "evo/providertx.h"
+
 #include <assert.h>
 
 #include <boost/algorithm/string/replace.hpp>
@@ -1116,9 +1118,14 @@ bool CWallet::AddToWallet(const CWalletTx& wtxIn, bool fFlushOnClose)
                          wtxIn.hashBlock.ToString());
         }
         AddToSpends(hash);
+
+        uint32_t proTxCollateralIdx = GetProTxCollateralIndex(*wtx.tx);
         for(unsigned int i = 0; i < wtx.tx->vout.size(); ++i) {
             if (IsMine(wtx.tx->vout[i]) && !IsSpent(hash, i)) {
                 setWalletUTXO.insert(COutPoint(hash, i));
+                if (i == proTxCollateralIdx) {
+                    LockCoin(COutPoint(hash, i));
+                }
             }
         }
     }
@@ -3968,9 +3975,13 @@ DBErrors CWallet::LoadWallet(bool& fFirstRunRet)
     {
         LOCK2(cs_main, cs_wallet);
         for (auto& pair : mapWallet) {
+            uint32_t proTxCollateralIdx = GetProTxCollateralIndex(*pair.second.tx);
             for(unsigned int i = 0; i < pair.second.tx->vout.size(); ++i) {
                 if (IsMine(pair.second.tx->vout[i]) && !IsSpent(pair.first, i)) {
                     setWalletUTXO.insert(COutPoint(pair.first, i));
+                    if (i == proTxCollateralIdx) {
+                        LockCoin(COutPoint(pair.first, i));
+                    }
                 }
             }
         }

From 9e8a867149cee43bf459d869c16b64a2d164af12 Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Wed, 14 Feb 2018 14:43:03 +0100
Subject: [PATCH 078/400] Implementation of deterministic MNs list

---
 src/Makefile.am                 |   2 +
 src/dsnotificationinterface.cpp |   4 +
 src/evo/deterministicmns.cpp    | 489 ++++++++++++++++++++++++++++++++
 src/evo/deterministicmns.h      | 410 ++++++++++++++++++++++++++
 src/evo/providertx.cpp          |  21 ++
 src/evo/specialtx.cpp           |   8 +
 src/init.cpp                    |   6 +
 src/qt/test/rpcnestedtests.cpp  |   3 +
 src/test/test_dash.cpp          |   4 +
 src/validation.cpp              |   1 +
 10 files changed, 948 insertions(+)
 create mode 100644 src/evo/deterministicmns.cpp
 create mode 100644 src/evo/deterministicmns.h

diff --git a/src/Makefile.am b/src/Makefile.am
index 2d55f8e15ae0..18ad6716974a 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -109,6 +109,7 @@ BITCOIN_CORE_H = \
   evo/evodb.h \
   evo/specialtx.h \
   evo/providertx.h \
+  evo/deterministicmns.h \
   privatesend.h \
   privatesend-client.h \
   privatesend-server.h \
@@ -222,6 +223,7 @@ libdash_server_a_SOURCES = \
   evo/evodb.cpp \
   evo/specialtx.cpp \
   evo/providertx.cpp \
+  evo/deterministicmns.cpp \
   httprpc.cpp \
   httpserver.cpp \
   init.cpp \
diff --git a/src/dsnotificationinterface.cpp b/src/dsnotificationinterface.cpp
index 00be55b55652..f7c1d2bc04c3 100644
--- a/src/dsnotificationinterface.cpp
+++ b/src/dsnotificationinterface.cpp
@@ -14,6 +14,8 @@
 #include "privatesend-client.h"
 #endif // ENABLE_WALLET
 
+#include "evo/deterministicmns.h"
+
 void CDSNotificationInterface::InitializeCurrentBlockTip()
 {
     LOCK(cs_main);
@@ -35,6 +37,8 @@ void CDSNotificationInterface::UpdatedBlockTip(const CBlockIndex *pindexNew, con
     if (pindexNew == pindexFork) // blocks were disconnected without any new ones
         return;
 
+    deterministicMNManager->UpdatedBlockTip(pindexNew);
+
     masternodeSync.UpdatedBlockTip(pindexNew, fInitialDownload, connman);
 
     // Update global DIP0001 activation status
diff --git a/src/evo/deterministicmns.cpp b/src/evo/deterministicmns.cpp
new file mode 100644
index 000000000000..f1717382a7dc
--- /dev/null
+++ b/src/evo/deterministicmns.cpp
@@ -0,0 +1,489 @@
+// Copyright (c) 2018 The Dash Core developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+#include "deterministicmns.h"
+#include "specialtx.h"
+
+#include "validation.h"
+#include "validationinterface.h"
+#include "chainparams.h"
+#include "script/standard.h"
+#include "base58.h"
+#include "core_io.h"
+
+#include <univalue.h>
+
+static const std::string DB_LIST_SNAPSHOT = "dmn_S";
+static const std::string DB_LIST_DIFF = "dmn_D";
+
+CDeterministicMNManager* deterministicMNManager;
+
+std::string CDeterministicMNState::ToString() const
+{
+    CTxDestination dest;
+    std::string payoutAddress = "unknown";
+    std::string operatorRewardAddress = "none";
+    if (ExtractDestination(scriptPayout, dest)) {
+        payoutAddress = CBitcoinAddress(dest).ToString();
+    }
+    if (ExtractDestination(scriptOperatorPayout, dest)) {
+        operatorRewardAddress = CBitcoinAddress(dest).ToString();
+    }
+
+    return strprintf("CDeterministicMNState(nRegisteredHeight=%d, nLastPaidHeight=%d, nPoSePenality=%d, nPoSeRevivedHeight=%d, nPoSeBanHeight=%d, "
+                     "keyIDOwner=%s, keyIDOperator=%s, keyIDVoting=%s, addr=%s, nProtocolVersion=%d, payoutAddress=%s, operatorRewardAddress=%s)",
+                     nRegisteredHeight, nLastPaidHeight, nPoSePenality, nPoSeRevivedHeight, nPoSeBanHeight,
+                     keyIDOwner.ToString(), keyIDOperator.ToString(), keyIDVoting.ToString(), addr.ToStringIPPort(false), nProtocolVersion, payoutAddress, operatorRewardAddress);
+}
+
+void CDeterministicMNState::ToJson(UniValue& obj) const
+{
+    obj.clear();
+    obj.setObject();
+    obj.push_back(Pair("registeredHeight", nRegisteredHeight));
+    obj.push_back(Pair("lastPaidHeight", nLastPaidHeight));
+    obj.push_back(Pair("PoSePenality", nPoSePenality));
+    obj.push_back(Pair("PoSeRevivedHeight", nPoSeRevivedHeight));
+    obj.push_back(Pair("PoSeBanHeight", nPoSeBanHeight));
+    obj.push_back(Pair("keyIDOwner", keyIDOwner.ToString()));
+    obj.push_back(Pair("keyIDOperator", keyIDOperator.ToString()));
+    obj.push_back(Pair("keyIDVoting", keyIDVoting.ToString()));
+    obj.push_back(Pair("addr", addr.ToStringIPPort(false)));
+    obj.push_back(Pair("protocolVersion", nProtocolVersion));
+
+    CTxDestination dest;
+    if (ExtractDestination(scriptPayout, dest)) {
+        CBitcoinAddress bitcoinAddress(dest);
+        obj.push_back(Pair("payoutAddress", bitcoinAddress.ToString()));
+    }
+    if (ExtractDestination(scriptOperatorPayout, dest)) {
+        CBitcoinAddress bitcoinAddress(dest);
+        obj.push_back(Pair("operatorRewardAddress", bitcoinAddress.ToString()));
+    }
+}
+
+std::string CDeterministicMN::ToString() const
+{
+    return strprintf("CDeterministicMN(proTxHash=%s, nCollateralIndex=%d, nOperatorReward=%f, state=%s", proTxHash.ToString(), nCollateralIndex, (double)nOperatorReward / 100, pdmnState->ToString());
+}
+
+void CDeterministicMN::ToJson(UniValue& obj) const
+{
+    obj.clear();
+    obj.setObject();
+
+    UniValue stateObj;
+    pdmnState->ToJson(stateObj);
+
+    obj.push_back(Pair("proTxHash", proTxHash.ToString()));
+    obj.push_back(Pair("collateralIndex", (int)nCollateralIndex));
+    obj.push_back(Pair("operatorReward", (double)nOperatorReward / 100));
+    obj.push_back(Pair("state", stateObj));
+}
+
+bool CDeterministicMNList::IsMNValid(const uint256& proTxHash) const
+{
+    auto p = mnMap.find(proTxHash);
+    if (p == nullptr) {
+        return false;
+    }
+    return IsMNValid(*p);
+}
+
+bool CDeterministicMNList::IsMNPoSeBanned(const uint256& proTxHash) const
+{
+    auto p = mnMap.find(proTxHash);
+    if (p == nullptr) {
+        return false;
+    }
+    return IsMNPoSeBanned(*p);
+}
+
+bool CDeterministicMNList::IsMNValid(const CDeterministicMNCPtr& dmn) const
+{
+    return !IsMNPoSeBanned(dmn);
+}
+
+bool CDeterministicMNList::IsMNPoSeBanned(const CDeterministicMNCPtr& dmn) const
+{
+    assert(dmn);
+    const CDeterministicMNState& state = *dmn->pdmnState;
+    return state.nPoSeBanHeight != -1;
+}
+
+CDeterministicMNCPtr CDeterministicMNList::GetMN(const uint256& proTxHash) const
+{
+    auto p = mnMap.find(proTxHash);
+    if (p == nullptr) {
+        return nullptr;
+    }
+    return *p;
+}
+
+CDeterministicMNCPtr CDeterministicMNList::GetValidMN(const uint256& proTxHash) const
+{
+    auto dmn = GetMN(proTxHash);
+    if (dmn && !IsMNValid(dmn)) {
+        return nullptr;
+    }
+    return dmn;
+}
+
+CDeterministicMNCPtr CDeterministicMNList::GetMNByOperatorKey(const CKeyID& keyID)
+{
+    for (const auto& p : mnMap) {
+        if (p.second->pdmnState->keyIDOperator == keyID) {
+            return p.second;
+        }
+    }
+    return nullptr;
+}
+
+static int CompareByLastPaid_GetHeight(const CDeterministicMN &dmn)
+{
+    int h = dmn.pdmnState->nLastPaidHeight;
+    if (dmn.pdmnState->nPoSeRevivedHeight != -1 && dmn.pdmnState->nPoSeRevivedHeight > h) {
+        h = dmn.pdmnState->nPoSeRevivedHeight;
+    } else if (h == 0) {
+        h = dmn.pdmnState->nRegisteredHeight;
+    }
+    return h;
+}
+
+static bool CompareByLastPaid(const CDeterministicMN &_a, const CDeterministicMN &_b)
+{
+    int ah = CompareByLastPaid_GetHeight(_a);
+    int bh = CompareByLastPaid_GetHeight(_b);
+    if (ah == bh) {
+        return _a.proTxHash < _b.proTxHash;
+    } else {
+        return ah < bh;
+    }
+}
+static bool CompareByLastPaid(const CDeterministicMNCPtr &_a, const CDeterministicMNCPtr &_b)
+{
+    return CompareByLastPaid(*_a, *_b);
+}
+
+CDeterministicMNCPtr CDeterministicMNList::GetMNPayee() const
+{
+    if (mnMap.size() == 0)
+        return nullptr;
+
+    CDeterministicMNCPtr best;
+    for (const auto& dmn : valid_range()) {
+        if (!best || CompareByLastPaid(dmn, best))
+            best = dmn;
+    }
+
+    return best;
+}
+
+std::vector<CDeterministicMNCPtr> CDeterministicMNList::GetProjectedMNPayees(int nCount) const
+{
+    std::vector<CDeterministicMNCPtr> result;
+    result.reserve(nCount);
+
+    CDeterministicMNList tmpMNList = *this;
+    for (int h = nHeight; h < nHeight + nCount; h++) {
+        tmpMNList.SetHeight(h);
+
+        CDeterministicMNCPtr payee = tmpMNList.GetMNPayee();
+        // push the original MN object instead of the one from the temporary list
+        result.push_back(GetMN(payee->proTxHash));
+
+        CDeterministicMNStatePtr newState = std::make_shared<CDeterministicMNState>(*payee->pdmnState);
+        newState->nLastPaidHeight = h;
+        tmpMNList.UpdateMN(payee->proTxHash, newState);
+    }
+
+    return result;
+}
+
+CDeterministicMNListDiff CDeterministicMNList::BuildDiff(const CDeterministicMNList& to) const
+{
+    CDeterministicMNListDiff diffRet;
+    diffRet.prevBlockHash = blockHash;
+    diffRet.blockHash = to.blockHash;
+    diffRet.nHeight = to.nHeight;
+
+    for (const auto& p : to.mnMap) {
+        const auto fromPtr = mnMap.find(p.first);
+        if (fromPtr == nullptr) {
+            diffRet.addedMNs.emplace(p.first, p.second);
+        } else if (*p.second->pdmnState != *(*fromPtr)->pdmnState) {
+            diffRet.updatedMNs.emplace(p.first, p.second->pdmnState);
+        }
+    }
+    for (const auto& p : mnMap) {
+        const auto toPtr = to.mnMap.find(p.first);
+        if (toPtr == nullptr) {
+            diffRet.removedMns.insert(p.first);
+        }
+    }
+
+    return diffRet;
+}
+
+CDeterministicMNList CDeterministicMNList::ApplyDiff(const CDeterministicMNListDiff& diff) const
+{
+    assert(diff.prevBlockHash == blockHash && diff.nHeight == nHeight + 1);
+
+    CDeterministicMNList result = *this;
+    result.blockHash = diff.blockHash;
+    result.nHeight = diff.nHeight;
+
+    for (const auto& hash : diff.removedMns) {
+        result.RemoveMN(hash);
+    }
+    for (const auto& p : diff.addedMNs) {
+        result.AddMN(p.second);
+    }
+    for (const auto& p : diff.updatedMNs) {
+        result.UpdateMN(p.first, p.second);
+    }
+
+    return result;
+}
+
+void CDeterministicMNList::AddMN(const CDeterministicMNCPtr &dmn)
+{
+    assert(!mnMap.find(dmn->proTxHash));
+    mnMap = mnMap.set(dmn->proTxHash, dmn);
+    AddUniqueProperty(dmn, dmn->pdmnState->addr);
+    AddUniqueProperty(dmn, dmn->pdmnState->keyIDOwner);
+    AddUniqueProperty(dmn, dmn->pdmnState->keyIDOperator);
+}
+
+void CDeterministicMNList::UpdateMN(const uint256 &proTxHash, const CDeterministicMNStateCPtr &pdmnState)
+{
+    auto oldDmn = mnMap.find(proTxHash);
+    assert(oldDmn != nullptr);
+    auto dmn = std::make_shared<CDeterministicMN>(**oldDmn);
+    auto oldState = dmn->pdmnState;
+    dmn->pdmnState = pdmnState;
+    mnMap = mnMap.set(proTxHash, dmn);
+
+    UpdateUniqueProperty(dmn, oldState->addr, pdmnState->addr);
+    UpdateUniqueProperty(dmn, oldState->keyIDOwner, pdmnState->keyIDOwner);
+    UpdateUniqueProperty(dmn, oldState->keyIDOperator, pdmnState->keyIDOperator);
+}
+
+void CDeterministicMNList::RemoveMN(const uint256& proTxHash)
+{
+    auto dmn = GetMN(proTxHash);
+    assert(dmn != nullptr);
+    DeleteUniqueProperty(dmn, dmn->pdmnState->addr);
+    DeleteUniqueProperty(dmn, dmn->pdmnState->keyIDOwner);
+    DeleteUniqueProperty(dmn, dmn->pdmnState->keyIDOperator);
+    mnMap = mnMap.erase(proTxHash);
+}
+
+CDeterministicMNManager::CDeterministicMNManager(CEvoDB& _evoDb) :
+    evoDb(_evoDb)
+{
+}
+
+bool CDeterministicMNManager::ProcessBlock(const CBlock& block, const CBlockIndex* pindexPrev, CValidationState& _state)
+{
+    LOCK(cs);
+
+    int nHeight = pindexPrev->nHeight + 1;
+
+    CDeterministicMNList newList;
+    if (!BuildNewListFromBlock(block, pindexPrev, _state, newList)) {
+        return false;
+    }
+
+    if (newList.GetHeight() == -1) {
+        newList.SetHeight(nHeight);
+    }
+
+    newList.SetBlockHash(block.GetHash());
+
+    CDeterministicMNList oldList = GetListForBlock(pindexPrev->GetBlockHash());
+    CDeterministicMNListDiff diff = oldList.BuildDiff(newList);
+
+    evoDb.Write(std::make_pair(DB_LIST_DIFF, diff.blockHash), diff);
+    if ((nHeight % SNAPSHOT_LIST_PERIOD) == 0) {
+        evoDb.Write(std::make_pair(DB_LIST_SNAPSHOT, diff.blockHash), newList);
+        LogPrintf("CDeterministicMNManager::%s -- Wrote snapshot. nHeight=%d, mapCurMNs.size=%d\n",
+                  __func__, nHeight, newList.size());
+    }
+
+    CleanupCache(nHeight);
+
+    return true;
+}
+
+bool CDeterministicMNManager::UndoBlock(const CBlock& block, const CBlockIndex* pindex)
+{
+    LOCK(cs);
+
+    int nHeight = pindex->nHeight;
+
+    evoDb.Erase(std::make_pair(DB_LIST_DIFF, block.GetHash()));
+    evoDb.Erase(std::make_pair(DB_LIST_SNAPSHOT, block.GetHash()));
+
+    return true;
+}
+
+void CDeterministicMNManager::UpdatedBlockTip(const CBlockIndex* pindex)
+{
+    LOCK(cs);
+
+    tipHeight = pindex->nHeight;
+    tipBlockHash = pindex->GetBlockHash();
+}
+
+bool CDeterministicMNManager::BuildNewListFromBlock(const CBlock& block, const CBlockIndex* pindexPrev, CValidationState& _state, CDeterministicMNList& mnListRet)
+{
+    AssertLockHeld(cs);
+
+    int nHeight = pindexPrev->nHeight + 1;
+
+    CDeterministicMNList oldList = GetListForBlock(pindexPrev->GetBlockHash());
+    CDeterministicMNList newList = oldList;
+    newList.SetBlockHash(uint256()); // we can't know the final block hash, so better not return a (invalid) block hash
+    newList.SetHeight(nHeight);
+
+    auto payee = oldList.GetMNPayee();
+
+    // we skip the coinbase
+    for (int i = 1; i < (int)block.vtx.size(); i++) {
+        const CTransaction& tx = *block.vtx[i];
+
+        // check if any existing MN collateral is spent by this transaction
+        for (const auto& in : tx.vin) {
+            const uint256& proTxHash = in.prevout.hash;
+            auto dmn = newList.GetMN(proTxHash);
+            if (dmn && dmn->nCollateralIndex == in.prevout.n) {
+                newList.RemoveMN(proTxHash);
+
+                LogPrintf("CDeterministicMNManager::%s -- MN %s removed from list because collateral was spent. nHeight=%d, mapCurMNs.size=%d\n",
+                          __func__, proTxHash.ToString(), nHeight, newList.size());
+            }
+        }
+
+        if (tx.nType == TRANSACTION_PROVIDER_REGISTER) {
+            CProRegTx proTx;
+            if (!GetTxPayload(tx, proTx)) {
+                assert(false); // this should have been handled already
+            }
+
+            if (newList.HasUniqueProperty(proTx.addr))
+                return _state.DoS(100, false, REJECT_CONFLICT, "bad-protx-dup-addr");
+            if (newList.HasUniqueProperty(proTx.keyIDOwner) || newList.HasUniqueProperty(proTx.keyIDOperator))
+                return _state.DoS(100, false, REJECT_CONFLICT, "bad-protx-dup-key");
+
+            auto dmn = std::make_shared<CDeterministicMN>(tx.GetHash(), proTx);
+
+            CDeterministicMNState dmnState = *dmn->pdmnState;
+            dmnState.nRegisteredHeight = nHeight;
+
+            if (proTx.addr == CService() || proTx.nProtocolVersion == 0) {
+                // start in banned pdmnState as we need to wait for a ProUpServTx
+                dmnState.nPoSeBanHeight = nHeight;
+            }
+
+            dmn->pdmnState = std::make_shared<CDeterministicMNState>(dmnState);
+
+            newList.AddMN(dmn);
+
+            LogPrintf("CDeterministicMNManager::%s -- MN %s added to MN list. nHeight=%d, mapCurMNs.size=%d\n",
+                      __func__, tx.GetHash().ToString(), nHeight, newList.size());
+        }
+    }
+
+    // The payee for the current block was determined by the previous block's list but it might have disappeared in the
+    // current block. We still pay that MN one last time however.
+    if (payee && newList.HasMN(payee->proTxHash)) {
+        auto newState = std::make_shared<CDeterministicMNState>(*newList.GetMN(payee->proTxHash)->pdmnState);
+        newState->nLastPaidHeight = nHeight;
+        newList.UpdateMN(payee->proTxHash, newState);
+    }
+
+    mnListRet = std::move(newList);
+
+    return true;
+}
+
+CDeterministicMNList CDeterministicMNManager::GetListForBlock(const uint256& blockHash)
+{
+    LOCK(cs);
+
+    auto it = mnListsCache.find(blockHash);
+    if (it != mnListsCache.end()) {
+        return it->second;
+    }
+
+    uint256 blockHashTmp = blockHash;
+    CDeterministicMNList snapshot;
+    std::vector<CDeterministicMNListDiff> vecDiff;
+
+    while(true) {
+        if (evoDb.Read(std::make_pair(DB_LIST_SNAPSHOT, blockHashTmp), snapshot)) {
+            break;
+        }
+
+        CDeterministicMNListDiff diff;
+        if (!evoDb.Read(std::make_pair(DB_LIST_DIFF, blockHashTmp), diff)) {
+            snapshot = CDeterministicMNList(blockHashTmp, -1);
+            break;
+        }
+
+        vecDiff.emplace(vecDiff.begin(), diff);
+        blockHashTmp = diff.prevBlockHash;
+    }
+
+    for (const auto& diff : vecDiff) {
+        if (diff.HasChanges()) {
+            snapshot = snapshot.ApplyDiff(diff);
+        } else {
+            snapshot.SetBlockHash(diff.blockHash);
+            snapshot.SetHeight(diff.nHeight);
+        }
+    }
+
+    mnListsCache.emplace(blockHash, snapshot);
+    return snapshot;
+}
+
+CDeterministicMNList CDeterministicMNManager::GetListAtChainTip()
+{
+    LOCK(cs);
+    return GetListForBlock(tipBlockHash);
+}
+
+CDeterministicMNCPtr CDeterministicMNManager::GetMN(const uint256& blockHash, const uint256& proTxHash)
+{
+    auto mnList = GetListForBlock(blockHash);
+    return mnList.GetMN(proTxHash);
+}
+
+bool CDeterministicMNManager::HasValidMNAtBlock(const uint256& blockHash, const uint256& proTxHash)
+{
+    auto mnList = GetListForBlock(blockHash);
+    return mnList.IsMNValid(proTxHash);
+}
+
+bool CDeterministicMNManager::HasValidMNAtChainTip(const uint256& proTxHash)
+{
+    return GetListAtChainTip().IsMNValid(proTxHash);
+}
+
+void CDeterministicMNManager::CleanupCache(int nHeight)
+{
+    AssertLockHeld(cs);
+
+    std::vector<uint256> toDelete;
+    for (const auto& p : mnListsCache) {
+        if (p.second.GetHeight() + LISTS_CACHE_SIZE < nHeight) {
+            toDelete.emplace_back(p.first);
+        }
+    }
+    for (const auto& h : toDelete) {
+        mnListsCache.erase(h);
+    }
+}
diff --git a/src/evo/deterministicmns.h b/src/evo/deterministicmns.h
new file mode 100644
index 000000000000..cfea510be107
--- /dev/null
+++ b/src/evo/deterministicmns.h
@@ -0,0 +1,410 @@
+// Copyright (c) 2018 The Dash Core developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+#ifndef DASH_DETERMINISTICMNS_H
+#define DASH_DETERMINISTICMNS_H
+
+#include "evodb.h"
+#include "providertx.h"
+#include "dbwrapper.h"
+#include "sync.h"
+
+#include "immer/map.hpp"
+#include "immer/map_transient.hpp"
+
+#include <map>
+
+#include <boost/range/adaptors.hpp>
+#include <boost/range/any_range.hpp>
+
+class CBlock;
+class CBlockIndex;
+class CValidationState;
+
+class CDeterministicMNState
+{
+public:
+    int nRegisteredHeight{-1};
+    int nLastPaidHeight{0};
+    int nPoSePenality{0};
+    int nPoSeRevivedHeight{-1};
+    int nPoSeBanHeight{-1};
+
+    CKeyID keyIDOwner;
+    CKeyID keyIDOperator;
+    CKeyID keyIDVoting;
+    CService addr;
+    int32_t nProtocolVersion;
+    CScript scriptPayout;
+    CScript scriptOperatorPayout;
+
+public:
+    CDeterministicMNState() {}
+    CDeterministicMNState(const CProRegTx& proTx)
+    {
+        keyIDOwner = proTx.keyIDOwner;
+        keyIDOperator = proTx.keyIDOperator;
+        keyIDVoting = proTx.keyIDVoting;
+        addr = proTx.addr;
+        nProtocolVersion = proTx.nProtocolVersion;
+        scriptPayout = proTx.scriptPayout;
+    }
+    template<typename Stream>
+    CDeterministicMNState(deserialize_type, Stream& s) { s >> *this;}
+
+    ADD_SERIALIZE_METHODS;
+
+    template <typename Stream, typename Operation>
+    inline void SerializationOp(Stream& s, Operation ser_action)
+    {
+        READWRITE(nRegisteredHeight);
+        READWRITE(nLastPaidHeight);
+        READWRITE(nPoSePenality);
+        READWRITE(nPoSeRevivedHeight);
+        READWRITE(nPoSeBanHeight);
+        READWRITE(keyIDOwner);
+        READWRITE(keyIDOperator);
+        READWRITE(keyIDVoting);
+        READWRITE(addr);
+        READWRITE(nProtocolVersion);
+        READWRITE(*(CScriptBase*)(&scriptPayout));
+        READWRITE(*(CScriptBase*)(&scriptOperatorPayout));
+    }
+
+    bool operator==(const CDeterministicMNState& rhs) const
+    {
+        return nRegisteredHeight == rhs.nRegisteredHeight &&
+               nLastPaidHeight == rhs.nLastPaidHeight &&
+               nPoSePenality == rhs.nPoSePenality &&
+               nPoSeRevivedHeight == rhs.nPoSeRevivedHeight &&
+               nPoSeBanHeight == rhs.nPoSeBanHeight &&
+               keyIDOwner == rhs.keyIDOwner &&
+               keyIDOperator == rhs.keyIDOperator &&
+               keyIDVoting == rhs.keyIDVoting &&
+               addr == rhs.addr &&
+               nProtocolVersion == rhs.nProtocolVersion &&
+               scriptPayout == rhs.scriptPayout &&
+               scriptOperatorPayout == rhs.scriptOperatorPayout;
+    }
+
+    bool operator!=(const CDeterministicMNState& rhs) const
+    {
+        return !(rhs == *this);
+    }
+
+public:
+    std::string ToString() const;
+    void ToJson(UniValue& obj) const;
+};
+typedef std::shared_ptr<CDeterministicMNState> CDeterministicMNStatePtr;
+typedef std::shared_ptr<const CDeterministicMNState> CDeterministicMNStateCPtr;
+
+class CDeterministicMN
+{
+public:
+    CDeterministicMN() {}
+    CDeterministicMN(const uint256& _proTxHash, const CProRegTx& _proTx)
+    {
+        proTxHash = _proTxHash;
+        nCollateralIndex = _proTx.nCollateralIndex;
+        nOperatorReward = _proTx.nOperatorReward;
+        pdmnState = std::make_shared<CDeterministicMNState>(_proTx);
+    }
+    template<typename Stream>
+    CDeterministicMN(deserialize_type, Stream& s) { s >> *this;}
+
+    uint256 proTxHash;
+    uint32_t nCollateralIndex;
+    uint16_t nOperatorReward;
+    CDeterministicMNStateCPtr pdmnState;
+
+public:
+    ADD_SERIALIZE_METHODS;
+
+    template <typename Stream, typename Operation>
+    inline void SerializationOp(Stream& s, Operation ser_action)
+    {
+        READWRITE(proTxHash);
+        READWRITE(nCollateralIndex);
+        READWRITE(nOperatorReward);
+        READWRITE(pdmnState);
+    }
+
+public:
+    std::string ToString() const;
+    void ToJson(UniValue& obj) const;
+};
+typedef std::shared_ptr<CDeterministicMN> CDeterministicMNPtr;
+typedef std::shared_ptr<const CDeterministicMN> CDeterministicMNCPtr;
+
+class CDeterministicMNListDiff;
+
+template<typename Stream, typename K, typename T, typename Hash, typename Equal>
+void SerializeImmerMap(Stream& os, const immer::map<K, T, Hash, Equal>& m)
+{
+    WriteCompactSize(os, m.size());
+    for (typename immer::map<K, T, Hash, Equal>::const_iterator mi = m.begin(); mi != m.end(); ++mi)
+        Serialize(os, (*mi));
+}
+
+template<typename Stream, typename K, typename T, typename Hash, typename Equal>
+void UnserializeImmerMap(Stream& is, immer::map<K, T, Hash, Equal>& m)
+{
+    m = immer::map<K, T, Hash, Equal>();
+    unsigned int nSize = ReadCompactSize(is);
+    for (unsigned int i = 0; i < nSize; i++)
+    {
+        std::pair<K, T> item;
+        Unserialize(is, item);
+        m = m.set(item.first, item.second);
+    }
+}
+
+class CDeterministicMNList
+{
+public:
+    typedef immer::map<uint256, CDeterministicMNCPtr> MnMap;
+    typedef immer::map<uint256, std::pair<uint256, uint32_t>> MnUniquePropertyMap;
+
+private:
+    uint256 blockHash;
+    int nHeight{-1};
+    MnMap mnMap;
+
+    // map of unique properties like address and keys
+    // we keep track of this as checking for duplicates would otherwise be painfully slow
+    // the entries in the map are ref counted as some properties might appear multiple times per MN (e.g. operator/owner keys)
+    MnUniquePropertyMap mnUniquePropertyMap;
+
+public:
+    CDeterministicMNList() {}
+    explicit CDeterministicMNList(const uint256& _blockHash, int _height) :
+            blockHash(_blockHash),
+            nHeight(_height)
+    {}
+
+    ADD_SERIALIZE_METHODS;
+
+    template <typename Stream, typename Operation>
+    inline void SerializationOp(Stream& s, Operation ser_action)
+    {
+        READWRITE(blockHash);
+        READWRITE(nHeight);
+        if (ser_action.ForRead()) {
+            UnserializeImmerMap(s, mnMap);
+            UnserializeImmerMap(s, mnUniquePropertyMap);
+        } else {
+            SerializeImmerMap(s, mnMap);
+            SerializeImmerMap(s, mnUniquePropertyMap);
+        }
+    }
+
+public:
+
+    size_t size() const
+    {
+        return mnMap.size();
+    }
+
+    typedef boost::any_range<const CDeterministicMNCPtr&, boost::forward_traversal_tag> range_type;
+
+    range_type all_range() const
+    {
+        return boost::adaptors::transform(mnMap, [] (const MnMap::value_type& p) -> const CDeterministicMNCPtr& {
+            return p.second;
+        });
+    }
+
+    range_type valid_range() const
+    {
+        return boost::adaptors::filter(all_range(), [&] (const CDeterministicMNCPtr& dmn) -> bool {
+            return IsMNValid(dmn);
+        });
+    }
+
+    size_t all_count() const
+    {
+        return mnMap.size();
+    }
+
+    size_t valid_count() const
+    {
+        size_t c = 0;
+        for (const auto& p : mnMap) {
+            if (IsMNValid(p.second)) {
+                c++;
+            }
+        }
+        return c;
+    }
+
+public:
+    const uint256& GetBlockHash() const
+    {
+        return blockHash;
+    }
+    void SetBlockHash(const uint256& _blockHash)
+    {
+        blockHash = _blockHash;
+    }
+    int GetHeight() const
+    {
+        return nHeight;
+    }
+    void SetHeight(int _height)
+    {
+        nHeight = _height;
+    }
+
+    bool IsMNValid(const uint256& proTxHash) const;
+    bool IsMNPoSeBanned(const uint256& proTxHash) const;
+
+    bool HasMN(const uint256& proTxHash) const {
+        return GetMN(proTxHash) != nullptr;
+    }
+    CDeterministicMNCPtr GetMN(const uint256& proTxHash) const;
+    CDeterministicMNCPtr GetValidMN(const uint256& proTxHash) const;
+    CDeterministicMNCPtr GetMNByOperatorKey(const CKeyID& keyID);
+    CDeterministicMNCPtr GetMNPayee() const;
+
+    /**
+     * Calculates the projected MN payees for the next *count* blocks. The result is not guaranteed to be correct
+     * as PoSe banning might occur later
+     * @param count
+     * @return
+     */
+    std::vector<CDeterministicMNCPtr> GetProjectedMNPayees(int nCount) const;
+
+    CDeterministicMNListDiff BuildDiff(const CDeterministicMNList& to) const;
+    CDeterministicMNList ApplyDiff(const CDeterministicMNListDiff& diff) const;
+
+    void AddMN(const CDeterministicMNCPtr &dmn);
+    void UpdateMN(const uint256 &proTxHash, const CDeterministicMNStateCPtr &pdmnState);
+    void RemoveMN(const uint256& proTxHash);
+
+    template<typename T>
+    bool HasUniqueProperty(const T& v) const
+    {
+        return mnUniquePropertyMap.count(::SerializeHash(v)) != 0;
+    }
+    template<typename T>
+    CDeterministicMNCPtr GetUniquePropertyMN(const T& v) const
+    {
+        auto p = mnUniquePropertyMap.find(::SerializeHash(v));
+        if (!p) {
+            return nullptr;
+        }
+        return GetMN(p->first);
+    }
+
+private:
+    bool IsMNValid(const CDeterministicMNCPtr& dmn) const;
+    bool IsMNPoSeBanned(const CDeterministicMNCPtr& dmn) const;
+
+    template<typename T>
+    void AddUniqueProperty(const CDeterministicMNCPtr& dmn, const T& v)
+    {
+        auto hash = ::SerializeHash(v);
+        auto oldEntry = mnUniquePropertyMap.find(hash);
+        assert(!oldEntry || oldEntry->first == dmn->proTxHash);
+        std::pair<uint256, uint32_t> newEntry(dmn->proTxHash, 1);
+        if (oldEntry) {
+            newEntry.second = oldEntry->second + 1;
+        }
+        mnUniquePropertyMap = mnUniquePropertyMap.set(hash, newEntry);
+    }
+    template<typename T>
+    void DeleteUniqueProperty(const CDeterministicMNCPtr& dmn, const T& oldValue)
+    {
+        auto oldHash = ::SerializeHash(oldValue);
+        auto p = mnUniquePropertyMap.find(oldHash);
+        assert(p && p->first == dmn->proTxHash);
+        if (p->second == 1) {
+            mnUniquePropertyMap = mnUniquePropertyMap.erase(oldHash);
+        } else {
+            mnUniquePropertyMap = mnUniquePropertyMap.set(oldHash, std::make_pair(dmn->proTxHash, p->second - 1));
+        }
+    }
+    template<typename T>
+    void UpdateUniqueProperty(const CDeterministicMNCPtr& dmn, const T& oldValue, const T& newValue)
+    {
+        if (oldValue == newValue) {
+            return;
+        }
+        DeleteUniqueProperty(dmn, oldValue);
+        AddUniqueProperty(dmn, newValue);
+    }
+};
+
+class CDeterministicMNListDiff
+{
+public:
+    uint256 prevBlockHash;
+    uint256 blockHash;
+    int nHeight{-1};
+    std::map<uint256, CDeterministicMNCPtr> addedMNs;
+    std::map<uint256, CDeterministicMNStateCPtr> updatedMNs;
+    std::set<uint256> removedMns;
+
+public:
+    ADD_SERIALIZE_METHODS;
+
+    template <typename Stream, typename Operation>
+    inline void SerializationOp(Stream& s, Operation ser_action)
+    {
+        READWRITE(prevBlockHash);
+        READWRITE(blockHash);
+        READWRITE(nHeight);
+        READWRITE(addedMNs);
+        READWRITE(updatedMNs);
+        READWRITE(removedMns);
+    }
+
+public:
+    bool HasChanges() const
+    {
+        return !addedMNs.empty() || !updatedMNs.empty() || !removedMns.empty();
+    }
+};
+
+class CDeterministicMNManager
+{
+    static const int SNAPSHOT_LIST_PERIOD = 576; // once per day
+    static const int LISTS_CACHE_SIZE = 576;
+
+public:
+    CCriticalSection cs;
+
+private:
+    CEvoDB& evoDb;
+
+    std::map<uint256, CDeterministicMNList> mnListsCache;
+    int tipHeight{-1};
+    uint256 tipBlockHash;
+
+public:
+    CDeterministicMNManager(CEvoDB& _evoDb);
+
+    bool ProcessBlock(const CBlock& block, const CBlockIndex* pindexPrev, CValidationState& state);
+    bool UndoBlock(const CBlock& block, const CBlockIndex* pindex);
+
+    void UpdatedBlockTip(const CBlockIndex *pindex);
+
+    // the returned list will not contain the correct block hash (we can't know it yet as the coinbase TX is not updated yet)
+    bool BuildNewListFromBlock(const CBlock& block, const CBlockIndex* pindexPrev, CValidationState& state, CDeterministicMNList& mnListRet);
+
+    CDeterministicMNList GetListForBlock(const uint256& blockHash);
+    CDeterministicMNList GetListAtChainTip();
+
+    CDeterministicMNCPtr GetMN(const uint256& blockHash, const uint256& proTxHash);
+    bool HasValidMNAtBlock(const uint256& blockHash, const uint256& proTxHash);
+    bool HasValidMNAtChainTip(const uint256& proTxHash);
+
+private:
+    void CleanupCache(int nHeight);
+};
+
+extern CDeterministicMNManager* deterministicMNManager;
+
+#endif//DASH_DETERMINISTICMNS_H
diff --git a/src/evo/providertx.cpp b/src/evo/providertx.cpp
index 94b0d76c0a86..b9f0497cf264 100644
--- a/src/evo/providertx.cpp
+++ b/src/evo/providertx.cpp
@@ -4,6 +4,7 @@
 
 #include "providertx.h"
 #include "specialtx.h"
+#include "deterministicmns.h"
 
 #include "hash.h"
 #include "clientversion.h"
@@ -30,6 +31,13 @@ static bool CheckService(const uint256& proTxHash, const ProTx& proTx, const CBl
     if (!proTx.addr.IsIPv4())
         return state.DoS(10, false, REJECT_INVALID, "bad-protx-addr");
 
+    if (pindexPrev) {
+        auto mnList = deterministicMNManager->GetListForBlock(pindexPrev->GetBlockHash());
+        if (mnList.HasUniqueProperty(proTx.addr) && mnList.GetUniquePropertyMN(proTx.addr)->proTxHash != proTxHash) {
+            return state.DoS(10, false, REJECT_DUPLICATE, "bad-protx-dup-addr");
+        }
+    }
+
     return true;
 }
 
@@ -81,6 +89,19 @@ bool CheckProRegTx(const CTransaction& tx, const CBlockIndex* pindexPrev, CValid
     if (ptx.nOperatorReward > 10000)
         return state.DoS(10, false, REJECT_INVALID, "bad-protx-operator-reward");
 
+    if (pindexPrev) {
+        auto mnList = deterministicMNManager->GetListForBlock(pindexPrev->GetBlockHash());
+        if (mnList.HasUniqueProperty(ptx.keyIDOwner) || mnList.HasUniqueProperty(ptx.keyIDOperator)) {
+            return state.DoS(10, false, REJECT_DUPLICATE, "bad-protx-dup-key");
+        }
+
+        if (!deterministicMNManager->IsDeterministicMNsSporkActive(pindexPrev->nHeight)) {
+            if (ptx.keyIDOwner != ptx.keyIDOperator || ptx.keyIDOwner != ptx.keyIDVoting) {
+                return state.DoS(10, false, REJECT_INVALID, "bad-protx-key-not-same");
+            }
+        }
+    }
+
     if (!CheckInputsHashAndSig(tx, ptx, ptx.keyIDOwner, state))
         return false;
 
diff --git a/src/evo/specialtx.cpp b/src/evo/specialtx.cpp
index a5887b35af3f..f5de5bdf8412 100644
--- a/src/evo/specialtx.cpp
+++ b/src/evo/specialtx.cpp
@@ -11,6 +11,7 @@
 #include "chainparams.h"
 
 #include "specialtx.h"
+#include "deterministicmns.h"
 
 bool CheckSpecialTx(const CTransaction& tx, const CBlockIndex* pindexPrev, CValidationState& state)
 {
@@ -67,6 +68,9 @@ bool ProcessSpecialTxsInBlock(const CBlock& block, const CBlockIndex* pindex, CV
             return false;
     }
 
+    if (!deterministicMNManager->ProcessBlock(block, pindex->pprev, state))
+        return false;
+
     return true;
 }
 
@@ -77,6 +81,10 @@ bool UndoSpecialTxsInBlock(const CBlock& block, const CBlockIndex* pindex)
         if (!UndoSpecialTx(tx, pindex))
             return false;
     }
+
+    if (!deterministicMNManager->UndoBlock(block, pindex))
+        return false;
+
     return true;
 }
 
diff --git a/src/init.cpp b/src/init.cpp
index 10d985b9a649..772cc7881cbb 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -66,6 +66,8 @@
 #include "spork.h"
 #include "warnings.h"
 
+#include "evo/deterministicmns.h"
+
 #include <stdint.h>
 #include <stdio.h>
 #include <memory>
@@ -293,6 +295,8 @@ void PrepareShutdown()
         pcoinsdbview = NULL;
         delete pblocktree;
         pblocktree = NULL;
+        delete deterministicMNManager;
+        deterministicMNManager = NULL;
         delete evoDb;
         evoDb = NULL;
     }
@@ -1655,6 +1659,7 @@ bool AppInitMain(boost::thread_group& threadGroup, CScheduler& scheduler)
                 delete pcoinsdbview;
                 delete pcoinscatcher;
                 delete pblocktree;
+                delete deterministicMNManager;
                 delete evoDb;
 
                 evoDb = new CEvoDB(nEvoDbCache, false, fReindex || fReindexChainState);
@@ -1663,6 +1668,7 @@ bool AppInitMain(boost::thread_group& threadGroup, CScheduler& scheduler)
                 pcoinsdbview = new CCoinsViewDB(nCoinDBCache, false, fReindex || fReindexChainState);
                 pcoinscatcher = new CCoinsViewErrorCatcher(pcoinsdbview);
                 pcoinsTip = new CCoinsViewCache(pcoinscatcher);
+                deterministicMNManager = new CDeterministicMNManager(*evoDb);
 
                 if (fReindex) {
                     pblocktree->WriteReindexing(true);
diff --git a/src/qt/test/rpcnestedtests.cpp b/src/qt/test/rpcnestedtests.cpp
index a758d29d7174..ef4ad3af1a03 100644
--- a/src/qt/test/rpcnestedtests.cpp
+++ b/src/qt/test/rpcnestedtests.cpp
@@ -14,6 +14,8 @@
 #include "univalue.h"
 #include "util.h"
 
+#include "evo/deterministicmns.h"
+
 #include <QDir>
 #include <QtGlobal>
 
@@ -50,6 +52,7 @@ void RPCNestedTests::rpcNestedTests()
     evoDb = new CEvoDB(1 << 20, true, true);
     pblocktree = new CBlockTreeDB(1 << 20, true);
     pcoinsdbview = new CCoinsViewDB(1 << 23, true);
+    deterministicMNManager = new CDeterministicMNManager(*evoDb);
     pcoinsTip = new CCoinsViewCache(pcoinsdbview);
     InitBlockIndex(chainparams);
     {
diff --git a/src/test/test_dash.cpp b/src/test/test_dash.cpp
index f769aed20a4a..5eb785557d87 100644
--- a/src/test/test_dash.cpp
+++ b/src/test/test_dash.cpp
@@ -24,6 +24,8 @@
 
 #include "test/testutil.h"
 
+#include "evo/deterministicmns.h"
+
 #include <memory>
 
 #include <boost/filesystem.hpp>
@@ -68,6 +70,7 @@ TestingSetup::TestingSetup(const std::string& chainName) : BasicTestingSetup(cha
         evoDb = new CEvoDB(1 << 20, true, true);
         pblocktree = new CBlockTreeDB(1 << 20, true);
         pcoinsdbview = new CCoinsViewDB(1 << 23, true);
+        deterministicMNManager = new CDeterministicMNManager(*evoDb);
         pcoinsTip = new CCoinsViewCache(pcoinsdbview);
         InitBlockIndex(chainparams);
         {
@@ -90,6 +93,7 @@ TestingSetup::~TestingSetup()
         threadGroup.join_all();
         UnloadBlockIndex();
         delete pcoinsTip;
+        delete deterministicMNManager;
         delete pcoinsdbview;
         delete pblocktree;
         delete evoDb;
diff --git a/src/validation.cpp b/src/validation.cpp
index b747ea3a7e73..8d8f779573db 100644
--- a/src/validation.cpp
+++ b/src/validation.cpp
@@ -44,6 +44,7 @@
 
 #include "evo/specialtx.h"
 #include "evo/providertx.h"
+#include "evo/deterministicmns.h"
 
 #include <atomic>
 #include <sstream>

From 5461e92bf456b516ac1a660f3fcccd389b22afbd Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Thu, 15 Feb 2018 13:57:18 +0100
Subject: [PATCH 079/400] Add spork to control deterministic MN lists
 activation

---
 src/evo/deterministicmns.cpp | 26 ++++++++++++++++++++++++++
 src/evo/deterministicmns.h   |  4 ++++
 src/spork.cpp                |  3 +++
 src/spork.h                  |  3 ++-
 4 files changed, 35 insertions(+), 1 deletion(-)

diff --git a/src/evo/deterministicmns.cpp b/src/evo/deterministicmns.cpp
index f1717382a7dc..5300b2640153 100644
--- a/src/evo/deterministicmns.cpp
+++ b/src/evo/deterministicmns.cpp
@@ -11,6 +11,7 @@
 #include "script/standard.h"
 #include "base58.h"
 #include "core_io.h"
+#include "spork.h"
 
 #include <univalue.h>
 
@@ -312,6 +313,10 @@ bool CDeterministicMNManager::ProcessBlock(const CBlock& block, const CBlockInde
                   __func__, nHeight, newList.size());
     }
 
+    if (nHeight == GetSpork15Value()) {
+        LogPrintf("CDeterministicMNManager::%s -- spork15 is active now. nHeight=%d\n", __func__, nHeight);
+    }
+
     CleanupCache(nHeight);
 
     return true;
@@ -326,6 +331,10 @@ bool CDeterministicMNManager::UndoBlock(const CBlock& block, const CBlockIndex*
     evoDb.Erase(std::make_pair(DB_LIST_DIFF, block.GetHash()));
     evoDb.Erase(std::make_pair(DB_LIST_SNAPSHOT, block.GetHash()));
 
+    if (nHeight == GetSpork15Value()) {
+        LogPrintf("CDeterministicMNManager::%s -- spork15 is not active anymore. nHeight=%d\n", __func__, nHeight);
+    }
+
     return true;
 }
 
@@ -473,6 +482,23 @@ bool CDeterministicMNManager::HasValidMNAtChainTip(const uint256& proTxHash)
     return GetListAtChainTip().IsMNValid(proTxHash);
 }
 
+int64_t CDeterministicMNManager::GetSpork15Value()
+{
+    return sporkManager.GetSporkValue(SPORK_15_DETERMINISTIC_MNS_ENABLED);
+}
+
+bool CDeterministicMNManager::IsDeterministicMNsSporkActive(int nHeight)
+{
+    LOCK(cs);
+
+    if (nHeight == -1) {
+        nHeight = tipHeight;
+    }
+
+    int64_t spork15Value = GetSpork15Value();
+    return nHeight >= spork15Value;
+}
+
 void CDeterministicMNManager::CleanupCache(int nHeight)
 {
     AssertLockHeld(cs);
diff --git a/src/evo/deterministicmns.h b/src/evo/deterministicmns.h
index cfea510be107..5a84095807fb 100644
--- a/src/evo/deterministicmns.h
+++ b/src/evo/deterministicmns.h
@@ -401,7 +401,11 @@ class CDeterministicMNManager
     bool HasValidMNAtBlock(const uint256& blockHash, const uint256& proTxHash);
     bool HasValidMNAtChainTip(const uint256& proTxHash);
 
+    bool IsDeterministicMNsSporkActive(int nHeight = -1);
+
 private:
+    void UpdateSpork15Value();
+    int64_t GetSpork15Value();
     void CleanupCache(int nHeight);
 };
 
diff --git a/src/spork.cpp b/src/spork.cpp
index adf3f315e1eb..1d096fa93589 100644
--- a/src/spork.cpp
+++ b/src/spork.cpp
@@ -25,6 +25,7 @@ std::map<int, int64_t> mapSporkDefaults = {
     {SPORK_10_MASTERNODE_PAY_UPDATED_NODES,  4070908800ULL}, // OFF
     {SPORK_12_RECONSIDER_BLOCKS,             0},             // 0 BLOCKS
     {SPORK_14_REQUIRE_SENTINEL_FLAG,         4070908800ULL}, // OFF
+    {SPORK_15_DETERMINISTIC_MNS_ENABLED,     4070908800ULL}, // OFF
 };
 
 void CSporkManager::Clear()
@@ -182,6 +183,7 @@ int CSporkManager::GetSporkIDByName(const std::string& strName)
     if (strName == "SPORK_10_MASTERNODE_PAY_UPDATED_NODES")     return SPORK_10_MASTERNODE_PAY_UPDATED_NODES;
     if (strName == "SPORK_12_RECONSIDER_BLOCKS")                return SPORK_12_RECONSIDER_BLOCKS;
     if (strName == "SPORK_14_REQUIRE_SENTINEL_FLAG")            return SPORK_14_REQUIRE_SENTINEL_FLAG;
+    if (strName == "SPORK_15_DETERMINISTIC_MNS_ENABLED")        return SPORK_15_DETERMINISTIC_MNS_ENABLED;
 
     LogPrint("spork", "CSporkManager::GetSporkIDByName -- Unknown Spork name '%s'\n", strName);
     return -1;
@@ -199,6 +201,7 @@ std::string CSporkManager::GetSporkNameByID(int nSporkID)
         case SPORK_10_MASTERNODE_PAY_UPDATED_NODES:     return "SPORK_10_MASTERNODE_PAY_UPDATED_NODES";
         case SPORK_12_RECONSIDER_BLOCKS:                return "SPORK_12_RECONSIDER_BLOCKS";
         case SPORK_14_REQUIRE_SENTINEL_FLAG:            return "SPORK_14_REQUIRE_SENTINEL_FLAG";
+        case SPORK_15_DETERMINISTIC_MNS_ENABLED:        return "SPORK_15_DETERMINISTIC_MNS_ENABLED";
         default:
             LogPrint("spork", "CSporkManager::GetSporkNameByID -- Unknown Spork ID %d\n", nSporkID);
             return "Unknown";
diff --git a/src/spork.h b/src/spork.h
index 60153efc0694..4ccd619d1231 100644
--- a/src/spork.h
+++ b/src/spork.h
@@ -26,9 +26,10 @@ static const int SPORK_9_SUPERBLOCKS_ENABLED                            = 10008;
 static const int SPORK_10_MASTERNODE_PAY_UPDATED_NODES                  = 10009;
 static const int SPORK_12_RECONSIDER_BLOCKS                             = 10011;
 static const int SPORK_14_REQUIRE_SENTINEL_FLAG                         = 10013;
+static const int SPORK_15_DETERMINISTIC_MNS_ENABLED                     = 10014;
 
 static const int SPORK_START                                            = SPORK_2_INSTANTSEND_ENABLED;
-static const int SPORK_END                                              = SPORK_14_REQUIRE_SENTINEL_FLAG;
+static const int SPORK_END                                              = SPORK_15_DETERMINISTIC_MNS_ENABLED;
 
 extern std::map<int, int64_t> mapSporkDefaults;
 extern CSporkManager sporkManager;

From 2c172873aa5c0f1ff4ca67c5836f8190337bcb2e Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Thu, 15 Feb 2018 18:25:20 +0100
Subject: [PATCH 080/400] Don't allow non-ProTx masternode collaterals after
 DIP3 activation

---
 src/governance-object.cpp |  2 ++
 src/masternode.cpp        | 21 +++++++++++++++++++++
 src/masternode.h          |  3 ++-
 3 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/src/governance-object.cpp b/src/governance-object.cpp
index 04185db4c640..1f5bbc9f2cdc 100644
--- a/src/governance-object.cpp
+++ b/src/governance-object.cpp
@@ -493,6 +493,8 @@ bool CGovernanceObject::IsValidLocally(std::string& strError, bool& fMissingMast
                 CMasternode::CollateralStatus err = CMasternode::CheckCollateral(masternodeOutpoint, CKeyID());
                 if (err == CMasternode::COLLATERAL_UTXO_NOT_FOUND) {
                     strError = "Failed to find Masternode UTXO, missing masternode=" + strOutpoint + "\n";
+                } else if (err == CMasternode::COLLATERAL_UTXO_NOT_PROTX) {
+                    strError = "Masternode UTXO is not a ProTx, missing masternode=" + strOutpoint + "\n";
                 } else if (err == CMasternode::COLLATERAL_INVALID_AMOUNT) {
                     strError = "Masternode UTXO should have 1000 DASH, missing masternode=" + strOutpoint + "\n";
                 } else if (err == CMasternode::COLLATERAL_INVALID_PUBKEY) {
diff --git a/src/masternode.cpp b/src/masternode.cpp
index 9fc59baf7dff..21e4202e7651 100644
--- a/src/masternode.cpp
+++ b/src/masternode.cpp
@@ -125,6 +125,22 @@ CMasternode::CollateralStatus CMasternode::CheckCollateral(const COutPoint& outp
         return COLLATERAL_INVALID_PUBKEY;
     }
 
+    CTransactionRef tx;
+    uint256 hashBlock;
+    if (!GetTransaction(outpoint.hash, tx, Params().GetConsensus(), hashBlock, true)) {
+        // should not happen
+        return COLLATERAL_UTXO_NOT_FOUND;
+    }
+    if (tx->nType != TRANSACTION_PROVIDER_REGISTER) {
+        assert(mapBlockIndex.count(hashBlock));
+
+        CBlockIndex *pindex = mapBlockIndex[hashBlock];
+        if (VersionBitsState(pindex->pprev, Params().GetConsensus(), Consensus::DEPLOYMENT_DIP0003, versionbitscache) == THRESHOLD_ACTIVE) {
+            LogPrintf("CMasternode::CheckCollateral -- ERROR: Collateral of masternode %s was created after DIP3 activation and is not a ProTx\n", outpoint.ToStringShort());
+            return COLLATERAL_UTXO_NOT_PROTX;
+        }
+    }
+
     nHeightRet = coin.nHeight;
     return COLLATERAL_OK;
 }
@@ -554,6 +570,11 @@ bool CMasternodeBroadcast::CheckOutpoint(int& nDos)
         return false;
     }
 
+    if (err == COLLATERAL_UTXO_NOT_PROTX) {
+        LogPrint("masternode", "CMasternodeBroadcast::CheckOutpoint -- Masternode UTXO should be a ProTx, masternode=%s\n", outpoint.ToStringShort());
+        return false;
+    }
+
     if (err == COLLATERAL_INVALID_AMOUNT) {
         LogPrint("masternode", "CMasternodeBroadcast::CheckOutpoint -- Masternode UTXO should have 1000 DASH, masternode=%s\n", outpoint.ToStringShort());
         nDos = 33;
diff --git a/src/masternode.h b/src/masternode.h
index 6b60b93e18f5..5c035f63de21 100644
--- a/src/masternode.h
+++ b/src/masternode.h
@@ -190,7 +190,8 @@ class CMasternode : public masternode_info_t
         COLLATERAL_OK,
         COLLATERAL_UTXO_NOT_FOUND,
         COLLATERAL_INVALID_AMOUNT,
-        COLLATERAL_INVALID_PUBKEY
+        COLLATERAL_INVALID_PUBKEY,
+        COLLATERAL_UTXO_NOT_PROTX,
     };
 
 

From 5e3abeca24a84513c0bdfa3ae3074cecaa4f36d6 Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Sat, 3 Mar 2018 21:48:00 +0100
Subject: [PATCH 081/400] Implement "protx list" RPC

---
 src/rpc/rpcevo.cpp    | 134 ++++++++++++++++++++++++++++++++++++++++++
 src/wallet/wallet.cpp |  13 ++++
 src/wallet/wallet.h   |   1 +
 3 files changed, 148 insertions(+)

diff --git a/src/rpc/rpcevo.cpp b/src/rpc/rpcevo.cpp
index 079cf1130f27..886cc78ebb12 100644
--- a/src/rpc/rpcevo.cpp
+++ b/src/rpc/rpcevo.cpp
@@ -19,6 +19,7 @@
 
 #include "evo/specialtx.h"
 #include "evo/providertx.h"
+#include "evo/deterministicmns.h"
 
 #ifdef ENABLE_WALLET
 extern UniValue signrawtransaction(const JSONRPCRequest& request);
@@ -239,6 +240,136 @@ UniValue protx_register(const JSONRPCRequest& request)
     return SignAndSendSpecialTx(tx);
 }
 
+void protx_list_help()
+{
+    throw std::runtime_error(
+            "protx list (\"type\")\n"
+            "\nLists all ProTxs in your wallet or on-chain, depending on the given type. If \"type\" is not\n"
+            "specified, it defaults to \"wallet\". All types have the optional argument \"detailed\" which if set to\n"
+            "\"true\" will result in a detailed list to be returned. If set to \"false\", only the hashes of the ProTx\n"
+            "will be returned.\n"
+            "\nAvailable types:\n"
+            "  wallet (detailed)              - List only ProTx which are found in your wallet. This will also include ProTx which\n"
+            "                                   failed PoSe verfication\n"
+            "  valid (height) (detailed)      - List only ProTx which are active/valid at the given chain height. If height is not\n"
+            "                                   specified, it defaults to the current chain-tip\n"
+            "  registered (height) (detaileD) - List all ProTx which are registered at the given chain height. If height is not\n"
+            "                                   specified, it defaults to the current chain-tip. This will also include ProTx\n"
+            "                                   which failed PoSe verification at that height\n"
+    );
+}
+
+static bool CheckWalletOwnsScript(const CScript& script) {
+    CTxDestination dest;
+    if (ExtractDestination(script, dest)) {
+        if ((boost::get<CKeyID>(&dest) && pwalletMain->HaveKey(*boost::get<CKeyID>(&dest))) || (boost::get<CScriptID>(&dest) && pwalletMain->HaveCScript(*boost::get<CScriptID>(&dest)))) {
+            return true;
+        }
+    }
+    return false;
+}
+
+UniValue BuildDMNListEntry(const CDeterministicMNCPtr& dmn, bool detailed)
+{
+    if (!detailed)
+        return dmn->proTxHash.ToString();
+
+    UniValue o(UniValue::VOBJ);
+
+    dmn->ToJson(o);
+
+    int confirmations = GetUTXOConfirmations(COutPoint(dmn->proTxHash, dmn->nCollateralIndex));
+    o.push_back(Pair("confirmations", confirmations));
+
+    bool hasOwnerKey = pwalletMain->HaveKey(dmn->pdmnState->keyIDOwner);
+    bool hasOperatorKey = pwalletMain->HaveKey(dmn->pdmnState->keyIDOperator);
+    bool hasVotingKey = pwalletMain->HaveKey(dmn->pdmnState->keyIDVoting);
+
+    bool ownsCollateral = false;
+    CTransactionRef collateralTx;
+    uint256 tmpHashBlock;
+    if (GetTransaction(dmn->proTxHash, collateralTx, Params().GetConsensus(), tmpHashBlock)) {
+        ownsCollateral = CheckWalletOwnsScript(collateralTx->vout[dmn->nCollateralIndex].scriptPubKey);
+    }
+
+    UniValue walletObj(UniValue::VOBJ);
+    walletObj.push_back(Pair("hasOwnerKey", hasOwnerKey));
+    walletObj.push_back(Pair("hasOperatorKey", hasOperatorKey));
+    walletObj.push_back(Pair("hasVotingKey", hasVotingKey));
+    walletObj.push_back(Pair("ownsCollateral", ownsCollateral));
+    walletObj.push_back(Pair("ownsPayeeScript", CheckWalletOwnsScript(dmn->pdmnState->scriptPayout)));
+    walletObj.push_back(Pair("ownsOperatorRewardScript", CheckWalletOwnsScript(dmn->pdmnState->scriptOperatorPayout)));
+    o.push_back(Pair("wallet", walletObj));
+
+    return o;
+}
+
+UniValue protx_list(const JSONRPCRequest& request)
+{
+    if (request.fHelp)
+        protx_list_help();
+
+    std::string type = "wallet";
+    if (request.params.size() > 1)
+        type = request.params[1].get_str();
+
+    UniValue ret(UniValue::VARR);
+
+    LOCK2(cs_main, pwalletMain->cs_wallet);
+
+    if (type == "wallet") {
+        if (request.params.size() > 3)
+            protx_list_help();
+
+        bool detailed = request.params.size() > 2 ? ParseBoolV(request.params[2], "detailed") : false;
+
+        std::vector<COutPoint> vOutpts;
+        pwalletMain->ListProTxCoins(vOutpts);
+        std::set<uint256> setOutpts;
+        for (const auto& outpt : vOutpts) {
+            setOutpts.emplace(outpt.hash);
+        }
+
+        for (const auto& dmn : deterministicMNManager->GetListAtChainTip().all_range()) {
+            if (setOutpts.count(dmn->proTxHash) ||
+                    pwalletMain->HaveKey(dmn->pdmnState->keyIDOwner) ||
+                    pwalletMain->HaveKey(dmn->pdmnState->keyIDOperator) ||
+                    pwalletMain->HaveKey(dmn->pdmnState->keyIDVoting) ||
+                    CheckWalletOwnsScript(dmn->pdmnState->scriptPayout) ||
+                    CheckWalletOwnsScript(dmn->pdmnState->scriptOperatorPayout)) {
+                ret.push_back(BuildDMNListEntry(dmn, detailed));
+            }
+        }
+    } else if (type == "valid" || type == "registered") {
+        if (request.params.size() > 4)
+            protx_list_help();
+
+        LOCK(cs_main);
+
+        int height = request.params.size() > 2 ? ParseInt32V(request.params[2], "height") : chainActive.Height();
+        if (height < 1 || height > chainActive.Height())
+            throw JSONRPCError(RPC_INVALID_PARAMETER, "invalid height specified");
+
+        bool detailed = request.params.size() > 3 ? ParseBoolV(request.params[3], "detailed") : false;
+
+        CDeterministicMNList mnList = deterministicMNManager->GetListForBlock(chainActive[height]->GetBlockHash());
+        CDeterministicMNList::range_type range;
+
+        if (type == "valid") {
+            range = mnList.valid_range();
+        } else if (type == "registered") {
+            range = mnList.all_range();
+        }
+        for (const auto& dmn : range) {
+            ret.push_back(BuildDMNListEntry(dmn, detailed));
+        }
+    } else {
+        throw JSONRPCError(RPC_INVALID_PARAMETER, "invalid type specified");
+    }
+
+    return ret;
+}
+
 UniValue protx(const JSONRPCRequest& request)
 {
     if (request.params.empty()) {
@@ -250,6 +381,7 @@ UniValue protx(const JSONRPCRequest& request)
                 "1. \"command\"        (string, required) The command to execute\n"
                 "\nAvailable commands:\n"
                 "  register    - Create and send ProTx to network\n"
+                "  list        - List ProTxs\n"
         );
     }
 
@@ -257,6 +389,8 @@ UniValue protx(const JSONRPCRequest& request)
 
     if (command == "register") {
         return protx_register(request);
+    } else if (command == "list") {
+        return protx_list(request);
     } else {
         throw std::runtime_error("invalid command: " + command);
     }
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
index 42c54df669d9..e4bf343a6dab 100644
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -4636,6 +4636,19 @@ void CWallet::ListLockedCoins(std::vector<COutPoint>& vOutpts)
     }
 }
 
+void CWallet::ListProTxCoins(std::vector<COutPoint>& vOutpts)
+{
+    AssertLockHeld(cs_wallet);
+    for (const auto &o : setWalletUTXO) {
+        if (mapWallet.count(o.hash)) {
+            const auto &p = mapWallet[o.hash];
+            if (IsProTxCollateral(*p.tx, o.n)) {
+                vOutpts.emplace_back(o);
+            }
+        }
+    }
+}
+
 /** @} */ // end of Actions
 
 class CAffectedKeysVisitor : public boost::static_visitor<void> {
diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h
index 2fe6be7314af..27dd22ef1859 100644
--- a/src/wallet/wallet.h
+++ b/src/wallet/wallet.h
@@ -834,6 +834,7 @@ class CWallet : public CCryptoKeyStore, public CValidationInterface
     void UnlockCoin(const COutPoint& output);
     void UnlockAllCoins();
     void ListLockedCoins(std::vector<COutPoint>& vOutpts);
+    void ListProTxCoins(std::vector<COutPoint>& vOutpts);
 
     /**
      * keystore implementation

From c566ce75d9bc44eaeffa9c522cc975717b43aeb5 Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Thu, 30 Aug 2018 19:46:43 +0200
Subject: [PATCH 082/400] Update copyright in specialtx.h/cpp

---
 src/evo/specialtx.cpp | 2 +-
 src/evo/specialtx.h   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/evo/specialtx.cpp b/src/evo/specialtx.cpp
index f5de5bdf8412..584321a160d5 100644
--- a/src/evo/specialtx.cpp
+++ b/src/evo/specialtx.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2017 The Dash Core developers
+// Copyright (c) 2018 The Dash Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/evo/specialtx.h b/src/evo/specialtx.h
index bd761720f9ac..2d900da534c7 100644
--- a/src/evo/specialtx.h
+++ b/src/evo/specialtx.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2017 The Dash Core developers
+// Copyright (c) 2018 The Dash Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 

From 5295c78cca8f38ca2347957f457d3a73e0391ce9 Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Fri, 31 Aug 2018 11:33:37 +0200
Subject: [PATCH 083/400] Fix typo in "penalty" (#2247)

---
 src/evo/deterministicmns.cpp | 6 +++---
 src/evo/deterministicmns.h   | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/evo/deterministicmns.cpp b/src/evo/deterministicmns.cpp
index 5300b2640153..e649da0fe402 100644
--- a/src/evo/deterministicmns.cpp
+++ b/src/evo/deterministicmns.cpp
@@ -32,9 +32,9 @@ std::string CDeterministicMNState::ToString() const
         operatorRewardAddress = CBitcoinAddress(dest).ToString();
     }
 
-    return strprintf("CDeterministicMNState(nRegisteredHeight=%d, nLastPaidHeight=%d, nPoSePenality=%d, nPoSeRevivedHeight=%d, nPoSeBanHeight=%d, "
+    return strprintf("CDeterministicMNState(nRegisteredHeight=%d, nLastPaidHeight=%d, nPoSePenalty=%d, nPoSeRevivedHeight=%d, nPoSeBanHeight=%d, "
                      "keyIDOwner=%s, keyIDOperator=%s, keyIDVoting=%s, addr=%s, nProtocolVersion=%d, payoutAddress=%s, operatorRewardAddress=%s)",
-                     nRegisteredHeight, nLastPaidHeight, nPoSePenality, nPoSeRevivedHeight, nPoSeBanHeight,
+                     nRegisteredHeight, nLastPaidHeight, nPoSePenalty, nPoSeRevivedHeight, nPoSeBanHeight,
                      keyIDOwner.ToString(), keyIDOperator.ToString(), keyIDVoting.ToString(), addr.ToStringIPPort(false), nProtocolVersion, payoutAddress, operatorRewardAddress);
 }
 
@@ -44,7 +44,7 @@ void CDeterministicMNState::ToJson(UniValue& obj) const
     obj.setObject();
     obj.push_back(Pair("registeredHeight", nRegisteredHeight));
     obj.push_back(Pair("lastPaidHeight", nLastPaidHeight));
-    obj.push_back(Pair("PoSePenality", nPoSePenality));
+    obj.push_back(Pair("PoSePenalty", nPoSePenalty));
     obj.push_back(Pair("PoSeRevivedHeight", nPoSeRevivedHeight));
     obj.push_back(Pair("PoSeBanHeight", nPoSeBanHeight));
     obj.push_back(Pair("keyIDOwner", keyIDOwner.ToString()));
diff --git a/src/evo/deterministicmns.h b/src/evo/deterministicmns.h
index 5a84095807fb..ee0551fd2bae 100644
--- a/src/evo/deterministicmns.h
+++ b/src/evo/deterministicmns.h
@@ -27,7 +27,7 @@ class CDeterministicMNState
 public:
     int nRegisteredHeight{-1};
     int nLastPaidHeight{0};
-    int nPoSePenality{0};
+    int nPoSePenalty{0};
     int nPoSeRevivedHeight{-1};
     int nPoSeBanHeight{-1};
 
@@ -60,7 +60,7 @@ class CDeterministicMNState
     {
         READWRITE(nRegisteredHeight);
         READWRITE(nLastPaidHeight);
-        READWRITE(nPoSePenality);
+        READWRITE(nPoSePenalty);
         READWRITE(nPoSeRevivedHeight);
         READWRITE(nPoSeBanHeight);
         READWRITE(keyIDOwner);
@@ -76,7 +76,7 @@ class CDeterministicMNState
     {
         return nRegisteredHeight == rhs.nRegisteredHeight &&
                nLastPaidHeight == rhs.nLastPaidHeight &&
-               nPoSePenality == rhs.nPoSePenality &&
+               nPoSePenalty == rhs.nPoSePenalty &&
                nPoSeRevivedHeight == rhs.nPoSeRevivedHeight &&
                nPoSeBanHeight == rhs.nPoSeBanHeight &&
                keyIDOwner == rhs.keyIDOwner &&

From 25545fc1e7e2372c7493d74048db7508bbf5099d Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Fri, 31 Aug 2018 15:31:59 +0200
Subject: [PATCH 084/400] Split keyIDMasternode into
 keyIDOwner/keyIDOperator/keyIDVoting (#2248)

* Split keyIDMasternode into keyIDOwner/keyIDOperator/keyIDVoting

keyIDOwner is the key used for things which should stay in control of the
collateral owner, like proposal voting.

keyIDOperator is the key used for operational things, like signing network
messages, signing trigger/watchdog objects and trigger votes.

keyIDVoting is the key used for proposal voting

Legacy masternodes will always have the same key for all 3 to keep
compatibility.

Using different keys is only allowed after spork15 activation.

* Forbid reusing collateral keys for operator/owner keys and vice versa

* Bump SERIALIZATION_VERSION_STRING in CMasternodeMan
---
 src/activemasternode.cpp    | 10 ++++-----
 src/activemasternode.h      |  4 ++--
 src/evo/providertx.cpp      | 10 +++++++++
 src/governance-object.cpp   | 28 ++++++++++++-----------
 src/governance-object.h     |  4 ++--
 src/governance-vote.cpp     | 24 ++++++++++----------
 src/governance-vote.h       |  8 +++----
 src/governance.cpp          |  5 ++++-
 src/init.cpp                |  6 ++---
 src/instantx.cpp            | 14 ++++++------
 src/masternode-payments.cpp | 18 +++++++--------
 src/masternode-payments.h   |  2 +-
 src/masternode.cpp          | 40 +++++++++++++++++----------------
 src/masternode.h            | 22 ++++++++++++-------
 src/masternodeman.cpp       | 44 ++++++++++++++++++-------------------
 src/masternodeman.h         |  6 ++---
 src/net_processing.cpp      |  2 +-
 src/privatesend-client.cpp  |  2 +-
 src/privatesend-server.cpp  |  2 +-
 src/privatesend.cpp         | 28 +++++++++++------------
 src/privatesend.h           |  4 ++--
 src/rpc/governance.cpp      | 28 ++++++++++++++++-------
 src/rpc/masternode.cpp      | 12 +++++++---
 23 files changed, 181 insertions(+), 142 deletions(-)

diff --git a/src/activemasternode.cpp b/src/activemasternode.cpp
index c221dae07bc5..662032558cdb 100644
--- a/src/activemasternode.cpp
+++ b/src/activemasternode.cpp
@@ -100,7 +100,7 @@ bool CActiveLegacyMasternodeManager::SendMasternodePing(CConnman& connman)
     mnp.nSentinelVersion = nSentinelVersion;
     mnp.fSentinelIsCurrent =
             (abs(GetAdjustedTime() - nSentinelPingTime) < MASTERNODE_SENTINEL_PING_MAX_SECONDS);
-    if(!mnp.Sign(activeMasternodeInfo.keyMasternode, activeMasternodeInfo.keyIDMasternode)) {
+    if(!mnp.Sign(activeMasternodeInfo.keyOperator, activeMasternodeInfo.keyIDOperator)) {
         LogPrintf("CActiveLegacyMasternodeManager::SendMasternodePing -- ERROR: Couldn't sign Masternode Ping\n");
         return false;
     }
@@ -210,12 +210,12 @@ void CActiveLegacyMasternodeManager::ManageStateInitial(CConnman& connman)
 
 void CActiveLegacyMasternodeManager::ManageStateRemote()
 {
-    LogPrint("masternode", "CActiveLegacyMasternodeManager::ManageStateRemote -- Start status = %s, type = %s, pinger enabled = %d, keyIDMasternode = %s\n",
-             GetStatus(), GetTypeString(), fPingerEnabled, activeMasternodeInfo.keyIDMasternode.ToString());
+    LogPrint("masternode", "CActiveLegacyMasternodeManager::ManageStateRemote -- Start status = %s, type = %s, pinger enabled = %d, keyIDOperator = %s\n",
+             GetStatus(), GetTypeString(), fPingerEnabled, activeMasternodeInfo.keyIDOperator.ToString());
 
-    mnodeman.CheckMasternode(activeMasternodeInfo.keyIDMasternode, true);
+    mnodeman.CheckMasternode(activeMasternodeInfo.keyIDOperator, true);
     masternode_info_t infoMn;
-    if(mnodeman.GetMasternodeInfo(activeMasternodeInfo.keyIDMasternode, infoMn)) {
+    if(mnodeman.GetMasternodeInfo(activeMasternodeInfo.keyIDOperator, infoMn)) {
         if(infoMn.nProtocolVersion != PROTOCOL_VERSION) {
             nState = ACTIVE_MASTERNODE_NOT_CAPABLE;
             strNotCapableReason = "Invalid protocol version";
diff --git a/src/activemasternode.h b/src/activemasternode.h
index 4189be734b95..f6a17150d623 100644
--- a/src/activemasternode.h
+++ b/src/activemasternode.h
@@ -24,8 +24,8 @@ extern CActiveLegacyMasternodeManager legacyActiveMasternodeManager;
 
 struct CActiveMasternodeInfo {
     // Keys for the active Masternode
-    CKeyID keyIDMasternode;
-    CKey keyMasternode;
+    CKeyID keyIDOperator;
+    CKey keyOperator;
 
     // Initialized while registering Masternode
     COutPoint outpoint;
diff --git a/src/evo/providertx.cpp b/src/evo/providertx.cpp
index b9f0497cf264..de2a3e315200 100644
--- a/src/evo/providertx.cpp
+++ b/src/evo/providertx.cpp
@@ -76,6 +76,16 @@ bool CheckProRegTx(const CTransaction& tx, const CBlockIndex* pindexPrev, CValid
     if (!ptx.scriptPayout.IsPayToPublicKeyHash())
         return state.DoS(10, false, REJECT_INVALID, "bad-protx-payee");
 
+    CTxDestination payoutDest;
+    if (!ExtractDestination(ptx.scriptPayout, payoutDest)) {
+        // should not happen as we checked script types before
+        return state.DoS(10, false, REJECT_INVALID, "bad-protx-payee-dest");
+    }
+    // don't allow reuse of collateral key for other keys (don't allow people to put the collateral key onto an online server)
+    if (payoutDest == CTxDestination(ptx.keyIDOwner) || payoutDest == CTxDestination(ptx.keyIDOperator) || payoutDest == CTxDestination(ptx.keyIDVoting)) {
+        return state.DoS(10, false, REJECT_INVALID, "bad-protx-payee-reuse");
+    }
+
     // This is a temporary restriction that will be lifted later
     // It is required while we are transitioning from the old MN list to the deterministic list
     if (tx.vout[ptx.nCollateralIndex].scriptPubKey != ptx.scriptPayout)
diff --git a/src/governance-object.cpp b/src/governance-object.cpp
index 1f5bbc9f2cdc..0fd2d876b00b 100644
--- a/src/governance-object.cpp
+++ b/src/governance-object.cpp
@@ -177,8 +177,10 @@ bool CGovernanceObject::ProcessVote(CNode* pfrom,
         }
     }
 
+    bool onlyOwnerAllowed = nObjectType == GOVERNANCE_OBJECT_PROPOSAL;
+
     // Finally check that the vote is actually valid (done last because of cost of signature verification)
-    if(!vote.IsValid(true)) {
+    if(!vote.IsValid(onlyOwnerAllowed)) {
         std::ostringstream ostr;
         ostr << "CGovernanceObject::ProcessVote -- Invalid vote"
                 << ", MN outpoint = " << vote.GetMasternodeOutpoint().ToStringShort()
@@ -265,53 +267,53 @@ void CGovernanceObject::SetMasternodeOutpoint(const COutPoint& outpoint)
     masternodeOutpoint = outpoint;
 }
 
-bool CGovernanceObject::Sign(const CKey& keyMasternode, const CKeyID& keyIDMasternode)
+bool CGovernanceObject::Sign(const CKey& key, const CKeyID& keyID)
 {
     std::string strError;
 
     if (sporkManager.IsSporkActive(SPORK_6_NEW_SIGS)) {
         uint256 hash = GetSignatureHash();
 
-        if (!CHashSigner::SignHash(hash, keyMasternode, vchSig)) {
+        if (!CHashSigner::SignHash(hash, key, vchSig)) {
             LogPrintf("CGovernanceObject::Sign -- SignHash() failed\n");
             return false;
         }
 
-        if (!CHashSigner::VerifyHash(hash, keyIDMasternode, vchSig, strError)) {
+        if (!CHashSigner::VerifyHash(hash, keyID, vchSig, strError)) {
             LogPrintf("CGovernanceObject::Sign -- VerifyHash() failed, error: %s\n", strError);
             return false;
         }
     } else {
         std::string strMessage = GetSignatureMessage();
-        if (!CMessageSigner::SignMessage(strMessage, vchSig, keyMasternode)) {
+        if (!CMessageSigner::SignMessage(strMessage, vchSig, key)) {
             LogPrintf("CGovernanceObject::Sign -- SignMessage() failed\n");
             return false;
         }
 
-        if(!CMessageSigner::VerifyMessage(keyIDMasternode, vchSig, strMessage, strError)) {
+        if(!CMessageSigner::VerifyMessage(keyID, vchSig, strMessage, strError)) {
             LogPrintf("CGovernanceObject::Sign -- VerifyMessage() failed, error: %s\n", strError);
             return false;
         }
     }
 
     LogPrint("gobject", "CGovernanceObject::Sign -- pubkey id = %s, masternode = %s\n",
-             keyIDMasternode.ToString(), masternodeOutpoint.ToStringShort());
+             keyID.ToString(), masternodeOutpoint.ToStringShort());
 
     return true;
 }
 
-bool CGovernanceObject::CheckSignature(const CKeyID& keyIDMasternode) const
+bool CGovernanceObject::CheckSignature(const CKeyID& keyID) const
 {
     std::string strError;
 
     if (sporkManager.IsSporkActive(SPORK_6_NEW_SIGS)) {
         uint256 hash = GetSignatureHash();
 
-        if (!CHashSigner::VerifyHash(hash, keyIDMasternode, vchSig, strError)) {
+        if (!CHashSigner::VerifyHash(hash, keyID, vchSig, strError)) {
             // could be an old object
             std::string strMessage = GetSignatureMessage();
 
-            if(!CMessageSigner::VerifyMessage(keyIDMasternode, vchSig, strMessage, strError)) {
+            if(!CMessageSigner::VerifyMessage(keyID, vchSig, strMessage, strError)) {
                 // nope, not in old format either
                 LogPrintf("CGovernance::CheckSignature -- VerifyMessage() failed, error: %s\n", strError);
                 return false;
@@ -320,7 +322,7 @@ bool CGovernanceObject::CheckSignature(const CKeyID& keyIDMasternode) const
     } else {
         std::string strMessage = GetSignatureMessage();
 
-        if (!CMessageSigner::VerifyMessage(keyIDMasternode, vchSig, strMessage, strError)) {
+        if (!CMessageSigner::VerifyMessage(keyID, vchSig, strMessage, strError)) {
             LogPrintf("CGovernance::CheckSignature -- VerifyMessage() failed, error: %s\n", strError);
             return false;
         }
@@ -509,8 +511,8 @@ bool CGovernanceObject::IsValidLocally(std::string& strError, bool& fMissingMast
             }
 
             // Check that we have a valid MN signature
-            if (!CheckSignature(infoMn.keyIDMasternode)) {
-                strError = "Invalid masternode signature for: " + strOutpoint + ", pubkey id = " + infoMn.keyIDMasternode.ToString();
+            if (!CheckSignature(infoMn.keyIDOperator)) {
+                strError = "Invalid masternode signature for: " + strOutpoint + ", pubkey id = " + infoMn.keyIDOperator.ToString();
                 return false;
             }
 
diff --git a/src/governance-object.h b/src/governance-object.h
index 8738a1c99ae1..17f41f229078 100644
--- a/src/governance-object.h
+++ b/src/governance-object.h
@@ -251,8 +251,8 @@ class CGovernanceObject
     // Signature related functions
 
     void SetMasternodeOutpoint(const COutPoint& outpoint);
-    bool Sign(const CKey& keyMasternode, const CKeyID& keyIDMasternode);
-    bool CheckSignature(const CKeyID& keyIDMasternode) const;
+    bool Sign(const CKey& key, const CKeyID& keyID);
+    bool CheckSignature(const CKeyID& keyID) const;
 
     std::string GetSignatureMessage() const;
     uint256 GetSignatureHash() const;
diff --git a/src/governance-vote.cpp b/src/governance-vote.cpp
index 7d45fa9df46e..0dd0a382e515 100644
--- a/src/governance-vote.cpp
+++ b/src/governance-vote.cpp
@@ -152,19 +152,19 @@ uint256 CGovernanceVote::GetSignatureHash() const
     return SerializeHash(*this);
 }
 
-bool CGovernanceVote::Sign(const CKey& keyMasternode, const CKeyID& keyIDMasternode)
+bool CGovernanceVote::Sign(const CKey& key, const CKeyID& keyID)
 {
     std::string strError;
 
     if (sporkManager.IsSporkActive(SPORK_6_NEW_SIGS)) {
         uint256 hash = GetSignatureHash();
 
-        if(!CHashSigner::SignHash(hash, keyMasternode, vchSig)) {
+        if(!CHashSigner::SignHash(hash, key, vchSig)) {
             LogPrintf("CGovernanceVote::Sign -- SignHash() failed\n");
             return false;
         }
 
-        if (!CHashSigner::VerifyHash(hash, keyIDMasternode, vchSig, strError)) {
+        if (!CHashSigner::VerifyHash(hash, keyID, vchSig, strError)) {
             LogPrintf("CGovernanceVote::Sign -- VerifyHash() failed, error: %s\n", strError);
             return false;
         }
@@ -173,12 +173,12 @@ bool CGovernanceVote::Sign(const CKey& keyMasternode, const CKeyID& keyIDMastern
         std::string strMessage = masternodeOutpoint.ToStringShort() + "|" + nParentHash.ToString() + "|" +
             std::to_string(nVoteSignal) + "|" + std::to_string(nVoteOutcome) + "|" + std::to_string(nTime);
 
-        if(!CMessageSigner::SignMessage(strMessage, vchSig, keyMasternode)) {
+        if(!CMessageSigner::SignMessage(strMessage, vchSig, key)) {
             LogPrintf("CGovernanceVote::Sign -- SignMessage() failed\n");
             return false;
         }
 
-        if(!CMessageSigner::VerifyMessage(keyIDMasternode, vchSig, strMessage, strError)) {
+        if(!CMessageSigner::VerifyMessage(keyID, vchSig, strMessage, strError)) {
             LogPrintf("CGovernanceVote::Sign -- VerifyMessage() failed, error: %s\n", strError);
             return false;
         }
@@ -187,21 +187,21 @@ bool CGovernanceVote::Sign(const CKey& keyMasternode, const CKeyID& keyIDMastern
     return true;
 }
 
-bool CGovernanceVote::CheckSignature(const CKeyID& keyIDMasternode) const
+bool CGovernanceVote::CheckSignature(const CKeyID& keyID) const
 {
     std::string strError;
 
     if (sporkManager.IsSporkActive(SPORK_6_NEW_SIGS)) {
         uint256 hash = GetSignatureHash();
 
-        if (!CHashSigner::VerifyHash(hash, keyIDMasternode, vchSig, strError)) {
+        if (!CHashSigner::VerifyHash(hash, keyID, vchSig, strError)) {
             // could be a signature in old format
             std::string strMessage = masternodeOutpoint.ToStringShort() + "|" + nParentHash.ToString() + "|" +
                 std::to_string(nVoteSignal) + "|" +
                 std::to_string(nVoteOutcome) + "|" +
                 std::to_string(nTime);
 
-            if(!CMessageSigner::VerifyMessage(keyIDMasternode, vchSig, strMessage, strError)) {
+            if(!CMessageSigner::VerifyMessage(keyID, vchSig, strMessage, strError)) {
                 // nope, not in old format either
                 LogPrint("gobject", "CGovernanceVote::IsValid -- VerifyMessage() failed, error: %s\n", strError);
                 return false;
@@ -213,7 +213,7 @@ bool CGovernanceVote::CheckSignature(const CKeyID& keyIDMasternode) const
             std::to_string(nVoteOutcome) + "|" +
             std::to_string(nTime);
 
-        if(!CMessageSigner::VerifyMessage(keyIDMasternode, vchSig, strMessage, strError)) {
+        if(!CMessageSigner::VerifyMessage(keyID, vchSig, strMessage, strError)) {
             LogPrint("gobject", "CGovernanceVote::IsValid -- VerifyMessage() failed, error: %s\n", strError);
             return false;
         }
@@ -222,7 +222,7 @@ bool CGovernanceVote::CheckSignature(const CKeyID& keyIDMasternode) const
     return true;
 }
 
-bool CGovernanceVote::IsValid(bool fSignatureCheck) const
+bool CGovernanceVote::IsValid(bool useVotingKey) const
 {
     if(nTime > GetAdjustedTime() + (60*60)) {
         LogPrint("gobject", "CGovernanceVote::IsValid -- vote is too far ahead of current time - %s - nTime %lli - Max Time %lli\n", GetHash().ToString(), nTime, GetAdjustedTime() + (60*60));
@@ -249,9 +249,7 @@ bool CGovernanceVote::IsValid(bool fSignatureCheck) const
         return false;
     }
 
-    if(!fSignatureCheck) return true;
-
-    return CheckSignature(infoMn.keyIDMasternode);
+    return CheckSignature(useVotingKey ? infoMn.keyIDVoting : infoMn.keyIDOperator);
 }
 
 bool operator==(const CGovernanceVote& vote1, const CGovernanceVote& vote2)
diff --git a/src/governance-vote.h b/src/governance-vote.h
index 193ec26093be..8e168df65a45 100644
--- a/src/governance-vote.h
+++ b/src/governance-vote.h
@@ -47,7 +47,7 @@ class CGovernanceVoting
 };
 
 //
-// CGovernanceVote - Allow a masternode node to vote and broadcast throughout the network
+// CGovernanceVote - Allow a masternode to vote and broadcast throughout the network
 //
 
 class CGovernanceVote
@@ -90,9 +90,9 @@ class CGovernanceVote
 
     void SetSignature(const std::vector<unsigned char>& vchSigIn) { vchSig = vchSigIn; }
 
-    bool Sign(const CKey& keyMasternode, const CKeyID& keyIDMasternode);
-    bool CheckSignature(const CKeyID& keyIDMasternode) const;
-    bool IsValid(bool fSignatureCheck) const;
+    bool Sign(const CKey& key, const CKeyID& keyID);
+    bool CheckSignature(const CKeyID& keyID) const;
+    bool IsValid(bool useVotingKey) const;
     void Relay(CConnman& connman) const;
 
     std::string GetVoteString() const {
diff --git a/src/governance.cpp b/src/governance.cpp
index 53459b928ca1..f9f231f511df 100644
--- a/src/governance.cpp
+++ b/src/governance.cpp
@@ -684,7 +684,10 @@ void CGovernanceManager::SyncSingleObjAndItsVotes(CNode* pnode, const uint256& n
 
     for (const auto& vote : fileVotes.GetVotes()) {
         uint256 nVoteHash = vote.GetHash();
-        if(filter.contains(nVoteHash) || !vote.IsValid(true)) {
+
+        bool onlyOwnerAllowed = govobj.GetObjectType() == GOVERNANCE_OBJECT_PROPOSAL;
+
+        if(filter.contains(nVoteHash) || !vote.IsValid(onlyOwnerAllowed)) {
             continue;
         }
         pnode->PushInventory(CInv(MSG_GOVERNANCE_OBJECT_VOTE, nVoteHash));
diff --git a/src/init.cpp b/src/init.cpp
index 772cc7881cbb..8fbf91781177 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -1871,12 +1871,12 @@ bool AppInitMain(boost::thread_group& threadGroup, CScheduler& scheduler)
         std::string strMasterNodePrivKey = GetArg("-masternodeprivkey", "");
         if(!strMasterNodePrivKey.empty()) {
             CPubKey pubKeyMasternode;
-            if(!CMessageSigner::GetKeysFromSecret(strMasterNodePrivKey, activeMasternodeInfo.keyMasternode, pubKeyMasternode))
+            if(!CMessageSigner::GetKeysFromSecret(strMasterNodePrivKey, activeMasternodeInfo.keyOperator, pubKeyMasternode))
                 return InitError(_("Invalid masternodeprivkey. Please see documenation."));
 
-            activeMasternodeInfo.keyIDMasternode = pubKeyMasternode.GetID();
+            activeMasternodeInfo.keyIDOperator = pubKeyMasternode.GetID();
 
-            LogPrintf("  keyIDMasternode: %s\n", CBitcoinAddress(activeMasternodeInfo.keyIDMasternode).ToString());
+            LogPrintf("  keyIDOperator: %s\n", CBitcoinAddress(activeMasternodeInfo.keyIDOperator).ToString());
         } else {
             return InitError(_("You must specify a masternodeprivkey in the configuration. Please see documentation for help."));
         }
diff --git a/src/instantx.cpp b/src/instantx.cpp
index 7cdc274c01b7..dc5431684bb6 100644
--- a/src/instantx.cpp
+++ b/src/instantx.cpp
@@ -1059,10 +1059,10 @@ bool CTxLockVote::CheckSignature() const
     if (sporkManager.IsSporkActive(SPORK_6_NEW_SIGS)) {
         uint256 hash = GetSignatureHash();
 
-        if (!CHashSigner::VerifyHash(hash, infoMn.keyIDMasternode, vchMasternodeSignature, strError)) {
+        if (!CHashSigner::VerifyHash(hash, infoMn.keyIDOperator, vchMasternodeSignature, strError)) {
             // could be a signature in old format
             std::string strMessage = txHash.ToString() + outpoint.ToStringShort();
-        if(!CMessageSigner::VerifyMessage(infoMn.keyIDMasternode, vchMasternodeSignature, strMessage, strError)) {
+        if(!CMessageSigner::VerifyMessage(infoMn.keyIDOperator, vchMasternodeSignature, strMessage, strError)) {
                 // nope, not in old format either
                 LogPrintf("CTxLockVote::CheckSignature -- VerifyMessage() failed, error: %s\n", strError);
                 return false;
@@ -1070,7 +1070,7 @@ bool CTxLockVote::CheckSignature() const
         }
     } else {
         std::string strMessage = txHash.ToString() + outpoint.ToStringShort();
-        if(!CMessageSigner::VerifyMessage(infoMn.keyIDMasternode, vchMasternodeSignature, strMessage, strError)) {
+        if(!CMessageSigner::VerifyMessage(infoMn.keyIDOperator, vchMasternodeSignature, strMessage, strError)) {
             LogPrintf("CTxLockVote::CheckSignature -- VerifyMessage() failed, error: %s\n", strError);
             return false;
         }
@@ -1086,24 +1086,24 @@ bool CTxLockVote::Sign()
     if (sporkManager.IsSporkActive(SPORK_6_NEW_SIGS)) {
         uint256 hash = GetSignatureHash();
 
-        if(!CHashSigner::SignHash(hash, activeMasternodeInfo.keyMasternode, vchMasternodeSignature)) {
+        if(!CHashSigner::SignHash(hash, activeMasternodeInfo.keyOperator, vchMasternodeSignature)) {
             LogPrintf("CTxLockVote::Sign -- SignHash() failed\n");
             return false;
         }
 
-        if (!CHashSigner::VerifyHash(hash, activeMasternodeInfo.keyIDMasternode, vchMasternodeSignature, strError)) {
+        if (!CHashSigner::VerifyHash(hash, activeMasternodeInfo.keyIDOperator, vchMasternodeSignature, strError)) {
             LogPrintf("CTxLockVote::Sign -- VerifyHash() failed, error: %s\n", strError);
             return false;
         }
     } else {
         std::string strMessage = txHash.ToString() + outpoint.ToStringShort();
 
-        if(!CMessageSigner::SignMessage(strMessage, vchMasternodeSignature, activeMasternodeInfo.keyMasternode)) {
+        if(!CMessageSigner::SignMessage(strMessage, vchMasternodeSignature, activeMasternodeInfo.keyOperator)) {
             LogPrintf("CTxLockVote::Sign -- SignMessage() failed\n");
             return false;
         }
 
-        if(!CMessageSigner::VerifyMessage(activeMasternodeInfo.keyIDMasternode, vchMasternodeSignature, strMessage, strError)) {
+        if(!CMessageSigner::VerifyMessage(activeMasternodeInfo.keyIDOperator, vchMasternodeSignature, strMessage, strError)) {
             LogPrintf("CTxLockVote::Sign -- VerifyMessage() failed, error: %s\n", strError);
             return false;
         }
diff --git a/src/masternode-payments.cpp b/src/masternode-payments.cpp
index 5548f328e364..03b2b7d51f3b 100644
--- a/src/masternode-payments.cpp
+++ b/src/masternode-payments.cpp
@@ -420,7 +420,7 @@ void CMasternodePayments::ProcessMessage(CNode* pfrom, const std::string& strCom
         }
 
         int nDos = 0;
-        if(!vote.CheckSignature(mnInfo.keyIDMasternode, nCachedBlockHeight, nDos)) {
+        if(!vote.CheckSignature(mnInfo.keyIDOperator, nCachedBlockHeight, nDos)) {
             if(nDos) {
                 LOCK(cs_main);
                 LogPrintf("MASTERNODEPAYMENTVOTE -- ERROR: invalid signature\n");
@@ -480,12 +480,12 @@ bool CMasternodePaymentVote::Sign()
     if (sporkManager.IsSporkActive(SPORK_6_NEW_SIGS)) {
         uint256 hash = GetSignatureHash();
 
-        if(!CHashSigner::SignHash(hash, activeMasternodeInfo.keyMasternode, vchSig)) {
+        if(!CHashSigner::SignHash(hash, activeMasternodeInfo.keyOperator, vchSig)) {
             LogPrintf("CMasternodePaymentVote::%s -- SignHash() failed\n", __func__);
             return false;
         }
 
-        if (!CHashSigner::VerifyHash(hash, activeMasternodeInfo.keyIDMasternode, vchSig, strError)) {
+        if (!CHashSigner::VerifyHash(hash, activeMasternodeInfo.keyIDOperator, vchSig, strError)) {
             LogPrintf("CMasternodePaymentVote::%s -- VerifyHash() failed, error: %s\n", __func__, strError);
             return false;
         }
@@ -494,12 +494,12 @@ bool CMasternodePaymentVote::Sign()
                     std::to_string(nBlockHeight) +
                     ScriptToAsmStr(payee);
 
-        if(!CMessageSigner::SignMessage(strMessage, vchSig, activeMasternodeInfo.keyMasternode)) {
+        if(!CMessageSigner::SignMessage(strMessage, vchSig, activeMasternodeInfo.keyOperator)) {
             LogPrintf("CMasternodePaymentVote::%s -- SignMessage() failed\n", __func__);
             return false;
         }
 
-        if(!CMessageSigner::VerifyMessage(activeMasternodeInfo.keyIDMasternode, vchSig, strMessage, strError)) {
+        if(!CMessageSigner::VerifyMessage(activeMasternodeInfo.keyIDOperator, vchSig, strMessage, strError)) {
             LogPrintf("CMasternodePaymentVote::%s -- VerifyMessage() failed, error: %s\n", __func__, strError);
             return false;
         }
@@ -939,7 +939,7 @@ void CMasternodePaymentVote::Relay(CConnman& connman) const
     connman.RelayInv(inv);
 }
 
-bool CMasternodePaymentVote::CheckSignature(const CKeyID& keyIDMasternode, int nValidationHeight, int &nDos) const
+bool CMasternodePaymentVote::CheckSignature(const CKeyID& keyIDOperator, int nValidationHeight, int &nDos) const
 {
     // do not ban by default
     nDos = 0;
@@ -948,12 +948,12 @@ bool CMasternodePaymentVote::CheckSignature(const CKeyID& keyIDMasternode, int n
     if (sporkManager.IsSporkActive(SPORK_6_NEW_SIGS)) {
         uint256 hash = GetSignatureHash();
 
-        if (!CHashSigner::VerifyHash(hash, keyIDMasternode, vchSig, strError)) {
+        if (!CHashSigner::VerifyHash(hash, keyIDOperator, vchSig, strError)) {
             // could be a signature in old format
             std::string strMessage = masternodeOutpoint.ToStringShort() +
                         std::to_string(nBlockHeight) +
                         ScriptToAsmStr(payee);
-            if(!CMessageSigner::VerifyMessage(keyIDMasternode, vchSig, strMessage, strError)) {
+            if(!CMessageSigner::VerifyMessage(keyIDOperator, vchSig, strMessage, strError)) {
                 // nope, not in old format either
                 // Only ban for future block vote when we are already synced.
                 // Otherwise it could be the case when MN which signed this vote is using another key now
@@ -970,7 +970,7 @@ bool CMasternodePaymentVote::CheckSignature(const CKeyID& keyIDMasternode, int n
                     std::to_string(nBlockHeight) +
                     ScriptToAsmStr(payee);
 
-        if (!CMessageSigner::VerifyMessage(keyIDMasternode, vchSig, strMessage, strError)) {
+        if (!CMessageSigner::VerifyMessage(keyIDOperator, vchSig, strMessage, strError)) {
             // Only ban for future block vote when we are already synced.
             // Otherwise it could be the case when MN which signed this vote is using another key now
             // and we have no idea about the old one.
diff --git a/src/masternode-payments.h b/src/masternode-payments.h
index 93d25901627b..e5cc6698ba21 100644
--- a/src/masternode-payments.h
+++ b/src/masternode-payments.h
@@ -159,7 +159,7 @@ class CMasternodePaymentVote
     uint256 GetSignatureHash() const;
 
     bool Sign();
-    bool CheckSignature(const CKeyID& keyIDMasternode, int nValidationHeight, int &nDos) const;
+    bool CheckSignature(const CKeyID& keyIDOperator, int nValidationHeight, int &nDos) const;
 
     bool IsValid(CNode* pnode, int nValidationHeight, std::string& strError, CConnman& connman) const;
     void Relay(CConnman& connman) const;
diff --git a/src/masternode.cpp b/src/masternode.cpp
index 21e4202e7651..9c36865362d7 100644
--- a/src/masternode.cpp
+++ b/src/masternode.cpp
@@ -60,7 +60,9 @@ bool CMasternode::UpdateFromNewBroadcast(CMasternodeBroadcast& mnb, CConnman& co
     if(mnb.sigTime <= sigTime && !mnb.fRecovery) return false;
 
     pubKeyMasternode = mnb.pubKeyMasternode;
-    keyIDMasternode = mnb.pubKeyMasternode.GetID();
+    keyIDOwner = mnb.pubKeyMasternode.GetID();
+    keyIDOperator = mnb.pubKeyMasternode.GetID();
+    keyIDVoting = mnb.pubKeyMasternode.GetID();
     sigTime = mnb.sigTime;
     vchSig = mnb.vchSig;
     nProtocolVersion = mnb.nProtocolVersion;
@@ -74,7 +76,7 @@ bool CMasternode::UpdateFromNewBroadcast(CMasternodeBroadcast& mnb, CConnman& co
         mnodeman.mapSeenMasternodePing.insert(std::make_pair(lastPing.GetHash(), lastPing));
     }
     // if it matches our Masternode privkey...
-    if(fMasternodeMode && keyIDMasternode == activeMasternodeInfo.keyIDMasternode) {
+    if(fMasternodeMode && keyIDOperator == activeMasternodeInfo.keyIDOperator) {
         nPoSeBanScore = -MASTERNODE_POSE_BAN_MAX_SCORE;
         if(nProtocolVersion == PROTOCOL_VERSION) {
             // ... and PROTOCOL_VERSION, then we've been remotely activated ...
@@ -188,7 +190,7 @@ void CMasternode::Check(bool fForce)
     }
 
     int nActiveStatePrev = nActiveState;
-    bool fOurMasternode = fMasternodeMode && activeMasternodeInfo.keyIDMasternode == keyIDMasternode;
+    bool fOurMasternode = fMasternodeMode && activeMasternodeInfo.keyIDOperator == keyIDOperator;
 
                    // masternode doesn't meet payment protocol requirements ...
     bool fRequireUpdate = nProtocolVersion < mnpayments.GetMinMasternodePaymentsProto() ||
@@ -413,7 +415,7 @@ bool CMasternodeBroadcast::Create(const COutPoint& outpoint, const CService& ser
     // wait for reindex and/or import to finish
     if (fImporting || fReindex) return false;
 
-    LogPrint("masternode", "CMasternodeBroadcast::Create -- pubKeyCollateralAddressNew = %s, keyIDMasternode = %s\n",
+    LogPrint("masternode", "CMasternodeBroadcast::Create -- pubKeyCollateralAddressNew = %s, keyIDOperator = %s\n",
              CBitcoinAddress(pubKeyCollateralAddressNew.GetID()).ToString(),
              pubKeyMasternodeNew.GetID().ToString());
 
@@ -483,10 +485,10 @@ bool CMasternodeBroadcast::SimpleCheck(int& nDos)
     }
 
     CScript pubkeyScript2;
-    pubkeyScript2 = GetScriptForDestination(keyIDMasternode);
+    pubkeyScript2 = GetScriptForDestination(keyIDOperator);
 
     if(pubkeyScript2.size() != 25) {
-        LogPrintf("CMasternodeBroadcast::SimpleCheck -- keyIDMasternode has the wrong size\n");
+        LogPrintf("CMasternodeBroadcast::SimpleCheck -- keyIDOperator has the wrong size\n");
         nDos = 100;
         return false;
     }
@@ -540,7 +542,7 @@ bool CMasternodeBroadcast::Update(CMasternode* pmn, int& nDos, CConnman& connman
     }
 
     // if ther was no masternode broadcast recently or if it matches our Masternode privkey...
-    if(!pmn->IsBroadcastedWithin(MASTERNODE_MIN_MNB_SECONDS) || (fMasternodeMode && keyIDMasternode == activeMasternodeInfo.keyIDMasternode)) {
+    if(!pmn->IsBroadcastedWithin(MASTERNODE_MIN_MNB_SECONDS) || (fMasternodeMode && keyIDOperator == activeMasternodeInfo.keyIDOperator)) {
         // take the newest entry
         LogPrintf("CMasternodeBroadcast::Update -- Got UPDATED Masternode entry: addr=%s\n", addr.ToString());
         if(pmn->UpdateFromNewBroadcast(*this, connman)) {
@@ -557,7 +559,7 @@ bool CMasternodeBroadcast::CheckOutpoint(int& nDos)
 {
     // we are a masternode with the same outpoint (i.e. already activated) and this mnb is ours (matches our Masternode privkey)
     // so nothing to do here for us
-    if(fMasternodeMode && outpoint == activeMasternodeInfo.outpoint && keyIDMasternode == activeMasternodeInfo.keyIDMasternode) {
+    if(fMasternodeMode && outpoint == activeMasternodeInfo.outpoint && keyIDOperator == activeMasternodeInfo.keyIDOperator) {
         return false;
     }
 
@@ -663,7 +665,7 @@ bool CMasternodeBroadcast::Sign(const CKey& keyCollateralAddress)
         }
     } else {
         std::string strMessage = addr.ToString(false) + std::to_string(sigTime) +
-                        keyIDCollateralAddress.ToString() + keyIDMasternode.ToString() +
+                        keyIDCollateralAddress.ToString() + keyIDOperator.ToString() +
                         std::to_string(nProtocolVersion);
 
         if (!CMessageSigner::SignMessage(strMessage, vchSig, keyCollateralAddress)) {
@@ -691,7 +693,7 @@ bool CMasternodeBroadcast::CheckSignature(int& nDos) const
         if (!CHashSigner::VerifyHash(hash, keyIDCollateralAddress, vchSig, strError)) {
             // maybe it's in old format
             std::string strMessage = addr.ToString(false) + std::to_string(sigTime) +
-                            keyIDCollateralAddress.ToString() + keyIDMasternode.ToString() +
+                            keyIDCollateralAddress.ToString() + keyIDOperator.ToString() +
                             std::to_string(nProtocolVersion);
 
             if (!CMessageSigner::VerifyMessage(keyIDCollateralAddress, vchSig, strMessage, strError)){
@@ -703,7 +705,7 @@ bool CMasternodeBroadcast::CheckSignature(int& nDos) const
         }
     } else {
         std::string strMessage = addr.ToString(false) + std::to_string(sigTime) +
-                        keyIDCollateralAddress.ToString() + keyIDMasternode.ToString() +
+                        keyIDCollateralAddress.ToString() + keyIDOperator.ToString() +
                         std::to_string(nProtocolVersion);
 
         if(!CMessageSigner::VerifyMessage(keyIDCollateralAddress, vchSig, strMessage, strError)){
@@ -764,7 +766,7 @@ CMasternodePing::CMasternodePing(const COutPoint& outpoint)
     nDaemonVersion = CLIENT_VERSION;
 }
 
-bool CMasternodePing::Sign(const CKey& keyMasternode, const CKeyID& keyIDMasternode)
+bool CMasternodePing::Sign(const CKey& keyMasternode, const CKeyID& keyIDOperator)
 {
     std::string strError;
 
@@ -778,7 +780,7 @@ bool CMasternodePing::Sign(const CKey& keyMasternode, const CKeyID& keyIDMastern
             return false;
         }
 
-        if (!CHashSigner::VerifyHash(hash, keyIDMasternode, vchSig, strError)) {
+        if (!CHashSigner::VerifyHash(hash, keyIDOperator, vchSig, strError)) {
             LogPrintf("CMasternodePing::Sign -- VerifyHash() failed, error: %s\n", strError);
             return false;
         }
@@ -791,7 +793,7 @@ bool CMasternodePing::Sign(const CKey& keyMasternode, const CKeyID& keyIDMastern
             return false;
         }
 
-        if(!CMessageSigner::VerifyMessage(keyIDMasternode, vchSig, strMessage, strError)) {
+        if(!CMessageSigner::VerifyMessage(keyIDOperator, vchSig, strMessage, strError)) {
             LogPrintf("CMasternodePing::Sign -- VerifyMessage() failed, error: %s\n", strError);
             return false;
         }
@@ -800,7 +802,7 @@ bool CMasternodePing::Sign(const CKey& keyMasternode, const CKeyID& keyIDMastern
     return true;
 }
 
-bool CMasternodePing::CheckSignature(CKeyID& keyIDMasternode, int &nDos) const
+bool CMasternodePing::CheckSignature(CKeyID& keyIDOperator, int &nDos) const
 {
     std::string strError = "";
     nDos = 0;
@@ -808,11 +810,11 @@ bool CMasternodePing::CheckSignature(CKeyID& keyIDMasternode, int &nDos) const
     if (sporkManager.IsSporkActive(SPORK_6_NEW_SIGS)) {
         uint256 hash = GetSignatureHash();
 
-        if (!CHashSigner::VerifyHash(hash, keyIDMasternode, vchSig, strError)) {
+        if (!CHashSigner::VerifyHash(hash, keyIDOperator, vchSig, strError)) {
             std::string strMessage = CTxIn(masternodeOutpoint).ToString() + blockHash.ToString() +
                         std::to_string(sigTime);
 
-            if(!CMessageSigner::VerifyMessage(keyIDMasternode, vchSig, strMessage, strError)) {
+            if(!CMessageSigner::VerifyMessage(keyIDOperator, vchSig, strMessage, strError)) {
                 LogPrintf("CMasternodePing::CheckSignature -- Got bad Masternode ping signature, masternode=%s, error: %s\n", masternodeOutpoint.ToStringShort(), strError);
                 nDos = 33;
                 return false;
@@ -822,7 +824,7 @@ bool CMasternodePing::CheckSignature(CKeyID& keyIDMasternode, int &nDos) const
         std::string strMessage = CTxIn(masternodeOutpoint).ToString() + blockHash.ToString() +
                     std::to_string(sigTime);
 
-        if (!CMessageSigner::VerifyMessage(keyIDMasternode, vchSig, strMessage, strError)) {
+        if (!CMessageSigner::VerifyMessage(keyIDOperator, vchSig, strMessage, strError)) {
             LogPrintf("CMasternodePing::CheckSignature -- Got bad Masternode ping signature, masternode=%s, error: %s\n", masternodeOutpoint.ToStringShort(), strError);
             nDos = 33;
             return false;
@@ -906,7 +908,7 @@ bool CMasternodePing::CheckAndUpdate(CMasternode* pmn, bool fFromNewBroadcast, i
         return false;
     }
 
-    if (!CheckSignature(pmn->keyIDMasternode, nDos)) return false;
+    if (!CheckSignature(pmn->keyIDOperator, nDos)) return false;
 
     // so, ping seems to be ok
 
diff --git a/src/masternode.h b/src/masternode.h
index 5c035f63de21..09c6344265f1 100644
--- a/src/masternode.h
+++ b/src/masternode.h
@@ -95,8 +95,8 @@ class CMasternodePing
 
     bool IsExpired() const { return GetAdjustedTime() - sigTime > MASTERNODE_NEW_START_REQUIRED_SECONDS; }
 
-    bool Sign(const CKey& keyMasternode, const CKeyID& keyIDMasternode);
-    bool CheckSignature(CKeyID& keyIDMasternode, int &nDos) const;
+    bool Sign(const CKey& keyMasternode, const CKeyID& keyIDOperator);
+    bool CheckSignature(CKeyID& keyIDOperator, int &nDos) const;
     bool SimpleCheck(int& nDos);
     bool CheckAndUpdate(CMasternode* pmn, bool fFromNewBroadcast, int& nDos, CConnman& connman);
     void Relay(CConnman& connman);
@@ -136,15 +136,15 @@ struct masternode_info_t
                       CPubKey const& pkCollAddr, CPubKey const& pkMN) :
         nActiveState{activeState}, nProtocolVersion{protoVer}, sigTime{sTime},
         outpoint{outpnt}, addr{addr},
-        pubKeyCollateralAddress{pkCollAddr}, pubKeyMasternode{pkMN}, keyIDCollateralAddress{pkCollAddr.GetID()}, keyIDMasternode{pkMN.GetID()} {}
+        pubKeyCollateralAddress{pkCollAddr}, pubKeyMasternode{pkMN}, keyIDCollateralAddress{pkCollAddr.GetID()}, keyIDOwner{pkMN.GetID()}, keyIDOperator{pkMN.GetID()}, keyIDVoting{pkMN.GetID()} {}
 
     // only called when the network is in deterministic MN list mode
     masternode_info_t(int activeState, int protoVer, int64_t sTime,
                       COutPoint const& outpnt, CService const& addr,
-                      CKeyID const& pkCollAddr, CKeyID const& pkMN) :
+                      CKeyID const& pkCollAddr, CKeyID const& pkOwner, CKeyID const& pkOperator, CKeyID const& pkVoting) :
         nActiveState{activeState}, nProtocolVersion{protoVer}, sigTime{sTime},
         outpoint{outpnt}, addr{addr},
-        pubKeyCollateralAddress{}, pubKeyMasternode{}, keyIDCollateralAddress{pkCollAddr}, keyIDMasternode{pkMN} {}
+        pubKeyCollateralAddress{}, pubKeyMasternode{}, keyIDCollateralAddress{pkCollAddr}, keyIDOwner{pkOwner}, keyIDOperator{pkOperator}, keyIDVoting{pkVoting} {}
 
     int nActiveState = 0;
     int nProtocolVersion = 0;
@@ -155,7 +155,9 @@ struct masternode_info_t
     CPubKey pubKeyCollateralAddress{}; // this will be invalid/unset when the network switches to deterministic MNs (luckely it's only important for the broadcast hash)
     CPubKey pubKeyMasternode{}; // this will be invalid/unset when the network switches to deterministic MNs (luckely it's only important for the broadcast hash)
     CKeyID keyIDCollateralAddress{};
-    CKeyID keyIDMasternode{};
+    CKeyID keyIDOwner{};
+    CKeyID keyIDOperator{};
+    CKeyID keyIDVoting{};
 
     int64_t nLastDsq = 0; //the dsq count from the last dsq broadcast of this node
     int64_t nTimeLastChecked = 0;
@@ -237,7 +239,9 @@ class CMasternode : public masternode_info_t
         READWRITE(pubKeyCollateralAddress);
         READWRITE(pubKeyMasternode);
         READWRITE(keyIDCollateralAddress);
-        READWRITE(keyIDMasternode);
+        READWRITE(keyIDOwner);
+        READWRITE(keyIDOperator);
+        READWRITE(keyIDVoting);
         READWRITE(lastPing);
         READWRITE(vchSig);
         READWRITE(sigTime);
@@ -406,7 +410,9 @@ class CMasternodeBroadcast : public CMasternode
 
         if (ser_action.ForRead()) {
             keyIDCollateralAddress = pubKeyCollateralAddress.GetID();
-            keyIDMasternode = pubKeyMasternode.GetID();
+            keyIDOwner = pubKeyMasternode.GetID();
+            keyIDOperator = pubKeyMasternode.GetID();
+            keyIDVoting = pubKeyMasternode.GetID();
         }
     }
 
diff --git a/src/masternodeman.cpp b/src/masternodeman.cpp
index 386f2969e921..6f7df18b6cf8 100644
--- a/src/masternodeman.cpp
+++ b/src/masternodeman.cpp
@@ -25,7 +25,7 @@
 /** Masternode manager */
 CMasternodeMan mnodeman;
 
-const std::string CMasternodeMan::SERIALIZATION_VERSION_STRING = "CMasternodeMan-Version-9";
+const std::string CMasternodeMan::SERIALIZATION_VERSION_STRING = "CMasternodeMan-Version-10";
 const int CMasternodeMan::LAST_PAID_SCAN_BLOCKS = 100;
 
 struct CompareLastPaidBlock
@@ -471,10 +471,10 @@ bool CMasternodeMan::GetMasternodeInfo(const COutPoint& outpoint, masternode_inf
     return true;
 }
 
-bool CMasternodeMan::GetMasternodeInfo(const CKeyID& keyIDMasternode, masternode_info_t& mnInfoRet) {
+bool CMasternodeMan::GetMasternodeInfo(const CKeyID& keyIDOperator, masternode_info_t& mnInfoRet) {
     LOCK(cs);
     for (const auto& mnpair : mapMasternodes) {
-        if (mnpair.second.keyIDMasternode == keyIDMasternode) {
+        if (mnpair.second.keyIDOperator == keyIDOperator) {
             mnInfoRet = mnpair.second.GetInfo();
             return true;
         }
@@ -482,9 +482,9 @@ bool CMasternodeMan::GetMasternodeInfo(const CKeyID& keyIDMasternode, masternode
     return false;
 }
 
-bool CMasternodeMan::GetMasternodeInfo(const CPubKey& pubKeyMasternode, masternode_info_t& mnInfoRet)
+bool CMasternodeMan::GetMasternodeInfo(const CPubKey& pubKeyOperator, masternode_info_t& mnInfoRet)
 {
-    return GetMasternodeInfo(pubKeyMasternode.GetID(), mnInfoRet);
+    return GetMasternodeInfo(pubKeyOperator.GetID(), mnInfoRet);
 }
 
 bool CMasternodeMan::GetMasternodeInfo(const CScript& payee, masternode_info_t& mnInfoRet)
@@ -1206,24 +1206,24 @@ void CMasternodeMan::SendVerifyReply(CNode* pnode, CMasternodeVerification& mnv,
     if (sporkManager.IsSporkActive(SPORK_6_NEW_SIGS)) {
         uint256 hash = mnv.GetSignatureHash1(blockHash);
 
-        if(!CHashSigner::SignHash(hash, activeMasternodeInfo.keyMasternode, mnv.vchSig1)) {
+        if(!CHashSigner::SignHash(hash, activeMasternodeInfo.keyOperator, mnv.vchSig1)) {
             LogPrintf("CMasternodeMan::SendVerifyReply -- SignHash() failed\n");
             return;
         }
 
-        if (!CHashSigner::VerifyHash(hash, activeMasternodeInfo.keyIDMasternode, mnv.vchSig1, strError)) {
+        if (!CHashSigner::VerifyHash(hash, activeMasternodeInfo.keyIDOperator, mnv.vchSig1, strError)) {
             LogPrintf("CMasternodeMan::SendVerifyReply -- VerifyHash() failed, error: %s\n", strError);
             return;
         }
     } else {
         std::string strMessage = strprintf("%s%d%s", activeMasternodeInfo.service.ToString(false), mnv.nonce, blockHash.ToString());
 
-        if(!CMessageSigner::SignMessage(strMessage, mnv.vchSig1, activeMasternodeInfo.keyMasternode)) {
+        if(!CMessageSigner::SignMessage(strMessage, mnv.vchSig1, activeMasternodeInfo.keyOperator)) {
             LogPrintf("MasternodeMan::SendVerifyReply -- SignMessage() failed\n");
             return;
         }
 
-        if(!CMessageSigner::VerifyMessage(activeMasternodeInfo.keyIDMasternode, mnv.vchSig1, strMessage, strError)) {
+        if(!CMessageSigner::VerifyMessage(activeMasternodeInfo.keyIDOperator, mnv.vchSig1, strMessage, strError)) {
             LogPrintf("MasternodeMan::SendVerifyReply -- VerifyMessage() failed, error: %s\n", strError);
             return;
         }
@@ -1290,10 +1290,10 @@ void CMasternodeMan::ProcessVerifyReply(CNode* pnode, CMasternodeVerification& m
             if(CAddress(mnpair.second.addr, NODE_NETWORK) == pnode->addr) {
                 bool fFound = false;
                 if (sporkManager.IsSporkActive(SPORK_6_NEW_SIGS)) {
-                    fFound = CHashSigner::VerifyHash(hash1, mnpair.second.keyIDMasternode, mnv.vchSig1, strError);
+                    fFound = CHashSigner::VerifyHash(hash1, mnpair.second.keyIDOperator, mnv.vchSig1, strError);
                     // we don't care about mnv with signature in old format
                 } else {
-                    fFound = CMessageSigner::VerifyMessage(mnpair.second.keyIDMasternode, mnv.vchSig1, strMessage1, strError);
+                    fFound = CMessageSigner::VerifyMessage(mnpair.second.keyIDOperator, mnv.vchSig1, strMessage1, strError);
                 }
                 if (fFound) {
                     // found it!
@@ -1315,12 +1315,12 @@ void CMasternodeMan::ProcessVerifyReply(CNode* pnode, CMasternodeVerification& m
                     if (sporkManager.IsSporkActive(SPORK_6_NEW_SIGS)) {
                         uint256 hash2 = mnv.GetSignatureHash2(blockHash);
 
-                        if(!CHashSigner::SignHash(hash2, activeMasternodeInfo.keyMasternode, mnv.vchSig2)) {
+                        if(!CHashSigner::SignHash(hash2, activeMasternodeInfo.keyOperator, mnv.vchSig2)) {
                             LogPrintf("MasternodeMan::ProcessVerifyReply -- SignHash() failed\n");
                             return;
                         }
 
-                        if(!CHashSigner::VerifyHash(hash2, activeMasternodeInfo.keyIDMasternode, mnv.vchSig2, strError)) {
+                        if(!CHashSigner::VerifyHash(hash2, activeMasternodeInfo.keyIDOperator, mnv.vchSig2, strError)) {
                             LogPrintf("MasternodeMan::ProcessVerifyReply -- VerifyHash() failed, error: %s\n", strError);
                             return;
                         }
@@ -1328,12 +1328,12 @@ void CMasternodeMan::ProcessVerifyReply(CNode* pnode, CMasternodeVerification& m
                         std::string strMessage2 = strprintf("%s%d%s%s%s", mnv.addr.ToString(false), mnv.nonce, blockHash.ToString(),
                                                 mnv.masternodeOutpoint1.ToStringShort(), mnv.masternodeOutpoint2.ToStringShort());
 
-                        if(!CMessageSigner::SignMessage(strMessage2, mnv.vchSig2, activeMasternodeInfo.keyMasternode)) {
+                        if(!CMessageSigner::SignMessage(strMessage2, mnv.vchSig2, activeMasternodeInfo.keyOperator)) {
                             LogPrintf("MasternodeMan::ProcessVerifyReply -- SignMessage() failed\n");
                             return;
                         }
 
-                        if(!CMessageSigner::VerifyMessage(activeMasternodeInfo.keyIDMasternode, mnv.vchSig2, strMessage2, strError)) {
+                        if(!CMessageSigner::VerifyMessage(activeMasternodeInfo.keyIDOperator, mnv.vchSig2, strMessage2, strError)) {
                             LogPrintf("MasternodeMan::ProcessVerifyReply -- VerifyMessage() failed, error: %s\n", strError);
                             return;
                         }
@@ -1443,12 +1443,12 @@ void CMasternodeMan::ProcessVerifyBroadcast(CNode* pnode, const CMasternodeVerif
             uint256 hash1 = mnv.GetSignatureHash1(blockHash);
             uint256 hash2 = mnv.GetSignatureHash2(blockHash);
 
-            if(!CHashSigner::VerifyHash(hash1, pmn1->keyIDMasternode, mnv.vchSig1, strError)) {
+            if(!CHashSigner::VerifyHash(hash1, pmn1->keyIDOperator, mnv.vchSig1, strError)) {
                 LogPrintf("MasternodeMan::ProcessVerifyBroadcast -- VerifyHash() failed, error: %s\n", strError);
                 return;
             }
 
-            if(!CHashSigner::VerifyHash(hash2, pmn2->keyIDMasternode, mnv.vchSig2, strError)) {
+            if(!CHashSigner::VerifyHash(hash2, pmn2->keyIDOperator, mnv.vchSig2, strError)) {
                 LogPrintf("MasternodeMan::ProcessVerifyBroadcast -- VerifyHash() failed, error: %s\n", strError);
                 return;
             }
@@ -1457,12 +1457,12 @@ void CMasternodeMan::ProcessVerifyBroadcast(CNode* pnode, const CMasternodeVerif
             std::string strMessage2 = strprintf("%s%d%s%s%s", mnv.addr.ToString(false), mnv.nonce, blockHash.ToString(),
                                     mnv.masternodeOutpoint1.ToStringShort(), mnv.masternodeOutpoint2.ToStringShort());
 
-            if(!CMessageSigner::VerifyMessage(pmn1->keyIDMasternode, mnv.vchSig1, strMessage1, strError)) {
+            if(!CMessageSigner::VerifyMessage(pmn1->keyIDOperator, mnv.vchSig1, strMessage1, strError)) {
                 LogPrintf("CMasternodeMan::ProcessVerifyBroadcast -- VerifyMessage() for masternode1 failed, error: %s\n", strError);
                 return;
             }
 
-            if(!CMessageSigner::VerifyMessage(pmn2->keyIDMasternode, mnv.vchSig2, strMessage2, strError)) {
+            if(!CMessageSigner::VerifyMessage(pmn2->keyIDOperator, mnv.vchSig2, strMessage2, strError)) {
                 LogPrintf("CMasternodeMan::ProcessVerifyBroadcast -- VerifyMessage() for masternode2 failed, error: %s\n", strError);
                 return;
             }
@@ -1574,7 +1574,7 @@ bool CMasternodeMan::CheckMnbAndUpdateMasternodeList(CNode* pfrom, CMasternodeBr
         Add(mnb);
         masternodeSync.BumpAssetLastTime("CMasternodeMan::CheckMnbAndUpdateMasternodeList - new");
         // if it matches our Masternode privkey...
-        if(fMasternodeMode && mnb.keyIDMasternode == activeMasternodeInfo.keyIDMasternode) {
+        if(fMasternodeMode && mnb.keyIDOperator == activeMasternodeInfo.keyIDOperator) {
             mnb.nPoSeBanScore = -MASTERNODE_POSE_BAN_MAX_SCORE;
             if(mnb.nProtocolVersion == PROTOCOL_VERSION) {
                 // ... and PROTOCOL_VERSION, then we've been remotely activated ...
@@ -1650,11 +1650,11 @@ void CMasternodeMan::RemoveGovernanceObject(uint256 nGovernanceObjectHash)
     }
 }
 
-void CMasternodeMan::CheckMasternode(const CKeyID& keyIDMasternode, bool fForce)
+void CMasternodeMan::CheckMasternode(const CKeyID& keyIDOperator, bool fForce)
 {
     LOCK2(cs_main, cs);
     for (auto& mnpair : mapMasternodes) {
-        if (mnpair.second.keyIDMasternode == keyIDMasternode) {
+        if (mnpair.second.keyIDOperator == keyIDOperator) {
             mnpair.second.Check(fForce);
             return;
         }
diff --git a/src/masternodeman.h b/src/masternodeman.h
index e3bf617a1709..2a3520060f08 100644
--- a/src/masternodeman.h
+++ b/src/masternodeman.h
@@ -169,8 +169,8 @@ class CMasternodeMan
     bool Has(const COutPoint& outpoint);
 
     bool GetMasternodeInfo(const COutPoint& outpoint, masternode_info_t& mnInfoRet);
-    bool GetMasternodeInfo(const CKeyID& keyIDMasternode, masternode_info_t& mnInfoRet);
-    bool GetMasternodeInfo(const CPubKey& pubKeyMasternode, masternode_info_t& mnInfoRet);
+    bool GetMasternodeInfo(const CKeyID& keyIDOperator, masternode_info_t& mnInfoRet);
+    bool GetMasternodeInfo(const CPubKey& pubKeyOperator, masternode_info_t& mnInfoRet);
     bool GetMasternodeInfo(const CScript& payee, masternode_info_t& mnInfoRet);
 
     /// Find an entry in the masternode list that is next to be paid
@@ -230,7 +230,7 @@ class CMasternodeMan
     bool AddGovernanceVote(const COutPoint& outpoint, uint256 nGovernanceObjectHash);
     void RemoveGovernanceObject(uint256 nGovernanceObjectHash);
 
-    void CheckMasternode(const CKeyID& keyIDMasternode, bool fForce);
+    void CheckMasternode(const CKeyID& keyIDOperator, bool fForce);
 
     bool IsMasternodePingedWithin(const COutPoint& outpoint, int nSeconds, int64_t nTimeToCheckAt = -1);
     void SetMasternodeLastPing(const COutPoint& outpoint, const CMasternodePing& mnp);
diff --git a/src/net_processing.cpp b/src/net_processing.cpp
index 2373141cb74f..01c5d0321bc8 100644
--- a/src/net_processing.cpp
+++ b/src/net_processing.cpp
@@ -1977,7 +1977,7 @@ bool static ProcessMessage(CNode* pfrom, const std::string& strCommand, CDataStr
                 // we have no idea about (e.g we were offline)? How to handle them?
             }
 
-            if(!dstx.CheckSignature(mn.keyIDMasternode)) {
+            if(!dstx.CheckSignature(mn.keyIDOperator)) {
                 LogPrint("privatesend", "DSTX -- CheckSignature() failed for %s\n", hashTx.ToString());
                 return false;
             }
diff --git a/src/privatesend-client.cpp b/src/privatesend-client.cpp
index 253e7aae6a44..2cbbf4c66657 100644
--- a/src/privatesend-client.cpp
+++ b/src/privatesend-client.cpp
@@ -56,7 +56,7 @@ void CPrivateSendClient::ProcessMessage(CNode* pfrom, const std::string& strComm
         masternode_info_t infoMn;
         if(!mnodeman.GetMasternodeInfo(dsq.masternodeOutpoint, infoMn)) return;
 
-        if(!dsq.CheckSignature(infoMn.keyIDMasternode)) {
+        if(!dsq.CheckSignature(infoMn.keyIDOperator)) {
             // we probably have outdated info
             mnodeman.AskForMN(pfrom, dsq.masternodeOutpoint, connman);
             return;
diff --git a/src/privatesend-server.cpp b/src/privatesend-server.cpp
index 0b544466249a..e6f115a03db0 100644
--- a/src/privatesend-server.cpp
+++ b/src/privatesend-server.cpp
@@ -105,7 +105,7 @@ void CPrivateSendServer::ProcessMessage(CNode* pfrom, const std::string& strComm
         masternode_info_t mnInfo;
         if(!mnodeman.GetMasternodeInfo(dsq.masternodeOutpoint, mnInfo)) return;
 
-        if(!dsq.CheckSignature(mnInfo.keyIDMasternode)) {
+        if(!dsq.CheckSignature(mnInfo.keyIDOperator)) {
             // we probably have outdated info
             mnodeman.AskForMN(pfrom, dsq.masternodeOutpoint, connman);
             return;
diff --git a/src/privatesend.cpp b/src/privatesend.cpp
index 1d08836addba..25198a7ec2d9 100644
--- a/src/privatesend.cpp
+++ b/src/privatesend.cpp
@@ -47,12 +47,12 @@ bool CDarksendQueue::Sign()
     if (sporkManager.IsSporkActive(SPORK_6_NEW_SIGS)) {
         uint256 hash = GetSignatureHash();
 
-        if (!CHashSigner::SignHash(hash, activeMasternodeInfo.keyMasternode, vchSig)) {
+        if (!CHashSigner::SignHash(hash, activeMasternodeInfo.keyOperator, vchSig)) {
             LogPrintf("CDarksendQueue::Sign -- SignHash() failed\n");
             return false;
         }
 
-        if (!CHashSigner::VerifyHash(hash, activeMasternodeInfo.keyIDMasternode, vchSig, strError)) {
+        if (!CHashSigner::VerifyHash(hash, activeMasternodeInfo.keyIDOperator, vchSig, strError)) {
             LogPrintf("CDarksendQueue::Sign -- VerifyHash() failed, error: %s\n", strError);
             return false;
         }
@@ -62,12 +62,12 @@ bool CDarksendQueue::Sign()
                         std::to_string(nTime) +
                         std::to_string(fReady);
 
-        if(!CMessageSigner::SignMessage(strMessage, vchSig, activeMasternodeInfo.keyMasternode)) {
+        if(!CMessageSigner::SignMessage(strMessage, vchSig, activeMasternodeInfo.keyOperator)) {
             LogPrintf("CDarksendQueue::Sign -- SignMessage() failed, %s\n", ToString());
             return false;
         }
 
-        if(!CMessageSigner::VerifyMessage(activeMasternodeInfo.keyIDMasternode, vchSig, strMessage, strError)) {
+        if(!CMessageSigner::VerifyMessage(activeMasternodeInfo.keyIDOperator, vchSig, strMessage, strError)) {
             LogPrintf("CDarksendQueue::Sign -- VerifyMessage() failed, error: %s\n", strError);
             return false;
         }
@@ -76,14 +76,14 @@ bool CDarksendQueue::Sign()
     return true;
 }
 
-bool CDarksendQueue::CheckSignature(const CKeyID& keyIDMasternode) const
+bool CDarksendQueue::CheckSignature(const CKeyID& keyIDOperator) const
 {
     std::string strError = "";
 
     if (sporkManager.IsSporkActive(SPORK_6_NEW_SIGS)) {
         uint256 hash = GetSignatureHash();
 
-        if (!CHashSigner::VerifyHash(hash, keyIDMasternode, vchSig, strError)) {
+        if (!CHashSigner::VerifyHash(hash, keyIDOperator, vchSig, strError)) {
             // we don't care about queues with old signature format
             LogPrintf("CDarksendQueue::CheckSignature -- VerifyHash() failed, error: %s\n", strError);
             return false;
@@ -94,7 +94,7 @@ bool CDarksendQueue::CheckSignature(const CKeyID& keyIDMasternode) const
                         std::to_string(nTime) +
                         std::to_string(fReady);
 
-        if(!CMessageSigner::VerifyMessage(keyIDMasternode, vchSig, strMessage, strError)) {
+        if(!CMessageSigner::VerifyMessage(keyIDOperator, vchSig, strMessage, strError)) {
             LogPrintf("CDarksendQueue::CheckSignature -- Got bad Masternode queue signature: %s; error: %s\n", ToString(), strError);
             return false;
         }
@@ -127,24 +127,24 @@ bool CDarksendBroadcastTx::Sign()
     if (sporkManager.IsSporkActive(SPORK_6_NEW_SIGS)) {
         uint256 hash = GetSignatureHash();
 
-        if (!CHashSigner::SignHash(hash, activeMasternodeInfo.keyMasternode, vchSig)) {
+        if (!CHashSigner::SignHash(hash, activeMasternodeInfo.keyOperator, vchSig)) {
             LogPrintf("CDarksendBroadcastTx::Sign -- SignHash() failed\n");
             return false;
         }
 
-        if (!CHashSigner::VerifyHash(hash, activeMasternodeInfo.keyIDMasternode, vchSig, strError)) {
+        if (!CHashSigner::VerifyHash(hash, activeMasternodeInfo.keyIDOperator, vchSig, strError)) {
             LogPrintf("CDarksendBroadcastTx::Sign -- VerifyHash() failed, error: %s\n", strError);
             return false;
         }
     } else {
         std::string strMessage = tx->GetHash().ToString() + std::to_string(sigTime);
 
-        if(!CMessageSigner::SignMessage(strMessage, vchSig, activeMasternodeInfo.keyMasternode)) {
+        if(!CMessageSigner::SignMessage(strMessage, vchSig, activeMasternodeInfo.keyOperator)) {
             LogPrintf("CDarksendBroadcastTx::Sign -- SignMessage() failed\n");
             return false;
         }
 
-        if(!CMessageSigner::VerifyMessage(activeMasternodeInfo.keyIDMasternode, vchSig, strMessage, strError)) {
+        if(!CMessageSigner::VerifyMessage(activeMasternodeInfo.keyIDOperator, vchSig, strMessage, strError)) {
             LogPrintf("CDarksendBroadcastTx::Sign -- VerifyMessage() failed, error: %s\n", strError);
             return false;
         }
@@ -153,14 +153,14 @@ bool CDarksendBroadcastTx::Sign()
     return true;
 }
 
-bool CDarksendBroadcastTx::CheckSignature(const CKeyID& keyIDMasternode) const
+bool CDarksendBroadcastTx::CheckSignature(const CKeyID& keyIDOperator) const
 {
     std::string strError = "";
 
     if (sporkManager.IsSporkActive(SPORK_6_NEW_SIGS)) {
         uint256 hash = GetSignatureHash();
 
-        if (!CHashSigner::VerifyHash(hash, keyIDMasternode, vchSig, strError)) {
+        if (!CHashSigner::VerifyHash(hash, keyIDOperator, vchSig, strError)) {
             // we don't care about dstxes with old signature format
             LogPrintf("CDarksendBroadcastTx::CheckSignature -- VerifyHash() failed, error: %s\n", strError);
             return false;
@@ -168,7 +168,7 @@ bool CDarksendBroadcastTx::CheckSignature(const CKeyID& keyIDMasternode) const
     } else {
         std::string strMessage = tx->GetHash().ToString() + std::to_string(sigTime);
 
-        if(!CMessageSigner::VerifyMessage(keyIDMasternode, vchSig, strMessage, strError)) {
+        if(!CMessageSigner::VerifyMessage(keyIDOperator, vchSig, strMessage, strError)) {
             LogPrintf("CDarksendBroadcastTx::CheckSignature -- Got bad dstx signature, error: %s\n", strError);
             return false;
         }
diff --git a/src/privatesend.h b/src/privatesend.h
index b2e2474f46de..c8b221e10c71 100644
--- a/src/privatesend.h
+++ b/src/privatesend.h
@@ -249,7 +249,7 @@ class CDarksendQueue
      */
     bool Sign();
     /// Check if we have a valid Masternode address
-    bool CheckSignature(const CKeyID& keyIDMasternode) const;
+    bool CheckSignature(const CKeyID& keyIDOperator) const;
 
     bool Relay(CConnman &connman);
 
@@ -341,7 +341,7 @@ class CDarksendBroadcastTx
     uint256 GetSignatureHash() const;
 
     bool Sign();
-    bool CheckSignature(const CKeyID& keyIDMasternode) const;
+    bool CheckSignature(const CKeyID& keyIDOperator) const;
 
     void SetConfirmedHeight(int nConfirmedHeightIn) { nConfirmedHeight = nConfirmedHeightIn; }
     bool IsExpired(int nHeight);
diff --git a/src/rpc/governance.cpp b/src/rpc/governance.cpp
index 536ac551d4f6..ba24a29772d5 100644
--- a/src/rpc/governance.cpp
+++ b/src/rpc/governance.cpp
@@ -236,7 +236,7 @@ UniValue gobject_submit(const JSONRPCRequest& request)
 
     bool fMnFound = mnodeman.Has(activeMasternodeInfo.outpoint);
 
-    DBG( std::cout << "gobject: submit activeMasternodeInfo.keyIDMasternode = " << activeMasternodeInfo.keyIDMasternode.ToString()
+    DBG( std::cout << "gobject: submit activeMasternodeInfo.keyIDOperator = " << activeMasternodeInfo.keyIDOperator.ToString()
          << ", outpoint = " << activeMasternodeInfo.outpoint.ToStringShort()
          << ", params.size() = " << request.params.size()
          << ", fMnFound = " << fMnFound << std::endl; );
@@ -286,7 +286,7 @@ UniValue gobject_submit(const JSONRPCRequest& request)
     if(govobj.GetObjectType() == GOVERNANCE_OBJECT_TRIGGER) {
         if(fMnFound) {
             govobj.SetMasternodeOutpoint(activeMasternodeInfo.outpoint);
-            govobj.Sign(activeMasternodeInfo.keyMasternode, activeMasternodeInfo.keyIDMasternode);
+            govobj.Sign(activeMasternodeInfo.keyOperator, activeMasternodeInfo.keyIDOperator);
         }
         else {
             LogPrintf("gobject(submit) -- Object submission rejected because node is not a masternode\n");
@@ -389,7 +389,7 @@ UniValue gobject_vote_conf(const JSONRPCRequest& request)
     }
 
     CGovernanceVote vote(mn.outpoint, hash, eVoteSignal, eVoteOutcome);
-    if(!vote.Sign(activeMasternodeInfo.keyMasternode, activeMasternodeInfo.keyIDMasternode)) {
+    if(!vote.Sign(activeMasternodeInfo.keyOperator, activeMasternodeInfo.keyIDOperator)) {
         nFailed++;
         statusObj.push_back(Pair("result", "failed"));
         statusObj.push_back(Pair("errorMessage", "Failure to sign."));
@@ -428,12 +428,12 @@ UniValue VoteWithMasternodeList(const std::vector<CMasternodeConfig::CMasternode
     UniValue resultsObj(UniValue::VOBJ);
 
     for (const auto& mne : entries) {
-        CPubKey pubKeyMasternode;
-        CKey keyMasternode;
+        CPubKey pubKeyOperator;
+        CKey keyOperator;
 
         UniValue statusObj(UniValue::VOBJ);
 
-        if(!CMessageSigner::GetKeysFromSecret(mne.getPrivKey(), keyMasternode, pubKeyMasternode)){
+        if(!CMessageSigner::GetKeysFromSecret(mne.getPrivKey(), keyOperator, pubKeyOperator)) {
             nFailed++;
             statusObj.push_back(Pair("result", "failed"));
             statusObj.push_back(Pair("errorMessage", "Masternode signing error, could not set key correctly"));
@@ -463,7 +463,7 @@ UniValue VoteWithMasternodeList(const std::vector<CMasternodeConfig::CMasternode
         }
 
         CGovernanceVote vote(mn.outpoint, hash, eVoteSignal, eVoteOutcome);
-        if(!vote.Sign(keyMasternode, pubKeyMasternode.GetID())){
+        if(!vote.Sign(keyOperator, pubKeyOperator.GetID())) {
             nFailed++;
             statusObj.push_back(Pair("result", "failed"));
             statusObj.push_back(Pair("errorMessage", "Failure to sign."));
@@ -981,6 +981,16 @@ UniValue voteraw(const JSONRPCRequest& request)
         throw JSONRPCError(RPC_INVALID_PARAMETER, "Invalid vote outcome. Please use one of the following: 'yes', 'no' or 'abstain'");
     }
 
+    int govObjType;
+    {
+        LOCK(governance.cs);
+        CGovernanceObject *pGovObj = governance.FindGovernanceObject(hashGovObj);
+        if (!pGovObj) {
+            throw JSONRPCError(RPC_INVALID_PARAMETER, "Governance object not found");
+        }
+        govObjType = pGovObj->GetObjectType();
+    }
+
     int64_t nTime = request.params[5].get_int64();
     std::string strSig = request.params[6].get_str();
     bool fInvalid = false;
@@ -1001,7 +1011,9 @@ UniValue voteraw(const JSONRPCRequest& request)
     vote.SetTime(nTime);
     vote.SetSignature(vchSig);
 
-    if(!vote.IsValid(true)) {
+    bool onlyOwnerAllowed = govObjType == GOVERNANCE_OBJECT_PROPOSAL;
+
+    if(!vote.IsValid(onlyOwnerAllowed)) {
         throw JSONRPCError(RPC_INTERNAL_ERROR, "Failure to verify vote.");
     }
 
diff --git a/src/rpc/masternode.cpp b/src/rpc/masternode.cpp
index 576c41f259a2..0e7fb4266336 100644
--- a/src/rpc/masternode.cpp
+++ b/src/rpc/masternode.cpp
@@ -939,9 +939,15 @@ UniValue masternodelist(const JSONRPCRequest& request)
                 if (strFilter !="" && strFilter != strprintf("%d", mn.nProtocolVersion) &&
                     strOutpoint.find(strFilter) == std::string::npos) continue;
                 obj.push_back(Pair(strOutpoint, mn.nProtocolVersion));
-            } else if (strMode == "keyid") {
+            } else if (strMode == "keyIDOwner") {
                 if (strFilter !="" && strOutpoint.find(strFilter) == std::string::npos) continue;
-                obj.push_back(Pair(strOutpoint, HexStr(mn.keyIDMasternode)));
+                obj.push_back(Pair(strOutpoint, HexStr(mn.keyIDOwner)));
+            } else if (strMode == "keyIDOperator") {
+                if (strFilter !="" && strOutpoint.find(strFilter) == std::string::npos) continue;
+                obj.push_back(Pair(strOutpoint, HexStr(mn.keyIDOperator)));
+            } else if (strMode == "keyIDVoting") {
+                if (strFilter !="" && strOutpoint.find(strFilter) == std::string::npos) continue;
+                obj.push_back(Pair(strOutpoint, HexStr(mn.keyIDVoting)));
             } else if (strMode == "status") {
                 std::string strStatus = mn.GetStatus();
                 if (strFilter !="" && strStatus.find(strFilter) == std::string::npos &&
@@ -1127,7 +1133,7 @@ UniValue masternodebroadcast(const JSONRPCRequest& request)
                 resultObj.push_back(Pair("outpoint", mnb.outpoint.ToStringShort()));
                 resultObj.push_back(Pair("addr", mnb.addr.ToString()));
                 resultObj.push_back(Pair("keyIDCollateralAddress", CBitcoinAddress(mnb.keyIDCollateralAddress).ToString()));
-                resultObj.push_back(Pair("keyIDMasternode", CBitcoinAddress(mnb.keyIDMasternode).ToString()));
+                resultObj.push_back(Pair("keyIDMasternode", CBitcoinAddress(mnb.keyIDOperator).ToString()));
                 resultObj.push_back(Pair("vchSig", EncodeBase64(&mnb.vchSig[0], mnb.vchSig.size())));
                 resultObj.push_back(Pair("sigTime", mnb.sigTime));
                 resultObj.push_back(Pair("protocolVersion", mnb.nProtocolVersion));

From 255403e9273ef0166924900d9e7523475b8580e4 Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Wed, 28 Feb 2018 10:08:47 +0100
Subject: [PATCH 085/400] Include proTx data in json formatted transactions

---
 src/rpc/rawtransaction.cpp | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/src/rpc/rawtransaction.cpp b/src/rpc/rawtransaction.cpp
index 283afacf89e3..4a028ff39985 100644
--- a/src/rpc/rawtransaction.cpp
+++ b/src/rpc/rawtransaction.cpp
@@ -29,6 +29,9 @@
 #include "wallet/wallet.h"
 #endif
 
+#include "evo/specialtx.h"
+#include "evo/providertx.h"
+
 #include <stdint.h>
 
 #include <boost/assign/list_of.hpp>
@@ -127,6 +130,15 @@ void TxToJSON(const CTransaction& tx, const uint256 hashBlock, UniValue& entry)
         entry.push_back(Pair("extraPayload", HexStr(tx.vExtraPayload)));
     }
 
+    if (tx.nVersion >= 3 && tx.nType == TRANSACTION_PROVIDER_REGISTER) {
+        CProRegTx proTx;
+        if (GetTxPayload(tx, proTx)) {
+            UniValue proTxObj;
+            proTx.ToJson(proTxObj);
+            entry.push_back(Pair("proTx", proTxObj));
+        }
+    }
+
     if (!hashBlock.IsNull()) {
         entry.push_back(Pair("blockhash", hashBlock.GetHex()));
         BlockMap::iterator mi = mapBlockIndex.find(hashBlock);

From 6ec0d7aea52f9f458f02d8bc28c78dc50ed0b0c6 Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Mon, 12 Mar 2018 12:14:11 +0100
Subject: [PATCH 086/400] Classes and basic validation of ProUpServTx

---
 src/evo/providertx.cpp       | 58 ++++++++++++++++++++++++++++
 src/evo/providertx.h         | 37 ++++++++++++++++++
 src/evo/specialtx.cpp        |  4 ++
 src/primitives/transaction.h |  1 +
 src/rpc/rawtransaction.cpp   |  9 ++++-
 src/txmempool.cpp            | 75 +++++++++++++++++++++++-------------
 src/txmempool.h              |  2 +-
 src/validation.cpp           |  3 +-
 8 files changed, 160 insertions(+), 29 deletions(-)

diff --git a/src/evo/providertx.cpp b/src/evo/providertx.cpp
index de2a3e315200..afda06f2f9a3 100644
--- a/src/evo/providertx.cpp
+++ b/src/evo/providertx.cpp
@@ -114,6 +114,42 @@ bool CheckProRegTx(const CTransaction& tx, const CBlockIndex* pindexPrev, CValid
 
     if (!CheckInputsHashAndSig(tx, ptx, ptx.keyIDOwner, state))
         return false;
+    return true;
+}
+
+bool CheckProUpServTx(const CTransaction& tx, const CBlockIndex* pindexPrev, CValidationState& state)
+{
+    AssertLockHeld(cs_main);
+
+    CProUpServTx ptx;
+    if (!GetTxPayload(tx, ptx))
+        return state.DoS(100, false, REJECT_INVALID, "bad-tx-payload");
+
+    if (ptx.nVersion > CProRegTx::CURRENT_VERSION)
+        return state.DoS(100, false, REJECT_INVALID, "bad-protx-version");
+
+    if (!CheckService(ptx.proTxHash, ptx, pindexPrev, state))
+        return false;
+
+    if (pindexPrev) {
+        auto mn = deterministicMNManager->GetMN(pindexPrev->GetBlockHash(), ptx.proTxHash);
+        if (!mn)
+            return state.DoS(100, false, REJECT_INVALID, "bad-protx-hash");
+
+        if (ptx.scriptOperatorPayout != CScript()) {
+            if (mn->nOperatorReward == 0) {
+                // don't allow to set operator reward payee in case no operatorReward was set
+                return state.DoS(10, false, REJECT_INVALID, "bad-protx-operator-payee");
+            }
+            // we may support P2SH later, but restrict it for now (while in transitioning phase from old MN list to deterministic list)
+            if (!ptx.scriptOperatorPayout.IsPayToPublicKeyHash())
+                return state.DoS(10, false, REJECT_INVALID, "bad-protx-operator-payee");
+        }
+
+        // we can only check the signature if pindexPrev != NULL and the MN is known
+        if (!CheckInputsHashAndSig(tx, ptx, mn->pdmnState->keyIDOperator, state))
+            return false;
+    }
 
     return true;
 }
@@ -152,6 +188,28 @@ void CProRegTx::ToJson(UniValue& obj) const
     obj.push_back(Pair("inputsHash", inputsHash.ToString()));
 }
 
+std::string CProUpServTx::ToString() const
+{
+    return strprintf("CProUpServTx(nVersion=%d, proTxHash=%s, nProtocolVersion=%d, addr=%s)",
+                     nVersion, proTxHash.ToString(), nProtocolVersion, addr.ToString());
+}
+
+void CProUpServTx::ToJson(UniValue& obj) const
+{
+    obj.clear();
+    obj.setObject();
+    obj.push_back(Pair("version", nVersion));
+    obj.push_back(Pair("proTxHash", proTxHash.ToString()));
+    obj.push_back(Pair("protocolVersion", nProtocolVersion));
+    obj.push_back(Pair("service", addr.ToString(false)));
+    CTxDestination dest;
+    if (ExtractDestination(scriptOperatorPayout, dest)) {
+        CBitcoinAddress bitcoinAddress(dest);
+        obj.push_back(Pair("operatorPayoutAddress", bitcoinAddress.ToString()));
+    }
+    obj.push_back(Pair("inputsHash", inputsHash.ToString()));
+}
+
 bool IsProTxCollateral(const CTransaction& tx, uint32_t n)
 {
     return GetProTxCollateralIndex(tx) == n;
diff --git a/src/evo/providertx.h b/src/evo/providertx.h
index 7c37de358516..1646a008c37e 100644
--- a/src/evo/providertx.h
+++ b/src/evo/providertx.h
@@ -57,7 +57,44 @@ class CProRegTx
     void ToJson(UniValue& obj) const;
 };
 
+class CProUpServTx
+{
+public:
+    static const uint16_t CURRENT_VERSION = 1;
+
+public:
+    uint16_t nVersion{CURRENT_VERSION}; // message version
+    uint256 proTxHash;
+    int32_t nProtocolVersion{0};
+    CService addr;
+    CScript scriptOperatorPayout;
+    uint256 inputsHash; // replay protection
+    std::vector<unsigned char> vchSig;
+
+public:
+    ADD_SERIALIZE_METHODS;
+
+    template <typename Stream, typename Operation>
+    inline void SerializationOp(Stream& s, Operation ser_action)
+    {
+        READWRITE(nVersion);
+        READWRITE(proTxHash);
+        READWRITE(nProtocolVersion);
+        READWRITE(addr);
+        READWRITE(*(CScriptBase*)(&scriptOperatorPayout));
+        READWRITE(inputsHash);
+        if (!(s.GetType() & SER_GETHASH)) {
+            READWRITE(vchSig);
+        }
+    }
+
+public:
+    std::string ToString() const;
+    void ToJson(UniValue& obj) const;
+};
+
 bool CheckProRegTx(const CTransaction& tx, const CBlockIndex* pindexPrev, CValidationState& state);
+bool CheckProUpServTx(const CTransaction& tx, const CBlockIndex* pindexPrev, CValidationState& state);
 
 bool IsProTxCollateral(const CTransaction& tx, uint32_t n);
 uint32_t GetProTxCollateralIndex(const CTransaction& tx);
diff --git a/src/evo/specialtx.cpp b/src/evo/specialtx.cpp
index 584321a160d5..dd4fa73748b5 100644
--- a/src/evo/specialtx.cpp
+++ b/src/evo/specialtx.cpp
@@ -27,6 +27,8 @@ bool CheckSpecialTx(const CTransaction& tx, const CBlockIndex* pindexPrev, CVali
     switch (tx.nType) {
         case TRANSACTION_PROVIDER_REGISTER:
             return CheckProRegTx(tx, pindexPrev, state);
+        case TRANSACTION_PROVIDER_UPDATE_SERVICE:
+            return CheckProUpServTx(tx, pindexPrev, state);
     }
 
     return state.DoS(10, false, REJECT_INVALID, "bad-tx-type");
@@ -39,6 +41,7 @@ bool ProcessSpecialTx(const CTransaction& tx, const CBlockIndex* pindex, CValida
 
     switch (tx.nType) {
         case TRANSACTION_PROVIDER_REGISTER:
+        case TRANSACTION_PROVIDER_UPDATE_SERVICE:
             return true; // handled in batches per block
     }
 
@@ -52,6 +55,7 @@ bool UndoSpecialTx(const CTransaction& tx, const CBlockIndex* pindex)
 
     switch (tx.nType) {
         case TRANSACTION_PROVIDER_REGISTER:
+        case TRANSACTION_PROVIDER_UPDATE_SERVICE:
             return true; // handled in batches per block
     }
 
diff --git a/src/primitives/transaction.h b/src/primitives/transaction.h
index 129a0c473e3b..fb023bb83df8 100644
--- a/src/primitives/transaction.h
+++ b/src/primitives/transaction.h
@@ -15,6 +15,7 @@
 enum {
     TRANSACTION_NORMAL = 0,
     TRANSACTION_PROVIDER_REGISTER = 1,
+    TRANSACTION_PROVIDER_UPDATE_SERVICE = 2,
 };
 
 /** An outpoint - a combination of a transaction hash and an index n into its vout */
diff --git a/src/rpc/rawtransaction.cpp b/src/rpc/rawtransaction.cpp
index 4a028ff39985..6f35f6536733 100644
--- a/src/rpc/rawtransaction.cpp
+++ b/src/rpc/rawtransaction.cpp
@@ -130,13 +130,20 @@ void TxToJSON(const CTransaction& tx, const uint256 hashBlock, UniValue& entry)
         entry.push_back(Pair("extraPayload", HexStr(tx.vExtraPayload)));
     }
 
-    if (tx.nVersion >= 3 && tx.nType == TRANSACTION_PROVIDER_REGISTER) {
+    if (tx.nType == TRANSACTION_PROVIDER_REGISTER) {
         CProRegTx proTx;
         if (GetTxPayload(tx, proTx)) {
             UniValue proTxObj;
             proTx.ToJson(proTxObj);
             entry.push_back(Pair("proTx", proTxObj));
         }
+    } else if (tx.nType == TRANSACTION_PROVIDER_UPDATE_SERVICE) {
+        CProUpServTx proTx;
+        if (GetTxPayload(tx, proTx)) {
+            UniValue proTxObj;
+            proTx.ToJson(proTxObj);
+            entry.push_back(Pair("proUpServTx", proTxObj));
+        }
     }
 
     if (!hashBlock.IsNull()) {
diff --git a/src/txmempool.cpp b/src/txmempool.cpp
index 42b6246dd600..52c10add874e 100644
--- a/src/txmempool.cpp
+++ b/src/txmempool.cpp
@@ -446,9 +446,15 @@ bool CTxMemPool::addUnchecked(const uint256& hash, const CTxMemPoolEntry &entry,
         if (!GetTxPayload(tx, proTx)) {
             assert(false);
         }
-        mapProTxRegisterAddresses.emplace(proTx.addr, tx.GetHash());
+        mapProTxAddresses.emplace(proTx.addr, tx.GetHash());
         mapProTxPubKeyIDs.emplace(proTx.keyIDOwner, tx.GetHash());
         mapProTxPubKeyIDs.emplace(proTx.keyIDOperator, tx.GetHash());
+    } else if (tx.nType == TRANSACTION_PROVIDER_UPDATE_SERVICE) {
+        CProUpServTx proTx;
+        if (!GetTxPayload(tx, proTx)) {
+            assert(false);
+        }
+        mapProTxAddresses.emplace(proTx.addr, tx.GetHash());
     }
 
     return true;
@@ -626,14 +632,20 @@ void CTxMemPool::removeUnchecked(txiter it, MemPoolRemovalReason reason)
     } else
         vTxHashes.clear();
 
-    if (it->GetTx().nVersion >= 3 && it->GetTx().nType == TRANSACTION_PROVIDER_REGISTER) {
+    if (it->GetTx().nType == TRANSACTION_PROVIDER_REGISTER) {
         CProRegTx proTx;
         if (!GetTxPayload(it->GetTx(), proTx)) {
             assert(false);
         }
-        mapProTxRegisterAddresses.erase(proTx.addr);
+        mapProTxAddresses.erase(proTx.addr);
         mapProTxPubKeyIDs.erase(proTx.keyIDOwner);
         mapProTxPubKeyIDs.erase(proTx.keyIDOperator);
+    } else if (it->GetTx().nType == TRANSACTION_PROVIDER_UPDATE_SERVICE) {
+        CProUpServTx proTx;
+        if (!GetTxPayload(it->GetTx(), proTx)) {
+            assert(false);
+        }
+        mapProTxAddresses.erase(proTx.addr);
     }
 
     totalTxSize -= it->GetTxSize();
@@ -764,30 +776,41 @@ void CTxMemPool::removeConflicts(const CTransaction &tx)
 
 void CTxMemPool::removeProTxConflicts(const CTransaction &tx)
 {
-    if (tx.nType != TRANSACTION_PROVIDER_REGISTER)
-        return;
-
-    CProRegTx proTx;
-    if (!GetTxPayload(tx, proTx)) {
-        assert(false);
-    }
+    if (tx.nType == TRANSACTION_PROVIDER_REGISTER) {
+        CProRegTx proTx;
+        if (!GetTxPayload(tx, proTx)) {
+            assert(false);
+        }
 
-    if (mapProTxRegisterAddresses.count(proTx.addr)) {
-        uint256 conflictHash = mapProTxRegisterAddresses[proTx.addr];
-        if (conflictHash != tx.GetHash() && mapTx.count(conflictHash)) {
-            removeRecursive(mapTx.find(conflictHash)->GetTx(), MemPoolRemovalReason::CONFLICT);
+        if (mapProTxAddresses.count(proTx.addr)) {
+            uint256 conflictHash = mapProTxAddresses[proTx.addr];
+            if (conflictHash != tx.GetHash() && mapTx.count(conflictHash)) {
+                removeRecursive(mapTx.find(conflictHash)->GetTx(), MemPoolRemovalReason::CONFLICT);
+            }
         }
-    }
-    if (mapProTxPubKeyIDs.count(proTx.keyIDOwner)) {
-        uint256 conflictHash = mapProTxPubKeyIDs[proTx.keyIDOwner];
-        if (conflictHash != tx.GetHash() && mapTx.count(conflictHash)) {
-            removeRecursive(mapTx.find(conflictHash)->GetTx(), MemPoolRemovalReason::CONFLICT);
+        if (mapProTxPubKeyIDs.count(proTx.keyIDOwner)) {
+            uint256 conflictHash = mapProTxPubKeyIDs[proTx.keyIDOwner];
+            if (conflictHash != tx.GetHash() && mapTx.count(conflictHash)) {
+                removeRecursive(mapTx.find(conflictHash)->GetTx(), MemPoolRemovalReason::CONFLICT);
+            }
         }
-    }
-    if (mapProTxPubKeyIDs.count(proTx.keyIDOperator)) {
-        uint256 conflictHash = mapProTxPubKeyIDs[proTx.keyIDOperator];
-        if (conflictHash != tx.GetHash() && mapTx.count(conflictHash)) {
-            removeRecursive(mapTx.find(conflictHash)->GetTx(), MemPoolRemovalReason::CONFLICT);
+        if (mapProTxPubKeyIDs.count(proTx.keyIDOperator)) {
+            uint256 conflictHash = mapProTxPubKeyIDs[proTx.keyIDOperator];
+            if (conflictHash != tx.GetHash() && mapTx.count(conflictHash)) {
+                removeRecursive(mapTx.find(conflictHash)->GetTx(), MemPoolRemovalReason::CONFLICT);
+            }
+        }
+    } else if (tx.nType == TRANSACTION_PROVIDER_UPDATE_SERVICE) {
+        CProUpServTx proTx;
+        if (!GetTxPayload(tx, proTx)) {
+            assert(false);
+        }
+
+        if (mapProTxAddresses.count(proTx.addr)) {
+            uint256 conflictHash = mapProTxAddresses[proTx.addr];
+            if (conflictHash != tx.GetHash() && mapTx.count(conflictHash)) {
+                removeRecursive(mapTx.find(conflictHash)->GetTx(), MemPoolRemovalReason::CONFLICT);
+            }
         }
     }
 }
@@ -830,7 +853,7 @@ void CTxMemPool::_clear()
     mapLinks.clear();
     mapTx.clear();
     mapNextTx.clear();
-    mapProTxRegisterAddresses.clear();
+    mapProTxAddresses.clear();
     mapProTxPubKeyIDs.clear();
     totalTxSize = 0;
     cachedInnerUsage = 0;
@@ -1076,7 +1099,7 @@ bool CTxMemPool::existsProviderTxConflict(const CTransaction &tx) const {
     CProRegTx proTx;
     if (!GetTxPayload(tx, proTx))
         assert(false);
-    return mapProTxRegisterAddresses.count(proTx.addr) || mapProTxPubKeyIDs.count(proTx.keyIDOwner) || mapProTxPubKeyIDs.count(proTx.keyIDOperator);
+    return mapProTxAddresses.count(proTx.addr) || mapProTxPubKeyIDs.count(proTx.keyIDOwner) || mapProTxPubKeyIDs.count(proTx.keyIDOperator);
 }
 
 CFeeRate CTxMemPool::estimateFee(int nBlocks) const
diff --git a/src/txmempool.h b/src/txmempool.h
index b741dfd5c373..6d1c7b76960c 100644
--- a/src/txmempool.h
+++ b/src/txmempool.h
@@ -535,7 +535,7 @@ class CTxMemPool
     typedef std::map<uint256, std::vector<CSpentIndexKey> > mapSpentIndexInserted;
     mapSpentIndexInserted mapSpentInserted;
 
-    std::map<CService, uint256> mapProTxRegisterAddresses;
+    std::map<CService, uint256> mapProTxAddresses;
     std::map<CKeyID, uint256> mapProTxPubKeyIDs;
 
     void UpdateParent(txiter entry, txiter parent, bool add);
diff --git a/src/validation.cpp b/src/validation.cpp
index 8d8f779573db..69b7fea778b6 100644
--- a/src/validation.cpp
+++ b/src/validation.cpp
@@ -573,7 +573,8 @@ bool ContextualCheckTransaction(const CTransaction& tx, CValidationState &state,
         // check version 3 transaction types
         if (tx.nVersion >= 3) {
             if (tx.nType != TRANSACTION_NORMAL &&
-                tx.nType != TRANSACTION_PROVIDER_REGISTER) {
+                tx.nType != TRANSACTION_PROVIDER_REGISTER &&
+                tx.nType != TRANSACTION_PROVIDER_UPDATE_SERVICE) {
                 return state.DoS(100, false, REJECT_INVALID, "bad-txns-type");
             }
             if (tx.IsCoinBase() && tx.nType != TRANSACTION_NORMAL)

From 923fd673957171dab2d6d18de22909c3a84f539f Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Tue, 13 Mar 2018 19:10:58 +0100
Subject: [PATCH 087/400] Implement CProUpServTx logic in
 CDeterministicMNManager

---
 src/evo/deterministicmns.cpp | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/src/evo/deterministicmns.cpp b/src/evo/deterministicmns.cpp
index e649da0fe402..17db083872dd 100644
--- a/src/evo/deterministicmns.cpp
+++ b/src/evo/deterministicmns.cpp
@@ -402,6 +402,39 @@ bool CDeterministicMNManager::BuildNewListFromBlock(const CBlock& block, const C
 
             LogPrintf("CDeterministicMNManager::%s -- MN %s added to MN list. nHeight=%d, mapCurMNs.size=%d\n",
                       __func__, tx.GetHash().ToString(), nHeight, newList.size());
+        } else if (tx.nType == TRANSACTION_PROVIDER_UPDATE_SERVICE) {
+            CProUpServTx proTx;
+            if (!GetTxPayload(tx, proTx)) {
+                assert(false); // this should have been handled already
+            }
+
+            if (newList.HasUniqueProperty(proTx.addr) && newList.GetUniquePropertyMN(proTx.addr)->proTxHash != proTx.proTxHash)
+                return _state.DoS(100, false, REJECT_CONFLICT, "bad-protx-dup-addr");
+
+            CDeterministicMNCPtr dmn = newList.GetMN(proTx.proTxHash);
+            if (!dmn) {
+                return _state.DoS(100, false, REJECT_INVALID, "bad-protx-hash");
+            }
+            auto newState = std::make_shared<CDeterministicMNState>(*dmn->pdmnState);
+            newState->addr = proTx.addr;
+            newState->nProtocolVersion = proTx.nProtocolVersion;
+            newState->scriptOperatorPayout = proTx.scriptOperatorPayout;
+
+            if (newState->nPoSeBanHeight != -1) {
+                // only revive when all keys are set
+                if (!newState->keyIDOperator.IsNull() && !newState->keyIDVoting.IsNull() && !newState->keyIDOwner.IsNull()) {
+                    newState->nPoSeBanHeight = -1;
+                    newState->nPoSeRevivedHeight = nHeight;
+
+                    LogPrintf("CDeterministicMNManager::%s -- MN %s revived at height %d\n",
+                              __func__, proTx.proTxHash.ToString(), nHeight);
+                }
+            }
+
+            newList.UpdateMN(proTx.proTxHash, newState);
+
+            LogPrintf("CDeterministicMNManager::%s -- MN %s updated with addr=%s, nProtocolVersion=%d. height=%d\n",
+                      __func__, proTx.proTxHash.ToString(), proTx.addr.ToString(false), proTx.nProtocolVersion, height);
         }
     }
 

From 8aca3b0404cde42916fa86c6cf437a9598a3b6c9 Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Mon, 19 Mar 2018 08:57:43 +0100
Subject: [PATCH 088/400] Also check duplicate addresses for CProUpServTX in
 CTxMemPool

---
 src/txmempool.cpp | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/txmempool.cpp b/src/txmempool.cpp
index 52c10add874e..cbd4d0946019 100644
--- a/src/txmempool.cpp
+++ b/src/txmempool.cpp
@@ -1094,12 +1094,18 @@ TxMempoolInfo CTxMemPool::info(const uint256& hash) const
 
 bool CTxMemPool::existsProviderTxConflict(const CTransaction &tx) const {
     LOCK(cs);
-    if (tx.nVersion < 3 || tx.nType != TRANSACTION_PROVIDER_REGISTER)
-        return false;
-    CProRegTx proTx;
-    if (!GetTxPayload(tx, proTx))
-        assert(false);
-    return mapProTxAddresses.count(proTx.addr) || mapProTxPubKeyIDs.count(proTx.keyIDOwner) || mapProTxPubKeyIDs.count(proTx.keyIDOperator);
+    if (tx.nType == TRANSACTION_PROVIDER_REGISTER) {
+        CProRegTx proTx;
+        if (!GetTxPayload(tx, proTx))
+            assert(false);
+        return mapProTxAddresses.count(proTx.addr) || mapProTxPubKeyIDs.count(proTx.keyIDOwner) || mapProTxPubKeyIDs.count(proTx.keyIDOperator);
+    } else if (tx.nType == TRANSACTION_PROVIDER_UPDATE_SERVICE) {
+        CProUpServTx proTx;
+        if (!GetTxPayload(tx, proTx))
+            assert(false);
+        return mapProTxAddresses.count(proTx.addr) && mapProTxAddresses[proTx.addr] != proTx.proTxHash;
+    }
+    return false;
 }
 
 CFeeRate CTxMemPool::estimateFee(int nBlocks) const

From 32951f795ce55fa238b3da071834fa5723511b33 Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Wed, 14 Mar 2018 08:57:08 +0100
Subject: [PATCH 089/400] Implement "protx update_service" RPC

---
 src/rpc/rpcevo.cpp | 73 ++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 71 insertions(+), 2 deletions(-)

diff --git a/src/rpc/rpcevo.cpp b/src/rpc/rpcevo.cpp
index 886cc78ebb12..7876bbd6779a 100644
--- a/src/rpc/rpcevo.cpp
+++ b/src/rpc/rpcevo.cpp
@@ -240,6 +240,72 @@ UniValue protx_register(const JSONRPCRequest& request)
     return SignAndSendSpecialTx(tx);
 }
 
+void protx_update_service_help()
+{
+    throw std::runtime_error(
+            "protx update_service \"proTxHash\" \"ipAndPort\" protocolVersion (\"operatorPayoutAddress\")\n"
+            "\nCreates and sends a ProUpServTx to the network. This will update the address and protocol version\n"
+            "of a masternode. The operator key of the masternode must be known to your wallet.\n"
+            "If this is done for a masternode that got PoSe-banned, the ProUpServTx will also revive this masternode.\n"
+            "\nArguments:\n"
+            "1. \"proTxHash\"                (string, required) The hash of the initial ProRegTx.\n"
+            "2. \"ipAndPort\"                (string, required) IP and port in the form \"IP:PORT\".\n"
+            "                              Must be unique on the network.\n"
+            "3. \"protocolVersion\"          (numeric, required) The protocol version of your masternode.\n"
+            "                              Can be 0 to default to the clients protocol version\n"
+            "4. \"operatorPayoutAddress\"    (string, optional) The address used for operator reward payments.\n"
+            "                              Only allowed when the ProRegTx had a non-zero operatorReward value.\n"
+            "\nExamples:\n"
+            + HelpExampleCli("protx", "update_service \"0123456701234567012345670123456701234567012345670123456701234567\" \"1.2.3.4:1234\" 0")
+    );
+}
+
+UniValue protx_update_service(const JSONRPCRequest& request)
+{
+    if (request.fHelp || (request.params.size() != 4 && request.params.size() != 5))
+        protx_update_service_help();
+
+    CProUpServTx ptx;
+    ptx.nVersion = CProRegTx::CURRENT_VERSION;
+    ptx.proTxHash = ParseHashV(request.params[1], "proTxHash");
+
+    if (!Lookup(request.params[2].get_str().c_str(), ptx.addr, Params().GetDefaultPort(), false)) {
+        throw std::runtime_error(strprintf("invalid network address %s", request.params[3].get_str()));
+    }
+
+    ptx.nProtocolVersion = ParseInt32V(request.params[3], "protocolVersion");
+    if (ptx.nProtocolVersion == 0) {
+        ptx.nProtocolVersion = PROTOCOL_VERSION;
+    }
+
+    if (request.params.size() > 4) {
+        CBitcoinAddress payoutAddress(request.params[4].get_str());
+        if (!payoutAddress.IsValid())
+            throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, strprintf("invalid operator payout address: %s", request.params[4].get_str()));
+        ptx.scriptOperatorPayout = GetScriptForDestination(payoutAddress.Get());
+    }
+
+    auto dmn = deterministicMNManager->GetListAtChainTip().GetMN(ptx.proTxHash);
+    if (!dmn) {
+        throw std::runtime_error(strprintf("masternode with proTxHash %s not found", ptx.proTxHash.ToString()));
+    }
+
+    CKey keyOperator;
+    if (!pwalletMain->GetKey(dmn->pdmnState->keyIDOperator, keyOperator)) {
+        throw std::runtime_error(strprintf("operator key %s not found in your wallet", dmn->pdmnState->keyIDOperator.ToString()));
+    }
+
+    CMutableTransaction tx;
+    tx.nVersion = 3;
+    tx.nType = TRANSACTION_PROVIDER_UPDATE_SERVICE;
+
+    FundSpecialTx(tx, ptx);
+    SignSpecialTxPayload(tx, ptx, keyOperator);
+    SetTxPayload(tx, ptx);
+
+    return SignAndSendSpecialTx(tx);
+}
+
 void protx_list_help()
 {
     throw std::runtime_error(
@@ -380,8 +446,9 @@ UniValue protx(const JSONRPCRequest& request)
                 "\nArguments:\n"
                 "1. \"command\"        (string, required) The command to execute\n"
                 "\nAvailable commands:\n"
-                "  register    - Create and send ProTx to network\n"
-                "  list        - List ProTxs\n"
+                "  register        - Create and send ProTx to network\n"
+                "  list            - List ProTxs\n"
+                "  update_service  - Create and send ProUpServTx to network\n"
         );
     }
 
@@ -391,6 +458,8 @@ UniValue protx(const JSONRPCRequest& request)
         return protx_register(request);
     } else if (command == "list") {
         return protx_list(request);
+    } else if (command == "update_service") {
+        return protx_update_service(request);
     } else {
         throw std::runtime_error("invalid command: " + command);
     }

From 1c68d11077f7e5d13b6470c86d9a12c97a0d1f9e Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Mon, 19 Mar 2018 08:44:00 +0100
Subject: [PATCH 090/400] Classes, validation and update logic for CProUpRegTX

---
 src/evo/deterministicmns.cpp |  32 +++++++++--
 src/evo/deterministicmns.h   |  15 ++++++
 src/evo/providertx.cpp       | 101 ++++++++++++++++++++++++++++++++++-
 src/evo/providertx.h         |  38 +++++++++++++
 src/evo/specialtx.cpp        |   4 ++
 src/primitives/transaction.h |   1 +
 src/rpc/rawtransaction.cpp   |   7 +++
 src/txmempool.cpp            |  52 +++++++++++++-----
 src/txmempool.h              |   1 +
 src/validation.cpp           |   3 +-
 10 files changed, 234 insertions(+), 20 deletions(-)

diff --git a/src/evo/deterministicmns.cpp b/src/evo/deterministicmns.cpp
index 17db083872dd..4f969eed2194 100644
--- a/src/evo/deterministicmns.cpp
+++ b/src/evo/deterministicmns.cpp
@@ -400,8 +400,8 @@ bool CDeterministicMNManager::BuildNewListFromBlock(const CBlock& block, const C
 
             newList.AddMN(dmn);
 
-            LogPrintf("CDeterministicMNManager::%s -- MN %s added to MN list. nHeight=%d, mapCurMNs.size=%d\n",
-                      __func__, tx.GetHash().ToString(), nHeight, newList.size());
+            LogPrintf("CDeterministicMNManager::%s -- MN %s added at height %d: %s\n",
+                      __func__, tx.GetHash().ToString(), nHeight, proTx.ToString());
         } else if (tx.nType == TRANSACTION_PROVIDER_UPDATE_SERVICE) {
             CProUpServTx proTx;
             if (!GetTxPayload(tx, proTx)) {
@@ -433,8 +433,32 @@ bool CDeterministicMNManager::BuildNewListFromBlock(const CBlock& block, const C
 
             newList.UpdateMN(proTx.proTxHash, newState);
 
-            LogPrintf("CDeterministicMNManager::%s -- MN %s updated with addr=%s, nProtocolVersion=%d. height=%d\n",
-                      __func__, proTx.proTxHash.ToString(), proTx.addr.ToString(false), proTx.nProtocolVersion, height);
+            LogPrintf("CDeterministicMNManager::%s -- MN %s updated at height %d: %s\n",
+                      __func__, proTx.proTxHash.ToString(), nHeight, proTx.ToString());
+        } else if (tx.nType == TRANSACTION_PROVIDER_UPDATE_REGISTRAR) {
+            CProUpRegTx proTx;
+            if (!GetTxPayload(tx, proTx)) {
+                assert(false); // this should have been handled already
+            }
+
+            CDeterministicMNCPtr dmn = newList.GetMN(proTx.proTxHash);
+            if (!dmn) {
+                return _state.DoS(100, false, REJECT_INVALID, "bad-protx-hash");
+            }
+            auto newState = std::make_shared<CDeterministicMNState>(*dmn->pdmnState);
+            if (newState->keyIDOperator != proTx.keyIDOperator) {
+                // reset all operator related fields and put MN into PoSe-banned state in case the operator key changes
+                newState->ResetOperatorFields();
+                newState->BanIfNotBanned(nHeight);
+            }
+            newState->keyIDOperator = proTx.keyIDOperator;
+            newState->keyIDVoting = proTx.keyIDVoting;
+            newState->scriptPayout = proTx.scriptPayout;
+
+            newList.UpdateMN(proTx.proTxHash, newState);
+
+            LogPrintf("CDeterministicMNManager::%s -- MN %s updated at height %d: %s\n",
+                      __func__, proTx.proTxHash.ToString(), nHeight, proTx.ToString());
         }
     }
 
diff --git a/src/evo/deterministicmns.h b/src/evo/deterministicmns.h
index ee0551fd2bae..a841df7f50cc 100644
--- a/src/evo/deterministicmns.h
+++ b/src/evo/deterministicmns.h
@@ -72,6 +72,21 @@ class CDeterministicMNState
         READWRITE(*(CScriptBase*)(&scriptOperatorPayout));
     }
 
+    void ResetOperatorFields()
+    {
+        keyIDOperator.SetNull();
+        addr = CService();
+        nProtocolVersion = 0;
+        scriptOperatorPayout = CScript();
+        revocationReason = CProUpRevTx::REASON_NOT_SPECIFIED;
+    }
+    void BanIfNotBanned(int height)
+    {
+        if (nPoSeBanHeight == -1) {
+            nPoSeBanHeight = height;
+        }
+    }
+
     bool operator==(const CDeterministicMNState& rhs) const
     {
         return nRegisteredHeight == rhs.nRegisteredHeight &&
diff --git a/src/evo/providertx.cpp b/src/evo/providertx.cpp
index afda06f2f9a3..8b2a47dcbdb0 100644
--- a/src/evo/providertx.cpp
+++ b/src/evo/providertx.cpp
@@ -154,6 +154,69 @@ bool CheckProUpServTx(const CTransaction& tx, const CBlockIndex* pindexPrev, CVa
     return true;
 }
 
+bool CheckProUpRegTx(const CTransaction& tx, const CBlockIndex* pindexPrev, CValidationState& state)
+{
+    AssertLockHeld(cs_main);
+
+    CProUpRegTx ptx;
+    if (!GetTxPayload(tx, ptx))
+        return state.DoS(100, false, REJECT_INVALID, "bad-tx-payload");
+
+    if (ptx.nVersion > CProRegTx::CURRENT_VERSION)
+        return state.DoS(100, false, REJECT_INVALID, "bad-protx-version");
+
+    if (ptx.keyIDOperator.IsNull() || ptx.keyIDVoting.IsNull())
+        return state.DoS(10, false, REJECT_INVALID, "bad-protx-key-null");
+    // we may support P2SH later, but restrict it for now (while in transitioning phase from old MN list to deterministic list)
+    if (!ptx.scriptPayout.IsPayToPublicKeyHash())
+        return state.DoS(10, false, REJECT_INVALID, "bad-protx-payee");
+
+    CTxDestination payoutDest;
+    if (!ExtractDestination(ptx.scriptPayout, payoutDest)) {
+        // should not happen as we checked script types before
+        return state.DoS(10, false, REJECT_INVALID, "bad-protx-payee-dest");
+    }
+
+    if (pindexPrev) {
+        auto mnList = deterministicMNManager->GetListForBlock(pindexPrev->GetBlockHash());
+        auto dmn = mnList.GetMN(ptx.proTxHash);
+        if (!dmn)
+            return state.DoS(100, false, REJECT_INVALID, "bad-protx-hash");
+
+        // don't allow reuse of collateral key for other keys (don't allow people to put the collateral key onto an online server)
+        if (payoutDest == CTxDestination(dmn->pdmnState->keyIDOwner) || payoutDest == CTxDestination(ptx.keyIDOperator) || payoutDest == CTxDestination(ptx.keyIDVoting)) {
+            return state.DoS(10, false, REJECT_INVALID, "bad-protx-payee-reuse");
+        }
+
+        // This is a temporary restriction that will be lifted later
+        // It is required while we are transitioning from the old MN list to the deterministic list
+        CTransactionRef proRegTx;
+        uint256 tmpHashBlock;
+        if (!GetTransaction(ptx.proTxHash, proRegTx, Params().GetConsensus(), tmpHashBlock))
+            return state.DoS(100, false, REJECT_INVALID, "bad-protx-payee-collateral");
+        if (proRegTx->vout[dmn->nCollateralIndex].scriptPubKey != ptx.scriptPayout)
+            return state.DoS(10, false, REJECT_INVALID, "bad-protx-payee-collateral");
+
+        if (mnList.HasUniqueProperty(ptx.keyIDOperator)) {
+            auto otherDmn = mnList.GetUniquePropertyMN(ptx.keyIDOperator);
+            if (ptx.proTxHash != otherDmn->proTxHash) {
+                return state.DoS(10, false, REJECT_DUPLICATE, "bad-protx-dup-key");
+            }
+        }
+
+        if (!deterministicMNManager->IsDeterministicMNsSporkActive(pindexPrev->nHeight)) {
+            if (dmn->pdmnState->keyIDOwner != ptx.keyIDOperator || dmn->pdmnState->keyIDOwner != ptx.keyIDVoting) {
+                return state.DoS(10, false, REJECT_INVALID, "bad-protx-key-not-same");
+            }
+        }
+
+        if (!CheckInputsHashAndSig(tx, ptx, dmn->pdmnState->keyIDOwner, state))
+            return false;
+    }
+
+    return true;
+}
+
 std::string CProRegTx::ToString() const
 {
     CTxDestination dest;
@@ -190,8 +253,14 @@ void CProRegTx::ToJson(UniValue& obj) const
 
 std::string CProUpServTx::ToString() const
 {
-    return strprintf("CProUpServTx(nVersion=%d, proTxHash=%s, nProtocolVersion=%d, addr=%s)",
-                     nVersion, proTxHash.ToString(), nProtocolVersion, addr.ToString());
+    CTxDestination dest;
+    std::string payee = "unknown";
+    if (ExtractDestination(scriptOperatorPayout, dest)) {
+        payee = CBitcoinAddress(dest).ToString();
+    }
+
+    return strprintf("CProUpServTx(nVersion=%d, proTxHash=%s, nProtocolVersion=%d, addr=%s, operatorPayoutAddress=%s)",
+                     nVersion, proTxHash.ToString(), nProtocolVersion, addr.ToString(), payee);
 }
 
 void CProUpServTx::ToJson(UniValue& obj) const
@@ -210,6 +279,34 @@ void CProUpServTx::ToJson(UniValue& obj) const
     obj.push_back(Pair("inputsHash", inputsHash.ToString()));
 }
 
+std::string CProUpRegTx::ToString() const
+{
+    CTxDestination dest;
+    std::string payee = "unknown";
+    if (ExtractDestination(scriptPayout, dest)) {
+        payee = CBitcoinAddress(dest).ToString();
+    }
+
+    return strprintf("CProUpRegTx(nVersion=%d, proTxHash=%s, keyIDOperator=%s, keyIDVoting=%s, payoutAddress=%s)",
+                     nVersion, proTxHash.ToString(), keyIDOperator.ToString(), keyIDVoting.ToString(), payee);
+}
+
+void CProUpRegTx::ToJson(UniValue& obj) const
+{
+    obj.clear();
+    obj.setObject();
+    obj.push_back(Pair("version", nVersion));
+    obj.push_back(Pair("proTxHash", proTxHash.ToString()));
+    obj.push_back(Pair("keyIDOperator", keyIDOperator.ToString()));
+    obj.push_back(Pair("keyIDVoting", keyIDVoting.ToString()));
+    CTxDestination dest;
+    if (ExtractDestination(scriptPayout, dest)) {
+        CBitcoinAddress bitcoinAddress(dest);
+        obj.push_back(Pair("payoutAddress", bitcoinAddress.ToString()));
+    }
+    obj.push_back(Pair("inputsHash", inputsHash.ToString()));
+}
+
 bool IsProTxCollateral(const CTransaction& tx, uint32_t n)
 {
     return GetProTxCollateralIndex(tx) == n;
diff --git a/src/evo/providertx.h b/src/evo/providertx.h
index 1646a008c37e..085706d8137a 100644
--- a/src/evo/providertx.h
+++ b/src/evo/providertx.h
@@ -93,8 +93,46 @@ class CProUpServTx
     void ToJson(UniValue& obj) const;
 };
 
+class CProUpRegTx
+{
+public:
+    static const uint16_t CURRENT_VERSION = 1;
+
+public:
+    uint16_t nVersion{CURRENT_VERSION}; // message version
+    uint256 proTxHash;
+    CKeyID keyIDOperator;
+    CKeyID keyIDVoting;
+    CScript scriptPayout;
+    uint256 inputsHash; // replay protection
+    std::vector<unsigned char> vchSig;
+
+public:
+    ADD_SERIALIZE_METHODS;
+
+    template <typename Stream, typename Operation>
+    inline void SerializationOp(Stream& s, Operation ser_action)
+    {
+        READWRITE(nVersion);
+        READWRITE(proTxHash);
+        READWRITE(keyIDOperator);
+        READWRITE(keyIDVoting);
+        READWRITE(*(CScriptBase*)(&scriptPayout));
+        READWRITE(inputsHash);
+        if (!(s.GetType() & SER_GETHASH)) {
+            READWRITE(vchSig);
+        }
+    }
+
+public:
+    std::string ToString() const;
+    void ToJson(UniValue& obj) const;
+};
+
+
 bool CheckProRegTx(const CTransaction& tx, const CBlockIndex* pindexPrev, CValidationState& state);
 bool CheckProUpServTx(const CTransaction& tx, const CBlockIndex* pindexPrev, CValidationState& state);
+bool CheckProUpRegTx(const CTransaction& tx, const CBlockIndex* pindexPrev, CValidationState& state);
 
 bool IsProTxCollateral(const CTransaction& tx, uint32_t n);
 uint32_t GetProTxCollateralIndex(const CTransaction& tx);
diff --git a/src/evo/specialtx.cpp b/src/evo/specialtx.cpp
index dd4fa73748b5..473a36055dfc 100644
--- a/src/evo/specialtx.cpp
+++ b/src/evo/specialtx.cpp
@@ -29,6 +29,8 @@ bool CheckSpecialTx(const CTransaction& tx, const CBlockIndex* pindexPrev, CVali
             return CheckProRegTx(tx, pindexPrev, state);
         case TRANSACTION_PROVIDER_UPDATE_SERVICE:
             return CheckProUpServTx(tx, pindexPrev, state);
+        case TRANSACTION_PROVIDER_UPDATE_REGISTRAR:
+            return CheckProUpRegTx(tx, pindexPrev, state);
     }
 
     return state.DoS(10, false, REJECT_INVALID, "bad-tx-type");
@@ -42,6 +44,7 @@ bool ProcessSpecialTx(const CTransaction& tx, const CBlockIndex* pindex, CValida
     switch (tx.nType) {
         case TRANSACTION_PROVIDER_REGISTER:
         case TRANSACTION_PROVIDER_UPDATE_SERVICE:
+        case TRANSACTION_PROVIDER_UPDATE_REGISTRAR:
             return true; // handled in batches per block
     }
 
@@ -56,6 +59,7 @@ bool UndoSpecialTx(const CTransaction& tx, const CBlockIndex* pindex)
     switch (tx.nType) {
         case TRANSACTION_PROVIDER_REGISTER:
         case TRANSACTION_PROVIDER_UPDATE_SERVICE:
+        case TRANSACTION_PROVIDER_UPDATE_REGISTRAR:
             return true; // handled in batches per block
     }
 
diff --git a/src/primitives/transaction.h b/src/primitives/transaction.h
index fb023bb83df8..248b91235c20 100644
--- a/src/primitives/transaction.h
+++ b/src/primitives/transaction.h
@@ -16,6 +16,7 @@ enum {
     TRANSACTION_NORMAL = 0,
     TRANSACTION_PROVIDER_REGISTER = 1,
     TRANSACTION_PROVIDER_UPDATE_SERVICE = 2,
+    TRANSACTION_PROVIDER_UPDATE_REGISTRAR = 3,
 };
 
 /** An outpoint - a combination of a transaction hash and an index n into its vout */
diff --git a/src/rpc/rawtransaction.cpp b/src/rpc/rawtransaction.cpp
index 6f35f6536733..0864ffcf7248 100644
--- a/src/rpc/rawtransaction.cpp
+++ b/src/rpc/rawtransaction.cpp
@@ -144,6 +144,13 @@ void TxToJSON(const CTransaction& tx, const uint256 hashBlock, UniValue& entry)
             proTx.ToJson(proTxObj);
             entry.push_back(Pair("proUpServTx", proTxObj));
         }
+    } else if (tx.nType == TRANSACTION_PROVIDER_UPDATE_REGISTRAR) {
+        CProUpRegTx proTx;
+        if (GetTxPayload(tx, proTx)) {
+            UniValue proTxObj;
+            proTx.ToJson(proTxObj);
+            entry.push_back(Pair("proUpRegTx", proTxObj));
+        }
     }
 
     if (!hashBlock.IsNull()) {
diff --git a/src/txmempool.cpp b/src/txmempool.cpp
index cbd4d0946019..bca9ad3d50cd 100644
--- a/src/txmempool.cpp
+++ b/src/txmempool.cpp
@@ -455,6 +455,12 @@ bool CTxMemPool::addUnchecked(const uint256& hash, const CTxMemPoolEntry &entry,
             assert(false);
         }
         mapProTxAddresses.emplace(proTx.addr, tx.GetHash());
+    } else if (tx.nType == TRANSACTION_PROVIDER_UPDATE_REGISTRAR) {
+        CProUpRegTx proTx;
+        if (!GetTxPayload(tx, proTx)) {
+            assert(false);
+        }
+        mapProTxPubKeyIDs.emplace(proTx.keyIDOperator, tx.GetHash());
     }
 
     return true;
@@ -646,6 +652,12 @@ void CTxMemPool::removeUnchecked(txiter it, MemPoolRemovalReason reason)
             assert(false);
         }
         mapProTxAddresses.erase(proTx.addr);
+    } else if (it->GetTx().nType == TRANSACTION_PROVIDER_UPDATE_REGISTRAR) {
+        CProUpRegTx proTx;
+        if (!GetTxPayload(it->GetTx(), proTx)) {
+            assert(false);
+        }
+        mapProTxPubKeyIDs.erase(proTx.keyIDOperator);
     }
 
     totalTxSize -= it->GetTxSize();
@@ -774,6 +786,16 @@ void CTxMemPool::removeConflicts(const CTransaction &tx)
     }
 }
 
+void CTxMemPool::removeProTxPubKeyConflicts(const CTransaction &tx, const CKeyID &keyId)
+{
+    if (mapProTxPubKeyIDs.count(keyId)) {
+        uint256 conflictHash = mapProTxPubKeyIDs[keyId];
+        if (conflictHash != tx.GetHash() && mapTx.count(conflictHash)) {
+            removeRecursive(mapTx.find(conflictHash)->GetTx(), MemPoolRemovalReason::CONFLICT);
+        }
+    }
+}
+
 void CTxMemPool::removeProTxConflicts(const CTransaction &tx)
 {
     if (tx.nType == TRANSACTION_PROVIDER_REGISTER) {
@@ -788,18 +810,8 @@ void CTxMemPool::removeProTxConflicts(const CTransaction &tx)
                 removeRecursive(mapTx.find(conflictHash)->GetTx(), MemPoolRemovalReason::CONFLICT);
             }
         }
-        if (mapProTxPubKeyIDs.count(proTx.keyIDOwner)) {
-            uint256 conflictHash = mapProTxPubKeyIDs[proTx.keyIDOwner];
-            if (conflictHash != tx.GetHash() && mapTx.count(conflictHash)) {
-                removeRecursive(mapTx.find(conflictHash)->GetTx(), MemPoolRemovalReason::CONFLICT);
-            }
-        }
-        if (mapProTxPubKeyIDs.count(proTx.keyIDOperator)) {
-            uint256 conflictHash = mapProTxPubKeyIDs[proTx.keyIDOperator];
-            if (conflictHash != tx.GetHash() && mapTx.count(conflictHash)) {
-                removeRecursive(mapTx.find(conflictHash)->GetTx(), MemPoolRemovalReason::CONFLICT);
-            }
-        }
+        removeProTxPubKeyConflicts(tx, proTx.keyIDOwner);
+        removeProTxPubKeyConflicts(tx, proTx.keyIDOperator);
     } else if (tx.nType == TRANSACTION_PROVIDER_UPDATE_SERVICE) {
         CProUpServTx proTx;
         if (!GetTxPayload(tx, proTx)) {
@@ -812,6 +824,13 @@ void CTxMemPool::removeProTxConflicts(const CTransaction &tx)
                 removeRecursive(mapTx.find(conflictHash)->GetTx(), MemPoolRemovalReason::CONFLICT);
             }
         }
+    } else if (tx.nType == TRANSACTION_PROVIDER_UPDATE_REGISTRAR) {
+        CProUpRegTx proTx;
+        if (!GetTxPayload(tx, proTx)) {
+            assert(false);
+        }
+
+        removeProTxPubKeyConflicts(tx, proTx.keyIDOperator);
     }
 }
 
@@ -1103,7 +1122,14 @@ bool CTxMemPool::existsProviderTxConflict(const CTransaction &tx) const {
         CProUpServTx proTx;
         if (!GetTxPayload(tx, proTx))
             assert(false);
-        return mapProTxAddresses.count(proTx.addr) && mapProTxAddresses[proTx.addr] != proTx.proTxHash;
+        auto it = mapProTxAddresses.find(proTx.addr);
+        return it != mapProTxAddresses.end() && it->second != proTx.proTxHash;
+    } else if (tx.nType == TRANSACTION_PROVIDER_UPDATE_REGISTRAR) {
+        CProUpRegTx proTx;
+        if (!GetTxPayload(tx, proTx))
+            assert(false);
+        auto it = mapProTxPubKeyIDs.find(proTx.keyIDOperator);
+        return it != mapProTxPubKeyIDs.end() && it->second != proTx.proTxHash;
     }
     return false;
 }
diff --git a/src/txmempool.h b/src/txmempool.h
index 6d1c7b76960c..cbf5360d08a7 100644
--- a/src/txmempool.h
+++ b/src/txmempool.h
@@ -580,6 +580,7 @@ class CTxMemPool
     void removeRecursive(const CTransaction &tx, MemPoolRemovalReason reason = MemPoolRemovalReason::UNKNOWN);
     void removeForReorg(const CCoinsViewCache *pcoins, unsigned int nMemPoolHeight, int flags);
     void removeConflicts(const CTransaction &tx);
+    void removeProTxPubKeyConflicts(const CTransaction &tx, const CKeyID &keyId);
     void removeProTxConflicts(const CTransaction &tx);
     void removeForBlock(const std::vector<CTransactionRef>& vtx, unsigned int nBlockHeight);
 
diff --git a/src/validation.cpp b/src/validation.cpp
index 69b7fea778b6..946ba0186ec2 100644
--- a/src/validation.cpp
+++ b/src/validation.cpp
@@ -574,7 +574,8 @@ bool ContextualCheckTransaction(const CTransaction& tx, CValidationState &state,
         if (tx.nVersion >= 3) {
             if (tx.nType != TRANSACTION_NORMAL &&
                 tx.nType != TRANSACTION_PROVIDER_REGISTER &&
-                tx.nType != TRANSACTION_PROVIDER_UPDATE_SERVICE) {
+                tx.nType != TRANSACTION_PROVIDER_UPDATE_SERVICE &&
+                tx.nType != TRANSACTION_PROVIDER_UPDATE_REGISTRAR) {
                 return state.DoS(100, false, REJECT_INVALID, "bad-txns-type");
             }
             if (tx.IsCoinBase() && tx.nType != TRANSACTION_NORMAL)

From 185416b9701537cb2ebca9bf546005dfd5a8c669 Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Mon, 19 Mar 2018 09:46:08 +0100
Subject: [PATCH 091/400] Implement "protx update_registrar" RPC

---
 src/rpc/rpcevo.cpp | 77 ++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 74 insertions(+), 3 deletions(-)

diff --git a/src/rpc/rpcevo.cpp b/src/rpc/rpcevo.cpp
index 7876bbd6779a..5423176a5d0f 100644
--- a/src/rpc/rpcevo.cpp
+++ b/src/rpc/rpcevo.cpp
@@ -306,6 +306,74 @@ UniValue protx_update_service(const JSONRPCRequest& request)
     return SignAndSendSpecialTx(tx);
 }
 
+void protx_update_registrar_help()
+{
+    throw std::runtime_error(
+            "protx update_registrar \"proTxHash\" \"operatorKeyAddr\" \"votingKeyAddr\" operatorReward \"payoutAddress\"\n"
+            "\nCreates and sends a ProUpRegTx to the network. This will update the operator key, voting key and payout\n"
+            "address of the masternode specified by \"proTxHash\".\n"
+            "The owner key of the masternode must be known to your wallet.\n"
+            "\nArguments:\n"
+            "1. \"proTxHash\"           (string, required) The hash of the initial ProRegTx.\n"
+            "2. \"operatorKeyAddr\"     (string, required) The operator key address. The private key does not have to be known by your wallet.\n"
+            "                         It has to match the private key which is later used when operating the masternode.\n"
+            "                         If set to \"0\" or an empty string, the last on-chain operator key of the masternode will be used.\n"
+            "3. \"votingKeyAddr\"       (string, required) The voting key address. The private key does not have to be known by your wallet.\n"
+            "                         It has to match the private key which is later used when voting on proposals.\n"
+            "                         If set to \"0\" or an empty string, the last on-chain voting key of the masternode will be used.\n"
+            "5. \"payoutAddress\"       (string, required) The dash address to use for masternode reward payments\n"
+            "                         Must match \"collateralAddress\" of initial ProRegTx.\n"
+            "                         If set to \"0\" or an empty string, the last on-chain payout address of the masternode will be used.\n"
+            "\nExamples:\n"
+            + HelpExampleCli("protx", "update_registrar \"0123456701234567012345670123456701234567012345670123456701234567\" \"<operatorKeyAddr>\" \"0\" \"XwnLY9Tf7Zsef8gMGL2fhWA9ZmMjt4KPwG\"")
+    );
+}
+
+UniValue protx_update_registrar(const JSONRPCRequest& request)
+{
+    if (request.fHelp || request.params.size() != 5)
+        protx_update_registrar_help();
+
+    CProUpRegTx ptx;
+    ptx.nVersion = CProRegTx::CURRENT_VERSION;
+    ptx.proTxHash = ParseHashV(request.params[1], "proTxHash");
+
+    auto dmn = deterministicMNManager->GetListAtChainTip().GetMN(ptx.proTxHash);
+    if (!dmn) {
+        throw JSONRPCError(RPC_INVALID_PARAMETER, strprintf("masternode %s not found", ptx.proTxHash.ToString()));
+    }
+    ptx.keyIDOperator = dmn->pdmnState->keyIDOperator;
+    ptx.keyIDVoting = dmn->pdmnState->keyIDVoting;
+    ptx.scriptPayout = dmn->pdmnState->scriptPayout;
+
+    if (request.params[2].get_str() != "0" && request.params[2].get_str() != "") {
+        ptx.keyIDOperator = ParsePubKeyIDFromAddress(request.params[2].get_str(), "operator address");
+    }
+    if (request.params[3].get_str() != "0" && request.params[3].get_str() != "") {
+        ptx.keyIDVoting = ParsePubKeyIDFromAddress(request.params[3].get_str(), "operator address");
+    }
+
+    CBitcoinAddress payoutAddress(request.params[4].get_str());
+    if (!payoutAddress.IsValid())
+        throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, strprintf("invalid payout address: %s", request.params[4].get_str()));
+    ptx.scriptPayout = GetScriptForDestination(payoutAddress.Get());
+
+    CKey keyOwner;
+    if (!pwalletMain->GetKey(dmn->pdmnState->keyIDOwner, keyOwner)) {
+        throw std::runtime_error(strprintf("owner key %s not found in your wallet", dmn->pdmnState->keyIDOwner.ToString()));
+    }
+
+    CMutableTransaction tx;
+    tx.nVersion = 3;
+    tx.nType = TRANSACTION_PROVIDER_UPDATE_REGISTRAR;
+
+    FundSpecialTx(tx, ptx);
+    SignSpecialTxPayload(tx, ptx, keyOwner);
+    SetTxPayload(tx, ptx);
+
+    return SignAndSendSpecialTx(tx);
+}
+
 void protx_list_help()
 {
     throw std::runtime_error(
@@ -446,9 +514,10 @@ UniValue protx(const JSONRPCRequest& request)
                 "\nArguments:\n"
                 "1. \"command\"        (string, required) The command to execute\n"
                 "\nAvailable commands:\n"
-                "  register        - Create and send ProTx to network\n"
-                "  list            - List ProTxs\n"
-                "  update_service  - Create and send ProUpServTx to network\n"
+                "  register          - Create and send ProTx to network\n"
+                "  list              - List ProTxs\n"
+                "  update_service    - Create and send ProUpServTx to network\n"
+                "  update_registrar  - Create and send ProUpRegTx to network\n"
         );
     }
 
@@ -460,6 +529,8 @@ UniValue protx(const JSONRPCRequest& request)
         return protx_list(request);
     } else if (command == "update_service") {
         return protx_update_service(request);
+    } else if (command == "update_registrar") {
+        return protx_update_registrar(request);
     } else {
         throw std::runtime_error("invalid command: " + command);
     }

From 9653af2f30103b60206aa3769734c8eea5d7f52a Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Mon, 19 Mar 2018 12:29:59 +0100
Subject: [PATCH 092/400] Classes, validation and update logic for CProUpRevTX

---
 src/evo/deterministicmns.cpp | 24 ++++++++++++++++++--
 src/evo/deterministicmns.h   |  5 ++++-
 src/evo/providertx.cpp       | 43 ++++++++++++++++++++++++++++++++++++
 src/evo/providertx.h         | 42 +++++++++++++++++++++++++++++++++++
 src/evo/specialtx.cpp        |  4 ++++
 src/primitives/transaction.h |  1 +
 src/rpc/rawtransaction.cpp   |  7 ++++++
 src/validation.cpp           |  3 ++-
 8 files changed, 125 insertions(+), 4 deletions(-)

diff --git a/src/evo/deterministicmns.cpp b/src/evo/deterministicmns.cpp
index 4f969eed2194..dc15d7fa5919 100644
--- a/src/evo/deterministicmns.cpp
+++ b/src/evo/deterministicmns.cpp
@@ -32,9 +32,9 @@ std::string CDeterministicMNState::ToString() const
         operatorRewardAddress = CBitcoinAddress(dest).ToString();
     }
 
-    return strprintf("CDeterministicMNState(nRegisteredHeight=%d, nLastPaidHeight=%d, nPoSePenalty=%d, nPoSeRevivedHeight=%d, nPoSeBanHeight=%d, "
+    return strprintf("CDeterministicMNState(nRegisteredHeight=%d, nLastPaidHeight=%d, nPoSePenalty=%d, nPoSeRevivedHeight=%d, nPoSeBanHeight=%d, nRevocationReason=%d, "
                      "keyIDOwner=%s, keyIDOperator=%s, keyIDVoting=%s, addr=%s, nProtocolVersion=%d, payoutAddress=%s, operatorRewardAddress=%s)",
-                     nRegisteredHeight, nLastPaidHeight, nPoSePenalty, nPoSeRevivedHeight, nPoSeBanHeight,
+                     nRegisteredHeight, nLastPaidHeight, nPoSePenalty, nPoSeRevivedHeight, nPoSeBanHeight, nRevocationReason,
                      keyIDOwner.ToString(), keyIDOperator.ToString(), keyIDVoting.ToString(), addr.ToStringIPPort(false), nProtocolVersion, payoutAddress, operatorRewardAddress);
 }
 
@@ -47,6 +47,7 @@ void CDeterministicMNState::ToJson(UniValue& obj) const
     obj.push_back(Pair("PoSePenalty", nPoSePenalty));
     obj.push_back(Pair("PoSeRevivedHeight", nPoSeRevivedHeight));
     obj.push_back(Pair("PoSeBanHeight", nPoSeBanHeight));
+    obj.push_back(Pair("revocationReason", nRevocationReason));
     obj.push_back(Pair("keyIDOwner", keyIDOwner.ToString()));
     obj.push_back(Pair("keyIDOperator", keyIDOperator.ToString()));
     obj.push_back(Pair("keyIDVoting", keyIDVoting.ToString()));
@@ -459,6 +460,25 @@ bool CDeterministicMNManager::BuildNewListFromBlock(const CBlock& block, const C
 
             LogPrintf("CDeterministicMNManager::%s -- MN %s updated at height %d: %s\n",
                       __func__, proTx.proTxHash.ToString(), nHeight, proTx.ToString());
+        } else if (tx.nType == TRANSACTION_PROVIDER_UPDATE_REVOKE) {
+            CProUpRevTx proTx;
+            if (!GetTxPayload(tx, proTx)) {
+                assert(false); // this should have been handled already
+            }
+
+            CDeterministicMNCPtr dmn = newList.GetMN(proTx.proTxHash);
+            if (!dmn) {
+                return _state.DoS(100, false, REJECT_INVALID, "bad-protx-hash");
+            }
+            auto newState = std::make_shared<CDeterministicMNState>(*dmn->pdmnState);
+            newState->ResetOperatorFields();
+            newState->BanIfNotBanned(nHeight);
+            newState->nRevocationReason = proTx.nReason;
+
+            newList.UpdateMN(proTx.proTxHash, newState);
+
+            LogPrintf("CDeterministicMNManager::%s -- MN %s revoked operator key at height %d: %s\n",
+                      __func__, proTx.proTxHash.ToString(), nHeight, proTx.ToString());
         }
     }
 
diff --git a/src/evo/deterministicmns.h b/src/evo/deterministicmns.h
index a841df7f50cc..a5758b218c05 100644
--- a/src/evo/deterministicmns.h
+++ b/src/evo/deterministicmns.h
@@ -30,6 +30,7 @@ class CDeterministicMNState
     int nPoSePenalty{0};
     int nPoSeRevivedHeight{-1};
     int nPoSeBanHeight{-1};
+    uint16_t nRevocationReason{CProUpRevTx::REASON_NOT_SPECIFIED};
 
     CKeyID keyIDOwner;
     CKeyID keyIDOperator;
@@ -63,6 +64,7 @@ class CDeterministicMNState
         READWRITE(nPoSePenalty);
         READWRITE(nPoSeRevivedHeight);
         READWRITE(nPoSeBanHeight);
+        READWRITE(nRevocationReason);
         READWRITE(keyIDOwner);
         READWRITE(keyIDOperator);
         READWRITE(keyIDVoting);
@@ -78,7 +80,7 @@ class CDeterministicMNState
         addr = CService();
         nProtocolVersion = 0;
         scriptOperatorPayout = CScript();
-        revocationReason = CProUpRevTx::REASON_NOT_SPECIFIED;
+        nRevocationReason = CProUpRevTx::REASON_NOT_SPECIFIED;
     }
     void BanIfNotBanned(int height)
     {
@@ -94,6 +96,7 @@ class CDeterministicMNState
                nPoSePenalty == rhs.nPoSePenalty &&
                nPoSeRevivedHeight == rhs.nPoSeRevivedHeight &&
                nPoSeBanHeight == rhs.nPoSeBanHeight &&
+               nRevocationReason == rhs.nRevocationReason &&
                keyIDOwner == rhs.keyIDOwner &&
                keyIDOperator == rhs.keyIDOperator &&
                keyIDVoting == rhs.keyIDVoting &&
diff --git a/src/evo/providertx.cpp b/src/evo/providertx.cpp
index 8b2a47dcbdb0..8c35fc7bcf3a 100644
--- a/src/evo/providertx.cpp
+++ b/src/evo/providertx.cpp
@@ -217,6 +217,33 @@ bool CheckProUpRegTx(const CTransaction& tx, const CBlockIndex* pindexPrev, CVal
     return true;
 }
 
+bool CheckProUpRevTx(const CTransaction& tx, const CBlockIndex* pindexPrev, CValidationState& state)
+{
+    AssertLockHeld(cs_main);
+
+    CProUpRevTx ptx;
+    if (!GetTxPayload(tx, ptx))
+        return state.DoS(100, false, REJECT_INVALID, "bad-tx-payload");
+
+    if (ptx.nVersion > CProRegTx::CURRENT_VERSION)
+        return state.DoS(100, false, REJECT_INVALID, "bad-protx-version");
+
+    if (ptx.nReason < CProUpRevTx::REASON_NOT_SPECIFIED || ptx.nReason > CProUpRevTx::REASON_LAST)
+        return state.DoS(100, false, REJECT_INVALID, "bad-protx-reason");
+
+    if (pindexPrev) {
+        auto mnList = deterministicMNManager->GetListForBlock(pindexPrev->GetBlockHash());
+        auto dmn = mnList.GetMN(ptx.proTxHash);
+        if (!dmn)
+            return state.DoS(100, false, REJECT_INVALID, "bad-protx-hash");
+
+        if (!CheckInputsHashAndSig(tx, ptx, dmn->pdmnState->keyIDOperator, state))
+            return false;
+    }
+
+    return true;
+}
+
 std::string CProRegTx::ToString() const
 {
     CTxDestination dest;
@@ -307,6 +334,22 @@ void CProUpRegTx::ToJson(UniValue& obj) const
     obj.push_back(Pair("inputsHash", inputsHash.ToString()));
 }
 
+std::string CProUpRevTx::ToString() const
+{
+    return strprintf("CProUpRevTx(nVersion=%d, proTxHash=%s, nReason=%d)",
+                     nVersion, proTxHash.ToString(), nReason);
+}
+
+void CProUpRevTx::ToJson(UniValue& obj) const
+{
+    obj.clear();
+    obj.setObject();
+    obj.push_back(Pair("version", nVersion));
+    obj.push_back(Pair("proTxHash", proTxHash.ToString()));
+    obj.push_back(Pair("reason", (int)nReason));
+    obj.push_back(Pair("inputsHash", inputsHash.ToString()));
+}
+
 bool IsProTxCollateral(const CTransaction& tx, uint32_t n)
 {
     return GetProTxCollateralIndex(tx) == n;
diff --git a/src/evo/providertx.h b/src/evo/providertx.h
index 085706d8137a..1aa0f1729ded 100644
--- a/src/evo/providertx.h
+++ b/src/evo/providertx.h
@@ -129,10 +129,52 @@ class CProUpRegTx
     void ToJson(UniValue& obj) const;
 };
 
+class CProUpRevTx
+{
+public:
+    static const uint16_t CURRENT_VERSION = 1;
+
+    // these are just informational and do not have any effect on the revocation
+    enum {
+        REASON_NOT_SPECIFIED = 0,
+        REASON_TERMINATION_OF_SERVICE = 1,
+        REASON_COMPROMISED_KEYS = 2,
+        REASON_CHANGE_OF_KEYS = 3,
+        REASON_LAST = REASON_CHANGE_OF_KEYS
+    };
+
+public:
+    uint16_t nVersion{CURRENT_VERSION}; // message version
+    uint256 proTxHash;
+    uint16_t nReason{REASON_NOT_SPECIFIED};
+    uint256 inputsHash; // replay protection
+    std::vector<unsigned char> vchSig;
+
+public:
+    ADD_SERIALIZE_METHODS;
+
+    template <typename Stream, typename Operation>
+    inline void SerializationOp(Stream& s, Operation ser_action)
+    {
+        READWRITE(nVersion);
+        READWRITE(proTxHash);
+        READWRITE(nReason);
+        READWRITE(inputsHash);
+        if (!(s.GetType() & SER_GETHASH)) {
+            READWRITE(vchSig);
+        }
+    }
+
+public:
+    std::string ToString() const;
+    void ToJson(UniValue& obj) const;
+};
+
 
 bool CheckProRegTx(const CTransaction& tx, const CBlockIndex* pindexPrev, CValidationState& state);
 bool CheckProUpServTx(const CTransaction& tx, const CBlockIndex* pindexPrev, CValidationState& state);
 bool CheckProUpRegTx(const CTransaction& tx, const CBlockIndex* pindexPrev, CValidationState& state);
+bool CheckProUpRevTx(const CTransaction& tx, const CBlockIndex* pindexPrev, CValidationState& state);
 
 bool IsProTxCollateral(const CTransaction& tx, uint32_t n);
 uint32_t GetProTxCollateralIndex(const CTransaction& tx);
diff --git a/src/evo/specialtx.cpp b/src/evo/specialtx.cpp
index 473a36055dfc..eb174bdb3612 100644
--- a/src/evo/specialtx.cpp
+++ b/src/evo/specialtx.cpp
@@ -31,6 +31,8 @@ bool CheckSpecialTx(const CTransaction& tx, const CBlockIndex* pindexPrev, CVali
             return CheckProUpServTx(tx, pindexPrev, state);
         case TRANSACTION_PROVIDER_UPDATE_REGISTRAR:
             return CheckProUpRegTx(tx, pindexPrev, state);
+        case TRANSACTION_PROVIDER_UPDATE_REVOKE:
+            return CheckProUpRevTx(tx, pindexPrev, state);
     }
 
     return state.DoS(10, false, REJECT_INVALID, "bad-tx-type");
@@ -45,6 +47,7 @@ bool ProcessSpecialTx(const CTransaction& tx, const CBlockIndex* pindex, CValida
         case TRANSACTION_PROVIDER_REGISTER:
         case TRANSACTION_PROVIDER_UPDATE_SERVICE:
         case TRANSACTION_PROVIDER_UPDATE_REGISTRAR:
+        case TRANSACTION_PROVIDER_UPDATE_REVOKE:
             return true; // handled in batches per block
     }
 
@@ -60,6 +63,7 @@ bool UndoSpecialTx(const CTransaction& tx, const CBlockIndex* pindex)
         case TRANSACTION_PROVIDER_REGISTER:
         case TRANSACTION_PROVIDER_UPDATE_SERVICE:
         case TRANSACTION_PROVIDER_UPDATE_REGISTRAR:
+        case TRANSACTION_PROVIDER_UPDATE_REVOKE:
             return true; // handled in batches per block
     }
 
diff --git a/src/primitives/transaction.h b/src/primitives/transaction.h
index 248b91235c20..71ad59880411 100644
--- a/src/primitives/transaction.h
+++ b/src/primitives/transaction.h
@@ -17,6 +17,7 @@ enum {
     TRANSACTION_PROVIDER_REGISTER = 1,
     TRANSACTION_PROVIDER_UPDATE_SERVICE = 2,
     TRANSACTION_PROVIDER_UPDATE_REGISTRAR = 3,
+    TRANSACTION_PROVIDER_UPDATE_REVOKE = 4,
 };
 
 /** An outpoint - a combination of a transaction hash and an index n into its vout */
diff --git a/src/rpc/rawtransaction.cpp b/src/rpc/rawtransaction.cpp
index 0864ffcf7248..4818338c5b7b 100644
--- a/src/rpc/rawtransaction.cpp
+++ b/src/rpc/rawtransaction.cpp
@@ -151,6 +151,13 @@ void TxToJSON(const CTransaction& tx, const uint256 hashBlock, UniValue& entry)
             proTx.ToJson(proTxObj);
             entry.push_back(Pair("proUpRegTx", proTxObj));
         }
+    } else if (tx.nType == TRANSACTION_PROVIDER_UPDATE_REVOKE) {
+        CProUpRevTx proTx;
+        if (GetTxPayload(tx, proTx)) {
+            UniValue proTxObj;
+            proTx.ToJson(proTxObj);
+            entry.push_back(Pair("proUpRevTx", proTxObj));
+        }
     }
 
     if (!hashBlock.IsNull()) {
diff --git a/src/validation.cpp b/src/validation.cpp
index 946ba0186ec2..c38b84a6c326 100644
--- a/src/validation.cpp
+++ b/src/validation.cpp
@@ -575,7 +575,8 @@ bool ContextualCheckTransaction(const CTransaction& tx, CValidationState &state,
             if (tx.nType != TRANSACTION_NORMAL &&
                 tx.nType != TRANSACTION_PROVIDER_REGISTER &&
                 tx.nType != TRANSACTION_PROVIDER_UPDATE_SERVICE &&
-                tx.nType != TRANSACTION_PROVIDER_UPDATE_REGISTRAR) {
+                tx.nType != TRANSACTION_PROVIDER_UPDATE_REGISTRAR &&
+                tx.nType != TRANSACTION_PROVIDER_UPDATE_REVOKE) {
                 return state.DoS(100, false, REJECT_INVALID, "bad-txns-type");
             }
             if (tx.IsCoinBase() && tx.nType != TRANSACTION_NORMAL)

From 58aa8136498ed346acdb2349e4b554590ff1834f Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Mon, 19 Mar 2018 12:45:15 +0100
Subject: [PATCH 093/400] Implement "protx revoke" RPC

---
 src/rpc/rpcevo.cpp | 57 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 57 insertions(+)

diff --git a/src/rpc/rpcevo.cpp b/src/rpc/rpcevo.cpp
index 5423176a5d0f..3e75fb9333e2 100644
--- a/src/rpc/rpcevo.cpp
+++ b/src/rpc/rpcevo.cpp
@@ -374,6 +374,60 @@ UniValue protx_update_registrar(const JSONRPCRequest& request)
     return SignAndSendSpecialTx(tx);
 }
 
+void protx_revoke_help()
+{
+    throw std::runtime_error(
+            "protx revoke \"proTxHash\"\n"
+            "\nCreates and sends a ProUpRevTx to the network. This will revoke the operator key of the masternode and\n"
+            "put it into the PoSe-banned state. It will also set the service and protocol version fields of the masternode\n"
+            "to zero. Use this in case your operator key got compromised or you want to stop providing your service\n"
+            "to the masternode owner.\n"
+            "The operator key of the masternode must be known to your wallet.\n"
+            "\nArguments:\n"
+            "1. \"proTxHash\"           (string, required) The hash of the initial ProRegTx.\n"
+            "2. reason                  (numeric, optional) The reason for revocation.\n"
+            "\nExamples:\n"
+            + HelpExampleCli("protx", "revoke \"0123456701234567012345670123456701234567012345670123456701234567\" \"<operatorKeyAddr>\"")
+    );
+}
+
+UniValue protx_revoke(const JSONRPCRequest& request)
+{
+    if (request.fHelp || (request.params.size() != 2 && request.params.size() != 3))
+        protx_revoke_help();
+
+    CProUpRevTx ptx;
+    ptx.nVersion = CProRegTx::CURRENT_VERSION;
+    ptx.proTxHash = ParseHashV(request.params[1], "proTxHash");
+
+    if (request.params.size() > 2) {
+        int32_t nReason = ParseInt32V(request.params[2], "reason");
+        if (nReason < 0 || nReason >= CProUpRevTx::REASON_LAST)
+            throw JSONRPCError(RPC_INVALID_PARAMETER, strprintf("invalid reason %d, must be between 0 and %d", nReason, CProUpRevTx::REASON_LAST));
+        ptx.nReason = (uint16_t)nReason;
+    }
+
+    auto dmn = deterministicMNManager->GetListAtChainTip().GetMN(ptx.proTxHash);
+    if (!dmn) {
+        throw JSONRPCError(RPC_INVALID_PARAMETER, strprintf("masternode %s not found", ptx.proTxHash.ToString()));
+    }
+
+    CKey keyOperator;
+    if (!pwalletMain->GetKey(dmn->pdmnState->keyIDOperator, keyOperator)) {
+        throw std::runtime_error(strprintf("operator key %s not found in your wallet", dmn->pdmnState->keyIDOwner.ToString()));
+    }
+
+    CMutableTransaction tx;
+    tx.nVersion = 3;
+    tx.nType = TRANSACTION_PROVIDER_UPDATE_REVOKE;
+
+    FundSpecialTx(tx, ptx);
+    SignSpecialTxPayload(tx, ptx, keyOperator);
+    SetTxPayload(tx, ptx);
+
+    return SignAndSendSpecialTx(tx);
+}
+
 void protx_list_help()
 {
     throw std::runtime_error(
@@ -518,6 +572,7 @@ UniValue protx(const JSONRPCRequest& request)
                 "  list              - List ProTxs\n"
                 "  update_service    - Create and send ProUpServTx to network\n"
                 "  update_registrar  - Create and send ProUpRegTx to network\n"
+                "  revoke            - Create and send ProUpRevTx to network\n"
         );
     }
 
@@ -531,6 +586,8 @@ UniValue protx(const JSONRPCRequest& request)
         return protx_update_service(request);
     } else if (command == "update_registrar") {
         return protx_update_registrar(request);
+    } else if (command == "revoke") {
+        return protx_revoke(request);
     } else {
         throw std::runtime_error("invalid command: " + command);
     }

From 0a086898f568ccb2e9490946ac04f8d9b09f7f7b Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Fri, 6 Apr 2018 11:00:10 +0200
Subject: [PATCH 094/400] Implement and enforce CbTx with correct block height
 and deprecate BIP34

---
 src/Makefile.am              |  2 ++
 src/evo/cbtx.cpp             | 47 ++++++++++++++++++++++++++++++++++++
 src/evo/cbtx.h               | 42 ++++++++++++++++++++++++++++++++
 src/evo/specialtx.cpp        |  7 ++++++
 src/miner.cpp                | 20 ++++++++++++++-
 src/primitives/transaction.h |  1 +
 src/rpc/rawtransaction.cpp   |  8 ++++++
 src/validation.cpp           | 24 +++++++++++++++---
 8 files changed, 146 insertions(+), 5 deletions(-)
 create mode 100644 src/evo/cbtx.cpp
 create mode 100644 src/evo/cbtx.h

diff --git a/src/Makefile.am b/src/Makefile.am
index 18ad6716974a..5bb89bf6ca8a 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -110,6 +110,7 @@ BITCOIN_CORE_H = \
   evo/specialtx.h \
   evo/providertx.h \
   evo/deterministicmns.h \
+  evo/cbtx.h \
   privatesend.h \
   privatesend-client.h \
   privatesend-server.h \
@@ -224,6 +225,7 @@ libdash_server_a_SOURCES = \
   evo/specialtx.cpp \
   evo/providertx.cpp \
   evo/deterministicmns.cpp \
+  evo/cbtx.cpp \
   httprpc.cpp \
   httpserver.cpp \
   init.cpp \
diff --git a/src/evo/cbtx.cpp b/src/evo/cbtx.cpp
new file mode 100644
index 000000000000..2d48ab747196
--- /dev/null
+++ b/src/evo/cbtx.cpp
@@ -0,0 +1,47 @@
+// Copyright (c) 2017 The Dash Core developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+#include "cbtx.h"
+#include "specialtx.h"
+#include "deterministicmns.h"
+
+#include "validation.h"
+#include "univalue.h"
+
+bool CheckCbTx(const CTransaction& tx, const CBlockIndex* pindexPrev, CValidationState& state)
+{
+    AssertLockHeld(cs_main);
+
+    if (!tx.IsCoinBase())
+        return state.DoS(100, false, REJECT_INVALID, "bad-cbtx-invalid");
+
+    CCbTx cbTx;
+    if (!GetTxPayload(tx, cbTx))
+        return state.DoS(100, false, REJECT_INVALID, "bad-tx-payload");
+
+    if (cbTx.nVersion > CCbTx::CURRENT_VERSION)
+        return state.DoS(100, false, REJECT_INVALID, "bad-cbtx-version");
+
+    if (pindexPrev) {
+        if (pindexPrev->nHeight + 1 != cbTx.nHeight)
+            return state.DoS(100, false, REJECT_INVALID, "bad-cbtx-height");
+    }
+
+    return true;
+}
+
+std::string CCbTx::ToString() const
+{
+    return strprintf("CCbTx(nHeight=%d, nVersion=%d, merkleRootMNList=%s)",
+        nVersion, nHeight, merkleRootMNList.ToString());
+}
+
+void CCbTx::ToJson(UniValue& obj) const
+{
+    obj.clear();
+    obj.setObject();
+    obj.push_back(Pair("version", (int)nVersion));
+    obj.push_back(Pair("height", (int)nHeight));
+    obj.push_back(Pair("merkleRootMNList", merkleRootMNList.ToString()));
+}
diff --git a/src/evo/cbtx.h b/src/evo/cbtx.h
new file mode 100644
index 000000000000..5f780f927ae5
--- /dev/null
+++ b/src/evo/cbtx.h
@@ -0,0 +1,42 @@
+// Copyright (c) 2017 The Dash Core developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+#ifndef DASH_CBTX_H
+#define DASH_CBTX_H
+
+#include "primitives/transaction.h"
+#include "consensus/validation.h"
+
+class CBlockIndex;
+class UniValue;
+
+// coinbase transaction
+class CCbTx
+{
+public:
+    static const uint16_t CURRENT_VERSION = 1;
+
+public:
+    uint16_t nVersion{CURRENT_VERSION};
+    int32_t nHeight{0};
+    uint256 merkleRootMNList;
+
+public:
+    ADD_SERIALIZE_METHODS;
+
+    template <typename Stream, typename Operation>
+    inline void SerializationOp(Stream& s, Operation ser_action)
+    {
+        READWRITE(nVersion);
+        READWRITE(nHeight);
+        READWRITE(merkleRootMNList);
+    }
+
+    std::string ToString() const;
+    void ToJson(UniValue& obj) const;
+};
+
+bool CheckCbTx(const CTransaction& tx, const CBlockIndex* pindexPrev, CValidationState& state);
+
+#endif//DASH_CBTX_H
diff --git a/src/evo/specialtx.cpp b/src/evo/specialtx.cpp
index eb174bdb3612..f602e9b130de 100644
--- a/src/evo/specialtx.cpp
+++ b/src/evo/specialtx.cpp
@@ -12,6 +12,7 @@
 
 #include "specialtx.h"
 #include "deterministicmns.h"
+#include "cbtx.h"
 
 bool CheckSpecialTx(const CTransaction& tx, const CBlockIndex* pindexPrev, CValidationState& state)
 {
@@ -33,6 +34,8 @@ bool CheckSpecialTx(const CTransaction& tx, const CBlockIndex* pindexPrev, CVali
             return CheckProUpRegTx(tx, pindexPrev, state);
         case TRANSACTION_PROVIDER_UPDATE_REVOKE:
             return CheckProUpRevTx(tx, pindexPrev, state);
+        case TRANSACTION_COINBASE:
+            return CheckCbTx(tx, pindexPrev, state);
     }
 
     return state.DoS(10, false, REJECT_INVALID, "bad-tx-type");
@@ -49,6 +52,8 @@ bool ProcessSpecialTx(const CTransaction& tx, const CBlockIndex* pindex, CValida
         case TRANSACTION_PROVIDER_UPDATE_REGISTRAR:
         case TRANSACTION_PROVIDER_UPDATE_REVOKE:
             return true; // handled in batches per block
+        case TRANSACTION_COINBASE:
+            return true; // nothing to do
     }
 
     return state.DoS(100, false, REJECT_INVALID, "bad-tx-type");
@@ -65,6 +70,8 @@ bool UndoSpecialTx(const CTransaction& tx, const CBlockIndex* pindex)
         case TRANSACTION_PROVIDER_UPDATE_REGISTRAR:
         case TRANSACTION_PROVIDER_UPDATE_REVOKE:
             return true; // handled in batches per block
+        case TRANSACTION_COINBASE:
+            return true; // nothing to do
     }
 
     return false;
diff --git a/src/miner.cpp b/src/miner.cpp
index 73a127125338..afb9cf6417e6 100644
--- a/src/miner.cpp
+++ b/src/miner.cpp
@@ -28,6 +28,9 @@
 #include "masternode-sync.h"
 #include "validationinterface.h"
 
+#include "evo/specialtx.h"
+#include "evo/cbtx.h"
+
 #include <algorithm>
 #include <boost/thread.hpp>
 #include <boost/tuple/tuple.hpp>
@@ -126,6 +129,9 @@ std::unique_ptr<CBlockTemplate> BlockAssembler::CreateNewBlock(const CScript& sc
     pblocktemplate->vTxSigOps.push_back(-1); // updated at end
 
     LOCK2(cs_main, mempool.cs);
+
+    bool fDIP0003Active_context = VersionBitsState(chainActive.Tip(), chainparams.GetConsensus(), Consensus::DEPLOYMENT_DIP0003, versionbitscache) == THRESHOLD_ACTIVE;
+
     CBlockIndex* pindexPrev = chainActive.Tip();
     nHeight = pindexPrev->nHeight + 1;
 
@@ -166,7 +172,19 @@ std::unique_ptr<CBlockTemplate> BlockAssembler::CreateNewBlock(const CScript& sc
 
     // Compute regular coinbase transaction.
     coinbaseTx.vout[0].nValue = blockReward;
-    coinbaseTx.vin[0].scriptSig = CScript() << nHeight << OP_0;
+
+    if (!fDIP0003Active_context) {
+        coinbaseTx.vin[0].scriptSig = CScript() << nHeight << OP_0;
+    } else {
+        coinbaseTx.vin[0].scriptSig = CScript() << OP_RETURN;
+
+        coinbaseTx.nVersion = 3;
+        coinbaseTx.nType = TRANSACTION_COINBASE;
+
+        CCbTx cbTx;
+        cbTx.nHeight = nHeight;
+        SetTxPayload(coinbaseTx, cbTx);
+    }
 
     // Update coinbase transaction with additional info about masternode and governance payments,
     // get some info back to pass to getblocktemplate
diff --git a/src/primitives/transaction.h b/src/primitives/transaction.h
index 71ad59880411..e65795d19c19 100644
--- a/src/primitives/transaction.h
+++ b/src/primitives/transaction.h
@@ -18,6 +18,7 @@ enum {
     TRANSACTION_PROVIDER_UPDATE_SERVICE = 2,
     TRANSACTION_PROVIDER_UPDATE_REGISTRAR = 3,
     TRANSACTION_PROVIDER_UPDATE_REVOKE = 4,
+    TRANSACTION_COINBASE = 5,
 };
 
 /** An outpoint - a combination of a transaction hash and an index n into its vout */
diff --git a/src/rpc/rawtransaction.cpp b/src/rpc/rawtransaction.cpp
index 4818338c5b7b..a98a2a48c742 100644
--- a/src/rpc/rawtransaction.cpp
+++ b/src/rpc/rawtransaction.cpp
@@ -31,6 +31,7 @@
 
 #include "evo/specialtx.h"
 #include "evo/providertx.h"
+#include "evo/cbtx.h"
 
 #include <stdint.h>
 
@@ -158,6 +159,13 @@ void TxToJSON(const CTransaction& tx, const uint256 hashBlock, UniValue& entry)
             proTx.ToJson(proTxObj);
             entry.push_back(Pair("proUpRevTx", proTxObj));
         }
+    } else if (tx.nType == TRANSACTION_COINBASE) {
+        CCbTx cbTx;
+        if (GetTxPayload(tx, cbTx)) {
+            UniValue proTxObj;
+            cbTx.ToJson(proTxObj);
+            entry.push_back(Pair("cbTx", proTxObj));
+        }
     }
 
     if (!hashBlock.IsNull()) {
diff --git a/src/validation.cpp b/src/validation.cpp
index c38b84a6c326..405379aa32f7 100644
--- a/src/validation.cpp
+++ b/src/validation.cpp
@@ -45,6 +45,7 @@
 #include "evo/specialtx.h"
 #include "evo/providertx.h"
 #include "evo/deterministicmns.h"
+#include "evo/cbtx.h"
 
 #include <atomic>
 #include <sstream>
@@ -550,7 +551,12 @@ bool CheckTransaction(const CTransaction& tx, CValidationState &state, bool fChe
 
     if (tx.IsCoinBase())
     {
-        if (tx.vin[0].scriptSig.size() < 2 || tx.vin[0].scriptSig.size() > 100)
+        int minCbSize = 2;
+        if (tx.nType == TRANSACTION_COINBASE) {
+            // With the introduction of CbTx, coinbase scripts are not required anymore to hold a valid block height
+            minCbSize = 1;
+        }
+        if (tx.vin[0].scriptSig.size() < minCbSize || tx.vin[0].scriptSig.size() > 100)
             return state.DoS(100, false, REJECT_INVALID, "bad-cb-length");
     }
     else
@@ -576,10 +582,11 @@ bool ContextualCheckTransaction(const CTransaction& tx, CValidationState &state,
                 tx.nType != TRANSACTION_PROVIDER_REGISTER &&
                 tx.nType != TRANSACTION_PROVIDER_UPDATE_SERVICE &&
                 tx.nType != TRANSACTION_PROVIDER_UPDATE_REGISTRAR &&
-                tx.nType != TRANSACTION_PROVIDER_UPDATE_REVOKE) {
+                tx.nType != TRANSACTION_PROVIDER_UPDATE_REVOKE &&
+                tx.nType != TRANSACTION_COINBASE) {
                 return state.DoS(100, false, REJECT_INVALID, "bad-txns-type");
             }
-            if (tx.IsCoinBase() && tx.nType != TRANSACTION_NORMAL)
+            if (tx.IsCoinBase() && tx.nType != TRANSACTION_COINBASE)
                 return state.DoS(100, false, REJECT_INVALID, "bad-txns-cb-type");
         } else if (tx.nType != TRANSACTION_NORMAL) {
             return state.DoS(100, false, REJECT_INVALID, "bad-txns-type");
@@ -3513,6 +3520,7 @@ bool ContextualCheckBlock(const CBlock& block, CValidationState& state, const Co
                               : block.GetBlockTime();
 
     bool fDIP0001Active_context = nHeight >= Params().GetConsensus().DIP0001Height;
+    bool fDIP0003Active_context = VersionBitsState(pindexPrev, consensusParams, Consensus::DEPLOYMENT_DIP0003, versionbitscache) == THRESHOLD_ACTIVE;
 
     // Size limits
     unsigned int nMaxBlockSize = MaxBlockSize(fDIP0001Active_context);
@@ -3537,7 +3545,9 @@ bool ContextualCheckBlock(const CBlock& block, CValidationState& state, const Co
         return state.DoS(10, false, REJECT_INVALID, "bad-blk-sigops", false, "out-of-bounds SigOpCount");
 
     // Enforce rule that the coinbase starts with serialized block height
-    if (nHeight >= consensusParams.BIP34Height)
+    // After DIP3/DIP4 activation, we don't enforce the height in the input script anymore.
+    // The CbTx special transaction payload will then contain the height, which is checked in CheckCbTx
+    if (nHeight >= consensusParams.BIP34Height && !fDIP0003Active_context)
     {
         CScript expect = CScript() << nHeight;
         if (block.vtx[0]->vin[0].scriptSig.size() < expect.size() ||
@@ -3546,6 +3556,12 @@ bool ContextualCheckBlock(const CBlock& block, CValidationState& state, const Co
         }
     }
 
+    if (fDIP0003Active_context) {
+        if (block.vtx[0]->nType != TRANSACTION_COINBASE) {
+            return state.DoS(100, false, REJECT_INVALID, "bad-cb-type", false, "coinbase is not a CbTx");
+        }
+    }
+
     return true;
 }
 

From bcc0719578f0e7aa20d9215471d6ee390fab5100 Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Mon, 9 Apr 2018 10:35:43 +0200
Subject: [PATCH 095/400] Calculate and enforce DIP4 masternodes merkle root in
 CbTx

Also add "coinbase_payload" field to block templates
---
 qa/rpc-tests/test_framework/mininode.py | 28 +++++++++++
 src/Makefile.am                         |  2 +
 src/evo/cbtx.cpp                        | 42 ++++++++++++++++
 src/evo/cbtx.h                          |  4 ++
 src/evo/simplifiedmns.cpp               | 67 +++++++++++++++++++++++++
 src/evo/simplifiedmns.h                 | 61 ++++++++++++++++++++++
 src/evo/specialtx.cpp                   |  3 ++
 src/miner.cpp                           |  8 +++
 src/rpc/blockchain.cpp                  | 11 ++++
 src/rpc/mining.cpp                      |  5 ++
 10 files changed, 231 insertions(+)
 create mode 100644 src/evo/simplifiedmns.cpp
 create mode 100644 src/evo/simplifiedmns.h

diff --git a/qa/rpc-tests/test_framework/mininode.py b/qa/rpc-tests/test_framework/mininode.py
index d2fd22718d64..504fc77e514d 100755
--- a/qa/rpc-tests/test_framework/mininode.py
+++ b/qa/rpc-tests/test_framework/mininode.py
@@ -793,6 +793,34 @@ def __repr__(self):
         return "BlockTransactions(hash=%064x transactions=%s)" % (self.blockhash, repr(self.transactions))
 
 
+class CCbTx(object):
+    def __init__(self, version=None, height=None, merkleRootMNList=None):
+        self.set_null()
+        if version is not None:
+            self.version = version
+        if height is not None:
+            self.height = height
+        if merkleRootMNList is not None:
+            self.merkleRootMNList = merkleRootMNList
+
+    def set_null(self):
+        self.version = 0
+        self.height = 0
+        self.merkleRootMNList = None
+
+    def deserialize(self, f):
+        self.version = struct.unpack("<H", f.read(2))[0]
+        self.height = struct.unpack("<i", f.read(4))[0]
+        self.merkleRootMNList = deser_uint256(f)
+
+    def serialize(self):
+        r = b""
+        r += struct.pack("<H", self.version)
+        r += struct.pack("<i", self.height)
+        r += ser_uint256(self.merkleRootMNList)
+        return r
+
+
 # Objects that correspond to messages on the wire
 class msg_version(object):
     command = b"version"
diff --git a/src/Makefile.am b/src/Makefile.am
index 5bb89bf6ca8a..e5fea8696a6b 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -111,6 +111,7 @@ BITCOIN_CORE_H = \
   evo/providertx.h \
   evo/deterministicmns.h \
   evo/cbtx.h \
+  evo/simplifiedmns.h \
   privatesend.h \
   privatesend-client.h \
   privatesend-server.h \
@@ -226,6 +227,7 @@ libdash_server_a_SOURCES = \
   evo/providertx.cpp \
   evo/deterministicmns.cpp \
   evo/cbtx.cpp \
+  evo/simplifiedmns.cpp \
   httprpc.cpp \
   httpserver.cpp \
   init.cpp \
diff --git a/src/evo/cbtx.cpp b/src/evo/cbtx.cpp
index 2d48ab747196..85a56aae7439 100644
--- a/src/evo/cbtx.cpp
+++ b/src/evo/cbtx.cpp
@@ -5,6 +5,7 @@
 #include "cbtx.h"
 #include "specialtx.h"
 #include "deterministicmns.h"
+#include "simplifiedmns.h"
 
 #include "validation.h"
 #include "univalue.h"
@@ -31,6 +32,47 @@ bool CheckCbTx(const CTransaction& tx, const CBlockIndex* pindexPrev, CValidatio
     return true;
 }
 
+// This can only be done after the block has been fully processed, as otherwise we won't have the finished MN list
+bool CheckCbTxMerkleRootMNList(const CBlock& block, const CBlockIndex* pindex, CValidationState& state)
+{
+    AssertLockHeld(cs_main);
+
+    if (block.vtx[0]->nType != TRANSACTION_COINBASE)
+        return true;
+
+    CCbTx cbTx;
+    if (!GetTxPayload(*block.vtx[0], cbTx))
+        return state.DoS(100, false, REJECT_INVALID, "bad-tx-payload");
+
+    if (pindex) {
+        uint256 calculatedMerkleRoot;
+        if (!CalcCbTxMerkleRootMNList(block, pindex->pprev, calculatedMerkleRoot, state)) {
+            return state.DoS(100, false, REJECT_INVALID, "bad-cbtx-mnmerkleroot");
+        }
+        if (calculatedMerkleRoot != cbTx.merkleRootMNList) {
+            return state.DoS(100, false, REJECT_INVALID, "bad-cbtx-mnmerkleroot");
+        }
+    }
+
+    return true;
+}
+
+bool CalcCbTxMerkleRootMNList(const CBlock& block, const CBlockIndex* pindexPrev, uint256& merkleRootRet, CValidationState& state)
+{
+    AssertLockHeld(cs_main);
+    LOCK(deterministicMNManager->cs);
+
+    CDeterministicMNList tmpMNList;
+    if (!deterministicMNManager->BuildNewListFromBlock(block, pindexPrev, state, tmpMNList)) {
+        return false;
+    }
+
+    CSimplifiedMNList sml(tmpMNList);
+    bool mutated = false;
+    merkleRootRet = sml.CalcMerkleRoot(&mutated);
+    return !mutated;
+}
+
 std::string CCbTx::ToString() const
 {
     return strprintf("CCbTx(nHeight=%d, nVersion=%d, merkleRootMNList=%s)",
diff --git a/src/evo/cbtx.h b/src/evo/cbtx.h
index 5f780f927ae5..0cc508bfa323 100644
--- a/src/evo/cbtx.h
+++ b/src/evo/cbtx.h
@@ -8,6 +8,7 @@
 #include "primitives/transaction.h"
 #include "consensus/validation.h"
 
+class CBlock;
 class CBlockIndex;
 class UniValue;
 
@@ -39,4 +40,7 @@ class CCbTx
 
 bool CheckCbTx(const CTransaction& tx, const CBlockIndex* pindexPrev, CValidationState& state);
 
+bool CheckCbTxMerkleRootMNList(const CBlock& block, const CBlockIndex* pindex, CValidationState& state);
+bool CalcCbTxMerkleRootMNList(const CBlock& block, const CBlockIndex* pindexPrev, uint256& merkleRootRet, CValidationState& state);
+
 #endif//DASH_CBTX_H
diff --git a/src/evo/simplifiedmns.cpp b/src/evo/simplifiedmns.cpp
new file mode 100644
index 000000000000..8ec41edce3a9
--- /dev/null
+++ b/src/evo/simplifiedmns.cpp
@@ -0,0 +1,67 @@
+// Copyright (c) 2017 The Dash Core developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+#include "simplifiedmns.h"
+#include "specialtx.h"
+#include "deterministicmns.h"
+
+#include "validation.h"
+#include "univalue.h"
+#include "consensus/merkle.h"
+
+CSimplifiedMNListEntry::CSimplifiedMNListEntry(const CDeterministicMN& dmn) :
+    proRegTxHash(dmn.proTxHash),
+    service(dmn.pdmnState->addr),
+    keyIDOperator(dmn.pdmnState->keyIDOperator),
+    keyIDVoting(dmn.pdmnState->keyIDVoting),
+    isValid(dmn.pdmnState->nPoSeBanHeight == -1)
+{
+}
+
+uint256 CSimplifiedMNListEntry::CalcHash() const
+{
+    CHashWriter hw(SER_GETHASH, CLIENT_VERSION);
+    hw << *this;
+    return hw.GetHash();
+}
+
+std::string CSimplifiedMNListEntry::ToString() const
+{
+    return strprintf("CSimplifiedMNListEntry(proRegTxHash=%s, service=%s, keyIDOperator=%s, keyIDVoting=%s, isValie=%d)",
+        proRegTxHash.ToString(), service.ToString(false), keyIDOperator.ToString(), keyIDVoting.ToString(), isValid);
+}
+
+void CSimplifiedMNListEntry::ToJson(UniValue& obj) const
+{
+    obj.clear();
+    obj.setObject();
+    obj.push_back(Pair("proRegTxHash", proRegTxHash.ToString()));
+    obj.push_back(Pair("service", service.ToString(false)));
+    obj.push_back(Pair("keyIDOperator", keyIDOperator.ToString()));
+    obj.push_back(Pair("keyIDVoting", keyIDOperator.ToString()));
+    obj.push_back(Pair("isValid", isValid));
+}
+
+CSimplifiedMNList::CSimplifiedMNList(const CDeterministicMNList& dmnList)
+{
+    mnList.reserve(dmnList.all_count());
+
+    for (const auto& dmn : dmnList.all_range()) {
+        mnList.emplace_back(*dmn);
+    }
+
+    std::sort(mnList.begin(), mnList.end(), [&](const CSimplifiedMNListEntry& a, const CSimplifiedMNListEntry& b) {
+        return a.proRegTxHash.Compare(b.proRegTxHash) < 0;
+    });
+}
+
+uint256 CSimplifiedMNList::CalcMerkleRoot(bool *pmutated) const
+{
+    std::vector<uint256> leaves;
+    leaves.reserve(mnList.size());
+    for (const auto& e : mnList) {
+        leaves.emplace_back(e.CalcHash());
+    }
+    return ComputeMerkleRoot(leaves, pmutated);
+}
diff --git a/src/evo/simplifiedmns.h b/src/evo/simplifiedmns.h
new file mode 100644
index 000000000000..0674a29cb041
--- /dev/null
+++ b/src/evo/simplifiedmns.h
@@ -0,0 +1,61 @@
+// Copyright (c) 2017 The Dash Core developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+#ifndef DASH_SIMPLIFIEDMNS_H
+#define DASH_SIMPLIFIEDMNS_H
+
+#include "serialize.h"
+#include "pubkey.h"
+#include "netaddress.h"
+
+class UniValue;
+class CDeterministicMNList;
+class CDeterministicMN;
+
+class CSimplifiedMNListEntry
+{
+public:
+    uint256 proRegTxHash;
+    CService service;
+    CKeyID keyIDOperator;
+    CKeyID keyIDVoting;
+    bool isValid;
+
+public:
+    CSimplifiedMNListEntry() {}
+    CSimplifiedMNListEntry(const CDeterministicMN& dmn);
+
+public:
+    ADD_SERIALIZE_METHODS;
+
+    template <typename Stream, typename Operation>
+    inline void SerializationOp(Stream& s, Operation ser_action)
+    {
+        READWRITE(proRegTxHash);
+        READWRITE(service);
+        READWRITE(keyIDOperator);
+        READWRITE(keyIDVoting);
+        READWRITE(isValid);
+    }
+
+public:
+    uint256 CalcHash() const;
+
+    std::string ToString() const;
+    void ToJson(UniValue& obj) const;
+};
+
+class CSimplifiedMNList
+{
+public:
+    std::vector<CSimplifiedMNListEntry> mnList;
+
+public:
+    CSimplifiedMNList() {}
+    CSimplifiedMNList(const CDeterministicMNList& dmnList);
+
+    uint256 CalcMerkleRoot(bool *pmutated = NULL) const;
+};
+
+#endif//DASH_SIMPLIFIEDMNS_H
diff --git a/src/evo/specialtx.cpp b/src/evo/specialtx.cpp
index f602e9b130de..c6622a5a4ba3 100644
--- a/src/evo/specialtx.cpp
+++ b/src/evo/specialtx.cpp
@@ -90,6 +90,9 @@ bool ProcessSpecialTxsInBlock(const CBlock& block, const CBlockIndex* pindex, CV
     if (!deterministicMNManager->ProcessBlock(block, pindex->pprev, state))
         return false;
 
+    if (!CheckCbTxMerkleRootMNList(block, pindex, state))
+        return false;
+
     return true;
 }
 
diff --git a/src/miner.cpp b/src/miner.cpp
index afb9cf6417e6..413ba197ad1f 100644
--- a/src/miner.cpp
+++ b/src/miner.cpp
@@ -30,6 +30,8 @@
 
 #include "evo/specialtx.h"
 #include "evo/cbtx.h"
+#include "evo/simplifiedmns.h"
+#include "evo/deterministicmns.h"
 
 #include <algorithm>
 #include <boost/thread.hpp>
@@ -183,6 +185,12 @@ std::unique_ptr<CBlockTemplate> BlockAssembler::CreateNewBlock(const CScript& sc
 
         CCbTx cbTx;
         cbTx.nHeight = nHeight;
+
+        CValidationState state;
+        if (!CalcCbTxMerkleRootMNList(*pblock, pindexPrev, cbTx.merkleRootMNList, state)) {
+            throw std::runtime_error(strprintf("%s: CalcSMLMerkleRootForNewBlock failed: %s", __func__, FormatStateMessage(state)));
+        }
+
         SetTxPayload(coinbaseTx, cbTx);
     }
 
diff --git a/src/rpc/blockchain.cpp b/src/rpc/blockchain.cpp
index de5aee549dcf..582e47e353f7 100644
--- a/src/rpc/blockchain.cpp
+++ b/src/rpc/blockchain.cpp
@@ -23,6 +23,9 @@
 #include "utilstrencodings.h"
 #include "hash.h"
 
+#include "evo/specialtx.h"
+#include "evo/cbtx.h"
+
 #include <stdint.h>
 
 #include <univalue.h>
@@ -131,6 +134,14 @@ UniValue blockToJSON(const CBlock& block, const CBlockIndex* blockindex, bool tx
             txs.push_back(tx->GetHash().GetHex());
     }
     result.push_back(Pair("tx", txs));
+    if (!block.vtx[0]->vExtraPayload.empty()) {
+        CCbTx cbTx;
+        if (GetTxPayload(block.vtx[0]->vExtraPayload, cbTx)) {
+            UniValue cbTxObj;
+            cbTx.ToJson(cbTxObj);
+            result.push_back(Pair("cbTx", cbTxObj));
+        }
+    }
     result.push_back(Pair("time", block.GetBlockTime()));
     result.push_back(Pair("mediantime", (int64_t)blockindex->GetMedianTimePast()));
     result.push_back(Pair("nonce", (uint64_t)block.nNonce));
diff --git a/src/rpc/mining.cpp b/src/rpc/mining.cpp
index b0f83b225bc3..7a3a4bfb3923 100644
--- a/src/rpc/mining.cpp
+++ b/src/rpc/mining.cpp
@@ -28,6 +28,9 @@
 #include "masternode-payments.h"
 #include "masternode-sync.h"
 
+#include "evo/specialtx.h"
+#include "evo/cbtx.h"
+
 #include <memory>
 #include <stdint.h>
 
@@ -736,6 +739,8 @@ UniValue getblocktemplate(const JSONRPCRequest& request)
     result.push_back(Pair("superblocks_started", pindexPrev->nHeight + 1 > consensusParams.nSuperblockStartBlock));
     result.push_back(Pair("superblocks_enabled", sporkManager.IsSporkActive(SPORK_9_SUPERBLOCKS_ENABLED)));
 
+    result.push_back(Pair("coinbase_payload", HexStr(pblock->vtx[0]->vExtraPayload)));
+
     return result;
 }
 

From d3ac86206c24682831d0ed6fd1b1d365cf93c0dd Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Mon, 9 Apr 2018 14:49:34 +0200
Subject: [PATCH 096/400] Implement GETMNLISTDIFF and MNLISTDIFF P2P messages

Also add "protx diff" RPC
---
 src/evo/simplifiedmns.cpp | 96 +++++++++++++++++++++++++++++++++++++++
 src/evo/simplifiedmns.h   | 50 ++++++++++++++++++++
 src/net_processing.cpp    | 19 ++++++++
 src/protocol.cpp          |  4 ++
 src/protocol.h            |  2 +
 src/rpc/rpcevo.cpp        | 58 +++++++++++++++++++++++
 6 files changed, 229 insertions(+)

diff --git a/src/evo/simplifiedmns.cpp b/src/evo/simplifiedmns.cpp
index 8ec41edce3a9..0be8f689cac3 100644
--- a/src/evo/simplifiedmns.cpp
+++ b/src/evo/simplifiedmns.cpp
@@ -5,10 +5,12 @@
 #include "simplifiedmns.h"
 #include "specialtx.h"
 #include "deterministicmns.h"
+#include "cbtx.h"
 
 #include "validation.h"
 #include "univalue.h"
 #include "consensus/merkle.h"
+#include "chainparams.h"
 
 CSimplifiedMNListEntry::CSimplifiedMNListEntry(const CDeterministicMN& dmn) :
     proRegTxHash(dmn.proTxHash),
@@ -65,3 +67,97 @@ uint256 CSimplifiedMNList::CalcMerkleRoot(bool *pmutated) const
     }
     return ComputeMerkleRoot(leaves, pmutated);
 }
+
+void CSimplifiedMNListDiff::ToJson(UniValue& obj) const
+{
+    obj.setObject();
+
+    obj.push_back(Pair("baseBlockHash", baseBlockHash.ToString()));
+    obj.push_back(Pair("blockHash", blockHash.ToString()));
+
+    UniValue deletedMNsArr(UniValue::VARR);
+    for (const auto& h : deletedMNs) {
+        deletedMNsArr.push_back(h.ToString());
+    }
+    obj.push_back(Pair("deletedMNs", deletedMNsArr));
+
+    UniValue mnListArr(UniValue::VARR);
+    for (const auto& e : mnList) {
+        UniValue eObj;
+        e.ToJson(eObj);
+        mnListArr.push_back(eObj);
+    }
+    obj.push_back(Pair("mnList", mnListArr));
+
+    CCbTx cbTxPayload;
+    if (GetTxPayload(*cbTx, cbTxPayload)) {
+        obj.push_back(Pair("merkleRootMNList", cbTxPayload.merkleRootMNList.ToString()));
+    }
+}
+
+bool BuildSimplifiedMNListDiff(const uint256& baseBlockHash, const uint256& blockHash, CSimplifiedMNListDiff& mnListDiffRet, std::string& errorRet)
+{
+    AssertLockHeld(cs_main);
+    mnListDiffRet = CSimplifiedMNListDiff();
+
+    BlockMap::iterator baseBlockIt = mapBlockIndex.begin();
+    if (!baseBlockHash.IsNull()) {
+        baseBlockIt = mapBlockIndex.find(baseBlockHash);
+    }
+    auto blockIt = mapBlockIndex.find(blockHash);
+    if (baseBlockIt == mapBlockIndex.end()) {
+        errorRet = strprintf("block %s not found", baseBlockHash.ToString());
+        return false;
+    }
+    if (blockIt == mapBlockIndex.end()) {
+        errorRet = strprintf("block %s not found", blockHash.ToString());
+        return false;
+    }
+
+    if (!chainActive.Contains(baseBlockIt->second) || !chainActive.Contains(blockIt->second)) {
+        errorRet = strprintf("block %s and %s are not in the same chain", baseBlockHash.ToString(), blockHash.ToString());
+        return false;
+    }
+    if (baseBlockIt->second->nHeight > blockIt->second->nHeight) {
+        errorRet = strprintf("base block %s is higher then block %s", baseBlockHash.ToString(), blockHash.ToString());
+        return false;
+    }
+
+    LOCK(deterministicMNManager->cs);
+
+    auto baseDmnList = deterministicMNManager->GetListForBlock(baseBlockHash);
+    auto dmnList = deterministicMNManager->GetListForBlock(blockHash);
+    auto dmnDiff = baseDmnList.BuildDiff(dmnList);
+
+    // TODO store coinbase TX in CBlockIndex
+    CBlock block;
+    if (!ReadBlockFromDisk(block, blockIt->second, Params().GetConsensus())) {
+        errorRet = strprintf("failed to read block %s from disk", blockHash.ToString());
+        return false;
+    }
+
+    mnListDiffRet.baseBlockHash = baseBlockHash;
+    mnListDiffRet.blockHash = blockHash;
+    mnListDiffRet.cbTx = block.vtx[0];
+
+    std::vector<uint256> vHashes;
+    std::vector<bool> vMatch(block.vtx.size(), false);
+    for (const auto& tx : block.vtx) {
+        vHashes.emplace_back(tx->GetHash());
+    }
+    vMatch[0] = true; // only coinbase matches
+    mnListDiffRet.cbTxMerkleTree = CPartialMerkleTree(vHashes, vMatch);
+    mnListDiffRet.deletedMNs.assign(dmnDiff.removedMns.begin(), dmnDiff.removedMns.end());
+
+    for (const auto& p : dmnDiff.addedMNs) {
+        mnListDiffRet.mnList.emplace_back(*p.second);
+    }
+    for (const auto& p : dmnDiff.updatedMNs) {
+        const auto& dmn = dmnList.GetMN(p.first);
+        CDeterministicMN newDmn(*dmn);
+        newDmn.pdmnState = p.second;
+        mnListDiffRet.mnList.emplace_back(newDmn);
+    }
+
+    return true;
+}
diff --git a/src/evo/simplifiedmns.h b/src/evo/simplifiedmns.h
index 0674a29cb041..00a701b65a2c 100644
--- a/src/evo/simplifiedmns.h
+++ b/src/evo/simplifiedmns.h
@@ -8,6 +8,7 @@
 #include "serialize.h"
 #include "pubkey.h"
 #include "netaddress.h"
+#include "merkleblock.h"
 
 class UniValue;
 class CDeterministicMNList;
@@ -58,4 +59,53 @@ class CSimplifiedMNList
     uint256 CalcMerkleRoot(bool *pmutated = NULL) const;
 };
 
+/// P2P messages
+
+class CGetSimplifiedMNListDiff
+{
+public:
+    uint256 baseBlockHash;
+    uint256 blockHash;
+
+public:
+    ADD_SERIALIZE_METHODS;
+
+    template <typename Stream, typename Operation>
+    inline void SerializationOp(Stream& s, Operation ser_action)
+    {
+        READWRITE(baseBlockHash);
+        READWRITE(blockHash);
+    }
+};
+
+class CSimplifiedMNListDiff
+{
+public:
+    uint256 baseBlockHash;
+    uint256 blockHash;
+    CPartialMerkleTree cbTxMerkleTree;
+    CTransactionRef cbTx;
+    std::vector<uint256> deletedMNs;
+    std::vector<CSimplifiedMNListEntry> mnList;
+
+public:
+    ADD_SERIALIZE_METHODS;
+
+    template <typename Stream, typename Operation>
+    inline void SerializationOp(Stream& s, Operation ser_action)
+    {
+        READWRITE(baseBlockHash);
+        READWRITE(blockHash);
+        READWRITE(cbTxMerkleTree);
+        READWRITE(cbTx);
+        READWRITE(deletedMNs);
+        READWRITE(mnList);
+    }
+
+public:
+    void ToJson(UniValue& obj) const;
+};
+
+bool BuildSimplifiedMNListDiff(const uint256& baseBlockHash, const uint256& blockHash, CSimplifiedMNListDiff& mnListDiffRet, std::string& errorRet);
+
 #endif//DASH_SIMPLIFIEDMNS_H
diff --git a/src/net_processing.cpp b/src/net_processing.cpp
index 01c5d0321bc8..63322c95aa1c 100644
--- a/src/net_processing.cpp
+++ b/src/net_processing.cpp
@@ -42,6 +42,8 @@
 #endif // ENABLE_WALLET
 #include "privatesend-server.h"
 
+#include "evo/simplifiedmns.h"
+
 #include <boost/thread.hpp>
 
 #if defined(NDEBUG)
@@ -2818,6 +2820,23 @@ bool static ProcessMessage(CNode* pfrom, const std::string& strCommand, CDataStr
     }
 
 
+    else if (strCommand == NetMsgType::GETMNLISTDIFF) {
+        CGetSimplifiedMNListDiff cmd;
+        vRecv >> cmd;
+
+        LOCK(cs_main);
+
+        CSimplifiedMNListDiff mnListDiff;
+        std::string strError;
+        if (BuildSimplifiedMNListDiff(cmd.baseBlockHash, cmd.blockHash, mnListDiff, strError)) {
+            connman.PushMessage(pfrom, msgMaker.Make(NetMsgType::MNLISTDIFF, mnListDiff));
+        } else {
+            LogPrint("net", "getmnlistdiff failed for baseBlockHash=%s, blockHash=%s. error=%s\n", cmd.baseBlockHash.ToString(), cmd.blockHash.ToString(), strError);
+            Misbehaving(pfrom->id, 1);
+        }
+    }
+
+
     else if (strCommand == NetMsgType::NOTFOUND) {
         // We do not care about the NOTFOUND message, but logging an Unknown Command
         // message would be undesirable as we transmit it ourselves.
diff --git a/src/protocol.cpp b/src/protocol.cpp
index 4cd85e24de88..fac2fab6e707 100644
--- a/src/protocol.cpp
+++ b/src/protocol.cpp
@@ -69,6 +69,8 @@ const char *MNGOVERNANCESYNC="govsync";
 const char *MNGOVERNANCEOBJECT="govobj";
 const char *MNGOVERNANCEOBJECTVOTE="govobjvote";
 const char *MNVERIFY="mnv";
+const char *GETMNLISTDIFF="getmnlistd";
+const char *MNLISTDIFF="mnlistdiff";
 };
 
 static const char* ppszTypeName[] =
@@ -153,6 +155,8 @@ const static std::string allNetMessageTypes[] = {
     NetMsgType::MNGOVERNANCEOBJECT,
     NetMsgType::MNGOVERNANCEOBJECTVOTE,
     NetMsgType::MNVERIFY,
+    NetMsgType::GETMNLISTDIFF,
+    NetMsgType::MNLISTDIFF,
 };
 const static std::vector<std::string> allNetMessageTypesVec(allNetMessageTypes, allNetMessageTypes+ARRAYLEN(allNetMessageTypes));
 
diff --git a/src/protocol.h b/src/protocol.h
index dc7389dc8878..f1dccca68ed7 100644
--- a/src/protocol.h
+++ b/src/protocol.h
@@ -268,6 +268,8 @@ extern const char *MNGOVERNANCESYNC;
 extern const char *MNGOVERNANCEOBJECT;
 extern const char *MNGOVERNANCEOBJECTVOTE;
 extern const char *MNVERIFY;
+extern const char *GETMNLISTDIFF;
+extern const char *MNLISTDIFF;
 };
 
 /* Get a vector of all valid message types (see above) */
diff --git a/src/rpc/rpcevo.cpp b/src/rpc/rpcevo.cpp
index 3e75fb9333e2..177db49f0cd7 100644
--- a/src/rpc/rpcevo.cpp
+++ b/src/rpc/rpcevo.cpp
@@ -20,6 +20,7 @@
 #include "evo/specialtx.h"
 #include "evo/providertx.h"
 #include "evo/deterministicmns.h"
+#include "evo/simplifiedmns.h"
 
 #ifdef ENABLE_WALLET
 extern UniValue signrawtransaction(const JSONRPCRequest& request);
@@ -558,6 +559,60 @@ UniValue protx_list(const JSONRPCRequest& request)
     return ret;
 }
 
+void protx_diff_help()
+{
+    throw std::runtime_error(
+            "protx diff \"baseBlock\" \"block\"\n"
+            "\nCalculates a diff between two deterministic masternode lists. The result also contains proof data.\n"
+            "specified, it defaults to \"wallet\". All types have the optional argument \"detailed\" which if set to\n"
+            "\"true\" will result in a detailed list to be returned. If set to \"false\", only the hashes of the ProTx\n"
+            "will be returned.\n"
+            "\nAvailable types:\n"
+            "  wallet (detailed)              - List only ProTx which are found in your wallet. This will also include ProTx which\n"
+            "                                   failed PoSe verfication\n"
+            "  valid (height) (detailed)      - List only ProTx which are active/valid at the given chain height. If height is not\n"
+            "                                   specified, it defaults to the current chain-tip\n"
+            "  registered (height) (detaileD) - List all ProTx which are registered at the given chain height. If height is not\n"
+            "                                   specified, it defaults to the current chain-tip. This will also include ProTx\n"
+            "                                   which failed PoSe verification at that height\n"
+    );
+}
+
+static uint256 ParseBlock(const UniValue& v, std::string strName)
+{
+    AssertLockHeld(cs_main);
+
+    try {
+        return ParseHashV(v, strName);
+    } catch (...) {
+        int h = ParseInt32V(v, strName);
+        if (h < 1 || h > chainActive.Height())
+            throw std::runtime_error(strprintf("%s must be a block hash or chain height and not %s", strName, v.getValStr()));
+        return *chainActive[h]->phashBlock;
+    }
+}
+
+UniValue protx_diff(const JSONRPCRequest& request)
+{
+    if (request.fHelp || request.params.size() != 3)
+        protx_diff_help();
+
+    LOCK(cs_main);
+    uint256 baseBlockHash = ParseBlock(request.params[1], "baseBlock");
+    uint256 blockHash = ParseBlock(request.params[2], "block");
+
+    CSimplifiedMNListDiff mnListDiff;
+    std::string strError;
+    if (!BuildSimplifiedMNListDiff(baseBlockHash, blockHash, mnListDiff, strError)) {
+        throw std::runtime_error(strError);
+    }
+
+    UniValue ret;
+    mnListDiff.ToJson(ret);
+    return ret;
+}
+
+
 UniValue protx(const JSONRPCRequest& request)
 {
     if (request.params.empty()) {
@@ -573,6 +628,7 @@ UniValue protx(const JSONRPCRequest& request)
                 "  update_service    - Create and send ProUpServTx to network\n"
                 "  update_registrar  - Create and send ProUpRegTx to network\n"
                 "  revoke            - Create and send ProUpRevTx to network\n"
+                "  diff              - Calculate a diff and a proof between two masternode lists\n"
         );
     }
 
@@ -588,6 +644,8 @@ UniValue protx(const JSONRPCRequest& request)
         return protx_update_registrar(request);
     } else if (command == "revoke") {
         return protx_revoke(request);
+    } else if (command == "diff") {
+        return protx_diff(request);
     } else {
         throw std::runtime_error("invalid command: " + command);
     }

From c7f75afdd6556f50d8d16d84e06e7c4055c0265f Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Tue, 29 May 2018 14:13:50 +0200
Subject: [PATCH 097/400] Fix nulldummy tests by creating correct DIP4 coinbase
 transactions

---
 qa/rpc-tests/nulldummy.py                 | 3 ++-
 qa/rpc-tests/test_framework/blocktools.py | 7 ++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/qa/rpc-tests/nulldummy.py b/qa/rpc-tests/nulldummy.py
index d1e0457a4fbe..9d1543d96503 100755
--- a/qa/rpc-tests/nulldummy.py
+++ b/qa/rpc-tests/nulldummy.py
@@ -113,7 +113,8 @@ def tx_submit(self, node, tx, msg = ""):
 
 
     def block_submit(self, node, txs, accept = False):
-        block = create_block(self.tip, create_coinbase(self.lastblockheight + 1), self.lastblocktime + 1)
+        dip4_activated = self.lastblockheight + 1 >= 432
+        block = create_block(self.tip, create_coinbase(self.lastblockheight + 1, dip4_activated=dip4_activated), self.lastblocktime + 1)
         block.nVersion = 4
         for tx in txs:
             tx.rehash()
diff --git a/qa/rpc-tests/test_framework/blocktools.py b/qa/rpc-tests/test_framework/blocktools.py
index 6266318342d5..1db0e90deb7b 100644
--- a/qa/rpc-tests/test_framework/blocktools.py
+++ b/qa/rpc-tests/test_framework/blocktools.py
@@ -40,7 +40,7 @@ def serialize_script_num(value):
 # Create a coinbase transaction, assuming no miner fees.
 # If pubkey is passed in, the coinbase output will be a P2PK output;
 # otherwise an anyone-can-spend output.
-def create_coinbase(height, pubkey = None):
+def create_coinbase(height, pubkey = None, dip4_activated=False):
     coinbase = CTransaction()
     coinbase.vin.append(CTxIn(COutPoint(0, 0xffffffff), 
                 ser_string(serialize_script_num(height)), 0xffffffff))
@@ -53,6 +53,11 @@ def create_coinbase(height, pubkey = None):
     else:
         coinbaseoutput.scriptPubKey = CScript([OP_TRUE])
     coinbase.vout = [ coinbaseoutput ]
+    if dip4_activated:
+        coinbase.nVersion = 3
+        coinbase.nType = 5
+        cbtx_payload = CCbTx(1, height, 0)
+        coinbase.vExtraPayload = cbtx_payload.serialize()
     coinbase.calc_sha256()
     return coinbase
 

From fced9a4b86124139aa19cb5b6c7b581bb787998c Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Mon, 3 Sep 2018 10:45:37 +0200
Subject: [PATCH 098/400] Ban peers that send us MNLISTDIFF messages

These are only meant to be sent to SPV clients
---
 src/net_processing.cpp | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/net_processing.cpp b/src/net_processing.cpp
index 63322c95aa1c..d53c38bfd2a3 100644
--- a/src/net_processing.cpp
+++ b/src/net_processing.cpp
@@ -2837,6 +2837,14 @@ bool static ProcessMessage(CNode* pfrom, const std::string& strCommand, CDataStr
     }
 
 
+    else if (strCommand == NetMsgType::MNLISTDIFF) {
+        // we have never requested this
+        LOCK(cs_main);
+        Misbehaving(pfrom->id, 100);
+        LogPrint("net", "received not-requested mnlistdiff. peer=%d\n", pfrom->id);
+    }
+
+
     else if (strCommand == NetMsgType::NOTFOUND) {
         // We do not care about the NOTFOUND message, but logging an Unknown Command
         // message would be undesirable as we transmit it ourselves.

From 88e7888de96b3be734ae103352b1cfd21f3b013e Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Mon, 3 Sep 2018 12:17:41 +0200
Subject: [PATCH 099/400] Try using cache in GetListForBlock before reading
 from disk (#2253)

* Try using cache in GetListForBlock before reading from disk

* Use std::list for vecDiff
---
 src/evo/deterministicmns.cpp | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/evo/deterministicmns.cpp b/src/evo/deterministicmns.cpp
index dc15d7fa5919..f599dac1d141 100644
--- a/src/evo/deterministicmns.cpp
+++ b/src/evo/deterministicmns.cpp
@@ -506,9 +506,16 @@ CDeterministicMNList CDeterministicMNManager::GetListForBlock(const uint256& blo
 
     uint256 blockHashTmp = blockHash;
     CDeterministicMNList snapshot;
-    std::vector<CDeterministicMNListDiff> vecDiff;
+    std::list<CDeterministicMNListDiff> listDiff;
 
     while(true) {
+        // try using cache before reading from disk
+        it = mnListsCache.find(blockHashTmp);
+        if (it != mnListsCache.end()) {
+            snapshot = it->second;
+            break;
+        }
+
         if (evoDb.Read(std::make_pair(DB_LIST_SNAPSHOT, blockHashTmp), snapshot)) {
             break;
         }
@@ -519,11 +526,11 @@ CDeterministicMNList CDeterministicMNManager::GetListForBlock(const uint256& blo
             break;
         }
 
-        vecDiff.emplace(vecDiff.begin(), diff);
+        listDiff.emplace_front(diff);
         blockHashTmp = diff.prevBlockHash;
     }
 
-    for (const auto& diff : vecDiff) {
+    for (const auto& diff : listDiff) {
         if (diff.HasChanges()) {
             snapshot = snapshot.ApplyDiff(diff);
         } else {

From a5e65aa373ee05b3e41ee2019ff521141d7c33e4 Mon Sep 17 00:00:00 2001
From: UdjinM6 <UdjinM6@users.noreply.github.com>
Date: Mon, 3 Sep 2018 13:18:20 +0300
Subject: [PATCH 100/400] Erase mnListCache entry on UndoBlock (#2254)

---
 src/evo/deterministicmns.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/evo/deterministicmns.cpp b/src/evo/deterministicmns.cpp
index f599dac1d141..30ec29fd5f51 100644
--- a/src/evo/deterministicmns.cpp
+++ b/src/evo/deterministicmns.cpp
@@ -328,9 +328,11 @@ bool CDeterministicMNManager::UndoBlock(const CBlock& block, const CBlockIndex*
     LOCK(cs);
 
     int nHeight = pindex->nHeight;
+    uint256 blockHash = block.GetHash();
 
-    evoDb.Erase(std::make_pair(DB_LIST_DIFF, block.GetHash()));
-    evoDb.Erase(std::make_pair(DB_LIST_SNAPSHOT, block.GetHash()));
+    evoDb.Erase(std::make_pair(DB_LIST_DIFF, blockHash));
+    evoDb.Erase(std::make_pair(DB_LIST_SNAPSHOT, blockHash));
+    mnListsCache.erase(blockHash);
 
     if (nHeight == GetSpork15Value()) {
         LogPrintf("CDeterministicMNManager::%s -- spork15 is not active anymore. nHeight=%d\n", __func__, nHeight);

From d90b1399679849665bdbce5be2560be4ea6a5140 Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Thu, 15 Feb 2018 14:33:04 +0100
Subject: [PATCH 101/400] Implement CActiveDeterministicMasternodeManager

---
 src/activemasternode.cpp | 140 +++++++++++++++++++++++++++++++++++++++
 src/activemasternode.h   |  40 ++++++++++-
 src/init.cpp             |  10 +++
 3 files changed, 189 insertions(+), 1 deletion(-)

diff --git a/src/activemasternode.cpp b/src/activemasternode.cpp
index 662032558cdb..a84a970d5153 100644
--- a/src/activemasternode.cpp
+++ b/src/activemasternode.cpp
@@ -9,13 +9,144 @@
 #include "netbase.h"
 #include "protocol.h"
 #include "netbase.h"
+#include "warnings.h"
+#include "init.h"
+#include "evo/deterministicmns.h"
 
 // Keep track of the active Masternode
 CActiveMasternodeInfo activeMasternodeInfo;
 CActiveLegacyMasternodeManager legacyActiveMasternodeManager;
+CActiveDeterministicMasternodeManager* activeMasternodeManager;
+
+std::string CActiveDeterministicMasternodeManager::GetStateString() const
+{
+    switch (state) {
+        case MASTERNODE_WAITING_FOR_PROTX:  return "WAITING_FOR_PROTX";
+        case MASTERNODE_POSE_BANNED:        return "POSE_BANNED";
+        case MASTERNODE_REMOVED:            return "REMOVED";
+        case MASTERNODE_READY:              return "READY";
+        case MASTERNODE_ERROR:              return "ERROR";
+        default:                            return "UNKNOWN";
+    }
+}
+
+std::string CActiveDeterministicMasternodeManager::GetStatus() const
+{
+    switch (state) {
+        case MASTERNODE_WAITING_FOR_PROTX:  return "Waiting for ProTx to appear on-chain";
+        case MASTERNODE_POSE_BANNED:        return "Masternode was PoSe banned";
+        case MASTERNODE_REMOVED:            return "Masternode removed from list";
+        case MASTERNODE_READY:              return "Ready";
+        case MASTERNODE_ERROR:              return "Error. " + strError;
+        default:                            return "Unknown";
+    }
+}
+
+void CActiveDeterministicMasternodeManager::Init()
+{
+    LOCK(cs_main);
+
+    if (!fMasternodeMode)
+        return;
+
+    if (!deterministicMNManager->IsDeterministicMNsSporkActive())
+        return;
+
+    if (!GetLocalAddress(activeMasternodeInfo.service)) {
+        state = MASTERNODE_ERROR;
+        return;
+    }
+
+    CDeterministicMNList mnList = deterministicMNManager->GetListAtChainTip();
+
+    CDeterministicMNCPtr dmn = mnList.GetMNByOperatorKey(activeMasternodeInfo.keyIDOperator);
+    if (!dmn) {
+        // MN not appeared on the chain yet
+        return;
+    }
+
+    if (!mnList.IsMNValid(dmn->proTxHash)) {
+        if (mnList.IsMNPoSeBanned(dmn->proTxHash)) {
+            state = MASTERNODE_POSE_BANNED;
+        } else {
+            state = MASTERNODE_REMOVED;
+        }
+        return;
+    }
+
+    mnListEntry = dmn;
+
+    LogPrintf("CActiveDeterministicMasternodeManager::Init -- proTxHash=%s, proTx=%s\n", mnListEntry->proTxHash.ToString(), mnListEntry->ToString());
+
+    if (activeMasternodeInfo.service != mnListEntry->pdmnState->addr) {
+        state = MASTERNODE_ERROR;
+        strError = "Local address does not match the address from ProTx";
+        LogPrintf("CActiveDeterministicMasternodeManager::Init -- ERROR: %s", strError);
+        return;
+    }
+
+    if (mnListEntry->pdmnState->nProtocolVersion != PROTOCOL_VERSION) {
+        state = MASTERNODE_ERROR;
+        strError = "Local protocol version does not match version from ProTx. You may need to update the ProTx";
+        LogPrintf("CActiveDeterministicMasternodeManager::Init -- ERROR: %s", strError);
+        return;
+    }
+
+    activeMasternodeInfo.outpoint = COutPoint(mnListEntry->proTxHash, mnListEntry->nCollateralIndex);
+    state = MASTERNODE_READY;
+}
+
+void CActiveDeterministicMasternodeManager::UpdatedBlockTip(const CBlockIndex* pindexNew, const CBlockIndex* pindexFork, bool fInitialDownload)
+{
+    LOCK(cs_main);
+
+    if (!fMasternodeMode)
+        return;
+
+    if (!deterministicMNManager->IsDeterministicMNsSporkActive(pindexNew->nHeight)) {
+        return;
+    }
+
+    if (state == MASTERNODE_WAITING_FOR_PROTX) {
+        Init();
+    } else if (state == MASTERNODE_READY) {
+        if (!deterministicMNManager->HasValidMNAtBlock(pindexNew->GetBlockHash(), mnListEntry->proTxHash)) {
+            // MN disappeared from MN list
+            state = MASTERNODE_REMOVED;
+            activeMasternodeInfo.outpoint.SetNull();
+            // MN might have reappeared in same block with a new ProTx (with same masternode key)
+            Init();
+        }
+    } else if (state == MASTERNODE_REMOVED || state == MASTERNODE_POSE_BANNED) {
+        // MN might have reappeared with a new ProTx (with same masternode key)
+        Init();
+    }
+}
+
+bool CActiveDeterministicMasternodeManager::GetLocalAddress(CService &addrRet)
+{
+    // First try to find whatever local address is specified by externalip option
+    bool fFoundLocal = GetLocal(addrRet) && CMasternode::IsValidNetAddr(addrRet);
+    if (!fFoundLocal && Params().NetworkIDString() == CBaseChainParams::REGTEST) {
+        if (Lookup("127.0.0.1", addrRet, GetListenPort(), false)) {
+            fFoundLocal = true;
+        }
+    }
+    if(!fFoundLocal) {
+        strError = "Can't detect valid external address. Please consider using the externalip configuration option if problem persists. Make sure to use IPv4 address only.";
+        LogPrintf("CActiveDeterministicMasternodeManager::GetLocalAddress -- ERROR: %s\n", strError);
+        return false;
+    }
+    return true;
+}
+
+/********* LEGACY *********/
 
 void CActiveLegacyMasternodeManager::ManageState(CConnman& connman)
 {
+    if (deterministicMNManager->IsDeterministicMNsSporkActive())
+        return;
+
     LogPrint("masternode", "CActiveLegacyMasternodeManager::ManageState -- Start\n");
     if(!fMasternodeMode) {
         LogPrint("masternode", "CActiveLegacyMasternodeManager::ManageState -- Not a masternode, returning\n");
@@ -84,6 +215,9 @@ std::string CActiveLegacyMasternodeManager::GetTypeString() const
 
 bool CActiveLegacyMasternodeManager::SendMasternodePing(CConnman& connman)
 {
+    if (deterministicMNManager->IsDeterministicMNsSporkActive())
+        return false;
+
     if(!fPingerEnabled) {
         LogPrint("masternode", "CActiveLegacyMasternodeManager::SendMasternodePing -- %s: masternode ping service is disabled, skipping...\n", GetStateString());
         return false;
@@ -129,6 +263,9 @@ bool CActiveLegacyMasternodeManager::UpdateSentinelPing(int version)
 
 void CActiveLegacyMasternodeManager::ManageStateInitial(CConnman& connman)
 {
+    if (deterministicMNManager->IsDeterministicMNsSporkActive())
+        return;
+
     LogPrint("masternode", "CActiveLegacyMasternodeManager::ManageStateInitial -- status = %s, type = %s, pinger enabled = %d\n", GetStatus(), GetTypeString(), fPingerEnabled);
 
     // Check that our local network configuration is correct
@@ -210,6 +347,9 @@ void CActiveLegacyMasternodeManager::ManageStateInitial(CConnman& connman)
 
 void CActiveLegacyMasternodeManager::ManageStateRemote()
 {
+    if (deterministicMNManager->IsDeterministicMNsSporkActive())
+        return;
+
     LogPrint("masternode", "CActiveLegacyMasternodeManager::ManageStateRemote -- Start status = %s, type = %s, pinger enabled = %d, keyIDOperator = %s\n",
              GetStatus(), GetTypeString(), fPingerEnabled, activeMasternodeInfo.keyIDOperator.ToString());
 
diff --git a/src/activemasternode.h b/src/activemasternode.h
index f6a17150d623..c937d57e0983 100644
--- a/src/activemasternode.h
+++ b/src/activemasternode.h
@@ -9,9 +9,14 @@
 #include "key.h"
 #include "net.h"
 #include "primitives/transaction.h"
+#include "validationinterface.h"
+
+#include "evo/providertx.h"
+#include "evo/deterministicmns.h"
 
 struct CActiveMasternodeInfo;
 class CActiveLegacyMasternodeManager;
+class CActiveDeterministicMasternodeManager;
 
 static const int ACTIVE_MASTERNODE_INITIAL          = 0; // initial state
 static const int ACTIVE_MASTERNODE_SYNC_IN_PROCESS  = 1;
@@ -21,6 +26,7 @@ static const int ACTIVE_MASTERNODE_STARTED          = 4;
 
 extern CActiveMasternodeInfo activeMasternodeInfo;
 extern CActiveLegacyMasternodeManager legacyActiveMasternodeManager;
+extern CActiveDeterministicMasternodeManager* activeMasternodeManager;
 
 struct CActiveMasternodeInfo {
     // Keys for the active Masternode
@@ -32,7 +38,39 @@ struct CActiveMasternodeInfo {
     CService service;
 };
 
-// Responsible for activating the Masternode and pinging the network
+
+class CActiveDeterministicMasternodeManager : public CValidationInterface
+{
+public:
+    enum masternode_state_t {
+        MASTERNODE_WAITING_FOR_PROTX,
+        MASTERNODE_POSE_BANNED,
+        MASTERNODE_REMOVED,
+        MASTERNODE_READY,
+        MASTERNODE_ERROR,
+    };
+
+private:
+    CDeterministicMNCPtr mnListEntry;
+    masternode_state_t state{MASTERNODE_WAITING_FOR_PROTX};
+    std::string strError;
+
+public:
+    virtual void UpdatedBlockTip(const CBlockIndex* pindexNew, const CBlockIndex* pindexFork, bool fInitialDownload);
+
+    void Init();
+
+    CDeterministicMNCPtr GetDMN() const { return mnListEntry; }
+
+    masternode_state_t GetState() const { return state; }
+    std::string GetStateString() const;
+    std::string GetStatus() const;
+
+private:
+    bool GetLocalAddress(CService &addrRet);
+};
+
+// Responsible for activating the Masternode and pinging the network (legacy MN list)
 class CActiveLegacyMasternodeManager
 {
 public:
diff --git a/src/init.cpp b/src/init.cpp
index 8fbf91781177..e148b6e72f72 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -318,6 +318,9 @@ void PrepareShutdown()
         delete pdsNotificationInterface;
         pdsNotificationInterface = NULL;
     }
+    if (fMasternodeMode) {
+        UnregisterValidationInterface(activeMasternodeManager);
+    }
 
 #ifndef WIN32
     try {
@@ -1880,6 +1883,10 @@ bool AppInitMain(boost::thread_group& threadGroup, CScheduler& scheduler)
         } else {
             return InitError(_("You must specify a masternodeprivkey in the configuration. Please see documentation for help."));
         }
+
+        // init and register activeMasternodeManager
+        activeMasternodeManager = new CActiveDeterministicMasternodeManager();
+        RegisterValidationInterface(activeMasternodeManager);
     }
 
 #ifdef ENABLE_WALLET
@@ -1996,6 +2003,9 @@ bool AppInitMain(boost::thread_group& threadGroup, CScheduler& scheduler)
     // GetMainSignals().UpdatedBlockTip(chainActive.Tip());
     pdsNotificationInterface->InitializeCurrentBlockTip();
 
+    if (activeMasternodeManager && fDIP0003ActiveAtTip)
+        activeMasternodeManager->Init();
+
     // ********************************************************* Step 11d: schedule Dash-specific tasks
 
     if (!fLiteMode) {

From 6764dafece88713c8ea6ff7a9548ff0d79af0ad8 Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Thu, 15 Feb 2018 17:45:53 +0100
Subject: [PATCH 102/400] Skip initial masternode list sync if spork 15 is
 active

---
 src/masternode-sync.cpp | 41 +++++++++++++++++++++++++++++++++--------
 1 file changed, 33 insertions(+), 8 deletions(-)

diff --git a/src/masternode-sync.cpp b/src/masternode-sync.cpp
index e9ecf8ebde66..cca003f20601 100644
--- a/src/masternode-sync.cpp
+++ b/src/masternode-sync.cpp
@@ -15,6 +15,7 @@
 #include "spork.h"
 #include "ui_interface.h"
 #include "util.h"
+#include "evo/deterministicmns.h"
 
 class CMasternodeSync;
 CMasternodeSync masternodeSync;
@@ -69,12 +70,20 @@ void CMasternodeSync::SwitchToNextAsset(CConnman& connman)
             break;
         case(MASTERNODE_SYNC_WAITING):
             LogPrintf("CMasternodeSync::SwitchToNextAsset -- Completed %s in %llds\n", GetAssetName(), GetTime() - nTimeAssetSyncStarted);
-            nRequestedMasternodeAssets = MASTERNODE_SYNC_LIST;
+            if (deterministicMNManager->IsDeterministicMNsSporkActive()) {
+                nRequestedMasternodeAssets = MASTERNODE_SYNC_GOVERNANCE;
+            } else {
+                nRequestedMasternodeAssets = MASTERNODE_SYNC_LIST;
+            }
             LogPrintf("CMasternodeSync::SwitchToNextAsset -- Starting %s\n", GetAssetName());
             break;
         case(MASTERNODE_SYNC_LIST):
             LogPrintf("CMasternodeSync::SwitchToNextAsset -- Completed %s in %llds\n", GetAssetName(), GetTime() - nTimeAssetSyncStarted);
-            nRequestedMasternodeAssets = MASTERNODE_SYNC_MNW;
+            if (deterministicMNManager->IsDeterministicMNsSporkActive()) {
+                nRequestedMasternodeAssets = MASTERNODE_SYNC_GOVERNANCE;
+            } else {
+                nRequestedMasternodeAssets = MASTERNODE_SYNC_MNW;
+            }
             LogPrintf("CMasternodeSync::SwitchToNextAsset -- Starting %s\n", GetAssetName());
             break;
         case(MASTERNODE_SYNC_MNW):
@@ -188,14 +197,18 @@ void CMasternodeSync::ProcessTick(CConnman& connman)
                 connman.PushMessage(pnode, msgMaker.Make(NetMsgType::GETSPORKS)); //get current network sporks
                 SwitchToNextAsset(connman);
             } else if (nRequestedMasternodeAssets == MASTERNODE_SYNC_LIST) {
-                mnodeman.DsegUpdate(pnode, connman);
+                if (!deterministicMNManager->IsDeterministicMNsSporkActive()) {
+                    mnodeman.DsegUpdate(pnode, connman);
+                }
                 SwitchToNextAsset(connman);
             } else if (nRequestedMasternodeAssets == MASTERNODE_SYNC_MNW) {
-                //sync payment votes
-                if(pnode->nVersion == 70208) {
-                    connman.PushMessage(pnode, msgMaker.Make(NetMsgType::MASTERNODEPAYMENTSYNC, mnpayments.GetStorageLimit())); //sync payment votes
-                } else {
-                    connman.PushMessage(pnode, msgMaker.Make(NetMsgType::MASTERNODEPAYMENTSYNC)); //sync payment votes
+                if (!deterministicMNManager->IsDeterministicMNsSporkActive()) {
+                    //sync payment votes
+                    if(pnode->nVersion == 70208) {
+                        connman.PushMessage(pnode, msgMaker.Make(NetMsgType::MASTERNODEPAYMENTSYNC, mnpayments.GetStorageLimit())); //sync payment votes
+                    } else {
+                        connman.PushMessage(pnode, msgMaker.Make(NetMsgType::MASTERNODEPAYMENTSYNC)); //sync payment votes
+                    }
                 }
                 SwitchToNextAsset(connman);
             } else if (nRequestedMasternodeAssets == MASTERNODE_SYNC_GOVERNANCE) {
@@ -245,6 +258,12 @@ void CMasternodeSync::ProcessTick(CConnman& connman)
             // MNLIST : SYNC MASTERNODE LIST FROM OTHER CONNECTED CLIENTS
 
             if(nRequestedMasternodeAssets == MASTERNODE_SYNC_LIST) {
+                if (deterministicMNManager->IsDeterministicMNsSporkActive()) {
+                    SwitchToNextAsset(connman);
+                    connman.ReleaseNodeVector(vNodesCopy);
+                    return;
+                }
+
                 LogPrint("masternode", "CMasternodeSync::ProcessTick -- nTick %d nRequestedMasternodeAssets %d nTimeLastBumped %lld GetTime() %lld diff %lld\n", nTick, nRequestedMasternodeAssets, nTimeLastBumped, GetTime(), GetTime() - nTimeLastBumped);
                 // check for timeout first
                 if(GetTime() - nTimeLastBumped > MASTERNODE_SYNC_TIMEOUT_SECONDS) {
@@ -283,6 +302,12 @@ void CMasternodeSync::ProcessTick(CConnman& connman)
             // MNW : SYNC MASTERNODE PAYMENT VOTES FROM OTHER CONNECTED CLIENTS
 
             if(nRequestedMasternodeAssets == MASTERNODE_SYNC_MNW) {
+                if (deterministicMNManager->IsDeterministicMNsSporkActive()) {
+                    SwitchToNextAsset(connman);
+                    connman.ReleaseNodeVector(vNodesCopy);
+                    return;
+                }
+
                 LogPrint("mnpayments", "CMasternodeSync::ProcessTick -- nTick %d nRequestedMasternodeAssets %d nTimeLastBumped %lld GetTime() %lld diff %lld\n", nTick, nRequestedMasternodeAssets, nTimeLastBumped, GetTime(), GetTime() - nTimeLastBumped);
                 // check for timeout first
                 // This might take a lot longer than MASTERNODE_SYNC_TIMEOUT_SECONDS due to new blocks,

From 27e8b48a60674ddb7594614e1f4ad1c1e0537492 Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Fri, 16 Feb 2018 14:09:42 +0100
Subject: [PATCH 103/400] Stop executing legacy MN list code when spork 15 is
 activated

---
 src/masternodeman.cpp  | 60 ++++++++++++++++++++++++++++++++++++++++++
 src/net_processing.cpp | 16 ++++++-----
 2 files changed, 70 insertions(+), 6 deletions(-)

diff --git a/src/masternodeman.cpp b/src/masternodeman.cpp
index 6f7df18b6cf8..fda6f89e05d6 100644
--- a/src/masternodeman.cpp
+++ b/src/masternodeman.cpp
@@ -22,6 +22,8 @@
 #include "util.h"
 #include "warnings.h"
 
+#include "evo/deterministicmns.h"
+
 /** Masternode manager */
 CMasternodeMan mnodeman;
 
@@ -79,6 +81,9 @@ bool CMasternodeMan::Add(CMasternode &mn)
 {
     LOCK(cs);
 
+    if (deterministicMNManager->IsDeterministicMNsSporkActive())
+        return false;
+
     if (Has(mn.outpoint)) return false;
 
     LogPrint("masternode", "CMasternodeMan::Add -- Adding new Masternode: addr=%s, %i now\n", mn.addr.ToString(), size() + 1);
@@ -94,6 +99,9 @@ void CMasternodeMan::AskForMN(CNode* pnode, const COutPoint& outpoint, CConnman&
     CNetMsgMaker msgMaker(pnode->GetSendVersion());
     LOCK(cs);
 
+    if (deterministicMNManager->IsDeterministicMNsSporkActive())
+        return;
+
     CService addrSquashed = Params().AllowMultiplePorts() ? (CService)pnode->addr : CService(pnode->addr, 0);
     auto it1 = mWeAskedForMasternodeListEntry.find(outpoint);
     if (it1 != mWeAskedForMasternodeListEntry.end()) {
@@ -151,6 +159,10 @@ bool CMasternodeMan::DisallowMixing(const COutPoint &outpoint)
 bool CMasternodeMan::PoSeBan(const COutPoint &outpoint)
 {
     LOCK(cs);
+
+    if (deterministicMNManager->IsDeterministicMNsSporkActive())
+        return true;
+
     CMasternode* pmn = Find(outpoint);
     if (!pmn) {
         return false;
@@ -164,6 +176,9 @@ void CMasternodeMan::Check()
 {
     LOCK2(cs_main, cs);
 
+    if (deterministicMNManager->IsDeterministicMNsSporkActive())
+        return;
+
     for (auto& mnpair : mapMasternodes) {
         // NOTE: internally it checks only every MASTERNODE_CHECK_SECONDS seconds
         // since the last time, so expect some MNs to skip this
@@ -173,6 +188,9 @@ void CMasternodeMan::Check()
 
 void CMasternodeMan::CheckAndRemove(CConnman& connman)
 {
+    if (deterministicMNManager->IsDeterministicMNsSporkActive())
+        return;
+
     if(!masternodeSync.IsMasternodeListSynced()) return;
 
     LogPrintf("CMasternodeMan::CheckAndRemove\n");
@@ -418,6 +436,9 @@ void CMasternodeMan::DsegUpdate(CNode* pnode, CConnman& connman)
     CNetMsgMaker msgMaker(pnode->GetSendVersion());
     LOCK(cs);
 
+    if (deterministicMNManager->IsDeterministicMNsSporkActive())
+        return;
+
     CService addrSquashed = Params().AllowMultiplePorts() ? (CService)pnode->addr : CService(pnode->addr, 0);
     if(Params().NetworkIDString() == CBaseChainParams::MAIN) {
         if(!(pnode->addr.IsRFC1918() || pnode->addr.IsLocal())) {
@@ -740,6 +761,9 @@ void CMasternodeMan::ProcessMasternodeConnections(CConnman& connman)
 std::pair<CService, std::set<uint256> > CMasternodeMan::PopScheduledMnbRequestConnection()
 {
     LOCK(cs);
+    if (deterministicMNManager->IsDeterministicMNsSporkActive()) {
+        return std::make_pair(CService(), std::set<uint256>());
+    }
     if(listScheduledMnbRequestConnections.empty()) {
         return std::make_pair(CService(), std::set<uint256>());
     }
@@ -766,6 +790,9 @@ std::pair<CService, std::set<uint256> > CMasternodeMan::PopScheduledMnbRequestCo
 
 void CMasternodeMan::ProcessPendingMnbRequests(CConnman& connman)
 {
+    if (deterministicMNManager->IsDeterministicMNsSporkActive())
+        return;
+
     std::pair<CService, std::set<uint256> > p = PopScheduledMnbRequestConnection();
     if (!(p.first == CService() || p.second.empty())) {
         if (connman.IsMasternodeOrDisconnectRequested(p.first)) return;
@@ -805,6 +832,9 @@ void CMasternodeMan::ProcessPendingMnbRequests(CConnman& connman)
 
 void CMasternodeMan::ProcessMessage(CNode* pfrom, const std::string& strCommand, CDataStream& vRecv, CConnman& connman)
 {
+    if (deterministicMNManager->IsDeterministicMNsSporkActive())
+        return;
+
     if(fLiteMode) return; // disable all Dash specific functionality
 
     if (strCommand == NetMsgType::MNANNOUNCE) { //Masternode Broadcast
@@ -1001,6 +1031,9 @@ void CMasternodeMan::PushDsegInvs(CNode* pnode, const CMasternode& mn)
 
 void CMasternodeMan::DoFullVerificationStep(CConnman& connman)
 {
+    if (deterministicMNManager->IsDeterministicMNsSporkActive())
+        return;
+
     if(activeMasternodeInfo.outpoint.IsNull()) return;
     if(!masternodeSync.IsSynced()) return;
 
@@ -1078,6 +1111,9 @@ void CMasternodeMan::DoFullVerificationStep(CConnman& connman)
 
 void CMasternodeMan::CheckSameAddr()
 {
+    if (deterministicMNManager->IsDeterministicMNsSporkActive())
+        return;
+
     if(!masternodeSync.IsSynced() || mapMasternodes.empty()) return;
 
     std::vector<CMasternode*> vBan;
@@ -1131,6 +1167,9 @@ void CMasternodeMan::CheckSameAddr()
 
 bool CMasternodeMan::SendVerifyRequest(const CAddress& addr, const std::vector<const CMasternode*>& vSortedByAddr, CConnman& connman)
 {
+    if (deterministicMNManager->IsDeterministicMNsSporkActive())
+        return false;
+
     if(netfulfilledman.HasFulfilledRequest(addr, strprintf("%s", NetMsgType::MNVERIFY)+"-request")) {
         // we already asked for verification, not a good idea to do this too often, skip it
         LogPrint("masternode", "CMasternodeMan::SendVerifyRequest -- too many requests, skipping... addr=%s\n", addr.ToString());
@@ -1152,6 +1191,9 @@ void CMasternodeMan::ProcessPendingMnvRequests(CConnman& connman)
 {
     LOCK(cs_mapPendingMNV);
 
+    if (deterministicMNManager->IsDeterministicMNsSporkActive())
+        return;
+
     std::map<CService, std::pair<int64_t, CMasternodeVerification> >::iterator itPendingMNV = mapPendingMNV.begin();
 
     while (itPendingMNV != mapPendingMNV.end()) {
@@ -1181,6 +1223,9 @@ void CMasternodeMan::SendVerifyReply(CNode* pnode, CMasternodeVerification& mnv,
 {
     AssertLockHeld(cs_main);
 
+    if (deterministicMNManager->IsDeterministicMNsSporkActive())
+        return;
+
     // only masternodes can sign this, why would someone ask regular node?
     if(!fMasternodeMode) {
         // do not ban, malicious node might be using my IP
@@ -1238,6 +1283,9 @@ void CMasternodeMan::ProcessVerifyReply(CNode* pnode, CMasternodeVerification& m
 {
     AssertLockHeld(cs_main);
 
+    if (deterministicMNManager->IsDeterministicMNsSporkActive())
+        return;
+
     std::string strError;
 
     // did we even ask for it? if that's the case we should have matching fulfilled request
@@ -1374,6 +1422,9 @@ void CMasternodeMan::ProcessVerifyBroadcast(CNode* pnode, const CMasternodeVerif
 {
     AssertLockHeld(cs_main);
 
+    if (deterministicMNManager->IsDeterministicMNsSporkActive())
+        return;
+
     std::string strError;
 
     if(mapSeenMasternodeVerification.find(mnv.GetHash()) != mapSeenMasternodeVerification.end()) {
@@ -1509,6 +1560,9 @@ bool CMasternodeMan::CheckMnbAndUpdateMasternodeList(CNode* pfrom, CMasternodeBr
     // Need to lock cs_main here to ensure consistent locking order because the SimpleCheck call below locks cs_main
     LOCK(cs_main);
 
+    if (deterministicMNManager->IsDeterministicMNsSporkActive())
+        return false;
+
     {
         LOCK(cs);
         nDos = 0;
@@ -1621,6 +1675,8 @@ void CMasternodeMan::UpdateLastPaid(const CBlockIndex* pindex)
 void CMasternodeMan::UpdateLastSentinelPingTime()
 {
     LOCK(cs);
+    if (deterministicMNManager->IsDeterministicMNsSporkActive())
+        return;
     nLastSentinelPingTime = GetTime();
 }
 
@@ -1653,6 +1709,8 @@ void CMasternodeMan::RemoveGovernanceObject(uint256 nGovernanceObjectHash)
 void CMasternodeMan::CheckMasternode(const CKeyID& keyIDOperator, bool fForce)
 {
     LOCK2(cs_main, cs);
+    if (deterministicMNManager->IsDeterministicMNsSporkActive())
+        return;
     for (auto& mnpair : mapMasternodes) {
         if (mnpair.second.keyIDOperator == keyIDOperator) {
             mnpair.second.Check(fForce);
@@ -1671,6 +1729,8 @@ bool CMasternodeMan::IsMasternodePingedWithin(const COutPoint& outpoint, int nSe
 void CMasternodeMan::SetMasternodeLastPing(const COutPoint& outpoint, const CMasternodePing& mnp)
 {
     LOCK(cs);
+    if (deterministicMNManager->IsDeterministicMNsSporkActive())
+        return;
     CMasternode* pmn = Find(outpoint);
     if(!pmn) {
         return;
diff --git a/src/net_processing.cpp b/src/net_processing.cpp
index d53c38bfd2a3..2bc080e9af41 100644
--- a/src/net_processing.cpp
+++ b/src/net_processing.cpp
@@ -1201,16 +1201,20 @@ void static ProcessGetData(CNode* pfrom, const Consensus::Params& consensusParam
                 }
 
                 if (!push && inv.type == MSG_MASTERNODE_ANNOUNCE) {
-                    if(mnodeman.mapSeenMasternodeBroadcast.count(inv.hash)){
-                        connman.PushMessage(pfrom, msgMaker.Make(NetMsgType::MNANNOUNCE, mnodeman.mapSeenMasternodeBroadcast[inv.hash].second));
-                        push = true;
+                    if (!deterministicMNManager->IsDeterministicMNsSporkActive()) {
+                        if (mnodeman.mapSeenMasternodeBroadcast.count(inv.hash)) {
+                            connman.PushMessage(pfrom, msgMaker.Make(NetMsgType::MNANNOUNCE, mnodeman.mapSeenMasternodeBroadcast[inv.hash].second));
+                            push = true;
+                        }
                     }
                 }
 
                 if (!push && inv.type == MSG_MASTERNODE_PING) {
-                    if(mnodeman.mapSeenMasternodePing.count(inv.hash)) {
-                        connman.PushMessage(pfrom, msgMaker.Make(NetMsgType::MNPING, mnodeman.mapSeenMasternodePing[inv.hash]));
-                        push = true;
+                    if (!deterministicMNManager->IsDeterministicMNsSporkActive()) {
+                        if (mnodeman.mapSeenMasternodePing.count(inv.hash)) {
+                            connman.PushMessage(pfrom, msgMaker.Make(NetMsgType::MNPING, mnodeman.mapSeenMasternodePing[inv.hash]));
+                            push = true;
+                        }
                     }
                 }
 

From 7d14566bcd36a776f3e84846d2ffcf043b9b621a Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Fri, 16 Feb 2018 14:20:55 +0100
Subject: [PATCH 104/400] Add compatibility code to CMasternodeMan so that old
 code is still compatible

...when deterministic MNs are activated.
---
 src/masternode.cpp    |  11 ++++
 src/masternode.h      |   3 ++
 src/masternodeman.cpp | 116 +++++++++++++++++++++++++++++++-----------
 src/masternodeman.h   |   2 +-
 4 files changed, 101 insertions(+), 31 deletions(-)

diff --git a/src/masternode.cpp b/src/masternode.cpp
index 9c36865362d7..84a26ce6de98 100644
--- a/src/masternode.cpp
+++ b/src/masternode.cpp
@@ -52,6 +52,17 @@ CMasternode::CMasternode(const CMasternodeBroadcast& mnb) :
     fAllowMixingTx(true)
 {}
 
+CMasternode::CMasternode(const uint256 &proTxHash, const CDeterministicMNCPtr& dmn) :
+    masternode_info_t{ MASTERNODE_ENABLED, dmn->pdmnState->nProtocolVersion, GetAdjustedTime(),
+                       COutPoint(proTxHash, dmn->nCollateralIndex), dmn->pdmnState->addr, CKeyID(), dmn->pdmnState->keyIDOwner, dmn->pdmnState->keyIDOperator, dmn->pdmnState->keyIDVoting},
+    fAllowMixingTx(true)
+{
+    CTxDestination dest;
+    if (!ExtractDestination(dmn->pdmnState->scriptPayout, dest) || !boost::get<CKeyID>(&dest))
+        assert(false); // should not happen (previous verification forbids non p2pkh/p2pk
+    keyIDCollateralAddress = *boost::get<CKeyID>(&dest);
+}
+
 //
 // When a new masternode broadcast is sent, update our information
 //
diff --git a/src/masternode.h b/src/masternode.h
index 09c6344265f1..fdc94b58f008 100644
--- a/src/masternode.h
+++ b/src/masternode.h
@@ -9,6 +9,8 @@
 #include "validation.h"
 #include "spork.h"
 
+#include "evo/deterministicmns.h"
+
 class CMasternode;
 class CMasternodeBroadcast;
 class CConnman;
@@ -214,6 +216,7 @@ class CMasternode : public masternode_info_t
     CMasternode(const CMasternode& other);
     CMasternode(const CMasternodeBroadcast& mnb);
     CMasternode(CService addrNew, COutPoint outpointNew, CPubKey pubKeyCollateralAddressNew, CPubKey pubKeyMasternodeNew, int nProtocolVersionIn);
+    CMasternode(const uint256 &proTxHash, const CDeterministicMNCPtr& dmn);
 
     ADD_SERIALIZE_METHODS;
 
diff --git a/src/masternodeman.cpp b/src/masternodeman.cpp
index fda6f89e05d6..3a1370da7bfd 100644
--- a/src/masternodeman.cpp
+++ b/src/masternodeman.cpp
@@ -23,6 +23,7 @@
 #include "warnings.h"
 
 #include "evo/deterministicmns.h"
+#include "evo/providertx.h"
 
 /** Masternode manager */
 CMasternodeMan mnodeman;
@@ -389,20 +390,32 @@ void CMasternodeMan::Clear()
 int CMasternodeMan::CountMasternodes(int nProtocolVersion)
 {
     LOCK(cs);
+
     int nCount = 0;
     nProtocolVersion = nProtocolVersion == -1 ? mnpayments.GetMinMasternodePaymentsProto() : nProtocolVersion;
 
-    for (const auto& mnpair : mapMasternodes) {
-        if(mnpair.second.nProtocolVersion < nProtocolVersion) continue;
-        nCount++;
+    if (deterministicMNManager->IsDeterministicMNsSporkActive()) {
+        auto mnList = deterministicMNManager->GetListAtChainTip();
+        for (const auto& dmn : mnList.valid_range()) {
+            if (dmn->pdmnState->nProtocolVersion < nProtocolVersion) continue;
+            nCount++;
+        }
+    } else {
+        for (const auto& mnpair : mapMasternodes) {
+            if(mnpair.second.nProtocolVersion < nProtocolVersion) continue;
+            nCount++;
+        }
     }
-
     return nCount;
 }
 
 int CMasternodeMan::CountEnabled(int nProtocolVersion)
 {
     LOCK(cs);
+
+    if (deterministicMNManager->IsDeterministicMNsSporkActive())
+        return CountMasternodes(nProtocolVersion);
+
     int nCount = 0;
     nProtocolVersion = nProtocolVersion == -1 ? mnpayments.GetMinMasternodePaymentsProto() : nProtocolVersion;
 
@@ -464,43 +477,77 @@ void CMasternodeMan::DsegUpdate(CNode* pnode, CConnman& connman)
 CMasternode* CMasternodeMan::Find(const COutPoint &outpoint)
 {
     LOCK(cs);
-    auto it = mapMasternodes.find(outpoint);
-    return it == mapMasternodes.end() ? nullptr : &(it->second);
+
+    if (deterministicMNManager->IsDeterministicMNsSporkActive()) {
+        // This code keeps compatibility to old code depending on the non-deterministic MN lists
+        // When deterministic MN lists get activated, we stop relying on the MNs we encountered due to MNBs and start
+        // using the MNs found in the deterministic MN manager. To keep compatibility, we create CMasternode entries
+        // for these and return them here. This is needed because we also need to track some data per MN that is not
+        // on-chain, like vote counts
+
+        auto mnList = deterministicMNManager->GetListAtChainTip();
+        if (!mnList.IsMNValid(outpoint.hash)) {
+            return nullptr;
+        }
+        auto dmn = mnList.GetMN(outpoint.hash);
+        if (!dmn) {
+            return nullptr;
+        }
+
+        auto it = mapMasternodes.find(outpoint);
+        if (it != mapMasternodes.end()) {
+            return &(it->second);
+        } else {
+            // MN is not in mapMasternodes but in the deterministic list. Create an entry in mapMasternodes for compatibility with legacy code
+            CMasternode mn(outpoint.hash, dmn);
+            it = mapMasternodes.emplace(outpoint, mn).first;
+            return &(it->second);
+        }
+    } else {
+        auto it = mapMasternodes.find(outpoint);
+        return it == mapMasternodes.end() ? nullptr : &(it->second);
+    }
 }
 
 bool CMasternodeMan::Get(const COutPoint& outpoint, CMasternode& masternodeRet)
 {
     // Theses mutexes are recursive so double locking by the same thread is safe.
     LOCK(cs);
-    auto it = mapMasternodes.find(outpoint);
-    if (it == mapMasternodes.end()) {
+    CMasternode* mn = Find(outpoint);
+    if (!mn)
         return false;
-    }
-
-    masternodeRet = it->second;
+    masternodeRet = *mn;
     return true;
 }
 
 bool CMasternodeMan::GetMasternodeInfo(const COutPoint& outpoint, masternode_info_t& mnInfoRet)
 {
     LOCK(cs);
-    auto it = mapMasternodes.find(outpoint);
-    if (it == mapMasternodes.end()) {
+    CMasternode* mn = Find(outpoint);
+    if (!mn)
         return false;
-    }
-    mnInfoRet = it->second.GetInfo();
+    mnInfoRet = mn->GetInfo();
     return true;
 }
 
 bool CMasternodeMan::GetMasternodeInfo(const CKeyID& keyIDOperator, masternode_info_t& mnInfoRet) {
     LOCK(cs);
-    for (const auto& mnpair : mapMasternodes) {
-        if (mnpair.second.keyIDOperator == keyIDOperator) {
-            mnInfoRet = mnpair.second.GetInfo();
-            return true;
+    if (deterministicMNManager->IsDeterministicMNsSporkActive()) {
+        auto mnList = deterministicMNManager->GetListAtChainTip();
+        auto dmn = mnList.GetMNByOperatorKey(keyIDOperator);
+        if (dmn) {
+            return GetMasternodeInfo(COutPoint(dmn->proTxHash, dmn->nCollateralIndex), mnInfoRet);
         }
+        return false;
+    } else {
+        for (const auto& mnpair : mapMasternodes) {
+            if (mnpair.second.keyIDOperator == keyIDOperator) {
+                mnInfoRet = mnpair.second.GetInfo();
+                return true;
+            }
+        }
+        return false;
     }
-    return false;
 }
 
 bool CMasternodeMan::GetMasternodeInfo(const CPubKey& pubKeyOperator, masternode_info_t& mnInfoRet)
@@ -527,7 +574,11 @@ bool CMasternodeMan::GetMasternodeInfo(const CScript& payee, masternode_info_t&
 bool CMasternodeMan::Has(const COutPoint& outpoint)
 {
     LOCK(cs);
-    return mapMasternodes.find(outpoint) != mapMasternodes.end();
+    if (deterministicMNManager->IsDeterministicMNsSporkActive()) {
+        return deterministicMNManager->HasValidMNAtChainTip(outpoint.hash);
+    } else {
+        return mapMasternodes.find(outpoint) != mapMasternodes.end();
+    }
 }
 
 //
@@ -1546,12 +1597,17 @@ std::string CMasternodeMan::ToString() const
 {
     std::ostringstream info;
 
-    info << "Masternodes: " << (int)mapMasternodes.size() <<
-            ", peers who asked us for Masternode list: " << (int)mAskedUsForMasternodeList.size() <<
-            ", peers we asked for Masternode list: " << (int)mWeAskedForMasternodeList.size() <<
-            ", entries in Masternode list we asked for: " << (int)mWeAskedForMasternodeListEntry.size() <<
-            ", nDsqCount: " << (int)nDsqCount;
-
+    if (deterministicMNManager->IsDeterministicMNsSporkActive()) {
+        info << "Masternodes: masternode object count: " << (int)mapMasternodes.size() <<
+                ", deterministic masternode count: " << deterministicMNManager->GetListAtChainTip().size() <<
+                ", nDsqCount: " << (int)nDsqCount;
+    } else {
+        info << "Masternodes: " << (int)mapMasternodes.size() <<
+                ", peers who asked us for Masternode list: " << (int)mAskedUsForMasternodeList.size() <<
+                ", peers we asked for Masternode list: " << (int)mWeAskedForMasternodeList.size() <<
+                ", entries in Masternode list we asked for: " << (int)mWeAskedForMasternodeListEntry.size() <<
+                ", nDsqCount: " << (int)nDsqCount;
+    }
     return info.str();
 }
 
@@ -1802,7 +1858,7 @@ void CMasternodeMan::WarnMasternodeDaemonUpdates()
     fWarned = true;
 }
 
-void CMasternodeMan::NotifyMasternodeUpdates(CConnman& connman)
+void CMasternodeMan::NotifyMasternodeUpdates(CConnman& connman, bool forceAddedChecks, bool forceRemovedChecks)
 {
     // Avoid double locking
     bool fMasternodesAddedLocal = false;
@@ -1813,11 +1869,11 @@ void CMasternodeMan::NotifyMasternodeUpdates(CConnman& connman)
         fMasternodesRemovedLocal = fMasternodesRemoved;
     }
 
-    if(fMasternodesAddedLocal) {
+    if(fMasternodesAddedLocal || forceAddedChecks) {
         governance.CheckMasternodeOrphanObjects(connman);
         governance.CheckMasternodeOrphanVotes(connman);
     }
-    if(fMasternodesRemovedLocal) {
+    if(fMasternodesRemovedLocal || forceRemovedChecks) {
         governance.UpdateCachesAndClean();
     }
 
diff --git a/src/masternodeman.h b/src/masternodeman.h
index 2a3520060f08..e932002555bd 100644
--- a/src/masternodeman.h
+++ b/src/masternodeman.h
@@ -243,7 +243,7 @@ class CMasternodeMan
      * Called to notify CGovernanceManager that the masternode index has been updated.
      * Must be called while not holding the CMasternodeMan::cs mutex
      */
-    void NotifyMasternodeUpdates(CConnman& connman);
+    void NotifyMasternodeUpdates(CConnman& connman, bool forceAddedChecks = false, bool forceRemovedChecks = false);
 
     void DoMaintenance(CConnman &connman);
 };

From cc73422f8879c2a24a0e4c213bd3b7792f345824 Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Fri, 23 Feb 2018 13:18:51 +0100
Subject: [PATCH 105/400] Add methods to add/remove (non-)deterministic MNs

---
 src/masternodeman.cpp | 80 +++++++++++++++++++++++++++++++++++++++++++
 src/masternodeman.h   |  5 ++-
 2 files changed, 84 insertions(+), 1 deletion(-)

diff --git a/src/masternodeman.cpp b/src/masternodeman.cpp
index 3a1370da7bfd..2f4dd2d393bb 100644
--- a/src/masternodeman.cpp
+++ b/src/masternodeman.cpp
@@ -374,6 +374,66 @@ void CMasternodeMan::CheckAndRemove(CConnman& connman)
     }
 }
 
+void CMasternodeMan::AddDeterministicMasternodes()
+{
+    if (!deterministicMNManager->IsDeterministicMNsSporkActive())
+        return;
+
+    bool added = false;
+    {
+        LOCK(cs);
+        unsigned int oldMnCount = mapMasternodes.size();
+
+        auto mnList = deterministicMNManager->GetListAtChainTip();
+        for (const auto& dmn : mnList.valid_range()) {
+            // call Find() on each deterministic MN to force creation of CMasternode object
+            auto mn = Find(COutPoint(dmn->proTxHash, dmn->nCollateralIndex));
+            assert(mn);
+
+            // make sure we use the splitted keys from now on
+            mn->keyIDOwner = dmn->pdmnState->keyIDOwner;
+            mn->keyIDOperator = dmn->pdmnState->keyIDOperator;
+            mn->keyIDVoting = dmn->pdmnState->keyIDVoting;
+            mn->addr = dmn->pdmnState->addr;
+            mn->nProtocolVersion = dmn->pdmnState->nProtocolVersion;
+        }
+
+        added = oldMnCount != mapMasternodes.size();
+    }
+
+    if (added) {
+        NotifyMasternodeUpdates(*g_connman, true, false);
+    }
+}
+
+void CMasternodeMan::RemoveNonDeterministicMasternodes()
+{
+    if (!deterministicMNManager->IsDeterministicMNsSporkActive())
+        return;
+
+    bool erased = false;
+    {
+        LOCK(cs);
+        std::set<COutPoint> mnSet;
+        auto mnList = deterministicMNManager->GetListAtChainTip();
+        for (const auto& dmn : mnList.valid_range()) {
+            mnSet.insert(COutPoint(dmn->proTxHash, dmn->nCollateralIndex));
+        }
+        auto it = mapMasternodes.begin();
+        while (it != mapMasternodes.end()) {
+            if (!mnSet.count(it->second.outpoint)) {
+                mapMasternodes.erase(it++);
+                erased = true;
+            } else {
+                ++it;
+            }
+        }
+    }
+    if (erased) {
+        NotifyMasternodeUpdates(*g_connman, false, true);
+    }
+}
+
 void CMasternodeMan::Clear()
 {
     LOCK(cs);
@@ -708,6 +768,23 @@ masternode_info_t CMasternodeMan::FindRandomNotInVec(const std::vector<COutPoint
     return masternode_info_t();
 }
 
+std::map<COutPoint, CMasternode> CMasternodeMan::GetFullMasternodeMap()
+{
+    LOCK(cs);
+
+    if (deterministicMNManager->IsDeterministicMNsSporkActive()) {
+        std::map<COutPoint, CMasternode> result;
+        for (const auto &p : mapMasternodes) {
+            if (deterministicMNManager->HasValidMNAtChainTip(p.first.hash)) {
+                result.emplace(p.first, p.second);
+            }
+        }
+        return result;
+    } else {
+        return mapMasternodes;
+    }
+}
+
 bool CMasternodeMan::GetMasternodeScores(const uint256& nBlockHash, CMasternodeMan::score_pair_vec_t& vecMasternodeScoresRet, int nMinProtocol)
 {
     vecMasternodeScoresRet.clear();
@@ -1809,6 +1886,9 @@ void CMasternodeMan::UpdatedBlockTip(const CBlockIndex *pindex)
     nCachedBlockHeight = pindex->nHeight;
     LogPrint("masternode", "CMasternodeMan::UpdatedBlockTip -- nCachedBlockHeight=%d\n", nCachedBlockHeight);
 
+    AddDeterministicMasternodes();
+    RemoveNonDeterministicMasternodes();
+
     CheckSameAddr();
 
     if(fMasternodeMode) {
diff --git a/src/masternodeman.h b/src/masternodeman.h
index e932002555bd..243ee8040561 100644
--- a/src/masternodeman.h
+++ b/src/masternodeman.h
@@ -149,6 +149,9 @@ class CMasternodeMan
     /// This is dummy overload to be used for dumping/loading mncache.dat
     void CheckAndRemove() {}
 
+    void AddDeterministicMasternodes();
+    void RemoveNonDeterministicMasternodes();
+
     /// Clear Masternode vector
     void Clear();
 
@@ -181,7 +184,7 @@ class CMasternodeMan
     /// Find a random entry
     masternode_info_t FindRandomNotInVec(const std::vector<COutPoint> &vecToExclude, int nProtocolVersion = -1);
 
-    std::map<COutPoint, CMasternode> GetFullMasternodeMap() { return mapMasternodes; }
+    std::map<COutPoint, CMasternode> GetFullMasternodeMap();
 
     bool GetMasternodeRanks(rank_pair_vec_t& vecMasternodeRanksRet, int nBlockHeight = -1, int nMinProtocol = 0);
     bool GetMasternodeRank(const COutPoint &outpoint, int& nRankRet, int nBlockHeight = -1, int nMinProtocol = 0);

From 5050a920538a903325beaf07c9fab9e6ef4d3bab Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Mon, 19 Feb 2018 10:35:28 +0100
Subject: [PATCH 106/400] Add compatibility code for FindRandomNotInVec and
 GetMasternodeScores

---
 src/masternodeman.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/masternodeman.cpp b/src/masternodeman.cpp
index 2f4dd2d393bb..e93ef2eb44a9 100644
--- a/src/masternodeman.cpp
+++ b/src/masternodeman.cpp
@@ -759,6 +759,8 @@ masternode_info_t CMasternodeMan::FindRandomNotInVec(const std::vector<COutPoint
             }
         }
         if(fExclude) continue;
+        if (deterministicMNManager->IsDeterministicMNsSporkActive() && !deterministicMNManager->HasValidMNAtChainTip(pmn->outpoint.hash))
+            continue;
         // found the one not in vecToExclude
         LogPrint("masternode", "CMasternodeMan::FindRandomNotInVec -- found, masternode=%s\n", pmn->outpoint.ToStringShort());
         return pmn->GetInfo();
@@ -799,6 +801,9 @@ bool CMasternodeMan::GetMasternodeScores(const uint256& nBlockHash, CMasternodeM
 
     // calculate scores
     for (const auto& mnpair : mapMasternodes) {
+        if (deterministicMNManager->IsDeterministicMNsSporkActive() && !deterministicMNManager->HasValidMNAtChainTip(mnpair.second.outpoint.hash))
+            continue;
+
         if (mnpair.second.nProtocolVersion >= nMinProtocol) {
             vecMasternodeScoresRet.push_back(std::make_pair(mnpair.second.CalculateScore(nBlockHash), &mnpair.second));
         }

From 50ac6fb3aac196b6e98e911aa1066fa755cccf9f Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Fri, 23 Feb 2018 13:30:02 +0100
Subject: [PATCH 107/400] Throw exception when trying to invoke start-xxx RPC
 in deterministic mode

---
 src/rpc/masternode.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/rpc/masternode.cpp b/src/rpc/masternode.cpp
index 0e7fb4266336..e006b087391c 100644
--- a/src/rpc/masternode.cpp
+++ b/src/rpc/masternode.cpp
@@ -327,6 +327,8 @@ UniValue masternode_start_alias(const JSONRPCRequest& request)
 {
     if(request.fHelp || request.params.size() < 2)
         masternode_start_alias_help();
+    if (deterministicMNManager->IsDeterministicMNsSporkActive())
+        throw JSONRPCError(RPC_MISC_ERROR, "start-alias is not supported when deterministic masternode list is active (DIP3)");
 
     if (!EnsureWalletIsAvailable(request.fHelp))
         return NullUniValue;
@@ -427,6 +429,8 @@ UniValue masternode_start_all(const JSONRPCRequest& request)
 {
     if(request.fHelp)
         masternode_start_all_help();
+    if (deterministicMNManager->IsDeterministicMNsSporkActive())
+        throw JSONRPCError(RPC_MISC_ERROR, strprintf("start-all is not supported when deterministic masternode list is active (DIP3)"));
 
     if (!EnsureWalletIsAvailable(request.fHelp))
         return NullUniValue;

From e2a9dbbce167cae8ff2d20660d786a6e7b5bfed0 Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Fri, 23 Feb 2018 13:30:36 +0100
Subject: [PATCH 108/400] Better "masternode status" for deterministic
 masternodes

---
 src/rpc/masternode.cpp | 24 +++++++++++++++++++-----
 1 file changed, 19 insertions(+), 5 deletions(-)

diff --git a/src/rpc/masternode.cpp b/src/rpc/masternode.cpp
index e006b087391c..23ac0788e210 100644
--- a/src/rpc/masternode.cpp
+++ b/src/rpc/masternode.cpp
@@ -626,15 +626,29 @@ UniValue masternode_status(const JSONRPCRequest& request)
 
     UniValue mnObj(UniValue::VOBJ);
 
+    // keep compatibility with legacy status for now (might get deprecated/removed later)
     mnObj.push_back(Pair("outpoint", activeMasternodeInfo.outpoint.ToStringShort()));
     mnObj.push_back(Pair("service", activeMasternodeInfo.service.ToString()));
 
-    CMasternode mn;
-    if(mnodeman.Get(activeMasternodeInfo.outpoint, mn)) {
-        mnObj.push_back(Pair("payee", CBitcoinAddress(mn.keyIDCollateralAddress).ToString()));
-    }
+    if (deterministicMNManager->IsDeterministicMNsSporkActive()) {
+        auto dmn = activeMasternodeManager->GetDMN();
+        if (dmn) {
+            mnObj.push_back(Pair("proTxHash", dmn->proTxHash.ToString()));
+            mnObj.push_back(Pair("collateralIndex", (int)dmn->nCollateralIndex));
+            UniValue stateObj;
+            dmn->pdmnState->ToJson(stateObj);
+            mnObj.push_back(Pair("dmnState", stateObj));
+        }
+        mnObj.push_back(Pair("state", activeMasternodeManager->GetStateString()));
+        mnObj.push_back(Pair("status", activeMasternodeManager->GetStatus()));
+    } else {
+        CMasternode mn;
+        if(mnodeman.Get(activeMasternodeInfo.outpoint, mn)) {
+            mnObj.push_back(Pair("payee", CBitcoinAddress(mn.keyIDCollateralAddress).ToString()));
+        }
 
-    mnObj.push_back(Pair("status", legacyActiveMasternodeManager.GetStatus()));
+        mnObj.push_back(Pair("status", legacyActiveMasternodeManager.GetStatus()));
+    }
     return mnObj;
 }
 

From 2d8f1244cf6905f8752f543b3cec72830b83ab1e Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Fri, 31 Aug 2018 11:47:14 +0200
Subject: [PATCH 109/400] Implement 'masternode info <proTxHash>' RPC

---
 src/rpc/masternode.cpp | 91 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 91 insertions(+)

diff --git a/src/rpc/masternode.cpp b/src/rpc/masternode.cpp
index 23ac0788e210..34495b4be36e 100644
--- a/src/rpc/masternode.cpp
+++ b/src/rpc/masternode.cpp
@@ -19,6 +19,10 @@
 #include "rpc/server.h"
 #include "util.h"
 #include "utilmoneystr.h"
+#include "txmempool.h"
+
+#include "evo/specialtx.h"
+#include "evo/deterministicmns.h"
 
 #include <fstream>
 #include <iomanip>
@@ -573,6 +577,91 @@ UniValue masternode_genkey(const JSONRPCRequest& request)
     return CBitcoinSecret(secret).ToString();
 }
 
+void masternode_info_help()
+{
+    throw std::runtime_error(
+            "masternode info \"proTxHash\"\n"
+            "Print masternode information of specified masternode\n"
+            "\nArguments:\n"
+            "1. proTxHash        (string, required) proTxHash of masternode\n"
+    );
+}
+
+UniValue masternode_info(const JSONRPCRequest& request)
+{
+    if(request.fHelp || request.params.size() != 2)
+        masternode_info_help();
+
+    std::string strProTxHash = request.params[1].get_str();
+    if (!IsHex(strProTxHash) || strProTxHash.size() != 64)
+        throw JSONRPCError(RPC_INVALID_PARAMETER, "Invalid \"proTxHash\"");
+
+    uint256 proTxHash;
+    proTxHash.SetHex(strProTxHash);
+
+    CTransactionRef tx;
+    uint256 hashBlock;
+    bool fromMempool = false;
+
+    auto dmn = deterministicMNManager->GetListAtChainTip().GetMN(proTxHash);
+    if (!dmn) {
+        tx = mempool.get(proTxHash);
+        if (tx) {
+            fromMempool = true;
+            if (tx->nVersion < 3 || tx->nType != TRANSACTION_PROVIDER_REGISTER)
+                throw JSONRPCError(RPC_INVALID_PARAMETER, "TX is not a ProTx");
+            CProRegTx tmpProTx;
+            if (!GetTxPayload(*tx, tmpProTx))
+                throw JSONRPCError(RPC_INVALID_PARAMETER, "TX is not a valid ProTx");
+            dmn = std::make_shared<CDeterministicMN>(tx->GetHash(), tmpProTx);
+        } else {
+            throw JSONRPCError(RPC_INVALID_PARAMETER, "ProTx not found");
+        }
+    } else {
+        if (!GetTransaction(proTxHash, tx, Params().GetConsensus(), hashBlock, true))
+            throw JSONRPCError(RPC_INVALID_PARAMETER, "Parent transaction of ProTx not found");
+
+        if (!mapBlockIndex.count(hashBlock))
+            throw JSONRPCError(RPC_INVALID_PARAMETER, "Parent transaction of ProTx not found");
+    }
+
+    UniValue obj(UniValue::VOBJ);
+
+    UniValue stateObj;
+    dmn->pdmnState->ToJson(stateObj);
+    obj.push_back(Pair("state", stateObj));
+
+    if (!hashBlock.IsNull()) {
+        UniValue blockObj(UniValue::VOBJ);
+        blockObj.push_back(Pair("blockhash", hashBlock.GetHex()));
+
+        LOCK(cs_main);
+        BlockMap::iterator mi = mapBlockIndex.find(hashBlock);
+        if (mi != mapBlockIndex.end() && (*mi).second) {
+            CBlockIndex *pindex = (*mi).second;
+            if (chainActive.Contains(pindex)) {
+                blockObj.push_back(Pair("height", pindex->nHeight));
+                blockObj.push_back(Pair("confirmations", 1 + chainActive.Height() - pindex->nHeight));
+                blockObj.push_back(Pair("time", pindex->GetBlockTime()));
+                blockObj.push_back(Pair("blocktime", pindex->GetBlockTime()));
+            } else {
+                blockObj.push_back(Pair("height", -1));
+                blockObj.push_back(Pair("confirmations", 0));
+            }
+        }
+        obj.push_back(Pair("block", blockObj));
+
+        if (GetUTXOHeight(COutPoint(proTxHash, dmn->nCollateralIndex)) < 0) {
+            obj.push_back(Pair("isSpent", true));
+        }
+
+    } else {
+        obj.push_back(Pair("fromMempool", true));
+    }
+
+    return obj;
+}
+
 void masternode_list_conf_help()
 {
     throw std::runtime_error(
@@ -804,6 +893,8 @@ UniValue masternode(const JSONRPCRequest& request)
 #endif // ENABLE_WALLET
     } else if (strCommand == "genkey") {
         return masternode_genkey(request);
+    } else if (strCommand == "info") {
+        return masternode_info(request);
     } else if (strCommand == "list-conf") {
         return masternode_list_conf(request);
 #ifdef ENABLE_WALLET

From 31b4f835430dac5728bb096e4f11fa52435d8097 Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Mon, 26 Feb 2018 14:13:38 +0100
Subject: [PATCH 110/400] Forbid starting of legacy masternodes with non
 matching ProTx collateral values

If the masternode is already upgraded to ProTx, it's address and key
must match with the started masternode.
---
 src/activemasternode.cpp | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/src/activemasternode.cpp b/src/activemasternode.cpp
index a84a970d5153..ca2ac96658c1 100644
--- a/src/activemasternode.cpp
+++ b/src/activemasternode.cpp
@@ -374,6 +374,22 @@ void CActiveLegacyMasternodeManager::ManageStateRemote()
             LogPrintf("CActiveLegacyMasternodeManager::ManageStateRemote -- %s: %s\n", GetStateString(), strNotCapableReason);
             return;
         }
+        auto dmn = deterministicMNManager->GetListAtChainTip().GetMN(infoMn.outpoint.hash);
+        if (dmn) {
+            if (dmn->pdmnState->keyIDOperator != infoMn.keyIDOperator) {
+                nState = ACTIVE_MASTERNODE_NOT_CAPABLE;
+                strNotCapableReason = strprintf("Masternode collateral is a ProTx and masternode key does not match key from -masternodeprivkey");
+                LogPrintf("CActiveLegacyMasternodeManager::ManageStateRemote -- %s: %s\n", GetStateString(), strNotCapableReason);
+                return;
+            }
+            if (dmn->pdmnState->addr != infoMn.addr) {
+                nState = ACTIVE_MASTERNODE_NOT_CAPABLE;
+                strNotCapableReason = strprintf("Masternode collateral is a ProTx and ProTx address does not match local address");
+                LogPrintf("CActiveLegacyMasternodeManager::ManageStateRemote -- %s: %s\n", GetStateString(), strNotCapableReason);
+                return;
+            }
+            LogPrintf("CActiveLegacyMasternodeManager::ManageStateRemote -- Collateral is a ProTx\n");
+        }
         if(nState != ACTIVE_MASTERNODE_STARTED) {
             LogPrintf("CActiveLegacyMasternodeManager::ManageStateRemote -- STARTED!\n");
             activeMasternodeInfo.outpoint = infoMn.outpoint;

From d4530eb7d560105ef2782646500a9c29ae701e6c Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Fri, 9 Mar 2018 12:45:18 +0100
Subject: [PATCH 111/400] Put all masternodes in MASTERNODE_ENABLED state when
 spork15 is active

---
 src/masternodeman.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/masternodeman.cpp b/src/masternodeman.cpp
index e93ef2eb44a9..a8e54e18edab 100644
--- a/src/masternodeman.cpp
+++ b/src/masternodeman.cpp
@@ -396,6 +396,9 @@ void CMasternodeMan::AddDeterministicMasternodes()
             mn->keyIDVoting = dmn->pdmnState->keyIDVoting;
             mn->addr = dmn->pdmnState->addr;
             mn->nProtocolVersion = dmn->pdmnState->nProtocolVersion;
+
+            // If it appeared in the valid list, it is enabled no matter what
+            mn->nActiveState = CMasternode::MASTERNODE_ENABLED;
         }
 
         added = oldMnCount != mapMasternodes.size();

From b164bcc7a5ce5110f2a5b30931a3fe41ddc9de3a Mon Sep 17 00:00:00 2001
From: UdjinM6 <UdjinM6@users.noreply.github.com>
Date: Tue, 4 Sep 2018 13:54:59 +0300
Subject: [PATCH 112/400] Split PS into Manager and Session and allow running
 multiple mixing sessions in parallel (client side) (#2203)

* Split PS into Manager and Session

* Adjust log messages accordingly

* add -privatesendsessions cmd-line option

* address review comments

* bump MAX_OUTBOUND_MASTERNODE_CONNECTIONS to 30

+10 for parallel mixing

* protect vecSessions

* constructors

* Rewrite CMasternodeMan::ProcessMasternodeConnections() to use CPrivateSendClientManager::GetMixingMasternodesInfo().

This should solve potential deadlock cs_vecqueue vs cs_vNodes.

* Drop no longer used IsMixingMasternode()

* lock cs_wallet when mixing uses balance related functions
---
 src/init.cpp               |   6 +-
 src/masternodeman.cpp      |  19 +-
 src/net.h                  |   2 +-
 src/privatesend-client.cpp | 565 ++++++++++++++++++++++++-------------
 src/privatesend-client.h   | 134 ++++++---
 src/privatesend-server.cpp |   5 +-
 src/privatesend-server.h   |   5 +-
 src/privatesend.cpp        |  35 ++-
 src/privatesend.h          |  39 ++-
 src/qt/overviewpage.cpp    |  12 +-
 src/rpc/masternode.cpp     |  30 +-
 11 files changed, 562 insertions(+), 290 deletions(-)

diff --git a/src/init.cpp b/src/init.cpp
index e148b6e72f72..c66e0039d53d 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -579,6 +579,7 @@ std::string HelpMessage(HelpMessageMode mode)
     strUsage += HelpMessageGroup(_("PrivateSend options:"));
     strUsage += HelpMessageOpt("-enableprivatesend=<n>", strprintf(_("Enable use of automated PrivateSend for funds stored in this wallet (0-1, default: %u)"), 0));
     strUsage += HelpMessageOpt("-privatesendmultisession=<n>", strprintf(_("Enable multiple PrivateSend mixing sessions per block, experimental (0-1, default: %u)"), DEFAULT_PRIVATESEND_MULTISESSION));
+    strUsage += HelpMessageOpt("-privatesendsessions=<n>", strprintf(_("Use N separate masternodes in parallel to mix funds (%u-%u, default: %u)"), MIN_PRIVATESEND_SESSIONS, MAX_PRIVATESEND_SESSIONS, DEFAULT_PRIVATESEND_SESSIONS));
     strUsage += HelpMessageOpt("-privatesendrounds=<n>", strprintf(_("Use N separate masternodes for each denominated input to mix funds (%u-%u, default: %u)"), MIN_PRIVATESEND_ROUNDS, MAX_PRIVATESEND_ROUNDS, DEFAULT_PRIVATESEND_ROUNDS));
     strUsage += HelpMessageOpt("-privatesendamount=<n>", strprintf(_("Keep N DASH anonymized (%u-%u, default: %u)"), MIN_PRIVATESEND_AMOUNT, MAX_PRIVATESEND_AMOUNT, DEFAULT_PRIVATESEND_AMOUNT));
     strUsage += HelpMessageOpt("-liquidityprovider=<n>", strprintf(_("Provide liquidity to PrivateSend by infrequently mixing coins on a continual basis (%u-%u, default: %u, 1=very frequent, high fees, %u=very infrequent, low fees)"),
@@ -918,6 +919,8 @@ void InitParameterInteraction()
     if (nLiqProvTmp > 0) {
         ForceSetArg("-enableprivatesend", "1");
         LogPrintf("%s: parameter interaction: -liquidityprovider=%d -> setting -enableprivatesend=1\n", __func__, nLiqProvTmp);
+        ForceSetArg("-privatesendsessions", itostr(MIN_PRIVATESEND_SESSIONS));
+        LogPrintf("%s: parameter interaction: -liquidityprovider=%d -> setting -privatesendsessions=%d\n", __func__, nLiqProvTmp, itostr(std::numeric_limits<int>::max()));
         ForceSetArg("-privatesendrounds", itostr(std::numeric_limits<int>::max()));
         LogPrintf("%s: parameter interaction: -liquidityprovider=%d -> setting -privatesendrounds=%d\n", __func__, nLiqProvTmp, itostr(std::numeric_limits<int>::max()));
         ForceSetArg("-privatesendamount", itostr(MAX_PRIVATESEND_AMOUNT));
@@ -1921,6 +1924,7 @@ bool AppInitMain(boost::thread_group& threadGroup, CScheduler& scheduler)
 
     privateSendClient.fEnablePrivateSend = GetBoolArg("-enableprivatesend", false);
     privateSendClient.fPrivateSendMultiSession = GetBoolArg("-privatesendmultisession", DEFAULT_PRIVATESEND_MULTISESSION);
+    privateSendClient.nPrivateSendSessions = std::min(std::max((int)GetArg("-privatesendsessions", DEFAULT_PRIVATESEND_SESSIONS), MIN_PRIVATESEND_SESSIONS), MAX_PRIVATESEND_SESSIONS);
     privateSendClient.nPrivateSendRounds = std::min(std::max((int)GetArg("-privatesendrounds", DEFAULT_PRIVATESEND_ROUNDS), MIN_PRIVATESEND_ROUNDS), nMaxRounds);
     privateSendClient.nPrivateSendAmount = std::min(std::max((int)GetArg("-privatesendamount", DEFAULT_PRIVATESEND_AMOUNT), MIN_PRIVATESEND_AMOUNT), MAX_PRIVATESEND_AMOUNT);
 #endif // ENABLE_WALLET
@@ -2023,7 +2027,7 @@ bool AppInitMain(boost::thread_group& threadGroup, CScheduler& scheduler)
             scheduler.scheduleEvery(boost::bind(&CPrivateSendServer::DoMaintenance, boost::ref(privateSendServer), boost::ref(*g_connman)), 1);
 #ifdef ENABLE_WALLET
         else
-            scheduler.scheduleEvery(boost::bind(&CPrivateSendClient::DoMaintenance, boost::ref(privateSendClient), boost::ref(*g_connman)), 1);
+            scheduler.scheduleEvery(boost::bind(&CPrivateSendClientManager::DoMaintenance, boost::ref(privateSendClient), boost::ref(*g_connman)), 1);
 #endif // ENABLE_WALLET
     }
 
diff --git a/src/masternodeman.cpp b/src/masternodeman.cpp
index a8e54e18edab..c7a53e55c724 100644
--- a/src/masternodeman.cpp
+++ b/src/masternodeman.cpp
@@ -882,11 +882,22 @@ void CMasternodeMan::ProcessMasternodeConnections(CConnman& connman)
     //we don't care about this for regtest
     if(Params().NetworkIDString() == CBaseChainParams::REGTEST) return;
 
-    connman.ForEachNode(CConnman::AllNodes, [](CNode* pnode) {
+    std::vector<masternode_info_t> vecMnInfo; // will be empty when no wallet
 #ifdef ENABLE_WALLET
-        if(pnode->fMasternode && !privateSendClient.IsMixingMasternode(pnode)) {
-#else
-        if(pnode->fMasternode) {
+    privateSendClient.GetMixingMasternodesInfo(vecMnInfo);
+#endif // ENABLE_WALLET
+
+    connman.ForEachNode(CConnman::AllNodes, [&vecMnInfo](CNode* pnode) {
+        if (pnode->fMasternode) {
+#ifdef ENABLE_WALLET
+            bool fFound = false;
+            for (const auto& mnInfo : vecMnInfo) {
+                if (pnode->addr == mnInfo.addr) {
+                    fFound = true;
+                    break;
+                }
+            }
+            if (fFound) return; // do NOT disconnect mixing masternodes
 #endif // ENABLE_WALLET
             LogPrintf("Closing Masternode connection: peer=%d, addr=%s\n", pnode->id, pnode->addr.ToString());
             pnode->fDisconnect = true;
diff --git a/src/net.h b/src/net.h
index bc58b4ebac23..afbbc028796e 100644
--- a/src/net.h
+++ b/src/net.h
@@ -65,7 +65,7 @@ static const int MAX_OUTBOUND_CONNECTIONS = 8;
 /** Maximum number of addnode outgoing nodes */
 static const int MAX_ADDNODE_CONNECTIONS = 8;
 /** Maximum number if outgoing masternodes */
-static const int MAX_OUTBOUND_MASTERNODE_CONNECTIONS = 20;
+static const int MAX_OUTBOUND_MASTERNODE_CONNECTIONS = 30;
 /** -listen default */
 static const bool DEFAULT_LISTEN = true;
 /** -upnp default */
diff --git a/src/privatesend-client.cpp b/src/privatesend-client.cpp
index 2cbbf4c66657..b6e3b44d54cb 100644
--- a/src/privatesend-client.cpp
+++ b/src/privatesend-client.cpp
@@ -18,18 +18,22 @@
 
 #include <memory>
 
-CPrivateSendClient privateSendClient;
+CPrivateSendClientManager privateSendClient;
 
-void CPrivateSendClient::ProcessMessage(CNode* pfrom, const std::string& strCommand, CDataStream& vRecv, CConnman& connman)
+void CPrivateSendClientManager::ProcessMessage(CNode* pfrom, const std::string& strCommand, CDataStream& vRecv, CConnman& connman)
 {
     if(fMasternodeMode) return;
     if(fLiteMode) return; // ignore all Dash related functionality
     if(!masternodeSync.IsBlockchainSynced()) return;
 
-    if(strCommand == NetMsgType::DSQUEUE) {
-        TRY_LOCK(cs_darksend, lockRecv);
-        if(!lockRecv) return;
+    if(!CheckDiskSpace()) {
+        ResetPool();
+        fEnablePrivateSend = false;
+        LogPrintf("CPrivateSendClientManager::ProcessMessage -- Not enough disk space, disabling PrivateSend.\n");
+        return;
+    }
 
+    if(strCommand == NetMsgType::DSQUEUE) {
         if(pfrom->nVersion < MIN_PRIVATESEND_PEER_PROTO_VERSION) {
             LogPrint("privatesend", "DSQUEUE -- peer=%d using obsolete version %i\n", pfrom->id, pfrom->nVersion);
             connman.PushMessage(pfrom, CNetMsgMaker(pfrom->GetSendVersion()).Make(NetMsgType::REJECT, strCommand, REJECT_OBSOLETE,
@@ -40,13 +44,18 @@ void CPrivateSendClient::ProcessMessage(CNode* pfrom, const std::string& strComm
         CDarksendQueue dsq;
         vRecv >> dsq;
 
-        // process every dsq only once
-        for (const auto& q : vecDarksendQueue) {
-            if(q == dsq) {
-                // LogPrint("privatesend", "DSQUEUE -- %s seen\n", dsq.ToString());
-                return;
+        {
+            TRY_LOCK(cs_vecqueue, lockRecv);
+            if(!lockRecv) return;
+
+            // process every dsq only once
+            for (const auto& q : vecDarksendQueue) {
+                if(q == dsq) {
+                    // LogPrint("privatesend", "DSQUEUE -- %s seen\n", dsq.ToString());
+                    return;
+                }
             }
-        }
+        } // cs_vecqueue
 
         LogPrint("privatesend", "DSQUEUE -- %s new\n", dsq.ToString());
 
@@ -64,17 +73,20 @@ void CPrivateSendClient::ProcessMessage(CNode* pfrom, const std::string& strComm
 
         // if the queue is ready, submit if we can
         if(dsq.fReady) {
-            if(!infoMixingMasternode.fInfoValid) return;
-            if(infoMixingMasternode.addr != infoMn.addr) {
-                LogPrintf("DSQUEUE -- message doesn't match current Masternode: infoMixingMasternode=%s, addr=%s\n", infoMixingMasternode.addr.ToString(), infoMn.addr.ToString());
-                return;
-            }
-
-            if(nState == POOL_STATE_QUEUE) {
-                LogPrint("privatesend", "DSQUEUE -- PrivateSend queue (%s) is ready on masternode %s\n", dsq.ToString(), infoMn.addr.ToString());
-                SubmitDenominate(connman);
+            LOCK(cs_vecsessions);
+            for (auto& session : vecSessions) {
+                masternode_info_t mnMixing;
+                if (session.GetMixingMasternodeInfo(mnMixing) && mnMixing.addr == infoMn.addr && session.GetState() == POOL_STATE_QUEUE) {
+                    LogPrint("privatesend", "DSQUEUE -- PrivateSend queue (%s) is ready on masternode %s\n", dsq.ToString(), infoMn.addr.ToString());
+                    session.SubmitDenominate(connman);
+                    return;
+                }
             }
         } else {
+            LOCK(cs_vecsessions); // have to lock this first to avoid deadlocks with cs_vecqueue
+            TRY_LOCK(cs_vecqueue, lockRecv);
+            if(!lockRecv) return;
+
             for (const auto& q : vecDarksendQueue) {
                 if(q.masternodeOutpoint == dsq.masternodeOutpoint) {
                     // no way same mn can send another "not yet ready" dsq this soon
@@ -94,14 +106,35 @@ void CPrivateSendClient::ProcessMessage(CNode* pfrom, const std::string& strComm
             if(!mnodeman.AllowMixing(dsq.masternodeOutpoint)) return;
 
             LogPrint("privatesend", "DSQUEUE -- new PrivateSend queue (%s) from masternode %s\n", dsq.ToString(), infoMn.addr.ToString());
-            if(infoMixingMasternode.fInfoValid && infoMixingMasternode.outpoint == dsq.masternodeOutpoint) {
-                dsq.fTried = true;
+            for (auto& session : vecSessions) {
+                masternode_info_t mnMixing;
+                if (session.GetMixingMasternodeInfo(mnMixing) && mnMixing.outpoint == dsq.masternodeOutpoint) {
+                    dsq.fTried = true;
+                }
             }
             vecDarksendQueue.push_back(dsq);
             dsq.Relay(connman);
         }
 
-    } else if(strCommand == NetMsgType::DSSTATUSUPDATE) {
+    } else if (
+        strCommand == NetMsgType::DSSTATUSUPDATE ||
+        strCommand == NetMsgType::DSFINALTX ||
+        strCommand == NetMsgType::DSCOMPLETE
+    ) {
+        LOCK(cs_vecsessions);
+        for (auto& session : vecSessions) {
+            session.ProcessMessage(pfrom, strCommand, vRecv, connman);
+        }
+    }
+}
+
+void CPrivateSendClientSession::ProcessMessage(CNode* pfrom, const std::string& strCommand, CDataStream& vRecv, CConnman& connman)
+{
+    if(fMasternodeMode) return;
+    if(fLiteMode) return; // ignore all Dash related functionality
+    if(!masternodeSync.IsBlockchainSynced()) return;
+
+    if(strCommand == NetMsgType::DSSTATUSUPDATE) {
 
         if(pfrom->nVersion < MIN_PRIVATESEND_PEER_PROTO_VERSION) {
             LogPrint("privatesend", "DSSTATUSUPDATE -- peer=%d using obsolete version %i\n", pfrom->id, pfrom->nVersion);
@@ -209,17 +242,26 @@ void CPrivateSendClient::ProcessMessage(CNode* pfrom, const std::string& strComm
     }
 }
 
-void CPrivateSendClient::ResetPool()
+void CPrivateSendClientSession::ResetPool()
 {
-    nCachedLastSuccessBlock = 0;
     txMyCollateral = CMutableTransaction();
-    vecMasternodesUsed.clear();
     UnlockCoins();
     keyHolderStorage.ReturnAll();
     SetNull();
 }
 
-void CPrivateSendClient::SetNull()
+void CPrivateSendClientManager::ResetPool()
+{
+    LOCK(cs_vecsessions);
+    nCachedLastSuccessBlock = 0;
+    vecMasternodesUsed.clear();
+    for (auto& session : vecSessions) {
+        session.ResetPool();
+    }
+    vecSessions.clear();
+}
+
+void CPrivateSendClientSession::SetNull()
 {
     // Client side
     nEntriesCount = 0;
@@ -227,13 +269,13 @@ void CPrivateSendClient::SetNull()
     infoMixingMasternode = masternode_info_t();
     pendingDsaRequest = CPendingDsaRequest();
 
-    CPrivateSendBase::SetNull();
+    CPrivateSendBaseSession::SetNull();
 }
 
 //
 // Unlock coins after mixing fails or succeeds
 //
-void CPrivateSendClient::UnlockCoins()
+void CPrivateSendClientSession::UnlockCoins()
 {
     if (!pwalletMain) return;
 
@@ -248,13 +290,13 @@ void CPrivateSendClient::UnlockCoins()
     vecOutPointLocked.clear();
 }
 
-std::string CPrivateSendClient::GetStatus()
+std::string CPrivateSendClientSession::GetStatus(bool fWaitForBlock)
 {
     static int nStatusMessageProgress = 0;
     nStatusMessageProgress += 10;
     std::string strSuffix = "";
 
-    if(WaitForAnotherBlock() || !masternodeSync.IsBlockchainSynced())
+    if(fWaitForBlock || !masternodeSync.IsBlockchainSynced())
         return strAutoDenomResult;
 
     switch(nState) {
@@ -297,25 +339,55 @@ std::string CPrivateSendClient::GetStatus()
     }
 }
 
-bool CPrivateSendClient::GetMixingMasternodeInfo(masternode_info_t& mnInfoRet)
+std::string CPrivateSendClientManager::GetStatuses()
+{
+    LOCK(cs_vecsessions);
+    std::string strStatus;
+    bool fWaitForBlock = WaitForAnotherBlock();
+
+    for (auto& session : vecSessions) {
+        strStatus += session.GetStatus(fWaitForBlock) + "; ";
+    }
+    return strStatus;
+}
+
+std::string CPrivateSendClientManager::GetSessionDenoms()
+{
+    LOCK(cs_vecsessions);
+    std::string strSessionDenoms;
+
+    for (auto& session : vecSessions) {
+        strSessionDenoms += (session.nSessionDenom ? CPrivateSend::GetDenominationsToString(session.nSessionDenom) : "N/A") + "; ";
+    }
+    return strSessionDenoms.empty() ? "N/A" : strSessionDenoms;
+}
+
+bool CPrivateSendClientSession::GetMixingMasternodeInfo(masternode_info_t& mnInfoRet) const
 {
     mnInfoRet = infoMixingMasternode.fInfoValid ? infoMixingMasternode : masternode_info_t();
     return infoMixingMasternode.fInfoValid;
 }
 
-bool CPrivateSendClient::IsMixingMasternode(const CNode* pnode)
+bool CPrivateSendClientManager::GetMixingMasternodesInfo(std::vector<masternode_info_t>& vecMnInfoRet) const
 {
-    return infoMixingMasternode.fInfoValid && pnode->addr == infoMixingMasternode.addr;
+    LOCK(cs_vecsessions);
+    for (const auto& session : vecSessions) {
+        masternode_info_t mnInfo;
+        if (session.GetMixingMasternodeInfo(mnInfo)) {
+            vecMnInfoRet.push_back(mnInfo);
+        }
+    }
+    return !vecMnInfoRet.empty();
 }
 
 //
 // Check the mixing progress and send client updates if a Masternode
 //
-void CPrivateSendClient::CheckPool()
+void CPrivateSendClientSession::CheckPool()
 {
     // reset if we're here for 10 seconds
     if((nState == POOL_STATE_ERROR || nState == POOL_STATE_SUCCESS) && GetTime() - nTimeLastSuccessfulStep >= 10) {
-        LogPrint("privatesend", "CPrivateSendClient::CheckPool -- timeout, RESETTING\n");
+        LogPrint("privatesend", "CPrivateSendClientSession::CheckPool -- timeout, RESETTING\n");
         UnlockCoins();
         if (nState == POOL_STATE_ERROR) {
             keyHolderStorage.ReturnAll();
@@ -327,24 +399,20 @@ void CPrivateSendClient::CheckPool()
 }
 
 //
-// Check for various timeouts (queue objects, mixing, etc)
+// Check session timeouts
 //
-void CPrivateSendClient::CheckTimeout()
+bool CPrivateSendClientSession::CheckTimeout()
 {
-    if(fMasternodeMode) return;
-
-    CheckQueue();
-
-    if(!fEnablePrivateSend) return;
+    if(fMasternodeMode) return false;
 
     // catching hanging sessions
     switch(nState) {
         case POOL_STATE_ERROR:
-            LogPrint("privatesend", "CPrivateSendClient::CheckTimeout -- Pool error -- Running CheckPool\n");
+            LogPrint("privatesend", "CPrivateSendClientSession::CheckTimeout -- Pool error -- Running CheckPool\n");
             CheckPool();
             break;
         case POOL_STATE_SUCCESS:
-            LogPrint("privatesend", "CPrivateSendClient::CheckTimeout -- Pool success -- Running CheckPool\n");
+            LogPrint("privatesend", "CPrivateSendClientSession::CheckTimeout -- Pool success -- Running CheckPool\n");
             CheckPool();
             break;
         default:
@@ -355,14 +423,34 @@ void CPrivateSendClient::CheckTimeout()
     int nTimeout = (nState == POOL_STATE_SIGNING) ? PRIVATESEND_SIGNING_TIMEOUT : PRIVATESEND_QUEUE_TIMEOUT;
     bool fTimeout = GetTime() - nTimeLastSuccessfulStep >= nTimeout + nLagTime;
 
-    if(nState != POOL_STATE_IDLE && fTimeout) {
-        LogPrint("privatesend", "CPrivateSendClient::CheckTimeout -- %s timed out (%ds) -- resetting\n",
-                (nState == POOL_STATE_SIGNING) ? "Signing" : "Session", nTimeout);
-        UnlockCoins();
-        keyHolderStorage.ReturnAll();
-        SetNull();
-        SetState(POOL_STATE_ERROR);
-        strLastMessage = _("Session timed out.");
+    if(nState == POOL_STATE_IDLE || !fTimeout)
+        return false;
+
+    LogPrint("privatesend", "CPrivateSendClientSession::CheckTimeout -- %s timed out (%ds) -- resetting\n",
+            (nState == POOL_STATE_SIGNING) ? "Signing" : "Session", nTimeout);
+    UnlockCoins();
+    keyHolderStorage.ReturnAll();
+    SetNull();
+    SetState(POOL_STATE_ERROR);
+
+    return true;
+}
+
+//
+// Check all queues and sessions for timeouts
+//
+void CPrivateSendClientManager::CheckTimeout()
+{
+    if(fMasternodeMode) return;
+    if(!fEnablePrivateSend) return;
+
+    CheckQueue();
+
+    LOCK(cs_vecsessions);
+    for (auto& session : vecSessions) {
+        if (session.CheckTimeout()) {
+            strAutoDenomResult = _("Session timed out.");
+        }
     }
 }
 
@@ -370,10 +458,10 @@ void CPrivateSendClient::CheckTimeout()
 // Execute a mixing denomination via a Masternode.
 // This is only ran from clients
 //
-bool CPrivateSendClient::SendDenominate(const std::vector<CTxDSIn>& vecTxDSIn, const std::vector<CTxOut>& vecTxOut, CConnman& connman)
+bool CPrivateSendClientSession::SendDenominate(const std::vector<CTxDSIn>& vecTxDSIn, const std::vector<CTxOut>& vecTxOut, CConnman& connman)
 {
     if(fMasternodeMode) {
-        LogPrintf("CPrivateSendClient::SendDenominate -- PrivateSend from a Masternode is not supported currently.\n");
+        LogPrintf("CPrivateSendClientSession::SendDenominate -- PrivateSend from a Masternode is not supported currently.\n");
         return false;
     }
 
@@ -391,7 +479,7 @@ bool CPrivateSendClient::SendDenominate(const std::vector<CTxDSIn>& vecTxDSIn, c
 
     // we should already be connected to a Masternode
     if(!nSessionID) {
-        LogPrintf("CPrivateSendClient::SendDenominate -- No Masternode has been selected yet.\n");
+        LogPrintf("CPrivateSendClientSession::SendDenominate -- No Masternode has been selected yet.\n");
         UnlockCoins();
         keyHolderStorage.ReturnAll();
         SetNull();
@@ -402,15 +490,14 @@ bool CPrivateSendClient::SendDenominate(const std::vector<CTxDSIn>& vecTxDSIn, c
         UnlockCoins();
         keyHolderStorage.ReturnAll();
         SetNull();
-        fEnablePrivateSend = false;
-        LogPrintf("CPrivateSendClient::SendDenominate -- Not enough disk space, disabling PrivateSend.\n");
+        LogPrintf("CPrivateSendClientSession::SendDenominate -- Not enough disk space.\n");
         return false;
     }
 
     SetState(POOL_STATE_ACCEPTING_ENTRIES);
     strLastMessage = "";
 
-    LogPrintf("CPrivateSendClient::SendDenominate -- Added transaction to pool.\n");
+    LogPrintf("CPrivateSendClientSession::SendDenominate -- Added transaction to pool.\n");
 
     {
         // construct a pseudo tx, for debugging purpuses only
@@ -418,16 +505,16 @@ bool CPrivateSendClient::SendDenominate(const std::vector<CTxDSIn>& vecTxDSIn, c
         CMutableTransaction tx;
 
         for (const auto& txdsin : vecTxDSIn) {
-            LogPrint("privatesend", "CPrivateSendClient::SendDenominate -- txdsin=%s\n", txdsin.ToString());
+            LogPrint("privatesend", "CPrivateSendClientSession::SendDenominate -- txdsin=%s\n", txdsin.ToString());
             tx.vin.push_back(txdsin);
         }
 
         for (const CTxOut& txout : vecTxOut) {
-            LogPrint("privatesend", "CPrivateSendClient::SendDenominate -- txout=%s\n", txout.ToString());
+            LogPrint("privatesend", "CPrivateSendClientSession::SendDenominate -- txout=%s\n", txout.ToString());
             tx.vout.push_back(txout);
         }
 
-        LogPrintf("CPrivateSendClient::SendDenominate -- Submitting partial tx %s", tx.ToString());
+        LogPrintf("CPrivateSendClientSession::SendDenominate -- Submitting partial tx %s", tx.ToString());
     }
 
     // store our entry for later use
@@ -440,7 +527,7 @@ bool CPrivateSendClient::SendDenominate(const std::vector<CTxDSIn>& vecTxDSIn, c
 }
 
 // Incoming message from Masternode updating the progress of mixing
-bool CPrivateSendClient::CheckPoolStateUpdate(PoolState nStateNew, int nEntriesCountNew, PoolStatusUpdate nStatusUpdate, PoolMessage nMessageID, int nSessionIDNew)
+bool CPrivateSendClientSession::CheckPoolStateUpdate(PoolState nStateNew, int nEntriesCountNew, PoolStatusUpdate nStatusUpdate, PoolMessage nMessageID, int nSessionIDNew)
 {
     if(fMasternodeMode) return false;
 
@@ -451,7 +538,7 @@ bool CPrivateSendClient::CheckPoolStateUpdate(PoolState nStateNew, int nEntriesC
 
     // if rejected at any state
     if(nStatusUpdate == STATUS_REJECTED) {
-        LogPrintf("CPrivateSendClient::CheckPoolStateUpdate -- entry is rejected by Masternode\n");
+        LogPrintf("CPrivateSendClientSession::CheckPoolStateUpdate -- entry is rejected by Masternode\n");
         UnlockCoins();
         keyHolderStorage.ReturnAll();
         SetNull();
@@ -465,14 +552,14 @@ bool CPrivateSendClient::CheckPoolStateUpdate(PoolState nStateNew, int nEntriesC
             // new session id should be set only in POOL_STATE_QUEUE state
             nSessionID = nSessionIDNew;
             nTimeLastSuccessfulStep = GetTime();
-            LogPrintf("CPrivateSendClient::CheckPoolStateUpdate -- set nSessionID to %d\n", nSessionID);
+            LogPrintf("CPrivateSendClientSession::CheckPoolStateUpdate -- set nSessionID to %d\n", nSessionID);
             return true;
         }
         else if(nStateNew == POOL_STATE_ACCEPTING_ENTRIES && nEntriesCount != nEntriesCountNew) {
             nEntriesCount = nEntriesCountNew;
             nTimeLastSuccessfulStep = GetTime();
             fLastEntryAccepted = true;
-            LogPrintf("CPrivateSendClient::CheckPoolStateUpdate -- new entry accepted!\n");
+            LogPrintf("CPrivateSendClientSession::CheckPoolStateUpdate -- new entry accepted!\n");
             return true;
         }
     }
@@ -486,21 +573,22 @@ bool CPrivateSendClient::CheckPoolStateUpdate(PoolState nStateNew, int nEntriesC
 // check it to make sure it's what we want, then sign it if we agree.
 // If we refuse to sign, it's possible we'll be charged collateral
 //
-bool CPrivateSendClient::SignFinalTransaction(const CTransaction& finalTransactionNew, CNode* pnode, CConnman& connman)
+bool CPrivateSendClientSession::SignFinalTransaction(const CTransaction& finalTransactionNew, CNode* pnode, CConnman& connman)
 {
     if (!pwalletMain) return false;
 
     if(fMasternodeMode || pnode == nullptr) return false;
+    if(!infoMixingMasternode.fInfoValid) return false;
 
     finalMutableTransaction = finalTransactionNew;
-    LogPrintf("CPrivateSendClient::SignFinalTransaction -- finalMutableTransaction=%s", finalMutableTransaction.ToString());
+    LogPrintf("CPrivateSendClientSession::SignFinalTransaction -- finalMutableTransaction=%s", finalMutableTransaction.ToString());
 
     // Make sure it's BIP69 compliant
     sort(finalMutableTransaction.vin.begin(), finalMutableTransaction.vin.end(), CompareInputBIP69());
     sort(finalMutableTransaction.vout.begin(), finalMutableTransaction.vout.end(), CompareOutputBIP69());
 
     if(finalMutableTransaction.GetHash() != finalTransactionNew.GetHash()) {
-        LogPrintf("CPrivateSendClient::SignFinalTransaction -- WARNING! Masternode %s is not BIP69 compliant!\n", infoMixingMasternode.outpoint.ToStringShort());
+        LogPrintf("CPrivateSendClientSession::SignFinalTransaction -- WARNING! Masternode %s is not BIP69 compliant!\n", infoMixingMasternode.outpoint.ToStringShort());
         UnlockCoins();
         keyHolderStorage.ReturnAll();
         SetNull();
@@ -546,7 +634,7 @@ bool CPrivateSendClient::SignFinalTransaction(const CTransaction& finalTransacti
                 if(nFoundOutputsCount < nTargetOuputsCount || nValue1 != nValue2) {
                     // in this case, something went wrong and we'll refuse to sign. It's possible we'll be charged collateral. But that's
                     // better then signing if the transaction doesn't look like what we wanted.
-                    LogPrintf("CPrivateSendClient::SignFinalTransaction -- My entries are not correct! Refusing to sign: nFoundOutputsCount: %d, nTargetOuputsCount: %d\n", nFoundOutputsCount, nTargetOuputsCount);
+                    LogPrintf("CPrivateSendClientSession::SignFinalTransaction -- My entries are not correct! Refusing to sign: nFoundOutputsCount: %d, nTargetOuputsCount: %d\n", nFoundOutputsCount, nTargetOuputsCount);
                     UnlockCoins();
                     keyHolderStorage.ReturnAll();
                     SetNull();
@@ -556,20 +644,20 @@ bool CPrivateSendClient::SignFinalTransaction(const CTransaction& finalTransacti
 
                 const CKeyStore& keystore = *pwalletMain;
 
-                LogPrint("privatesend", "CPrivateSendClient::SignFinalTransaction -- Signing my input %i\n", nMyInputIndex);
+                LogPrint("privatesend", "CPrivateSendClientSession::SignFinalTransaction -- Signing my input %i\n", nMyInputIndex);
                 if(!SignSignature(keystore, prevPubKey, finalMutableTransaction, nMyInputIndex, int(SIGHASH_ALL|SIGHASH_ANYONECANPAY))) { // changes scriptSig
-                    LogPrint("privatesend", "CPrivateSendClient::SignFinalTransaction -- Unable to sign my own transaction!\n");
+                    LogPrint("privatesend", "CPrivateSendClientSession::SignFinalTransaction -- Unable to sign my own transaction!\n");
                     // not sure what to do here, it will timeout...?
                 }
 
                 sigs.push_back(finalMutableTransaction.vin[nMyInputIndex]);
-                LogPrint("privatesend", "CPrivateSendClient::SignFinalTransaction -- nMyInputIndex: %d, sigs.size(): %d, scriptSig=%s\n", nMyInputIndex, (int)sigs.size(), ScriptToAsmStr(finalMutableTransaction.vin[nMyInputIndex].scriptSig));
+                LogPrint("privatesend", "CPrivateSendClientSession::SignFinalTransaction -- nMyInputIndex: %d, sigs.size(): %d, scriptSig=%s\n", nMyInputIndex, (int)sigs.size(), ScriptToAsmStr(finalMutableTransaction.vin[nMyInputIndex].scriptSig));
             }
         }
     }
 
     if(sigs.empty()) {
-        LogPrintf("CPrivateSendClient::SignFinalTransaction -- can't sign anything!\n");
+        LogPrintf("CPrivateSendClientSession::SignFinalTransaction -- can't sign anything!\n");
         UnlockCoins();
         keyHolderStorage.ReturnAll();
         SetNull();
@@ -578,7 +666,7 @@ bool CPrivateSendClient::SignFinalTransaction(const CTransaction& finalTransacti
     }
 
     // push all of our signatures to the Masternode
-    LogPrintf("CPrivateSendClient::SignFinalTransaction -- pushing sigs to the masternode, finalMutableTransaction=%s", finalMutableTransaction.ToString());
+    LogPrintf("CPrivateSendClientSession::SignFinalTransaction -- pushing sigs to the masternode, finalMutableTransaction=%s", finalMutableTransaction.ToString());
     CNetMsgMaker msgMaker(pnode->GetSendVersion());
     connman.PushMessage(pnode, msgMaker.Make(NetMsgType::DSSIGNFINALTX, sigs));
     SetState(POOL_STATE_SIGNING);
@@ -588,13 +676,13 @@ bool CPrivateSendClient::SignFinalTransaction(const CTransaction& finalTransacti
 }
 
 // mixing transaction was completed (failed or successful)
-void CPrivateSendClient::CompletedTransaction(PoolMessage nMessageID)
+void CPrivateSendClientSession::CompletedTransaction(PoolMessage nMessageID)
 {
     if(fMasternodeMode) return;
 
     if(nMessageID == MSG_SUCCESS) {
         LogPrintf("CompletedTransaction -- success\n");
-        nCachedLastSuccessBlock = nCachedBlockHeight;
+        privateSendClient.UpdatedSuccessBlock();
         keyHolderStorage.KeepAll();
     } else {
         LogPrintf("CompletedTransaction -- error\n");
@@ -605,12 +693,23 @@ void CPrivateSendClient::CompletedTransaction(PoolMessage nMessageID)
     strLastMessage = CPrivateSend::GetMessageByID(nMessageID);
 }
 
-bool CPrivateSendClient::IsDenomSkipped(CAmount nDenomValue)
+void CPrivateSendClientManager::UpdatedSuccessBlock()
+{
+    if(fMasternodeMode) return;
+    nCachedLastSuccessBlock = nCachedBlockHeight;
+}
+
+bool CPrivateSendClientManager::IsDenomSkipped(const CAmount& nDenomValue)
 {
     return std::find(vecDenominationsSkipped.begin(), vecDenominationsSkipped.end(), nDenomValue) != vecDenominationsSkipped.end();
 }
 
-bool CPrivateSendClient::WaitForAnotherBlock()
+void CPrivateSendClientManager::AddSkippedDenom(const CAmount& nDenomValue)
+{
+    vecDenominationsSkipped.push_back(nDenomValue);
+}
+
+bool CPrivateSendClientManager::WaitForAnotherBlock()
 {
     if(!masternodeSync.IsMasternodeListSynced())
         return true;
@@ -621,10 +720,10 @@ bool CPrivateSendClient::WaitForAnotherBlock()
     return nCachedBlockHeight - nCachedLastSuccessBlock < nMinBlocksToWait;
 }
 
-bool CPrivateSendClient::CheckAutomaticBackup()
+bool CPrivateSendClientManager::CheckAutomaticBackup()
 {
     if (!pwalletMain) {
-        LogPrint("privatesend", "CPrivateSendClient::CheckAutomaticBackup -- Wallet is not initialized, no mixing available.\n");
+        LogPrint("privatesend", "CPrivateSendClientManager::CheckAutomaticBackup -- Wallet is not initialized, no mixing available.\n");
         strAutoDenomResult = _("Wallet is not initialized") + ", " + _("no mixing available.");
         fEnablePrivateSend = false; // no mixing
         return false;
@@ -632,7 +731,7 @@ bool CPrivateSendClient::CheckAutomaticBackup()
 
     switch(nWalletBackups) {
         case 0:
-            LogPrint("privatesend", "CPrivateSendClient::CheckAutomaticBackup -- Automatic backups disabled, no mixing available.\n");
+            LogPrint("privatesend", "CPrivateSendClientManager::CheckAutomaticBackup -- Automatic backups disabled, no mixing available.\n");
             strAutoDenomResult = _("Automatic backups disabled") + ", " + _("no mixing available.");
             fEnablePrivateSend = false; // stop mixing
             pwalletMain->nKeysLeftSinceAutoBackup = 0; // no backup, no "keys since last backup"
@@ -641,43 +740,43 @@ bool CPrivateSendClient::CheckAutomaticBackup()
             // Automatic backup failed, nothing else we can do until user fixes the issue manually.
             // There is no way to bring user attention in daemon mode so we just update status and
             // keep spamming if debug is on.
-            LogPrint("privatesend", "CPrivateSendClient::CheckAutomaticBackup -- ERROR! Failed to create automatic backup.\n");
+            LogPrint("privatesend", "CPrivateSendClientManager::CheckAutomaticBackup -- ERROR! Failed to create automatic backup.\n");
             strAutoDenomResult = _("ERROR! Failed to create automatic backup") + ", " + _("see debug.log for details.");
             return false;
         case -2:
             // We were able to create automatic backup but keypool was not replenished because wallet is locked.
             // There is no way to bring user attention in daemon mode so we just update status and
             // keep spamming if debug is on.
-            LogPrint("privatesend", "CPrivateSendClient::CheckAutomaticBackup -- WARNING! Failed to create replenish keypool, please unlock your wallet to do so.\n");
+            LogPrint("privatesend", "CPrivateSendClientManager::CheckAutomaticBackup -- WARNING! Failed to create replenish keypool, please unlock your wallet to do so.\n");
             strAutoDenomResult = _("WARNING! Failed to replenish keypool, please unlock your wallet to do so.") + ", " + _("see debug.log for details.");
             return false;
     }
 
     if(pwalletMain->nKeysLeftSinceAutoBackup < PRIVATESEND_KEYS_THRESHOLD_STOP) {
         // We should never get here via mixing itself but probably smth else is still actively using keypool
-        LogPrint("privatesend", "CPrivateSendClient::CheckAutomaticBackup -- Very low number of keys left: %d, no mixing available.\n", pwalletMain->nKeysLeftSinceAutoBackup);
+        LogPrint("privatesend", "CPrivateSendClientManager::CheckAutomaticBackup -- Very low number of keys left: %d, no mixing available.\n", pwalletMain->nKeysLeftSinceAutoBackup);
         strAutoDenomResult = strprintf(_("Very low number of keys left: %d") + ", " + _("no mixing available."), pwalletMain->nKeysLeftSinceAutoBackup);
         // It's getting really dangerous, stop mixing
         fEnablePrivateSend = false;
         return false;
     } else if(pwalletMain->nKeysLeftSinceAutoBackup < PRIVATESEND_KEYS_THRESHOLD_WARNING) {
         // Low number of keys left but it's still more or less safe to continue
-        LogPrint("privatesend", "CPrivateSendClient::CheckAutomaticBackup -- Very low number of keys left: %d\n", pwalletMain->nKeysLeftSinceAutoBackup);
+        LogPrint("privatesend", "CPrivateSendClientManager::CheckAutomaticBackup -- Very low number of keys left: %d\n", pwalletMain->nKeysLeftSinceAutoBackup);
         strAutoDenomResult = strprintf(_("Very low number of keys left: %d"), pwalletMain->nKeysLeftSinceAutoBackup);
 
         if(fCreateAutoBackups) {
-            LogPrint("privatesend", "CPrivateSendClient::CheckAutomaticBackup -- Trying to create new backup.\n");
+            LogPrint("privatesend", "CPrivateSendClientManager::CheckAutomaticBackup -- Trying to create new backup.\n");
             std::string warningString;
             std::string errorString;
 
             if(!AutoBackupWallet(pwalletMain, "", warningString, errorString)) {
                 if(!warningString.empty()) {
                     // There were some issues saving backup but yet more or less safe to continue
-                    LogPrintf("CPrivateSendClient::CheckAutomaticBackup -- WARNING! Something went wrong on automatic backup: %s\n", warningString);
+                    LogPrintf("CPrivateSendClientManager::CheckAutomaticBackup -- WARNING! Something went wrong on automatic backup: %s\n", warningString);
                 }
                 if(!errorString.empty()) {
                     // Things are really broken
-                    LogPrintf("CPrivateSendClient::CheckAutomaticBackup -- ERROR! Failed to create automatic backup: %s\n", errorString);
+                    LogPrintf("CPrivateSendClientManager::CheckAutomaticBackup -- ERROR! Failed to create automatic backup: %s\n", errorString);
                     strAutoDenomResult = strprintf(_("ERROR! Failed to create automatic backup") + ": %s", errorString);
                     return false;
                 }
@@ -688,7 +787,7 @@ bool CPrivateSendClient::CheckAutomaticBackup()
         }
     }
 
-    LogPrint("privatesend", "CPrivateSendClient::CheckAutomaticBackup -- Keys left since latest backup: %d\n", pwalletMain->nKeysLeftSinceAutoBackup);
+    LogPrint("privatesend", "CPrivateSendClientManager::CheckAutomaticBackup -- Keys left since latest backup: %d\n", pwalletMain->nKeysLeftSinceAutoBackup);
 
     return true;
 }
@@ -696,10 +795,9 @@ bool CPrivateSendClient::CheckAutomaticBackup()
 //
 // Passively run mixing in the background to anonymize funds based on the given configuration.
 //
-bool CPrivateSendClient::DoAutomaticDenominating(CConnman& connman, bool fDryRun)
+bool CPrivateSendClientSession::DoAutomaticDenominating(CConnman& connman, bool fDryRun)
 {
     if(fMasternodeMode) return false; // no client-side mixing on masternodes
-    if(!fEnablePrivateSend) return false;
     if(nState != POOL_STATE_IDLE) return false;
 
     if(!masternodeSync.IsMasternodeListSynced()) {
@@ -712,14 +810,17 @@ bool CPrivateSendClient::DoAutomaticDenominating(CConnman& connman, bool fDryRun
         return false;
     }
 
+    CAmount nBalanceNeedsAnonymized;
+    CAmount nValueMin = CPrivateSend::GetSmallestDenomination();
+
+    {
+    LOCK2(cs_main, pwalletMain->cs_wallet);
+
     if(!fDryRun && pwalletMain->IsLocked(true)) {
         strAutoDenomResult = _("Wallet is locked.");
         return false;
     }
 
-    if(!CheckAutomaticBackup())
-        return false;
-
     if(GetEntriesCount() > 0) {
         strAutoDenomResult = _("Mixing in progress...");
         return false;
@@ -731,20 +832,12 @@ bool CPrivateSendClient::DoAutomaticDenominating(CConnman& connman, bool fDryRun
         return false;
     }
 
-    if(WaitForAnotherBlock()) {
-        LogPrintf("CPrivateSendClient::DoAutomaticDenominating -- Last successful PrivateSend action was too recent\n");
-        strAutoDenomResult = _("Last successful PrivateSend action was too recent.");
-        return false;
-    }
-
     if(mnodeman.size() == 0) {
-        LogPrint("privatesend", "CPrivateSendClient::DoAutomaticDenominating -- No Masternodes detected\n");
+        LogPrint("privatesend", "CPrivateSendClientSession::DoAutomaticDenominating -- No Masternodes detected\n");
         strAutoDenomResult = _("No Masternodes detected.");
         return false;
     }
 
-    CAmount nValueMin = CPrivateSend::GetSmallestDenomination();
-
     // if there are no confirmed DS collateral inputs yet
     if(!pwalletMain->HasCollateralInputs()) {
         // should have some additional amount for them
@@ -752,11 +845,11 @@ bool CPrivateSendClient::DoAutomaticDenominating(CConnman& connman, bool fDryRun
     }
 
     // including denoms but applying some restrictions
-    CAmount nBalanceNeedsAnonymized = pwalletMain->GetNeedsToBeAnonymizedBalance(nValueMin);
+    nBalanceNeedsAnonymized = pwalletMain->GetNeedsToBeAnonymizedBalance(nValueMin);
 
     // anonymizable balance is way too small
     if(nBalanceNeedsAnonymized < nValueMin) {
-        LogPrintf("CPrivateSendClient::DoAutomaticDenominating -- Not enough funds to anonymize\n");
+        LogPrintf("CPrivateSendClientSession::DoAutomaticDenominating -- Not enough funds to anonymize\n");
         strAutoDenomResult = _("Not enough funds to anonymize.");
         return false;
     }
@@ -768,7 +861,7 @@ bool CPrivateSendClient::DoAutomaticDenominating(CConnman& connman, bool fDryRun
     CAmount nBalanceDenominatedUnconf = pwalletMain->GetDenominatedBalance(true);
     CAmount nBalanceDenominated = nBalanceDenominatedConf + nBalanceDenominatedUnconf;
 
-    LogPrint("privatesend", "CPrivateSendClient::DoAutomaticDenominating -- nValueMin: %f, nBalanceNeedsAnonymized: %f, nBalanceAnonimizableNonDenom: %f, nBalanceDenominatedConf: %f, nBalanceDenominatedUnconf: %f, nBalanceDenominated: %f\n",
+    LogPrint("privatesend", "CPrivateSendClientSession::DoAutomaticDenominating -- nValueMin: %f, nBalanceNeedsAnonymized: %f, nBalanceAnonimizableNonDenom: %f, nBalanceDenominatedConf: %f, nBalanceDenominatedUnconf: %f, nBalanceDenominated: %f\n",
             (float)nValueMin/COIN,
             (float)nBalanceNeedsAnonymized/COIN,
             (float)nBalanceAnonimizableNonDenom/COIN,
@@ -781,7 +874,7 @@ bool CPrivateSendClient::DoAutomaticDenominating(CConnman& connman, bool fDryRun
     // Check if we have should create more denominated inputs i.e.
     // there are funds to denominate and denominated balance does not exceed
     // max amount to mix yet.
-    if(nBalanceAnonimizableNonDenom >= nValueMin + CPrivateSend::GetCollateralAmount() && nBalanceDenominated < nPrivateSendAmount*COIN)
+    if(nBalanceAnonimizableNonDenom >= nValueMin + CPrivateSend::GetCollateralAmount() && nBalanceDenominated < privateSendClient.nPrivateSendAmount*COIN)
         return CreateDenominated(connman);
 
     //check if we have the collateral sized inputs
@@ -800,8 +893,8 @@ bool CPrivateSendClient::DoAutomaticDenominating(CConnman& connman, bool fDryRun
     SetNull();
 
     // should be no unconfirmed denoms in non-multi-session mode
-    if(!fPrivateSendMultiSession && nBalanceDenominatedUnconf > 0) {
-        LogPrintf("CPrivateSendClient::DoAutomaticDenominating -- Found unconfirmed denominated outputs, will wait till they confirm to continue.\n");
+    if(!privateSendClient.fPrivateSendMultiSession && nBalanceDenominatedUnconf > 0) {
+        LogPrintf("CPrivateSendClientSession::DoAutomaticDenominating -- Found unconfirmed denominated outputs, will wait till they confirm to continue.\n");
         strAutoDenomResult = _("Found unconfirmed denominated outputs, will wait till they confirm to continue.");
         return false;
     }
@@ -810,18 +903,54 @@ bool CPrivateSendClient::DoAutomaticDenominating(CConnman& connman, bool fDryRun
     std::string strReason;
     if(txMyCollateral == CMutableTransaction()) {
         if(!pwalletMain->CreateCollateralTransaction(txMyCollateral, strReason)) {
-            LogPrintf("CPrivateSendClient::DoAutomaticDenominating -- create collateral error:%s\n", strReason);
+            LogPrintf("CPrivateSendClientSession::DoAutomaticDenominating -- create collateral error:%s\n", strReason);
             return false;
         }
     } else {
         if(!CPrivateSend::IsCollateralValid(txMyCollateral)) {
-            LogPrintf("CPrivateSendClient::DoAutomaticDenominating -- invalid collateral, recreating...\n");
+            LogPrintf("CPrivateSendClientSession::DoAutomaticDenominating -- invalid collateral, recreating...\n");
             if(!pwalletMain->CreateCollateralTransaction(txMyCollateral, strReason)) {
-                LogPrintf("CPrivateSendClient::DoAutomaticDenominating -- create collateral error: %s\n", strReason);
+                LogPrintf("CPrivateSendClientSession::DoAutomaticDenominating -- create collateral error: %s\n", strReason);
                 return false;
             }
         }
     }
+    } // LOCK2(cs_main, pwalletMain->cs_wallet);
+
+    bool fUseQueue = GetRandInt(100) > 33;
+    // don't use the queues all of the time for mixing unless we are a liquidity provider
+    if((privateSendClient.nLiquidityProvider || fUseQueue) && JoinExistingQueue(nBalanceNeedsAnonymized, connman))
+        return true;
+
+    // do not initiate queue if we are a liquidity provider to avoid useless inter-mixing
+    if(privateSendClient.nLiquidityProvider) return false;
+
+    if(StartNewQueue(nValueMin, nBalanceNeedsAnonymized, connman))
+        return true;
+
+    strAutoDenomResult = _("No compatible Masternode found.");
+    return false;
+}
+
+bool CPrivateSendClientManager::DoAutomaticDenominating(CConnman& connman, bool fDryRun)
+{
+    if (fMasternodeMode) return false; // no client-side mixing on masternodes
+    if (!fEnablePrivateSend) return false;
+
+    if (!masternodeSync.IsMasternodeListSynced()) {
+        strAutoDenomResult = _("Can't mix while sync in progress.");
+        return false;
+    }
+
+    if (!pwalletMain) {
+        strAutoDenomResult = _("Wallet is not initialized");
+        return false;
+    }
+
+    if (!fDryRun && pwalletMain->IsLocked(true)) {
+        strAutoDenomResult = _("Wallet is locked.");
+        return false;
+    }
 
     int nMnCountEnabled = mnodeman.CountEnabled(MIN_PRIVATESEND_PEER_PROTO_VERSION);
 
@@ -835,38 +964,49 @@ bool CPrivateSendClient::DoAutomaticDenominating(CConnman& connman, bool fDryRun
         LogPrint("privatesend", "  vecMasternodesUsed: new size: %d, threshold: %d\n", (int)vecMasternodesUsed.size(), nThreshold_high);
     }
 
-    bool fUseQueue = GetRandInt(100) > 33;
-    // don't use the queues all of the time for mixing unless we are a liquidity provider
-    if((nLiquidityProvider || fUseQueue) && JoinExistingQueue(nBalanceNeedsAnonymized, connman))
-        return true;
+    LOCK(cs_vecsessions);
+    bool fResult = true;
+    if ((int)vecSessions.size() < nPrivateSendSessions) {
+        vecSessions.emplace_back();
+    }
+    for (auto& session : vecSessions) {
+        if (!CheckAutomaticBackup())
+            return false;
 
-    // do not initiate queue if we are a liquidity provider to avoid useless inter-mixing
-    if(nLiquidityProvider) return false;
+        if (WaitForAnotherBlock()) {
+            LogPrintf("CPrivateSendClientManager::DoAutomaticDenominating -- Last successful PrivateSend action was too recent\n");
+            strAutoDenomResult = _("Last successful PrivateSend action was too recent.");
+            return false;
+        }
 
-    if(StartNewQueue(nValueMin, nBalanceNeedsAnonymized, connman))
-        return true;
+        fResult &= session.DoAutomaticDenominating(connman, fDryRun);
+    }
 
-    strAutoDenomResult = _("No compatible Masternode found.");
-    return false;
+    return fResult;
+}
+
+void CPrivateSendClientManager::AddUsedMasternode(const COutPoint& outpointMn)
+{
+    vecMasternodesUsed.push_back(outpointMn);
+}
+
+masternode_info_t CPrivateSendClientManager::GetNotUsedMasternode()
+{
+    return mnodeman.FindRandomNotInVec(vecMasternodesUsed, MIN_PRIVATESEND_PEER_PROTO_VERSION);
 }
 
-bool CPrivateSendClient::JoinExistingQueue(CAmount nBalanceNeedsAnonymized, CConnman& connman)
+bool CPrivateSendClientSession::JoinExistingQueue(CAmount nBalanceNeedsAnonymized, CConnman& connman)
 {
     if (!pwalletMain)  return false;
 
     std::vector<CAmount> vecStandardDenoms = CPrivateSend::GetStandardDenominations();
     // Look through the queues and see if anything matches
-    for (auto& dsq : vecDarksendQueue) {
-        // only try each queue once
-        if(dsq.fTried) continue;
-        dsq.fTried = true;
-
-        if(dsq.IsExpired()) continue;
-
+    CDarksendQueue dsq;
+    while (privateSendClient.GetQueueItemAndTry(dsq)) {
         masternode_info_t infoMn;
 
         if(!mnodeman.GetMasternodeInfo(dsq.masternodeOutpoint, infoMn)) {
-            LogPrintf("CPrivateSendClient::JoinExistingQueue -- dsq masternode is not in masternode list, masternode=%s\n", dsq.masternodeOutpoint.ToStringShort());
+            LogPrintf("CPrivateSendClientSession::JoinExistingQueue -- dsq masternode is not in masternode list, masternode=%s\n", dsq.masternodeOutpoint.ToStringShort());
             continue;
         }
 
@@ -874,7 +1014,7 @@ bool CPrivateSendClient::JoinExistingQueue(CAmount nBalanceNeedsAnonymized, CCon
 
         // skip next mn payments winners
         if (mnpayments.IsScheduled(infoMn, 0)) {
-            LogPrintf("CPrivateSendClient::JoinExistingQueue -- skipping winner, masternode=%s\n", infoMn.outpoint.ToStringShort());
+            LogPrintf("CPrivateSendClientSession::JoinExistingQueue -- skipping winner, masternode=%s\n", infoMn.outpoint.ToStringShort());
             continue;
         }
 
@@ -888,7 +1028,7 @@ bool CPrivateSendClient::JoinExistingQueue(CAmount nBalanceNeedsAnonymized, CCon
         // in order for dsq to get into vecDarksendQueue, so we should be safe to mix already,
         // no need for additional verification here
 
-        LogPrint("privatesend", "CPrivateSendClient::JoinExistingQueue -- found valid queue: %s\n", dsq.ToString());
+        LogPrint("privatesend", "CPrivateSendClientSession::JoinExistingQueue -- found valid queue: %s\n", dsq.ToString());
 
         CAmount nValueInTmp = 0;
         std::vector<CTxDSIn> vecTxDSInTmp;
@@ -903,15 +1043,15 @@ bool CPrivateSendClient::JoinExistingQueue(CAmount nBalanceNeedsAnonymized, CCon
             nMinAmount = nMaxAmount = dsq.nInputCount * vecStandardDenoms[vecBits.front()];
         }
         // Try to match their denominations if possible, select exact number of denominations
-        if(!pwalletMain->SelectCoinsByDenominations(dsq.nDenom, nMinAmount, nMaxAmount, vecTxDSInTmp, vCoinsTmp, nValueInTmp, 0, nPrivateSendRounds)) {
-            LogPrintf("CPrivateSendClient::JoinExistingQueue -- Couldn't match %d denominations %d %d (%s)\n", dsq.nInputCount, vecBits.front(), dsq.nDenom, CPrivateSend::GetDenominationsToString(dsq.nDenom));
+        if(!pwalletMain->SelectCoinsByDenominations(dsq.nDenom, nMinAmount, nMaxAmount, vecTxDSInTmp, vCoinsTmp, nValueInTmp, 0, privateSendClient.nPrivateSendRounds)) {
+            LogPrintf("CPrivateSendClientSession::JoinExistingQueue -- Couldn't match %d denominations %d %d (%s)\n", dsq.nInputCount, vecBits.front(), dsq.nDenom, CPrivateSend::GetDenominationsToString(dsq.nDenom));
             continue;
         }
 
-        vecMasternodesUsed.push_back(dsq.masternodeOutpoint);
+        privateSendClient.AddUsedMasternode(dsq.masternodeOutpoint);
 
         if (connman.IsMasternodeOrDisconnectRequested(infoMn.addr)) {
-            LogPrintf("CPrivateSendClient::JoinExistingQueue -- skipping masternode connection, addr=%s\n", infoMn.addr.ToString());
+            LogPrintf("CPrivateSendClientSession::JoinExistingQueue -- skipping masternode connection, addr=%s\n", infoMn.addr.ToString());
             continue;
         }
 
@@ -923,7 +1063,7 @@ bool CPrivateSendClient::JoinExistingQueue(CAmount nBalanceNeedsAnonymized, CCon
         // TODO: add new state POOL_STATE_CONNECTING and bump MIN_PRIVATESEND_PEER_PROTO_VERSION
         SetState(POOL_STATE_QUEUE);
         nTimeLastSuccessfulStep = GetTime();
-        LogPrintf("CPrivateSendClient::JoinExistingQueue -- pending connection (from queue): nSessionDenom: %d (%s), nSessionInputCount: %d, addr=%s\n",
+        LogPrintf("CPrivateSendClientSession::JoinExistingQueue -- pending connection (from queue): nSessionDenom: %d (%s), nSessionInputCount: %d, addr=%s\n",
                   nSessionDenom, CPrivateSend::GetDenominationsToString(nSessionDenom), nSessionInputCount, infoMn.addr.ToString());
         strAutoDenomResult = _("Trying to connect...");
         return true;
@@ -932,7 +1072,7 @@ bool CPrivateSendClient::JoinExistingQueue(CAmount nBalanceNeedsAnonymized, CCon
     return false;
 }
 
-bool CPrivateSendClient::StartNewQueue(CAmount nValueMin, CAmount nBalanceNeedsAnonymized, CConnman& connman)
+bool CPrivateSendClientSession::StartNewQueue(CAmount nValueMin, CAmount nBalanceNeedsAnonymized, CConnman& connman)
 {
     if (!pwalletMain) return false;
 
@@ -942,34 +1082,34 @@ bool CPrivateSendClient::StartNewQueue(CAmount nValueMin, CAmount nBalanceNeedsA
     // ** find the coins we'll use
     std::vector<CTxIn> vecTxIn;
     CAmount nValueInTmp = 0;
-    if(!pwalletMain->SelectCoinsDark(nValueMin, nBalanceNeedsAnonymized, vecTxIn, nValueInTmp, 0, nPrivateSendRounds)) {
+    if(!pwalletMain->SelectCoinsDark(nValueMin, nBalanceNeedsAnonymized, vecTxIn, nValueInTmp, 0, privateSendClient.nPrivateSendRounds)) {
         // this should never happen
-        LogPrintf("CPrivateSendClient::StartNewQueue -- Can't mix: no compatible inputs found!\n");
+        LogPrintf("CPrivateSendClientSession::StartNewQueue -- Can't mix: no compatible inputs found!\n");
         strAutoDenomResult = _("Can't mix: no compatible inputs found!");
         return false;
     }
 
     // otherwise, try one randomly
     while(nTries < 10) {
-        masternode_info_t infoMn = mnodeman.FindRandomNotInVec(vecMasternodesUsed, MIN_PRIVATESEND_PEER_PROTO_VERSION);
+        masternode_info_t infoMn = privateSendClient.GetNotUsedMasternode();
 
         if(!infoMn.fInfoValid) {
-            LogPrintf("CPrivateSendClient::StartNewQueue -- Can't find random masternode!\n");
+            LogPrintf("CPrivateSendClientSession::StartNewQueue -- Can't find random masternode!\n");
             strAutoDenomResult = _("Can't find random Masternode.");
             return false;
         }
 
         // skip next mn payments winners
         if (mnpayments.IsScheduled(infoMn, 0)) {
-            LogPrintf("CPrivateSendClient::StartNewQueue -- skipping winner, masternode=%s\n", infoMn.outpoint.ToStringShort());
+            LogPrintf("CPrivateSendClientSession::StartNewQueue -- skipping winner, masternode=%s\n", infoMn.outpoint.ToStringShort());
             nTries++;
             continue;
         }
 
-        vecMasternodesUsed.push_back(infoMn.outpoint);
+        privateSendClient.AddUsedMasternode(infoMn.outpoint);
 
         if(infoMn.nLastDsq != 0 && infoMn.nLastDsq + nMnCountEnabled/5 > mnodeman.nDsqCount) {
-            LogPrintf("CPrivateSendClient::StartNewQueue -- Too early to mix on this masternode!"
+            LogPrintf("CPrivateSendClientSession::StartNewQueue -- Too early to mix on this masternode!"
                         " masternode=%s  addr=%s  nLastDsq=%d  CountEnabled/5=%d  nDsqCount=%d\n",
                         infoMn.outpoint.ToStringShort(), infoMn.addr.ToString(), infoMn.nLastDsq,
                         nMnCountEnabled/5, mnodeman.nDsqCount);
@@ -978,12 +1118,12 @@ bool CPrivateSendClient::StartNewQueue(CAmount nValueMin, CAmount nBalanceNeedsA
         }
 
         if (connman.IsMasternodeOrDisconnectRequested(infoMn.addr)) {
-            LogPrintf("CPrivateSendClient::StartNewQueue -- skipping masternode connection, addr=%s\n", infoMn.addr.ToString());
+            LogPrintf("CPrivateSendClientSession::StartNewQueue -- skipping masternode connection, addr=%s\n", infoMn.addr.ToString());
             nTries++;
             continue;
         }
 
-        LogPrintf("CPrivateSendClient::StartNewQueue -- attempt %d connection to Masternode %s\n", nTries, infoMn.addr.ToString());
+        LogPrintf("CPrivateSendClientSession::StartNewQueue -- attempt %d connection to Masternode %s\n", nTries, infoMn.addr.ToString());
 
         std::vector<CAmount> vecAmounts;
         pwalletMain->ConvertList(vecTxIn, vecAmounts);
@@ -1004,7 +1144,7 @@ bool CPrivateSendClient::StartNewQueue(CAmount nValueMin, CAmount nBalanceNeedsA
         std::vector<COutput> vCoinsTmp;
         std::vector<CAmount> vecStandardDenoms = CPrivateSend::GetStandardDenominations();
 
-        bool fSelected = pwalletMain->SelectCoinsByDenominations(nSessionDenom, vecStandardDenoms[vecBits.front()], vecStandardDenoms[vecBits.front()] * PRIVATESEND_ENTRY_MAX_SIZE, vecTxDSInTmp, vCoinsTmp, nValueInTmp, 0, nPrivateSendRounds);
+        bool fSelected = pwalletMain->SelectCoinsByDenominations(nSessionDenom, vecStandardDenoms[vecBits.front()], vecStandardDenoms[vecBits.front()] * PRIVATESEND_ENTRY_MAX_SIZE, vecTxDSInTmp, vCoinsTmp, nValueInTmp, 0, privateSendClient.nPrivateSendRounds);
         if (!fSelected) {
             return false;
         }
@@ -1021,7 +1161,7 @@ bool CPrivateSendClient::StartNewQueue(CAmount nValueMin, CAmount nBalanceNeedsA
         // TODO: add new state POOL_STATE_CONNECTING and bump MIN_PRIVATESEND_PEER_PROTO_VERSION
         SetState(POOL_STATE_QUEUE);
         nTimeLastSuccessfulStep = GetTime();
-        LogPrintf("CPrivateSendClient::StartNewQueue -- pending connection, nSessionDenom: %d (%s), nSessionInputCount: %d, addr=%s\n",
+        LogPrintf("CPrivateSendClientSession::StartNewQueue -- pending connection, nSessionDenom: %d (%s), nSessionInputCount: %d, addr=%s\n",
                 nSessionDenom, CPrivateSend::GetDenominationsToString(nSessionDenom), nSessionInputCount, infoMn.addr.ToString());
         strAutoDenomResult = _("Trying to connect...");
         return true;
@@ -1030,16 +1170,15 @@ bool CPrivateSendClient::StartNewQueue(CAmount nValueMin, CAmount nBalanceNeedsA
     return false;
 }
 
-void CPrivateSendClient::ProcessPendingDsaRequest(CConnman& connman)
+bool CPrivateSendClientSession::ProcessPendingDsaRequest(CConnman& connman)
 {
-    if (!pendingDsaRequest) return;
+    if (!pendingDsaRequest) return false;
 
     bool fDone = connman.ForNode(pendingDsaRequest.GetAddr(), [&](CNode* pnode) {
         LogPrint("privatesend", "-- processing dsa queue for addr=%s\n", pnode->addr.ToString());
         nTimeLastSuccessfulStep = GetTime();
         // TODO: this vvvv should be here after new state POOL_STATE_CONNECTING is added and MIN_PRIVATESEND_PEER_PROTO_VERSION is bumped
         // SetState(POOL_STATE_QUEUE);
-        strAutoDenomResult = _("Mixing in progress...");
         CNetMsgMaker msgMaker(pnode->GetSendVersion());
         connman.PushMessage(pnode, msgMaker.Make(NetMsgType::DSACCEPT, pendingDsaRequest.GetDSA()));
         return true;
@@ -1048,51 +1187,65 @@ void CPrivateSendClient::ProcessPendingDsaRequest(CConnman& connman)
     if (fDone) {
         pendingDsaRequest = CPendingDsaRequest();
     } else if (pendingDsaRequest.IsExpired()) {
-        LogPrint("privatesend", "CPrivateSendClient::%s -- failed to connect to %s\n", __func__, pendingDsaRequest.GetAddr().ToString());
+        LogPrint("privatesend", "CPrivateSendClientSession::%s -- failed to connect to %s\n", __func__, pendingDsaRequest.GetAddr().ToString());
         SetNull();
     }
+
+    return fDone;
+}
+
+void CPrivateSendClientManager::ProcessPendingDsaRequest(CConnman& connman)
+{
+    LOCK(cs_vecsessions);
+    for (auto& session : vecSessions) {
+        if (session.ProcessPendingDsaRequest(connman)) {
+            strAutoDenomResult = _("Mixing in progress...");
+        }
+    }
 }
 
-bool CPrivateSendClient::SubmitDenominate(CConnman& connman)
+bool CPrivateSendClientSession::SubmitDenominate(CConnman& connman)
 {
+    LOCK2(cs_main, pwalletMain->cs_wallet);
+
     std::string strError;
     std::vector<CTxDSIn> vecTxDSInRet;
     std::vector<CTxOut> vecTxOutRet;
 
     // Submit transaction to the pool if we get here
-    if (nLiquidityProvider) {
+    if (privateSendClient.nLiquidityProvider) {
         // Try to use only inputs with the same number of rounds starting from the lowest number of rounds possible
-        for(int i = 0; i< nPrivateSendRounds; i++) {
+        for(int i = 0; i< privateSendClient.nPrivateSendRounds; i++) {
             if(PrepareDenominate(i, i + 1, strError, vecTxDSInRet, vecTxOutRet)) {
-                LogPrintf("CPrivateSendClient::SubmitDenominate -- Running PrivateSend denominate for %d rounds, success\n", i);
+                LogPrintf("CPrivateSendClientSession::SubmitDenominate -- Running PrivateSend denominate for %d rounds, success\n", i);
                 return SendDenominate(vecTxDSInRet, vecTxOutRet, connman);
             }
-            LogPrint("privatesend", "CPrivateSendClient::SubmitDenominate -- Running PrivateSend denominate for %d rounds, error: %s\n", i, strError);
+            LogPrint("privatesend", "CPrivateSendClientSession::SubmitDenominate -- Running PrivateSend denominate for %d rounds, error: %s\n", i, strError);
         }
     } else {
         // Try to use only inputs with the same number of rounds starting from the highest number of rounds possible
-        for(int i = nPrivateSendRounds; i > 0; i--) {
+        for(int i = privateSendClient.nPrivateSendRounds; i > 0; i--) {
             if(PrepareDenominate(i - 1, i, strError, vecTxDSInRet, vecTxOutRet)) {
-                LogPrintf("CPrivateSendClient::SubmitDenominate -- Running PrivateSend denominate for %d rounds, success\n", i);
+                LogPrintf("CPrivateSendClientSession::SubmitDenominate -- Running PrivateSend denominate for %d rounds, success\n", i);
                 return SendDenominate(vecTxDSInRet, vecTxOutRet, connman);
             }
-            LogPrint("privatesend", "CPrivateSendClient::SubmitDenominate -- Running PrivateSend denominate for %d rounds, error: %s\n", i, strError);
+            LogPrint("privatesend", "CPrivateSendClientSession::SubmitDenominate -- Running PrivateSend denominate for %d rounds, error: %s\n", i, strError);
         }
     }
 
     // We failed? That's strange but let's just make final attempt and try to mix everything
-    if(PrepareDenominate(0, nPrivateSendRounds, strError, vecTxDSInRet, vecTxOutRet)) {
-        LogPrintf("CPrivateSendClient::SubmitDenominate -- Running PrivateSend denominate for all rounds, success\n");
+    if(PrepareDenominate(0, privateSendClient.nPrivateSendRounds, strError, vecTxDSInRet, vecTxOutRet)) {
+        LogPrintf("CPrivateSendClientSession::SubmitDenominate -- Running PrivateSend denominate for all rounds, success\n");
         return SendDenominate(vecTxDSInRet, vecTxOutRet, connman);
     }
 
     // Should never actually get here but just in case
-    LogPrintf("CPrivateSendClient::SubmitDenominate -- Running PrivateSend denominate for all rounds, error: %s\n", strError);
+    LogPrintf("CPrivateSendClientSession::SubmitDenominate -- Running PrivateSend denominate for all rounds, error: %s\n", strError);
     strAutoDenomResult = strError;
     return false;
 }
 
-bool CPrivateSendClient::PrepareDenominate(int nMinRounds, int nMaxRounds, std::string& strErrorRet, std::vector<CTxDSIn>& vecTxDSInRet, std::vector<CTxOut>& vecTxOutRet)
+bool CPrivateSendClientSession::PrepareDenominate(int nMinRounds, int nMaxRounds, std::string& strErrorRet, std::vector<CTxDSIn>& vecTxDSInRet, std::vector<CTxOut>& vecTxOutRet)
 {
     if(!pwalletMain) {
         strErrorRet = "Wallet is not initialized";
@@ -1135,7 +1288,7 @@ bool CPrivateSendClient::PrepareDenominate(int nMinRounds, int nMaxRounds, std::
         return false;
     }
 
-    LogPrintf("CPrivateSendClient::PrepareDenominate -- max value: %f\n", (double)nValueIn/COIN);
+    LogPrintf("CPrivateSendClientSession::PrepareDenominate -- max value: %f\n", (double)nValueIn/COIN);
 
     {
         LOCK(pwalletMain->cs_wallet);
@@ -1197,7 +1350,7 @@ bool CPrivateSendClient::PrepareDenominate(int nMinRounds, int nMaxRounds, std::
         }
     }
 
-    if (CPrivateSend::GetDenominations(vecTxOutRet) != nSessionDenom || (nSessionInputCount != 0 && vecTxOutRet.size() != nSessionInputCount)) {
+    if (CPrivateSend::GetDenominations(vecTxOutRet) != nSessionDenom || (nSessionInputCount != 0 && vecTxOutRet.size() != (size_t)nSessionInputCount)) {
         {
             // unlock used coins on failure
             LOCK(pwalletMain->cs_wallet);
@@ -1206,7 +1359,7 @@ bool CPrivateSendClient::PrepareDenominate(int nMinRounds, int nMaxRounds, std::
             }
         }
         keyHolderStorage.ReturnAll();
-        strErrorRet = "Can't make current denominated outputs";
+        strErrorRet = "Can't prepare current denominated outputs";
         return false;
     }
 
@@ -1215,13 +1368,13 @@ bool CPrivateSendClient::PrepareDenominate(int nMinRounds, int nMaxRounds, std::
 }
 
 // Create collaterals by looping through inputs grouped by addresses
-bool CPrivateSendClient::MakeCollateralAmounts(CConnman& connman)
+bool CPrivateSendClientSession::MakeCollateralAmounts(CConnman& connman)
 {
     if (!pwalletMain) return false;
 
     std::vector<CompactTallyItem> vecTally;
     if(!pwalletMain->SelectCoinsGrouppedByAddresses(vecTally, false)) {
-        LogPrint("privatesend", "CPrivateSendClient::MakeCollateralAmounts -- SelectCoinsGrouppedByAddresses can't find any inputs!\n");
+        LogPrint("privatesend", "CPrivateSendClientSession::MakeCollateralAmounts -- SelectCoinsGrouppedByAddresses can't find any inputs!\n");
         return false;
     }
 
@@ -1238,12 +1391,12 @@ bool CPrivateSendClient::MakeCollateralAmounts(CConnman& connman)
     }
 
     // If we got here then smth is terribly broken actually
-    LogPrintf("CPrivateSendClient::MakeCollateralAmounts -- ERROR: Can't make collaterals!\n");
+    LogPrintf("CPrivateSendClientSession::MakeCollateralAmounts -- ERROR: Can't make collaterals!\n");
     return false;
 }
 
 // Split up large inputs or create fee sized inputs
-bool CPrivateSendClient::MakeCollateralAmounts(const CompactTallyItem& tallyItem, bool fTryDenominated, CConnman& connman)
+bool CPrivateSendClientSession::MakeCollateralAmounts(const CompactTallyItem& tallyItem, bool fTryDenominated, CConnman& connman)
 {
     if (!pwalletMain) return false;
 
@@ -1283,13 +1436,13 @@ bool CPrivateSendClient::MakeCollateralAmounts(const CompactTallyItem& tallyItem
     bool fSuccess = pwalletMain->CreateTransaction(vecSend, wtx, reservekeyChange,
             nFeeRet, nChangePosRet, strFail, &coinControl, true, ONLY_NONDENOMINATED);
     if(!fSuccess) {
-        LogPrintf("CPrivateSendClient::MakeCollateralAmounts -- ONLY_NONDENOMINATED: %s\n", strFail);
+        LogPrintf("CPrivateSendClientSession::MakeCollateralAmounts -- ONLY_NONDENOMINATED: %s\n", strFail);
         // If we failed then most likely there are not enough funds on this address.
         if(fTryDenominated) {
             // Try to also use denominated coins (we can't mix denominated without collaterals anyway).
             if(!pwalletMain->CreateTransaction(vecSend, wtx, reservekeyChange,
                                 nFeeRet, nChangePosRet, strFail, &coinControl, true, ALL_COINS)) {
-                LogPrintf("CPrivateSendClient::MakeCollateralAmounts -- ALL_COINS Error: %s\n", strFail);
+                LogPrintf("CPrivateSendClientSession::MakeCollateralAmounts -- ALL_COINS Error: %s\n", strFail);
                 reservekeyCollateral.ReturnKey();
                 return false;
             }
@@ -1302,22 +1455,22 @@ bool CPrivateSendClient::MakeCollateralAmounts(const CompactTallyItem& tallyItem
 
     reservekeyCollateral.KeepKey();
 
-    LogPrintf("CPrivateSendClient::MakeCollateralAmounts -- txid=%s\n", wtx.GetHash().GetHex());
+    LogPrintf("CPrivateSendClientSession::MakeCollateralAmounts -- txid=%s\n", wtx.GetHash().GetHex());
 
     // use the same nCachedLastSuccessBlock as for DS mixing to prevent race
     CValidationState state;
     if(!pwalletMain->CommitTransaction(wtx, reservekeyChange, &connman, state)) {
-        LogPrintf("CPrivateSendClient::MakeCollateralAmounts -- CommitTransaction failed! Reason given: %s\n", state.GetRejectReason());
+        LogPrintf("CPrivateSendClientSession::MakeCollateralAmounts -- CommitTransaction failed! Reason given: %s\n", state.GetRejectReason());
         return false;
     }
 
-    nCachedLastSuccessBlock = nCachedBlockHeight;
+    privateSendClient.UpdatedSuccessBlock();
 
     return true;
 }
 
 // Create denominations by looping through inputs grouped by addresses
-bool CPrivateSendClient::CreateDenominated(CConnman& connman)
+bool CPrivateSendClientSession::CreateDenominated(CConnman& connman)
 {
     if (!pwalletMain) return false;
 
@@ -1325,7 +1478,7 @@ bool CPrivateSendClient::CreateDenominated(CConnman& connman)
 
     std::vector<CompactTallyItem> vecTally;
     if(!pwalletMain->SelectCoinsGrouppedByAddresses(vecTally)) {
-        LogPrint("privatesend", "CPrivateSendClient::CreateDenominated -- SelectCoinsGrouppedByAddresses can't find any inputs!\n");
+        LogPrint("privatesend", "CPrivateSendClientSession::CreateDenominated -- SelectCoinsGrouppedByAddresses can't find any inputs!\n");
         return false;
     }
 
@@ -1336,12 +1489,12 @@ bool CPrivateSendClient::CreateDenominated(CConnman& connman)
         return true;
     }
 
-    LogPrintf("CPrivateSendClient::CreateDenominated -- failed!\n");
+    LogPrintf("CPrivateSendClientSession::CreateDenominated -- failed!\n");
     return false;
 }
 
 // Create denominations
-bool CPrivateSendClient::CreateDenominated(const CompactTallyItem& tallyItem, bool fCreateMixingCollaterals, CConnman& connman)
+bool CPrivateSendClientSession::CreateDenominated(const CompactTallyItem& tallyItem, bool fCreateMixingCollaterals, CConnman& connman)
 {
     if (!pwalletMain) return false;
 
@@ -1351,7 +1504,7 @@ bool CPrivateSendClient::CreateDenominated(const CompactTallyItem& tallyItem, bo
     CAmount nValueLeft = tallyItem.nAmount;
     nValueLeft -= CPrivateSend::GetCollateralAmount(); // leave some room for fees
 
-    LogPrintf("CreateDenominated0: %s nValueLeft: %f\n", CBitcoinAddress(tallyItem.txdest).ToString(), (float)nValueLeft/COIN);
+    LogPrintf("CPrivateSendClientSession::CreateDenominated -- 0 - %s nValueLeft: %f\n", CBitcoinAddress(tallyItem.txdest).ToString(), (float)nValueLeft/COIN);
 
     // ****** Add an output for mixing collaterals ************ /
 
@@ -1377,13 +1530,17 @@ bool CPrivateSendClient::CreateDenominated(const CompactTallyItem& tallyItem, bo
                 // and there are still larger denoms which can be used for mixing
 
                 // check skipped denoms
-                if(IsDenomSkipped(nDenomValue)) continue;
+                if(privateSendClient.IsDenomSkipped(nDenomValue)) {
+                    strAutoDenomResult = strprintf(_("Too many %f denominations, skipping."), (float)nDenomValue/COIN);
+                    LogPrintf("CPrivateSendClientSession::CreateDenominated -- %s\n", strAutoDenomResult);
+                    continue;
+                }
 
                 // find new denoms to skip if any (ignore the largest one)
                 if(nDenomValue != vecStandardDenoms.front() && pwalletMain->CountInputsWithAmount(nDenomValue) > DENOMS_COUNT_MAX) {
                     strAutoDenomResult = strprintf(_("Too many %f denominations, removing."), (float)nDenomValue/COIN);
-                    LogPrintf("CPrivateSendClient::CreateDenominated -- %s\n", strAutoDenomResult);
-                    vecDenominationsSkipped.push_back(nDenomValue);
+                    LogPrintf("CPrivateSendClientSession::CreateDenominated -- %s\n", strAutoDenomResult);
+                    privateSendClient.AddSkippedDenom(nDenomValue);
                     continue;
                 }
             }
@@ -1399,17 +1556,17 @@ bool CPrivateSendClient::CreateDenominated(const CompactTallyItem& tallyItem, bo
                 //increment outputs and subtract denomination amount
                 nOutputs++;
                 nValueLeft -= nDenomValue;
-                LogPrintf("CreateDenominated1: totalOutputs: %d, nOutputsTotal: %d, nOutputs: %d, nValueLeft: %f\n", nOutputsTotal + nOutputs, nOutputsTotal, nOutputs, (float)nValueLeft/COIN);
+                LogPrintf("CPrivateSendClientSession::CreateDenominated -- 1 - totalOutputs: %d, nOutputsTotal: %d, nOutputs: %d, nValueLeft: %f\n", nOutputsTotal + nOutputs, nOutputsTotal, nOutputs, (float)nValueLeft/COIN);
             }
 
             nOutputsTotal += nOutputs;
             if(nValueLeft == 0) break;
         }
-        LogPrintf("CreateDenominated2: nOutputsTotal: %d, nValueLeft: %f\n", nOutputsTotal, (float)nValueLeft/COIN);
+        LogPrintf("CPrivateSendClientSession::CreateDenominated -- 2 - nOutputsTotal: %d, nValueLeft: %f\n", nOutputsTotal, (float)nValueLeft/COIN);
         // if there were no outputs added, start over without skipping
         fSkip = !fSkip;
     } while (nOutputsTotal == 0 && !fSkip);
-    LogPrintf("CreateDenominated3: nOutputsTotal: %d, nValueLeft: %f\n", nOutputsTotal, (float)nValueLeft/COIN);
+    LogPrintf("CPrivateSendClientSession::CreateDenominated -- 3 - nOutputsTotal: %d, nValueLeft: %f\n", nOutputsTotal, (float)nValueLeft/COIN);
 
     // if we have anything left over, it will be automatically send back as change - there is no need to send it manually
 
@@ -1431,7 +1588,7 @@ bool CPrivateSendClient::CreateDenominated(const CompactTallyItem& tallyItem, bo
     bool fSuccess = pwalletMain->CreateTransaction(vecSend, wtx, reservekeyChange,
             nFeeRet, nChangePosRet, strFail, &coinControl, true, ONLY_NONDENOMINATED);
     if(!fSuccess) {
-        LogPrintf("CPrivateSendClient::CreateDenominated -- Error: %s\n", strFail);
+        LogPrintf("CPrivateSendClientSession::CreateDenominated -- Error: %s\n", strFail);
         keyHolderStorageDenom.ReturnAll();
         return false;
     }
@@ -1440,43 +1597,43 @@ bool CPrivateSendClient::CreateDenominated(const CompactTallyItem& tallyItem, bo
 
     CValidationState state;
     if(!pwalletMain->CommitTransaction(wtx, reservekeyChange, &connman, state)) {
-        LogPrintf("CPrivateSendClient::CreateDenominated -- CommitTransaction failed! Reason given: %s\n", state.GetRejectReason());
+        LogPrintf("CPrivateSendClientSession::CreateDenominated -- CommitTransaction failed! Reason given: %s\n", state.GetRejectReason());
         return false;
     }
 
     // use the same nCachedLastSuccessBlock as for DS mixing to prevent race
-    nCachedLastSuccessBlock = nCachedBlockHeight;
-    LogPrintf("CPrivateSendClient::CreateDenominated -- txid=%s\n", wtx.GetHash().GetHex());
+    privateSendClient.UpdatedSuccessBlock();
+    LogPrintf("CPrivateSendClientSession::CreateDenominated -- txid=%s\n", wtx.GetHash().GetHex());
 
     return true;
 }
 
-void CPrivateSendClient::RelayIn(const CDarkSendEntry& entry, CConnman& connman)
+void CPrivateSendClientSession::RelayIn(const CDarkSendEntry& entry, CConnman& connman)
 {
     if(!infoMixingMasternode.fInfoValid) return;
 
     connman.ForNode(infoMixingMasternode.addr, [&entry, &connman](CNode* pnode) {
-        LogPrintf("CPrivateSendClient::RelayIn -- found master, relaying message to %s\n", pnode->addr.ToString());
+        LogPrintf("CPrivateSendClientSession::RelayIn -- found master, relaying message to %s\n", pnode->addr.ToString());
         CNetMsgMaker msgMaker(pnode->GetSendVersion());
         connman.PushMessage(pnode, msgMaker.Make(NetMsgType::DSVIN, entry));
         return true;
     });
 }
 
-void CPrivateSendClient::SetState(PoolState nStateNew)
+void CPrivateSendClientSession::SetState(PoolState nStateNew)
 {
-    LogPrintf("CPrivateSendClient::SetState -- nState: %d, nStateNew: %d\n", nState, nStateNew);
+    LogPrintf("CPrivateSendClientSession::SetState -- nState: %d, nStateNew: %d\n", nState, nStateNew);
     nState = nStateNew;
 }
 
-void CPrivateSendClient::UpdatedBlockTip(const CBlockIndex *pindex)
+void CPrivateSendClientManager::UpdatedBlockTip(const CBlockIndex *pindex)
 {
     nCachedBlockHeight = pindex->nHeight;
-    LogPrint("privatesend", "CPrivateSendClient::UpdatedBlockTip -- nCachedBlockHeight: %d\n", nCachedBlockHeight);
+    LogPrint("privatesend", "CPrivateSendClientManager::UpdatedBlockTip -- nCachedBlockHeight: %d\n", nCachedBlockHeight);
 
 }
 
-void CPrivateSendClient::DoMaintenance(CConnman& connman)
+void CPrivateSendClientManager::DoMaintenance(CConnman& connman)
 {
     if(fLiteMode) return; // disable all Dash specific functionality
     if(fMasternodeMode) return; // no client-side mixing on masternodes
@@ -1488,10 +1645,10 @@ void CPrivateSendClient::DoMaintenance(CConnman& connman)
     static unsigned int nDoAutoNextRun = nTick + PRIVATESEND_AUTO_TIMEOUT_MIN;
 
     nTick++;
-    privateSendClient.CheckTimeout();
-    privateSendClient.ProcessPendingDsaRequest(connman);
+    CheckTimeout();
+    ProcessPendingDsaRequest(connman);
     if(nDoAutoNextRun == nTick) {
-        privateSendClient.DoAutomaticDenominating(connman);
+        DoAutomaticDenominating(connman);
         nDoAutoNextRun = nTick + PRIVATESEND_AUTO_TIMEOUT_MIN + GetRandInt(PRIVATESEND_AUTO_TIMEOUT_MAX - PRIVATESEND_AUTO_TIMEOUT_MIN);
     }
 }
diff --git a/src/privatesend-client.h b/src/privatesend-client.h
index 7b9c9f2ce3a1..0d730c07f12a 100644
--- a/src/privatesend-client.h
+++ b/src/privatesend-client.h
@@ -10,17 +10,20 @@
 #include "wallet/wallet.h"
 #include "privatesend-util.h"
 
-class CPrivateSendClient;
+class CPrivateSendClientManager;
 class CConnman;
 
 static const int DENOMS_COUNT_MAX                   = 100;
 
+static const int MIN_PRIVATESEND_SESSIONS           = 1;
 static const int MIN_PRIVATESEND_ROUNDS             = 2;
 static const int MIN_PRIVATESEND_AMOUNT             = 2;
 static const int MIN_PRIVATESEND_LIQUIDITY          = 0;
+static const int MAX_PRIVATESEND_SESSIONS           = 10;
 static const int MAX_PRIVATESEND_ROUNDS             = 16;
 static const int MAX_PRIVATESEND_AMOUNT             = MAX_MONEY / COIN;
 static const int MAX_PRIVATESEND_LIQUIDITY          = 100;
+static const int DEFAULT_PRIVATESEND_SESSIONS       = 4;
 static const int DEFAULT_PRIVATESEND_ROUNDS         = 4;
 static const int DEFAULT_PRIVATESEND_AMOUNT         = 1000;
 static const int DEFAULT_PRIVATESEND_LIQUIDITY      = 0;
@@ -34,7 +37,7 @@ static const int PRIVATESEND_KEYS_THRESHOLD_WARNING = 100;
 static const int PRIVATESEND_KEYS_THRESHOLD_STOP    = 50;
 
 // The main object for accessing mixing
-extern CPrivateSendClient privateSendClient;
+extern CPrivateSendClientManager privateSendClient;
 
 class CPendingDsaRequest
 {
@@ -75,23 +78,11 @@ class CPendingDsaRequest
     }
 };
 
-/** Used to keep track of current status of mixing pool
- */
-class CPrivateSendClient : public CPrivateSendBase
+class CPrivateSendClientSession : public CPrivateSendBaseSession
 {
 private:
-    // Keep track of the used Masternodes
-    std::vector<COutPoint> vecMasternodesUsed;
-
-    std::vector<CAmount> vecDenominationsSkipped;
     std::vector<COutPoint> vecOutPointLocked;
 
-    int nCachedLastSuccessBlock;
-    int nMinBlocksToWait; // how many blocks to wait after one successful mixing tx in non-multisession mode
-
-    // Keep track of current block height
-    int nCachedBlockHeight;
-
     int nEntriesCount;
     bool fLastEntryAccepted;
 
@@ -104,19 +95,6 @@ class CPrivateSendClient : public CPrivateSendBase
 
     CKeyHolderStorage keyHolderStorage; // storage for keys used in PrepareDenominate
 
-    /// Check for process
-    void CheckPool();
-    void CompletedTransaction(PoolMessage nMessageID);
-
-    bool IsDenomSkipped(CAmount nDenomValue);
-
-    bool WaitForAnotherBlock();
-
-    // Make sure we have enough keys since last backup
-    bool CheckAutomaticBackup();
-    bool JoinExistingQueue(CAmount nBalanceNeedsAnonymized, CConnman& connman);
-    bool StartNewQueue(CAmount nValueMin, CAmount nBalanceNeedsAnonymized, CConnman& connman);
-
     /// Create denominations
     bool CreateDenominated(CConnman& connman);
     bool CreateDenominated(const CompactTallyItem& tallyItem, bool fCreateMixingCollaterals, CConnman& connman);
@@ -125,8 +103,9 @@ class CPrivateSendClient : public CPrivateSendBase
     bool MakeCollateralAmounts(CConnman& connman);
     bool MakeCollateralAmounts(const CompactTallyItem& tallyItem, bool fTryDenominated, CConnman& connman);
 
-    /// As a client, submit part of a future mixing transaction to a Masternode to start the process
-    bool SubmitDenominate(CConnman& connman);
+    bool JoinExistingQueue(CAmount nBalanceNeedsAnonymized, CConnman& connman);
+    bool StartNewQueue(CAmount nValueMin, CAmount nBalanceNeedsAnonymized, CConnman& connman);
+
     /// step 1: prepare denominated inputs and outputs
     bool PrepareDenominate(int nMinRounds, int nMaxRounds, std::string& strErrorRet, std::vector<CTxDSIn>& vecTxDSInRet, std::vector<CTxOut>& vecTxOutRet);
     /// step 2: send denominated inputs and outputs prepared in step 1
@@ -137,6 +116,10 @@ class CPrivateSendClient : public CPrivateSendBase
     // Set the 'state' value, with some logging and capturing when the state changed
     void SetState(PoolState nStateNew);
 
+    /// Check for process
+    void CheckPool();
+    void CompletedTransaction(PoolMessage nMessageID);
+
     /// As a client, check and sign the final transaction
     bool SignFinalTransaction(const CTransaction& finalTransactionNew, CNode* pnode, CConnman& connman);
 
@@ -145,6 +128,68 @@ class CPrivateSendClient : public CPrivateSendBase
     void SetNull();
 
 public:
+    CPrivateSendClientSession() :
+        vecOutPointLocked(),
+        nEntriesCount(0),
+        fLastEntryAccepted(false),
+        strLastMessage(),
+        strAutoDenomResult(),
+        infoMixingMasternode(),
+        txMyCollateral(),
+        pendingDsaRequest(),
+        keyHolderStorage()
+        {}
+    CPrivateSendClientSession(const CPrivateSendClientSession& other) { /* dummy copy constructor*/ SetNull(); }
+
+    void ProcessMessage(CNode* pfrom, const std::string& strCommand, CDataStream& vRecv, CConnman& connman);
+
+    void UnlockCoins();
+
+    void ResetPool();
+
+    std::string GetStatus(bool fWaitForBlock);
+
+    bool GetMixingMasternodeInfo(masternode_info_t& mnInfoRet) const;
+
+    /// Passively run mixing in the background according to the configuration in settings
+    bool DoAutomaticDenominating(CConnman& connman, bool fDryRun=false);
+
+    /// As a client, submit part of a future mixing transaction to a Masternode to start the process
+    bool SubmitDenominate(CConnman& connman);
+
+    bool ProcessPendingDsaRequest(CConnman& connman);
+
+    bool CheckTimeout();
+};
+
+/** Used to keep track of current status of mixing pool
+ */
+class CPrivateSendClientManager : public CPrivateSendBaseManager
+{
+private:
+    // Keep track of the used Masternodes
+    std::vector<COutPoint> vecMasternodesUsed;
+
+    std::vector<CAmount> vecDenominationsSkipped;
+
+    // TODO: or map<denom, CPrivateSendClientSession> ??
+    std::vector<CPrivateSendClientSession> vecSessions;
+    mutable CCriticalSection cs_vecsessions;
+
+    int nCachedLastSuccessBlock;
+    int nMinBlocksToWait; // how many blocks to wait after one successful mixing tx in non-multisession mode
+    std::string strAutoDenomResult;
+
+    // Keep track of current block height
+    int nCachedBlockHeight;
+
+    bool WaitForAnotherBlock();
+
+    // Make sure we have enough keys since last backup
+    bool CheckAutomaticBackup();
+
+public:
+    int nPrivateSendSessions;
     int nPrivateSendRounds;
     int nPrivateSendAmount;
     int nLiquidityProvider;
@@ -154,40 +199,49 @@ class CPrivateSendClient : public CPrivateSendBase
     int nCachedNumBlocks; //used for the overview screen
     bool fCreateAutoBackups; //builtin support for automatic backups
 
-    CPrivateSendClient() :
+    CPrivateSendClientManager() :
+        vecMasternodesUsed(),
+        vecDenominationsSkipped(),
+        vecSessions(),
         nCachedLastSuccessBlock(0),
         nMinBlocksToWait(1),
-        txMyCollateral(CMutableTransaction()),
+        strAutoDenomResult(),
+        nCachedBlockHeight(0),
         nPrivateSendRounds(DEFAULT_PRIVATESEND_ROUNDS),
         nPrivateSendAmount(DEFAULT_PRIVATESEND_AMOUNT),
         nLiquidityProvider(DEFAULT_PRIVATESEND_LIQUIDITY),
         fEnablePrivateSend(false),
         fPrivateSendMultiSession(DEFAULT_PRIVATESEND_MULTISESSION),
         nCachedNumBlocks(std::numeric_limits<int>::max()),
-        fCreateAutoBackups(true) { SetNull(); }
+        fCreateAutoBackups(true)
+        {}
 
     void ProcessMessage(CNode* pfrom, const std::string& strCommand, CDataStream& vRecv, CConnman& connman);
 
+    bool IsDenomSkipped(const CAmount& nDenomValue);
+    void AddSkippedDenom(const CAmount& nDenomValue);
     void ClearSkippedDenominations() { vecDenominationsSkipped.clear(); }
 
     void SetMinBlocksToWait(int nMinBlocksToWaitIn) { nMinBlocksToWait = nMinBlocksToWaitIn; }
 
-
     void ResetPool();
 
-    void UnlockCoins();
-
-    std::string GetStatus();
+    std::string GetStatuses();
+    std::string GetSessionDenoms();
 
-    bool GetMixingMasternodeInfo(masternode_info_t& mnInfoRet);
-    bool IsMixingMasternode(const CNode* pnode);
+    bool GetMixingMasternodesInfo(std::vector<masternode_info_t>& vecMnInfoRet) const;
 
     /// Passively run mixing in the background according to the configuration in settings
     bool DoAutomaticDenominating(CConnman& connman, bool fDryRun=false);
 
+    void CheckTimeout();
+
     void ProcessPendingDsaRequest(CConnman& connman);
 
-    void CheckTimeout();
+    void AddUsedMasternode(const COutPoint& outpointMn);
+    masternode_info_t GetNotUsedMasternode();
+
+    void UpdatedSuccessBlock();
 
     void UpdatedBlockTip(const CBlockIndex *pindex);
 
diff --git a/src/privatesend-server.cpp b/src/privatesend-server.cpp
index e6f115a03db0..7ad012b57613 100644
--- a/src/privatesend-server.cpp
+++ b/src/privatesend-server.cpp
@@ -76,7 +76,7 @@ void CPrivateSendServer::ProcessMessage(CNode* pfrom, const std::string& strComm
         }
 
     } else if(strCommand == NetMsgType::DSQUEUE) {
-        TRY_LOCK(cs_darksend, lockRecv);
+        TRY_LOCK(cs_vecqueue, lockRecv);
         if(!lockRecv) return;
 
         if(pfrom->nVersion < MIN_PRIVATESEND_PEER_PROTO_VERSION) {
@@ -282,7 +282,8 @@ void CPrivateSendServer::SetNull()
     // MN side
     vecSessionCollaterals.clear();
 
-    CPrivateSendBase::SetNull();
+    CPrivateSendBaseSession::SetNull();
+    CPrivateSendBaseManager::SetNull();
 }
 
 //
diff --git a/src/privatesend-server.h b/src/privatesend-server.h
index eb6207692554..f9219627ca8b 100644
--- a/src/privatesend-server.h
+++ b/src/privatesend-server.h
@@ -15,7 +15,7 @@ extern CPrivateSendServer privateSendServer;
 
 /** Used to keep track of current status of mixing pool
  */
-class CPrivateSendServer : public CPrivateSendBase
+class CPrivateSendServer : public CPrivateSendBaseSession, public CPrivateSendBaseManager
 {
 private:
     // Mixing uses collateral transactions to trust parties entering the pool
@@ -66,8 +66,7 @@ class CPrivateSendServer : public CPrivateSendBase
     void SetNull();
 
 public:
-    CPrivateSendServer() :
-        fUnitTest(false) { SetNull(); }
+    CPrivateSendServer() : vecSessionCollaterals(), fUnitTest(false) {}
 
     void ProcessMessage(CNode* pfrom, const std::string& strCommand, CDataStream& vRecv, CConnman& connman);
 
diff --git a/src/privatesend.cpp b/src/privatesend.cpp
index 25198a7ec2d9..5cac0dc67314 100644
--- a/src/privatesend.cpp
+++ b/src/privatesend.cpp
@@ -183,9 +183,10 @@ bool CDarksendBroadcastTx::IsExpired(int nHeight)
     return (nConfirmedHeight != -1) && (nHeight - nConfirmedHeight > 24);
 }
 
-void CPrivateSendBase::SetNull()
+void CPrivateSendBaseSession::SetNull()
 {
     // Both sides
+    LOCK(cs_darksend);
     nState = POOL_STATE_IDLE;
     nSessionID = 0;
     nSessionDenom = 0;
@@ -196,22 +197,44 @@ void CPrivateSendBase::SetNull()
     nTimeLastSuccessfulStep = GetTime();
 }
 
-void CPrivateSendBase::CheckQueue()
+void CPrivateSendBaseManager::SetNull()
 {
-    TRY_LOCK(cs_darksend, lockDS);
+    LOCK(cs_vecqueue);
+    vecDarksendQueue.clear();
+}
+
+void CPrivateSendBaseManager::CheckQueue()
+{
+    TRY_LOCK(cs_vecqueue, lockDS);
     if(!lockDS) return; // it's ok to fail here, we run this quite frequently
 
     // check mixing queue objects for timeouts
     std::vector<CDarksendQueue>::iterator it = vecDarksendQueue.begin();
     while(it != vecDarksendQueue.end()) {
         if((*it).IsExpired()) {
-            LogPrint("privatesend", "CPrivateSendBase::%s -- Removing expired queue (%s)\n", __func__, (*it).ToString());
+            LogPrint("privatesend", "CPrivateSendBaseManager::%s -- Removing expired queue (%s)\n", __func__, (*it).ToString());
             it = vecDarksendQueue.erase(it);
         } else ++it;
     }
 }
 
-std::string CPrivateSendBase::GetStateString() const
+bool CPrivateSendBaseManager::GetQueueItemAndTry(CDarksendQueue& dsqRet)
+{
+    TRY_LOCK(cs_vecqueue, lockDS);
+    if(!lockDS) return false; // it's ok to fail here, we run this quite frequently
+
+    for (auto& dsq : vecDarksendQueue) {
+        // only try each queue once
+        if(dsq.fTried || dsq.IsExpired()) continue;
+        dsq.fTried = true;
+        dsqRet = dsq;
+        return true;
+    }
+
+    return false;
+}
+
+std::string CPrivateSendBaseSession::GetStateString() const
 {
     switch(nState) {
         case POOL_STATE_IDLE:                   return "IDLE";
@@ -504,5 +527,5 @@ void CPrivateSend::SyncTransaction(const CTransaction& tx, const CBlockIndex *pi
 
     // When tx is 0-confirmed or conflicted, posInBlock is SYNC_TRANSACTION_NOT_IN_BLOCK and nConfirmedHeight should be set to -1
     mapDSTX[txHash].SetConfirmedHeight(posInBlock == CMainSignals::SYNC_TRANSACTION_NOT_IN_BLOCK ? -1 : pindex->nHeight);
-    LogPrint("privatesend", "CPrivateSendClient::SyncTransaction -- txid=%s\n", txHash.ToString());
+    LogPrint("privatesend", "CPrivateSend::SyncTransaction -- txid=%s\n", txHash.ToString());
 }
diff --git a/src/privatesend.h b/src/privatesend.h
index c8b221e10c71..47b0158ae192 100644
--- a/src/privatesend.h
+++ b/src/privatesend.h
@@ -348,14 +348,11 @@ class CDarksendBroadcastTx
 };
 
 // base class
-class CPrivateSendBase
+class CPrivateSendBaseSession
 {
 protected:
     mutable CCriticalSection cs_darksend;
 
-    // The current mixing sessions in progress on the network
-    std::vector<CDarksendQueue> vecDarksendQueue;
-
     std::vector<CDarkSendEntry> vecEntries; // Masternode/clients entries
 
     PoolState nState; // should be one of the POOL_STATE_XXX values
@@ -366,21 +363,47 @@ class CPrivateSendBase
     CMutableTransaction finalMutableTransaction; // the finalized transaction ready for signing
 
     void SetNull();
-    void CheckQueue();
 
 public:
-    int nSessionDenom; //Users must submit an denom matching this
+    int nSessionDenom; //Users must submit a denom matching this
     int nSessionInputCount; //Users must submit a count matching this
 
-    CPrivateSendBase() { SetNull(); }
+    CPrivateSendBaseSession() :
+        vecEntries(),
+        nState(POOL_STATE_IDLE),
+        nTimeLastSuccessfulStep(0),
+        nSessionID(0),
+        finalMutableTransaction(),
+        nSessionDenom(0),
+        nSessionInputCount(0)
+        {}
+    CPrivateSendBaseSession(const CPrivateSendBaseSession& other) { /* dummy copy constructor*/ SetNull(); }
 
-    int GetQueueSize() const { return vecDarksendQueue.size(); }
     int GetState() const { return nState; }
     std::string GetStateString() const;
 
     int GetEntriesCount() const { return vecEntries.size(); }
 };
 
+// base class
+class CPrivateSendBaseManager
+{
+protected:
+    mutable CCriticalSection cs_vecqueue;
+
+    // The current mixing sessions in progress on the network
+    std::vector<CDarksendQueue> vecDarksendQueue;
+
+    void SetNull();
+    void CheckQueue();
+
+public:
+    CPrivateSendBaseManager() : vecDarksendQueue() {}
+
+    int GetQueueSize() const { return vecDarksendQueue.size(); }
+    bool GetQueueItemAndTry(CDarksendQueue& dsqRet);
+};
+
 // helper class
 class CPrivateSend
 {
diff --git a/src/qt/overviewpage.cpp b/src/qt/overviewpage.cpp
index 1ea7c5d242e8..b285506dd4ca 100644
--- a/src/qt/overviewpage.cpp
+++ b/src/qt/overviewpage.cpp
@@ -564,7 +564,7 @@ void OverviewPage::privateSendStatus()
         updatePrivateSendProgress();
     }
 
-    QString strStatus = QString(privateSendClient.GetStatus().c_str());
+    QString strStatus = QString(privateSendClient.GetStatuses().c_str());
 
     QString s = tr("Last PrivateSend message:\n") + strStatus;
 
@@ -573,13 +573,7 @@ void OverviewPage::privateSendStatus()
 
     ui->labelPrivateSendLastMessage->setText(s);
 
-    if(privateSendClient.nSessionDenom == 0){
-        ui->labelSubmittedDenom->setText(tr("N/A"));
-    } else {
-        QString strDenom(CPrivateSend::GetDenominationsToString(privateSendClient.nSessionDenom).c_str());
-        ui->labelSubmittedDenom->setText(strDenom);
-    }
-
+    ui->labelSubmittedDenom->setText(QString(privateSendClient.GetSessionDenoms().c_str()));
 }
 
 void OverviewPage::privateSendAuto(){
@@ -642,7 +636,7 @@ void OverviewPage::togglePrivateSend(){
 
     if(!privateSendClient.fEnablePrivateSend){
         ui->togglePrivateSend->setText(tr("Start Mixing"));
-        privateSendClient.UnlockCoins();
+        privateSendClient.ResetPool();
     } else {
         ui->togglePrivateSend->setText(tr("Stop Mixing"));
     }
diff --git a/src/rpc/masternode.cpp b/src/rpc/masternode.cpp
index 34495b4be36e..5e42fe20d894 100644
--- a/src/rpc/masternode.cpp
+++ b/src/rpc/masternode.cpp
@@ -63,7 +63,7 @@ UniValue privatesend(const JSONRPCRequest& request)
 
         privateSendClient.fEnablePrivateSend = true;
         bool result = privateSendClient.DoAutomaticDenominating(*g_connman);
-        return "Mixing " + (result ? "started successfully" : ("start failed: " + privateSendClient.GetStatus() + ", will retry"));
+        return "Mixing " + (result ? "started successfully" : ("start failed: " + privateSendClient.GetStatuses() + ", will retry"));
     }
 
     if(request.params[0].get_str() == "stop") {
@@ -88,19 +88,25 @@ UniValue getpoolinfo(const JSONRPCRequest& request)
             "Returns an object containing mixing pool related information.\n");
 
 #ifdef ENABLE_WALLET
-    CPrivateSendBase* pprivateSendBase = fMasternodeMode ? (CPrivateSendBase*)&privateSendServer : (CPrivateSendBase*)&privateSendClient;
+    CPrivateSendBaseManager* pprivateSendBaseManager = fMasternodeMode ? (CPrivateSendBaseManager*)&privateSendServer : (CPrivateSendBaseManager*)&privateSendClient;
 
     UniValue obj(UniValue::VOBJ);
-    obj.push_back(Pair("state",             pprivateSendBase->GetStateString()));
-    obj.push_back(Pair("mixing_mode",       (!fMasternodeMode && privateSendClient.fPrivateSendMultiSession) ? "multi-session" : "normal"));
-    obj.push_back(Pair("queue",             pprivateSendBase->GetQueueSize()));
-    obj.push_back(Pair("entries",           pprivateSendBase->GetEntriesCount()));
-    obj.push_back(Pair("status",            privateSendClient.GetStatus()));
-
-    masternode_info_t mnInfo;
-    if (privateSendClient.GetMixingMasternodeInfo(mnInfo)) {
-        obj.push_back(Pair("outpoint",      mnInfo.outpoint.ToStringShort()));
-        obj.push_back(Pair("addr",          mnInfo.addr.ToString()));
+    // TODO:
+    // obj.push_back(Pair("state",             pprivateSendBase->GetStateString()));
+    obj.push_back(Pair("queue",             pprivateSendBaseManager->GetQueueSize()));
+    // obj.push_back(Pair("entries",           pprivateSendBase->GetEntriesCount()));
+    obj.push_back(Pair("status",            privateSendClient.GetStatuses()));
+
+    std::vector<masternode_info_t> vecMnInfo;
+    if (privateSendClient.GetMixingMasternodesInfo(vecMnInfo)) {
+        UniValue pools(UniValue::VARR);
+        for (const auto& mnInfo : vecMnInfo) {
+            UniValue pool(UniValue::VOBJ);
+            pool.push_back(Pair("outpoint",      mnInfo.outpoint.ToStringShort()));
+            pool.push_back(Pair("addr",          mnInfo.addr.ToString()));
+            pools.push_back(pool);
+        }
+        obj.push_back(Pair("pools", pools));
     }
 
     if (pwalletMain) {

From 8c9cb290928a7a5f713eea0787f65b8fd3b3adce Mon Sep 17 00:00:00 2001
From: UdjinM6 <UdjinM6@users.noreply.github.com>
Date: Wed, 5 Sep 2018 14:19:03 +0300
Subject: [PATCH 113/400] Revert 2075 (#2259)

* Revert "Require all participants to submit equal number of inputs (#2075)"

This reverts commit 7ac4b972ab0c7a87424f0ffc8e29d12df8aa3314.

* Backward compatibility for nInputCount
---
 src/privatesend-client.cpp | 51 ++++++++------------------------------
 src/privatesend-server.cpp | 39 +++--------------------------
 src/privatesend.cpp        |  2 --
 src/privatesend.h          | 31 ++++++++---------------
 4 files changed, 24 insertions(+), 99 deletions(-)

diff --git a/src/privatesend-client.cpp b/src/privatesend-client.cpp
index b6e3b44d54cb..e123f8c6733f 100644
--- a/src/privatesend-client.cpp
+++ b/src/privatesend-client.cpp
@@ -60,7 +60,6 @@ void CPrivateSendClientManager::ProcessMessage(CNode* pfrom, const std::string&
         LogPrint("privatesend", "DSQUEUE -- %s new\n", dsq.ToString());
 
         if(dsq.IsExpired()) return;
-        if(dsq.nInputCount < 0 || dsq.nInputCount > PRIVATESEND_ENTRY_MAX_SIZE) return;
 
         masternode_info_t infoMn;
         if(!mnodeman.GetMasternodeInfo(dsq.masternodeOutpoint, infoMn)) return;
@@ -1035,16 +1034,10 @@ bool CPrivateSendClientSession::JoinExistingQueue(CAmount nBalanceNeedsAnonymize
         std::vector<COutput> vCoinsTmp;
         CAmount nMinAmount = vecStandardDenoms[vecBits.front()];
         CAmount nMaxAmount = nBalanceNeedsAnonymized;
-        // nInputCount is not covered by legacy signature, require SPORK_6_NEW_SIGS to activate to use new algo
-        // (to make sure nInputCount wasn't modified by some intermediary node)
-        bool fNewAlgo = infoMn.nProtocolVersion > 70208 && sporkManager.IsSporkActive(SPORK_6_NEW_SIGS);
 
-        if (fNewAlgo && dsq.nInputCount != 0) {
-            nMinAmount = nMaxAmount = dsq.nInputCount * vecStandardDenoms[vecBits.front()];
-        }
         // Try to match their denominations if possible, select exact number of denominations
         if(!pwalletMain->SelectCoinsByDenominations(dsq.nDenom, nMinAmount, nMaxAmount, vecTxDSInTmp, vCoinsTmp, nValueInTmp, 0, privateSendClient.nPrivateSendRounds)) {
-            LogPrintf("CPrivateSendClientSession::JoinExistingQueue -- Couldn't match %d denominations %d %d (%s)\n", dsq.nInputCount, vecBits.front(), dsq.nDenom, CPrivateSend::GetDenominationsToString(dsq.nDenom));
+            LogPrintf("CPrivateSendClientSession::JoinExistingQueue -- Couldn't match %d denominations %d (%s)\n", vecBits.front(), dsq.nDenom, CPrivateSend::GetDenominationsToString(dsq.nDenom));
             continue;
         }
 
@@ -1056,15 +1049,14 @@ bool CPrivateSendClientSession::JoinExistingQueue(CAmount nBalanceNeedsAnonymize
         }
 
         nSessionDenom = dsq.nDenom;
-        nSessionInputCount = fNewAlgo ? dsq.nInputCount : 0;
         infoMixingMasternode = infoMn;
-        pendingDsaRequest = CPendingDsaRequest(infoMn.addr, CDarksendAccept(nSessionDenom, nSessionInputCount, txMyCollateral));
+        pendingDsaRequest = CPendingDsaRequest(infoMn.addr, CDarksendAccept(nSessionDenom, txMyCollateral));
         connman.AddPendingMasternode(infoMn.addr);
         // TODO: add new state POOL_STATE_CONNECTING and bump MIN_PRIVATESEND_PEER_PROTO_VERSION
         SetState(POOL_STATE_QUEUE);
         nTimeLastSuccessfulStep = GetTime();
-        LogPrintf("CPrivateSendClientSession::JoinExistingQueue -- pending connection (from queue): nSessionDenom: %d (%s), nSessionInputCount: %d, addr=%s\n",
-                  nSessionDenom, CPrivateSend::GetDenominationsToString(nSessionDenom), nSessionInputCount, infoMn.addr.ToString());
+        LogPrintf("CPrivateSendClientSession::JoinExistingQueue -- pending connection (from queue): nSessionDenom: %d (%s), addr=%s\n",
+                  nSessionDenom, CPrivateSend::GetDenominationsToString(nSessionDenom), infoMn.addr.ToString());
         strAutoDenomResult = _("Trying to connect...");
         return true;
     }
@@ -1132,37 +1124,14 @@ bool CPrivateSendClientSession::StartNewQueue(CAmount nValueMin, CAmount nBalanc
             nSessionDenom = CPrivateSend::GetDenominationsByAmounts(vecAmounts);
         }
 
-        // Count available denominations.
-        // Should never really fail after this point, since we just selected compatible inputs ourselves.
-        std::vector<int> vecBits;
-        if (!CPrivateSend::GetDenominationsBits(nSessionDenom, vecBits)) {
-            return false;
-        }
-
-        CAmount nValueInTmp = 0;
-        std::vector<CTxDSIn> vecTxDSInTmp;
-        std::vector<COutput> vCoinsTmp;
-        std::vector<CAmount> vecStandardDenoms = CPrivateSend::GetStandardDenominations();
-
-        bool fSelected = pwalletMain->SelectCoinsByDenominations(nSessionDenom, vecStandardDenoms[vecBits.front()], vecStandardDenoms[vecBits.front()] * PRIVATESEND_ENTRY_MAX_SIZE, vecTxDSInTmp, vCoinsTmp, nValueInTmp, 0, privateSendClient.nPrivateSendRounds);
-        if (!fSelected) {
-            return false;
-        }
-
-        // nInputCount is not covered by legacy signature, require SPORK_6_NEW_SIGS to activate to use new algo
-        // (to make sure nInputCount wasn't modified by some intermediary node)
-        bool fNewAlgo = infoMn.nProtocolVersion > 70208 && sporkManager.IsSporkActive(SPORK_6_NEW_SIGS);
-        nSessionInputCount = fNewAlgo
-                ? std::min(vecTxDSInTmp.size(), size_t(5 + GetRand(PRIVATESEND_ENTRY_MAX_SIZE - 5 + 1)))
-                : 0;
         infoMixingMasternode = infoMn;
         connman.AddPendingMasternode(infoMn.addr);
-        pendingDsaRequest = CPendingDsaRequest(infoMn.addr, CDarksendAccept(nSessionDenom, nSessionInputCount, txMyCollateral));
+        pendingDsaRequest = CPendingDsaRequest(infoMn.addr, CDarksendAccept(nSessionDenom, txMyCollateral));
         // TODO: add new state POOL_STATE_CONNECTING and bump MIN_PRIVATESEND_PEER_PROTO_VERSION
         SetState(POOL_STATE_QUEUE);
         nTimeLastSuccessfulStep = GetTime();
-        LogPrintf("CPrivateSendClientSession::StartNewQueue -- pending connection, nSessionDenom: %d (%s), nSessionInputCount: %d, addr=%s\n",
-                nSessionDenom, CPrivateSend::GetDenominationsToString(nSessionDenom), nSessionInputCount, infoMn.addr.ToString());
+        LogPrintf("CPrivateSendClientSession::StartNewQueue -- pending connection, nSessionDenom: %d (%s), addr=%s\n",
+                nSessionDenom, CPrivateSend::GetDenominationsToString(nSessionDenom), infoMn.addr.ToString());
         strAutoDenomResult = _("Trying to connect...");
         return true;
     }
@@ -1282,7 +1251,7 @@ bool CPrivateSendClientSession::PrepareDenominate(int nMinRounds, int nMaxRounds
         return false;
     }
     std::vector<CAmount> vecStandardDenoms = CPrivateSend::GetStandardDenominations();
-    bool fSelected = pwalletMain->SelectCoinsByDenominations(nSessionDenom, vecStandardDenoms[vecBits.front()], vecStandardDenoms[vecBits.front()] * PRIVATESEND_ENTRY_MAX_SIZE, vecTxDSIn, vCoins, nValueIn, nMinRounds, nMaxRounds);
+    bool fSelected = pwalletMain->SelectCoinsByDenominations(nSessionDenom, vecStandardDenoms[vecBits.front()], CPrivateSend::GetMaxPoolAmount(), vecTxDSIn, vCoins, nValueIn, nMinRounds, nMaxRounds);
     if (nMinRounds >= 0 && !fSelected) {
         strErrorRet = "Can't select current denominated inputs";
         return false;
@@ -1303,7 +1272,7 @@ bool CPrivateSendClientSession::PrepareDenominate(int nMinRounds, int nMaxRounds
     // NOTE: No need to randomize order of inputs because they were
     // initially shuffled in CWallet::SelectCoinsByDenominations already.
     int nStep = 0;
-    int nStepsMax = nSessionInputCount != 0 ? nSessionInputCount : (5 + GetRandInt(PRIVATESEND_ENTRY_MAX_SIZE - 5 + 1));
+    int nStepsMax = 5 + GetRandInt(PRIVATESEND_ENTRY_MAX_SIZE - 5 + 1);
 
     while (nStep < nStepsMax) {
         for (const auto& nBit : vecBits) {
@@ -1350,7 +1319,7 @@ bool CPrivateSendClientSession::PrepareDenominate(int nMinRounds, int nMaxRounds
         }
     }
 
-    if (CPrivateSend::GetDenominations(vecTxOutRet) != nSessionDenom || (nSessionInputCount != 0 && vecTxOutRet.size() != (size_t)nSessionInputCount)) {
+    if (CPrivateSend::GetDenominations(vecTxOutRet) != nSessionDenom) {
         {
             // unlock used coins on failure
             LOCK(pwalletMain->cs_wallet);
diff --git a/src/privatesend-server.cpp b/src/privatesend-server.cpp
index 7ad012b57613..ad62d7b5bab2 100644
--- a/src/privatesend-server.cpp
+++ b/src/privatesend-server.cpp
@@ -45,8 +45,6 @@ void CPrivateSendServer::ProcessMessage(CNode* pfrom, const std::string& strComm
 
         LogPrint("privatesend", "DSACCEPT -- nDenom %d (%s)  txCollateral %s", dsa.nDenom, CPrivateSend::GetDenominationsToString(dsa.nDenom), dsa.txCollateral.ToString());
 
-        if(dsa.nInputCount < 0 || dsa.nInputCount > PRIVATESEND_ENTRY_MAX_SIZE) return;
-
         masternode_info_t mnInfo;
         if(!mnodeman.GetMasternodeInfo(activeMasternodeInfo.outpoint, mnInfo)) {
             PushStatus(pfrom, STATUS_REJECTED, ERR_MN_LIST, connman);
@@ -100,7 +98,6 @@ void CPrivateSendServer::ProcessMessage(CNode* pfrom, const std::string& strComm
         LogPrint("privatesend", "DSQUEUE -- %s new\n", dsq.ToString());
 
         if(dsq.IsExpired()) return;
-        if(dsq.nInputCount < 0 || dsq.nInputCount > PRIVATESEND_ENTRY_MAX_SIZE) return;
 
         masternode_info_t mnInfo;
         if(!mnodeman.GetMasternodeInfo(dsq.masternodeOutpoint, mnInfo)) return;
@@ -168,18 +165,6 @@ void CPrivateSendServer::ProcessMessage(CNode* pfrom, const std::string& strComm
             return;
         }
 
-        if(nSessionInputCount != 0 && entry.vecTxDSIn.size() != nSessionInputCount) {
-            LogPrintf("DSVIN -- ERROR: incorrect number of inputs! %d/%d\n", entry.vecTxDSIn.size(), nSessionInputCount);
-            PushStatus(pfrom, STATUS_REJECTED, ERR_INVALID_INPUT_COUNT, connman);
-            return;
-        }
-
-        if(nSessionInputCount != 0 && entry.vecTxOut.size() != nSessionInputCount) {
-            LogPrintf("DSVIN -- ERROR: incorrect number of outputs! %d/%d\n", entry.vecTxOut.size(), nSessionInputCount);
-            PushStatus(pfrom, STATUS_REJECTED, ERR_INVALID_INPUT_COUNT, connman);
-            return;
-        }
-
         //do we have the same denominations as the current session?
         if(!IsOutputsCompatibleWithSessionDenom(entry.vecTxOut)) {
             LogPrintf("DSVIN -- not compatible with existing transactions!\n");
@@ -525,7 +510,7 @@ void CPrivateSendServer::CheckForCompleteQueue(CConnman& connman)
     if(nState == POOL_STATE_QUEUE && IsSessionReady()) {
         SetState(POOL_STATE_ACCEPTING_ENTRIES);
 
-        CDarksendQueue dsq(nSessionDenom, nSessionInputCount, activeMasternodeInfo.outpoint, GetAdjustedTime(), true);
+        CDarksendQueue dsq(nSessionDenom, activeMasternodeInfo.outpoint, GetAdjustedTime(), true);
         LogPrint("privatesend", "CPrivateSendServer::CheckForCompleteQueue -- queue is ready, signing and relaying (%s)\n", dsq.ToString());
         dsq.Sign();
         dsq.Relay(connman);
@@ -703,12 +688,6 @@ bool CPrivateSendServer::IsAcceptableDSA(const CDarksendAccept& dsa, PoolMessage
         return false;
     }
 
-    if(dsa.nInputCount < 0 || dsa.nInputCount > PRIVATESEND_ENTRY_MAX_SIZE) {
-        LogPrint("privatesend", "CPrivateSendServer::%s -- requested count is not valid!\n", __func__);
-        nMessageIDRet = ERR_INVALID_INPUT_COUNT;
-        return false;
-    }
-
     return true;
 }
 
@@ -731,16 +710,13 @@ bool CPrivateSendServer::CreateNewSession(const CDarksendAccept& dsa, PoolMessag
     nMessageIDRet = MSG_NOERR;
     nSessionID = GetRandInt(999999)+1;
     nSessionDenom = dsa.nDenom;
-    // nInputCount is not covered by legacy signature, require SPORK_6_NEW_SIGS to activate to use new algo
-    // (to make sure nInputCount wasn't modified by some intermediary node)
-    nSessionInputCount = sporkManager.IsSporkActive(SPORK_6_NEW_SIGS) ? dsa.nInputCount : 0;
 
     SetState(POOL_STATE_QUEUE);
     nTimeLastSuccessfulStep = GetTime();
 
     if(!fUnitTest) {
         //broadcast that I'm accepting entries, only if it's the first entry through
-        CDarksendQueue dsq(dsa.nDenom, dsa.nInputCount, activeMasternodeInfo.outpoint, GetAdjustedTime(), false);
+        CDarksendQueue dsq(dsa.nDenom, activeMasternodeInfo.outpoint, GetAdjustedTime(), false);
         LogPrint("privatesend", "CPrivateSendServer::CreateNewSession -- signing and relaying new queue: %s\n", dsq.ToString());
         dsq.Sign();
         dsq.Relay(connman);
@@ -776,21 +752,14 @@ bool CPrivateSendServer::AddUserToExistingSession(const CDarksendAccept& dsa, Po
         return false;
     }
 
-    if(dsa.nInputCount != nSessionInputCount) {
-        LogPrintf("CPrivateSendServer::AddUserToExistingSession -- incompatible count %d != nSessionInputCount %d\n",
-                    dsa.nInputCount, nSessionInputCount);
-        nMessageIDRet = ERR_INVALID_INPUT_COUNT;
-        return false;
-    }
-
     // count new user as accepted to an existing session
 
     nMessageIDRet = MSG_NOERR;
     nTimeLastSuccessfulStep = GetTime();
     vecSessionCollaterals.push_back(MakeTransactionRef(dsa.txCollateral));
 
-    LogPrintf("CPrivateSendServer::AddUserToExistingSession -- new user accepted, nSessionID: %d  nSessionDenom: %d (%s)  nSessionInputCount: %d  vecSessionCollaterals.size(): %d\n",
-            nSessionID, nSessionDenom, CPrivateSend::GetDenominationsToString(nSessionDenom), nSessionInputCount, vecSessionCollaterals.size());
+    LogPrintf("CPrivateSendServer::AddUserToExistingSession -- new user accepted, nSessionID: %d  nSessionDenom: %d (%s)  vecSessionCollaterals.size(): %d\n",
+            nSessionID, nSessionDenom, CPrivateSend::GetDenominationsToString(nSessionDenom), vecSessionCollaterals.size());
 
     return true;
 }
diff --git a/src/privatesend.cpp b/src/privatesend.cpp
index 5cac0dc67314..9a315e03fb04 100644
--- a/src/privatesend.cpp
+++ b/src/privatesend.cpp
@@ -190,7 +190,6 @@ void CPrivateSendBaseSession::SetNull()
     nState = POOL_STATE_IDLE;
     nSessionID = 0;
     nSessionDenom = 0;
-    nSessionInputCount = 0;
     vecEntries.clear();
     finalMutableTransaction.vin.clear();
     finalMutableTransaction.vout.clear();
@@ -477,7 +476,6 @@ std::string CPrivateSend::GetMessageByID(PoolMessage nMessageID)
         case MSG_NOERR:                 return _("No errors detected.");
         case MSG_SUCCESS:               return _("Transaction created successfully.");
         case MSG_ENTRIES_ADDED:         return _("Your entries added successfully.");
-        case ERR_INVALID_INPUT_COUNT:   return _("Invalid input count.");
         default:                        return _("Unknown response.");
     }
 }
diff --git a/src/privatesend.h b/src/privatesend.h
index 47b0158ae192..5a63615e6a68 100644
--- a/src/privatesend.h
+++ b/src/privatesend.h
@@ -51,7 +51,6 @@ enum PoolMessage {
     MSG_NOERR,
     MSG_SUCCESS,
     MSG_ENTRIES_ADDED,
-    ERR_INVALID_INPUT_COUNT,
     MSG_POOL_MIN = ERR_ALREADY_HAVE,
     MSG_POOL_MAX = MSG_ENTRIES_ADDED
 };
@@ -100,18 +99,15 @@ class CDarksendAccept
 {
 public:
     int nDenom;
-    int nInputCount;
     CMutableTransaction txCollateral;
 
     CDarksendAccept() :
         nDenom(0),
-        nInputCount(0),
         txCollateral(CMutableTransaction())
         {};
 
-    CDarksendAccept(int nDenom, int nInputCount, const CMutableTransaction& txCollateral) :
+    CDarksendAccept(int nDenom, const CMutableTransaction& txCollateral) :
         nDenom(nDenom),
-        nInputCount(nInputCount),
         txCollateral(txCollateral)
         {};
 
@@ -121,10 +117,9 @@ class CDarksendAccept
     inline void SerializationOp(Stream& s, Operation ser_action) {
         READWRITE(nDenom);
         int nVersion = s.GetVersion();
-        if (nVersion > 70208) {
+        if (nVersion > 70208 && nVersion <= 70210) {
+            int nInputCount = 0;
             READWRITE(nInputCount);
-        } else if (ser_action.ForRead()) {
-            nInputCount = 0;
         }
         READWRITE(txCollateral);
     }
@@ -179,7 +174,6 @@ class CDarksendQueue
 {
 public:
     int nDenom;
-    int nInputCount;
     COutPoint masternodeOutpoint;
     int64_t nTime;
     bool fReady; //ready for submit
@@ -189,7 +183,6 @@ class CDarksendQueue
 
     CDarksendQueue() :
         nDenom(0),
-        nInputCount(0),
         masternodeOutpoint(COutPoint()),
         nTime(0),
         fReady(false),
@@ -197,9 +190,8 @@ class CDarksendQueue
         fTried(false)
         {}
 
-    CDarksendQueue(int nDenom, int nInputCount, COutPoint outpoint, int64_t nTime, bool fReady) :
+    CDarksendQueue(int nDenom, COutPoint outpoint, int64_t nTime, bool fReady) :
         nDenom(nDenom),
-        nInputCount(nInputCount),
         masternodeOutpoint(outpoint),
         nTime(nTime),
         fReady(fReady),
@@ -213,10 +205,9 @@ class CDarksendQueue
     inline void SerializationOp(Stream& s, Operation ser_action) {
         READWRITE(nDenom);
         int nVersion = s.GetVersion();
-        if (nVersion > 70208) {
+        if (nVersion > 70208 && nVersion <= 70210) {
+            int nInputCount = 0;
             READWRITE(nInputCount);
-        } else if (ser_action.ForRead()) {
-            nInputCount = 0;
         }
         if (nVersion == 70208 && (s.GetType() & SER_NETWORK)) {
             // converting from/to old format
@@ -258,13 +249,13 @@ class CDarksendQueue
 
     std::string ToString() const
     {
-        return strprintf("nDenom=%d, nInputCount=%d, nTime=%lld, fReady=%s, fTried=%s, masternode=%s",
-                        nDenom, nInputCount, nTime, fReady ? "true" : "false", fTried ? "true" : "false", masternodeOutpoint.ToStringShort());
+        return strprintf("nDenom=%d, nTime=%lld, fReady=%s, fTried=%s, masternode=%s",
+                        nDenom, nTime, fReady ? "true" : "false", fTried ? "true" : "false", masternodeOutpoint.ToStringShort());
     }
 
     friend bool operator==(const CDarksendQueue& a, const CDarksendQueue& b)
     {
-        return a.nDenom == b.nDenom && a.nInputCount == b.nInputCount && a.masternodeOutpoint == b.masternodeOutpoint && a.nTime == b.nTime && a.fReady == b.fReady;
+        return a.nDenom == b.nDenom && a.masternodeOutpoint == b.masternodeOutpoint && a.nTime == b.nTime && a.fReady == b.fReady;
     }
 };
 
@@ -366,7 +357,6 @@ class CPrivateSendBaseSession
 
 public:
     int nSessionDenom; //Users must submit a denom matching this
-    int nSessionInputCount; //Users must submit a count matching this
 
     CPrivateSendBaseSession() :
         vecEntries(),
@@ -374,8 +364,7 @@ class CPrivateSendBaseSession
         nTimeLastSuccessfulStep(0),
         nSessionID(0),
         finalMutableTransaction(),
-        nSessionDenom(0),
-        nSessionInputCount(0)
+        nSessionDenom(0)
         {}
     CPrivateSendBaseSession(const CPrivateSendBaseSession& other) { /* dummy copy constructor*/ SetNull(); }
 

From fded838c9d83f6ad47cd13fdc24d0e1ab053300b Mon Sep 17 00:00:00 2001
From: PastaPastaPasta <pasta@dashboost.org>
Date: Wed, 5 Sep 2018 07:04:24 -0500
Subject: [PATCH 114/400] RPC folder: Cleaned up brackets on if, while, for,
 BOOST_FOREACH. Some whitespace fixes (#2257)

* Cleaned up brackets on if, while, for, BOOST_FOREACH. Some whitespace fixes

* gov, mn and mining cleanup

* Revert "Cleaned up brackets on if, while, for, BOOST_FOREACH. Some whitespace fixes"

This reverts commit 4a2a1b0645c5195025d0c7e6dad2e01a93efbfd6.

* Revert "gov, mn and mining cleanup"

This reverts commit 7cb91aabc67df0ab60db4ee84e3aaaf6cf6b7881.

* cleanup some dash specific

* "if(" -> "if ("     "for(" -> "for (" + corrected some else blocks
---
 src/rpc/governance.cpp | 154 +++++++++++++++++++----------------------
 src/rpc/masternode.cpp |  89 +++++++++++-------------
 2 files changed, 115 insertions(+), 128 deletions(-)

diff --git a/src/rpc/governance.cpp b/src/rpc/governance.cpp
index ba24a29772d5..f200400b9b5e 100644
--- a/src/rpc/governance.cpp
+++ b/src/rpc/governance.cpp
@@ -105,13 +105,12 @@ UniValue gobject_check(const JSONRPCRequest& request)
 
     CGovernanceObject govobj(hashParent, nRevision, nTime, uint256(), strDataHex);
 
-    if(govobj.GetObjectType() == GOVERNANCE_OBJECT_PROPOSAL) {
+    if (govobj.GetObjectType() == GOVERNANCE_OBJECT_PROPOSAL) {
         CProposalValidator validator(strDataHex);
-        if(!validator.Validate())  {
+        if (!validator.Validate())  {
             throw JSONRPCError(RPC_INVALID_PARAMETER, "Invalid proposal data, error messages:" + validator.GetErrorMessages());
         }
-    }
-    else {
+    } else {
         throw JSONRPCError(RPC_INVALID_PARAMETER, "Invalid object type, only proposals can be validated");
     }
 
@@ -149,7 +148,7 @@ UniValue gobject_prepare(const JSONRPCRequest& request)
     uint256 hashParent;
 
     // -- attach to root node (root node doesn't really exist, but has a hash of zero)
-    if(request.params[1].get_str() == "0") {
+    if (request.params[1].get_str() == "0") {
         hashParent = uint256();
     } else {
         hashParent = ParseHashV(request.params[1], "fee-txid, parameter 1");
@@ -165,31 +164,31 @@ UniValue gobject_prepare(const JSONRPCRequest& request)
 
     CGovernanceObject govobj(hashParent, nRevision, nTime, uint256(), strDataHex);
 
-    if(govobj.GetObjectType() == GOVERNANCE_OBJECT_PROPOSAL) {
+    if (govobj.GetObjectType() == GOVERNANCE_OBJECT_PROPOSAL) {
         CProposalValidator validator(strDataHex);
-        if(!validator.Validate())  {
+        if (!validator.Validate()) {
             throw JSONRPCError(RPC_INVALID_PARAMETER, "Invalid proposal data, error messages:" + validator.GetErrorMessages());
         }
     }
 
-    if(govobj.GetObjectType() == GOVERNANCE_OBJECT_TRIGGER) {
+    if (govobj.GetObjectType() == GOVERNANCE_OBJECT_TRIGGER) {
         throw JSONRPCError(RPC_INVALID_PARAMETER, "Trigger objects need not be prepared (however only masternodes can create them)");
     }
 
-    if(govobj.GetObjectType() == GOVERNANCE_OBJECT_WATCHDOG) {
+    if (govobj.GetObjectType() == GOVERNANCE_OBJECT_WATCHDOG) {
         throw JSONRPCError(RPC_INVALID_PARAMETER, "Watchdogs are deprecated");
     }
 
     LOCK2(cs_main, pwalletMain->cs_wallet);
 
     std::string strError = "";
-    if(!govobj.IsValidLocally(strError, false))
+    if (!govobj.IsValidLocally(strError, false))
         throw JSONRPCError(RPC_INTERNAL_ERROR, "Governance object is not valid - " + govobj.GetHash().ToString() + " - " + strError);
 
     EnsureWalletIsUnlocked();
 
     CWalletTx wtx;
-    if(!pwalletMain->GetBudgetSystemCollateralTX(wtx, govobj.GetHash(), govobj.GetMinCollateralFee(), false)) {
+    if (!pwalletMain->GetBudgetSystemCollateralTX(wtx, govobj.GetHash(), govobj.GetMinCollateralFee(), false)) {
         throw JSONRPCError(RPC_INTERNAL_ERROR, "Error making collateral transaction for governance object. Please check your wallet balance and make sure your wallet is unlocked.");
     }
 
@@ -245,11 +244,11 @@ UniValue gobject_submit(const JSONRPCRequest& request)
 
     uint256 txidFee;
 
-    if(request.params.size() == 6) {
+    if (request.params.size() == 6) {
         txidFee = ParseHashV(request.params[5], "fee-txid, parameter 6");
     }
     uint256 hashParent;
-    if(request.params[1].get_str() == "0") { // attach to root node (root node doesn't really exist, but has a hash of zero)
+    if (request.params[1].get_str() == "0") { // attach to root node (root node doesn't really exist, but has a hash of zero)
         hashParent = uint256();
     } else {
         hashParent = ParseHashV(request.params[1], "parent object hash, parameter 2");
@@ -271,33 +270,29 @@ UniValue gobject_submit(const JSONRPCRequest& request)
          << ", txidFee = " << txidFee.GetHex()
          << std::endl; );
 
-    if(govobj.GetObjectType() == GOVERNANCE_OBJECT_PROPOSAL) {
+    if (govobj.GetObjectType() == GOVERNANCE_OBJECT_PROPOSAL) {
         CProposalValidator validator(strDataHex);
-        if(!validator.Validate())  {
+        if (!validator.Validate()) {
             throw JSONRPCError(RPC_INVALID_PARAMETER, "Invalid proposal data, error messages:" + validator.GetErrorMessages());
         }
     }
 
-    if(govobj.GetObjectType() == GOVERNANCE_OBJECT_WATCHDOG) {
+    if (govobj.GetObjectType() == GOVERNANCE_OBJECT_WATCHDOG) {
         throw JSONRPCError(RPC_INVALID_PARAMETER, "Watchdogs are deprecated");
     }
 
     // Attempt to sign triggers if we are a MN
-    if(govobj.GetObjectType() == GOVERNANCE_OBJECT_TRIGGER) {
-        if(fMnFound) {
+    if (govobj.GetObjectType() == GOVERNANCE_OBJECT_TRIGGER) {
+        if (fMnFound) {
             govobj.SetMasternodeOutpoint(activeMasternodeInfo.outpoint);
             govobj.Sign(activeMasternodeInfo.keyOperator, activeMasternodeInfo.keyIDOperator);
-        }
-        else {
+        } else {
             LogPrintf("gobject(submit) -- Object submission rejected because node is not a masternode\n");
             throw JSONRPCError(RPC_INVALID_PARAMETER, "Only valid masternodes can submit this type of object");
         }
-    }
-    else {
-        if(request.params.size() != 6) {
-            LogPrintf("gobject(submit) -- Object submission rejected because fee tx not provided\n");
-            throw JSONRPCError(RPC_INVALID_PARAMETER, "The fee-txid parameter must be included to submit this type of object");
-        }
+    } else if (request.params.size() != 6) {
+        LogPrintf("gobject(submit) -- Object submission rejected because fee tx not provided\n");
+        throw JSONRPCError(RPC_INVALID_PARAMETER, "The fee-txid parameter must be included to submit this type of object");
     }
 
     std::string strHash = govobj.GetHash().ToString();
@@ -307,7 +302,7 @@ UniValue gobject_submit(const JSONRPCRequest& request)
     bool fMissingConfirmations;
     {
         LOCK(cs_main);
-        if(!govobj.IsValidLocally(strError, fMissingMasternode, fMissingConfirmations, true) && !fMissingConfirmations) {
+        if (!govobj.IsValidLocally(strError, fMissingMasternode, fMissingConfirmations, true) && !fMissingConfirmations) {
             LogPrintf("gobject(submit) -- Object submission rejected because object is not valid - hash = %s, strError = %s\n", strHash, strError);
             throw JSONRPCError(RPC_INTERNAL_ERROR, "Governance object is not valid - " + strHash + " - " + strError);
         }
@@ -315,14 +310,14 @@ UniValue gobject_submit(const JSONRPCRequest& request)
 
     // RELAY THIS OBJECT
     // Reject if rate check fails but don't update buffer
-    if(!governance.MasternodeRateCheck(govobj)) {
+    if (!governance.MasternodeRateCheck(govobj)) {
         LogPrintf("gobject(submit) -- Object submission rejected because of rate check failure - hash = %s\n", strHash);
         throw JSONRPCError(RPC_INVALID_PARAMETER, "Object creation rate limit exceeded");
     }
 
     LogPrintf("gobject(submit) -- Adding locally created governance object - %s\n", strHash);
 
-    if(fMissingConfirmations) {
+    if (fMissingConfirmations) {
         governance.AddPostponedObject(govobj);
         govobj.Relay(*g_connman);
     } else {
@@ -356,14 +351,14 @@ UniValue gobject_vote_conf(const JSONRPCRequest& request)
     std::string strVoteOutcome = request.params[3].get_str();
 
     vote_signal_enum_t eVoteSignal = CGovernanceVoting::ConvertVoteSignal(strVoteSignal);
-    if(eVoteSignal == VOTE_SIGNAL_NONE) {
+    if (eVoteSignal == VOTE_SIGNAL_NONE) {
         throw JSONRPCError(RPC_INVALID_PARAMETER,
                            "Invalid vote signal. Please using one of the following: "
                            "(funding|valid|delete|endorsed)");
     }
 
     vote_outcome_enum_t eVoteOutcome = CGovernanceVoting::ConvertVoteOutcome(strVoteOutcome);
-    if(eVoteOutcome == VOTE_OUTCOME_NONE) {
+    if (eVoteOutcome == VOTE_OUTCOME_NONE) {
         throw JSONRPCError(RPC_INVALID_PARAMETER, "Invalid vote outcome. Please use one of the following: 'yes', 'no' or 'abstain'");
     }
 
@@ -378,7 +373,7 @@ UniValue gobject_vote_conf(const JSONRPCRequest& request)
     CMasternode mn;
     bool fMnFound = mnodeman.Get(activeMasternodeInfo.outpoint, mn);
 
-    if(!fMnFound) {
+    if (!fMnFound) {
         nFailed++;
         statusObj.push_back(Pair("result", "failed"));
         statusObj.push_back(Pair("errorMessage", "Can't find masternode by collateral output"));
@@ -389,7 +384,7 @@ UniValue gobject_vote_conf(const JSONRPCRequest& request)
     }
 
     CGovernanceVote vote(mn.outpoint, hash, eVoteSignal, eVoteOutcome);
-    if(!vote.Sign(activeMasternodeInfo.keyOperator, activeMasternodeInfo.keyIDOperator)) {
+    if (!vote.Sign(activeMasternodeInfo.keyOperator, activeMasternodeInfo.keyIDOperator)) {
         nFailed++;
         statusObj.push_back(Pair("result", "failed"));
         statusObj.push_back(Pair("errorMessage", "Failure to sign."));
@@ -400,11 +395,10 @@ UniValue gobject_vote_conf(const JSONRPCRequest& request)
     }
 
     CGovernanceException exception;
-    if(governance.ProcessVoteAndRelay(vote, exception, *g_connman)) {
+    if (governance.ProcessVoteAndRelay(vote, exception, *g_connman)) {
         nSuccessful++;
         statusObj.push_back(Pair("result", "success"));
-    }
-    else {
+    } else {
         nFailed++;
         statusObj.push_back(Pair("result", "failed"));
         statusObj.push_back(Pair("errorMessage", exception.GetMessage()));
@@ -433,7 +427,7 @@ UniValue VoteWithMasternodeList(const std::vector<CMasternodeConfig::CMasternode
 
         UniValue statusObj(UniValue::VOBJ);
 
-        if(!CMessageSigner::GetKeysFromSecret(mne.getPrivKey(), keyOperator, pubKeyOperator)) {
+        if (!CMessageSigner::GetKeysFromSecret(mne.getPrivKey(), keyOperator, pubKeyOperator)) {
             nFailed++;
             statusObj.push_back(Pair("result", "failed"));
             statusObj.push_back(Pair("errorMessage", "Masternode signing error, could not set key correctly"));
@@ -445,7 +439,7 @@ UniValue VoteWithMasternodeList(const std::vector<CMasternodeConfig::CMasternode
         nTxHash.SetHex(mne.getTxHash());
 
         int nOutputIndex = 0;
-        if(!ParseInt32(mne.getOutputIndex(), &nOutputIndex)) {
+        if (!ParseInt32(mne.getOutputIndex(), &nOutputIndex)) {
             continue;
         }
 
@@ -454,7 +448,7 @@ UniValue VoteWithMasternodeList(const std::vector<CMasternodeConfig::CMasternode
         CMasternode mn;
         bool fMnFound = mnodeman.Get(outpoint, mn);
 
-        if(!fMnFound) {
+        if (!fMnFound) {
             nFailed++;
             statusObj.push_back(Pair("result", "failed"));
             statusObj.push_back(Pair("errorMessage", "Can't find masternode by collateral output"));
@@ -463,7 +457,7 @@ UniValue VoteWithMasternodeList(const std::vector<CMasternodeConfig::CMasternode
         }
 
         CGovernanceVote vote(mn.outpoint, hash, eVoteSignal, eVoteOutcome);
-        if(!vote.Sign(keyOperator, pubKeyOperator.GetID())) {
+        if (!vote.Sign(keyOperator, pubKeyOperator.GetID())) {
             nFailed++;
             statusObj.push_back(Pair("result", "failed"));
             statusObj.push_back(Pair("errorMessage", "Failure to sign."));
@@ -472,11 +466,10 @@ UniValue VoteWithMasternodeList(const std::vector<CMasternodeConfig::CMasternode
         }
 
         CGovernanceException exception;
-        if(governance.ProcessVoteAndRelay(vote, exception, *g_connman)) {
+        if (governance.ProcessVoteAndRelay(vote, exception, *g_connman)) {
             nSuccessful++;
             statusObj.push_back(Pair("result", "success"));
-        }
-        else {
+        } else {
             nFailed++;
             statusObj.push_back(Pair("result", "failed"));
             statusObj.push_back(Pair("errorMessage", exception.GetMessage()));
@@ -514,14 +507,14 @@ UniValue gobject_vote_many(const JSONRPCRequest& request)
     std::string strVoteOutcome = request.params[3].get_str();
 
     vote_signal_enum_t eVoteSignal = CGovernanceVoting::ConvertVoteSignal(strVoteSignal);
-    if(eVoteSignal == VOTE_SIGNAL_NONE) {
+    if (eVoteSignal == VOTE_SIGNAL_NONE) {
         throw JSONRPCError(RPC_INVALID_PARAMETER,
                            "Invalid vote signal. Please using one of the following: "
                            "(funding|valid|delete|endorsed)");
     }
 
     vote_outcome_enum_t eVoteOutcome = CGovernanceVoting::ConvertVoteOutcome(strVoteOutcome);
-    if(eVoteOutcome == VOTE_OUTCOME_NONE) {
+    if (eVoteOutcome == VOTE_OUTCOME_NONE) {
         throw JSONRPCError(RPC_INVALID_PARAMETER, "Invalid vote outcome. Please use one of the following: 'yes', 'no' or 'abstain'");
     }
 
@@ -553,20 +546,20 @@ UniValue gobject_vote_alias(const JSONRPCRequest& request)
     std::string strAlias = request.params[4].get_str();
 
     vote_signal_enum_t eVoteSignal = CGovernanceVoting::ConvertVoteSignal(strVoteSignal);
-    if(eVoteSignal == VOTE_SIGNAL_NONE) {
+    if (eVoteSignal == VOTE_SIGNAL_NONE) {
         throw JSONRPCError(RPC_INVALID_PARAMETER,
                            "Invalid vote signal. Please using one of the following: "
                            "(funding|valid|delete|endorsed)");
     }
 
     vote_outcome_enum_t eVoteOutcome = CGovernanceVoting::ConvertVoteOutcome(strVoteOutcome);
-    if(eVoteOutcome == VOTE_OUTCOME_NONE) {
+    if (eVoteOutcome == VOTE_OUTCOME_NONE) {
         throw JSONRPCError(RPC_INVALID_PARAMETER, "Invalid vote outcome. Please use one of the following: 'yes', 'no' or 'abstain'");
     }
 
     std::vector<CMasternodeConfig::CMasternodeEntry> entries;
     for (const auto& mne : masternodeConfig.getEntries()) {
-        if(strAlias == mne.getAlias())
+        if (strAlias == mne.getAlias())
             entries.push_back(mne);
     }
 
@@ -586,15 +579,14 @@ UniValue ListObjects(const std::string& strCachedSignal, const std::string& strT
 
     // CREATE RESULTS FOR USER
 
-    for (const auto& pGovObj : objs)
-    {
-        if(strCachedSignal == "valid" && !pGovObj->IsSetCachedValid()) continue;
-        if(strCachedSignal == "funding" && !pGovObj->IsSetCachedFunding()) continue;
-        if(strCachedSignal == "delete" && !pGovObj->IsSetCachedDelete()) continue;
-        if(strCachedSignal == "endorsed" && !pGovObj->IsSetCachedEndorsed()) continue;
+    for (const auto& pGovObj : objs) {
+        if (strCachedSignal == "valid" && !pGovObj->IsSetCachedValid()) continue;
+        if (strCachedSignal == "funding" && !pGovObj->IsSetCachedFunding()) continue;
+        if (strCachedSignal == "delete" && !pGovObj->IsSetCachedDelete()) continue;
+        if (strCachedSignal == "endorsed" && !pGovObj->IsSetCachedEndorsed()) continue;
 
-        if(strType == "proposals" && pGovObj->GetObjectType() != GOVERNANCE_OBJECT_PROPOSAL) continue;
-        if(strType == "triggers" && pGovObj->GetObjectType() != GOVERNANCE_OBJECT_TRIGGER) continue;
+        if (strType == "proposals" && pGovObj->GetObjectType() != GOVERNANCE_OBJECT_PROPOSAL) continue;
+        if (strType == "triggers" && pGovObj->GetObjectType() != GOVERNANCE_OBJECT_TRIGGER) continue;
 
         UniValue bObj(UniValue::VOBJ);
         bObj.push_back(Pair("DataHex",  pGovObj->GetDataAsHexString()));
@@ -604,7 +596,7 @@ UniValue ListObjects(const std::string& strCachedSignal, const std::string& strT
         bObj.push_back(Pair("ObjectType", pGovObj->GetObjectType()));
         bObj.push_back(Pair("CreationTime", pGovObj->GetCreationTime()));
         const COutPoint& masternodeOutpoint = pGovObj->GetMasternodeOutpoint();
-        if(masternodeOutpoint != COutPoint()) {
+        if (masternodeOutpoint != COutPoint()) {
             bObj.push_back(Pair("SigningMasternode", masternodeOutpoint.ToStringShort()));
         }
 
@@ -710,8 +702,9 @@ UniValue gobject_get(const JSONRPCRequest& request)
     // FIND THE GOVERNANCE OBJECT THE USER IS LOOKING FOR
     CGovernanceObject* pGovObj = governance.FindGovernanceObject(hash);
 
-    if(pGovObj == nullptr)
+    if (pGovObj == nullptr) {
         throw JSONRPCError(RPC_INVALID_PARAMETER, "Unknown governance object");
+    }
 
     // REPORT BASIC OBJECT STATS
 
@@ -723,7 +716,7 @@ UniValue gobject_get(const JSONRPCRequest& request)
     objResult.push_back(Pair("ObjectType", pGovObj->GetObjectType()));
     objResult.push_back(Pair("CreationTime", pGovObj->GetCreationTime()));
     const COutPoint& masternodeOutpoint = pGovObj->GetMasternodeOutpoint();
-    if(masternodeOutpoint != COutPoint()) {
+    if (masternodeOutpoint != COutPoint()) {
         objResult.push_back(Pair("SigningMasternode", masternodeOutpoint.ToStringShort()));
     }
 
@@ -797,7 +790,7 @@ UniValue gobject_getvotes(const JSONRPCRequest& request)
 
     CGovernanceObject* pGovObj = governance.FindGovernanceObject(hash);
 
-    if(pGovObj == nullptr) {
+    if (pGovObj == nullptr) {
         throw JSONRPCError(RPC_INVALID_PARAMETER, "Unknown governance-hash");
     }
 
@@ -849,7 +842,7 @@ UniValue gobject_getcurrentvotes(const JSONRPCRequest& request)
 
     CGovernanceObject* pGovObj = governance.FindGovernanceObject(hash);
 
-    if(pGovObj == nullptr) {
+    if (pGovObj == nullptr) {
         throw JSONRPCError(RPC_INVALID_PARAMETER, "Unknown governance-hash");
     }
 
@@ -907,20 +900,20 @@ UniValue gobject(const JSONRPCRequest& request)
          strCommand != "check" ))
             gobject_help();
 
-    if(strCommand == "count") {
+    if (strCommand == "count") {
         return gobject_count(request);
-    } else if(strCommand == "deserialize") {
+    } else if (strCommand == "deserialize") {
         // DEBUG : TEST DESERIALIZATION OF GOVERNANCE META DATA
         return gobject_deserialize(request);
-    } else if(strCommand == "check") {
+    } else if (strCommand == "check") {
         // VALIDATE A GOVERNANCE OBJECT PRIOR TO SUBMISSION
         return gobject_check(request);
 #ifdef ENABLE_WALLET
-    } else if(strCommand == "prepare") {
+    } else if (strCommand == "prepare") {
         // PREPARE THE GOVERNANCE OBJECT BY CREATING A COLLATERAL TRANSACTION
         return gobject_prepare(request);
 #endif // ENABLE_WALLET
-    } else if(strCommand == "submit") {
+    } else if (strCommand == "submit") {
         // AFTER COLLATERAL TRANSACTION HAS MATURED USER CAN SUBMIT GOVERNANCE OBJECT TO PROPAGATE NETWORK
         /*
             ------ Example Governance Item ------
@@ -928,24 +921,24 @@ UniValue gobject(const JSONRPCRequest& request)
             gobject submit 6e622bb41bad1fb18e7f23ae96770aeb33129e18bd9efe790522488e580a0a03 0 1 1464292854 "beer-reimbursement" 5b5b22636f6e7472616374222c207b2270726f6a6563745f6e616d65223a20225c22626565722d7265696d62757273656d656e745c22222c20227061796d656e745f61646472657373223a20225c225879324c4b4a4a64655178657948726e34744744514238626a6876464564615576375c22222c2022656e645f64617465223a202231343936333030343030222c20226465736372697074696f6e5f75726c223a20225c227777772e646173687768616c652e6f72672f702f626565722d7265696d62757273656d656e745c22222c2022636f6e74726163745f75726c223a20225c22626565722d7265696d62757273656d656e742e636f6d2f3030312e7064665c22222c20227061796d656e745f616d6f756e74223a20223233342e323334323232222c2022676f7665726e616e63655f6f626a6563745f6964223a2037342c202273746172745f64617465223a202231343833323534303030227d5d5d1
         */
         return gobject_submit(request);
-    } else if(strCommand == "vote-conf") {
+    } else if (strCommand == "vote-conf") {
         return gobject_vote_conf(request);
-    } else if(strCommand == "vote-many") {
+    } else if (strCommand == "vote-many") {
         return gobject_vote_many(request);
-    } else if(strCommand == "vote-alias") {
+    } else if (strCommand == "vote-alias") {
         return gobject_vote_alias(request);
-    } else if(strCommand == "list") {
+    } else if (strCommand == "list") {
         // USERS CAN QUERY THE SYSTEM FOR A LIST OF VARIOUS GOVERNANCE ITEMS
         return gobject_list(request);
-    } else if(strCommand == "diff") {
+    } else if (strCommand == "diff") {
         return gobject_diff(request);
-    } else if(strCommand == "get") {
+    } else if (strCommand == "get") {
         // GET SPECIFIC GOVERNANCE ENTRY
         return gobject_get(request);
-    } else if(strCommand == "getvotes") {
+    } else if (strCommand == "getvotes") {
         // GETVOTES FOR SPECIFIC GOVERNANCE OBJECT
         return gobject_getvotes(request);
-    } else if(strCommand == "getcurrentvotes") {
+    } else if (strCommand == "getcurrentvotes") {
         // GETVOTES FOR SPECIFIC GOVERNANCE OBJECT
         return gobject_getcurrentvotes(request);
     }
@@ -970,14 +963,14 @@ UniValue voteraw(const JSONRPCRequest& request)
     std::string strVoteOutcome = request.params[4].get_str();
 
     vote_signal_enum_t eVoteSignal = CGovernanceVoting::ConvertVoteSignal(strVoteSignal);
-    if(eVoteSignal == VOTE_SIGNAL_NONE)  {
+    if (eVoteSignal == VOTE_SIGNAL_NONE)  {
         throw JSONRPCError(RPC_INVALID_PARAMETER,
                            "Invalid vote signal. Please using one of the following: "
                            "(funding|valid|delete|endorsed)");
     }
 
     vote_outcome_enum_t eVoteOutcome = CGovernanceVoting::ConvertVoteOutcome(strVoteOutcome);
-    if(eVoteOutcome == VOTE_OUTCOME_NONE) {
+    if (eVoteOutcome == VOTE_OUTCOME_NONE) {
         throw JSONRPCError(RPC_INVALID_PARAMETER, "Invalid vote outcome. Please use one of the following: 'yes', 'no' or 'abstain'");
     }
 
@@ -1003,7 +996,7 @@ UniValue voteraw(const JSONRPCRequest& request)
     CMasternode mn;
     bool fMnFound = mnodeman.Get(outpoint, mn);
 
-    if(!fMnFound) {
+    if (!fMnFound) {
         throw JSONRPCError(RPC_INTERNAL_ERROR, "Failure to find masternode in list : " + outpoint.ToStringShort());
     }
 
@@ -1013,15 +1006,14 @@ UniValue voteraw(const JSONRPCRequest& request)
 
     bool onlyOwnerAllowed = govObjType == GOVERNANCE_OBJECT_PROPOSAL;
 
-    if(!vote.IsValid(onlyOwnerAllowed)) {
+    if (!vote.IsValid(onlyOwnerAllowed)) {
         throw JSONRPCError(RPC_INTERNAL_ERROR, "Failure to verify vote.");
     }
 
     CGovernanceException exception;
-    if(governance.ProcessVoteAndRelay(vote, exception, *g_connman)) {
+    if (governance.ProcessVoteAndRelay(vote, exception, *g_connman)) {
         return "Voted successfully";
-    }
-    else {
+    } else {
         throw JSONRPCError(RPC_INTERNAL_ERROR, "Error voting : " + exception.GetMessage());
     }
 }
diff --git a/src/rpc/masternode.cpp b/src/rpc/masternode.cpp
index 5e42fe20d894..33bace9cefe5 100644
--- a/src/rpc/masternode.cpp
+++ b/src/rpc/masternode.cpp
@@ -51,10 +51,10 @@ UniValue privatesend(const JSONRPCRequest& request)
             "  reset       - Reset mixing\n"
             );
 
-    if(fMasternodeMode)
+    if (fMasternodeMode)
         throw JSONRPCError(RPC_INTERNAL_ERROR, "Client-side mixing is not supported on masternodes");
 
-    if(request.params[0].get_str() == "start") {
+    if (request.params[0].get_str() == "start") {
         {
             LOCK(pwalletMain->cs_wallet);
             if (pwalletMain->IsLocked(true))
@@ -66,12 +66,12 @@ UniValue privatesend(const JSONRPCRequest& request)
         return "Mixing " + (result ? "started successfully" : ("start failed: " + privateSendClient.GetStatuses() + ", will retry"));
     }
 
-    if(request.params[0].get_str() == "stop") {
+    if (request.params[0].get_str() == "stop") {
         privateSendClient.fEnablePrivateSend = false;
         return "Mixing was stopped";
     }
 
-    if(request.params[0].get_str() == "reset") {
+    if (request.params[0].get_str() == "reset") {
         privateSendClient.ResetPool();
         return "Mixing was reset";
     }
@@ -159,7 +159,7 @@ void masternode_list_help()
 
 UniValue masternode_list(const JSONRPCRequest& request)
 {
-    if(request.fHelp)
+    if (request.fHelp)
         masternode_list_help();
     JSONRPCRequest newRequest = request;
     newRequest.params.setArray();
@@ -182,7 +182,7 @@ void masternode_connect_help()
 
 UniValue masternode_connect(const JSONRPCRequest& request)
 {
-    if(request.fHelp || request.params.size() < 2)
+    if (request.fHelp || request.params.size() < 2)
         masternode_connect_help();
 
     std::string strAddress = request.params[1].get_str();
@@ -219,7 +219,7 @@ void masternode_count_help()
 
 UniValue masternode_count(const JSONRPCRequest& request)
 {
-    if(request.fHelp || request.params.size() > 2)
+    if (request.fHelp || request.params.size() > 2)
         masternode_count_help();
 
     int nCount;
@@ -275,7 +275,7 @@ UniValue GetNextMasternodeForPayment(int heightShift)
     nHeight = pindex->nHeight + heightShift;
     mnodeman.UpdateLastPaid(pindex);
 
-    if(!mnodeman.GetNextMasternodeInQueueForPayment(nHeight, true, nCount, mnInfo))
+    if (!mnodeman.GetNextMasternodeInQueueForPayment(nHeight, true, nCount, mnInfo))
         return "unknown";
 
     UniValue obj(UniValue::VOBJ);
@@ -300,7 +300,7 @@ void masternode_winner_help()
 
 UniValue masternode_winner(const JSONRPCRequest& request)
 {
-    if(request.fHelp)
+    if (request.fHelp)
         masternode_winner_help();
 
     return GetNextMasternodeForPayment(10);
@@ -316,7 +316,7 @@ void masternode_current_help()
 
 UniValue masternode_current(const JSONRPCRequest& request)
 {
-    if(request.fHelp)
+    if (request.fHelp)
         masternode_current_help();
 
     return GetNextMasternodeForPayment(1);
@@ -335,7 +335,7 @@ void masternode_start_alias_help()
 
 UniValue masternode_start_alias(const JSONRPCRequest& request)
 {
-    if(request.fHelp || request.params.size() < 2)
+    if (request.fHelp || request.params.size() < 2)
         masternode_start_alias_help();
     if (deterministicMNManager->IsDeterministicMNsSporkActive())
         throw JSONRPCError(RPC_MISC_ERROR, "start-alias is not supported when deterministic masternode list is active (DIP3)");
@@ -356,7 +356,7 @@ UniValue masternode_start_alias(const JSONRPCRequest& request)
     statusObj.push_back(Pair("alias", strAlias));
 
     for (const auto& mne : masternodeConfig.getEntries()) {
-        if(mne.getAlias() == strAlias) {
+        if (mne.getAlias() == strAlias) {
             fFound = true;
             std::string strError;
             CMasternodeBroadcast mnb;
@@ -370,7 +370,7 @@ UniValue masternode_start_alias(const JSONRPCRequest& request)
             }
 
             statusObj.push_back(Pair("result", fResult ? "successful" : "failed"));
-            if(!fResult) {
+            if (!fResult) {
                 statusObj.push_back(Pair("errorMessage", strError));
             }
             mnodeman.NotifyMasternodeUpdates(*g_connman);
@@ -378,7 +378,7 @@ UniValue masternode_start_alias(const JSONRPCRequest& request)
         }
     }
 
-    if(!fFound) {
+    if (!fFound) {
         statusObj.push_back(Pair("result", "failed"));
         statusObj.push_back(Pair("errorMessage", "Could not find alias in config. Verify with list-conf."));
     }
@@ -437,7 +437,7 @@ UniValue StartMasternodeList(const std::vector<CMasternodeConfig::CMasternodeEnt
 
 UniValue masternode_start_all(const JSONRPCRequest& request)
 {
-    if(request.fHelp)
+    if (request.fHelp)
         masternode_start_all_help();
     if (deterministicMNManager->IsDeterministicMNsSporkActive())
         throw JSONRPCError(RPC_MISC_ERROR, strprintf("start-all is not supported when deterministic masternode list is active (DIP3)"));
@@ -463,7 +463,7 @@ void masternode_start_missing_help()
 
 UniValue masternode_start_missing(const JSONRPCRequest& request)
 {
-    if(request.fHelp)
+    if (request.fHelp)
         masternode_start_missing_help();
 
     if (!EnsureWalletIsAvailable(request.fHelp))
@@ -474,7 +474,7 @@ UniValue masternode_start_missing(const JSONRPCRequest& request)
         EnsureWalletIsUnlocked();
     }
 
-    if(!masternodeSync.IsMasternodeListSynced()) {
+    if (!masternodeSync.IsMasternodeListSynced()) {
         throw JSONRPCError(RPC_CLIENT_IN_INITIAL_DOWNLOAD, "You can't use this command until masternode list is synced");
     }
 
@@ -483,7 +483,7 @@ UniValue masternode_start_missing(const JSONRPCRequest& request)
         COutPoint outpoint = COutPoint(uint256S(mne.getTxHash()), (uint32_t)atoi(mne.getOutputIndex()));
         CMasternode mn;
         bool fFound = mnodeman.Get(outpoint, mn);
-        if(fFound)
+        if (fFound)
             entries.push_back(mne);
     }
     return StartMasternodeList(entries);
@@ -499,7 +499,7 @@ void masternode_start_disabled_help()
 
 UniValue masternode_start_disabled(const JSONRPCRequest& request)
 {
-    if(request.fHelp)
+    if (request.fHelp)
         masternode_start_disabled_help();
 
     if (!EnsureWalletIsAvailable(request.fHelp))
@@ -510,7 +510,7 @@ UniValue masternode_start_disabled(const JSONRPCRequest& request)
         EnsureWalletIsUnlocked();
     }
 
-    if(!masternodeSync.IsMasternodeListSynced()) {
+    if (!masternodeSync.IsMasternodeListSynced()) {
         throw JSONRPCError(RPC_CLIENT_IN_INITIAL_DOWNLOAD, "You can't use this command until masternode list is synced");
     }
 
@@ -520,7 +520,7 @@ UniValue masternode_start_disabled(const JSONRPCRequest& request)
         CMasternode mn;
         bool fFound = mnodeman.Get(outpoint, mn);
 
-        if(fFound && mn.IsEnabled()) continue;
+        if (fFound && mn.IsEnabled()) continue;
 
         entries.push_back(mne);
     }
@@ -537,7 +537,7 @@ void masternode_outputs_help()
 
 UniValue masternode_outputs(const JSONRPCRequest& request)
 {
-    if(request.fHelp)
+    if (request.fHelp)
         masternode_outputs_help();
 
     if (!EnsureWalletIsAvailable(request.fHelp))
@@ -569,7 +569,7 @@ void masternode_genkey_help()
 
 UniValue masternode_genkey(const JSONRPCRequest& request)
 {
-    if(request.fHelp)
+    if (request.fHelp)
         masternode_genkey_help();
 
     bool fCompressed = false;
@@ -595,7 +595,7 @@ void masternode_info_help()
 
 UniValue masternode_info(const JSONRPCRequest& request)
 {
-    if(request.fHelp || request.params.size() != 2)
+    if (request.fHelp || request.params.size() != 2)
         masternode_info_help();
 
     std::string strProTxHash = request.params[1].get_str();
@@ -678,7 +678,7 @@ void masternode_list_conf_help()
 
 UniValue masternode_list_conf(const JSONRPCRequest& request)
 {
-    if(request.fHelp)
+    if (request.fHelp)
         masternode_list_conf_help();
 
     UniValue resultObj(UniValue::VOBJ);
@@ -713,7 +713,7 @@ void masternode_status_help()
 
 UniValue masternode_status(const JSONRPCRequest& request)
 {
-    if(request.fHelp)
+    if (request.fHelp)
         masternode_status_help();
 
     if (!fMasternodeMode)
@@ -738,7 +738,7 @@ UniValue masternode_status(const JSONRPCRequest& request)
         mnObj.push_back(Pair("status", activeMasternodeManager->GetStatus()));
     } else {
         CMasternode mn;
-        if(mnodeman.Get(activeMasternodeInfo.outpoint, mn)) {
+        if (mnodeman.Get(activeMasternodeInfo.outpoint, mn)) {
             mnObj.push_back(Pair("payee", CBitcoinAddress(mn.keyIDCollateralAddress).ToString()));
         }
 
@@ -760,14 +760,14 @@ void masternode_winners_help()
 
 UniValue masternode_winners(const JSONRPCRequest& request)
 {
-    if(request.fHelp)
+    if (request.fHelp)
         masternode_winners_help();
 
     int nHeight;
     {
         LOCK(cs_main);
         CBlockIndex* pindex = chainActive.Tip();
-        if(!pindex) return NullUniValue;
+        if (!pindex) return NullUniValue;
 
         nHeight = pindex->nHeight;
     }
@@ -788,7 +788,7 @@ UniValue masternode_winners(const JSONRPCRequest& request)
 
     UniValue obj(UniValue::VOBJ);
 
-    for(int i = nHeight - nLast; i < nHeight + 20; i++) {
+    for (int i = nHeight - nLast; i < nHeight + 20; i++) {
         std::string strPayment = GetRequiredPaymentsString(i);
         if (strFilter !="" && strPayment.find(strFilter) == std::string::npos) continue;
         obj.push_back(Pair(strprintf("%d", i), strPayment));
@@ -807,7 +807,7 @@ void masternode_check_help()
 
 UniValue masternode_check(const JSONRPCRequest& request)
 {
-    if(request.fHelp)
+    if (request.fHelp)
         masternode_check_help();
 
     int countBeforeCheck = mnodeman.CountMasternodes();
@@ -1083,8 +1083,7 @@ bool DecodeHexVecMnb(std::vector<CMasternodeBroadcast>& vecMnb, std::string strH
     CDataStream ssData(mnbData, SER_NETWORK, PROTOCOL_VERSION);
     try {
         ssData >> vecMnb;
-    }
-    catch (const std::exception&) {
+    } catch (const std::exception&) {
         return false;
     }
 
@@ -1118,8 +1117,7 @@ UniValue masternodebroadcast(const JSONRPCRequest& request)
                 );
 
 #ifdef ENABLE_WALLET
-    if (strCommand == "create-alias")
-    {
+    if (strCommand == "create-alias") {
         if (!EnsureWalletIsAvailable(request.fHelp))
             return NullUniValue;
 
@@ -1144,7 +1142,7 @@ UniValue masternodebroadcast(const JSONRPCRequest& request)
         statusObj.push_back(Pair("alias", strAlias));
 
         for (const auto& mne : masternodeConfig.getEntries()) {
-            if(mne.getAlias() == strAlias) {
+            if (mne.getAlias() == strAlias) {
                 fFound = true;
                 std::string strError;
                 CMasternodeBroadcast mnb;
@@ -1152,7 +1150,7 @@ UniValue masternodebroadcast(const JSONRPCRequest& request)
                 bool fResult = CMasternodeBroadcast::Create(mne.getIp(), mne.getPrivKey(), mne.getTxHash(), mne.getOutputIndex(), strError, mnb, true);
 
                 statusObj.push_back(Pair("result", fResult ? "successful" : "failed"));
-                if(fResult) {
+                if (fResult) {
                     vecMnb.push_back(mnb);
                     CDataStream ssVecMnb(SER_NETWORK, PROTOCOL_VERSION);
                     ssVecMnb << vecMnb;
@@ -1164,7 +1162,7 @@ UniValue masternodebroadcast(const JSONRPCRequest& request)
             }
         }
 
-        if(!fFound) {
+        if (!fFound) {
             statusObj.push_back(Pair("result", "not found"));
             statusObj.push_back(Pair("errorMessage", "Could not find alias in config. Verify with list-conf."));
         }
@@ -1173,8 +1171,7 @@ UniValue masternodebroadcast(const JSONRPCRequest& request)
 
     }
 
-    if (strCommand == "create-all")
-    {
+    if (strCommand == "create-all") {
         if (!EnsureWalletIsAvailable(request.fHelp))
             return NullUniValue;
 
@@ -1203,7 +1200,7 @@ UniValue masternodebroadcast(const JSONRPCRequest& request)
             statusObj.push_back(Pair("alias", mne.getAlias()));
             statusObj.push_back(Pair("result", fResult ? "successful" : "failed"));
 
-            if(fResult) {
+            if (fResult) {
                 nSuccessful++;
                 vecMnb.push_back(mnb);
             } else {
@@ -1225,8 +1222,7 @@ UniValue masternodebroadcast(const JSONRPCRequest& request)
     }
 #endif // ENABLE_WALLET
 
-    if (strCommand == "decode")
-    {
+    if (strCommand == "decode") {
         if (request.params.size() != 2)
             throw JSONRPCError(RPC_INVALID_PARAMETER, "Correct usage is 'masternodebroadcast decode \"hexstring\"'");
 
@@ -1243,7 +1239,7 @@ UniValue masternodebroadcast(const JSONRPCRequest& request)
         for (const auto& mnb : vecMnb) {
             UniValue resultObj(UniValue::VOBJ);
 
-            if(mnb.CheckSignature(nDos)) {
+            if (mnb.CheckSignature(nDos)) {
                 nSuccessful++;
                 resultObj.push_back(Pair("outpoint", mnb.outpoint.ToStringShort()));
                 resultObj.push_back(Pair("addr", mnb.addr.ToString()));
@@ -1274,8 +1270,7 @@ UniValue masternodebroadcast(const JSONRPCRequest& request)
         return returnObj;
     }
 
-    if (strCommand == "relay")
-    {
+    if (strCommand == "relay") {
         if (request.params.size() < 2 || request.params.size() > 3)
             throw JSONRPCError(RPC_INVALID_PARAMETER,   "masternodebroadcast relay \"hexstring\"\n"
                                                         "\nArguments:\n"
@@ -1304,7 +1299,7 @@ UniValue masternodebroadcast(const JSONRPCRequest& request)
                 mnodeman.NotifyMasternodeUpdates(*g_connman);
             } else fResult = false;
 
-            if(fResult) {
+            if (fResult) {
                 nSuccessful++;
                 resultObj.push_back(Pair(mnb.GetHash().ToString(), "successful"));
             } else {

From b99886532ef5308c7b9c75949ace72d12f5679d2 Mon Sep 17 00:00:00 2001
From: PastaPastaPasta <pasta@dashboost.org>
Date: Wed, 5 Sep 2018 07:05:27 -0500
Subject: [PATCH 115/400] add link for developer-notes in contributing (#2260)

---
 CONTRIBUTING.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index dab20e9beba3..078e0ec756b1 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -174,7 +174,7 @@ In general, all pull requests must:
     the project (for example refactoring for modularisation);
   - be well peer reviewed;
   - have unit tests and functional tests where appropriate;
-  - follow code style guidelines;
+  - follow [code style guidelines](/doc/developer-notes.md);
   - not break the existing test suite;
   - where bugs are fixed, where possible, there should be unit tests
     demonstrating the bug and also proving the fix. This helps prevent regression.

From dc7292afa94f493d54ee41b0cb237ab5bfea7582 Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Thu, 15 Feb 2018 19:14:28 +0100
Subject: [PATCH 116/400] Implement new MN payments logic and add compatibility
 code

---
 src/masternode-payments.cpp | 77 +++++++++++++++++++++++++++++++------
 src/masternode.cpp          | 15 ++++++++
 src/masternodeman.cpp       | 12 ++++++
 src/masternodeman.h         |  1 +
 src/net_processing.cpp      | 29 ++++++++------
 src/rpc/masternode.cpp      | 24 +++++++++---
 6 files changed, 129 insertions(+), 29 deletions(-)

diff --git a/src/masternode-payments.cpp b/src/masternode-payments.cpp
index 03b2b7d51f3b..2885ffb1d567 100644
--- a/src/masternode-payments.cpp
+++ b/src/masternode-payments.cpp
@@ -14,6 +14,8 @@
 #include "spork.h"
 #include "util.h"
 
+#include "evo/deterministicmns.h"
+
 #include <string>
 
 /** Object for who's going to get paid on which blocks */
@@ -150,7 +152,7 @@ bool IsBlockValueValid(const CBlock& block, int nBlockHeight, CAmount blockRewar
 
 bool IsBlockPayeeValid(const CTransaction& txNew, int nBlockHeight, CAmount blockReward)
 {
-    if(!masternodeSync.IsSynced() || fLiteMode) {
+    if((!masternodeSync.IsSynced() && !deterministicMNManager->IsDeterministicMNsSporkActive(nBlockHeight)) || fLiteMode) {
         //there is no budget data to use to check anything, let's just accept the longest chain
         if(fDebug) LogPrintf("%s -- WARNING: Not enough data, skipping block payee checks\n", __func__);
         return true;
@@ -267,6 +269,9 @@ void CMasternodePayments::Clear()
 
 bool CMasternodePayments::UpdateLastVote(const CMasternodePaymentVote& vote)
 {
+    if (deterministicMNManager->IsDeterministicMNsSporkActive())
+        return false;
+
     LOCK(cs_mapMasternodePaymentVotes);
 
     const auto it = mapMasternodesLastVote.find(vote.masternodeOutpoint);
@@ -294,6 +299,8 @@ bool CMasternodePayments::GetMasternodeTxOuts(int nBlockHeight, CAmount blockRew
     voutMasternodePaymentsRet.clear();
 
     if(!GetBlockTxOuts(nBlockHeight, blockReward, voutMasternodePaymentsRet)) {
+        assert(!deterministicMNManager->IsDeterministicMNsSporkActive(nBlockHeight));
+
         // no masternode detected...
         int nCount = 0;
         masternode_info_t mnInfo;
@@ -327,6 +334,9 @@ int CMasternodePayments::GetMinMasternodePaymentsProto() const {
 
 void CMasternodePayments::ProcessMessage(CNode* pfrom, const std::string& strCommand, CDataStream& vRecv, CConnman& connman)
 {
+    if (deterministicMNManager->IsDeterministicMNsSporkActive())
+        return;
+
     if(fLiteMode) return; // disable all Dash specific functionality
 
     if (strCommand == NetMsgType::MASTERNODEPAYMENTSYNC) { //Masternode Payments Request Sync
@@ -514,14 +524,29 @@ bool CMasternodePayments::GetBlockTxOuts(int nBlockHeight, CAmount blockReward,
 
     CAmount masternodeReward = GetMasternodePayment(nBlockHeight, blockReward);
 
-    LOCK(cs_mapMasternodeBlocks);
-    auto it = mapMasternodeBlocks.find(nBlockHeight);
-    CScript payee;
-    if (it == mapMasternodeBlocks.end() || !it->second.GetBestPayee(payee)) {
-        return false;
+    if (deterministicMNManager->IsDeterministicMNsSporkActive(nBlockHeight)) {
+        uint256 blockHash;
+        {
+            LOCK(cs_main);
+            blockHash = chainActive[nBlockHeight - 1]->GetBlockHash();
+        }
+        uint256 proTxHash;
+        auto dmnPayee = deterministicMNManager->GetListForBlock(blockHash).GetMNPayee();
+        if (!dmnPayee) {
+            return false;
+        }
+        voutMasternodePaymentsRet.emplace_back(masternodeReward, dmnPayee->pdmnState->scriptPayout);
+        return true;
+    } else {
+        LOCK(cs_mapMasternodeBlocks);
+        auto it = mapMasternodeBlocks.find(nBlockHeight);
+        CScript payee;
+        if (it == mapMasternodeBlocks.end() || !it->second.GetBestPayee(payee)) {
+            return false;
+        }
+        voutMasternodePaymentsRet.emplace_back(masternodeReward, payee);
+        return true;
     }
-    voutMasternodePaymentsRet.emplace_back(masternodeReward, payee);
-    return true;
 }
 
 // Is this masternode scheduled to get paid soon?
@@ -698,10 +723,22 @@ std::string CMasternodeBlockPayees::GetRequiredPaymentsString() const
 
 std::string CMasternodePayments::GetRequiredPaymentsString(int nBlockHeight) const
 {
-    LOCK(cs_mapMasternodeBlocks);
-
-    const auto it = mapMasternodeBlocks.find(nBlockHeight);
-    return it == mapMasternodeBlocks.end() ? "Unknown" : it->second.GetRequiredPaymentsString();
+    if (deterministicMNManager->IsDeterministicMNsSporkActive(nBlockHeight)) {
+        LOCK(cs_main);
+        auto pindex = chainActive[nBlockHeight - 1];
+        auto payee = deterministicMNManager->GetListForBlock(pindex->GetBlockHash()).GetMNPayee();
+        if (!payee) {
+            return "Unknown";
+        }
+        CTxDestination dest;
+        if (!ExtractDestination(payee->pdmnState->scriptPayout, dest))
+            assert(false);
+        return CBitcoinAddress(dest).ToString();
+    } else {
+        LOCK(cs_mapMasternodeBlocks);
+        const auto it = mapMasternodeBlocks.find(nBlockHeight);
+        return it == mapMasternodeBlocks.end() ? "Unknown" : it->second.GetRequiredPaymentsString();
+    }
 }
 
 bool CMasternodePayments::IsTransactionValid(const CTransaction& txNew, int nBlockHeight, CAmount blockReward) const
@@ -713,6 +750,10 @@ bool CMasternodePayments::IsTransactionValid(const CTransaction& txNew, int nBlo
 
 void CMasternodePayments::CheckAndRemove()
 {
+    if (deterministicMNManager->IsDeterministicMNsSporkActive()) {
+        return;
+    }
+
     if(!masternodeSync.IsBlockchainSynced()) return;
 
     LOCK2(cs_mapMasternodeBlocks, cs_mapMasternodePaymentVotes);
@@ -794,6 +835,10 @@ bool CMasternodePaymentVote::IsValid(CNode* pnode, int nValidationHeight, std::s
 
 bool CMasternodePayments::ProcessBlock(int nBlockHeight, CConnman& connman)
 {
+    if (deterministicMNManager->IsDeterministicMNsSporkActive(nBlockHeight)) {
+        return true;
+    }
+
     // DETERMINE IF WE SHOULD BE VOTING FOR THE NEXT PAYEE
 
     if(fLiteMode || !fMasternodeMode) return false;
@@ -929,6 +974,10 @@ void CMasternodePayments::CheckBlockVotes(int nBlockHeight)
 
 void CMasternodePaymentVote::Relay(CConnman& connman) const
 {
+    if (deterministicMNManager->IsDeterministicMNsSporkActive()) {
+        return;
+    }
+
     // Do not relay until fully synced
     if(!masternodeSync.IsSynced()) {
         LogPrint("mnpayments", "CMasternodePayments::%s -- won't relay until fully synced\n", __func__);
@@ -1130,6 +1179,10 @@ void CMasternodePayments::UpdatedBlockTip(const CBlockIndex *pindex, CConnman& c
 {
     if(!pindex) return;
 
+    if (deterministicMNManager->IsDeterministicMNsSporkActive(pindex->nHeight)) {
+        return;
+    }
+
     nCachedBlockHeight = pindex->nHeight;
     LogPrint("mnpayments", "CMasternodePayments::%s -- nCachedBlockHeight=%d\n", __func__, nCachedBlockHeight);
 
diff --git a/src/masternode.cpp b/src/masternode.cpp
index 84a26ce6de98..39350741f07f 100644
--- a/src/masternode.cpp
+++ b/src/masternode.cpp
@@ -18,6 +18,8 @@
 #include "wallet/wallet.h"
 #endif // ENABLE_WALLET
 
+#include "evo/deterministicmns.h"
+
 #include <string>
 
 
@@ -347,6 +349,19 @@ void CMasternode::UpdateLastPaid(const CBlockIndex *pindex, int nMaxBlocksToScan
 {
     if(!pindex) return;
 
+    if (deterministicMNManager->IsDeterministicMNsSporkActive(pindex->nHeight)) {
+        auto dmn = deterministicMNManager->GetListForBlock(pindex->GetBlockHash()).GetMN(outpoint.hash);
+        if (!dmn || dmn->pdmnState->nLastPaidHeight == -1) {
+            LogPrint("masternode", "CMasternode::UpdateLastPaidBlock -- searching for block with payment to %s -- not found\n", outpoint.ToStringShort());
+        } else {
+            LOCK(cs_main);
+            nBlockLastPaid = (int)dmn->pdmnState->nLastPaidHeight;
+            nTimeLastPaid = chainActive[nBlockLastPaid]->nTime;
+            LogPrint("masternode", "CMasternode::UpdateLastPaidBlock -- searching for block with payment to %s -- found new %d\n", outpoint.ToStringShort(), nBlockLastPaid);
+        }
+        return;
+    }
+
     const CBlockIndex *BlockReading = pindex;
 
     CScript mnpayee = GetScriptForDestination(keyIDCollateralAddress);
diff --git a/src/masternodeman.cpp b/src/masternodeman.cpp
index c7a53e55c724..318b45e1e2ff 100644
--- a/src/masternodeman.cpp
+++ b/src/masternodeman.cpp
@@ -583,6 +583,14 @@ bool CMasternodeMan::Get(const COutPoint& outpoint, CMasternode& masternodeRet)
     return true;
 }
 
+bool CMasternodeMan::GetMasternodeInfo(const uint256& proTxHash, masternode_info_t& mnInfoRet)
+{
+    auto dmn = deterministicMNManager->GetListAtChainTip().GetValidMN(proTxHash);
+    if (!dmn)
+        return false;
+    return GetMasternodeInfo(COutPoint(proTxHash, dmn->nCollateralIndex), mnInfoRet);
+}
+
 bool CMasternodeMan::GetMasternodeInfo(const COutPoint& outpoint, masternode_info_t& mnInfoRet)
 {
     LOCK(cs);
@@ -654,6 +662,10 @@ bool CMasternodeMan::GetNextMasternodeInQueueForPayment(bool fFilterSigTime, int
 
 bool CMasternodeMan::GetNextMasternodeInQueueForPayment(int nBlockHeight, bool fFilterSigTime, int& nCountRet, masternode_info_t& mnInfoRet)
 {
+    if (deterministicMNManager->IsDeterministicMNsSporkActive(nBlockHeight)) {
+        return false;
+    }
+
     mnInfoRet = masternode_info_t();
     nCountRet = 0;
 
diff --git a/src/masternodeman.h b/src/masternodeman.h
index 243ee8040561..94d102cde42e 100644
--- a/src/masternodeman.h
+++ b/src/masternodeman.h
@@ -171,6 +171,7 @@ class CMasternodeMan
     bool Get(const COutPoint& outpoint, CMasternode& masternodeRet);
     bool Has(const COutPoint& outpoint);
 
+    bool GetMasternodeInfo(const uint256& proTxHash, masternode_info_t& mnInfoRet);
     bool GetMasternodeInfo(const COutPoint& outpoint, masternode_info_t& mnInfoRet);
     bool GetMasternodeInfo(const CKeyID& keyIDOperator, masternode_info_t& mnInfoRet);
     bool GetMasternodeInfo(const CPubKey& pubKeyOperator, masternode_info_t& mnInfoRet);
diff --git a/src/net_processing.cpp b/src/net_processing.cpp
index 2bc080e9af41..1a32aa25236a 100644
--- a/src/net_processing.cpp
+++ b/src/net_processing.cpp
@@ -42,6 +42,7 @@
 #endif // ENABLE_WALLET
 #include "privatesend-server.h"
 
+#include "evo/deterministicmns.h"
 #include "evo/simplifiedmns.h"
 
 #include <boost/thread.hpp>
@@ -1178,25 +1179,29 @@ void static ProcessGetData(CNode* pfrom, const Consensus::Params& consensusParam
                 }
 
                 if (!push && inv.type == MSG_MASTERNODE_PAYMENT_VOTE) {
-                    if(mnpayments.HasVerifiedPaymentVote(inv.hash)) {
-                        connman.PushMessage(pfrom, msgMaker.Make(NetMsgType::MASTERNODEPAYMENTVOTE, mnpayments.mapMasternodePaymentVotes[inv.hash]));
-                        push = true;
+                    if (!deterministicMNManager->IsDeterministicMNsSporkActive()) {
+                        if (mnpayments.HasVerifiedPaymentVote(inv.hash)) {
+                            connman.PushMessage(pfrom, msgMaker.Make(NetMsgType::MASTERNODEPAYMENTVOTE, mnpayments.mapMasternodePaymentVotes[inv.hash]));
+                            push = true;
+                        }
                     }
                 }
 
                 if (!push && inv.type == MSG_MASTERNODE_PAYMENT_BLOCK) {
-                    BlockMap::iterator mi = mapBlockIndex.find(inv.hash);
-                    LOCK(cs_mapMasternodeBlocks);
-                    if (mi != mapBlockIndex.end() && mnpayments.mapMasternodeBlocks.count(mi->second->nHeight)) {
-                        BOOST_FOREACH(CMasternodePayee& payee, mnpayments.mapMasternodeBlocks[mi->second->nHeight].vecPayees) {
-                            std::vector<uint256> vecVoteHashes = payee.GetVoteHashes();
-                            BOOST_FOREACH(uint256& hash, vecVoteHashes) {
-                                if(mnpayments.HasVerifiedPaymentVote(hash)) {
-                                    connman.PushMessage(pfrom, msgMaker.Make(NetMsgType::MASTERNODEPAYMENTVOTE, mnpayments.mapMasternodePaymentVotes[hash]));
+                    if (!deterministicMNManager->IsDeterministicMNsSporkActive()) {
+                        BlockMap::iterator mi = mapBlockIndex.find(inv.hash);
+                        LOCK(cs_mapMasternodeBlocks);
+                        if (mi != mapBlockIndex.end() && mnpayments.mapMasternodeBlocks.count(mi->second->nHeight)) {
+                            BOOST_FOREACH(CMasternodePayee& payee, mnpayments.mapMasternodeBlocks[mi->second->nHeight].vecPayees) {
+                                std::vector<uint256> vecVoteHashes = payee.GetVoteHashes();
+                                BOOST_FOREACH(uint256& hash, vecVoteHashes) {
+                                    if(mnpayments.HasVerifiedPaymentVote(hash)) {
+                                        connman.PushMessage(pfrom, msgMaker.Make(NetMsgType::MASTERNODEPAYMENTVOTE, mnpayments.mapMasternodePaymentVotes[hash]));
+                                    }
                                 }
                             }
+                            push = true;
                         }
-                        push = true;
                     }
                 }
 
diff --git a/src/rpc/masternode.cpp b/src/rpc/masternode.cpp
index 33bace9cefe5..1fe361fd8deb 100644
--- a/src/rpc/masternode.cpp
+++ b/src/rpc/masternode.cpp
@@ -24,6 +24,8 @@
 #include "evo/specialtx.h"
 #include "evo/deterministicmns.h"
 
+#include "evo/deterministicmns.h"
+
 #include <fstream>
 #include <iomanip>
 #include <univalue.h>
@@ -223,10 +225,15 @@ UniValue masternode_count(const JSONRPCRequest& request)
         masternode_count_help();
 
     int nCount;
-    masternode_info_t mnInfo;
-    mnodeman.GetNextMasternodeInQueueForPayment(true, nCount, mnInfo);
+    int total;
+    if (deterministicMNManager->IsDeterministicMNsSporkActive()) {
+        nCount = total = mnodeman.CountEnabled();
+    } else {
+        masternode_info_t mnInfo;
+        mnodeman.GetNextMasternodeInQueueForPayment(true, nCount, mnInfo);
+        total = mnodeman.size();
+    }
 
-    int total = mnodeman.size();
     int ps = mnodeman.CountEnabled(MIN_PRIVATESEND_PEER_PROTO_VERSION);
     int enabled = mnodeman.CountEnabled();
 
@@ -272,11 +279,18 @@ UniValue GetNextMasternodeForPayment(int heightShift)
         LOCK(cs_main);
         pindex = chainActive.Tip();
     }
+
     nHeight = pindex->nHeight + heightShift;
     mnodeman.UpdateLastPaid(pindex);
 
-    if (!mnodeman.GetNextMasternodeInQueueForPayment(nHeight, true, nCount, mnInfo))
-        return "unknown";
+    if (deterministicMNManager->IsDeterministicMNsSporkActive()) {
+        auto payee = deterministicMNManager->GetListAtChainTip().GetMNPayee();
+        if (!payee || !mnodeman.GetMasternodeInfo(payee->proTxHash, mnInfo))
+            return "unknown";
+    } else {
+        if (!mnodeman.GetNextMasternodeInQueueForPayment(nHeight, true, nCount, mnInfo))
+            return "unknown";
+    }
 
     UniValue obj(UniValue::VOBJ);
 

From 19fbf8ab76eabff1064505baf44d2af567d8e28f Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Fri, 9 Mar 2018 21:19:44 +0100
Subject: [PATCH 117/400] Move cs_main lock from CMasternode::UpdateLastPaid to
 CMasternodeMan

Ensure correct locking order to fix deadlock.
---
 src/masternode.cpp    | 3 ++-
 src/masternodeman.cpp | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/masternode.cpp b/src/masternode.cpp
index 39350741f07f..f8215e6818ad 100644
--- a/src/masternode.cpp
+++ b/src/masternode.cpp
@@ -347,6 +347,8 @@ std::string CMasternode::GetStatus() const
 
 void CMasternode::UpdateLastPaid(const CBlockIndex *pindex, int nMaxBlocksToScanBack)
 {
+    AssertLockHeld(cs_main);
+
     if(!pindex) return;
 
     if (deterministicMNManager->IsDeterministicMNsSporkActive(pindex->nHeight)) {
@@ -354,7 +356,6 @@ void CMasternode::UpdateLastPaid(const CBlockIndex *pindex, int nMaxBlocksToScan
         if (!dmn || dmn->pdmnState->nLastPaidHeight == -1) {
             LogPrint("masternode", "CMasternode::UpdateLastPaidBlock -- searching for block with payment to %s -- not found\n", outpoint.ToStringShort());
         } else {
-            LOCK(cs_main);
             nBlockLastPaid = (int)dmn->pdmnState->nLastPaidHeight;
             nTimeLastPaid = chainActive[nBlockLastPaid]->nTime;
             LogPrint("masternode", "CMasternode::UpdateLastPaidBlock -- searching for block with payment to %s -- found new %d\n", outpoint.ToStringShort(), nBlockLastPaid);
diff --git a/src/masternodeman.cpp b/src/masternodeman.cpp
index 318b45e1e2ff..0be4cacee359 100644
--- a/src/masternodeman.cpp
+++ b/src/masternodeman.cpp
@@ -1817,7 +1817,7 @@ bool CMasternodeMan::CheckMnbAndUpdateMasternodeList(CNode* pfrom, CMasternodeBr
 
 void CMasternodeMan::UpdateLastPaid(const CBlockIndex* pindex)
 {
-    LOCK(cs);
+    LOCK2(cs_main, cs);
 
     if(fLiteMode || !masternodeSync.IsWinnersListSynced() || mapMasternodes.empty()) return;
 

From e6b699bc26a5b7aafe33f470a5fa950bbd3e45f6 Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Sat, 3 Mar 2018 15:56:01 +0100
Subject: [PATCH 118/400] Enforce MN and superblock payments in same block

1. Enforce payment to masternodes in IsBlockPayeeValid even if superblocks
   are triggered. This new rule only gets activated when spork15 activates.

2. Always enforce masternode payments when spork15 is activated and ignore
   spork8 in that case. spork8 can be removed after spork15 activation
   and hardening of the spork15 height into consensus params.
---
 src/masternode-payments.cpp | 28 ++++++++++++++++++----------
 src/rpc/mining.cpp          |  3 ++-
 2 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/src/masternode-payments.cpp b/src/masternode-payments.cpp
index 2885ffb1d567..bc1e08087c8d 100644
--- a/src/masternode-payments.cpp
+++ b/src/masternode-payments.cpp
@@ -178,7 +178,10 @@ bool IsBlockPayeeValid(const CTransaction& txNew, int nBlockHeight, CAmount bloc
         if(CSuperblockManager::IsSuperblockTriggered(nBlockHeight)) {
             if(CSuperblockManager::IsValid(txNew, nBlockHeight, blockReward)) {
                 LogPrint("gobject", "%s -- Valid superblock at height %d: %s", __func__, nBlockHeight, txNew.ToString());
-                return true;
+                // only allow superblock and masternode payments in the same block after spork15 activation
+                if (!deterministicMNManager->IsDeterministicMNsSporkActive(nBlockHeight))
+                    return true;
+                // continue validation, should also pay MN
             } else {
                 LogPrintf("%s -- ERROR: Invalid superblock detected at height %d: %s", __func__, nBlockHeight, txNew.ToString());
                 // should NOT allow such superblocks, when superblocks are enabled
@@ -198,13 +201,18 @@ bool IsBlockPayeeValid(const CTransaction& txNew, int nBlockHeight, CAmount bloc
         return true;
     }
 
-    if(sporkManager.IsSporkActive(SPORK_8_MASTERNODE_PAYMENT_ENFORCEMENT)) {
-        LogPrintf("%s -- ERROR: Invalid masternode payment detected at height %d: %s", __func__, nBlockHeight, txNew.ToString());
+    if (deterministicMNManager->IsDeterministicMNsSporkActive(nBlockHeight)) {
+        // always enforce masternode payments when spork15 is active
         return false;
-    }
+    } else {
+        if(sporkManager.IsSporkActive(SPORK_8_MASTERNODE_PAYMENT_ENFORCEMENT)) {
+            LogPrintf("%s -- ERROR: Invalid masternode payment detected at height %d: %s", __func__, nBlockHeight, txNew.ToString());
+            return false;
+        }
 
-    LogPrintf("%s -- WARNING: Masternode payment enforcement is disabled, accepting any payee\n", __func__);
-    return true;
+        LogPrintf("%s-- WARNING: Masternode payment enforcement is disabled, accepting any payee\n", __func__);
+        return true;
+    }
 }
 
 void FillBlockPayments(CMutableTransaction& txNew, int nBlockHeight, CAmount blockReward, std::vector<CTxOut>& voutMasternodePaymentsRet, std::vector<CTxOut>& voutSuperblockPaymentsRet)
@@ -217,10 +225,7 @@ void FillBlockPayments(CMutableTransaction& txNew, int nBlockHeight, CAmount blo
             CSuperblockManager::GetSuperblockPayments(nBlockHeight, voutSuperblockPaymentsRet);
     }
 
-    // TODO this is a placeholder until DIP3 is merged, which will allow superblock payments and MN reward payments
-    // in the same block. We set this to false for now, which means that we'll always get into the next if statement
-    // when a superblock payment is present
-    bool allowSuperblockAndMNReward = false;
+    bool allowSuperblockAndMNReward = deterministicMNManager->IsDeterministicMNsSporkActive(nBlockHeight);
 
     // don't allow payments to superblocks AND masternodes before spork15 activation
     if (!voutSuperblockPaymentsRet.empty() && !allowSuperblockAndMNReward) {
@@ -253,6 +258,9 @@ std::string GetRequiredPaymentsString(int nBlockHeight)
 {
     // IF WE HAVE A ACTIVATED TRIGGER FOR THIS HEIGHT - IT IS A SUPERBLOCK, GET THE REQUIRED PAYEES
     if(CSuperblockManager::IsSuperblockTriggered(nBlockHeight)) {
+        if (deterministicMNManager->IsDeterministicMNsSporkActive(nBlockHeight)) {
+           return mnpayments.GetRequiredPaymentsString(nBlockHeight) + ", " + CSuperblockManager::GetRequiredPaymentsString(nBlockHeight);
+        }
         return CSuperblockManager::GetRequiredPaymentsString(nBlockHeight);
     }
 
diff --git a/src/rpc/mining.cpp b/src/rpc/mining.cpp
index 7a3a4bfb3923..3ca55356b725 100644
--- a/src/rpc/mining.cpp
+++ b/src/rpc/mining.cpp
@@ -28,6 +28,7 @@
 #include "masternode-payments.h"
 #include "masternode-sync.h"
 
+#include "evo/deterministicmns.h"
 #include "evo/specialtx.h"
 #include "evo/cbtx.h"
 
@@ -720,7 +721,7 @@ UniValue getblocktemplate(const JSONRPCRequest& request)
 
     result.push_back(Pair("masternode", masternodeObj));
     result.push_back(Pair("masternode_payments_started", pindexPrev->nHeight + 1 > consensusParams.nMasternodePaymentsStartBlock));
-    result.push_back(Pair("masternode_payments_enforced", sporkManager.IsSporkActive(SPORK_8_MASTERNODE_PAYMENT_ENFORCEMENT)));
+    result.push_back(Pair("masternode_payments_enforced", deterministicMNManager->IsDeterministicMNsSporkActive() || sporkManager.IsSporkActive(SPORK_8_MASTERNODE_PAYMENT_ENFORCEMENT)));
 
     UniValue superblockObjArray(UniValue::VARR);
     if(pblocktemplate->voutSuperblockPayments.size()) {

From 44706dc88acf2eab07695f5093bda31ab278d2bf Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Wed, 4 Apr 2018 17:20:54 +0200
Subject: [PATCH 119/400] Implement projection of MN reward winners in
 "masternode winners"

---
 src/masternode-payments.cpp | 72 ++++++++++++++++++++++++++-----------
 src/masternode-payments.h   |  2 +-
 src/rpc/masternode.cpp      |  8 ++---
 3 files changed, 56 insertions(+), 26 deletions(-)

diff --git a/src/masternode-payments.cpp b/src/masternode-payments.cpp
index bc1e08087c8d..dc50651fd841 100644
--- a/src/masternode-payments.cpp
+++ b/src/masternode-payments.cpp
@@ -254,13 +254,10 @@ void FillBlockPayments(CMutableTransaction& txNew, int nBlockHeight, CAmount blo
                             nBlockHeight, blockReward, voutMasternodeStr, txNew.ToString());
 }
 
-std::string GetRequiredPaymentsString(int nBlockHeight)
+std::string GetLegacyRequiredPaymentsString(int nBlockHeight)
 {
     // IF WE HAVE A ACTIVATED TRIGGER FOR THIS HEIGHT - IT IS A SUPERBLOCK, GET THE REQUIRED PAYEES
     if(CSuperblockManager::IsSuperblockTriggered(nBlockHeight)) {
-        if (deterministicMNManager->IsDeterministicMNsSporkActive(nBlockHeight)) {
-           return mnpayments.GetRequiredPaymentsString(nBlockHeight) + ", " + CSuperblockManager::GetRequiredPaymentsString(nBlockHeight);
-        }
         return CSuperblockManager::GetRequiredPaymentsString(nBlockHeight);
     }
 
@@ -268,6 +265,54 @@ std::string GetRequiredPaymentsString(int nBlockHeight)
     return mnpayments.GetRequiredPaymentsString(nBlockHeight);
 }
 
+std::string GetRequiredPaymentsString(int nBlockHeight, const CDeterministicMNCPtr &payee)
+{
+    std::string strPayee = "Unknown";
+    if (payee) {
+        CTxDestination dest;
+        if (!ExtractDestination(payee->pdmnState->scriptPayout, dest))
+            assert(false);
+        strPayee = CBitcoinAddress(dest).ToString();
+    }
+    if (CSuperblockManager::IsSuperblockTriggered(nBlockHeight)) {
+        strPayee += ", " + CSuperblockManager::GetRequiredPaymentsString(nBlockHeight);
+    }
+    return strPayee;
+}
+
+std::map<int, std::string> GetRequiredPaymentsStrings(int nStartHeight, int nEndHeight)
+{
+    std::map<int, std::string> mapPayments;
+
+    LOCK(cs_main);
+    int nChainTipHeight = chainActive.Height();
+
+    bool doProjection = false;
+    for(int h = nStartHeight; h < nEndHeight; h++) {
+        if (deterministicMNManager->IsDeterministicMNsSporkActive(h)) {
+            if (h <= nChainTipHeight) {
+                auto payee = deterministicMNManager->GetListForBlock(chainActive[h - 1]->GetBlockHash()).GetMNPayee();
+                mapPayments.emplace(h, GetRequiredPaymentsString(h, payee));
+            } else {
+                doProjection = true;
+                break;
+            }
+        } else {
+            mapPayments.emplace(h, GetLegacyRequiredPaymentsString(h));
+        }
+    }
+    if (doProjection) {
+        auto projection = deterministicMNManager->GetListAtChainTip().GetProjectedMNPayees(nEndHeight - nChainTipHeight);
+        for (size_t i = 0; i < projection.size(); i++) {
+            auto payee = projection[i];
+            int h = nChainTipHeight + 1 + i;
+            mapPayments.emplace(h, GetRequiredPaymentsString(h, payee));
+        }
+    }
+
+    return mapPayments;
+}
+
 void CMasternodePayments::Clear()
 {
     LOCK2(cs_mapMasternodeBlocks, cs_mapMasternodePaymentVotes);
@@ -731,22 +776,9 @@ std::string CMasternodeBlockPayees::GetRequiredPaymentsString() const
 
 std::string CMasternodePayments::GetRequiredPaymentsString(int nBlockHeight) const
 {
-    if (deterministicMNManager->IsDeterministicMNsSporkActive(nBlockHeight)) {
-        LOCK(cs_main);
-        auto pindex = chainActive[nBlockHeight - 1];
-        auto payee = deterministicMNManager->GetListForBlock(pindex->GetBlockHash()).GetMNPayee();
-        if (!payee) {
-            return "Unknown";
-        }
-        CTxDestination dest;
-        if (!ExtractDestination(payee->pdmnState->scriptPayout, dest))
-            assert(false);
-        return CBitcoinAddress(dest).ToString();
-    } else {
-        LOCK(cs_mapMasternodeBlocks);
-        const auto it = mapMasternodeBlocks.find(nBlockHeight);
-        return it == mapMasternodeBlocks.end() ? "Unknown" : it->second.GetRequiredPaymentsString();
-    }
+    LOCK(cs_mapMasternodeBlocks);
+    const auto it = mapMasternodeBlocks.find(nBlockHeight);
+    return it == mapMasternodeBlocks.end() ? "Unknown" : it->second.GetRequiredPaymentsString();
 }
 
 bool CMasternodePayments::IsTransactionValid(const CTransaction& txNew, int nBlockHeight, CAmount blockReward) const
diff --git a/src/masternode-payments.h b/src/masternode-payments.h
index e5cc6698ba21..4c4a3c7acb74 100644
--- a/src/masternode-payments.h
+++ b/src/masternode-payments.h
@@ -36,7 +36,7 @@ extern CMasternodePayments mnpayments;
 bool IsBlockValueValid(const CBlock& block, int nBlockHeight, CAmount blockReward, std::string& strErrorRet);
 bool IsBlockPayeeValid(const CTransaction& txNew, int nBlockHeight, CAmount blockReward);
 void FillBlockPayments(CMutableTransaction& txNew, int nBlockHeight, CAmount blockReward, std::vector<CTxOut>& voutMasternodePaymentsRet, std::vector<CTxOut>& voutSuperblockPaymentsRet);
-std::string GetRequiredPaymentsString(int nBlockHeight);
+std::map<int, std::string> GetRequiredPaymentsStrings(int nStartHeight, int nEndHeight);
 
 class CMasternodePayee
 {
diff --git a/src/rpc/masternode.cpp b/src/rpc/masternode.cpp
index 1fe361fd8deb..3761bd5a435a 100644
--- a/src/rpc/masternode.cpp
+++ b/src/rpc/masternode.cpp
@@ -801,11 +801,9 @@ UniValue masternode_winners(const JSONRPCRequest& request)
         throw JSONRPCError(RPC_INVALID_PARAMETER, "Correct usage is 'masternode winners ( \"count\" \"filter\" )'");
 
     UniValue obj(UniValue::VOBJ);
-
-    for (int i = nHeight - nLast; i < nHeight + 20; i++) {
-        std::string strPayment = GetRequiredPaymentsString(i);
-        if (strFilter !="" && strPayment.find(strFilter) == std::string::npos) continue;
-        obj.push_back(Pair(strprintf("%d", i), strPayment));
+    auto mapPayments = GetRequiredPaymentsStrings(nHeight - nLast, nHeight + 20);
+    for (const auto &p : mapPayments) {
+        obj.push_back(Pair(strprintf("%d", p.first), p.second));
     }
 
     return obj;

From 2c481f0f86c071c54769f9500a29c69c2b7e52e7 Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Fri, 9 Mar 2018 12:46:27 +0100
Subject: [PATCH 120/400] Implement deterministic version of
 CMasternodePayments::IsScheduled

Needed for privatesend when choosing masternodes
---
 src/masternode-payments.cpp | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/masternode-payments.cpp b/src/masternode-payments.cpp
index dc50651fd841..34ed127371aa 100644
--- a/src/masternode-payments.cpp
+++ b/src/masternode-payments.cpp
@@ -608,6 +608,16 @@ bool CMasternodePayments::IsScheduled(const masternode_info_t& mnInfo, int nNotB
 {
     LOCK(cs_mapMasternodeBlocks);
 
+    if (deterministicMNManager->IsDeterministicMNsSporkActive()) {
+        auto projectedPayees = deterministicMNManager->GetListAtChainTip().GetProjectedMNPayees(8);
+        for (const auto &dmn : projectedPayees) {
+            if (dmn->proTxHash == mnInfo.outpoint.hash) {
+                return true;
+            }
+        }
+        return false;
+    }
+
     if(!masternodeSync.IsMasternodeListSynced()) return false;
 
     CScript mnpayee;

From 60002b7ddb460a4c6b4699386d5502ca1fc4b683 Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Fri, 16 Mar 2018 15:08:14 +0100
Subject: [PATCH 121/400] Payout and enforce operator reward payments

---
 src/masternode-payments.cpp | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/masternode-payments.cpp b/src/masternode-payments.cpp
index 34ed127371aa..55f4cbd2f71e 100644
--- a/src/masternode-payments.cpp
+++ b/src/masternode-payments.cpp
@@ -588,7 +588,15 @@ bool CMasternodePayments::GetBlockTxOuts(int nBlockHeight, CAmount blockReward,
         if (!dmnPayee) {
             return false;
         }
-        voutMasternodePaymentsRet.emplace_back(masternodeReward, dmnPayee->pdmnState->scriptPayout);
+
+        if (dmnPayee->nOperatorReward == 0 || dmnPayee->pdmnState->scriptOperatorPayout == CScript()) {
+            voutMasternodePaymentsRet.emplace_back(masternodeReward, dmnPayee->pdmnState->scriptPayout);
+        } else {
+            CAmount operatorReward = (masternodeReward * dmnPayee->nOperatorReward) / 10000;
+            masternodeReward -= operatorReward;
+            voutMasternodePaymentsRet.emplace_back(masternodeReward, dmnPayee->pdmnState->scriptPayout);
+            voutMasternodePaymentsRet.emplace_back(operatorReward, dmnPayee->pdmnState->scriptOperatorPayout);
+        }
         return true;
     } else {
         LOCK(cs_mapMasternodeBlocks);

From d8247dfffa6f6fa77f86d0d80403373f8d14c84e Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Mon, 27 Aug 2018 14:59:54 +0200
Subject: [PATCH 122/400] Use refactored payment logic when spork15 is active

Related to https://github.com/dashpay/dash/pull/2237
---
 src/masternode-payments.cpp | 32 +++++++++++++++++++++++++++++---
 1 file changed, 29 insertions(+), 3 deletions(-)

diff --git a/src/masternode-payments.cpp b/src/masternode-payments.cpp
index 55f4cbd2f71e..fce2aead1188 100644
--- a/src/masternode-payments.cpp
+++ b/src/masternode-payments.cpp
@@ -801,9 +801,35 @@ std::string CMasternodePayments::GetRequiredPaymentsString(int nBlockHeight) con
 
 bool CMasternodePayments::IsTransactionValid(const CTransaction& txNew, int nBlockHeight, CAmount blockReward) const
 {
-    LOCK(cs_mapMasternodeBlocks);
-    const auto it = mapMasternodeBlocks.find(nBlockHeight);
-    return it == mapMasternodeBlocks.end() ? true : it->second.IsTransactionValid(txNew);
+    if (deterministicMNManager->IsDeterministicMNsSporkActive(nBlockHeight)) {
+        std::vector<CTxOut> voutMasternodePayments;
+        if (!GetBlockTxOuts(nBlockHeight, blockReward, voutMasternodePayments)) {
+            LogPrintf("CMasternodePayments::%s -- ERROR failed to get payees for block at height %s\n", __func__, nBlockHeight);
+            return true;
+        }
+
+        for (const auto& txout : voutMasternodePayments) {
+            bool found = false;
+            for (const auto& txout2 : txNew.vout) {
+                if (txout == txout2) {
+                    found = true;
+                    break;
+                }
+            }
+            if (!found) {
+                CTxDestination dest;
+                if (!ExtractDestination(txout.scriptPubKey, dest))
+                    assert(false);
+                LogPrintf("CMasternodePayments::%s -- ERROR failed to find expected payee %s in block at height %s\n", __func__, CBitcoinAddress(dest).ToString(), nBlockHeight);
+                return false;
+            }
+        }
+        return true;
+    } else {
+        LOCK(cs_mapMasternodeBlocks);
+        const auto it = mapMasternodeBlocks.find(nBlockHeight);
+        return it == mapMasternodeBlocks.end() ? true : it->second.IsTransactionValid(txNew);
+    }
 }
 
 void CMasternodePayments::CheckAndRemove()

From cb37c39725402340c360112cdedc8becfa801cbc Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Wed, 5 Sep 2018 18:34:56 +0200
Subject: [PATCH 123/400] Bump PROTOCOL_VERSION to 70211, bump MIN_* protocols
 to 70210 (#2256)

Bump PROTOCOL_VERSION to 70211, bump MIN_* protocols to 70210
---
 contrib/seeds/makeseeds.py              | 2 +-
 qa/rpc-tests/test_framework/mininode.py | 2 +-
 src/governance-object.h                 | 2 +-
 src/instantx.h                          | 2 +-
 src/masternode-payments.h               | 2 +-
 src/privatesend.h                       | 2 +-
 src/version.h                           | 4 ++--
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/contrib/seeds/makeseeds.py b/contrib/seeds/makeseeds.py
index 0f43154e874e..f0c0d3d17141 100755
--- a/contrib/seeds/makeseeds.py
+++ b/contrib/seeds/makeseeds.py
@@ -10,7 +10,7 @@
 
 MAX_SEEDS_PER_ASN=4
 
-MIN_PROTOCOL_VERSION = 70208
+MIN_PROTOCOL_VERSION = 70210
 MAX_LAST_SEEN_DIFF = 60 * 60 * 24 * 1 # 1 day
 MAX_LAST_PAID_DIFF = 60 * 60 * 24 * 30 # 1 month
 
diff --git a/qa/rpc-tests/test_framework/mininode.py b/qa/rpc-tests/test_framework/mininode.py
index 504fc77e514d..c0b1ed7d9b67 100755
--- a/qa/rpc-tests/test_framework/mininode.py
+++ b/qa/rpc-tests/test_framework/mininode.py
@@ -41,7 +41,7 @@
 import dash_hash
 
 BIP0031_VERSION = 60000
-MY_VERSION = 70209  # SHORT_IDS_BLOCKS_VERSION to support cmpct blocks
+MY_VERSION = 70210  # MIN_PEER_PROTO_VERSION
 MY_SUBVERSION = b"/python-mininode-tester:0.0.3/"
 MY_RELAY = 1 # from version 70001 onwards, fRelay should be appended to version messages (BIP37)
 
diff --git a/src/governance-object.h b/src/governance-object.h
index 17f41f229078..a2b06411e159 100644
--- a/src/governance-object.h
+++ b/src/governance-object.h
@@ -25,7 +25,7 @@ class CGovernanceObject;
 class CGovernanceVote;
 
 static const int MAX_GOVERNANCE_OBJECT_DATA_SIZE = 16 * 1024;
-static const int MIN_GOVERNANCE_PEER_PROTO_VERSION = 70208;
+static const int MIN_GOVERNANCE_PEER_PROTO_VERSION = 70210;
 static const int GOVERNANCE_FILTER_PROTO_VERSION = 70206;
 
 static const double GOVERNANCE_FILTER_FP_RATE = 0.001;
diff --git a/src/instantx.h b/src/instantx.h
index 46999443978b..e3c06af1aee4 100644
--- a/src/instantx.h
+++ b/src/instantx.h
@@ -26,7 +26,7 @@ extern CInstantSend instantsend;
     (1000/2900.0)**5 = 0.004875397277841433
 */
 
-static const int MIN_INSTANTSEND_PROTO_VERSION      = 70208;
+static const int MIN_INSTANTSEND_PROTO_VERSION      = 70210;
 
 /// For how long we are going to accept votes/locks
 /// after we saw the first one for a specific transaction
diff --git a/src/masternode-payments.h b/src/masternode-payments.h
index 4c4a3c7acb74..dab4d96abeb6 100644
--- a/src/masternode-payments.h
+++ b/src/masternode-payments.h
@@ -23,7 +23,7 @@ static const int MNPAYMENTS_SIGNATURES_TOTAL            = 10;
 //  vote for masternode and be elected as a payment winner
 // V1 - Last protocol version before update
 // V2 - Newest protocol version
-static const int MIN_MASTERNODE_PAYMENT_PROTO_VERSION_1 = 70206;
+static const int MIN_MASTERNODE_PAYMENT_PROTO_VERSION_1 = 70210;
 static const int MIN_MASTERNODE_PAYMENT_PROTO_VERSION_2 = 70210;
 
 extern CCriticalSection cs_vecPayees;
diff --git a/src/privatesend.h b/src/privatesend.h
index 5a63615e6a68..b13b82aa11b0 100644
--- a/src/privatesend.h
+++ b/src/privatesend.h
@@ -23,7 +23,7 @@ static const int PRIVATESEND_QUEUE_TIMEOUT          = 30;
 static const int PRIVATESEND_SIGNING_TIMEOUT        = 15;
 
 //! minimum peer version accepted by mixing pool
-static const int MIN_PRIVATESEND_PEER_PROTO_VERSION = 70208;
+static const int MIN_PRIVATESEND_PEER_PROTO_VERSION = 70210;
 
 static const size_t PRIVATESEND_ENTRY_MAX_SIZE      = 9;
 
diff --git a/src/version.h b/src/version.h
index dc4360bd3d79..30130fe617b0 100644
--- a/src/version.h
+++ b/src/version.h
@@ -11,7 +11,7 @@
  */
 
 
-static const int PROTOCOL_VERSION = 70210;
+static const int PROTOCOL_VERSION = 70211;
 
 //! initial proto version, to be increased after version/verack negotiation
 static const int INIT_PROTO_VERSION = 209;
@@ -20,7 +20,7 @@ static const int INIT_PROTO_VERSION = 209;
 static const int GETHEADERS_VERSION = 70077;
 
 //! disconnect from peers older than this proto version
-static const int MIN_PEER_PROTO_VERSION = 70208;
+static const int MIN_PEER_PROTO_VERSION = 70210;
 
 //! nTime field added to CAddress, starting with this version;
 //! if possible, avoid requesting addresses nodes older than this

From ad31dbbd73d04f34704ea26c65d511a3668defcc Mon Sep 17 00:00:00 2001
From: UdjinM6 <UdjinM6@users.noreply.github.com>
Date: Wed, 5 Sep 2018 19:35:33 +0300
Subject: [PATCH 124/400] Add more variance to coin selection in PS mixing
 (#2261)

* Lean towards "from high to low" branch but still mix via "from low to high" one someties

* Try to mix non-duplicate txids only

* Lean towards edges but still mix starting from the middle sometimes

If failed when started from the middle try mixing from the edges right away.

Note: liqudity providers always start from 0

* map -> set

* Refactor nRoundStart calculations
---
 src/privatesend-client.cpp | 50 ++++++++++++++++++++++++++------------
 src/wallet/wallet.cpp      |  9 ++++++-
 src/wallet/wallet.h        |  2 +-
 3 files changed, 44 insertions(+), 17 deletions(-)

diff --git a/src/privatesend-client.cpp b/src/privatesend-client.cpp
index e123f8c6733f..01ce35f0cabf 100644
--- a/src/privatesend-client.cpp
+++ b/src/privatesend-client.cpp
@@ -1036,7 +1036,7 @@ bool CPrivateSendClientSession::JoinExistingQueue(CAmount nBalanceNeedsAnonymize
         CAmount nMaxAmount = nBalanceNeedsAnonymized;
 
         // Try to match their denominations if possible, select exact number of denominations
-        if(!pwalletMain->SelectCoinsByDenominations(dsq.nDenom, nMinAmount, nMaxAmount, vecTxDSInTmp, vCoinsTmp, nValueInTmp, 0, privateSendClient.nPrivateSendRounds)) {
+        if(!pwalletMain->SelectCoinsByDenominations(dsq.nDenom, nMinAmount, nMaxAmount, vecTxDSInTmp, vCoinsTmp, nValueInTmp, 0, privateSendClient.nPrivateSendRounds, true)) {
             LogPrintf("CPrivateSendClientSession::JoinExistingQueue -- Couldn't match %d denominations %d (%s)\n", vecBits.front(), dsq.nDenom, CPrivateSend::GetDenominationsToString(dsq.nDenom));
             continue;
         }
@@ -1180,25 +1180,45 @@ bool CPrivateSendClientSession::SubmitDenominate(CConnman& connman)
     std::string strError;
     std::vector<CTxDSIn> vecTxDSInRet;
     std::vector<CTxOut> vecTxOutRet;
+    // lean towards "highest" branch but still mix via "lowest" one someties
+    bool fMixLowest = privateSendClient.nLiquidityProvider || (GetRandInt(4) == 0);
+    // lean towards edges but still mix starting from the middle someties
+    // Note: liqudity providers always start from 0
+    bool fScanFromTheMiddle = (privateSendClient.nLiquidityProvider == 0) && (GetRandInt(4) == 0);
+
+    int nRoundStart{0};
+    if (fScanFromTheMiddle) {
+        nRoundStart = privateSendClient.nPrivateSendRounds / 2;
+    } else if (!fMixLowest) {
+        nRoundStart = privateSendClient.nPrivateSendRounds;
+    }
 
     // Submit transaction to the pool if we get here
-    if (privateSendClient.nLiquidityProvider) {
-        // Try to use only inputs with the same number of rounds starting from the lowest number of rounds possible
-        for(int i = 0; i< privateSendClient.nPrivateSendRounds; i++) {
-            if(PrepareDenominate(i, i + 1, strError, vecTxDSInRet, vecTxOutRet)) {
-                LogPrintf("CPrivateSendClientSession::SubmitDenominate -- Running PrivateSend denominate for %d rounds, success\n", i);
-                return SendDenominate(vecTxDSInRet, vecTxOutRet, connman);
+    if (fMixLowest) {
+        // Try to use only inputs with the same number of rounds, from low to high
+        while (true) {
+            for(int i = nRoundStart; i < privateSendClient.nPrivateSendRounds; i++) {
+                if(PrepareDenominate(i, i + 1, strError, vecTxDSInRet, vecTxOutRet)) {
+                    LogPrintf("CPrivateSendClientSession::SubmitDenominate -- Running PrivateSend denominate for %d rounds, success\n", i);
+                    return SendDenominate(vecTxDSInRet, vecTxOutRet, connman);
+                }
+                LogPrint("privatesend", "CPrivateSendClientSession::SubmitDenominate -- Running PrivateSend denominate for %d rounds, error: %s\n", i, strError);
             }
-            LogPrint("privatesend", "CPrivateSendClientSession::SubmitDenominate -- Running PrivateSend denominate for %d rounds, error: %s\n", i, strError);
+            if (nRoundStart == 0) break;
+            nRoundStart = 0;
         }
     } else {
-        // Try to use only inputs with the same number of rounds starting from the highest number of rounds possible
-        for(int i = privateSendClient.nPrivateSendRounds; i > 0; i--) {
-            if(PrepareDenominate(i - 1, i, strError, vecTxDSInRet, vecTxOutRet)) {
-                LogPrintf("CPrivateSendClientSession::SubmitDenominate -- Running PrivateSend denominate for %d rounds, success\n", i);
-                return SendDenominate(vecTxDSInRet, vecTxOutRet, connman);
+        // Try to use only inputs with the same number of rounds, from high to low
+        while (true) {
+            for(int i = nRoundStart; i > 0; i--) {
+                if(PrepareDenominate(i - 1, i, strError, vecTxDSInRet, vecTxOutRet)) {
+                    LogPrintf("CPrivateSendClientSession::SubmitDenominate -- Running PrivateSend denominate for %d rounds, success\n", i);
+                    return SendDenominate(vecTxDSInRet, vecTxOutRet, connman);
+                }
+                LogPrint("privatesend", "CPrivateSendClientSession::SubmitDenominate -- Running PrivateSend denominate for %d rounds, error: %s\n", i, strError);
             }
-            LogPrint("privatesend", "CPrivateSendClientSession::SubmitDenominate -- Running PrivateSend denominate for %d rounds, error: %s\n", i, strError);
+            if (nRoundStart == privateSendClient.nPrivateSendRounds) break;
+            nRoundStart = privateSendClient.nPrivateSendRounds;
         }
     }
 
@@ -1251,7 +1271,7 @@ bool CPrivateSendClientSession::PrepareDenominate(int nMinRounds, int nMaxRounds
         return false;
     }
     std::vector<CAmount> vecStandardDenoms = CPrivateSend::GetStandardDenominations();
-    bool fSelected = pwalletMain->SelectCoinsByDenominations(nSessionDenom, vecStandardDenoms[vecBits.front()], CPrivateSend::GetMaxPoolAmount(), vecTxDSIn, vCoins, nValueIn, nMinRounds, nMaxRounds);
+    bool fSelected = pwalletMain->SelectCoinsByDenominations(nSessionDenom, vecStandardDenoms[vecBits.front()], CPrivateSend::GetMaxPoolAmount(), vecTxDSIn, vCoins, nValueIn, nMinRounds, nMaxRounds, true);
     if (nMinRounds >= 0 && !fSelected) {
         strErrorRet = "Can't select current denominated inputs";
         return false;
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
index e4bf343a6dab..5eac1b238dab 100644
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -3007,8 +3007,10 @@ bool CWallet::FundTransaction(CMutableTransaction& tx, CAmount& nFeeRet, bool ov
     return true;
 }
 
-bool CWallet::SelectCoinsByDenominations(int nDenom, CAmount nValueMin, CAmount nValueMax, std::vector<CTxDSIn>& vecTxDSInRet, std::vector<COutput>& vCoinsRet, CAmount& nValueRet, int nPrivateSendRoundsMin, int nPrivateSendRoundsMax)
+bool CWallet::SelectCoinsByDenominations(int nDenom, CAmount nValueMin, CAmount nValueMax, std::vector<CTxDSIn>& vecTxDSInRet, std::vector<COutput>& vCoinsRet, CAmount& nValueRet, int nPrivateSendRoundsMin, int nPrivateSendRoundsMax, bool fNoDuplicateTxIds)
 {
+    std::set<uint256> setRecentTxIds;
+
     vecTxDSInRet.clear();
     vCoinsRet.clear();
     nValueRet = 0;
@@ -3037,6 +3039,7 @@ bool CWallet::SelectCoinsByDenominations(int nDenom, CAmount nValueMin, CAmount
     {
         // masternode-like input should not be selected by AvailableCoins now anyway
         //if(out.tx->vout[out.i].nValue == 1000*COIN) continue;
+        if(fNoDuplicateTxIds && setRecentTxIds.find(out.tx->GetHash()) != setRecentTxIds.end()) continue;
         if(nValueRet + out.tx->tx->vout[out.i].nValue <= nValueMax){
 
             CTxIn txin = CTxIn(out.tx->GetHash(), out.i);
@@ -3051,11 +3054,15 @@ bool CWallet::SelectCoinsByDenominations(int nDenom, CAmount nValueMin, CAmount
                     vecTxDSInRet.push_back(CTxDSIn(txin, out.tx->tx->vout[out.i].scriptPubKey));
                     vCoinsRet.push_back(out);
                     nDenomResult |= 1 << nBit;
+                    setRecentTxIds.emplace(out.tx->GetHash());
+                    LogPrint("privatesend", "CWallet::SelectCoinsByDenominations -- hash %s nValue %d\n", out.tx->GetHash().ToString(), out.tx->tx->vout[out.i].nValue);
                 }
             }
         }
     }
 
+    LogPrintf("CWallet::SelectCoinsByDenominations -- setRecentTxIds.size() %d\n", setRecentTxIds.size());
+
     return nValueRet >= nValueMin && nDenom == nDenomResult;
 }
 
diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h
index 27dd22ef1859..8fff1dbf5020 100644
--- a/src/wallet/wallet.h
+++ b/src/wallet/wallet.h
@@ -806,7 +806,7 @@ class CWallet : public CCryptoKeyStore, public CValidationInterface
     bool SelectCoinsMinConf(const CAmount& nTargetValue, int nConfMine, int nConfTheirs, uint64_t nMaxAncestors, std::vector<COutput> vCoins, std::set<std::pair<const CWalletTx*,unsigned int> >& setCoinsRet, CAmount& nValueRet, bool fUseInstantSend = false) const;
 
     // Coin selection
-    bool SelectCoinsByDenominations(int nDenom, CAmount nValueMin, CAmount nValueMax, std::vector<CTxDSIn>& vecTxDSInRet, std::vector<COutput>& vCoinsRet, CAmount& nValueRet, int nPrivateSendRoundsMin, int nPrivateSendRoundsMax);
+    bool SelectCoinsByDenominations(int nDenom, CAmount nValueMin, CAmount nValueMax, std::vector<CTxDSIn>& vecTxDSInRet, std::vector<COutput>& vCoinsRet, CAmount& nValueRet, int nPrivateSendRoundsMin, int nPrivateSendRoundsMax, bool fNoDuplicateTxIds);
     bool GetCollateralTxDSIn(CTxDSIn& txdsinRet, CAmount& nValueRet) const;
     bool SelectCoinsDark(CAmount nValueMin, CAmount nValueMax, std::vector<CTxIn>& vecTxInRet, CAmount& nValueRet, int nPrivateSendRoundsMin, int nPrivateSendRoundsMax) const;
 

From 9674be8f96c9d5930fb4ad7d498be5b4279f2f3a Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Wed, 18 Jul 2018 12:06:56 +0200
Subject: [PATCH 125/400] Refactor TestChain100Setup to allow different test
 chain setups

Allows testing of features which depend on BIP9 deployments
---
 src/test/test_dash.cpp | 37 +++++++++++++++++++++++++++++--------
 src/test/test_dash.h   | 26 ++++++++++++++++++--------
 2 files changed, 47 insertions(+), 16 deletions(-)

diff --git a/src/test/test_dash.cpp b/src/test/test_dash.cpp
index 5eb785557d87..01c73f7d9db6 100644
--- a/src/test/test_dash.cpp
+++ b/src/test/test_dash.cpp
@@ -100,12 +100,12 @@ TestingSetup::~TestingSetup()
         boost::filesystem::remove_all(pathTemp);
 }
 
-TestChain100Setup::TestChain100Setup() : TestingSetup(CBaseChainParams::REGTEST)
+TestChainSetup::TestChainSetup(int blockCount) : TestingSetup(CBaseChainParams::REGTEST)
 {
     // Generate a 100-block chain:
     coinbaseKey.MakeNewKey(true);
-    CScript scriptPubKey = CScript() <<  ToByteVector(coinbaseKey.GetPubKey()) << OP_CHECKSIG;
-    for (int i = 0; i < COINBASE_MATURITY; i++)
+    CScript scriptPubKey = CScript() << ToByteVector(coinbaseKey.GetPubKey()) << OP_CHECKSIG;
+    for (int i = 0; i < blockCount; i++)
     {
         std::vector<CMutableTransaction> noTxns;
         CBlock b = CreateAndProcessBlock(noTxns, scriptPubKey);
@@ -118,7 +118,25 @@ TestChain100Setup::TestChain100Setup() : TestingSetup(CBaseChainParams::REGTEST)
 // scriptPubKey, and try to add it to the current chain.
 //
 CBlock
-TestChain100Setup::CreateAndProcessBlock(const std::vector<CMutableTransaction>& txns, const CScript& scriptPubKey)
+TestChainSetup::CreateAndProcessBlock(const std::vector<CMutableTransaction>& txns, const CScript& scriptPubKey)
+{
+    const CChainParams& chainparams = Params();
+    auto block = CreateBlock(txns, scriptPubKey);
+
+    std::shared_ptr<const CBlock> shared_pblock = std::make_shared<const CBlock>(block);
+    ProcessNewBlock(chainparams, shared_pblock, true, NULL);
+
+    CBlock result = block;
+    return result;
+}
+
+CBlock TestChainSetup::CreateAndProcessBlock(const std::vector<CMutableTransaction>& txns, const CKey& scriptKey)
+{
+    CScript scriptPubKey = CScript() <<  ToByteVector(coinbaseKey.GetPubKey()) << OP_CHECKSIG;
+    return CreateAndProcessBlock(txns, scriptPubKey);
+}
+
+CBlock TestChainSetup::CreateBlock(const std::vector<CMutableTransaction>& txns, const CScript& scriptPubKey)
 {
     const CChainParams& chainparams = Params();
     std::unique_ptr<CBlockTemplate> pblocktemplate = BlockAssembler(chainparams).CreateNewBlock(scriptPubKey);
@@ -134,14 +152,17 @@ TestChain100Setup::CreateAndProcessBlock(const std::vector<CMutableTransaction>&
 
     while (!CheckProofOfWork(block.GetHash(), block.nBits, chainparams.GetConsensus())) ++block.nNonce;
 
-    std::shared_ptr<const CBlock> shared_pblock = std::make_shared<const CBlock>(block);
-    ProcessNewBlock(chainparams, shared_pblock, true, NULL);
-
     CBlock result = block;
     return result;
 }
 
-TestChain100Setup::~TestChain100Setup()
+CBlock TestChainSetup::CreateBlock(const std::vector<CMutableTransaction>& txns, const CKey& scriptKey)
+{
+    CScript scriptPubKey = CScript() <<  ToByteVector(coinbaseKey.GetPubKey()) << OP_CHECKSIG;
+    return CreateBlock(txns, scriptPubKey);
+}
+
+TestChainSetup::~TestChainSetup()
 {
 }
 
diff --git a/src/test/test_dash.h b/src/test/test_dash.h
index 0bb1717a839b..1a42fbff5a1a 100644
--- a/src/test/test_dash.h
+++ b/src/test/test_dash.h
@@ -43,24 +43,34 @@ class CBlock;
 struct CMutableTransaction;
 class CScript;
 
-//
-// Testing fixture that pre-creates a
-// 100-block REGTEST-mode block chain
-//
-struct TestChain100Setup : public TestingSetup {
-    TestChain100Setup();
+struct TestChainSetup : public TestingSetup
+{
+    TestChainSetup(int blockCount);
+    ~TestChainSetup();
 
     // Create a new block with just given transactions, coinbase paying to
     // scriptPubKey, and try to add it to the current chain.
     CBlock CreateAndProcessBlock(const std::vector<CMutableTransaction>& txns,
                                  const CScript& scriptPubKey);
-
-    ~TestChain100Setup();
+    CBlock CreateAndProcessBlock(const std::vector<CMutableTransaction>& txns,
+                                 const CKey& scriptKey);
+    CBlock CreateBlock(const std::vector<CMutableTransaction>& txns,
+                       const CScript& scriptPubKey);
+    CBlock CreateBlock(const std::vector<CMutableTransaction>& txns,
+                       const CKey& scriptKey);
 
     std::vector<CTransaction> coinbaseTxns; // For convenience, coinbase transactions
     CKey coinbaseKey; // private/public key needed to spend coinbase transactions
 };
 
+//
+// Testing fixture that pre-creates a
+// 100-block REGTEST-mode block chain
+//
+struct TestChain100Setup : public TestChainSetup {
+    TestChain100Setup() : TestChainSetup(100) {}
+};
+
 class CTxMemPoolEntry;
 class CTxMemPool;
 

From d653ace99e5731ab64595cf672d03c9cfbf87bbb Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Wed, 22 Aug 2018 12:38:31 +0200
Subject: [PATCH 126/400] Update CbTx in TestChainSetup

We need to update the CbTx's merkle root for the masternode list here as
tests might add transactions into a block which cause the list to change.
---
 src/test/test_dash.cpp | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/src/test/test_dash.cpp b/src/test/test_dash.cpp
index 01c73f7d9db6..a62d1b3191e5 100644
--- a/src/test/test_dash.cpp
+++ b/src/test/test_dash.cpp
@@ -24,7 +24,9 @@
 
 #include "test/testutil.h"
 
+#include "evo/specialtx.h"
 #include "evo/deterministicmns.h"
+#include "evo/cbtx.h"
 
 #include <memory>
 
@@ -146,6 +148,22 @@ CBlock TestChainSetup::CreateBlock(const std::vector<CMutableTransaction>& txns,
     block.vtx.resize(1);
     BOOST_FOREACH(const CMutableTransaction& tx, txns)
         block.vtx.push_back(MakeTransactionRef(tx));
+
+    // Manually update CbTx as we modified the block here
+    if (block.vtx[0]->nType == TRANSACTION_COINBASE) {
+        CCbTx cbTx;
+        if (!GetTxPayload(*block.vtx[0], cbTx)) {
+            BOOST_ASSERT(false);
+        }
+        CValidationState state;
+        if (!CalcCbTxMerkleRootMNList(block, chainActive.Tip(), cbTx.merkleRootMNList, state)) {
+            BOOST_ASSERT(false);
+        }
+        CMutableTransaction tmpTx = *block.vtx[0];
+        SetTxPayload(tmpTx, cbTx);
+        block.vtx[0] = MakeTransactionRef(tmpTx);
+    }
+
     // IncrementExtraNonce creates a valid coinbase and merkleRoot
     unsigned int extraNonce = 0;
     IncrementExtraNonce(&block, chainActive.Tip(), extraNonce);

From bc7924d418f99c2e581d8d0ac396089fdf87de51 Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Wed, 22 Aug 2018 12:39:41 +0200
Subject: [PATCH 127/400] Add unit tests for DIP3 and DIP4

---
 src/Makefile.test.include               |   2 +
 src/evo/simplifiedmns.cpp               |   9 +
 src/evo/simplifiedmns.h                 |   1 +
 src/test/evo_deterministicmns_tests.cpp | 394 ++++++++++++++++++++++++
 src/test/evo_simplifiedmns_tests.cpp    |  64 ++++
 src/test/test_dash.h                    |  10 +
 6 files changed, 480 insertions(+)
 create mode 100644 src/test/evo_deterministicmns_tests.cpp
 create mode 100644 src/test/evo_simplifiedmns_tests.cpp

diff --git a/src/Makefile.test.include b/src/Makefile.test.include
index fa6765a083eb..91f46163157b 100644
--- a/src/Makefile.test.include
+++ b/src/Makefile.test.include
@@ -89,6 +89,8 @@ BITCOIN_TESTS =\
   test/crypto_tests.cpp \
   test/cuckoocache_tests.cpp \
   test/DoS_tests.cpp \
+  test/evo_deterministicmns_tests.cpp \
+  test/evo_simplifiedmns_tests.cpp \
   test/getarg_tests.cpp \
   test/governance_validators_tests.cpp \
   test/hash_tests.cpp \
diff --git a/src/evo/simplifiedmns.cpp b/src/evo/simplifiedmns.cpp
index 0be8f689cac3..0bf79924b69b 100644
--- a/src/evo/simplifiedmns.cpp
+++ b/src/evo/simplifiedmns.cpp
@@ -45,6 +45,15 @@ void CSimplifiedMNListEntry::ToJson(UniValue& obj) const
     obj.push_back(Pair("isValid", isValid));
 }
 
+CSimplifiedMNList::CSimplifiedMNList(const std::vector<CSimplifiedMNListEntry>& smlEntries)
+{
+    mnList = smlEntries;
+
+    std::sort(mnList.begin(), mnList.end(), [&](const CSimplifiedMNListEntry& a, const CSimplifiedMNListEntry& b) {
+        return a.proRegTxHash.Compare(b.proRegTxHash) < 0;
+    });
+}
+
 CSimplifiedMNList::CSimplifiedMNList(const CDeterministicMNList& dmnList)
 {
     mnList.reserve(dmnList.all_count());
diff --git a/src/evo/simplifiedmns.h b/src/evo/simplifiedmns.h
index 00a701b65a2c..64465dda8a48 100644
--- a/src/evo/simplifiedmns.h
+++ b/src/evo/simplifiedmns.h
@@ -54,6 +54,7 @@ class CSimplifiedMNList
 
 public:
     CSimplifiedMNList() {}
+    CSimplifiedMNList(const std::vector<CSimplifiedMNListEntry>& smlEntries);
     CSimplifiedMNList(const CDeterministicMNList& dmnList);
 
     uint256 CalcMerkleRoot(bool *pmutated = NULL) const;
diff --git a/src/test/evo_deterministicmns_tests.cpp b/src/test/evo_deterministicmns_tests.cpp
new file mode 100644
index 000000000000..f64650eb77ec
--- /dev/null
+++ b/src/test/evo_deterministicmns_tests.cpp
@@ -0,0 +1,394 @@
+// Copyright (c) 2018 The Dash Core developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+#include "test/test_dash.h"
+
+#include "script/interpreter.h"
+#include "script/standard.h"
+#include "script/sign.h"
+#include "validation.h"
+#include "base58.h"
+#include "netbase.h"
+#include "messagesigner.h"
+#include "keystore.h"
+#include "spork.h"
+
+#include "evo/specialtx.h"
+#include "evo/providertx.h"
+#include "evo/deterministicmns.h"
+
+#include <boost/test/unit_test.hpp>
+
+static const CBitcoinAddress payoutAddress  ("yRq1Ky1AfFmf597rnotj7QRxsDUKePVWNF");
+static const std::string payoutKey          ("cV3qrPWzDcnhzRMV4MqtTH4LhNPqPo26ZntGvfJhc8nqCi8Ae5xR");
+
+typedef std::map<COutPoint, std::pair<int, CAmount>> SimpleUTXOMap;
+
+static SimpleUTXOMap BuildSimpleUtxoMap(const std::vector<CTransaction>& txs)
+{
+    SimpleUTXOMap utxos;
+    for (size_t i = 0; i < txs.size(); i++) {
+        auto& tx = txs[i];
+        for (size_t j = 0; j < tx.vout.size(); j++) {
+            utxos.emplace(COutPoint(tx.GetHash(), j), std::make_pair((int)i + 1, tx.vout[j].nValue));
+        }
+    }
+    return utxos;
+}
+
+static std::vector<COutPoint> SelectUTXOs(SimpleUTXOMap& utoxs, CAmount amount, CAmount& changeRet)
+{
+    changeRet = 0;
+
+    std::vector<COutPoint> selectedUtxos;
+    CAmount selectedAmount = 0;
+    while (!utoxs.empty()) {
+        bool found = false;
+        for (auto it = utoxs.begin(); it != utoxs.end(); ++it) {
+            if (chainActive.Height() - it->second.first < 101) {
+                continue;
+            }
+
+            found = true;
+            selectedAmount += it->second.second;
+            selectedUtxos.emplace_back(it->first);
+            utoxs.erase(it);
+            break;
+        }
+        BOOST_ASSERT(found);
+        if (selectedAmount >= amount) {
+            changeRet = selectedAmount - amount;
+            break;
+        }
+    }
+
+    return selectedUtxos;
+}
+
+static void FundTransaction(CMutableTransaction& tx, SimpleUTXOMap& utoxs, const CScript& scriptPayout, CAmount amount, const CKey& coinbaseKey)
+{
+    CScript scriptPubKey = CScript() << ToByteVector(coinbaseKey.GetPubKey()) << OP_CHECKSIG;
+
+    CAmount change;
+    auto inputs = SelectUTXOs(utoxs, amount, change);
+    for (size_t i = 0; i < inputs.size(); i++) {
+        tx.vin.emplace_back(CTxIn(inputs[i]));
+    }
+    tx.vout.emplace_back(CTxOut(amount, scriptPayout));
+    if (change != 0) {
+        tx.vout.emplace_back(CTxOut(change, scriptPayout));
+    }
+}
+
+static void SignTransaction(CMutableTransaction& tx, const CKey& coinbaseKey)
+{
+    CBasicKeyStore tempKeystore;
+    tempKeystore.AddKeyPubKey(coinbaseKey, coinbaseKey.GetPubKey());
+
+    for (size_t i = 0; i < tx.vin.size(); i++) {
+        CTransactionRef txFrom;
+        uint256 hashBlock;
+        BOOST_ASSERT(GetTransaction(tx.vin[i].prevout.hash, txFrom, Params().GetConsensus(), hashBlock));
+        BOOST_ASSERT(SignSignature(tempKeystore, *txFrom, tx, i));
+    }
+}
+
+static CMutableTransaction CreateProRegTx(SimpleUTXOMap& utxos, int port, const CScript& scriptPayout, const CKey& coinbaseKey, CKey& mnKeyRet)
+{
+    mnKeyRet.MakeNewKey(true);
+
+    CAmount change;
+    auto inputs = SelectUTXOs(utxos, 1000 * COIN, change);
+
+    CProRegTx proTx;
+    proTx.nProtocolVersion = PROTOCOL_VERSION;
+    proTx.nCollateralIndex = 0;
+    proTx.addr = LookupNumeric("1.1.1.1", port);
+    proTx.keyIDOwner = mnKeyRet.GetPubKey().GetID();
+    proTx.keyIDOperator = mnKeyRet.GetPubKey().GetID();
+    proTx.keyIDVoting = mnKeyRet.GetPubKey().GetID();
+    proTx.scriptPayout = scriptPayout;
+
+    CMutableTransaction tx;
+    tx.nVersion = 3;
+    tx.nType = TRANSACTION_PROVIDER_REGISTER;
+    FundTransaction(tx, utxos, scriptPayout, 1000 * COIN, coinbaseKey);
+    proTx.inputsHash = CalcTxInputsHash(tx);
+    CHashSigner::SignHash(::SerializeHash(proTx), mnKeyRet, proTx.vchSig);
+    SetTxPayload(tx, proTx);
+    SignTransaction(tx, coinbaseKey);
+
+    return tx;
+}
+
+static CMutableTransaction CreateProUpServTx(SimpleUTXOMap& utxos, const uint256& proTxHash, const CKey& mnKey, int port, const CScript& scriptOperatorPayout, const CKey& coinbaseKey)
+{
+    CAmount change;
+    auto inputs = SelectUTXOs(utxos, 1 * COIN, change);
+
+    CProUpServTx proTx;
+    proTx.proTxHash = proTxHash;
+    proTx.nProtocolVersion = PROTOCOL_VERSION;
+    proTx.addr = LookupNumeric("1.1.1.1", port);
+    proTx.scriptOperatorPayout = scriptOperatorPayout;
+
+    CMutableTransaction tx;
+    tx.nVersion = 3;
+    tx.nType = TRANSACTION_PROVIDER_UPDATE_SERVICE;
+    FundTransaction(tx, utxos, GetScriptForDestination(coinbaseKey.GetPubKey().GetID()), 1 * COIN, coinbaseKey);
+    proTx.inputsHash = CalcTxInputsHash(tx);
+    CHashSigner::SignHash(::SerializeHash(proTx), mnKey, proTx.vchSig);
+    SetTxPayload(tx, proTx);
+    SignTransaction(tx, coinbaseKey);
+
+    return tx;
+}
+
+static CMutableTransaction CreateProUpRegTx(SimpleUTXOMap& utxos, const uint256& proTxHash, const CKey& mnKey, const CKeyID& keyIDOperator, const CKeyID& keyIDVoting, const CScript& scriptPayout, const CKey& coinbaseKey)
+{
+    CAmount change;
+    auto inputs = SelectUTXOs(utxos, 1 * COIN, change);
+
+    CProUpRegTx proTx;
+    proTx.proTxHash = proTxHash;
+    proTx.keyIDOperator = keyIDOperator;
+    proTx.keyIDVoting = keyIDVoting;
+    proTx.scriptPayout = scriptPayout;
+
+    CMutableTransaction tx;
+    tx.nVersion = 3;
+    tx.nType = TRANSACTION_PROVIDER_UPDATE_REGISTRAR;
+    FundTransaction(tx, utxos, GetScriptForDestination(coinbaseKey.GetPubKey().GetID()), 1 * COIN, coinbaseKey);
+    proTx.inputsHash = CalcTxInputsHash(tx);
+    CHashSigner::SignHash(::SerializeHash(proTx), mnKey, proTx.vchSig);
+    SetTxPayload(tx, proTx);
+    SignTransaction(tx, coinbaseKey);
+
+    return tx;
+}
+
+static CMutableTransaction CreateProUpRevTx(SimpleUTXOMap& utxos, const uint256& proTxHash, const CKey& mnKey, const CKey& coinbaseKey)
+{
+    CAmount change;
+    auto inputs = SelectUTXOs(utxos, 1 * COIN, change);
+
+    CProUpRevTx proTx;
+    proTx.proTxHash = proTxHash;
+
+    CMutableTransaction tx;
+    tx.nVersion = 3;
+    tx.nType = TRANSACTION_PROVIDER_UPDATE_REVOKE;
+    FundTransaction(tx, utxos, GetScriptForDestination(coinbaseKey.GetPubKey().GetID()), 1 * COIN, coinbaseKey);
+    proTx.inputsHash = CalcTxInputsHash(tx);
+    CHashSigner::SignHash(::SerializeHash(proTx), mnKey, proTx.vchSig);
+    SetTxPayload(tx, proTx);
+    SignTransaction(tx, coinbaseKey);
+
+    return tx;
+}
+
+static CScript GenerateRandomAddress()
+{
+    CKey key;
+    key.MakeNewKey(false);
+    return GetScriptForDestination(key.GetPubKey().GetID());
+}
+
+static CDeterministicMNCPtr FindPayoutDmn(const CBlock& block)
+{
+    auto dmnList = deterministicMNManager->GetListAtChainTip();
+
+    for (auto txout : block.vtx[0]->vout) {
+        for (auto& dmn : dmnList.valid_range()) {
+            if (txout.scriptPubKey == dmn->pdmnState->scriptPayout) {
+                return dmn;
+            }
+        }
+    }
+    return nullptr;
+}
+
+BOOST_AUTO_TEST_SUITE(evo_dip3_activation_tests)
+
+BOOST_FIXTURE_TEST_CASE(dip3_activation, TestChainDIP3BeforeActivationSetup)
+{
+    auto utxos = BuildSimpleUtxoMap(coinbaseTxns);
+    CKey mnKey;
+    auto tx = CreateProRegTx(utxos, 1, GetScriptForDestination(payoutAddress.Get()), coinbaseKey, mnKey);
+    std::vector<CMutableTransaction> txns = {tx};
+
+    int nHeight = chainActive.Height();
+
+    // We start one block before DIP3 activation, so mining a block with a DIP3 transaction should fail
+    auto block = std::make_shared<CBlock>(CreateBlock(txns, coinbaseKey));
+    ProcessNewBlock(Params(), block, true, nullptr);
+    BOOST_ASSERT(chainActive.Height() == nHeight);
+    BOOST_ASSERT(block->GetHash() != chainActive.Tip()->GetBlockHash());
+    BOOST_ASSERT(!deterministicMNManager->GetListAtChainTip().HasMN(tx.GetHash()));
+
+    // This block should activate DIP3
+    CreateAndProcessBlock({}, coinbaseKey);
+    BOOST_ASSERT(chainActive.Height() == nHeight + 1);
+
+    // Mining a block with a DIP3 transaction should succeed now
+    block = std::make_shared<CBlock>(CreateBlock(txns, coinbaseKey));
+    ProcessNewBlock(Params(), block, true, nullptr);
+    deterministicMNManager->UpdatedBlockTip(chainActive.Tip());
+    BOOST_ASSERT(chainActive.Height() == nHeight + 2);
+    BOOST_ASSERT(block->GetHash() == chainActive.Tip()->GetBlockHash());
+    BOOST_ASSERT(deterministicMNManager->GetListAtChainTip().HasMN(tx.GetHash()));
+}
+
+BOOST_FIXTURE_TEST_CASE(dip3_protx, TestChainDIP3Setup)
+{
+    CKey sporkKey;
+    sporkKey.MakeNewKey(false);
+    CBitcoinSecret sporkSecret(sporkKey);
+    CBitcoinAddress sporkAddress;
+    sporkAddress.Set(sporkKey.GetPubKey().GetID());
+    sporkManager.SetSporkAddress(sporkAddress.ToString());
+    sporkManager.SetPrivKey(sporkSecret.ToString());
+
+    auto utxos = BuildSimpleUtxoMap(coinbaseTxns);
+
+    int nHeight = chainActive.Height();
+    int port = 1;
+
+    std::vector<uint256> dmnHashes;
+    std::map<uint256, CKey> mnKeys;
+
+    // register one MN per block
+    for (size_t i = 0; i < 6; i++) {
+        CKey mnKey;
+        auto tx = CreateProRegTx(utxos, port++, GenerateRandomAddress(), coinbaseKey, mnKey);
+        dmnHashes.emplace_back(tx.GetHash());
+        mnKeys.emplace(tx.GetHash(), mnKey);
+        CreateAndProcessBlock({tx}, coinbaseKey);
+        deterministicMNManager->UpdatedBlockTip(chainActive.Tip());
+
+        BOOST_ASSERT(chainActive.Height() == nHeight + 1);
+        BOOST_ASSERT(deterministicMNManager->GetListAtChainTip().HasMN(tx.GetHash()));
+
+        nHeight++;
+    }
+
+    // activate spork15
+    sporkManager.UpdateSpork(SPORK_15_DETERMINISTIC_MNS_ENABLED, chainActive.Height() + 1, *g_connman);
+    CreateAndProcessBlock({}, coinbaseKey);
+    deterministicMNManager->UpdatedBlockTip(chainActive.Tip());
+    nHeight++;
+
+    // check MN reward payments
+    for (size_t i = 0; i < 20; i++) {
+        auto dmnExpectedPayee = deterministicMNManager->GetListAtChainTip().GetMNPayee();
+
+        CBlock block = CreateAndProcessBlock({}, coinbaseKey);
+        deterministicMNManager->UpdatedBlockTip(chainActive.Tip());
+        BOOST_ASSERT(!block.vtx.empty());
+
+        auto dmnPayout = FindPayoutDmn(block);
+        BOOST_ASSERT(dmnPayout != nullptr);
+        BOOST_CHECK_EQUAL(dmnPayout->proTxHash.ToString(), dmnExpectedPayee->proTxHash.ToString());
+
+        nHeight++;
+    }
+
+    // register multiple MNs per block
+    for (size_t i = 0; i < 3; i++) {
+        std::vector<CMutableTransaction> txns;
+        for (size_t j = 0; j < 3; j++) {
+            CKey mnKey;
+            auto tx = CreateProRegTx(utxos, port++, GenerateRandomAddress(), coinbaseKey, mnKey);
+            dmnHashes.emplace_back(tx.GetHash());
+            mnKeys.emplace(tx.GetHash(), mnKey);
+            txns.emplace_back(tx);
+        }
+        CreateAndProcessBlock(txns, coinbaseKey);
+        deterministicMNManager->UpdatedBlockTip(chainActive.Tip());
+        BOOST_ASSERT(chainActive.Height() == nHeight + 1);
+
+        for (size_t j = 0; j < 3; j++) {
+            BOOST_ASSERT(deterministicMNManager->GetListAtChainTip().HasMN(txns[j].GetHash()));
+        }
+
+        nHeight++;
+    }
+
+    // test ProUpServTx
+    auto tx = CreateProUpServTx(utxos, dmnHashes[0], mnKeys[dmnHashes[0]], 1000, CScript(), coinbaseKey);
+    CreateAndProcessBlock({tx}, coinbaseKey);
+    deterministicMNManager->UpdatedBlockTip(chainActive.Tip());
+    BOOST_ASSERT(chainActive.Height() == nHeight + 1);
+    nHeight++;
+
+    auto dmn = deterministicMNManager->GetListAtChainTip().GetMN(dmnHashes[0]);
+    BOOST_ASSERT(dmn != nullptr && dmn->pdmnState->addr.GetPort() == 1000);
+
+    // test ProUpRevTx
+    tx = CreateProUpRevTx(utxos, dmnHashes[0], mnKeys[dmnHashes[0]], coinbaseKey);
+    CreateAndProcessBlock({tx}, coinbaseKey);
+    deterministicMNManager->UpdatedBlockTip(chainActive.Tip());
+    BOOST_ASSERT(chainActive.Height() == nHeight + 1);
+    nHeight++;
+
+    dmn = deterministicMNManager->GetListAtChainTip().GetMN(dmnHashes[0]);
+    BOOST_ASSERT(dmn != nullptr && dmn->pdmnState->nPoSeBanHeight == nHeight);
+
+    // test that the revoked MN does not get paid anymore
+    for (size_t i = 0; i < 20; i++) {
+        auto dmnExpectedPayee = deterministicMNManager->GetListAtChainTip().GetMNPayee();
+        BOOST_ASSERT(dmnExpectedPayee->proTxHash != dmnHashes[0]);
+
+        CBlock block = CreateAndProcessBlock({}, coinbaseKey);
+        deterministicMNManager->UpdatedBlockTip(chainActive.Tip());
+        BOOST_ASSERT(!block.vtx.empty());
+
+        auto dmnPayout = FindPayoutDmn(block);
+        BOOST_ASSERT(dmnPayout != nullptr);
+        BOOST_CHECK_EQUAL(dmnPayout->proTxHash.ToString(), dmnExpectedPayee->proTxHash.ToString());
+
+        nHeight++;
+    }
+
+    // test reviving the MN
+    CKey newOperatorKey;
+    newOperatorKey.MakeNewKey(false);
+    dmn = deterministicMNManager->GetListAtChainTip().GetMN(dmnHashes[0]);
+    tx = CreateProUpRegTx(utxos, dmnHashes[0], mnKeys[dmnHashes[0]], newOperatorKey.GetPubKey().GetID(), newOperatorKey.GetPubKey().GetID(), dmn->pdmnState->scriptPayout, coinbaseKey);
+    CreateAndProcessBlock({tx}, coinbaseKey);
+    deterministicMNManager->UpdatedBlockTip(chainActive.Tip());
+    BOOST_ASSERT(chainActive.Height() == nHeight + 1);
+    nHeight++;
+
+    tx = CreateProUpServTx(utxos, dmnHashes[0], newOperatorKey, 100, CScript(), coinbaseKey);
+    CreateAndProcessBlock({tx}, coinbaseKey);
+    deterministicMNManager->UpdatedBlockTip(chainActive.Tip());
+    BOOST_ASSERT(chainActive.Height() == nHeight + 1);
+    nHeight++;
+
+    dmn = deterministicMNManager->GetListAtChainTip().GetMN(dmnHashes[0]);
+    BOOST_ASSERT(dmn != nullptr && dmn->pdmnState->addr.GetPort() == 100);
+    BOOST_ASSERT(dmn != nullptr && dmn->pdmnState->nPoSeBanHeight == -1);
+
+    // test that the revived MN gets payments again
+    bool foundRevived = false;
+    for (size_t i = 0; i < 20; i++) {
+        auto dmnExpectedPayee = deterministicMNManager->GetListAtChainTip().GetMNPayee();
+        if (dmnExpectedPayee->proTxHash == dmnHashes[0]) {
+            foundRevived = true;
+        }
+
+        CBlock block = CreateAndProcessBlock({}, coinbaseKey);
+        deterministicMNManager->UpdatedBlockTip(chainActive.Tip());
+        BOOST_ASSERT(!block.vtx.empty());
+
+        auto dmnPayout = FindPayoutDmn(block);
+        BOOST_ASSERT(dmnPayout != nullptr);
+        BOOST_CHECK_EQUAL(dmnPayout->proTxHash.ToString(), dmnExpectedPayee->proTxHash.ToString());
+
+        nHeight++;
+    }
+    BOOST_ASSERT(foundRevived);
+}
+BOOST_AUTO_TEST_SUITE_END()
diff --git a/src/test/evo_simplifiedmns_tests.cpp b/src/test/evo_simplifiedmns_tests.cpp
new file mode 100644
index 000000000000..a3684cb3bccb
--- /dev/null
+++ b/src/test/evo_simplifiedmns_tests.cpp
@@ -0,0 +1,64 @@
+// Copyright (c) 2018 The Dash Core developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+#include "test/test_dash.h"
+
+#include "evo/simplifiedmns.h"
+#include "netbase.h"
+
+#include <boost/test/unit_test.hpp>
+
+BOOST_FIXTURE_TEST_SUITE(evo_simplifiedmns_tests, BasicTestingSetup)
+
+BOOST_AUTO_TEST_CASE(simplifiedmns_merkleroots)
+{
+    std::vector<CSimplifiedMNListEntry> entries;
+    for (size_t i = 0; i < 15; i++) {
+        CSimplifiedMNListEntry smle;
+        smle.proRegTxHash.SetHex(strprintf("%064x", i));
+
+        std::string ip = strprintf("%d.%d.%d.%d", 0, 0, 0, i);
+        Lookup(ip.c_str(), smle.service, i, false);
+
+        smle.keyIDOperator.SetHex(strprintf("%040x", i));
+        smle.keyIDVoting.SetHex(strprintf("%040x", i));
+        smle.isValid = true;
+
+        entries.emplace_back(smle);
+    }
+
+    std::vector<std::string> expectedHashes = {
+        "aa8bfb825f433bcd6f1039f27c77ed269386e05577b0fe9afc4e16b1af0076b2",
+        "686a19dba9b515f77f11027cd1e92e6a8c650448bf4616101fd5ddbe6e2629e7",
+        "c2efc1b08daa791c71e1d5887be3eaa136381f783fcc5b7efdc5909db38701bb",
+        "ce394197d6e1684467fbf2e1619f71ae9d1a6cf6548b2235e4289f95d4bccbbd",
+        "aeeaf7b498aa7d5fa92ee0028499b4f165c31662f5e9b0a80e6e13b38fd61f8d",
+        "0c1c8dc9dc82eb5432a557580e5d3d930943ce0d0db5daebc51267afb46b6d48",
+        "1c4add10ea844a46734473e48c2f781059b35382219d0cf67d6432b540e0bbbe",
+        "1ae1ad5ff4dd4c09469d21d569a025d467dca1e407581a2815175528e139b7da",
+        "d59b231cdc80ce7eda3a3f37608abda818659c189d31a7ef42024d496e290cbc",
+        "2d5e6c87e3d4e5b3fdd600f561e8dec1ea720560569398006050480232f1257c",
+        "3d6af35f08efeea22f3c8fcb78038e56dac221f3173ca4e2230ea8ae3cbd3c60",
+        "ecf547077c37b79da954c4ef46a3c4fb136746366bfb81192ed01de96fd66348",
+        "626af5fb8192ead7bbd79ad7bfe2c3ea82714fdfd9ac49b88d7a411aa6956853",
+        "6c84a4485fb2ba35b4dcd4d89cbdd3d813446514bb7a2046b6b1b9813beaac0f",
+        "453ca2a83140da73a37794fe6fddd701ea5066f21c2f1df8a33b6ff6134043c3",
+    };
+    std::vector<std::string> calculatedHashes;
+
+    for (auto& smle : entries) {
+        calculatedHashes.emplace_back(smle.CalcHash().ToString());
+        //printf("\"%s\",\n", calculatedHashes.back().c_str());
+    }
+
+    BOOST_CHECK(expectedHashes == calculatedHashes);
+
+    CSimplifiedMNList sml(entries);
+
+    std::string expectedMerkleRoot = "926efc8dc7b5b060254b102670b918133fea67c5e1bc2703d596e49672878c22";
+    std::string calculatedMerkleRoot = sml.CalcMerkleRoot(nullptr).ToString();
+
+    BOOST_CHECK(expectedMerkleRoot == calculatedMerkleRoot);
+}
+BOOST_AUTO_TEST_SUITE_END()
diff --git a/src/test/test_dash.h b/src/test/test_dash.h
index 1a42fbff5a1a..c951675225df 100644
--- a/src/test/test_dash.h
+++ b/src/test/test_dash.h
@@ -71,6 +71,16 @@ struct TestChain100Setup : public TestChainSetup {
     TestChain100Setup() : TestChainSetup(100) {}
 };
 
+struct TestChainDIP3Setup : public TestChainSetup
+{
+    TestChainDIP3Setup() : TestChainSetup(431) {}
+};
+
+struct TestChainDIP3BeforeActivationSetup : public TestChainSetup
+{
+    TestChainDIP3BeforeActivationSetup() : TestChainSetup(430) {}
+};
+
 class CTxMemPoolEntry;
 class CTxMemPool;
 

From ad6c2893c0754e211f319a92a9b3b95a7507765e Mon Sep 17 00:00:00 2001
From: thephez <thephez@users.noreply.github.com>
Date: Mon, 10 Sep 2018 06:23:22 -0400
Subject: [PATCH 128/400] Docs - Update Core version number in readme files
 (#2267)

---
 README.md              | 2 +-
 doc/README.md          | 2 +-
 doc/README_windows.txt | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 3b9b31ef062b..a6fb97854b2a 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-Dash Core staging tree 0.12.3
+Dash Core staging tree 0.12.4
 ===============================
 
 `master:` [![Build Status](https://travis-ci.org/dashpay/dash.svg?branch=master)](https://travis-ci.org/dashpay/dash) `develop:` [![Build Status](https://travis-ci.org/dashpay/dash.svg?branch=develop)](https://travis-ci.org/dashpay/dash/branches)
diff --git a/doc/README.md b/doc/README.md
index 9798a25b6ec4..64b707ba12d3 100644
--- a/doc/README.md
+++ b/doc/README.md
@@ -1,4 +1,4 @@
-Dash Core 0.12.1
+Dash Core 0.12.4
 =====================
 
 This is the official reference wallet for Dash digital currency and comprises the backbone of the Dash peer-to-peer network. You can [download Dash Core](https://www.dash.org/downloads/) or [build it yourself](#building) using the guides below.
diff --git a/doc/README_windows.txt b/doc/README_windows.txt
index 7c763782b034..b539fd9d1d80 100644
--- a/doc/README_windows.txt
+++ b/doc/README_windows.txt
@@ -1,4 +1,4 @@
-Dash Core 0.12.1
+Dash Core 0.12.4
 =====================
 
 Intro

From c3d6b0651885871d59bd73e16c8077190edc11b1 Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Mon, 10 Sep 2018 12:23:42 +0200
Subject: [PATCH 129/400] Remove redundant check for unknown commands in
 masternode RPC (#2279)

---
 src/rpc/masternode.cpp | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/src/rpc/masternode.cpp b/src/rpc/masternode.cpp
index 3761bd5a435a..3aaacc05ab60 100644
--- a/src/rpc/masternode.cpp
+++ b/src/rpc/masternode.cpp
@@ -878,16 +878,9 @@ UniValue masternode(const JSONRPCRequest& request)
         throw JSONRPCError(RPC_INVALID_PARAMETER, "DEPRECATED, please use start-all instead");
 #endif // ENABLE_WALLET
 
-    if ((request.fHelp && strCommand.empty())  ||
-        (
-#ifdef ENABLE_WALLET
-            strCommand != "start-alias" && strCommand != "start-all" && strCommand != "start-missing" &&
-         strCommand != "start-disabled" && strCommand != "outputs" &&
-#endif // ENABLE_WALLET
-         strCommand != "list" && strCommand != "list-conf" && strCommand != "count" &&
-         strCommand != "debug" && strCommand != "current" && strCommand != "winner" && strCommand != "winners" && strCommand != "genkey" &&
-         strCommand != "connect" && strCommand != "status" && strCommand != "check"))
-            masternode_help();
+    if (request.fHelp && strCommand.empty()) {
+        masternode_help();
+    }
 
     if (strCommand == "list") {
         return masternode_list(request);
@@ -925,9 +918,10 @@ UniValue masternode(const JSONRPCRequest& request)
         return masternode_winners(request);
     } else if (strCommand == "check") {
         return masternode_check(request);
+    } else {
+        masternode_help();
+        return UniValue::VNULL; // avoid compiler warnings
     }
-
-    throw std::runtime_error("invalid command: " + strCommand);
 }
 
 UniValue masternodelist(const JSONRPCRequest& request)

From 737353c84c6cc5a6f990d4b786326dbd2b3f5d54 Mon Sep 17 00:00:00 2001
From: UdjinM6 <UdjinM6@users.noreply.github.com>
Date: Mon, 10 Sep 2018 17:12:32 +0300
Subject: [PATCH 130/400] Fix IsBlockValueValid/IsOldBudgetBlockValueValid
 (#2276)

---
 src/masternode-payments.cpp | 28 +++++++++++++++++++++-------
 1 file changed, 21 insertions(+), 7 deletions(-)

diff --git a/src/masternode-payments.cpp b/src/masternode-payments.cpp
index fce2aead1188..435d6deb061b 100644
--- a/src/masternode-payments.cpp
+++ b/src/masternode-payments.cpp
@@ -27,13 +27,17 @@ CCriticalSection cs_mapMasternodePaymentVotes;
 
 bool IsOldBudgetBlockValueValid(const CBlock& block, int nBlockHeight, CAmount blockReward, std::string& strErrorRet) {
     const Consensus::Params& consensusParams = Params().GetConsensus();
+    bool isBlockRewardValueMet = (block.vtx[0]->GetValueOut() <= blockReward);
 
-    if (nBlockHeight >= consensusParams.nSuperblockStartBlock) {
-        // switched to new budget system (superblocks)
-        return true;
+    if (nBlockHeight < consensusParams.nBudgetPaymentsStartBlock) {
+        strErrorRet = strprintf("Incorrect block %d, old budgets are not activated yet", nBlockHeight);
+        return false;
     }
 
-    bool isBlockRewardValueMet = (block.vtx[0]->GetValueOut() <= blockReward);
+    if (nBlockHeight >= consensusParams.nSuperblockStartBlock) {
+        strErrorRet = strprintf("Incorrect block %d, old budgets are no longer active", nBlockHeight);
+        return false;
+    }
 
     // we are still using budgets, but we have no data about them anymore,
     // all we know is predefined budget cycle and window
@@ -77,13 +81,23 @@ bool IsOldBudgetBlockValueValid(const CBlock& block, int nBlockHeight, CAmount b
 
 bool IsBlockValueValid(const CBlock& block, int nBlockHeight, CAmount blockReward, std::string& strErrorRet)
 {
+    const Consensus::Params& consensusParams = Params().GetConsensus();
+    bool isBlockRewardValueMet = (block.vtx[0]->GetValueOut() <= blockReward);
+
     strErrorRet = "";
 
-    if (!IsOldBudgetBlockValueValid(block, nBlockHeight, blockReward, strErrorRet)) {
-        return false;
+    if (nBlockHeight < consensusParams.nBudgetPaymentsStartBlock) {
+        // old budget system is not activated yet, just make sure we do not exceed the regular block reward
+        if(!isBlockRewardValueMet) {
+            strErrorRet = strprintf("coinbase pays too much at height %d (actual=%d vs limit=%d), exceeded block reward, old budgets are not activated yet",
+                                    nBlockHeight, block.vtx[0]->GetValueOut(), blockReward);
+        }
+        return isBlockRewardValueMet;
+    } else if (nBlockHeight < consensusParams.nSuperblockStartBlock) {
+        // superblocks are not enabled yet, check if we can pass old budget rules
+        return IsOldBudgetBlockValueValid(block, nBlockHeight, blockReward, strErrorRet);
     }
 
-    bool isBlockRewardValueMet = (block.vtx[0]->GetValueOut() <= blockReward);
     if(fDebug) LogPrintf("block.vtx[0]->GetValueOut() %lld <= blockReward %lld\n", block.vtx[0]->GetValueOut(), blockReward);
 
     CAmount nSuperblockMaxValue =  blockReward + CSuperblock::GetPaymentsLimit(nBlockHeight);

From 38ccfef3bea5950fcb6a7bff41364072379e6139 Mon Sep 17 00:00:00 2001
From: UdjinM6 <UdjinM6@users.noreply.github.com>
Date: Tue, 11 Sep 2018 17:31:18 +0300
Subject: [PATCH 131/400] Identify PS collateral payments in transaction list a
 bit more accurate (#2271)

This have to be updated due to new rules for PS collateral - we allow OP_RETURN outputs and "non-exact" inputs (1x<=X<2x) now.
---
 src/qt/transactionrecord.cpp | 40 ++++++++++++++++++++++++++++--------
 1 file changed, 32 insertions(+), 8 deletions(-)

diff --git a/src/qt/transactionrecord.cpp b/src/qt/transactionrecord.cpp
index e61667050471..2cea36561664 100644
--- a/src/qt/transactionrecord.cpp
+++ b/src/qt/transactionrecord.cpp
@@ -146,14 +146,24 @@ QList<TransactionRecord> TransactionRecord::decomposeTransaction(const CWallet *
             }
             else
             {
-                for (unsigned int nOut = 0; nOut < wtx.tx->vout.size(); nOut++)
+                sub.idx = parts.size();
+                if(wtx.tx->vin.size() == 1 && wtx.tx->vout.size() == 1
+                    && CPrivateSend::IsCollateralAmount(nDebit)
+                    && CPrivateSend::IsCollateralAmount(nCredit)
+                    && CPrivateSend::IsCollateralAmount(-nNet))
                 {
-                    const CTxOut& txout = wtx.tx->vout[nOut];
-                    sub.idx = parts.size();
-
-                    if(txout.nValue == CPrivateSend::GetMaxCollateralAmount()) sub.type = TransactionRecord::PrivateSendMakeCollaterals;
-                    if(CPrivateSend::IsDenominatedAmount(txout.nValue)) sub.type = TransactionRecord::PrivateSendCreateDenominations;
-                    if(nDebit - wtx.tx->GetValueOut() == CPrivateSend::GetCollateralAmount()) sub.type = TransactionRecord::PrivateSendCollateralPayment;
+                    sub.type = TransactionRecord::PrivateSendCollateralPayment;
+                } else {
+                    for (const auto& txout : wtx.tx->vout) {
+                        if(txout.nValue == CPrivateSend::GetMaxCollateralAmount()) {
+                            sub.type = TransactionRecord::PrivateSendMakeCollaterals;
+                            break;
+                        }
+                        if(CPrivateSend::IsDenominatedAmount(txout.nValue)) {
+                            sub.type = TransactionRecord::PrivateSendCreateDenominations;
+                            break;
+                        }
+                    }
                 }
             }
 
@@ -171,7 +181,21 @@ QList<TransactionRecord> TransactionRecord::decomposeTransaction(const CWallet *
             //
             CAmount nTxFee = nDebit - wtx.tx->GetValueOut();
 
-            for (unsigned int nOut = 0; nOut < wtx.tx->vout.size(); nOut++)
+            bool fDone = false;
+            if(wtx.tx->vin.size() == 1 && wtx.tx->vout.size() == 1
+                && CPrivateSend::IsCollateralAmount(nDebit)
+                && nCredit == 0 // OP_RETURN
+                && CPrivateSend::IsCollateralAmount(-nNet))
+            {
+                TransactionRecord sub(hash, nTime);
+                sub.idx = 0;
+                sub.type = TransactionRecord::PrivateSendCollateralPayment;
+                sub.debit = -nDebit;
+                parts.append(sub);
+                fDone = true;
+            }
+
+            for (unsigned int nOut = 0; nOut < wtx.tx->vout.size() && !fDone; nOut++)
             {
                 const CTxOut& txout = wtx.tx->vout[nOut];
                 TransactionRecord sub(hash, nTime);

From 55d7bb9009668e7da73c3861210b83d339b56278 Mon Sep 17 00:00:00 2001
From: UdjinM6 <UdjinM6@users.noreply.github.com>
Date: Tue, 11 Sep 2018 17:31:46 +0300
Subject: [PATCH 132/400] Add an option to disable popups for PS mixing txes
 (#2272)

* Add an option to disable popups for PS mixing txes

* capital S
---
 src/qt/forms/optionsdialog.ui | 10 ++++++++++
 src/qt/optionsdialog.cpp      |  1 +
 src/qt/optionsmodel.cpp       |  8 ++++++++
 src/qt/optionsmodel.h         |  1 +
 src/qt/walletview.cpp         | 12 +++++++++++-
 5 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/src/qt/forms/optionsdialog.ui b/src/qt/forms/optionsdialog.ui
index ff3351ec0f1e..8c9a4cfd9f3f 100644
--- a/src/qt/forms/optionsdialog.ui
+++ b/src/qt/forms/optionsdialog.ui
@@ -173,6 +173,16 @@
             </property>
            </widget>
           </item>
+          <item>
+           <widget class="QCheckBox" name="showPrivateSendPopups">
+            <property name="toolTip">
+             <string>Show system popups for PrivateSend mixing transactions&lt;br/&gt;just like for all other transaction types.</string>
+            </property>
+            <property name="text">
+             <string>Show popups for Privatesend transactions</string>
+            </property>
+           </widget>
+          </item>
           <item>
            <widget class="QCheckBox" name="lowKeysWarning">
             <property name="toolTip">
diff --git a/src/qt/optionsdialog.cpp b/src/qt/optionsdialog.cpp
index 668a5afdd84e..0e702b9488a9 100644
--- a/src/qt/optionsdialog.cpp
+++ b/src/qt/optionsdialog.cpp
@@ -211,6 +211,7 @@ void OptionsDialog::setMapper()
     mapper->addMapping(ui->coinControlFeatures, OptionsModel::CoinControlFeatures);
     mapper->addMapping(ui->showMasternodesTab, OptionsModel::ShowMasternodesTab);
     mapper->addMapping(ui->showAdvancedPSUI, OptionsModel::ShowAdvancedPSUI);
+    mapper->addMapping(ui->showPrivateSendPopups, OptionsModel::ShowPrivateSendPopups);
     mapper->addMapping(ui->lowKeysWarning, OptionsModel::LowKeysWarning);
     mapper->addMapping(ui->privateSendMultiSession, OptionsModel::PrivateSendMultiSession);
     mapper->addMapping(ui->spendZeroConfChange, OptionsModel::SpendZeroConfChange);
diff --git a/src/qt/optionsmodel.cpp b/src/qt/optionsmodel.cpp
index 7e8d9cdb652b..27b68fe2c02c 100644
--- a/src/qt/optionsmodel.cpp
+++ b/src/qt/optionsmodel.cpp
@@ -101,6 +101,9 @@ void OptionsModel::Init(bool resetSettings)
         settings.setValue("fShowAdvancedPSUI", false);
     fShowAdvancedPSUI = settings.value("fShowAdvancedPSUI", false).toBool();
 
+    if (!settings.contains("fShowPrivateSendPopups"))
+        settings.setValue("fShowPrivateSendPopups", true);
+
     if (!settings.contains("fLowKeysWarning"))
         settings.setValue("fLowKeysWarning", true);
 #endif // ENABLE_WALLET
@@ -272,6 +275,8 @@ QVariant OptionsModel::data(const QModelIndex & index, int role) const
             return settings.value("fShowMasternodesTab");
         case ShowAdvancedPSUI:
             return fShowAdvancedPSUI;
+        case ShowPrivateSendPopups:
+            return settings.value("fShowPrivateSendPopups");
         case LowKeysWarning:
             return settings.value("fLowKeysWarning");
         case PrivateSendRounds:
@@ -422,6 +427,9 @@ bool OptionsModel::setData(const QModelIndex & index, const QVariant & value, in
             settings.setValue("fShowAdvancedPSUI", fShowAdvancedPSUI);
             Q_EMIT advancedPSUIChanged(fShowAdvancedPSUI);
             break;
+        case ShowPrivateSendPopups:
+            settings.setValue("fShowPrivateSendPopups", value);
+            break;
         case LowKeysWarning:
             settings.setValue("fLowKeysWarning", value);
             break;
diff --git a/src/qt/optionsmodel.h b/src/qt/optionsmodel.h
index 8bc051ae1d17..3dd4ff15167d 100644
--- a/src/qt/optionsmodel.h
+++ b/src/qt/optionsmodel.h
@@ -49,6 +49,7 @@ class OptionsModel : public QAbstractListModel
         SpendZeroConfChange,    // bool
         ShowMasternodesTab,     // bool
         ShowAdvancedPSUI,       // bool
+        ShowPrivateSendPopups,  // bool
         LowKeysWarning,         // bool
         PrivateSendRounds,      // int
         PrivateSendAmount,      // int
diff --git a/src/qt/walletview.cpp b/src/qt/walletview.cpp
index 3fc088165fa8..16239a947643 100644
--- a/src/qt/walletview.cpp
+++ b/src/qt/walletview.cpp
@@ -16,6 +16,7 @@
 #include "receivecoinsdialog.h"
 #include "sendcoinsdialog.h"
 #include "signverifymessagedialog.h"
+#include "transactionrecord.h"
 #include "transactiontablemodel.h"
 #include "transactionview.h"
 #include "walletmodel.h"
@@ -194,10 +195,19 @@ void WalletView::processNewTransaction(const QModelIndex& parent, int start, int
     if (!ttm || ttm->processingQueuedTransactions())
         return;
 
+    QModelIndex index = ttm->index(start, 0, parent);
+    QSettings settings;
+    if (!settings.value("fShowPrivateSendPopups").toBool()) {
+        QVariant nType = ttm->data(index, TransactionTableModel::TypeRole);
+        if (nType == TransactionRecord::PrivateSendDenominate ||
+            nType == TransactionRecord::PrivateSendCollateralPayment ||
+            nType == TransactionRecord::PrivateSendMakeCollaterals ||
+            nType == TransactionRecord::PrivateSendCreateDenominations) return;
+    }
+
     QString date = ttm->index(start, TransactionTableModel::Date, parent).data().toString();
     qint64 amount = ttm->index(start, TransactionTableModel::Amount, parent).data(Qt::EditRole).toULongLong();
     QString type = ttm->index(start, TransactionTableModel::Type, parent).data().toString();
-    QModelIndex index = ttm->index(start, 0, parent);
     QString address = ttm->data(index, TransactionTableModel::AddressRole).toString();
     QString label = ttm->data(index, TransactionTableModel::LabelRole).toString();
 

From 9b6eb4765f1ab332804fd74890cb1f2b54bc5b54 Mon Sep 17 00:00:00 2001
From: UdjinM6 <UdjinM6@users.noreply.github.com>
Date: Tue, 11 Sep 2018 17:32:18 +0300
Subject: [PATCH 133/400] Include inputs with max rounds in
 SelectCoinsDark/SelectCoinsByDenominations (#2277)

---
 src/privatesend-client.cpp | 12 ++++++------
 src/wallet/wallet.cpp      |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/privatesend-client.cpp b/src/privatesend-client.cpp
index 01ce35f0cabf..dd4cf61c34ec 100644
--- a/src/privatesend-client.cpp
+++ b/src/privatesend-client.cpp
@@ -1036,7 +1036,7 @@ bool CPrivateSendClientSession::JoinExistingQueue(CAmount nBalanceNeedsAnonymize
         CAmount nMaxAmount = nBalanceNeedsAnonymized;
 
         // Try to match their denominations if possible, select exact number of denominations
-        if(!pwalletMain->SelectCoinsByDenominations(dsq.nDenom, nMinAmount, nMaxAmount, vecTxDSInTmp, vCoinsTmp, nValueInTmp, 0, privateSendClient.nPrivateSendRounds, true)) {
+        if(!pwalletMain->SelectCoinsByDenominations(dsq.nDenom, nMinAmount, nMaxAmount, vecTxDSInTmp, vCoinsTmp, nValueInTmp, 0, privateSendClient.nPrivateSendRounds - 1, true)) {
             LogPrintf("CPrivateSendClientSession::JoinExistingQueue -- Couldn't match %d denominations %d (%s)\n", vecBits.front(), dsq.nDenom, CPrivateSend::GetDenominationsToString(dsq.nDenom));
             continue;
         }
@@ -1074,7 +1074,7 @@ bool CPrivateSendClientSession::StartNewQueue(CAmount nValueMin, CAmount nBalanc
     // ** find the coins we'll use
     std::vector<CTxIn> vecTxIn;
     CAmount nValueInTmp = 0;
-    if(!pwalletMain->SelectCoinsDark(nValueMin, nBalanceNeedsAnonymized, vecTxIn, nValueInTmp, 0, privateSendClient.nPrivateSendRounds)) {
+    if(!pwalletMain->SelectCoinsDark(nValueMin, nBalanceNeedsAnonymized, vecTxIn, nValueInTmp, 0, privateSendClient.nPrivateSendRounds - 1)) {
         // this should never happen
         LogPrintf("CPrivateSendClientSession::StartNewQueue -- Can't mix: no compatible inputs found!\n");
         strAutoDenomResult = _("Can't mix: no compatible inputs found!");
@@ -1190,7 +1190,7 @@ bool CPrivateSendClientSession::SubmitDenominate(CConnman& connman)
     if (fScanFromTheMiddle) {
         nRoundStart = privateSendClient.nPrivateSendRounds / 2;
     } else if (!fMixLowest) {
-        nRoundStart = privateSendClient.nPrivateSendRounds;
+        nRoundStart = privateSendClient.nPrivateSendRounds - 1;
     }
 
     // Submit transaction to the pool if we get here
@@ -1198,7 +1198,7 @@ bool CPrivateSendClientSession::SubmitDenominate(CConnman& connman)
         // Try to use only inputs with the same number of rounds, from low to high
         while (true) {
             for(int i = nRoundStart; i < privateSendClient.nPrivateSendRounds; i++) {
-                if(PrepareDenominate(i, i + 1, strError, vecTxDSInRet, vecTxOutRet)) {
+                if(PrepareDenominate(i, i, strError, vecTxDSInRet, vecTxOutRet)) {
                     LogPrintf("CPrivateSendClientSession::SubmitDenominate -- Running PrivateSend denominate for %d rounds, success\n", i);
                     return SendDenominate(vecTxDSInRet, vecTxOutRet, connman);
                 }
@@ -1211,7 +1211,7 @@ bool CPrivateSendClientSession::SubmitDenominate(CConnman& connman)
         // Try to use only inputs with the same number of rounds, from high to low
         while (true) {
             for(int i = nRoundStart; i > 0; i--) {
-                if(PrepareDenominate(i - 1, i, strError, vecTxDSInRet, vecTxOutRet)) {
+                if(PrepareDenominate(i, i, strError, vecTxDSInRet, vecTxOutRet)) {
                     LogPrintf("CPrivateSendClientSession::SubmitDenominate -- Running PrivateSend denominate for %d rounds, success\n", i);
                     return SendDenominate(vecTxDSInRet, vecTxOutRet, connman);
                 }
@@ -1223,7 +1223,7 @@ bool CPrivateSendClientSession::SubmitDenominate(CConnman& connman)
     }
 
     // We failed? That's strange but let's just make final attempt and try to mix everything
-    if(PrepareDenominate(0, privateSendClient.nPrivateSendRounds, strError, vecTxDSInRet, vecTxOutRet)) {
+    if(PrepareDenominate(0, privateSendClient.nPrivateSendRounds - 1, strError, vecTxDSInRet, vecTxOutRet)) {
         LogPrintf("CPrivateSendClientSession::SubmitDenominate -- Running PrivateSend denominate for all rounds, success\n");
         return SendDenominate(vecTxDSInRet, vecTxOutRet, connman);
     }
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
index 5eac1b238dab..ba675ef19405 100644
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -3045,7 +3045,7 @@ bool CWallet::SelectCoinsByDenominations(int nDenom, CAmount nValueMin, CAmount
             CTxIn txin = CTxIn(out.tx->GetHash(), out.i);
 
             int nRounds = GetCappedOutpointPrivateSendRounds(txin.prevout);
-            if(nRounds >= nPrivateSendRoundsMax) continue;
+            if(nRounds > nPrivateSendRoundsMax) continue;
             if(nRounds < nPrivateSendRoundsMin) continue;
 
             for (const auto& nBit : vecBits) {
@@ -3199,7 +3199,7 @@ bool CWallet::SelectCoinsDark(CAmount nValueMin, CAmount nValueMax, std::vector<
             CTxIn txin = CTxIn(out.tx->GetHash(),out.i);
 
             int nRounds = GetCappedOutpointPrivateSendRounds(txin.prevout);
-            if(nRounds >= nPrivateSendRoundsMax) continue;
+            if(nRounds > nPrivateSendRoundsMax) continue;
             if(nRounds < nPrivateSendRoundsMin) continue;
 
             nValueRet += out.tx->tx->vout[out.i].nValue;

From 47ca06ab33b8c04dbfc8401882e019ba25118b1e Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Tue, 11 Sep 2018 16:32:45 +0200
Subject: [PATCH 134/400] DIP3 integration tests (#2280)

* Implement dip3 integration tests

This tests the full upgrade path from legacy MNs to deterministic MNs

* Invoke UpdatedBlockTip signal when invalidateblock RPC is called

Currently, UpdatedBlockTip would only be called if the invalidation resulted
in another chain becoming the longest one. This is inconsistent behavior
and was spotted when running dip3 integration tests.
---
 qa/pull-tester/rpc-tests.py               |   1 +
 qa/rpc-tests/dip3-deterministicmns.py     | 722 ++++++++++++++++++++++
 qa/rpc-tests/test_framework/blocktools.py |  28 +
 src/validation.cpp                        |   1 +
 4 files changed, 752 insertions(+)
 create mode 100755 qa/rpc-tests/dip3-deterministicmns.py

diff --git a/qa/pull-tester/rpc-tests.py b/qa/pull-tester/rpc-tests.py
index 2bd823f688ac..1ce4448fb28b 100755
--- a/qa/pull-tester/rpc-tests.py
+++ b/qa/pull-tester/rpc-tests.py
@@ -109,6 +109,7 @@
 
 testScripts = [
     # longest test should go first, to favor running tests in parallel
+    'dip3-deterministicmns.py', # NOTE: needs dash_hash to pass
     'wallet-hd.py',
     'walletbackup.py',
     # vv Tests less than 5m vv
diff --git a/qa/rpc-tests/dip3-deterministicmns.py b/qa/rpc-tests/dip3-deterministicmns.py
new file mode 100755
index 000000000000..c53f48051355
--- /dev/null
+++ b/qa/rpc-tests/dip3-deterministicmns.py
@@ -0,0 +1,722 @@
+#!/usr/bin/env python3
+# Copyright (c) 2015-2018 The Dash Core developers
+# Distributed under the MIT software license, see the accompanying
+# file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+#
+# Test deterministic masternodes
+#
+
+from test_framework.blocktools import create_block, create_coinbase, get_masternode_payment
+from test_framework.mininode import CTransaction, ToHex, FromHex, CTxOut, COIN, CCbTx
+from test_framework.test_framework import BitcoinTestFramework
+from test_framework.util import *
+
+class Masternode(object):
+    pass
+
+class DIP3Test(BitcoinTestFramework):
+    def __init__(self):
+        super().__init__()
+        self.num_initial_mn = 11 # Should be >= 11 to make sure quorums are not always the same MNs
+        self.num_nodes = 1 + self.num_initial_mn + 2 # +1 for controller, +1 for mn-qt, +1 for mn created after dip3 activation
+        self.setup_clean_chain = True
+
+        self.extra_args = ["-budgetparams=240:100:240"]
+        self.extra_args += ["-sporkkey=cP4EKFyJsHT39LDqgdcB43Y3YXjNyjb5Fuas1GQSeAtjnZWmZEQK"]
+
+    def setup_network(self):
+        disable_mocktime()
+        self.start_controller_node()
+        self.is_network_split = False
+
+    def start_controller_node(self, extra_args=None):
+        print("starting controller node")
+        if self.nodes is None:
+            self.nodes = [None]
+        args = self.extra_args
+        if extra_args is not None:
+            args += extra_args
+        self.nodes[0] = start_node(0, self.options.tmpdir, extra_args=args)
+        for i in range(1, self.num_nodes):
+            if i < len(self.nodes) and self.nodes[i] is not None:
+                connect_nodes_bi(self.nodes, 0, i)
+
+    def stop_controller_node(self):
+        print("stopping controller node")
+        stop_node(self.nodes[0], 0)
+
+    def restart_controller_node(self):
+        self.stop_controller_node()
+        self.start_controller_node()
+
+    def run_test(self):
+        print("funding controller node")
+        while self.nodes[0].getbalance() < (self.num_initial_mn + 3) * 1000:
+            self.nodes[0].generate(1) # generate enough for collaterals
+        print("controller node has {} dash".format(self.nodes[0].getbalance()))
+
+        # Make sure we're below block 143 (which activates dip3)
+        print("testing rejection of ProTx before dip3 activation")
+        assert(self.nodes[0].getblockchaininfo()['blocks'] < 143)
+        dip3_deployment = self.nodes[0].getblockchaininfo()['bip9_softforks']['dip0003']
+        assert_equal(dip3_deployment['status'], 'defined')
+
+        self.test_fail_create_protx(self.nodes[0])
+
+        mns = []
+        mn_idx = 1
+        for i in range(self.num_initial_mn):
+            mn = self.create_mn(self.nodes[0], mn_idx, 'mn-%d' % (mn_idx))
+            mn_idx += 1
+            mns.append(mn)
+
+        # mature collaterals
+        for i in range(3):
+            self.nodes[0].generate(1)
+            time.sleep(1)
+
+        self.write_mnconf(mns)
+
+        self.restart_controller_node()
+        for mn in mns:
+            self.start_mn(mn)
+        self.sync_all()
+
+        # force finishing of mnsync
+        for node in self.nodes:
+            self.force_finish_mnsync(node)
+
+        # start MNs
+        print("start mns")
+        for mn in mns:
+            self.start_alias(self.nodes[0], mn.alias)
+        print("wait for MNs to appear in MN lists")
+        self.wait_for_mnlists(mns, True, False)
+
+        print("testing MN payment votes")
+        self.test_mn_votes(10)
+
+        print("testing instant send")
+        self.test_instantsend(10, 5)
+
+        print("testing rejection of ProTx before dip3 activation (in states defined, started and locked_in)")
+        while self.nodes[0].getblockchaininfo()['bip9_softforks']['dip0003']['status'] == 'defined':
+            self.nodes[0].generate(1)
+        self.test_fail_create_protx(self.nodes[0])
+        while self.nodes[0].getblockchaininfo()['bip9_softforks']['dip0003']['status'] == 'started':
+            self.nodes[0].generate(1)
+        self.test_fail_create_protx(self.nodes[0])
+
+        # prepare mn which should still be accepted later when dip3 activates (because it is funded before final activation)
+        print("creating collateral for mn-before-dip3")
+        before_dip3_mn = self.create_mn(self.nodes[0], mn_idx, 'mn-before-dip3')
+        mn_idx += 1
+
+        while self.nodes[0].getblockchaininfo()['bip9_softforks']['dip0003']['status'] == 'locked_in':
+            self.nodes[0].generate(1)
+
+        # We have hundreds of blocks to sync here, give it more time
+        print("syncing blocks for all nodes")
+        sync_blocks(self.nodes, timeout=120)
+
+        # DIP3 has activated here
+
+        print("testing rejection of ProTx right before dip3 activation")
+        best_block = self.nodes[0].getbestblockhash()
+        self.nodes[0].invalidateblock(best_block)
+        self.test_fail_create_protx(self.nodes[0])
+        self.nodes[0].reconsiderblock(best_block)
+
+        # Now it should be possible to mine ProTx
+        self.sync_all()
+        self.test_success_create_protx(self.nodes[0])
+
+        print("creating collateral for mn-after-dip3")
+        after_dip3_mn = self.create_mn(self.nodes[0], mn_idx, 'mn-after-dip3')
+        # mature collaterals
+        for i in range(3):
+            self.nodes[0].generate(1)
+            time.sleep(1)
+
+        print("testing if we can start a mn which was created before dip3 activation")
+        mns.append(before_dip3_mn)
+        self.write_mnconf(mns + [after_dip3_mn])
+        self.restart_controller_node()
+        self.force_finish_mnsync(self.nodes[0])
+
+        print("start MN %s" % before_dip3_mn.alias)
+        self.start_mn(before_dip3_mn)
+        self.wait_for_sporks()
+        self.force_finish_mnsync_list(before_dip3_mn.node)
+        self.start_alias(self.nodes[0], before_dip3_mn.alias)
+
+        self.wait_for_mnlists(mns, True, False)
+        self.wait_for_mnlists_same()
+
+        # Test if nodes deny creating new non-ProTx MNs now
+        print("testing if MN start fails when using collateral which was created after dip3 activation")
+        self.start_alias(self.nodes[0], after_dip3_mn.alias, should_fail=True)
+
+        first_upgrade_count = 5
+        print("upgrading first %d MNs to use ProTx (but not deterministic MN lists)" % first_upgrade_count)
+        for i in range(first_upgrade_count):
+            mns[i] = self.upgrade_mn_protx(mns[i])
+            self.nodes[0].generate(1)
+        self.write_mnconf(mns)
+
+        print("wait for upgraded MNs to disappear from MN lists (their collateral was spent)")
+        self.wait_for_mnlists(mns, True, False, check=True)
+        self.wait_for_mnlists_same()
+
+        print("restarting controller and upgraded MNs")
+        self.restart_controller_node()
+        self.force_finish_mnsync_list(self.nodes[0])
+        for mn in mns:
+            if mn.is_protx:
+                print("restarting MN %s" % mn.alias)
+                self.stop_node(mn.idx)
+                self.start_mn(mn)
+                self.force_finish_mnsync_list(mn.node)
+        print('start-alias on upgraded nodes')
+        for mn in mns:
+            if mn.is_protx:
+                self.start_alias(self.nodes[0], mn.alias)
+
+        print("wait for upgraded MNs to appear in MN list")
+        self.wait_for_mnlists(mns, True, True)
+        self.wait_for_mnlists_same()
+
+        print("testing MN payment votes (with mixed ProTx and legacy nodes)")
+        self.test_mn_votes(10, test_enforcement=True)
+
+        print("testing instant send (with mixed ProTx and legacy nodes)")
+        self.test_instantsend(10, 5)
+
+        print("activating spork15")
+        height = self.nodes[0].getblockchaininfo()['blocks']
+        spork15_offset = 10
+        self.nodes[0].spork('SPORK_15_DETERMINISTIC_MNS_ENABLED', height + spork15_offset)
+        self.wait_for_sporks()
+
+        print("test that MN list does not change before final spork15 activation")
+        for i in range(spork15_offset - 1):
+            self.nodes[0].generate(1)
+            self.sync_all()
+            self.wait_for_mnlists(mns, True, True)
+            self.wait_for_mnlists_same()
+
+        print("mining final block which should switch network to deterministic lists")
+        self.nodes[0].generate(1)
+        self.sync_all()
+
+        ##### WOW...we made it...we are in deterministic MN lists mode now.
+        ##### From now on, we don't wait for mnlists to become correct anymore, we always assert that they are correct immediately
+
+        print("assert that not upgraded MNs disappeared from MN list")
+        self.assert_mnlists(mns, False, True)
+
+        # enable enforcement and keep it on from now on
+        self.nodes[0].spork('SPORK_8_MASTERNODE_PAYMENT_ENFORCEMENT', 0)
+        self.wait_for_sporks()
+
+        print("test that MNs disappear from the list when the ProTx collateral is spent")
+        spend_mns_count = 3
+        mns_tmp = [] + mns
+        dummy_txins = []
+        for i in range(spend_mns_count):
+            dummy_txin = self.spend_mn_collateral(mns[i], with_dummy_input_output=True)
+            dummy_txins.append(dummy_txin)
+            self.nodes[0].generate(1)
+            self.sync_all()
+            mns_tmp.remove(mns[i])
+            self.assert_mnlists(mns_tmp, False, True)
+
+        print("test that reverting the blockchain on a single node results in the mnlist to be reverted as well")
+        for i in range(spend_mns_count):
+            self.nodes[0].invalidateblock(self.nodes[0].getbestblockhash())
+            mns_tmp.append(mns[spend_mns_count - 1 - i])
+            self.assert_mnlist(self.nodes[0], mns_tmp, False, True)
+
+        print("cause a reorg with a double spend and check that mnlists are still correct on all nodes")
+        self.mine_double_spend(self.nodes[0], dummy_txins, self.nodes[0].getnewaddress(), use_mnmerkleroot_from_tip=True)
+        self.nodes[0].generate(spend_mns_count)
+        self.sync_all()
+        self.assert_mnlists(mns_tmp, False, True)
+
+        print("upgrade remaining MNs to ProTx")
+        for i in range(first_upgrade_count, len(mns)):
+            mns[i] = self.upgrade_mn_protx(mns[i])
+            mn = mns[i]
+            self.nodes[0].generate(1)
+            print("restarting MN %s" % mn.alias)
+            self.stop_node(mn.idx)
+            self.start_mn(mn)
+            self.sync_all()
+            self.force_finish_mnsync(mn.node)
+            self.assert_mnlists(mns, False, True)
+
+        self.assert_mnlists(mns, False, True)
+
+        print("test mn payment enforcement with deterministic MNs")
+        for i in range(20):
+            node = self.nodes[i % len(self.nodes)]
+            self.test_invalid_mn_payment(node)
+            node.generate(1)
+            self.sync_all()
+
+        print("testing instant send with deterministic MNs")
+        self.test_instantsend(20, 5)
+
+        print("testing ProUpServTx")
+        for mn in mns:
+            self.test_protx_update_service(mn)
+
+    def create_mn(self, node, idx, alias):
+        mn = Masternode()
+        mn.idx = idx
+        mn.alias = alias
+        mn.is_protx = False
+        mn.p2p_port = p2p_port(mn.idx)
+
+        mn.mnkey = node.masternode('genkey')
+        mn.collateral_address = node.getnewaddress()
+        mn.collateral_txid = node.sendtoaddress(mn.collateral_address, 1000)
+        rawtx = node.getrawtransaction(mn.collateral_txid, 1)
+
+        mn.collateral_vout = -1
+        for txout in rawtx['vout']:
+            if txout['value'] == Decimal(1000):
+                mn.collateral_vout = txout['n']
+                break
+        assert(mn.collateral_vout != -1)
+
+        lock = node.lockunspent(False, [{'txid': mn.collateral_txid, 'vout': mn.collateral_vout}])
+
+        return mn
+
+    def create_mn_protx(self, node, idx, alias):
+        mn = Masternode()
+        mn.idx = idx
+        mn.alias = alias
+        mn.is_protx = True
+        mn.p2p_port = p2p_port(mn.idx)
+
+        mn.ownerAddr = node.getnewaddress()
+        mn.operatorAddr = mn.ownerAddr
+        mn.votingAddr = mn.ownerAddr
+        mn.mnkey = node.dumpprivkey(mn.operatorAddr)
+        mn.collateral_address = node.getnewaddress()
+
+        mn.collateral_txid = node.protx('register', mn.collateral_address, '1000', '127.0.0.1:%d' % mn.p2p_port, '0', mn.ownerAddr, mn.operatorAddr, mn.votingAddr, 0, mn.collateral_address)
+        rawtx = node.getrawtransaction(mn.collateral_txid, 1)
+
+        mn.collateral_vout = -1
+        for txout in rawtx['vout']:
+            if txout['value'] == Decimal(1000):
+                mn.collateral_vout = txout['n']
+                break
+        assert(mn.collateral_vout != -1)
+
+        return mn
+
+    def start_mn(self, mn):
+        while len(self.nodes) <= mn.idx:
+            self.nodes.append(None)
+        extra_args = ['-masternode=1', '-masternodeprivkey=%s' % mn.mnkey]
+        n = start_node(mn.idx, self.options.tmpdir, self.extra_args + extra_args, redirect_stderr=True)
+        self.nodes[mn.idx] = n
+        for i in range(0, self.num_nodes):
+            if i < len(self.nodes) and self.nodes[i] is not None and i != mn.idx:
+                connect_nodes_bi(self.nodes, mn.idx, i)
+        mn.node = self.nodes[mn.idx]
+        self.sync_all()
+
+    def spend_mn_collateral(self, mn, with_dummy_input_output=False):
+        return self.spend_input(mn.collateral_txid, mn.collateral_vout, 1000, with_dummy_input_output)
+
+    def upgrade_mn_protx(self, mn):
+        self.spend_mn_collateral(mn)
+        mn = self.create_mn_protx(self.nodes[0], mn.idx, 'mn-protx-%d' % mn.idx)
+        return mn
+
+    def test_protx_update_service(self, mn):
+        self.nodes[0].protx('update_service', mn.collateral_txid, '127.0.0.2:%d' % mn.p2p_port, '0')
+        self.nodes[0].generate(1)
+        self.sync_all()
+        for node in self.nodes:
+            mn_info = node.masternode('info', mn.collateral_txid)
+            mn_list = node.masternode('list')
+            assert_equal(mn_info['state']['addr'], '127.0.0.2:%d' % mn.p2p_port)
+            assert_equal(mn_list['%s-%d' % (mn.collateral_txid, mn.collateral_vout)]['address'], '127.0.0.2:%d' % mn.p2p_port)
+
+        # undo
+        self.nodes[0].protx('update_service', mn.collateral_txid, '127.0.0.1:%d' % mn.p2p_port, '0')
+        self.nodes[0].generate(1)
+
+    def force_finish_mnsync(self, node):
+        while True:
+            s = node.mnsync('next')
+            if s == 'sync updated to MASTERNODE_SYNC_FINISHED':
+                break
+            time.sleep(0.1)
+
+    def force_finish_mnsync_list(self, node):
+        if node.mnsync('status')['AssetName'] == 'MASTERNODE_SYNC_WAITING':
+            node.mnsync('next')
+
+        while True:
+            mnlist = node.masternode('list', 'status')
+            if len(mnlist) != 0:
+                time.sleep(0.5)
+                self.force_finish_mnsync(node)
+                return
+            time.sleep(0.1)
+
+    def write_mnconf_line(self, mn, f):
+        conf_line = "%s %s:%d %s %s %d\n" % (mn.alias, '127.0.0.1', mn.p2p_port, mn.mnkey, mn.collateral_txid, mn.collateral_vout)
+        f.write(conf_line)
+
+    def write_mnconf(self, mns):
+        mnconf_file = os.path.join(self.options.tmpdir, "node0/regtest/masternode.conf")
+        with open(mnconf_file, 'w') as f:
+            for mn in mns:
+                self.write_mnconf_line(mn, f)
+
+    def start_alias(self, node, alias, should_fail=False):
+        start_result = node.masternode('start-alias', alias)
+        if not should_fail:
+            assert_equal(start_result, {'result': 'successful', 'alias': alias})
+        else:
+            assert_equal(start_result, {'result': 'failed', 'alias': alias, 'errorMessage': 'Failed to verify MNB'})
+
+    def generate_blocks_until_winners(self, node, count, timeout=60):
+        # Winner lists are pretty much messed up when too many blocks were generated in a short time
+        # To allow proper testing of winners list, we need to slowly generate a few blocks until the list stabilizes
+        good_count = 0
+        st = time.time()
+        while time.time() < st + timeout:
+            height = node.getblockchaininfo()['blocks'] + 10
+            winners = node.masternode('winners')
+            if str(height) in winners:
+                if re.match('[0-9a-zA-Z]*:10', winners[str(height)]):
+                    good_count += 1
+                    if good_count >= count:
+                        return
+                else:
+                    good_count = 0
+            node.generate(1)
+            self.sync_all()
+            time.sleep(1)
+        raise AssertionError("generate_blocks_until_winners timed out: {}".format(node.masternode('winners')))
+
+    def test_mn_votes(self, block_count, test_enforcement=False):
+        self.generate_blocks_until_winners(self.nodes[0], self.num_nodes)
+
+        if test_enforcement:
+            self.nodes[0].spork('SPORK_8_MASTERNODE_PAYMENT_ENFORCEMENT', 0)
+            self.wait_for_sporks()
+            self.test_invalid_mn_payment(self.nodes[0])
+
+        cur_block = 0
+        while cur_block < block_count:
+            for n1 in self.nodes:
+                if cur_block >= block_count:
+                    break
+                if n1 is None:
+                    continue
+
+                if test_enforcement:
+                    self.test_invalid_mn_payment(n1)
+
+                n1.generate(1)
+                cur_block += 1
+                self.sync_all()
+
+                height = n1.getblockchaininfo()['blocks']
+                winners = self.wait_for_winners(n1, height + 10)
+
+                for n2 in self.nodes:
+                    if n1 is n2 or n2 is None:
+                        continue
+                    winners2 = self.wait_for_winners(n2, height + 10)
+                    if winners[str(height + 10)] != winners2[str(height + 10)]:
+                        print("winner1: " + str(winners[str(height + 10)]))
+                        print("winner2: " + str(winners2[str(height + 10)]))
+                        raise AssertionError("winners did not match")
+
+        if test_enforcement:
+            self.nodes[0].spork('SPORK_8_MASTERNODE_PAYMENT_ENFORCEMENT', 4070908800)
+
+    def test_instantsend(self, tx_count, repeat):
+        self.nodes[0].spork('SPORK_2_INSTANTSEND_ENABLED', 0)
+        self.wait_for_sporks()
+
+        # give all nodes some coins first
+        for i in range(tx_count):
+            outputs = {}
+            for node in self.nodes[1:]:
+                outputs[node.getnewaddress()] = 1
+            rawtx = self.nodes[0].createrawtransaction([], outputs)
+            rawtx = self.nodes[0].fundrawtransaction(rawtx)['hex']
+            rawtx = self.nodes[0].signrawtransaction(rawtx)['hex']
+            self.nodes[0].sendrawtransaction(rawtx)
+            self.nodes[0].generate(1)
+        self.sync_all()
+
+        for j in range(repeat):
+            for i in range(tx_count):
+                while True:
+                    from_node_idx = random.randint(0, len(self.nodes) - 1)
+                    from_node = self.nodes[from_node_idx]
+                    if from_node is not None:
+                        break
+                while True:
+                    to_node_idx = random.randint(0, len(self.nodes) - 1)
+                    to_node = self.nodes[to_node_idx]
+                    if to_node is not None and from_node is not to_node:
+                        break
+                to_address = to_node.getnewaddress()
+                txid = from_node.instantsendtoaddress(to_address, 0.01)
+                self.wait_for_instant_lock(to_node, to_node_idx, txid)
+            self.nodes[0].generate(6)
+            self.sync_all()
+
+    def wait_for_instant_lock(self, node, node_idx, txid, timeout=10):
+        st = time.time()
+        while time.time() < st + timeout:
+            try:
+                tx = node.gettransaction(txid)
+            except:
+                continue
+            if tx is None:
+                continue
+            if tx['instantlock']:
+                return
+            time.sleep(0.5)
+        raise AssertionError("wait_for_instant_lock timed out for: {} on node {}".format(txid, node_idx))
+
+    def wait_for_winners(self, node, height, timeout=5):
+        st = time.time()
+        while time.time() < st + timeout:
+            winners = node.masternode('winners')
+            if str(height) in winners:
+                if re.match('[0-9a-zA-Z]*:10', winners[str(height)]):
+                    return winners
+            time.sleep(0.5)
+        raise AssertionError("wait_for_winners for height {} timed out: {}".format(height, node.masternode('winners')))
+
+    def wait_for_mnlists(self, mns, include_legacy, include_protx, timeout=30, check=False):
+        for node in self.nodes:
+            self.wait_for_mnlist(node, mns, include_legacy, include_protx, timeout, check=check)
+
+    def wait_for_mnlist(self, node, mns, include_legacy, include_protx, timeout=30, check=False):
+        st = time.time()
+        while time.time() < st + timeout:
+            if check:
+                node.masternode('check')
+            if self.compare_mnlist(node, mns, include_legacy, include_protx):
+                return
+            time.sleep(0.5)
+        raise AssertionError("wait_for_mnlist timed out")
+
+    def assert_mnlists(self, mns, include_legacy, include_protx):
+        for node in self.nodes:
+            self.assert_mnlist(node, mns, include_legacy, include_protx)
+
+    def assert_mnlist(self, node, mns, include_legacy, include_protx):
+        if not self.compare_mnlist(node, mns, include_legacy, include_protx):
+            expected = []
+            for mn in mns:
+                if (mn.is_protx and include_protx) or (not mn.is_protx and include_legacy):
+                    expected.append('%s-%d' % (mn.collateral_txid, mn.collateral_vout))
+            print('mnlist: ' + str(node.masternode('list', 'status')))
+            print('expected: ' + str(expected))
+            raise AssertionError("mnlists does not match provided mns")
+
+    def wait_for_sporks(self, timeout=30):
+        st = time.time()
+        while time.time() < st + timeout:
+            if self.compare_sporks():
+                return
+            time.sleep(0.5)
+        raise AssertionError("wait_for_sporks timed out")
+
+    def compare_sporks(self):
+        sporks = self.nodes[0].spork('show')
+        for node in self.nodes[1:]:
+            sporks2 = node.spork('show')
+            if sporks != sporks2:
+                return False
+        return True
+
+    def compare_mnlist(self, node, mns, include_legacy, include_protx):
+        mnlist = node.masternode('list', 'status')
+        for mn in mns:
+            s = '%s-%d' % (mn.collateral_txid, mn.collateral_vout)
+            in_list = s in mnlist
+
+            if mn.is_protx:
+                if include_protx:
+                    if not in_list:
+                        return False
+                else:
+                    if in_list:
+                        return False
+            else:
+                if include_legacy:
+                    if not in_list:
+                        return False
+                else:
+                    if in_list:
+                        return False
+            mnlist.pop(s, None)
+        if len(mnlist) != 0:
+            return False
+        return True
+
+    def wait_for_mnlists_same(self, timeout=30):
+        st = time.time()
+        while time.time() < st + timeout:
+            mnlist = self.nodes[0].masternode('list', 'status')
+            all_match = True
+            for node in self.nodes[1:]:
+                mnlist2 = node.masternode('list', 'status')
+                if mnlist != mnlist2:
+                    all_match = False
+                    break
+            if all_match:
+                return
+            time.sleep(0.5)
+        raise AssertionError("wait_for_mnlists_same timed out")
+
+    def test_fail_create_protx(self, node):
+        # Try to create ProTx (should still fail)
+        address = node.getnewaddress()
+        key = node.getnewaddress()
+        assert_raises_jsonrpc(None, "bad-tx-type", node.protx, 'register', address, '1000', '127.0.0.1:10000', '0', key, key, key, 0, address)
+
+    def test_success_create_protx(self, node):
+        address = node.getnewaddress()
+        key = node.getnewaddress()
+        txid = node.protx('register', address, '1000', '127.0.0.1:10000', '0', key, key, key, 0, address)
+        rawtx = node.getrawtransaction(txid, 1)
+        self.mine_double_spend(node, rawtx['vin'], address, use_mnmerkleroot_from_tip=True)
+        self.sync_all()
+
+    def spend_input(self, txid, vout, amount, with_dummy_input_output=False):
+        # with_dummy_input_output is useful if you want to test reorgs with double spends of the TX without touching the actual txid/vout
+        address = self.nodes[0].getnewaddress()
+        target = {address: amount}
+        if with_dummy_input_output:
+            dummyaddress = self.nodes[0].getnewaddress()
+            target[dummyaddress] = 1
+        rawtx = self.nodes[0].createrawtransaction([{'txid': txid, 'vout': vout}], target)
+        rawtx = self.nodes[0].fundrawtransaction(rawtx)['hex']
+        rawtx = self.nodes[0].signrawtransaction(rawtx)['hex']
+        new_txid = self.nodes[0].sendrawtransaction(rawtx)
+
+        if with_dummy_input_output:
+            decoded = self.nodes[0].decoderawtransaction(rawtx)
+            for i in range(len(decoded['vout'])):
+                # make sure this one can only be spent when explicitely creating a rawtx with these outputs as inputs
+                # this ensures that no other TX is chaining on top of this TX
+                lock = self.nodes[0].lockunspent(False, [{'txid': new_txid, 'vout': i}])
+            for txin in decoded['vin']:
+                if txin['txid'] != txid or txin['vout'] != vout:
+                    return txin
+        return None
+
+    def mine_block(self, node, vtx=[], miner_address=None, mn_payee=None, mn_amount=None, use_mnmerkleroot_from_tip=False, expected_error=None):
+        bt = node.getblocktemplate()
+        height = bt['height']
+        tip_hash = bt['previousblockhash']
+
+        tip_block = node.getblock(tip_hash)
+
+        coinbasevalue = bt['coinbasevalue']
+        if miner_address is None:
+            miner_address = node.getnewaddress()
+        if mn_payee is None:
+            if isinstance(bt['masternode'], list):
+                mn_payee = bt['masternode'][0]['payee']
+            else:
+                mn_payee = bt['masternode']['payee']
+        # we can't take the masternode payee amount from the template here as we might have additional fees in vtx
+
+        # calculate fees that the block template included (we'll have to remove it from the coinbase as we won't
+        # include the template's transactions
+        bt_fees = 0
+        for tx in bt['transactions']:
+            bt_fees += tx['fee']
+
+        new_fees = 0
+        for tx in vtx:
+            in_value = 0
+            out_value = 0
+            for txin in tx.vin:
+                txout = node.gettxout("%064x" % txin.prevout.hash, txin.prevout.n, False)
+                in_value += int(txout['value'] * COIN)
+            for txout in tx.vout:
+                out_value += txout.nValue
+            new_fees += in_value - out_value
+
+        # fix fees
+        coinbasevalue -= bt_fees
+        coinbasevalue += new_fees
+
+        if mn_amount is None:
+            mn_amount = get_masternode_payment(height, coinbasevalue)
+        miner_amount = coinbasevalue - mn_amount
+
+        outputs = {miner_address: str(Decimal(miner_amount) / COIN)}
+        if mn_amount > 0:
+            outputs[mn_payee] = str(Decimal(mn_amount) / COIN)
+
+        coinbase = FromHex(CTransaction(), node.createrawtransaction([], outputs))
+        coinbase.vin = create_coinbase(height).vin
+
+        # We can't really use this one as it would result in invalid merkle roots for masternode lists
+        if len(bt['coinbase_payload']) != 0:
+            cbtx = FromHex(CCbTx(), bt['coinbase_payload'])
+            if use_mnmerkleroot_from_tip:
+                if 'cbTx' in tip_block:
+                    cbtx.merkleRootMNList = int(tip_block['cbTx']['merkleRootMNList'], 16)
+                else:
+                    cbtx.merkleRootMNList = 0
+            coinbase.nVersion = 3
+            coinbase.nType = 5 # CbTx
+            coinbase.vExtraPayload = cbtx.serialize()
+
+        coinbase.calc_sha256()
+
+        block = create_block(int(tip_hash, 16), coinbase)
+        block.vtx += vtx
+        block.hashMerkleRoot = block.calc_merkle_root()
+        block.solve()
+        result = node.submitblock(ToHex(block))
+        if expected_error is not None and result != expected_error:
+            raise AssertionError('mining the block should have failed with error %s, but submitblock returned %s' % (expected_error, result))
+        elif expected_error is None and result is not None:
+            raise AssertionError('submitblock returned %s' % (result))
+
+    def mine_double_spend(self, node, txins, target_address, use_mnmerkleroot_from_tip=False):
+        amount = Decimal(0)
+        for txin in txins:
+            txout = node.gettxout(txin['txid'], txin['vout'], False)
+            amount += txout['value']
+        amount -= Decimal("0.001") # fee
+
+        rawtx = node.createrawtransaction(txins, {target_address: amount})
+        rawtx = node.signrawtransaction(rawtx)['hex']
+        tx = FromHex(CTransaction(), rawtx)
+
+        self.mine_block(node, [tx], use_mnmerkleroot_from_tip=use_mnmerkleroot_from_tip)
+
+    def test_invalid_mn_payment(self, node):
+        mn_payee = self.nodes[0].getnewaddress()
+        self.mine_block(node, mn_payee=mn_payee, expected_error='bad-cb-payee')
+        self.mine_block(node, mn_amount=1, expected_error='bad-cb-payee')
+
+if __name__ == '__main__':
+    DIP3Test().main()
diff --git a/qa/rpc-tests/test_framework/blocktools.py b/qa/rpc-tests/test_framework/blocktools.py
index 1db0e90deb7b..558d195fb7f7 100644
--- a/qa/rpc-tests/test_framework/blocktools.py
+++ b/qa/rpc-tests/test_framework/blocktools.py
@@ -85,3 +85,31 @@ def get_legacy_sigopcount_tx(tx, fAccurate=True):
         # scriptSig might be of type bytes, so convert to CScript for the moment
         count += CScript(j.scriptSig).GetSigOpCount(fAccurate)
     return count
+
+# Identical to GetMasternodePayment in C++ code
+def get_masternode_payment(nHeight, blockValue):
+    ret = int(blockValue / 5)
+
+    nMNPIBlock = 350
+    nMNPIPeriod = 10
+
+    if nHeight > nMNPIBlock:
+        ret += int(blockValue / 20)
+    if nHeight > nMNPIBlock+(nMNPIPeriod* 1):
+        ret += int(blockValue / 20)
+    if nHeight > nMNPIBlock+(nMNPIPeriod* 2):
+        ret += int(blockValue / 20)
+    if nHeight > nMNPIBlock+(nMNPIPeriod* 3):
+        ret += int(blockValue / 40)
+    if nHeight > nMNPIBlock+(nMNPIPeriod* 4):
+        ret += int(blockValue / 40)
+    if nHeight > nMNPIBlock+(nMNPIPeriod* 5):
+        ret += int(blockValue / 40)
+    if nHeight > nMNPIBlock+(nMNPIPeriod* 6):
+        ret += int(blockValue / 40)
+    if nHeight > nMNPIBlock+(nMNPIPeriod* 7):
+        ret += int(blockValue / 40)
+    if nHeight > nMNPIBlock+(nMNPIPeriod* 9):
+        ret += int(blockValue / 40)
+
+    return ret
diff --git a/src/validation.cpp b/src/validation.cpp
index 405379aa32f7..47bb7676031d 100644
--- a/src/validation.cpp
+++ b/src/validation.cpp
@@ -3141,6 +3141,7 @@ bool InvalidateBlock(CValidationState& state, const CChainParams& chainparams, C
 
     InvalidChainFound(pindex);
     mempool.removeForReorg(pcoinsTip, chainActive.Tip()->nHeight + 1, STANDARD_LOCKTIME_VERIFY_FLAGS);
+    GetMainSignals().UpdatedBlockTip(chainActive.Tip(), NULL, IsInitialBlockDownload());
     uiInterface.NotifyBlockTip(IsInitialBlockDownload(), pindex->pprev);
     return true;
 }

From 6b3d650280f98496afb6700d49a442f263bd1ecd Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Tue, 11 Sep 2018 16:33:07 +0200
Subject: [PATCH 135/400] After DIP3 activation, allow voting with voting keys
 stored in your wallet (#2281)

* Implement temporary solution to allow voting with owner keys from your wallet

Will later be removed and properly reimplemented when cleaning up
legacy masternode code

* When MN keys from masternode.conf are used, only allow voting when they match with keyIDVoting
---
 src/rpc/governance.cpp | 84 +++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 83 insertions(+), 1 deletion(-)

diff --git a/src/rpc/governance.cpp b/src/rpc/governance.cpp
index f200400b9b5e..52ae2bb27ddf 100644
--- a/src/rpc/governance.cpp
+++ b/src/rpc/governance.cpp
@@ -362,6 +362,16 @@ UniValue gobject_vote_conf(const JSONRPCRequest& request)
         throw JSONRPCError(RPC_INVALID_PARAMETER, "Invalid vote outcome. Please use one of the following: 'yes', 'no' or 'abstain'");
     }
 
+    int govObjType;
+    {
+        LOCK(governance.cs);
+        CGovernanceObject *pGovObj = governance.FindGovernanceObject(hash);
+        if (!pGovObj) {
+            throw JSONRPCError(RPC_INVALID_PARAMETER, "Governance object not found");
+        }
+        govObjType = pGovObj->GetObjectType();
+    }
+
     int nSuccessful = 0;
     int nFailed = 0;
 
@@ -383,6 +393,18 @@ UniValue gobject_vote_conf(const JSONRPCRequest& request)
         return returnObj;
     }
 
+    if (deterministicMNManager->IsDeterministicMNsSporkActive()) {
+        if (govObjType == GOVERNANCE_OBJECT_PROPOSAL && mn.keyIDVoting != activeMasternodeInfo.keyIDOperator) {
+            nFailed++;
+            statusObj.push_back(Pair("result", "failed"));
+            statusObj.push_back(Pair("errorMessage", "Can't vote on proposal when operator key does not match voting key"));
+            resultsObj.push_back(Pair("dash.conf", statusObj));
+            returnObj.push_back(Pair("overall", strprintf("Voted successfully %d time(s) and failed %d time(s).", nSuccessful, nFailed)));
+            returnObj.push_back(Pair("detail", resultsObj));
+            return returnObj;
+        }
+    }
+
     CGovernanceVote vote(mn.outpoint, hash, eVoteSignal, eVoteOutcome);
     if (!vote.Sign(activeMasternodeInfo.keyOperator, activeMasternodeInfo.keyIDOperator)) {
         nFailed++;
@@ -416,6 +438,16 @@ UniValue VoteWithMasternodeList(const std::vector<CMasternodeConfig::CMasternode
                                 const uint256& hash, vote_signal_enum_t eVoteSignal,
                                 vote_outcome_enum_t eVoteOutcome)
 {
+    int govObjType;
+    {
+        LOCK(governance.cs);
+        CGovernanceObject *pGovObj = governance.FindGovernanceObject(hash);
+        if (!pGovObj) {
+            throw JSONRPCError(RPC_INVALID_PARAMETER, "Governance object not found");
+        }
+        govObjType = pGovObj->GetObjectType();
+    }
+
     int nSuccessful = 0;
     int nFailed = 0;
 
@@ -456,6 +488,16 @@ UniValue VoteWithMasternodeList(const std::vector<CMasternodeConfig::CMasternode
             continue;
         }
 
+        if (deterministicMNManager->IsDeterministicMNsSporkActive()) {
+            if (govObjType == GOVERNANCE_OBJECT_PROPOSAL && mn.keyIDVoting != pubKeyOperator.GetID()) {
+                nFailed++;
+                statusObj.push_back(Pair("result", "failed"));
+                statusObj.push_back(Pair("errorMessage", "Can't vote on proposal when key does not match voting key"));
+                resultsObj.push_back(Pair(mne.getAlias(), statusObj));
+                continue;
+            }
+        }
+
         CGovernanceVote vote(mn.outpoint, hash, eVoteSignal, eVoteOutcome);
         if (!vote.Sign(keyOperator, pubKeyOperator.GetID())) {
             nFailed++;
@@ -518,7 +560,47 @@ UniValue gobject_vote_many(const JSONRPCRequest& request)
         throw JSONRPCError(RPC_INVALID_PARAMETER, "Invalid vote outcome. Please use one of the following: 'yes', 'no' or 'abstain'");
     }
 
-    return VoteWithMasternodeList(masternodeConfig.getEntries(), hash, eVoteSignal, eVoteOutcome);
+    std::vector<CMasternodeConfig::CMasternodeEntry> entries = masternodeConfig.getEntries();
+
+#ifdef ENABLE_WALLET
+    // This is a hack to maintain code-level backwards compatibility with masternode.conf and the deterministic masternodes.
+    // Deterministic masternode keys are managed inside the wallet instead of masternode.conf
+    // This allows voting on proposals when you have the MN voting key in your wallet
+    // We can remove this when we remove support for masternode.conf and only support wallet based masternode
+    // management
+    if (deterministicMNManager->IsDeterministicMNsSporkActive()) {
+        auto mnList = deterministicMNManager->GetListAtChainTip();
+        for (const auto &dmn : mnList.valid_range()) {
+            bool found = false;
+            for (const auto &mne : entries) {
+                uint256 nTxHash;
+                nTxHash.SetHex(mne.getTxHash());
+
+                int nOutputIndex = 0;
+                if(!ParseInt32(mne.getOutputIndex(), &nOutputIndex)) {
+                    continue;
+                }
+
+                if (nTxHash == dmn->proTxHash && (uint32_t)nOutputIndex == dmn->nCollateralIndex) {
+                    found = true;
+                    break;
+                }
+            }
+            if (found) {
+                continue;
+            }
+
+            CKey ownerKey;
+            if (pwalletMain->GetKey(dmn->pdmnState->keyIDVoting, ownerKey)) {
+                CBitcoinSecret secret(ownerKey);
+                CMasternodeConfig::CMasternodeEntry mne(dmn->proTxHash.ToString(), dmn->pdmnState->addr.ToStringIPPort(false), secret.ToString(), dmn->proTxHash.ToString(), itostr(dmn->nCollateralIndex));
+                entries.push_back(mne);
+            }
+        }
+    }
+#endif
+
+    return VoteWithMasternodeList(entries, hash, eVoteSignal, eVoteOutcome);
 }
 
 void gobject_vote_alias_help()

From 28e0476f4c53a103a955e6cfe0899e571c2e139d Mon Sep 17 00:00:00 2001
From: UdjinM6 <UdjinM6@users.noreply.github.com>
Date: Tue, 11 Sep 2018 21:33:06 +0300
Subject: [PATCH 136/400] Squash two logic branches in SubmitDenominate into
 one (#2270)

---
 src/privatesend-client.cpp | 53 +++++++++++++++++---------------------
 1 file changed, 23 insertions(+), 30 deletions(-)

diff --git a/src/privatesend-client.cpp b/src/privatesend-client.cpp
index dd4cf61c34ec..91a781a208d9 100644
--- a/src/privatesend-client.cpp
+++ b/src/privatesend-client.cpp
@@ -1175,6 +1175,17 @@ void CPrivateSendClientManager::ProcessPendingDsaRequest(CConnman& connman)
 
 bool CPrivateSendClientSession::SubmitDenominate(CConnman& connman)
 {
+    // This is just a local helper
+    auto GetStartRound = [](bool fMixLowest, bool fScanFromTheMiddle) -> int
+    {
+        if (fScanFromTheMiddle) {
+            return privateSendClient.nPrivateSendRounds / 2;
+        } else if (!fMixLowest) {
+            return privateSendClient.nPrivateSendRounds - 1;
+        }
+        return 0;
+    };
+
     LOCK2(cs_main, pwalletMain->cs_wallet);
 
     std::string strError;
@@ -1182,44 +1193,26 @@ bool CPrivateSendClientSession::SubmitDenominate(CConnman& connman)
     std::vector<CTxOut> vecTxOutRet;
     // lean towards "highest" branch but still mix via "lowest" one someties
     bool fMixLowest = privateSendClient.nLiquidityProvider || (GetRandInt(4) == 0);
+    // Try to use only inputs with the same number of rounds, from low to high, or vice versa
+    int nLoopStep = fMixLowest ? 1 : -1;
     // lean towards edges but still mix starting from the middle someties
     // Note: liqudity providers always start from 0
     bool fScanFromTheMiddle = (privateSendClient.nLiquidityProvider == 0) && (GetRandInt(4) == 0);
 
-    int nRoundStart{0};
-    if (fScanFromTheMiddle) {
-        nRoundStart = privateSendClient.nPrivateSendRounds / 2;
-    } else if (!fMixLowest) {
-        nRoundStart = privateSendClient.nPrivateSendRounds - 1;
-    }
+    int nRoundStart = GetStartRound(fMixLowest, fScanFromTheMiddle);
+    int nRoundEdge = GetStartRound(fMixLowest, false);
 
     // Submit transaction to the pool if we get here
-    if (fMixLowest) {
-        // Try to use only inputs with the same number of rounds, from low to high
-        while (true) {
-            for(int i = nRoundStart; i < privateSendClient.nPrivateSendRounds; i++) {
-                if(PrepareDenominate(i, i, strError, vecTxDSInRet, vecTxOutRet)) {
-                    LogPrintf("CPrivateSendClientSession::SubmitDenominate -- Running PrivateSend denominate for %d rounds, success\n", i);
-                    return SendDenominate(vecTxDSInRet, vecTxOutRet, connman);
-                }
-                LogPrint("privatesend", "CPrivateSendClientSession::SubmitDenominate -- Running PrivateSend denominate for %d rounds, error: %s\n", i, strError);
-            }
-            if (nRoundStart == 0) break;
-            nRoundStart = 0;
-        }
-    } else {
-        // Try to use only inputs with the same number of rounds, from high to low
-        while (true) {
-            for(int i = nRoundStart; i > 0; i--) {
-                if(PrepareDenominate(i, i, strError, vecTxDSInRet, vecTxOutRet)) {
-                    LogPrintf("CPrivateSendClientSession::SubmitDenominate -- Running PrivateSend denominate for %d rounds, success\n", i);
-                    return SendDenominate(vecTxDSInRet, vecTxOutRet, connman);
-                }
-                LogPrint("privatesend", "CPrivateSendClientSession::SubmitDenominate -- Running PrivateSend denominate for %d rounds, error: %s\n", i, strError);
+    while (true) {
+        for (int i = nRoundStart; i >= 0 && i < privateSendClient.nPrivateSendRounds; i += nLoopStep) {
+            if (PrepareDenominate(i, i, strError, vecTxDSInRet, vecTxOutRet)) {
+                LogPrintf("CPrivateSendClientSession::SubmitDenominate -- Running PrivateSend denominate for %d rounds, success\n", i);
+                return SendDenominate(vecTxDSInRet, vecTxOutRet, connman);
             }
-            if (nRoundStart == privateSendClient.nPrivateSendRounds) break;
-            nRoundStart = privateSendClient.nPrivateSendRounds;
+            LogPrint("privatesend", "CPrivateSendClientSession::SubmitDenominate -- Running PrivateSend denominate for %d rounds, error: %s\n", i, strError);
         }
+        if (nRoundStart == nRoundEdge) break;
+        nRoundStart = nRoundEdge;
     }
 
     // We failed? That's strange but let's just make final attempt and try to mix everything

From 1e74bcace927bbd0566453650b0d83d4acb87046 Mon Sep 17 00:00:00 2001
From: PastaPastaPasta <pasta@dashboost.org>
Date: Wed, 12 Sep 2018 06:12:44 -0500
Subject: [PATCH 137/400] [ZMQ] Notify when an IS double spend is attempted
 (#2262)

* Implement IS Double spend notifications in zmq

* copy/paste error

* typo

* Send both conflicting and conflicts against as ZMQ notifications

* CTransaction based not hash based

* @UdjinM6 requested changes
---
 contrib/zmq/zmq_sub.py               |  9 ++++++++-
 doc/zmq.md                           |  2 ++
 src/init.cpp                         |  2 ++
 src/instantx.cpp                     |  8 +++++++-
 src/validationinterface.cpp          |  3 +++
 src/validationinterface.h            |  3 +++
 src/zmq/zmqabstractnotifier.cpp      |  5 +++++
 src/zmq/zmqabstractnotifier.h        |  1 +
 src/zmq/zmqconfig.h                  |  2 ++
 src/zmq/zmqnotificationinterface.cpp | 15 +++++++++++++++
 src/zmq/zmqnotificationinterface.h   |  1 +
 src/zmq/zmqpublishnotifier.cpp       | 26 ++++++++++++++++++++++++++
 src/zmq/zmqpublishnotifier.h         | 12 ++++++++++++
 13 files changed, 87 insertions(+), 2 deletions(-)

diff --git a/contrib/zmq/zmq_sub.py b/contrib/zmq/zmq_sub.py
index 7fbfbbd005e6..fa15f1285c4b 100755
--- a/contrib/zmq/zmq_sub.py
+++ b/contrib/zmq/zmq_sub.py
@@ -16,11 +16,13 @@
 zmqSubSocket.setsockopt(zmq.SUBSCRIBE, b"hashtxlock")
 zmqSubSocket.setsockopt(zmq.SUBSCRIBE, b"hashgovernancevote")
 zmqSubSocket.setsockopt(zmq.SUBSCRIBE, b"hashgovernanceobject")
+zmqSubSocket.setsockopt(zmq.SUBSCRIBE, b"hashinstantsenddoublespend")
 zmqSubSocket.setsockopt(zmq.SUBSCRIBE, b"rawblock")
 zmqSubSocket.setsockopt(zmq.SUBSCRIBE, b"rawtx")
 zmqSubSocket.setsockopt(zmq.SUBSCRIBE, b"rawtxlock")
 zmqSubSocket.setsockopt(zmq.SUBSCRIBE, b"rawgovernancevote")
 zmqSubSocket.setsockopt(zmq.SUBSCRIBE, b"rawgovernanceobject")
+zmqSubSocket.setsockopt(zmq.SUBSCRIBE, b"rawinstantsenddoublespend")
 zmqSubSocket.connect("tcp://127.0.0.1:%i" % port)
 
 try:
@@ -52,6 +54,9 @@
         elif topic == "rawtxlock":
             print('- RAW TX LOCK ('+sequence+') -')
             print(binascii.hexlify(body).decode("utf-8"))
+        elif topic == "rawinstantsenddoublespend":
+            print('- RAW IS DOUBLE SPEND ('+sequence+') -')
+            print(binascii.hexlify(body).decode("utf-8"))
         elif topic == "hashgovernancevote":
             print('- HASH GOVERNANCE VOTE ('+sequence+') -')
             print(binascii.hexlify(body).decode("utf-8"))
@@ -64,7 +69,9 @@
         elif topic == "rawgovernanceobject":
             print('- RAW GOVERNANCE OBJECT ('+sequence+') -')
             print(binascii.hexlify(body).decode("utf-8"))
-
+        elif topic == "hashinstantsenddoublespend":
+            print('- HASH IS DOUBLE SPEND ('+sequence+') -')
+            print(binascii.hexlify(body).decode("utf-8"))
 
 except KeyboardInterrupt:
     zmqContext.destroy()
diff --git a/doc/zmq.md b/doc/zmq.md
index 489ab549a018..627f46c2d1a0 100644
--- a/doc/zmq.md
+++ b/doc/zmq.md
@@ -66,6 +66,8 @@ Currently, the following notifications are supported:
     -zmqpubhashgovernanceobject=address
     -zmqpubrawgovernancevote=address
     -zmqpubhashgovernanceobject=address
+    -zmqpubrawinstantsenddoublespend=address
+    -zmqpubhashinstantsenddoublespend=address
 
 The socket type is PUB and the address must be a valid ZeroMQ socket
 address. The same address can be used in more than one notification.
diff --git a/src/init.cpp b/src/init.cpp
index c66e0039d53d..6d5d7c235a7b 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -508,9 +508,11 @@ std::string HelpMessage(HelpMessageMode mode)
     strUsage += HelpMessageOpt("-zmqpubhashtxlock=<address>", _("Enable publish hash transaction (locked via InstantSend) in <address>"));
     strUsage += HelpMessageOpt("-zmqpubhashgovernancevote=<address>", _("Enable publish hash of governance votes in <address>"));
     strUsage += HelpMessageOpt("-zmqpubhashgovernanceobject=<address>", _("Enable publish hash of governance objects (like proposals) in <address>"));
+    strUsage += HelpMessageOpt("-zmqpubhashinstantsenddoublespend=<address>", _("Enable publish transaction hashes of attempted InstantSend double spend in <address>"));
     strUsage += HelpMessageOpt("-zmqpubrawblock=<address>", _("Enable publish raw block in <address>"));
     strUsage += HelpMessageOpt("-zmqpubrawtx=<address>", _("Enable publish raw transaction in <address>"));
     strUsage += HelpMessageOpt("-zmqpubrawtxlock=<address>", _("Enable publish raw transaction (locked via InstantSend) in <address>"));
+    strUsage += HelpMessageOpt("-zmqpubrawinstantsenddoublespend=<address>", _("Enable publish raw transactions of attempted InstantSend double spend in <address>"));
 #endif
 
     strUsage += HelpMessageGroup(_("Debugging/Testing options:"));
diff --git a/src/instantx.cpp b/src/instantx.cpp
index dc5431684bb6..79412272b6f6 100644
--- a/src/instantx.cpp
+++ b/src/instantx.cpp
@@ -117,7 +117,13 @@ bool CInstantSend::ProcessTxLockRequest(const CTxLockRequest& txLockRequest, CCo
                 if(hash != txLockRequest.GetHash()) {
                     LogPrint("instantsend", "CInstantSend::ProcessTxLockRequest -- Double spend attempt! %s\n", txin.prevout.ToStringShort());
                     // do not fail here, let it go and see which one will get the votes to be locked
-                    // TODO: notify zmq+script
+                    // NOTIFY ZMQ
+                    CTransaction txCurrent = *txLockRequest.tx; // currently processed tx
+                    auto itPrevious = mapTxLockCandidates.find(hash);
+                    if (itPrevious != mapTxLockCandidates.end() && itPrevious->second.txLockRequest) {
+                        CTransaction txPrevious = *itPrevious->second.txLockRequest.tx; // previously locked one
+                        GetMainSignals().NotifyInstantSendDoubleSpendAttempt(txCurrent, txPrevious);
+                    }
                 }
             }
         }
diff --git a/src/validationinterface.cpp b/src/validationinterface.cpp
index 436cedf1019c..26b08647da2b 100644
--- a/src/validationinterface.cpp
+++ b/src/validationinterface.cpp
@@ -28,6 +28,7 @@ void RegisterValidationInterface(CValidationInterface* pwalletIn) {
     g_signals.NewPoWValidBlock.connect(boost::bind(&CValidationInterface::NewPoWValidBlock, pwalletIn, _1, _2));
     g_signals.NotifyGovernanceObject.connect(boost::bind(&CValidationInterface::NotifyGovernanceObject, pwalletIn, _1));
     g_signals.NotifyGovernanceVote.connect(boost::bind(&CValidationInterface::NotifyGovernanceVote, pwalletIn, _1));
+    g_signals.NotifyInstantSendDoubleSpendAttempt.connect(boost::bind(&CValidationInterface::NotifyInstantSendDoubleSpendAttempt, pwalletIn, _1, _2));
 }
 
 void UnregisterValidationInterface(CValidationInterface* pwalletIn) {
@@ -46,6 +47,7 @@ void UnregisterValidationInterface(CValidationInterface* pwalletIn) {
     g_signals.AcceptedBlockHeader.disconnect(boost::bind(&CValidationInterface::AcceptedBlockHeader, pwalletIn, _1));
     g_signals.NotifyGovernanceObject.disconnect(boost::bind(&CValidationInterface::NotifyGovernanceObject, pwalletIn, _1));
     g_signals.NotifyGovernanceVote.disconnect(boost::bind(&CValidationInterface::NotifyGovernanceVote, pwalletIn, _1));
+    g_signals.NotifyInstantSendDoubleSpendAttempt.disconnect(boost::bind(&CValidationInterface::NotifyInstantSendDoubleSpendAttempt, pwalletIn, _1, _2));
 }
 
 void UnregisterAllValidationInterfaces() {
@@ -64,4 +66,5 @@ void UnregisterAllValidationInterfaces() {
     g_signals.AcceptedBlockHeader.disconnect_all_slots();
     g_signals.NotifyGovernanceObject.disconnect_all_slots();
     g_signals.NotifyGovernanceVote.disconnect_all_slots();
+    g_signals.NotifyInstantSendDoubleSpendAttempt.disconnect_all_slots();
 }
diff --git a/src/validationinterface.h b/src/validationinterface.h
index 8ce15b30cd5f..f5f5df31c043 100644
--- a/src/validationinterface.h
+++ b/src/validationinterface.h
@@ -40,6 +40,7 @@ class CValidationInterface {
     virtual void NotifyTransactionLock(const CTransaction &tx) {}
     virtual void NotifyGovernanceVote(const CGovernanceVote &vote) {}
     virtual void NotifyGovernanceObject(const CGovernanceObject &object) {}
+    virtual void NotifyInstantSendDoubleSpendAttempt(const CTransaction &currentTx, const CTransaction &previousTx) {}
     virtual void SetBestChain(const CBlockLocator &locator) {}
     virtual bool UpdatedTransaction(const uint256 &hash) { return false;}
     virtual void Inventory(const uint256 &hash) {}
@@ -77,6 +78,8 @@ struct CMainSignals {
     boost::signals2::signal<void (const CGovernanceVote &)> NotifyGovernanceVote;
     /** Notifies listeners of a new governance object. */
     boost::signals2::signal<void (const CGovernanceObject &)> NotifyGovernanceObject;
+    /** Notifies listeners of a attempted InstantSend double spend*/
+    boost::signals2::signal<void(const CTransaction &currentTx, const CTransaction &previousTx)> NotifyInstantSendDoubleSpendAttempt;
     /** Notifies listeners of an updated transaction without new data (for now: a coinbase potentially becoming visible). */
     boost::signals2::signal<bool (const uint256 &)> UpdatedTransaction;
     /** Notifies listeners of a new active block chain. */
diff --git a/src/zmq/zmqabstractnotifier.cpp b/src/zmq/zmqabstractnotifier.cpp
index ea993d6061bc..6e280eefeae9 100644
--- a/src/zmq/zmqabstractnotifier.cpp
+++ b/src/zmq/zmqabstractnotifier.cpp
@@ -35,3 +35,8 @@ bool CZMQAbstractNotifier::NotifyGovernanceObject(const CGovernanceObject& /*obj
 {
     return true;
 }
+
+bool CZMQAbstractNotifier::NotifyInstantSendDoubleSpendAttempt(const CTransaction& /*currentTx*/, const CTransaction& /*previousTx*/)
+{
+    return true;
+}
diff --git a/src/zmq/zmqabstractnotifier.h b/src/zmq/zmqabstractnotifier.h
index ee6aa3ad7e2c..6ce9d12531bf 100644
--- a/src/zmq/zmqabstractnotifier.h
+++ b/src/zmq/zmqabstractnotifier.h
@@ -39,6 +39,7 @@ class CZMQAbstractNotifier
     virtual bool NotifyTransactionLock(const CTransaction &transaction);
     virtual bool NotifyGovernanceVote(const CGovernanceVote &vote);
     virtual bool NotifyGovernanceObject(const CGovernanceObject &object);
+    virtual bool NotifyInstantSendDoubleSpendAttempt(const CTransaction &currentTx, const CTransaction &previousTx);
 
 
 protected:
diff --git a/src/zmq/zmqconfig.h b/src/zmq/zmqconfig.h
index b7168c962dcb..c1a8e6c3f651 100644
--- a/src/zmq/zmqconfig.h
+++ b/src/zmq/zmqconfig.h
@@ -22,6 +22,8 @@
 #include "governance-object.h"
 #include "governance-vote.h"
 
+#include "instantx.h"
+
 void zmqError(const char *str);
 
 #endif // BITCOIN_ZMQ_ZMQCONFIG_H
diff --git a/src/zmq/zmqnotificationinterface.cpp b/src/zmq/zmqnotificationinterface.cpp
index 7895f17aaa8b..8a15fd1a9e1d 100644
--- a/src/zmq/zmqnotificationinterface.cpp
+++ b/src/zmq/zmqnotificationinterface.cpp
@@ -40,11 +40,13 @@ CZMQNotificationInterface* CZMQNotificationInterface::Create()
     factories["pubhashtxlock"] = CZMQAbstractNotifier::Create<CZMQPublishHashTransactionLockNotifier>;
     factories["pubhashgovernancevote"] = CZMQAbstractNotifier::Create<CZMQPublishHashGovernanceVoteNotifier>;
     factories["pubhashgovernanceobject"] = CZMQAbstractNotifier::Create<CZMQPublishHashGovernanceObjectNotifier>;
+    factories["pubhashinstantsenddoublespend"] = CZMQAbstractNotifier::Create<CZMQPublishHashInstantSendDoubleSpendNotifier>;
     factories["pubrawblock"] = CZMQAbstractNotifier::Create<CZMQPublishRawBlockNotifier>;
     factories["pubrawtx"] = CZMQAbstractNotifier::Create<CZMQPublishRawTransactionNotifier>;
     factories["pubrawtxlock"] = CZMQAbstractNotifier::Create<CZMQPublishRawTransactionLockNotifier>;
     factories["pubrawgovernancevote"] = CZMQAbstractNotifier::Create<CZMQPublishRawGovernanceVoteNotifier>;
     factories["pubrawgovernanceobject"] = CZMQAbstractNotifier::Create<CZMQPublishRawGovernanceObjectNotifier>;
+    factories["pubrawinstantsenddoublespend"] = CZMQAbstractNotifier::Create<CZMQPublishRawInstantSendDoubleSpendNotifier>;
 
     for (std::map<std::string, CZMQNotifierFactory>::const_iterator i=factories.begin(); i!=factories.end(); ++i)
     {
@@ -217,3 +219,16 @@ void CZMQNotificationInterface::NotifyGovernanceObject(const CGovernanceObject &
         }
     }
 }
+
+void CZMQNotificationInterface::NotifyInstantSendDoubleSpendAttempt(const CTransaction &currentTx, const CTransaction &previousTx)
+{
+    for (auto it = notifiers.begin(); it != notifiers.end();) {
+        CZMQAbstractNotifier *notifier = *it;
+        if (notifier->NotifyInstantSendDoubleSpendAttempt(currentTx, previousTx)) {
+            ++it;
+        } else {
+            notifier->Shutdown();
+            it = notifiers.erase(it);
+        }
+    }
+}
diff --git a/src/zmq/zmqnotificationinterface.h b/src/zmq/zmqnotificationinterface.h
index aeaed254a007..f552751e97d1 100644
--- a/src/zmq/zmqnotificationinterface.h
+++ b/src/zmq/zmqnotificationinterface.h
@@ -29,6 +29,7 @@ class CZMQNotificationInterface : public CValidationInterface
     void NotifyTransactionLock(const CTransaction &tx) override;
     void NotifyGovernanceVote(const CGovernanceVote& vote) override;
     void NotifyGovernanceObject(const CGovernanceObject& object) override;
+    void NotifyInstantSendDoubleSpendAttempt(const CTransaction &currentTx, const CTransaction &previousTx) override;
 
 
 private:
diff --git a/src/zmq/zmqpublishnotifier.cpp b/src/zmq/zmqpublishnotifier.cpp
index 8a6c4167d0c8..9f46331c0dba 100644
--- a/src/zmq/zmqpublishnotifier.cpp
+++ b/src/zmq/zmqpublishnotifier.cpp
@@ -15,11 +15,13 @@ static const char *MSG_HASHTX     = "hashtx";
 static const char *MSG_HASHTXLOCK = "hashtxlock";
 static const char *MSG_HASHGVOTE  = "hashgovernancevote";
 static const char *MSG_HASHGOBJ   = "hashgovernanceobject";
+static const char *MSG_HASHISCON  = "hashinstantsenddoublespend";
 static const char *MSG_RAWBLOCK   = "rawblock";
 static const char *MSG_RAWTX      = "rawtx";
 static const char *MSG_RAWTXLOCK  = "rawtxlock";
 static const char *MSG_RAWGVOTE   = "rawgovernancevote";
 static const char *MSG_RAWGOBJ    = "rawgovernanceobject";
+static const char *MSG_RAWISCON   = "rawinstantsenddoublespend";
 
 // Internal function to send multipart message
 static int zmq_send_multipart(void *sock, const void* data, size_t size, ...)
@@ -197,6 +199,20 @@ bool CZMQPublishHashGovernanceObjectNotifier::NotifyGovernanceObject(const CGove
     return SendMessage(MSG_HASHGOBJ, data, 32);
 }
 
+bool CZMQPublishHashInstantSendDoubleSpendNotifier::NotifyInstantSendDoubleSpendAttempt(const CTransaction &currentTx, const CTransaction &previousTx)
+{
+    uint256 currentHash = currentTx.GetHash(), previousHash = previousTx.GetHash();
+    LogPrint("zmq", "zmq: Publish hashinstantsenddoublespend %s conflicts against %s\n", currentHash.ToString(), previousHash.ToString());
+    char dataCurrentHash[32], dataPreviousHash[32];
+    for (unsigned int i = 0; i < 32; i++) {
+        dataCurrentHash[31 - i] = currentHash.begin()[i];
+        dataPreviousHash[31 - i] = previousHash.begin()[i];
+    }
+    return SendMessage(MSG_HASHISCON, dataCurrentHash, 32)
+        && SendMessage(MSG_HASHISCON, dataPreviousHash, 32);
+}
+
+
 bool CZMQPublishRawBlockNotifier::NotifyBlock(const CBlockIndex *pindex)
 {
     LogPrint("zmq", "zmq: Publish rawblock %s\n", pindex->GetBlockHash().GetHex());
@@ -253,3 +269,13 @@ bool CZMQPublishRawGovernanceObjectNotifier::NotifyGovernanceObject(const CGover
     ss << govobj;
     return SendMessage(MSG_RAWGOBJ, &(*ss.begin()), ss.size());
 }
+
+bool CZMQPublishRawInstantSendDoubleSpendNotifier::NotifyInstantSendDoubleSpendAttempt(const CTransaction &currentTx, const CTransaction &previousTx)
+{
+    LogPrint("zmq", "zmq: Publish rawinstantsenddoublespend %s conflicts with %s\n", currentTx.GetHash().ToString(), previousTx.GetHash().ToString());
+    CDataStream ssCurrent(SER_NETWORK, PROTOCOL_VERSION), ssPrevious(SER_NETWORK, PROTOCOL_VERSION);
+    ssCurrent << currentTx;
+    ssPrevious << previousTx;
+    return SendMessage(MSG_RAWISCON, &(*ssCurrent.begin()), ssCurrent.size())
+        && SendMessage(MSG_RAWISCON, &(*ssPrevious.begin()), ssPrevious.size());
+}
diff --git a/src/zmq/zmqpublishnotifier.h b/src/zmq/zmqpublishnotifier.h
index 31c90317d8c0..e51b6a314527 100644
--- a/src/zmq/zmqpublishnotifier.h
+++ b/src/zmq/zmqpublishnotifier.h
@@ -60,6 +60,12 @@ class CZMQPublishHashGovernanceObjectNotifier : public CZMQAbstractPublishNotifi
     bool NotifyGovernanceObject(const CGovernanceObject &object) override;
 };
 
+class CZMQPublishHashInstantSendDoubleSpendNotifier : public CZMQAbstractPublishNotifier
+{
+public:
+    bool NotifyInstantSendDoubleSpendAttempt(const CTransaction &currentTx, const CTransaction &previousTx) override;
+};
+
 class CZMQPublishRawBlockNotifier : public CZMQAbstractPublishNotifier
 {
 public:
@@ -89,4 +95,10 @@ class CZMQPublishRawGovernanceObjectNotifier : public CZMQAbstractPublishNotifie
 public:
     bool NotifyGovernanceObject(const CGovernanceObject &object) override;
 };
+
+class CZMQPublishRawInstantSendDoubleSpendNotifier : public CZMQAbstractPublishNotifier
+{
+public:
+    bool NotifyInstantSendDoubleSpendAttempt(const CTransaction &currentTx, const CTransaction &previousTx) override;
+};
 #endif // BITCOIN_ZMQ_ZMQPUBLISHNOTIFIER_H

From 2a95dd30c54601622e7d8e006d22c2cf83d4bdb4 Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Wed, 12 Sep 2018 13:13:00 +0200
Subject: [PATCH 138/400] Fix locking issues in DIP3 unit tests (#2285)

* Don't use GetTransaction in CheckProUpRegTx

GetTransaction locks mempool.cs internally. This brings messes up the locking
order of cs_main, mempool.cs and CCheckQueue::ControlMutex.

* Lock cs_main in TestChainSetup::CreateBlock when updating CbTx
---
 src/evo/providertx.cpp | 8 ++++----
 src/test/test_dash.cpp | 1 +
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/evo/providertx.cpp b/src/evo/providertx.cpp
index 8c35fc7bcf3a..08f6ba47230b 100644
--- a/src/evo/providertx.cpp
+++ b/src/evo/providertx.cpp
@@ -190,11 +190,11 @@ bool CheckProUpRegTx(const CTransaction& tx, const CBlockIndex* pindexPrev, CVal
 
         // This is a temporary restriction that will be lifted later
         // It is required while we are transitioning from the old MN list to the deterministic list
-        CTransactionRef proRegTx;
-        uint256 tmpHashBlock;
-        if (!GetTransaction(ptx.proTxHash, proRegTx, Params().GetConsensus(), tmpHashBlock))
+        Coin coin;
+        if (!GetUTXOCoin(COutPoint(dmn->proTxHash, dmn->nCollateralIndex), coin) || coin.IsSpent()) {
             return state.DoS(100, false, REJECT_INVALID, "bad-protx-payee-collateral");
-        if (proRegTx->vout[dmn->nCollateralIndex].scriptPubKey != ptx.scriptPayout)
+        }
+        if (coin.out.scriptPubKey != ptx.scriptPayout)
             return state.DoS(10, false, REJECT_INVALID, "bad-protx-payee-collateral");
 
         if (mnList.HasUniqueProperty(ptx.keyIDOperator)) {
diff --git a/src/test/test_dash.cpp b/src/test/test_dash.cpp
index a62d1b3191e5..2654382264d7 100644
--- a/src/test/test_dash.cpp
+++ b/src/test/test_dash.cpp
@@ -151,6 +151,7 @@ CBlock TestChainSetup::CreateBlock(const std::vector<CMutableTransaction>& txns,
 
     // Manually update CbTx as we modified the block here
     if (block.vtx[0]->nType == TRANSACTION_COINBASE) {
+        LOCK(cs_main);
         CCbTx cbTx;
         if (!GetTxPayload(*block.vtx[0], cbTx)) {
             BOOST_ASSERT(false);

From 8a878bfcfdacdaf1f6ec5dbb231508e5e23b0f09 Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Wed, 12 Sep 2018 13:13:17 +0200
Subject: [PATCH 139/400] Call InitializeCurrentBlockTip and
 activeMasternodeManager->Init after importing has finished (#2286)

While importing, IsInitialBlockDownload always returns true, meaning that
the call to UpdatedBlockTip will also receive true as fInitialDownload.

UpdatedBlockTip is never called again unless a block is mined.
Mining of new blocks in regtest however only starts after mnsync has
finished, which will never happen as it waits for the next call to
UpdatedBlockTip.
---
 src/init.cpp | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/src/init.cpp b/src/init.cpp
index 6d5d7c235a7b..8aaba5cc27f5 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -799,6 +799,15 @@ void ThreadImport(std::vector<boost::filesystem::path> vImportFiles)
         StartShutdown();
     }
     } // End scope of CImportingNow
+
+    // force UpdatedBlockTip to initialize nCachedBlockHeight for DS, MN payments and budgets
+    // but don't call it directly to prevent triggering of other listeners like zmq etc.
+    // GetMainSignals().UpdatedBlockTip(chainActive.Tip());
+    pdsNotificationInterface->InitializeCurrentBlockTip();
+
+    if (activeMasternodeManager && fDIP0003ActiveAtTip)
+        activeMasternodeManager->Init();
+
     LoadMempool();
     fDumpMempoolLater = !fRequestShutdown;
 }
@@ -2001,18 +2010,7 @@ bool AppInitMain(boost::thread_group& threadGroup, CScheduler& scheduler)
         }
     }
 
-
-    // ********************************************************* Step 11c: update block tip in Dash modules
-
-    // force UpdatedBlockTip to initialize nCachedBlockHeight for DS, MN payments and budgets
-    // but don't call it directly to prevent triggering of other listeners like zmq etc.
-    // GetMainSignals().UpdatedBlockTip(chainActive.Tip());
-    pdsNotificationInterface->InitializeCurrentBlockTip();
-
-    if (activeMasternodeManager && fDIP0003ActiveAtTip)
-        activeMasternodeManager->Init();
-
-    // ********************************************************* Step 11d: schedule Dash-specific tasks
+    // ********************************************************* Step 11c: schedule Dash-specific tasks
 
     if (!fLiteMode) {
         scheduler.scheduleEvery(boost::bind(&CNetFulfilledRequestManager::DoMaintenance, boost::ref(netfulfilledman)), 60);

From 6adc236d0e04051d388314153f8d06337c8ff55c Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Fri, 14 Sep 2018 17:53:09 +0200
Subject: [PATCH 140/400] Only use dataDir in CEvoDB when not in-memory (#2291)

---
 src/evo/evodb.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/evo/evodb.cpp b/src/evo/evodb.cpp
index c53b139e8407..5b91c3d2b3f4 100644
--- a/src/evo/evodb.cpp
+++ b/src/evo/evodb.cpp
@@ -7,7 +7,7 @@
 CEvoDB* evoDb;
 
 CEvoDB::CEvoDB(size_t nCacheSize, bool fMemory, bool fWipe) :
-        db(GetDataDir() / "evodb", nCacheSize, fMemory, fWipe),
+        db(fMemory ? "" : (GetDataDir() / "evodb"), nCacheSize, fMemory, fWipe),
         dbTransaction(db)
 {
 }

From 9d90b4fa477ad10c30a58ab129def0a4f35d6e32 Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Fri, 14 Sep 2018 17:53:26 +0200
Subject: [PATCH 141/400] Honor filterInventoryKnown for non-tx/non-block items
 (#2292)

---
 src/net.h              | 15 ++++++++++++---
 src/net_processing.cpp |  4 ++++
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/src/net.h b/src/net.h
index afbbc028796e..03ef7069c181 100644
--- a/src/net.h
+++ b/src/net.h
@@ -887,10 +887,15 @@ class CNode
 
 
     void AddInventoryKnown(const CInv& inv)
+    {
+        AddInventoryKnown(inv.hash);
+    }
+
+    void AddInventoryKnown(const uint256& hash)
     {
         {
             LOCK(cs_inventory);
-            filterInventoryKnown.insert(inv.hash);
+            filterInventoryKnown.insert(hash);
         }
     }
 
@@ -908,8 +913,12 @@ class CNode
             LogPrint("net", "PushInventory --  inv: %s peer=%d\n", inv.ToString(), id);
             vInventoryBlockToSend.push_back(inv.hash);
         } else {
-            LogPrint("net", "PushInventory --  inv: %s peer=%d\n", inv.ToString(), id);
-            vInventoryOtherToSend.push_back(inv);
+            if (!filterInventoryKnown.contains(inv.hash)) {
+                LogPrint("net", "PushInventory --  inv: %s peer=%d\n", inv.ToString(), id);
+                vInventoryOtherToSend.push_back(inv);
+            } else {
+                LogPrint("net", "PushInventory --  filtered inv: %s peer=%d\n", inv.ToString(), id);
+            }
         }
     }
 
diff --git a/src/net_processing.cpp b/src/net_processing.cpp
index 1a32aa25236a..b71c76d35a78 100644
--- a/src/net_processing.cpp
+++ b/src/net_processing.cpp
@@ -3431,7 +3431,11 @@ bool SendMessages(CNode* pto, CConnman& connman, const std::atomic<bool>& interr
 
             // Send non-tx/non-block inventory items
             for (const auto& inv : pto->vInventoryOtherToSend) {
+                if (pto->filterInventoryKnown.contains(inv.hash)) {
+                    continue;
+                }
                 vInv.push_back(inv);
+                pto->filterInventoryKnown.insert(inv.hash);
                 if (vInv.size() == MAX_INV_SZ) {
                     connman.PushMessage(pto, msgMaker.Make(NetMsgType::INV, vInv));
                     vInv.clear();

From 016681cd38a12fa4257e1227d247503636cf28d2 Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Fri, 14 Sep 2018 17:53:49 +0200
Subject: [PATCH 142/400] Add support for serialization of bitsets and tuples
 (#2293)

* Add serialization support for dynamic and fixed size bitsets

* Support serialization of std::tuple
---
 src/serialize.h | 108 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 108 insertions(+)

diff --git a/src/serialize.h b/src/serialize.h
index 555c8db59d18..37ffac5b7f8d 100644
--- a/src/serialize.h
+++ b/src/serialize.h
@@ -357,6 +357,8 @@ I ReadVarInt(Stream& is)
 }
 
 #define FLATDATA(obj) REF(CFlatData((char*)&(obj), (char*)&(obj) + sizeof(obj)))
+#define FIXEDBITSET(obj, size) REF(CFixedBitSet(REF(obj), (size)))
+#define DYNBITSET(obj) REF(CDynamicBitSet(REF(obj)))
 #define VARINT(obj) REF(WrapVarInt(REF(obj)))
 #define COMPACTSIZE(obj) REF(CCompactSize(REF(obj)))
 #define LIMITED_STRING(obj,n) REF(LimitedString< n >(REF(obj)))
@@ -401,6 +403,67 @@ class CFlatData
     }
 };
 
+class CFixedBitSet
+{
+protected:
+    std::vector<bool>& vec;
+    size_t size;
+
+public:
+    CFixedBitSet(std::vector<bool>& vecIn, size_t sizeIn) : vec(vecIn), size(sizeIn) {}
+
+    template<typename Stream>
+    void Serialize(Stream& s) const
+    {
+        std::vector<unsigned char> vBytes((size + 7) / 8);
+        size_t ms = std::min(size, vec.size());
+        for (size_t p = 0; p < ms; p++)
+            vBytes[p / 8] |= vec[p] << (p % 8);
+        s.write((char*)vBytes.data(), vBytes.size());
+    }
+
+    template<typename Stream>
+    void Unserialize(Stream& s)
+    {
+        vec.resize(size);
+
+        std::vector<unsigned char> vBytes((size + 7) / 8);
+        s.read((char*)vBytes.data(), vBytes.size());
+        for (size_t p = 0; p < size; p++)
+            vec[p] = (vBytes[p / 8] & (1 << (p % 8))) != 0;
+        if (vBytes.size() * 8 != size) {
+            size_t rem = vBytes.size() * 8 - size;
+            uint8_t m = (uint8_t)(0xff << rem);
+            if (vBytes[vBytes.size() - 1] & m) {
+                throw std::ios_base::failure("Out-of-range bits set");
+            }
+        }
+    }
+};
+
+class CDynamicBitSet
+{
+protected:
+    std::vector<bool>& vec;
+
+public:
+    explicit CDynamicBitSet(std::vector<bool>& vecIn) : vec(vecIn) {}
+
+    template<typename Stream>
+    void Serialize(Stream& s) const
+    {
+        WriteCompactSize(s, vec.size());
+        CFixedBitSet(REF(vec), vec.size()).Serialize(s);
+    }
+
+    template<typename Stream>
+    void Unserialize(Stream& s)
+    {
+        vec.resize(ReadCompactSize(s));
+        CFixedBitSet(vec, vec.size()).Unserialize(s);
+    }
+};
+
 template<typename I>
 class CVarInt
 {
@@ -512,6 +575,12 @@ template<typename Stream, typename T, typename A> inline void Unserialize(Stream
 template<typename Stream, typename K, typename T> void Serialize(Stream& os, const std::pair<K, T>& item);
 template<typename Stream, typename K, typename T> void Unserialize(Stream& is, std::pair<K, T>& item);
 
+/**
+ * pair
+ */
+template<typename Stream, typename... Elements> void Serialize(Stream& os, const std::tuple<Elements...>& item);
+template<typename Stream, typename... Elements> void Unserialize(Stream& is, std::tuple<Elements...>& item);
+
 /**
  * map
  */
@@ -732,6 +801,45 @@ void Unserialize(Stream& is, std::pair<K, T>& item)
     Unserialize(is, item.second);
 }
 
+/**
+ * tuple
+ */
+template<typename Stream, bool for_read, int index, typename... Ts>
+struct SerializeDeserializeTuple {
+    void operator() (Stream&s, std::tuple<Ts...>& t) {
+        SerializeDeserializeTuple<Stream, for_read, index - 1, Ts...>{}(s, t);
+        if (for_read) {
+            s >> std::get<index>(t);
+        } else {
+            s << std::get<index>(t);
+        }
+    }
+};
+
+template<typename Stream, bool for_read, typename... Ts>
+struct SerializeDeserializeTuple<Stream, for_read, 0, Ts...> {
+    void operator() (Stream&s, std::tuple<Ts...>& t) {
+        if (for_read) {
+            s >> std::get<0>(t);
+        } else {
+            s << std::get<0>(t);
+        }
+    }
+};
+
+template<typename Stream, typename... Elements>
+void Serialize(Stream& os, const std::tuple<Elements...>& item)
+{
+    const auto size = std::tuple_size<std::tuple<Elements...>>::value;
+    SerializeDeserializeTuple<Stream, false, size - 1, Elements...>{}(os, const_cast<std::tuple<Elements...>&>(item));
+}
+
+template<typename Stream, typename... Elements>
+void Unserialize(Stream& is, std::tuple<Elements...>& item)
+{
+    const auto size = std::tuple_size<std::tuple<Elements...>>::value;
+    SerializeDeserializeTuple<Stream, true, size - 1, Elements...>{}(is, item);
+}
 
 
 /**

From d192d642f6de45ae368e0ee1e98bcbcfb264ff20 Mon Sep 17 00:00:00 2001
From: UdjinM6 <UdjinM6@users.noreply.github.com>
Date: Sat, 15 Sep 2018 13:18:32 +0300
Subject: [PATCH 143/400] Move heavy coin selection out of the loop in
 SubmitDenominate (#2274)

* extend CTxOut constructor

* Move heavy coin selection out of the loop in SubmitDenominate
---
 src/primitives/transaction.cpp |   4 +-
 src/primitives/transaction.h   |   2 +-
 src/privatesend-client.cpp     | 176 ++++++++++++++-------------------
 src/privatesend-client.h       |   6 +-
 src/wallet/wallet.cpp          |  67 ++++++-------
 src/wallet/wallet.h            |   2 +-
 6 files changed, 110 insertions(+), 147 deletions(-)

diff --git a/src/primitives/transaction.cpp b/src/primitives/transaction.cpp
index 892cec4f690a..fd8e56ff5dea 100644
--- a/src/primitives/transaction.cpp
+++ b/src/primitives/transaction.cpp
@@ -48,11 +48,11 @@ std::string CTxIn::ToString() const
     return str;
 }
 
-CTxOut::CTxOut(const CAmount& nValueIn, CScript scriptPubKeyIn)
+CTxOut::CTxOut(const CAmount& nValueIn, CScript scriptPubKeyIn, int nRoundsIn)
 {
     nValue = nValueIn;
     scriptPubKey = scriptPubKeyIn;
-    nRounds = -10;
+    nRounds = nRoundsIn;
 }
 
 std::string CTxOut::ToString() const
diff --git a/src/primitives/transaction.h b/src/primitives/transaction.h
index e65795d19c19..30d95715331f 100644
--- a/src/primitives/transaction.h
+++ b/src/primitives/transaction.h
@@ -152,7 +152,7 @@ class CTxOut
         SetNull();
     }
 
-    CTxOut(const CAmount& nValueIn, CScript scriptPubKeyIn);
+    CTxOut(const CAmount& nValueIn, CScript scriptPubKeyIn, int nRoundsIn = -10);
 
     ADD_SERIALIZE_METHODS;
 
diff --git a/src/privatesend-client.cpp b/src/privatesend-client.cpp
index 91a781a208d9..975212600def 100644
--- a/src/privatesend-client.cpp
+++ b/src/privatesend-client.cpp
@@ -457,7 +457,7 @@ void CPrivateSendClientManager::CheckTimeout()
 // Execute a mixing denomination via a Masternode.
 // This is only ran from clients
 //
-bool CPrivateSendClientSession::SendDenominate(const std::vector<CTxDSIn>& vecTxDSIn, const std::vector<CTxOut>& vecTxOut, CConnman& connman)
+bool CPrivateSendClientSession::SendDenominate(const std::vector< std::pair<CTxDSIn, CTxOut> >& vecPSInOutPairsIn, CConnman& connman)
 {
     if(fMasternodeMode) {
         LogPrintf("CPrivateSendClientSession::SendDenominate -- PrivateSend from a Masternode is not supported currently.\n");
@@ -473,8 +473,8 @@ bool CPrivateSendClientSession::SendDenominate(const std::vector<CTxDSIn>& vecTx
     for (const auto& txin : txMyCollateral.vin)
         vecOutPointLocked.push_back(txin.prevout);
 
-    for (const auto& txdsin : vecTxDSIn)
-        vecOutPointLocked.push_back(txdsin.prevout);
+    for (const auto& pair : vecPSInOutPairsIn)
+        vecOutPointLocked.push_back(pair.first.prevout);
 
     // we should already be connected to a Masternode
     if(!nSessionID) {
@@ -498,28 +498,22 @@ bool CPrivateSendClientSession::SendDenominate(const std::vector<CTxDSIn>& vecTx
 
     LogPrintf("CPrivateSendClientSession::SendDenominate -- Added transaction to pool.\n");
 
-    {
-        // construct a pseudo tx, for debugging purpuses only
-
-        CMutableTransaction tx;
+    CMutableTransaction tx; // for debug purposes only
+    std::vector<CTxDSIn> vecTxDSInTmp;
+    std::vector<CTxOut> vecTxOutTmp;
 
-        for (const auto& txdsin : vecTxDSIn) {
-            LogPrint("privatesend", "CPrivateSendClientSession::SendDenominate -- txdsin=%s\n", txdsin.ToString());
-            tx.vin.push_back(txdsin);
-        }
-
-        for (const CTxOut& txout : vecTxOut) {
-            LogPrint("privatesend", "CPrivateSendClientSession::SendDenominate -- txout=%s\n", txout.ToString());
-            tx.vout.push_back(txout);
-        }
-
-        LogPrintf("CPrivateSendClientSession::SendDenominate -- Submitting partial tx %s", tx.ToString());
+    for (const auto& pair : vecPSInOutPairsIn) {
+        vecTxDSInTmp.emplace_back(pair.first);
+        vecTxOutTmp.emplace_back(pair.second);
+        tx.vin.emplace_back(pair.first);
+        tx.vout.emplace_back(pair.second);
     }
 
+    LogPrintf("CPrivateSendClientSession::SendDenominate -- Submitting partial tx %s", tx.ToString());
+
     // store our entry for later use
-    CDarkSendEntry entry(vecTxDSIn, vecTxOut, txMyCollateral);
-    vecEntries.push_back(entry);
-    RelayIn(entry, connman);
+    vecEntries.emplace_back(vecTxDSInTmp, vecTxOutTmp, txMyCollateral);
+    RelayIn(vecEntries.back(), connman);
     nTimeLastSuccessfulStep = GetTime();
 
     return true;
@@ -1029,14 +1023,12 @@ bool CPrivateSendClientSession::JoinExistingQueue(CAmount nBalanceNeedsAnonymize
 
         LogPrint("privatesend", "CPrivateSendClientSession::JoinExistingQueue -- found valid queue: %s\n", dsq.ToString());
 
-        CAmount nValueInTmp = 0;
-        std::vector<CTxDSIn> vecTxDSInTmp;
-        std::vector<COutput> vCoinsTmp;
+        std::vector< std::pair<CTxDSIn, CTxOut> > vecPSInOutPairsTmp;
         CAmount nMinAmount = vecStandardDenoms[vecBits.front()];
         CAmount nMaxAmount = nBalanceNeedsAnonymized;
 
         // Try to match their denominations if possible, select exact number of denominations
-        if(!pwalletMain->SelectCoinsByDenominations(dsq.nDenom, nMinAmount, nMaxAmount, vecTxDSInTmp, vCoinsTmp, nValueInTmp, 0, privateSendClient.nPrivateSendRounds - 1, true)) {
+        if (!pwalletMain->SelectPSInOutPairsByDenominations(dsq.nDenom, nMinAmount, nMaxAmount, vecPSInOutPairsTmp)) {
             LogPrintf("CPrivateSendClientSession::JoinExistingQueue -- Couldn't match %d denominations %d (%s)\n", vecBits.front(), dsq.nDenom, CPrivateSend::GetDenominationsToString(dsq.nDenom));
             continue;
         }
@@ -1189,8 +1181,13 @@ bool CPrivateSendClientSession::SubmitDenominate(CConnman& connman)
     LOCK2(cs_main, pwalletMain->cs_wallet);
 
     std::string strError;
-    std::vector<CTxDSIn> vecTxDSInRet;
-    std::vector<CTxOut> vecTxOutRet;
+    std::vector< std::pair<CTxDSIn, CTxOut> > vecPSInOutPairs, vecPSInOutPairsTmp;
+
+    if (!SelectDenominate(strError, vecPSInOutPairs)) {
+        LogPrintf("CPrivateSendClientSession::SubmitDenominate -- SelectDenominate failed, error: %s\n", strError);
+        return false;
+    }
+
     // lean towards "highest" branch but still mix via "lowest" one someties
     bool fMixLowest = privateSendClient.nLiquidityProvider || (GetRandInt(4) == 0);
     // Try to use only inputs with the same number of rounds, from low to high, or vice versa
@@ -1205,9 +1202,9 @@ bool CPrivateSendClientSession::SubmitDenominate(CConnman& connman)
     // Submit transaction to the pool if we get here
     while (true) {
         for (int i = nRoundStart; i >= 0 && i < privateSendClient.nPrivateSendRounds; i += nLoopStep) {
-            if (PrepareDenominate(i, i, strError, vecTxDSInRet, vecTxOutRet)) {
+            if (PrepareDenominate(i, i, strError, vecPSInOutPairs, vecPSInOutPairsTmp)) {
                 LogPrintf("CPrivateSendClientSession::SubmitDenominate -- Running PrivateSend denominate for %d rounds, success\n", i);
-                return SendDenominate(vecTxDSInRet, vecTxOutRet, connman);
+                return SendDenominate(vecPSInOutPairsTmp, connman);
             }
             LogPrint("privatesend", "CPrivateSendClientSession::SubmitDenominate -- Running PrivateSend denominate for %d rounds, error: %s\n", i, strError);
         }
@@ -1216,9 +1213,9 @@ bool CPrivateSendClientSession::SubmitDenominate(CConnman& connman)
     }
 
     // We failed? That's strange but let's just make final attempt and try to mix everything
-    if(PrepareDenominate(0, privateSendClient.nPrivateSendRounds - 1, strError, vecTxDSInRet, vecTxOutRet)) {
+    if (PrepareDenominate(0, privateSendClient.nPrivateSendRounds - 1, strError, vecPSInOutPairs, vecPSInOutPairsTmp)) {
         LogPrintf("CPrivateSendClientSession::SubmitDenominate -- Running PrivateSend denominate for all rounds, success\n");
-        return SendDenominate(vecTxDSInRet, vecTxOutRet, connman);
+        return SendDenominate(vecPSInOutPairsTmp, connman);
     }
 
     // Should never actually get here but just in case
@@ -1227,9 +1224,9 @@ bool CPrivateSendClientSession::SubmitDenominate(CConnman& connman)
     return false;
 }
 
-bool CPrivateSendClientSession::PrepareDenominate(int nMinRounds, int nMaxRounds, std::string& strErrorRet, std::vector<CTxDSIn>& vecTxDSInRet, std::vector<CTxOut>& vecTxOutRet)
+bool CPrivateSendClientSession::SelectDenominate(std::string& strErrorRet, std::vector< std::pair<CTxDSIn, CTxOut> >& vecPSInOutPairsRet)
 {
-    if(!pwalletMain) {
+    if (!pwalletMain) {
         strErrorRet = "Wallet is not initialized";
         return false;
     }
@@ -1244,101 +1241,76 @@ bool CPrivateSendClientSession::PrepareDenominate(int nMinRounds, int nMaxRounds
         return false;
     }
 
-    // make sure returning vectors are empty before filling them up
-    vecTxDSInRet.clear();
-    vecTxOutRet.clear();
-
-    // ** find the coins we'll use
-    std::vector<CTxDSIn> vecTxDSIn;
-    std::vector<COutput> vCoins;
-    CAmount nValueIn = 0;
+    vecPSInOutPairsRet.clear();
 
-    /*
-        Select the coins we'll use
-
-        if nMinRounds >= 0 it means only denominated inputs are going in and coming out
-    */
     std::vector<int> vecBits;
     if (!CPrivateSend::GetDenominationsBits(nSessionDenom, vecBits)) {
         strErrorRet = "Incorrect session denom";
         return false;
     }
     std::vector<CAmount> vecStandardDenoms = CPrivateSend::GetStandardDenominations();
-    bool fSelected = pwalletMain->SelectCoinsByDenominations(nSessionDenom, vecStandardDenoms[vecBits.front()], CPrivateSend::GetMaxPoolAmount(), vecTxDSIn, vCoins, nValueIn, nMinRounds, nMaxRounds, true);
-    if (nMinRounds >= 0 && !fSelected) {
+
+    bool fSelected = pwalletMain->SelectPSInOutPairsByDenominations(nSessionDenom, vecStandardDenoms[vecBits.front()], CPrivateSend::GetMaxPoolAmount(), vecPSInOutPairsRet);
+    if (!fSelected) {
         strErrorRet = "Can't select current denominated inputs";
         return false;
     }
 
-    LogPrintf("CPrivateSendClientSession::PrepareDenominate -- max value: %f\n", (double)nValueIn/COIN);
+    return true;
+}
 
-    {
-        LOCK(pwalletMain->cs_wallet);
-        for (const auto& txin : vecTxDSIn) {
-            pwalletMain->LockCoin(txin.prevout);
-        }
+bool CPrivateSendClientSession::PrepareDenominate(int nMinRounds, int nMaxRounds, std::string& strErrorRet, const std::vector< std::pair<CTxDSIn, CTxOut> >& vecPSInOutPairsIn, std::vector< std::pair<CTxDSIn, CTxOut> >& vecPSInOutPairsRet)
+{
+    std::vector<int> vecBits;
+    if (!CPrivateSend::GetDenominationsBits(nSessionDenom, vecBits)) {
+        strErrorRet = "Incorrect session denom";
+        return false;
     }
 
-    CAmount nValueLeft = nValueIn;
+    for (const auto& pair : vecPSInOutPairsIn) {
+        pwalletMain->LockCoin(pair.first.prevout);
+    }
 
     // Try to add every needed denomination, repeat up to 5-PRIVATESEND_ENTRY_MAX_SIZE times.
     // NOTE: No need to randomize order of inputs because they were
-    // initially shuffled in CWallet::SelectCoinsByDenominations already.
-    int nStep = 0;
+    // initially shuffled in CWallet::SelectPSInOutPairsByDenominations already.
     int nStepsMax = 5 + GetRandInt(PRIVATESEND_ENTRY_MAX_SIZE - 5 + 1);
+    int nDenomResult{0};
+
+    std::vector<CAmount> vecStandardDenoms = CPrivateSend::GetStandardDenominations();
+    std::vector<int> vecSteps(vecStandardDenoms.size(), 0);
+    vecPSInOutPairsRet.clear();
 
-    while (nStep < nStepsMax) {
+    for (const auto& pair: vecPSInOutPairsIn) {
+        if (pair.second.nRounds < nMinRounds || pair.second.nRounds > nMaxRounds) {
+            // unlock unused coins
+            pwalletMain->UnlockCoin(pair.first.prevout);
+            continue;
+        }
+        bool fFound = false;
         for (const auto& nBit : vecBits) {
+            if (vecSteps[nBit] >= nStepsMax) break;
             CAmount nValueDenom = vecStandardDenoms[nBit];
-            if (nValueLeft - nValueDenom < 0) continue;
-
-            // Note: this relies on a fact that both vectors MUST have same size
-            std::vector<CTxDSIn>::iterator it = vecTxDSIn.begin();
-            std::vector<COutput>::iterator it2 = vCoins.begin();
-            while (it2 != vCoins.end()) {
-                // we have matching inputs
-                if ((*it2).tx->tx->vout[(*it2).i].nValue == nValueDenom) {
-                    // add new input in resulting vector
-                    vecTxDSInRet.push_back(*it);
-                    // remove corresponding items from initial vectors
-                    vecTxDSIn.erase(it);
-                    vCoins.erase(it2);
-
-                    CScript scriptDenom = keyHolderStorage.AddKey(pwalletMain);
-
-                    // add new output
-                    CTxOut txout(nValueDenom, scriptDenom);
-                    vecTxOutRet.push_back(txout);
-
-                    // subtract denomination amount
-                    nValueLeft -= nValueDenom;
-
-                    // step is complete
-                    break;
-                }
-                ++it;
-                ++it2;
+            if (pair.second.nValue == nValueDenom) {
+                CScript scriptDenom = keyHolderStorage.AddKey(pwalletMain);
+                vecPSInOutPairsRet.emplace_back(pair.first, CTxOut(nValueDenom, scriptDenom));
+                fFound = true;
+                nDenomResult |= 1 << nBit;
+                // step is complete
+                ++vecSteps[nBit];
+                break;
             }
         }
-        nStep++;
-        if(nValueLeft == 0) break;
-    }
-
-    {
-        // unlock unused coins
-        LOCK(pwalletMain->cs_wallet);
-        for (const auto& txin : vecTxDSIn) {
-            pwalletMain->UnlockCoin(txin.prevout);
+        if (!fFound) {
+            // unlock unused coins
+            pwalletMain->UnlockCoin(pair.first.prevout);
         }
     }
 
-    if (CPrivateSend::GetDenominations(vecTxOutRet) != nSessionDenom) {
-        {
-            // unlock used coins on failure
-            LOCK(pwalletMain->cs_wallet);
-            for (const auto& txin : vecTxDSInRet) {
-                pwalletMain->UnlockCoin(txin.prevout);
-            }
+    if (nDenomResult != nSessionDenom) {
+        // unlock used coins on failure
+        for (const auto& pair : vecPSInOutPairsRet) {
+            pwalletMain->UnlockCoin(pair.first.prevout);
         }
         keyHolderStorage.ReturnAll();
         strErrorRet = "Can't prepare current denominated outputs";
diff --git a/src/privatesend-client.h b/src/privatesend-client.h
index 0d730c07f12a..90f6942f5974 100644
--- a/src/privatesend-client.h
+++ b/src/privatesend-client.h
@@ -106,10 +106,12 @@ class CPrivateSendClientSession : public CPrivateSendBaseSession
     bool JoinExistingQueue(CAmount nBalanceNeedsAnonymized, CConnman& connman);
     bool StartNewQueue(CAmount nValueMin, CAmount nBalanceNeedsAnonymized, CConnman& connman);
 
+    /// step 0: select denominated inputs and txouts
+    bool SelectDenominate(std::string& strErrorRet, std::vector< std::pair<CTxDSIn, CTxOut> >& vecPSInOutPairsRet);
     /// step 1: prepare denominated inputs and outputs
-    bool PrepareDenominate(int nMinRounds, int nMaxRounds, std::string& strErrorRet, std::vector<CTxDSIn>& vecTxDSInRet, std::vector<CTxOut>& vecTxOutRet);
+    bool PrepareDenominate(int nMinRounds, int nMaxRounds, std::string& strErrorRet, const std::vector< std::pair<CTxDSIn, CTxOut> >& vecPSInOutPairsIn, std::vector< std::pair<CTxDSIn, CTxOut> >& vecPSInOutPairsRet);
     /// step 2: send denominated inputs and outputs prepared in step 1
-    bool SendDenominate(const std::vector<CTxDSIn>& vecTxDSIn, const std::vector<CTxOut>& vecTxOut, CConnman& connman);
+    bool SendDenominate(const std::vector< std::pair<CTxDSIn, CTxOut> >& vecPSInOutPairsIn, CConnman& connman);
 
     /// Get Masternode updates about the progress of mixing
     bool CheckPoolStateUpdate(PoolState nStateNew, int nEntriesCountNew, PoolStatusUpdate nStatusUpdate, PoolMessage nMessageID, int nSessionIDNew=0);
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
index ba675ef19405..529b186e672f 100644
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -3007,63 +3007,52 @@ bool CWallet::FundTransaction(CMutableTransaction& tx, CAmount& nFeeRet, bool ov
     return true;
 }
 
-bool CWallet::SelectCoinsByDenominations(int nDenom, CAmount nValueMin, CAmount nValueMax, std::vector<CTxDSIn>& vecTxDSInRet, std::vector<COutput>& vCoinsRet, CAmount& nValueRet, int nPrivateSendRoundsMin, int nPrivateSendRoundsMax, bool fNoDuplicateTxIds)
+bool CWallet::SelectPSInOutPairsByDenominations(int nDenom, CAmount nValueMin, CAmount nValueMax, std::vector< std::pair<CTxDSIn, CTxOut> >& vecPSInOutPairsRet)
 {
-    std::set<uint256> setRecentTxIds;
-
-    vecTxDSInRet.clear();
-    vCoinsRet.clear();
-    nValueRet = 0;
+    CAmount nValueTotal{0};
+    int nDenomResult{0};
 
+    std::set<uint256> setRecentTxIds;
     std::vector<COutput> vCoins;
-    AvailableCoins(vCoins, true, NULL, false, ONLY_DENOMINATED);
 
-    std::random_shuffle(vCoins.rbegin(), vCoins.rend(), GetRandInt);
-
-    // ( bit on if present )
-    // bit 0 - 100DASH+1
-    // bit 1 - 10DASH+1
-    // bit 2 - 1DASH+1
-    // bit 3 - .1DASH+1
+    vecPSInOutPairsRet.clear();
 
     std::vector<int> vecBits;
     if (!CPrivateSend::GetDenominationsBits(nDenom, vecBits)) {
         return false;
     }
 
-    int nDenomResult = 0;
+    AvailableCoins(vCoins, true, NULL, false, ONLY_DENOMINATED);
+    LogPrintf("CWallet::%s -- vCoins.size(): %d\n", __func__, vCoins.size());
 
-    std::vector<CAmount> vecPrivateSendDenominations = CPrivateSend::GetStandardDenominations();
-    FastRandomContext insecure_rand;
-    for (const auto& out : vCoins)
-    {
-        // masternode-like input should not be selected by AvailableCoins now anyway
-        //if(out.tx->vout[out.i].nValue == 1000*COIN) continue;
-        if(fNoDuplicateTxIds && setRecentTxIds.find(out.tx->GetHash()) != setRecentTxIds.end()) continue;
-        if(nValueRet + out.tx->tx->vout[out.i].nValue <= nValueMax){
+    std::random_shuffle(vCoins.rbegin(), vCoins.rend(), GetRandInt);
 
-            CTxIn txin = CTxIn(out.tx->GetHash(), out.i);
+    std::vector<CAmount> vecPrivateSendDenominations = CPrivateSend::GetStandardDenominations();
+    for (const auto& out : vCoins) {
+        uint256 txHash = out.tx->GetHash();
+        int nValue = out.tx->tx->vout[out.i].nValue;
+        if (setRecentTxIds.find(txHash) != setRecentTxIds.end()) continue; // no duplicate txids
+        if (nValueTotal + nValue > nValueMax) continue;
 
-            int nRounds = GetCappedOutpointPrivateSendRounds(txin.prevout);
-            if(nRounds > nPrivateSendRoundsMax) continue;
-            if(nRounds < nPrivateSendRoundsMin) continue;
+        CTxIn txin = CTxIn(txHash, out.i);
+        CScript scriptPubKey = out.tx->tx->vout[out.i].scriptPubKey;
+        int nRounds = GetRealOutpointPrivateSendRounds(txin.prevout);
+        if (nRounds >= privateSendClient.nPrivateSendRounds) continue;
 
-            for (const auto& nBit : vecBits) {
-                if(out.tx->tx->vout[out.i].nValue == vecPrivateSendDenominations[nBit]) {
-                    nValueRet += out.tx->tx->vout[out.i].nValue;
-                    vecTxDSInRet.push_back(CTxDSIn(txin, out.tx->tx->vout[out.i].scriptPubKey));
-                    vCoinsRet.push_back(out);
-                    nDenomResult |= 1 << nBit;
-                    setRecentTxIds.emplace(out.tx->GetHash());
-                    LogPrint("privatesend", "CWallet::SelectCoinsByDenominations -- hash %s nValue %d\n", out.tx->GetHash().ToString(), out.tx->tx->vout[out.i].nValue);
-                }
-            }
+        for (const auto& nBit : vecBits) {
+            if (nValue != vecPrivateSendDenominations[nBit]) continue;
+            nValueTotal += nValue;
+            vecPSInOutPairsRet.emplace_back(CTxDSIn(txin, scriptPubKey), CTxOut(nValue, scriptPubKey, nRounds));
+            setRecentTxIds.emplace(txHash);
+            nDenomResult |= 1 << nBit;
+            LogPrint("privatesend", "CWallet::%s -- hash: %s, nValue: %d.%08d, nRounds: %d\n",
+                            __func__, txHash.ToString(), nValue / COIN, nValue % COIN, nRounds);
         }
     }
 
-    LogPrintf("CWallet::SelectCoinsByDenominations -- setRecentTxIds.size() %d\n", setRecentTxIds.size());
+    LogPrintf("CWallet::%s -- setRecentTxIds.size(): %d\n", __func__, setRecentTxIds.size());
 
-    return nValueRet >= nValueMin && nDenom == nDenomResult;
+    return nValueTotal >= nValueMin && nDenom == nDenomResult;
 }
 
 struct CompareByAmount
diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h
index 8fff1dbf5020..fad981547831 100644
--- a/src/wallet/wallet.h
+++ b/src/wallet/wallet.h
@@ -806,7 +806,7 @@ class CWallet : public CCryptoKeyStore, public CValidationInterface
     bool SelectCoinsMinConf(const CAmount& nTargetValue, int nConfMine, int nConfTheirs, uint64_t nMaxAncestors, std::vector<COutput> vCoins, std::set<std::pair<const CWalletTx*,unsigned int> >& setCoinsRet, CAmount& nValueRet, bool fUseInstantSend = false) const;
 
     // Coin selection
-    bool SelectCoinsByDenominations(int nDenom, CAmount nValueMin, CAmount nValueMax, std::vector<CTxDSIn>& vecTxDSInRet, std::vector<COutput>& vCoinsRet, CAmount& nValueRet, int nPrivateSendRoundsMin, int nPrivateSendRoundsMax, bool fNoDuplicateTxIds);
+    bool SelectPSInOutPairsByDenominations(int nDenom, CAmount nValueMin, CAmount nValueMax, std::vector< std::pair<CTxDSIn, CTxOut> >& vecPSInOutPairsRet);
     bool GetCollateralTxDSIn(CTxDSIn& txdsinRet, CAmount& nValueRet) const;
     bool SelectCoinsDark(CAmount nValueMin, CAmount nValueMax, std::vector<CTxIn>& vecTxInRet, CAmount& nValueRet, int nPrivateSendRoundsMin, int nPrivateSendRoundsMax) const;
 

From c6a0c554178cb7ed5f70717dac949572488f9ad5 Mon Sep 17 00:00:00 2001
From: UdjinM6 <UdjinM6@users.noreply.github.com>
Date: Sat, 15 Sep 2018 13:19:00 +0300
Subject: [PATCH 144/400] A couple of small fixes for mixing collaterals
 (#2294)

* No reasons to create mixing collaterals if we can't create denoms to mix

* Include non-anonymizable inputs when trying to make mixing collaterals
---
 src/privatesend-client.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/privatesend-client.cpp b/src/privatesend-client.cpp
index 975212600def..3f2552e8e1c2 100644
--- a/src/privatesend-client.cpp
+++ b/src/privatesend-client.cpp
@@ -1327,7 +1327,7 @@ bool CPrivateSendClientSession::MakeCollateralAmounts(CConnman& connman)
     if (!pwalletMain) return false;
 
     std::vector<CompactTallyItem> vecTally;
-    if(!pwalletMain->SelectCoinsGrouppedByAddresses(vecTally, false)) {
+    if(!pwalletMain->SelectCoinsGrouppedByAddresses(vecTally, false, false)) {
         LogPrint("privatesend", "CPrivateSendClientSession::MakeCollateralAmounts -- SelectCoinsGrouppedByAddresses can't find any inputs!\n");
         return false;
     }
@@ -1522,6 +1522,9 @@ bool CPrivateSendClientSession::CreateDenominated(const CompactTallyItem& tallyI
     } while (nOutputsTotal == 0 && !fSkip);
     LogPrintf("CPrivateSendClientSession::CreateDenominated -- 3 - nOutputsTotal: %d, nValueLeft: %f\n", nOutputsTotal, (float)nValueLeft/COIN);
 
+    // No reasons to create mixing collaterals if we can't create denoms to mix
+    if (nOutputsTotal == 0) return false;
+
     // if we have anything left over, it will be automatically send back as change - there is no need to send it manually
 
     CCoinControl coinControl;

From 76599aad3c415981a27ca1f4b81c591d91403bc4 Mon Sep 17 00:00:00 2001
From: UdjinM6 <UdjinM6@users.noreply.github.com>
Date: Sat, 15 Sep 2018 13:19:31 +0300
Subject: [PATCH 145/400] Drop (pre-)70208 compatibility code (#2295)

---
 src/governance-object.h     | 31 +------------
 src/governance-vote.h       | 16 +------
 src/masternode-payments.cpp |  6 ---
 src/masternode-payments.h   | 16 +------
 src/masternode-sync.cpp     | 14 +-----
 src/masternode.h            | 87 +++----------------------------------
 src/masternodeman.cpp       | 22 ++--------
 src/privatesend.h           | 31 +------------
 8 files changed, 18 insertions(+), 205 deletions(-)

diff --git a/src/governance-object.h b/src/governance-object.h
index a2b06411e159..12528286ed83 100644
--- a/src/governance-object.h
+++ b/src/governance-object.h
@@ -303,40 +303,13 @@ class CGovernanceObject
     inline void SerializationOp(Stream& s, Operation ser_action)
     {
         // SERIALIZE DATA FOR SAVING/LOADING OR NETWORK FUNCTIONS
-        int nVersion = s.GetVersion();
         READWRITE(nHashParent);
         READWRITE(nRevision);
         READWRITE(nTime);
         READWRITE(nCollateralHash);
-        if (nVersion == 70208 && (s.GetType() & SER_NETWORK)) {
-            // converting from/to old format
-            std::string strDataHex;
-            if (ser_action.ForRead()) {
-                READWRITE(LIMITED_STRING(strDataHex, MAX_GOVERNANCE_OBJECT_DATA_SIZE));
-                vchData = ParseHex(strDataHex);
-            } else {
-                strDataHex = HexStr(vchData);
-                READWRITE(LIMITED_STRING(strDataHex, MAX_GOVERNANCE_OBJECT_DATA_SIZE));
-            }
-        } else {
-            // using new format directly
-            READWRITE(vchData);
-        }
+        READWRITE(vchData);
         READWRITE(nObjectType);
-        if (nVersion == 70208 && (s.GetType() & SER_NETWORK)) {
-            // converting from/to old format
-            CTxIn txin;
-            if (ser_action.ForRead()) {
-                READWRITE(txin);
-                masternodeOutpoint = txin.prevout;
-            } else {
-                txin = CTxIn(masternodeOutpoint);
-                READWRITE(txin);
-            }
-        } else {
-            // using new format directly
-            READWRITE(masternodeOutpoint);
-        }
+        READWRITE(masternodeOutpoint);
         if (!(s.GetType() & SER_GETHASH)) {
             READWRITE(vchSig);
         }
diff --git a/src/governance-vote.h b/src/governance-vote.h
index 8e168df65a45..67b79ca3700b 100644
--- a/src/governance-vote.h
+++ b/src/governance-vote.h
@@ -116,21 +116,7 @@ class CGovernanceVote
 
     template <typename Stream, typename Operation>
     inline void SerializationOp(Stream& s, Operation ser_action) {
-        int nVersion = s.GetVersion();
-        if (nVersion == 70208 && (s.GetType() & SER_NETWORK)) {
-            // converting from/to old format
-            CTxIn txin{};
-            if (ser_action.ForRead()) {
-                READWRITE(txin);
-                masternodeOutpoint = txin.prevout;
-            } else {
-                txin = CTxIn(masternodeOutpoint);
-                READWRITE(txin);
-            }
-        } else {
-            // using new format directly
-            READWRITE(masternodeOutpoint);
-        }
+        READWRITE(masternodeOutpoint);
         READWRITE(nParentHash);
         READWRITE(nVoteOutcome);
         READWRITE(nVoteSignal);
diff --git a/src/masternode-payments.cpp b/src/masternode-payments.cpp
index 435d6deb061b..97ea640e5fa6 100644
--- a/src/masternode-payments.cpp
+++ b/src/masternode-payments.cpp
@@ -420,12 +420,6 @@ void CMasternodePayments::ProcessMessage(CNode* pfrom, const std::string& strCom
         // but this is a heavy one so it's better to finish sync first.
         if (!masternodeSync.IsSynced()) return;
 
-        // DEPRECATED, should be removed on next protocol bump
-        if(pfrom->nVersion == 70208) {
-            int nCountNeeded;
-            vRecv >> nCountNeeded;
-        }
-
         if(netfulfilledman.HasFulfilledRequest(pfrom->addr, NetMsgType::MASTERNODEPAYMENTSYNC)) {
             LOCK(cs_main);
             // Asking for the payments list multiple times in a short period of time is no good
diff --git a/src/masternode-payments.h b/src/masternode-payments.h
index dab4d96abeb6..59b1a320f44b 100644
--- a/src/masternode-payments.h
+++ b/src/masternode-payments.h
@@ -133,21 +133,7 @@ class CMasternodePaymentVote
 
     template <typename Stream, typename Operation>
     inline void SerializationOp(Stream& s, Operation ser_action) {
-        int nVersion = s.GetVersion();
-        if (nVersion == 70208 && (s.GetType() & SER_NETWORK)) {
-            // converting from/to old format
-            CTxIn txin{};
-            if (ser_action.ForRead()) {
-                READWRITE(txin);
-                masternodeOutpoint = txin.prevout;
-            } else {
-                txin = CTxIn(masternodeOutpoint);
-                READWRITE(txin);
-            }
-        } else {
-            // using new format directly
-            READWRITE(masternodeOutpoint);
-        }
+        READWRITE(masternodeOutpoint);
         READWRITE(nBlockHeight);
         READWRITE(*(CScriptBase*)(&payee));
         if (!(s.GetType() & SER_GETHASH)) {
diff --git a/src/masternode-sync.cpp b/src/masternode-sync.cpp
index cca003f20601..2b45e330149e 100644
--- a/src/masternode-sync.cpp
+++ b/src/masternode-sync.cpp
@@ -203,12 +203,7 @@ void CMasternodeSync::ProcessTick(CConnman& connman)
                 SwitchToNextAsset(connman);
             } else if (nRequestedMasternodeAssets == MASTERNODE_SYNC_MNW) {
                 if (!deterministicMNManager->IsDeterministicMNsSporkActive()) {
-                    //sync payment votes
-                    if(pnode->nVersion == 70208) {
-                        connman.PushMessage(pnode, msgMaker.Make(NetMsgType::MASTERNODEPAYMENTSYNC, mnpayments.GetStorageLimit())); //sync payment votes
-                    } else {
-                        connman.PushMessage(pnode, msgMaker.Make(NetMsgType::MASTERNODEPAYMENTSYNC)); //sync payment votes
-                    }
+                    connman.PushMessage(pnode, msgMaker.Make(NetMsgType::MASTERNODEPAYMENTSYNC)); //sync payment votes
                 }
                 SwitchToNextAsset(connman);
             } else if (nRequestedMasternodeAssets == MASTERNODE_SYNC_GOVERNANCE) {
@@ -350,12 +345,7 @@ void CMasternodeSync::ProcessTick(CConnman& connman)
                 nRequestedMasternodeAttempt++;
 
                 // ask node for all payment votes it has (new nodes will only return votes for future payments)
-                //sync payment votes
-                if(pnode->nVersion == 70208) {
-                    connman.PushMessage(pnode, msgMaker.Make(NetMsgType::MASTERNODEPAYMENTSYNC, mnpayments.GetStorageLimit()));
-                } else {
-                    connman.PushMessage(pnode, msgMaker.Make(NetMsgType::MASTERNODEPAYMENTSYNC));
-                }
+                connman.PushMessage(pnode, msgMaker.Make(NetMsgType::MASTERNODEPAYMENTSYNC));
                 // ask node for missing pieces only (old nodes will not be asked)
                 mnpayments.RequestLowDataPaymentBlocks(pnode, connman);
 
diff --git a/src/masternode.h b/src/masternode.h
index fdc94b58f008..6b9be5df6c1e 100644
--- a/src/masternode.h
+++ b/src/masternode.h
@@ -53,43 +53,15 @@ class CMasternodePing
 
     template <typename Stream, typename Operation>
     inline void SerializationOp(Stream& s, Operation ser_action) {
-        int nVersion = s.GetVersion();
-        if (nVersion == 70208 && (s.GetType() & SER_NETWORK)) {
-            // converting from/to old format
-            CTxIn txin{};
-            if (ser_action.ForRead()) {
-                READWRITE(txin);
-                masternodeOutpoint = txin.prevout;
-            } else {
-                txin = CTxIn(masternodeOutpoint);
-                READWRITE(txin);
-            }
-        } else {
-            // using new format directly
-            READWRITE(masternodeOutpoint);
-        }
+        READWRITE(masternodeOutpoint);
         READWRITE(blockHash);
         READWRITE(sigTime);
         if (!(s.GetType() & SER_GETHASH)) {
             READWRITE(vchSig);
         }
-        if(ser_action.ForRead() && s.size() == 0) {
-            // TODO: drop this after migration to 70209
-            fSentinelIsCurrent = false;
-            nSentinelVersion = DEFAULT_SENTINEL_VERSION;
-            nDaemonVersion = DEFAULT_DAEMON_VERSION;
-            return;
-        }
         READWRITE(fSentinelIsCurrent);
         READWRITE(nSentinelVersion);
-        if(ser_action.ForRead() && s.size() == 0) {
-            // TODO: drop this after migration to 70209
-            nDaemonVersion = DEFAULT_DAEMON_VERSION;
-            return;
-        }
-        if (!(nVersion == 70208 && (s.GetType() & SER_NETWORK))) {
-            READWRITE(nDaemonVersion);
-        }
+        READWRITE(nDaemonVersion);
     }
 
     uint256 GetHash() const;
@@ -223,21 +195,7 @@ class CMasternode : public masternode_info_t
     template <typename Stream, typename Operation>
     inline void SerializationOp(Stream& s, Operation ser_action) {
         LOCK(cs);
-        int nVersion = s.GetVersion();
-        if (nVersion == 70208 && (s.GetType() & SER_NETWORK)) {
-            // converting from/to old format
-            CTxIn txin{};
-            if (ser_action.ForRead()) {
-                READWRITE(txin);
-                outpoint = txin.prevout;
-            } else {
-                txin = CTxIn(outpoint);
-                READWRITE(txin);
-            }
-        } else {
-            // using new format directly
-            READWRITE(outpoint);
-        }
+        READWRITE(outpoint);
         READWRITE(addr);
         READWRITE(pubKeyCollateralAddress);
         READWRITE(pubKeyMasternode);
@@ -384,21 +342,7 @@ class CMasternodeBroadcast : public CMasternode
 
     template <typename Stream, typename Operation>
     inline void SerializationOp(Stream& s, Operation ser_action) {
-        int nVersion = s.GetVersion();
-        if (nVersion == 70208 && (s.GetType() & SER_NETWORK)) {
-            // converting from/to old format
-            CTxIn txin{};
-            if (ser_action.ForRead()) {
-                READWRITE(txin);
-                outpoint = txin.prevout;
-            } else {
-                txin = CTxIn(outpoint);
-                READWRITE(txin);
-            }
-        } else {
-            // using new format directly
-            READWRITE(outpoint);
-        }
+        READWRITE(outpoint);
         READWRITE(addr);
         READWRITE(pubKeyCollateralAddress);
         READWRITE(pubKeyMasternode);
@@ -458,27 +402,8 @@ class CMasternodeVerification
 
     template <typename Stream, typename Operation>
     inline void SerializationOp(Stream& s, Operation ser_action) {
-        int nVersion = s.GetVersion();
-        if (nVersion == 70208 && (s.GetType() & SER_NETWORK)) {
-            // converting from/to old format
-            CTxIn txin1{};
-            CTxIn txin2{};
-            if (ser_action.ForRead()) {
-                READWRITE(txin1);
-                READWRITE(txin2);
-                masternodeOutpoint1 = txin1.prevout;
-                masternodeOutpoint2 = txin2.prevout;
-            } else {
-                txin1 = CTxIn(masternodeOutpoint1);
-                txin2 = CTxIn(masternodeOutpoint2);
-                READWRITE(txin1);
-                READWRITE(txin2);
-            }
-        } else {
-            // using new format directly
-            READWRITE(masternodeOutpoint1);
-            READWRITE(masternodeOutpoint2);
-        }
+        READWRITE(masternodeOutpoint1);
+        READWRITE(masternodeOutpoint2);
         READWRITE(addr);
         READWRITE(nonce);
         READWRITE(nBlockHeight);
diff --git a/src/masternodeman.cpp b/src/masternodeman.cpp
index 0be4cacee359..04aebffc78c6 100644
--- a/src/masternodeman.cpp
+++ b/src/masternodeman.cpp
@@ -124,11 +124,7 @@ void CMasternodeMan::AskForMN(CNode* pnode, const COutPoint& outpoint, CConnman&
     }
     mWeAskedForMasternodeListEntry[outpoint][addrSquashed] = GetTime() + DSEG_UPDATE_SECONDS;
 
-    if (pnode->GetSendVersion() == 70208) {
-        connman.PushMessage(pnode, msgMaker.Make(NetMsgType::DSEG, CTxIn(outpoint)));
-    } else {
-        connman.PushMessage(pnode, msgMaker.Make(NetMsgType::DSEG, outpoint));
-    }
+    connman.PushMessage(pnode, msgMaker.Make(NetMsgType::DSEG, outpoint));
 }
 
 bool CMasternodeMan::AllowMixing(const COutPoint &outpoint)
@@ -526,11 +522,8 @@ void CMasternodeMan::DsegUpdate(CNode* pnode, CConnman& connman)
         }
     }
 
-    if (pnode->GetSendVersion() == 70208) {
-        connman.PushMessage(pnode, msgMaker.Make(NetMsgType::DSEG, CTxIn()));
-    } else {
-        connman.PushMessage(pnode, msgMaker.Make(NetMsgType::DSEG, COutPoint()));
-    }
+    connman.PushMessage(pnode, msgMaker.Make(NetMsgType::DSEG, COutPoint()));
+
     int64_t askAgain = GetTime() + DSEG_UPDATE_SECONDS;
     mWeAskedForMasternodeList[addrSquashed] = askAgain;
 
@@ -1072,14 +1065,7 @@ void CMasternodeMan::ProcessMessage(CNode* pfrom, const std::string& strCommand,
         if (!masternodeSync.IsSynced()) return;
 
         COutPoint masternodeOutpoint;
-
-        if (pfrom->nVersion == 70208) {
-            CTxIn vin;
-            vRecv >> vin;
-            masternodeOutpoint = vin.prevout;
-        } else {
-            vRecv >> masternodeOutpoint;
-        }
+        vRecv >> masternodeOutpoint;
 
         LogPrint("masternode", "DSEG -- Masternode list, masternode=%s\n", masternodeOutpoint.ToStringShort());
 
diff --git a/src/privatesend.h b/src/privatesend.h
index b13b82aa11b0..1211e125f773 100644
--- a/src/privatesend.h
+++ b/src/privatesend.h
@@ -209,20 +209,7 @@ class CDarksendQueue
             int nInputCount = 0;
             READWRITE(nInputCount);
         }
-        if (nVersion == 70208 && (s.GetType() & SER_NETWORK)) {
-            // converting from/to old format
-            CTxIn txin{};
-            if (ser_action.ForRead()) {
-                READWRITE(txin);
-                masternodeOutpoint = txin.prevout;
-            } else {
-                txin = CTxIn(masternodeOutpoint);
-                READWRITE(txin);
-            }
-        } else {
-            // using new format directly
-            READWRITE(masternodeOutpoint);
-        }
+        READWRITE(masternodeOutpoint);
         READWRITE(nTime);
         READWRITE(fReady);
         if (!(s.GetType() & SER_GETHASH)) {
@@ -295,21 +282,7 @@ class CDarksendBroadcastTx
     template <typename Stream, typename Operation>
     inline void SerializationOp(Stream& s, Operation ser_action) {
         READWRITE(tx);
-        int nVersion = s.GetVersion();
-        if (nVersion == 70208 && (s.GetType() & SER_NETWORK)) {
-            // converting from/to old format
-            CTxIn txin{};
-            if (ser_action.ForRead()) {
-                READWRITE(txin);
-                masternodeOutpoint = txin.prevout;
-            } else {
-                txin = CTxIn(masternodeOutpoint);
-                READWRITE(txin);
-            }
-        } else {
-            // using new format directly
-            READWRITE(masternodeOutpoint);
-        }
+        READWRITE(masternodeOutpoint);
         if (!(s.GetType() & SER_GETHASH)) {
             READWRITE(vchSig);
         }

From 0471fa8847168bee62998735ac2ac81d896df9e4 Mon Sep 17 00:00:00 2001
From: UdjinM6 <UdjinM6@users.noreply.github.com>
Date: Wed, 19 Sep 2018 15:03:30 +0300
Subject: [PATCH 146/400] Drop MAX_GOVERNANCE_OBJECT_DATA_SIZE (and
 maxgovobjdatasize in rpc) (#2298)

---
 src/governance-object.h | 1 -
 src/rpc/governance.cpp  | 2 --
 2 files changed, 3 deletions(-)

diff --git a/src/governance-object.h b/src/governance-object.h
index 12528286ed83..9aebe35a37f5 100644
--- a/src/governance-object.h
+++ b/src/governance-object.h
@@ -24,7 +24,6 @@ class CGovernanceTriggerManager;
 class CGovernanceObject;
 class CGovernanceVote;
 
-static const int MAX_GOVERNANCE_OBJECT_DATA_SIZE = 16 * 1024;
 static const int MIN_GOVERNANCE_PEER_PROTO_VERSION = 70210;
 static const int GOVERNANCE_FILTER_PROTO_VERSION = 70206;
 
diff --git a/src/rpc/governance.cpp b/src/rpc/governance.cpp
index 52ae2bb27ddf..143bd2ad22b2 100644
--- a/src/rpc/governance.cpp
+++ b/src/rpc/governance.cpp
@@ -1115,7 +1115,6 @@ UniValue getgovernanceinfo(const JSONRPCRequest& request)
             "  \"superblockcycle\": xxxxx,               (numeric) the number of blocks between superblocks\n"
             "  \"lastsuperblock\": xxxxx,                (numeric) the block number of the last superblock\n"
             "  \"nextsuperblock\": xxxxx,                (numeric) the block number of the next superblock\n"
-            "  \"maxgovobjdatasize\": xxxxx,             (numeric) maximum governance object data size in bytes\n"
             "}\n"
             "\nExamples:\n"
             + HelpExampleCli("getgovernanceinfo", "")
@@ -1138,7 +1137,6 @@ UniValue getgovernanceinfo(const JSONRPCRequest& request)
     obj.push_back(Pair("superblockcycle", Params().GetConsensus().nSuperblockCycle));
     obj.push_back(Pair("lastsuperblock", nLastSuperblock));
     obj.push_back(Pair("nextsuperblock", nNextSuperblock));
-    obj.push_back(Pair("maxgovobjdatasize", MAX_GOVERNANCE_OBJECT_DATA_SIZE));
 
     return obj;
 }

From 31759a44d68a3513e5227ef9bb203fabdd352094 Mon Sep 17 00:00:00 2001
From: UdjinM6 <UdjinM6@users.noreply.github.com>
Date: Wed, 19 Sep 2018 15:04:03 +0300
Subject: [PATCH 147/400] Fix tx inv throughput (#2300)

Bumps 4x per 1MB due to 4x smaller block times and accounts for blocks >1MB as in https://reviews.bitcoinabc.org/rABC4ae37d54ba3db21609ef8b704ed7f4377b9cece7
---
 src/net_processing.cpp | 4 ++--
 src/validation.h       | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/net_processing.cpp b/src/net_processing.cpp
index b71c76d35a78..beba6989deae 100644
--- a/src/net_processing.cpp
+++ b/src/net_processing.cpp
@@ -3318,7 +3318,7 @@ bool SendMessages(CNode* pto, CConnman& connman, const std::atomic<bool>& interr
         std::vector<CInv> vInv;
         {
             LOCK(pto->cs_inventory);
-            vInv.reserve(std::max<size_t>(pto->vInventoryBlockToSend.size(), INVENTORY_BROADCAST_MAX));
+            vInv.reserve(std::max<size_t>(pto->vInventoryBlockToSend.size(), INVENTORY_BROADCAST_MAX_PER_1MB_BLOCK * MaxBlockSize(true) / 1000000));
 
             // Add blocks
             BOOST_FOREACH(const uint256& hash, pto->vInventoryBlockToSend) {
@@ -3387,7 +3387,7 @@ bool SendMessages(CNode* pto, CConnman& connman, const std::atomic<bool>& interr
                 // especially since we have many peers and some will draw much shorter delays.
                 unsigned int nRelayedTransactions = 0;
                 LOCK(pto->cs_filter);
-                while (!vInvTx.empty() && nRelayedTransactions < INVENTORY_BROADCAST_MAX) {
+                while (!vInvTx.empty() && nRelayedTransactions < INVENTORY_BROADCAST_MAX_PER_1MB_BLOCK * MaxBlockSize(true) / 1000000) {
                     // Fetch the top element from the heap
                     std::pop_heap(vInvTx.begin(), vInvTx.end(), compareInvMempoolOrder);
                     std::set<uint256>::iterator it = vInvTx.back();
diff --git a/src/validation.h b/src/validation.h
index 8c45bbb4e2f3..91967b4e9cdc 100644
--- a/src/validation.h
+++ b/src/validation.h
@@ -115,8 +115,9 @@ static const unsigned int AVG_ADDRESS_BROADCAST_INTERVAL = 30;
  *  Blocks and whitelisted receivers bypass this, outbound peers get half this delay. */
 static const unsigned int INVENTORY_BROADCAST_INTERVAL = 5;
 /** Maximum number of inventory items to send per transmission.
- *  Limits the impact of low-fee transaction floods. */
-static const unsigned int INVENTORY_BROADCAST_MAX = 7 * INVENTORY_BROADCAST_INTERVAL;
+ *  Limits the impact of low-fee transaction floods.
+ *  We have 4 times smaller block times in Dash, so we need to push 4 times more invs per 1MB. */
+static const unsigned int INVENTORY_BROADCAST_MAX_PER_1MB_BLOCK = 4 * 7 * INVENTORY_BROADCAST_INTERVAL;
 /** Block download timeout base, expressed in millionths of the block interval (i.e. 2.5 min) */
 static const int64_t BLOCK_DOWNLOAD_TIMEOUT_BASE = 1000000;
 /** Additional block download timeout per parallel downloading peer (i.e. 1.25 min) */

From 3cc4ac137669c3ee4a6d602c533d16baedd83aa5 Mon Sep 17 00:00:00 2001
From: UdjinM6 <UdjinM6@users.noreply.github.com>
Date: Wed, 19 Sep 2018 15:04:35 +0300
Subject: [PATCH 148/400] Fix crash bug with duplicate inputs within a
 transaction (#2302)

* Fix crash bug with duplicate inputs within a transaction

Introduced by #9049

* Remove redundant parameter fCheckDuplicateInputs from CheckTransaction
---
 src/validation.cpp | 18 ++++++++----------
 src/validation.h   |  2 +-
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/src/validation.cpp b/src/validation.cpp
index 47bb7676031d..3b067eea9195 100644
--- a/src/validation.cpp
+++ b/src/validation.cpp
@@ -513,7 +513,7 @@ int GetUTXOConfirmations(const COutPoint& outpoint)
 }
 
 
-bool CheckTransaction(const CTransaction& tx, CValidationState &state, bool fCheckDuplicateInputs)
+bool CheckTransaction(const CTransaction& tx, CValidationState &state)
 {
     // Basic checks that don't depend on any context
     if (tx.vin.empty())
@@ -539,14 +539,12 @@ bool CheckTransaction(const CTransaction& tx, CValidationState &state, bool fChe
             return state.DoS(100, false, REJECT_INVALID, "bad-txns-txouttotal-toolarge");
     }
 
-    // Check for duplicate inputs - note that this check is slow so we skip it in CheckBlock
-    if (fCheckDuplicateInputs) {
-        std::set<COutPoint> vInOutPoints;
-        for (const auto& txin : tx.vin)
-        {
-            if (!vInOutPoints.insert(txin.prevout).second)
-                return state.DoS(100, false, REJECT_INVALID, "bad-txns-inputs-duplicate");
-        }
+    // Check for duplicate inputs
+    std::set<COutPoint> vInOutPoints;
+    for (const auto& txin : tx.vin)
+    {
+        if (!vInOutPoints.insert(txin.prevout).second)
+            return state.DoS(100, false, REJECT_INVALID, "bad-txns-inputs-duplicate");
     }
 
     if (tx.IsCoinBase())
@@ -3437,7 +3435,7 @@ bool CheckBlock(const CBlock& block, CValidationState& state, const Consensus::P
 
     // Check transactions
     for (const auto& tx : block.vtx)
-        if (!CheckTransaction(*tx, state, false))
+        if (!CheckTransaction(*tx, state))
             return state.Invalid(false, state.GetRejectCode(), state.GetRejectReason(),
                                  strprintf("Transaction check failed (tx hash %s) %s", tx->GetHash().ToString(), state.GetDebugMessage()));
 
diff --git a/src/validation.h b/src/validation.h
index 91967b4e9cdc..95bcaf595e49 100644
--- a/src/validation.h
+++ b/src/validation.h
@@ -389,7 +389,7 @@ void UpdateCoins(const CTransaction& tx, CCoinsViewCache& inputs, int nHeight);
 /** Transaction validation functions */
 
 /** Context-independent validity checks */
-bool CheckTransaction(const CTransaction& tx, CValidationState& state, bool fCheckDuplicateInputs=true);
+bool CheckTransaction(const CTransaction& tx, CValidationState& state);
 
 namespace Consensus {
 

From 8ea40102c0ad7038c2e147385799247163bb4f70 Mon Sep 17 00:00:00 2001
From: PastaPastaPasta <pasta@dashboost.org>
Date: Thu, 20 Sep 2018 07:39:34 -0500
Subject: [PATCH 149/400] Remove leftover RBF code from BTC (#2297)

* Remove leftover RBF code from BTC

* remove rbf #include

* remove rbf in rpc-tests

* removes replace-by-fee.py

* remove help text related to rbf

* remove comment text relating to rbf

* remove "-mempoolreplacement" cli option

* Remove (effectively dead) RBF code which would never have been called anyway and some assosiated variables

* since `setConflicts` is always empty, this is dead code

* Since we don't have RBF, don't have to do this check. Also, since `setConflicts` is always empty this is dead code

* removes unneccesary if as it will always be true

* remove unused `set<uint256> setConflicts`

* Removes replacement of conflicting txs, as conflicting txs are never accepted

* removes RBF from `validForFeeEstimation`

* removes (probably) unnecessary lock

* remove replacing part of the AcceptToMemoryPool and AcceptToMemoryPoolWIthTime

* fixes err in ps.cpp, didn't remove arg

* RBF in net_processing.cpp

* remove arg in ps-server.cpp

* removes another arg in PS code

* removes rawtx.c AcceptToMemoryPool arg

* removes arg in txvalidationcache_tests.cpp

* remove extra args

* forgot an arg

* fix typo in 82898b0

* remove unused fEnableReplacement in validation.h

* remove the removal reason REPLACED in txmempool.h

* removed unused variable

* comment typo
---
 qa/pull-tester/rpc-tests.py          |   1 -
 qa/rpc-tests/listtransactions.py     | 102 -----
 qa/rpc-tests/replace-by-fee.py       | 589 ---------------------------
 src/Makefile.am                      |   2 -
 src/init.cpp                         |  10 -
 src/net_processing.cpp               |   9 +-
 src/policy/rbf.cpp                   |  47 ---
 src/policy/rbf.h                     |  26 --
 src/privatesend-server.cpp           |   6 +-
 src/privatesend.cpp                  |   2 +-
 src/rpc/rawtransaction.cpp           |   2 +-
 src/test/txvalidationcache_tests.cpp |   2 +-
 src/txmempool.h                      |   4 +-
 src/validation.cpp                   | 239 ++---------
 src/validation.h                     |  13 +-
 src/wallet/rpcwallet.cpp             |  19 -
 src/wallet/wallet.cpp                |   2 +-
 17 files changed, 38 insertions(+), 1037 deletions(-)
 delete mode 100755 qa/rpc-tests/replace-by-fee.py
 delete mode 100644 src/policy/rbf.cpp
 delete mode 100644 src/policy/rbf.h

diff --git a/qa/pull-tester/rpc-tests.py b/qa/pull-tester/rpc-tests.py
index 1ce4448fb28b..372eb104b14d 100755
--- a/qa/pull-tester/rpc-tests.py
+++ b/qa/pull-tester/rpc-tests.py
@@ -199,7 +199,6 @@
     'invalidateblock.py',
     'maxblocksinflight.py',
     'p2p-acceptblock.py', # NOTE: needs dash_hash to pass
-    # 'replace-by-fee.py', # RBF is disabled in Dash Core
 ]
 
 
diff --git a/qa/rpc-tests/listtransactions.py b/qa/rpc-tests/listtransactions.py
index d727f6d5cf2e..ad0bbe0f8944 100755
--- a/qa/rpc-tests/listtransactions.py
+++ b/qa/rpc-tests/listtransactions.py
@@ -93,108 +93,6 @@ def run_test(self):
                            {"category":"receive","amount":Decimal("0.1")},
                            {"txid":txid, "account" : "watchonly"} )
 
-        # rbf is disabled in Dash Core
-        # self.run_rbf_opt_in_test()
-
-    # Check that the opt-in-rbf flag works properly, for sent and received
-    # transactions.
-    def run_rbf_opt_in_test(self):
-        # Check whether a transaction signals opt-in RBF itself
-        def is_opt_in(node, txid):
-            rawtx = node.getrawtransaction(txid, 1)
-            for x in rawtx["vin"]:
-                if x["sequence"] < 0xfffffffe:
-                    return True
-            return False
-
-        # Find an unconfirmed output matching a certain txid
-        def get_unconfirmed_utxo_entry(node, txid_to_match):
-            utxo = node.listunspent(0, 0)
-            for i in utxo:
-                if i["txid"] == txid_to_match:
-                    return i
-            return None
-
-        # 1. Chain a few transactions that don't opt-in.
-        txid_1 = self.nodes[0].sendtoaddress(self.nodes[1].getnewaddress(), 1)
-        assert(not is_opt_in(self.nodes[0], txid_1))
-        assert_array_result(self.nodes[0].listtransactions(), {"txid": txid_1}, {"bip125-replaceable":"no"})
-        sync_mempools(self.nodes)
-        assert_array_result(self.nodes[1].listtransactions(), {"txid": txid_1}, {"bip125-replaceable":"no"})
-
-        # Tx2 will build off txid_1, still not opting in to RBF.
-        utxo_to_use = get_unconfirmed_utxo_entry(self.nodes[1], txid_1)
-
-        # Create tx2 using createrawtransaction
-        inputs = [{"txid":utxo_to_use["txid"], "vout":utxo_to_use["vout"]}]
-        outputs = {self.nodes[0].getnewaddress(): 0.999}
-        tx2 = self.nodes[1].createrawtransaction(inputs, outputs)
-        tx2_signed = self.nodes[1].signrawtransaction(tx2)["hex"]
-        txid_2 = self.nodes[1].sendrawtransaction(tx2_signed)
-
-        # ...and check the result
-        assert(not is_opt_in(self.nodes[1], txid_2))
-        assert_array_result(self.nodes[1].listtransactions(), {"txid": txid_2}, {"bip125-replaceable":"no"})
-        sync_mempools(self.nodes)
-        assert_array_result(self.nodes[0].listtransactions(), {"txid": txid_2}, {"bip125-replaceable":"no"})
-
-        # Tx3 will opt-in to RBF
-        utxo_to_use = get_unconfirmed_utxo_entry(self.nodes[0], txid_2)
-        inputs = [{"txid": txid_2, "vout":utxo_to_use["vout"]}]
-        outputs = {self.nodes[1].getnewaddress(): 0.998}
-        tx3 = self.nodes[0].createrawtransaction(inputs, outputs)
-        tx3_modified = txFromHex(tx3)
-        tx3_modified.vin[0].nSequence = 0
-        tx3 = bytes_to_hex_str(tx3_modified.serialize())
-        tx3_signed = self.nodes[0].signrawtransaction(tx3)['hex']
-        txid_3 = self.nodes[0].sendrawtransaction(tx3_signed)
-
-        assert(is_opt_in(self.nodes[0], txid_3))
-        assert_array_result(self.nodes[0].listtransactions(), {"txid": txid_3}, {"bip125-replaceable":"yes"})
-        sync_mempools(self.nodes)
-        assert_array_result(self.nodes[1].listtransactions(), {"txid": txid_3}, {"bip125-replaceable":"yes"})
-
-        # Tx4 will chain off tx3.  Doesn't signal itself, but depends on one
-        # that does.
-        utxo_to_use = get_unconfirmed_utxo_entry(self.nodes[1], txid_3)
-        inputs = [{"txid": txid_3, "vout":utxo_to_use["vout"]}]
-        outputs = {self.nodes[0].getnewaddress(): 0.997}
-        tx4 = self.nodes[1].createrawtransaction(inputs, outputs)
-        tx4_signed = self.nodes[1].signrawtransaction(tx4)["hex"]
-        txid_4 = self.nodes[1].sendrawtransaction(tx4_signed)
-
-        assert(not is_opt_in(self.nodes[1], txid_4))
-        assert_array_result(self.nodes[1].listtransactions(), {"txid": txid_4}, {"bip125-replaceable":"yes"})
-        sync_mempools(self.nodes)
-        assert_array_result(self.nodes[0].listtransactions(), {"txid": txid_4}, {"bip125-replaceable":"yes"})
-
-        # Replace tx3, and check that tx4 becomes unknown
-        tx3_b = tx3_modified
-        tx3_b.vout[0].nValue -= int(Decimal("0.004") * COIN) # bump the fee
-        tx3_b = bytes_to_hex_str(tx3_b.serialize())
-        tx3_b_signed = self.nodes[0].signrawtransaction(tx3_b)['hex']
-        txid_3b = self.nodes[0].sendrawtransaction(tx3_b_signed, True)
-        assert(is_opt_in(self.nodes[0], txid_3b))
-
-        assert_array_result(self.nodes[0].listtransactions(), {"txid": txid_4}, {"bip125-replaceable":"unknown"})
-        sync_mempools(self.nodes)
-        assert_array_result(self.nodes[1].listtransactions(), {"txid": txid_4}, {"bip125-replaceable":"unknown"})
-
-        # Check gettransaction as well:
-        for n in self.nodes[0:2]:
-            assert_equal(n.gettransaction(txid_1)["bip125-replaceable"], "no")
-            assert_equal(n.gettransaction(txid_2)["bip125-replaceable"], "no")
-            assert_equal(n.gettransaction(txid_3)["bip125-replaceable"], "yes")
-            assert_equal(n.gettransaction(txid_3b)["bip125-replaceable"], "yes")
-            assert_equal(n.gettransaction(txid_4)["bip125-replaceable"], "unknown")
-
-        # After mining a transaction, it's no longer BIP125-replaceable
-        self.nodes[0].generate(1)
-        assert(txid_3b not in self.nodes[0].getrawmempool())
-        assert_equal(self.nodes[0].gettransaction(txid_3b)["bip125-replaceable"], "no")
-        assert_equal(self.nodes[0].gettransaction(txid_4)["bip125-replaceable"], "unknown")
-
-
 if __name__ == '__main__':
     ListTransactionsTest().main()
 
diff --git a/qa/rpc-tests/replace-by-fee.py b/qa/rpc-tests/replace-by-fee.py
deleted file mode 100755
index 2b29dfdd2bd9..000000000000
--- a/qa/rpc-tests/replace-by-fee.py
+++ /dev/null
@@ -1,589 +0,0 @@
-#!/usr/bin/env python3
-# Copyright (c) 2014-2016 The Bitcoin Core developers
-# Distributed under the MIT software license, see the accompanying
-# file COPYING or http://www.opensource.org/licenses/mit-license.php.
-
-#
-# Test replace by fee code
-#
-
-from test_framework.test_framework import BitcoinTestFramework
-from test_framework.util import *
-from test_framework.script import *
-from test_framework.mininode import *
-
-MAX_REPLACEMENT_LIMIT = 100
-
-def txToHex(tx):
-    return bytes_to_hex_str(tx.serialize())
-
-def make_utxo(node, amount, confirmed=True, scriptPubKey=CScript([1])):
-    """Create a txout with a given amount and scriptPubKey
-
-    Mines coins as needed.
-
-    confirmed - txouts created will be confirmed in the blockchain;
-                unconfirmed otherwise.
-    """
-    fee = 1*COIN
-    while node.getbalance() < satoshi_round((amount + fee)/COIN):
-        node.generate(100)
-        #print (node.getbalance(), amount, fee)
-
-    new_addr = node.getnewaddress()
-    #print new_addr
-    txid = node.sendtoaddress(new_addr, satoshi_round((amount+fee)/COIN))
-    tx1 = node.getrawtransaction(txid, 1)
-    txid = int(txid, 16)
-    i = None
-
-    for i, txout in enumerate(tx1['vout']):
-        #print i, txout['scriptPubKey']['addresses']
-        if txout['scriptPubKey']['addresses'] == [new_addr]:
-            #print i
-            break
-    assert i is not None
-
-    tx2 = CTransaction()
-    tx2.vin = [CTxIn(COutPoint(txid, i))]
-    tx2.vout = [CTxOut(amount, scriptPubKey)]
-    tx2.rehash()
-
-    signed_tx = node.signrawtransaction(txToHex(tx2))
-
-    txid = node.sendrawtransaction(signed_tx['hex'], True)
-
-    # If requested, ensure txouts are confirmed.
-    if confirmed:
-        mempool_size = len(node.getrawmempool())
-        while mempool_size > 0:
-            node.generate(1)
-            new_size = len(node.getrawmempool())
-            # Error out if we have something stuck in the mempool, as this
-            # would likely be a bug.
-            assert(new_size < mempool_size)
-            mempool_size = new_size
-
-    return COutPoint(int(txid, 16), 0)
-
-class ReplaceByFeeTest(BitcoinTestFramework):
-
-    def __init__(self):
-        super().__init__()
-        self.num_nodes = 1
-        self.setup_clean_chain = False
-
-    def setup_network(self):
-        self.nodes = []
-        self.nodes.append(start_node(0, self.options.tmpdir, ["-maxorphantx=1000", "-debug",
-                                                              "-whitelist=127.0.0.1",
-                                                              "-limitancestorcount=50",
-                                                              "-limitancestorsize=101",
-                                                              "-limitdescendantcount=200",
-                                                              "-limitdescendantsize=101"
-                                                              ]))
-        self.is_network_split = False
-
-    def run_test(self):
-        make_utxo(self.nodes[0], 1*COIN)
-
-        print("Running test simple doublespend...")
-        self.test_simple_doublespend()
-
-        print("Running test doublespend chain...")
-        self.test_doublespend_chain()
-
-        print("Running test doublespend tree...")
-        self.test_doublespend_tree()
-
-        print("Running test replacement feeperkb...")
-        self.test_replacement_feeperkb()
-
-        print("Running test spends of conflicting outputs...")
-        self.test_spends_of_conflicting_outputs()
-
-        print("Running test new unconfirmed inputs...")
-        self.test_new_unconfirmed_inputs()
-
-        print("Running test too many replacements...")
-        self.test_too_many_replacements()
-
-        print("Running test opt-in...")
-        self.test_opt_in()
-
-        print("Running test prioritised transactions...")
-        self.test_prioritised_transactions()
-
-        print("Passed\n")
-
-    def test_simple_doublespend(self):
-        """Simple doublespend"""
-        tx0_outpoint = make_utxo(self.nodes[0], int(1.1*COIN))
-
-        tx1a = CTransaction()
-        tx1a.vin = [CTxIn(tx0_outpoint, nSequence=0)]
-        tx1a.vout = [CTxOut(1*COIN, CScript([b'a']))]
-        tx1a_hex = txToHex(tx1a)
-        tx1a_txid = self.nodes[0].sendrawtransaction(tx1a_hex, True)
-
-        # Should fail because we haven't changed the fee
-        tx1b = CTransaction()
-        tx1b.vin = [CTxIn(tx0_outpoint, nSequence=0)]
-        tx1b.vout = [CTxOut(1*COIN, CScript([b'b']))]
-        tx1b_hex = txToHex(tx1b)
-
-        try:
-            tx1b_txid = self.nodes[0].sendrawtransaction(tx1b_hex, True)
-        except JSONRPCException as exp:
-            assert_equal(exp.error['code'], -26) # insufficient fee
-        else:
-            assert(False)
-
-        # Extra 0.1 BTC fee
-        tx1b = CTransaction()
-        tx1b.vin = [CTxIn(tx0_outpoint, nSequence=0)]
-        tx1b.vout = [CTxOut(int(0.9*COIN), CScript([b'b']))]
-        tx1b_hex = txToHex(tx1b)
-        tx1b_txid = self.nodes[0].sendrawtransaction(tx1b_hex, True)
-
-        mempool = self.nodes[0].getrawmempool()
-
-        assert (tx1a_txid not in mempool)
-        assert (tx1b_txid in mempool)
-
-        assert_equal(tx1b_hex, self.nodes[0].getrawtransaction(tx1b_txid))
-
-    def test_doublespend_chain(self):
-        """Doublespend of a long chain"""
-
-        initial_nValue = 50*COIN
-        tx0_outpoint = make_utxo(self.nodes[0], initial_nValue)
-
-        prevout = tx0_outpoint
-        remaining_value = initial_nValue
-        chain_txids = []
-        while remaining_value > 10*COIN:
-            remaining_value -= 1*COIN
-            tx = CTransaction()
-            tx.vin = [CTxIn(prevout, nSequence=0)]
-            tx.vout = [CTxOut(remaining_value, CScript([1]))]
-            tx_hex = txToHex(tx)
-            txid = self.nodes[0].sendrawtransaction(tx_hex, True)
-            chain_txids.append(txid)
-            prevout = COutPoint(int(txid, 16), 0)
-
-        # Whether the double-spend is allowed is evaluated by including all
-        # child fees - 40 BTC - so this attempt is rejected.
-        dbl_tx = CTransaction()
-        dbl_tx.vin = [CTxIn(tx0_outpoint, nSequence=0)]
-        dbl_tx.vout = [CTxOut(initial_nValue - 30*COIN, CScript([1]))]
-        dbl_tx_hex = txToHex(dbl_tx)
-
-        try:
-            self.nodes[0].sendrawtransaction(dbl_tx_hex, True)
-        except JSONRPCException as exp:
-            assert_equal(exp.error['code'], -26) # insufficient fee
-        else:
-            assert(False) # transaction mistakenly accepted!
-
-        # Accepted with sufficient fee
-        dbl_tx = CTransaction()
-        dbl_tx.vin = [CTxIn(tx0_outpoint, nSequence=0)]
-        dbl_tx.vout = [CTxOut(1*COIN, CScript([1]))]
-        dbl_tx_hex = txToHex(dbl_tx)
-        self.nodes[0].sendrawtransaction(dbl_tx_hex, True)
-
-        mempool = self.nodes[0].getrawmempool()
-        for doublespent_txid in chain_txids:
-            assert(doublespent_txid not in mempool)
-
-    def test_doublespend_tree(self):
-        """Doublespend of a big tree of transactions"""
-
-        initial_nValue = 50*COIN
-        tx0_outpoint = make_utxo(self.nodes[0], initial_nValue)
-
-        def branch(prevout, initial_value, max_txs, tree_width=5, fee=0.0001*COIN, _total_txs=None):
-            if _total_txs is None:
-                _total_txs = [0]
-            if _total_txs[0] >= max_txs:
-                return
-
-            txout_value = (initial_value - fee) // tree_width
-            if txout_value < fee:
-                return
-
-            vout = [CTxOut(txout_value, CScript([i+1]))
-                    for i in range(tree_width)]
-            tx = CTransaction()
-            tx.vin = [CTxIn(prevout, nSequence=0)]
-            tx.vout = vout
-            tx_hex = txToHex(tx)
-
-            assert(len(tx.serialize()) < 100000)
-            txid = self.nodes[0].sendrawtransaction(tx_hex, True)
-            yield tx
-            _total_txs[0] += 1
-
-            txid = int(txid, 16)
-
-            for i, txout in enumerate(tx.vout):
-                for x in branch(COutPoint(txid, i), txout_value,
-                                  max_txs,
-                                  tree_width=tree_width, fee=fee,
-                                  _total_txs=_total_txs):
-                    yield x
-
-        fee = int(0.0001*COIN)
-        n = MAX_REPLACEMENT_LIMIT
-        tree_txs = list(branch(tx0_outpoint, initial_nValue, n, fee=fee))
-        assert_equal(len(tree_txs), n)
-
-        # Attempt double-spend, will fail because too little fee paid
-        dbl_tx = CTransaction()
-        dbl_tx.vin = [CTxIn(tx0_outpoint, nSequence=0)]
-        dbl_tx.vout = [CTxOut(initial_nValue - fee*n, CScript([1]))]
-        dbl_tx_hex = txToHex(dbl_tx)
-        try:
-            self.nodes[0].sendrawtransaction(dbl_tx_hex, True)
-        except JSONRPCException as exp:
-            assert_equal(exp.error['code'], -26) # insufficient fee
-        else:
-            assert(False)
-
-        # 1 BTC fee is enough
-        dbl_tx = CTransaction()
-        dbl_tx.vin = [CTxIn(tx0_outpoint, nSequence=0)]
-        dbl_tx.vout = [CTxOut(initial_nValue - fee*n - 1*COIN, CScript([1]))]
-        dbl_tx_hex = txToHex(dbl_tx)
-        self.nodes[0].sendrawtransaction(dbl_tx_hex, True)
-
-        mempool = self.nodes[0].getrawmempool()
-
-        for tx in tree_txs:
-            tx.rehash()
-            assert (tx.hash not in mempool)
-
-        # Try again, but with more total transactions than the "max txs
-        # double-spent at once" anti-DoS limit.
-        for n in (MAX_REPLACEMENT_LIMIT+1, MAX_REPLACEMENT_LIMIT*2):
-            fee = int(0.0001*COIN)
-            tx0_outpoint = make_utxo(self.nodes[0], initial_nValue)
-            tree_txs = list(branch(tx0_outpoint, initial_nValue, n, fee=fee))
-            assert_equal(len(tree_txs), n)
-
-            dbl_tx = CTransaction()
-            dbl_tx.vin = [CTxIn(tx0_outpoint, nSequence=0)]
-            dbl_tx.vout = [CTxOut(initial_nValue - 2*fee*n, CScript([1]))]
-            dbl_tx_hex = txToHex(dbl_tx)
-            try:
-                self.nodes[0].sendrawtransaction(dbl_tx_hex, True)
-            except JSONRPCException as exp:
-                assert_equal(exp.error['code'], -26)
-                assert_equal("too many potential replacements" in exp.error['message'], True)
-            else:
-                assert(False)
-
-            for tx in tree_txs:
-                tx.rehash()
-                self.nodes[0].getrawtransaction(tx.hash)
-
-    def test_replacement_feeperkb(self):
-        """Replacement requires fee-per-KB to be higher"""
-        tx0_outpoint = make_utxo(self.nodes[0], int(1.1*COIN))
-
-        tx1a = CTransaction()
-        tx1a.vin = [CTxIn(tx0_outpoint, nSequence=0)]
-        tx1a.vout = [CTxOut(1*COIN, CScript([b'a']))]
-        tx1a_hex = txToHex(tx1a)
-        tx1a_txid = self.nodes[0].sendrawtransaction(tx1a_hex, True)
-
-        # Higher fee, but the fee per KB is much lower, so the replacement is
-        # rejected.
-        tx1b = CTransaction()
-        tx1b.vin = [CTxIn(tx0_outpoint, nSequence=0)]
-        tx1b.vout = [CTxOut(int(0.001*COIN), CScript([b'a'*999000]))]
-        tx1b_hex = txToHex(tx1b)
-
-        try:
-            tx1b_txid = self.nodes[0].sendrawtransaction(tx1b_hex, True)
-        except JSONRPCException as exp:
-            assert_equal(exp.error['code'], -26) # insufficient fee
-        else:
-            assert(False)
-
-    def test_spends_of_conflicting_outputs(self):
-        """Replacements that spend conflicting tx outputs are rejected"""
-        utxo1 = make_utxo(self.nodes[0], int(1.2*COIN))
-        utxo2 = make_utxo(self.nodes[0], 3*COIN)
-
-        tx1a = CTransaction()
-        tx1a.vin = [CTxIn(utxo1, nSequence=0)]
-        tx1a.vout = [CTxOut(int(1.1*COIN), CScript([b'a']))]
-        tx1a_hex = txToHex(tx1a)
-        tx1a_txid = self.nodes[0].sendrawtransaction(tx1a_hex, True)
-
-        tx1a_txid = int(tx1a_txid, 16)
-
-        # Direct spend an output of the transaction we're replacing.
-        tx2 = CTransaction()
-        tx2.vin = [CTxIn(utxo1, nSequence=0), CTxIn(utxo2, nSequence=0)]
-        tx2.vin.append(CTxIn(COutPoint(tx1a_txid, 0), nSequence=0))
-        tx2.vout = tx1a.vout
-        tx2_hex = txToHex(tx2)
-
-        try:
-            tx2_txid = self.nodes[0].sendrawtransaction(tx2_hex, True)
-        except JSONRPCException as exp:
-            assert_equal(exp.error['code'], -26)
-        else:
-            assert(False)
-
-        # Spend tx1a's output to test the indirect case.
-        tx1b = CTransaction()
-        tx1b.vin = [CTxIn(COutPoint(tx1a_txid, 0), nSequence=0)]
-        tx1b.vout = [CTxOut(1*COIN, CScript([b'a']))]
-        tx1b_hex = txToHex(tx1b)
-        tx1b_txid = self.nodes[0].sendrawtransaction(tx1b_hex, True)
-        tx1b_txid = int(tx1b_txid, 16)
-
-        tx2 = CTransaction()
-        tx2.vin = [CTxIn(utxo1, nSequence=0), CTxIn(utxo2, nSequence=0),
-                   CTxIn(COutPoint(tx1b_txid, 0))]
-        tx2.vout = tx1a.vout
-        tx2_hex = txToHex(tx2)
-
-        try:
-            tx2_txid = self.nodes[0].sendrawtransaction(tx2_hex, True)
-        except JSONRPCException as exp:
-            assert_equal(exp.error['code'], -26)
-        else:
-            assert(False)
-
-    def test_new_unconfirmed_inputs(self):
-        """Replacements that add new unconfirmed inputs are rejected"""
-        confirmed_utxo = make_utxo(self.nodes[0], int(1.1*COIN))
-        unconfirmed_utxo = make_utxo(self.nodes[0], int(0.1*COIN), False)
-
-        tx1 = CTransaction()
-        tx1.vin = [CTxIn(confirmed_utxo)]
-        tx1.vout = [CTxOut(1*COIN, CScript([b'a']))]
-        tx1_hex = txToHex(tx1)
-        tx1_txid = self.nodes[0].sendrawtransaction(tx1_hex, True)
-
-        tx2 = CTransaction()
-        tx2.vin = [CTxIn(confirmed_utxo), CTxIn(unconfirmed_utxo)]
-        tx2.vout = tx1.vout
-        tx2_hex = txToHex(tx2)
-
-        try:
-            tx2_txid = self.nodes[0].sendrawtransaction(tx2_hex, True)
-        except JSONRPCException as exp:
-            assert_equal(exp.error['code'], -26)
-        else:
-            assert(False)
-
-    def test_too_many_replacements(self):
-        """Replacements that evict too many transactions are rejected"""
-        # Try directly replacing more than MAX_REPLACEMENT_LIMIT
-        # transactions
-
-        # Start by creating a single transaction with many outputs
-        initial_nValue = 10*COIN
-        utxo = make_utxo(self.nodes[0], initial_nValue)
-        fee = int(0.0001*COIN)
-        split_value = int((initial_nValue-fee)/(MAX_REPLACEMENT_LIMIT+1))
-
-        outputs = []
-        for i in range(MAX_REPLACEMENT_LIMIT+1):
-            outputs.append(CTxOut(split_value, CScript([1])))
-
-        splitting_tx = CTransaction()
-        splitting_tx.vin = [CTxIn(utxo, nSequence=0)]
-        splitting_tx.vout = outputs
-        splitting_tx_hex = txToHex(splitting_tx)
-
-        txid = self.nodes[0].sendrawtransaction(splitting_tx_hex, True)
-        txid = int(txid, 16)
-
-        # Now spend each of those outputs individually
-        for i in range(MAX_REPLACEMENT_LIMIT+1):
-            tx_i = CTransaction()
-            tx_i.vin = [CTxIn(COutPoint(txid, i), nSequence=0)]
-            tx_i.vout = [CTxOut(split_value-fee, CScript([b'a']))]
-            tx_i_hex = txToHex(tx_i)
-            self.nodes[0].sendrawtransaction(tx_i_hex, True)
-
-        # Now create doublespend of the whole lot; should fail.
-        # Need a big enough fee to cover all spending transactions and have
-        # a higher fee rate
-        double_spend_value = (split_value-100*fee)*(MAX_REPLACEMENT_LIMIT+1)
-        inputs = []
-        for i in range(MAX_REPLACEMENT_LIMIT+1):
-            inputs.append(CTxIn(COutPoint(txid, i), nSequence=0))
-        double_tx = CTransaction()
-        double_tx.vin = inputs
-        double_tx.vout = [CTxOut(double_spend_value, CScript([b'a']))]
-        double_tx_hex = txToHex(double_tx)
-
-        try:
-            self.nodes[0].sendrawtransaction(double_tx_hex, True)
-        except JSONRPCException as exp:
-            assert_equal(exp.error['code'], -26)
-            assert_equal("too many potential replacements" in exp.error['message'], True)
-        else:
-            assert(False)
-
-        # If we remove an input, it should pass
-        double_tx = CTransaction()
-        double_tx.vin = inputs[0:-1]
-        double_tx.vout = [CTxOut(double_spend_value, CScript([b'a']))]
-        double_tx_hex = txToHex(double_tx)
-        self.nodes[0].sendrawtransaction(double_tx_hex, True)
-
-    def test_opt_in(self):
-        """ Replacing should only work if orig tx opted in """
-        tx0_outpoint = make_utxo(self.nodes[0], int(1.1*COIN))
-
-        # Create a non-opting in transaction
-        tx1a = CTransaction()
-        tx1a.vin = [CTxIn(tx0_outpoint, nSequence=0xffffffff)]
-        tx1a.vout = [CTxOut(1*COIN, CScript([b'a']))]
-        tx1a_hex = txToHex(tx1a)
-        tx1a_txid = self.nodes[0].sendrawtransaction(tx1a_hex, True)
-
-        # Shouldn't be able to double-spend
-        tx1b = CTransaction()
-        tx1b.vin = [CTxIn(tx0_outpoint, nSequence=0)]
-        tx1b.vout = [CTxOut(int(0.9*COIN), CScript([b'b']))]
-        tx1b_hex = txToHex(tx1b)
-
-        try:
-            tx1b_txid = self.nodes[0].sendrawtransaction(tx1b_hex, True)
-        except JSONRPCException as exp:
-            assert_equal(exp.error['code'], -26)
-        else:
-            print(tx1b_txid)
-            assert(False)
-
-        tx1_outpoint = make_utxo(self.nodes[0], int(1.1*COIN))
-
-        # Create a different non-opting in transaction
-        tx2a = CTransaction()
-        tx2a.vin = [CTxIn(tx1_outpoint, nSequence=0xfffffffe)]
-        tx2a.vout = [CTxOut(1*COIN, CScript([b'a']))]
-        tx2a_hex = txToHex(tx2a)
-        tx2a_txid = self.nodes[0].sendrawtransaction(tx2a_hex, True)
-
-        # Still shouldn't be able to double-spend
-        tx2b = CTransaction()
-        tx2b.vin = [CTxIn(tx1_outpoint, nSequence=0)]
-        tx2b.vout = [CTxOut(int(0.9*COIN), CScript([b'b']))]
-        tx2b_hex = txToHex(tx2b)
-
-        try:
-            tx2b_txid = self.nodes[0].sendrawtransaction(tx2b_hex, True)
-        except JSONRPCException as exp:
-            assert_equal(exp.error['code'], -26)
-        else:
-            assert(False)
-
-        # Now create a new transaction that spends from tx1a and tx2a
-        # opt-in on one of the inputs
-        # Transaction should be replaceable on either input
-
-        tx1a_txid = int(tx1a_txid, 16)
-        tx2a_txid = int(tx2a_txid, 16)
-
-        tx3a = CTransaction()
-        tx3a.vin = [CTxIn(COutPoint(tx1a_txid, 0), nSequence=0xffffffff),
-                    CTxIn(COutPoint(tx2a_txid, 0), nSequence=0xfffffffd)]
-        tx3a.vout = [CTxOut(int(0.9*COIN), CScript([b'c'])), CTxOut(int(0.9*COIN), CScript([b'd']))]
-        tx3a_hex = txToHex(tx3a)
-
-        self.nodes[0].sendrawtransaction(tx3a_hex, True)
-
-        tx3b = CTransaction()
-        tx3b.vin = [CTxIn(COutPoint(tx1a_txid, 0), nSequence=0)]
-        tx3b.vout = [CTxOut(int(0.5*COIN), CScript([b'e']))]
-        tx3b_hex = txToHex(tx3b)
-
-        tx3c = CTransaction()
-        tx3c.vin = [CTxIn(COutPoint(tx2a_txid, 0), nSequence=0)]
-        tx3c.vout = [CTxOut(int(0.5*COIN), CScript([b'f']))]
-        tx3c_hex = txToHex(tx3c)
-
-        self.nodes[0].sendrawtransaction(tx3b_hex, True)
-        # If tx3b was accepted, tx3c won't look like a replacement,
-        # but make sure it is accepted anyway
-        self.nodes[0].sendrawtransaction(tx3c_hex, True)
-
-    def test_prioritised_transactions(self):
-        # Ensure that fee deltas used via prioritisetransaction are
-        # correctly used by replacement logic
-
-        # 1. Check that feeperkb uses modified fees
-        tx0_outpoint = make_utxo(self.nodes[0], int(1.1*COIN))
-
-        tx1a = CTransaction()
-        tx1a.vin = [CTxIn(tx0_outpoint, nSequence=0)]
-        tx1a.vout = [CTxOut(1*COIN, CScript([b'a']))]
-        tx1a_hex = txToHex(tx1a)
-        tx1a_txid = self.nodes[0].sendrawtransaction(tx1a_hex, True)
-
-        # Higher fee, but the actual fee per KB is much lower.
-        tx1b = CTransaction()
-        tx1b.vin = [CTxIn(tx0_outpoint, nSequence=0)]
-        tx1b.vout = [CTxOut(int(0.001*COIN), CScript([b'a'*740000]))]
-        tx1b_hex = txToHex(tx1b)
-
-        # Verify tx1b cannot replace tx1a.
-        try:
-            tx1b_txid = self.nodes[0].sendrawtransaction(tx1b_hex, True)
-        except JSONRPCException as exp:
-            assert_equal(exp.error['code'], -26)
-        else:
-            assert(False)
-
-        # Use prioritisetransaction to set tx1a's fee to 0.
-        self.nodes[0].prioritisetransaction(tx1a_txid, 0, int(-0.1*COIN))
-
-        # Now tx1b should be able to replace tx1a
-        tx1b_txid = self.nodes[0].sendrawtransaction(tx1b_hex, True)
-
-        assert(tx1b_txid in self.nodes[0].getrawmempool())
-
-        # 2. Check that absolute fee checks use modified fee.
-        tx1_outpoint = make_utxo(self.nodes[0], int(1.1*COIN))
-
-        tx2a = CTransaction()
-        tx2a.vin = [CTxIn(tx1_outpoint, nSequence=0)]
-        tx2a.vout = [CTxOut(1*COIN, CScript([b'a']))]
-        tx2a_hex = txToHex(tx2a)
-        tx2a_txid = self.nodes[0].sendrawtransaction(tx2a_hex, True)
-
-        # Lower fee, but we'll prioritise it
-        tx2b = CTransaction()
-        tx2b.vin = [CTxIn(tx1_outpoint, nSequence=0)]
-        tx2b.vout = [CTxOut(int(1.01*COIN), CScript([b'a']))]
-        tx2b.rehash()
-        tx2b_hex = txToHex(tx2b)
-
-        # Verify tx2b cannot replace tx2a.
-        try:
-            tx2b_txid = self.nodes[0].sendrawtransaction(tx2b_hex, True)
-        except JSONRPCException as exp:
-            assert_equal(exp.error['code'], -26)
-        else:
-            assert(False)
-
-        # Now prioritise tx2b to have a higher modified fee
-        self.nodes[0].prioritisetransaction(tx2b.hash, 0, int(0.1*COIN))
-
-        # tx2b should now be accepted
-        tx2b_txid = self.nodes[0].sendrawtransaction(tx2b_hex, True)
-
-        assert(tx2b_txid in self.nodes[0].getrawmempool())
-
-if __name__ == '__main__':
-    ReplaceByFeeTest().main()
diff --git a/src/Makefile.am b/src/Makefile.am
index e5fea8696a6b..17f2a339f86e 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -154,7 +154,6 @@ BITCOIN_CORE_H = \
   noui.h \
   policy/fees.h \
   policy/policy.h \
-  policy/rbf.h \
   pow.h \
   protocol.h \
   random.h \
@@ -304,7 +303,6 @@ libdash_wallet_a_SOURCES = \
   wallet/rpcwallet.cpp \
   wallet/wallet.cpp \
   wallet/walletdb.cpp \
-  policy/rbf.cpp \
   $(BITCOIN_CORE_H)
 
 # crypto primitives library
diff --git a/src/init.cpp b/src/init.cpp
index 8aaba5cc27f5..d33dfd96db25 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -602,7 +602,6 @@ std::string HelpMessage(HelpMessageMode mode)
     strUsage += HelpMessageOpt("-bytespersigop", strprintf(_("Minimum bytes per sigop in transactions we relay and mine (default: %u)"), DEFAULT_BYTES_PER_SIGOP));
     strUsage += HelpMessageOpt("-datacarrier", strprintf(_("Relay and mine data carrier transactions (default: %u)"), DEFAULT_ACCEPT_DATACARRIER));
     strUsage += HelpMessageOpt("-datacarriersize", strprintf(_("Maximum size of data in data carrier transactions we relay and mine (default: %u)"), MAX_OP_RETURN_RELAY));
-    strUsage += HelpMessageOpt("-mempoolreplacement", strprintf(_("Enable transaction replacement in the memory pool (default: %u)"), DEFAULT_ENABLE_REPLACEMENT));
 
     strUsage += HelpMessageGroup(_("Block creation options:"));
     strUsage += HelpMessageOpt("-blockmaxsize=<n>", strprintf(_("Set maximum block size in bytes (default: %d)"), DEFAULT_BLOCK_MAX_SIZE));
@@ -1258,15 +1257,6 @@ bool AppInitParameterInteraction()
 
     nMaxTipAge = GetArg("-maxtipage", DEFAULT_MAX_TIP_AGE);
 
-    fEnableReplacement = GetBoolArg("-mempoolreplacement", DEFAULT_ENABLE_REPLACEMENT);
-    if ((!fEnableReplacement) && IsArgSet("-mempoolreplacement")) {
-        // Minimal effort at forwards compatibility
-        std::string strReplacementModeList = GetArg("-mempoolreplacement", "");  // default is impossible
-        std::vector<std::string> vstrReplacementModes;
-        boost::split(vstrReplacementModes, strReplacementModeList, boost::is_any_of(","));
-        fEnableReplacement = (std::find(vstrReplacementModes.begin(), vstrReplacementModes.end(), "fee") != vstrReplacementModes.end());
-    }
-
     if (mapMultiArgs.count("-bip9params")) {
         // Allow overriding BIP9 parameters for testing
         if (!chainparams.MineBlocksOnDemand()) {
diff --git a/src/net_processing.cpp b/src/net_processing.cpp
index beba6989deae..eb62b815d43f 100644
--- a/src/net_processing.cpp
+++ b/src/net_processing.cpp
@@ -2005,9 +2005,7 @@ bool static ProcessMessage(CNode* pfrom, const std::string& strCommand, CDataStr
 
         mapAlreadyAskedFor.erase(inv.hash);
 
-        std::list<CTransactionRef> lRemovedTxn;
-
-        if (!AlreadyHave(inv) && AcceptToMemoryPool(mempool, state, ptx, true, &fMissingInputs, &lRemovedTxn)) {
+        if (!AlreadyHave(inv) && AcceptToMemoryPool(mempool, state, ptx, true, &fMissingInputs)) {
             // Process custom txes, this changes AlreadyHave to "true"
             if (strCommand == NetMsgType::DSTX) {
                 LogPrintf("DSTX -- Masternode transaction accepted, txid=%s, peer=%d\n",
@@ -2057,7 +2055,7 @@ bool static ProcessMessage(CNode* pfrom, const std::string& strCommand, CDataStr
 
                     if (setMisbehaving.count(fromPeer))
                         continue;
-                    if (AcceptToMemoryPool(mempool, stateDummy, porphanTx, true, &fMissingInputs2, &lRemovedTxn)) {
+                    if (AcceptToMemoryPool(mempool, stateDummy, porphanTx, true, &fMissingInputs2)) {
                         LogPrint("mempool", "   accepted orphan tx %s\n", orphanHash.ToString());
                         connman.RelayTransaction(orphanTx);
                         for (unsigned int i = 0; i < orphanTx.vout.size(); i++) {
@@ -2160,9 +2158,6 @@ bool static ProcessMessage(CNode* pfrom, const std::string& strCommand, CDataStr
             }
         }
 
-        for (const CTransactionRef& removedTx : lRemovedTxn)
-            AddToCompactExtraTransactions(removedTx);
-
         int nDoS = 0;
         if (state.IsInvalid(nDoS))
         {
diff --git a/src/policy/rbf.cpp b/src/policy/rbf.cpp
deleted file mode 100644
index d9b47e71bbe0..000000000000
--- a/src/policy/rbf.cpp
+++ /dev/null
@@ -1,47 +0,0 @@
-// Copyright (c) 2016 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 "policy/rbf.h"
-
-bool SignalsOptInRBF(const CTransaction &tx)
-{
-    BOOST_FOREACH(const CTxIn &txin, tx.vin) {
-        if (txin.nSequence < std::numeric_limits<unsigned int>::max()-1) {
-            return true;
-        }
-    }
-    return false;
-}
-
-RBFTransactionState IsRBFOptIn(const CTransaction &tx, CTxMemPool &pool)
-{
-    AssertLockHeld(pool.cs);
-
-    CTxMemPool::setEntries setAncestors;
-
-    // First check the transaction itself.
-    if (SignalsOptInRBF(tx)) {
-        return RBF_TRANSACTIONSTATE_REPLACEABLE_BIP125;
-    }
-
-    // If this transaction is not in our mempool, then we can't be sure
-    // we will know about all its inputs.
-    if (!pool.exists(tx.GetHash())) {
-        return RBF_TRANSACTIONSTATE_UNKNOWN;
-    }
-
-    // If all the inputs have nSequence >= maxint-1, it still might be
-    // signaled for RBF if any unconfirmed parents have signaled.
-    uint64_t noLimit = std::numeric_limits<uint64_t>::max();
-    std::string dummy;
-    CTxMemPoolEntry entry = *pool.mapTx.find(tx.GetHash());
-    pool.CalculateMemPoolAncestors(entry, setAncestors, noLimit, noLimit, noLimit, noLimit, dummy, false);
-
-    BOOST_FOREACH(CTxMemPool::txiter it, setAncestors) {
-        if (SignalsOptInRBF(it->GetTx())) {
-            return RBF_TRANSACTIONSTATE_REPLACEABLE_BIP125;
-        }
-    }
-    return RBF_TRANSACTIONSTATE_FINAL;
-}
diff --git a/src/policy/rbf.h b/src/policy/rbf.h
deleted file mode 100644
index 139aec57602c..000000000000
--- a/src/policy/rbf.h
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright (c) 2016 The Bitcoin Core developers
-// Distributed under the MIT software license, see the accompanying
-// file COPYING or http://www.opensource.org/licenses/mit-license.php.
-
-#ifndef BITCOIN_POLICY_RBF_H
-#define BITCOIN_POLICY_RBF_H
-
-#include "txmempool.h"
-
-enum RBFTransactionState {
-    RBF_TRANSACTIONSTATE_UNKNOWN,
-    RBF_TRANSACTIONSTATE_REPLACEABLE_BIP125,
-    RBF_TRANSACTIONSTATE_FINAL
-};
-
-// Check whether the sequence numbers on this transaction are signaling
-// opt-in to replace-by-fee, according to BIP 125
-bool SignalsOptInRBF(const CTransaction &tx);
-
-// Determine whether an in-mempool transaction is signaling opt-in to RBF
-// according to BIP 125
-// This involves checking sequence numbers of the transaction, as well
-// as the sequence numbers of all in-mempool ancestors.
-RBFTransactionState IsRBFOptIn(const CTransaction &tx, CTxMemPool &pool);
-
-#endif // BITCOIN_POLICY_RBF_H
diff --git a/src/privatesend-server.cpp b/src/privatesend-server.cpp
index ad62d7b5bab2..b71d56c7a39f 100644
--- a/src/privatesend-server.cpp
+++ b/src/privatesend-server.cpp
@@ -335,7 +335,7 @@ void CPrivateSendServer::CommitFinalTransaction(CConnman& connman)
         TRY_LOCK(cs_main, lockMain);
         CValidationState validationState;
         mempool.PrioritiseTransaction(hashTx, hashTx.ToString(), 1000, 0.1*COIN);
-        if(!lockMain || !AcceptToMemoryPool(mempool, validationState, finalTransaction, false, NULL, NULL, false, maxTxFee, true))
+        if(!lockMain || !AcceptToMemoryPool(mempool, validationState, finalTransaction, false, NULL, false, maxTxFee, true))
         {
             LogPrintf("CPrivateSendServer::CommitFinalTransaction -- AcceptToMemoryPool() error: Transaction not valid\n");
             SetNull();
@@ -437,7 +437,7 @@ void CPrivateSendServer::ChargeFees(CConnman& connman)
         LOCK(cs_main);
 
         CValidationState state;
-        if(!AcceptToMemoryPool(mempool, state, vecOffendersCollaterals[0], false, NULL, NULL, false, maxTxFee)) {
+        if(!AcceptToMemoryPool(mempool, state, vecOffendersCollaterals[0], false, NULL, false, maxTxFee)) {
             // should never really happen
             LogPrintf("CPrivateSendServer::ChargeFees -- ERROR: AcceptToMemoryPool failed!\n");
         } else {
@@ -469,7 +469,7 @@ void CPrivateSendServer::ChargeRandomFees(CConnman& connman)
         LogPrintf("CPrivateSendServer::ChargeRandomFees -- charging random fees, txCollateral=%s", txCollateral->ToString());
 
         CValidationState state;
-        if(!AcceptToMemoryPool(mempool, state, txCollateral, false, NULL, NULL, false, maxTxFee)) {
+        if(!AcceptToMemoryPool(mempool, state, txCollateral, false, NULL, false, maxTxFee)) {
             // should never really happen
             LogPrintf("CPrivateSendServer::ChargeRandomFees -- ERROR: AcceptToMemoryPool failed!\n");
         } else {
diff --git a/src/privatesend.cpp b/src/privatesend.cpp
index 9a315e03fb04..ab0d4978d093 100644
--- a/src/privatesend.cpp
+++ b/src/privatesend.cpp
@@ -314,7 +314,7 @@ bool CPrivateSend::IsCollateralValid(const CTransaction& txCollateral)
     {
         LOCK(cs_main);
         CValidationState validationState;
-        if(!AcceptToMemoryPool(mempool, validationState, MakeTransactionRef(txCollateral), false, NULL, NULL, false, maxTxFee, true)) {
+        if(!AcceptToMemoryPool(mempool, validationState, MakeTransactionRef(txCollateral), false, NULL, false, maxTxFee, true)) {
             LogPrint("privatesend", "CPrivateSend::IsCollateralValid -- didn't pass AcceptToMemoryPool()\n");
             return false;
         }
diff --git a/src/rpc/rawtransaction.cpp b/src/rpc/rawtransaction.cpp
index a98a2a48c742..717d1c8dc26a 100644
--- a/src/rpc/rawtransaction.cpp
+++ b/src/rpc/rawtransaction.cpp
@@ -984,7 +984,7 @@ UniValue sendrawtransaction(const JSONRPCRequest& request)
         }
         CValidationState state;
         bool fMissingInputs;
-        if (!AcceptToMemoryPool(mempool, state, std::move(tx), !fBypassLimits, &fMissingInputs, NULL, false, nMaxRawTxFee)) {
+        if (!AcceptToMemoryPool(mempool, state, std::move(tx), !fBypassLimits, &fMissingInputs, false, nMaxRawTxFee)) {
             if (state.IsInvalid()) {
                 throw JSONRPCError(RPC_TRANSACTION_REJECTED, strprintf("%i: %s", state.GetRejectCode(), state.GetRejectReason()));
             } else {
diff --git a/src/test/txvalidationcache_tests.cpp b/src/test/txvalidationcache_tests.cpp
index af2495abf3ef..8e6637e4f1be 100644
--- a/src/test/txvalidationcache_tests.cpp
+++ b/src/test/txvalidationcache_tests.cpp
@@ -23,7 +23,7 @@ ToMemPool(CMutableTransaction& tx)
     LOCK(cs_main);
 
     CValidationState state;
-    return AcceptToMemoryPool(mempool, state, MakeTransactionRef(tx), false, NULL, NULL, true, 0);
+    return AcceptToMemoryPool(mempool, state, MakeTransactionRef(tx), false, NULL, true, 0);
 }
 
 BOOST_FIXTURE_TEST_CASE(tx_mempool_block_doublespend, TestChain100Setup)
diff --git a/src/txmempool.h b/src/txmempool.h
index cbf5360d08a7..d1cec34d21c7 100644
--- a/src/txmempool.h
+++ b/src/txmempool.h
@@ -348,7 +348,6 @@ enum class MemPoolRemovalReason {
     REORG,       //! Removed for reorganization
     BLOCK,       //! Removed for block
     CONFLICT,    //! Removed for conflict with in-block transaction
-    REPLACED     //! Removed for replacement
 };
 
 class SaltedTxidHasher
@@ -374,8 +373,7 @@ class SaltedTxidHasher
  * example, the following new transactions will not be added to the mempool:
  * - a transaction which doesn't meet the minimum fee requirements.
  * - a new transaction that double-spends an input of a transaction already in
- * the pool where the new transaction does not meet the Replace-By-Fee
- * requirements as defined in BIP 125.
+ * the pool.
  * - a non-standard transaction.
  *
  * CTxMemPool::mapTx, and CTxMemPoolEntry bookkeeping:
diff --git a/src/validation.cpp b/src/validation.cpp
index 3b067eea9195..972313402956 100644
--- a/src/validation.cpp
+++ b/src/validation.cpp
@@ -91,7 +91,6 @@ size_t nCoinCacheUsage = 5000 * 300;
 uint64_t nPruneTarget = 0;
 bool fAlerts = DEFAULT_ALERTS;
 int64_t nMaxTipAge = DEFAULT_MAX_TIP_AGE;
-bool fEnableReplacement = DEFAULT_ENABLE_REPLACEMENT;
 
 std::atomic<bool> fDIP0001ActiveAtTip{false};
 std::atomic<bool> fDIP0003ActiveAtTip{false};
@@ -631,9 +630,8 @@ static bool IsCurrentForFeeEstimation()
 }
 
 bool AcceptToMemoryPoolWorker(CTxMemPool& pool, CValidationState& state, const CTransactionRef& ptx, bool fLimitFree,
-                              bool* pfMissingInputs, int64_t nAcceptTime, std::list<CTransactionRef>* plTxnReplaced,
-                              bool fOverrideMempoolLimit, const CAmount& nAbsurdFee,
-                              std::vector<COutPoint>& coins_to_uncache, bool fDryRun)
+                              bool* pfMissingInputs, int64_t nAcceptTime, bool fOverrideMempoolLimit, 
+                              const CAmount& nAbsurdFee, std::vector<COutPoint>& coins_to_uncache, bool fDryRun)
 {
     const CTransaction& tx = *ptx;
     const uint256 hash = tx.GetHash();
@@ -689,7 +687,6 @@ bool AcceptToMemoryPoolWorker(CTxMemPool& pool, CValidationState& state, const C
     }
 
     // Check for conflicts with in-memory transactions
-    std::set<uint256> setConflicts;
     {
     LOCK(pool.cs); // protect pool.mapNextTx
     BOOST_FOREACH(const CTxIn &txin, tx.vin)
@@ -698,49 +695,21 @@ bool AcceptToMemoryPoolWorker(CTxMemPool& pool, CValidationState& state, const C
         if (itConflicting != pool.mapNextTx.end())
         {
             const CTransaction *ptxConflicting = itConflicting->second;
-            if (!setConflicts.count(ptxConflicting->GetHash()))
-            {
-                // InstantSend txes are not replacable
-                if(instantsend.HasTxLockRequest(ptxConflicting->GetHash())) {
-                    // this tx conflicts with a Transaction Lock Request candidate
-                    return state.DoS(0, error("AcceptToMemoryPool : Transaction %s conflicts with Transaction Lock Request %s",
-                                            hash.ToString(), ptxConflicting->GetHash().ToString()),
-                                    REJECT_INVALID, "tx-txlockreq-mempool-conflict");
-                } else if (instantsend.HasTxLockRequest(hash)) {
-                    // this tx is a tx lock request and it conflicts with a normal tx
-                    return state.DoS(0, error("AcceptToMemoryPool : Transaction Lock Request %s conflicts with transaction %s",
-                                            hash.ToString(), ptxConflicting->GetHash().ToString()),
-                                    REJECT_INVALID, "txlockreq-tx-mempool-conflict");
-                }
-                // Allow opt-out of transaction replacement by setting
-                // nSequence >= maxint-1 on all inputs.
-                //
-                // maxint-1 is picked to still allow use of nLockTime by
-                // non-replaceable transactions. All inputs rather than just one
-                // is for the sake of multi-party protocols, where we don't
-                // want a single party to be able to disable replacement.
-                //
-                // The opt-out ignores descendants as anyone relying on
-                // first-seen mempool behavior should be checking all
-                // unconfirmed ancestors anyway; doing otherwise is hopelessly
-                // insecure.
-                bool fReplacementOptOut = true;
-                if (fEnableReplacement)
-                {
-                    BOOST_FOREACH(const CTxIn &_txin, ptxConflicting->vin)
-                    {
-                        if (_txin.nSequence < std::numeric_limits<unsigned int>::max()-1)
-                        {
-                            fReplacementOptOut = false;
-                            break;
-                        }
-                    }
-                }
-                if (fReplacementOptOut)
-                    return state.Invalid(false, REJECT_CONFLICT, "txn-mempool-conflict");
-
-                setConflicts.insert(ptxConflicting->GetHash());
+     
+            // InstantSend txes are not replacable
+            if(instantsend.HasTxLockRequest(ptxConflicting->GetHash())) {
+                // this tx conflicts with a Transaction Lock Request candidate
+                return state.DoS(0, error("AcceptToMemoryPool : Transaction %s conflicts with Transaction Lock Request %s",
+                                        hash.ToString(), ptxConflicting->GetHash().ToString()),
+                                REJECT_INVALID, "tx-txlockreq-mempool-conflict");
+            } else if (instantsend.HasTxLockRequest(hash)) {
+                // this tx is a tx lock request and it conflicts with a normal tx
+                return state.DoS(0, error("AcceptToMemoryPool : Transaction Lock Request %s conflicts with transaction %s",
+                                        hash.ToString(), ptxConflicting->GetHash().ToString()),
+                                REJECT_INVALID, "txlockreq-tx-mempool-conflict");
             }
+            // Transaction conflicts with mempool and RBF doesn't exist in Dash
+            return state.Invalid(false, REJECT_CONFLICT, "txn-mempool-conflict");
         }
     }
     }
@@ -886,150 +855,6 @@ bool AcceptToMemoryPoolWorker(CTxMemPool& pool, CValidationState& state, const C
             return state.DoS(0, false, REJECT_NONSTANDARD, "too-long-mempool-chain", false, errString);
         }
 
-        // A transaction that spends outputs that would be replaced by it is invalid. Now
-        // that we have the set of all ancestors we can detect this
-        // pathological case by making sure setConflicts and setAncestors don't
-        // intersect.
-        BOOST_FOREACH(CTxMemPool::txiter ancestorIt, setAncestors)
-        {
-            const uint256 &hashAncestor = ancestorIt->GetTx().GetHash();
-            if (setConflicts.count(hashAncestor))
-            {
-                return state.DoS(10, false,
-                                 REJECT_INVALID, "bad-txns-spends-conflicting-tx", false,
-                                 strprintf("%s spends conflicting transaction %s",
-                                           hash.ToString(),
-                                           hashAncestor.ToString()));
-            }
-        }
-
-        // Check if it's economically rational to mine this transaction rather
-        // than the ones it replaces.
-        CAmount nConflictingFees = 0;
-        size_t nConflictingSize = 0;
-        uint64_t nConflictingCount = 0;
-        CTxMemPool::setEntries allConflicting;
-
-        // If we don't hold the lock allConflicting might be incomplete; the
-        // subsequent RemoveStaged() and addUnchecked() calls don't guarantee
-        // mempool consistency for us.
-        LOCK(pool.cs);
-        const bool fReplacementTransaction = setConflicts.size();
-        if (fReplacementTransaction)
-        {
-            CFeeRate newFeeRate(nModifiedFees, nSize);
-            std::set<uint256> setConflictsParents;
-            const int maxDescendantsToVisit = 100;
-            CTxMemPool::setEntries setIterConflicting;
-            BOOST_FOREACH(const uint256 &hashConflicting, setConflicts)
-            {
-                CTxMemPool::txiter mi = pool.mapTx.find(hashConflicting);
-                if (mi == pool.mapTx.end())
-                    continue;
-
-                // Save these to avoid repeated lookups
-                setIterConflicting.insert(mi);
-
-                // Don't allow the replacement to reduce the feerate of the
-                // mempool.
-                //
-                // We usually don't want to accept replacements with lower
-                // feerates than what they replaced as that would lower the
-                // feerate of the next block. Requiring that the feerate always
-                // be increased is also an easy-to-reason about way to prevent
-                // DoS attacks via replacements.
-                //
-                // The mining code doesn't (currently) take children into
-                // account (CPFP) so we only consider the feerates of
-                // transactions being directly replaced, not their indirect
-                // descendants. While that does mean high feerate children are
-                // ignored when deciding whether or not to replace, we do
-                // require the replacement to pay more overall fees too,
-                // mitigating most cases.
-                CFeeRate oldFeeRate(mi->GetModifiedFee(), mi->GetTxSize());
-                if (newFeeRate <= oldFeeRate)
-                {
-                    return state.DoS(0, false,
-                            REJECT_INSUFFICIENTFEE, "insufficient fee", false,
-                            strprintf("rejecting replacement %s; new feerate %s <= old feerate %s",
-                                  hash.ToString(),
-                                  newFeeRate.ToString(),
-                                  oldFeeRate.ToString()));
-                }
-
-                BOOST_FOREACH(const CTxIn &txin, mi->GetTx().vin)
-                {
-                    setConflictsParents.insert(txin.prevout.hash);
-                }
-
-                nConflictingCount += mi->GetCountWithDescendants();
-            }
-            // This potentially overestimates the number of actual descendants
-            // but we just want to be conservative to avoid doing too much
-            // work.
-            if (nConflictingCount <= maxDescendantsToVisit) {
-                // If not too many to replace, then calculate the set of
-                // transactions that would have to be evicted
-                BOOST_FOREACH(CTxMemPool::txiter it, setIterConflicting) {
-                    pool.CalculateDescendants(it, allConflicting);
-                }
-                BOOST_FOREACH(CTxMemPool::txiter it, allConflicting) {
-                    nConflictingFees += it->GetModifiedFee();
-                    nConflictingSize += it->GetTxSize();
-                }
-            } else {
-                return state.DoS(0, false,
-                        REJECT_NONSTANDARD, "too many potential replacements", false,
-                        strprintf("rejecting replacement %s; too many potential replacements (%d > %d)\n",
-                            hash.ToString(),
-                            nConflictingCount,
-                            maxDescendantsToVisit));
-            }
-
-            for (unsigned int j = 0; j < tx.vin.size(); j++)
-            {
-                // We don't want to accept replacements that require low
-                // feerate junk to be mined first. Ideally we'd keep track of
-                // the ancestor feerates and make the decision based on that,
-                // but for now requiring all new inputs to be confirmed works.
-                if (!setConflictsParents.count(tx.vin[j].prevout.hash))
-                {
-                    // Rather than check the UTXO set - potentially expensive -
-                    // it's cheaper to just check if the new input refers to a
-                    // tx that's in the mempool.
-                    if (pool.mapTx.find(tx.vin[j].prevout.hash) != pool.mapTx.end())
-                        return state.DoS(0, false,
-                                         REJECT_NONSTANDARD, "replacement-adds-unconfirmed", false,
-                                         strprintf("replacement %s adds unconfirmed input, idx %d",
-                                                  hash.ToString(), j));
-                }
-            }
-
-            // The replacement must pay greater fees than the transactions it
-            // replaces - if we did the bandwidth used by those conflicting
-            // transactions would not be paid for.
-            if (nModifiedFees < nConflictingFees)
-            {
-                return state.DoS(0, false,
-                                 REJECT_INSUFFICIENTFEE, "insufficient fee", false,
-                                 strprintf("rejecting replacement %s, less fees than conflicting txs; %s < %s",
-                                          hash.ToString(), FormatMoney(nModifiedFees), FormatMoney(nConflictingFees)));
-            }
-
-            // Finally in addition to paying more fees than the conflicts the
-            // new transaction must pay for its own bandwidth.
-            CAmount nDeltaFees = nModifiedFees - nConflictingFees;
-            if (nDeltaFees < ::incrementalRelayFee.GetFee(nSize))
-            {
-                return state.DoS(0, false,
-                        REJECT_INSUFFICIENTFEE, "insufficient fee", false,
-                        strprintf("rejecting replacement %s, not enough additional fees to relay; %s < %s",
-                              hash.ToString(),
-                              FormatMoney(nDeltaFees),
-                              FormatMoney(::incrementalRelayFee.GetFee(nSize))));
-            }
-        }
-
         // If we aren't going to actually accept it but just were verifying it, we are fine already
         if(fDryRun) return true;
 
@@ -1053,25 +878,10 @@ bool AcceptToMemoryPoolWorker(CTxMemPool& pool, CValidationState& state, const C
                 __func__, hash.ToString(), FormatStateMessage(state));
         }
 
-        // Remove conflicting transactions from the mempool
-        BOOST_FOREACH(const CTxMemPool::txiter it, allConflicting)
-        {
-            LogPrint("mempool", "replacing tx %s with %s for %s %s additional fees, %d delta bytes\n",
-                    it->GetTx().GetHash().ToString(),
-                    hash.ToString(),
-                    FormatMoney(nModifiedFees - nConflictingFees),
-                    CURRENCY_UNIT,
-                    (int)nSize - (int)nConflictingSize);
-            if (plTxnReplaced)
-                plTxnReplaced->push_back(it->GetSharedTx());
-        }
-        pool.RemoveStaged(allConflicting, false, MemPoolRemovalReason::REPLACED);
-
-        // This transaction should only count for fee estimation if it isn't a
-        // BIP 125 replacement transaction (may not be widely supported), the
+        // This transaction should only count for fee estimation if the
         // node is not behind, and the transaction is not dependent on any other
         // transactions in the mempool.
-        bool validForFeeEstimation = !fReplacementTransaction && IsCurrentForFeeEstimation() && pool.HasNoInputsOf(tx);
+        bool validForFeeEstimation = IsCurrentForFeeEstimation() && pool.HasNoInputsOf(tx);
 
         // Store transaction in memory
         pool.addUnchecked(hash, entry, setAncestors, validForFeeEstimation);
@@ -1101,11 +911,11 @@ bool AcceptToMemoryPoolWorker(CTxMemPool& pool, CValidationState& state, const C
 }
 
 bool AcceptToMemoryPoolWithTime(CTxMemPool& pool, CValidationState &state, const CTransactionRef &tx, bool fLimitFree,
-                        bool* pfMissingInputs, int64_t nAcceptTime, std::list<CTransactionRef>* plTxnReplaced,
-                        bool fOverrideMempoolLimit, const CAmount nAbsurdFee, bool fDryRun)
+                        bool* pfMissingInputs, int64_t nAcceptTime, bool fOverrideMempoolLimit, 
+                        const CAmount nAbsurdFee, bool fDryRun)
 {
     std::vector<COutPoint> coins_to_uncache;
-    bool res = AcceptToMemoryPoolWorker(pool, state, tx, fLimitFree, pfMissingInputs, nAcceptTime, plTxnReplaced, fOverrideMempoolLimit, nAbsurdFee, coins_to_uncache, fDryRun);
+    bool res = AcceptToMemoryPoolWorker(pool, state, tx, fLimitFree, pfMissingInputs, nAcceptTime, fOverrideMempoolLimit, nAbsurdFee, coins_to_uncache, fDryRun);
     if (!res || fDryRun) {
         if(!res) LogPrint("mempool", "%s: %s %s (%s)\n", __func__, tx->GetHash().ToString(), state.GetRejectReason(), state.GetDebugMessage());
         BOOST_FOREACH(const COutPoint& hashTx, coins_to_uncache)
@@ -1118,10 +928,9 @@ bool AcceptToMemoryPoolWithTime(CTxMemPool& pool, CValidationState &state, const
 }
 
 bool AcceptToMemoryPool(CTxMemPool& pool, CValidationState &state, const CTransactionRef &tx, bool fLimitFree,
-                        bool* pfMissingInputs, std::list<CTransactionRef>* plTxnReplaced,
-                        bool fOverrideMempoolLimit, const CAmount nAbsurdFee, bool fDryRun)
+                        bool* pfMissingInputs, bool fOverrideMempoolLimit, const CAmount nAbsurdFee, bool fDryRun)
 {
-    return AcceptToMemoryPoolWithTime(pool, state, tx, fLimitFree, pfMissingInputs, GetTime(), plTxnReplaced, fOverrideMempoolLimit, nAbsurdFee, fDryRun);
+    return AcceptToMemoryPoolWithTime(pool, state, tx, fLimitFree, pfMissingInputs, GetTime(), fOverrideMempoolLimit, nAbsurdFee, fDryRun);
 }
 
 bool GetTimestampIndex(const unsigned int &high, const unsigned int &low, std::vector<uint256> &hashes)
@@ -2666,7 +2475,7 @@ bool static DisconnectTip(CValidationState& state, const CChainParams& chainpara
         const CTransaction& tx = *it;
         // ignore validation errors in resurrected transactions
         CValidationState stateDummy;
-        if (tx.IsCoinBase() || !AcceptToMemoryPool(mempool, stateDummy, it, false, NULL, NULL, true)) {
+        if (tx.IsCoinBase() || !AcceptToMemoryPool(mempool, stateDummy, it, false, NULL, true)) {
             mempool.removeRecursive(tx, MemPoolRemovalReason::REORG);
         } else if (mempool.exists(tx.GetHash())) {
             vHashUpdate.push_back(tx.GetHash());
diff --git a/src/validation.h b/src/validation.h
index 95bcaf595e49..96b9cd35743b 100644
--- a/src/validation.h
+++ b/src/validation.h
@@ -139,9 +139,6 @@ static const bool DEFAULT_TIMESTAMPINDEX = false;
 static const bool DEFAULT_SPENTINDEX = false;
 static const unsigned int DEFAULT_BANSCORE_THRESHOLD = 100;
 
-/** Default for -mempoolreplacement */
-static const bool DEFAULT_ENABLE_REPLACEMENT = false;
-
 /** Maximum number of headers to announce when relaying blocks with headers message.*/
 static const unsigned int MAX_BLOCKS_TO_ANNOUNCE = 8;
 
@@ -182,7 +179,6 @@ extern CAmount maxTxFee;
 extern bool fAlerts;
 /** If the tip is older than this (in seconds), the node is considered to be in initial block download. */
 extern int64_t nMaxTipAge;
-extern bool fEnableReplacement;
 
 extern bool fLargeWorkForkFound;
 extern bool fLargeWorkInvalidChainFound;
@@ -334,16 +330,15 @@ void PruneAndFlush();
 /** Prune block files up to a given height */
 void PruneBlockFilesManual(int nPruneUpToHeight);
 
-/** (try to) add transaction to memory pool
- * plTxnReplaced will be appended to with all transactions replaced from mempool **/
+/** (try to) add transaction to memory pool */
 bool AcceptToMemoryPool(CTxMemPool& pool, CValidationState &state, const CTransactionRef &tx, bool fLimitFree,
-                        bool* pfMissingInputs, std::list<CTransactionRef>* plTxnReplaced = NULL, bool fOverrideMempoolLimit=false,
+                        bool* pfMissingInputs, bool fOverrideMempoolLimit=false,
                         const CAmount nAbsurdFee=0, bool fDryRun=false);
 
 /** (try to) add transaction to memory pool with a specified acceptance time **/
 bool AcceptToMemoryPoolWithTime(CTxMemPool& pool, CValidationState &state, const CTransactionRef &tx, bool fLimitFree,
-                        bool* pfMissingInputs, int64_t nAcceptTime, std::list<CTransactionRef>* plTxnReplaced = NULL,
-                        bool fOverrideMempoolLimit=false, const CAmount nAbsurdFee=0, bool fDryRun=false);
+                                bool* pfMissingInputs, int64_t nAcceptTime, bool fOverrideMempoolLimit=false, 
+                                const CAmount nAbsurdFee=0, bool fDryRun=false);
 
 bool GetUTXOCoin(const COutPoint& outpoint, Coin& coin);
 int GetUTXOHeight(const COutPoint& outpoint);
diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index 33d500dcae06..7ee20e1c63e9 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -12,7 +12,6 @@
 #include "init.h"
 #include "instantx.h"
 #include "net.h"
-#include "policy/rbf.h"
 #include "rpc/server.h"
 #include "timedata.h"
 #include "util.h"
@@ -82,18 +81,6 @@ void WalletTxToJSON(const CWalletTx& wtx, UniValue& entry)
     entry.push_back(Pair("time", wtx.GetTxTime()));
     entry.push_back(Pair("timereceived", (int64_t)wtx.nTimeReceived));
 
-    // Add opt-in RBF status
-    std::string rbfStatus = "no";
-    if (confirms <= 0) {
-        LOCK(mempool.cs);
-        RBFTransactionState rbfState = IsRBFOptIn(wtx, mempool);
-        if (rbfState == RBF_TRANSACTIONSTATE_UNKNOWN)
-            rbfStatus = "unknown";
-        else if (rbfState == RBF_TRANSACTIONSTATE_REPLACEABLE_BIP125)
-            rbfStatus = "yes";
-    }
-    entry.push_back(Pair("bip125-replaceable", rbfStatus));
-
     BOOST_FOREACH(const PAIRTYPE(std::string, std::string)& item, wtx.mapValue)
         entry.push_back(Pair(item.first, item.second));
 }
@@ -1530,8 +1517,6 @@ UniValue listtransactions(const JSONRPCRequest& request)
             "    \"otheraccount\": \"accountname\",  (string) DEPRECATED. For the 'move' category of transactions, the account the funds came \n"
             "                                          from (for receiving funds, positive amounts), or went to (for sending funds,\n"
             "                                          negative amounts).\n"
-            "    \"bip125-replaceable\": \"yes|no|unknown\",  (string) Whether this transaction could be replaced due to BIP125 (replace-by-fee);\n"
-            "                                                     may be unknown for unconfirmed transactions not in the mempool\n"
             "    \"abandoned\": xxx          (bool) 'true' if the transaction has been abandoned (inputs are respendable). Only available for the \n"
             "                                         'send' category of transactions.\n"
             "  }\n"
@@ -1722,8 +1707,6 @@ UniValue listsinceblock(const JSONRPCRequest& request)
             "    \"txid\": \"transactionid\",  (string) The transaction id. Available for 'send' and 'receive' category of transactions.\n"
             "    \"time\": xxx,              (numeric) The transaction time in seconds since epoch (Jan 1 1970 GMT).\n"
             "    \"timereceived\": xxx,      (numeric) The time received in seconds since epoch (Jan 1 1970 GMT). Available for 'send' and 'receive' category of transactions.\n"
-            "    \"bip125-replaceable\": \"yes|no|unknown\",  (string) Whether this transaction could be replaced due to BIP125 (replace-by-fee);\n"
-            "                                                   may be unknown for unconfirmed transactions not in the mempool\n"
             "    \"abandoned\": xxx,         (bool) 'true' if the transaction has been abandoned (inputs are respendable). Only available for the 'send' category of transactions.\n"
             "    \"comment\": \"...\",         (string) If a comment is associated with the transaction.\n"
             "    \"label\" : \"label\"         (string) A comment for the address/transaction, if any\n"
@@ -1824,8 +1807,6 @@ UniValue gettransaction(const JSONRPCRequest& request)
             "  \"txid\" : \"transactionid\",   (string) The transaction id.\n"
             "  \"time\" : ttt,            (numeric) The transaction time in seconds since epoch (1 Jan 1970 GMT)\n"
             "  \"timereceived\" : ttt,    (numeric) The time received in seconds since epoch (1 Jan 1970 GMT)\n"
-            "  \"bip125-replaceable\": \"yes|no|unknown\",  (string) Whether this transaction could be replaced due to BIP125 (replace-by-fee);\n"
-            "                                                   may be unknown for unconfirmed transactions not in the mempool\n"
             "  \"details\" : [\n"
             "    {\n"
             "      \"account\" : \"accountname\",      (string) DEPRECATED. The account name involved in the transaction, can be \"\" for the default account.\n"
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
index 529b186e672f..2da41cd6d3b5 100644
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -5425,5 +5425,5 @@ int CMerkleTx::GetBlocksToMaturity() const
 
 bool CMerkleTx::AcceptToMemoryPool(const CAmount& nAbsurdFee, CValidationState& state)
 {
-    return ::AcceptToMemoryPool(mempool, state, tx, true, NULL, NULL, false, nAbsurdFee);
+    return ::AcceptToMemoryPool(mempool, state, tx, true, NULL, false, nAbsurdFee);
 }

From 3d48824b484eef7ced42d6eaca7784580791edb6 Mon Sep 17 00:00:00 2001
From: PastaPastaPasta <pasta@dashboost.org>
Date: Thu, 20 Sep 2018 07:40:00 -0500
Subject: [PATCH 150/400] Update .clang-format to more accurately show the
 actual style (#2299)

* updated clang formatting

* add `BreakConstructorInitializers: AfterColon`

* revert column limit change

* AlignConsecutiveAssignments: true

* Revert "AlignConsecutiveAssignments: true"

This reverts commit fc4a4a54f7b0d9e725179a3ee1bf0808c08b0da6.
---
 src/.clang-format | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/.clang-format b/src/.clang-format
index fc53509138fa..1e8222754462 100644
--- a/src/.clang-format
+++ b/src/.clang-format
@@ -10,11 +10,13 @@ AllowShortIfStatementsOnASingleLine: true
 AllowShortLoopsOnASingleLine: false
 AlwaysBreakBeforeMultilineStrings: false
 AlwaysBreakTemplateDeclarations: true
+BinPackArguments: true
 BinPackParameters: false
 BreakBeforeBinaryOperators: false
 BreakBeforeBraces: Linux
-BreakBeforeTernaryOperators: false
+BreakBeforeTernaryOperators: true
 BreakConstructorInitializersBeforeComma: false
+BreakConstructorInitializers: AfterColon
 ColumnLimit:     0
 CommentPragmas:  '^ IWYU pragma:'
 ConstructorInitializerAllOnOneLineOrOnePerLine: false
@@ -35,8 +37,8 @@ ObjCSpaceBeforeProtocolList: false
 PenaltyBreakBeforeFirstCallParameter: 1
 PenaltyBreakComment: 300
 PenaltyBreakFirstLessLess: 120
-PenaltyBreakString: 1000
-PenaltyExcessCharacter: 1000000
+PenaltyBreakString: 100
+PenaltyExcessCharacter: 5
 PenaltyReturnTypeOnItsOwnLine: 200
 PointerAlignment: Left
 SpaceBeforeAssignmentOperators: true

From 85a958a360ee9f7a0e01742ccee8d52a490cb7fe Mon Sep 17 00:00:00 2001
From: UdjinM6 <UdjinM6@users.noreply.github.com>
Date: Thu, 20 Sep 2018 15:40:43 +0300
Subject: [PATCH 151/400] Drop dummy copy constructors in CPrivateSend*Session
 (#2305)

* Switch vecSessions to deque and drop dummy copy constructors

* s/vec/deq/ for PS vecSessions/cs_vecsessions
---
 src/privatesend-client.cpp | 46 +++++++++++++++++++-------------------
 src/privatesend-client.h   |  7 +++---
 src/privatesend.h          |  1 -
 3 files changed, 26 insertions(+), 28 deletions(-)

diff --git a/src/privatesend-client.cpp b/src/privatesend-client.cpp
index 3f2552e8e1c2..f0bd2a6dec4b 100644
--- a/src/privatesend-client.cpp
+++ b/src/privatesend-client.cpp
@@ -72,8 +72,8 @@ void CPrivateSendClientManager::ProcessMessage(CNode* pfrom, const std::string&
 
         // if the queue is ready, submit if we can
         if(dsq.fReady) {
-            LOCK(cs_vecsessions);
-            for (auto& session : vecSessions) {
+            LOCK(cs_deqsessions);
+            for (auto& session : deqSessions) {
                 masternode_info_t mnMixing;
                 if (session.GetMixingMasternodeInfo(mnMixing) && mnMixing.addr == infoMn.addr && session.GetState() == POOL_STATE_QUEUE) {
                     LogPrint("privatesend", "DSQUEUE -- PrivateSend queue (%s) is ready on masternode %s\n", dsq.ToString(), infoMn.addr.ToString());
@@ -82,7 +82,7 @@ void CPrivateSendClientManager::ProcessMessage(CNode* pfrom, const std::string&
                 }
             }
         } else {
-            LOCK(cs_vecsessions); // have to lock this first to avoid deadlocks with cs_vecqueue
+            LOCK(cs_deqsessions); // have to lock this first to avoid deadlocks with cs_vecqueue
             TRY_LOCK(cs_vecqueue, lockRecv);
             if(!lockRecv) return;
 
@@ -105,7 +105,7 @@ void CPrivateSendClientManager::ProcessMessage(CNode* pfrom, const std::string&
             if(!mnodeman.AllowMixing(dsq.masternodeOutpoint)) return;
 
             LogPrint("privatesend", "DSQUEUE -- new PrivateSend queue (%s) from masternode %s\n", dsq.ToString(), infoMn.addr.ToString());
-            for (auto& session : vecSessions) {
+            for (auto& session : deqSessions) {
                 masternode_info_t mnMixing;
                 if (session.GetMixingMasternodeInfo(mnMixing) && mnMixing.outpoint == dsq.masternodeOutpoint) {
                     dsq.fTried = true;
@@ -120,8 +120,8 @@ void CPrivateSendClientManager::ProcessMessage(CNode* pfrom, const std::string&
         strCommand == NetMsgType::DSFINALTX ||
         strCommand == NetMsgType::DSCOMPLETE
     ) {
-        LOCK(cs_vecsessions);
-        for (auto& session : vecSessions) {
+        LOCK(cs_deqsessions);
+        for (auto& session : deqSessions) {
             session.ProcessMessage(pfrom, strCommand, vRecv, connman);
         }
     }
@@ -251,13 +251,13 @@ void CPrivateSendClientSession::ResetPool()
 
 void CPrivateSendClientManager::ResetPool()
 {
-    LOCK(cs_vecsessions);
+    LOCK(cs_deqsessions);
     nCachedLastSuccessBlock = 0;
     vecMasternodesUsed.clear();
-    for (auto& session : vecSessions) {
+    for (auto& session : deqSessions) {
         session.ResetPool();
     }
-    vecSessions.clear();
+    deqSessions.clear();
 }
 
 void CPrivateSendClientSession::SetNull()
@@ -340,11 +340,11 @@ std::string CPrivateSendClientSession::GetStatus(bool fWaitForBlock)
 
 std::string CPrivateSendClientManager::GetStatuses()
 {
-    LOCK(cs_vecsessions);
+    LOCK(cs_deqsessions);
     std::string strStatus;
     bool fWaitForBlock = WaitForAnotherBlock();
 
-    for (auto& session : vecSessions) {
+    for (auto& session : deqSessions) {
         strStatus += session.GetStatus(fWaitForBlock) + "; ";
     }
     return strStatus;
@@ -352,10 +352,10 @@ std::string CPrivateSendClientManager::GetStatuses()
 
 std::string CPrivateSendClientManager::GetSessionDenoms()
 {
-    LOCK(cs_vecsessions);
+    LOCK(cs_deqsessions);
     std::string strSessionDenoms;
 
-    for (auto& session : vecSessions) {
+    for (auto& session : deqSessions) {
         strSessionDenoms += (session.nSessionDenom ? CPrivateSend::GetDenominationsToString(session.nSessionDenom) : "N/A") + "; ";
     }
     return strSessionDenoms.empty() ? "N/A" : strSessionDenoms;
@@ -369,8 +369,8 @@ bool CPrivateSendClientSession::GetMixingMasternodeInfo(masternode_info_t& mnInf
 
 bool CPrivateSendClientManager::GetMixingMasternodesInfo(std::vector<masternode_info_t>& vecMnInfoRet) const
 {
-    LOCK(cs_vecsessions);
-    for (const auto& session : vecSessions) {
+    LOCK(cs_deqsessions);
+    for (const auto& session : deqSessions) {
         masternode_info_t mnInfo;
         if (session.GetMixingMasternodeInfo(mnInfo)) {
             vecMnInfoRet.push_back(mnInfo);
@@ -445,8 +445,8 @@ void CPrivateSendClientManager::CheckTimeout()
 
     CheckQueue();
 
-    LOCK(cs_vecsessions);
-    for (auto& session : vecSessions) {
+    LOCK(cs_deqsessions);
+    for (auto& session : deqSessions) {
         if (session.CheckTimeout()) {
             strAutoDenomResult = _("Session timed out.");
         }
@@ -957,12 +957,12 @@ bool CPrivateSendClientManager::DoAutomaticDenominating(CConnman& connman, bool
         LogPrint("privatesend", "  vecMasternodesUsed: new size: %d, threshold: %d\n", (int)vecMasternodesUsed.size(), nThreshold_high);
     }
 
-    LOCK(cs_vecsessions);
+    LOCK(cs_deqsessions);
     bool fResult = true;
-    if ((int)vecSessions.size() < nPrivateSendSessions) {
-        vecSessions.emplace_back();
+    if ((int)deqSessions.size() < nPrivateSendSessions) {
+        deqSessions.emplace_back();
     }
-    for (auto& session : vecSessions) {
+    for (auto& session : deqSessions) {
         if (!CheckAutomaticBackup())
             return false;
 
@@ -1157,8 +1157,8 @@ bool CPrivateSendClientSession::ProcessPendingDsaRequest(CConnman& connman)
 
 void CPrivateSendClientManager::ProcessPendingDsaRequest(CConnman& connman)
 {
-    LOCK(cs_vecsessions);
-    for (auto& session : vecSessions) {
+    LOCK(cs_deqsessions);
+    for (auto& session : deqSessions) {
         if (session.ProcessPendingDsaRequest(connman)) {
             strAutoDenomResult = _("Mixing in progress...");
         }
diff --git a/src/privatesend-client.h b/src/privatesend-client.h
index 90f6942f5974..f32db5611ee6 100644
--- a/src/privatesend-client.h
+++ b/src/privatesend-client.h
@@ -141,7 +141,6 @@ class CPrivateSendClientSession : public CPrivateSendBaseSession
         pendingDsaRequest(),
         keyHolderStorage()
         {}
-    CPrivateSendClientSession(const CPrivateSendClientSession& other) { /* dummy copy constructor*/ SetNull(); }
 
     void ProcessMessage(CNode* pfrom, const std::string& strCommand, CDataStream& vRecv, CConnman& connman);
 
@@ -175,8 +174,8 @@ class CPrivateSendClientManager : public CPrivateSendBaseManager
     std::vector<CAmount> vecDenominationsSkipped;
 
     // TODO: or map<denom, CPrivateSendClientSession> ??
-    std::vector<CPrivateSendClientSession> vecSessions;
-    mutable CCriticalSection cs_vecsessions;
+    std::deque<CPrivateSendClientSession> deqSessions;
+    mutable CCriticalSection cs_deqsessions;
 
     int nCachedLastSuccessBlock;
     int nMinBlocksToWait; // how many blocks to wait after one successful mixing tx in non-multisession mode
@@ -204,7 +203,7 @@ class CPrivateSendClientManager : public CPrivateSendBaseManager
     CPrivateSendClientManager() :
         vecMasternodesUsed(),
         vecDenominationsSkipped(),
-        vecSessions(),
+        deqSessions(),
         nCachedLastSuccessBlock(0),
         nMinBlocksToWait(1),
         strAutoDenomResult(),
diff --git a/src/privatesend.h b/src/privatesend.h
index 1211e125f773..14636f5c6fbc 100644
--- a/src/privatesend.h
+++ b/src/privatesend.h
@@ -339,7 +339,6 @@ class CPrivateSendBaseSession
         finalMutableTransaction(),
         nSessionDenom(0)
         {}
-    CPrivateSendBaseSession(const CPrivateSendBaseSession& other) { /* dummy copy constructor*/ SetNull(); }
 
     int GetState() const { return nState; }
     std::string GetStateString() const;

From 2c1a17909ea61d4bceb322969add6bafdd2fb70b Mon Sep 17 00:00:00 2001
From: Nathan Marley <nathan.marley@gmail.com>
Date: Thu, 20 Sep 2018 05:41:16 -0700
Subject: [PATCH 152/400] cleanup: remove unused vars, includes, functions
 (#2306)

---
 src/activemasternode.h    |  1 -
 src/governance-classes.h  |  5 -----
 src/governance-object.h   |  4 ----
 src/instantx.cpp          | 12 ------------
 src/instantx.h            |  3 ---
 src/masternode-payments.h |  1 -
 src/masternode-sync.cpp   |  4 ----
 src/masternode-sync.h     |  4 ----
 src/masternodeconfig.h    | 20 --------------------
 src/masternodeman.h       |  1 -
 src/rpc/masternode.cpp    |  2 --
 11 files changed, 57 deletions(-)

diff --git a/src/activemasternode.h b/src/activemasternode.h
index c937d57e0983..22f761caba5a 100644
--- a/src/activemasternode.h
+++ b/src/activemasternode.h
@@ -62,7 +62,6 @@ class CActiveDeterministicMasternodeManager : public CValidationInterface
 
     CDeterministicMNCPtr GetDMN() const { return mnListEntry; }
 
-    masternode_state_t GetState() const { return state; }
     std::string GetStateString() const;
     std::string GetStatus() const;
 
diff --git a/src/governance-classes.h b/src/governance-classes.h
index ccd14f793c4d..6584f56c433d 100644
--- a/src/governance-classes.h
+++ b/src/governance-classes.h
@@ -13,13 +13,9 @@
 #include "util.h"
 
 class CSuperblock;
-class CGovernanceTrigger;
 class CGovernanceTriggerManager;
 class CSuperblockManager;
 
-static const int TRIGGER_UNKNOWN            = -1;
-static const int TRIGGER_SUPERBLOCK         = 1000;
-
 typedef std::shared_ptr<CSuperblock> CSuperblock_sptr;
 
 // DECLARE GLOBAL VARIABLES FOR GOVERNANCE CLASSES
@@ -40,7 +36,6 @@ class CGovernanceTriggerManager
 private:
     typedef std::map<uint256, CSuperblock_sptr> trigger_m_t;
     typedef trigger_m_t::iterator trigger_m_it;
-    typedef trigger_m_t::const_iterator trigger_m_cit;
 
     trigger_m_t mapTrigger;
 
diff --git a/src/governance-object.h b/src/governance-object.h
index 9aebe35a37f5..20613bf0a713 100644
--- a/src/governance-object.h
+++ b/src/governance-object.h
@@ -239,10 +239,6 @@ class CGovernanceObject
         return fExpired;
     }
 
-    void InvalidateVoteCache() {
-        fDirtyCache = true;
-    }
-
     const CGovernanceObjectVoteFile& GetVoteFile() const {
         return fileVotes;
     }
diff --git a/src/instantx.cpp b/src/instantx.cpp
index 79412272b6f6..fbf30ac668e7 100644
--- a/src/instantx.cpp
+++ b/src/instantx.cpp
@@ -777,18 +777,6 @@ bool CInstantSend::GetTxLockVote(const uint256& hash, CTxLockVote& txLockVoteRet
     return true;
 }
 
-bool CInstantSend::IsInstantSendReadyToLock(const uint256& txHash)
-{
-    if(!fEnableInstantSend || GetfLargeWorkForkFound() || GetfLargeWorkInvalidChainFound() ||
-        !sporkManager.IsSporkActive(SPORK_2_INSTANTSEND_ENABLED)) return false;
-
-    LOCK(cs_instantsend);
-    // There must be a successfully verified lock request
-    // and all outputs must be locked (i.e. have enough signatures)
-    std::map<uint256, CTxLockCandidate>::iterator it = mapTxLockCandidates.find(txHash);
-    return it != mapTxLockCandidates.end() && it->second.IsAllOutPointsReady();
-}
-
 void CInstantSend::Clear()
 {
     LOCK(cs_instantsend);
diff --git a/src/instantx.h b/src/instantx.h
index e3c06af1aee4..0746f5b4f447 100644
--- a/src/instantx.h
+++ b/src/instantx.h
@@ -36,7 +36,6 @@ static const int INSTANTSEND_LOCK_TIMEOUT_SECONDS   = 15;
 static const int INSTANTSEND_FAILED_TIMEOUT_SECONDS = 60;
 
 extern bool fEnableInstantSend;
-extern int nInstantSendDepth;
 extern int nCompleteTXLocks;
 
 /**
@@ -82,8 +81,6 @@ class CInstantSend
     void UpdateLockedTransaction(const CTxLockCandidate& txLockCandidate);
     bool ResolveConflicts(const CTxLockCandidate& txLockCandidate);
 
-    bool IsInstantSendReadyToLock(const uint256 &txHash);
-
 public:
     mutable CCriticalSection cs_instantsend;
 
diff --git a/src/masternode-payments.h b/src/masternode-payments.h
index 59b1a320f44b..e1e2eb9eecad 100644
--- a/src/masternode-payments.h
+++ b/src/masternode-payments.h
@@ -28,7 +28,6 @@ static const int MIN_MASTERNODE_PAYMENT_PROTO_VERSION_2 = 70210;
 
 extern CCriticalSection cs_vecPayees;
 extern CCriticalSection cs_mapMasternodeBlocks;
-extern CCriticalSection cs_mapMasternodePayeeVotes;
 
 extern CMasternodePayments mnpayments;
 
diff --git a/src/masternode-sync.cpp b/src/masternode-sync.cpp
index 2b45e330149e..9ff1267151a8 100644
--- a/src/masternode-sync.cpp
+++ b/src/masternode-sync.cpp
@@ -3,18 +3,14 @@
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #include "activemasternode.h"
-#include "checkpoints.h"
 #include "governance.h"
 #include "validation.h"
-#include "masternode.h"
 #include "masternode-payments.h"
 #include "masternode-sync.h"
 #include "masternodeman.h"
 #include "netfulfilledman.h"
 #include "netmessagemaker.h"
-#include "spork.h"
 #include "ui_interface.h"
-#include "util.h"
 #include "evo/deterministicmns.h"
 
 class CMasternodeSync;
diff --git a/src/masternode-sync.h b/src/masternode-sync.h
index 8a7464f05456..1ae54a6ec852 100644
--- a/src/masternode-sync.h
+++ b/src/masternode-sync.h
@@ -7,8 +7,6 @@
 #include "chain.h"
 #include "net.h"
 
-#include <univalue.h>
-
 class CMasternodeSync;
 
 static const int MASTERNODE_SYNC_FAILED          = -1;
@@ -24,8 +22,6 @@ static const int MASTERNODE_SYNC_FINISHED        = 999;
 static const int MASTERNODE_SYNC_TICK_SECONDS    = 6;
 static const int MASTERNODE_SYNC_TIMEOUT_SECONDS = 30; // our blocks are 2.5 minutes so 30 seconds should be fine
 
-static const int MASTERNODE_SYNC_ENOUGH_PEERS    = 6;
-
 extern CMasternodeSync masternodeSync;
 
 //
diff --git a/src/masternodeconfig.h b/src/masternodeconfig.h
index 39066cd3b904..7d978d9dc7d4 100644
--- a/src/masternodeconfig.h
+++ b/src/masternodeconfig.h
@@ -36,41 +36,21 @@ class CMasternodeConfig
             return alias;
         }
 
-        void setAlias(const std::string& alias) {
-            this->alias = alias;
-        }
-
         const std::string& getOutputIndex() const {
             return outputIndex;
         }
 
-        void setOutputIndex(const std::string& outputIndex) {
-            this->outputIndex = outputIndex;
-        }
-
         const std::string& getPrivKey() const {
             return privKey;
         }
 
-        void setPrivKey(const std::string& privKey) {
-            this->privKey = privKey;
-        }
-
         const std::string& getTxHash() const {
             return txHash;
         }
 
-        void setTxHash(const std::string& txHash) {
-            this->txHash = txHash;
-        }
-
         const std::string& getIp() const {
             return ip;
         }
-
-        void setIp(const std::string& ip) {
-            this->ip = ip;
-        }
     };
 
     CMasternodeConfig() {
diff --git a/src/masternodeman.h b/src/masternodeman.h
index 94d102cde42e..3e7b916f8202 100644
--- a/src/masternodeman.h
+++ b/src/masternodeman.h
@@ -135,7 +135,6 @@ class CMasternodeMan
 
     /// Ask (source) node for mnb
     void AskForMN(CNode *pnode, const COutPoint& outpoint, CConnman& connman);
-    void AskForMnb(CNode *pnode, const uint256 &hash);
 
     bool PoSeBan(const COutPoint &outpoint);
     bool AllowMixing(const COutPoint &outpoint);
diff --git a/src/rpc/masternode.cpp b/src/rpc/masternode.cpp
index 3aaacc05ab60..284278e4dc46 100644
--- a/src/rpc/masternode.cpp
+++ b/src/rpc/masternode.cpp
@@ -621,13 +621,11 @@ UniValue masternode_info(const JSONRPCRequest& request)
 
     CTransactionRef tx;
     uint256 hashBlock;
-    bool fromMempool = false;
 
     auto dmn = deterministicMNManager->GetListAtChainTip().GetMN(proTxHash);
     if (!dmn) {
         tx = mempool.get(proTxHash);
         if (tx) {
-            fromMempool = true;
             if (tx->nVersion < 3 || tx->nType != TRANSACTION_PROVIDER_REGISTER)
                 throw JSONRPCError(RPC_INVALID_PARAMETER, "TX is not a ProTx");
             CProRegTx tmpProTx;

From 8c0dca28266ec735eb43b40727f167c0a324a416 Mon Sep 17 00:00:00 2001
From: UdjinM6 <UdjinM6@users.noreply.github.com>
Date: Wed, 26 Sep 2018 17:15:02 +0300
Subject: [PATCH 153/400] Add versioning to spork cache (#2312)

---
 src/spork.cpp | 32 ++++++++++++++++++++++++++++++++
 src/spork.h   | 15 +++++++++++++--
 2 files changed, 45 insertions(+), 2 deletions(-)

diff --git a/src/spork.cpp b/src/spork.cpp
index 1d096fa93589..c5fcf3cdd420 100644
--- a/src/spork.cpp
+++ b/src/spork.cpp
@@ -15,6 +15,8 @@
 
 CSporkManager sporkManager;
 
+const std::string CSporkManager::SERIALIZATION_VERSION_STRING = "CMasternodeMan-Version-1";
+
 std::map<int, int64_t> mapSporkDefaults = {
     {SPORK_2_INSTANTSEND_ENABLED,            0},             // ON
     {SPORK_3_INSTANTSEND_BLOCK_FILTERING,    0},             // ON
@@ -37,6 +39,36 @@ void CSporkManager::Clear()
     sporkPrivKey = CKey();
 }
 
+void CSporkManager::CheckAndRemove()
+{
+    LOCK(cs);
+    bool fSporkAddressIsSet = !sporkPubKeyID.IsNull();
+    assert(fSporkAddressIsSet);
+
+    auto itActive = mapSporksActive.begin();
+    while (itActive != mapSporksActive.end()) {
+        if (!itActive->second.CheckSignature(sporkPubKeyID, false)) {
+            if (!itActive->second.CheckSignature(sporkPubKeyID, true)) {
+                mapSporksByHash.erase(itActive->second.GetHash());
+                mapSporksActive.erase(itActive++);
+                continue;
+            }
+        }
+        ++itActive;
+    }
+    auto itByHash = mapSporksByHash.begin();
+    while (itByHash != mapSporksByHash.end()) {
+        if (!itByHash->second.CheckSignature(sporkPubKeyID, false)) {
+            if (!itByHash->second.CheckSignature(sporkPubKeyID, true)) {
+                mapSporksActive.erase(itByHash->second.nSporkID);
+                mapSporksByHash.erase(itByHash++);
+                continue;
+            }
+        }
+        ++itByHash;
+    }
+}
+
 void CSporkManager::ProcessSpork(CNode* pfrom, const std::string& strCommand, CDataStream& vRecv, CConnman& connman)
 {
     if(fLiteMode) return; // disable all Dash specific functionality
diff --git a/src/spork.h b/src/spork.h
index 4ccd619d1231..262faa82987e 100644
--- a/src/spork.h
+++ b/src/spork.h
@@ -86,6 +86,8 @@ class CSporkMessage
 class CSporkManager
 {
 private:
+    static const std::string SERIALIZATION_VERSION_STRING;
+
     mutable CCriticalSection cs;
     std::map<uint256, CSporkMessage> mapSporksByHash;
     std::map<int, CSporkMessage> mapSporksActive;
@@ -101,6 +103,16 @@ class CSporkManager
 
     template <typename Stream, typename Operation>
     inline void SerializationOp(Stream& s, Operation ser_action) {
+        std::string strVersion;
+        if(ser_action.ForRead()) {
+            READWRITE(strVersion);
+            if (strVersion != SERIALIZATION_VERSION_STRING) {
+                return;
+            }
+        } else {
+            strVersion = SERIALIZATION_VERSION_STRING;
+            READWRITE(strVersion);
+        }
         READWRITE(sporkPubKeyID);
         READWRITE(mapSporksByHash);
         READWRITE(mapSporksActive);
@@ -108,8 +120,7 @@ class CSporkManager
     }
 
     void Clear();
-    /// Dummy implementation for CFlatDB
-    void CheckAndRemove() {}
+    void CheckAndRemove();
 
     void ProcessSpork(CNode* pfrom, const std::string& strCommand, CDataStream& vRecv, CConnman& connman);
     void ExecuteSpork(int nSporkID, int nValue);

From c2958733e6934e3c1662477f5477a3218a02e6b8 Mon Sep 17 00:00:00 2001
From: UdjinM6 <UdjinM6@users.noreply.github.com>
Date: Wed, 26 Sep 2018 17:15:58 +0300
Subject: [PATCH 154/400] CSporkManager::Clear() should not alter sporkPubKeyID
 and sporkPrivKey (#2313)

---
 src/spork.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/spork.cpp b/src/spork.cpp
index c5fcf3cdd420..aeee817982f0 100644
--- a/src/spork.cpp
+++ b/src/spork.cpp
@@ -35,8 +35,8 @@ void CSporkManager::Clear()
     LOCK(cs);
     mapSporksActive.clear();
     mapSporksByHash.clear();
-    sporkPubKeyID.SetNull();
-    sporkPrivKey = CKey();
+    // sporkPubKeyID and sporkPrivKey should be set in init.cpp,
+    // we should not alter them here.
 }
 
 void CSporkManager::CheckAndRemove()

From d932d2c4e1b1fe082216b4e73a58d77ebd3bd1f4 Mon Sep 17 00:00:00 2001
From: UdjinM6 <UdjinM6@users.noreply.github.com>
Date: Wed, 26 Sep 2018 17:16:22 +0300
Subject: [PATCH 155/400] Add instantlock field to getrawtransaction rpc output
 (#2314)

---
 src/rpc/rawtransaction.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/rpc/rawtransaction.cpp b/src/rpc/rawtransaction.cpp
index 717d1c8dc26a..b70ffda4928f 100644
--- a/src/rpc/rawtransaction.cpp
+++ b/src/rpc/rawtransaction.cpp
@@ -184,6 +184,8 @@ void TxToJSON(const CTransaction& tx, const uint256 hashBlock, UniValue& entry)
             }
         }
     }
+    bool fLocked = instantsend.IsLockedInstantSendTransaction(txid);
+    entry.push_back(Pair("instantlock", fLocked));
 }
 
 UniValue getrawtransaction(const JSONRPCRequest& request)
@@ -249,6 +251,7 @@ UniValue getrawtransaction(const JSONRPCRequest& request)
             "  \"confirmations\" : n,      (numeric) The confirmations\n"
             "  \"time\" : ttt,             (numeric) The transaction time in seconds since epoch (Jan 1 1970 GMT)\n"
             "  \"blocktime\" : ttt         (numeric) The block time in seconds since epoch (Jan 1 1970 GMT)\n"
+            "  \"instantlock\" : true|false, (bool) Current transaction lock state\n"
             "}\n"
 
             "\nExamples:\n"

From 547b81dd0df5f254be22750a941b8c96f97de004 Mon Sep 17 00:00:00 2001
From: UdjinM6 <UdjinM6@users.noreply.github.com>
Date: Wed, 26 Sep 2018 17:16:40 +0300
Subject: [PATCH 156/400] log `gobject prepare` params (#2317)

---
 src/rpc/governance.cpp | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/rpc/governance.cpp b/src/rpc/governance.cpp
index 143bd2ad22b2..bbe0ff70b5e8 100644
--- a/src/rpc/governance.cpp
+++ b/src/rpc/governance.cpp
@@ -164,6 +164,15 @@ UniValue gobject_prepare(const JSONRPCRequest& request)
 
     CGovernanceObject govobj(hashParent, nRevision, nTime, uint256(), strDataHex);
 
+    // This command is dangerous because it consumes 5 DASH irreversibly.
+    // If params are lost, it's very hard to bruteforce them and yet
+    // users ignore all instructions on dashcentral etc. and do not save them...
+    // Let's log them here and hope users do not mess with debug.log
+    LogPrintf("gobject_prepare -- params: %s %s %s %s, data: %s, hash: %s\n",
+                request.params[1].get_str(), request.params[2].get_str(),
+                request.params[3].get_str(), request.params[4].get_str(),
+                govobj.GetDataAsPlainString(), govobj.GetHash().ToString());
+
     if (govobj.GetObjectType() == GOVERNANCE_OBJECT_PROPOSAL) {
         CProposalValidator validator(strDataHex);
         if (!validator.Validate()) {

From 5454bea377d230ddba7101e2f123d17cb7348bc8 Mon Sep 17 00:00:00 2001
From: gladcow <sergey@dash.org>
Date: Wed, 26 Sep 2018 17:17:47 +0300
Subject: [PATCH 157/400] Automatic InstantSend locks for "simple" transactions
 (#2140)

* add locktransaction rpc call

* Remove special instantsend fee for simple transactions

* Function to check if trx is simple enough to be autolocked

* Automatic lock for all received from peers simple trxes

If we get a new transaction with CInv message and it is "simple" and
is accepted in mempool, we initiate its lock. We don't lock orphan trxes
that accepted in mempool after this trx because they are locked by other
peers.

* Automatically lock simple trxes in wallet

* protocol bump for InstantSend without special fee

* Add function to detect used mempool share

* Mempool threshold for auto IX locks

* Add SPORK_16_INSTANTSEND_AUTOLOCKS spork

* Make autolocks active only when spork SPORK_16_INSTANTSEND_AUTOLOCKS is active

* BIP9 autolocks activation

* revert increasing min peer protocol version for mn rank

* move IsTrxSimple check to CTxLockRequest class

* make MAX_INPUTS_FOR_AUTO_IX private member of CTxLockRequest class

* make AUTO_IX_MEMPOOL_THRESHOLD private member of CInstantSend class

* remove locktransaction RPC call

* tests for automatic IS locks

* fix mempool threshod calculation

* bump mocktime in activate_autoix_bip9

* set node times

* no need to spam the node with gettransaction rpc requests that often

* use `spork active` instead of leaking spork logic into tests

* codestyle fixes

* add test description in comments

* fix typo

* sync test nodes more often during BIP9 activation

* Use 4th bit in BIP9 activation

* Fix comments according codestyle guide

* Call AcceptLockRequest and Vote at the first node creating autoix lock

* fix mempool used memory calculation

* rallback not necessary change in CWallet::CreateTransaction

* test for stopping autolocks for full mempool

* Inject "simple autolockable" txes into txlockrequest logic
---
 qa/pull-tester/rpc-tests.py         |   2 +
 qa/rpc-tests/autoix-mempool.py      | 306 ++++++++++++++++++++++++++++
 qa/rpc-tests/p2p-autoinstantsend.py | 300 +++++++++++++++++++++++++++
 src/chainparams.cpp                 |  25 +++
 src/consensus/params.h              |   1 +
 src/dsnotificationinterface.cpp     |   3 +
 src/instantx.cpp                    |  19 ++
 src/instantx.h                      |  18 ++
 src/net_processing.cpp              |  15 +-
 src/rpc/blockchain.cpp              |   1 +
 src/spork.cpp                       |   3 +
 src/spork.h                         |   3 +-
 src/txmempool.cpp                   |  10 +
 src/txmempool.h                     |   2 +
 src/validation.cpp                  |   2 +-
 src/versionbits.cpp                 |   5 +
 src/wallet/wallet.cpp               |   3 +-
 17 files changed, 712 insertions(+), 6 deletions(-)
 create mode 100755 qa/rpc-tests/autoix-mempool.py
 create mode 100755 qa/rpc-tests/p2p-autoinstantsend.py

diff --git a/qa/pull-tester/rpc-tests.py b/qa/pull-tester/rpc-tests.py
index 372eb104b14d..e248d80859fc 100755
--- a/qa/pull-tester/rpc-tests.py
+++ b/qa/pull-tester/rpc-tests.py
@@ -116,6 +116,8 @@
     'p2p-fullblocktest.py', # NOTE: needs dash_hash to pass
     'fundrawtransaction.py',
     'fundrawtransaction-hd.py',
+    'p2p-autoinstantsend.py',
+    'autoix-mempool.py',
     # vv Tests less than 2m vv
     'p2p-instantsend.py',
     'wallet.py',
diff --git a/qa/rpc-tests/autoix-mempool.py b/qa/rpc-tests/autoix-mempool.py
new file mode 100755
index 000000000000..178ef1f2dfbf
--- /dev/null
+++ b/qa/rpc-tests/autoix-mempool.py
@@ -0,0 +1,306 @@
+#!/usr/bin/env python3
+# Copyright (c) 2018 The Dash Core developers
+# Distributed under the MIT software license, see the accompanying
+# file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+from test_framework.mininode import *
+from test_framework.test_framework import BitcoinTestFramework
+from test_framework.util import *
+from time import *
+
+'''
+autoix-mempool.py
+
+Checks if automatic InstantSend locks stop working when transaction mempool 
+is full (more than 0.1 part from max value). 
+
+'''
+
+MASTERNODE_COLLATERAL = 1000
+MAX_MEMPOOL_SIZE = 5 # max node mempool in MBs
+MB_SIZE = 1000000 # C++ code use this coefficient to calc MB in mempool
+AUTO_IX_MEM_THRESHOLD = 0.1
+
+
+class MasternodeInfo:
+    def __init__(self, key, collateral_id, collateral_out):
+        self.key = key
+        self.collateral_id = collateral_id
+        self.collateral_out = collateral_out
+
+
+class AutoIXMempoolTest(BitcoinTestFramework):
+    def __init__(self):
+        super().__init__()
+        self.mn_count = 10
+        self.num_nodes = self.mn_count + 3
+        self.mninfo = []
+        self.setup_clean_chain = True
+        self.is_network_split = False
+        # set sender,  receiver,  isolated nodes
+        self.receiver_idx = self.num_nodes - 2
+        self.sender_idx = self.num_nodes - 3
+        # additional args
+        self.extra_args = ["-maxmempool=%d" % MAX_MEMPOOL_SIZE]
+
+    def create_simple_node(self):
+        idx = len(self.nodes)
+        args = ["-debug"] + self.extra_args
+        self.nodes.append(start_node(idx, self.options.tmpdir,
+                                     args))
+        for i in range(0, idx):
+            connect_nodes(self.nodes[i], idx)
+
+    def get_mnconf_file(self):
+        return os.path.join(self.options.tmpdir, "node0/regtest/masternode.conf")
+
+    def prepare_masternodes(self):
+        for idx in range(0, self.mn_count):
+            key = self.nodes[0].masternode("genkey")
+            address = self.nodes[0].getnewaddress()
+            txid = self.nodes[0].sendtoaddress(address, MASTERNODE_COLLATERAL)
+            txrow = self.nodes[0].getrawtransaction(txid, True)
+            collateral_vout = 0
+            for vout_idx in range(0, len(txrow["vout"])):
+                vout = txrow["vout"][vout_idx]
+                if vout["value"] == MASTERNODE_COLLATERAL:
+                    collateral_vout = vout_idx
+            self.nodes[0].lockunspent(False,
+                                      [{"txid": txid, "vout": collateral_vout}])
+            self.mninfo.append(MasternodeInfo(key, txid, collateral_vout))
+
+    def write_mn_config(self):
+        conf = self.get_mnconf_file()
+        f = open(conf, 'a')
+        for idx in range(0, self.mn_count):
+            f.write("mn%d 127.0.0.1:%d %s %s %d\n" % (idx + 1, p2p_port(idx + 1),
+                                                      self.mninfo[idx].key,
+                                                      self.mninfo[idx].collateral_id,
+                                                      self.mninfo[idx].collateral_out))
+        f.close()
+
+    def create_masternodes(self):
+        for idx in range(0, self.mn_count):
+            args = ['-debug=masternode', '-externalip=127.0.0.1', '-masternode=1',
+                    '-masternodeprivkey=%s' % self.mninfo[idx].key] + self.extra_args
+            self.nodes.append(start_node(idx + 1, self.options.tmpdir, args))
+            for i in range(0, idx + 1):
+                connect_nodes(self.nodes[i], idx + 1)
+
+    def setup_network(self):
+        self.nodes = []
+        # create faucet node for collateral and transactions
+        args = ["-debug"] + self.extra_args
+        self.nodes.append(start_node(0, self.options.tmpdir, args))
+        required_balance = MASTERNODE_COLLATERAL * self.mn_count + 1
+        while self.nodes[0].getbalance() < required_balance:
+            set_mocktime(get_mocktime() + 1)
+            set_node_times(self.nodes, get_mocktime())
+            self.nodes[0].generate(1)
+        # create masternodes
+        self.prepare_masternodes()
+        self.write_mn_config()
+        stop_node(self.nodes[0], 0)
+        args = ["-debug",
+                "-sporkkey=cP4EKFyJsHT39LDqgdcB43Y3YXjNyjb5Fuas1GQSeAtjnZWmZEQK"] + \
+               self.extra_args
+        self.nodes[0] = start_node(0, self.options.tmpdir,
+                                   args)
+        self.create_masternodes()
+        # create connected simple nodes
+        for i in range(0, self.num_nodes - self.mn_count - 1):
+            self.create_simple_node()
+        set_mocktime(get_mocktime() + 1)
+        set_node_times(self.nodes, get_mocktime())
+        self.nodes[0].generate(1)
+        # sync nodes
+        self.sync_all()
+        set_mocktime(get_mocktime() + 1)
+        set_node_times(self.nodes, get_mocktime())
+        sync_masternodes(self.nodes)
+        for i in range(1, self.mn_count + 1):
+            res = self.nodes[0].masternode("start-alias", "mn%d" % i)
+            assert(res["result"] == 'successful')
+        sync_masternodes(self.nodes)
+        mn_info = self.nodes[0].masternodelist("status")
+        assert(len(mn_info) == self.mn_count)
+        for status in mn_info.values():
+            assert(status == 'ENABLED')
+
+    def get_autoix_bip9_status(self):
+        info = self.nodes[0].getblockchaininfo()
+        return info['bip9_softforks']['autoix']['status']
+
+    def activate_autoix_bip9(self):
+        # sync nodes periodically
+        # if we sync them too often, activation takes too many time
+        # if we sync them too rarely, nodes failed to update its state and
+        # bip9 status is not updated
+        # so, in this code nodes are synced once per 20 blocks
+        counter = 0
+        sync_period = 10
+
+        while self.get_autoix_bip9_status() == 'defined':
+            set_mocktime(get_mocktime() + 1)
+            set_node_times(self.nodes, get_mocktime())
+            self.nodes[0].generate(1)
+            counter += 1
+            if counter % sync_period == 0:
+                # sync nodes
+                self.sync_all()
+                sync_masternodes(self.nodes)
+
+        while self.get_autoix_bip9_status() == 'started':
+            set_mocktime(get_mocktime() + 1)
+            set_node_times(self.nodes, get_mocktime())
+            self.nodes[0].generate(1)
+            counter += 1
+            if counter % sync_period == 0:
+                # sync nodes
+                self.sync_all()
+                sync_masternodes(self.nodes)
+
+        while self.get_autoix_bip9_status() == 'locked_in':
+            set_mocktime(get_mocktime() + 1)
+            set_node_times(self.nodes, get_mocktime())
+            self.nodes[0].generate(1)
+            counter += 1
+            if counter % sync_period == 0:
+                # sync nodes
+                self.sync_all()
+                sync_masternodes(self.nodes)
+
+        # sync nodes
+        self.sync_all()
+        sync_masternodes(self.nodes)
+
+        assert(self.get_autoix_bip9_status() == 'active')
+
+    def get_autoix_spork_state(self):
+        info = self.nodes[0].spork('active')
+        return info['SPORK_16_INSTANTSEND_AUTOLOCKS']
+
+    def set_autoix_spork_state(self, state):
+        if state:
+            value = 0
+        else:
+            value = 4070908800
+        self.nodes[0].spork('SPORK_16_INSTANTSEND_AUTOLOCKS', value)
+
+    def enforce_masternode_payments(self):
+        self.nodes[0].spork('SPORK_8_MASTERNODE_PAYMENT_ENFORCEMENT', 0)
+
+    def create_raw_trx(self, node_from, node_to, amount, min_inputs, max_inputs):
+        assert(min_inputs <= max_inputs)
+        # fill inputs
+        inputs=[]
+        balances = node_from.listunspent()
+        in_amount = 0.0
+        last_amount = 0.0
+        for tx in balances:
+            if len(inputs) < min_inputs:
+                input = {}
+                input["txid"] = tx['txid']
+                input['vout'] = tx['vout']
+                in_amount += float(tx['amount'])
+                inputs.append(input)
+            elif in_amount > amount:
+                break
+            elif len(inputs) < max_inputs:
+                input = {}
+                input["txid"] = tx['txid']
+                input['vout'] = tx['vout']
+                in_amount += float(tx['amount'])
+                inputs.append(input)
+            else:
+                input = {}
+                input["txid"] = tx['txid']
+                input['vout'] = tx['vout']
+                in_amount -= last_amount
+                in_amount += float(tx['amount'])
+                inputs[-1] = input
+            last_amount = float(tx['amount'])
+
+        assert(len(inputs) > 0)
+        assert(in_amount > amount)
+        # fill outputs
+        receiver_address = node_to.getnewaddress()
+        change_address = node_from.getnewaddress()
+        fee = 0.001
+        outputs={}
+        outputs[receiver_address] = amount
+        outputs[change_address] = in_amount - amount - fee
+        rawtx = node_from.createrawtransaction(inputs, outputs)
+        return node_from.signrawtransaction(rawtx)
+
+    def check_IX_lock(self, txid, node):
+        # wait for instantsend locks
+        start = time()
+        locked = False
+        while True:
+            is_trx = node.gettransaction(txid)
+            if is_trx['instantlock']:
+                locked = True
+                break
+            if time() > start + 10:
+                break
+            sleep(0.1)
+        return locked
+
+    # sends regular IX with high fee and may inputs (not-simple transaction)
+    def send_regular_IX(self, sender, receiver):
+        receiver_addr = receiver.getnewaddress()
+        txid = sender.instantsendtoaddress(receiver_addr, 1.0)
+        return self.check_IX_lock(txid, sender)
+
+    # sends simple trx, it should become IX if autolocks are allowed
+    def send_simple_tx(self, sender, receiver):
+        raw_tx = self.create_raw_trx(sender, receiver, 1.0, 1, 4)
+        txid = self.nodes[0].sendrawtransaction(raw_tx['hex'])
+        self.sync_all()
+        return self.check_IX_lock(txid, sender)
+
+    def get_mempool_size(self, node):
+        info = node.getmempoolinfo()
+        return info['usage']
+
+    def fill_mempool(self):
+        node = self.nodes[0]
+        rec_address = node.getnewaddress()
+        while self.get_mempool_size(node) < MAX_MEMPOOL_SIZE * MB_SIZE * AUTO_IX_MEM_THRESHOLD + 10000:
+            node.sendtoaddress(rec_address, 1.0)
+            sleep(0.1)
+        self.sync_all()
+
+    def run_test(self):
+        self.enforce_masternode_payments()  # required for bip9 activation
+        self.activate_autoix_bip9()
+        self.set_autoix_spork_state(True)
+
+        # check pre-conditions for autoIX
+        assert(self.get_autoix_bip9_status() == 'active')
+        assert(self.get_autoix_spork_state())
+
+        # autoIX is working
+        assert(self.send_simple_tx(self.nodes[0], self.nodes[self.receiver_idx]))
+
+        # send funds for InstantSend  after filling mempool and give them 6 confirmations
+        rec_address = self.nodes[self.receiver_idx].getnewaddress()
+        self.nodes[0].sendtoaddress(rec_address, 500.0)
+        self.nodes[0].sendtoaddress(rec_address, 500.0)
+        self.sync_all()
+        for i in range(0, 2):
+            self.nodes[self.receiver_idx].generate(1)
+        self.sync_all()
+
+        # fill mempool with transactions
+        self.fill_mempool()
+
+        # autoIX is not working now
+        assert(not self.send_simple_tx(self.nodes[self.receiver_idx], self.nodes[0]))
+        # regular IX is still working
+        assert(self.send_regular_IX(self.nodes[self.receiver_idx], self.nodes[0]))
+
+
+if __name__ == '__main__':
+    AutoIXMempoolTest().main()
diff --git a/qa/rpc-tests/p2p-autoinstantsend.py b/qa/rpc-tests/p2p-autoinstantsend.py
new file mode 100755
index 000000000000..fb3ca47d3c2b
--- /dev/null
+++ b/qa/rpc-tests/p2p-autoinstantsend.py
@@ -0,0 +1,300 @@
+#!/usr/bin/env python3
+# Copyright (c) 2018 The Dash Core developers
+# Distributed under the MIT software license, see the accompanying
+# file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+from test_framework.mininode import *
+from test_framework.test_framework import BitcoinTestFramework
+from test_framework.util import *
+from time import *
+
+'''
+p2p-autoinstantsend.py
+
+Test automatic InstantSend locks functionality.
+
+Checks that simple transactions automatically become InstantSend locked, 
+complex transactions don't become IS-locked and this functionality is
+activated only if it is BIP9-activated and SPORK_16_INSTANTSEND_AUTOLOCKS is 
+active.
+
+Also checks that this functionality doesn't influence regular InstantSend
+transactions with high fee. 
+'''
+
+MASTERNODE_COLLATERAL = 1000
+
+
+class MasternodeInfo:
+    def __init__(self, key, collateral_id, collateral_out):
+        self.key = key
+        self.collateral_id = collateral_id
+        self.collateral_out = collateral_out
+
+
+class AutoInstantSendTest(BitcoinTestFramework):
+    def __init__(self):
+        super().__init__()
+        self.mn_count = 10
+        self.num_nodes = self.mn_count + 4
+        self.mninfo = []
+        self.setup_clean_chain = True
+        self.is_network_split = False
+        # set sender,  receiver,  isolated nodes
+        self.isolated_idx = self.num_nodes - 1
+        self.receiver_idx = self.num_nodes - 2
+        self.sender_idx = self.num_nodes - 3
+
+    def create_simple_node(self):
+        idx = len(self.nodes)
+        self.nodes.append(start_node(idx, self.options.tmpdir,
+                                     ["-debug"]))
+        for i in range(0, idx):
+            connect_nodes(self.nodes[i], idx)
+
+    def get_mnconf_file(self):
+        return os.path.join(self.options.tmpdir, "node0/regtest/masternode.conf")
+
+    def prepare_masternodes(self):
+        for idx in range(0, self.mn_count):
+            key = self.nodes[0].masternode("genkey")
+            address = self.nodes[0].getnewaddress()
+            txid = self.nodes[0].sendtoaddress(address, MASTERNODE_COLLATERAL)
+            txrow = self.nodes[0].getrawtransaction(txid, True)
+            collateral_vout = 0
+            for vout_idx in range(0, len(txrow["vout"])):
+                vout = txrow["vout"][vout_idx]
+                if vout["value"] == MASTERNODE_COLLATERAL:
+                    collateral_vout = vout_idx
+            self.nodes[0].lockunspent(False,
+                                      [{"txid": txid, "vout": collateral_vout}])
+            self.mninfo.append(MasternodeInfo(key, txid, collateral_vout))
+
+    def write_mn_config(self):
+        conf = self.get_mnconf_file()
+        f = open(conf, 'a')
+        for idx in range(0, self.mn_count):
+            f.write("mn%d 127.0.0.1:%d %s %s %d\n" % (idx + 1, p2p_port(idx + 1),
+                                                      self.mninfo[idx].key,
+                                                      self.mninfo[idx].collateral_id,
+                                                      self.mninfo[idx].collateral_out))
+        f.close()
+
+    def create_masternodes(self):
+        for idx in range(0, self.mn_count):
+            self.nodes.append(start_node(idx + 1, self.options.tmpdir,
+                                         ['-debug=masternode', '-externalip=127.0.0.1',
+                                          '-masternode=1',
+                                          '-masternodeprivkey=%s' % self.mninfo[idx].key
+                                          ]))
+            for i in range(0, idx + 1):
+                connect_nodes(self.nodes[i], idx + 1)
+
+    def sentinel(self):
+        for i in range(1, self.mn_count + 1):
+            self.nodes[i].sentinelping("1.1.0")
+
+    def setup_network(self):
+        self.nodes = []
+        # create faucet node for collateral and transactions
+        self.nodes.append(start_node(0, self.options.tmpdir, ["-debug"]))
+        required_balance = MASTERNODE_COLLATERAL * self.mn_count + 1
+        while self.nodes[0].getbalance() < required_balance:
+            set_mocktime(get_mocktime() + 1)
+            set_node_times(self.nodes, get_mocktime())
+            self.nodes[0].generate(1)
+        # create masternodes
+        self.prepare_masternodes()
+        self.write_mn_config()
+        stop_node(self.nodes[0], 0)
+        self.nodes[0] = start_node(0, self.options.tmpdir,
+                                   ["-debug", "-sporkkey=cP4EKFyJsHT39LDqgdcB43Y3YXjNyjb5Fuas1GQSeAtjnZWmZEQK"])
+        self.create_masternodes()
+        # create connected simple nodes
+        for i in range(0, self.num_nodes - self.mn_count - 1):
+            self.create_simple_node()
+        # feed the sender with some balance
+        sender_addr = self.nodes[self.sender_idx].getnewaddress()
+        self.nodes[0].sendtoaddress(sender_addr, 1)
+        # make sender funds mature for InstantSend
+        for i in range(0, 2):
+            set_mocktime(get_mocktime() + 1)
+            set_node_times(self.nodes, get_mocktime())
+            self.nodes[0].generate(1)
+        # sync nodes
+        self.sync_all()
+        set_mocktime(get_mocktime() + 1)
+        set_node_times(self.nodes, get_mocktime())
+        sync_masternodes(self.nodes)
+        for i in range(1, self.mn_count + 1):
+            res = self.nodes[0].masternode("start-alias", "mn%d" % i)
+            assert(res["result"] == 'successful')
+        sync_masternodes(self.nodes)
+        #self.sentinel()
+        mn_info = self.nodes[0].masternodelist("status")
+        assert(len(mn_info) == self.mn_count)
+        for status in mn_info.values():
+            assert(status == 'ENABLED')
+
+    def get_autoix_bip9_status(self):
+        info = self.nodes[0].getblockchaininfo()
+        return info['bip9_softforks']['autoix']['status']
+
+    def activate_autoix_bip9(self):
+        # sync nodes periodically
+        # if we sync them too often, activation takes too many time
+        # if we sync them too rarely, nodes failed to update its state and
+        # bip9 status is not updated
+        # so, in this code nodes are synced once per 20 blocks
+        counter = 0
+        sync_period = 10
+
+        while self.get_autoix_bip9_status() == 'defined':
+            set_mocktime(get_mocktime() + 1)
+            set_node_times(self.nodes, get_mocktime())
+            self.nodes[0].generate(1)
+            counter += 1
+            if counter % sync_period == 0:
+                # sync nodes
+                self.sync_all()
+                sync_masternodes(self.nodes)
+
+        while self.get_autoix_bip9_status() == 'started':
+            set_mocktime(get_mocktime() + 1)
+            set_node_times(self.nodes, get_mocktime())
+            self.nodes[0].generate(1)
+            counter += 1
+            if counter % sync_period == 0:
+                # sync nodes
+                self.sync_all()
+                sync_masternodes(self.nodes)
+
+        while self.get_autoix_bip9_status() == 'locked_in':
+            set_mocktime(get_mocktime() + 1)
+            set_node_times(self.nodes, get_mocktime())
+            self.nodes[0].generate(1)
+            counter += 1
+            if counter % sync_period == 0:
+                # sync nodes
+                self.sync_all()
+                sync_masternodes(self.nodes)
+
+        # sync nodes
+        self.sync_all()
+        sync_masternodes(self.nodes)
+
+        assert(self.get_autoix_bip9_status() == 'active')
+
+    def get_autoix_spork_state(self):
+        info = self.nodes[0].spork('active')
+        return info['SPORK_16_INSTANTSEND_AUTOLOCKS']
+
+    def set_autoix_spork_state(self, state):
+        if state:
+            value = 0
+        else:
+            value = 4070908800
+        self.nodes[0].spork('SPORK_16_INSTANTSEND_AUTOLOCKS', value)
+
+    def enforce_masternode_payments(self):
+        self.nodes[0].spork('SPORK_8_MASTERNODE_PAYMENT_ENFORCEMENT', 0)
+
+    def create_raw_trx(self, node_from, node_to, amount, min_inputs, max_inputs):
+        assert(min_inputs <= max_inputs)
+        # fill inputs
+        inputs=[]
+        balances = node_from.listunspent()
+        in_amount = 0.0
+        last_amount = 0.0
+        for tx in balances:
+            if len(inputs) < min_inputs:
+                input = {}
+                input["txid"] = tx['txid']
+                input['vout'] = tx['vout']
+                in_amount += float(tx['amount'])
+                inputs.append(input)
+            elif in_amount > amount:
+                break
+            elif len(inputs) < max_inputs:
+                input = {}
+                input["txid"] = tx['txid']
+                input['vout'] = tx['vout']
+                in_amount += float(tx['amount'])
+                inputs.append(input)
+            else:
+                input = {}
+                input["txid"] = tx['txid']
+                input['vout'] = tx['vout']
+                in_amount -= last_amount
+                in_amount += float(tx['amount'])
+                inputs[-1] = input
+            last_amount = float(tx['amount'])
+
+        assert(len(inputs) > 0)
+        assert(in_amount > amount)
+        # fill outputs
+        receiver_address = node_to.getnewaddress()
+        change_address = node_from.getnewaddress()
+        fee = 0.001
+        outputs={}
+        outputs[receiver_address] = amount
+        outputs[change_address] = in_amount - amount - fee
+        rawtx = node_from.createrawtransaction(inputs, outputs)
+        return node_from.signrawtransaction(rawtx)
+
+    def check_IX_lock(self, txid):
+        # wait for instantsend locks
+        start = time()
+        locked = False
+        while True:
+            is_trx = self.nodes[0].gettransaction(txid)
+            if is_trx['instantlock']:
+                locked = True
+                break
+            if time() > start + 10:
+                break
+            sleep(0.1)
+        return locked
+
+    # sends regular IX with high fee and may inputs (not-simple transaction)
+    def send_regular_IX(self):
+        receiver_addr = self.nodes[self.receiver_idx].getnewaddress()
+        txid = self.nodes[0].instantsendtoaddress(receiver_addr, 1.0)
+        return self.check_IX_lock(txid)
+
+
+    # sends simple trx, it should become IX if autolocks are allowed
+    def send_simple_tx(self):
+        raw_tx = self.create_raw_trx(self.nodes[0], self.nodes[self.receiver_idx], 1.0, 1, 4)
+        txid = self.nodes[0].sendrawtransaction(raw_tx['hex'])
+        self.sync_all()
+        return self.check_IX_lock(txid)
+
+    # sends complex trx, it should never become IX
+    def send_complex_tx(self):
+        raw_tx = self.create_raw_trx(self.nodes[0], self.nodes[self.receiver_idx], 1.0, 5, 100)
+        txid = self.nodes[0].sendrawtransaction(raw_tx['hex'])
+        self.sync_all()
+        return self.check_IX_lock(txid)
+
+    def run_test(self):
+        self.enforce_masternode_payments()  # required for bip9 activation
+        assert(self.get_autoix_bip9_status() == 'defined')
+        assert(not self.get_autoix_spork_state())
+
+        assert(self.send_regular_IX())
+        assert(not self.send_simple_tx())
+        assert(not self.send_complex_tx())
+
+        self.activate_autoix_bip9()
+        self.set_autoix_spork_state(True)
+
+        assert(self.get_autoix_bip9_status() == 'active')
+        assert(self.get_autoix_spork_state())
+
+        assert(self.send_regular_IX())
+        assert(self.send_simple_tx())
+        assert(not self.send_complex_tx())
+
+if __name__ == '__main__':
+    AutoInstantSendTest().main()
diff --git a/src/chainparams.cpp b/src/chainparams.cpp
index b7edaa7bda0f..d2a9da6db168 100644
--- a/src/chainparams.cpp
+++ b/src/chainparams.cpp
@@ -174,6 +174,13 @@ class CMainParams : public CChainParams {
         consensus.vDeployments[Consensus::DEPLOYMENT_BIP147].nWindowSize = 4032;
         consensus.vDeployments[Consensus::DEPLOYMENT_BIP147].nThreshold = 3226; // 80% of 4032
 
+        // Deployment of InstantSend autolocks
+        consensus.vDeployments[Consensus::DEPLOYMENT_ISAUTOLOCKS].bit = 4;
+        consensus.vDeployments[Consensus::DEPLOYMENT_ISAUTOLOCKS].nStartTime = 1533945600; // Aug 11th, 2018
+        consensus.vDeployments[Consensus::DEPLOYMENT_ISAUTOLOCKS].nTimeout = 1565481600; // Aug 11th, 2019
+        consensus.vDeployments[Consensus::DEPLOYMENT_ISAUTOLOCKS].nWindowSize = 4032;
+        consensus.vDeployments[Consensus::DEPLOYMENT_ISAUTOLOCKS].nThreshold = 3226; // 80% of 4032
+
         // The best chain should have at least this much work.
         consensus.nMinimumChainWork = uint256S("0x00000000000000000000000000000000000000000000081021b74f9f47bbd7bc"); // 888900
 
@@ -327,6 +334,13 @@ class CTestNetParams : public CChainParams {
         consensus.vDeployments[Consensus::DEPLOYMENT_BIP147].nWindowSize = 100;
         consensus.vDeployments[Consensus::DEPLOYMENT_BIP147].nThreshold = 50; // 50% of 100
 
+        // Deployment of InstantSend autolocks
+        consensus.vDeployments[Consensus::DEPLOYMENT_ISAUTOLOCKS].bit = 4;
+        consensus.vDeployments[Consensus::DEPLOYMENT_ISAUTOLOCKS].nStartTime = 1532476800; // Jul 25th, 2018
+        consensus.vDeployments[Consensus::DEPLOYMENT_ISAUTOLOCKS].nTimeout = 1564012800; // Jul 25th, 2019
+        consensus.vDeployments[Consensus::DEPLOYMENT_ISAUTOLOCKS].nWindowSize = 100;
+        consensus.vDeployments[Consensus::DEPLOYMENT_ISAUTOLOCKS].nThreshold = 50; // 50% of 100
+
         // The best chain should have at least this much work.
         consensus.nMinimumChainWork = uint256S("0x000000000000000000000000000000000000000000000000003be69c34b1244f"); // 143200
 
@@ -464,6 +478,13 @@ class CDevNetParams : public CChainParams {
         consensus.vDeployments[Consensus::DEPLOYMENT_DIP0003].nWindowSize = 100;
         consensus.vDeployments[Consensus::DEPLOYMENT_DIP0003].nThreshold = 50; // 50% of 100
 
+        // Deployment of InstantSend autolocks
+        consensus.vDeployments[Consensus::DEPLOYMENT_ISAUTOLOCKS].bit = 4;
+        consensus.vDeployments[Consensus::DEPLOYMENT_ISAUTOLOCKS].nStartTime = 1535752800; // Sep 1st, 2018
+        consensus.vDeployments[Consensus::DEPLOYMENT_ISAUTOLOCKS].nTimeout = 1567288800; // Sep 1st, 2019
+        consensus.vDeployments[Consensus::DEPLOYMENT_ISAUTOLOCKS].nWindowSize = 100;
+        consensus.vDeployments[Consensus::DEPLOYMENT_ISAUTOLOCKS].nThreshold = 50; // 50% of 100
+
         // The best chain should have at least this much work.
         consensus.nMinimumChainWork = uint256S("0x000000000000000000000000000000000000000000000000000000000000000");
 
@@ -583,6 +604,10 @@ class CRegTestParams : public CChainParams {
         consensus.vDeployments[Consensus::DEPLOYMENT_DIP0003].bit = 3;
         consensus.vDeployments[Consensus::DEPLOYMENT_DIP0003].nStartTime = 0;
         consensus.vDeployments[Consensus::DEPLOYMENT_DIP0003].nTimeout = 999999999999ULL;
+        consensus.vDeployments[Consensus::DEPLOYMENT_ISAUTOLOCKS].bit = 4;
+        consensus.vDeployments[Consensus::DEPLOYMENT_ISAUTOLOCKS].nStartTime = 0;
+        consensus.vDeployments[Consensus::DEPLOYMENT_ISAUTOLOCKS].nTimeout = 999999999999ULL;
+
 
         // The best chain should have at least this much work.
         consensus.nMinimumChainWork = uint256S("0x00");
diff --git a/src/consensus/params.h b/src/consensus/params.h
index 524d094fd8ab..f602bc029ec6 100644
--- a/src/consensus/params.h
+++ b/src/consensus/params.h
@@ -19,6 +19,7 @@ enum DeploymentPos
     DEPLOYMENT_DIP0001, // Deployment of DIP0001 and lower transaction fees.
     DEPLOYMENT_BIP147, // Deployment of BIP147 (NULLDUMMY)
     DEPLOYMENT_DIP0003, // Deployment of DIP0002 and DIP0003 (txv3 and deterministic MN lists)
+    DEPLOYMENT_ISAUTOLOCKS, // Deployment of automatic IS locks for simple transactions
     // NOTE: Also add new deployments to VersionBitsDeploymentInfo in versionbits.cpp
     MAX_VERSION_BITS_DEPLOYMENTS
 };
diff --git a/src/dsnotificationinterface.cpp b/src/dsnotificationinterface.cpp
index f7c1d2bc04c3..5e7fbcef5acc 100644
--- a/src/dsnotificationinterface.cpp
+++ b/src/dsnotificationinterface.cpp
@@ -44,6 +44,9 @@ void CDSNotificationInterface::UpdatedBlockTip(const CBlockIndex *pindexNew, con
     // Update global DIP0001 activation status
     fDIP0001ActiveAtTip = pindexNew->nHeight >= Params().GetConsensus().DIP0001Height;
     fDIP0003ActiveAtTip = (VersionBitsState(pindexNew->pprev, Params().GetConsensus(), Consensus::DEPLOYMENT_DIP0003, versionbitscache) == THRESHOLD_ACTIVE);
+    // update instantsend autolock activation flag
+    instantsend.isAutoLockBip9Active =
+            (VersionBitsTipState(Params().GetConsensus(), Consensus::DEPLOYMENT_ISAUTOLOCKS) == THRESHOLD_ACTIVE);
 
     if (fInitialDownload)
         return;
diff --git a/src/instantx.cpp b/src/instantx.cpp
index fbf30ac668e7..be4148b3995a 100644
--- a/src/instantx.cpp
+++ b/src/instantx.cpp
@@ -35,6 +35,9 @@ extern CTxMemPool mempool;
 bool fEnableInstantSend = true;
 int nCompleteTXLocks;
 
+std::atomic<bool> CInstantSend::isAutoLockBip9Active{false};
+const double CInstantSend::AUTO_IX_MEMPOOL_THRESHOLD = 0.1;
+
 CInstantSend instantsend;
 const std::string CInstantSend::SERIALIZATION_VERSION_STRING = "CInstantSend-Version-1";
 
@@ -915,6 +918,15 @@ std::string CInstantSend::ToString() const
     return strprintf("Lock Candidates: %llu, Votes %llu", mapTxLockCandidates.size(), mapTxLockVotes.size());
 }
 
+bool CInstantSend::CanAutoLock()
+{
+    if(!isAutoLockBip9Active)
+        return false;
+    if(!sporkManager.IsSporkActive(SPORK_16_INSTANTSEND_AUTOLOCKS))
+        return false;
+    return (mempool.UsedMemoryShare() < AUTO_IX_MEMPOOL_THRESHOLD);
+}
+
 //
 // CTxLockRequest
 //
@@ -976,6 +988,8 @@ bool CTxLockRequest::IsValid() const
 
 CAmount CTxLockRequest::GetMinFee() const
 {
+    if(IsSimple())
+        return CAmount();
     CAmount nMinFee = MIN_FEE;
     return std::max(nMinFee, CAmount(tx->vin.size() * nMinFee));
 }
@@ -985,6 +999,11 @@ int CTxLockRequest::GetMaxSignatures() const
     return tx->vin.size() * COutPointLock::SIGNATURES_TOTAL;
 }
 
+bool CTxLockRequest::IsSimple() const
+{
+    return (tx->vin.size() <= MAX_INPUTS_FOR_AUTO_IX);
+}
+
 //
 // CTxLockVote
 //
diff --git a/src/instantx.h b/src/instantx.h
index 0746f5b4f447..72361c66212b 100644
--- a/src/instantx.h
+++ b/src/instantx.h
@@ -28,6 +28,8 @@ extern CInstantSend instantsend;
 
 static const int MIN_INSTANTSEND_PROTO_VERSION      = 70210;
 
+static const int MIN_INSTANTSEND_WITHOUT_FEE_PROTO_VERSION = 70211;
+
 /// For how long we are going to accept votes/locks
 /// after we saw the first one for a specific transaction
 static const int INSTANTSEND_LOCK_TIMEOUT_SECONDS   = 15;
@@ -45,6 +47,9 @@ class CInstantSend
 {
 private:
     static const std::string SERIALIZATION_VERSION_STRING;
+    /// Automatic locks of "simple" transactions are only allowed
+    /// when mempool usage is lower than this threshold
+    static const double AUTO_IX_MEMPOOL_THRESHOLD;
 
     // Keep track of current block height
     int nCachedBlockHeight;
@@ -148,6 +153,12 @@ class CInstantSend
     std::string ToString() const;
 
     void DoMaintenance() { CheckAndRemove(); }
+
+    /// checks if we can automatically lock "simple" transactions
+    static bool CanAutoLock();
+
+    /// flag of the AutoLock Bip9 activation
+    static std::atomic<bool> isAutoLockBip9Active;
 };
 
 /**
@@ -157,6 +168,9 @@ class CTxLockRequest
 {
 private:
     static const CAmount MIN_FEE            = 0.0001 * COIN;
+    /// If transaction has less or equal inputs than MAX_INPUTS_FOR_AUTO_IX,
+    /// it will be automatically locked
+    static const int MAX_INPUTS_FOR_AUTO_IX = 4;
 
 public:
     /// Warn for a large number of inputs to an IS tx - fees could be substantial
@@ -167,6 +181,7 @@ class CTxLockRequest
 
     CTxLockRequest() : tx(MakeTransactionRef()) {}
     CTxLockRequest(const CTransaction& _tx) : tx(MakeTransactionRef(_tx)) {};
+    CTxLockRequest(const CTransactionRef& _tx) : tx(_tx) {};
 
     ADD_SERIALIZE_METHODS;
 
@@ -179,6 +194,9 @@ class CTxLockRequest
     CAmount GetMinFee() const;
     int GetMaxSignatures() const;
 
+    // checks if related transaction is "simple" to lock it automatically
+    bool IsSimple() const;
+
     const uint256 &GetHash() const {
         return tx->GetHash();
     }
diff --git a/src/net_processing.cpp b/src/net_processing.cpp
index eb62b815d43f..e5bf5541c32f 100644
--- a/src/net_processing.cpp
+++ b/src/net_processing.cpp
@@ -1942,10 +1942,13 @@ bool static ProcessMessage(CNode* pfrom, const std::string& strCommand, CDataStr
         CTxLockRequest txLockRequest;
         CDarksendBroadcastTx dstx;
         int nInvType = MSG_TX;
+        bool fCanAutoLock = false;
 
         // Read data and assign inv type
         if(strCommand == NetMsgType::TX) {
             vRecv >> ptx;
+            txLockRequest = CTxLockRequest(ptx);
+            fCanAutoLock = CInstantSend::CanAutoLock() && txLockRequest.IsSimple();
         } else if(strCommand == NetMsgType::TXLOCKREQUEST) {
             vRecv >> txLockRequest;
             ptx = txLockRequest.tx;
@@ -1962,10 +1965,16 @@ bool static ProcessMessage(CNode* pfrom, const std::string& strCommand, CDataStr
         pfrom->setAskFor.erase(inv.hash);
 
         // Process custom logic, no matter if tx will be accepted to mempool later or not
-        if (strCommand == NetMsgType::TXLOCKREQUEST) {
+        if (strCommand == NetMsgType::TXLOCKREQUEST || fCanAutoLock) {
             if(!instantsend.ProcessTxLockRequest(txLockRequest, connman)) {
                 LogPrint("instantsend", "TXLOCKREQUEST -- failed %s\n", txLockRequest.GetHash().ToString());
-                return false;
+                // Should not really happen for "fCanAutoLock == true" but just in case:
+                if (!fCanAutoLock) {
+                    // Fail only for "true" IS here
+                    return false;
+                }
+                // Fallback for normal txes to process as usual
+                fCanAutoLock = false;
             }
         } else if (strCommand == NetMsgType::DSTX) {
             uint256 hashTx = tx.GetHash();
@@ -2011,7 +2020,7 @@ bool static ProcessMessage(CNode* pfrom, const std::string& strCommand, CDataStr
                 LogPrintf("DSTX -- Masternode transaction accepted, txid=%s, peer=%d\n",
                         tx.GetHash().ToString(), pfrom->id);
                 CPrivateSend::AddDSTX(dstx);
-            } else if (strCommand == NetMsgType::TXLOCKREQUEST) {
+            } else if (strCommand == NetMsgType::TXLOCKREQUEST || fCanAutoLock) {
                 LogPrintf("TXLOCKREQUEST -- Transaction Lock Request accepted, txid=%s, peer=%d\n",
                         tx.GetHash().ToString(), pfrom->id);
                 instantsend.AcceptLockRequest(txLockRequest);
diff --git a/src/rpc/blockchain.cpp b/src/rpc/blockchain.cpp
index 582e47e353f7..14b5dc00600e 100644
--- a/src/rpc/blockchain.cpp
+++ b/src/rpc/blockchain.cpp
@@ -1287,6 +1287,7 @@ UniValue getblockchaininfo(const JSONRPCRequest& request)
     BIP9SoftForkDescPushBack(bip9_softforks, "dip0001", consensusParams, Consensus::DEPLOYMENT_DIP0001);
     BIP9SoftForkDescPushBack(bip9_softforks, "dip0003", consensusParams, Consensus::DEPLOYMENT_DIP0003);
     BIP9SoftForkDescPushBack(bip9_softforks, "bip147", consensusParams, Consensus::DEPLOYMENT_BIP147);
+    BIP9SoftForkDescPushBack(bip9_softforks, "autoix", consensusParams, Consensus::DEPLOYMENT_ISAUTOLOCKS);
     obj.push_back(Pair("softforks",             softforks));
     obj.push_back(Pair("bip9_softforks", bip9_softforks));
 
diff --git a/src/spork.cpp b/src/spork.cpp
index aeee817982f0..cc60cf7ff2b2 100644
--- a/src/spork.cpp
+++ b/src/spork.cpp
@@ -28,6 +28,7 @@ std::map<int, int64_t> mapSporkDefaults = {
     {SPORK_12_RECONSIDER_BLOCKS,             0},             // 0 BLOCKS
     {SPORK_14_REQUIRE_SENTINEL_FLAG,         4070908800ULL}, // OFF
     {SPORK_15_DETERMINISTIC_MNS_ENABLED,     4070908800ULL}, // OFF
+    {SPORK_16_INSTANTSEND_AUTOLOCKS,         4070908800ULL}, // OFF
 };
 
 void CSporkManager::Clear()
@@ -216,6 +217,7 @@ int CSporkManager::GetSporkIDByName(const std::string& strName)
     if (strName == "SPORK_12_RECONSIDER_BLOCKS")                return SPORK_12_RECONSIDER_BLOCKS;
     if (strName == "SPORK_14_REQUIRE_SENTINEL_FLAG")            return SPORK_14_REQUIRE_SENTINEL_FLAG;
     if (strName == "SPORK_15_DETERMINISTIC_MNS_ENABLED")        return SPORK_15_DETERMINISTIC_MNS_ENABLED;
+    if (strName == "SPORK_16_INSTANTSEND_AUTOLOCKS")            return SPORK_16_INSTANTSEND_AUTOLOCKS;
 
     LogPrint("spork", "CSporkManager::GetSporkIDByName -- Unknown Spork name '%s'\n", strName);
     return -1;
@@ -234,6 +236,7 @@ std::string CSporkManager::GetSporkNameByID(int nSporkID)
         case SPORK_12_RECONSIDER_BLOCKS:                return "SPORK_12_RECONSIDER_BLOCKS";
         case SPORK_14_REQUIRE_SENTINEL_FLAG:            return "SPORK_14_REQUIRE_SENTINEL_FLAG";
         case SPORK_15_DETERMINISTIC_MNS_ENABLED:        return "SPORK_15_DETERMINISTIC_MNS_ENABLED";
+        case SPORK_16_INSTANTSEND_AUTOLOCKS:            return "SPORK_16_INSTANTSEND_AUTOLOCKS";
         default:
             LogPrint("spork", "CSporkManager::GetSporkNameByID -- Unknown Spork ID %d\n", nSporkID);
             return "Unknown";
diff --git a/src/spork.h b/src/spork.h
index 262faa82987e..efccd232f276 100644
--- a/src/spork.h
+++ b/src/spork.h
@@ -27,9 +27,10 @@ static const int SPORK_10_MASTERNODE_PAY_UPDATED_NODES                  = 10009;
 static const int SPORK_12_RECONSIDER_BLOCKS                             = 10011;
 static const int SPORK_14_REQUIRE_SENTINEL_FLAG                         = 10013;
 static const int SPORK_15_DETERMINISTIC_MNS_ENABLED                     = 10014;
+static const int SPORK_16_INSTANTSEND_AUTOLOCKS                         = 10015;
 
 static const int SPORK_START                                            = SPORK_2_INSTANTSEND_ENABLED;
-static const int SPORK_END                                              = SPORK_15_DETERMINISTIC_MNS_ENABLED;
+static const int SPORK_END                                              = SPORK_16_INSTANTSEND_AUTOLOCKS;
 
 extern std::map<int, int64_t> mapSporkDefaults;
 extern CSporkManager sporkManager;
diff --git a/src/txmempool.cpp b/src/txmempool.cpp
index bca9ad3d50cd..a0eea414685a 100644
--- a/src/txmempool.cpp
+++ b/src/txmempool.cpp
@@ -1269,6 +1269,16 @@ size_t CTxMemPool::DynamicMemoryUsage() const {
     return memusage::MallocUsage(sizeof(CTxMemPoolEntry) + 15 * sizeof(void*)) * mapTx.size() + memusage::DynamicUsage(mapNextTx) + memusage::DynamicUsage(mapDeltas) + memusage::DynamicUsage(mapLinks) + memusage::DynamicUsage(vTxHashes) + cachedInnerUsage;
 }
 
+double CTxMemPool::UsedMemoryShare() const
+{
+    // use 1000000 instead of real bytes number in megabyte because of
+    // this param is calculated in such way in other places (see AppInit
+    // function in src/init.cpp or mempoolInfoToJSON function in
+    // src/rpc/blockchain.cpp)
+    size_t maxmempool = GetArg("-maxmempool", DEFAULT_MAX_MEMPOOL_SIZE) * 1000000;
+    return double(DynamicMemoryUsage()) / maxmempool;
+}
+
 void CTxMemPool::RemoveStaged(setEntries &stage, bool updateDescendants, MemPoolRemovalReason reason) {
     AssertLockHeld(cs);
     UpdateForRemoveFromMempool(stage, updateDescendants);
diff --git a/src/txmempool.h b/src/txmempool.h
index d1cec34d21c7..38f4dbcff401 100644
--- a/src/txmempool.h
+++ b/src/txmempool.h
@@ -713,6 +713,8 @@ class CTxMemPool
     bool ReadFeeEstimates(CAutoFile& filein);
 
     size_t DynamicMemoryUsage() const;
+    // returns share of the used memory to maximum allowed memory
+    double UsedMemoryShare() const;
 
     boost::signals2::signal<void (CTransactionRef)> NotifyEntryAdded;
     boost::signals2::signal<void (CTransactionRef, MemPoolRemovalReason)> NotifyEntryRemoved;
diff --git a/src/validation.cpp b/src/validation.cpp
index 972313402956..e4c8a051816c 100644
--- a/src/validation.cpp
+++ b/src/validation.cpp
@@ -1818,7 +1818,7 @@ int32_t ComputeBlockVersion(const CBlockIndex* pindexPrev, const Consensus::Para
                 // unknown masternode
                 continue;
             }
-            if (mnInfo.nProtocolVersion < DIP0001_PROTOCOL_VERSION) {
+            if (mnInfo.nProtocolVersion < MIN_INSTANTSEND_WITHOUT_FEE_PROTO_VERSION) {
                 // masternode is not upgraded yet
                 continue;
             }
diff --git a/src/versionbits.cpp b/src/versionbits.cpp
index f7a5ce1d2bf9..29aa97366d87 100644
--- a/src/versionbits.cpp
+++ b/src/versionbits.cpp
@@ -31,6 +31,11 @@ const struct BIP9DeploymentInfo VersionBitsDeploymentInfo[Consensus::MAX_VERSION
         /*.name =*/ "dip0003",
         /*.gbt_force =*/ true,
         /*.check_mn_protocol =*/ false,
+    },
+    {
+        /*.name =*/ "autoix",
+        /*.gbt_force =*/ true,
+        /*.check_mn_protocol =*/ true,
     }
 };
 
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
index 2da41cd6d3b5..53546d8e2220 100644
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -1979,7 +1979,8 @@ bool CWalletTx::RelayWalletTransaction(CConnman* connman, const std::string& str
             uint256 hash = GetHash();
             LogPrintf("Relaying wtx %s\n", hash.ToString());
 
-            if (strCommand == NetMsgType::TXLOCKREQUEST) {
+            if ((strCommand == NetMsgType::TXLOCKREQUEST) ||
+                ((CTxLockRequest(*this).IsSimple()) && CInstantSend::CanAutoLock())) {
                 if (instantsend.ProcessTxLockRequest((CTxLockRequest)*this, *connman)) {
                     instantsend.AcceptLockRequest((CTxLockRequest)*this);
                 } else {

From a4ff2a19a719bd3c3ee5a9e4745139357b2344ef Mon Sep 17 00:00:00 2001
From: UdjinM6 <UdjinM6@users.noreply.github.com>
Date: Fri, 28 Sep 2018 10:55:11 +0300
Subject: [PATCH 158/400] Fix some warnings and do a couple of other trivial
 cleanups (#2315)

* Fix various warnings

* A couple of trivial cleanups

* fix 2320
---
 src/activemasternode.cpp       | 2 +-
 src/chainparams.cpp            | 2 ++
 src/dbwrapper.h                | 1 +
 src/evo/providertx.cpp         | 4 +++-
 src/governance.cpp             | 2 +-
 src/hdchain.cpp                | 4 ++--
 src/net.cpp                    | 4 ++--
 src/primitives/transaction.h   | 2 +-
 src/privatesend-client.h       | 7 ++++---
 src/privatesend-server.cpp     | 4 ++--
 src/qt/forms/optionsdialog.ui  | 2 +-
 src/qt/test/rpcnestedtests.cpp | 2 +-
 src/rpc/misc.cpp               | 2 +-
 src/validation.cpp             | 2 +-
 14 files changed, 23 insertions(+), 17 deletions(-)

diff --git a/src/activemasternode.cpp b/src/activemasternode.cpp
index ca2ac96658c1..844622f36df9 100644
--- a/src/activemasternode.cpp
+++ b/src/activemasternode.cpp
@@ -282,7 +282,7 @@ void CActiveLegacyMasternodeManager::ManageStateInitial(CConnman& connman)
     if(!fFoundLocal) {
         bool empty = true;
         // If we have some peers, let's try to find our local address from one of them
-        connman.ForEachNodeContinueIf(CConnman::AllNodes, [&fFoundLocal, &empty, this](CNode* pnode) {
+        connman.ForEachNodeContinueIf(CConnman::AllNodes, [&fFoundLocal, &empty](CNode* pnode) {
             empty = false;
             if (pnode->addr.IsIPv4())
                 fFoundLocal = GetLocal(activeMasternodeInfo.service, &pnode->addr) && CMasternode::IsValidNetAddr(activeMasternodeInfo.service);
diff --git a/src/chainparams.cpp b/src/chainparams.cpp
index d2a9da6db168..1beccf7f0e15 100644
--- a/src/chainparams.cpp
+++ b/src/chainparams.cpp
@@ -361,6 +361,8 @@ class CTestNetParams : public CChainParams {
         assert(genesis.hashMerkleRoot == uint256S("0xe0028eb9648db56b1ac77cf090b99048a8007e2bb64b68f092c03c7f56a662c7"));
 
         vFixedSeeds.clear();
+        vFixedSeeds = std::vector<SeedSpec6>(pnSeed6_test, pnSeed6_test + ARRAYLEN(pnSeed6_test));
+
         vSeeds.clear();
         // nodes with support for servicebits filtering should be at the top
         vSeeds.push_back(CDNSSeedData("dashdot.io",  "testnet-seed.dashdot.io"));
diff --git a/src/dbwrapper.h b/src/dbwrapper.h
index 240c6cfe4c27..500da8380632 100644
--- a/src/dbwrapper.h
+++ b/src/dbwrapper.h
@@ -371,6 +371,7 @@ class CDBTransaction {
     };
 
     struct KeyValueHolder {
+        virtual ~KeyValueHolder() = default;
         virtual void Write(CDBBatch &batch) = 0;
     };
     typedef std::unique_ptr<KeyValueHolder> KeyValueHolderPtr;
diff --git a/src/evo/providertx.cpp b/src/evo/providertx.cpp
index 08f6ba47230b..8ec449a13a55 100644
--- a/src/evo/providertx.cpp
+++ b/src/evo/providertx.cpp
@@ -228,7 +228,9 @@ bool CheckProUpRevTx(const CTransaction& tx, const CBlockIndex* pindexPrev, CVal
     if (ptx.nVersion > CProRegTx::CURRENT_VERSION)
         return state.DoS(100, false, REJECT_INVALID, "bad-protx-version");
 
-    if (ptx.nReason < CProUpRevTx::REASON_NOT_SPECIFIED || ptx.nReason > CProUpRevTx::REASON_LAST)
+    // ptx.nReason < CProUpRevTx::REASON_NOT_SPECIFIED is always `false` since
+    // ptx.nReason is unsigned and CProUpRevTx::REASON_NOT_SPECIFIED == 0
+    if (ptx.nReason > CProUpRevTx::REASON_LAST)
         return state.DoS(100, false, REJECT_INVALID, "bad-protx-reason");
 
     if (pindexPrev) {
diff --git a/src/governance.cpp b/src/governance.cpp
index f9f231f511df..e69b5478d049 100644
--- a/src/governance.cpp
+++ b/src/governance.cpp
@@ -1019,7 +1019,7 @@ void CGovernanceManager::RequestGovernanceObject(CNode* pfrom, const uint256& nH
         return;
     }
 
-    LogPrint("gobject", "CGovernanceObject::RequestGovernanceObject -- hash = %s (peer=%d)\n", nHash.ToString(), pfrom->GetId());
+    LogPrint("gobject", "CGovernanceManager::RequestGovernanceObject -- nHash %s peer=%d\n", nHash.ToString(), pfrom->GetId());
 
     CNetMsgMaker msgMaker(pfrom->GetSendVersion());
 
diff --git a/src/hdchain.cpp b/src/hdchain.cpp
index 19bdc0e23da4..ae31a052ad9a 100644
--- a/src/hdchain.cpp
+++ b/src/hdchain.cpp
@@ -169,9 +169,9 @@ void CHDChain::DeriveChildExtKey(uint32_t nAccountIndex, bool fInternal, uint32_
     purposeKey.Derive(cointypeKey, Params().ExtCoinType() | 0x80000000);
     // derive m/purpose'/coin_type'/account'
     cointypeKey.Derive(accountKey, nAccountIndex | 0x80000000);
-    // derive m/purpose'/coin_type'/account/change
+    // derive m/purpose'/coin_type'/account'/change
     accountKey.Derive(changeKey, fInternal ? 1 : 0);
-    // derive m/purpose'/coin_type'/account/change/address_index
+    // derive m/purpose'/coin_type'/account'/change/address_index
     changeKey.Derive(extKeyRet, nChildIndex);
 }
 
diff --git a/src/net.cpp b/src/net.cpp
index 630ab50b5b25..d6d3841e7c48 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -2253,8 +2253,8 @@ void CConnman::SetNetworkActive(bool active)
 }
 
 CConnman::CConnman(uint64_t nSeed0In, uint64_t nSeed1In) :
-        nSeed0(nSeed0In), nSeed1(nSeed1In),
-        addrman(Params().AllowMultiplePorts())
+        addrman(Params().AllowMultiplePorts()),
+        nSeed0(nSeed0In), nSeed1(nSeed1In)
 {
     fNetworkActive = true;
     setBannedIsDirty = false;
diff --git a/src/primitives/transaction.h b/src/primitives/transaction.h
index 30d95715331f..cfcd66afe2c3 100644
--- a/src/primitives/transaction.h
+++ b/src/primitives/transaction.h
@@ -179,7 +179,7 @@ class CTxOut
         // "Dust" is defined in terms of CTransaction::minRelayTxFee, which has units duffs-per-kilobyte.
         // If you'd pay more than 1/3 in fees to spend something, then we consider it dust.
         // A typical spendable txout is 34 bytes big, and will need a CTxIn of at least 148 bytes to spend
-        // i.e. total is 148 + 32 = 182 bytes. Default -minrelaytxfee is 1000 duffs per kB
+        // i.e. total is 148 + 34 = 182 bytes. Default -minrelaytxfee is 1000 duffs per kB
         // and that means that fee per spendable txout is 182 * 1000 / 1000 = 182 duffs.
         // So dust is a spendable txout less than 546 * minRelayTxFee / 1000 (in duffs)
         // i.e. 182 * 3 = 546 duffs with default -minrelaytxfee = minRelayTxFee = 1000 duffs per kB.
diff --git a/src/privatesend-client.h b/src/privatesend-client.h
index f32db5611ee6..c63f39754096 100644
--- a/src/privatesend-client.h
+++ b/src/privatesend-client.h
@@ -53,12 +53,13 @@ class CPendingDsaRequest
         addr(CService()),
         dsa(CDarksendAccept()),
         nTimeCreated(0)
-    {};
+    {}
 
     CPendingDsaRequest(const CService& addr_, const CDarksendAccept& dsa_):
         addr(addr_),
-        dsa(dsa_)
-    { nTimeCreated = GetTime(); }
+        dsa(dsa_),
+        nTimeCreated(GetTime())
+    {}
 
     CService GetAddr() { return addr; }
     CDarksendAccept GetDSA() { return dsa; }
diff --git a/src/privatesend-server.cpp b/src/privatesend-server.cpp
index b71d56c7a39f..4f7b76a38fdc 100644
--- a/src/privatesend-server.cpp
+++ b/src/privatesend-server.cpp
@@ -431,7 +431,7 @@ void CPrivateSendServer::ChargeFees(CConnman& connman)
     std::random_shuffle(vecOffendersCollaterals.begin(), vecOffendersCollaterals.end());
 
     if(nState == POOL_STATE_ACCEPTING_ENTRIES || nState == POOL_STATE_SIGNING) {
-        LogPrintf("CPrivateSendServer::ChargeFees -- found uncooperative node (didn't %s transaction), charging fees: %s\n",
+        LogPrintf("CPrivateSendServer::ChargeFees -- found uncooperative node (didn't %s transaction), charging fees: %s",
                 (nState == POOL_STATE_SIGNING) ? "sign" : "send", vecOffendersCollaterals[0]->ToString());
 
         LOCK(cs_main);
@@ -716,7 +716,7 @@ bool CPrivateSendServer::CreateNewSession(const CDarksendAccept& dsa, PoolMessag
 
     if(!fUnitTest) {
         //broadcast that I'm accepting entries, only if it's the first entry through
-        CDarksendQueue dsq(dsa.nDenom, activeMasternodeInfo.outpoint, GetAdjustedTime(), false);
+        CDarksendQueue dsq(nSessionDenom, activeMasternodeInfo.outpoint, GetAdjustedTime(), false);
         LogPrint("privatesend", "CPrivateSendServer::CreateNewSession -- signing and relaying new queue: %s\n", dsq.ToString());
         dsq.Sign();
         dsq.Relay(connman);
diff --git a/src/qt/forms/optionsdialog.ui b/src/qt/forms/optionsdialog.ui
index 8c9a4cfd9f3f..f0cf50166516 100644
--- a/src/qt/forms/optionsdialog.ui
+++ b/src/qt/forms/optionsdialog.ui
@@ -179,7 +179,7 @@
              <string>Show system popups for PrivateSend mixing transactions&lt;br/&gt;just like for all other transaction types.</string>
             </property>
             <property name="text">
-             <string>Show popups for Privatesend transactions</string>
+             <string>Show popups for PrivateSend transactions</string>
             </property>
            </widget>
           </item>
diff --git a/src/qt/test/rpcnestedtests.cpp b/src/qt/test/rpcnestedtests.cpp
index ef4ad3af1a03..eeba5d943926 100644
--- a/src/qt/test/rpcnestedtests.cpp
+++ b/src/qt/test/rpcnestedtests.cpp
@@ -44,7 +44,7 @@ void RPCNestedTests::rpcNestedTests()
     RegisterAllCoreRPCCommands(tableRPC);
     tableRPC.appendCommand("rpcNestedTest", &vRPCCommands[0]);
     ClearDatadirCache();
-    std::string path = QDir::tempPath().toStdString() + "/" + strprintf("test_bitcoin_qt_%lu_%i", (unsigned long)GetTime(), (int)(GetRand(100000)));
+    std::string path = QDir::tempPath().toStdString() + "/" + strprintf("test_dash_qt_%lu_%i", (unsigned long)GetTime(), (int)(GetRand(100000)));
     QDir dir(QString::fromStdString(path));
     dir.mkpath(".");
     ForceSetArg("-datadir", path);
diff --git a/src/rpc/misc.cpp b/src/rpc/misc.cpp
index 7c6f735f2df2..1c321b6ca046 100644
--- a/src/rpc/misc.cpp
+++ b/src/rpc/misc.cpp
@@ -1157,7 +1157,7 @@ static const CRPCCommand commands[] =
     /* Not shown in help */
     { "hidden",             "setmocktime",            &setmocktime,            true,  {"timestamp"}},
     { "hidden",             "echo",                   &echo,                   true,  {"arg0","arg1","arg2","arg3","arg4","arg5","arg6","arg7","arg8","arg9"}},
-    { "hidden",             "echojson",               &echo,                  true,  {"arg0","arg1","arg2","arg3","arg4","arg5","arg6","arg7","arg8","arg9"}},
+    { "hidden",             "echojson",               &echo,                   true,  {"arg0","arg1","arg2","arg3","arg4","arg5","arg6","arg7","arg8","arg9"}},
 };
 
 void RegisterMiscRPCCommands(CRPCTable &t)
diff --git a/src/validation.cpp b/src/validation.cpp
index e4c8a051816c..bc5dd39a0cbc 100644
--- a/src/validation.cpp
+++ b/src/validation.cpp
@@ -548,7 +548,7 @@ bool CheckTransaction(const CTransaction& tx, CValidationState &state)
 
     if (tx.IsCoinBase())
     {
-        int minCbSize = 2;
+        size_t minCbSize = 2;
         if (tx.nType == TRANSACTION_COINBASE) {
             // With the introduction of CbTx, coinbase scripts are not required anymore to hold a valid block height
             minCbSize = 1;

From bd8c54d12e0463ac6c80fc736ad2e44c058cd01b Mon Sep 17 00:00:00 2001
From: UdjinM6 <UdjinM6@users.noreply.github.com>
Date: Fri, 28 Sep 2018 10:55:30 +0300
Subject: [PATCH 159/400] A bit more verbosity for some critical errors (#2316)

---
 src/validation.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/validation.cpp b/src/validation.cpp
index bc5dd39a0cbc..b1768672506e 100644
--- a/src/validation.cpp
+++ b/src/validation.cpp
@@ -3297,11 +3297,11 @@ bool ContextualCheckBlockHeader(const CBlockHeader& block, CValidationState& sta
 
     // Check timestamp against prev
     if (block.GetBlockTime() <= pindexPrev->GetMedianTimePast())
-        return state.Invalid(false, REJECT_INVALID, "time-too-old", "block's timestamp is too early");
+        return state.Invalid(false, REJECT_INVALID, "time-too-old", strprintf("block's timestamp is too early %d %d", block.GetBlockTime(), pindexPrev->GetMedianTimePast()));
 
     // Check timestamp
     if (block.GetBlockTime() > nAdjustedTime + 2 * 60 * 60)
-        return state.Invalid(false, REJECT_INVALID, "time-too-new", "block timestamp too far in the future");
+        return state.Invalid(false, REJECT_INVALID, "time-too-new", strprintf("block timestamp too far in the future %d %d", block.GetBlockTime(), nAdjustedTime + 2 * 60 * 60));
 
     // check for version 2, 3 and 4 upgrades
     if((block.nVersion < 2 && nHeight >= consensusParams.BIP34Height) ||
@@ -3545,7 +3545,7 @@ bool ProcessNewBlock(const CChainParams& chainparams, const std::shared_ptr<cons
         CheckBlockIndex(chainparams.GetConsensus());
         if (!ret) {
             GetMainSignals().BlockChecked(*pblock, state);
-            return error("%s: AcceptBlock FAILED", __func__);
+            return error("%s: AcceptBlock FAILED: %s", __func__, FormatStateMessage(state));
         }
     }
 
@@ -3553,7 +3553,7 @@ bool ProcessNewBlock(const CChainParams& chainparams, const std::shared_ptr<cons
 
     CValidationState state; // Only used to report errors, not invalidity - ignore it
     if (!ActivateBestChain(state, chainparams, pblock))
-        return error("%s: ActivateBestChain failed", __func__);
+        return error("%s: ActivateBestChain failed: %s", __func__, FormatStateMessage(state));
 
     LogPrintf("%s : ACCEPTED\n", __func__);
     return true;

From d7e5f02eac15ef85821894aa65d993f5e7374ae8 Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Fri, 28 Sep 2018 09:55:46 +0200
Subject: [PATCH 160/400] Update build documentation (#2323)

Only describe how to build based on the depends system
---
 doc/build-cross.md   |  95 ++++++++++++++
 doc/build-generic.md |  79 +++++++++++
 doc/build-osx.md     |  49 ++-----
 doc/build-unix.md    | 305 ++++++++-----------------------------------
 doc/build-windows.md |  46 +------
 5 files changed, 237 insertions(+), 337 deletions(-)
 create mode 100644 doc/build-cross.md
 create mode 100644 doc/build-generic.md

diff --git a/doc/build-cross.md b/doc/build-cross.md
new file mode 100644
index 000000000000..283648577ab5
--- /dev/null
+++ b/doc/build-cross.md
@@ -0,0 +1,95 @@
+Cross-compiliation of Dash Core
+===============================
+
+Dash Core can be cross-compiled on Linux to all other supported host systems. This is done by changing
+the `HOST` parameter when building the dependencies and then specifying another `--prefix` directory when building Dash.
+
+The following instructions are only tested on Debian Stretch and Ubuntu Bionic.
+
+MacOSX Cross-compilation
+------------------------
+Cross-compiling to MacOSX requires a few additional packages to be installed:
+
+```bash
+$ sudo apt-get install python3-setuptools libcap-dev zlib1g-dev libbz2-dev
+```
+
+Additionally, the Mac OSX SDK must be downloaded and extracted manually:
+
+```bash
+$ mkdir -p depends/sdk-sources
+$ mkdir -p depends/SDKs
+$ curl https://bitcoincore.org/depends-sources/sdks/MacOSX10.11.sdk.tar.gz -o depends/sdk-sources/MacOSX10.11.sdk.tar.gz
+$ tar -C depends/SDKs -xf depends/sdk-sources/MacOSX10.11.sdk.tar.gz
+```
+
+When building the dependencies, as described in [build-generic](build-generic.md), use
+
+```bash
+$ make HOST=x86_64-apple-darwin11 -j4
+```
+
+When building Dash Core, use
+
+```bash
+$ ./configure --prefix `pwd`/depends/x86_64-apple-darwin11
+```
+
+Windows 64bit/32bit Cross-compilation
+-------------------------------
+Cross-compiling to Windows requires a few additional packages to be installed:
+
+```bash
+$ sudo apt-get install nsis wine wine64 bc
+```
+
+For Windows 64bit, install :
+```bash
+$ sudo apt-get install g++-mingw-w64-x86-64
+$ # Required to enable C++ threading libraries (e.g. std::thread)
+$ sudo update-alternatives --set x86_64-w64-mingw32-g++  /usr/bin/x86_64-w64-mingw32-g++-posix
+$ sudo update-alternatives --set x86_64-w64-mingw32-gcc  /usr/bin/x86_64-w64-mingw32-gcc-posix
+```
+
+For Windows 32bit, install:
+```bash
+$ sudo apt-get install g++-mingw-w64-i686
+$ # Required to enable C++ threading libraries (e.g. std::thread)
+$ sudo update-alternatives --set i686-w64-mingw32-gcc /usr/bin/i686-w64-mingw32-gcc-posix
+$ sudo update-alternatives --set i686-w64-mingw32-g++  /usr/bin/i686-w64-mingw32-g++-posix
+```
+
+When building the dependencies, as described in [build-generic](build-generic.md), use
+
+```bash
+$ make HOST=x86_64-w64-mingw32 -j4
+```
+
+When building Dash Core, use
+
+```bash
+$ ./configure --prefix `pwd`/depends/x86_64-w64-mingw32
+```
+
+These commands will build for Windows 64bit. If you want to compile for 32bit,
+replace `x86_64-w64-mingw32` with `i686-w64-mingw32`.
+
+ARM-Linux Cross-compilation
+-------------------
+Cross-compiling to ARM-Linux requires a few additional packages to be installed:
+
+```bash
+$ sudo apt-get install g++-arm-linux-gnueabihf
+```
+
+When building the dependencies, as described in [build-generic](build-generic.md), use
+
+```bash
+$ make HOST=arm-linux-gnueabihf -j4
+```
+
+When building Dash Core, use
+
+```bash
+$ ./configure --prefix `pwd`/depends/arm-linux-gnueabihf
+```
diff --git a/doc/build-generic.md b/doc/build-generic.md
new file mode 100644
index 000000000000..3e6c6ae9086b
--- /dev/null
+++ b/doc/build-generic.md
@@ -0,0 +1,79 @@
+GENERIC BUILD NOTES
+====================
+Some notes on how to build Dash Core based on the [depends](../depends/README.md) build system.
+
+Note on old build instructions
+------------------------------
+In the past, the build documentation contained instructions on how to build Dash with system-wide installed dependencies
+like BerkeleyDB 4.8, boost and Qt. Building this way is considered deprecated and only building with the `depends` prefix
+is supported today.
+
+Required build tools and environment
+------------------------------------
+Building the dependencies and Dash Core requires some essential build tools to be installed before. Please see
+[build-unix](build-unix.md), [build-osx](build-osx.md) and [build-windows](build-windows.md) for details.
+
+Building dependencies
+---------------------
+Dash inherited the `depends` folder from Bitcoin, which contains all dependencies required to build Dash. These
+dependencies must be built before Dash can actually be built. To do so, perform the following:
+
+```bash
+$ cd depends
+$ make -j4 # Choose a good -j value, depending on the number of CPU cores available
+$ cd ..
+```
+
+This will download and build all dependencies required to build Dash Core. Caching of build results will ensure that only
+the packages are rebuilt which have changed since the last depends build.
+
+It is required to re-run the above commands from time to time when dependencies have been updated or added. If this is
+not done, build failures might occur when building Dash.
+
+Please read the [depends](../depends/README.md) documentation for more details on supported hosts and configuration
+options. If no host is specified (as in the above example) when calling `make`, the depends system will default to your
+local host system. 
+
+Building Dash Core
+---------------------
+
+```bash
+$ ./autogen.sh
+$ ./configure --prefix `pwd`/depends/<host>
+$ make
+$ make install # optional
+```
+
+Please replace `<host>` with your local system's `host-platform-triplet`. The following triplets are usually valid:
+- `i686-pc-linux-gnu` for Linux32
+- `x86_64-pc-linux-gnu` for Linux64
+- `i686-w64-mingw32` for Win32
+- `x86_64-w64-mingw32` for Win64
+- `x86_64-apple-darwin11` for MacOSX
+- `arm-linux-gnueabihf` for Linux ARM 32 bit
+- `aarch64-linux-gnu` for Linux ARM 64 bit
+
+If you want to cross-compile for another platform, choose the appropriate `<host>` and make sure to build the
+dependencies with the same host before.
+
+
+ccache
+------
+The depends system also contains [ccache](https://ccache.samba.org/), which caches build results on source->object
+level. `./configure` of Dash Core will autodetect the presence of ccache and enable use of it. To disable ccache, use
+`./configure --prefix=<prefix> --disable-ccache`.
+
+The default maximum cache size is 5G, which might not be enough to cache multiple builds when switching Git branches
+very often. It is advised to increase the maximum cache size:
+
+```bash
+$ ./depends/<host>/bin/ccache -M20G
+```
+
+Additional Configure Flags
+--------------------------
+A list of additional configure flags can be displayed with:
+
+```bash
+./configure --help
+```
diff --git a/doc/build-osx.md b/doc/build-osx.md
index 87a5096b3a37..a0e595bdf5ed 100644
--- a/doc/build-osx.md
+++ b/doc/build-osx.md
@@ -13,42 +13,22 @@ When the popup appears, click `Install`.
 
 Then install [Homebrew](https://brew.sh).
 
-Dependencies
-----------------------
+Base build dependencies
+-----------------------
 
-    brew install automake berkeley-db4 libtool boost --c++11 miniupnpc openssl pkg-config protobuf qt libevent
+```bash
+brew install automake libtool --c++11 pkg-config
+```
 
 If you want to build the disk image with `make deploy` (.dmg / optional), you need RSVG
+```bash
+brew install librsvg
+```
 
-    brew install librsvg
+Building
+--------
 
-NOTE: Building with Qt4 is still supported, however, doing so could result in a broken UI. Therefore, building with Qt5 is recommended.
-
-Build Dash Core
-------------------------
-
-1. Clone the Dash Core source code and cd into `dash`
-
-        git clone https://github.com/dashpay/dash
-        cd dash
-
-2.  Build Dash Core:
-
-    Configure and build the headless dash binaries as well as the GUI (if Qt is found).
-
-    You can disable the GUI build by passing `--without-gui` to configure.
-
-        ./autogen.sh
-        ./configure
-        make
-
-3.  It is recommended to build and run the unit tests:
-
-        make check
-
-4.  You can also create a .dmg that contains the .app bundle (optional):
-
-        make deploy
+Follow the instructions in [build-generic](build-generic.md)
 
 Running
 -------
@@ -90,10 +70,3 @@ Uncheck everything except Qt Creator during the installation process.
 8. Select the default "Desktop" kit and select "Clang (x86 64bit in /usr/bin)" as compiler
 9. Select LLDB as debugger (you might need to set the path to your installation)
 10. Start debugging with Qt Creator
-
-Notes
------
-
-* Tested on OS X 10.8 through 10.12 on 64-bit Intel processors only.
-
-* Building with downloaded Qt binaries is not officially supported. See the notes in [#7714](https://github.com/bitcoin/bitcoin/issues/7714)
diff --git a/doc/build-unix.md b/doc/build-unix.md
index fa0c7239e2ba..95ead44f647a 100644
--- a/doc/build-unix.md
+++ b/doc/build-unix.md
@@ -4,204 +4,39 @@ Some notes on how to build Dash Core in Unix.
 
 (for OpenBSD specific instructions, see [build-openbsd.md](build-openbsd.md))
 
-Note
----------------------
-Always use absolute paths to configure and compile Dash Core and the dependencies,
-for example, when specifying the path of the dependency:
+Base build dependencies
+-----------------------
+Building the dependencies and Dash Core requires some essential build tools and libraries to be installed before.
 
-	../dist/configure --enable-cxx --disable-shared --with-pic --prefix=$BDB_PREFIX
-
-Here BDB_PREFIX must be an absolute path - it is defined using $(pwd) which ensures
-the usage of the absolute path.
-
-To Build
----------------------
+Run the following commands to install required packages:
 
+#####Debian/Ubuntu:
 ```bash
-./autogen.sh
-./configure
-make
-make install # optional
+$ sudo apt-get install curl build-essential libtool autotools-dev automake pkg-config python3 bsdmainutils cmake
 ```
 
-This will build dash-qt as well if the dependencies are met.
-
-Dependencies
----------------------
-
-These dependencies are required:
-
- Library     | Purpose          | Description
- ------------|------------------|----------------------
- libssl      | Crypto           | Random Number Generation, Elliptic Curve Cryptography
- libboost    | Utility          | Library for threading, data structures, etc
- libevent    | Networking       | OS independent asynchronous networking
-
-Optional dependencies:
-
- Library     | Purpose          | Description
- ------------|------------------|----------------------
- miniupnpc   | UPnP Support     | Firewall-jumping support
- libdb4.8    | Berkeley DB      | Wallet storage (only needed when wallet enabled)
- qt          | GUI              | GUI toolkit (only needed when GUI enabled)
- protobuf    | Payments in GUI  | Data interchange format used for payment protocol (only needed when GUI enabled)
- libqrencode | QR codes in GUI  | Optional for generating QR codes (only needed when GUI enabled)
- univalue    | Utility          | JSON parsing and encoding (bundled version will be used unless --with-system-univalue passed to configure)
- libzmq3     | ZMQ notification | Optional, allows generating ZMQ notifications (requires ZMQ version >= 4.x)
-
-For the versions used in the release, see [release-process.md](release-process.md) under *Fetch and build inputs*.
-
-Memory Requirements
---------------------
-
-C++ compilers are memory-hungry. It is recommended to have at least 1.5 GB of
-memory available when compiling Dash Core. On systems with less, gcc can be
-tuned to conserve memory with additional CXXFLAGS:
-
-
-    ./configure CXXFLAGS="--param ggc-min-expand=1 --param ggc-min-heapsize=32768"
-
-Dependency Build Instructions: Ubuntu & Debian
-----------------------------------------------
-Build requirements:
-
-    sudo apt-get install build-essential libtool autotools-dev automake pkg-config libssl-dev libevent-dev bsdmainutils
-
-Options when installing required Boost library files:
-
-1. On at least Ubuntu 14.04+ and Debian 7+ there are generic names for the
-individual boost development packages, so the following can be used to only
-install necessary parts of boost:
-
-        sudo apt-get install libboost-system-dev libboost-filesystem-dev libboost-chrono-dev libboost-program-options-dev libboost-test-dev libboost-thread-dev
-
-2. If that doesn't work, you can install all boost development packages with:
-
-        sudo apt-get install libboost-all-dev
-
-BerkeleyDB is required for the wallet.
-
-**For Ubuntu only:** db4.8 packages are available [here](https://launchpad.net/~bitcoin/+archive/bitcoin).
-You can add the repository and install using the following commands:
-
-    sudo apt-get install software-properties-common
-    sudo add-apt-repository ppa:bitcoin/bitcoin
-    sudo apt-get update
-    sudo apt-get install libdb4.8-dev libdb4.8++-dev
-
-Ubuntu and Debian have their own libdb-dev and libdb++-dev packages, but these will install
-BerkeleyDB 5.1 or later, which break binary wallet compatibility with the distributed executables which
-are based on BerkeleyDB 4.8. If you do not care about wallet compatibility,
-pass `--with-incompatible-bdb` to configure.
-
-See the section "Disable-wallet mode" to build Dash Core without wallet.
-
-Optional (see --with-miniupnpc and --enable-upnp-default):
-
-    sudo apt-get install libminiupnpc-dev
-
-ZMQ dependencies (provides ZMQ API 4.x):
-
-    sudo apt-get install libzmq3-dev
-
-Dependencies for the GUI: Ubuntu & Debian
------------------------------------------
-
-If you want to build Dash-Qt, make sure that the required packages for Qt development
-are installed. Either Qt 5 or Qt 4 are necessary to build the GUI.
-If both Qt 4 and Qt 5 are installed, Qt 5 will be used. Pass `--with-gui=qt4` to configure to choose Qt4.
-To build without GUI pass `--without-gui`.
-
-To build with Qt 5 (recommended) you need the following:
-
-    sudo apt-get install libqt5gui5 libqt5core5a libqt5dbus5 qttools5-dev qttools5-dev-tools libprotobuf-dev protobuf-compiler
-
-Alternatively, to build with Qt 4 you need the following:
-
-    sudo apt-get install libqt4-dev libprotobuf-dev protobuf-compiler
-
-libqrencode (optional) can be installed with:
-
-    sudo apt-get install libqrencode-dev
-
-Once these are installed, they will be found by configure and a dash-qt executable will be
-built by default.
-
-Dependency Build Instructions: Fedora
--------------------------------------
-Build requirements:
-
-    sudo dnf install gcc-c++ libtool make autoconf automake openssl-devel libevent-devel boost-devel libdb4-devel libdb4-cxx-devel
-
-Optional:
-
-    sudo dnf install miniupnpc-devel
-
-To build with Qt 5 (recommended) you need the following:
-
-    sudo dnf install qt5-qttools-devel qt5-qtbase-devel protobuf-devel
-
-libqrencode (optional) can be installed with:
-
-    sudo dnf install qrencode-devel
-
-Notes
------
-The release is built with GCC and then "strip dashd" to strip the debug
-symbols, which reduces the executable size by about 90%.
-
-
-miniupnpc
----------
-
-[miniupnpc](http://miniupnp.free.fr/) may be used for UPnP port mapping.  It can be downloaded from [here](
-http://miniupnp.tuxfamily.org/files/).  UPnP support is compiled in and
-turned off by default.  See the configure options for upnp behavior desired:
-
-	--without-miniupnpc      No UPnP support miniupnp not required
-	--disable-upnp-default   (the default) UPnP support turned off by default at runtime
-	--enable-upnp-default    UPnP support turned on by default at runtime
-
-
-Berkeley DB
------------
-It is recommended to use Berkeley DB 4.8. If you have to build it yourself:
-
+#####Fedora:
 ```bash
-DASH_ROOT=$(pwd)
-
-# Pick some path to install BDB to, here we create a directory within the dash directory
-BDB_PREFIX="${DASH_ROOT}/db4"
-mkdir -p $BDB_PREFIX
-
-# Fetch the source and verify that it is not tampered with
-wget 'http://download.oracle.com/berkeley-db/db-4.8.30.NC.tar.gz'
-echo '12edc0df75bf9abd7f82f821795bcee50f42cb2e5f76a6a281b85732798364ef  db-4.8.30.NC.tar.gz' | sha256sum -c
-# -> db-4.8.30.NC.tar.gz: OK
-tar -xzvf db-4.8.30.NC.tar.gz
-
-# Build the library and install to our prefix
-cd db-4.8.30.NC/build_unix/
-#  Note: Do a static build so that it can be embedded into the executable, instead of having to find a .so at runtime
-../dist/configure --enable-cxx --disable-shared --with-pic --prefix=$BDB_PREFIX
-make install
-
-# Configure Dash Core to use our own-built instance of BDB
-cd $DASH_ROOT
-./autogen.sh
-./configure LDFLAGS="-L${BDB_PREFIX}/lib/" CPPFLAGS="-I${BDB_PREFIX}/include/" # (other args...)
+$ sudo dnf install gcc-c++ libtool make autoconf automake python3 cmake
 ```
 
-**Note**: You only need Berkeley DB if the wallet is enabled (see the section *Disable-Wallet mode* below).
+#####Arch Linux
+```bash
+$ pacman -S base-devel python3 cmake
+```
 
-Boost
------
-If you need to build Boost yourself:
+#####FreeBSD/OpenBSD
+```bash
+pkg_add gmake cmake libtool
+pkg_add autoconf # (select highest version, e.g. 2.69)
+pkg_add automake # (select highest version, e.g. 1.15)
+pkg_add python # (select highest version, e.g. 3.5)
+```
 
-	sudo su
-	./bootstrap.sh
-	./bjam install
+Building
+--------
 
+Follow the instructions in [build-generic](build-generic.md)
 
 Security
 --------
@@ -211,8 +46,8 @@ This can be disabled with:
 
 Hardening Flags:
 
-	./configure --enable-hardening
-	./configure --disable-hardening
+	./configure --prefix=<prefix> --enable-hardening
+	./configure --prefix=<prefix> --disable-hardening
 
 
 Hardening enables the following features:
@@ -257,7 +92,7 @@ Disable-wallet mode
 When the intention is to run only a P2P node without a wallet, Dash Core may be compiled in
 disable-wallet mode with:
 
-    ./configure --disable-wallet
+    ./configure --prefix=<prefix> --disable-wallet
 
 In this case there is no dependency on Berkeley DB 4.8.
 
@@ -270,78 +105,40 @@ A list of additional configure flags can be displayed with:
 
     ./configure --help
 
-
-Setup and Build Example: Arch Linux
------------------------------------
-This example lists the steps necessary to setup and build a command line only, non-wallet distribution of the latest changes on Arch Linux:
-
-    pacman -S git base-devel boost libevent python
-    git clone https://github.com/dashpay/dash.git
-    cd dash/
-    ./autogen.sh
-    ./configure --disable-wallet --without-gui --without-miniupnpc
-    make check
-
-Note:
-Enabling wallet support requires either compiling against a Berkeley DB newer than 4.8 (package `db`) using `--with-incompatible-bdb`,
-or building and depending on a local version of Berkeley DB 4.8. The readily available Arch Linux packages are currently built using
-`--with-incompatible-bdb` according to the [PKGBUILD](https://projects.archlinux.org/svntogit/community.git/tree/bitcoin/trunk/PKGBUILD).
-As mentioned above, when maintaining portability of the wallet between the standard Dash Core distributions and independently built
-node software is desired, Berkeley DB 4.8 must be used.
-
-
-ARM Cross-compilation
--------------------
-These steps can be performed on, for example, an Ubuntu VM. The depends system
-will also work on other Linux distributions, however the commands for
-installing the toolchain will be different.
-
-Make sure you install the build requirements mentioned above.
-Then, install the toolchain and curl:
-
-    sudo apt-get install g++-arm-linux-gnueabihf curl
-
-To build executables for ARM:
-
-    cd depends
-    make HOST=arm-linux-gnueabihf NO_QT=1
-    cd ..
-    ./configure --prefix=$PWD/depends/arm-linux-gnueabihf --enable-glibc-back-compat --enable-reduce-exports LDFLAGS=-static-libstdc++
-    make
-
-
-For further documentation on the depends system see [README.md](../depends/README.md) in the depends directory.
-
 Building on FreeBSD
 --------------------
 
-(Updated as of FreeBSD 11.0)
-
-Clang is installed by default as `cc` compiler, this makes it easier to get
-started than on [OpenBSD](build-openbsd.md). Installing dependencies:
+(TODO, this is untested, please report if it works and if changes to this documentation are needed)
 
-    pkg install autoconf automake libtool pkgconf
-    pkg install boost-libs openssl libevent
-    pkg install gmake
+Building on FreeBSD is basically the same as on Linux based systems, with the difference that you have to use `gmake`
+instead of `make`.
 
-You need to use GNU make (`gmake`) instead of `make`.
-(`libressl` instead of `openssl` will also work)
+*Note on debugging*: The version of `gdb` installed by default is [ancient and considered harmful](https://wiki.freebsd.org/GdbRetirement).
+It is not suitable for debugging a multi-threaded C++ program, not even for getting backtraces. Please install the package `gdb` and
+use the versioned gdb command e.g. `gdb7111`.
 
-For the wallet (optional):
+Building on OpenBSD
+-------------------
 
-    pkg install db5
+(TODO, this is untested, please report if it works and if changes to this documentation are needed)
+(TODO, clang might also be an option. Old documentation reported it to to not work due to linking errors, but we're building all dependencies now as part of the depends system, so this might have changed)
 
-This will give a warning "configure: WARNING: Found Berkeley DB other
-than 4.8; wallets opened by this build will not be portable!", but as FreeBSD never
-had a binary release, this may not matter. If backwards compatibility
-with 4.8-built Dash Core is needed follow the steps under "Berkeley DB" above.
+Building on OpenBSD might require installation of a newer GCC version. If needed, do this with:
 
-Then build using:
+```bash
+$ pkg_add g++ # (select newest 6.x version)
+```
 
-    ./autogen.sh
-    ./configure --with-incompatible-bdb BDB_CFLAGS="-I/usr/local/include/db5" BDB_LIBS="-L/usr/local/lib -ldb_cxx-5"
-    gmake
+This compiler will not overwrite the system compiler, it will be installed as `egcc` and `eg++` in `/usr/local/bin`.
 
-*Note on debugging*: The version of `gdb` installed by default is [ancient and considered harmful](https://wiki.freebsd.org/GdbRetirement).
-It is not suitable for debugging a multi-threaded C++ program, not even for getting backtraces. Please install the package `gdb` and
-use the versioned gdb command e.g. `gdb7111`.
+Add `CC=egcc CXX=eg++ CPP=ecpp` to the dependencies build and the Dash Core build:
+```bash
+$ cd depends
+$ make CC=egcc CXX=eg++ CPP=ecpp # do not use -jX, this is broken
+$ cd ..
+$ export AUTOCONF_VERSION=2.69 # replace this with the autoconf version that you installed
+$ export AUTOMAKE_VERSION=1.15 # replace this with the automake version that you installed
+$ ./autogen.sh
+$ ./configure --prefix=<prefix> CC=egcc CXX=eg++ CPP=ecpp
+$ gmake # do not use -jX, this is broken
+```
\ No newline at end of file
diff --git a/doc/build-windows.md b/doc/build-windows.md
index a877625ca932..2434d939a0d8 100644
--- a/doc/build-windows.md
+++ b/doc/build-windows.md
@@ -47,51 +47,7 @@ recommended but it is possible to compile the 32-bit version.
 Cross-compilation
 -------------------
 
-These steps can be performed on, for example, an Ubuntu VM. The depends system
-will also work on other Linux distributions, however the commands for
-installing the toolchain will be different.
-
-First, install the general dependencies:
-
-    sudo apt-get install build-essential libtool autotools-dev automake pkg-config bsdmainutils curl
-
-A host toolchain (`build-essential`) is necessary because some dependency
-packages (such as `protobuf`) need to build host utilities that are used in the
-build process.
-
-## Building for 64-bit Windows
-
-To build executables for Windows 64-bit, install the following dependencies:
-
-    sudo apt-get install g++-mingw-w64-x86-64 mingw-w64-x86-64-dev
-
-Then build using:
-
-    cd depends
-    make HOST=x86_64-w64-mingw32
-    cd ..
-    ./autogen.sh # not required when building from tarball
-    CONFIG_SITE=$PWD/depends/x86_64-w64-mingw32/share/config.site ./configure --prefix=/
-    make
-
-## Building for 32-bit Windows
-
-To build executables for Windows 32-bit, install the following dependencies:
-
-    sudo apt-get install g++-mingw-w64-i686 mingw-w64-i686-dev 
-
-Then build using:
-
-    cd depends
-    make HOST=i686-w64-mingw32
-    cd ..
-    ./autogen.sh # not required when building from tarball
-    CONFIG_SITE=$PWD/depends/i686-w64-mingw32/share/config.site ./configure --prefix=/
-    make
-
-## Depends system
-
-For further documentation on the depends system see [README.md](../depends/README.md) in the depends directory.
+Follow the instructions for Windows in [build-cross](build-cross.md)
 
 Installation
 -------------

From ee6a5a33b7d7d001c313d0de51ae994ce79c31fc Mon Sep 17 00:00:00 2001
From: PastaPastaPasta <pasta@dashboost.org>
Date: Fri, 28 Sep 2018 02:56:17 -0500
Subject: [PATCH 161/400] Gov cleanup + copyright bump (#2324)

* governance.* formatting and copyright bump

* manual changes gov.cpp

* clang and copyright bump

* gov-exc.h clang and copyright bump

* gov-obj.* clang and copyright bump

* gov-val.* clang and copyright bump

* gov-vote.* clang and copyright bump

* gov-votedb.* clang and copyright bump

* fix some weirdness

* Modernize ConvertVoteOutcome, ConvertSignalToString and  ConvertOutcomeToString

* add braces

* move breaks

* add braces instead of inlining

* Revert "Modernize ConvertVoteOutcome, ConvertSignalToString and  ConvertOutcomeToString"

This reverts commit 41bc3d3d863076cd5e6b10ca7706100963cd51b0.

* drop unused function
---
 src/governance-classes.cpp    | 309 ++++++++++++-----------
 src/governance-classes.h      |  41 ++-
 src/governance-exceptions.h   |  19 +-
 src/governance-object.cpp     | 294 +++++++++++-----------
 src/governance-object.h       |  83 ++++---
 src/governance-validators.cpp | 105 ++++----
 src/governance-validators.h   |   8 +-
 src/governance-vote.cpp       | 165 ++++++-------
 src/governance-vote.h         |  30 +--
 src/governance-votedb.cpp     |  39 ++-
 src/governance-votedb.h       |  11 +-
 src/governance.cpp            | 452 ++++++++++++++++------------------
 src/governance.h              |  80 +++---
 13 files changed, 801 insertions(+), 835 deletions(-)

diff --git a/src/governance-classes.cpp b/src/governance-classes.cpp
index e21232fa6252..89a8b75056df 100644
--- a/src/governance-classes.cpp
+++ b/src/governance-classes.cpp
@@ -1,14 +1,14 @@
-// Copyright (c) 2014-2017 The Dash Core developers
+// Copyright (c) 2014-2018 The Dash Core developers
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 //#define ENABLE_DASH_DEBUG
 
-#include "core_io.h"
 #include "governance-classes.h"
+#include "core_io.h"
 #include "init.h"
-#include "validation.h"
 #include "utilstrencodings.h"
+#include "validation.h"
 
 #include <boost/algorithm/string.hpp>
 
@@ -24,19 +24,19 @@ std::vector<std::string> SplitBy(const std::string& strCommand, const std::strin
     std::vector<std::string> vParts;
     boost::split(vParts, strCommand, boost::is_any_of(strDelimit));
 
-    for(int q=0; q<(int)vParts.size(); q++) {
-        if(strDelimit.find(vParts[q]) != std::string::npos) {
-            vParts.erase(vParts.begin()+q);
+    for (int q = 0; q < (int)vParts.size(); q++) {
+        if (strDelimit.find(vParts[q]) != std::string::npos) {
+            vParts.erase(vParts.begin() + q);
             --q;
         }
     }
 
-   return vParts;
+    return vParts;
 }
 
 CAmount ParsePaymentAmount(const std::string& strAmount)
 {
-    DBG( std::cout << "ParsePaymentAmount Start: strAmount = " << strAmount << std::endl; );
+    DBG(std::cout << "ParsePaymentAmount Start: strAmount = " << strAmount << std::endl;);
 
     CAmount nAmount = 0;
     if (strAmount.empty()) {
@@ -44,7 +44,7 @@ CAmount ParsePaymentAmount(const std::string& strAmount)
         ostr << "ParsePaymentAmount: Amount is empty";
         throw std::runtime_error(ostr.str());
     }
-    if(strAmount.size() > 20) {
+    if (strAmount.size() > 20) {
         // String is much too long, the functions below impose stricter
         // requirements
         std::ostringstream ostr;
@@ -70,7 +70,7 @@ CAmount ParsePaymentAmount(const std::string& strAmount)
     }
 
     // Make sure there's no more than 1 decimal point
-    if ((pos != std::string::npos) && (strAmount.find(".", pos+1) != std::string::npos)) {
+    if ((pos != std::string::npos) && (strAmount.find(".", pos + 1) != std::string::npos)) {
         std::ostringstream ostr;
         ostr << "ParsePaymentAmount: Invalid amount string, too many decimal points";
         throw std::runtime_error(ostr.str());
@@ -91,7 +91,7 @@ CAmount ParsePaymentAmount(const std::string& strAmount)
         throw std::runtime_error(ostr.str());
     }
 
-    DBG( std::cout << "ParsePaymentAmount Returning true nAmount = " << nAmount << std::endl; );
+    DBG(std::cout << "ParsePaymentAmount Returning true nAmount = " << nAmount << std::endl;);
 
     return nAmount;
 }
@@ -102,44 +102,42 @@ CAmount ParsePaymentAmount(const std::string& strAmount)
 
 bool CGovernanceTriggerManager::AddNewTrigger(uint256 nHash)
 {
-    DBG( std::cout << "CGovernanceTriggerManager::AddNewTrigger: Start" << std::endl; );
+    DBG(std::cout << "CGovernanceTriggerManager::AddNewTrigger: Start" << std::endl;);
     AssertLockHeld(governance.cs);
 
     // IF WE ALREADY HAVE THIS HASH, RETURN
-    if(mapTrigger.count(nHash)) {
+    if (mapTrigger.count(nHash)) {
         DBG(
             std::cout << "CGovernanceTriggerManager::AddNewTrigger: Already have hash"
-                 << ", nHash = " << nHash.GetHex()
-                 << ", count = " << mapTrigger.count(nHash)
-                 << ", mapTrigger.size() = " << mapTrigger.size()
-                 << std::endl; );
+                      << ", nHash = " << nHash.GetHex()
+                      << ", count = " << mapTrigger.count(nHash)
+                      << ", mapTrigger.size() = " << mapTrigger.size()
+                      << std::endl;);
         return false;
     }
 
     CSuperblock_sptr pSuperblock;
-    try  {
+    try {
         CSuperblock_sptr pSuperblockTmp(new CSuperblock(nHash));
         pSuperblock = pSuperblockTmp;
-    }
-    catch(std::exception& e) {
-        DBG( std::cout << "CGovernanceTriggerManager::AddNewTrigger Error creating superblock"
-             << ", e.what() = " << e.what()
-             << std::endl; );
+    } catch (std::exception& e) {
+        DBG(std::cout << "CGovernanceTriggerManager::AddNewTrigger Error creating superblock"
+                      << ", e.what() = " << e.what()
+                      << std::endl;);
         LogPrintf("CGovernanceTriggerManager::AddNewTrigger -- Error creating superblock: %s\n", e.what());
         return false;
-    }
-    catch(...) {
+    } catch (...) {
         LogPrintf("CGovernanceTriggerManager::AddNewTrigger: Unknown Error creating superblock\n");
-        DBG( std::cout << "CGovernanceTriggerManager::AddNewTrigger Error creating superblock catchall" << std::endl; );
+        DBG(std::cout << "CGovernanceTriggerManager::AddNewTrigger Error creating superblock catchall" << std::endl;);
         return false;
     }
 
     pSuperblock->SetStatus(SEEN_OBJECT_IS_VALID);
 
-    DBG( std::cout << "CGovernanceTriggerManager::AddNewTrigger: Inserting trigger" << std::endl; );
+    DBG(std::cout << "CGovernanceTriggerManager::AddNewTrigger: Inserting trigger" << std::endl;);
     mapTrigger.insert(std::make_pair(nHash, pSuperblock));
 
-    DBG( std::cout << "CGovernanceTriggerManager::AddNewTrigger: End" << std::endl; );
+    DBG(std::cout << "CGovernanceTriggerManager::AddNewTrigger: End" << std::endl;);
 
     return true;
 }
@@ -153,33 +151,33 @@ bool CGovernanceTriggerManager::AddNewTrigger(uint256 nHash)
 void CGovernanceTriggerManager::CleanAndRemove()
 {
     LogPrint("gobject", "CGovernanceTriggerManager::CleanAndRemove -- Start\n");
-    DBG( std::cout << "CGovernanceTriggerManager::CleanAndRemove: Start" << std::endl; );
+    DBG(std::cout << "CGovernanceTriggerManager::CleanAndRemove: Start" << std::endl;);
     AssertLockHeld(governance.cs);
 
     // Remove triggers that are invalid or expired
-    DBG( std::cout << "CGovernanceTriggerManager::CleanAndRemove: mapTrigger.size() = " << mapTrigger.size() << std::endl; );
+    DBG(std::cout << "CGovernanceTriggerManager::CleanAndRemove: mapTrigger.size() = " << mapTrigger.size() << std::endl;);
     LogPrint("gobject", "CGovernanceTriggerManager::CleanAndRemove -- mapTrigger.size() = %d\n", mapTrigger.size());
 
     trigger_m_it it = mapTrigger.begin();
-    while(it != mapTrigger.end()) {
+    while (it != mapTrigger.end()) {
         bool remove = false;
         CGovernanceObject* pObj = nullptr;
         CSuperblock_sptr& pSuperblock = it->second;
-        if(!pSuperblock) {
-            DBG( std::cout << "CGovernanceTriggerManager::CleanAndRemove: NULL superblock marked for removal" << std::endl; );
+        if (!pSuperblock) {
+            DBG(std::cout << "CGovernanceTriggerManager::CleanAndRemove: NULL superblock marked for removal" << std::endl;);
             LogPrint("gobject", "CGovernanceTriggerManager::CleanAndRemove -- NULL superblock marked for removal\n");
             remove = true;
         } else {
             pObj = governance.FindGovernanceObject(it->first);
-            if(!pObj || pObj->GetObjectType() != GOVERNANCE_OBJECT_TRIGGER) {
-                DBG( std::cout << "CGovernanceTriggerManager::CleanAndRemove: Unknown or non-trigger superblock" << std::endl; );
+            if (!pObj || pObj->GetObjectType() != GOVERNANCE_OBJECT_TRIGGER) {
+                DBG(std::cout << "CGovernanceTriggerManager::CleanAndRemove: Unknown or non-trigger superblock" << std::endl;);
                 LogPrint("gobject", "CGovernanceTriggerManager::CleanAndRemove -- Unknown or non-trigger superblock\n");
                 pSuperblock->SetStatus(SEEN_OBJECT_ERROR_INVALID);
             }
 
-            DBG( std::cout << "CGovernanceTriggerManager::CleanAndRemove: superblock status = " << pSuperblock->GetStatus() << std::endl; );
+            DBG(std::cout << "CGovernanceTriggerManager::CleanAndRemove: superblock status = " << pSuperblock->GetStatus() << std::endl;);
             LogPrint("gobject", "CGovernanceTriggerManager::CleanAndRemove -- superblock status = %d\n", pSuperblock->GetStatus());
-            switch(pSuperblock->GetStatus()) {
+            switch (pSuperblock->GetStatus()) {
             case SEEN_OBJECT_ERROR_INVALID:
             case SEEN_OBJECT_UNKNOWN:
                 LogPrint("gobject", "CGovernanceTriggerManager::CleanAndRemove -- Unknown or invalid trigger found\n");
@@ -195,16 +193,15 @@ void CGovernanceTriggerManager::CleanAndRemove()
         }
         LogPrint("gobject", "CGovernanceTriggerManager::CleanAndRemove -- %smarked for removal\n", remove ? "" : "NOT ");
 
-        if(remove) {
+        if (remove) {
             DBG(
                 std::string strDataAsPlainString = "NULL";
-                if(pObj) {
+                if (pObj) {
                     strDataAsPlainString = pObj->GetDataAsPlainString();
-                }
+                } 
                 std::cout << "CGovernanceTriggerManager::CleanAndRemove: Removing object: "
-                     << strDataAsPlainString
-                     << std::endl;
-               );
+                          << strDataAsPlainString
+                          << std::endl;);
             LogPrint("gobject", "CGovernanceTriggerManager::CleanAndRemove -- Removing trigger object\n");
             // mark corresponding object for deletion
             if (pObj) {
@@ -215,13 +212,12 @@ void CGovernanceTriggerManager::CleanAndRemove()
             }
             // delete the trigger
             mapTrigger.erase(it++);
-        }
-        else  {
+        } else {
             ++it;
         }
     }
 
-    DBG( std::cout << "CGovernanceTriggerManager::CleanAndRemove: End" << std::endl; );
+    DBG(std::cout << "CGovernanceTriggerManager::CleanAndRemove: End" << std::endl;);
 }
 
 /**
@@ -236,18 +232,18 @@ std::vector<CSuperblock_sptr> CGovernanceTriggerManager::GetActiveTriggers()
     AssertLockHeld(governance.cs);
     std::vector<CSuperblock_sptr> vecResults;
 
-    DBG( std::cout << "GetActiveTriggers: mapTrigger.size() = " << mapTrigger.size() << std::endl; );
+    DBG(std::cout << "GetActiveTriggers: mapTrigger.size() = " << mapTrigger.size() << std::endl;);
 
     // LOOK AT THESE OBJECTS AND COMPILE A VALID LIST OF TRIGGERS
     for (const auto& pair : mapTrigger) {
         CGovernanceObject* pObj = governance.FindGovernanceObject(pair.first);
-        if(pObj) {
-            DBG( std::cout << "GetActiveTriggers: pObj->GetDataAsPlainString() = " << pObj->GetDataAsPlainString() << std::endl; );
+        if (pObj) {
+            DBG(std::cout << "GetActiveTriggers: pObj->GetDataAsPlainString() = " << pObj->GetDataAsPlainString() << std::endl;);
             vecResults.push_back(pair.second);
         }
     }
 
-    DBG( std::cout << "GetActiveTriggers: vecResults.size() = " << vecResults.size() << std::endl; );
+    DBG(std::cout << "GetActiveTriggers: vecResults.size() = " << vecResults.size() << std::endl;);
 
     return vecResults;
 }
@@ -271,21 +267,20 @@ bool CSuperblockManager::IsSuperblockTriggered(int nBlockHeight)
 
     LogPrint("gobject", "CSuperblockManager::IsSuperblockTriggered -- vecTriggers.size() = %d\n", vecTriggers.size());
 
-    DBG( std::cout << "IsSuperblockTriggered Number triggers = " << vecTriggers.size() << std::endl; );
+    DBG(std::cout << "IsSuperblockTriggered Number triggers = " << vecTriggers.size() << std::endl;);
 
-    for (const auto& pSuperblock : vecTriggers)
-    {
-        if(!pSuperblock) {
+    for (const auto& pSuperblock : vecTriggers) {
+        if (!pSuperblock) {
             LogPrintf("CSuperblockManager::IsSuperblockTriggered -- Non-superblock found, continuing\n");
-            DBG( std::cout << "IsSuperblockTriggered Not a superblock, continuing " << std::endl; );
+            DBG(std::cout << "IsSuperblockTriggered Not a superblock, continuing " << std::endl;);
             continue;
         }
 
         CGovernanceObject* pObj = pSuperblock->GetGovernanceObject();
 
-        if(!pObj) {
+        if (!pObj) {
             LogPrintf("CSuperblockManager::IsSuperblockTriggered -- pObj == nullptr, continuing\n");
-            DBG( std::cout << "IsSuperblockTriggered pObj is NULL, continuing" << std::endl; );
+            DBG(std::cout << "IsSuperblockTriggered pObj is NULL, continuing" << std::endl;);
             continue;
         }
 
@@ -293,14 +288,14 @@ bool CSuperblockManager::IsSuperblockTriggered(int nBlockHeight)
 
         // note : 12.1 - is epoch calculation correct?
 
-        if(nBlockHeight != pSuperblock->GetBlockHeight()) {
+        if (nBlockHeight != pSuperblock->GetBlockHeight()) {
             LogPrint("gobject", "CSuperblockManager::IsSuperblockTriggered -- block height doesn't match nBlockHeight = %d, blockStart = %d, continuing\n",
-                     nBlockHeight,
-                     pSuperblock->GetBlockHeight());
-            DBG( std::cout << "IsSuperblockTriggered Not the target block, continuing"
-                 << ", nBlockHeight = " << nBlockHeight
-                 << ", superblock->GetBlockHeight() = " << pSuperblock->GetBlockHeight()
-                 << std::endl; );
+                nBlockHeight,
+                pSuperblock->GetBlockHeight());
+            DBG(std::cout << "IsSuperblockTriggered Not the target block, continuing"
+                          << ", nBlockHeight = " << nBlockHeight
+                          << ", superblock->GetBlockHeight() = " << pSuperblock->GetBlockHeight()
+                          << std::endl;);
             continue;
         }
 
@@ -308,14 +303,13 @@ bool CSuperblockManager::IsSuperblockTriggered(int nBlockHeight)
 
         pObj->UpdateSentinelVariables();
 
-        if(pObj->IsSetCachedFunding()) {
+        if (pObj->IsSetCachedFunding()) {
             LogPrint("gobject", "CSuperblockManager::IsSuperblockTriggered -- fCacheFunding = true, returning true\n");
-            DBG( std::cout << "IsSuperblockTriggered returning true" << std::endl; );
+            DBG(std::cout << "IsSuperblockTriggered returning true" << std::endl;);
             return true;
-        }
-        else  {
+        } else {
             LogPrint("gobject", "CSuperblockManager::IsSuperblockTriggered -- fCacheFunding = false, continuing\n");
-            DBG( std::cout << "IsSuperblockTriggered No fCachedFunding, continuing" << std::endl; );
+            DBG(std::cout << "IsSuperblockTriggered No fCachedFunding, continuing" << std::endl;);
         }
     }
 
@@ -325,7 +319,7 @@ bool CSuperblockManager::IsSuperblockTriggered(int nBlockHeight)
 
 bool CSuperblockManager::GetBestSuperblock(CSuperblock_sptr& pSuperblockRet, int nBlockHeight)
 {
-    if(!CSuperblock::IsValidBlockHeight(nBlockHeight)) {
+    if (!CSuperblock::IsValidBlockHeight(nBlockHeight)) {
         return false;
     }
 
@@ -334,31 +328,31 @@ bool CSuperblockManager::GetBestSuperblock(CSuperblock_sptr& pSuperblockRet, int
     int nYesCount = 0;
 
     for (const auto& pSuperblock : vecTriggers) {
-        if(!pSuperblock) {
-            DBG( std::cout << "GetBestSuperblock Not a superblock, continuing" << std::endl; );
+        if (!pSuperblock) {
+            DBG(std::cout << "GetBestSuperblock Not a superblock, continuing" << std::endl;);
             continue;
         }
 
         CGovernanceObject* pObj = pSuperblock->GetGovernanceObject();
 
-        if(!pObj) {
-            DBG( std::cout << "GetBestSuperblock pObj is NULL, continuing" << std::endl; );
+        if (!pObj) {
+            DBG(std::cout << "GetBestSuperblock pObj is NULL, continuing" << std::endl;);
             continue;
         }
 
-        if(nBlockHeight != pSuperblock->GetBlockHeight()) {
-            DBG( std::cout << "GetBestSuperblock Not the target block, continuing" << std::endl; );
+        if (nBlockHeight != pSuperblock->GetBlockHeight()) {
+            DBG(std::cout << "GetBestSuperblock Not the target block, continuing" << std::endl;);
             continue;
         }
 
         // DO WE HAVE A NEW WINNER?
 
         int nTempYesCount = pObj->GetAbsoluteYesCount(VOTE_SIGNAL_FUNDING);
-        DBG( std::cout << "GetBestSuperblock nTempYesCount = " << nTempYesCount << std::endl; );
-        if(nTempYesCount > nYesCount) {
+        DBG(std::cout << "GetBestSuperblock nTempYesCount = " << nTempYesCount << std::endl;);
+        if (nTempYesCount > nYesCount) {
             nYesCount = nTempYesCount;
             pSuperblockRet = pSuperblock;
-            DBG( std::cout << "GetBestSuperblock Valid superblock found, pSuperblock set" << std::endl; );
+            DBG(std::cout << "GetBestSuperblock Valid superblock found, pSuperblock set" << std::endl;);
         }
     }
 
@@ -373,16 +367,16 @@ bool CSuperblockManager::GetBestSuperblock(CSuperblock_sptr& pSuperblockRet, int
 
 bool CSuperblockManager::GetSuperblockPayments(int nBlockHeight, std::vector<CTxOut>& voutSuperblockRet)
 {
-    DBG( std::cout << "CSuperblockManager::GetSuperblockPayments Start" << std::endl; );
+    DBG(std::cout << "CSuperblockManager::GetSuperblockPayments Start" << std::endl;);
 
     LOCK(governance.cs);
 
     // GET THE BEST SUPERBLOCK FOR THIS BLOCK HEIGHT
 
     CSuperblock_sptr pSuperblock;
-    if(!CSuperblockManager::GetBestSuperblock(pSuperblock, nBlockHeight)) {
+    if (!CSuperblockManager::GetBestSuperblock(pSuperblock, nBlockHeight)) {
         LogPrint("gobject", "CSuperblockManager::GetSuperblockPayments -- Can't find superblock for height %d\n", nBlockHeight);
-        DBG( std::cout << "CSuperblockManager::GetSuperblockPayments Failed to get superblock for height, returning" << std::endl; );
+        DBG(std::cout << "CSuperblockManager::GetSuperblockPayments Failed to get superblock for height, returning" << std::endl;);
         return false;
     }
 
@@ -392,17 +386,17 @@ bool CSuperblockManager::GetSuperblockPayments(int nBlockHeight, std::vector<CTx
     // GET SUPERBLOCK OUTPUTS
 
     // Superblock payments will be appended to the end of the coinbase vout vector
-    DBG( std::cout << "CSuperblockManager::GetSuperblockPayments Number payments: " << pSuperblock->CountPayments() << std::endl; );
+    DBG(std::cout << "CSuperblockManager::GetSuperblockPayments Number payments: " << pSuperblock->CountPayments() << std::endl;);
 
     // TODO: How many payments can we add before things blow up?
     //       Consider at least following limits:
     //          - max coinbase tx size
     //          - max "budget" available
-    for(int i = 0; i < pSuperblock->CountPayments(); i++) {
+    for (int i = 0; i < pSuperblock->CountPayments(); i++) {
         CGovernancePayment payment;
-        DBG( std::cout << "CSuperblockManager::GetSuperblockPayments i = " << i << std::endl; );
-        if(pSuperblock->GetPayment(i, payment)) {
-            DBG( std::cout << "CSuperblockManager::GetSuperblockPayments Payment found " << std::endl; );
+        DBG(std::cout << "CSuperblockManager::GetSuperblockPayments i = " << i << std::endl;);
+        if (pSuperblock->GetPayment(i, payment)) {
+            DBG(std::cout << "CSuperblockManager::GetSuperblockPayments Payment found " << std::endl;);
             // SET COINBASE OUTPUT TO SUPERBLOCK SETTING
 
             CTxOut txout = CTxOut(payment.nAmount, payment.script);
@@ -416,15 +410,15 @@ bool CSuperblockManager::GetSuperblockPayments(int nBlockHeight, std::vector<CTx
 
             // TODO: PRINT NICE N.N DASH OUTPUT
 
-            DBG( std::cout << "CSuperblockManager::GetSuperblockPayments Before LogPrintf call, nAmount = " << payment.nAmount << std::endl; );
+            DBG(std::cout << "CSuperblockManager::GetSuperblockPayments Before LogPrintf call, nAmount = " << payment.nAmount << std::endl;);
             LogPrintf("NEW Superblock : output %d (addr %s, amount %d)\n", i, address2.ToString(), payment.nAmount);
-            DBG( std::cout << "CSuperblockManager::GetSuperblockPayments After LogPrintf call " << std::endl; );
+            DBG(std::cout << "CSuperblockManager::GetSuperblockPayments After LogPrintf call " << std::endl;);
         } else {
-            DBG( std::cout << "CSuperblockManager::GetSuperblockPayments Payment not found " << std::endl; );
+            DBG(std::cout << "CSuperblockManager::GetSuperblockPayments Payment not found " << std::endl;);
         }
     }
 
-    DBG( std::cout << "CSuperblockManager::GetSuperblockPayments End" << std::endl; );
+    DBG(std::cout << "CSuperblockManager::GetSuperblockPayments End" << std::endl;);
 
     return true;
 }
@@ -435,7 +429,7 @@ bool CSuperblockManager::IsValid(const CTransaction& txNew, int nBlockHeight, CA
     LOCK(governance.cs);
 
     CSuperblock_sptr pSuperblock;
-    if(CSuperblockManager::GetBestSuperblock(pSuperblock, nBlockHeight)) {
+    if (CSuperblockManager::GetBestSuperblock(pSuperblock, nBlockHeight)) {
         return pSuperblock->IsValid(txNew, nBlockHeight, blockReward);
     }
 
@@ -447,7 +441,7 @@ void CSuperblockManager::ExecuteBestSuperblock(int nBlockHeight)
     LOCK(governance.cs);
 
     CSuperblock_sptr pSuperblock;
-    if(GetBestSuperblock(pSuperblock, nBlockHeight)) {
+    if (GetBestSuperblock(pSuperblock, nBlockHeight)) {
         // All checks are done in CSuperblock::IsValid via IsBlockValueValid and IsBlockPayeeValid,
         // tip wouldn't be updated if anything was wrong. Mark this trigger as executed.
         pSuperblock->SetExecuted();
@@ -455,36 +449,37 @@ void CSuperblockManager::ExecuteBestSuperblock(int nBlockHeight)
 }
 
 CSuperblock::
-CSuperblock()
-    : nGovObjHash(),
-      nBlockHeight(0),
-      nStatus(SEEN_OBJECT_UNKNOWN),
-      vecPayments()
-{}
+    CSuperblock() :
+    nGovObjHash(),
+    nBlockHeight(0),
+    nStatus(SEEN_OBJECT_UNKNOWN),
+    vecPayments()
+{
+}
 
 CSuperblock::
-CSuperblock(uint256& nHash)
-    : nGovObjHash(nHash),
-      nBlockHeight(0),
-      nStatus(SEEN_OBJECT_UNKNOWN),
-      vecPayments()
+    CSuperblock(uint256& nHash) :
+    nGovObjHash(nHash),
+    nBlockHeight(0),
+    nStatus(SEEN_OBJECT_UNKNOWN),
+    vecPayments()
 {
-    DBG( std::cout << "CSuperblock Constructor Start" << std::endl; );
+    DBG(std::cout << "CSuperblock Constructor Start" << std::endl;);
 
     CGovernanceObject* pGovObj = GetGovernanceObject();
 
-    if(!pGovObj) {
-        DBG( std::cout << "CSuperblock Constructor pGovObjIn is NULL, returning" << std::endl; );
+    if (!pGovObj) {
+        DBG(std::cout << "CSuperblock Constructor pGovObjIn is NULL, returning" << std::endl;);
         throw std::runtime_error("CSuperblock: Failed to find Governance Object");
     }
 
-    DBG( std::cout << "CSuperblock Constructor pGovObj : "
-         << pGovObj->GetDataAsPlainString()
-         << ", nObjectType = " << pGovObj->GetObjectType()
-         << std::endl; );
+    DBG(std::cout << "CSuperblock Constructor pGovObj : "
+                  << pGovObj->GetDataAsPlainString()
+                  << ", nObjectType = " << pGovObj->GetObjectType()
+                  << std::endl;);
 
     if (pGovObj->GetObjectType() != GOVERNANCE_OBJECT_TRIGGER) {
-        DBG( std::cout << "CSuperblock Constructor pGovObj not a trigger, returning" << std::endl; );
+        DBG(std::cout << "CSuperblock Constructor pGovObj not a trigger, returning" << std::endl;);
         throw std::runtime_error("CSuperblock: Governance Object not a trigger");
     }
 
@@ -499,9 +494,9 @@ CSuperblock(uint256& nHash)
     ParsePaymentSchedule(strAddresses, strAmounts);
 
     LogPrint("gobject", "CSuperblock -- nBlockHeight = %d, strAddresses = %s, strAmounts = %s, vecPayments.size() = %d\n",
-             nBlockHeight, strAddresses, strAmounts, vecPayments.size());
+        nBlockHeight, strAddresses, strAmounts, vecPayments.size());
 
-    DBG( std::cout << "CSuperblock Constructor End" << std::endl; );
+    DBG(std::cout << "CSuperblock Constructor End" << std::endl;);
 }
 
 /**
@@ -514,7 +509,7 @@ bool CSuperblock::IsValidBlockHeight(int nBlockHeight)
 {
     // SUPERBLOCKS CAN HAPPEN ONLY after hardfork and only ONCE PER CYCLE
     return nBlockHeight >= Params().GetConsensus().nSuperblockStartBlock &&
-            ((nBlockHeight % Params().GetConsensus().nSuperblockCycle) == 0);
+           ((nBlockHeight % Params().GetConsensus().nSuperblockCycle) == 0);
 }
 
 void CSuperblock::GetNearestSuperblocksHeights(int nBlockHeight, int& nLastSuperblockRet, int& nNextSuperblockRet)
@@ -527,7 +522,7 @@ void CSuperblock::GetNearestSuperblocksHeights(int nBlockHeight, int& nLastSuper
     int nFirstSuperblockOffset = (nSuperblockCycle - nSuperblockStartBlock % nSuperblockCycle) % nSuperblockCycle;
     int nFirstSuperblock = nSuperblockStartBlock + nFirstSuperblockOffset;
 
-    if(nBlockHeight < nFirstSuperblock) {
+    if (nBlockHeight < nFirstSuperblock) {
         nLastSuperblockRet = 0;
         nNextSuperblockRet = nFirstSuperblock;
     } else {
@@ -540,7 +535,7 @@ CAmount CSuperblock::GetPaymentsLimit(int nBlockHeight)
 {
     const Consensus::Params& consensusParams = Params().GetConsensus();
 
-    if(!IsValidBlockHeight(nBlockHeight)) {
+    if (!IsValidBlockHeight(nBlockHeight)) {
         return 0;
     }
 
@@ -585,13 +580,13 @@ void CSuperblock::ParsePaymentSchedule(const std::string& strPaymentAddresses, c
       AMOUNTS = [AMOUNT1|2|3|4|5|6]
     */
 
-    DBG( std::cout << "CSuperblock::ParsePaymentSchedule vecParsed1.size() = " << vecParsed1.size() << std::endl; );
+    DBG(std::cout << "CSuperblock::ParsePaymentSchedule vecParsed1.size() = " << vecParsed1.size() << std::endl;);
 
     for (int i = 0; i < (int)vecParsed1.size(); i++) {
         CBitcoinAddress address(vecParsed1[i]);
         if (!address.IsValid()) {
             std::ostringstream ostr;
-            ostr << "CSuperblock::ParsePaymentSchedule -- Invalid Dash Address : " <<  vecParsed1[i];
+            ostr << "CSuperblock::ParsePaymentSchedule -- Invalid Dash Address : " << vecParsed1[i];
             LogPrintf("%s\n", ostr.str());
             throw std::runtime_error(ostr.str());
         }
@@ -601,29 +596,28 @@ void CSuperblock::ParsePaymentSchedule(const std::string& strPaymentAddresses, c
             - There might be an issue with multisig in the coinbase on mainnet, we will add support for it in a future release.
             - Post 12.3+ (test multisig coinbase transaction)
         */
-        if(address.IsScript()) {
+        if (address.IsScript()) {
             std::ostringstream ostr;
-            ostr << "CSuperblock::ParsePaymentSchedule -- Script addresses are not supported yet : " <<  vecParsed1[i];
+            ostr << "CSuperblock::ParsePaymentSchedule -- Script addresses are not supported yet : " << vecParsed1[i];
             LogPrintf("%s\n", ostr.str());
             throw std::runtime_error(ostr.str());
         }
 
-        DBG( std::cout << "CSuperblock::ParsePaymentSchedule i = " << i
-             <<  ", vecParsed2[i] = " << vecParsed2[i]
-             << std::endl; );
+        DBG(std::cout << "CSuperblock::ParsePaymentSchedule i = " << i
+                      << ", vecParsed2[i] = " << vecParsed2[i]
+                      << std::endl;);
 
         CAmount nAmount = ParsePaymentAmount(vecParsed2[i]);
 
-        DBG( std::cout << "CSuperblock::ParsePaymentSchedule: "
-             << "amount string = " << vecParsed2[i]
-             << ", nAmount = " << nAmount
-             << std::endl; );
+        DBG(std::cout << "CSuperblock::ParsePaymentSchedule: "
+                      << "amount string = " << vecParsed2[i]
+                      << ", nAmount = " << nAmount
+                      << std::endl;);
 
         CGovernancePayment payment(address, nAmount);
-        if(payment.IsValid()) {
+        if (payment.IsValid()) {
             vecPayments.push_back(payment);
-        }
-        else {
+        } else {
             vecPayments.clear();
             std::ostringstream ostr;
             ostr << "CSuperblock::ParsePaymentSchedule -- Invalid payment found: address = " << address.ToString()
@@ -636,7 +630,7 @@ void CSuperblock::ParsePaymentSchedule(const std::string& strPaymentAddresses, c
 
 bool CSuperblock::GetPayment(int nPaymentIndex, CGovernancePayment& paymentRet)
 {
-    if((nPaymentIndex<0) || (nPaymentIndex >= (int)vecPayments.size())) {
+    if ((nPaymentIndex < 0) || (nPaymentIndex >= (int)vecPayments.size())) {
         return false;
     }
 
@@ -649,7 +643,7 @@ CAmount CSuperblock::GetPaymentsTotalAmount()
     CAmount nPaymentsTotalAmount = 0;
     int nPayments = CountPayments();
 
-    for(int i = 0; i < nPayments; i++) {
+    for (int i = 0; i < nPayments; i++) {
         nPaymentsTotalAmount += vecPayments[i].nAmount;
     }
 
@@ -669,7 +663,7 @@ bool CSuperblock::IsValid(const CTransaction& txNew, int nBlockHeight, CAmount b
     // internal to *this and since CSuperblock's are accessed only through
     // shared pointers there's no way our object can get deleted while this
     // code is running.
-    if(!IsValidBlockHeight(nBlockHeight)) {
+    if (!IsValidBlockHeight(nBlockHeight)) {
         LogPrintf("CSuperblock::IsValid -- ERROR: Block invalid, incorrect block height\n");
         return false;
     }
@@ -683,12 +677,12 @@ bool CSuperblock::IsValid(const CTransaction& txNew, int nBlockHeight, CAmount b
     int nMinerAndMasternodePayments = nOutputs - nPayments;
 
     LogPrint("gobject", "CSuperblock::IsValid nOutputs = %d, nPayments = %d, GetDataAsHexString = %s\n",
-             nOutputs, nPayments, GetGovernanceObject()->GetDataAsHexString());
+        nOutputs, nPayments, GetGovernanceObject()->GetDataAsHexString());
 
     // We require an exact match (including order) between the expected
     // superblock payments and the payments actually in the block.
 
-    if(nMinerAndMasternodePayments < 0) {
+    if (nMinerAndMasternodePayments < 0) {
         // This means the block cannot have all the superblock payments
         // so it is not valid.
         // TODO: could that be that we just hit coinbase size limit?
@@ -699,22 +693,22 @@ bool CSuperblock::IsValid(const CTransaction& txNew, int nBlockHeight, CAmount b
     // payments should not exceed limit
     CAmount nPaymentsTotalAmount = GetPaymentsTotalAmount();
     CAmount nPaymentsLimit = GetPaymentsLimit(nBlockHeight);
-    if(nPaymentsTotalAmount > nPaymentsLimit) {
+    if (nPaymentsTotalAmount > nPaymentsLimit) {
         LogPrintf("CSuperblock::IsValid -- ERROR: Block invalid, payments limit exceeded: payments %lld, limit %lld\n", nPaymentsTotalAmount, nPaymentsLimit);
         return false;
     }
 
     // miner and masternodes should not get more than they would usually get
     CAmount nBlockValue = txNew.GetValueOut();
-    if(nBlockValue > blockReward + nPaymentsTotalAmount) {
+    if (nBlockValue > blockReward + nPaymentsTotalAmount) {
         LogPrintf("CSuperblock::IsValid -- ERROR: Block invalid, block value limit exceeded: block %lld, limit %lld\n", nBlockValue, blockReward + nPaymentsTotalAmount);
         return false;
     }
 
     int nVoutIndex = 0;
-    for(int i = 0; i < nPayments; i++) {
+    for (int i = 0; i < nPayments; i++) {
         CGovernancePayment payment;
-        if(!GetPayment(i, payment)) {
+        if (!GetPayment(i, payment)) {
             // This shouldn't happen so log a warning
             LogPrintf("CSuperblock::IsValid -- WARNING: Failed to find payment: %d of %d total payments\n", i, nPayments);
             continue;
@@ -733,7 +727,7 @@ bool CSuperblock::IsValid(const CTransaction& txNew, int nBlockHeight, CAmount b
             }
         }
 
-        if(!fPaymentMatch) {
+        if (!fPaymentMatch) {
             // Superblock payment not found!
 
             CTxDestination address1;
@@ -755,26 +749,26 @@ bool CSuperblock::IsExpired()
     // Executed triggers are kept for another superblock cycle (approximately 1 month),
     // other valid triggers are kept for ~1 day only, everything else is pruned after ~1h.
     switch (nStatus) {
-        case SEEN_OBJECT_EXECUTED:
-            nExpirationBlocks = Params().GetConsensus().nSuperblockCycle;
-            break;
-        case SEEN_OBJECT_IS_VALID:
-            nExpirationBlocks = 576;
-            break;
-        default:
-            nExpirationBlocks = 24;
-            break;
+    case SEEN_OBJECT_EXECUTED:
+        nExpirationBlocks = Params().GetConsensus().nSuperblockCycle;
+        break;
+    case SEEN_OBJECT_IS_VALID:
+        nExpirationBlocks = 576;
+        break;
+    default:
+        nExpirationBlocks = 24;
+        break;
     }
 
     int nExpirationBlock = nBlockHeight + nExpirationBlocks;
 
     LogPrint("gobject", "CSuperblock::IsExpired -- nBlockHeight = %d, nExpirationBlock = %d\n", nBlockHeight, nExpirationBlock);
 
-    if(governance.GetCachedBlockHeight() > nExpirationBlock) {
+    if (governance.GetCachedBlockHeight() > nExpirationBlock) {
         LogPrint("gobject", "CSuperblock::IsExpired -- Outdated trigger found\n");
         fExpired = true;
         CGovernanceObject* pgovobj = GetGovernanceObject();
-        if(pgovobj) {
+        if (pgovobj) {
             LogPrint("gobject", "CSuperblock::IsExpired -- Expiring outdated object: %s\n", pgovobj->GetHash().ToString());
             pgovobj->fExpired = true;
             pgovobj->nDeletionTime = GetAdjustedTime();
@@ -798,16 +792,16 @@ std::string CSuperblockManager::GetRequiredPaymentsString(int nBlockHeight)
     // GET BEST SUPERBLOCK
 
     CSuperblock_sptr pSuperblock;
-    if(!GetBestSuperblock(pSuperblock, nBlockHeight)) {
+    if (!GetBestSuperblock(pSuperblock, nBlockHeight)) {
         LogPrint("gobject", "CSuperblockManager::GetRequiredPaymentsString -- Can't find superblock for height %d\n", nBlockHeight);
         return "error";
     }
 
     // LOOP THROUGH SUPERBLOCK PAYMENTS, CONFIGURE OUTPUT STRING
 
-    for(int i = 0; i < pSuperblock->CountPayments(); i++) {
+    for (int i = 0; i < pSuperblock->CountPayments(); i++) {
         CGovernancePayment payment;
-        if(pSuperblock->GetPayment(i, payment)) {
+        if (pSuperblock->GetPayment(i, payment)) {
             // PRINT NICE LOG OUTPUT FOR SUPERBLOCK PAYMENT
 
             CTxDestination address1;
@@ -816,10 +810,9 @@ std::string CSuperblockManager::GetRequiredPaymentsString(int nBlockHeight)
 
             // RETURN NICE OUTPUT FOR CONSOLE
 
-            if(ret != "Unknown") {
+            if (ret != "Unknown") {
                 ret += ", " + address2.ToString();
-            }
-            else {
+            } else {
                 ret = address2.ToString();
             }
         }
diff --git a/src/governance-classes.h b/src/governance-classes.h
index 6584f56c433d..2e0946bea62c 100644
--- a/src/governance-classes.h
+++ b/src/governance-classes.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2017 The Dash Core developers
+// Copyright (c) 2014-2018 The Dash Core developers
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 #ifndef GOVERNANCE_CLASSES_H
@@ -44,7 +44,8 @@ class CGovernanceTriggerManager
     void CleanAndRemove();
 
 public:
-    CGovernanceTriggerManager() : mapTrigger() {}
+    CGovernanceTriggerManager() :
+        mapTrigger() {}
 };
 
 /**
@@ -59,7 +60,6 @@ class CSuperblockManager
     static bool GetBestSuperblock(CSuperblock_sptr& pSuperblockRet, int nBlockHeight);
 
 public:
-
     static bool IsSuperblockTriggered(int nBlockHeight);
 
     static bool GetSuperblockPayments(int nBlockHeight, std::vector<CTxOut>& voutSuperblockRet);
@@ -83,33 +83,29 @@ class CGovernancePayment
     CScript script;
     CAmount nAmount;
 
-    CGovernancePayment()
-        :fValid(false),
-         script(),
-         nAmount(0)
-    {}
+    CGovernancePayment() :
+        fValid(false),
+        script(),
+        nAmount(0)
+    {
+    }
 
-    CGovernancePayment(CBitcoinAddress addrIn, CAmount nAmountIn)
-        :fValid(false),
-         script(),
-         nAmount(0)
+    CGovernancePayment(CBitcoinAddress addrIn, CAmount nAmountIn) :
+        fValid(false),
+        script(),
+        nAmount(0)
     {
-        try
-        {
+        try {
             CTxDestination dest = addrIn.Get();
             script = GetScriptForDestination(dest);
             nAmount = nAmountIn;
             fValid = true;
-        }
-        catch(std::exception& e)
-        {
+        } catch (std::exception& e) {
             LogPrintf("CGovernancePayment Payment not valid: addrIn = %s, nAmountIn = %d, what = %s\n",
-                     addrIn.ToString(), nAmountIn, e.what());
-        }
-        catch(...)
-        {
+                addrIn.ToString(), nAmountIn, e.what());
+        } catch (...) {
             LogPrintf("CGovernancePayment Payment not valid: addrIn = %s, nAmountIn = %d\n",
-                      addrIn.ToString(), nAmountIn);
+                addrIn.ToString(), nAmountIn);
         }
     }
 
@@ -146,7 +142,6 @@ class CSuperblock : public CGovernanceObject
     void ParsePaymentSchedule(const std::string& strPaymentAddresses, const std::string& strPaymentAmounts);
 
 public:
-
     CSuperblock();
     CSuperblock(uint256& nHash);
 
diff --git a/src/governance-exceptions.h b/src/governance-exceptions.h
index 6df354f71133..100c4e4942dd 100644
--- a/src/governance-exceptions.h
+++ b/src/governance-exceptions.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2017 The Dash Core developers
+// Copyright (c) 2014-2018 The Dash Core developers
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
@@ -25,7 +25,7 @@ enum governance_exception_type_enum_t {
 
 inline std::ostream& operator<<(std::ostream& os, governance_exception_type_enum_t eType)
 {
-    switch(eType) {
+    switch (eType) {
     case GOVERNANCE_EXCEPTION_NONE:
         os << "GOVERNANCE_EXCEPTION_NONE";
         break;
@@ -63,11 +63,11 @@ class CGovernanceException : public std::exception
 
 public:
     CGovernanceException(const std::string& strMessageIn = "",
-                         governance_exception_type_enum_t eTypeIn = GOVERNANCE_EXCEPTION_NONE,
-                         int nNodePenaltyIn = 0)
-        : strMessage(),
-          eType(eTypeIn),
-          nNodePenalty(nNodePenaltyIn)
+        governance_exception_type_enum_t eTypeIn = GOVERNANCE_EXCEPTION_NONE,
+        int nNodePenaltyIn = 0) :
+        strMessage(),
+        eType(eTypeIn),
+        nNodePenalty(nNodePenaltyIn)
     {
         std::ostringstream ostr;
         ostr << eType << ":" << strMessageIn;
@@ -76,7 +76,7 @@ class CGovernanceException : public std::exception
 
     virtual ~CGovernanceException() throw() {}
 
-    virtual const char* what() const throw() override 
+    virtual const char* what() const throw() override
     {
         return strMessage.c_str();
     }
@@ -91,7 +91,8 @@ class CGovernanceException : public std::exception
         return eType;
     }
 
-    int GetNodePenalty() const {
+    int GetNodePenalty() const
+    {
         return nNodePenalty;
     }
 };
diff --git a/src/governance-object.cpp b/src/governance-object.cpp
index 0fd2d876b00b..839352efa681 100644
--- a/src/governance-object.cpp
+++ b/src/governance-object.cpp
@@ -1,23 +1,23 @@
-// Copyright (c) 2014-2017 The Dash Core developers
+// Copyright (c) 2014-2018 The Dash Core developers
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
+#include "governance-object.h"
 #include "core_io.h"
-#include "governance.h"
 #include "governance-classes.h"
-#include "governance-object.h"
-#include "governance-vote.h"
 #include "governance-validators.h"
+#include "governance-vote.h"
+#include "governance.h"
 #include "instantx.h"
 #include "masternode-sync.h"
 #include "masternodeman.h"
 #include "messagesigner.h"
 #include "util.h"
 
-#include <univalue.h>
 #include <string>
+#include <univalue.h>
 
-CGovernanceObject::CGovernanceObject():
+CGovernanceObject::CGovernanceObject() :
     cs(),
     nObjectType(GOVERNANCE_OBJECT_UNKNOWN),
     nHashParent(),
@@ -45,7 +45,7 @@ CGovernanceObject::CGovernanceObject():
     LoadData();
 }
 
-CGovernanceObject::CGovernanceObject(const uint256& nHashParentIn, int nRevisionIn, int64_t nTimeIn, const uint256& nCollateralHashIn, const std::string& strDataHexIn):
+CGovernanceObject::CGovernanceObject(const uint256& nHashParentIn, int nRevisionIn, int64_t nTimeIn, const uint256& nCollateralHashIn, const std::string& strDataHexIn) :
     cs(),
     nObjectType(GOVERNANCE_OBJECT_UNKNOWN),
     nHashParent(nHashParentIn),
@@ -73,7 +73,7 @@ CGovernanceObject::CGovernanceObject(const uint256& nHashParentIn, int nRevision
     LoadData();
 }
 
-CGovernanceObject::CGovernanceObject(const CGovernanceObject& other):
+CGovernanceObject::CGovernanceObject(const CGovernanceObject& other) :
     cs(),
     nObjectType(other.nObjectType),
     nHashParent(other.nHashParent),
@@ -96,12 +96,13 @@ CGovernanceObject::CGovernanceObject(const CGovernanceObject& other):
     mapCurrentMNVotes(other.mapCurrentMNVotes),
     cmmapOrphanVotes(other.cmmapOrphanVotes),
     fileVotes(other.fileVotes)
-{}
+{
+}
 
 bool CGovernanceObject::ProcessVote(CNode* pfrom,
-                                    const CGovernanceVote& vote,
-                                    CGovernanceException& exception,
-                                    CConnman& connman)
+    const CGovernanceVote& vote,
+    CGovernanceException& exception,
+    CConnman& connman)
 {
     LOCK(cs);
 
@@ -115,17 +116,16 @@ bool CGovernanceObject::ProcessVote(CNode* pfrom,
         return false;
     }
 
-    if(!mnodeman.Has(vote.GetMasternodeOutpoint())) {
+    if (!mnodeman.Has(vote.GetMasternodeOutpoint())) {
         std::ostringstream ostr;
         ostr << "CGovernanceObject::ProcessVote -- Masternode " << vote.GetMasternodeOutpoint().ToStringShort() << " not found";
         exception = CGovernanceException(ostr.str(), GOVERNANCE_EXCEPTION_WARNING);
-        if(cmmapOrphanVotes.Insert(vote.GetMasternodeOutpoint(), vote_time_pair_t(vote, GetAdjustedTime() + GOVERNANCE_ORPHAN_EXPIRATION_TIME))) {
-            if(pfrom) {
+        if (cmmapOrphanVotes.Insert(vote.GetMasternodeOutpoint(), vote_time_pair_t(vote, GetAdjustedTime() + GOVERNANCE_ORPHAN_EXPIRATION_TIME))) {
+            if (pfrom) {
                 mnodeman.AskForMN(pfrom, vote.GetMasternodeOutpoint(), connman);
             }
             LogPrintf("%s\n", ostr.str());
-        }
-        else {
+        } else {
             LogPrint("gobject", "%s\n", ostr.str());
         }
         return false;
@@ -134,14 +134,14 @@ bool CGovernanceObject::ProcessVote(CNode* pfrom,
     vote_m_it it = mapCurrentMNVotes.emplace(vote_m_t::value_type(vote.GetMasternodeOutpoint(), vote_rec_t())).first;
     vote_rec_t& voteRecordRef = it->second;
     vote_signal_enum_t eSignal = vote.GetSignal();
-    if(eSignal == VOTE_SIGNAL_NONE) {
+    if (eSignal == VOTE_SIGNAL_NONE) {
         std::ostringstream ostr;
         ostr << "CGovernanceObject::ProcessVote -- Vote signal: none";
         LogPrint("gobject", "%s\n", ostr.str());
         exception = CGovernanceException(ostr.str(), GOVERNANCE_EXCEPTION_WARNING);
         return false;
     }
-    if(eSignal > MAX_SUPPORTED_VOTE_SIGNAL) {
+    if (eSignal > MAX_SUPPORTED_VOTE_SIGNAL) {
         std::ostringstream ostr;
         ostr << "CGovernanceObject::ProcessVote -- Unsupported vote signal: " << CGovernanceVoting::ConvertSignalToString(vote.GetSignal());
         LogPrintf("%s\n", ostr.str());
@@ -152,7 +152,7 @@ bool CGovernanceObject::ProcessVote(CNode* pfrom,
     vote_instance_t& voteInstanceRef = it2->second;
 
     // Reject obsolete votes
-    if(vote.GetTimestamp() < voteInstanceRef.nCreationTime) {
+    if (vote.GetTimestamp() < voteInstanceRef.nCreationTime) {
         std::ostringstream ostr;
         ostr << "CGovernanceObject::ProcessVote -- Obsolete vote";
         LogPrint("gobject", "%s\n", ostr.str());
@@ -162,9 +162,9 @@ bool CGovernanceObject::ProcessVote(CNode* pfrom,
 
     int64_t nNow = GetAdjustedTime();
     int64_t nVoteTimeUpdate = voteInstanceRef.nTime;
-    if(governance.AreRateChecksEnabled()) {
+    if (governance.AreRateChecksEnabled()) {
         int64_t nTimeDelta = nNow - voteInstanceRef.nTime;
-        if(nTimeDelta < GOVERNANCE_UPDATE_MIN) {
+        if (nTimeDelta < GOVERNANCE_UPDATE_MIN) {
             std::ostringstream ostr;
             ostr << "CGovernanceObject::ProcessVote -- Masternode voting too often"
                  << ", MN outpoint = " << vote.GetMasternodeOutpoint().ToStringShort()
@@ -180,19 +180,19 @@ bool CGovernanceObject::ProcessVote(CNode* pfrom,
     bool onlyOwnerAllowed = nObjectType == GOVERNANCE_OBJECT_PROPOSAL;
 
     // Finally check that the vote is actually valid (done last because of cost of signature verification)
-    if(!vote.IsValid(onlyOwnerAllowed)) {
+    if (!vote.IsValid(onlyOwnerAllowed)) {
         std::ostringstream ostr;
         ostr << "CGovernanceObject::ProcessVote -- Invalid vote"
-                << ", MN outpoint = " << vote.GetMasternodeOutpoint().ToStringShort()
-                << ", governance object hash = " << GetHash().ToString()
-                << ", vote hash = " << vote.GetHash().ToString();
+             << ", MN outpoint = " << vote.GetMasternodeOutpoint().ToStringShort()
+             << ", governance object hash = " << GetHash().ToString()
+             << ", vote hash = " << vote.GetHash().ToString();
         LogPrintf("%s\n", ostr.str());
         exception = CGovernanceException(ostr.str(), GOVERNANCE_EXCEPTION_PERMANENT_ERROR, 20);
         governance.AddInvalidVote(vote);
         return false;
     }
 
-    if(!mnodeman.AddGovernanceVote(vote.GetMasternodeOutpoint(), vote.GetParentHash())) {
+    if (!mnodeman.AddGovernanceVote(vote.GetMasternodeOutpoint(), vote.GetParentHash())) {
         std::ostringstream ostr;
         ostr << "CGovernanceObject::ProcessVote -- Unable to add governance vote"
              << ", MN outpoint = " << vote.GetMasternodeOutpoint().ToStringShort()
@@ -213,12 +213,11 @@ void CGovernanceObject::ClearMasternodeVotes()
     LOCK(cs);
 
     vote_m_it it = mapCurrentMNVotes.begin();
-    while(it != mapCurrentMNVotes.end()) {
-        if(!mnodeman.Has(it->first)) {
+    while (it != mapCurrentMNVotes.end()) {
+        if (!mnodeman.Has(it->first)) {
             fileVotes.RemoveVotesFromMasternode(it->first);
             mapCurrentMNVotes.erase(it++);
-        }
-        else {
+        } else {
             ++it;
         }
     }
@@ -228,11 +227,11 @@ std::string CGovernanceObject::GetSignatureMessage() const
 {
     LOCK(cs);
     std::string strMessage = nHashParent.ToString() + "|" +
-        std::to_string(nRevision) + "|" +
-        std::to_string(nTime) + "|" +
-        GetDataAsHexString() + "|" +
-        masternodeOutpoint.ToStringShort() + "|" +
-        nCollateralHash.ToString();
+                             std::to_string(nRevision) + "|" +
+                             std::to_string(nTime) + "|" +
+                             GetDataAsHexString() + "|" +
+                             masternodeOutpoint.ToStringShort() + "|" +
+                             nCollateralHash.ToString();
 
     return strMessage;
 }
@@ -252,7 +251,7 @@ uint256 CGovernanceObject::GetHash() const
     ss << vchSig;
     // fee_tx is left out on purpose
 
-    DBG( printf("CGovernanceObject::GetHash %i %li %s\n", nRevision, nTime, GetDataAsHexString().c_str()); );
+    DBG(printf("CGovernanceObject::GetHash %i %li %s\n", nRevision, nTime, GetDataAsHexString().c_str()););
 
     return ss.GetHash();
 }
@@ -290,14 +289,14 @@ bool CGovernanceObject::Sign(const CKey& key, const CKeyID& keyID)
             return false;
         }
 
-        if(!CMessageSigner::VerifyMessage(keyID, vchSig, strMessage, strError)) {
+        if (!CMessageSigner::VerifyMessage(keyID, vchSig, strMessage, strError)) {
             LogPrintf("CGovernanceObject::Sign -- VerifyMessage() failed, error: %s\n", strError);
             return false;
         }
     }
 
     LogPrint("gobject", "CGovernanceObject::Sign -- pubkey id = %s, masternode = %s\n",
-             keyID.ToString(), masternodeOutpoint.ToStringShort());
+        keyID.ToString(), masternodeOutpoint.ToStringShort());
 
     return true;
 }
@@ -313,7 +312,7 @@ bool CGovernanceObject::CheckSignature(const CKeyID& keyID) const
             // could be an old object
             std::string strMessage = GetSignatureMessage();
 
-            if(!CMessageSigner::VerifyMessage(keyID, vchSig, strMessage, strError)) {
+            if (!CMessageSigner::VerifyMessage(keyID, vchSig, strMessage, strError)) {
                 // nope, not in old format either
                 LogPrintf("CGovernance::CheckSignature -- VerifyMessage() failed, error: %s\n", strError);
                 return false;
@@ -339,7 +338,7 @@ bool CGovernanceObject::CheckSignature(const CKeyID& keyID) const
 UniValue CGovernanceObject::GetJSONObject()
 {
     UniValue obj(UniValue::VOBJ);
-    if(vchData.empty()) {
+    if (vchData.empty()) {
         return obj;
     }
 
@@ -350,8 +349,8 @@ UniValue CGovernanceObject::GetJSONObject()
         obj = objResult;
     } else {
         std::vector<UniValue> arr1 = objResult.getValues();
-        std::vector<UniValue> arr2 = arr1.at( 0 ).getValues();
-        obj = arr2.at( 1 );
+        std::vector<UniValue> arr2 = arr1.at(0).getValues();
+        obj = arr2.at(1);
     }
 
     return obj;
@@ -370,36 +369,34 @@ void CGovernanceObject::LoadData()
     // todo : 12.1 - resolved
     //return;
 
-    if(vchData.empty()) {
+    if (vchData.empty()) {
         return;
     }
 
-    try  {
+    try {
         // ATTEMPT TO LOAD JSON STRING FROM VCHDATA
         UniValue objResult(UniValue::VOBJ);
         GetData(objResult);
 
-        DBG( std::cout << "CGovernanceObject::LoadData GetDataAsPlainString = "
-             << GetDataAsPlainString()
-             << std::endl; );
+        DBG(std::cout << "CGovernanceObject::LoadData GetDataAsPlainString = "
+                      << GetDataAsPlainString()
+                      << std::endl;);
 
         UniValue obj = GetJSONObject();
         nObjectType = obj["type"].get_int();
-    }
-    catch(std::exception& e) {
+    } catch (std::exception& e) {
         fUnparsable = true;
         std::ostringstream ostr;
         ostr << "CGovernanceObject::LoadData Error parsing JSON"
              << ", e.what() = " << e.what();
-        DBG( std::cout << ostr.str() << std::endl; );
+        DBG(std::cout << ostr.str() << std::endl;);
         LogPrintf("%s\n", ostr.str());
         return;
-    }
-    catch(...) {
+    } catch (...) {
         fUnparsable = true;
         std::ostringstream ostr;
         ostr << "CGovernanceObject::LoadData Unknown Error parsing JSON";
-        DBG( std::cout << ostr.str() << std::endl; );
+        DBG(std::cout << ostr.str() << std::endl;);
         LogPrintf("%s\n", ostr.str());
         return;
     }
@@ -463,77 +460,80 @@ bool CGovernanceObject::IsValidLocally(std::string& strError, bool& fMissingMast
         return false;
     }
 
-    switch(nObjectType) {
-        case GOVERNANCE_OBJECT_WATCHDOG: {
-            // watchdogs are deprecated
+    switch (nObjectType) {
+    case GOVERNANCE_OBJECT_WATCHDOG: {
+        // watchdogs are deprecated
+        return false;
+    }
+    case GOVERNANCE_OBJECT_PROPOSAL: {
+        CProposalValidator validator(GetDataAsHexString());
+        // Note: It's ok to have expired proposals
+        // they are going to be cleared by CGovernanceManager::UpdateCachesAndClean()
+        // TODO: should they be tagged as "expired" to skip vote downloading?
+        if (!validator.Validate(false)) {
+            strError = strprintf("Invalid proposal data, error messages: %s", validator.GetErrorMessages());
             return false;
         }
-        case GOVERNANCE_OBJECT_PROPOSAL: {
-            CProposalValidator validator(GetDataAsHexString());
-            // Note: It's ok to have expired proposals
-            // they are going to be cleared by CGovernanceManager::UpdateCachesAndClean()
-            // TODO: should they be tagged as "expired" to skip vote downloading?
-            if (!validator.Validate(false)) {
-                strError = strprintf("Invalid proposal data, error messages: %s", validator.GetErrorMessages());
-                return false;
-            }
-            if (fCheckCollateral && !IsCollateralValid(strError, fMissingConfirmations)) {
-                strError = "Invalid proposal collateral";
-                return false;
-            }
+        if (fCheckCollateral && !IsCollateralValid(strError, fMissingConfirmations)) {
+            strError = "Invalid proposal collateral";
+            return false;
+        }
+        return true;
+    }
+    case GOVERNANCE_OBJECT_TRIGGER: {
+        if (!fCheckCollateral) {
+            // nothing else we can check here (yet?)
             return true;
         }
-        case GOVERNANCE_OBJECT_TRIGGER: {
-            if (!fCheckCollateral)
-                // nothing else we can check here (yet?)
-                return true;
-
-            std::string strOutpoint = masternodeOutpoint.ToStringShort();
-            masternode_info_t infoMn;
-            if (!mnodeman.GetMasternodeInfo(masternodeOutpoint, infoMn)) {
-
-                CMasternode::CollateralStatus err = CMasternode::CheckCollateral(masternodeOutpoint, CKeyID());
-                if (err == CMasternode::COLLATERAL_UTXO_NOT_FOUND) {
-                    strError = "Failed to find Masternode UTXO, missing masternode=" + strOutpoint + "\n";
-                } else if (err == CMasternode::COLLATERAL_UTXO_NOT_PROTX) {
-                    strError = "Masternode UTXO is not a ProTx, missing masternode=" + strOutpoint + "\n";
-                } else if (err == CMasternode::COLLATERAL_INVALID_AMOUNT) {
-                    strError = "Masternode UTXO should have 1000 DASH, missing masternode=" + strOutpoint + "\n";
-                } else if (err == CMasternode::COLLATERAL_INVALID_PUBKEY) {
-                    fMissingMasternode = true;
-                    strError = "Masternode not found: " + strOutpoint;
-                } else if (err == CMasternode::COLLATERAL_OK) {
-                    // this should never happen with CPubKey() as a param
-                    strError = "CheckCollateral critical failure! Masternode: " + strOutpoint;
-                }
-
-                return false;
-            }
 
-            // Check that we have a valid MN signature
-            if (!CheckSignature(infoMn.keyIDOperator)) {
-                strError = "Invalid masternode signature for: " + strOutpoint + ", pubkey id = " + infoMn.keyIDOperator.ToString();
-                return false;
+        std::string strOutpoint = masternodeOutpoint.ToStringShort();
+        masternode_info_t infoMn;
+        if (!mnodeman.GetMasternodeInfo(masternodeOutpoint, infoMn)) {
+            CMasternode::CollateralStatus err = CMasternode::CheckCollateral(masternodeOutpoint, CKeyID());
+            if (err == CMasternode::COLLATERAL_UTXO_NOT_FOUND) {
+                strError = "Failed to find Masternode UTXO, missing masternode=" + strOutpoint + "\n";
+            } else if (err == CMasternode::COLLATERAL_UTXO_NOT_PROTX) {
+                strError = "Masternode UTXO is not a ProTx, missing masternode=" + strOutpoint + "\n";
+            } else if (err == CMasternode::COLLATERAL_INVALID_AMOUNT) {
+                strError = "Masternode UTXO should have 1000 DASH, missing masternode=" + strOutpoint + "\n";
+            } else if (err == CMasternode::COLLATERAL_INVALID_PUBKEY) {
+                fMissingMasternode = true;
+                strError = "Masternode not found: " + strOutpoint;
+            } else if (err == CMasternode::COLLATERAL_OK) {
+                // this should never happen with CPubKey() as a param
+                strError = "CheckCollateral critical failure! Masternode: " + strOutpoint;
             }
 
-            return true;
+            return false;
         }
-        default: {
-            strError = strprintf("Invalid object type %d", nObjectType);
+
+        // Check that we have a valid MN signature
+        if (!CheckSignature(infoMn.keyIDOperator)) {
+            strError = "Invalid masternode signature for: " + strOutpoint + ", pubkey id = " + infoMn.keyIDOperator.ToString();
             return false;
         }
-    }
 
+        return true;
+    }
+    default: {
+        strError = strprintf("Invalid object type %d", nObjectType);
+        return false;
+    }
+    }
 }
 
 CAmount CGovernanceObject::GetMinCollateralFee() const
 {
     // Only 1 type has a fee for the moment but switch statement allows for future object types
-    switch(nObjectType) {
-        case GOVERNANCE_OBJECT_PROPOSAL:    return GOVERNANCE_PROPOSAL_FEE_TX;
-        case GOVERNANCE_OBJECT_TRIGGER:     return 0;
-        case GOVERNANCE_OBJECT_WATCHDOG:    return 0;
-        default:                            return MAX_MONEY;
+    switch (nObjectType) {
+    case GOVERNANCE_OBJECT_PROPOSAL:
+        return GOVERNANCE_PROPOSAL_FEE_TX;
+    case GOVERNANCE_OBJECT_TRIGGER:
+        return 0;
+    case GOVERNANCE_OBJECT_WATCHDOG:
+        return 0;
+    default:
+        return MAX_MONEY;
     }
 }
 
@@ -549,19 +549,19 @@ bool CGovernanceObject::IsCollateralValid(std::string& strError, bool& fMissingC
 
     // RETRIEVE TRANSACTION IN QUESTION
 
-    if(!GetTransaction(nCollateralHash, txCollateral, Params().GetConsensus(), nBlockHash, true)){
+    if (!GetTransaction(nCollateralHash, txCollateral, Params().GetConsensus(), nBlockHash, true)) {
         strError = strprintf("Can't find collateral tx %s", nCollateralHash.ToString());
         LogPrintf("CGovernanceObject::IsCollateralValid -- %s\n", strError);
         return false;
     }
 
-    if(nBlockHash == uint256()) {
+    if (nBlockHash == uint256()) {
         strError = strprintf("Collateral tx %s is not mined yet", txCollateral->ToString());
         LogPrintf("CGovernanceObject::IsCollateralValid -- %s\n", strError);
         return false;
     }
 
-    if(txCollateral->vout.size() < 1) {
+    if (txCollateral->vout.size() < 1) {
         strError = strprintf("tx vout size less than 1 | %d", txCollateral->vout.size());
         LogPrintf("CGovernanceObject::IsCollateralValid -- %s\n", strError);
         return false;
@@ -572,37 +572,35 @@ bool CGovernanceObject::IsCollateralValid(std::string& strError, bool& fMissingC
     CScript findScript;
     findScript << OP_RETURN << ToByteVector(nExpectedHash);
 
-    DBG( std::cout << "IsCollateralValid: txCollateral->vout.size() = " << txCollateral->vout.size() << std::endl; );
+    DBG(std::cout << "IsCollateralValid: txCollateral->vout.size() = " << txCollateral->vout.size() << std::endl;);
 
-    DBG( std::cout << "IsCollateralValid: findScript = " << ScriptToAsmStr( findScript, false ) << std::endl; );
+    DBG(std::cout << "IsCollateralValid: findScript = " << ScriptToAsmStr(findScript, false) << std::endl;);
 
-    DBG( std::cout << "IsCollateralValid: nMinFee = " << nMinFee << std::endl; );
+    DBG(std::cout << "IsCollateralValid: nMinFee = " << nMinFee << std::endl;);
 
 
     bool foundOpReturn = false;
     for (const auto& output : txCollateral->vout) {
-        DBG( std::cout << "IsCollateralValid txout : " << output.ToString()
-             << ", output.nValue = " << output.nValue
-             << ", output.scriptPubKey = " << ScriptToAsmStr( output.scriptPubKey, false )
-             << std::endl; );
-        if(!output.scriptPubKey.IsPayToPublicKeyHash() && !output.scriptPubKey.IsUnspendable()) {
+        DBG(std::cout << "IsCollateralValid txout : " << output.ToString()
+                      << ", output.nValue = " << output.nValue
+                      << ", output.scriptPubKey = " << ScriptToAsmStr(output.scriptPubKey, false)
+                      << std::endl;);
+        if (!output.scriptPubKey.IsPayToPublicKeyHash() && !output.scriptPubKey.IsUnspendable()) {
             strError = strprintf("Invalid Script %s", txCollateral->ToString());
-            LogPrintf ("CGovernanceObject::IsCollateralValid -- %s\n", strError);
+            LogPrintf("CGovernanceObject::IsCollateralValid -- %s\n", strError);
             return false;
         }
-        if(output.scriptPubKey == findScript && output.nValue >= nMinFee) {
-            DBG( std::cout << "IsCollateralValid foundOpReturn = true" << std::endl; );
+        if (output.scriptPubKey == findScript && output.nValue >= nMinFee) {
+            DBG(std::cout << "IsCollateralValid foundOpReturn = true" << std::endl;);
             foundOpReturn = true;
+        } else {
+            DBG(std::cout << "IsCollateralValid No match, continuing" << std::endl;);
         }
-        else  {
-            DBG( std::cout << "IsCollateralValid No match, continuing" << std::endl; );
-        }
-
     }
 
-    if(!foundOpReturn){
+    if (!foundOpReturn) {
         strError = strprintf("Couldn't find opReturn %s in %s", nExpectedHash.ToString(), txCollateral->ToString());
-        LogPrintf ("CGovernanceObject::IsCollateralValid -- %s\n", strError);
+        LogPrintf("CGovernanceObject::IsCollateralValid -- %s\n", strError);
         return false;
     }
 
@@ -620,8 +618,8 @@ bool CGovernanceObject::IsCollateralValid(std::string& strError, bool& fMissingC
         }
     }
 
-    if((nConfirmationsIn < GOVERNANCE_FEE_CONFIRMATIONS)  &&
-       (!instantsend.IsLockedInstantSendTransaction(nCollateralHash))){
+    if ((nConfirmationsIn < GOVERNANCE_FEE_CONFIRMATIONS) &&
+        (!instantsend.IsLockedInstantSendTransaction(nCollateralHash))) {
         strError = strprintf("Collateral requires at least %d confirmations to be relayed throughout the network (it has only %d)", GOVERNANCE_FEE_CONFIRMATIONS, nConfirmationsIn);
         if (nConfirmationsIn >= GOVERNANCE_MIN_RELAY_FEE_CONFIRMATIONS) {
             fMissingConfirmations = true;
@@ -629,7 +627,7 @@ bool CGovernanceObject::IsCollateralValid(std::string& strError, bool& fMissingC
         } else {
             strError += ", rejected -- try again later";
         }
-        LogPrintf ("CGovernanceObject::IsCollateralValid -- %s\n", strError);
+        LogPrintf("CGovernanceObject::IsCollateralValid -- %s\n", strError);
 
         return false;
     }
@@ -646,7 +644,7 @@ int CGovernanceObject::CountMatchingVotes(vote_signal_enum_t eVoteSignalIn, vote
     for (const auto& votepair : mapCurrentMNVotes) {
         const vote_rec_t& recVote = votepair.second;
         vote_instance_m_cit it2 = recVote.mapInstances.find(eVoteSignalIn);
-        if(it2 != recVote.mapInstances.end() && it2->second.eOutcome == eVoteOutcomeIn) {
+        if (it2 != recVote.mapInstances.end() && it2->second.eOutcome == eVoteOutcomeIn) {
             ++nCount;
         }
     }
@@ -691,13 +689,13 @@ bool CGovernanceObject::GetCurrentMNVotes(const COutPoint& mnCollateralOutpoint,
         return false;
     }
     voteRecord = it->second;
-    return  true;
+    return true;
 }
 
 void CGovernanceObject::Relay(CConnman& connman)
 {
     // Do not relay until fully synced
-    if(!masternodeSync.IsSynced()) {
+    if (!masternodeSync.IsSynced()) {
         LogPrint("gobject", "CGovernanceObject::Relay -- won't relay until fully synced\n");
         return;
     }
@@ -711,7 +709,7 @@ void CGovernanceObject::UpdateSentinelVariables()
     // CALCULATE MINIMUM SUPPORT LEVELS REQUIRED
 
     int nMnCount = mnodeman.CountEnabled();
-    if(nMnCount == 0) return;
+    if (nMnCount == 0) return;
 
     // CALCULATE THE MINUMUM VOTE COUNT REQUIRED FOR FULL SIGNAL
 
@@ -728,16 +726,16 @@ void CGovernanceObject::UpdateSentinelVariables()
     // SET SENTINEL FLAGS TO TRUE IF MIMIMUM SUPPORT LEVELS ARE REACHED
     // ARE ANY OF THESE FLAGS CURRENTLY ACTIVATED?
 
-    if(GetAbsoluteYesCount(VOTE_SIGNAL_FUNDING) >= nAbsVoteReq) fCachedFunding = true;
-    if((GetAbsoluteYesCount(VOTE_SIGNAL_DELETE) >= nAbsDeleteReq) && !fCachedDelete) {
+    if (GetAbsoluteYesCount(VOTE_SIGNAL_FUNDING) >= nAbsVoteReq) fCachedFunding = true;
+    if ((GetAbsoluteYesCount(VOTE_SIGNAL_DELETE) >= nAbsDeleteReq) && !fCachedDelete) {
         fCachedDelete = true;
-        if(nDeletionTime == 0) {
+        if (nDeletionTime == 0) {
             nDeletionTime = GetAdjustedTime();
         }
     }
-    if(GetAbsoluteYesCount(VOTE_SIGNAL_ENDORSED) >= nAbsVoteReq) fCachedEndorsed = true;
+    if (GetAbsoluteYesCount(VOTE_SIGNAL_ENDORSED) >= nAbsVoteReq) fCachedEndorsed = true;
 
-    if(GetAbsoluteNoCount(VOTE_SIGNAL_VALID) >= nAbsVoteReq) fCachedValid = false;
+    if (GetAbsoluteNoCount(VOTE_SIGNAL_VALID) >= nAbsVoteReq) fCachedValid = false;
 }
 
 void CGovernanceObject::CheckOrphanVotes(CConnman& connman)
@@ -745,28 +743,26 @@ void CGovernanceObject::CheckOrphanVotes(CConnman& connman)
     int64_t nNow = GetAdjustedTime();
     const vote_cmm_t::list_t& listVotes = cmmapOrphanVotes.GetItemList();
     vote_cmm_t::list_cit it = listVotes.begin();
-    while(it != listVotes.end()) {
+    while (it != listVotes.end()) {
         bool fRemove = false;
         const COutPoint& key = it->key;
         const vote_time_pair_t& pairVote = it->value;
         const CGovernanceVote& vote = pairVote.first;
-        if(pairVote.second < nNow) {
+        if (pairVote.second < nNow) {
             fRemove = true;
-        }
-        else if(!mnodeman.Has(vote.GetMasternodeOutpoint())) {
+        } else if (!mnodeman.Has(vote.GetMasternodeOutpoint())) {
             ++it;
             continue;
         }
         CGovernanceException exception;
-        if(!ProcessVote(nullptr, vote, exception, connman)) {
+        if (!ProcessVote(nullptr, vote, exception, connman)) {
             LogPrintf("CGovernanceObject::CheckOrphanVotes -- Failed to add orphan vote: %s\n", exception.what());
-        }
-        else {
+        } else {
             vote.Relay(connman);
             fRemove = true;
         }
         ++it;
-        if(fRemove) {
+        if (fRemove) {
             cmmapOrphanVotes.Erase(key, pairVote);
         }
     }
diff --git a/src/governance-object.h b/src/governance-object.h
index 20613bf0a713..58b8e8967df1 100644
--- a/src/governance-object.h
+++ b/src/governance-object.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2017 The Dash Core developers
+// Copyright (c) 2014-2018 The Dash Core developers
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
@@ -34,20 +34,20 @@ static const int GOVERNANCE_OBJECT_PROPOSAL = 1;
 static const int GOVERNANCE_OBJECT_TRIGGER = 2;
 static const int GOVERNANCE_OBJECT_WATCHDOG = 3;
 
-static const CAmount GOVERNANCE_PROPOSAL_FEE_TX = (5.0*COIN);
+static const CAmount GOVERNANCE_PROPOSAL_FEE_TX = (5.0 * COIN);
 
 static const int64_t GOVERNANCE_FEE_CONFIRMATIONS = 6;
 static const int64_t GOVERNANCE_MIN_RELAY_FEE_CONFIRMATIONS = 1;
-static const int64_t GOVERNANCE_UPDATE_MIN = 60*60;
-static const int64_t GOVERNANCE_DELETION_DELAY = 10*60;
-static const int64_t GOVERNANCE_ORPHAN_EXPIRATION_TIME = 10*60;
+static const int64_t GOVERNANCE_UPDATE_MIN = 60 * 60;
+static const int64_t GOVERNANCE_DELETION_DELAY = 10 * 60;
+static const int64_t GOVERNANCE_ORPHAN_EXPIRATION_TIME = 10 * 60;
 
 // FOR SEEN MAP ARRAYS - GOVERNANCE OBJECTS AND VOTES
 static const int SEEN_OBJECT_IS_VALID = 0;
 static const int SEEN_OBJECT_ERROR_INVALID = 1;
 static const int SEEN_OBJECT_ERROR_IMMATURE = 2;
 static const int SEEN_OBJECT_EXECUTED = 3; //used for triggers
-static const int SEEN_OBJECT_UNKNOWN = 4; // the default
+static const int SEEN_OBJECT_UNKNOWN = 4;  // the default
 
 typedef std::pair<CGovernanceVote, int64_t> vote_time_pair_t;
 
@@ -57,16 +57,16 @@ inline bool operator<(const vote_time_pair_t& p1, const vote_time_pair_t& p2)
 }
 
 struct vote_instance_t {
-
     vote_outcome_enum_t eOutcome;
     int64_t nTime;
     int64_t nCreationTime;
 
-    vote_instance_t(vote_outcome_enum_t eOutcomeIn = VOTE_OUTCOME_NONE, int64_t nTimeIn = 0, int64_t nCreationTimeIn = 0)
-        : eOutcome(eOutcomeIn),
-          nTime(nTimeIn),
-          nCreationTime(nCreationTimeIn)
-    {}
+    vote_instance_t(vote_outcome_enum_t eOutcomeIn = VOTE_OUTCOME_NONE, int64_t nTimeIn = 0, int64_t nCreationTimeIn = 0) :
+        eOutcome(eOutcomeIn),
+        nTime(nTimeIn),
+        nCreationTime(nCreationTimeIn)
+    {
+    }
 
     ADD_SERIALIZE_METHODS;
 
@@ -77,13 +77,13 @@ struct vote_instance_t {
         READWRITE(nOutcome);
         READWRITE(nTime);
         READWRITE(nCreationTime);
-        if(ser_action.ForRead()) {
+        if (ser_action.ForRead()) {
             eOutcome = vote_outcome_enum_t(nOutcome);
         }
     }
 };
 
-typedef std::map<int,vote_instance_t> vote_instance_m_t;
+typedef std::map<int, vote_instance_t> vote_instance_m_t;
 
 typedef vote_instance_m_t::iterator vote_instance_m_it;
 
@@ -94,11 +94,11 @@ struct vote_rec_t {
 
     ADD_SERIALIZE_METHODS;
 
-     template <typename Stream, typename Operation>
-     inline void SerializationOp(Stream& s, Operation ser_action)
-     {
-         READWRITE(mapInstances);
-     }
+    template <typename Stream, typename Operation>
+    inline void SerializationOp(Stream& s, Operation ser_action)
+    {
+        READWRITE(mapInstances);
+    }
 };
 
 /**
@@ -195,51 +195,63 @@ class CGovernanceObject
 
     // Public Getter methods
 
-    int64_t GetCreationTime() const {
+    int64_t GetCreationTime() const
+    {
         return nTime;
     }
 
-    int64_t GetDeletionTime() const {
+    int64_t GetDeletionTime() const
+    {
         return nDeletionTime;
     }
 
-    int GetObjectType() const {
+    int GetObjectType() const
+    {
         return nObjectType;
     }
 
-    const uint256& GetCollateralHash() const {
+    const uint256& GetCollateralHash() const
+    {
         return nCollateralHash;
     }
 
-    const COutPoint& GetMasternodeOutpoint() const {
+    const COutPoint& GetMasternodeOutpoint() const
+    {
         return masternodeOutpoint;
     }
 
-    bool IsSetCachedFunding() const {
+    bool IsSetCachedFunding() const
+    {
         return fCachedFunding;
     }
 
-    bool IsSetCachedValid() const {
+    bool IsSetCachedValid() const
+    {
         return fCachedValid;
     }
 
-    bool IsSetCachedDelete() const {
+    bool IsSetCachedDelete() const
+    {
         return fCachedDelete;
     }
 
-    bool IsSetCachedEndorsed() const {
+    bool IsSetCachedEndorsed() const
+    {
         return fCachedEndorsed;
     }
 
-    bool IsSetDirtyCache() const {
+    bool IsSetDirtyCache() const
+    {
         return fDirtyCache;
     }
 
-    bool IsSetExpired() const {
+    bool IsSetExpired() const
+    {
         return fExpired;
     }
 
-    const CGovernanceObjectVoteFile& GetVoteFile() const {
+    const CGovernanceObjectVoteFile& GetVoteFile() const
+    {
         return fileVotes;
     }
 
@@ -308,7 +320,7 @@ class CGovernanceObject
         if (!(s.GetType() & SER_GETHASH)) {
             READWRITE(vchSig);
         }
-        if(s.GetType() & SER_DISK) {
+        if (s.GetType() & SER_DISK) {
             // Only include these for the disk file format
             LogPrint("gobject", "CGovernanceObject::SerializationOp Reading/writing votes from/to disk\n");
             READWRITE(nDeletionTime);
@@ -327,15 +339,14 @@ class CGovernanceObject
     void GetData(UniValue& objResult);
 
     bool ProcessVote(CNode* pfrom,
-                     const CGovernanceVote& vote,
-                     CGovernanceException& exception,
-                     CConnman& connman);
+        const CGovernanceVote& vote,
+        CGovernanceException& exception,
+        CConnman& connman);
 
     /// Called when MN's which have voted on this object have been removed
     void ClearMasternodeVotes();
 
     void CheckOrphanVotes(CConnman& connman);
-
 };
 
 
diff --git a/src/governance-validators.cpp b/src/governance-validators.cpp
index dc70494a3f91..3e9a36a1a377 100644
--- a/src/governance-validators.cpp
+++ b/src/governance-validators.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2017 The Dash Core developers
+// Copyright (c) 2014-2018 The Dash Core developers
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
@@ -11,15 +11,15 @@
 
 #include <algorithm>
 
-const size_t MAX_DATA_SIZE  = 512;
-const size_t MAX_NAME_SIZE  = 40;
+const size_t MAX_DATA_SIZE = 512;
+const size_t MAX_NAME_SIZE = 40;
 
 CProposalValidator::CProposalValidator(const std::string& strHexData) :
     objJSON(UniValue::VOBJ),
     fJSONValid(false),
     strErrorMessages()
 {
-    if(!strHexData.empty()) {
+    if (!strHexData.empty()) {
         ParseStrHexData(strHexData);
     }
 }
@@ -36,27 +36,27 @@ void CProposalValidator::ParseStrHexData(const std::string& strHexData)
 
 bool CProposalValidator::Validate(bool fCheckExpiration)
 {
-    if(!fJSONValid) {
+    if (!fJSONValid) {
         strErrorMessages += "JSON parsing error;";
         return false;
     }
-    if(!ValidateName()) {
+    if (!ValidateName()) {
         strErrorMessages += "Invalid name;";
         return false;
     }
-    if(!ValidateStartEndEpoch(fCheckExpiration)) {
+    if (!ValidateStartEndEpoch(fCheckExpiration)) {
         strErrorMessages += "Invalid start:end range;";
         return false;
     }
-    if(!ValidatePaymentAmount()) {
+    if (!ValidatePaymentAmount()) {
         strErrorMessages += "Invalid payment amount;";
         return false;
     }
-    if(!ValidatePaymentAddress()) {
+    if (!ValidatePaymentAddress()) {
         strErrorMessages += "Invalid payment address;";
         return false;
     }
-    if(!ValidateURL()) {
+    if (!ValidateURL()) {
         strErrorMessages += "Invalid URL;";
         return false;
     }
@@ -66,12 +66,12 @@ bool CProposalValidator::Validate(bool fCheckExpiration)
 bool CProposalValidator::ValidateName()
 {
     std::string strName;
-    if(!GetDataValue("name", strName)) {
+    if (!GetDataValue("name", strName)) {
         strErrorMessages += "name field not found;";
         return false;
     }
 
-    if(strName.size() > MAX_NAME_SIZE) {
+    if (strName.size() > MAX_NAME_SIZE) {
         strErrorMessages += strprintf("name exceeds %lu characters;", MAX_NAME_SIZE);
         return false;
     }
@@ -80,7 +80,7 @@ bool CProposalValidator::ValidateName()
 
     std::transform(strName.begin(), strName.end(), strName.begin(), ::tolower);
 
-    if(strName.find_first_not_of(strAllowedChars) != std::string::npos) {
+    if (strName.find_first_not_of(strAllowedChars) != std::string::npos) {
         strErrorMessages += "name contains invalid characters;";
         return false;
     }
@@ -93,22 +93,22 @@ bool CProposalValidator::ValidateStartEndEpoch(bool fCheckExpiration)
     int64_t nStartEpoch = 0;
     int64_t nEndEpoch = 0;
 
-    if(!GetDataValue("start_epoch", nStartEpoch)) {
+    if (!GetDataValue("start_epoch", nStartEpoch)) {
         strErrorMessages += "start_epoch field not found;";
         return false;
     }
 
-    if(!GetDataValue("end_epoch", nEndEpoch)) {
+    if (!GetDataValue("end_epoch", nEndEpoch)) {
         strErrorMessages += "end_epoch field not found;";
         return false;
     }
 
-    if(nEndEpoch <= nStartEpoch) {
+    if (nEndEpoch <= nStartEpoch) {
         strErrorMessages += "end_epoch <= start_epoch;";
         return false;
     }
 
-    if(fCheckExpiration && nEndEpoch <= GetAdjustedTime()) {
+    if (fCheckExpiration && nEndEpoch <= GetAdjustedTime()) {
         strErrorMessages += "expired;";
         return false;
     }
@@ -120,12 +120,12 @@ bool CProposalValidator::ValidatePaymentAmount()
 {
     double dValue = 0.0;
 
-    if(!GetDataValue("payment_amount", dValue)) {
+    if (!GetDataValue("payment_amount", dValue)) {
         strErrorMessages += "payment_amount field not found;";
         return false;
     }
 
-    if(dValue <= 0.0) {
+    if (dValue <= 0.0) {
         strErrorMessages += "payment_amount is negative;";
         return false;
     }
@@ -141,23 +141,23 @@ bool CProposalValidator::ValidatePaymentAddress()
 {
     std::string strPaymentAddress;
 
-    if(!GetDataValue("payment_address", strPaymentAddress)) {
+    if (!GetDataValue("payment_address", strPaymentAddress)) {
         strErrorMessages += "payment_address field not found;";
         return false;
     }
 
-    if(std::find_if(strPaymentAddress.begin(), strPaymentAddress.end(), ::isspace) != strPaymentAddress.end()) {
+    if (std::find_if(strPaymentAddress.begin(), strPaymentAddress.end(), ::isspace) != strPaymentAddress.end()) {
         strErrorMessages += "payment_address can't have whitespaces;";
         return false;
     }
 
     CBitcoinAddress address(strPaymentAddress);
-    if(!address.IsValid()) {
+    if (!address.IsValid()) {
         strErrorMessages += "payment_address is invalid;";
         return false;
     }
 
-    if(address.IsScript()) {
+    if (address.IsScript()) {
         strErrorMessages += "script addresses are not supported;";
         return false;
     }
@@ -168,22 +168,22 @@ bool CProposalValidator::ValidatePaymentAddress()
 bool CProposalValidator::ValidateURL()
 {
     std::string strURL;
-    if(!GetDataValue("url", strURL)) {
+    if (!GetDataValue("url", strURL)) {
         strErrorMessages += "url field not found;";
         return false;
     }
 
-    if(std::find_if(strURL.begin(), strURL.end(), ::isspace) != strURL.end()) {
+    if (std::find_if(strURL.begin(), strURL.end(), ::isspace) != strURL.end()) {
         strErrorMessages += "url can't have whitespaces;";
         return false;
     }
 
-    if(strURL.size() < 4U) {
+    if (strURL.size() < 4U) {
         strErrorMessages += "url too short;";
         return false;
     }
 
-    if(!CheckURL(strURL)) {
+    if (!CheckURL(strURL)) {
         strErrorMessages += "url invalid;";
         return false;
     }
@@ -195,7 +195,7 @@ void CProposalValidator::ParseJSONData(const std::string& strJSONData)
 {
     fJSONValid = false;
 
-    if(strJSONData.empty()) {
+    if (strJSONData.empty()) {
         return;
     }
 
@@ -213,11 +213,9 @@ void CProposalValidator::ParseJSONData(const std::string& strJSONData)
         }
 
         fJSONValid = true;
-    }
-    catch(std::exception& e) {
+    } catch (std::exception& e) {
         strErrorMessages += std::string(e.what()) + std::string(";");
-    }
-    catch(...) {
+    } catch (...) {
         strErrorMessages += "Unknown exception;";
     }
 }
@@ -225,14 +223,12 @@ void CProposalValidator::ParseJSONData(const std::string& strJSONData)
 bool CProposalValidator::GetDataValue(const std::string& strKey, std::string& strValueRet)
 {
     bool fOK = false;
-    try  {
+    try {
         strValueRet = objJSON[strKey].get_str();
         fOK = true;
-    }
-    catch(std::exception& e) {
+    } catch (std::exception& e) {
         strErrorMessages += std::string(e.what()) + std::string(";");
-    }
-    catch(...) {
+    } catch (...) {
         strErrorMessages += "Unknown exception;";
     }
     return fOK;
@@ -241,9 +237,9 @@ bool CProposalValidator::GetDataValue(const std::string& strKey, std::string& st
 bool CProposalValidator::GetDataValue(const std::string& strKey, int64_t& nValueRet)
 {
     bool fOK = false;
-    try  {
+    try {
         const UniValue uValue = objJSON[strKey];
-        switch(uValue.getType()) {
+        switch (uValue.getType()) {
         case UniValue::VNUM:
             nValueRet = uValue.get_int64();
             fOK = true;
@@ -251,11 +247,9 @@ bool CProposalValidator::GetDataValue(const std::string& strKey, int64_t& nValue
         default:
             break;
         }
-    }
-    catch(std::exception& e) {
+    } catch (std::exception& e) {
         strErrorMessages += std::string(e.what()) + std::string(";");
-    }
-    catch(...) {
+    } catch (...) {
         strErrorMessages += "Unknown exception;";
     }
     return fOK;
@@ -264,9 +258,9 @@ bool CProposalValidator::GetDataValue(const std::string& strKey, int64_t& nValue
 bool CProposalValidator::GetDataValue(const std::string& strKey, double& dValueRet)
 {
     bool fOK = false;
-    try  {
+    try {
         const UniValue uValue = objJSON[strKey];
-        switch(uValue.getType()) {
+        switch (uValue.getType()) {
         case UniValue::VNUM:
             dValueRet = uValue.get_real();
             fOK = true;
@@ -274,11 +268,9 @@ bool CProposalValidator::GetDataValue(const std::string& strKey, double& dValueR
         default:
             break;
         }
-    }
-    catch(std::exception& e) {
+    } catch (std::exception& e) {
         strErrorMessages += std::string(e.what()) + std::string(";");
-    }
-    catch(...) {
+    } catch (...) {
         strErrorMessages += "Unknown exception;";
     }
     return fOK;
@@ -295,32 +287,31 @@ bool CProposalValidator::CheckURL(const std::string& strURLIn)
     std::string strRest(strURLIn);
     std::string::size_type nPos = strRest.find(':');
 
-    if(nPos != std::string::npos) {
+    if (nPos != std::string::npos) {
         //std::string strSchema = strRest.substr(0,nPos);
 
-        if(nPos < strRest.size()) {
+        if (nPos < strRest.size()) {
             strRest = strRest.substr(nPos + 1);
-        }
-        else {
+        } else {
             strRest = "";
         }
     }
 
     // Process netloc
-    if((strRest.size() > 2) && (strRest.substr(0,2) == "//")) {
+    if ((strRest.size() > 2) && (strRest.substr(0, 2) == "//")) {
         static const std::string strNetlocDelimiters = "/?#";
 
         strRest = strRest.substr(2);
 
         std::string::size_type nPos2 = strRest.find_first_of(strNetlocDelimiters);
 
-        std::string strNetloc = strRest.substr(0,nPos2);
+        std::string strNetloc = strRest.substr(0, nPos2);
 
-        if((strNetloc.find('[') != std::string::npos) && (strNetloc.find(']') == std::string::npos)) {
+        if ((strNetloc.find('[') != std::string::npos) && (strNetloc.find(']') == std::string::npos)) {
             return false;
         }
 
-        if((strNetloc.find(']') != std::string::npos) && (strNetloc.find('[') == std::string::npos)) {
+        if ((strNetloc.find(']') != std::string::npos) && (strNetloc.find('[') == std::string::npos)) {
             return false;
         }
     }
diff --git a/src/governance-validators.h b/src/governance-validators.h
index bcdb49fc883f..e9de02ae1079 100644
--- a/src/governance-validators.h
+++ b/src/governance-validators.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2017 The Dash Core developers
+// Copyright (c) 2014-2018 The Dash Core developers
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
@@ -12,9 +12,9 @@
 class CProposalValidator
 {
 private:
-    UniValue               objJSON;
-    bool                   fJSONValid;
-    std::string            strErrorMessages;
+    UniValue objJSON;
+    bool fJSONValid;
+    std::string strErrorMessages;
 
 public:
     CProposalValidator(const std::string& strDataHexIn = std::string());
diff --git a/src/governance-vote.cpp b/src/governance-vote.cpp
index 0dd0a382e515..9f7b523a9e82 100644
--- a/src/governance-vote.cpp
+++ b/src/governance-vote.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2017 The Dash Core developers
+// Copyright (c) 2014-2018 The Dash Core developers
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
@@ -11,16 +11,19 @@
 
 std::string CGovernanceVoting::ConvertOutcomeToString(vote_outcome_enum_t nOutcome)
 {
-    switch(nOutcome)
-    {
-        case VOTE_OUTCOME_NONE:
-            return "NONE"; break;
-        case VOTE_OUTCOME_YES:
-            return "YES"; break;
-        case VOTE_OUTCOME_NO:
-            return "NO"; break;
-        case VOTE_OUTCOME_ABSTAIN:
-            return "ABSTAIN"; break;
+    switch (nOutcome) {
+    case VOTE_OUTCOME_NONE:
+        return "NONE";
+        break;
+    case VOTE_OUTCOME_YES:
+        return "YES";
+        break;
+    case VOTE_OUTCOME_NO:
+        return "NO";
+        break;
+    case VOTE_OUTCOME_ABSTAIN:
+        return "ABSTAIN";
+        break;
     }
     return "error";
 }
@@ -28,23 +31,22 @@ std::string CGovernanceVoting::ConvertOutcomeToString(vote_outcome_enum_t nOutco
 std::string CGovernanceVoting::ConvertSignalToString(vote_signal_enum_t nSignal)
 {
     std::string strReturn = "NONE";
-    switch(nSignal)
-    {
-        case VOTE_SIGNAL_NONE:
-            strReturn = "NONE";
-            break;
-        case VOTE_SIGNAL_FUNDING:
-            strReturn = "FUNDING";
-            break;
-        case VOTE_SIGNAL_VALID:
-            strReturn = "VALID";
-            break;
-        case VOTE_SIGNAL_DELETE:
-            strReturn = "DELETE";
-            break;
-        case VOTE_SIGNAL_ENDORSED:
-            strReturn = "ENDORSED";
-            break;
+    switch (nSignal) {
+    case VOTE_SIGNAL_NONE:
+        strReturn = "NONE";
+        break;
+    case VOTE_SIGNAL_FUNDING:
+        strReturn = "FUNDING";
+        break;
+    case VOTE_SIGNAL_VALID:
+        strReturn = "VALID";
+        break;
+    case VOTE_SIGNAL_DELETE:
+        strReturn = "DELETE";
+        break;
+    case VOTE_SIGNAL_ENDORSED:
+        strReturn = "ENDORSED";
+        break;
     }
 
     return strReturn;
@@ -54,13 +56,11 @@ std::string CGovernanceVoting::ConvertSignalToString(vote_signal_enum_t nSignal)
 vote_outcome_enum_t CGovernanceVoting::ConvertVoteOutcome(const std::string& strVoteOutcome)
 {
     vote_outcome_enum_t eVote = VOTE_OUTCOME_NONE;
-    if(strVoteOutcome == "yes") {
+    if (strVoteOutcome == "yes") {
         eVote = VOTE_OUTCOME_YES;
-    }
-    else if(strVoteOutcome == "no") {
+    } else if (strVoteOutcome == "no") {
         eVote = VOTE_OUTCOME_NO;
-    }
-    else if(strVoteOutcome == "abstain") {
+    } else if (strVoteOutcome == "abstain") {
         eVote = VOTE_OUTCOME_ABSTAIN;
     }
     return eVote;
@@ -68,12 +68,11 @@ vote_outcome_enum_t CGovernanceVoting::ConvertVoteOutcome(const std::string& str
 
 vote_signal_enum_t CGovernanceVoting::ConvertVoteSignal(const std::string& strVoteSignal)
 {
-    static const std::map <std::string, vote_signal_enum_t> mapStrVoteSignals = {
-        {"funding",  VOTE_SIGNAL_FUNDING},
-        {"valid",    VOTE_SIGNAL_VALID},
-        {"delete",   VOTE_SIGNAL_DELETE},
-        {"endorsed", VOTE_SIGNAL_ENDORSED}
-    };
+    static const std::map<std::string, vote_signal_enum_t> mapStrVoteSignals = {
+        {"funding", VOTE_SIGNAL_FUNDING},
+        {"valid", VOTE_SIGNAL_VALID},
+        {"delete", VOTE_SIGNAL_DELETE},
+        {"endorsed", VOTE_SIGNAL_ENDORSED}};
 
     const auto& it = mapStrVoteSignals.find(strVoteSignal);
     if (it == mapStrVoteSignals.end()) {
@@ -83,26 +82,27 @@ vote_signal_enum_t CGovernanceVoting::ConvertVoteSignal(const std::string& strVo
     return it->second;
 }
 
-CGovernanceVote::CGovernanceVote()
-    : fValid(true),
-      fSynced(false),
-      nVoteSignal(int(VOTE_SIGNAL_NONE)),
-      masternodeOutpoint(),
-      nParentHash(),
-      nVoteOutcome(int(VOTE_OUTCOME_NONE)),
-      nTime(0),
-      vchSig()
-{}
-
-CGovernanceVote::CGovernanceVote(const COutPoint& outpointMasternodeIn, const uint256& nParentHashIn, vote_signal_enum_t eVoteSignalIn, vote_outcome_enum_t eVoteOutcomeIn)
-    : fValid(true),
-      fSynced(false),
-      nVoteSignal(eVoteSignalIn),
-      masternodeOutpoint(outpointMasternodeIn),
-      nParentHash(nParentHashIn),
-      nVoteOutcome(eVoteOutcomeIn),
-      nTime(GetAdjustedTime()),
-      vchSig()
+CGovernanceVote::CGovernanceVote() :
+    fValid(true),
+    fSynced(false),
+    nVoteSignal(int(VOTE_SIGNAL_NONE)),
+    masternodeOutpoint(),
+    nParentHash(),
+    nVoteOutcome(int(VOTE_OUTCOME_NONE)),
+    nTime(0),
+    vchSig()
+{
+}
+
+CGovernanceVote::CGovernanceVote(const COutPoint& outpointMasternodeIn, const uint256& nParentHashIn, vote_signal_enum_t eVoteSignalIn, vote_outcome_enum_t eVoteOutcomeIn) :
+    fValid(true),
+    fSynced(false),
+    nVoteSignal(eVoteSignalIn),
+    masternodeOutpoint(outpointMasternodeIn),
+    nParentHash(nParentHashIn),
+    nVoteOutcome(eVoteOutcomeIn),
+    nTime(GetAdjustedTime()),
+    vchSig()
 {
     UpdateHash();
 }
@@ -120,7 +120,7 @@ std::string CGovernanceVote::ToString() const
 void CGovernanceVote::Relay(CConnman& connman) const
 {
     // Do not relay until fully synced
-    if(!masternodeSync.IsSynced()) {
+    if (!masternodeSync.IsSynced()) {
         LogPrint("gobject", "CGovernanceVote::Relay -- won't relay until fully synced\n");
         return;
     }
@@ -159,7 +159,7 @@ bool CGovernanceVote::Sign(const CKey& key, const CKeyID& keyID)
     if (sporkManager.IsSporkActive(SPORK_6_NEW_SIGS)) {
         uint256 hash = GetSignatureHash();
 
-        if(!CHashSigner::SignHash(hash, key, vchSig)) {
+        if (!CHashSigner::SignHash(hash, key, vchSig)) {
             LogPrintf("CGovernanceVote::Sign -- SignHash() failed\n");
             return false;
         }
@@ -169,16 +169,15 @@ bool CGovernanceVote::Sign(const CKey& key, const CKeyID& keyID)
             return false;
         }
     } else {
-
         std::string strMessage = masternodeOutpoint.ToStringShort() + "|" + nParentHash.ToString() + "|" +
-            std::to_string(nVoteSignal) + "|" + std::to_string(nVoteOutcome) + "|" + std::to_string(nTime);
+                                 std::to_string(nVoteSignal) + "|" + std::to_string(nVoteOutcome) + "|" + std::to_string(nTime);
 
-        if(!CMessageSigner::SignMessage(strMessage, vchSig, key)) {
+        if (!CMessageSigner::SignMessage(strMessage, vchSig, key)) {
             LogPrintf("CGovernanceVote::Sign -- SignMessage() failed\n");
             return false;
         }
 
-        if(!CMessageSigner::VerifyMessage(keyID, vchSig, strMessage, strError)) {
+        if (!CMessageSigner::VerifyMessage(keyID, vchSig, strMessage, strError)) {
             LogPrintf("CGovernanceVote::Sign -- VerifyMessage() failed, error: %s\n", strError);
             return false;
         }
@@ -197,11 +196,11 @@ bool CGovernanceVote::CheckSignature(const CKeyID& keyID) const
         if (!CHashSigner::VerifyHash(hash, keyID, vchSig, strError)) {
             // could be a signature in old format
             std::string strMessage = masternodeOutpoint.ToStringShort() + "|" + nParentHash.ToString() + "|" +
-                std::to_string(nVoteSignal) + "|" +
-                std::to_string(nVoteOutcome) + "|" +
-                std::to_string(nTime);
+                                     std::to_string(nVoteSignal) + "|" +
+                                     std::to_string(nVoteOutcome) + "|" +
+                                     std::to_string(nTime);
 
-            if(!CMessageSigner::VerifyMessage(keyID, vchSig, strMessage, strError)) {
+            if (!CMessageSigner::VerifyMessage(keyID, vchSig, strMessage, strError)) {
                 // nope, not in old format either
                 LogPrint("gobject", "CGovernanceVote::IsValid -- VerifyMessage() failed, error: %s\n", strError);
                 return false;
@@ -209,11 +208,11 @@ bool CGovernanceVote::CheckSignature(const CKeyID& keyID) const
         }
     } else {
         std::string strMessage = masternodeOutpoint.ToStringShort() + "|" + nParentHash.ToString() + "|" +
-            std::to_string(nVoteSignal) + "|" +
-            std::to_string(nVoteOutcome) + "|" +
-            std::to_string(nTime);
+                                 std::to_string(nVoteSignal) + "|" +
+                                 std::to_string(nVoteOutcome) + "|" +
+                                 std::to_string(nTime);
 
-        if(!CMessageSigner::VerifyMessage(keyID, vchSig, strMessage, strError)) {
+        if (!CMessageSigner::VerifyMessage(keyID, vchSig, strMessage, strError)) {
             LogPrint("gobject", "CGovernanceVote::IsValid -- VerifyMessage() failed, error: %s\n", strError);
             return false;
         }
@@ -224,27 +223,25 @@ bool CGovernanceVote::CheckSignature(const CKeyID& keyID) const
 
 bool CGovernanceVote::IsValid(bool useVotingKey) const
 {
-    if(nTime > GetAdjustedTime() + (60*60)) {
-        LogPrint("gobject", "CGovernanceVote::IsValid -- vote is too far ahead of current time - %s - nTime %lli - Max Time %lli\n", GetHash().ToString(), nTime, GetAdjustedTime() + (60*60));
+    if (nTime > GetAdjustedTime() + (60 * 60)) {
+        LogPrint("gobject", "CGovernanceVote::IsValid -- vote is too far ahead of current time - %s - nTime %lli - Max Time %lli\n", GetHash().ToString(), nTime, GetAdjustedTime() + (60 * 60));
         return false;
     }
 
     // support up to MAX_SUPPORTED_VOTE_SIGNAL, can be extended
-    if(nVoteSignal > MAX_SUPPORTED_VOTE_SIGNAL)
-    {
+    if (nVoteSignal > MAX_SUPPORTED_VOTE_SIGNAL) {
         LogPrint("gobject", "CGovernanceVote::IsValid -- Client attempted to vote on invalid signal(%d) - %s\n", nVoteSignal, GetHash().ToString());
         return false;
     }
 
     // 0=none, 1=yes, 2=no, 3=abstain. Beyond that reject votes
-    if(nVoteOutcome > 3)
-    {
+    if (nVoteOutcome > 3) {
         LogPrint("gobject", "CGovernanceVote::IsValid -- Client attempted to vote on invalid outcome(%d) - %s\n", nVoteSignal, GetHash().ToString());
         return false;
     }
 
     masternode_info_t infoMn;
-    if(!mnodeman.GetMasternodeInfo(masternodeOutpoint, infoMn)) {
+    if (!mnodeman.GetMasternodeInfo(masternodeOutpoint, infoMn)) {
         LogPrint("gobject", "CGovernanceVote::IsValid -- Unknown Masternode - %s\n", masternodeOutpoint.ToStringShort());
         return false;
     }
@@ -265,25 +262,25 @@ bool operator==(const CGovernanceVote& vote1, const CGovernanceVote& vote2)
 bool operator<(const CGovernanceVote& vote1, const CGovernanceVote& vote2)
 {
     bool fResult = (vote1.masternodeOutpoint < vote2.masternodeOutpoint);
-    if(!fResult) {
+    if (!fResult) {
         return false;
     }
     fResult = (vote1.masternodeOutpoint == vote2.masternodeOutpoint);
 
     fResult = fResult && (vote1.nParentHash < vote2.nParentHash);
-    if(!fResult) {
+    if (!fResult) {
         return false;
     }
     fResult = fResult && (vote1.nParentHash == vote2.nParentHash);
 
     fResult = fResult && (vote1.nVoteOutcome < vote2.nVoteOutcome);
-    if(!fResult) {
+    if (!fResult) {
         return false;
     }
     fResult = fResult && (vote1.nVoteOutcome == vote2.nVoteOutcome);
 
     fResult = fResult && (vote1.nVoteSignal == vote2.nVoteSignal);
-    if(!fResult) {
+    if (!fResult) {
         return false;
     }
     fResult = fResult && (vote1.nVoteSignal == vote2.nVoteSignal);
diff --git a/src/governance-vote.h b/src/governance-vote.h
index 67b79ca3700b..0a2ac0489f48 100644
--- a/src/governance-vote.h
+++ b/src/governance-vote.h
@@ -1,7 +1,7 @@
-// Copyright (c) 2014-2017 The Dash Core developers
-
+// Copyright (c) 2014-2018 The Dash Core developers
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
 #ifndef GOVERNANCE_VOTE_H
 #define GOVERNANCE_VOTE_H
 
@@ -12,7 +12,7 @@ class CGovernanceVote;
 class CConnman;
 
 // INTENTION OF MASTERNODES REGARDING ITEM
-enum vote_outcome_enum_t  {
+enum vote_outcome_enum_t {
     VOTE_OUTCOME_NONE      = 0,
     VOTE_OUTCOME_YES       = 1,
     VOTE_OUTCOME_NO        = 2,
@@ -21,7 +21,7 @@ enum vote_outcome_enum_t  {
 
 
 // SIGNAL VARIOUS THINGS TO HAPPEN:
-enum vote_signal_enum_t  {
+enum vote_signal_enum_t {
     VOTE_SIGNAL_NONE       = 0,
     VOTE_SIGNAL_FUNDING    = 1, //   -- fund this object for it's stated amount
     VOTE_SIGNAL_VALID      = 2, //   -- this object checks out in sentinel engine
@@ -57,8 +57,8 @@ class CGovernanceVote
     friend bool operator<(const CGovernanceVote& vote1, const CGovernanceVote& vote2);
 
 private:
-    bool fValid; //if the vote is currently valid / counted
-    bool fSynced; //if we've sent this to our peers
+    bool fValid;     //if the vote is currently valid / counted
+    bool fSynced;    //if we've sent this to our peers
     int nVoteSignal; // see VOTE_ACTIONS above
     COutPoint masternodeOutpoint;
     uint256 nParentHash;
@@ -80,13 +80,17 @@ class CGovernanceVote
 
     int64_t GetTimestamp() const { return nTime; }
 
-    vote_signal_enum_t GetSignal() const  { return vote_signal_enum_t(nVoteSignal); }
+    vote_signal_enum_t GetSignal() const { return vote_signal_enum_t(nVoteSignal); }
 
-    vote_outcome_enum_t GetOutcome() const  { return vote_outcome_enum_t(nVoteOutcome); }
+    vote_outcome_enum_t GetOutcome() const { return vote_outcome_enum_t(nVoteOutcome); }
 
     const uint256& GetParentHash() const { return nParentHash; }
 
-    void SetTime(int64_t nTimeIn) { nTime = nTimeIn; UpdateHash(); }
+    void SetTime(int64_t nTimeIn)
+    {
+        nTime = nTimeIn;
+        UpdateHash();
+    }
 
     void SetSignature(const std::vector<unsigned char>& vchSigIn) { vchSig = vchSigIn; }
 
@@ -95,10 +99,6 @@ class CGovernanceVote
     bool IsValid(bool useVotingKey) const;
     void Relay(CConnman& connman) const;
 
-    std::string GetVoteString() const {
-        return CGovernanceVoting::ConvertOutcomeToString(GetOutcome());
-    }
-
     const COutPoint& GetMasternodeOutpoint() const { return masternodeOutpoint; }
 
     /**
@@ -115,7 +115,8 @@ class CGovernanceVote
     ADD_SERIALIZE_METHODS;
 
     template <typename Stream, typename Operation>
-    inline void SerializationOp(Stream& s, Operation ser_action) {
+    inline void SerializationOp(Stream& s, Operation ser_action)
+    {
         READWRITE(masternodeOutpoint);
         READWRITE(nParentHash);
         READWRITE(nVoteOutcome);
@@ -127,7 +128,6 @@ class CGovernanceVote
         if (ser_action.ForRead())
             UpdateHash();
     }
-
 };
 
 #endif
diff --git a/src/governance-votedb.cpp b/src/governance-votedb.cpp
index 403c0e882911..9f67e166155c 100644
--- a/src/governance-votedb.cpp
+++ b/src/governance-votedb.cpp
@@ -1,19 +1,20 @@
-// Copyright (c) 2014-2017 The Dash Core developers
+// Copyright (c) 2014-2018 The Dash Core developers
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #include "governance-votedb.h"
 
-CGovernanceObjectVoteFile::CGovernanceObjectVoteFile()
-    : nMemoryVotes(0),
-      listVotes(),
-      mapVoteIndex()
-{}
+CGovernanceObjectVoteFile::CGovernanceObjectVoteFile() :
+    nMemoryVotes(0),
+    listVotes(),
+    mapVoteIndex()
+{
+}
 
-CGovernanceObjectVoteFile::CGovernanceObjectVoteFile(const CGovernanceObjectVoteFile& other)
-    : nMemoryVotes(other.nMemoryVotes),
-      listVotes(other.listVotes),
-      mapVoteIndex()
+CGovernanceObjectVoteFile::CGovernanceObjectVoteFile(const CGovernanceObjectVoteFile& other) :
+    nMemoryVotes(other.nMemoryVotes),
+    listVotes(other.listVotes),
+    mapVoteIndex()
 {
     RebuildIndex();
 }
@@ -37,7 +38,7 @@ bool CGovernanceObjectVoteFile::HasVote(const uint256& nHash) const
 bool CGovernanceObjectVoteFile::SerializeVoteToStream(const uint256& nHash, CDataStream& ss) const
 {
     vote_m_cit it = mapVoteIndex.find(nHash);
-    if(it == mapVoteIndex.end()) {
+    if (it == mapVoteIndex.end()) {
         return false;
     }
     ss << *(it->second);
@@ -47,7 +48,7 @@ bool CGovernanceObjectVoteFile::SerializeVoteToStream(const uint256& nHash, CDat
 std::vector<CGovernanceVote> CGovernanceObjectVoteFile::GetVotes() const
 {
     std::vector<CGovernanceVote> vecResult;
-    for(vote_l_cit it = listVotes.begin(); it != listVotes.end(); ++it) {
+    for (vote_l_cit it = listVotes.begin(); it != listVotes.end(); ++it) {
         vecResult.push_back(*it);
     }
     return vecResult;
@@ -56,13 +57,12 @@ std::vector<CGovernanceVote> CGovernanceObjectVoteFile::GetVotes() const
 void CGovernanceObjectVoteFile::RemoveVotesFromMasternode(const COutPoint& outpointMasternode)
 {
     vote_l_it it = listVotes.begin();
-    while(it != listVotes.end()) {
-        if(it->GetMasternodeOutpoint() == outpointMasternode) {
+    while (it != listVotes.end()) {
+        if (it->GetMasternodeOutpoint() == outpointMasternode) {
             --nMemoryVotes;
             mapVoteIndex.erase(it->GetHash());
             listVotes.erase(it++);
-        }
-        else {
+        } else {
             ++it;
         }
     }
@@ -73,15 +73,14 @@ void CGovernanceObjectVoteFile::RebuildIndex()
     mapVoteIndex.clear();
     nMemoryVotes = 0;
     vote_l_it it = listVotes.begin();
-    while(it != listVotes.end()) {
+    while (it != listVotes.end()) {
         CGovernanceVote& vote = *it;
         uint256 nHash = vote.GetHash();
-        if(mapVoteIndex.find(nHash) == mapVoteIndex.end()) {
+        if (mapVoteIndex.find(nHash) == mapVoteIndex.end()) {
             mapVoteIndex[nHash] = it;
             ++nMemoryVotes;
             ++it;
-        }
-        else {
+        } else {
             listVotes.erase(it++);
         }
     }
diff --git a/src/governance-votedb.h b/src/governance-votedb.h
index 73638c8694ef..c3b42f593be5 100644
--- a/src/governance-votedb.h
+++ b/src/governance-votedb.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2017 The Dash Core developers
+// Copyright (c) 2014-2018 The Dash Core developers
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
@@ -30,7 +30,7 @@ class CGovernanceObjectVoteFile
 
     typedef vote_l_t::const_iterator vote_l_cit;
 
-    typedef std::map<uint256,vote_l_it> vote_m_t;
+    typedef std::map<uint256, vote_l_it> vote_m_t;
 
     typedef vote_m_t::iterator vote_m_it;
 
@@ -65,7 +65,8 @@ class CGovernanceObjectVoteFile
      */
     bool SerializeVoteToStream(const uint256& nHash, CDataStream& ss) const;
 
-    int GetVoteCount() {
+    int GetVoteCount()
+    {
         return nMemoryVotes;
     }
 
@@ -80,13 +81,13 @@ class CGovernanceObjectVoteFile
     {
         READWRITE(nMemoryVotes);
         READWRITE(listVotes);
-        if(ser_action.ForRead()) {
+        if (ser_action.ForRead()) {
             RebuildIndex();
         }
     }
+
 private:
     void RebuildIndex();
-
 };
 
 #endif
diff --git a/src/governance.cpp b/src/governance.cpp
index e69b5478d049..9b30e9cec220 100644
--- a/src/governance.cpp
+++ b/src/governance.cpp
@@ -1,45 +1,46 @@
-// Copyright (c) 2014-2017 The Dash Core developers
+// Copyright (c) 2014-2018 The Dash Core developers
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include "consensus/validation.h"
-#include "validationinterface.h"
 #include "governance.h"
+#include "consensus/validation.h"
+#include "governance-classes.h"
 #include "governance-object.h"
 #include "governance-validators.h"
 #include "governance-vote.h"
-#include "governance-classes.h"
-#include "net_processing.h"
-#include "netmessagemaker.h"
-#include "masternode.h"
 #include "masternode-sync.h"
+#include "masternode.h"
 #include "masternodeman.h"
 #include "messagesigner.h"
+#include "net_processing.h"
 #include "netfulfilledman.h"
+#include "netmessagemaker.h"
 #include "util.h"
+#include "validationinterface.h"
 
 CGovernanceManager governance;
 
 int nSubmittedFinalBudget;
 
 const std::string CGovernanceManager::SERIALIZATION_VERSION_STRING = "CGovernanceManager-Version-13";
-const int CGovernanceManager::MAX_TIME_FUTURE_DEVIATION = 60*60;
+const int CGovernanceManager::MAX_TIME_FUTURE_DEVIATION = 60 * 60;
 const int CGovernanceManager::RELIABLE_PROPAGATION_TIME = 60;
 
-CGovernanceManager::CGovernanceManager()
-    : nTimeLastDiff(0),
-      nCachedBlockHeight(0),
-      mapObjects(),
-      mapErasedGovernanceObjects(),
-      mapMasternodeOrphanObjects(),
-      cmapVoteToObject(MAX_CACHE_SIZE),
-      cmapInvalidVotes(MAX_CACHE_SIZE),
-      cmmapOrphanVotes(MAX_CACHE_SIZE),
-      mapLastMasternodeObject(),
-      setRequestedObjects(),
-      fRateChecksEnabled(true),
-      cs()
-{}
+CGovernanceManager::CGovernanceManager() :
+    nTimeLastDiff(0),
+    nCachedBlockHeight(0),
+    mapObjects(),
+    mapErasedGovernanceObjects(),
+    mapMasternodeOrphanObjects(),
+    cmapVoteToObject(MAX_CACHE_SIZE),
+    cmapInvalidVotes(MAX_CACHE_SIZE),
+    cmmapOrphanVotes(MAX_CACHE_SIZE),
+    mapLastMasternodeObject(),
+    setRequestedObjects(),
+    fRateChecksEnabled(true),
+    cs()
+{
+}
 
 // Accessors for thread-safe access to maps
 bool CGovernanceManager::HaveObjectForHash(const uint256& nHash) const
@@ -80,23 +81,20 @@ bool CGovernanceManager::SerializeVoteForHash(const uint256& nHash, CDataStream&
     LOCK(cs);
 
     CGovernanceObject* pGovobj = nullptr;
-    return cmapVoteToObject.Get(nHash,pGovobj) && pGovobj->GetVoteFile().SerializeVoteToStream(nHash, ss);
+    return cmapVoteToObject.Get(nHash, pGovobj) && pGovobj->GetVoteFile().SerializeVoteToStream(nHash, ss);
 }
 
 void CGovernanceManager::ProcessMessage(CNode* pfrom, const std::string& strCommand, CDataStream& vRecv, CConnman& connman)
 {
     // lite mode is not supported
-    if(fLiteMode) return;
-    if(!masternodeSync.IsBlockchainSynced()) return;
+    if (fLiteMode) return;
+    if (!masternodeSync.IsBlockchainSynced()) return;
 
     // ANOTHER USER IS ASKING US TO HELP THEM SYNC GOVERNANCE OBJECT DATA
-    if (strCommand == NetMsgType::MNGOVERNANCESYNC)
-    {
-
-        if(pfrom->nVersion < MIN_GOVERNANCE_PEER_PROTO_VERSION) {
+    if (strCommand == NetMsgType::MNGOVERNANCESYNC) {
+        if (pfrom->nVersion < MIN_GOVERNANCE_PEER_PROTO_VERSION) {
             LogPrint("gobject", "MNGOVERNANCESYNC -- peer=%d using obsolete version %i\n", pfrom->id, pfrom->nVersion);
-            connman.PushMessage(pfrom, CNetMsgMaker(pfrom->GetSendVersion()).Make(NetMsgType::REJECT, strCommand, REJECT_OBSOLETE,
-                               strprintf("Version must be %d or greater", MIN_GOVERNANCE_PEER_PROTO_VERSION)));
+            connman.PushMessage(pfrom, CNetMsgMaker(pfrom->GetSendVersion()).Make(NetMsgType::REJECT, strCommand, REJECT_OBSOLETE, strprintf("Version must be %d or greater", MIN_GOVERNANCE_PEER_PROTO_VERSION)));
             return;
         }
 
@@ -110,15 +108,14 @@ void CGovernanceManager::ProcessMessage(CNode* pfrom, const std::string& strComm
 
         vRecv >> nProp;
 
-        if(pfrom->nVersion >= GOVERNANCE_FILTER_PROTO_VERSION) {
+        if (pfrom->nVersion >= GOVERNANCE_FILTER_PROTO_VERSION) {
             vRecv >> filter;
             filter.UpdateEmptyFull();
-        }
-        else {
+        } else {
             filter.clear();
         }
 
-        if(nProp == uint256()) {
+        if (nProp == uint256()) {
             SyncAll(pfrom, connman);
         } else {
             SyncSingleObjAndItsVotes(pfrom, nProp, filter, connman);
@@ -127,8 +124,7 @@ void CGovernanceManager::ProcessMessage(CNode* pfrom, const std::string& strComm
     }
 
     // A NEW GOVERNANCE OBJECT HAS ARRIVED
-    else if (strCommand == NetMsgType::MNGOVERNANCEOBJECT)
-    {
+    else if (strCommand == NetMsgType::MNGOVERNANCEOBJECT) {
         // MAKE SURE WE HAVE A VALID REFERENCE TO THE TIP BEFORE CONTINUING
 
         CGovernanceObject govobj;
@@ -138,14 +134,13 @@ void CGovernanceManager::ProcessMessage(CNode* pfrom, const std::string& strComm
 
         pfrom->setAskFor.erase(nHash);
 
-        if(pfrom->nVersion < MIN_GOVERNANCE_PEER_PROTO_VERSION) {
+        if (pfrom->nVersion < MIN_GOVERNANCE_PEER_PROTO_VERSION) {
             LogPrint("gobject", "MNGOVERNANCEOBJECT -- peer=%d using obsolete version %i\n", pfrom->id, pfrom->nVersion);
-            connman.PushMessage(pfrom, CNetMsgMaker(pfrom->GetSendVersion()).Make(NetMsgType::REJECT, strCommand, REJECT_OBSOLETE,
-                               strprintf("Version must be %d or greater", MIN_GOVERNANCE_PEER_PROTO_VERSION)));
+            connman.PushMessage(pfrom, CNetMsgMaker(pfrom->GetSendVersion()).Make(NetMsgType::REJECT, strCommand, REJECT_OBSOLETE, strprintf("Version must be %d or greater", MIN_GOVERNANCE_PEER_PROTO_VERSION)));
             return;
         }
 
-        if(!masternodeSync.IsMasternodeListSynced()) {
+        if (!masternodeSync.IsMasternodeListSynced()) {
             LogPrint("gobject", "MNGOVERNANCEOBJECT -- masternode list not synced\n");
             return;
         }
@@ -154,22 +149,22 @@ void CGovernanceManager::ProcessMessage(CNode* pfrom, const std::string& strComm
 
         LogPrint("gobject", "MNGOVERNANCEOBJECT -- Received object: %s\n", strHash);
 
-        if(!AcceptObjectMessage(nHash)) {
+        if (!AcceptObjectMessage(nHash)) {
             LogPrintf("MNGOVERNANCEOBJECT -- Received unrequested object: %s\n", strHash);
             return;
         }
 
         LOCK2(cs_main, cs);
 
-        if(mapObjects.count(nHash) || mapPostponedObjects.count(nHash) ||
-           mapErasedGovernanceObjects.count(nHash) || mapMasternodeOrphanObjects.count(nHash)) {
+        if (mapObjects.count(nHash) || mapPostponedObjects.count(nHash) ||
+            mapErasedGovernanceObjects.count(nHash) || mapMasternodeOrphanObjects.count(nHash)) {
             // TODO - print error code? what if it's GOVOBJ_ERROR_IMMATURE?
             LogPrint("gobject", "MNGOVERNANCEOBJECT -- Received already seen object: %s\n", strHash);
             return;
         }
 
         bool fRateCheckBypassed = false;
-        if(!MasternodeRateCheck(govobj, true, false, fRateCheckBypassed)) {
+        if (!MasternodeRateCheck(govobj, true, false, fRateCheckBypassed)) {
             LogPrintf("MNGOVERNANCEOBJECT -- masternode rate check failed - %s - (current block height %d) \n", strHash, nCachedBlockHeight);
             return;
         }
@@ -181,16 +176,15 @@ void CGovernanceManager::ProcessMessage(CNode* pfrom, const std::string& strComm
         bool fMissingConfirmations = false;
         bool fIsValid = govobj.IsValidLocally(strError, fMasternodeMissing, fMissingConfirmations, true);
 
-        if(fRateCheckBypassed && (fIsValid || fMasternodeMissing)) {
-            if(!MasternodeRateCheck(govobj, true)) {
+        if (fRateCheckBypassed && (fIsValid || fMasternodeMissing)) {
+            if (!MasternodeRateCheck(govobj, true)) {
                 LogPrintf("MNGOVERNANCEOBJECT -- masternode rate check failed (after signature verification) - %s - (current block height %d) \n", strHash, nCachedBlockHeight);
                 return;
             }
         }
 
-        if(!fIsValid) {
-            if(fMasternodeMissing) {
-
+        if (!fIsValid) {
+            if (fMasternodeMissing) {
                 int& count = mapMasternodeOrphanCounter[govobj.GetMasternodeOutpoint()];
                 if (count >= 10) {
                     LogPrint("gobject", "MNGOVERNANCEOBJECT -- Too many orphan objects, missing masternode=%s\n", govobj.GetMasternodeOutpoint().ToStringShort());
@@ -204,7 +198,7 @@ void CGovernanceManager::ProcessMessage(CNode* pfrom, const std::string& strComm
                 ExpirationInfo info(pfrom->GetId(), GetAdjustedTime() + GOVERNANCE_ORPHAN_EXPIRATION_TIME);
                 mapMasternodeOrphanObjects.insert(std::make_pair(nHash, object_info_pair_t(govobj, info)));
                 LogPrintf("MNGOVERNANCEOBJECT -- Missing masternode for: %s, strError = %s\n", strHash, strError);
-            } else if(fMissingConfirmations) {
+            } else if (fMissingConfirmations) {
                 AddPostponedObject(govobj);
                 LogPrintf("MNGOVERNANCEOBJECT -- Not enough fee confirmations for: %s, strError = %s\n", strHash, strError);
             } else {
@@ -220,8 +214,7 @@ void CGovernanceManager::ProcessMessage(CNode* pfrom, const std::string& strComm
     }
 
     // A NEW GOVERNANCE OBJECT VOTE HAS ARRIVED
-    else if (strCommand == NetMsgType::MNGOVERNANCEOBJECTVOTE)
-    {
+    else if (strCommand == NetMsgType::MNGOVERNANCEOBJECTVOTE) {
         CGovernanceVote vote;
         vRecv >> vote;
 
@@ -229,14 +222,13 @@ void CGovernanceManager::ProcessMessage(CNode* pfrom, const std::string& strComm
 
         pfrom->setAskFor.erase(nHash);
 
-        if(pfrom->nVersion < MIN_GOVERNANCE_PEER_PROTO_VERSION) {
+        if (pfrom->nVersion < MIN_GOVERNANCE_PEER_PROTO_VERSION) {
             LogPrint("gobject", "MNGOVERNANCEOBJECTVOTE -- peer=%d using obsolete version %i\n", pfrom->id, pfrom->nVersion);
-            connman.PushMessage(pfrom, CNetMsgMaker(pfrom->GetSendVersion()).Make(NetMsgType::REJECT, strCommand, REJECT_OBSOLETE,
-                               strprintf("Version must be %d or greater", MIN_GOVERNANCE_PEER_PROTO_VERSION)));
+            connman.PushMessage(pfrom, CNetMsgMaker(pfrom->GetSendVersion()).Make(NetMsgType::REJECT, strCommand, REJECT_OBSOLETE, strprintf("Version must be %d or greater", MIN_GOVERNANCE_PEER_PROTO_VERSION)));
         }
 
         // Ignore such messages until masternode list is synced
-        if(!masternodeSync.IsMasternodeListSynced()) {
+        if (!masternodeSync.IsMasternodeListSynced()) {
             LogPrint("gobject", "MNGOVERNANCEOBJECTVOTE -- masternode list not synced\n");
             return;
         }
@@ -245,21 +237,20 @@ void CGovernanceManager::ProcessMessage(CNode* pfrom, const std::string& strComm
 
         std::string strHash = nHash.ToString();
 
-        if(!AcceptVoteMessage(nHash)) {
+        if (!AcceptVoteMessage(nHash)) {
             LogPrint("gobject", "MNGOVERNANCEOBJECTVOTE -- Received unrequested vote object: %s, hash: %s, peer = %d\n",
-                      vote.ToString(), strHash, pfrom->GetId());
+                vote.ToString(), strHash, pfrom->GetId());
             return;
         }
 
         CGovernanceException exception;
-        if(ProcessVote(pfrom, vote, exception, connman)) {
+        if (ProcessVote(pfrom, vote, exception, connman)) {
             LogPrint("gobject", "MNGOVERNANCEOBJECTVOTE -- %s new\n", strHash);
             masternodeSync.BumpAssetLastTime("MNGOVERNANCEOBJECTVOTE");
             vote.Relay(connman);
-        }
-        else {
+        } else {
             LogPrint("gobject", "MNGOVERNANCEOBJECTVOTE -- Rejected vote, error = %s\n", exception.what());
-            if((exception.GetNodePenalty() != 0) && masternodeSync.IsSynced()) {
+            if ((exception.GetNodePenalty() != 0) && masternodeSync.IsSynced()) {
                 LOCK(cs_main);
                 Misbehaving(pfrom->GetId(), exception.GetNodePenalty());
             }
@@ -279,19 +270,18 @@ void CGovernanceManager::CheckOrphanVotes(CGovernanceObject& govobj, CGovernance
     ScopedLockBool guard(cs, fRateChecksEnabled, false);
 
     int64_t nNow = GetAdjustedTime();
-    for(size_t i = 0; i < vecVotePairs.size(); ++i) {
+    for (size_t i = 0; i < vecVotePairs.size(); ++i) {
         bool fRemove = false;
         vote_time_pair_t& pairVote = vecVotePairs[i];
         CGovernanceVote& vote = pairVote.first;
         CGovernanceException exception;
-        if(pairVote.second < nNow) {
+        if (pairVote.second < nNow) {
             fRemove = true;
-        }
-        else if(govobj.ProcessVote(nullptr, vote, exception, connman)) {
+        } else if (govobj.ProcessVote(nullptr, vote, exception, connman)) {
             vote.Relay(connman);
             fRemove = true;
         }
-        if(fRemove) {
+        if (fRemove) {
             cmmapOrphanVotes.Erase(nHash, pairVote);
         }
     }
@@ -299,7 +289,7 @@ void CGovernanceManager::CheckOrphanVotes(CGovernanceObject& govobj, CGovernance
 
 void CGovernanceManager::AddGovernanceObject(CGovernanceObject& govobj, CConnman& connman, CNode* pfrom)
 {
-    DBG( std::cout << "CGovernanceManager::AddGovernanceObject START" << std::endl; );
+    DBG(std::cout << "CGovernanceManager::AddGovernanceObject START" << std::endl;);
 
     uint256 nHash = govobj.GetHash();
     std::string strHash = nHash.ToString();
@@ -313,7 +303,7 @@ void CGovernanceManager::AddGovernanceObject(CGovernanceObject& govobj, CConnman
 
     // MAKE SURE THIS OBJECT IS OK
 
-    if(!govobj.IsValidLocally(strError, true)) {
+    if (!govobj.IsValidLocally(strError, true)) {
         LogPrintf("CGovernanceManager::AddGovernanceObject -- invalid governance object - %s - (nCachedBlockHeight %d) \n", strError, nCachedBlockHeight);
         return;
     }
@@ -324,20 +314,20 @@ void CGovernanceManager::AddGovernanceObject(CGovernanceObject& govobj, CConnman
     // IF WE HAVE THIS OBJECT ALREADY, WE DON'T WANT ANOTHER COPY
     auto objpair = mapObjects.emplace(nHash, govobj);
 
-    if(!objpair.second) {
+    if (!objpair.second) {
         LogPrintf("CGovernanceManager::AddGovernanceObject -- already have governance object %s\n", nHash.ToString());
         return;
     }
 
     // SHOULD WE ADD THIS OBJECT TO ANY OTHER MANANGERS?
 
-    DBG( std::cout << "CGovernanceManager::AddGovernanceObject Before trigger block, GetDataAsPlainString = "
-              << govobj.GetDataAsPlainString()
-              << ", nObjectType = " << govobj.nObjectType
-              << std::endl; );
+    DBG(std::cout << "CGovernanceManager::AddGovernanceObject Before trigger block, GetDataAsPlainString = "
+                  << govobj.GetDataAsPlainString()
+                  << ", nObjectType = " << govobj.nObjectType
+                  << std::endl;);
 
     if (govobj.nObjectType == GOVERNANCE_OBJECT_TRIGGER) {
-        DBG( std::cout << "CGovernanceManager::AddGovernanceObject Before AddNewTrigger" << std::endl; );
+        DBG(std::cout << "CGovernanceManager::AddGovernanceObject Before AddNewTrigger" << std::endl;);
         if (!triggerman.AddNewTrigger(nHash)) {
             LogPrint("gobject", "CGovernanceManager::AddGovernanceObject -- undo adding invalid trigger object: hash = %s\n", nHash.ToString());
             CGovernanceObject& objref = objpair.first->second;
@@ -347,7 +337,7 @@ void CGovernanceManager::AddGovernanceObject(CGovernanceObject& govobj, CConnman
             }
             return;
         }
-        DBG( std::cout << "CGovernanceManager::AddGovernanceObject After AddNewTrigger" << std::endl; );
+        DBG(std::cout << "CGovernanceManager::AddGovernanceObject After AddNewTrigger" << std::endl;);
     }
 
     LogPrintf("CGovernanceManager::AddGovernanceObject -- %s new, received from %s\n", strHash, pfrom ? pfrom->GetAddrName() : "nullptr");
@@ -367,7 +357,7 @@ void CGovernanceManager::AddGovernanceObject(CGovernanceObject& govobj, CConnman
     GetMainSignals().NotifyGovernanceObject(govobj);
 
 
-    DBG( std::cout << "CGovernanceManager::AddGovernanceObject END" << std::endl; );
+    DBG(std::cout << "CGovernanceManager::AddGovernanceObject END" << std::endl;);
 }
 
 void CGovernanceManager::UpdateCachesAndClean()
@@ -378,9 +368,9 @@ void CGovernanceManager::UpdateCachesAndClean()
 
     LOCK2(cs_main, cs);
 
-    for(size_t i = 0; i < vecDirtyHashes.size(); ++i) {
+    for (size_t i = 0; i < vecDirtyHashes.size(); ++i) {
         object_m_it it = mapObjects.find(vecDirtyHashes[i]);
-        if(it == mapObjects.end()) {
+        if (it == mapObjects.end()) {
             continue;
         }
         it->second.ClearMasternodeVotes();
@@ -395,11 +385,10 @@ void CGovernanceManager::UpdateCachesAndClean()
     object_m_it it = mapObjects.begin();
     int64_t nNow = GetAdjustedTime();
 
-    while(it != mapObjects.end())
-    {
+    while (it != mapObjects.end()) {
         CGovernanceObject* pObj = &((*it).second);
 
-        if(!pObj) {
+        if (!pObj) {
             ++it;
             continue;
         }
@@ -408,7 +397,7 @@ void CGovernanceManager::UpdateCachesAndClean()
         std::string strHash = nHash.ToString();
 
         // IF CACHE IS NOT DIRTY, WHY DO THIS?
-        if(pObj->IsSetDirtyCache()) {
+        if (pObj->IsSetDirtyCache()) {
             // UPDATE LOCAL VALIDITY AGAINST CRYPTO DATA
             pObj->UpdateLocalValidity();
 
@@ -421,30 +410,29 @@ void CGovernanceManager::UpdateCachesAndClean()
         int64_t nTimeSinceDeletion = nNow - pObj->GetDeletionTime();
 
         LogPrint("gobject", "CGovernanceManager::UpdateCachesAndClean -- Checking object for deletion: %s, deletion time = %d, time since deletion = %d, delete flag = %d, expired flag = %d\n",
-                 strHash, pObj->GetDeletionTime(), nTimeSinceDeletion, pObj->IsSetCachedDelete(), pObj->IsSetExpired());
+            strHash, pObj->GetDeletionTime(), nTimeSinceDeletion, pObj->IsSetCachedDelete(), pObj->IsSetExpired());
 
-        if((pObj->IsSetCachedDelete() || pObj->IsSetExpired()) &&
-           (nTimeSinceDeletion >= GOVERNANCE_DELETION_DELAY)) {
+        if ((pObj->IsSetCachedDelete() || pObj->IsSetExpired()) &&
+            (nTimeSinceDeletion >= GOVERNANCE_DELETION_DELAY)) {
             LogPrintf("CGovernanceManager::UpdateCachesAndClean -- erase obj %s\n", (*it).first.ToString());
             mnodeman.RemoveGovernanceObject(pObj->GetHash());
 
             // Remove vote references
             const object_ref_cm_t::list_t& listItems = cmapVoteToObject.GetItemList();
             object_ref_cm_t::list_cit lit = listItems.begin();
-            while(lit != listItems.end()) {
-                if(lit->value == pObj) {
+            while (lit != listItems.end()) {
+                if (lit->value == pObj) {
                     uint256 nKey = lit->key;
                     ++lit;
                     cmapVoteToObject.Erase(nKey);
-                }
-                else {
+                } else {
                     ++lit;
                 }
             }
 
             int64_t nTimeExpired{0};
 
-            if(pObj->GetObjectType() == GOVERNANCE_OBJECT_PROPOSAL) {
+            if (pObj->GetObjectType() == GOVERNANCE_OBJECT_PROPOSAL) {
                 // keep hashes of deleted proposals forever
                 nTimeExpired = std::numeric_limits<int64_t>::max();
             } else {
@@ -472,11 +460,12 @@ void CGovernanceManager::UpdateCachesAndClean()
 
     // forget about expired deleted objects
     hash_time_m_it s_it = mapErasedGovernanceObjects.begin();
-    while(s_it != mapErasedGovernanceObjects.end()) {
-        if(s_it->second < nNow)
+    while (s_it != mapErasedGovernanceObjects.end()) {
+        if (s_it->second < nNow) {
             mapErasedGovernanceObjects.erase(s_it++);
-        else
+        } else {
             ++s_it;
+        }
     }
 
     LogPrintf("CGovernanceManager::UpdateCachesAndClean -- %s\n", ToString());
@@ -486,8 +475,7 @@ CGovernanceObject* CGovernanceManager::FindGovernanceObject(const uint256& nHash
 {
     LOCK(cs);
 
-    if(mapObjects.count(nHash))
-        return &mapObjects[nHash];
+    if (mapObjects.count(nHash)) return &mapObjects[nHash];
 
     return nullptr;
 }
@@ -498,7 +486,7 @@ std::vector<CGovernanceVote> CGovernanceManager::GetMatchingVotes(const uint256&
     std::vector<CGovernanceVote> vecResult;
 
     object_m_cit it = mapObjects.find(nParentHash);
-    if(it == mapObjects.end()) {
+    if (it == mapObjects.end()) {
         return vecResult;
     }
 
@@ -512,20 +500,19 @@ std::vector<CGovernanceVote> CGovernanceManager::GetCurrentVotes(const uint256&
 
     // Find the governance object or short-circuit.
     object_m_cit it = mapObjects.find(nParentHash);
-    if(it == mapObjects.end()) return vecResult;
+    if (it == mapObjects.end()) return vecResult;
     const CGovernanceObject& govobj = it->second;
 
     CMasternode mn;
     std::map<COutPoint, CMasternode> mapMasternodes;
-    if(mnCollateralOutpointFilter.IsNull()) {
+    if (mnCollateralOutpointFilter.IsNull()) {
         mapMasternodes = mnodeman.GetFullMasternodeMap();
     } else if (mnodeman.Get(mnCollateralOutpointFilter, mn)) {
         mapMasternodes[mnCollateralOutpointFilter] = mn;
     }
 
     // Loop thru each MN collateral outpoint and get the votes for the `nParentHash` governance object
-    for (const auto& mnpair : mapMasternodes)
-    {
+    for (const auto& mnpair : mapMasternodes) {
         // get a vote_rec_t from the govobj
         vote_rec_t voteRecord;
         if (!govobj.GetCurrentMNVotes(mnpair.first, voteRecord)) continue;
@@ -553,7 +540,7 @@ std::vector<const CGovernanceObject*> CGovernanceManager::GetAllNewerThan(int64_
 
     for (const auto& objPair : mapObjects) {
         // IF THIS OBJECT IS OLDER THAN TIME, CONTINUE
-        if(objPair.second.GetCreationTime() < nMoreThanTime) {
+        if (objPair.second.GetCreationTime() < nMoreThanTime) {
             continue;
         }
 
@@ -569,16 +556,16 @@ std::vector<const CGovernanceObject*> CGovernanceManager::GetAllNewerThan(int64_
 // Sort by votes, if there's a tie sort by their feeHash TX
 //
 struct sortProposalsByVotes {
-    bool operator()(const std::pair<CGovernanceObject*, int> &left, const std::pair<CGovernanceObject*, int> &right) {
-        if (left.second != right.second)
-            return (left.second > right.second);
+    bool operator()(const std::pair<CGovernanceObject*, int>& left, const std::pair<CGovernanceObject*, int>& right)
+    {
+        if (left.second != right.second) return (left.second > right.second);
         return (UintToArith256(left.first->GetCollateralHash()) > UintToArith256(right.first->GetCollateralHash()));
     }
 };
 
 void CGovernanceManager::DoMaintenance(CConnman& connman)
 {
-    if(fLiteMode || !masternodeSync.IsSynced()) return;
+    if (fLiteMode || !masternodeSync.IsSynced()) return;
 
     // CHECK OBJECTS WE'VE ASKED FOR, REMOVE OLD ENTRIES
 
@@ -594,30 +581,28 @@ void CGovernanceManager::DoMaintenance(CConnman& connman)
 bool CGovernanceManager::ConfirmInventoryRequest(const CInv& inv)
 {
     // do not request objects until it's time to sync
-    if(!masternodeSync.IsWinnersListSynced()) return false;
+    if (!masternodeSync.IsWinnersListSynced()) return false;
 
     LOCK(cs);
 
     LogPrint("gobject", "CGovernanceManager::ConfirmInventoryRequest inv = %s\n", inv.ToString());
 
     // First check if we've already recorded this object
-    switch(inv.type) {
-    case MSG_GOVERNANCE_OBJECT:
-    {
-        if(mapObjects.count(inv.hash) == 1 || mapPostponedObjects.count(inv.hash) == 1) {
+    switch (inv.type) {
+    case MSG_GOVERNANCE_OBJECT: {
+        if (mapObjects.count(inv.hash) == 1 || mapPostponedObjects.count(inv.hash) == 1) {
             LogPrint("gobject", "CGovernanceManager::ConfirmInventoryRequest already have governance object, returning false\n");
             return false;
         }
-    }
-    break;
-    case MSG_GOVERNANCE_OBJECT_VOTE:
-    {
-        if(cmapVoteToObject.HasKey(inv.hash)) {
+        break;
+    } 
+    case MSG_GOVERNANCE_OBJECT_VOTE: {
+        if (cmapVoteToObject.HasKey(inv.hash)) {
             LogPrint("gobject", "CGovernanceManager::ConfirmInventoryRequest already have governance vote, returning false\n");
             return false;
         }
-    }
-    break;
+        break;
+    } 
     default:
         LogPrint("gobject", "CGovernanceManager::ConfirmInventoryRequest unknown type, returning false\n");
         return false;
@@ -625,7 +610,7 @@ bool CGovernanceManager::ConfirmInventoryRequest(const CInv& inv)
 
 
     hash_s_t* setHash = nullptr;
-    switch(inv.type) {
+    switch (inv.type) {
     case MSG_GOVERNANCE_OBJECT:
         setHash = &setRequestedObjects;
         break;
@@ -637,7 +622,7 @@ bool CGovernanceManager::ConfirmInventoryRequest(const CInv& inv)
     }
 
     hash_s_cit it = setHash->find(inv.hash);
-    if(it == setHash->end()) {
+    if (it == setHash->end()) {
         setHash->insert(inv.hash);
         LogPrint("gobject", "CGovernanceManager::ConfirmInventoryRequest added inv to requested set\n");
     }
@@ -649,7 +634,7 @@ bool CGovernanceManager::ConfirmInventoryRequest(const CInv& inv)
 void CGovernanceManager::SyncSingleObjAndItsVotes(CNode* pnode, const uint256& nProp, const CBloomFilter& filter, CConnman& connman)
 {
     // do not provide any data until our node is synced
-    if(!masternodeSync.IsSynced()) return;
+    if (!masternodeSync.IsSynced()) return;
 
     int nVoteCount = 0;
 
@@ -661,7 +646,7 @@ void CGovernanceManager::SyncSingleObjAndItsVotes(CNode* pnode, const uint256& n
 
     // single valid object and its valid votes
     object_m_it it = mapObjects.find(nProp);
-    if(it == mapObjects.end()) {
+    if (it == mapObjects.end()) {
         LogPrint("gobject", "CGovernanceManager::%s -- no matching object for hash %s, peer=%d\n", __func__, nProp.ToString(), pnode->id);
         return;
     }
@@ -670,9 +655,9 @@ void CGovernanceManager::SyncSingleObjAndItsVotes(CNode* pnode, const uint256& n
 
     LogPrint("gobject", "CGovernanceManager::%s -- attempting to sync govobj: %s, peer=%d\n", __func__, strHash, pnode->id);
 
-    if(govobj.IsSetCachedDelete() || govobj.IsSetExpired()) {
+    if (govobj.IsSetCachedDelete() || govobj.IsSetExpired()) {
         LogPrintf("CGovernanceManager::%s -- not syncing deleted/expired govobj: %s, peer=%d\n", __func__,
-                  strHash, pnode->id);
+            strHash, pnode->id);
         return;
     }
 
@@ -687,7 +672,7 @@ void CGovernanceManager::SyncSingleObjAndItsVotes(CNode* pnode, const uint256& n
 
         bool onlyOwnerAllowed = govobj.GetObjectType() == GOVERNANCE_OBJECT_PROPOSAL;
 
-        if(filter.contains(nVoteHash) || !vote.IsValid(onlyOwnerAllowed)) {
+        if (filter.contains(nVoteHash) || !vote.IsValid(onlyOwnerAllowed)) {
             continue;
         }
         pnode->PushInventory(CInv(MSG_GOVERNANCE_OBJECT_VOTE, nVoteHash));
@@ -703,9 +688,9 @@ void CGovernanceManager::SyncSingleObjAndItsVotes(CNode* pnode, const uint256& n
 void CGovernanceManager::SyncAll(CNode* pnode, CConnman& connman) const
 {
     // do not provide any data until our node is synced
-    if(!masternodeSync.IsSynced()) return;
+    if (!masternodeSync.IsSynced()) return;
 
-    if(netfulfilledman.HasFulfilledRequest(pnode->addr, NetMsgType::MNGOVERNANCESYNC)) {
+    if (netfulfilledman.HasFulfilledRequest(pnode->addr, NetMsgType::MNGOVERNANCESYNC)) {
         LOCK(cs_main);
         // Asking for the whole list multiple times in a short period of time is no good
         LogPrint("gobject", "CGovernanceManager::%s -- peer already asked me for the list\n", __func__);
@@ -731,9 +716,9 @@ void CGovernanceManager::SyncAll(CNode* pnode, CConnman& connman) const
 
         LogPrint("gobject", "CGovernanceManager::%s -- attempting to sync govobj: %s, peer=%d\n", __func__, strHash, pnode->id);
 
-        if(govobj.IsSetCachedDelete() || govobj.IsSetExpired()) {
+        if (govobj.IsSetCachedDelete() || govobj.IsSetExpired()) {
             LogPrintf("CGovernanceManager::%s -- not syncing deleted/expired govobj: %s, peer=%d\n", __func__,
-                      strHash, pnode->id);
+                strHash, pnode->id);
             continue;
         }
 
@@ -751,14 +736,14 @@ void CGovernanceManager::SyncAll(CNode* pnode, CConnman& connman) const
 
 void CGovernanceManager::MasternodeRateUpdate(const CGovernanceObject& govobj)
 {
-    if(govobj.GetObjectType() != GOVERNANCE_OBJECT_TRIGGER)
-        return;
+    if (govobj.GetObjectType() != GOVERNANCE_OBJECT_TRIGGER) return;
 
     const COutPoint& masternodeOutpoint = govobj.GetMasternodeOutpoint();
-    txout_m_it it  = mapLastMasternodeObject.find(masternodeOutpoint);
+    txout_m_it it = mapLastMasternodeObject.find(masternodeOutpoint);
 
-    if(it == mapLastMasternodeObject.end())
+    if (it == mapLastMasternodeObject.end()) {
         it = mapLastMasternodeObject.insert(txout_m_t::value_type(masternodeOutpoint, last_object_rec(true))).first;
+    }
 
     int64_t nTimestamp = govobj.GetCreationTime();
     it->second.triggerBuffer.AddTimestamp(nTimestamp);
@@ -783,15 +768,11 @@ bool CGovernanceManager::MasternodeRateCheck(const CGovernanceObject& govobj, bo
 
     fRateCheckBypassed = false;
 
-    if(!masternodeSync.IsSynced()) {
+    if (!masternodeSync.IsSynced() || !fRateChecksEnabled) {
         return true;
     }
 
-    if(!fRateChecksEnabled) {
-        return true;
-    }
-
-    if(govobj.GetObjectType() != GOVERNANCE_OBJECT_TRIGGER) {
+    if (govobj.GetObjectType() != GOVERNANCE_OBJECT_TRIGGER) {
         return true;
     }
 
@@ -802,23 +783,22 @@ bool CGovernanceManager::MasternodeRateCheck(const CGovernanceObject& govobj, bo
 
     std::string strHash = govobj.GetHash().ToString();
 
-    if(nTimestamp < nNow - 2 * nSuperblockCycleSeconds) {
+    if (nTimestamp < nNow - 2 * nSuperblockCycleSeconds) {
         LogPrintf("CGovernanceManager::MasternodeRateCheck -- object %s rejected due to too old timestamp, masternode = %s, timestamp = %d, current time = %d\n",
-                 strHash, masternodeOutpoint.ToStringShort(), nTimestamp, nNow);
+            strHash, masternodeOutpoint.ToStringShort(), nTimestamp, nNow);
         return false;
     }
 
-    if(nTimestamp > nNow + MAX_TIME_FUTURE_DEVIATION) {
+    if (nTimestamp > nNow + MAX_TIME_FUTURE_DEVIATION) {
         LogPrintf("CGovernanceManager::MasternodeRateCheck -- object %s rejected due to too new (future) timestamp, masternode = %s, timestamp = %d, current time = %d\n",
-                 strHash, masternodeOutpoint.ToStringShort(), nTimestamp, nNow);
+            strHash, masternodeOutpoint.ToStringShort(), nTimestamp, nNow);
         return false;
     }
 
-    txout_m_it it  = mapLastMasternodeObject.find(masternodeOutpoint);
-    if(it == mapLastMasternodeObject.end())
-        return true;
+    txout_m_it it = mapLastMasternodeObject.find(masternodeOutpoint);
+    if (it == mapLastMasternodeObject.end()) return true;
 
-    if(it->second.fStatusOK && !fForce) {
+    if (it->second.fStatusOK && !fForce) {
         fRateCheckBypassed = true;
         return true;
     }
@@ -832,15 +812,16 @@ bool CGovernanceManager::MasternodeRateCheck(const CGovernanceObject& govobj, bo
     buffer.AddTimestamp(nTimestamp);
     double dRate = buffer.GetRate();
 
-    if(dRate < dMaxRate) {
+    if (dRate < dMaxRate) {
         return true;
     }
 
     LogPrintf("CGovernanceManager::MasternodeRateCheck -- Rate too high: object hash = %s, masternode = %s, object timestamp = %d, rate = %f, max rate = %f\n",
-              strHash, masternodeOutpoint.ToStringShort(), nTimestamp, dRate, dMaxRate);
+        strHash, masternodeOutpoint.ToStringShort(), nTimestamp, dRate, dMaxRate);
 
-    if (fUpdateFailStatus)
+    if (fUpdateFailStatus) {
         it->second.fStatusOK = false;
+    }
 
     return false;
 }
@@ -851,17 +832,17 @@ bool CGovernanceManager::ProcessVote(CNode* pfrom, const CGovernanceVote& vote,
     uint256 nHashVote = vote.GetHash();
     uint256 nHashGovobj = vote.GetParentHash();
 
-    if(cmapVoteToObject.HasKey(nHashVote)) {
+    if (cmapVoteToObject.HasKey(nHashVote)) {
         LogPrint("gobject", "CGovernanceObject::ProcessVote -- skipping known valid vote %s for object %s\n", nHashVote.ToString(), nHashGovobj.ToString());
         LEAVE_CRITICAL_SECTION(cs);
         return false;
     }
 
-    if(cmapInvalidVotes.HasKey(nHashVote)) {
+    if (cmapInvalidVotes.HasKey(nHashVote)) {
         std::ostringstream ostr;
         ostr << "CGovernanceManager::ProcessVote -- Old invalid vote "
-                << ", MN outpoint = " << vote.GetMasternodeOutpoint().ToStringShort()
-                << ", governance object hash = " << nHashGovobj.ToString();
+             << ", MN outpoint = " << vote.GetMasternodeOutpoint().ToStringShort()
+             << ", governance object hash = " << nHashGovobj.ToString();
         LogPrintf("%s\n", ostr.str());
         exception = CGovernanceException(ostr.str(), GOVERNANCE_EXCEPTION_PERMANENT_ERROR, 20);
         LEAVE_CRITICAL_SECTION(cs);
@@ -869,12 +850,12 @@ bool CGovernanceManager::ProcessVote(CNode* pfrom, const CGovernanceVote& vote,
     }
 
     object_m_it it = mapObjects.find(nHashGovobj);
-    if(it == mapObjects.end()) {
+    if (it == mapObjects.end()) {
         std::ostringstream ostr;
         ostr << "CGovernanceManager::ProcessVote -- Unknown parent object " << nHashGovobj.ToString()
              << ", MN outpoint = " << vote.GetMasternodeOutpoint().ToStringShort();
         exception = CGovernanceException(ostr.str(), GOVERNANCE_EXCEPTION_WARNING);
-        if(cmmapOrphanVotes.Insert(nHashGovobj, vote_time_pair_t(vote, GetAdjustedTime() + GOVERNANCE_ORPHAN_EXPIRATION_TIME))) {
+        if (cmmapOrphanVotes.Insert(nHashGovobj, vote_time_pair_t(vote, GetAdjustedTime() + GOVERNANCE_ORPHAN_EXPIRATION_TIME))) {
             LEAVE_CRITICAL_SECTION(cs);
             RequestGovernanceObject(pfrom, nHashGovobj, connman);
             LogPrintf("%s\n", ostr.str());
@@ -888,7 +869,7 @@ bool CGovernanceManager::ProcessVote(CNode* pfrom, const CGovernanceVote& vote,
 
     CGovernanceObject& govobj = it->second;
 
-    if(govobj.IsSetCachedDelete() || govobj.IsSetExpired()) {
+    if (govobj.IsSetCachedDelete() || govobj.IsSetExpired()) {
         LogPrint("gobject", "CGovernanceObject::ProcessVote -- ignoring vote for expired or deleted object, hash = %s\n", nHashGovobj.ToString());
         LEAVE_CRITICAL_SECTION(cs);
         return false;
@@ -916,19 +897,19 @@ void CGovernanceManager::CheckMasternodeOrphanObjects(CConnman& connman)
     int64_t nNow = GetAdjustedTime();
     ScopedLockBool guard(cs, fRateChecksEnabled, false);
     object_info_m_it it = mapMasternodeOrphanObjects.begin();
-    while(it != mapMasternodeOrphanObjects.end()) {
+    while (it != mapMasternodeOrphanObjects.end()) {
         object_info_pair_t& pair = it->second;
         CGovernanceObject& govobj = pair.first;
 
-        if(pair.second.nExpirationTime >= nNow) {
+        if (pair.second.nExpirationTime >= nNow) {
             std::string strError;
             bool fMasternodeMissing = false;
             bool fConfirmationsMissing = false;
             bool fIsValid = govobj.IsValidLocally(strError, fMasternodeMissing, fConfirmationsMissing, true);
 
-            if(fIsValid) {
+            if (fIsValid) {
                 AddGovernanceObject(govobj, connman);
-            } else if(fMasternodeMissing) {
+            } else if (fMasternodeMissing) {
                 ++it;
                 continue;
             }
@@ -938,7 +919,7 @@ void CGovernanceManager::CheckMasternodeOrphanObjects(CConnman& connman)
         }
 
         auto it_count = mapMasternodeOrphanCounter.find(govobj.GetMasternodeOutpoint());
-        if(--it_count->second == 0)
+        if (--it_count->second == 0)
             mapMasternodeOrphanCounter.erase(it_count);
 
         mapMasternodeOrphanObjects.erase(it++);
@@ -947,13 +928,12 @@ void CGovernanceManager::CheckMasternodeOrphanObjects(CConnman& connman)
 
 void CGovernanceManager::CheckPostponedObjects(CConnman& connman)
 {
-    if(!masternodeSync.IsSynced()) return;
+    if (!masternodeSync.IsSynced()) return;
 
     LOCK2(cs_main, cs);
 
     // Check postponed proposals
-    for(object_m_it it = mapPostponedObjects.begin(); it != mapPostponedObjects.end();) {
-
+    for (object_m_it it = mapPostponedObjects.begin(); it != mapPostponedObjects.end();) {
         const uint256& nHash = it->first;
         CGovernanceObject& govobj = it->second;
 
@@ -961,14 +941,14 @@ void CGovernanceManager::CheckPostponedObjects(CConnman& connman)
 
         std::string strError;
         bool fMissingConfirmations;
-        if (govobj.IsCollateralValid(strError, fMissingConfirmations))
-        {
-            if(govobj.IsValidLocally(strError, false))
+        if (govobj.IsCollateralValid(strError, fMissingConfirmations)) {
+            if (govobj.IsValidLocally(strError, false)) {
                 AddGovernanceObject(govobj, connman);
-            else
+            } else {
                 LogPrintf("CGovernanceManager::CheckPostponedObjects -- %s invalid\n", nHash.ToString());
+            }
 
-        } else if(fMissingConfirmations) {
+        } else if (fMissingConfirmations) {
             // wait for more confirmations
             ++it;
             continue;
@@ -983,11 +963,9 @@ void CGovernanceManager::CheckPostponedObjects(CConnman& connman)
     int64_t nNow = GetAdjustedTime();
     int64_t nSuperblockCycleSeconds = Params().GetConsensus().nSuperblockCycle * Params().GetConsensus().nPowTargetSpacing;
 
-    for(hash_s_it it = setAdditionalRelayObjects.begin(); it != setAdditionalRelayObjects.end();) {
-
+    for (hash_s_it it = setAdditionalRelayObjects.begin(); it != setAdditionalRelayObjects.end();) {
         object_m_it itObject = mapObjects.find(*it);
-        if(itObject != mapObjects.end()) {
-
+        if (itObject != mapObjects.end()) {
             CGovernanceObject& govobj = itObject->second;
 
             int64_t nTimestamp = govobj.GetCreationTime();
@@ -995,8 +973,8 @@ void CGovernanceManager::CheckPostponedObjects(CConnman& connman)
             bool fValid = (nTimestamp <= nNow + MAX_TIME_FUTURE_DEVIATION) && (nTimestamp >= nNow - 2 * nSuperblockCycleSeconds);
             bool fReady = (nTimestamp <= nNow + MAX_TIME_FUTURE_DEVIATION - RELIABLE_PROPAGATION_TIME);
 
-            if(fValid) {
-                if(fReady) {
+            if (fValid) {
+                if (fReady) {
                     LogPrintf("CGovernanceManager::CheckPostponedObjects -- additional relay: hash = %s\n", govobj.GetHash().ToString());
                     govobj.Relay(connman);
                 } else {
@@ -1015,7 +993,7 @@ void CGovernanceManager::CheckPostponedObjects(CConnman& connman)
 
 void CGovernanceManager::RequestGovernanceObject(CNode* pfrom, const uint256& nHash, CConnman& connman, bool fUseFilter)
 {
-    if(!pfrom) {
+    if (!pfrom) {
         return;
     }
 
@@ -1023,7 +1001,7 @@ void CGovernanceManager::RequestGovernanceObject(CNode* pfrom, const uint256& nH
 
     CNetMsgMaker msgMaker(pfrom->GetSendVersion());
 
-    if(pfrom->nVersion < GOVERNANCE_FILTER_PROTO_VERSION) {
+    if (pfrom->nVersion < GOVERNANCE_FILTER_PROTO_VERSION) {
         connman.PushMessage(pfrom, msgMaker.Make(NetMsgType::MNGOVERNANCESYNC, nHash));
         return;
     }
@@ -1032,15 +1010,15 @@ void CGovernanceManager::RequestGovernanceObject(CNode* pfrom, const uint256& nH
     filter.clear();
 
     int nVoteCount = 0;
-    if(fUseFilter) {
+    if (fUseFilter) {
         LOCK(cs);
         CGovernanceObject* pObj = FindGovernanceObject(nHash);
 
-        if(pObj) {
+        if (pObj) {
             filter = CBloomFilter(Params().GetConsensus().nGovernanceFilterElements, GOVERNANCE_FILTER_FP_RATE, GetRandInt(999999), BLOOM_UPDATE_ALL);
             std::vector<CGovernanceVote> vecVotes = pObj->GetVoteFile().GetVotes();
             nVoteCount = vecVotes.size();
-            for(size_t i = 0; i < vecVotes.size(); ++i) {
+            for (size_t i = 0; i < vecVotes.size(); ++i) {
                 filter.insert(vecVotes[i].GetHash());
             }
         }
@@ -1052,7 +1030,7 @@ void CGovernanceManager::RequestGovernanceObject(CNode* pfrom, const uint256& nH
 
 int CGovernanceManager::RequestGovernanceObjectVotes(CNode* pnode, CConnman& connman)
 {
-    if(pnode->nVersion < MIN_GOVERNANCE_PEER_PROTO_VERSION) return -3;
+    if (pnode->nVersion < MIN_GOVERNANCE_PEER_PROTO_VERSION) return -3;
     std::vector<CNode*> vNodesCopy;
     vNodesCopy.push_back(pnode);
     return RequestGovernanceObjectVotes(vNodesCopy, connman);
@@ -1062,7 +1040,7 @@ int CGovernanceManager::RequestGovernanceObjectVotes(const std::vector<CNode*>&
 {
     static std::map<uint256, std::map<CService, int64_t> > mapAskedRecently;
 
-    if(vNodesCopy.empty()) return -1;
+    if (vNodesCopy.empty()) return -1;
 
     int64_t nNow = GetTime();
     int nTimeout = 60 * 60;
@@ -1078,30 +1056,30 @@ int CGovernanceManager::RequestGovernanceObjectVotes(const std::vector<CNode*>&
     // On mainnet nMaxObjRequestsPerNode is always set to 1.
     int nMaxObjRequestsPerNode = 1;
     size_t nProjectedVotes = 2000;
-    if(Params().NetworkIDString() != CBaseChainParams::MAIN) {
+    if (Params().NetworkIDString() != CBaseChainParams::MAIN) {
         nMaxObjRequestsPerNode = std::max(1, int(nProjectedVotes / std::max(1, mnodeman.size())));
     }
 
     {
         LOCK2(cs_main, cs);
 
-        if(mapObjects.empty()) return -2;
+        if (mapObjects.empty()) return -2;
 
         for (const auto& objPair : mapObjects) {
             uint256 nHash = objPair.first;
-            if(mapAskedRecently.count(nHash)) {
+            if (mapAskedRecently.count(nHash)) {
                 auto it = mapAskedRecently[nHash].begin();
-                while(it != mapAskedRecently[nHash].end()) {
-                    if(it->second < nNow) {
+                while (it != mapAskedRecently[nHash].end()) {
+                    if (it->second < nNow) {
                         mapAskedRecently[nHash].erase(it++);
                     } else {
                         ++it;
                     }
                 }
-                if(mapAskedRecently[nHash].size() >= nPeersPerHashMax) continue;
+                if (mapAskedRecently[nHash].size() >= nPeersPerHashMax) continue;
             }
 
-            if(objPair.second.nObjectType == GOVERNANCE_OBJECT_TRIGGER) {
+            if (objPair.second.nObjectType == GOVERNANCE_OBJECT_TRIGGER) {
                 vTriggerObjHashes.push_back(nHash);
             } else {
                 vOtherObjHashes.push_back(nHash);
@@ -1110,7 +1088,7 @@ int CGovernanceManager::RequestGovernanceObjectVotes(const std::vector<CNode*>&
     }
 
     LogPrint("gobject", "CGovernanceManager::RequestGovernanceObjectVotes -- start: vTriggerObjHashes %d vOtherObjHashes %d mapAskedRecently %d\n",
-                vTriggerObjHashes.size(), vOtherObjHashes.size(), mapAskedRecently.size());
+        vTriggerObjHashes.size(), vOtherObjHashes.size(), mapAskedRecently.size());
 
     FastRandomContext insecure_rand;
     std::random_shuffle(vTriggerObjHashes.begin(), vTriggerObjHashes.end(), insecure_rand);
@@ -1120,10 +1098,10 @@ int CGovernanceManager::RequestGovernanceObjectVotes(const std::vector<CNode*>&
         uint256 nHashGovobj;
 
         // ask for triggers first
-        if(vTriggerObjHashes.size()) {
+        if (vTriggerObjHashes.size()) {
             nHashGovobj = vTriggerObjHashes.back();
         } else {
-            if(vOtherObjHashes.empty()) break;
+            if (vOtherObjHashes.empty()) break;
             nHashGovobj = vOtherObjHashes.back();
         }
         bool fAsked = false;
@@ -1132,31 +1110,31 @@ int CGovernanceManager::RequestGovernanceObjectVotes(const std::vector<CNode*>&
             // they stay connected for a short period of time and it's possible that we won't get everything we should.
             // Only use outbound connections - inbound connection could be a "masternode" connection
             // initiated from another node, so skip it too.
-            if(pnode->fMasternode || (fMasternodeMode && pnode->fInbound)) continue;
+            if (pnode->fMasternode || (fMasternodeMode && pnode->fInbound)) continue;
             // only use up to date peers
-            if(pnode->nVersion < MIN_GOVERNANCE_PEER_PROTO_VERSION) continue;
+            if (pnode->nVersion < MIN_GOVERNANCE_PEER_PROTO_VERSION) continue;
             // stop early to prevent setAskFor overflow
             size_t nProjectedSize = pnode->setAskFor.size() + nProjectedVotes;
-            if(nProjectedSize > SETASKFOR_MAX_SZ/2) continue;
+            if (nProjectedSize > SETASKFOR_MAX_SZ / 2) continue;
             // to early to ask the same node
-            if(mapAskedRecently[nHashGovobj].count(pnode->addr)) continue;
+            if (mapAskedRecently[nHashGovobj].count(pnode->addr)) continue;
 
             RequestGovernanceObject(pnode, nHashGovobj, connman, true);
             mapAskedRecently[nHashGovobj][pnode->addr] = nNow + nTimeout;
             fAsked = true;
             // stop loop if max number of peers per obj was asked
-            if(mapAskedRecently[nHashGovobj].size() >= nPeersPerHashMax) break;
+            if (mapAskedRecently[nHashGovobj].size() >= nPeersPerHashMax) break;
         }
         // NOTE: this should match `if` above (the one before `while`)
-        if(vTriggerObjHashes.size()) {
+        if (vTriggerObjHashes.size()) {
             vTriggerObjHashes.pop_back();
         } else {
             vOtherObjHashes.pop_back();
         }
-        if(!fAsked) i--;
+        if (!fAsked) i--;
     }
     LogPrint("gobject", "CGovernanceManager::RequestGovernanceObjectVotes -- end: vTriggerObjHashes %d vOtherObjHashes %d mapAskedRecently %d\n",
-                vTriggerObjHashes.size(), vOtherObjHashes.size(), mapAskedRecently.size());
+        vTriggerObjHashes.size(), vOtherObjHashes.size(), mapAskedRecently.size());
 
     return int(vTriggerObjHashes.size() + vOtherObjHashes.size());
 }
@@ -1176,7 +1154,7 @@ bool CGovernanceManager::AcceptVoteMessage(const uint256& nHash)
 bool CGovernanceManager::AcceptMessage(const uint256& nHash, hash_s_t& setHash)
 {
     hash_s_it it = setHash.find(nHash);
-    if(it == setHash.end()) {
+    if (it == setHash.end()) {
         // We never requested this
         return false;
     }
@@ -1193,7 +1171,7 @@ void CGovernanceManager::RebuildIndexes()
     for (auto& objPair : mapObjects) {
         CGovernanceObject& govobj = objPair.second;
         std::vector<CGovernanceVote> vecVotes = govobj.GetVoteFile().GetVotes();
-        for(size_t i = 0; i < vecVotes.size(); ++i) {
+        for (size_t i = 0; i < vecVotes.size(); ++i) {
             cmapVoteToObject.Insert(vecVotes[i].GetHash(), &govobj);
         }
     }
@@ -1206,7 +1184,7 @@ void CGovernanceManager::AddCachedTriggers()
     for (auto& objpair : mapObjects) {
         CGovernanceObject& govobj = objpair.second;
 
-        if(govobj.nObjectType != GOVERNANCE_OBJECT_TRIGGER) {
+        if (govobj.nObjectType != GOVERNANCE_OBJECT_TRIGGER) {
             continue;
         }
 
@@ -1239,23 +1217,23 @@ std::string CGovernanceManager::ToString() const
     int nOtherCount = 0;
 
     for (const auto& objPair : mapObjects) {
-        switch(objPair.second.GetObjectType()) {
-            case GOVERNANCE_OBJECT_PROPOSAL:
-                nProposalCount++;
-                break;
-            case GOVERNANCE_OBJECT_TRIGGER:
-                nTriggerCount++;
-                break;
-            default:
-                nOtherCount++;
-                break;
+        switch (objPair.second.GetObjectType()) {
+        case GOVERNANCE_OBJECT_PROPOSAL:
+            nProposalCount++;
+            break;
+        case GOVERNANCE_OBJECT_TRIGGER:
+            nTriggerCount++;
+            break;
+        default:
+            nOtherCount++;
+            break;
         }
     }
 
     return strprintf("Governance Objects: %d (Proposals: %d, Triggers: %d, Other: %d; Erased: %d), Votes: %d",
-                    (int)mapObjects.size(),
-                    nProposalCount, nTriggerCount, nOtherCount, (int)mapErasedGovernanceObjects.size(),
-                    (int)cmapVoteToObject.GetSize());
+        (int)mapObjects.size(),
+        nProposalCount, nTriggerCount, nOtherCount, (int)mapErasedGovernanceObjects.size(),
+        (int)cmapVoteToObject.GetSize());
 }
 
 UniValue CGovernanceManager::ToJson() const
@@ -1267,16 +1245,16 @@ UniValue CGovernanceManager::ToJson() const
     int nOtherCount = 0;
 
     for (const auto& objpair : mapObjects) {
-        switch(objpair.second.GetObjectType()) {
-            case GOVERNANCE_OBJECT_PROPOSAL:
-                nProposalCount++;
-                break;
-            case GOVERNANCE_OBJECT_TRIGGER:
-                nTriggerCount++;
-                break;
-            default:
-                nOtherCount++;
-                break;
+        switch (objpair.second.GetObjectType()) {
+        case GOVERNANCE_OBJECT_PROPOSAL:
+            nProposalCount++;
+            break;
+        case GOVERNANCE_OBJECT_TRIGGER:
+            nTriggerCount++;
+            break;
+        default:
+            nOtherCount++;
+            break;
         }
     }
 
@@ -1290,14 +1268,14 @@ UniValue CGovernanceManager::ToJson() const
     return jsonObj;
 }
 
-void CGovernanceManager::UpdatedBlockTip(const CBlockIndex *pindex, CConnman& connman)
+void CGovernanceManager::UpdatedBlockTip(const CBlockIndex* pindex, CConnman& connman)
 {
     // Note this gets called from ActivateBestChain without cs_main being held
     // so it should be safe to lock our mutex here without risking a deadlock
     // On the other hand it should be safe for us to access pindex without holding a lock
     // on cs_main because the CBlockIndex objects are dynamically allocated and
     // presumably never deleted.
-    if(!pindex) {
+    if (!pindex) {
         return;
     }
 
@@ -1318,20 +1296,20 @@ void CGovernanceManager::RequestOrphanObjects(CConnman& connman)
         std::vector<uint256> vecHashes;
         LOCK(cs);
         cmmapOrphanVotes.GetKeys(vecHashes);
-        for(size_t i = 0; i < vecHashes.size(); ++i) {
+        for (size_t i = 0; i < vecHashes.size(); ++i) {
             const uint256& nHash = vecHashes[i];
-            if(mapObjects.find(nHash) == mapObjects.end()) {
+            if (mapObjects.find(nHash) == mapObjects.end()) {
                 vecHashesFiltered.push_back(nHash);
             }
         }
     }
 
     LogPrint("gobject", "CGovernanceObject::RequestOrphanObjects -- number objects = %d\n", vecHashesFiltered.size());
-    for(size_t i = 0; i < vecHashesFiltered.size(); ++i) {
+    for (size_t i = 0; i < vecHashesFiltered.size(); ++i) {
         const uint256& nHash = vecHashesFiltered[i];
-        for(size_t j = 0; j < vNodesCopy.size(); ++j) {
+        for (size_t j = 0; j < vNodesCopy.size(); ++j) {
             CNode* pnode = vNodesCopy[j];
-            if(pnode->fMasternode) {
+            if (pnode->fMasternode) {
                 continue;
             }
             RequestGovernanceObject(pnode, nHash, connman);
@@ -1349,11 +1327,11 @@ void CGovernanceManager::CleanOrphanObjects()
     int64_t nNow = GetAdjustedTime();
 
     vote_cmm_t::list_cit it = items.begin();
-    while(it != items.end()) {
+    while (it != items.end()) {
         vote_cmm_t::list_cit prevIt = it;
         ++it;
         const vote_time_pair_t& pairVote = prevIt->value;
-        if(pairVote.second < nNow) {
+        if (pairVote.second < nNow) {
             cmmapOrphanVotes.Erase(prevIt->key, prevIt->value);
         }
     }
diff --git a/src/governance.h b/src/governance.h
index 9a0bac58d1b3..6d07fdcafbbc 100644
--- a/src/governance.h
+++ b/src/governance.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2017 The Dash Core developers
+// Copyright (c) 2014-2018 The Dash Core developers
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
@@ -29,7 +29,8 @@ class CGovernanceVote;
 extern CGovernanceManager governance;
 
 struct ExpirationInfo {
-    ExpirationInfo(int64_t _nExpirationTime, int _idFrom) : nExpirationTime(_nExpirationTime), idFrom(_idFrom) {}
+    ExpirationInfo(int64_t _nExpirationTime, int _idFrom) :
+        nExpirationTime(_nExpirationTime), idFrom(_idFrom) {}
 
     int64_t nExpirationTime;
     NodeId idFrom;
@@ -51,16 +52,17 @@ class CRateCheckBuffer
     bool fBufferEmpty;
 
 public:
-    CRateCheckBuffer()
-        : vecTimestamps(RATE_BUFFER_SIZE),
-          nDataStart(0),
-          nDataEnd(0),
-          fBufferEmpty(true)
-        {}
+    CRateCheckBuffer() :
+        vecTimestamps(RATE_BUFFER_SIZE),
+        nDataStart(0),
+        nDataEnd(0),
+        fBufferEmpty(true)
+    {
+    }
 
     void AddTimestamp(int64_t nTimestamp)
     {
-        if((nDataEnd == nDataStart) && !fBufferEmpty) {
+        if ((nDataEnd == nDataStart) && !fBufferEmpty) {
             // Buffer full, discard 1st element
             nDataStart = (nDataStart + 1) % RATE_BUFFER_SIZE;
         }
@@ -73,15 +75,15 @@ class CRateCheckBuffer
     {
         int nIndex = nDataStart;
         int64_t nMin = std::numeric_limits<int64_t>::max();
-        if(fBufferEmpty) {
+        if (fBufferEmpty) {
             return nMin;
         }
         do {
-            if(vecTimestamps[nIndex] < nMin) {
+            if (vecTimestamps[nIndex] < nMin) {
                 nMin = vecTimestamps[nIndex];
             }
             nIndex = (nIndex + 1) % RATE_BUFFER_SIZE;
-        } while(nIndex != nDataEnd);
+        } while (nIndex != nDataEnd);
         return nMin;
     }
 
@@ -89,28 +91,27 @@ class CRateCheckBuffer
     {
         int nIndex = nDataStart;
         int64_t nMax = 0;
-        if(fBufferEmpty) {
+        if (fBufferEmpty) {
             return nMax;
         }
         do {
-            if(vecTimestamps[nIndex] > nMax) {
+            if (vecTimestamps[nIndex] > nMax) {
                 nMax = vecTimestamps[nIndex];
             }
             nIndex = (nIndex + 1) % RATE_BUFFER_SIZE;
-        } while(nIndex != nDataEnd);
+        } while (nIndex != nDataEnd);
         return nMax;
     }
 
     int GetCount()
     {
         int nCount = 0;
-        if(fBufferEmpty) {
+        if (fBufferEmpty) {
             return 0;
         }
-        if(nDataEnd > nDataStart) {
+        if (nDataEnd > nDataStart) {
             nCount = nDataEnd - nDataStart;
-        }
-        else {
+        } else {
             nCount = RATE_BUFFER_SIZE - nDataStart + nDataEnd;
         }
 
@@ -120,12 +121,12 @@ class CRateCheckBuffer
     double GetRate()
     {
         int nCount = GetCount();
-        if(nCount < RATE_BUFFER_SIZE) {
+        if (nCount < RATE_BUFFER_SIZE) {
             return 0.0;
         }
         int64_t nMin = GetMinTimestamp();
         int64_t nMax = GetMaxTimestamp();
-        if(nMin == nMax) {
+        if (nMin == nMax) {
             // multiple objects with the same timestamp => infinite rate
             return 1.0e10;
         }
@@ -153,10 +154,11 @@ class CGovernanceManager
 
 public: // Types
     struct last_object_rec {
-        last_object_rec(bool fStatusOKIn = true)
-            : triggerBuffer(),
-              fStatusOK(fStatusOKIn)
-            {}
+        last_object_rec(bool fStatusOKIn = true) :
+            triggerBuffer(),
+            fStatusOK(fStatusOKIn)
+        {
+        }
 
         ADD_SERIALIZE_METHODS;
 
@@ -192,7 +194,7 @@ class CGovernanceManager
 
     typedef object_m_t::size_type size_type;
 
-    typedef std::map<COutPoint, last_object_rec > txout_m_t;
+    typedef std::map<COutPoint, last_object_rec> txout_m_t;
 
     typedef txout_m_t::iterator txout_m_it;
 
@@ -265,7 +267,8 @@ class CGovernanceManager
         bool fPrevValue;
 
     public:
-        ScopedLockBool(CCriticalSection& _cs, bool& _ref, bool _value) : ref(_ref)
+        ScopedLockBool(CCriticalSection& _cs, bool& _ref, bool _value) :
+            ref(_ref)
         {
             AssertLockHeld(_cs);
             fPrevValue = ref;
@@ -311,7 +314,7 @@ class CGovernanceManager
 
     void UpdateCachesAndClean();
 
-    void CheckAndRemove() {UpdateCachesAndClean();}
+    void CheckAndRemove() { UpdateCachesAndClean(); }
 
     void Clear()
     {
@@ -332,13 +335,13 @@ class CGovernanceManager
     ADD_SERIALIZE_METHODS;
 
     template <typename Stream, typename Operation>
-    inline void SerializationOp(Stream& s, Operation ser_action) {
+    inline void SerializationOp(Stream& s, Operation ser_action)
+    {
         LOCK(cs);
         std::string strVersion;
-        if(ser_action.ForRead()) {
+        if (ser_action.ForRead()) {
             READWRITE(strVersion);
-        }
-        else {
+        } else {
             strVersion = SERIALIZATION_VERSION_STRING;
             READWRITE(strVersion);
         }
@@ -348,13 +351,13 @@ class CGovernanceManager
         READWRITE(cmmapOrphanVotes);
         READWRITE(mapObjects);
         READWRITE(mapLastMasternodeObject);
-        if(ser_action.ForRead() && (strVersion != SERIALIZATION_VERSION_STRING)) {
+        if (ser_action.ForRead() && (strVersion != SERIALIZATION_VERSION_STRING)) {
             Clear();
             return;
         }
     }
 
-    void UpdatedBlockTip(const CBlockIndex *pindex, CConnman& connman);
+    void UpdatedBlockTip(const CBlockIndex* pindex, CConnman& connman);
     int64_t GetLastDiffTime() const { return nTimeLastDiff; }
     void UpdateLastDiffTime(int64_t nTimeIn) { nTimeLastDiff = nTimeIn; }
 
@@ -387,9 +390,10 @@ class CGovernanceManager
 
     bool MasternodeRateCheck(const CGovernanceObject& govobj, bool fUpdateFailStatus, bool fForce, bool& fRateCheckBypassed);
 
-    bool ProcessVoteAndRelay(const CGovernanceVote& vote, CGovernanceException& exception, CConnman& connman) {
+    bool ProcessVoteAndRelay(const CGovernanceVote& vote, CGovernanceException& exception, CConnman& connman)
+    {
         bool fOK = ProcessVote(nullptr, vote, exception, connman);
-        if(fOK) {
+        if (fOK) {
             vote.Relay(connman);
         }
         return fOK;
@@ -401,7 +405,8 @@ class CGovernanceManager
 
     void CheckPostponedObjects(CConnman& connman);
 
-    bool AreRateChecksEnabled() const {
+    bool AreRateChecksEnabled() const
+    {
         LOCK(cs);
         return fRateChecksEnabled;
     }
@@ -443,7 +448,6 @@ class CGovernanceManager
     void RequestOrphanObjects(CConnman& connman);
 
     void CleanOrphanObjects();
-
 };
 
 #endif

From a5aca049dd0f4aae2d71e741d04457a354a3372d Mon Sep 17 00:00:00 2001
From: Nathan Marley <nathan.marley@gmail.com>
Date: Sun, 30 Sep 2018 04:02:52 -0700
Subject: [PATCH 162/400] rename vars in mnsync to make more sense (#2308)

* rename vars in mnsync to make more sense

nRequestedMasternodeAssets -> nCurrentAsset
nRequestedMasternodeAttempt -> nPeerCount

* rename var to nTriedPeerCount
---
 src/masternode-sync.cpp | 86 ++++++++++++++++++++---------------------
 src/masternode-sync.h   | 18 ++++-----
 2 files changed, 52 insertions(+), 52 deletions(-)

diff --git a/src/masternode-sync.cpp b/src/masternode-sync.cpp
index 9ff1267151a8..2581de6ebe90 100644
--- a/src/masternode-sync.cpp
+++ b/src/masternode-sync.cpp
@@ -19,13 +19,13 @@ CMasternodeSync masternodeSync;
 void CMasternodeSync::Fail()
 {
     nTimeLastFailure = GetTime();
-    nRequestedMasternodeAssets = MASTERNODE_SYNC_FAILED;
+    nCurrentAsset = MASTERNODE_SYNC_FAILED;
 }
 
 void CMasternodeSync::Reset()
 {
-    nRequestedMasternodeAssets = MASTERNODE_SYNC_INITIAL;
-    nRequestedMasternodeAttempt = 0;
+    nCurrentAsset = MASTERNODE_SYNC_INITIAL;
+    nTriedPeerCount = 0;
     nTimeAssetSyncStarted = GetTime();
     nTimeLastBumped = GetTime();
     nTimeLastFailure = 0;
@@ -40,7 +40,7 @@ void CMasternodeSync::BumpAssetLastTime(const std::string& strFuncName)
 
 std::string CMasternodeSync::GetAssetName()
 {
-    switch(nRequestedMasternodeAssets)
+    switch(nCurrentAsset)
     {
         case(MASTERNODE_SYNC_INITIAL):      return "MASTERNODE_SYNC_INITIAL";
         case(MASTERNODE_SYNC_WAITING):      return "MASTERNODE_SYNC_WAITING";
@@ -55,41 +55,41 @@ std::string CMasternodeSync::GetAssetName()
 
 void CMasternodeSync::SwitchToNextAsset(CConnman& connman)
 {
-    switch(nRequestedMasternodeAssets)
+    switch(nCurrentAsset)
     {
         case(MASTERNODE_SYNC_FAILED):
             throw std::runtime_error("Can't switch to next asset from failed, should use Reset() first!");
             break;
         case(MASTERNODE_SYNC_INITIAL):
-            nRequestedMasternodeAssets = MASTERNODE_SYNC_WAITING;
+            nCurrentAsset = MASTERNODE_SYNC_WAITING;
             LogPrintf("CMasternodeSync::SwitchToNextAsset -- Starting %s\n", GetAssetName());
             break;
         case(MASTERNODE_SYNC_WAITING):
             LogPrintf("CMasternodeSync::SwitchToNextAsset -- Completed %s in %llds\n", GetAssetName(), GetTime() - nTimeAssetSyncStarted);
             if (deterministicMNManager->IsDeterministicMNsSporkActive()) {
-                nRequestedMasternodeAssets = MASTERNODE_SYNC_GOVERNANCE;
+                nCurrentAsset = MASTERNODE_SYNC_GOVERNANCE;
             } else {
-                nRequestedMasternodeAssets = MASTERNODE_SYNC_LIST;
+                nCurrentAsset = MASTERNODE_SYNC_LIST;
             }
             LogPrintf("CMasternodeSync::SwitchToNextAsset -- Starting %s\n", GetAssetName());
             break;
         case(MASTERNODE_SYNC_LIST):
             LogPrintf("CMasternodeSync::SwitchToNextAsset -- Completed %s in %llds\n", GetAssetName(), GetTime() - nTimeAssetSyncStarted);
             if (deterministicMNManager->IsDeterministicMNsSporkActive()) {
-                nRequestedMasternodeAssets = MASTERNODE_SYNC_GOVERNANCE;
+                nCurrentAsset = MASTERNODE_SYNC_GOVERNANCE;
             } else {
-                nRequestedMasternodeAssets = MASTERNODE_SYNC_MNW;
+                nCurrentAsset = MASTERNODE_SYNC_MNW;
             }
             LogPrintf("CMasternodeSync::SwitchToNextAsset -- Starting %s\n", GetAssetName());
             break;
         case(MASTERNODE_SYNC_MNW):
             LogPrintf("CMasternodeSync::SwitchToNextAsset -- Completed %s in %llds\n", GetAssetName(), GetTime() - nTimeAssetSyncStarted);
-            nRequestedMasternodeAssets = MASTERNODE_SYNC_GOVERNANCE;
+            nCurrentAsset = MASTERNODE_SYNC_GOVERNANCE;
             LogPrintf("CMasternodeSync::SwitchToNextAsset -- Starting %s\n", GetAssetName());
             break;
         case(MASTERNODE_SYNC_GOVERNANCE):
             LogPrintf("CMasternodeSync::SwitchToNextAsset -- Completed %s in %llds\n", GetAssetName(), GetTime() - nTimeAssetSyncStarted);
-            nRequestedMasternodeAssets = MASTERNODE_SYNC_FINISHED;
+            nCurrentAsset = MASTERNODE_SYNC_FINISHED;
             uiInterface.NotifyAdditionalDataSyncProgressChanged(1);
             //try to activate our masternode if possible
             legacyActiveMasternodeManager.ManageState(connman);
@@ -101,14 +101,14 @@ void CMasternodeSync::SwitchToNextAsset(CConnman& connman)
 
             break;
     }
-    nRequestedMasternodeAttempt = 0;
+    nTriedPeerCount = 0;
     nTimeAssetSyncStarted = GetTime();
     BumpAssetLastTime("CMasternodeSync::SwitchToNextAsset");
 }
 
 std::string CMasternodeSync::GetSyncStatus()
 {
-    switch (masternodeSync.nRequestedMasternodeAssets) {
+    switch (masternodeSync.nCurrentAsset) {
         case MASTERNODE_SYNC_INITIAL:       return _("Synchroning blockchain...");
         case MASTERNODE_SYNC_WAITING:       return _("Synchronization pending...");
         case MASTERNODE_SYNC_LIST:          return _("Synchronizing masternodes...");
@@ -170,8 +170,8 @@ void CMasternodeSync::ProcessTick(CConnman& connman)
     }
 
     // Calculate "progress" for LOG reporting / GUI notification
-    double nSyncProgress = double(nRequestedMasternodeAttempt + (nRequestedMasternodeAssets - 1) * 8) / (8*4);
-    LogPrintf("CMasternodeSync::ProcessTick -- nTick %d nRequestedMasternodeAssets %d nRequestedMasternodeAttempt %d nSyncProgress %f\n", nTick, nRequestedMasternodeAssets, nRequestedMasternodeAttempt, nSyncProgress);
+    double nSyncProgress = double(nTriedPeerCount + (nCurrentAsset - 1) * 8) / (8*4);
+    LogPrintf("CMasternodeSync::ProcessTick -- nTick %d nCurrentAsset %d nTriedPeerCount %d nSyncProgress %f\n", nTick, nCurrentAsset, nTriedPeerCount, nSyncProgress);
     uiInterface.NotifyAdditionalDataSyncProgressChanged(nSyncProgress);
 
     std::vector<CNode*> vNodesCopy = connman.CopyNodeVector(CConnman::FullyConnectedOnly);
@@ -189,20 +189,20 @@ void CMasternodeSync::ProcessTick(CConnman& connman)
         // QUICK MODE (REGTEST ONLY!)
         if(Params().NetworkIDString() == CBaseChainParams::REGTEST)
         {
-            if (nRequestedMasternodeAssets == MASTERNODE_SYNC_WAITING) {
+            if (nCurrentAsset == MASTERNODE_SYNC_WAITING) {
                 connman.PushMessage(pnode, msgMaker.Make(NetMsgType::GETSPORKS)); //get current network sporks
                 SwitchToNextAsset(connman);
-            } else if (nRequestedMasternodeAssets == MASTERNODE_SYNC_LIST) {
+            } else if (nCurrentAsset == MASTERNODE_SYNC_LIST) {
                 if (!deterministicMNManager->IsDeterministicMNsSporkActive()) {
                     mnodeman.DsegUpdate(pnode, connman);
                 }
                 SwitchToNextAsset(connman);
-            } else if (nRequestedMasternodeAssets == MASTERNODE_SYNC_MNW) {
+            } else if (nCurrentAsset == MASTERNODE_SYNC_MNW) {
                 if (!deterministicMNManager->IsDeterministicMNsSporkActive()) {
                     connman.PushMessage(pnode, msgMaker.Make(NetMsgType::MASTERNODEPAYMENTSYNC)); //sync payment votes
                 }
                 SwitchToNextAsset(connman);
-            } else if (nRequestedMasternodeAssets == MASTERNODE_SYNC_GOVERNANCE) {
+            } else if (nCurrentAsset == MASTERNODE_SYNC_GOVERNANCE) {
                 SendGovernanceSyncRequest(pnode, connman);
                 SwitchToNextAsset(connman);
             }
@@ -227,12 +227,12 @@ void CMasternodeSync::ProcessTick(CConnman& connman)
                 netfulfilledman.AddFulfilledRequest(pnode->addr, "spork-sync");
                 // get current network sporks
                 connman.PushMessage(pnode, msgMaker.Make(NetMsgType::GETSPORKS));
-                LogPrintf("CMasternodeSync::ProcessTick -- nTick %d nRequestedMasternodeAssets %d -- requesting sporks from peer=%d\n", nTick, nRequestedMasternodeAssets, pnode->id);
+                LogPrintf("CMasternodeSync::ProcessTick -- nTick %d nCurrentAsset %d -- requesting sporks from peer=%d\n", nTick, nCurrentAsset, pnode->id);
             }
 
             // INITIAL TIMEOUT
 
-            if(nRequestedMasternodeAssets == MASTERNODE_SYNC_WAITING) {
+            if(nCurrentAsset == MASTERNODE_SYNC_WAITING) {
                 if(GetTime() - nTimeLastBumped > MASTERNODE_SYNC_TIMEOUT_SECONDS) {
                     // At this point we know that:
                     // a) there are peers (because we are looping on at least one of them);
@@ -248,18 +248,18 @@ void CMasternodeSync::ProcessTick(CConnman& connman)
 
             // MNLIST : SYNC MASTERNODE LIST FROM OTHER CONNECTED CLIENTS
 
-            if(nRequestedMasternodeAssets == MASTERNODE_SYNC_LIST) {
+            if(nCurrentAsset == MASTERNODE_SYNC_LIST) {
                 if (deterministicMNManager->IsDeterministicMNsSporkActive()) {
                     SwitchToNextAsset(connman);
                     connman.ReleaseNodeVector(vNodesCopy);
                     return;
                 }
 
-                LogPrint("masternode", "CMasternodeSync::ProcessTick -- nTick %d nRequestedMasternodeAssets %d nTimeLastBumped %lld GetTime() %lld diff %lld\n", nTick, nRequestedMasternodeAssets, nTimeLastBumped, GetTime(), GetTime() - nTimeLastBumped);
+                LogPrint("masternode", "CMasternodeSync::ProcessTick -- nTick %d nCurrentAsset %d nTimeLastBumped %lld GetTime() %lld diff %lld\n", nTick, nCurrentAsset, nTimeLastBumped, GetTime(), GetTime() - nTimeLastBumped);
                 // check for timeout first
                 if(GetTime() - nTimeLastBumped > MASTERNODE_SYNC_TIMEOUT_SECONDS) {
-                    LogPrintf("CMasternodeSync::ProcessTick -- nTick %d nRequestedMasternodeAssets %d -- timeout\n", nTick, nRequestedMasternodeAssets);
-                    if (nRequestedMasternodeAttempt == 0) {
+                    LogPrintf("CMasternodeSync::ProcessTick -- nTick %d nCurrentAsset %d -- timeout\n", nTick, nCurrentAsset);
+                    if (nTriedPeerCount == 0) {
                         LogPrintf("CMasternodeSync::ProcessTick -- ERROR: failed to sync %s\n", GetAssetName());
                         // there is no way we can continue without masternode list, fail here and try later
                         Fail();
@@ -272,7 +272,7 @@ void CMasternodeSync::ProcessTick(CConnman& connman)
                 }
 
                 // request from three peers max
-                if (nRequestedMasternodeAttempt > 2) {
+                if (nTriedPeerCount > 2) {
                     connman.ReleaseNodeVector(vNodesCopy);
                     return;
                 }
@@ -282,7 +282,7 @@ void CMasternodeSync::ProcessTick(CConnman& connman)
                 netfulfilledman.AddFulfilledRequest(pnode->addr, "masternode-list-sync");
 
                 if (pnode->nVersion < mnpayments.GetMinMasternodePaymentsProto()) continue;
-                nRequestedMasternodeAttempt++;
+                nTriedPeerCount++;
 
                 mnodeman.DsegUpdate(pnode, connman);
 
@@ -292,20 +292,20 @@ void CMasternodeSync::ProcessTick(CConnman& connman)
 
             // MNW : SYNC MASTERNODE PAYMENT VOTES FROM OTHER CONNECTED CLIENTS
 
-            if(nRequestedMasternodeAssets == MASTERNODE_SYNC_MNW) {
+            if(nCurrentAsset == MASTERNODE_SYNC_MNW) {
                 if (deterministicMNManager->IsDeterministicMNsSporkActive()) {
                     SwitchToNextAsset(connman);
                     connman.ReleaseNodeVector(vNodesCopy);
                     return;
                 }
 
-                LogPrint("mnpayments", "CMasternodeSync::ProcessTick -- nTick %d nRequestedMasternodeAssets %d nTimeLastBumped %lld GetTime() %lld diff %lld\n", nTick, nRequestedMasternodeAssets, nTimeLastBumped, GetTime(), GetTime() - nTimeLastBumped);
+                LogPrint("mnpayments", "CMasternodeSync::ProcessTick -- nTick %d nCurrentAsset %d nTimeLastBumped %lld GetTime() %lld diff %lld\n", nTick, nCurrentAsset, nTimeLastBumped, GetTime(), GetTime() - nTimeLastBumped);
                 // check for timeout first
                 // This might take a lot longer than MASTERNODE_SYNC_TIMEOUT_SECONDS due to new blocks,
                 // but that should be OK and it should timeout eventually.
                 if(GetTime() - nTimeLastBumped > MASTERNODE_SYNC_TIMEOUT_SECONDS) {
-                    LogPrintf("CMasternodeSync::ProcessTick -- nTick %d nRequestedMasternodeAssets %d -- timeout\n", nTick, nRequestedMasternodeAssets);
-                    if (nRequestedMasternodeAttempt == 0) {
+                    LogPrintf("CMasternodeSync::ProcessTick -- nTick %d nCurrentAsset %d -- timeout\n", nTick, nCurrentAsset);
+                    if (nTriedPeerCount == 0) {
                         LogPrintf("CMasternodeSync::ProcessTick -- ERROR: failed to sync %s\n", GetAssetName());
                         // probably not a good idea to proceed without winner list
                         Fail();
@@ -320,15 +320,15 @@ void CMasternodeSync::ProcessTick(CConnman& connman)
                 // check for data
                 // if mnpayments already has enough blocks and votes, switch to the next asset
                 // try to fetch data from at least two peers though
-                if(nRequestedMasternodeAttempt > 1 && mnpayments.IsEnoughData()) {
-                    LogPrintf("CMasternodeSync::ProcessTick -- nTick %d nRequestedMasternodeAssets %d -- found enough data\n", nTick, nRequestedMasternodeAssets);
+                if(nTriedPeerCount > 1 && mnpayments.IsEnoughData()) {
+                    LogPrintf("CMasternodeSync::ProcessTick -- nTick %d nCurrentAsset %d -- found enough data\n", nTick, nCurrentAsset);
                     SwitchToNextAsset(connman);
                     connman.ReleaseNodeVector(vNodesCopy);
                     return;
                 }
 
                 // request from three peers max
-                if (nRequestedMasternodeAttempt > 2) {
+                if (nTriedPeerCount > 2) {
                     connman.ReleaseNodeVector(vNodesCopy);
                     return;
                 }
@@ -338,7 +338,7 @@ void CMasternodeSync::ProcessTick(CConnman& connman)
                 netfulfilledman.AddFulfilledRequest(pnode->addr, "masternode-payment-sync");
 
                 if(pnode->nVersion < mnpayments.GetMinMasternodePaymentsProto()) continue;
-                nRequestedMasternodeAttempt++;
+                nTriedPeerCount++;
 
                 // ask node for all payment votes it has (new nodes will only return votes for future payments)
                 connman.PushMessage(pnode, msgMaker.Make(NetMsgType::MASTERNODEPAYMENTSYNC));
@@ -351,13 +351,13 @@ void CMasternodeSync::ProcessTick(CConnman& connman)
 
             // GOVOBJ : SYNC GOVERNANCE ITEMS FROM OUR PEERS
 
-            if(nRequestedMasternodeAssets == MASTERNODE_SYNC_GOVERNANCE) {
-                LogPrint("gobject", "CMasternodeSync::ProcessTick -- nTick %d nRequestedMasternodeAssets %d nTimeLastBumped %lld GetTime() %lld diff %lld\n", nTick, nRequestedMasternodeAssets, nTimeLastBumped, GetTime(), GetTime() - nTimeLastBumped);
+            if(nCurrentAsset == MASTERNODE_SYNC_GOVERNANCE) {
+                LogPrint("gobject", "CMasternodeSync::ProcessTick -- nTick %d nCurrentAsset %d nTimeLastBumped %lld GetTime() %lld diff %lld\n", nTick, nCurrentAsset, nTimeLastBumped, GetTime(), GetTime() - nTimeLastBumped);
 
                 // check for timeout first
                 if(GetTime() - nTimeLastBumped > MASTERNODE_SYNC_TIMEOUT_SECONDS) {
-                    LogPrintf("CMasternodeSync::ProcessTick -- nTick %d nRequestedMasternodeAssets %d -- timeout\n", nTick, nRequestedMasternodeAssets);
-                    if(nRequestedMasternodeAttempt == 0) {
+                    LogPrintf("CMasternodeSync::ProcessTick -- nTick %d nCurrentAsset %d -- timeout\n", nTick, nCurrentAsset);
+                    if(nTriedPeerCount == 0) {
                         LogPrintf("CMasternodeSync::ProcessTick -- WARNING: failed to sync %s\n", GetAssetName());
                         // it's kind of ok to skip this for now, hopefully we'll catch up later?
                     }
@@ -387,7 +387,7 @@ void CMasternodeSync::ProcessTick(CConnman& connman)
                             // after that and less then 0.01% or MASTERNODE_SYNC_TICK_SECONDS
                             // (i.e. 1 per second) votes were recieved during the last tick.
                             // We can be pretty sure that we are done syncing.
-                            LogPrintf("CMasternodeSync::ProcessTick -- nTick %d nRequestedMasternodeAssets %d -- asked for all objects, nothing to do\n", nTick, nRequestedMasternodeAssets);
+                            LogPrintf("CMasternodeSync::ProcessTick -- nTick %d nCurrentAsset %d -- asked for all objects, nothing to do\n", nTick, nCurrentAsset);
                             // reset nTimeNoObjectsLeft to be able to use the same condition on resync
                             nTimeNoObjectsLeft = 0;
                             SwitchToNextAsset(connman);
@@ -402,7 +402,7 @@ void CMasternodeSync::ProcessTick(CConnman& connman)
                 netfulfilledman.AddFulfilledRequest(pnode->addr, "governance-sync");
 
                 if (pnode->nVersion < MIN_GOVERNANCE_PEER_PROTO_VERSION) continue;
-                nRequestedMasternodeAttempt++;
+                nTriedPeerCount++;
 
                 SendGovernanceSyncRequest(pnode, connman);
 
@@ -496,7 +496,7 @@ void CMasternodeSync::UpdatedBlockTip(const CBlockIndex *pindexNew, bool fInitia
     if (!IsBlockchainSynced() && fReachedBestHeader) {
         if (fLiteMode) {
             // nothing to do in lite mode, just finish the process immediately
-            nRequestedMasternodeAssets = MASTERNODE_SYNC_FINISHED;
+            nCurrentAsset = MASTERNODE_SYNC_FINISHED;
             return;
         }
         // Reached best header while being in initial mode.
diff --git a/src/masternode-sync.h b/src/masternode-sync.h
index 1ae54a6ec852..e0632c267238 100644
--- a/src/masternode-sync.h
+++ b/src/masternode-sync.h
@@ -32,9 +32,9 @@ class CMasternodeSync
 {
 private:
     // Keep track of current asset
-    int nRequestedMasternodeAssets;
+    int nCurrentAsset;
     // Count peers we've requested the asset from
-    int nRequestedMasternodeAttempt;
+    int nTriedPeerCount;
 
     // Time when current masternode asset sync started
     int64_t nTimeAssetSyncStarted;
@@ -51,14 +51,14 @@ class CMasternodeSync
 
     void SendGovernanceSyncRequest(CNode* pnode, CConnman& connman);
 
-    bool IsFailed() { return nRequestedMasternodeAssets == MASTERNODE_SYNC_FAILED; }
-    bool IsBlockchainSynced() { return nRequestedMasternodeAssets > MASTERNODE_SYNC_WAITING; }
-    bool IsMasternodeListSynced() { return nRequestedMasternodeAssets > MASTERNODE_SYNC_LIST; }
-    bool IsWinnersListSynced() { return nRequestedMasternodeAssets > MASTERNODE_SYNC_MNW; }
-    bool IsSynced() { return nRequestedMasternodeAssets == MASTERNODE_SYNC_FINISHED; }
+    bool IsFailed() { return nCurrentAsset == MASTERNODE_SYNC_FAILED; }
+    bool IsBlockchainSynced() { return nCurrentAsset > MASTERNODE_SYNC_WAITING; }
+    bool IsMasternodeListSynced() { return nCurrentAsset > MASTERNODE_SYNC_LIST; }
+    bool IsWinnersListSynced() { return nCurrentAsset > MASTERNODE_SYNC_MNW; }
+    bool IsSynced() { return nCurrentAsset == MASTERNODE_SYNC_FINISHED; }
 
-    int GetAssetID() { return nRequestedMasternodeAssets; }
-    int GetAttempt() { return nRequestedMasternodeAttempt; }
+    int GetAssetID() { return nCurrentAsset; }
+    int GetAttempt() { return nTriedPeerCount; }
     void BumpAssetLastTime(const std::string& strFuncName);
     int64_t GetAssetStartTime() { return nTimeAssetSyncStarted; }
     std::string GetAssetName();

From 8a1b513560be435cd76f1ad63ae4f199288c04ee Mon Sep 17 00:00:00 2001
From: UdjinM6 <UdjinM6@users.noreply.github.com>
Date: Sun, 30 Sep 2018 14:03:13 +0300
Subject: [PATCH 163/400] Backport: Fix Qt build with XCode (for depends)
 (#2325)

* [Depends] Fix Qt build with Xcode 9.2

GitHub-Pull: #11995
Rebased-From: 2b1f794

* depends: Fix Qt build with XCode 9.3

GitHub-Pull: #12946
Rebased-From: 5b4fc3e

* add newline
---
 depends/packages/qt.mk                        |  5 +-
 .../patches/qt/fix-cocoahelpers-macos.patch   | 70 +++++++++++++++++++
 depends/patches/qt/qfixed-coretext.patch      | 34 +++++++++
 3 files changed, 108 insertions(+), 1 deletion(-)
 create mode 100644 depends/patches/qt/fix-cocoahelpers-macos.patch
 create mode 100644 depends/patches/qt/qfixed-coretext.patch

diff --git a/depends/packages/qt.mk b/depends/packages/qt.mk
index e8301eb692a8..1f5af9be4118 100644
--- a/depends/packages/qt.mk
+++ b/depends/packages/qt.mk
@@ -8,7 +8,8 @@ $(package)_dependencies=openssl zlib
 $(package)_linux_dependencies=freetype fontconfig libxcb libX11 xproto libXext
 $(package)_build_subdir=qtbase
 $(package)_qt_libs=corelib network widgets gui plugins testlib
-$(package)_patches=mac-qmake.conf mingw-uuidof.patch pidlist_absolute.patch fix-xcb-include-order.patch fix_qt_pkgconfig.patch
+$(package)_patches=mac-qmake.conf mingw-uuidof.patch pidlist_absolute.patch fix-xcb-include-order.patch
+$(package)_patches+=fix_qt_pkgconfig.patch fix-cocoahelpers-macos.patch qfixed-coretext.patch
 
 $(package)_qttranslations_file_name=qttranslations-$($(package)_suffix)
 $(package)_qttranslations_sha256_hash=3a15aebd523c6d89fb97b2d3df866c94149653a26d27a00aac9b6d3020bc5a1d
@@ -140,6 +141,8 @@ define $(package)_preprocess_cmds
   patch -p1 < $($(package)_patch_dir)/pidlist_absolute.patch && \
   patch -p1 < $($(package)_patch_dir)/fix-xcb-include-order.patch && \
   patch -p1 < $($(package)_patch_dir)/fix_qt_pkgconfig.patch && \
+  patch -p1 < $($(package)_patch_dir)/fix-cocoahelpers-macos.patch && \
+  patch -p1 < $($(package)_patch_dir)/qfixed-coretext.patch && \
   echo "!host_build: QMAKE_CFLAGS     += $($(package)_cflags) $($(package)_cppflags)" >> qtbase/mkspecs/common/gcc-base.conf && \
   echo "!host_build: QMAKE_CXXFLAGS   += $($(package)_cxxflags) $($(package)_cppflags)" >> qtbase/mkspecs/common/gcc-base.conf && \
   echo "!host_build: QMAKE_LFLAGS     += $($(package)_ldflags)" >> qtbase/mkspecs/common/gcc-base.conf && \
diff --git a/depends/patches/qt/fix-cocoahelpers-macos.patch b/depends/patches/qt/fix-cocoahelpers-macos.patch
new file mode 100644
index 000000000000..1b43a9eff8fe
--- /dev/null
+++ b/depends/patches/qt/fix-cocoahelpers-macos.patch
@@ -0,0 +1,70 @@
+From 0707260a4f8e64dfadf1df5f935e74cabb7c7d27 Mon Sep 17 00:00:00 2001
+From: Jake Petroules <jake.petroules@qt.io>
+Date: Sun, 1 Oct 2017 21:48:17 -0700
+Subject: [PATCH] Fix build error with macOS 10.13 SDK
+MIME-Version: 1.0
+Content-Type: text/plain; charset=utf8
+Content-Transfer-Encoding: 8bit
+
+Several of these variables/macros are no longer defined. We didn't
+validate the preconditions on iOS, tvOS, or watchOS, so no
+need to bother validating them on macOS either. Nor did we check the
+OSStatus result on any platform anyways.
+
+Task-number: QTBUG-63401
+Change-Id: Ife64dff767cf6d3f4b839fc53ec486181c176bf3
+(cherry-picked from 861544583511d4e6f7745d2339b26ff1cd44132b)
+Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
+Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
+---
+ src/plugins/platforms/cocoa/qcocoahelpers.h  |  2 +-
+ src/plugins/platforms/cocoa/qcocoahelpers.mm | 13 +------------
+ 2 files changed, 2 insertions(+), 13 deletions(-)
+
+diff --git old/qtbase/src/plugins/platforms/cocoa/qcocoahelpers.h new/qtbase/src/plugins/platforms/cocoa/qcocoahelpers.h
+index bbb3793..74371d5 100644
+--- old/qtbase/src/plugins/platforms/cocoa/qcocoahelpers.h
++++ new/qtbase/src/plugins/platforms/cocoa/qcocoahelpers.h
+@@ -80,7 +80,7 @@ QColor qt_mac_toQColor(CGColorRef color);
+ // Creates a mutable shape, it's the caller's responsibility to release.
+ HIMutableShapeRef qt_mac_QRegionToHIMutableShape(const QRegion &region);
+ 
+-OSStatus qt_mac_drawCGImage(CGContextRef inContext, const CGRect *inBounds, CGImageRef inImage);
++void qt_mac_drawCGImage(CGContextRef inContext, const CGRect *inBounds, CGImageRef inImage);
+ 
+ NSDragOperation qt_mac_mapDropAction(Qt::DropAction action);
+ NSDragOperation qt_mac_mapDropActions(Qt::DropActions actions);
+diff --git old/qtbase/src/plugins/platforms/cocoa/qcocoahelpers.mm new/qtbase/src/plugins/platforms/cocoa/qcocoahelpers.mm
+index cd73148..3f8429e 100644
+--- old/qtbase/src/plugins/platforms/cocoa/qcocoahelpers.mm
++++ new/qtbase/src/plugins/platforms/cocoa/qcocoahelpers.mm
+@@ -544,15 +544,8 @@ NSRect qt_mac_flipRect(const QRect &rect)
+     return NSMakeRect(rect.x(), flippedY, rect.width(), rect.height());
+ }
+ 
+-OSStatus qt_mac_drawCGImage(CGContextRef inContext, const CGRect *inBounds, CGImageRef inImage)
++void qt_mac_drawCGImage(CGContextRef inContext, const CGRect *inBounds, CGImageRef inImage)
+ {
+-    // Verbatim copy if HIViewDrawCGImage (as shown on Carbon-Dev)
+-    OSStatus err = noErr;
+-
+-    require_action(inContext != NULL, InvalidContext, err = paramErr);
+-    require_action(inBounds != NULL, InvalidBounds, err = paramErr);
+-    require_action(inImage != NULL, InvalidImage, err = paramErr);
+-
+     CGContextSaveGState( inContext );
+     CGContextTranslateCTM (inContext, 0, inBounds->origin.y + CGRectGetMaxY(*inBounds));
+     CGContextScaleCTM(inContext, 1, -1);
+@@ -560,10 +553,6 @@ OSStatus qt_mac_drawCGImage(CGContextRef inContext, const CGRect *inBounds, CGIm
+     CGContextDrawImage(inContext, *inBounds, inImage);
+ 
+     CGContextRestoreGState(inContext);
+-InvalidImage:
+-InvalidBounds:
+-InvalidContext:
+-        return err;
+ }
+ 
+ Qt::MouseButton cocoaButton2QtButton(NSInteger buttonNum)
+-- 
+2.7.4
diff --git a/depends/patches/qt/qfixed-coretext.patch b/depends/patches/qt/qfixed-coretext.patch
new file mode 100644
index 000000000000..c5ad7d063237
--- /dev/null
+++ b/depends/patches/qt/qfixed-coretext.patch
@@ -0,0 +1,34 @@
+From dbdd5f0ffbce52c8b789ed09f1aa3f1da6c02e23 Mon Sep 17 00:00:00 2001
+From: Gabriel de Dietrich <gabriel.dedietrich@qt.io>
+Date: Fri, 30 Mar 2018 11:58:16 -0700
+Subject: [PATCH] QCoreTextFontEngine: Fix build with Xcode 9.3
+
+Apple LLVM version 9.1.0 (clang-902.0.39.1)
+
+Error message:
+
+.../qfontengine_coretext.mm:827:20: error: qualified reference to
+      'QFixed' is a constructor name rather than a type in this context
+    return QFixed::QFixed(int(CTFontGetUnitsPerEm(ctfont)));
+
+Change-Id: Iebe26b3b087a16b10664208fc8851cbddb47f043
+Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
+---
+ src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git old/qtbase/src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm new/qtbase/src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm
+index 25ff69d877d..98b753eff96 100644
+--- old/qtbase/src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm
++++ new/qtbase/src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm
+@@ -824,7 +824,7 @@ void QCoreTextFontEngine::getUnscaledGlyph(glyph_t glyph, QPainterPath *path, gl
+ 
+ QFixed QCoreTextFontEngine::emSquareSize() const
+ {
+-    return QFixed::QFixed(int(CTFontGetUnitsPerEm(ctfont)));
++    return QFixed(int(CTFontGetUnitsPerEm(ctfont)));
+ }
+ 
+ QFontEngine *QCoreTextFontEngine::cloneWithSize(qreal pixelSize) const
+-- 
+2.16.3

From 407baccec4da68caf10d5500da8343d49d9b864e Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Sun, 30 Sep 2018 13:03:25 +0200
Subject: [PATCH 164/400] Remove obsolete build-openbsd.md (#2328)

build-generic.md should cover all Unix-like systems, including OpenBSD.
---
 doc/build-openbsd.md | 176 -------------------------------------------
 1 file changed, 176 deletions(-)
 delete mode 100644 doc/build-openbsd.md

diff --git a/doc/build-openbsd.md b/doc/build-openbsd.md
deleted file mode 100644
index faeb3a021bb3..000000000000
--- a/doc/build-openbsd.md
+++ /dev/null
@@ -1,176 +0,0 @@
-OpenBSD build guide
-======================
-(updated for OpenBSD 6.0)
-
-This guide describes how to build dashd and command-line utilities on OpenBSD.
-
-As OpenBSD is most common as a server OS, we will not bother with the GUI.
-
-Preparation
--------------
-
-Run the following as root to install the base dependencies for building:
-
-```bash
-pkg_add gmake libtool libevent
-pkg_add autoconf # (select highest version, e.g. 2.69)
-pkg_add automake # (select highest version, e.g. 1.15)
-pkg_add python # (select highest version, e.g. 3.5)
-```
-
-The default C++ compiler that comes with OpenBSD 5.9 is g++ 4.2. This version is old (from 2007), and is not able to compile the current version of Dash Core, primarily as it has no C++11 support, but even before there were issues. So here we will be installing a newer compiler.
-
-GCC
--------
-
-You can install a newer version of gcc with:
-
-```bash
-pkg_add g++ # (select newest 4.x version, e.g. 4.9.3)
-```
-
-This compiler will not overwrite the system compiler, it will be installed as `egcc` and `eg++` in `/usr/local/bin`.
-
-### Building boost
-
-Do not use `pkg_add boost`! The boost version installed thus is compiled using the `g++` compiler not `eg++`, which will result in a conflict between `/usr/local/lib/libestdc++.so.XX.0` and `/usr/lib/libstdc++.so.XX.0`, resulting in a test crash:
-
-    test_dash:/usr/lib/libstdc++.so.57.0: /usr/local/lib/libestdc++.so.17.0 : WARNING: symbol(_ZN11__gnu_debug17_S_debug_me ssagesE) size mismatch, relink your program
-    ...
-    Segmentation fault (core dumped)
-
-This makes it necessary to build boost, or at least the parts used by Dash Core, manually:
-
-```
-# Pick some path to install boost to, here we create a directory within the dash directory
-BITCOIN_ROOT=$(pwd)
-BOOST_PREFIX="${BITCOIN_ROOT}/boost"
-mkdir -p $BOOST_PREFIX
-
-# Fetch the source and verify that it is not tampered with
-curl -o boost_1_61_0.tar.bz2 http://heanet.dl.sourceforge.net/project/boost/boost/1.61.0/boost_1_61_0.tar.bz2
-echo 'a547bd06c2fd9a71ba1d169d9cf0339da7ebf4753849a8f7d6fdb8feee99b640  boost_1_61_0.tar.bz2' | sha256 -c
-# MUST output: (SHA256) boost_1_61_0.tar.bz2: OK
-tar -xjf boost_1_61_0.tar.bz2
-
-# Boost 1.61 needs one small patch for OpenBSD
-cd boost_1_61_0
-# Also here: https://gist.githubusercontent.com/laanwj/bf359281dc319b8ff2e1/raw/92250de8404b97bb99d72ab898f4a8cb35ae1ea3/patch-boost_test_impl_execution_monitor_ipp.patch
-patch -p0 < /usr/ports/devel/boost/patches/patch-boost_test_impl_execution_monitor_ipp
-
-# Build w/ minimum configuration necessary for dash
-echo 'using gcc : : eg++ : <cxxflags>"-fvisibility=hidden -fPIC" <linkflags>"" <archiver>"ar" <striper>"strip"  <ranlib>"ranlib" <rc>"" : ;' > user-config.jam
-config_opts="runtime-link=shared threadapi=pthread threading=multi link=static variant=release --layout=tagged --build-type=complete --user-config=user-config.jam -sNO_BZIP2=1"
-./bootstrap.sh --without-icu --with-libraries=chrono,filesystem,program_options,system,thread,test
-./b2 -d2 -j2 -d1 ${config_opts} --prefix=${BOOST_PREFIX} stage
-./b2 -d0 -j4 ${config_opts} --prefix=${BOOST_PREFIX} install
-```
-
-### Building BerkeleyDB
-
-BerkeleyDB is only necessary for the wallet functionality. To skip this, pass `--disable-wallet` to `./configure`.
-
-See "Berkeley DB" in [build_unix.md](build_unix.md) for instructions on how to build BerkeleyDB 4.8.
-You cannot use the BerkeleyDB library from ports, for the same reason as boost above (g++/libstd++ incompatibility).
-
-```bash
-# Pick some path to install BDB to, here we create a directory within the dash directory
-BITCOIN_ROOT=$(pwd)
-BDB_PREFIX="${BITCOIN_ROOT}/db4"
-mkdir -p $BDB_PREFIX
-
-# Fetch the source and verify that it is not tampered with
-curl -o db-4.8.30.NC.tar.gz 'http://download.oracle.com/berkeley-db/db-4.8.30.NC.tar.gz'
-echo '12edc0df75bf9abd7f82f821795bcee50f42cb2e5f76a6a281b85732798364ef  db-4.8.30.NC.tar.gz' | sha256 -c
-# MUST output: (SHA256) db-4.8.30.NC.tar.gz: OK
-tar -xzf db-4.8.30.NC.tar.gz
-
-# Build the library and install to specified prefix
-cd db-4.8.30.NC/build_unix/
-#  Note: Do a static build so that it can be embedded into the executable, instead of having to find a .so at runtime
-../dist/configure --enable-cxx --disable-shared --with-pic --prefix=$BDB_PREFIX CC=egcc CXX=eg++ CPP=ecpp
-make install # do NOT use -jX, this is broken
-```
-
-### Resource limits
-
-The standard ulimit restrictions in OpenBSD are very strict:
-
-    data(kbytes)         1572864
-
-This is, unfortunately, no longer enough to compile some `.cpp` files in the project,
-at least with gcc 4.9.3 (see issue https://github.com/bitcoin/bitcoin/issues/6658).
-If your user is in the `staff` group the limit can be raised with:
-
-    ulimit -d 3000000
-
-The change will only affect the current shell and processes spawned by it. To
-make the change system-wide, change `datasize-cur` and `datasize-max` in
-`/etc/login.conf`, and reboot.
-
-### Building Dash Core
-
-**Important**: use `gmake`, not `make`. The non-GNU `make` will exit with a horrible error.
-
-Preparation:
-```bash
-export AUTOCONF_VERSION=2.69 # replace this with the autoconf version that you installed
-export AUTOMAKE_VERSION=1.15 # replace this with the automake version that you installed
-./autogen.sh
-```
-Make sure `BDB_PREFIX` and `BOOST_PREFIX` are set to the appropriate paths from the above steps.
-
-To configure with wallet:
-```bash
-./configure --with-gui=no --with-boost=$BOOST_PREFIX \
-    CC=egcc CXX=eg++ CPP=ecpp \
-    BDB_LIBS="-L${BDB_PREFIX}/lib -ldb_cxx-4.8" BDB_CFLAGS="-I${BDB_PREFIX}/include"
-```
-
-To configure without wallet:
-```bash
-./configure --disable-wallet --with-gui=no --with-boost=$BOOST_PREFIX \
-    CC=egcc CXX=eg++ CPP=ecpp
-```
-
-Build and run the tests:
-```bash
-gmake # can use -jX here for parallelism
-gmake check
-```
-
-Clang (not currently working)
-------------------------------
-
-WARNING: This is outdated, needs to be updated for OpenBSD 6.0 and re-tried.
-
-Using a newer g++ results in linking the new code to a new libstdc++.
-Libraries built with the old g++, will still import the old library.
-This gives conflicts, necessitating rebuild of all C++ dependencies of the application.
-
-With clang this can - at least theoretically - be avoided because it uses the
-base system's libstdc++.
-
-```bash
-pkg_add llvm boost
-```
-
-```bash
-./configure --disable-wallet --with-gui=no CC=clang CXX=clang++
-gmake
-```
-
-However, this does not appear to work. Compilation succeeds, but link fails
-with many 'local symbol discarded' errors:
-
-    local symbol 150: discarded in section `.text._ZN10tinyformat6detail14FormatIterator6finishEv' from libbitcoin_util.a(libbitcoin_util_a-random.o)
-    local symbol 151: discarded in section `.text._ZN10tinyformat6detail14FormatIterator21streamStateFromFormatERSoRjPKcii' from libbitcoin_util.a(libbitcoin_util_a-random.o)
-    local symbol 152: discarded in section `.text._ZN10tinyformat6detail12convertToIntIA13_cLb0EE6invokeERA13_Kc' from libbitcoin_util.a(libbitcoin_util_a-random.o)
-
-According to similar reported errors this is a binutils (ld) issue in 2.15, the
-version installed by OpenBSD 5.7:
-
-- http://openbsd-archive.7691.n7.nabble.com/UPDATE-cppcheck-1-65-td248900.html
-- https://llvm.org/bugs/show_bug.cgi?id=9758
-
-There is no known workaround for this.

From f7ab6c469c743a8a6403a0cb6b29e9dcbff25748 Mon Sep 17 00:00:00 2001
From: gladcow <sergey@dash.org>
Date: Sun, 30 Sep 2018 20:01:33 +0300
Subject: [PATCH 165/400] M-of-N-like sporks (#2288)

* support set of keys to sign spork

* several addresses support in -sporkkey

* tests for multykey sporks

* command line option -minsporkkeys

* make spork active only after given number of signers

* use signature in spork hash calculation

* test for new and old spork messages interaction

* add multikeyspork.py to integration tests

* change test to have ability to distinguish default spork value

* require min spork keys number to be more than the half of the common spork keys number

* calc current spork value with majority of signers

* set test nodes time in integration test

* extract keyid from signed spork message directly

* change -sporkaddr option syntax to process several addresses

* codestyle fixes

* fix test comments

* codestyle fixes

* simplify CSporkManager::SporkValueIsActive

* Calc signature hash without signature field

* do not restore pubkey ids from cach

* Calc different keyids to check signature because not all sporks can be synced at moment

* codestyle fixes

* Fix CSporkManager::CheckAndRemove to use several keys

* codestyle fixes

* Correct processing of not actual spork6 value with GetSignerKeyID
---
 qa/pull-tester/rpc-tests.py    |   1 +
 qa/rpc-tests/multikeysporks.py | 151 ++++++++++++++++++++++++++
 src/chainparams.cpp            |  12 ++-
 src/chainparams.h              |   6 +-
 src/init.cpp                   |  26 ++++-
 src/spork.cpp                  | 188 ++++++++++++++++++++++++++-------
 src/spork.h                    |  16 +--
 7 files changed, 342 insertions(+), 58 deletions(-)
 create mode 100755 qa/rpc-tests/multikeysporks.py

diff --git a/qa/pull-tester/rpc-tests.py b/qa/pull-tester/rpc-tests.py
index e248d80859fc..b40da3c13271 100755
--- a/qa/pull-tester/rpc-tests.py
+++ b/qa/pull-tester/rpc-tests.py
@@ -124,6 +124,7 @@
     'wallet-accounts.py',
     'wallet-dump.py',
     'listtransactions.py',
+    'multikeysporks.py',
     # vv Tests less than 60s vv
     'sendheaders.py', # NOTE: needs dash_hash to pass
     'zapwallettxes.py',
diff --git a/qa/rpc-tests/multikeysporks.py b/qa/rpc-tests/multikeysporks.py
new file mode 100755
index 000000000000..8d4f8c38e670
--- /dev/null
+++ b/qa/rpc-tests/multikeysporks.py
@@ -0,0 +1,151 @@
+#!/usr/bin/env python3
+# Copyright (c) 2018 The Dash Core developers
+# Distributed under the MIT software license, see the accompanying
+# file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+from test_framework.mininode import *
+from test_framework.test_framework import BitcoinTestFramework
+from test_framework.util import *
+from time import *
+
+'''
+multikeysporks.py
+
+Test logic for several signer keys usage for spork broadcast.
+
+We set 5 possible keys for sporks signing and set minimum 
+required signers to 3. We check 1 and 2 signers can't set the spork 
+value, any 3 signers can change spork value and other 3 signers
+can change it again.
+'''
+
+
+class MultiKeySporkTest(BitcoinTestFramework):
+    def __init__(self):
+        super().__init__()
+        self.num_nodes = 5
+        self.setup_clean_chain = True
+        self.is_network_split = False
+
+    def setup_network(self):
+        self.nodes = []
+
+        # secret(base58): 931wyuRNVYvhg18Uu9bky5Qg1z4QbxaJ7fefNBzjBPiLRqcd33F
+        # keyid(hex): 60f0f57f71f0081f1aacdd8432340a33a526f91b
+        # address(base58): yNsMZhEhYqv14TgdYb1NS2UmNZjE8FSJxa
+
+        # secret(base58): 91vbXGMSWKGHom62986XtL1q2mQDA12ngcuUNNe5NfMSj44j7g3
+        # keyid(hex): 43dff2b09de2f904f688ec14ee6899087b889ad0
+        # address(base58): yfLSXFfipnkgYioD6L8aUNyfRgEBuJv48h
+
+        # secret(base58): 92bxUjPT5AhgXuXJwfGGXqhomY2SdQ55MYjXyx9DZNxCABCSsRH
+        # keyid(hex): d9aa5fa00cce99101a4044e65dc544d1579890de
+        # address(base58): ygcG5S2pQz2U1UAaHvU6EznKZW7yapKMA7
+
+        # secret(base58): 934yPXiVGf4RCY2qTs2Bt5k3TEtAiAg12sMxCt8yVWbSU7p3fuD
+        # keyid(hex): 0b23935ce0bea3b997a334f6fa276c9fa17687b2
+        # address(base58): ycbRQWbovrhQMTuxg9p4LAuW5SCMAKqPrn
+
+        # secret(base58): 92Cxwia363Wg2qGF1fE5z4GKi8u7r1nrWQXdtsj2ACZqaDPSihD
+        # keyid(hex): 1d1098b2b1f759b678a0a7a098637a9b898adcac
+        # address(base58): yc5TGfcHYoLCrcbVy4umsiDjsYUn39vLui
+
+        self.nodes.append(start_node(0, self.options.tmpdir,
+                                     ["-debug", "-sporkkey=931wyuRNVYvhg18Uu9bky5Qg1z4QbxaJ7fefNBzjBPiLRqcd33F",
+                                      "-sporkaddr=ygcG5S2pQz2U1UAaHvU6EznKZW7yapKMA7",
+                                      "-sporkaddr=yfLSXFfipnkgYioD6L8aUNyfRgEBuJv48h",
+                                      "-sporkaddr=yNsMZhEhYqv14TgdYb1NS2UmNZjE8FSJxa",
+                                      "-sporkaddr=ycbRQWbovrhQMTuxg9p4LAuW5SCMAKqPrn",
+                                      "-sporkaddr=yc5TGfcHYoLCrcbVy4umsiDjsYUn39vLui",
+                                      "-minsporkkeys=3"]))
+        self.nodes.append(start_node(1, self.options.tmpdir,
+                                     ["-debug", "-sporkkey=91vbXGMSWKGHom62986XtL1q2mQDA12ngcuUNNe5NfMSj44j7g3",
+                                      "-sporkaddr=ygcG5S2pQz2U1UAaHvU6EznKZW7yapKMA7",
+                                      "-sporkaddr=yfLSXFfipnkgYioD6L8aUNyfRgEBuJv48h",
+                                      "-sporkaddr=yNsMZhEhYqv14TgdYb1NS2UmNZjE8FSJxa",
+                                      "-sporkaddr=ycbRQWbovrhQMTuxg9p4LAuW5SCMAKqPrn",
+                                      "-sporkaddr=yc5TGfcHYoLCrcbVy4umsiDjsYUn39vLui",
+                                      "-minsporkkeys=3"]))
+        self.nodes.append(start_node(2, self.options.tmpdir,
+                                     ["-debug", "-sporkkey=92bxUjPT5AhgXuXJwfGGXqhomY2SdQ55MYjXyx9DZNxCABCSsRH",
+                                      "-sporkaddr=ygcG5S2pQz2U1UAaHvU6EznKZW7yapKMA7",
+                                      "-sporkaddr=yfLSXFfipnkgYioD6L8aUNyfRgEBuJv48h",
+                                      "-sporkaddr=yNsMZhEhYqv14TgdYb1NS2UmNZjE8FSJxa",
+                                      "-sporkaddr=ycbRQWbovrhQMTuxg9p4LAuW5SCMAKqPrn",
+                                      "-sporkaddr=yc5TGfcHYoLCrcbVy4umsiDjsYUn39vLui",
+                                      "-minsporkkeys=3"]))
+        self.nodes.append(start_node(3, self.options.tmpdir,
+                                     ["-debug", "-sporkkey=934yPXiVGf4RCY2qTs2Bt5k3TEtAiAg12sMxCt8yVWbSU7p3fuD",
+                                      "-sporkaddr=ygcG5S2pQz2U1UAaHvU6EznKZW7yapKMA7",
+                                      "-sporkaddr=yfLSXFfipnkgYioD6L8aUNyfRgEBuJv48h",
+                                      "-sporkaddr=yNsMZhEhYqv14TgdYb1NS2UmNZjE8FSJxa",
+                                      "-sporkaddr=ycbRQWbovrhQMTuxg9p4LAuW5SCMAKqPrn",
+                                      "-sporkaddr=yc5TGfcHYoLCrcbVy4umsiDjsYUn39vLui",
+                                      "-minsporkkeys=3"]))
+        self.nodes.append(start_node(4, self.options.tmpdir,
+                                     ["-debug", "-sporkkey=92Cxwia363Wg2qGF1fE5z4GKi8u7r1nrWQXdtsj2ACZqaDPSihD",
+                                      "-sporkaddr=ygcG5S2pQz2U1UAaHvU6EznKZW7yapKMA7",
+                                      "-sporkaddr=yfLSXFfipnkgYioD6L8aUNyfRgEBuJv48h",
+                                      "-sporkaddr=yNsMZhEhYqv14TgdYb1NS2UmNZjE8FSJxa",
+                                      "-sporkaddr=ycbRQWbovrhQMTuxg9p4LAuW5SCMAKqPrn",
+                                      "-sporkaddr=yc5TGfcHYoLCrcbVy4umsiDjsYUn39vLui",
+                                      "-minsporkkeys=3"]))
+        # connect nodes at start
+        for i in range(0, 5):
+            for j in range(i, 5):
+                connect_nodes(self.nodes[i], j)
+
+    def get_test_spork_state(self, node):
+        info = node.spork('show')
+        # use InstantSend spork for tests
+        return info['SPORK_2_INSTANTSEND_ENABLED']
+
+    def set_test_spork_state(self, node, value):
+        # use InstantSend spork for tests
+        node.spork('SPORK_2_INSTANTSEND_ENABLED', value)
+
+    def wait_for_test_spork_state(self, node, value):
+        start = time()
+        got_state = False
+        while True:
+            if self.get_test_spork_state(node) == value:
+                got_state = True
+                break
+            if time() > start + 10:
+                break
+            sleep(0.1)
+        return got_state
+
+    def run_test(self):
+        # check test spork default state
+        for node in self.nodes:
+            assert(self.get_test_spork_state(node) == 0)
+
+        set_mocktime(get_mocktime() + 1)
+        set_node_times(self.nodes, get_mocktime())
+        # first and second signers set spork value
+        self.set_test_spork_state(self.nodes[0], 1)
+        self.set_test_spork_state(self.nodes[1], 1)
+        # spork change requires at least 3 signers
+        for node in self.nodes:
+            assert(not self.wait_for_test_spork_state(node, 1))
+
+        # third signer set spork value
+        self.set_test_spork_state(self.nodes[2], 1)
+        # now spork state is changed
+        for node in self.nodes:
+            assert(self.wait_for_test_spork_state(node, 1))
+
+        set_mocktime(get_mocktime() + 1)
+        set_node_times(self.nodes, get_mocktime())
+        # now set the spork again with other signers to test
+        # old and new spork messages interaction
+        self.set_test_spork_state(self.nodes[2], 2)
+        self.set_test_spork_state(self.nodes[3], 2)
+        self.set_test_spork_state(self.nodes[4], 2)
+        for node in self.nodes:
+            assert(self.wait_for_test_spork_state(node, 2))
+
+
+if __name__ == '__main__':
+    MultiKeySporkTest().main()
diff --git a/src/chainparams.cpp b/src/chainparams.cpp
index 1beccf7f0e15..265d3c366d84 100644
--- a/src/chainparams.cpp
+++ b/src/chainparams.cpp
@@ -237,7 +237,8 @@ class CMainParams : public CChainParams {
         nPoolMaxTransactions = 3;
         nFulfilledRequestExpireTime = 60*60; // fulfilled requests expire in 1 hour
 
-        strSporkAddress = "Xgtyuk76vhuFW2iT7UAiHgNdWXCf3J34wh";
+        vSporkAddresses = {"Xgtyuk76vhuFW2iT7UAiHgNdWXCf3J34wh"};
+        nMinSporkKeys = 1;
 
         checkpointData = (CCheckpointData) {
             boost::assign::map_list_of
@@ -393,7 +394,8 @@ class CTestNetParams : public CChainParams {
         nPoolMaxTransactions = 3;
         nFulfilledRequestExpireTime = 5*60; // fulfilled requests expire in 5 minutes
 
-        strSporkAddress = "yjPtiKh2uwk3bDutTEA2q9mCtXyiZRWn55";
+        vSporkAddresses = {"yjPtiKh2uwk3bDutTEA2q9mCtXyiZRWn55"};
+        nMinSporkKeys = 1;
 
         checkpointData = (CCheckpointData) {
             boost::assign::map_list_of
@@ -537,7 +539,8 @@ class CDevNetParams : public CChainParams {
         nPoolMaxTransactions = 3;
         nFulfilledRequestExpireTime = 5*60; // fulfilled requests expire in 5 minutes
 
-        strSporkAddress = "yjPtiKh2uwk3bDutTEA2q9mCtXyiZRWn55";
+        vSporkAddresses = {"yjPtiKh2uwk3bDutTEA2q9mCtXyiZRWn55"};
+        nMinSporkKeys = 1;
 
         checkpointData = (CCheckpointData) {
             boost::assign::map_list_of
@@ -643,7 +646,8 @@ class CRegTestParams : public CChainParams {
         nFulfilledRequestExpireTime = 5*60; // fulfilled requests expire in 5 minutes
 
         // privKey: cP4EKFyJsHT39LDqgdcB43Y3YXjNyjb5Fuas1GQSeAtjnZWmZEQK
-        strSporkAddress = "yj949n1UH6fDhw6HtVE5VMj2iSTaSWBMcW";
+        vSporkAddresses = {"yj949n1UH6fDhw6HtVE5VMj2iSTaSWBMcW"};
+        nMinSporkKeys = 1;
 
         checkpointData = (CCheckpointData){
             boost::assign::map_list_of
diff --git a/src/chainparams.h b/src/chainparams.h
index fa67c9b73a94..29e3b9588474 100644
--- a/src/chainparams.h
+++ b/src/chainparams.h
@@ -88,7 +88,8 @@ class CChainParams
     const ChainTxData& TxData() const { return chainTxData; }
     int PoolMaxTransactions() const { return nPoolMaxTransactions; }
     int FulfilledRequestExpireTime() const { return nFulfilledRequestExpireTime; }
-    const std::string& SporkAddress() const { return strSporkAddress; }
+    const std::vector<std::string>& SporkAddresses() const { return vSporkAddresses; }
+    int MinSporkKeys() const { return nMinSporkKeys; }
 protected:
     CChainParams() {}
 
@@ -116,7 +117,8 @@ class CChainParams
     ChainTxData chainTxData;
     int nPoolMaxTransactions;
     int nFulfilledRequestExpireTime;
-    std::string strSporkAddress;
+    std::vector<std::string> vSporkAddresses;
+    int nMinSporkKeys;
 };
 
 /**
diff --git a/src/init.cpp b/src/init.cpp
index d33dfd96db25..0cf30ccca109 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -570,6 +570,7 @@ std::string HelpMessage(HelpMessageMode mode)
     AppendParamsHelpMessages(strUsage, showDebug);
     strUsage += HelpMessageOpt("-litemode=<n>", strprintf(_("Disable all Dash specific functionality (Masternodes, PrivateSend, InstantSend, Governance) (0-1, default: %u)"), 0));
     strUsage += HelpMessageOpt("-sporkaddr=<hex>", strprintf(_("Override spork address. Only useful for regtest and devnet. Using this on mainnet or testnet will ban you.")));
+    strUsage += HelpMessageOpt("-minsporkkeys=<n>", strprintf(_("Overrides minimum spork signers to change spork value. Only useful for regtest and devnet. Using this on mainnet or testnet will ban you.")));
 
     strUsage += HelpMessageGroup(_("Masternode options:"));
     strUsage += HelpMessageOpt("-masternode=<n>", strprintf(_("Enable the client to act as a masternode (0-1, default: %u)"), 0));
@@ -1398,13 +1399,28 @@ bool AppInitMain(boost::thread_group& threadGroup, CScheduler& scheduler)
             threadGroup.create_thread(&ThreadScriptCheck);
     }
 
-    if (!sporkManager.SetSporkAddress(GetArg("-sporkaddr", Params().SporkAddress())))
-        return InitError(_("Invalid spork address specified with -sporkaddr"));
+    std::vector<std::string> vSporkAddresses;
+    if (mapMultiArgs.count("-sporkaddr")) {
+        vSporkAddresses = mapMultiArgs.at("-sporkaddr");
+    } else {
+        vSporkAddresses = Params().SporkAddresses();
+    }
+    for (const auto& address: vSporkAddresses) {
+        if (!sporkManager.SetSporkAddress(address)) {
+            return InitError(_("Invalid spork address specified with -sporkaddr"));
+        }
+    }
 
-    if (IsArgSet("-sporkkey")) // spork priv key
-    {
-        if (!sporkManager.SetPrivKey(GetArg("-sporkkey", "")))
+    int minsporkkeys = GetArg("-minsporkkeys", Params().MinSporkKeys());
+    if (!sporkManager.SetMinSporkKeys(minsporkkeys)) {
+        return InitError(_("Invalid minimum number of spork signers specified with -minsporkkeys"));
+    }
+
+
+    if (IsArgSet("-sporkkey")) { // spork priv key
+        if (!sporkManager.SetPrivKey(GetArg("-sporkkey", ""))) {
             return InitError(_("Unable to sign spork message, wrong key?"));
+        }
     }
 
     // Start the lightweight task scheduler thread
diff --git a/src/spork.cpp b/src/spork.cpp
index cc60cf7ff2b2..a9963eb138c2 100644
--- a/src/spork.cpp
+++ b/src/spork.cpp
@@ -15,7 +15,7 @@
 
 CSporkManager sporkManager;
 
-const std::string CSporkManager::SERIALIZATION_VERSION_STRING = "CMasternodeMan-Version-1";
+const std::string CSporkManager::SERIALIZATION_VERSION_STRING = "CMasternodeMan-Version-2";
 
 std::map<int, int64_t> mapSporkDefaults = {
     {SPORK_2_INSTANTSEND_ENABLED,            0},             // ON
@@ -31,6 +31,27 @@ std::map<int, int64_t> mapSporkDefaults = {
     {SPORK_16_INSTANTSEND_AUTOLOCKS,         4070908800ULL}, // OFF
 };
 
+bool CSporkManager::SporkValueIsActive(int nSporkID, int64_t &nActiveValueRet) const
+{
+    LOCK(cs);
+
+    if (!mapSporksActive.count(nSporkID)) return false;
+
+    // calc how many values we have and how many signers vote for every value
+    std::map<int64_t, int> mapValueCounts;
+    for (const auto& pair: mapSporksActive.at(nSporkID)) {
+        mapValueCounts[pair.second.nValue]++;
+        if (mapValueCounts.at(pair.second.nValue) >= nMinSporkKeys) {
+            // nMinSporkKeys is always more than the half of the max spork keys number,
+            // so there is only one such value and we can stop here
+            nActiveValueRet = pair.second.nValue;
+            return true;
+        }
+    }
+
+    return false;
+}
+
 void CSporkManager::Clear()
 {
     LOCK(cs);
@@ -43,29 +64,47 @@ void CSporkManager::Clear()
 void CSporkManager::CheckAndRemove()
 {
     LOCK(cs);
-    bool fSporkAddressIsSet = !sporkPubKeyID.IsNull();
+    bool fSporkAddressIsSet = !setSporkPubKeyIDs.empty();
     assert(fSporkAddressIsSet);
 
     auto itActive = mapSporksActive.begin();
     while (itActive != mapSporksActive.end()) {
-        if (!itActive->second.CheckSignature(sporkPubKeyID, false)) {
-            if (!itActive->second.CheckSignature(sporkPubKeyID, true)) {
-                mapSporksByHash.erase(itActive->second.GetHash());
-                mapSporksActive.erase(itActive++);
+        auto itSignerPair = itActive->second.begin();
+        while (itSignerPair != itActive->second.end()) {
+            if (setSporkPubKeyIDs.find(itSignerPair->first) == setSporkPubKeyIDs.end()) {
+                mapSporksByHash.erase(itSignerPair->second.GetHash());
                 continue;
             }
+            if (!itSignerPair->second.CheckSignature(itSignerPair->first, false)) {
+                if (!itSignerPair->second.CheckSignature(itSignerPair->first, true)) {
+                    mapSporksByHash.erase(itSignerPair->second.GetHash());
+                    itActive->second.erase(itSignerPair++);
+                    continue;
+                }
+            }
+            ++itSignerPair;
+        }
+        if (itActive->second.empty()) {
+            mapSporksActive.erase(itActive++);
+            continue;
         }
         ++itActive;
     }
+
     auto itByHash = mapSporksByHash.begin();
     while (itByHash != mapSporksByHash.end()) {
-        if (!itByHash->second.CheckSignature(sporkPubKeyID, false)) {
-            if (!itByHash->second.CheckSignature(sporkPubKeyID, true)) {
-                mapSporksActive.erase(itByHash->second.nSporkID);
-                mapSporksByHash.erase(itByHash++);
-                continue;
+        bool found = false;
+        for (const auto& signer: setSporkPubKeyIDs) {
+            if (itByHash->second.CheckSignature(signer, false) ||
+                itByHash->second.CheckSignature(signer, true)) {
+                found = true;
+                break;
             }
         }
+        if (!found) {
+            mapSporksByHash.erase(itByHash++);
+            continue;
+        }
         ++itByHash;
     }
 }
@@ -88,41 +127,61 @@ void CSporkManager::ProcessSpork(CNode* pfrom, const std::string& strCommand, CD
             if(!chainActive.Tip()) return;
             strLogMsg = strprintf("SPORK -- hash: %s id: %d value: %10d bestHeight: %d peer=%d", hash.ToString(), spork.nSporkID, spork.nValue, chainActive.Height(), pfrom->id);
         }
+
+        CKeyID keyIDSigner;
+        bool fSpork6IsActive = IsSporkActive(SPORK_6_NEW_SIGS);
+        if (!spork.GetSignerKeyID(keyIDSigner, fSpork6IsActive)
+                                 || !setSporkPubKeyIDs.count(keyIDSigner)) {
+            // Note: unlike for other messages we have to check for new format even with SPORK_6_NEW_SIGS
+            // inactive because SPORK_6_NEW_SIGS default is OFF and it is not the first spork to sync
+            // (and even if it would, spork order can't be guaranteed anyway).
+            if (!spork.GetSignerKeyID(keyIDSigner, !fSpork6IsActive)
+                                     || !setSporkPubKeyIDs.count(keyIDSigner)) {
+                LOCK(cs_main);
+                LogPrintf("CSporkManager::ProcessSpork -- ERROR: invalid signature\n");
+                Misbehaving(pfrom->GetId(), 100);
+                return;
+            }
+        }
+
         {
             LOCK(cs); // make sure to not lock this together with cs_main
             if (mapSporksActive.count(spork.nSporkID)) {
-                if (mapSporksActive[spork.nSporkID].nTimeSigned >= spork.nTimeSigned) {
-                    LogPrint("spork", "%s seen\n", strLogMsg);
-                    return;
+                if (mapSporksActive[spork.nSporkID].count(keyIDSigner)) {
+                    if (mapSporksActive[spork.nSporkID][keyIDSigner].nTimeSigned >= spork.nTimeSigned) {
+                        LogPrint("spork", "%s seen\n", strLogMsg);
+                        return;
+                    } else {
+                        LogPrintf("%s updated\n", strLogMsg);
+                    }
                 } else {
-                    LogPrintf("%s updated\n", strLogMsg);
+                    LogPrintf("%s new signer\n", strLogMsg);
                 }
             } else {
                 LogPrintf("%s new\n", strLogMsg);
             }
         }
 
-        if(!spork.CheckSignature(sporkPubKeyID, IsSporkActive(SPORK_6_NEW_SIGS))) {
-            LOCK(cs_main);
-            LogPrintf("CSporkManager::ProcessSpork -- ERROR: invalid signature\n");
-            Misbehaving(pfrom->GetId(), 100);
-            return;
-        }
 
         {
             LOCK(cs); // make sure to not lock this together with cs_main
             mapSporksByHash[hash] = spork;
-            mapSporksActive[spork.nSporkID] = spork;
+            mapSporksActive[spork.nSporkID][keyIDSigner] = spork;
         }
         spork.Relay(connman);
 
         //does a task if needed
-        ExecuteSpork(spork.nSporkID, spork.nValue);
+        int64_t nActiveValue = 0;
+        if (SporkValueIsActive(spork.nSporkID, nActiveValue)) {
+            ExecuteSpork(spork.nSporkID, nActiveValue);
+        }
 
     } else if (strCommand == NetMsgType::GETSPORKS) {
         LOCK(cs); // make sure to not lock this together with cs_main
         for (const auto& pair : mapSporksActive) {
-            connman.PushMessage(pfrom, CNetMsgMaker(pfrom->GetSendVersion()).Make(NetMsgType::SPORK, pair.second));
+            for (const auto& signerSporkPair: pair.second) {
+                connman.PushMessage(pfrom, CNetMsgMaker(pfrom->GetSendVersion()).Make(NetMsgType::SPORK, signerSporkPair.second));
+            }
         }
     }
 
@@ -161,11 +220,17 @@ bool CSporkManager::UpdateSpork(int nSporkID, int64_t nValue, CConnman& connman)
 {
     CSporkMessage spork = CSporkMessage(nSporkID, nValue, GetAdjustedTime());
 
-    if(spork.Sign(sporkPrivKey, IsSporkActive(SPORK_6_NEW_SIGS))) {
+    bool fSpork6IsActive = IsSporkActive(SPORK_6_NEW_SIGS);
+    if(spork.Sign(sporkPrivKey, fSpork6IsActive)) {
+        CKeyID keyIDSigner;
+        if (!spork.GetSignerKeyID(keyIDSigner, fSpork6IsActive) || !setSporkPubKeyIDs.count(keyIDSigner)) {
+            LogPrintf("CSporkManager::UpdateSpork: failed to find keyid for private key\n");
+            return false;
+        }
         spork.Relay(connman);
         LOCK(cs);
         mapSporksByHash[spork.GetHash()] = spork;
-        mapSporksActive[nSporkID] = spork;
+        mapSporksActive[nSporkID][keyIDSigner] = spork;
         return true;
     }
 
@@ -176,26 +241,29 @@ bool CSporkManager::UpdateSpork(int nSporkID, int64_t nValue, CConnman& connman)
 bool CSporkManager::IsSporkActive(int nSporkID)
 {
     LOCK(cs);
-    int64_t r = -1;
+    int64_t nSporkValue = -1;
 
-    if(mapSporksActive.count(nSporkID)){
-        r = mapSporksActive[nSporkID].nValue;
-    } else if (mapSporkDefaults.count(nSporkID)) {
-        r = mapSporkDefaults[nSporkID];
-    } else {
-        LogPrint("spork", "CSporkManager::IsSporkActive -- Unknown Spork ID %d\n", nSporkID);
-        r = 4070908800ULL; // 2099-1-1 i.e. off by default
+    if (SporkValueIsActive(nSporkID, nSporkValue)) {
+        return nSporkValue < GetAdjustedTime();
     }
 
-    return r < GetAdjustedTime();
+    if (mapSporkDefaults.count(nSporkID)) {
+        return  mapSporkDefaults[nSporkID] < GetAdjustedTime();
+    }
+
+    LogPrint("spork", "CSporkManager::IsSporkActive -- Unknown Spork ID %d\n", nSporkID);
+    return false;
 }
 
 // grab the value of the spork on the network, or the default
 int64_t CSporkManager::GetSporkValue(int nSporkID)
 {
     LOCK(cs);
-    if (mapSporksActive.count(nSporkID))
-        return mapSporksActive[nSporkID].nValue;
+
+    int64_t nSporkValue = -1;
+    if (SporkValueIsActive(nSporkID, nSporkValue)) {
+        return nSporkValue;
+    }
 
     if (mapSporkDefaults.count(nSporkID)) {
         return mapSporkDefaults[nSporkID];
@@ -260,10 +328,23 @@ bool CSporkManager::GetSporkByHash(const uint256& hash, CSporkMessage &sporkRet)
 bool CSporkManager::SetSporkAddress(const std::string& strAddress) {
     LOCK(cs);
     CBitcoinAddress address(strAddress);
-    if (!address.IsValid() || !address.GetKeyID(sporkPubKeyID)) {
+    CKeyID keyid;
+    if (!address.IsValid() || !address.GetKeyID(keyid)) {
         LogPrintf("CSporkManager::SetSporkAddress -- Failed to parse spork address\n");
         return false;
     }
+    setSporkPubKeyIDs.insert(keyid);
+    return true;
+}
+
+bool CSporkManager::SetMinSporkKeys(int minSporkKeys)
+{
+    int maxKeysNumber = setSporkPubKeyIDs.size();
+    if ((minSporkKeys <= maxKeysNumber / 2) || (minSporkKeys > maxKeysNumber)) {
+        LogPrintf("CSporkManager::SetMinSporkKeys -- Invalid min spork signers number: %d\n", minSporkKeys);
+        return false;
+    }
+    nMinSporkKeys = minSporkKeys;
     return true;
 }
 
@@ -276,8 +357,8 @@ bool CSporkManager::SetPrivKey(const std::string& strPrivKey)
         return false;
     }
 
-    if (pubKey.GetID() != sporkPubKeyID) {
-        LogPrintf("CSporkManager::SetPrivKey -- New private key does not belong to spork address\n");
+    if (setSporkPubKeyIDs.find(pubKey.GetID()) == setSporkPubKeyIDs.end()) {
+        LogPrintf("CSporkManager::SetPrivKey -- New private key does not belong to spork addresses\n");
         return false;
     }
 
@@ -309,7 +390,11 @@ uint256 CSporkMessage::GetHash() const
 
 uint256 CSporkMessage::GetSignatureHash() const
 {
-    return GetHash();
+    CHashWriter s(SER_GETHASH, 0);
+    s << nSporkID;
+    s << nValue;
+    s << nTimeSigned;
+    return s.GetHash();
 }
 
 bool CSporkMessage::Sign(const CKey& key, bool fSporkSixActive)
@@ -382,6 +467,27 @@ bool CSporkMessage::CheckSignature(const CKeyID& pubKeyId, bool fSporkSixActive)
     return true;
 }
 
+bool CSporkMessage::GetSignerKeyID(CKeyID &retKeyidSporkSigner, bool fSporkSixActive)
+{
+    CPubKey pubkeyFromSig;
+    if (fSporkSixActive) {
+        if (!pubkeyFromSig.RecoverCompact(GetSignatureHash(), vchSig)) {
+            return false;
+        }
+    } else {
+        std::string strMessage = std::to_string(nSporkID) + std::to_string(nValue) + std::to_string(nTimeSigned);
+        CHashWriter ss(SER_GETHASH, 0);
+        ss << strMessageMagic;
+        ss << strMessage;
+        if (!pubkeyFromSig.RecoverCompact(ss.GetHash(), vchSig)) {
+            return false;
+        }
+    }
+
+    retKeyidSporkSigner = pubkeyFromSig.GetID();
+    return true;
+}
+
 void CSporkMessage::Relay(CConnman& connman)
 {
     CInv inv(MSG_SPORK, GetHash());
diff --git a/src/spork.h b/src/spork.h
index efccd232f276..85e44a33ee10 100644
--- a/src/spork.h
+++ b/src/spork.h
@@ -70,9 +70,7 @@ class CSporkMessage
         READWRITE(nSporkID);
         READWRITE(nValue);
         READWRITE(nTimeSigned);
-        if (!(s.GetType() & SER_GETHASH)) {
-            READWRITE(vchSig);
-        }
+        READWRITE(vchSig);
     }
 
     uint256 GetHash() const;
@@ -80,6 +78,7 @@ class CSporkMessage
 
     bool Sign(const CKey& key, bool fSporkSixActive);
     bool CheckSignature(const CKeyID& pubKeyId, bool fSporkSixActive) const;
+    bool GetSignerKeyID(CKeyID& retKeyidSporkSigner, bool fSporkSixActive);
     void Relay(CConnman& connman);
 };
 
@@ -91,11 +90,13 @@ class CSporkManager
 
     mutable CCriticalSection cs;
     std::map<uint256, CSporkMessage> mapSporksByHash;
-    std::map<int, CSporkMessage> mapSporksActive;
+    std::map<int, std::map<CKeyID, CSporkMessage> > mapSporksActive;
 
-    CKeyID sporkPubKeyID;
+    std::set<CKeyID> setSporkPubKeyIDs;
+    int nMinSporkKeys;
     CKey sporkPrivKey;
 
+    bool SporkValueIsActive(int nSporkID, int64_t& nActiveValueRet) const;
 public:
 
     CSporkManager() {}
@@ -114,7 +115,9 @@ class CSporkManager
             strVersion = SERIALIZATION_VERSION_STRING;
             READWRITE(strVersion);
         }
-        READWRITE(sporkPubKeyID);
+        // we don't serialize pubkey ids because pubkeys should be
+        // hardcoded or be setted with cmdline or options, should
+        // not reuse pubkeys from previous dashd run
         READWRITE(mapSporksByHash);
         READWRITE(mapSporksActive);
         // we don't serialize private key to prevent its leakage
@@ -135,6 +138,7 @@ class CSporkManager
     bool GetSporkByHash(const uint256& hash, CSporkMessage &sporkRet);
 
     bool SetSporkAddress(const std::string& strAddress);
+    bool SetMinSporkKeys(int minSporkKeys);
     bool SetPrivKey(const std::string& strPrivKey);
 
     std::string ToString() const;

From 07208a4ae2669237b934797d9e54ef099c5e8038 Mon Sep 17 00:00:00 2001
From: Nathan Marley <nathan.marley@gmail.com>
Date: Tue, 2 Oct 2018 02:02:27 -0700
Subject: [PATCH 166/400] document spork system with doxygen comments (#2301)

This is an initial shot at an on-going WIP, which will add documentation via
Doxygen comments to (especially) Dash-specific features in the codebase.
---
 src/spork.cpp |   3 -
 src/spork.h   | 150 ++++++++++++++++++++++++++++++++++++++++++++++++--
 2 files changed, 145 insertions(+), 8 deletions(-)

diff --git a/src/spork.cpp b/src/spork.cpp
index a9963eb138c2..ad67ec6933e6 100644
--- a/src/spork.cpp
+++ b/src/spork.cpp
@@ -237,7 +237,6 @@ bool CSporkManager::UpdateSpork(int nSporkID, int64_t nValue, CConnman& connman)
     return false;
 }
 
-// grab the spork, otherwise say it's off
 bool CSporkManager::IsSporkActive(int nSporkID)
 {
     LOCK(cs);
@@ -255,7 +254,6 @@ bool CSporkManager::IsSporkActive(int nSporkID)
     return false;
 }
 
-// grab the value of the spork on the network, or the default
 int64_t CSporkManager::GetSporkValue(int nSporkID)
 {
     LOCK(cs);
@@ -382,7 +380,6 @@ std::string CSporkManager::ToString() const
     return strprintf("Sporks: %llu", mapSporksActive.size());
 }
 
-
 uint256 CSporkMessage::GetHash() const
 {
     return SerializeHash(*this);
diff --git a/src/spork.h b/src/spork.h
index 85e44a33ee10..0b61a7154d49 100644
--- a/src/spork.h
+++ b/src/spork.h
@@ -35,11 +35,24 @@ static const int SPORK_END                                              = SPORK_
 extern std::map<int, int64_t> mapSporkDefaults;
 extern CSporkManager sporkManager;
 
-//
-// Spork classes
-// Keep track of all of the network spork settings
-//
+/**
+ * Sporks are network parameters used primarily to prevent forking and turn
+ * on/off certain features. They are a soft consensus mechanism.
+ *
+ * We use 2 main classes to manage the spork system.
+ *
+ * SporkMessages - low-level constructs which contain the sporkID, value,
+ *                 signature and a signature timestamp
+ * SporkManager  - a higher-level construct which manages the naming, use of
+ *                 sporks, signatures and verification, and which sporks are active according
+ *                 to this node
+ */
 
+/**
+ * CSporkMessage is a low-level class used to encapsulate Spork messages and
+ * serialize them for transmission to other peers. This includes the internal
+ * spork ID, value, spork signature and timestamp for the signature.
+ */
 class CSporkMessage
 {
 private:
@@ -73,16 +86,49 @@ class CSporkMessage
         READWRITE(vchSig);
     }
 
+    /**
+     * GetHash returns the double-sha256 hash of the serialized spork message.
+     */
     uint256 GetHash() const;
+
+    /**
+     * GetSignatureHash returns the hash of the serialized spork message
+     * without the signature included. The intent of this method is to get the
+     * hash to be signed.
+     */
     uint256 GetSignatureHash() const;
 
+    /**
+     * Sign will sign the spork message with the given key.
+     */
     bool Sign(const CKey& key, bool fSporkSixActive);
+
+    /**
+     * CheckSignature will ensure the spork signature matches the provided public
+     * key hash.
+     */
     bool CheckSignature(const CKeyID& pubKeyId, bool fSporkSixActive) const;
+
+    /**
+     * GetSignerKeyID is used to recover the spork address of the key used to
+     * sign this spork message.
+     *
+     * This method was introduced along with the multi-signer sporks feature,
+     * in order to identify which spork key signed this message.
+     */
     bool GetSignerKeyID(CKeyID& retKeyidSporkSigner, bool fSporkSixActive);
+
+    /**
+     * Relay is used to send this spork message to other peers.
+     */
     void Relay(CConnman& connman);
 };
 
-
+/**
+ * CSporkManager is a higher-level class which manages the node's spork
+ * messages, rules for which sporks should be considered active/inactive, and
+ * processing for certain sporks (e.g. spork 12).
+ */
 class CSporkManager
 {
 private:
@@ -96,7 +142,12 @@ class CSporkManager
     int nMinSporkKeys;
     CKey sporkPrivKey;
 
+    /**
+     * SporkValueIsActive is used to get the value agreed upon by the majority
+     * of signed spork messages for a given Spork ID.
+     */
     bool SporkValueIsActive(int nSporkID, int64_t& nActiveValueRet) const;
+
 public:
 
     CSporkManager() {}
@@ -123,24 +174,113 @@ class CSporkManager
         // we don't serialize private key to prevent its leakage
     }
 
+    /**
+     * Clear is used to clear all in-memory active spork messages. Since spork
+     * public and private keys are set in init.cpp, we do not clear them here.
+     *
+     * This method was introduced along with the spork cache.
+     */
     void Clear();
+
+    /**
+     * CheckAndRemove is defined to fulfill an interface as part of the on-disk
+     * cache used to cache sporks between runs. If sporks that are restored
+     * from cache do not have valid signatures when compared against the
+     * current spork private keys, they are removed from in-memory storage.
+     *
+     * This method was introduced along with the spork cache.
+     */
     void CheckAndRemove();
 
+    /**
+     * ProcessSpork is used to handle the 'getsporks' and 'spork' p2p messages.
+     *
+     * For 'getsporks', it sends active sporks to the requesting peer. For 'spork',
+     * it validates the spork and adds it to the internal spork storage and
+     * performs any necessary processing.
+     */
     void ProcessSpork(CNode* pfrom, const std::string& strCommand, CDataStream& vRecv, CConnman& connman);
+
+    /**
+     * ExecuteSpork is used to perform certain actions based on the spork value.
+     *
+     * Currently only used with Spork 12.
+     */
     void ExecuteSpork(int nSporkID, int nValue);
+
+    /**
+     * UpdateSpork is used by the spork RPC command to set a new spork value, sign
+     * and broadcast the spork message.
+     */
     bool UpdateSpork(int nSporkID, int64_t nValue, CConnman& connman);
 
+    /**
+     * IsSporkActive returns a bool for time-based sporks, and should be used
+     * to determine whether the spork can be considered active or not.
+     *
+     * For value-based sporks such as SPORK_5_INSTANTSEND_MAX_VALUE, the spork
+     * value should not be considered a timestamp, but an integer value
+     * instead, and therefore this method doesn't make sense and should not be
+     * used.
+     */
     bool IsSporkActive(int nSporkID);
+
+    /**
+     * GetSporkValue returns the spork value given a Spork ID. If no active spork
+     * message has yet been received by the node, it returns the default value.
+     */
     int64_t GetSporkValue(int nSporkID);
+
+    /**
+     * GetSporkIDByName returns the internal Spork ID given the spork name.
+     */
     int GetSporkIDByName(const std::string& strName);
+
+    /**
+     * GetSporkNameByID returns the spork name as a string, given a Spork ID.
+     */
     std::string GetSporkNameByID(int nSporkID);
 
+    /**
+     * GetSporkByHash returns a spork message given a hash of the spork message.
+     *
+     * This is used when a requesting peer sends a MSG_SPORK inventory message with
+     * the hash, to quickly lookup and return the full spork message. We maintain a
+     * hash-based index of sporks for this reason, and this function is the access
+     * point into that index.
+     */
     bool GetSporkByHash(const uint256& hash, CSporkMessage &sporkRet);
 
+    /**
+     * SetSporkAddress is used to set a public key ID which will be used to
+     * verify spork signatures.
+     *
+     * This can be called multiple times to add multiple keys to the set of
+     * valid spork signers.
+     */
     bool SetSporkAddress(const std::string& strAddress);
+
+    /**
+     * SetMinSporkKeys is used to set the required spork signer threshold, for
+     * a spork to be considered active.
+     *
+     * This value must be at least a majority of the total number of spork
+     * keys, and for obvious resons cannot be larger than that number.
+     */
     bool SetMinSporkKeys(int minSporkKeys);
+
+    /**
+     * SetPrivKey is used to set a spork key to enable setting / signing of
+     * spork values.
+     *
+     * This will return false if the private key does not match any spork
+     * address in the set of valid spork signers (see SetSporkAddress).
+     */
     bool SetPrivKey(const std::string& strPrivKey);
 
+    /**
+     * ToString returns the string representation of the SporkManager.
+     */
     std::string ToString() const;
 };
 

From eaef9020256400171ac7521df8819b0c832a0b73 Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Tue, 2 Oct 2018 11:03:05 +0200
Subject: [PATCH 167/400] Don't use boost range adaptors in
 CDeterministicMNList (#2327)

These cause crashes when used in for loops. Reason is very likely that
temporary CDeterministicMNList objects are destroyed before entering the
loop while the adaptors rely on these objects.

Discovered in one of our devnets while calling "protx list"
---
 src/evo/deterministicmns.cpp            | 15 ++++++-----
 src/evo/deterministicmns.h              | 36 ++++---------------------
 src/evo/simplifiedmns.cpp               |  6 ++---
 src/masternodeman.cpp                   | 19 ++++++-------
 src/rpc/governance.cpp                  | 20 +++++++-------
 src/rpc/rpcevo.cpp                      | 26 +++++++-----------
 src/test/evo_deterministicmns_tests.cpp | 12 ++++++---
 7 files changed, 53 insertions(+), 81 deletions(-)

diff --git a/src/evo/deterministicmns.cpp b/src/evo/deterministicmns.cpp
index 30ec29fd5f51..3e2aef77d071 100644
--- a/src/evo/deterministicmns.cpp
+++ b/src/evo/deterministicmns.cpp
@@ -174,10 +174,11 @@ CDeterministicMNCPtr CDeterministicMNList::GetMNPayee() const
         return nullptr;
 
     CDeterministicMNCPtr best;
-    for (const auto& dmn : valid_range()) {
-        if (!best || CompareByLastPaid(dmn, best))
+    ForEachMN(true, [&](const CDeterministicMNCPtr& dmn) {
+        if (!best || CompareByLastPaid(dmn, best)) {
             best = dmn;
-    }
+        }
+    });
 
     return best;
 }
@@ -310,8 +311,8 @@ bool CDeterministicMNManager::ProcessBlock(const CBlock& block, const CBlockInde
     evoDb.Write(std::make_pair(DB_LIST_DIFF, diff.blockHash), diff);
     if ((nHeight % SNAPSHOT_LIST_PERIOD) == 0) {
         evoDb.Write(std::make_pair(DB_LIST_SNAPSHOT, diff.blockHash), newList);
-        LogPrintf("CDeterministicMNManager::%s -- Wrote snapshot. nHeight=%d, mapCurMNs.size=%d\n",
-                  __func__, nHeight, newList.size());
+        LogPrintf("CDeterministicMNManager::%s -- Wrote snapshot. nHeight=%d, mapCurMNs.allMNsCount=%d\n",
+                  __func__, nHeight, newList.GetAllMNsCount());
     }
 
     if (nHeight == GetSpork15Value()) {
@@ -373,8 +374,8 @@ bool CDeterministicMNManager::BuildNewListFromBlock(const CBlock& block, const C
             if (dmn && dmn->nCollateralIndex == in.prevout.n) {
                 newList.RemoveMN(proTxHash);
 
-                LogPrintf("CDeterministicMNManager::%s -- MN %s removed from list because collateral was spent. nHeight=%d, mapCurMNs.size=%d\n",
-                          __func__, proTxHash.ToString(), nHeight, newList.size());
+                LogPrintf("CDeterministicMNManager::%s -- MN %s removed from list because collateral was spent. nHeight=%d, mapCurMNs.allMNsCount=%d\n",
+                          __func__, proTxHash.ToString(), nHeight, newList.GetAllMNsCount());
             }
         }
 
diff --git a/src/evo/deterministicmns.h b/src/evo/deterministicmns.h
index a5758b218c05..c1699c65b134 100644
--- a/src/evo/deterministicmns.h
+++ b/src/evo/deterministicmns.h
@@ -15,9 +15,6 @@
 
 #include <map>
 
-#include <boost/range/adaptors.hpp>
-#include <boost/range/any_range.hpp>
-
 class CBlock;
 class CBlockIndex;
 class CValidationState;
@@ -220,41 +217,18 @@ class CDeterministicMNList
 
 public:
 
-    size_t size() const
+    size_t GetAllMNsCount() const
     {
         return mnMap.size();
     }
 
-    typedef boost::any_range<const CDeterministicMNCPtr&, boost::forward_traversal_tag> range_type;
-
-    range_type all_range() const
-    {
-        return boost::adaptors::transform(mnMap, [] (const MnMap::value_type& p) -> const CDeterministicMNCPtr& {
-            return p.second;
-        });
-    }
-
-    range_type valid_range() const
-    {
-        return boost::adaptors::filter(all_range(), [&] (const CDeterministicMNCPtr& dmn) -> bool {
-            return IsMNValid(dmn);
-        });
-    }
-
-    size_t all_count() const
-    {
-        return mnMap.size();
-    }
-
-    size_t valid_count() const
-    {
-        size_t c = 0;
+    template<typename Callback>
+    void ForEachMN(bool onlyValid, Callback&& cb) const {
         for (const auto& p : mnMap) {
-            if (IsMNValid(p.second)) {
-                c++;
+            if (!onlyValid || IsMNValid(p.second)) {
+                cb(p.second);
             }
         }
-        return c;
     }
 
 public:
diff --git a/src/evo/simplifiedmns.cpp b/src/evo/simplifiedmns.cpp
index 0bf79924b69b..9c426a9cae94 100644
--- a/src/evo/simplifiedmns.cpp
+++ b/src/evo/simplifiedmns.cpp
@@ -56,11 +56,11 @@ CSimplifiedMNList::CSimplifiedMNList(const std::vector<CSimplifiedMNListEntry>&
 
 CSimplifiedMNList::CSimplifiedMNList(const CDeterministicMNList& dmnList)
 {
-    mnList.reserve(dmnList.all_count());
+    mnList.reserve(dmnList.GetAllMNsCount());
 
-    for (const auto& dmn : dmnList.all_range()) {
+    dmnList.ForEachMN(false, [this](const CDeterministicMNCPtr& dmn) {
         mnList.emplace_back(*dmn);
-    }
+    });
 
     std::sort(mnList.begin(), mnList.end(), [&](const CSimplifiedMNListEntry& a, const CSimplifiedMNListEntry& b) {
         return a.proRegTxHash.Compare(b.proRegTxHash) < 0;
diff --git a/src/masternodeman.cpp b/src/masternodeman.cpp
index 04aebffc78c6..bbd02c047a99 100644
--- a/src/masternodeman.cpp
+++ b/src/masternodeman.cpp
@@ -381,7 +381,7 @@ void CMasternodeMan::AddDeterministicMasternodes()
         unsigned int oldMnCount = mapMasternodes.size();
 
         auto mnList = deterministicMNManager->GetListAtChainTip();
-        for (const auto& dmn : mnList.valid_range()) {
+        mnList.ForEachMN(true, [this](const CDeterministicMNCPtr& dmn) {
             // call Find() on each deterministic MN to force creation of CMasternode object
             auto mn = Find(COutPoint(dmn->proTxHash, dmn->nCollateralIndex));
             assert(mn);
@@ -395,7 +395,7 @@ void CMasternodeMan::AddDeterministicMasternodes()
 
             // If it appeared in the valid list, it is enabled no matter what
             mn->nActiveState = CMasternode::MASTERNODE_ENABLED;
-        }
+        });
 
         added = oldMnCount != mapMasternodes.size();
     }
@@ -415,9 +415,9 @@ void CMasternodeMan::RemoveNonDeterministicMasternodes()
         LOCK(cs);
         std::set<COutPoint> mnSet;
         auto mnList = deterministicMNManager->GetListAtChainTip();
-        for (const auto& dmn : mnList.valid_range()) {
+        mnList.ForEachMN(true, [&](const CDeterministicMNCPtr& dmn) {
             mnSet.insert(COutPoint(dmn->proTxHash, dmn->nCollateralIndex));
-        }
+        });
         auto it = mapMasternodes.begin();
         while (it != mapMasternodes.end()) {
             if (!mnSet.count(it->second.outpoint)) {
@@ -455,10 +455,11 @@ int CMasternodeMan::CountMasternodes(int nProtocolVersion)
 
     if (deterministicMNManager->IsDeterministicMNsSporkActive()) {
         auto mnList = deterministicMNManager->GetListAtChainTip();
-        for (const auto& dmn : mnList.valid_range()) {
-            if (dmn->pdmnState->nProtocolVersion < nProtocolVersion) continue;
-            nCount++;
-        }
+        mnList.ForEachMN(true, [&](const CDeterministicMNCPtr& dmn) {
+            if (dmn->pdmnState->nProtocolVersion >= nProtocolVersion) {
+                nCount++;
+            }
+        });
     } else {
         for (const auto& mnpair : mapMasternodes) {
             if(mnpair.second.nProtocolVersion < nProtocolVersion) continue;
@@ -1693,7 +1694,7 @@ std::string CMasternodeMan::ToString() const
 
     if (deterministicMNManager->IsDeterministicMNsSporkActive()) {
         info << "Masternodes: masternode object count: " << (int)mapMasternodes.size() <<
-                ", deterministic masternode count: " << deterministicMNManager->GetListAtChainTip().size() <<
+                ", deterministic masternode count: " << deterministicMNManager->GetListAtChainTip().GetAllMNsCount() <<
                 ", nDsqCount: " << (int)nDsqCount;
     } else {
         info << "Masternodes: " << (int)mapMasternodes.size() <<
diff --git a/src/rpc/governance.cpp b/src/rpc/governance.cpp
index bbe0ff70b5e8..4084fbfbcade 100644
--- a/src/rpc/governance.cpp
+++ b/src/rpc/governance.cpp
@@ -579,7 +579,7 @@ UniValue gobject_vote_many(const JSONRPCRequest& request)
     // management
     if (deterministicMNManager->IsDeterministicMNsSporkActive()) {
         auto mnList = deterministicMNManager->GetListAtChainTip();
-        for (const auto &dmn : mnList.valid_range()) {
+        mnList.ForEachMN(true, [&](const CDeterministicMNCPtr& dmn) {
             bool found = false;
             for (const auto &mne : entries) {
                 uint256 nTxHash;
@@ -595,17 +595,15 @@ UniValue gobject_vote_many(const JSONRPCRequest& request)
                     break;
                 }
             }
-            if (found) {
-                continue;
-            }
-
-            CKey ownerKey;
-            if (pwalletMain->GetKey(dmn->pdmnState->keyIDVoting, ownerKey)) {
-                CBitcoinSecret secret(ownerKey);
-                CMasternodeConfig::CMasternodeEntry mne(dmn->proTxHash.ToString(), dmn->pdmnState->addr.ToStringIPPort(false), secret.ToString(), dmn->proTxHash.ToString(), itostr(dmn->nCollateralIndex));
-                entries.push_back(mne);
+            if (!found) {
+                CKey ownerKey;
+                if (pwalletMain->GetKey(dmn->pdmnState->keyIDVoting, ownerKey)) {
+                    CBitcoinSecret secret(ownerKey);
+                    CMasternodeConfig::CMasternodeEntry mne(dmn->proTxHash.ToString(), dmn->pdmnState->addr.ToStringIPPort(false), secret.ToString(), dmn->proTxHash.ToString(), itostr(dmn->nCollateralIndex));
+                    entries.push_back(mne);
+                }
             }
-        }
+        });
     }
 #endif
 
diff --git a/src/rpc/rpcevo.cpp b/src/rpc/rpcevo.cpp
index 177db49f0cd7..72a12b5c4c12 100644
--- a/src/rpc/rpcevo.cpp
+++ b/src/rpc/rpcevo.cpp
@@ -519,16 +519,16 @@ UniValue protx_list(const JSONRPCRequest& request)
             setOutpts.emplace(outpt.hash);
         }
 
-        for (const auto& dmn : deterministicMNManager->GetListAtChainTip().all_range()) {
+        deterministicMNManager->GetListAtChainTip().ForEachMN(false, [&](const CDeterministicMNCPtr& dmn) {
             if (setOutpts.count(dmn->proTxHash) ||
-                    pwalletMain->HaveKey(dmn->pdmnState->keyIDOwner) ||
-                    pwalletMain->HaveKey(dmn->pdmnState->keyIDOperator) ||
-                    pwalletMain->HaveKey(dmn->pdmnState->keyIDVoting) ||
-                    CheckWalletOwnsScript(dmn->pdmnState->scriptPayout) ||
-                    CheckWalletOwnsScript(dmn->pdmnState->scriptOperatorPayout)) {
+                pwalletMain->HaveKey(dmn->pdmnState->keyIDOwner) ||
+                pwalletMain->HaveKey(dmn->pdmnState->keyIDOperator) ||
+                pwalletMain->HaveKey(dmn->pdmnState->keyIDVoting) ||
+                CheckWalletOwnsScript(dmn->pdmnState->scriptPayout) ||
+                CheckWalletOwnsScript(dmn->pdmnState->scriptOperatorPayout)) {
                 ret.push_back(BuildDMNListEntry(dmn, detailed));
             }
-        }
+        });
     } else if (type == "valid" || type == "registered") {
         if (request.params.size() > 4)
             protx_list_help();
@@ -542,16 +542,10 @@ UniValue protx_list(const JSONRPCRequest& request)
         bool detailed = request.params.size() > 3 ? ParseBoolV(request.params[3], "detailed") : false;
 
         CDeterministicMNList mnList = deterministicMNManager->GetListForBlock(chainActive[height]->GetBlockHash());
-        CDeterministicMNList::range_type range;
-
-        if (type == "valid") {
-            range = mnList.valid_range();
-        } else if (type == "registered") {
-            range = mnList.all_range();
-        }
-        for (const auto& dmn : range) {
+        bool onlyValid = type == "valid";
+        mnList.ForEachMN(onlyValid, [&](const CDeterministicMNCPtr& dmn) {
             ret.push_back(BuildDMNListEntry(dmn, detailed));
-        }
+        });
     } else {
         throw JSONRPCError(RPC_INVALID_PARAMETER, "invalid type specified");
     }
diff --git a/src/test/evo_deterministicmns_tests.cpp b/src/test/evo_deterministicmns_tests.cpp
index f64650eb77ec..af9e241437d0 100644
--- a/src/test/evo_deterministicmns_tests.cpp
+++ b/src/test/evo_deterministicmns_tests.cpp
@@ -199,11 +199,15 @@ static CDeterministicMNCPtr FindPayoutDmn(const CBlock& block)
 {
     auto dmnList = deterministicMNManager->GetListAtChainTip();
 
-    for (auto txout : block.vtx[0]->vout) {
-        for (auto& dmn : dmnList.valid_range()) {
-            if (txout.scriptPubKey == dmn->pdmnState->scriptPayout) {
-                return dmn;
+    for (const auto& txout : block.vtx[0]->vout) {
+        CDeterministicMNCPtr found;
+        dmnList.ForEachMN(true, [&](const CDeterministicMNCPtr& dmn) {
+            if (found == nullptr && txout.scriptPubKey == dmn->pdmnState->scriptPayout) {
+                found = dmn;
             }
+        });
+        if (found != nullptr) {
+            return found;
         }
     }
     return nullptr;

From 47a162255260019bd4733d4336c235b01019df9f Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Thu, 24 May 2018 13:50:57 +0200
Subject: [PATCH 168/400] Add ctpl header only library

A simple C++ thread pool library

https://github.com/vit-vit/CTPL
Commit: 437e135dbd94eb65b45533d9ce8ee28b5bd37b6d
---
 src/Makefile.am |   1 +
 src/ctpl.h      | 240 ++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 241 insertions(+)
 create mode 100644 src/ctpl.h

diff --git a/src/Makefile.am b/src/Makefile.am
index 17f2a339f86e..90e126e5c015 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -106,6 +106,7 @@ BITCOIN_CORE_H = \
   core_io.h \
   core_memusage.h \
   cuckoocache.h \
+  ctpl.h \
   evo/evodb.h \
   evo/specialtx.h \
   evo/providertx.h \
diff --git a/src/ctpl.h b/src/ctpl.h
new file mode 100644
index 000000000000..64f650d3e83b
--- /dev/null
+++ b/src/ctpl.h
@@ -0,0 +1,240 @@
+
+/*********************************************************
+ *
+ *  Copyright (C) 2014 by Vitaliy Vitsentiy
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ *********************************************************/
+
+
+#ifndef __ctpl_thread_pool_H__
+#define __ctpl_thread_pool_H__
+
+#include <functional>
+#include <thread>
+#include <atomic>
+#include <vector>
+#include <memory>
+#include <exception>
+#include <future>
+#include <mutex>
+#include <boost/lockfree/queue.hpp>
+
+
+#ifndef _ctplThreadPoolLength_
+#define _ctplThreadPoolLength_  100
+#endif
+
+
+// thread pool to run user's functors with signature
+//      ret func(int id, other_params)
+// where id is the index of the thread that runs the functor
+// ret is some return type
+
+
+namespace ctpl {
+
+    class thread_pool {
+
+    public:
+
+        thread_pool() : q(_ctplThreadPoolLength_) { this->init(); }
+        thread_pool(int nThreads, int queueSize = _ctplThreadPoolLength_) : q(queueSize) { this->init(); this->resize(nThreads); }
+
+        // the destructor waits for all the functions in the queue to be finished
+        ~thread_pool() {
+            this->stop(true);
+        }
+
+        // get the number of running threads in the pool
+        int size() { return static_cast<int>(this->threads.size()); }
+
+        // number of idle threads
+        int n_idle() { return this->nWaiting; }
+        std::thread & get_thread(int i) { return *this->threads[i]; }
+
+        // change the number of threads in the pool
+        // should be called from one thread, otherwise be careful to not interleave, also with this->stop()
+        // nThreads must be >= 0
+        void resize(int nThreads) {
+            if (!this->isStop && !this->isDone) {
+                int oldNThreads = static_cast<int>(this->threads.size());
+                if (oldNThreads <= nThreads) {  // if the number of threads is increased
+                    this->threads.resize(nThreads);
+                    this->flags.resize(nThreads);
+
+                    for (int i = oldNThreads; i < nThreads; ++i) {
+                        this->flags[i] = std::make_shared<std::atomic<bool>>(false);
+                        this->set_thread(i);
+                    }
+                }
+                else {  // the number of threads is decreased
+                    for (int i = oldNThreads - 1; i >= nThreads; --i) {
+                        *this->flags[i] = true;  // this thread will finish
+                        this->threads[i]->detach();
+                    }
+                    {
+                        // stop the detached threads that were waiting
+                        std::unique_lock<std::mutex> lock(this->mutex);
+                        this->cv.notify_all();
+                    }
+                    this->threads.resize(nThreads);  // safe to delete because the threads are detached
+                    this->flags.resize(nThreads);  // safe to delete because the threads have copies of shared_ptr of the flags, not originals
+                }
+            }
+        }
+
+        // empty the queue
+        void clear_queue() {
+            std::function<void(int id)> * _f;
+            while (this->q.pop(_f))
+                delete _f;  // empty the queue
+        }
+
+        // pops a functional wraper to the original function
+        std::function<void(int)> pop() {
+            std::function<void(int id)> * _f = nullptr;
+            this->q.pop(_f);
+            std::unique_ptr<std::function<void(int id)>> func(_f);  // at return, delete the function even if an exception occurred
+            
+            std::function<void(int)> f;
+            if (_f)
+                f = *_f;
+            return f;
+        }
+
+
+        // wait for all computing threads to finish and stop all threads
+        // may be called asyncronously to not pause the calling thread while waiting
+        // if isWait == true, all the functions in the queue are run, otherwise the queue is cleared without running the functions
+        void stop(bool isWait = false) {
+            if (!isWait) {
+                if (this->isStop)
+                    return;
+                this->isStop = true;
+                for (int i = 0, n = this->size(); i < n; ++i) {
+                    *this->flags[i] = true;  // command the threads to stop
+                }
+                this->clear_queue();  // empty the queue
+            }
+            else {
+                if (this->isDone || this->isStop)
+                    return;
+                this->isDone = true;  // give the waiting threads a command to finish
+            }
+            {
+                std::unique_lock<std::mutex> lock(this->mutex);
+                this->cv.notify_all();  // stop all waiting threads
+            }
+            for (int i = 0; i < static_cast<int>(this->threads.size()); ++i) {  // wait for the computing threads to finish
+                if (this->threads[i]->joinable())
+                    this->threads[i]->join();
+            }
+            // if there were no threads in the pool but some functors in the queue, the functors are not deleted by the threads
+            // therefore delete them here
+            this->clear_queue();
+            this->threads.clear();
+            this->flags.clear();
+        }
+
+        template<typename F, typename... Rest>
+        auto push(F && f, Rest&&... rest) ->std::future<decltype(f(0, rest...))> {
+            auto pck = std::make_shared<std::packaged_task<decltype(f(0, rest...))(int)>>(
+                std::bind(std::forward<F>(f), std::placeholders::_1, std::forward<Rest>(rest)...)
+            );
+
+            auto _f = new std::function<void(int id)>([pck](int id) {
+                (*pck)(id);
+            });
+            this->q.push(_f);
+
+            std::unique_lock<std::mutex> lock(this->mutex);
+            this->cv.notify_one();
+
+            return pck->get_future();
+        }
+
+        // run the user's function that excepts argument int - id of the running thread. returned value is templatized
+        // operator returns std::future, where the user can get the result and rethrow the catched exceptins
+        template<typename F>
+        auto push(F && f) ->std::future<decltype(f(0))> {
+            auto pck = std::make_shared<std::packaged_task<decltype(f(0))(int)>>(std::forward<F>(f));
+
+            auto _f = new std::function<void(int id)>([pck](int id) {
+                (*pck)(id);
+            });
+            this->q.push(_f);
+
+            std::unique_lock<std::mutex> lock(this->mutex);
+            this->cv.notify_one();
+
+            return pck->get_future();
+        }
+
+
+    private:
+
+        // deleted
+        thread_pool(const thread_pool &);// = delete;
+        thread_pool(thread_pool &&);// = delete;
+        thread_pool & operator=(const thread_pool &);// = delete;
+        thread_pool & operator=(thread_pool &&);// = delete;
+
+        void set_thread(int i) {
+            std::shared_ptr<std::atomic<bool>> flag(this->flags[i]);  // a copy of the shared ptr to the flag
+            auto f = [this, i, flag/* a copy of the shared ptr to the flag */]() {
+                std::atomic<bool> & _flag = *flag;
+                std::function<void(int id)> * _f;
+                bool isPop = this->q.pop(_f);
+                while (true) {
+                    while (isPop) {  // if there is anything in the queue
+                        std::unique_ptr<std::function<void(int id)>> func(_f);  // at return, delete the function even if an exception occurred
+                        (*_f)(i);
+
+                        if (_flag)
+                            return;  // the thread is wanted to stop, return even if the queue is not empty yet
+                        else
+                            isPop = this->q.pop(_f);
+                    }
+
+                    // the queue is empty here, wait for the next command
+                    std::unique_lock<std::mutex> lock(this->mutex);
+                    ++this->nWaiting;
+                    this->cv.wait(lock, [this, &_f, &isPop, &_flag](){ isPop = this->q.pop(_f); return isPop || this->isDone || _flag; });
+                    --this->nWaiting;
+
+                    if (!isPop)
+                        return;  // if the queue is empty and this->isDone == true or *flag then return
+                }
+            };
+            this->threads[i].reset(new std::thread(f));  // compiler may not support std::make_unique()
+        }
+
+        void init() { this->nWaiting = 0; this->isStop = false; this->isDone = false; }
+
+        std::vector<std::unique_ptr<std::thread>> threads;
+        std::vector<std::shared_ptr<std::atomic<bool>>> flags;
+        mutable boost::lockfree::queue<std::function<void(int id)> *> q;
+        std::atomic<bool> isDone;
+        std::atomic<bool> isStop;
+        std::atomic<int> nWaiting;  // how many threads are waiting
+
+        std::mutex mutex;
+        std::condition_variable cv;
+    };
+
+}
+
+#endif // __ctpl_thread_pool_H__
+

From b0d0093d73d53b3abff25605cdf95270cbd1de84 Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Thu, 24 May 2018 13:57:36 +0200
Subject: [PATCH 169/400] Add helper to rename all threads of a
 ctpl::thread_pool

---
 src/util.cpp | 20 ++++++++++++++++++++
 src/util.h   |  5 +++++
 2 files changed, 25 insertions(+)

diff --git a/src/util.cpp b/src/util.cpp
index 573125ec2bca..036479f8aee1 100644
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -12,6 +12,7 @@
 
 #include "support/allocators/secure.h"
 #include "chainparamsbase.h"
+#include "ctpl.h"
 #include "random.h"
 #include "serialize.h"
 #include "sync.h"
@@ -905,6 +906,25 @@ std::string GetThreadName()
     return std::string(name);
 }
 
+void RenameThreadPool(ctpl::thread_pool& tp, const char* baseName)
+{
+    auto cond = std::make_shared<std::condition_variable>();
+    auto mutex = std::make_shared<std::mutex>();
+    std::atomic<int> doneCnt(0);
+    for (size_t i = 0; i < tp.size(); i++) {
+        tp.push([baseName, i, cond, mutex, &doneCnt](int threadId) {
+            RenameThread(strprintf("%s-%d", baseName, i).c_str());
+            doneCnt++;
+            std::unique_lock<std::mutex> l(*mutex);
+            cond->wait(l);
+        });
+    }
+    while (doneCnt != tp.size()) {
+        MilliSleep(10);
+    }
+    cond->notify_all();
+}
+
 void SetupEnvironment()
 {
 #ifdef HAVE_MALLOPT_ARENA_MAX
diff --git a/src/util.h b/src/util.h
index 98c924328c62..b28bb5d945ef 100644
--- a/src/util.h
+++ b/src/util.h
@@ -244,6 +244,11 @@ int GetNumCores();
 void RenameThread(const char* name);
 std::string GetThreadName();
 
+namespace ctpl {
+    class thread_pool;
+}
+void RenameThreadPool(ctpl::thread_pool& tp, const char* baseName);
+
 /**
  * .. and a wrapper that just calls func once
  */

From 057d7445eb5c29719dd854bb7a4adf8c19c27380 Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Tue, 18 Sep 2018 14:26:18 +0200
Subject: [PATCH 170/400] Add libgmp to depends

---
 depends/packages/gmp.mk      | 22 ++++++++++++++++++++++
 depends/packages/packages.mk |  2 +-
 2 files changed, 23 insertions(+), 1 deletion(-)
 create mode 100644 depends/packages/gmp.mk

diff --git a/depends/packages/gmp.mk b/depends/packages/gmp.mk
new file mode 100644
index 000000000000..0003b24a33da
--- /dev/null
+++ b/depends/packages/gmp.mk
@@ -0,0 +1,22 @@
+package=gmp
+$(package)_version=6.1.2
+$(package)_download_path=https://gmplib.org/download/gmp
+$(package)_file_name=gmp-$($(package)_version).tar.bz2
+$(package)_sha256_hash=5275bb04f4863a13516b2f39392ac5e272f5e1bb8057b18aec1c9b79d73d8fb2
+
+define $(package)_set_vars
+$(package)_config_opts+=--enable-cxx --enable-fat --with-pic --disable-shared
+endef
+
+define $(package)_config_cmds
+  $($(package)_autoconf)
+endef
+
+define $(package)_build_cmds
+  $(MAKE)
+endef
+
+define $(package)_stage_cmds
+  $(MAKE) DESTDIR=$($(package)_staging_dir) install
+endef
+
diff --git a/depends/packages/packages.mk b/depends/packages/packages.mk
index 088723ebd0d5..5f3bf71a6299 100644
--- a/depends/packages/packages.mk
+++ b/depends/packages/packages.mk
@@ -1,4 +1,4 @@
-packages:=boost openssl libevent zeromq
+packages:=boost openssl libevent zeromq gmp
 native_packages := native_ccache
 
 qt_native_packages = native_protobuf

From f3dcb6916c3f53e8ac9c18c242eeab615d6477da Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Fri, 21 Sep 2018 11:52:01 +0200
Subject: [PATCH 171/400] Add cmake to ci/Dockerfile.builder

---
 ci/Dockerfile.builder | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ci/Dockerfile.builder b/ci/Dockerfile.builder
index 66d28227184c..250fac8ab7ac 100644
--- a/ci/Dockerfile.builder
+++ b/ci/Dockerfile.builder
@@ -12,6 +12,7 @@ RUN apt-get update && apt-get install -y \
   ccache \
   bsdmainutils \
   python3-pip python3-dev \
+  cmake \
   && rm -rf /var/lib/apt/lists
 
 # Python stuff

From 3039d44d39bb1df39e93391814ae9bd636660f1b Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Tue, 18 Sep 2018 10:19:04 +0200
Subject: [PATCH 172/400] Add Chia bls-signatures library to depends

---
 depends/packages/chia_bls.mk | 50 ++++++++++++++++++++++++++++++++++++
 depends/packages/packages.mk |  2 +-
 2 files changed, 51 insertions(+), 1 deletion(-)
 create mode 100644 depends/packages/chia_bls.mk

diff --git a/depends/packages/chia_bls.mk b/depends/packages/chia_bls.mk
new file mode 100644
index 000000000000..5ad17be881a5
--- /dev/null
+++ b/depends/packages/chia_bls.mk
@@ -0,0 +1,50 @@
+package=chia_bls
+$(package)_version=b24c15cef6567a855e901b4774d1d22efb063ea9
+# It's actually from https://github.com/Chia-Network/bls-signatures, but we have so many patches atm that it's forked
+$(package)_download_path=https://github.com/codablock/bls-signatures/archive
+$(package)_file_name=$($(package)_version).tar.gz
+$(package)_sha256_hash=96b5f9b70179e2e76123fb19b7a00dec9188b571757db15949bf9f1d8dee864f
+$(package)_dependencies=gmp
+#$(package)_patches=...TODO (when we switch back to https://github.com/Chia-Network/bls-signatures)
+
+#define $(package)_preprocess_cmds
+#  for i in $($(package)_patches); do patch -N -p1 < $($(package)_patch_dir)/$$$$i; done
+#endef
+
+define $(package)_set_vars
+  $(package)_config_opts=-DCMAKE_INSTALL_PREFIX=$($(package)_staging_dir)/$(host_prefix)
+  $(package)_config_opts+= -DCMAKE_PREFIX_PATH=$(host_prefix)
+  $(package)_config_opts+= -DSTLIB=ON -DSHLIB=OFF -DSTBIN=ON
+  $(package)_config_opts_linux=-DOPSYS=LINUX -DCMAKE_SYSTEM_NAME=Linux
+  $(package)_config_opts_darwin=-DOPSYS=MACOSX -DCMAKE_SYSTEM_NAME=Darwin
+  $(package)_config_opts_mingw32=-DOPSYS=WINDOWS -DCMAKE_SYSTEM_NAME=Windows -DCMAKE_SHARED_LIBRARY_LINK_C_FLAGS="" -DCMAKE_SHARED_LIBRARY_LINK_CXX_FLAGS=""
+  $(package)_config_opts_i686+= -DWSIZE=32
+  $(package)_config_opts_x86_64+= -DWSIZE=64
+  $(package)_config_opts_arm+= -DWSIZE=32
+  $(package)_config_opts_debug=-DDEBUG=ON -DCMAKE_BUILD_TYPE=Debug
+
+  ifneq ($(darwin_native_toolchain),)
+    $(package)_config_opts_darwin+= -DCMAKE_AR="$(host_prefix)/native/bin/$($(package)_ar)"
+    $(package)_config_opts_darwin+= -DCMAKE_RANLIB="$(host_prefix)/native/bin/$($(package)_ranlib)"
+  endif
+endef
+
+define $(package)_config_cmds
+  export CC="$($(package)_cc)" && \
+  export CXX="$($(package)_cxx)" && \
+  export CFLAGS="$($(package)_cflags) $($(package)_cppflags)" && \
+  export CXXFLAGS="$($(package)_cxxflags) $($(package)_cppflags)" && \
+  export LDFLAGS="$($(package)_ldflags)" && \
+  mkdir build && cd build && \
+  cmake ../ $($(package)_config_opts)
+endef
+
+define $(package)_build_cmds
+  cd build && \
+  $(MAKE) $($(package)_build_opts)
+endef
+
+define $(package)_stage_cmds
+  cd build && \
+  $(MAKE) install
+endef
diff --git a/depends/packages/packages.mk b/depends/packages/packages.mk
index 5f3bf71a6299..9eabe53f3b14 100644
--- a/depends/packages/packages.mk
+++ b/depends/packages/packages.mk
@@ -1,4 +1,4 @@
-packages:=boost openssl libevent zeromq gmp
+packages:=boost openssl libevent zeromq gmp chia_bls
 native_packages := native_ccache
 
 qt_native_packages = native_protobuf

From 9ccf6f584d45b824f8c1c5aedc7d05de30692858 Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Wed, 3 Oct 2018 14:53:21 +0200
Subject: [PATCH 173/400] Implement wrappers around Chia BLS lib

# Conflicts:
#	configure.ac
---
 src/Makefile.am             |  12 +-
 src/Makefile.bench.include  |   2 +-
 src/Makefile.qt.include     |   2 +-
 src/Makefile.qttest.include |   2 +-
 src/Makefile.test.include   |   2 +-
 src/crypto/bls.cpp          | 516 ++++++++++++++++++++++++++++++++++++
 src/crypto/bls.h            | 296 +++++++++++++++++++++
 src/init.cpp                |   5 +
 8 files changed, 829 insertions(+), 8 deletions(-)
 create mode 100644 src/crypto/bls.cpp
 create mode 100644 src/crypto/bls.h

diff --git a/src/Makefile.am b/src/Makefile.am
index 90e126e5c015..1a7c3c2db3af 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -25,6 +25,8 @@ BITCOIN_INCLUDES=-I$(builddir) -I$(builddir)/obj $(BDB_CPPFLAGS) $(BOOST_CPPFLAG
 BITCOIN_INCLUDES += -I$(srcdir)/secp256k1/include
 BITCOIN_INCLUDES += $(UNIVALUE_CFLAGS)
 
+BLS_LIBS=-lchiabls -lgmp
+
 LIBBITCOIN_SERVER=libdash_server.a
 LIBBITCOIN_COMMON=libdash_common.a
 LIBBITCOIN_CONSENSUS=libdash_consensus.a
@@ -312,6 +314,8 @@ crypto_libdash_crypto_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) $(PIC_FLAGS)
 crypto_libdash_crypto_a_SOURCES = \
   crypto/aes.cpp \
   crypto/aes.h \
+  crypto/bls.cpp \
+  crypto/bls.h \
   crypto/common.h \
   crypto/hmac_sha256.cpp \
   crypto/hmac_sha256.h \
@@ -473,7 +477,7 @@ dashd_LDADD = \
   $(LIBMEMENV) \
   $(LIBSECP256K1)
 
-dashd_LDADD += $(BOOST_LIBS) $(BDB_LIBS) $(SSL_LIBS) $(CRYPTO_LIBS) $(MINIUPNPC_LIBS) $(EVENT_PTHREADS_LIBS) $(EVENT_LIBS) $(ZMQ_LIBS)
+dashd_LDADD += $(BOOST_LIBS) $(BDB_LIBS) $(SSL_LIBS) $(CRYPTO_LIBS) $(MINIUPNPC_LIBS) $(EVENT_PTHREADS_LIBS) $(EVENT_LIBS) $(ZMQ_LIBS) $(BLS_LIBS)
 
 # dash-cli binary #
 dash_cli_SOURCES = dash-cli.cpp
@@ -490,7 +494,7 @@ dash_cli_LDADD = \
   $(LIBUNIVALUE) \
   $(LIBBITCOIN_UTIL) \
   $(LIBBITCOIN_CRYPTO)
-dash_cli_LDADD += $(BOOST_LIBS) $(SSL_LIBS) $(CRYPTO_LIBS) $(EVENT_LIBS)
+dash_cli_LDADD += $(BOOST_LIBS) $(SSL_LIBS) $(CRYPTO_LIBS) $(EVENT_LIBS) $(BLS_LIBS)
 #
 
 # dash-tx binary #
@@ -511,7 +515,7 @@ dash_tx_LDADD = \
   $(LIBBITCOIN_CRYPTO) \
   $(LIBSECP256K1)
 
-dash_tx_LDADD += $(BOOST_LIBS) $(CRYPTO_LIBS)
+dash_tx_LDADD += $(BOOST_LIBS) $(CRYPTO_LIBS) $(BLS_LIBS)
 #
 
 # dashconsensus library #
@@ -524,7 +528,7 @@ if GLIBC_BACK_COMPAT
 endif
 
 libdashconsensus_la_LDFLAGS = $(AM_LDFLAGS) -no-undefined $(RELDFLAGS)
-libdashconsensus_la_LIBADD = $(LIBSECP256K1)
+libdashconsensus_la_LIBADD = $(LIBSECP256K1) $(BLS_LIBS)
 libdashconsensus_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(builddir)/obj -I$(srcdir)/secp256k1/include -DBUILD_BITCOIN_INTERNAL
 libdashconsensus_la_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS)
 
diff --git a/src/Makefile.bench.include b/src/Makefile.bench.include
index c9efb4bdc305..87f579804c88 100644
--- a/src/Makefile.bench.include
+++ b/src/Makefile.bench.include
@@ -52,7 +52,7 @@ bench_bench_dash_SOURCES += bench/coin_selection.cpp
 bench_bench_dash_LDADD += $(LIBBITCOIN_WALLET) $(LIBBITCOIN_CRYPTO)
 endif
 
-bench_bench_dash_LDADD += $(BOOST_LIBS) $(BDB_LIBS) $(SSL_LIBS) $(CRYPTO_LIBS) $(MINIUPNPC_LIBS) $(EVENT_PTHREADS_LIBS) $(EVENT_LIBS)
+bench_bench_dash_LDADD += $(BOOST_LIBS) $(BDB_LIBS) $(SSL_LIBS) $(CRYPTO_LIBS) $(MINIUPNPC_LIBS) $(EVENT_PTHREADS_LIBS) $(EVENT_LIBS) $(BLS_LIBS)
 bench_bench_dash_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS)
 
 CLEAN_BITCOIN_BENCH = bench/*.gcda bench/*.gcno $(GENERATED_TEST_FILES)
diff --git a/src/Makefile.qt.include b/src/Makefile.qt.include
index c53c8e535366..c81768d1128d 100644
--- a/src/Makefile.qt.include
+++ b/src/Makefile.qt.include
@@ -641,7 +641,7 @@ qt_dash_qt_LDADD += $(LIBBITCOIN_ZMQ) $(ZMQ_LIBS)
 endif
 qt_dash_qt_LDADD += $(LIBBITCOIN_CLI) $(LIBBITCOIN_COMMON) $(LIBBITCOIN_UTIL) $(LIBBITCOIN_CONSENSUS) $(LIBBITCOIN_CRYPTO) $(LIBUNIVALUE) $(LIBLEVELDB) $(LIBMEMENV) \
   $(BOOST_LIBS) $(QT_LIBS) $(QT_DBUS_LIBS) $(QR_LIBS) $(PROTOBUF_LIBS) $(BDB_LIBS) $(SSL_LIBS) $(CRYPTO_LIBS) $(MINIUPNPC_LIBS) $(LIBSECP256K1) \
-  $(EVENT_PTHREADS_LIBS) $(EVENT_LIBS)
+  $(EVENT_PTHREADS_LIBS) $(EVENT_LIBS) $(BLS_LIBS)
 qt_dash_qt_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(QT_LDFLAGS) $(LIBTOOL_APP_LDFLAGS)
 qt_dash_qt_LIBTOOLFLAGS = --tag CXX
 
diff --git a/src/Makefile.qttest.include b/src/Makefile.qttest.include
index 8df5a6091bbf..01243392a521 100644
--- a/src/Makefile.qttest.include
+++ b/src/Makefile.qttest.include
@@ -51,7 +51,7 @@ endif
 qt_test_test_dash_qt_LDADD += $(LIBBITCOIN_CLI) $(LIBBITCOIN_COMMON) $(LIBBITCOIN_UTIL) $(LIBBITCOIN_CONSENSUS) $(LIBBITCOIN_CRYPTO) $(LIBUNIVALUE) $(LIBLEVELDB) \
   $(LIBMEMENV) $(BOOST_LIBS) $(QT_DBUS_LIBS) $(QT_TEST_LIBS) $(QT_LIBS) \
   $(QR_LIBS) $(PROTOBUF_LIBS) $(BDB_LIBS) $(SSL_LIBS) $(CRYPTO_LIBS) $(MINIUPNPC_LIBS) $(LIBSECP256K1) \
-  $(EVENT_PTHREADS_LIBS) $(EVENT_LIBS)
+  $(EVENT_PTHREADS_LIBS) $(EVENT_LIBS) $(BLS_LIBS)
 qt_test_test_dash_qt_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(QT_LDFLAGS) $(LIBTOOL_APP_LDFLAGS)
 qt_test_test_dash_qt_CXXFLAGS = $(AM_CXXFLAGS) $(QT_PIE_FLAGS)
 
diff --git a/src/Makefile.test.include b/src/Makefile.test.include
index 91f46163157b..b30a02c1d1ff 100644
--- a/src/Makefile.test.include
+++ b/src/Makefile.test.include
@@ -156,7 +156,7 @@ if ENABLE_WALLET
 test_test_dash_LDADD += $(LIBBITCOIN_WALLET)
 endif
 
-test_test_dash_LDADD += $(BDB_LIBS) $(SSL_LIBS) $(CRYPTO_LIBS) $(MINIUPNPC_LIBS) $(EVENT_PTHREADS_LIBS) $(EVENT_LIBS)
+test_test_dash_LDADD += $(BDB_LIBS) $(SSL_LIBS) $(CRYPTO_LIBS) $(MINIUPNPC_LIBS) $(EVENT_PTHREADS_LIBS) $(EVENT_LIBS) $(BLS_LIBS)
 test_test_dash_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS) -static
 
 if ENABLE_ZMQ
diff --git a/src/crypto/bls.cpp b/src/crypto/bls.cpp
new file mode 100644
index 000000000000..b1ab28ac68b7
--- /dev/null
+++ b/src/crypto/bls.cpp
@@ -0,0 +1,516 @@
+// Copyright (c) 2018 The Dash Core developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+#include "bls.h"
+
+#include "hash.h"
+#include "random.h"
+#include "tinyformat.h"
+
+#ifndef BUILD_BITCOIN_INTERNAL
+#include "support/allocators/secure.h"
+#include <boost/pool/pool_alloc.hpp>
+#endif
+
+#include <assert.h>
+#include <string.h>
+
+bool CBLSId::InternalSetBuf(const void* buf, size_t size)
+{
+    assert(size == sizeof(uint256));
+    memcpy(impl.begin(), buf, sizeof(uint256));
+    return true;
+}
+
+bool CBLSId::InternalGetBuf(void* buf, size_t size) const
+{
+    if (size != GetSerSize()) {
+        return false;
+    }
+    memcpy(buf, impl.begin(), sizeof(uint256));
+    return true;
+}
+
+void CBLSId::SetInt(int x)
+{
+    impl.SetHex(strprintf("%x", x));
+    fValid = true;
+    UpdateHash();
+}
+
+void CBLSId::SetHash(const uint256& hash)
+{
+    impl = hash;
+    fValid = true;
+    UpdateHash();
+}
+
+CBLSId CBLSId::FromInt(int64_t i)
+{
+    CBLSId id;
+    id.SetInt(i);
+    return id;
+}
+
+CBLSId CBLSId::FromHash(const uint256& hash)
+{
+    CBLSId id;
+    id.SetHash(hash);
+    return id;
+}
+
+bool CBLSSecretKey::InternalSetBuf(const void* buf, size_t size)
+{
+    if (size != GetSerSize()) {
+        return false;
+    }
+
+    try {
+        impl = bls::PrivateKey::FromBytes((const uint8_t*)buf);
+        return true;
+    } catch (...) {
+        return false;
+    }
+}
+
+bool CBLSSecretKey::InternalGetBuf(void* buf, size_t size) const
+{
+    if (size != GetSerSize()) {
+        return false;
+    }
+
+    impl.Serialize((uint8_t*)buf);
+    return true;
+}
+
+void CBLSSecretKey::AggregateInsecure(const CBLSSecretKey& o)
+{
+    assert(IsValid() && o.IsValid());
+    impl = bls::PrivateKey::AggregateInsecure({impl, o.impl});
+    UpdateHash();
+}
+
+CBLSSecretKey CBLSSecretKey::AggregateInsecure(const std::vector<CBLSSecretKey>& sks)
+{
+    if (sks.empty()) {
+        return CBLSSecretKey();
+    }
+
+    std::vector<bls::PrivateKey> v;
+    v.reserve(sks.size());
+    for (auto& sk : sks) {
+        v.emplace_back(sk.impl);
+    }
+
+    auto agg = bls::PrivateKey::AggregateInsecure(v);
+    CBLSSecretKey ret;
+    ret.impl = agg;
+    ret.fValid = true;
+    ret.UpdateHash();
+    return ret;
+}
+
+#ifndef BUILD_BITCOIN_INTERNAL
+void CBLSSecretKey::MakeNewKey()
+{
+    unsigned char buf[32];
+    while (true) {
+        GetStrongRandBytes(buf, sizeof(buf));
+        try {
+            impl = bls::PrivateKey::FromBytes((const uint8_t*)buf);
+            break;
+        } catch (...) {
+        }
+    }
+    fValid = true;
+    UpdateHash();
+}
+#endif
+
+bool CBLSSecretKey::SecretKeyShare(const std::vector<CBLSSecretKey>& msk, const CBLSId& _id)
+{
+    fValid = false;
+    UpdateHash();
+
+    if (!_id.IsValid()) {
+        return false;
+    }
+
+    std::vector<bls::PrivateKey> mskVec;
+    mskVec.reserve(msk.size());
+    for (const CBLSSecretKey& sk : msk) {
+        if (!sk.IsValid()) {
+            return false;
+        }
+        mskVec.emplace_back(sk.impl);
+    }
+
+    try {
+        impl = bls::BLS::PrivateKeyShare(mskVec, (const uint8_t*)_id.impl.begin());
+    } catch (...) {
+        return false;
+    }
+
+    fValid = true;
+    UpdateHash();
+    return true;
+}
+
+CBLSPublicKey CBLSSecretKey::GetPublicKey() const
+{
+    if (!IsValid()) {
+        return CBLSPublicKey();
+    }
+
+    CBLSPublicKey pubKey;
+    pubKey.impl = impl.GetPublicKey();
+    pubKey.fValid = true;
+    pubKey.UpdateHash();
+    return pubKey;
+}
+
+CBLSSignature CBLSSecretKey::Sign(const uint256& hash) const
+{
+    if (!IsValid()) {
+        return CBLSSignature();
+    }
+
+    CBLSSignature sigRet;
+    sigRet.impl = impl.SignInsecurePrehashed((const uint8_t*)hash.begin());
+
+    sigRet.fValid = true;
+    sigRet.UpdateHash();
+
+    return sigRet;
+}
+
+bool CBLSPublicKey::InternalSetBuf(const void* buf, size_t size)
+{
+    if (size != GetSerSize()) {
+        return false;
+    }
+
+    try {
+        impl = bls::PublicKey::FromBytes((const uint8_t*)buf);
+        return true;
+    } catch (...) {
+        return false;
+    }
+}
+
+bool CBLSPublicKey::InternalGetBuf(void* buf, size_t size) const
+{
+    if (size != GetSerSize()) {
+        return false;
+    }
+
+    impl.Serialize((uint8_t*)buf);
+    return true;
+}
+
+void CBLSPublicKey::AggregateInsecure(const CBLSPublicKey& o)
+{
+    assert(IsValid() && o.IsValid());
+    impl = bls::PublicKey::AggregateInsecure({impl, o.impl});
+    UpdateHash();
+}
+
+CBLSPublicKey CBLSPublicKey::AggregateInsecure(const std::vector<CBLSPublicKey>& pks)
+{
+    if (pks.empty()) {
+        return CBLSPublicKey();
+    }
+
+    std::vector<bls::PublicKey> v;
+    v.reserve(pks.size());
+    for (auto& pk : pks) {
+        v.emplace_back(pk.impl);
+    }
+
+    auto agg = bls::PublicKey::AggregateInsecure(v);
+    CBLSPublicKey ret;
+    ret.impl = agg;
+    ret.fValid = true;
+    ret.UpdateHash();
+    return ret;
+}
+
+bool CBLSPublicKey::PublicKeyShare(const std::vector<CBLSPublicKey>& mpk, const CBLSId& _id)
+{
+    fValid = false;
+    UpdateHash();
+
+    if (!_id.IsValid()) {
+        return false;
+    }
+
+    std::vector<bls::PublicKey> mpkVec;
+    mpkVec.reserve(mpk.size());
+    for (const CBLSPublicKey& pk : mpk) {
+        if (!pk.IsValid()) {
+            return false;
+        }
+        mpkVec.emplace_back(pk.impl);
+    }
+
+    try {
+        impl = bls::BLS::PublicKeyShare(mpkVec, (const uint8_t*)_id.impl.begin());
+    } catch (...) {
+        return false;
+    }
+
+    fValid = true;
+    UpdateHash();
+    return true;
+}
+
+bool CBLSPublicKey::DHKeyExchange(const CBLSSecretKey& sk, const CBLSPublicKey& pk)
+{
+    fValid = false;
+    UpdateHash();
+
+    if (!sk.IsValid() || !pk.IsValid()) {
+        return false;
+    }
+    impl = bls::BLS::DHKeyExchange(sk.impl, pk.impl);
+    fValid = true;
+    UpdateHash();
+    return true;
+}
+
+bool CBLSSignature::InternalSetBuf(const void* buf, size_t size)
+{
+    if (size != GetSerSize()) {
+        return false;
+    }
+
+    try {
+        impl = bls::InsecureSignature::FromBytes((const uint8_t*)buf);
+        return true;
+    } catch (...) {
+        return false;
+    }
+}
+
+bool CBLSSignature::InternalGetBuf(void* buf, size_t size) const
+{
+    if (size != GetSerSize()) {
+        return false;
+    }
+    impl.Serialize((uint8_t*)buf);
+    return true;
+}
+
+void CBLSSignature::AggregateInsecure(const CBLSSignature& o)
+{
+    assert(IsValid() && o.IsValid());
+    impl = bls::InsecureSignature::Aggregate({impl, o.impl});
+    UpdateHash();
+}
+
+CBLSSignature CBLSSignature::AggregateInsecure(const std::vector<CBLSSignature>& sigs)
+{
+    if (sigs.empty()) {
+        return CBLSSignature();
+    }
+
+    std::vector<bls::InsecureSignature> v;
+    v.reserve(sigs.size());
+    for (auto& pk : sigs) {
+        v.emplace_back(pk.impl);
+    }
+
+    auto agg = bls::InsecureSignature::Aggregate(v);
+    CBLSSignature ret;
+    ret.impl = agg;
+    ret.fValid = true;
+    ret.UpdateHash();
+    return ret;
+}
+
+CBLSSignature CBLSSignature::AggregateSecure(const std::vector<CBLSSignature>& sigs,
+                                             const std::vector<CBLSPublicKey>& pks,
+                                             const uint256& hash)
+{
+    if (sigs.size() != pks.size() || sigs.empty()) {
+        return CBLSSignature();
+    }
+
+    std::vector<bls::Signature> v;
+    v.reserve(sigs.size());
+
+    for (size_t i = 0; i < sigs.size(); i++) {
+        bls::AggregationInfo aggInfo = bls::AggregationInfo::FromMsgHash(pks[i].impl, hash.begin());
+        v.emplace_back(bls::Signature::FromInsecureSig(sigs[i].impl, aggInfo));
+    }
+
+    auto aggSig = bls::Signature::AggregateSigs(v);
+    CBLSSignature ret;
+    ret.impl = aggSig.GetInsecureSig();
+    ret.fValid = true;
+    ret.UpdateHash();
+    return ret;
+}
+
+void CBLSSignature::SubInsecure(const CBLSSignature& o)
+{
+    assert(IsValid() && o.IsValid());
+    impl = impl.DivideBy({o.impl});
+    UpdateHash();
+}
+
+bool CBLSSignature::VerifyInsecure(const CBLSPublicKey& pubKey, const uint256& hash) const
+{
+    if (!IsValid() || !pubKey.IsValid()) {
+        return false;
+    }
+
+    try {
+        return impl.Verify({(const uint8_t*)hash.begin()}, {pubKey.impl});
+    } catch (...) {
+        return false;
+    }
+}
+
+bool CBLSSignature::VerifyInsecureAggregated(const std::vector<CBLSPublicKey>& pubKeys, const std::vector<uint256>& hashes) const
+{
+    if (!IsValid()) {
+        return false;
+    }
+    assert(!pubKeys.empty() && !hashes.empty() && pubKeys.size() == hashes.size());
+
+    std::vector<bls::PublicKey> pubKeyVec;
+    std::vector<const uint8_t*> hashes2;
+    hashes2.reserve(hashes.size());
+    pubKeyVec.reserve(pubKeys.size());
+    for (size_t i = 0; i < pubKeys.size(); i++) {
+        auto& p = pubKeys[i];
+        if (!p.IsValid()) {
+            return false;
+        }
+        pubKeyVec.push_back(p.impl);
+        hashes2.push_back((uint8_t*)hashes[i].begin());
+    }
+
+    try {
+        return impl.Verify(hashes2, pubKeyVec);
+    } catch (...) {
+        return false;
+    }
+}
+
+bool CBLSSignature::VerifySecureAggregated(const std::vector<CBLSPublicKey>& pks, const uint256& hash) const
+{
+    if (pks.empty()) {
+        return false;
+    }
+
+    std::vector<bls::AggregationInfo> v;
+    v.reserve(pks.size());
+    for (auto& pk : pks) {
+        auto aggInfo = bls::AggregationInfo::FromMsgHash(pk.impl, hash.begin());
+        v.emplace_back(aggInfo);
+    }
+
+    bls::AggregationInfo aggInfo = bls::AggregationInfo::MergeInfos(v);
+    bls::Signature aggSig = bls::Signature::FromInsecureSig(impl, aggInfo);
+    return aggSig.Verify();
+}
+
+bool CBLSSignature::Recover(const std::vector<CBLSSignature>& sigs, const std::vector<CBLSId>& ids)
+{
+    fValid = false;
+    UpdateHash();
+
+    if (sigs.empty() || ids.empty() || sigs.size() != ids.size()) {
+        return false;
+    }
+
+    std::vector<bls::InsecureSignature> sigsVec;
+    std::vector<const uint8_t*> idsVec;
+    sigsVec.reserve(sigs.size());
+    idsVec.reserve(sigs.size());
+
+    for (size_t i = 0; i < sigs.size(); i++) {
+        if (!sigs[i].IsValid() || !ids[i].IsValid()) {
+            return false;
+        }
+        sigsVec.emplace_back(sigs[i].impl);
+        idsVec.emplace_back(ids[i].impl.begin());
+    }
+
+    try {
+        impl = bls::BLS::RecoverSig(sigsVec, idsVec);
+    } catch (...) {
+        return false;
+    }
+
+    fValid = true;
+    UpdateHash();
+    return true;
+}
+
+#ifndef BUILD_BITCOIN_INTERNAL
+struct secure_user_allocator {
+    typedef std::size_t size_type;
+    typedef std::ptrdiff_t difference_type;
+
+    static char* malloc(const size_type bytes)
+    {
+        return static_cast<char*>(LockedPoolManager::Instance().alloc(bytes));
+    }
+
+    static void free(char* const block)
+    {
+        LockedPoolManager::Instance().free(block);
+    }
+};
+
+// every thread has it's own pool allocator for secure data to speed things up
+// otherwise locking of mutexes slows down the system at places were you'd never expect it
+// downside is that we must make sure that all threads have destroyed their copy of the pool before the global
+// LockedPool is destroyed. This means that all worker threads must finish before static destruction begins
+// we use sizeof(relic::bn_t) as the pool request size as this is what Chia's BLS library will request in most cases
+// In case something larger is requested, we directly call into LockedPool and accept the slowness
+thread_local static boost::pool<secure_user_allocator> securePool(sizeof(relic::bn_t) + sizeof(size_t));
+
+static void* secure_allocate(size_t n)
+{
+    void* p;
+    if (n <= securePool.get_requested_size() - sizeof(size_t)) {
+        p = securePool.ordered_malloc();
+    } else {
+        p = secure_user_allocator::malloc(n + sizeof(size_t));
+    }
+    *(size_t*)p = n;
+    p = (uint8_t*)p + sizeof(size_t);
+    return p;
+}
+
+static void secure_free(void* p)
+{
+    if (!p) {
+        return;
+    }
+    p = (uint8_t*)p - sizeof(size_t);
+    size_t n = *(size_t*)p;
+    memory_cleanse(p, n + sizeof(size_t));
+    if (n <= securePool.get_requested_size() - sizeof(size_t)) {
+        securePool.ordered_free(p);
+    } else {
+        secure_user_allocator::free((char*)p);
+    }
+}
+#endif
+
+bool BLSInit()
+{
+    if (!bls::BLS::Init()) {
+        return false;
+    }
+#ifndef BUILD_BITCOIN_INTERNAL
+    bls::BLS::SetSecureAllocator(secure_allocate, secure_free);
+#endif
+    return true;
+}
diff --git a/src/crypto/bls.h b/src/crypto/bls.h
new file mode 100644
index 000000000000..e64da0dbc81c
--- /dev/null
+++ b/src/crypto/bls.h
@@ -0,0 +1,296 @@
+// Copyright (c) 2018 The Dash Core developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+#ifndef DASH_CRYPTO_BLS_H
+#define DASH_CRYPTO_BLS_H
+
+#include "hash.h"
+#include "serialize.h"
+#include "uint256.h"
+#include "utilstrencodings.h"
+
+#include <chiabls/bls.hpp>
+#include <chiabls/privatekey.hpp>
+#include <chiabls/publickey.hpp>
+#include <chiabls/signature.hpp>
+
+#include <array>
+#include <unistd.h>
+
+// reversed BLS12-381
+#define BLS_CURVE_ID_SIZE 32
+#define BLS_CURVE_SECKEY_SIZE 32
+#define BLS_CURVE_PUBKEY_SIZE 48
+#define BLS_CURVE_SIG_SIZE 96
+
+class CBLSSignature;
+class CBLSPublicKey;
+
+template <typename ImplType, size_t _SerSize, typename C>
+class CBLSWrapper
+{
+    friend class CBLSSecretKey;
+    friend class CBLSPublicKey;
+    friend class CBLSSignature;
+
+protected:
+    ImplType impl;
+    bool fValid{false};
+    mutable uint256 cachedHash;
+
+    inline constexpr size_t GetSerSize() const { return SerSize; }
+
+    virtual bool InternalSetBuf(const void* buf, size_t size) = 0;
+    virtual bool InternalGetBuf(void* buf, size_t size) const = 0;
+
+public:
+    static const size_t SerSize = _SerSize;
+
+    CBLSWrapper()
+    {
+        UpdateHash();
+    }
+
+    CBLSWrapper(const CBLSWrapper& ref) = default;
+    CBLSWrapper& operator=(const CBLSWrapper& ref) = default;
+    CBLSWrapper(CBLSWrapper&& ref)
+    {
+        std::swap(impl, ref.impl);
+        std::swap(fValid, ref.fValid);
+        std::swap(cachedHash, ref.cachedHash);
+    }
+    CBLSWrapper& operator=(CBLSWrapper&& ref)
+    {
+        std::swap(impl, ref.impl);
+        std::swap(fValid, ref.fValid);
+        std::swap(cachedHash, ref.cachedHash);
+        return *this;
+    }
+
+    bool operator==(const C& r) const
+    {
+        return fValid == r.fValid && impl == r.impl;
+    }
+    bool operator!=(const C& r) const
+    {
+        return !((*this) == r);
+    }
+
+    bool IsValid() const
+    {
+        return fValid;
+    }
+
+    void SetBuf(const void* buf, size_t size)
+    {
+        if (std::all_of((const char*)buf, (const char*)buf + size, [](char c) { return c == 0; })) {
+            Reset();
+        } else {
+            fValid = InternalSetBuf(buf, size);
+            if (!fValid) {
+                Reset();
+            }
+        }
+        UpdateHash();
+    }
+
+    void Reset()
+    {
+        *((C*)this) = C();
+    }
+
+    void GetBuf(void* buf, size_t size) const
+    {
+        if (!fValid) {
+            memset(buf, 0, size);
+        } else {
+            bool ok = InternalGetBuf(buf, size);
+            assert(ok);
+        }
+    }
+
+    template <typename T>
+    void SetBuf(const T& buf)
+    {
+        SetBuf(buf.data(), buf.size());
+    }
+
+    template <typename T>
+    void GetBuf(T& buf) const
+    {
+        buf.resize(GetSerSize());
+        GetBuf(buf.data(), buf.size());
+    }
+
+    const uint256& GetHash() const
+    {
+        return cachedHash;
+    }
+
+    void UpdateHash() const
+    {
+        cachedHash = ::SerializeHash(*this);
+    }
+
+    bool SetHexStr(const std::string& str)
+    {
+        auto b = ParseHex(str);
+        if (b.size() != SerSize) {
+            return false;
+        }
+        SetBuf(b);
+        return IsValid();
+    }
+
+public:
+    template <typename Stream>
+    inline void Serialize(Stream& s) const
+    {
+        char buf[SerSize] = {0};
+        GetBuf(buf, SerSize);
+        s.write((const char*)buf, SerSize);
+
+        // if (s.GetType() != SER_GETHASH) {
+        //    CheckMalleable(buf, SerSize);
+        // }
+    }
+    template <typename Stream>
+    inline void Unserialize(Stream& s)
+    {
+        char buf[SerSize];
+        s.read((char*)buf, SerSize);
+        SetBuf(buf, SerSize);
+
+        CheckMalleable(buf, SerSize);
+    }
+
+    inline void CheckMalleable(void* buf, size_t size) const
+    {
+        char buf2[SerSize];
+        C tmp;
+        tmp.SetBuf(buf, SerSize);
+        tmp.GetBuf(buf2, SerSize);
+        if (memcmp(buf, buf2, SerSize)) {
+            // TODO not sure if this is actually possible with the BLS libs. I'm assuming here that somewhere deep inside
+            // these libs masking might happen, so that 2 different binary representations could result in the same object
+            // representation
+            throw std::ios_base::failure("malleable BLS object");
+        }
+    }
+
+    inline std::string ToString() const
+    {
+        std::vector<unsigned char> buf;
+        GetBuf(buf);
+        return HexStr(buf.begin(), buf.end());
+    }
+};
+
+class CBLSId : public CBLSWrapper<uint256, BLS_CURVE_ID_SIZE, CBLSId>
+{
+public:
+    using CBLSWrapper::operator=;
+    using CBLSWrapper::operator==;
+    using CBLSWrapper::operator!=;
+
+    void SetInt(int x);
+    void SetHash(const uint256& hash);
+
+    static CBLSId FromInt(int64_t i);
+    static CBLSId FromHash(const uint256& hash);
+
+protected:
+    bool InternalSetBuf(const void* buf, size_t size);
+    bool InternalGetBuf(void* buf, size_t size) const;
+};
+
+class CBLSSecretKey : public CBLSWrapper<bls::PrivateKey, BLS_CURVE_SECKEY_SIZE, CBLSSecretKey>
+{
+public:
+    using CBLSWrapper::operator=;
+    using CBLSWrapper::operator==;
+    using CBLSWrapper::operator!=;
+
+    void AggregateInsecure(const CBLSSecretKey& o);
+    static CBLSSecretKey AggregateInsecure(const std::vector<CBLSSecretKey>& sks);
+
+#ifndef BUILD_BITCOIN_INTERNAL
+    void MakeNewKey();
+#endif
+    bool SecretKeyShare(const std::vector<CBLSSecretKey>& msk, const CBLSId& id);
+
+    CBLSPublicKey GetPublicKey() const;
+    CBLSSignature Sign(const uint256& hash) const;
+
+protected:
+    bool InternalSetBuf(const void* buf, size_t size);
+    bool InternalGetBuf(void* buf, size_t size) const;
+};
+
+class CBLSPublicKey : public CBLSWrapper<bls::PublicKey, BLS_CURVE_PUBKEY_SIZE, CBLSPublicKey>
+{
+    friend class CBLSSecretKey;
+    friend class CBLSSignature;
+
+public:
+    using CBLSWrapper::operator=;
+    using CBLSWrapper::operator==;
+    using CBLSWrapper::operator!=;
+
+    void AggregateInsecure(const CBLSPublicKey& o);
+    static CBLSPublicKey AggregateInsecure(const std::vector<CBLSPublicKey>& pks);
+
+    bool PublicKeyShare(const std::vector<CBLSPublicKey>& mpk, const CBLSId& id);
+    bool DHKeyExchange(const CBLSSecretKey& sk, const CBLSPublicKey& pk);
+
+protected:
+    bool InternalSetBuf(const void* buf, size_t size);
+    bool InternalGetBuf(void* buf, size_t size) const;
+};
+
+class CBLSSignature : public CBLSWrapper<bls::InsecureSignature, BLS_CURVE_SIG_SIZE, CBLSSignature>
+{
+    friend class CBLSSecretKey;
+
+public:
+    using CBLSWrapper::operator==;
+    using CBLSWrapper::operator!=;
+
+    CBLSSignature() = default;
+    CBLSSignature(const CBLSSignature&) = default;
+    CBLSSignature& operator=(const CBLSSignature&) = default;
+
+    void AggregateInsecure(const CBLSSignature& o);
+    static CBLSSignature AggregateInsecure(const std::vector<CBLSSignature>& sigs);
+    static CBLSSignature AggregateSecure(const std::vector<CBLSSignature>& sigs, const std::vector<CBLSPublicKey>& pks, const uint256& hash);
+
+    void SubInsecure(const CBLSSignature& o);
+
+    bool VerifyInsecure(const CBLSPublicKey& pubKey, const uint256& hash) const;
+    bool VerifyInsecureAggregated(const std::vector<CBLSPublicKey>& pubKeys, const std::vector<uint256>& hashes) const;
+
+    bool VerifySecureAggregated(const std::vector<CBLSPublicKey>& pks, const uint256& hash) const;
+
+    bool Recover(const std::vector<CBLSSignature>& sigs, const std::vector<CBLSId>& ids);
+
+protected:
+    bool InternalSetBuf(const void* buf, size_t size);
+    bool InternalGetBuf(void* buf, size_t size) const;
+};
+
+typedef std::vector<CBLSId> BLSIdVector;
+typedef std::vector<CBLSPublicKey> BLSVerificationVector;
+typedef std::vector<CBLSPublicKey> BLSPublicKeyVector;
+typedef std::vector<CBLSSecretKey> BLSSecretKeyVector;
+typedef std::vector<CBLSSignature> BLSSignatureVector;
+
+typedef std::shared_ptr<BLSIdVector> BLSIdVectorPtr;
+typedef std::shared_ptr<BLSVerificationVector> BLSVerificationVectorPtr;
+typedef std::shared_ptr<BLSPublicKeyVector> BLSPublicKeyVectorPtr;
+typedef std::shared_ptr<BLSSecretKeyVector> BLSSecretKeyVectorPtr;
+typedef std::shared_ptr<BLSSignatureVector> BLSSignatureVectorPtr;
+
+bool BLSInit();
+
+#endif // DASH_CRYPTO_BLS_H
diff --git a/src/init.cpp b/src/init.cpp
index 0cf30ccca109..88e64ddaa1e3 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -72,6 +72,8 @@
 #include <stdio.h>
 #include <memory>
 
+#include "crypto/bls.h"
+
 #ifndef WIN32
 #include <signal.h>
 #endif
@@ -825,6 +827,9 @@ bool InitSanityCheck(void)
     if (!glibc_sanity_test() || !glibcxx_sanity_test())
         return false;
 
+    if (!BLSInit())
+        return false;
+
     return true;
 }
 

From aa3b0aa8a4ba0afc86548c3620a726bdd2f3473e Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Thu, 24 May 2018 11:29:48 +0200
Subject: [PATCH 174/400] Add simple helpers/wrappers for BLS+AES based
 integrated encryption schemes (IES)

---
 src/Makefile.am        |   2 +
 src/crypto/bls_ies.cpp | 136 ++++++++++++++++++++++++++++++++++
 src/crypto/bls_ies.h   | 164 +++++++++++++++++++++++++++++++++++++++++
 3 files changed, 302 insertions(+)
 create mode 100644 src/crypto/bls_ies.cpp
 create mode 100644 src/crypto/bls_ies.h

diff --git a/src/Makefile.am b/src/Makefile.am
index 1a7c3c2db3af..6483cacab7dd 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -422,6 +422,8 @@ libdash_common_a_SOURCES = \
 libdash_util_a_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES)
 libdash_util_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS)
 libdash_util_a_SOURCES = \
+  crypto/bls_ies.cpp \
+  crypto/bls_ies.h \
   support/lockedpool.cpp \
   chainparamsbase.cpp \
   clientversion.cpp \
diff --git a/src/crypto/bls_ies.cpp b/src/crypto/bls_ies.cpp
new file mode 100644
index 000000000000..7212692ec486
--- /dev/null
+++ b/src/crypto/bls_ies.cpp
@@ -0,0 +1,136 @@
+// Copyright (c) 2018 The Dash Core developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+#include "bls_ies.h"
+
+#include "hash.h"
+#include "random.h"
+#include "streams.h"
+
+#include "aes.h"
+
+template <typename Out>
+static bool EncryptBlob(const void* in, size_t inSize, Out& out, const void* symKey, const void* iv)
+{
+    out.resize(inSize);
+
+    AES256CBCEncrypt enc((const unsigned char*)symKey, (const unsigned char*)iv, false);
+    int w = enc.Encrypt((const unsigned char*)in, (int)inSize, (unsigned char*)out.data());
+    return w == (int)inSize;
+}
+
+template <typename Out>
+static bool DecryptBlob(const void* in, size_t inSize, Out& out, const void* symKey, const void* iv)
+{
+    out.resize(inSize);
+
+    AES256CBCDecrypt enc((const unsigned char*)symKey, (const unsigned char*)iv, false);
+    int w = enc.Decrypt((const unsigned char*)in, (int)inSize, (unsigned char*)out.data());
+    return w == (int)inSize;
+}
+
+bool CBLSIESEncryptedBlob::Encrypt(const CBLSPublicKey& peerPubKey, const void* plainTextData, size_t dataSize)
+{
+    CBLSSecretKey ephemeralSecretKey;
+    ephemeralSecretKey.MakeNewKey();
+    ephemeralPubKey = ephemeralSecretKey.GetPublicKey();
+    GetStrongRandBytes(iv, sizeof(iv));
+
+    CBLSPublicKey pk;
+    if (!pk.DHKeyExchange(ephemeralSecretKey, peerPubKey)) {
+        return false;
+    }
+
+    std::vector<unsigned char> symKey;
+    pk.GetBuf(symKey);
+    symKey.resize(32);
+
+    return EncryptBlob(plainTextData, dataSize, data, symKey.data(), iv);
+}
+
+bool CBLSIESEncryptedBlob::Decrypt(const CBLSSecretKey& secretKey, CDataStream& decryptedDataRet) const
+{
+    CBLSPublicKey pk;
+    if (!pk.DHKeyExchange(secretKey, ephemeralPubKey)) {
+        return false;
+    }
+
+    std::vector<unsigned char> symKey;
+    pk.GetBuf(symKey);
+    symKey.resize(32);
+
+    return DecryptBlob(data.data(), data.size(), decryptedDataRet, symKey.data(), iv);
+}
+
+
+bool CBLSIESMultiRecipientBlobs::Encrypt(const std::vector<CBLSPublicKey>& recipients, const BlobVector& _blobs)
+{
+    if (recipients.size() != _blobs.size()) {
+        return false;
+    }
+
+    InitEncrypt(_blobs.size());
+
+    for (size_t i = 0; i < _blobs.size(); i++) {
+        if (!Encrypt(i, recipients[i], _blobs[i])) {
+            return false;
+        }
+    }
+
+    return true;
+}
+
+void CBLSIESMultiRecipientBlobs::InitEncrypt(size_t count)
+{
+    ephemeralSecretKey.MakeNewKey();
+    ephemeralPubKey = ephemeralSecretKey.GetPublicKey();
+    GetStrongRandBytes(ivSeed.begin(), ivSeed.size());
+
+    uint256 iv = ivSeed;
+    ivVector.resize(count);
+    blobs.resize(count);
+    for (size_t i = 0; i < count; i++) {
+        ivVector[i] = iv;
+        iv = ::SerializeHash(iv);
+    }
+}
+
+bool CBLSIESMultiRecipientBlobs::Encrypt(size_t idx, const CBLSPublicKey& recipient, const Blob& blob)
+{
+    assert(idx < blobs.size());
+
+    CBLSPublicKey pk;
+    if (!pk.DHKeyExchange(ephemeralSecretKey, recipient)) {
+        return false;
+    }
+
+    std::vector<unsigned char> symKey;
+    pk.GetBuf(symKey);
+    symKey.resize(32);
+
+    return EncryptBlob(blob.data(), blob.size(), blobs[idx], symKey.data(), ivVector[idx].begin());
+}
+
+bool CBLSIESMultiRecipientBlobs::Decrypt(size_t idx, const CBLSSecretKey& sk, Blob& blobRet) const
+{
+    if (idx >= blobs.size()) {
+        return false;
+    }
+
+    CBLSPublicKey pk;
+    if (!pk.DHKeyExchange(sk, ephemeralPubKey)) {
+        return false;
+    }
+
+    std::vector<unsigned char> symKey;
+    pk.GetBuf(symKey);
+    symKey.resize(32);
+
+    uint256 iv = ivSeed;
+    for (size_t i = 0; i < idx; i++) {
+        iv = ::SerializeHash(iv);
+    }
+
+    return DecryptBlob(blobs[idx].data(), blobs[idx].size(), blobRet, symKey.data(), iv.begin());
+}
diff --git a/src/crypto/bls_ies.h b/src/crypto/bls_ies.h
new file mode 100644
index 000000000000..5f28c91aa269
--- /dev/null
+++ b/src/crypto/bls_ies.h
@@ -0,0 +1,164 @@
+// Copyright (c) 2018 The Dash Core developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+#ifndef DASH_CRYPTO_BLS_IES_H
+#define DASH_CRYPTO_BLS_IES_H
+
+#include "bls.h"
+#include "streams.h"
+
+class CBLSIESEncryptedBlob
+{
+public:
+    CBLSPublicKey ephemeralPubKey;
+    unsigned char iv[16];
+    std::vector<unsigned char> data;
+
+    bool valid{false};
+
+public:
+    ADD_SERIALIZE_METHODS
+
+    template <typename Stream, typename Operation>
+    inline void SerializationOp(Stream& s, Operation ser_action)
+    {
+        if (!ser_action.ForRead()) {
+            assert(valid);
+        } else {
+            valid = false;
+        }
+        READWRITE(ephemeralPubKey);
+        READWRITE(FLATDATA(iv));
+        READWRITE(data);
+        if (ser_action.ForRead()) {
+            valid = true;
+        }
+    };
+
+public:
+    bool Encrypt(const CBLSPublicKey& peerPubKey, const void* data, size_t dataSize);
+    bool Decrypt(const CBLSSecretKey& secretKey, CDataStream& decryptedDataRet) const;
+};
+
+template <typename Object>
+class CBLSIESEncryptedObject : public CBLSIESEncryptedBlob
+{
+public:
+    CBLSIESEncryptedObject()
+    {
+    }
+
+    bool Encrypt(const CBLSPublicKey& peerPubKey, const Object& obj, int nVersion)
+    {
+        try {
+            CDataStream ds(SER_NETWORK, nVersion);
+            ds << obj;
+            return CBLSIESEncryptedBlob::Encrypt(peerPubKey, ds.data(), ds.size());
+        } catch (std::exception&) {
+            return false;
+        }
+    }
+
+    bool Decrypt(const CBLSSecretKey& secretKey, Object& objRet, int nVersion) const
+    {
+        CDataStream ds(SER_NETWORK, nVersion);
+        if (!CBLSIESEncryptedBlob::Decrypt(secretKey, ds)) {
+            return false;
+        }
+        try {
+            ds >> objRet;
+        } catch (std::exception& e) {
+            return false;
+        }
+        return true;
+    }
+};
+
+class CBLSIESMultiRecipientBlobs
+{
+public:
+    typedef std::vector<unsigned char> Blob;
+    typedef std::vector<Blob> BlobVector;
+
+public:
+    CBLSPublicKey ephemeralPubKey;
+    uint256 ivSeed;
+    BlobVector blobs;
+
+    // Used while encrypting. Temporary and only in-memory
+    CBLSSecretKey ephemeralSecretKey;
+    std::vector<uint256> ivVector;
+
+public:
+    bool Encrypt(const std::vector<CBLSPublicKey>& recipients, const BlobVector& _blobs);
+
+    void InitEncrypt(size_t count);
+    bool Encrypt(size_t idx, const CBLSPublicKey& recipient, const Blob& blob);
+    bool Decrypt(size_t idx, const CBLSSecretKey& sk, Blob& blobRet) const;
+
+public:
+    ADD_SERIALIZE_METHODS
+
+    template <typename Stream, typename Operation>
+    inline void SerializationOp(Stream& s, Operation ser_action)
+    {
+        READWRITE(ephemeralPubKey);
+        READWRITE(ivSeed);
+        READWRITE(blobs);
+    }
+};
+
+template <typename Object>
+class CBLSIESMultiRecipientObjects : public CBLSIESMultiRecipientBlobs
+{
+public:
+    typedef std::vector<Object> ObjectVector;
+
+public:
+    bool Encrypt(const std::vector<CBLSPublicKey>& recipients, const ObjectVector& _objects, int nVersion)
+    {
+        BlobVector blobs;
+        blobs.resize(_objects.size());
+
+        try {
+            CDataStream ds(SER_NETWORK, nVersion);
+            for (size_t i = 0; i < _objects.size(); i++) {
+                ds.clear();
+
+                ds << _objects[i];
+                blobs[i].assign(ds.begin(), ds.end());
+            }
+        } catch (std::exception&) {
+            return false;
+        }
+
+        return CBLSIESMultiRecipientBlobs::Encrypt(recipients, blobs);
+    }
+
+    bool Encrypt(size_t idx, const CBLSPublicKey& recipient, const Object& obj, int nVersion)
+    {
+        CDataStream ds(SER_NETWORK, nVersion);
+        ds << obj;
+        Blob blob(ds.begin(), ds.end());
+        return CBLSIESMultiRecipientBlobs::Encrypt(idx, recipient, blob);
+    }
+
+    bool Decrypt(size_t idx, const CBLSSecretKey& sk, Object& objectRet, int nVersion) const
+    {
+        Blob blob;
+        if (!CBLSIESMultiRecipientBlobs::Decrypt(idx, sk, blob)) {
+            return false;
+        }
+
+        try {
+            CDataStream ds(blob, SER_NETWORK, nVersion);
+            ds >> objectRet;
+            return true;
+        } catch (std::exception&) {
+            return false;
+        }
+    }
+};
+
+#endif // DASH_CRYPTO_BLS_IES_H

From 3ee27c1681b037ee71cbd2748b59fcb01aeb37d2 Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Thu, 24 May 2018 13:51:48 +0200
Subject: [PATCH 175/400] Add highly parallelized worker/helper for BLS/DKG
 calculations

---
 src/Makefile.am           |   2 +
 src/crypto/bls_worker.cpp | 957 ++++++++++++++++++++++++++++++++++++++
 src/crypto/bls_worker.h   | 204 ++++++++
 3 files changed, 1163 insertions(+)
 create mode 100644 src/crypto/bls_worker.cpp
 create mode 100644 src/crypto/bls_worker.h

diff --git a/src/Makefile.am b/src/Makefile.am
index 6483cacab7dd..f441a77e9776 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -424,6 +424,8 @@ libdash_util_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS)
 libdash_util_a_SOURCES = \
   crypto/bls_ies.cpp \
   crypto/bls_ies.h \
+  crypto/bls_worker.cpp \
+  crypto/bls_worker.h \
   support/lockedpool.cpp \
   chainparamsbase.cpp \
   clientversion.cpp \
diff --git a/src/crypto/bls_worker.cpp b/src/crypto/bls_worker.cpp
new file mode 100644
index 000000000000..f93d8504b2f4
--- /dev/null
+++ b/src/crypto/bls_worker.cpp
@@ -0,0 +1,957 @@
+// Copyright (c) 2018 The Dash Core developers
+// Distributed under the MIT/X11 software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+#include "bls_worker.h"
+#include "hash.h"
+#include "serialize.h"
+
+#include "util.h"
+
+template <typename T>
+bool VerifyVectorHelper(const std::vector<T>& vec, size_t start, size_t count)
+{
+    if (start == 0 && count == 0) {
+        count = vec.size();
+    }
+    std::set<uint256> set;
+    for (size_t i = start; i < start + count; i++) {
+        if (!vec[i].IsValid())
+            return false;
+        // check duplicates
+        if (!set.emplace(vec[i].GetHash()).second) {
+            return false;
+        }
+    }
+    return true;
+}
+
+// Creates a doneCallback and a future. The doneCallback simply finishes the future
+template <typename T>
+std::pair<std::function<void(const T&)>, std::future<T> > BuildFutureDoneCallback()
+{
+    auto p = std::make_shared<std::promise<T> >();
+    std::function<void(const T&)> f = [p](const T& v) {
+        p->set_value(v);
+    };
+    return std::make_pair(std::move(f), p->get_future());
+}
+template <typename T>
+std::pair<std::function<void(T)>, std::future<T> > BuildFutureDoneCallback2()
+{
+    auto p = std::make_shared<std::promise<T> >();
+    std::function<void(const T&)> f = [p](T v) {
+        p->set_value(v);
+    };
+    return std::make_pair(std::move(f), p->get_future());
+}
+
+
+/////
+
+CBLSWorker::CBLSWorker()
+{
+    int workerCount = std::thread::hardware_concurrency() / 2;
+    workerCount = std::max(std::min(1, workerCount), 4);
+    workerPool.resize(workerCount);
+
+    RenameThreadPool(workerPool, "bls-worker");
+}
+
+CBLSWorker::~CBLSWorker()
+{
+    Stop();
+}
+
+void CBLSWorker::Stop()
+{
+    workerPool.clear_queue();
+    workerPool.stop(true);
+}
+
+bool CBLSWorker::GenerateContributions(int quorumThreshold, const BLSIdVector& ids, BLSVerificationVectorPtr& vvecRet, BLSSecretKeyVector& skShares)
+{
+    BLSSecretKeyVectorPtr svec = std::make_shared<BLSSecretKeyVector>((size_t)quorumThreshold);
+    vvecRet = std::make_shared<BLSVerificationVector>((size_t)quorumThreshold);
+    skShares.resize(ids.size());
+
+    for (int i = 0; i < quorumThreshold; i++) {
+        (*svec)[i].MakeNewKey();
+    }
+    std::list<std::future<bool> > futures;
+    size_t batchSize = 8;
+
+    for (size_t i = 0; i < quorumThreshold; i += batchSize) {
+        size_t start = i;
+        size_t count = std::min(batchSize, quorumThreshold - start);
+        auto f = [&, start, count](int threadId) {
+            for (size_t j = start; j < start + count; j++) {
+                (*vvecRet)[j] = (*svec)[j].GetPublicKey();
+            }
+            return true;
+        };
+        futures.emplace_back(workerPool.push(f));
+    }
+
+    for (size_t i = 0; i < ids.size(); i += batchSize) {
+        size_t start = i;
+        size_t count = std::min(batchSize, ids.size() - start);
+        auto f = [&, start, count](int threadId) {
+            for (size_t j = start; j < start + count; j++) {
+                if (!skShares[j].SecretKeyShare(*svec, ids[j])) {
+                    return false;
+                }
+            }
+            return true;
+        };
+        futures.emplace_back(workerPool.push(f));
+    }
+    bool success = true;
+    for (auto& f : futures) {
+        if (!f.get()) {
+            success = false;
+        }
+    }
+    return success;
+}
+
+// aggregates a single vector of BLS objects in parallel
+// the input vector is split into batches and each batch is aggregated in parallel
+// when enough batches are finished to form a new batch, the new batch is queued for further parallel aggregation
+// when no more batches can be created from finished batch results, the final aggregated is created and the doneCallback
+// called.
+// The Aggregator object needs to be created on the heap and it will delete itself after calling the doneCallback
+// The input vector is not copied into the Aggregator but instead a vector of pointers to the original entries from the
+// input vector is stored. This means that the input vector must stay alive for the whole lifetime of the Aggregator
+template <typename T>
+struct Aggregator {
+    typedef T ElementType;
+
+    size_t batchSize{16};
+    std::shared_ptr<std::vector<const T*> > inputVec;
+
+    bool parallel;
+    ctpl::thread_pool& workerPool;
+
+    std::mutex m;
+    // items in the queue are all intermediate aggregation results of finished batches.
+    // The intermediate results must be deleted by us again (which we do in SyncAggregateAndPushAggQueue)
+    boost::lockfree::queue<T*> aggQueue;
+    std::atomic<size_t> aggQueueSize{0};
+
+    // keeps track of currently queued/in-progress batches. If it reaches 0, we are done
+    std::atomic<size_t> waitCount{0};
+
+    typedef std::function<void(const T& agg)> DoneCallback;
+    DoneCallback doneCallback;
+
+    // TP can either be a pointer or a reference
+    template <typename TP>
+    Aggregator(const std::vector<TP>& _inputVec,
+               size_t start, size_t count,
+               bool _parallel,
+               ctpl::thread_pool& _workerPool,
+               DoneCallback _doneCallback) :
+            workerPool(_workerPool),
+            parallel(_parallel),
+            aggQueue(0),
+            doneCallback(std::move(_doneCallback))
+    {
+        inputVec = std::make_shared<std::vector<const T*> >(count);
+        for (size_t i = 0; i < count; i++) {
+            (*inputVec)[i] = pointer(_inputVec[start + i]);
+        }
+    }
+
+    const T* pointer(const T& v) { return &v; }
+    const T* pointer(const T* v) { return v; }
+
+    // Starts aggregation.
+    // If parallel=true, then this will return fast, otherwise this will block until aggregation is done
+    void Start()
+    {
+        size_t batchCount = (inputVec->size() + batchSize - 1) / batchSize;
+
+        if (!parallel) {
+            if (inputVec->size() == 1) {
+                doneCallback(*(*inputVec)[0]);
+            } else {
+                doneCallback(SyncAggregate(*inputVec, 0, inputVec->size()));
+            }
+            delete this;
+            return;
+        }
+
+        if (batchCount == 1) {
+            // just a single batch of work, take a shortcut.
+            PushWork([this](int threadId) {
+                if (inputVec->size() == 1) {
+                    doneCallback(*(*inputVec)[0]);
+                } else {
+                    doneCallback(SyncAggregate(*inputVec, 0, inputVec->size()));
+                }
+                delete this;
+            });
+            return;
+        }
+
+        // increment wait counter as otherwise the first finished async aggregation might signal that we're done
+        IncWait();
+        for (size_t i = 0; i < batchCount; i++) {
+            size_t start = i * batchSize;
+            size_t count = std::min(batchSize, inputVec->size() - start);
+            AsyncAggregateAndPushAggQueue(inputVec, start, count, false);
+        }
+        // this will decrement the wait counter and in most cases NOT finish, as async work is still in progress
+        CheckDone();
+    }
+
+    void IncWait()
+    {
+        ++waitCount;
+    }
+
+    void CheckDone()
+    {
+        if (--waitCount == 0) {
+            Finish();
+        }
+    }
+
+    void Finish()
+    {
+        // All async work is done, but we might have items in the aggQueue which are the results of the async
+        // work. This is the case when these did not add up to a new batch. In this case, we have to aggregate
+        // the items into the final result
+
+        std::vector<T*> rem(aggQueueSize);
+        for (size_t i = 0; i < rem.size(); i++) {
+            T* p = nullptr;
+            bool s = aggQueue.pop(p);
+            assert(s);
+            rem[i] = p;
+        }
+
+        T r;
+        if (rem.size() == 1) {
+            // just one intermediate result, which is actually the final result
+            r = *rem[0];
+        } else {
+            // multiple intermediate results left which did not add up to a new batch. aggregate them now
+            r = SyncAggregate(rem, 0, rem.size());
+        }
+
+        // all items which are left in the queue are intermediate results, so we must delete them
+        for (size_t i = 0; i < rem.size(); i++) {
+            delete rem[i];
+        }
+        doneCallback(r);
+
+        delete this;
+    }
+
+    void AsyncAggregateAndPushAggQueue(std::shared_ptr<std::vector<const T*> >& vec, size_t start, size_t count, bool del)
+    {
+        IncWait();
+        PushWork(std::bind(&Aggregator::SyncAggregateAndPushAggQueue, this, vec, start, count, del));
+    }
+
+    void SyncAggregateAndPushAggQueue(std::shared_ptr<std::vector<const T*> >& vec, size_t start, size_t count, bool del)
+    {
+        // aggregate vec and push the intermediate result onto the work queue
+        PushAggQueue(SyncAggregate(*vec, start, count));
+        if (del) {
+            for (size_t i = 0; i < count; i++) {
+                delete (*vec)[start + i];
+            }
+        }
+        CheckDone();
+    }
+
+    void PushAggQueue(const T& v)
+    {
+        aggQueue.push(new T(v));
+
+        if (++aggQueueSize >= batchSize) {
+            // we've collected enough intermediate results to form a new batch.
+            std::shared_ptr<std::vector<const T*> > newBatch;
+            {
+                std::unique_lock<std::mutex> l(m);
+                if (aggQueueSize < batchSize) {
+                    // some other worker thread grabbed this batch
+                    return;
+                }
+                newBatch = std::make_shared<std::vector<const T*> >(batchSize);
+                // collect items for new batch
+                for (size_t i = 0; i < batchSize; i++) {
+                    T* p = nullptr;
+                    bool s = aggQueue.pop(p);
+                    assert(s);
+                    (*newBatch)[i] = p;
+                }
+                aggQueueSize -= batchSize;
+            }
+
+            // push new batch to work queue. del=true this time as these items are intermediate results and need to be deleted
+            // after aggregation is done
+            AsyncAggregateAndPushAggQueue(newBatch, 0, newBatch->size(), true);
+        }
+    }
+
+    template <typename TP>
+    T SyncAggregate(const std::vector<TP>& vec, size_t start, size_t count)
+    {
+        T result = *vec[start];
+        for (size_t j = 1; j < count; j++) {
+            result.AggregateInsecure(*vec[start + j]);
+        }
+        return result;
+    }
+
+    template <typename Callable>
+    void PushWork(Callable&& f)
+    {
+        workerPool.push(f);
+    }
+};
+
+// Aggregates multiple input vectors into a single output vector
+// Inputs are in the following form:
+//   [
+//     [a1, b1, c1, d1],
+//     [a2, b2, c2, d2],
+//     [a3, b3, c3, d3],
+//     [a4, b4, c4, d4],
+//   ]
+// The result is in the following form:
+//   [ a1+a2+a3+a4, b1+b2+b3+b4, c1+c2+c3+c4, d1+d2+d3+d4]
+// Same rules for the input vectors apply to the VectorAggregator as for the Aggregator (they must stay alive)
+template <typename T>
+struct VectorAggregator {
+    typedef Aggregator<T> AggregatorType;
+    typedef std::vector<T> VectorType;
+    typedef std::shared_ptr<VectorType> VectorPtrType;
+    typedef std::vector<VectorPtrType> VectorVectorType;
+    typedef std::function<void(const VectorPtrType& agg)> DoneCallback;
+    DoneCallback doneCallback;
+
+    const VectorVectorType& vecs;
+    size_t start;
+    size_t count;
+    bool parallel;
+    ctpl::thread_pool& workerPool;
+
+    std::atomic<size_t> doneCount;
+
+    VectorPtrType result;
+    size_t vecSize;
+
+    VectorAggregator(const VectorVectorType& _vecs,
+                     size_t _start, size_t _count,
+                     bool _parallel, ctpl::thread_pool& _workerPool,
+                     DoneCallback _doneCallback) :
+            vecs(_vecs),
+            parallel(_parallel),
+            start(_start),
+            count(_count),
+            workerPool(_workerPool),
+            doneCallback(std::move(_doneCallback))
+    {
+        assert(!vecs.empty());
+        vecSize = vecs[0]->size();
+        result = std::make_shared<VectorType>(vecSize);
+        doneCount = 0;
+    }
+
+    void Start()
+    {
+        std::vector<AggregatorType*> aggregators;
+        for (size_t i = 0; i < vecSize; i++) {
+            std::vector<const T*> tmp(count);
+            for (size_t j = 0; j < count; j++) {
+                tmp[j] = &(*vecs[start + j])[i];
+            }
+
+            auto aggregator = new AggregatorType(std::move(tmp), 0, count, parallel, workerPool, std::bind(&VectorAggregator::CheckDone, this, std::placeholders::_1, i));
+            // we can't directly start the aggregator here as it might be so fast that it deletes "this" while we are still in this loop
+            aggregators.emplace_back(aggregator);
+        }
+        for (auto agg : aggregators) {
+            agg->Start();
+        }
+    }
+
+    void CheckDone(const T& agg, size_t idx)
+    {
+        (*result)[idx] = agg;
+        if (++doneCount == vecSize) {
+            doneCallback(result);
+            delete this;
+        }
+    }
+};
+
+// See comment of AsyncVerifyContributionShares for a description on what this does
+// Same rules as in Aggregator apply for the inputs
+struct ContributionVerifier {
+    struct BatchState {
+        size_t start;
+        size_t count;
+
+        BLSVerificationVectorPtr vvec;
+        CBLSSecretKey skShare;
+
+        // starts with 0 and is incremented if either vvec or skShare aggregation finishs. If it reaches 2, we know
+        // that aggregation for this batch is fully done. We can then start verification.
+        std::unique_ptr<std::atomic<int> > aggDone;
+
+        // we can't directly update a vector<bool> in parallel
+        // as vector<bool> is not thread safe (uses bitsets internally)
+        // so we must use vector<char> temporarely and concatenate/convert
+        // each batch result into a final vector<bool>
+        std::vector<char> verifyResults;
+    };
+
+    CBLSId forId;
+    const std::vector<BLSVerificationVectorPtr>& vvecs;
+    const BLSSecretKeyVector& skShares;
+    size_t batchSize;
+    bool parallel;
+    bool aggregated;
+
+    ctpl::thread_pool& workerPool;
+
+    size_t batchCount;
+    size_t verifyCount;
+
+    std::vector<BatchState> batchStates;
+    std::atomic<size_t> verifyDoneCount{0};
+    std::function<void(const std::vector<bool>&)> doneCallback;
+
+    ContributionVerifier(const CBLSId& _forId, const std::vector<BLSVerificationVectorPtr>& _vvecs,
+                         const BLSSecretKeyVector& _skShares, size_t _batchSize,
+                         bool _parallel, bool _aggregated, ctpl::thread_pool& _workerPool,
+                         std::function<void(const std::vector<bool>&)> _doneCallback) :
+        forId(_forId),
+        vvecs(_vvecs),
+        skShares(_skShares),
+        batchSize(_batchSize),
+        parallel(_parallel),
+        aggregated(_aggregated),
+        workerPool(_workerPool),
+        doneCallback(std::move(_doneCallback))
+    {
+    }
+
+    void Start()
+    {
+        if (!aggregated) {
+            // treat all inputs as one large batch
+            batchSize = vvecs.size();
+            batchCount = 1;
+        } else {
+            batchCount = (vvecs.size() + batchSize - 1) / batchSize;
+        }
+        verifyCount = vvecs.size();
+
+        batchStates.resize(batchCount);
+        for (size_t i = 0; i < batchCount; i++) {
+            auto& batchState = batchStates[i];
+
+            batchState.aggDone.reset(new std::atomic<int>(0));
+            batchState.start = i * batchSize;
+            batchState.count = std::min(batchSize, vvecs.size() - batchState.start);
+            batchState.verifyResults.assign(batchState.count, 0);
+        }
+
+        if (aggregated) {
+            size_t batchCount2 = batchCount; // 'this' might get deleted while we're still looping
+            for (size_t i = 0; i < batchCount2; i++) {
+                AsyncAggregate(i);
+            }
+        } else {
+            // treat all inputs as a single batch and verify one-by-one
+            AsyncVerifyBatchOneByOne(0);
+        }
+    }
+
+    void Finish()
+    {
+        size_t batchIdx = 0;
+        std::vector<bool> result(vvecs.size());
+        for (size_t i = 0; i < vvecs.size(); i += batchSize) {
+            auto& batchState = batchStates[batchIdx++];
+            for (size_t j = 0; j < batchState.count; j++) {
+                result[batchState.start + j] = batchState.verifyResults[j] != 0;
+            }
+        }
+        doneCallback(result);
+        delete this;
+    }
+
+    void AsyncAggregate(size_t batchIdx)
+    {
+        auto& batchState = batchStates[batchIdx];
+
+        // aggregate vvecs and skShares of batch in parallel
+        auto vvecAgg = new VectorAggregator<CBLSPublicKey>(vvecs, batchState.start, batchState.count, parallel, workerPool, std::bind(&ContributionVerifier::HandleAggVvecDone, this, batchIdx, std::placeholders::_1));
+        auto skShareAgg = new Aggregator<CBLSSecretKey>(skShares, batchState.start, batchState.count, parallel, workerPool, std::bind(&ContributionVerifier::HandleAggSkShareDone, this, batchIdx, std::placeholders::_1));
+
+        vvecAgg->Start();
+        skShareAgg->Start();
+    }
+
+    void HandleAggVvecDone(size_t batchIdx, const BLSVerificationVectorPtr& vvec)
+    {
+        auto& batchState = batchStates[batchIdx];
+        batchState.vvec = vvec;
+        if (++(*batchState.aggDone) == 2) {
+            HandleAggDone(batchIdx);
+        }
+    }
+    void HandleAggSkShareDone(size_t batchIdx, const CBLSSecretKey& skShare)
+    {
+        auto& batchState = batchStates[batchIdx];
+        batchState.skShare = skShare;
+        if (++(*batchState.aggDone) == 2) {
+            HandleAggDone(batchIdx);
+        }
+    }
+
+    void HandleVerifyDone(size_t batchIdx, size_t count)
+    {
+        size_t c = verifyDoneCount += count;
+        if (c == verifyCount) {
+            Finish();
+        }
+    }
+
+    void HandleAggDone(size_t batchIdx)
+    {
+        auto& batchState = batchStates[batchIdx];
+
+        if (batchState.vvec == nullptr || batchState.vvec->empty() || !batchState.skShare.IsValid()) {
+            // something went wrong while aggregating and there is nothing we can do now except mark the whole batch as failed
+            // this can only happen if inputs were invalid in some way
+            batchState.verifyResults.assign(batchState.count, 0);
+            HandleVerifyDone(batchIdx, batchState.count);
+            return;
+        }
+
+        AsyncAggregatedVerifyBatch(batchIdx);
+    }
+
+    void AsyncAggregatedVerifyBatch(size_t batchIdx)
+    {
+        auto f = [this, batchIdx](int threadId) {
+            auto& batchState = batchStates[batchIdx];
+            bool result = Verify(batchState.vvec, batchState.skShare);
+            if (result) {
+                // whole batch is valid
+                batchState.verifyResults.assign(batchState.count, 1);
+                HandleVerifyDone(batchIdx, batchState.count);
+            } else {
+                // at least one entry in the batch is invalid, revert to per-contribution verification (but parallelized)
+                AsyncVerifyBatchOneByOne(batchIdx);
+            }
+        };
+        PushOrDoWork(std::move(f));
+    }
+
+    void AsyncVerifyBatchOneByOne(size_t batchIdx)
+    {
+        size_t count = batchStates[batchIdx].count;
+        batchStates[batchIdx].verifyResults.assign(count, 0);
+        for (size_t i = 0; i < count; i++) {
+            auto f = [this, i, batchIdx](int threadId) {
+                auto& batchState = batchStates[batchIdx];
+                batchState.verifyResults[i] = Verify(vvecs[batchState.start + i], skShares[batchState.start + i]);
+                HandleVerifyDone(batchIdx, 1);
+            };
+            PushOrDoWork(std::move(f));
+        }
+    }
+
+    bool Verify(const BLSVerificationVectorPtr& vvec, const CBLSSecretKey& skShare)
+    {
+        CBLSPublicKey pk1;
+        if (!pk1.PublicKeyShare(*vvec, forId)) {
+            return false;
+        }
+
+        CBLSPublicKey pk2 = skShare.GetPublicKey();
+        return pk1 == pk2;
+    }
+
+    template <typename Callable>
+    void PushOrDoWork(Callable&& f)
+    {
+        if (parallel) {
+            workerPool.push(std::move(f));
+        } else {
+            f(0);
+        }
+    }
+};
+
+void CBLSWorker::AsyncBuildQuorumVerificationVector(const std::vector<BLSVerificationVectorPtr>& vvecs,
+                                                    size_t start, size_t count, bool parallel,
+                                                    std::function<void(const BLSVerificationVectorPtr&)> doneCallback)
+{
+    if (start == 0 && count == 0) {
+        count = vvecs.size();
+    }
+    if (vvecs.empty() || count == 0 || start > vvecs.size() || start + count > vvecs.size()) {
+        doneCallback(nullptr);
+        return;
+    }
+    if (!VerifyVerificationVectors(vvecs, start, count)) {
+        doneCallback(nullptr);
+        return;
+    }
+
+    auto agg = new VectorAggregator<CBLSPublicKey>(vvecs, start, count, parallel, workerPool, std::move(doneCallback));
+    agg->Start();
+}
+
+std::future<BLSVerificationVectorPtr> CBLSWorker::AsyncBuildQuorumVerificationVector(const std::vector<BLSVerificationVectorPtr>& vvecs,
+                                                                                     size_t start, size_t count, bool parallel)
+{
+    auto p = BuildFutureDoneCallback<BLSVerificationVectorPtr>();
+    AsyncBuildQuorumVerificationVector(vvecs, start, count, parallel, std::move(p.first));
+    return std::move(p.second);
+}
+
+BLSVerificationVectorPtr CBLSWorker::BuildQuorumVerificationVector(const std::vector<BLSVerificationVectorPtr>& vvecs,
+                                                                   size_t start, size_t count, bool parallel)
+{
+    return AsyncBuildQuorumVerificationVector(vvecs, start, count, parallel).get();
+}
+
+template <typename T>
+void AsyncAggregateHelper(ctpl::thread_pool& workerPool,
+                          const std::vector<T>& vec, size_t start, size_t count, bool parallel,
+                          std::function<void(const T&)> doneCallback)
+{
+    if (start == 0 && count == 0) {
+        count = vec.size();
+    }
+    if (vec.empty() || count == 0 || start > vec.size() || start + count > vec.size()) {
+        doneCallback(T());
+        return;
+    }
+    if (!VerifyVectorHelper(vec, start, count)) {
+        doneCallback(T());
+        return;
+    }
+
+    auto agg = new Aggregator<T>(vec, start, count, parallel, workerPool, std::move(doneCallback));
+    agg->Start();
+}
+
+void CBLSWorker::AsyncAggregateSecretKeys(const BLSSecretKeyVector& secKeys,
+                                          size_t start, size_t count, bool parallel,
+                                          std::function<void(const CBLSSecretKey&)> doneCallback)
+{
+    AsyncAggregateHelper(workerPool, secKeys, start, count, parallel, doneCallback);
+}
+
+std::future<CBLSSecretKey> CBLSWorker::AsyncAggregateSecretKeys(const BLSSecretKeyVector& secKeys,
+                                                                size_t start, size_t count, bool parallel)
+{
+    auto p = BuildFutureDoneCallback<CBLSSecretKey>();
+    AsyncAggregateSecretKeys(secKeys, start, count, parallel, std::move(p.first));
+    return std::move(p.second);
+}
+
+CBLSSecretKey CBLSWorker::AggregateSecretKeys(const BLSSecretKeyVector& secKeys,
+                                              size_t start, size_t count, bool parallel)
+{
+    return AsyncAggregateSecretKeys(secKeys, start, count, parallel).get();
+}
+
+void CBLSWorker::AsyncAggregatePublicKeys(const BLSPublicKeyVector& pubKeys,
+                                          size_t start, size_t count, bool parallel,
+                                          std::function<void(const CBLSPublicKey&)> doneCallback)
+{
+    AsyncAggregateHelper(workerPool, pubKeys, start, count, parallel, doneCallback);
+}
+
+std::future<CBLSPublicKey> CBLSWorker::AsyncAggregatePublicKeys(const BLSPublicKeyVector& pubKeys,
+                                                                size_t start, size_t count, bool parallel)
+{
+    auto p = BuildFutureDoneCallback<CBLSPublicKey>();
+    AsyncAggregatePublicKeys(pubKeys, start, count, parallel, std::move(p.first));
+    return std::move(p.second);
+}
+
+CBLSPublicKey CBLSWorker::AggregatePublicKeys(const BLSPublicKeyVector& pubKeys,
+                                              size_t start, size_t count, bool parallel)
+{
+    return AsyncAggregatePublicKeys(pubKeys, start, count, parallel).get();
+}
+
+void CBLSWorker::AsyncAggregateSigs(const BLSSignatureVector& sigs,
+                                    size_t start, size_t count, bool parallel,
+                                    std::function<void(const CBLSSignature&)> doneCallback)
+{
+    AsyncAggregateHelper(workerPool, sigs, start, count, parallel, doneCallback);
+}
+
+std::future<CBLSSignature> CBLSWorker::AsyncAggregateSigs(const BLSSignatureVector& sigs,
+                                                          size_t start, size_t count, bool parallel)
+{
+    auto p = BuildFutureDoneCallback<CBLSSignature>();
+    AsyncAggregateSigs(sigs, start, count, parallel, std::move(p.first));
+    return std::move(p.second);
+}
+
+CBLSSignature CBLSWorker::AggregateSigs(const BLSSignatureVector& sigs,
+                                        size_t start, size_t count, bool parallel)
+{
+    return AsyncAggregateSigs(sigs, start, count, parallel).get();
+}
+
+
+CBLSPublicKey CBLSWorker::BuildPubKeyShare(const BLSVerificationVectorPtr& vvec, const CBLSId& id)
+{
+    CBLSPublicKey pkShare;
+    pkShare.PublicKeyShare(*vvec, id);
+    return pkShare;
+}
+
+void CBLSWorker::AsyncVerifyContributionShares(const CBLSId& forId, const std::vector<BLSVerificationVectorPtr>& vvecs, const BLSSecretKeyVector& skShares,
+                                               bool parallel, bool aggregated, std::function<void(const std::vector<bool>&)> doneCallback)
+{
+    if (!forId.IsValid() || !VerifyVerificationVectors(vvecs)) {
+        std::vector<bool> result;
+        result.assign(vvecs.size(), false);
+        doneCallback(result);
+        return;
+    }
+
+    auto verifier = new ContributionVerifier(forId, vvecs, skShares, 8, parallel, aggregated, workerPool, std::move(doneCallback));
+    verifier->Start();
+}
+
+std::future<std::vector<bool> > CBLSWorker::AsyncVerifyContributionShares(const CBLSId& forId, const std::vector<BLSVerificationVectorPtr>& vvecs, const BLSSecretKeyVector& skShares,
+                                                                          bool parallel, bool aggregated)
+{
+    auto p = BuildFutureDoneCallback<std::vector<bool> >();
+    AsyncVerifyContributionShares(forId, vvecs, skShares, parallel, aggregated, std::move(p.first));
+    return std::move(p.second);
+}
+
+std::vector<bool> CBLSWorker::VerifyContributionShares(const CBLSId& forId, const std::vector<BLSVerificationVectorPtr>& vvecs, const BLSSecretKeyVector& skShares,
+                                                       bool parallel, bool aggregated)
+{
+    return AsyncVerifyContributionShares(forId, vvecs, skShares, parallel, aggregated).get();
+}
+
+std::future<bool> CBLSWorker::AsyncVerifyContributionShare(const CBLSId& forId,
+                                                           const BLSVerificationVectorPtr& vvec,
+                                                           const CBLSSecretKey& skContribution)
+{
+    if (!forId.IsValid() || !VerifyVerificationVector(*vvec)) {
+        auto p = BuildFutureDoneCallback<bool>();
+        p.first(false);
+        return std::move(p.second);
+    }
+
+    auto f = [this, &forId, &vvec, &skContribution](int threadId) {
+        CBLSPublicKey pk1;
+        if (!pk1.PublicKeyShare(*vvec, forId)) {
+            return false;
+        }
+
+        CBLSPublicKey pk2 = skContribution.GetPublicKey();
+        return pk1 == pk2;
+    };
+    return workerPool.push(f);
+}
+
+bool CBLSWorker::VerifyContributionShare(const CBLSId& forId, const BLSVerificationVectorPtr& vvec,
+                                         const CBLSSecretKey& skContribution)
+{
+    CBLSPublicKey pk1;
+    if (!pk1.PublicKeyShare(*vvec, forId)) {
+        return false;
+    }
+
+    CBLSPublicKey pk2 = skContribution.GetPublicKey();
+    return pk1 == pk2;
+}
+
+bool CBLSWorker::VerifyVerificationVector(const BLSVerificationVector& vvec, size_t start, size_t count)
+{
+    return VerifyVectorHelper(vvec, start, count);
+}
+
+bool CBLSWorker::VerifyVerificationVectors(const std::vector<BLSVerificationVectorPtr>& vvecs,
+                                           size_t start, size_t count)
+{
+    if (start == 0 && count == 0) {
+        count = vvecs.size();
+    }
+
+    std::set<uint256> set;
+    for (size_t i = 0; i < count; i++) {
+        auto& vvec = vvecs[start + i];
+        if (vvec == nullptr) {
+            return false;
+        }
+        if (vvec->size() != vvecs[start]->size()) {
+            return false;
+        }
+        for (size_t j = 0; j < vvec->size(); j++) {
+            if (!(*vvec)[j].IsValid()) {
+                return false;
+            }
+            // check duplicates
+            if (!set.emplace((*vvec)[j].GetHash()).second) {
+                return false;
+            }
+        }
+    }
+
+    return true;
+}
+
+bool CBLSWorker::VerifySecretKeyVector(const BLSSecretKeyVector& secKeys, size_t start, size_t count)
+{
+    return VerifyVectorHelper(secKeys, start, count);
+}
+
+bool CBLSWorker::VerifySignatureVector(const BLSSignatureVector& sigs, size_t start, size_t count)
+{
+    return VerifyVectorHelper(sigs, start, count);
+}
+
+void CBLSWorker::AsyncSign(const CBLSSecretKey& secKey, const uint256& msgHash, CBLSWorker::SignDoneCallback doneCallback)
+{
+    workerPool.push([secKey, msgHash, doneCallback](int threadId) {
+        doneCallback(secKey.Sign(msgHash));
+    });
+}
+
+std::future<CBLSSignature> CBLSWorker::AsyncSign(const CBLSSecretKey& secKey, const uint256& msgHash)
+{
+    auto p = BuildFutureDoneCallback<CBLSSignature>();
+    AsyncSign(secKey, msgHash, std::move(p.first));
+    return std::move(p.second);
+}
+
+void CBLSWorker::AsyncVerifySig(const CBLSSignature& sig, const CBLSPublicKey& pubKey, const uint256& msgHash,
+                                CBLSWorker::SigVerifyDoneCallback doneCallback, CancelCond cancelCond)
+{
+    if (!sig.IsValid() || !pubKey.IsValid()) {
+        doneCallback(false);
+        return;
+    }
+
+    std::unique_lock<std::mutex> l(sigVerifyMutex);
+
+    bool foundDuplicate = false;
+    for (auto& s : sigVerifyQueue) {
+        if (s.msgHash == msgHash) {
+            foundDuplicate = true;
+            break;
+        }
+    }
+
+    if (foundDuplicate) {
+        // batched/aggregated verification does not allow duplicate hashes, so we push what we currently have and start
+        // with a fresh batch
+        PushSigVerifyBatch();
+    }
+
+    sigVerifyQueue.emplace_back(std::move(doneCallback), std::move(cancelCond), sig, pubKey, msgHash);
+    if (sigVerifyBatchesInProgress == 0 || sigVerifyQueue.size() >= SIG_VERIFY_BATCH_SIZE) {
+        PushSigVerifyBatch();
+    }
+}
+
+std::future<bool> CBLSWorker::AsyncVerifySig(const CBLSSignature& sig, const CBLSPublicKey& pubKey, const uint256& msgHash, CancelCond cancelCond)
+{
+    auto p = BuildFutureDoneCallback2<bool>();
+    AsyncVerifySig(sig, pubKey, msgHash, std::move(p.first), cancelCond);
+    return std::move(p.second);
+}
+
+bool CBLSWorker::IsAsyncVerifyInProgress()
+{
+    std::unique_lock<std::mutex> l(sigVerifyMutex);
+    return sigVerifyBatchesInProgress != 0;
+}
+
+// sigVerifyMutex must be held while calling
+void CBLSWorker::PushSigVerifyBatch()
+{
+    auto f = [this](int threadId, std::shared_ptr<std::vector<SigVerifyJob> > _jobs) {
+        auto& jobs = *_jobs;
+        if (jobs.size() == 1) {
+            auto& job = jobs[0];
+            if (!job.cancelCond()) {
+                bool valid = job.sig.VerifyInsecure(job.pubKey, job.msgHash);
+                job.doneCallback(valid);
+            }
+            std::unique_lock<std::mutex> l(sigVerifyMutex);
+            sigVerifyBatchesInProgress--;
+            if (!sigVerifyQueue.empty()) {
+                PushSigVerifyBatch();
+            }
+            return;
+        }
+
+        CBLSSignature aggSig;
+        std::vector<size_t> indexes;
+        std::vector<CBLSPublicKey> pubKeys;
+        std::vector<uint256> msgHashes;
+        indexes.reserve(jobs.size());
+        pubKeys.reserve(jobs.size());
+        msgHashes.reserve(jobs.size());
+        for (size_t i = 0; i < jobs.size(); i++) {
+            auto& job = jobs[i];
+            if (job.cancelCond()) {
+                continue;
+            }
+            if (pubKeys.empty()) {
+                aggSig = job.sig;
+            } else {
+                aggSig.AggregateInsecure(job.sig);
+            }
+            indexes.emplace_back(i);
+            pubKeys.emplace_back(job.pubKey);
+            msgHashes.emplace_back(job.msgHash);
+        }
+
+        if (!pubKeys.empty()) {
+            bool allValid = aggSig.VerifyInsecureAggregated(pubKeys, msgHashes);
+            if (allValid) {
+                for (size_t i = 0; i < pubKeys.size(); i++) {
+                    jobs[indexes[i]].doneCallback(true);
+                }
+            } else {
+                // one or more sigs were not valid, revert to per-sig verification
+                // TODO this could be improved if we would cache pairing results in some way as the previous aggregated verification already calculated all the pairings for the hashes
+                for (size_t i = 0; i < pubKeys.size(); i++) {
+                    auto& job = jobs[indexes[i]];
+                    bool valid = job.sig.VerifyInsecure(job.pubKey, job.msgHash);
+                    job.doneCallback(valid);
+                }
+            }
+        }
+
+        std::unique_lock<std::mutex> l(sigVerifyMutex);
+        sigVerifyBatchesInProgress--;
+        if (!sigVerifyQueue.empty()) {
+            PushSigVerifyBatch();
+        }
+    };
+
+    auto batch = std::make_shared<std::vector<SigVerifyJob> >(std::move(sigVerifyQueue));
+    sigVerifyQueue.reserve(SIG_VERIFY_BATCH_SIZE);
+
+    sigVerifyBatchesInProgress++;
+    workerPool.push(f, batch);
+}
diff --git a/src/crypto/bls_worker.h b/src/crypto/bls_worker.h
new file mode 100644
index 000000000000..5c1767126b3e
--- /dev/null
+++ b/src/crypto/bls_worker.h
@@ -0,0 +1,204 @@
+// Copyright (c) 2018 The Dash Core developers
+// Distributed under the MIT/X11 software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+#ifndef DASH_CRYPTO_BLS_WORKER_H
+#define DASH_CRYPTO_BLS_WORKER_H
+
+#include "bls.h"
+
+#include "ctpl.h"
+
+#include <future>
+#include <mutex>
+
+#include <boost/lockfree/queue.hpp>
+
+// Low level BLS/DKG stuff. All very compute intensive and optimized for parallelization
+// The worker tries to parallelize as much as possible and utilizes a few properties of BLS aggregation to speed up things
+// For example, public key vectors can be aggregated in parallel if they are split into batches and the batched aggregations are
+// aggregated to a final public key. This utilizes that when aggregating keys (a+b+c+d) gives the same result as (a+b)+(c+d)
+class CBLSWorker
+{
+public:
+    typedef std::function<void(const CBLSSignature&)> SignDoneCallback;
+    typedef std::function<void(bool)> SigVerifyDoneCallback;
+    typedef std::function<bool()> CancelCond;
+
+private:
+    ctpl::thread_pool workerPool;
+
+    static const int SIG_VERIFY_BATCH_SIZE = 8;
+    struct SigVerifyJob {
+        SigVerifyDoneCallback doneCallback;
+        CancelCond cancelCond;
+        CBLSSignature sig;
+        CBLSPublicKey pubKey;
+        uint256 msgHash;
+        SigVerifyJob(SigVerifyDoneCallback&& _doneCallback, CancelCond&& _cancelCond, const CBLSSignature& _sig, const CBLSPublicKey& _pubKey, const uint256& _msgHash) :
+            doneCallback(_doneCallback),
+            cancelCond(_cancelCond),
+            sig(_sig),
+            pubKey(_pubKey),
+            msgHash(_msgHash)
+        {
+        }
+    };
+
+    std::mutex sigVerifyMutex;
+    int sigVerifyBatchesInProgress{0};
+    std::vector<SigVerifyJob> sigVerifyQueue;
+
+public:
+    CBLSWorker();
+    ~CBLSWorker();
+
+    void Stop();
+
+    bool GenerateContributions(int threshold, const BLSIdVector& ids, BLSVerificationVectorPtr& vvecRet, BLSSecretKeyVector& skShares);
+
+    // The following functions are all used to aggregate verification (public key) vectors
+    // Inputs are in the following form:
+    //   [
+    //     [a1, b1, c1, d1],
+    //     [a2, b2, c2, d2],
+    //     [a3, b3, c3, d3],
+    //     [a4, b4, c4, d4],
+    //   ]
+    // The result is in the following form:
+    //   [ a1+a2+a3+a4, b1+b2+b3+b4, c1+c2+c3+c4, d1+d2+d3+d4]
+    // Multiple things can be parallelized here. For example, all 4 entries in the result vector can be calculated in parallel
+    // Also, each individual vector can be split into multiple batches and aggregating the batches can also be paralellized.
+    void AsyncBuildQuorumVerificationVector(const std::vector<BLSVerificationVectorPtr>& vvecs,
+                                            size_t start, size_t count, bool parallel,
+                                            std::function<void(const BLSVerificationVectorPtr&)> doneCallback);
+    std::future<BLSVerificationVectorPtr> AsyncBuildQuorumVerificationVector(const std::vector<BLSVerificationVectorPtr>& vvecs,
+                                                                             size_t start, size_t count, bool parallel);
+    BLSVerificationVectorPtr BuildQuorumVerificationVector(const std::vector<BLSVerificationVectorPtr>& vvecs,
+                                                           size_t start = 0, size_t count = 0, bool parallel = true);
+
+    // The following functions are all used to aggregate single vectors
+    // Inputs are in the following form:
+    //   [a, b, c, d],
+    // The result is simply a+b+c+d
+    // Aggregation is paralellized by splitting up the input vector into multiple batches and then aggregating the individual batch results
+    void AsyncAggregateSecretKeys(const BLSSecretKeyVector& secKeys,
+                                  size_t start, size_t count, bool parallel,
+                                  std::function<void(const CBLSSecretKey&)> doneCallback);
+    std::future<CBLSSecretKey> AsyncAggregateSecretKeys(const BLSSecretKeyVector& secKeys,
+                                                        size_t start, size_t count, bool parallel);
+    CBLSSecretKey AggregateSecretKeys(const BLSSecretKeyVector& secKeys, size_t start = 0, size_t count = 0, bool parallel = true);
+
+    void AsyncAggregatePublicKeys(const BLSPublicKeyVector& pubKeys,
+                                  size_t start, size_t count, bool parallel,
+                                  std::function<void(const CBLSPublicKey&)> doneCallback);
+    std::future<CBLSPublicKey> AsyncAggregatePublicKeys(const BLSPublicKeyVector& pubKeys,
+                                                        size_t start, size_t count, bool parallel);
+    CBLSPublicKey AggregatePublicKeys(const BLSPublicKeyVector& pubKeys, size_t start = 0, size_t count = 0, bool parallel = true);
+
+    void AsyncAggregateSigs(const BLSSignatureVector& sigs,
+                            size_t start, size_t count, bool parallel,
+                            std::function<void(const CBLSSignature&)> doneCallback);
+    std::future<CBLSSignature> AsyncAggregateSigs(const BLSSignatureVector& sigs,
+                                                        size_t start, size_t count, bool parallel);
+    CBLSSignature AggregateSigs(const BLSSignatureVector& sigs, size_t start = 0, size_t count = 0, bool parallel = true);
+
+
+    // Calculate public key share from public key vector and id. Not parallelized
+    CBLSPublicKey BuildPubKeyShare(const BLSVerificationVectorPtr& vvec, const CBLSId& id);
+
+    // The following functions verify multiple verification vectors and contributions for the same id
+    // This is parallelized by performing batched verification. The verification vectors and the contributions of
+    // a batch are aggregated (in parallel, see AsyncBuildQuorumVerificationVector and AsyncBuildSecretKeyShare). The
+    // result per batch is a single aggregated verification vector and a single aggregated contribution, which are then
+    // verified with VerifyContributionShare. If verification of the aggregated inputs is successful, the whole batch
+    // is marked as valid. If the batch verification fails, the individual entries are verified in a non-aggregated manner
+    void AsyncVerifyContributionShares(const CBLSId& forId, const std::vector<BLSVerificationVectorPtr>& vvecs, const BLSSecretKeyVector& skShares,
+                                       bool parallel, bool aggregated, std::function<void(const std::vector<bool>&)> doneCallback);
+    std::future<std::vector<bool> > AsyncVerifyContributionShares(const CBLSId& forId, const std::vector<BLSVerificationVectorPtr>& vvecs, const BLSSecretKeyVector& skShares,
+                                                                  bool parallel, bool aggregated);
+    std::vector<bool> VerifyContributionShares(const CBLSId& forId, const std::vector<BLSVerificationVectorPtr>& vvecs, const BLSSecretKeyVector& skShares,
+                                               bool parallel = true, bool aggregated = true);
+
+    std::future<bool> AsyncVerifyContributionShare(const CBLSId& forId, const BLSVerificationVectorPtr& vvec, const CBLSSecretKey& skContribution);
+
+    // Non paralellized verification of a single contribution
+    bool VerifyContributionShare(const CBLSId& forId, const BLSVerificationVectorPtr& vvec, const CBLSSecretKey& skContribution);
+
+    // Simple verification of vectors. Checks x.IsValid() for every entry and checks for duplicate entries
+    bool VerifyVerificationVector(const BLSVerificationVector& vvec, size_t start = 0, size_t count = 0);
+    bool VerifyVerificationVectors(const std::vector<BLSVerificationVectorPtr>& vvecs, size_t start = 0, size_t count = 0);
+    bool VerifySecretKeyVector(const BLSSecretKeyVector& secKeys, size_t start = 0, size_t count = 0);
+    bool VerifySignatureVector(const BLSSignatureVector& sigs, size_t start = 0, size_t count = 0);
+
+    // Internally batched signature signing and verification
+    void AsyncSign(const CBLSSecretKey& secKey, const uint256& msgHash, SignDoneCallback doneCallback);
+    std::future<CBLSSignature> AsyncSign(const CBLSSecretKey& secKey, const uint256& msgHash);
+    void AsyncVerifySig(const CBLSSignature& sig, const CBLSPublicKey& pubKey, const uint256& msgHash, SigVerifyDoneCallback doneCallback, CancelCond cancelCond = [] { return false; });
+    std::future<bool> AsyncVerifySig(const CBLSSignature& sig, const CBLSPublicKey& pubKey, const uint256& msgHash, CancelCond cancelCond = [] { return false; });
+    bool IsAsyncVerifyInProgress();
+
+private:
+    void PushSigVerifyBatch();
+};
+
+// Builds and caches different things from CBLSWorker
+// Cache keys are provided externally as computing hashes on BLS vectors is too expensive
+// If multiple threads try to build the same thing at the same time, only one will actually build it
+// and the other ones will wait for the result of the first caller
+class CBLSWorkerCache
+{
+private:
+    CBLSWorker& worker;
+
+    std::mutex cacheCs;
+    std::map<uint256, std::shared_future<BLSVerificationVectorPtr> > vvecCache;
+    std::map<uint256, std::shared_future<CBLSSecretKey> > secretKeyShareCache;
+    std::map<uint256, std::shared_future<CBLSPublicKey> > publicKeyShareCache;
+
+public:
+    CBLSWorkerCache(CBLSWorker& _worker) :
+        worker(_worker) {}
+
+    BLSVerificationVectorPtr BuildQuorumVerificationVector(const uint256& cacheKey, const std::vector<BLSVerificationVectorPtr>& vvecs)
+    {
+        return GetOrBuild(cacheKey, vvecCache, [&]() {
+            return worker.BuildQuorumVerificationVector(vvecs);
+        });
+    }
+    CBLSSecretKey AggregateSecretKeys(const uint256& cacheKey, const BLSSecretKeyVector& skShares)
+    {
+        return GetOrBuild(cacheKey, secretKeyShareCache, [&]() {
+            return worker.AggregateSecretKeys(skShares);
+        });
+    }
+    CBLSPublicKey BuildPubKeyShare(const uint256& cacheKey, const BLSVerificationVectorPtr& vvec, const CBLSId& id)
+    {
+        return GetOrBuild(cacheKey, publicKeyShareCache, [&]() {
+            return worker.BuildPubKeyShare(vvec, id);
+        });
+    }
+
+private:
+    template <typename T, typename Builder>
+    T GetOrBuild(const uint256& cacheKey, std::map<uint256, std::shared_future<T> >& cache, Builder&& builder)
+    {
+        cacheCs.lock();
+        auto it = cache.find(cacheKey);
+        if (it != cache.end()) {
+            auto f = it->second;
+            cacheCs.unlock();
+            return f.get();
+        }
+
+        std::promise<T> p;
+        cache.emplace(cacheKey, p.get_future());
+        cacheCs.unlock();
+
+        T v = builder();
+        p.set_value(v);
+        return v;
+    }
+};
+
+#endif //DASH_CRYPTO_BLS_WORKER_H

From 78675d9bb02523686abd9b1cf459b82c19bbc804 Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Thu, 24 May 2018 13:56:49 +0200
Subject: [PATCH 176/400] Add BLS and DKG benchmarks

---
 src/Makefile.bench.include |   2 +
 src/bench/bench_dash.cpp   |  10 +
 src/bench/bls.cpp          | 361 +++++++++++++++++++++++++++++++++++++
 src/bench/bls_dkg.cpp      | 181 +++++++++++++++++++
 4 files changed, 554 insertions(+)
 create mode 100644 src/bench/bls.cpp
 create mode 100644 src/bench/bls_dkg.cpp

diff --git a/src/Makefile.bench.include b/src/Makefile.bench.include
index 87f579804c88..07f4089a5c51 100644
--- a/src/Makefile.bench.include
+++ b/src/Makefile.bench.include
@@ -15,6 +15,8 @@ bench_bench_dash_SOURCES = \
   bench/bench_dash.cpp \
   bench/bench.cpp \
   bench/bench.h \
+  bench/bls.cpp \
+  bench/bls_dkg.cpp \
   bench/checkblock.cpp \
   bench/checkqueue.cpp \
   bench/Examples.cpp \
diff --git a/src/bench/bench_dash.cpp b/src/bench/bench_dash.cpp
index bd768180c6d8..3f654e1fdc6e 100644
--- a/src/bench/bench_dash.cpp
+++ b/src/bench/bench_dash.cpp
@@ -8,14 +8,24 @@
 #include "validation.h"
 #include "util.h"
 
+#include "crypto/bls.h"
+
+void CleanupBLSTests();
+void CleanupBLSDkgTests();
+
 int
 main(int argc, char** argv)
 {
     ECC_Start();
+    BLSInit();
     SetupEnvironment();
     fPrintToDebugLog = false; // don't want to write to debug.log file
 
     benchmark::BenchRunner::RunAll();
 
+    // need to be called before global destructors kick in (PoolAllocator is needed due to many BLSSecretKeys)
+    CleanupBLSDkgTests();
+    CleanupBLSTests();
+
     ECC_Stop();
 }
diff --git a/src/bench/bls.cpp b/src/bench/bls.cpp
new file mode 100644
index 000000000000..04c0665b8c7a
--- /dev/null
+++ b/src/bench/bls.cpp
@@ -0,0 +1,361 @@
+// Copyright (c) 2018 The Dash Core developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+#include "bench.h"
+#include "random.h"
+#include "crypto/bls_worker.h"
+#include "utiltime.h"
+
+#include <iostream>
+
+CBLSWorker blsWorker;
+
+void CleanupBLSTests()
+{
+    blsWorker.Stop();
+}
+
+static void BuildTestVectors(size_t count, size_t invalidCount,
+                             BLSPublicKeyVector& pubKeys, BLSSecretKeyVector& secKeys, BLSSignatureVector& sigs,
+                             std::vector<uint256>& msgHashes,
+                             std::vector<bool>& invalid)
+{
+    secKeys.resize(count);
+    pubKeys.resize(count);
+    sigs.resize(count);
+    msgHashes.resize(count);
+
+    invalid.resize(count);
+    for (size_t i = 0; i < invalidCount; i++) {
+        invalid[i] = true;
+    }
+    std::random_shuffle(invalid.begin(), invalid.end());
+
+    for (size_t i = 0; i < count; i++) {
+        secKeys[i].MakeNewKey();
+        pubKeys[i] = secKeys[i].GetPublicKey();
+        msgHashes[i] = GetRandHash();
+        sigs[i] = secKeys[i].Sign(msgHashes[i]);
+
+        if (invalid[i]) {
+            CBLSSecretKey s;
+            s.MakeNewKey();
+            sigs[i] = s.Sign(msgHashes[i]);
+        }
+    }
+}
+
+static void BLSPubKeyAggregate_Normal(benchmark::State& state)
+{
+    CBLSSecretKey secKey1, secKey2;
+    secKey1.MakeNewKey();
+    secKey2.MakeNewKey();
+    CBLSPublicKey pubKey1 = secKey1.GetPublicKey();
+    CBLSPublicKey pubKey2 = secKey2.GetPublicKey();
+
+    // Benchmark.
+    while (state.KeepRunning()) {
+        CBLSPublicKey k(pubKey1);
+        k.AggregateInsecure(pubKey2);
+    }
+}
+
+static void BLSSecKeyAggregate_Normal(benchmark::State& state)
+{
+    CBLSSecretKey secKey1, secKey2;
+    secKey1.MakeNewKey();
+    secKey2.MakeNewKey();
+    CBLSPublicKey pubKey1 = secKey1.GetPublicKey();
+    CBLSPublicKey pubKey2 = secKey2.GetPublicKey();
+
+    // Benchmark.
+    while (state.KeepRunning()) {
+        CBLSSecretKey k(secKey1);
+        k.AggregateInsecure(secKey2);
+    }
+}
+
+static void BLSSign_Normal(benchmark::State& state)
+{
+    CBLSSecretKey secKey;
+    secKey.MakeNewKey();
+    CBLSPublicKey pubKey = secKey.GetPublicKey();
+
+    // Benchmark.
+    while (state.KeepRunning()) {
+        uint256 hash = GetRandHash();
+        secKey.Sign(hash);
+    }
+}
+
+static void BLSVerify_Normal(benchmark::State& state)
+{
+    BLSPublicKeyVector pubKeys;
+    BLSSecretKeyVector secKeys;
+    BLSSignatureVector sigs;
+    std::vector<uint256> msgHashes;
+    std::vector<bool> invalid;
+    BuildTestVectors(1000, 10, pubKeys, secKeys, sigs, msgHashes, invalid);
+
+    // Benchmark.
+    size_t i = 0;
+    while (state.KeepRunning()) {
+        bool valid = sigs[i].VerifyInsecure(pubKeys[i], msgHashes[i]);
+        if (valid && invalid[i]) {
+            std::cout << "expected invalid but it is valid" << std::endl;
+            assert(false);
+        } else if (!valid && !invalid[i]) {
+            std::cout << "expected valid but it is invalid" << std::endl;
+            assert(false);
+        }
+        i = (i + 1) % pubKeys.size();
+    }
+}
+
+
+static void BLSVerify_LargeBlock(size_t txCount, benchmark::State& state)
+{
+    BLSPublicKeyVector pubKeys;
+    BLSSecretKeyVector secKeys;
+    BLSSignatureVector sigs;
+    std::vector<uint256> msgHashes;
+    std::vector<bool> invalid;
+    BuildTestVectors(txCount, 0, pubKeys, secKeys, sigs, msgHashes, invalid);
+
+    // Benchmark.
+    while (state.KeepRunning()) {
+        for (size_t i = 0; i < pubKeys.size(); i++) {
+            sigs[i].VerifyInsecure(pubKeys[i], msgHashes[i]);
+        }
+    }
+}
+
+static void BLSVerify_LargeBlock1000(benchmark::State& state)
+{
+    BLSVerify_LargeBlock(1000, state);
+}
+
+static void BLSVerify_LargeBlock10000(benchmark::State& state)
+{
+    BLSVerify_LargeBlock(10000, state);
+}
+
+static void BLSVerify_LargeBlockSelfAggregated(size_t txCount, benchmark::State& state)
+{
+    BLSPublicKeyVector pubKeys;
+    BLSSecretKeyVector secKeys;
+    BLSSignatureVector sigs;
+    std::vector<uint256> msgHashes;
+    std::vector<bool> invalid;
+    BuildTestVectors(txCount, 0, pubKeys, secKeys, sigs, msgHashes, invalid);
+
+    // Benchmark.
+    while (state.KeepRunning()) {
+        CBLSSignature aggSig = CBLSSignature::AggregateInsecure(sigs);
+        aggSig.VerifyInsecureAggregated(pubKeys, msgHashes);
+    }
+}
+
+static void BLSVerify_LargeBlockSelfAggregated1000(benchmark::State& state)
+{
+    BLSVerify_LargeBlockSelfAggregated(1000, state);
+}
+
+static void BLSVerify_LargeBlockSelfAggregated10000(benchmark::State& state)
+{
+    BLSVerify_LargeBlockSelfAggregated(10000, state);
+}
+
+static void BLSVerify_LargeAggregatedBlock(size_t txCount, benchmark::State& state)
+{
+    BLSPublicKeyVector pubKeys;
+    BLSSecretKeyVector secKeys;
+    BLSSignatureVector sigs;
+    std::vector<uint256> msgHashes;
+    std::vector<bool> invalid;
+    BuildTestVectors(txCount, 0, pubKeys, secKeys, sigs, msgHashes, invalid);
+
+    CBLSSignature aggSig = CBLSSignature::AggregateInsecure(sigs);
+
+    // Benchmark.
+    size_t i = 0;
+    while (state.KeepRunning()) {
+        aggSig.VerifyInsecureAggregated(pubKeys, msgHashes);
+        i = (i + 1) % pubKeys.size();
+    }
+}
+
+static void BLSVerify_LargeAggregatedBlock1000(benchmark::State& state)
+{
+    BLSVerify_LargeAggregatedBlock(1000, state);
+}
+
+static void BLSVerify_LargeAggregatedBlock10000(benchmark::State& state)
+{
+    BLSVerify_LargeAggregatedBlock(10000, state);
+}
+
+static void BLSVerify_LargeAggregatedBlock1000PreVerified(benchmark::State& state)
+{
+    BLSPublicKeyVector pubKeys;
+    BLSSecretKeyVector secKeys;
+    BLSSignatureVector sigs;
+    std::vector<uint256> msgHashes;
+    std::vector<bool> invalid;
+    BuildTestVectors(1000, 0, pubKeys, secKeys, sigs, msgHashes, invalid);
+
+    CBLSSignature aggSig = CBLSSignature::AggregateInsecure(sigs);
+
+    std::set<size_t> prevalidated;
+
+    while (prevalidated.size() < 900) {
+        int idx = GetRandInt((int)pubKeys.size());
+        if (prevalidated.count((size_t)idx)) {
+            continue;
+        }
+        prevalidated.emplace((size_t)idx);
+    }
+
+    // Benchmark.
+    size_t i = 0;
+    while (state.KeepRunning()) {
+        BLSPublicKeyVector nonvalidatedPubKeys;
+        std::vector<uint256> nonvalidatedHashes;
+        nonvalidatedPubKeys.reserve(pubKeys.size());
+        nonvalidatedHashes.reserve(msgHashes.size());
+
+        for (size_t i = 0; i < sigs.size(); i++) {
+            if (prevalidated.count(i)) {
+                continue;
+            }
+            nonvalidatedPubKeys.emplace_back(pubKeys[i]);
+            nonvalidatedHashes.emplace_back(msgHashes[i]);
+        }
+
+        CBLSSignature aggSigCopy = aggSig;
+        for (auto idx : prevalidated) {
+            aggSigCopy.SubInsecure(sigs[idx]);
+        }
+
+        bool valid = aggSigCopy.VerifyInsecureAggregated(nonvalidatedPubKeys, nonvalidatedHashes);
+        assert(valid);
+        i = (i + 1) % pubKeys.size();
+    }
+}
+
+static void BLSVerify_Batched(benchmark::State& state)
+{
+    BLSPublicKeyVector pubKeys;
+    BLSSecretKeyVector secKeys;
+    BLSSignatureVector sigs;
+    std::vector<uint256> msgHashes;
+    std::vector<bool> invalid;
+    BuildTestVectors(1000, 10, pubKeys, secKeys, sigs, msgHashes, invalid);
+
+    // Benchmark.
+    size_t i = 0;
+    size_t j = 0;
+    size_t batchSize = 16;
+    while (state.KeepRunning()) {
+        j++;
+        if ((j % batchSize) != 0) {
+            continue;
+        }
+
+        BLSPublicKeyVector testPubKeys;
+        BLSSignatureVector testSigs;
+        std::vector<uint256> testMsgHashes;
+        testPubKeys.reserve(batchSize);
+        testSigs.reserve(batchSize);
+        testMsgHashes.reserve(batchSize);
+        size_t startI = i;
+        for (size_t k = 0; k < batchSize; k++) {
+            testPubKeys.emplace_back(pubKeys[i]);
+            testSigs.emplace_back(sigs[i]);
+            testMsgHashes.emplace_back(msgHashes[i]);
+            i = (i + 1) % pubKeys.size();
+        }
+
+        CBLSSignature batchSig = CBLSSignature::AggregateInsecure(testSigs);
+        bool batchValid = batchSig.VerifyInsecureAggregated(testPubKeys, testMsgHashes);
+        std::vector<bool> valid;
+        if (batchValid) {
+            valid.assign(batchSize, true);
+        } else {
+            for (size_t k = 0; k < batchSize; k++) {
+                bool valid1 = testSigs[k].VerifyInsecure(testPubKeys[k], testMsgHashes[k]);
+                valid.emplace_back(valid1);
+            }
+        }
+        for (size_t k = 0; k < batchSize; k++) {
+            if (valid[k] && invalid[(startI + k) % pubKeys.size()]) {
+                std::cout << "expected invalid but it is valid" << std::endl;
+                assert(false);
+            } else if (!valid[k] && !invalid[(startI + k) % pubKeys.size()]) {
+                std::cout << "expected valid but it is invalid" << std::endl;
+                assert(false);
+            }
+        }
+    }
+}
+
+static void BLSVerify_BatchedParallel(benchmark::State& state)
+{
+    BLSPublicKeyVector pubKeys;
+    BLSSecretKeyVector secKeys;
+    BLSSignatureVector sigs;
+    std::vector<uint256> msgHashes;
+    std::vector<bool> invalid;
+    BuildTestVectors(1000, 10, pubKeys, secKeys, sigs, msgHashes, invalid);
+
+    std::list<std::pair<size_t, std::future<bool>>> futures;
+
+    volatile bool cancel = false;
+    auto cancelCond = [&]() {
+        return cancel;
+    };
+
+    // Benchmark.
+    size_t i = 0;
+    while (state.KeepRunning()) {
+        if (futures.size() < 100) {
+            while (futures.size() < 10000) {
+                auto f = blsWorker.AsyncVerifySig(sigs[i], pubKeys[i], msgHashes[i], cancelCond);
+                futures.emplace_back(std::make_pair(i, std::move(f)));
+                i = (i + 1) % pubKeys.size();
+            }
+        }
+
+        auto fp = std::move(futures.front());
+        futures.pop_front();
+
+        size_t j = fp.first;
+        bool valid = fp.second.get();
+
+        if (valid && invalid[j]) {
+            std::cout << "expected invalid but it is valid" << std::endl;
+            assert(false);
+        } else if (!valid && !invalid[j]) {
+            std::cout << "expected valid but it is invalid" << std::endl;
+            assert(false);
+        }
+    }
+    cancel = true;
+    while (blsWorker.IsAsyncVerifyInProgress()) {
+        MilliSleep(100);
+    }
+}
+
+BENCHMARK(BLSPubKeyAggregate_Normal)
+BENCHMARK(BLSSecKeyAggregate_Normal)
+BENCHMARK(BLSSign_Normal)
+BENCHMARK(BLSVerify_Normal)
+BENCHMARK(BLSVerify_LargeBlock1000)
+BENCHMARK(BLSVerify_LargeBlockSelfAggregated1000)
+BENCHMARK(BLSVerify_LargeBlockSelfAggregated10000)
+BENCHMARK(BLSVerify_LargeAggregatedBlock1000)
+BENCHMARK(BLSVerify_LargeAggregatedBlock10000)
+BENCHMARK(BLSVerify_LargeAggregatedBlock1000PreVerified)
+BENCHMARK(BLSVerify_Batched)
+BENCHMARK(BLSVerify_BatchedParallel)
diff --git a/src/bench/bls_dkg.cpp b/src/bench/bls_dkg.cpp
new file mode 100644
index 000000000000..d2ffd8f579eb
--- /dev/null
+++ b/src/bench/bls_dkg.cpp
@@ -0,0 +1,181 @@
+// Copyright (c) 2018 The Dash Core developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+#include "bench.h"
+#include "random.h"
+#include "crypto/bls_worker.h"
+
+extern CBLSWorker blsWorker;
+
+struct Member {
+    CBLSId id;
+
+    BLSVerificationVectorPtr vvec;
+    BLSSecretKeyVector skShares;
+};
+
+struct DKG
+{
+    std::vector<Member> members;
+    std::vector<CBLSId> ids;
+
+    std::vector<BLSVerificationVectorPtr> receivedVvecs;
+    BLSSecretKeyVector receivedSkShares;
+
+    BLSVerificationVectorPtr quorumVvec;
+
+    DKG(int quorumSize)
+    {
+        members.resize(quorumSize);
+        ids.resize(quorumSize);
+
+        for (int i = 0; i < quorumSize; i++) {
+            members[i].id.SetInt(i + 1);
+            ids[i] = members[i].id;
+        }
+
+        for (int i = 0; i < quorumSize; i++) {
+            blsWorker.GenerateContributions(quorumSize / 2 + 1, ids, members[i].vvec, members[i].skShares);
+        }
+
+        //printf("initialized quorum %d\n", quorumSize);
+    }
+
+    void ReceiveVvecs()
+    {
+        receivedVvecs.clear();
+        for (size_t i = 0; i < members.size(); i++) {
+            receivedVvecs.emplace_back(members[i].vvec);
+        }
+        quorumVvec = blsWorker.BuildQuorumVerificationVector(receivedVvecs);
+    }
+
+    void ReceiveShares(size_t whoAmI)
+    {
+        receivedSkShares.clear();
+        for (size_t i = 0; i < members.size(); i++) {
+            receivedSkShares.emplace_back(members[i].skShares[whoAmI]);
+        }
+    }
+
+    void BuildQuorumVerificationVector(bool parallel)
+    {
+        quorumVvec = blsWorker.BuildQuorumVerificationVector(receivedVvecs, 0, 0, parallel);
+        //assert(worker.VerifyVerificationVector(*members[memberIdx].quorumVvec));
+    }
+
+    void Bench_BuildQuorumVerificationVectors(benchmark::State& state, bool parallel)
+    {
+        ReceiveVvecs();
+
+        while (state.KeepRunning()) {
+            BuildQuorumVerificationVector(parallel);
+        }
+    }
+
+    void VerifyContributionShares(size_t whoAmI, const std::set<size_t>& invalidIndexes, bool parallel, bool aggregated)
+    {
+        auto result = blsWorker.VerifyContributionShares(members[whoAmI].id, receivedVvecs, receivedSkShares, parallel, aggregated);
+        for (size_t i = 0; i < receivedVvecs.size(); i++) {
+            if (invalidIndexes.count(i)) {
+                assert(!result[i]);
+            } else {
+                assert(result[i]);
+            }
+        }
+    }
+
+    void Bench_VerifyContributionShares(benchmark::State& state, int invalidCount, bool parallel, bool aggregated)
+    {
+        ReceiveVvecs();
+
+        // Benchmark.
+        size_t memberIdx = 0;
+        while (state.KeepRunning()) {
+            auto& m = members[memberIdx];
+
+            ReceiveShares(memberIdx);
+
+            std::set<size_t> invalidIndexes;
+            for (int i = 0; i < invalidCount; i++) {
+                int shareIdx = GetRandInt(receivedSkShares.size());
+                receivedSkShares[shareIdx].MakeNewKey();
+                invalidIndexes.emplace(shareIdx);
+            }
+
+            VerifyContributionShares(memberIdx, invalidIndexes, parallel, aggregated);
+
+            memberIdx = (memberIdx + 1) % members.size();
+        }
+    }
+};
+
+std::shared_ptr<DKG> dkg10;
+std::shared_ptr<DKG> dkg100;
+std::shared_ptr<DKG> dkg400;
+
+void InitIfNeeded()
+{
+    if (dkg10 == nullptr) {
+        dkg10 = std::make_shared<DKG>(10);
+    }
+    if (dkg100 == nullptr) {
+        dkg100 = std::make_shared<DKG>(100);
+    }
+    if (dkg400 == nullptr) {
+        dkg400 = std::make_shared<DKG>(400);
+    }
+}
+
+void CleanupBLSDkgTests()
+{
+    dkg10.reset();
+    dkg100.reset();
+    dkg400.reset();
+}
+
+
+
+#define BENCH_BuildQuorumVerificationVectors(name, quorumSize, parallel) \
+    static void BLSDKG_BuildQuorumVerificationVectors_##name##_##quorumSize(benchmark::State& state) \
+    { \
+        InitIfNeeded(); \
+        dkg##quorumSize->Bench_BuildQuorumVerificationVectors(state, parallel); \
+    } \
+    BENCHMARK(BLSDKG_BuildQuorumVerificationVectors_##name##_##quorumSize)
+
+BENCH_BuildQuorumVerificationVectors(simple, 10, false)
+BENCH_BuildQuorumVerificationVectors(simple, 100, false)
+BENCH_BuildQuorumVerificationVectors(simple, 400, false)
+BENCH_BuildQuorumVerificationVectors(parallel, 10, true)
+BENCH_BuildQuorumVerificationVectors(parallel, 100, true)
+BENCH_BuildQuorumVerificationVectors(parallel, 400, true)
+
+///////////////////////////////
+
+
+
+#define BENCH_VerifyContributionShares(name, quorumSize, invalidCount, parallel, aggregated) \
+    static void BLSDKG_VerifyContributionShares_##name##_##quorumSize(benchmark::State& state) \
+    { \
+        InitIfNeeded(); \
+        dkg##quorumSize->Bench_VerifyContributionShares(state, invalidCount, parallel, aggregated); \
+    } \
+    BENCHMARK(BLSDKG_VerifyContributionShares_##name##_##quorumSize)
+
+BENCH_VerifyContributionShares(simple, 10, 5, false, false)
+BENCH_VerifyContributionShares(simple, 100, 5, false, false)
+BENCH_VerifyContributionShares(simple, 400, 5, false, false)
+
+BENCH_VerifyContributionShares(aggregated, 10, 5, false, true)
+BENCH_VerifyContributionShares(aggregated, 100, 5, false, true)
+BENCH_VerifyContributionShares(aggregated, 400, 5, false, true)
+
+BENCH_VerifyContributionShares(parallel, 10, 5, true, false)
+BENCH_VerifyContributionShares(parallel, 100, 5, true, false)
+BENCH_VerifyContributionShares(parallel, 400, 5, true, false)
+
+BENCH_VerifyContributionShares(parallel_aggregated, 10, 5, true, true)
+BENCH_VerifyContributionShares(parallel_aggregated, 100, 5, true, true)
+BENCH_VerifyContributionShares(parallel_aggregated, 400, 5, true, true)

From 80fd096b0749412229a863da82e91054e6ab7363 Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Fri, 14 Sep 2018 18:04:45 +0200
Subject: [PATCH 177/400] Add ECDSA benchmarks

---
 src/Makefile.bench.include |  1 +
 src/bench/bench_dash.cpp   |  2 +
 src/bench/ecdsa.cpp        | 77 ++++++++++++++++++++++++++++++++++++++
 3 files changed, 80 insertions(+)
 create mode 100644 src/bench/ecdsa.cpp

diff --git a/src/Makefile.bench.include b/src/Makefile.bench.include
index 07f4089a5c51..96170ff4e969 100644
--- a/src/Makefile.bench.include
+++ b/src/Makefile.bench.include
@@ -19,6 +19,7 @@ bench_bench_dash_SOURCES = \
   bench/bls_dkg.cpp \
   bench/checkblock.cpp \
   bench/checkqueue.cpp \
+  bench/ecdsa.cpp \
   bench/Examples.cpp \
   bench/rollingbloom.cpp \
   bench/crypto_hash.cpp \
diff --git a/src/bench/bench_dash.cpp b/src/bench/bench_dash.cpp
index 3f654e1fdc6e..533ae7194c56 100644
--- a/src/bench/bench_dash.cpp
+++ b/src/bench/bench_dash.cpp
@@ -17,6 +17,8 @@ int
 main(int argc, char** argv)
 {
     ECC_Start();
+    ECCVerifyHandle verifyHandle;
+
     BLSInit();
     SetupEnvironment();
     fPrintToDebugLog = false; // don't want to write to debug.log file
diff --git a/src/bench/ecdsa.cpp b/src/bench/ecdsa.cpp
new file mode 100644
index 000000000000..706608eac208
--- /dev/null
+++ b/src/bench/ecdsa.cpp
@@ -0,0 +1,77 @@
+// Copyright (c) 2018 The Dash Core developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+#include "bench.h"
+
+#include "key.h"
+
+static void ECDSASign(benchmark::State& state)
+{
+    std::vector<CKey> keys;
+    std::vector<uint256> hashes;
+    for (size_t i = 0; i < 100; i++) {
+        CKey k;
+        k.MakeNewKey(false);
+        keys.emplace_back(k);
+        hashes.emplace_back(::SerializeHash((int)i));
+    }
+
+    // Benchmark.
+    size_t i = 0;
+    while (state.KeepRunning()) {
+        std::vector<unsigned char> sig;
+        keys[i].Sign(hashes[i], sig);
+        i = (i + 1) % keys.size();
+    }
+}
+
+static void ECDSAVerify(benchmark::State& state)
+{
+    std::vector<CPubKey> keys;
+    std::vector<uint256> hashes;
+    std::vector<std::vector<unsigned char>> sigs;
+    for (size_t i = 0; i < 100; i++) {
+        CKey k;
+        k.MakeNewKey(false);
+        keys.emplace_back(k.GetPubKey());
+        hashes.emplace_back(::SerializeHash((int)i));
+        std::vector<unsigned char> sig;
+        k.Sign(hashes[i], sig);
+        sigs.emplace_back(sig);
+    }
+
+    // Benchmark.
+    size_t i = 0;
+    while (state.KeepRunning()) {
+        keys[i].Verify(hashes[i], sigs[i]);
+        i = (i + 1) % keys.size();
+    }
+}
+
+static void ECDSAVerify_LargeBlock(benchmark::State& state)
+{
+    std::vector<CPubKey> keys;
+    std::vector<uint256> hashes;
+    std::vector<std::vector<unsigned char>> sigs;
+    for (size_t i = 0; i < 1000; i++) {
+        CKey k;
+        k.MakeNewKey(false);
+        keys.emplace_back(k.GetPubKey());
+        hashes.emplace_back(::SerializeHash((int)i));
+        std::vector<unsigned char> sig;
+        k.Sign(hashes[i], sig);
+        sigs.emplace_back(sig);
+    }
+
+    // Benchmark.
+    while (state.KeepRunning()) {
+        for (size_t i = 0; i < keys.size(); i++) {
+            keys[i].Verify(hashes[i], sigs[i]);
+        }
+    }
+}
+
+BENCHMARK(ECDSASign)
+BENCHMARK(ECDSAVerify)
+BENCHMARK(ECDSAVerify_LargeBlock)

From b3fc236af5ba63e836b28faec4744017e93fb401 Mon Sep 17 00:00:00 2001
From: UdjinM6 <UdjinM6@users.noreply.github.com>
Date: Thu, 11 Oct 2018 17:32:05 +0300
Subject: [PATCH 178/400] Fix mnodeman.cs vs cs_vPendingMasternodes vs cs_main
 deadlock (#2200)

Decouple cs_vPendingMasternodes from mnodeman.cs to fix the issue. Also drop deprecated/unused stuff in mnv preparation while at it.
---
 src/masternodeman.cpp | 38 ++++++++++++++++++++------------------
 src/masternodeman.h   |  3 ++-
 2 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/src/masternodeman.cpp b/src/masternodeman.cpp
index bbd02c047a99..1dbda34f9453 100644
--- a/src/masternodeman.cpp
+++ b/src/masternodeman.cpp
@@ -1186,9 +1186,10 @@ void CMasternodeMan::DoFullVerificationStep(CConnman& connman)
     rank_pair_vec_t vecMasternodeRanks;
     GetMasternodeRanks(vecMasternodeRanks, nCachedBlockHeight - 1, MIN_POSE_PROTO_VERSION);
 
-    LOCK(cs);
+    std::vector<CAddress> vAddr;
 
-    int nCount = 0;
+    {
+    LOCK(cs);
 
     int nMyRank = -1;
     int nRanksTotal = (int)vecMasternodeRanks.size();
@@ -1216,13 +1217,6 @@ void CMasternodeMan::DoFullVerificationStep(CConnman& connman)
     int nOffset = MAX_POSE_RANK + nMyRank - 1;
     if(nOffset >= (int)vecMasternodeRanks.size()) return;
 
-    std::vector<const CMasternode*> vSortedByAddr;
-    for (const auto& mnpair : mapMasternodes) {
-        vSortedByAddr.push_back(&mnpair.second);
-    }
-
-    sort(vSortedByAddr.begin(), vSortedByAddr.end(), CompareByAddr());
-
     auto it = vecMasternodeRanks.begin() + nOffset;
     while(it != vecMasternodeRanks.end()) {
         if(it->second.IsPoSeVerified() || it->second.IsPoSeBanned()) {
@@ -1238,16 +1232,22 @@ void CMasternodeMan::DoFullVerificationStep(CConnman& connman)
         }
         LogPrint("masternode", "CMasternodeMan::DoFullVerificationStep -- Verifying masternode %s rank %d/%d address %s\n",
                     it->second.outpoint.ToStringShort(), it->first, nRanksTotal, it->second.addr.ToString());
-        if(SendVerifyRequest(CAddress(it->second.addr, NODE_NETWORK), vSortedByAddr, connman)) {
-            nCount++;
-            if(nCount >= MAX_POSE_CONNECTIONS) break;
+        CAddress addr = CAddress(it->second.addr, NODE_NETWORK);
+        if(CheckVerifyRequestAddr(addr, connman)) {
+            vAddr.push_back(addr);
+            if((int)vAddr.size() >= MAX_POSE_CONNECTIONS) break;
         }
         nOffset += MAX_POSE_CONNECTIONS;
         if(nOffset >= (int)vecMasternodeRanks.size()) break;
         it += MAX_POSE_CONNECTIONS;
     }
+    } // cs
+
+    for (const auto& addr : vAddr) {
+        PrepareVerifyRequest(addr, connman);
+    }
 
-    LogPrint("masternode", "CMasternodeMan::DoFullVerificationStep -- Sent verification requests to %d masternodes\n", nCount);
+    LogPrint("masternode", "CMasternodeMan::DoFullVerificationStep -- Prepared verification requests for %d masternodes\n", vAddr.size());
 }
 
 // This function tries to find masternodes with the same addr,
@@ -1311,26 +1311,28 @@ void CMasternodeMan::CheckSameAddr()
     }
 }
 
-bool CMasternodeMan::SendVerifyRequest(const CAddress& addr, const std::vector<const CMasternode*>& vSortedByAddr, CConnman& connman)
+bool CMasternodeMan::CheckVerifyRequestAddr(const CAddress& addr, CConnman& connman)
 {
     if (deterministicMNManager->IsDeterministicMNsSporkActive())
         return false;
 
     if(netfulfilledman.HasFulfilledRequest(addr, strprintf("%s", NetMsgType::MNVERIFY)+"-request")) {
         // we already asked for verification, not a good idea to do this too often, skip it
-        LogPrint("masternode", "CMasternodeMan::SendVerifyRequest -- too many requests, skipping... addr=%s\n", addr.ToString());
+        LogPrint("masternode", "CMasternodeMan::%s -- too many requests, skipping... addr=%s\n", __func__, addr.ToString());
         return false;
     }
 
-    if (connman.IsMasternodeOrDisconnectRequested(addr)) return false;
+    return !connman.IsMasternodeOrDisconnectRequested(addr);
+}
 
+void CMasternodeMan::PrepareVerifyRequest(const CAddress& addr, CConnman& connman)
+{
     connman.AddPendingMasternode(addr);
     // use random nonce, store it and require node to reply with correct one later
     CMasternodeVerification mnv(addr, GetRandInt(999999), nCachedBlockHeight - 1);
     LOCK(cs_mapPendingMNV);
     mapPendingMNV.insert(std::make_pair(addr, std::make_pair(GetTime(), mnv)));
-    LogPrintf("CMasternodeMan::SendVerifyRequest -- verifying node using nonce %d addr=%s\n", mnv.nonce, addr.ToString());
-    return true;
+    LogPrintf("CMasternodeMan::%s -- verifying node using nonce %d addr=%s\n", __func__, mnv.nonce, addr.ToString());
 }
 
 void CMasternodeMan::ProcessPendingMnvRequests(CConnman& connman)
diff --git a/src/masternodeman.h b/src/masternodeman.h
index 3e7b916f8202..41f3383c0633 100644
--- a/src/masternodeman.h
+++ b/src/masternodeman.h
@@ -197,7 +197,8 @@ class CMasternodeMan
 
     void DoFullVerificationStep(CConnman& connman);
     void CheckSameAddr();
-    bool SendVerifyRequest(const CAddress& addr, const std::vector<const CMasternode*>& vSortedByAddr, CConnman& connman);
+    bool CheckVerifyRequestAddr(const CAddress& addr, CConnman& connman);
+    void PrepareVerifyRequest(const CAddress& addr, CConnman& connman);
     void ProcessPendingMnvRequests(CConnman& connman);
     void SendVerifyReply(CNode* pnode, CMasternodeVerification& mnv, CConnman& connman);
     void ProcessVerifyReply(CNode* pnode, CMasternodeVerification& mnv);

From 8deb8e90f21b79692f2f6bc810a067a5ad732524 Mon Sep 17 00:00:00 2001
From: PastaPastaPasta <pasta@dashboost.org>
Date: Thu, 11 Oct 2018 09:32:31 -0500
Subject: [PATCH 179/400] Modernize Gov Methods (#2326)

* governance.* formatting and copyright bump

* manual changes gov.cpp

* Modernize ConvertVoteOutcome, ConvertSignalToString and  ConvertOutcomeToString

* move breaks

* add braces instead of inlining

* Revert "Modernize ConvertVoteOutcome, ConvertSignalToString and  ConvertOutcomeToString"

This reverts commit 41bc3d3d863076cd5e6b10ca7706100963cd51b0.

* Modernize ConvertVoteOutcome, ConvertSignalToString and  ConvertOutcomeToString

* fix bugs

* make "NONE" lowercase

* revert merge error

* @InhumanPerfection comments fix

* whoops
---
 src/governance-vote.cpp | 75 +++++++++++++++++++----------------------
 1 file changed, 34 insertions(+), 41 deletions(-)

diff --git a/src/governance-vote.cpp b/src/governance-vote.cpp
index 9f7b523a9e82..7e68675ce753 100644
--- a/src/governance-vote.cpp
+++ b/src/governance-vote.cpp
@@ -11,59 +11,52 @@
 
 std::string CGovernanceVoting::ConvertOutcomeToString(vote_outcome_enum_t nOutcome)
 {
-    switch (nOutcome) {
-    case VOTE_OUTCOME_NONE:
-        return "NONE";
-        break;
-    case VOTE_OUTCOME_YES:
-        return "YES";
-        break;
-    case VOTE_OUTCOME_NO:
-        return "NO";
-        break;
-    case VOTE_OUTCOME_ABSTAIN:
-        return "ABSTAIN";
-        break;
+    static const std::map<vote_outcome_enum_t, std::string> mapOutcomeString = {
+        { VOTE_OUTCOME_NONE, "none" },
+        { VOTE_OUTCOME_YES, "yes" },
+        { VOTE_OUTCOME_NO, "no" },
+        { VOTE_OUTCOME_ABSTAIN, "abstain" } };
+
+    const auto& it = mapOutcomeString.find(nOutcome);
+    if (it == mapOutcomeString.end()) {
+        LogPrintf("CGovernanceVoting::%s -- ERROR: Unknown outcome %d\n", __func__, nOutcome);
+        return "error";
     }
-    return "error";
+    return it->second;
 }
 
 std::string CGovernanceVoting::ConvertSignalToString(vote_signal_enum_t nSignal)
 {
-    std::string strReturn = "NONE";
-    switch (nSignal) {
-    case VOTE_SIGNAL_NONE:
-        strReturn = "NONE";
-        break;
-    case VOTE_SIGNAL_FUNDING:
-        strReturn = "FUNDING";
-        break;
-    case VOTE_SIGNAL_VALID:
-        strReturn = "VALID";
-        break;
-    case VOTE_SIGNAL_DELETE:
-        strReturn = "DELETE";
-        break;
-    case VOTE_SIGNAL_ENDORSED:
-        strReturn = "ENDORSED";
-        break;
+    static const std::map<vote_signal_enum_t, std::string> mapSignalsString = {
+        { VOTE_SIGNAL_FUNDING, "funding" },
+        { VOTE_SIGNAL_VALID, "valid" },
+        { VOTE_SIGNAL_DELETE, "delete" },
+        { VOTE_SIGNAL_ENDORSED, "endorsed" } };
+
+    const auto& it = mapSignalsString.find(nSignal);
+    if (it == mapSignalsString.end()) {
+        LogPrintf("CGovernanceVoting::%s -- ERROR: Unknown signal %d\n", __func__, nSignal);
+        return "none";
     }
-
-    return strReturn;
+    return it->second;
 }
 
 
 vote_outcome_enum_t CGovernanceVoting::ConvertVoteOutcome(const std::string& strVoteOutcome)
 {
-    vote_outcome_enum_t eVote = VOTE_OUTCOME_NONE;
-    if (strVoteOutcome == "yes") {
-        eVote = VOTE_OUTCOME_YES;
-    } else if (strVoteOutcome == "no") {
-        eVote = VOTE_OUTCOME_NO;
-    } else if (strVoteOutcome == "abstain") {
-        eVote = VOTE_OUTCOME_ABSTAIN;
+    static const std::map<std::string, vote_outcome_enum_t> mapStringOutcome = {
+        { "none", VOTE_OUTCOME_NONE },
+        { "yes", VOTE_OUTCOME_YES },
+        { "no", VOTE_OUTCOME_NO },
+        { "abstain", VOTE_OUTCOME_ABSTAIN } };
+
+    const auto& it = mapStringOutcome.find(strVoteOutcome);
+    if (it == mapStringOutcome.end()) {
+        LogPrintf("CGovernanceVoting::%s -- ERROR: Unknown outcome %s\n", __func__, strVoteOutcome);
+        return VOTE_OUTCOME_NONE;
     }
-    return eVote;
+    return it->second;
+
 }
 
 vote_signal_enum_t CGovernanceVoting::ConvertVoteSignal(const std::string& strVoteSignal)

From 727e940c0c932e41efd1347af57bb538595c4515 Mon Sep 17 00:00:00 2001
From: UdjinM6 <UdjinM6@users.noreply.github.com>
Date: Thu, 11 Oct 2018 17:32:51 +0300
Subject: [PATCH 180/400] Fix recently introduced PS bugs (#2330)

* backward compatibility fix for dsq

* fix StartNewQueue
---
 src/privatesend-client.cpp | 4 ++--
 src/privatesend.cpp        | 9 ++++++++-
 src/privatesend.h          | 4 +++-
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/privatesend-client.cpp b/src/privatesend-client.cpp
index f0bd2a6dec4b..48ef4decec7b 100644
--- a/src/privatesend-client.cpp
+++ b/src/privatesend-client.cpp
@@ -1083,6 +1083,8 @@ bool CPrivateSendClientSession::StartNewQueue(CAmount nValueMin, CAmount nBalanc
             return false;
         }
 
+        privateSendClient.AddUsedMasternode(infoMn.outpoint);
+
         // skip next mn payments winners
         if (mnpayments.IsScheduled(infoMn, 0)) {
             LogPrintf("CPrivateSendClientSession::StartNewQueue -- skipping winner, masternode=%s\n", infoMn.outpoint.ToStringShort());
@@ -1090,8 +1092,6 @@ bool CPrivateSendClientSession::StartNewQueue(CAmount nValueMin, CAmount nBalanc
             continue;
         }
 
-        privateSendClient.AddUsedMasternode(infoMn.outpoint);
-
         if(infoMn.nLastDsq != 0 && infoMn.nLastDsq + nMnCountEnabled/5 > mnodeman.nDsqCount) {
             LogPrintf("CPrivateSendClientSession::StartNewQueue -- Too early to mix on this masternode!"
                         " masternode=%s  addr=%s  nLastDsq=%d  CountEnabled/5=%d  nDsqCount=%d\n",
diff --git a/src/privatesend.cpp b/src/privatesend.cpp
index ab0d4978d093..0e3c3bf670b3 100644
--- a/src/privatesend.cpp
+++ b/src/privatesend.cpp
@@ -35,7 +35,14 @@ bool CDarkSendEntry::AddScriptSig(const CTxIn& txin)
 
 uint256 CDarksendQueue::GetSignatureHash() const
 {
-    return SerializeHash(*this);
+    // Remove after migration to 70211
+    {
+    masternode_info_t mnInfo;
+    mnodeman.GetMasternodeInfo(masternodeOutpoint, mnInfo);
+    return SerializeHash(*this, SER_GETHASH, mnInfo.nProtocolVersion);
+    }
+    // END remove, replace with the code below
+    // return SerializeHash(*this);
 }
 
 bool CDarksendQueue::Sign()
diff --git a/src/privatesend.h b/src/privatesend.h
index 14636f5c6fbc..b505c7fbc15a 100644
--- a/src/privatesend.h
+++ b/src/privatesend.h
@@ -174,6 +174,7 @@ class CDarksendQueue
 {
 public:
     int nDenom;
+    int nInputCount; // not used for anything but to calculate correct hash, remove after migration to 70211
     COutPoint masternodeOutpoint;
     int64_t nTime;
     bool fReady; //ready for submit
@@ -183,6 +184,7 @@ class CDarksendQueue
 
     CDarksendQueue() :
         nDenom(0),
+        nInputCount(0),
         masternodeOutpoint(COutPoint()),
         nTime(0),
         fReady(false),
@@ -192,6 +194,7 @@ class CDarksendQueue
 
     CDarksendQueue(int nDenom, COutPoint outpoint, int64_t nTime, bool fReady) :
         nDenom(nDenom),
+        nInputCount(0),
         masternodeOutpoint(outpoint),
         nTime(nTime),
         fReady(fReady),
@@ -206,7 +209,6 @@ class CDarksendQueue
         READWRITE(nDenom);
         int nVersion = s.GetVersion();
         if (nVersion > 70208 && nVersion <= 70210) {
-            int nInputCount = 0;
             READWRITE(nInputCount);
         }
         READWRITE(masternodeOutpoint);

From 9603c52900cac32f16317a7650e9db1e005b19a3 Mon Sep 17 00:00:00 2001
From: gladcow <sergey@dash.org>
Date: Thu, 11 Oct 2018 17:33:22 +0300
Subject: [PATCH 181/400] Trivial: Codestyle fixes in InstantSend code (#2332)

---
 src/instantx.cpp | 223 ++++++++++++++++++++++++-----------------------
 1 file changed, 113 insertions(+), 110 deletions(-)

diff --git a/src/instantx.cpp b/src/instantx.cpp
index be4148b3995a..ad5f1691fe0a 100644
--- a/src/instantx.cpp
+++ b/src/instantx.cpp
@@ -54,13 +54,12 @@ const std::string CInstantSend::SERIALIZATION_VERSION_STRING = "CInstantSend-Ver
 
 void CInstantSend::ProcessMessage(CNode* pfrom, const std::string& strCommand, CDataStream& vRecv, CConnman& connman)
 {
-    if(fLiteMode) return; // disable all Dash specific functionality
-    if(!sporkManager.IsSporkActive(SPORK_2_INSTANTSEND_ENABLED)) return;
+    if (fLiteMode) return; // disable all Dash specific functionality
+    if (!sporkManager.IsSporkActive(SPORK_2_INSTANTSEND_ENABLED)) return;
 
     // NOTE: NetMsgType::TXLOCKREQUEST is handled via ProcessMessage() in net_processing.cpp
 
-    if (strCommand == NetMsgType::TXLOCKVOTE) // InstantSend Transaction Lock Consensus Votes
-    {
+    if (strCommand == NetMsgType::TXLOCKVOTE) { // InstantSend Transaction Lock Consensus Votes
         if(pfrom->nVersion < MIN_INSTANTSEND_PROTO_VERSION) {
             LogPrint("instantsend", "TXLOCKVOTE -- peer=%d using obsolete version %i\n", pfrom->id, pfrom->nVersion);
             connman.PushMessage(pfrom, CNetMsgMaker(pfrom->GetSendVersion()).Make(NetMsgType::REJECT, strCommand, REJECT_OBSOLETE,
@@ -77,7 +76,7 @@ void CInstantSend::ProcessMessage(CNode* pfrom, const std::string& strCommand, C
         pfrom->setAskFor.erase(nVoteHash);
 
         // Ignore any InstantSend messages until masternode list is synced
-        if(!masternodeSync.IsMasternodeListSynced()) return;
+        if (!masternodeSync.IsMasternodeListSynced()) return;
 
         {
             LOCK(cs_instantsend);
@@ -104,7 +103,7 @@ bool CInstantSend::ProcessTxLockRequest(const CTxLockRequest& txLockRequest, CCo
     // Check to see if we conflict with existing completed lock
     for (const auto& txin : txLockRequest.tx->vin) {
         std::map<COutPoint, uint256>::iterator it = mapLockedOutpoints.find(txin.prevout);
-        if(it != mapLockedOutpoints.end() && it->second != txLockRequest.GetHash()) {
+        if (it != mapLockedOutpoints.end() && it->second != txLockRequest.GetHash()) {
             // Conflicting with complete lock, proceed to see if we should cancel them both
             LogPrintf("CInstantSend::ProcessTxLockRequest -- WARNING: Found conflicting completed Transaction Lock, txid=%s, completed lock txid=%s\n",
                     txLockRequest.GetHash().ToString(), it->second.ToString());
@@ -115,9 +114,9 @@ bool CInstantSend::ProcessTxLockRequest(const CTxLockRequest& txLockRequest, CCo
     // if so - do not fail, just warn user
     for (const auto& txin : txLockRequest.tx->vin) {
         std::map<COutPoint, std::set<uint256> >::iterator it = mapVotedOutpoints.find(txin.prevout);
-        if(it != mapVotedOutpoints.end()) {
+        if (it != mapVotedOutpoints.end()) {
             for (const auto& hash : it->second) {
-                if(hash != txLockRequest.GetHash()) {
+                if (hash != txLockRequest.GetHash()) {
                     LogPrint("instantsend", "CInstantSend::ProcessTxLockRequest -- Double spend attempt! %s\n", txin.prevout.ToStringShort());
                     // do not fail here, let it go and see which one will get the votes to be locked
                     // NOTIFY ZMQ
@@ -132,7 +131,7 @@ bool CInstantSend::ProcessTxLockRequest(const CTxLockRequest& txLockRequest, CCo
         }
     }
 
-    if(!CreateTxLockCandidate(txLockRequest)) {
+    if (!CreateTxLockCandidate(txLockRequest)) {
         // smth is not right
         LogPrintf("CInstantSend::ProcessTxLockRequest -- CreateTxLockCandidate failed, txid=%s\n", txHash.ToString());
         return false;
@@ -151,19 +150,19 @@ bool CInstantSend::ProcessTxLockRequest(const CTxLockRequest& txLockRequest, CCo
 
 bool CInstantSend::CreateTxLockCandidate(const CTxLockRequest& txLockRequest)
 {
-    if(!txLockRequest.IsValid()) return false;
+    if (!txLockRequest.IsValid()) return false;
 
     LOCK(cs_instantsend);
 
     uint256 txHash = txLockRequest.GetHash();
 
     std::map<uint256, CTxLockCandidate>::iterator itLockCandidate = mapTxLockCandidates.find(txHash);
-    if(itLockCandidate == mapTxLockCandidates.end()) {
+    if (itLockCandidate == mapTxLockCandidates.end()) {
         LogPrintf("CInstantSend::CreateTxLockCandidate -- new, txid=%s\n", txHash.ToString());
 
         CTxLockCandidate txLockCandidate(txLockRequest);
         // all inputs should already be checked by txLockRequest.IsValid() above, just use them now
-        for(const auto& txin : txLockRequest.tx->vin) {
+        for (const auto& txin : txLockRequest.tx->vin) {
             txLockCandidate.AddOutPointLock(txin.prevout);
         }
         mapTxLockCandidates.insert(std::make_pair(txHash, txLockCandidate));
@@ -177,7 +176,7 @@ bool CInstantSend::CreateTxLockCandidate(const CTxLockRequest& txLockRequest)
         LogPrintf("CInstantSend::CreateTxLockCandidate -- update empty, txid=%s\n", txHash.ToString());
 
         // all inputs should already be checked by txLockRequest.IsValid() above, just use them now
-        for(const auto& txin : txLockRequest.tx->vin) {
+        for (const auto& txin : txLockRequest.tx->vin) {
             itLockCandidate->second.AddOutPointLock(txin.prevout);
         }
     } else {
@@ -220,20 +219,20 @@ void CInstantSend::Vote(const uint256& txHash, CConnman& connman)
 
 void CInstantSend::Vote(CTxLockCandidate& txLockCandidate, CConnman& connman)
 {
-    if(!fMasternodeMode) return;
-    if(!sporkManager.IsSporkActive(SPORK_2_INSTANTSEND_ENABLED)) return;
+    if (!fMasternodeMode) return;
+    if (!sporkManager.IsSporkActive(SPORK_2_INSTANTSEND_ENABLED)) return;
 
     AssertLockHeld(cs_main);
     AssertLockHeld(cs_instantsend);
 
     uint256 txHash = txLockCandidate.GetHash();
     // We should never vote on a Transaction Lock Request that was not (yet) accepted by the mempool
-    if(mapLockRequestAccepted.find(txHash) == mapLockRequestAccepted.end()) return;
+    if (mapLockRequestAccepted.find(txHash) == mapLockRequestAccepted.end()) return;
     // check if we need to vote on this candidate's outpoints,
     // it's possible that we need to vote for several of them
     for (auto& outpointLockPair : txLockCandidate.mapOutPointLocks) {
         int nPrevoutHeight = GetUTXOHeight(outpointLockPair.first);
-        if(nPrevoutHeight == -1) {
+        if (nPrevoutHeight == -1) {
             LogPrint("instantsend", "CInstantSend::Vote -- Failed to find UTXO %s\n", outpointLockPair.first.ToStringShort());
             return;
         }
@@ -242,13 +241,13 @@ void CInstantSend::Vote(CTxLockCandidate& txLockCandidate, CConnman& connman)
 
         int nRank;
         int nMinRequiredProtocol = std::max(MIN_INSTANTSEND_PROTO_VERSION, mnpayments.GetMinMasternodePaymentsProto());
-        if(!mnodeman.GetMasternodeRank(activeMasternodeInfo.outpoint, nRank, nLockInputHeight, nMinRequiredProtocol)) {
+        if (!mnodeman.GetMasternodeRank(activeMasternodeInfo.outpoint, nRank, nLockInputHeight, nMinRequiredProtocol)) {
             LogPrint("instantsend", "CInstantSend::Vote -- Can't calculate rank for masternode %s\n", activeMasternodeInfo.outpoint.ToStringShort());
             continue;
         }
 
         int nSignaturesTotal = COutPointLock::SIGNATURES_TOTAL;
-        if(nRank > nSignaturesTotal) {
+        if (nRank > nSignaturesTotal) {
             LogPrint("instantsend", "CInstantSend::Vote -- Masternode not in the top %d (%d)\n", nSignaturesTotal, nRank);
             continue;
         }
@@ -260,10 +259,10 @@ void CInstantSend::Vote(CTxLockCandidate& txLockCandidate, CConnman& connman)
         // Check to see if we already voted for this outpoint,
         // refuse to vote twice or to include the same outpoint in another tx
         bool fAlreadyVoted = false;
-        if(itVoted != mapVotedOutpoints.end()) {
+        if (itVoted != mapVotedOutpoints.end()) {
             for (const auto& hash : itVoted->second) {
                 std::map<uint256, CTxLockCandidate>::iterator it2 = mapTxLockCandidates.find(hash);
-                if(it2->second.HasMasternodeVoted(outpointLockPair.first, activeMasternodeInfo.outpoint)) {
+                if (it2->second.HasMasternodeVoted(outpointLockPair.first, activeMasternodeInfo.outpoint)) {
                     // we already voted for this outpoint to be included either in the same tx or in a competing one,
                     // skip it anyway
                     fAlreadyVoted = true;
@@ -273,18 +272,18 @@ void CInstantSend::Vote(CTxLockCandidate& txLockCandidate, CConnman& connman)
                 }
             }
         }
-        if(fAlreadyVoted) {
+        if (fAlreadyVoted) {
             continue; // skip to the next outpoint
         }
 
         // we haven't voted for this outpoint yet, let's try to do this now
         CTxLockVote vote(txHash, outpointLockPair.first, activeMasternodeInfo.outpoint);
 
-        if(!vote.Sign()) {
+        if (!vote.Sign()) {
             LogPrintf("CInstantSend::Vote -- Failed to sign consensus vote\n");
             return;
         }
-        if(!vote.CheckSignature()) {
+        if (!vote.CheckSignature()) {
             LogPrintf("CInstantSend::Vote -- Signature invalid\n");
             return;
         }
@@ -292,17 +291,17 @@ void CInstantSend::Vote(CTxLockCandidate& txLockCandidate, CConnman& connman)
         // vote constructed sucessfully, let's store and relay it
         uint256 nVoteHash = vote.GetHash();
         mapTxLockVotes.insert(std::make_pair(nVoteHash, vote));
-        if(outpointLockPair.second.AddVote(vote)) {
+        if (outpointLockPair.second.AddVote(vote)) {
             LogPrintf("CInstantSend::Vote -- Vote created successfully, relaying: txHash=%s, outpoint=%s, vote=%s\n",
                     txHash.ToString(), outpointLockPair.first.ToStringShort(), nVoteHash.ToString());
 
-            if(itVoted == mapVotedOutpoints.end()) {
+            if (itVoted == mapVotedOutpoints.end()) {
                 std::set<uint256> setHashes;
                 setHashes.insert(txHash);
                 mapVotedOutpoints.insert(std::make_pair(outpointLockPair.first, setHashes));
             } else {
                 mapVotedOutpoints[outpointLockPair.first].insert(txHash);
-                if(mapVotedOutpoints[outpointLockPair.first].size() > 1) {
+                if (mapVotedOutpoints[outpointLockPair.first].size() > 1) {
                     // it's ok to continue, just warn user
                     LogPrintf("CInstantSend::Vote -- WARNING: Vote conflicts with some existing votes: txHash=%s, outpoint=%s, vote=%s\n",
                             txHash.ToString(), outpointLockPair.first.ToStringShort(), nVoteHash.ToString());
@@ -319,7 +318,7 @@ bool CInstantSend::ProcessNewTxLockVote(CNode* pfrom, const CTxLockVote& vote, C
     uint256 txHash = vote.GetTxHash();
     uint256 nVoteHash = vote.GetHash();
 
-    if(!vote.IsValid(pfrom, connman)) {
+    if (!vote.IsValid(pfrom, connman)) {
         // could be because of missing MN
         LogPrint("instantsend", "CInstantSend::%s -- Vote is invalid, txid=%s\n", __func__, txHash.ToString());
         return false;
@@ -338,9 +337,9 @@ bool CInstantSend::ProcessNewTxLockVote(CNode* pfrom, const CTxLockVote& vote, C
     // will actually process only after the lock request itself has arrived
 
     std::map<uint256, CTxLockCandidate>::iterator it = mapTxLockCandidates.find(txHash);
-    if(it == mapTxLockCandidates.end() || !it->second.txLockRequest) {
+    if (it == mapTxLockCandidates.end() || !it->second.txLockRequest) {
         // no or empty tx lock candidate
-        if(it == mapTxLockCandidates.end()) {
+        if (it == mapTxLockCandidates.end()) {
             // start timeout countdown after the very first vote
             CreateEmptyTxLockCandidate(txHash);
         }
@@ -353,10 +352,10 @@ bool CInstantSend::ProcessNewTxLockVote(CNode* pfrom, const CTxLockVote& vote, C
 
         int nMasternodeOrphanExpireTime = GetTime() + 60*10; // keep time data for 10 minutes
         auto itMnOV = mapMasternodeOrphanVotes.find(vote.GetMasternodeOutpoint());
-        if(itMnOV == mapMasternodeOrphanVotes.end()) {
+        if (itMnOV == mapMasternodeOrphanVotes.end()) {
             mapMasternodeOrphanVotes.emplace(vote.GetMasternodeOutpoint(), nMasternodeOrphanExpireTime);
         } else {
-            if(itMnOV->second > GetTime() && itMnOV->second > GetAverageMasternodeOrphanVoteTime()) {
+            if (itMnOV->second > GetTime() && itMnOV->second > GetAverageMasternodeOrphanVoteTime()) {
                 LogPrint("instantsend", "CInstantSend::%s -- masternode is spamming orphan Transaction Lock Votes: txid=%s  masternode=%s\n",
                         __func__, txHash.ToString(), vote.GetMasternodeOutpoint().ToStringShort());
                 // Misbehaving(pfrom->id, 1);
@@ -381,7 +380,7 @@ bool CInstantSend::ProcessNewTxLockVote(CNode* pfrom, const CTxLockVote& vote, C
 
     UpdateVotedOutpoints(vote, txLockCandidate);
 
-    if(!txLockCandidate.AddVote(vote)) {
+    if (!txLockCandidate.AddVote(vote)) {
         // this should never happen
         return false;
     }
@@ -410,7 +409,7 @@ bool CInstantSend::ProcessOrphanTxLockVote(const CTxLockVote& vote)
 
     // We shouldn't process orphan votes without a valid tx lock candidate
     std::map<uint256, CTxLockCandidate>::iterator it = mapTxLockCandidates.find(txHash);
-    if(it == mapTxLockCandidates.end() || !it->second.txLockRequest)
+    if (it == mapTxLockCandidates.end() || !it->second.txLockRequest)
         return false; // this shouldn never happen
 
     CTxLockCandidate& txLockCandidate = it->second;
@@ -424,7 +423,7 @@ bool CInstantSend::ProcessOrphanTxLockVote(const CTxLockVote& vote)
 
     UpdateVotedOutpoints(vote, txLockCandidate);
 
-    if(!txLockCandidate.AddVote(vote)) {
+    if (!txLockCandidate.AddVote(vote)) {
         // this should never happen
         return false;
     }
@@ -444,14 +443,14 @@ void CInstantSend::UpdateVotedOutpoints(const CTxLockVote& vote, CTxLockCandidat
     uint256 txHash = vote.GetTxHash();
 
     std::map<COutPoint, std::set<uint256> >::iterator it1 = mapVotedOutpoints.find(vote.GetOutpoint());
-    if(it1 != mapVotedOutpoints.end()) {
+    if (it1 != mapVotedOutpoints.end()) {
         for (const auto& hash : it1->second) {
-            if(hash != txHash) {
+            if (hash != txHash) {
                 // same outpoint was already voted to be locked by another tx lock request,
                 // let's see if it was the same masternode who voted on this outpoint
                 // for another tx lock request
                 std::map<uint256, CTxLockCandidate>::iterator it2 = mapTxLockCandidates.find(hash);
-                if(it2 !=mapTxLockCandidates.end() && it2->second.HasMasternodeVoted(vote.GetOutpoint(), vote.GetMasternodeOutpoint())) {
+                if (it2 !=mapTxLockCandidates.end() && it2->second.HasMasternodeVoted(vote.GetOutpoint(), vote.GetMasternodeOutpoint())) {
                     // yes, it was the same masternode
                     LogPrintf("CInstantSend::%s -- masternode sent conflicting votes! %s\n", __func__, vote.GetMasternodeOutpoint().ToStringShort());
                     // mark both Lock Candidates as attacked, none of them should complete,
@@ -480,8 +479,8 @@ void CInstantSend::ProcessOrphanTxLockVotes()
     AssertLockHeld(cs_instantsend);
 
     std::map<uint256, CTxLockVote>::iterator it = mapTxLockVotesOrphan.begin();
-    while(it != mapTxLockVotesOrphan.end()) {
-        if(ProcessOrphanTxLockVote(it->second)) {
+    while (it != mapTxLockVotesOrphan.end()) {
+        if (ProcessOrphanTxLockVote(it->second)) {
             mapTxLockVotesOrphan.erase(it++);
         } else {
             ++it;
@@ -491,16 +490,16 @@ void CInstantSend::ProcessOrphanTxLockVotes()
 
 void CInstantSend::TryToFinalizeLockCandidate(const CTxLockCandidate& txLockCandidate)
 {
-    if(!sporkManager.IsSporkActive(SPORK_2_INSTANTSEND_ENABLED)) return;
+    if (!sporkManager.IsSporkActive(SPORK_2_INSTANTSEND_ENABLED)) return;
 
     AssertLockHeld(cs_main);
     AssertLockHeld(cs_instantsend);
 
     uint256 txHash = txLockCandidate.txLockRequest.tx->GetHash();
-    if(txLockCandidate.IsAllOutPointsReady() && !IsLockedInstantSendTransaction(txHash)) {
+    if (txLockCandidate.IsAllOutPointsReady() && !IsLockedInstantSendTransaction(txHash)) {
         // we have enough votes now
         LogPrint("instantsend", "CInstantSend::TryToFinalizeLockCandidate -- Transaction Lock is ready to complete, txid=%s\n", txHash.ToString());
-        if(ResolveConflicts(txLockCandidate)) {
+        if (ResolveConflicts(txLockCandidate)) {
             LockTransactionInputs(txLockCandidate);
             UpdateLockedTransaction(txLockCandidate);
         }
@@ -512,22 +511,23 @@ void CInstantSend::UpdateLockedTransaction(const CTxLockCandidate& txLockCandida
     // cs_main, cs_wallet and cs_instantsend should be already locked
     AssertLockHeld(cs_main);
 #ifdef ENABLE_WALLET
-    if (pwalletMain)
+    if (pwalletMain) {
         AssertLockHeld(pwalletMain->cs_wallet);
+    }
 #endif
     AssertLockHeld(cs_instantsend);
 
     uint256 txHash = txLockCandidate.GetHash();
 
-    if(!IsLockedInstantSendTransaction(txHash)) return; // not a locked tx, do not update/notify
+    if (!IsLockedInstantSendTransaction(txHash)) return; // not a locked tx, do not update/notify
 
 #ifdef ENABLE_WALLET
-    if(pwalletMain && pwalletMain->UpdatedTransaction(txHash)) {
+    if (pwalletMain && pwalletMain->UpdatedTransaction(txHash)) {
         // bumping this to update UI
         nCompleteTXLocks++;
         // notify an external script once threshold is reached
         std::string strCmd = GetArg("-instantsendnotify", "");
-        if(!strCmd.empty()) {
+        if (!strCmd.empty()) {
             boost::replace_all(strCmd, "%s", txHash.GetHex());
             boost::thread t(runCommand, strCmd); // thread runs free
         }
@@ -541,13 +541,13 @@ void CInstantSend::UpdateLockedTransaction(const CTxLockCandidate& txLockCandida
 
 void CInstantSend::LockTransactionInputs(const CTxLockCandidate& txLockCandidate)
 {
-    if(!sporkManager.IsSporkActive(SPORK_2_INSTANTSEND_ENABLED)) return;
+    if (!sporkManager.IsSporkActive(SPORK_2_INSTANTSEND_ENABLED)) return;
 
     LOCK(cs_instantsend);
 
     uint256 txHash = txLockCandidate.GetHash();
 
-    if(!txLockCandidate.IsAllOutPointsReady()) return;
+    if (!txLockCandidate.IsAllOutPointsReady()) return;
 
     for (const auto& pair : txLockCandidate.mapOutPointLocks) {
         mapLockedOutpoints.insert(std::make_pair(pair.first, txHash));
@@ -559,7 +559,7 @@ bool CInstantSend::GetLockedOutPointTxHash(const COutPoint& outpoint, uint256& h
 {
     LOCK(cs_instantsend);
     std::map<COutPoint, uint256>::iterator it = mapLockedOutpoints.find(outpoint);
-    if(it == mapLockedOutpoints.end()) return false;
+    if (it == mapLockedOutpoints.end()) return false;
     hashRet = it->second;
     return true;
 }
@@ -572,18 +572,18 @@ bool CInstantSend::ResolveConflicts(const CTxLockCandidate& txLockCandidate)
     uint256 txHash = txLockCandidate.GetHash();
 
     // make sure the lock is ready
-    if(!txLockCandidate.IsAllOutPointsReady()) return false;
+    if (!txLockCandidate.IsAllOutPointsReady()) return false;
 
     AssertLockHeld(mempool.cs); // protect mempool.mapNextTx
 
     for (const auto& txin : txLockCandidate.txLockRequest.tx->vin) {
         uint256 hashConflicting;
-        if(GetLockedOutPointTxHash(txin.prevout, hashConflicting) && txHash != hashConflicting) {
+        if (GetLockedOutPointTxHash(txin.prevout, hashConflicting) && txHash != hashConflicting) {
             // completed lock which conflicts with another completed one?
             // this means that majority of MNs in the quorum for this specific tx input are malicious!
             std::map<uint256, CTxLockCandidate>::iterator itLockCandidate = mapTxLockCandidates.find(txHash);
             std::map<uint256, CTxLockCandidate>::iterator itLockCandidateConflicting = mapTxLockCandidates.find(hashConflicting);
-            if(itLockCandidate == mapTxLockCandidates.end() || itLockCandidateConflicting == mapTxLockCandidates.end()) {
+            if (itLockCandidate == mapTxLockCandidates.end() || itLockCandidateConflicting == mapTxLockCandidates.end()) {
                 // safety check, should never really happen
                 LogPrintf("CInstantSend::ResolveConflicts -- ERROR: Found conflicting completed Transaction Lock, but one of txLockCandidate-s is missing, txid=%s, conflicting txid=%s\n",
                         txHash.ToString(), hashConflicting.ToString());
@@ -613,7 +613,7 @@ bool CInstantSend::ResolveConflicts(const CTxLockCandidate& txLockCandidate)
         } else if (mempool.mapNextTx.count(txin.prevout)) {
             // check if it's in mempool
             hashConflicting = mempool.mapNextTx.find(txin.prevout)->second->GetHash();
-            if(txHash == hashConflicting) continue; // matches current, not a conflict, skip to next txin
+            if (txHash == hashConflicting) continue; // matches current, not a conflict, skip to next txin
             // conflicts with tx in mempool
             LogPrintf("CInstantSend::ResolveConflicts -- ERROR: Failed to complete Transaction Lock, conflicts with mempool, txid=%s\n", txHash.ToString());
             return false;
@@ -622,14 +622,14 @@ bool CInstantSend::ResolveConflicts(const CTxLockCandidate& txLockCandidate)
     // No conflicts were found so far, check to see if it was already included in block
     CTransactionRef txTmp;
     uint256 hashBlock;
-    if(GetTransaction(txHash, txTmp, Params().GetConsensus(), hashBlock, true) && hashBlock != uint256()) {
+    if (GetTransaction(txHash, txTmp, Params().GetConsensus(), hashBlock, true) && hashBlock != uint256()) {
         LogPrint("instantsend", "CInstantSend::ResolveConflicts -- Done, %s is included in block %s\n", txHash.ToString(), hashBlock.ToString());
         return true;
     }
     // Not in block yet, make sure all its inputs are still unspent
     for (const auto& txin : txLockCandidate.txLockRequest.tx->vin) {
         Coin coin;
-        if(!GetUTXOCoin(txin.prevout, coin)) {
+        if (!GetUTXOCoin(txin.prevout, coin)) {
             // Not in UTXO anymore? A conflicting tx was mined while we were waiting for votes.
             LogPrintf("CInstantSend::ResolveConflicts -- ERROR: Failed to find UTXO %s, can't complete Transaction Lock\n", txin.prevout.ToStringShort());
             return false;
@@ -644,7 +644,7 @@ int64_t CInstantSend::GetAverageMasternodeOrphanVoteTime()
 {
     LOCK(cs_instantsend);
     // NOTE: should never actually call this function when mapMasternodeOrphanVotes is empty
-    if(mapMasternodeOrphanVotes.empty()) return 0;
+    if (mapMasternodeOrphanVotes.empty()) return 0;
 
     int64_t total = 0;
     for (const auto& pair : mapMasternodeOrphanVotes) {
@@ -656,17 +656,17 @@ int64_t CInstantSend::GetAverageMasternodeOrphanVoteTime()
 
 void CInstantSend::CheckAndRemove()
 {
-    if(!masternodeSync.IsMasternodeListSynced()) return;
+    if (!masternodeSync.IsMasternodeListSynced()) return;
 
     LOCK(cs_instantsend);
 
     std::map<uint256, CTxLockCandidate>::iterator itLockCandidate = mapTxLockCandidates.begin();
 
     // remove expired candidates
-    while(itLockCandidate != mapTxLockCandidates.end()) {
+    while (itLockCandidate != mapTxLockCandidates.end()) {
         CTxLockCandidate &txLockCandidate = itLockCandidate->second;
         uint256 txHash = txLockCandidate.GetHash();
-        if(txLockCandidate.IsExpired(nCachedBlockHeight)) {
+        if (txLockCandidate.IsExpired(nCachedBlockHeight)) {
             LogPrintf("CInstantSend::CheckAndRemove -- Removing expired Transaction Lock Candidate: txid=%s\n", txHash.ToString());
 
             for (const auto& pair : txLockCandidate.mapOutPointLocks) {
@@ -683,8 +683,8 @@ void CInstantSend::CheckAndRemove()
 
     // remove expired votes
     std::map<uint256, CTxLockVote>::iterator itVote = mapTxLockVotes.begin();
-    while(itVote != mapTxLockVotes.end()) {
-        if(itVote->second.IsExpired(nCachedBlockHeight)) {
+    while (itVote != mapTxLockVotes.end()) {
+        if (itVote->second.IsExpired(nCachedBlockHeight)) {
             LogPrint("instantsend", "CInstantSend::CheckAndRemove -- Removing expired vote: txid=%s  masternode=%s\n",
                     itVote->second.GetTxHash().ToString(), itVote->second.GetMasternodeOutpoint().ToStringShort());
             mapTxLockVotes.erase(itVote++);
@@ -695,8 +695,8 @@ void CInstantSend::CheckAndRemove()
 
     // remove timed out orphan votes
     std::map<uint256, CTxLockVote>::iterator itOrphanVote = mapTxLockVotesOrphan.begin();
-    while(itOrphanVote != mapTxLockVotesOrphan.end()) {
-        if(itOrphanVote->second.IsTimedOut()) {
+    while (itOrphanVote != mapTxLockVotesOrphan.end()) {
+        if (itOrphanVote->second.IsTimedOut()) {
             LogPrint("instantsend", "CInstantSend::CheckAndRemove -- Removing timed out orphan vote: txid=%s  masternode=%s\n",
                     itOrphanVote->second.GetTxHash().ToString(), itOrphanVote->second.GetMasternodeOutpoint().ToStringShort());
             mapTxLockVotes.erase(itOrphanVote->first);
@@ -708,8 +708,8 @@ void CInstantSend::CheckAndRemove()
 
     // remove invalid votes and votes for failed lock attempts
     itVote = mapTxLockVotes.begin();
-    while(itVote != mapTxLockVotes.end()) {
-        if(itVote->second.IsFailed()) {
+    while (itVote != mapTxLockVotes.end()) {
+        if (itVote->second.IsFailed()) {
             LogPrint("instantsend", "CInstantSend::CheckAndRemove -- Removing vote for failed lock attempt: txid=%s  masternode=%s\n",
                     itVote->second.GetTxHash().ToString(), itVote->second.GetMasternodeOutpoint().ToStringShort());
             mapTxLockVotes.erase(itVote++);
@@ -720,8 +720,8 @@ void CInstantSend::CheckAndRemove()
 
     // remove timed out masternode orphan votes (DOS protection)
     std::map<COutPoint, int64_t>::iterator itMasternodeOrphan = mapMasternodeOrphanVotes.begin();
-    while(itMasternodeOrphan != mapMasternodeOrphanVotes.end()) {
-        if(itMasternodeOrphan->second < GetTime()) {
+    while (itMasternodeOrphan != mapMasternodeOrphanVotes.end()) {
+        if (itMasternodeOrphan->second < GetTime()) {
             LogPrint("instantsend", "CInstantSend::CheckAndRemove -- Removing timed out orphan masternode vote: masternode=%s\n",
                     itMasternodeOrphan->first.ToStringShort());
             mapMasternodeOrphanVotes.erase(itMasternodeOrphan++);
@@ -763,7 +763,7 @@ bool CInstantSend::GetTxLockRequest(const uint256& txHash, CTxLockRequest& txLoc
     LOCK(cs_instantsend);
 
     std::map<uint256, CTxLockCandidate>::iterator it = mapTxLockCandidates.find(txHash);
-    if(it == mapTxLockCandidates.end() || !it->second.txLockRequest) return false;
+    if (it == mapTxLockCandidates.end() || !it->second.txLockRequest) return false;
     txLockRequestRet = it->second.txLockRequest;
 
     return true;
@@ -774,7 +774,7 @@ bool CInstantSend::GetTxLockVote(const uint256& hash, CTxLockVote& txLockVoteRet
     LOCK(cs_instantsend);
 
     std::map<uint256, CTxLockVote>::iterator it = mapTxLockVotes.find(hash);
-    if(it == mapTxLockVotes.end()) return false;
+    if (it == mapTxLockVotes.end()) return false;
     txLockVoteRet = it->second;
 
     return true;
@@ -797,22 +797,22 @@ void CInstantSend::Clear()
 
 bool CInstantSend::IsLockedInstantSendTransaction(const uint256& txHash)
 {
-    if(!fEnableInstantSend || GetfLargeWorkForkFound() || GetfLargeWorkInvalidChainFound() ||
+    if (!fEnableInstantSend || GetfLargeWorkForkFound() || GetfLargeWorkInvalidChainFound() ||
         !sporkManager.IsSporkActive(SPORK_3_INSTANTSEND_BLOCK_FILTERING)) return false;
 
     LOCK(cs_instantsend);
 
     // there must be a lock candidate
     std::map<uint256, CTxLockCandidate>::iterator itLockCandidate = mapTxLockCandidates.find(txHash);
-    if(itLockCandidate == mapTxLockCandidates.end()) return false;
+    if (itLockCandidate == mapTxLockCandidates.end()) return false;
 
     // which should have outpoints
-    if(itLockCandidate->second.mapOutPointLocks.empty()) return false;
+    if (itLockCandidate->second.mapOutPointLocks.empty()) return false;
 
     // and all of these outputs must be included in mapLockedOutpoints with correct hash
     for (const auto& pair : itLockCandidate->second.mapOutPointLocks) {
         uint256 hashLocked;
-        if(!GetLockedOutPointTxHash(pair.first, hashLocked) || hashLocked != txHash) return false;
+        if (!GetLockedOutPointTxHash(pair.first, hashLocked) || hashLocked != txHash) return false;
     }
 
     return true;
@@ -820,14 +820,14 @@ bool CInstantSend::IsLockedInstantSendTransaction(const uint256& txHash)
 
 int CInstantSend::GetTransactionLockSignatures(const uint256& txHash)
 {
-    if(!fEnableInstantSend) return -1;
-    if(GetfLargeWorkForkFound() || GetfLargeWorkInvalidChainFound()) return -2;
-    if(!sporkManager.IsSporkActive(SPORK_2_INSTANTSEND_ENABLED)) return -3;
+    if (!fEnableInstantSend) return -1;
+    if (GetfLargeWorkForkFound() || GetfLargeWorkInvalidChainFound()) return -2;
+    if (!sporkManager.IsSporkActive(SPORK_2_INSTANTSEND_ENABLED)) return -3;
 
     LOCK(cs_instantsend);
 
     std::map<uint256, CTxLockCandidate>::iterator itLockCandidate = mapTxLockCandidates.find(txHash);
-    if(itLockCandidate != mapTxLockCandidates.end()) {
+    if (itLockCandidate != mapTxLockCandidates.end()) {
         return itLockCandidate->second.CountVotes();
     }
 
@@ -836,7 +836,7 @@ int CInstantSend::GetTransactionLockSignatures(const uint256& txHash)
 
 bool CInstantSend::IsTxLockCandidateTimedOut(const uint256& txHash)
 {
-    if(!fEnableInstantSend) return false;
+    if (!fEnableInstantSend) return false;
 
     LOCK(cs_instantsend);
 
@@ -882,20 +882,19 @@ void CInstantSend::SyncTransaction(const CTransaction& tx, const CBlockIndex *pi
 
     // Check lock candidates
     std::map<uint256, CTxLockCandidate>::iterator itLockCandidate = mapTxLockCandidates.find(txHash);
-    if(itLockCandidate != mapTxLockCandidates.end()) {
+    if (itLockCandidate != mapTxLockCandidates.end()) {
         LogPrint("instantsend", "CInstantSend::SyncTransaction -- txid=%s nHeightNew=%d lock candidate updated\n",
                 txHash.ToString(), nHeightNew);
         itLockCandidate->second.SetConfirmedHeight(nHeightNew);
         // Loop through outpoint locks
         for (const auto& pair : itLockCandidate->second.mapOutPointLocks) {
-
             // Check corresponding lock votes
             for (const auto& vote : pair.second.GetVotes()) {
                 uint256 nVoteHash = vote.GetHash();
                 LogPrint("instantsend", "CInstantSend::SyncTransaction -- txid=%s nHeightNew=%d vote %s updated\n",
                         txHash.ToString(), nHeightNew, nVoteHash.ToString());
                 const auto& it = mapTxLockVotes.find(nVoteHash);
-                if(it != mapTxLockVotes.end()) {
+                if (it != mapTxLockVotes.end()) {
                     it->second.SetConfirmedHeight(nHeightNew);
                 }
             }
@@ -904,7 +903,7 @@ void CInstantSend::SyncTransaction(const CTransaction& tx, const CBlockIndex *pi
 
     // check orphan votes
     for (const auto& pair : mapTxLockVotesOrphan) {
-        if(pair.second.GetTxHash() == txHash) {
+        if (pair.second.GetTxHash() == txHash) {
             LogPrint("instantsend", "CInstantSend::SyncTransaction -- txid=%s nHeightNew=%d vote %s updated\n",
                     txHash.ToString(), nHeightNew, pair.first.ToString());
             mapTxLockVotes[pair.first].SetConfirmedHeight(nHeightNew);
@@ -920,10 +919,12 @@ std::string CInstantSend::ToString() const
 
 bool CInstantSend::CanAutoLock()
 {
-    if(!isAutoLockBip9Active)
+    if (!isAutoLockBip9Active) {
         return false;
-    if(!sporkManager.IsSporkActive(SPORK_16_INSTANTSEND_AUTOLOCKS))
+    }
+    if (!sporkManager.IsSporkActive(SPORK_16_INSTANTSEND_AUTOLOCKS)) {
         return false;
+    }
     return (mempool.UsedMemoryShare() < AUTO_IX_MEMPOOL_THRESHOLD);
 }
 
@@ -933,14 +934,14 @@ bool CInstantSend::CanAutoLock()
 
 bool CTxLockRequest::IsValid() const
 {
-    if(tx->vout.size() < 1) return false;
+    if (tx->vout.size() < 1) return false;
 
-    if(tx->vin.size() > WARN_MANY_INPUTS) {
+    if (tx->vin.size() > WARN_MANY_INPUTS) {
         LogPrint("instantsend", "CTxLockRequest::IsValid -- WARNING: Too many inputs: tx=%s", ToString());
     }
 
     AssertLockHeld(cs_main);
-    if(!CheckFinalTx(*tx)) {
+    if (!CheckFinalTx(*tx)) {
         LogPrint("instantsend", "CTxLockRequest::IsValid -- Transaction is not final: tx=%s", ToString());
         return false;
     }
@@ -953,7 +954,7 @@ bool CTxLockRequest::IsValid() const
 
         Coin coin;
 
-        if(!GetUTXOCoin(txin.prevout, coin)) {
+        if (!GetUTXOCoin(txin.prevout, coin)) {
             LogPrint("instantsend", "CTxLockRequest::IsValid -- Failed to find UTXO %s\n", txin.prevout.ToStringShort());
             return false;
         }
@@ -962,7 +963,7 @@ bool CTxLockRequest::IsValid() const
         // 1 less than the "send IX" gui requires, in case of a block propagating the network at the time
         int nConfirmationsRequired = nInstantSendConfirmationsRequired - 1;
 
-        if(nTxAge < nConfirmationsRequired) {
+        if (nTxAge < nConfirmationsRequired) {
             LogPrint("instantsend", "CTxLockRequest::IsValid -- outpoint %s too new: nTxAge=%d, nConfirmationsRequired=%d, txid=%s\n",
                     txin.prevout.ToStringShort(), nTxAge, nConfirmationsRequired, GetHash().ToString());
             return false;
@@ -971,14 +972,14 @@ bool CTxLockRequest::IsValid() const
         nValueIn += coin.out.nValue;
     }
 
-    if(nValueIn > sporkManager.GetSporkValue(SPORK_5_INSTANTSEND_MAX_VALUE)*COIN) {
+    if (nValueIn > sporkManager.GetSporkValue(SPORK_5_INSTANTSEND_MAX_VALUE)*COIN) {
         LogPrint("instantsend", "CTxLockRequest::IsValid -- Transaction value too high: nValueIn=%d, tx=%s", nValueIn, ToString());
         return false;
     }
 
     CAmount nValueOut = tx->GetValueOut();
 
-    if(nValueIn - nValueOut < GetMinFee()) {
+    if (nValueIn - nValueOut < GetMinFee()) {
         LogPrint("instantsend", "CTxLockRequest::IsValid -- did not include enough fees in transaction: fees=%d, tx=%s", nValueOut - nValueIn, ToString());
         return false;
     }
@@ -988,8 +989,9 @@ bool CTxLockRequest::IsValid() const
 
 CAmount CTxLockRequest::GetMinFee() const
 {
-    if(IsSimple())
+    if (IsSimple()) {
         return CAmount();
+    }
     CAmount nMinFee = MIN_FEE;
     return std::max(nMinFee, CAmount(tx->vin.size() * nMinFee));
 }
@@ -1010,14 +1012,14 @@ bool CTxLockRequest::IsSimple() const
 
 bool CTxLockVote::IsValid(CNode* pnode, CConnman& connman) const
 {
-    if(!mnodeman.Has(outpointMasternode)) {
+    if (!mnodeman.Has(outpointMasternode)) {
         LogPrint("instantsend", "CTxLockVote::IsValid -- Unknown masternode %s\n", outpointMasternode.ToStringShort());
         mnodeman.AskForMN(pnode, outpointMasternode, connman);
         return false;
     }
 
     Coin coin;
-    if(!GetUTXOCoin(outpoint, coin)) {
+    if (!GetUTXOCoin(outpoint, coin)) {
         LogPrint("instantsend", "CTxLockVote::IsValid -- Failed to find UTXO %s\n", outpoint.ToStringShort());
         return false;
     }
@@ -1026,7 +1028,7 @@ bool CTxLockVote::IsValid(CNode* pnode, CConnman& connman) const
 
     int nRank;
     int nMinRequiredProtocol = std::max(MIN_INSTANTSEND_PROTO_VERSION, mnpayments.GetMinMasternodePaymentsProto());
-    if(!mnodeman.GetMasternodeRank(outpointMasternode, nRank, nLockInputHeight, nMinRequiredProtocol)) {
+    if (!mnodeman.GetMasternodeRank(outpointMasternode, nRank, nLockInputHeight, nMinRequiredProtocol)) {
         //can be caused by past versions trying to vote with an invalid protocol
         LogPrint("instantsend", "CTxLockVote::IsValid -- Can't calculate rank for masternode %s\n", outpointMasternode.ToStringShort());
         return false;
@@ -1034,13 +1036,13 @@ bool CTxLockVote::IsValid(CNode* pnode, CConnman& connman) const
     LogPrint("instantsend", "CTxLockVote::IsValid -- Masternode %s, rank=%d\n", outpointMasternode.ToStringShort(), nRank);
 
     int nSignaturesTotal = COutPointLock::SIGNATURES_TOTAL;
-    if(nRank > nSignaturesTotal) {
+    if (nRank > nSignaturesTotal) {
         LogPrint("instantsend", "CTxLockVote::IsValid -- Masternode %s is not in the top %d (%d), vote hash=%s\n",
                 outpointMasternode.ToStringShort(), nSignaturesTotal, nRank, GetHash().ToString());
         return false;
     }
 
-    if(!CheckSignature()) {
+    if (!CheckSignature()) {
         LogPrintf("CTxLockVote::IsValid -- Signature invalid\n");
         return false;
     }
@@ -1064,7 +1066,7 @@ bool CTxLockVote::CheckSignature() const
 
     masternode_info_t infoMn;
 
-    if(!mnodeman.GetMasternodeInfo(outpointMasternode, infoMn)) {
+    if (!mnodeman.GetMasternodeInfo(outpointMasternode, infoMn)) {
         LogPrintf("CTxLockVote::CheckSignature -- Unknown Masternode: masternode=%s\n", outpointMasternode.ToString());
         return false;
     }
@@ -1075,7 +1077,7 @@ bool CTxLockVote::CheckSignature() const
         if (!CHashSigner::VerifyHash(hash, infoMn.keyIDOperator, vchMasternodeSignature, strError)) {
             // could be a signature in old format
             std::string strMessage = txHash.ToString() + outpoint.ToStringShort();
-        if(!CMessageSigner::VerifyMessage(infoMn.keyIDOperator, vchMasternodeSignature, strMessage, strError)) {
+        if (!CMessageSigner::VerifyMessage(infoMn.keyIDOperator, vchMasternodeSignature, strMessage, strError)) {
                 // nope, not in old format either
                 LogPrintf("CTxLockVote::CheckSignature -- VerifyMessage() failed, error: %s\n", strError);
                 return false;
@@ -1083,7 +1085,7 @@ bool CTxLockVote::CheckSignature() const
         }
     } else {
         std::string strMessage = txHash.ToString() + outpoint.ToStringShort();
-        if(!CMessageSigner::VerifyMessage(infoMn.keyIDOperator, vchMasternodeSignature, strMessage, strError)) {
+        if (!CMessageSigner::VerifyMessage(infoMn.keyIDOperator, vchMasternodeSignature, strMessage, strError)) {
             LogPrintf("CTxLockVote::CheckSignature -- VerifyMessage() failed, error: %s\n", strError);
             return false;
         }
@@ -1099,7 +1101,7 @@ bool CTxLockVote::Sign()
     if (sporkManager.IsSporkActive(SPORK_6_NEW_SIGS)) {
         uint256 hash = GetSignatureHash();
 
-        if(!CHashSigner::SignHash(hash, activeMasternodeInfo.keyOperator, vchMasternodeSignature)) {
+        if (!CHashSigner::SignHash(hash, activeMasternodeInfo.keyOperator, vchMasternodeSignature)) {
             LogPrintf("CTxLockVote::Sign -- SignHash() failed\n");
             return false;
         }
@@ -1111,12 +1113,12 @@ bool CTxLockVote::Sign()
     } else {
         std::string strMessage = txHash.ToString() + outpoint.ToStringShort();
 
-        if(!CMessageSigner::SignMessage(strMessage, vchMasternodeSignature, activeMasternodeInfo.keyOperator)) {
+        if (!CMessageSigner::SignMessage(strMessage, vchMasternodeSignature, activeMasternodeInfo.keyOperator)) {
             LogPrintf("CTxLockVote::Sign -- SignMessage() failed\n");
             return false;
         }
 
-        if(!CMessageSigner::VerifyMessage(activeMasternodeInfo.keyIDOperator, vchMasternodeSignature, strMessage, strError)) {
+        if (!CMessageSigner::VerifyMessage(activeMasternodeInfo.keyIDOperator, vchMasternodeSignature, strMessage, strError)) {
             LogPrintf("CTxLockVote::Sign -- VerifyMessage() failed, error: %s\n", strError);
             return false;
         }
@@ -1129,10 +1131,11 @@ void CTxLockVote::Relay(CConnman& connman) const
 {
     CInv inv(MSG_TXLOCK_VOTE, GetHash());
     CTxLockRequest request;
-    if(instantsend.GetTxLockRequest(txHash, request))
+    if (instantsend.GetTxLockRequest(txHash, request)) {
         connman.RelayInvFiltered(inv, *request.tx);
-    else
+    } else {
         connman.RelayInv(inv);
+    }
 }
 
 bool CTxLockVote::IsExpired(int nHeight) const
@@ -1193,23 +1196,23 @@ void CTxLockCandidate::AddOutPointLock(const COutPoint& outpoint)
 void CTxLockCandidate::MarkOutpointAsAttacked(const COutPoint& outpoint)
 {
     std::map<COutPoint, COutPointLock>::iterator it = mapOutPointLocks.find(outpoint);
-    if(it != mapOutPointLocks.end())
+    if (it != mapOutPointLocks.end())
         it->second.MarkAsAttacked();
 }
 
 bool CTxLockCandidate::AddVote(const CTxLockVote& vote)
 {
     std::map<COutPoint, COutPointLock>::iterator it = mapOutPointLocks.find(vote.GetOutpoint());
-    if(it == mapOutPointLocks.end()) return false;
+    if (it == mapOutPointLocks.end()) return false;
     return it->second.AddVote(vote);
 }
 
 bool CTxLockCandidate::IsAllOutPointsReady() const
 {
-    if(mapOutPointLocks.empty()) return false;
+    if (mapOutPointLocks.empty()) return false;
 
     for (const auto& pair : mapOutPointLocks) {
-        if(!pair.second.IsReady()) return false;
+        if (!pair.second.IsReady()) return false;
     }
     return true;
 }

From 89f744d0640f85604f2e36c6eeee6db9cd80dbf9 Mon Sep 17 00:00:00 2001
From: Nathan Marley <nathan.marley@gmail.com>
Date: Thu, 11 Oct 2018 07:33:48 -0700
Subject: [PATCH 182/400] pack of small cleanup fixes / optimizations (#2334)

* remove vector, extra loop in cleanup function

This commit removes 2 loops and a vector which I don't believe are necessary in
CMasternode::FlagGovernanceItemsAsDirty. I could be missing something, but
can't think of any good reason why this was implemented this way.

* use range operator to range over vectors

* remove deprecated wire message types

* mn: simplify govobj map mgmt a bit

* remove extra semicolons

* invert if/else condition and drop else

* remove if/else logic from Qt

This is the entire purpose of the Get<X>String methods on MNP class.

* Revert "remove deprecated wire message types"

This reverts commit 9de88a3fda999555c00cb829d60e322b2fd3800d.

* Revert "remove if/else logic from Qt"

This reverts commit c0f43c9b85274b13a3ac9625775817bc5b53bb9d.
---
 src/governance.cpp         | 20 ++++++++------------
 src/masternode.cpp         | 28 ++++++++--------------------
 src/masternodeman.h        |  2 +-
 src/privatesend-client.cpp |  2 +-
 src/qt/masternodelist.cpp  |  5 +----
 5 files changed, 19 insertions(+), 38 deletions(-)

diff --git a/src/governance.cpp b/src/governance.cpp
index 9b30e9cec220..e0586362bdef 100644
--- a/src/governance.cpp
+++ b/src/governance.cpp
@@ -270,9 +270,8 @@ void CGovernanceManager::CheckOrphanVotes(CGovernanceObject& govobj, CGovernance
     ScopedLockBool guard(cs, fRateChecksEnabled, false);
 
     int64_t nNow = GetAdjustedTime();
-    for (size_t i = 0; i < vecVotePairs.size(); ++i) {
+    for (auto& pairVote : vecVotePairs) {
         bool fRemove = false;
-        vote_time_pair_t& pairVote = vecVotePairs[i];
         CGovernanceVote& vote = pairVote.first;
         CGovernanceException exception;
         if (pairVote.second < nNow) {
@@ -368,8 +367,8 @@ void CGovernanceManager::UpdateCachesAndClean()
 
     LOCK2(cs_main, cs);
 
-    for (size_t i = 0; i < vecDirtyHashes.size(); ++i) {
-        object_m_it it = mapObjects.find(vecDirtyHashes[i]);
+    for (const uint256& nHash : vecDirtyHashes) {
+        object_m_it it = mapObjects.find(nHash);
         if (it == mapObjects.end()) {
             continue;
         }
@@ -1018,8 +1017,8 @@ void CGovernanceManager::RequestGovernanceObject(CNode* pfrom, const uint256& nH
             filter = CBloomFilter(Params().GetConsensus().nGovernanceFilterElements, GOVERNANCE_FILTER_FP_RATE, GetRandInt(999999), BLOOM_UPDATE_ALL);
             std::vector<CGovernanceVote> vecVotes = pObj->GetVoteFile().GetVotes();
             nVoteCount = vecVotes.size();
-            for (size_t i = 0; i < vecVotes.size(); ++i) {
-                filter.insert(vecVotes[i].GetHash());
+            for (const auto& vote : vecVotes) {
+                filter.insert(vote.GetHash());
             }
         }
     }
@@ -1296,8 +1295,7 @@ void CGovernanceManager::RequestOrphanObjects(CConnman& connman)
         std::vector<uint256> vecHashes;
         LOCK(cs);
         cmmapOrphanVotes.GetKeys(vecHashes);
-        for (size_t i = 0; i < vecHashes.size(); ++i) {
-            const uint256& nHash = vecHashes[i];
+        for (const uint256& nHash : vecHashes) {
             if (mapObjects.find(nHash) == mapObjects.end()) {
                 vecHashesFiltered.push_back(nHash);
             }
@@ -1305,10 +1303,8 @@ void CGovernanceManager::RequestOrphanObjects(CConnman& connman)
     }
 
     LogPrint("gobject", "CGovernanceObject::RequestOrphanObjects -- number objects = %d\n", vecHashesFiltered.size());
-    for (size_t i = 0; i < vecHashesFiltered.size(); ++i) {
-        const uint256& nHash = vecHashesFiltered[i];
-        for (size_t j = 0; j < vNodesCopy.size(); ++j) {
-            CNode* pnode = vNodesCopy[j];
+    for (const uint256& nHash : vecHashesFiltered) {
+        for (CNode* pnode : vNodesCopy) {
             if (pnode->fMasternode) {
                 continue;
             }
diff --git a/src/masternode.cpp b/src/masternode.cpp
index f8215e6818ad..6dad0e224d31 100644
--- a/src/masternode.cpp
+++ b/src/masternode.cpp
@@ -993,20 +993,16 @@ std::string CMasternodePing::GetDaemonString() const
 
 void CMasternode::AddGovernanceVote(uint256 nGovernanceObjectHash)
 {
-    if(mapGovernanceObjectsVotedOn.count(nGovernanceObjectHash)) {
-        mapGovernanceObjectsVotedOn[nGovernanceObjectHash]++;
-    } else {
-        mapGovernanceObjectsVotedOn.insert(std::make_pair(nGovernanceObjectHash, 1));
-    }
+    // Insert a zero value, or not. Then increment the value regardless. This
+    // ensures the value is in the map.
+    const auto& pair = mapGovernanceObjectsVotedOn.emplace(nGovernanceObjectHash, 0);
+    pair.first->second++;
 }
 
 void CMasternode::RemoveGovernanceObject(uint256 nGovernanceObjectHash)
 {
-    std::map<uint256, int>::iterator it = mapGovernanceObjectsVotedOn.find(nGovernanceObjectHash);
-    if(it == mapGovernanceObjectsVotedOn.end()) {
-        return;
-    }
-    mapGovernanceObjectsVotedOn.erase(it);
+    // Whether or not the govobj hash exists in the map first is irrelevant.
+    mapGovernanceObjectsVotedOn.erase(nGovernanceObjectHash);
 }
 
 /**
@@ -1017,15 +1013,7 @@ void CMasternode::RemoveGovernanceObject(uint256 nGovernanceObjectHash)
 */
 void CMasternode::FlagGovernanceItemsAsDirty()
 {
-    std::vector<uint256> vecDirty;
-    {
-        std::map<uint256, int>::iterator it = mapGovernanceObjectsVotedOn.begin();
-        while(it != mapGovernanceObjectsVotedOn.end()) {
-            vecDirty.push_back(it->first);
-            ++it;
-        }
-    }
-    for(size_t i = 0; i < vecDirty.size(); ++i) {
-        mnodeman.AddDirtyGovernanceObjectHash(vecDirty[i]);
+    for (auto& govObjHashPair : mapGovernanceObjectsVotedOn) {
+        mnodeman.AddDirtyGovernanceObjectHash(govObjHashPair.first);
     }
 }
diff --git a/src/masternodeman.h b/src/masternodeman.h
index 41f3383c0633..750ba90978a0 100644
--- a/src/masternodeman.h
+++ b/src/masternodeman.h
@@ -226,7 +226,7 @@ class CMasternodeMan
         LOCK(cs);
         std::vector<uint256> vecTmp = vecDirtyGovernanceObjectHashes;
         vecDirtyGovernanceObjectHashes.clear();
-        return vecTmp;;
+        return vecTmp;
     }
 
     bool IsSentinelPingActive();
diff --git a/src/privatesend-client.cpp b/src/privatesend-client.cpp
index 48ef4decec7b..b3668b302e73 100644
--- a/src/privatesend-client.cpp
+++ b/src/privatesend-client.cpp
@@ -305,7 +305,7 @@ std::string CPrivateSendClientSession::GetStatus(bool fWaitForBlock)
             if(     nStatusMessageProgress % 70 <= 30) strSuffix = ".";
             else if(nStatusMessageProgress % 70 <= 50) strSuffix = "..";
             else if(nStatusMessageProgress % 70 <= 70) strSuffix = "...";
-            return strprintf(_("Submitted to masternode, waiting in queue %s"), strSuffix);;
+            return strprintf(_("Submitted to masternode, waiting in queue %s"), strSuffix);
         case POOL_STATE_ACCEPTING_ENTRIES:
             if(nEntriesCount == 0) {
                 nStatusMessageProgress = 0;
diff --git a/src/qt/masternodelist.cpp b/src/qt/masternodelist.cpp
index 266a143351a4..ce8e19784faa 100644
--- a/src/qt/masternodelist.cpp
+++ b/src/qt/masternodelist.cpp
@@ -474,10 +474,7 @@ void MasternodeList::ShowQRCode(std::string strAlias) {
     bool fFound = false;
 
     for (const auto& mne : masternodeConfig.getEntries()) {
-        if (strAlias != mne.getAlias()) {
-            continue;
-        }
-        else {
+        if (strAlias == mne.getAlias()) {
             strMNPrivKey = mne.getPrivKey();
             strCollateral = mne.getTxHash() + "-" + mne.getOutputIndex();
             strIP = mne.getIp();

From bed1ded8be424f4778fceb27972128be3f9ce48b Mon Sep 17 00:00:00 2001
From: Spencer Lievens <36229929+Duality-CDOO@users.noreply.github.com>
Date: Thu, 11 Oct 2018 16:34:03 +0200
Subject: [PATCH 183/400] Remove duplicated check (#2336)

---
 src/wallet/wallet.cpp | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
index 53546d8e2220..b37363b5cbf5 100644
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -2609,11 +2609,6 @@ void CWallet::AvailableCoins(std::vector<COutput>& vCoins, bool fOnlyConfirmed,
             if (nDepth == 0 && !pcoin->InMempool())
                 continue;
 
-            // We should not consider coins which aren't at least in our mempool
-            // It's possible for these to be conflicted via ancestors which we may never be able to detect
-            if (nDepth == 0 && !pcoin->InMempool())
-                continue;
-
             for (unsigned int i = 0; i < pcoin->tx->vout.size(); i++) {
                 bool found = false;
                 if(nCoinType == ONLY_DENOMINATED) {

From 43e757bee5ac8e0b112b31ba202ef1d78c506a90 Mon Sep 17 00:00:00 2001
From: Spencer Lievens <36229929+Duality-CDOO@users.noreply.github.com>
Date: Thu, 11 Oct 2018 16:34:52 +0200
Subject: [PATCH 184/400] Amend SERIALIZATION_VERSION_STRING string for spork
 cache (#2339)

---
 src/spork.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/spork.cpp b/src/spork.cpp
index ad67ec6933e6..0dbb4a387271 100644
--- a/src/spork.cpp
+++ b/src/spork.cpp
@@ -15,7 +15,7 @@
 
 CSporkManager sporkManager;
 
-const std::string CSporkManager::SERIALIZATION_VERSION_STRING = "CMasternodeMan-Version-2";
+const std::string CSporkManager::SERIALIZATION_VERSION_STRING = "CSporkManager-Version-2";
 
 std::map<int, int64_t> mapSporkDefaults = {
     {SPORK_2_INSTANTSEND_ENABLED,            0},             // ON

From 9c8e4ac76bbe4eb4d7353f16f8c298ad40305da9 Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Fri, 12 Oct 2018 19:39:17 +0200
Subject: [PATCH 185/400] Move bls stuff from crypto/ to bls/

---
 src/Makefile.am                    | 12 ++++++------
 src/bench/bench_dash.cpp           |  2 +-
 src/bench/bls.cpp                  |  2 +-
 src/bench/bls_dkg.cpp              |  2 +-
 src/{crypto => bls}/bls.cpp        |  0
 src/{crypto => bls}/bls.h          |  0
 src/{crypto => bls}/bls_ies.cpp    |  2 +-
 src/{crypto => bls}/bls_ies.h      |  0
 src/{crypto => bls}/bls_worker.cpp |  0
 src/{crypto => bls}/bls_worker.h   |  0
 src/init.cpp                       |  2 +-
 11 files changed, 11 insertions(+), 11 deletions(-)
 rename src/{crypto => bls}/bls.cpp (100%)
 rename src/{crypto => bls}/bls.h (100%)
 rename src/{crypto => bls}/bls_ies.cpp (99%)
 rename src/{crypto => bls}/bls_ies.h (100%)
 rename src/{crypto => bls}/bls_worker.cpp (100%)
 rename src/{crypto => bls}/bls_worker.h (100%)

diff --git a/src/Makefile.am b/src/Makefile.am
index f441a77e9776..8cbd73d0f3f2 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -314,8 +314,6 @@ crypto_libdash_crypto_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) $(PIC_FLAGS)
 crypto_libdash_crypto_a_SOURCES = \
   crypto/aes.cpp \
   crypto/aes.h \
-  crypto/bls.cpp \
-  crypto/bls.h \
   crypto/common.h \
   crypto/hmac_sha256.cpp \
   crypto/hmac_sha256.h \
@@ -364,6 +362,8 @@ libdash_consensus_a_SOURCES = \
   amount.h \
   arith_uint256.cpp \
   arith_uint256.h \
+  bls/bls.cpp \
+  bls/bls.h \
   consensus/merkle.cpp \
   consensus/merkle.h \
   consensus/params.h \
@@ -422,10 +422,10 @@ libdash_common_a_SOURCES = \
 libdash_util_a_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES)
 libdash_util_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS)
 libdash_util_a_SOURCES = \
-  crypto/bls_ies.cpp \
-  crypto/bls_ies.h \
-  crypto/bls_worker.cpp \
-  crypto/bls_worker.h \
+  bls/bls_ies.cpp \
+  bls/bls_ies.h \
+  bls/bls_worker.cpp \
+  bls/bls_worker.h \
   support/lockedpool.cpp \
   chainparamsbase.cpp \
   clientversion.cpp \
diff --git a/src/bench/bench_dash.cpp b/src/bench/bench_dash.cpp
index 533ae7194c56..a1d208502470 100644
--- a/src/bench/bench_dash.cpp
+++ b/src/bench/bench_dash.cpp
@@ -8,7 +8,7 @@
 #include "validation.h"
 #include "util.h"
 
-#include "crypto/bls.h"
+#include "bls/bls.h"
 
 void CleanupBLSTests();
 void CleanupBLSDkgTests();
diff --git a/src/bench/bls.cpp b/src/bench/bls.cpp
index 04c0665b8c7a..f3bf97fc3623 100644
--- a/src/bench/bls.cpp
+++ b/src/bench/bls.cpp
@@ -4,7 +4,7 @@
 
 #include "bench.h"
 #include "random.h"
-#include "crypto/bls_worker.h"
+#include "bls/bls_worker.h"
 #include "utiltime.h"
 
 #include <iostream>
diff --git a/src/bench/bls_dkg.cpp b/src/bench/bls_dkg.cpp
index d2ffd8f579eb..e6e473e2c7e5 100644
--- a/src/bench/bls_dkg.cpp
+++ b/src/bench/bls_dkg.cpp
@@ -4,7 +4,7 @@
 
 #include "bench.h"
 #include "random.h"
-#include "crypto/bls_worker.h"
+#include "bls/bls_worker.h"
 
 extern CBLSWorker blsWorker;
 
diff --git a/src/crypto/bls.cpp b/src/bls/bls.cpp
similarity index 100%
rename from src/crypto/bls.cpp
rename to src/bls/bls.cpp
diff --git a/src/crypto/bls.h b/src/bls/bls.h
similarity index 100%
rename from src/crypto/bls.h
rename to src/bls/bls.h
diff --git a/src/crypto/bls_ies.cpp b/src/bls/bls_ies.cpp
similarity index 99%
rename from src/crypto/bls_ies.cpp
rename to src/bls/bls_ies.cpp
index 7212692ec486..2c67b9737892 100644
--- a/src/crypto/bls_ies.cpp
+++ b/src/bls/bls_ies.cpp
@@ -8,7 +8,7 @@
 #include "random.h"
 #include "streams.h"
 
-#include "aes.h"
+#include "crypto/aes.h"
 
 template <typename Out>
 static bool EncryptBlob(const void* in, size_t inSize, Out& out, const void* symKey, const void* iv)
diff --git a/src/crypto/bls_ies.h b/src/bls/bls_ies.h
similarity index 100%
rename from src/crypto/bls_ies.h
rename to src/bls/bls_ies.h
diff --git a/src/crypto/bls_worker.cpp b/src/bls/bls_worker.cpp
similarity index 100%
rename from src/crypto/bls_worker.cpp
rename to src/bls/bls_worker.cpp
diff --git a/src/crypto/bls_worker.h b/src/bls/bls_worker.h
similarity index 100%
rename from src/crypto/bls_worker.h
rename to src/bls/bls_worker.h
diff --git a/src/init.cpp b/src/init.cpp
index 88e64ddaa1e3..2dd8e1926b36 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -72,7 +72,7 @@
 #include <stdio.h>
 #include <memory>
 
-#include "crypto/bls.h"
+#include "bls/bls.h"
 
 #ifndef WIN32
 #include <signal.h>

From 46419169849e5a7f481746a578a8dd463639ab04 Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Fri, 12 Oct 2018 19:39:34 +0200
Subject: [PATCH 186/400] Review fixes

---
 src/bench/bls.cpp | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/bench/bls.cpp b/src/bench/bls.cpp
index f3bf97fc3623..8127c2935a08 100644
--- a/src/bench/bls.cpp
+++ b/src/bench/bls.cpp
@@ -179,10 +179,8 @@ static void BLSVerify_LargeAggregatedBlock(size_t txCount, benchmark::State& sta
     CBLSSignature aggSig = CBLSSignature::AggregateInsecure(sigs);
 
     // Benchmark.
-    size_t i = 0;
     while (state.KeepRunning()) {
         aggSig.VerifyInsecureAggregated(pubKeys, msgHashes);
-        i = (i + 1) % pubKeys.size();
     }
 }
 
@@ -218,7 +216,6 @@ static void BLSVerify_LargeAggregatedBlock1000PreVerified(benchmark::State& stat
     }
 
     // Benchmark.
-    size_t i = 0;
     while (state.KeepRunning()) {
         BLSPublicKeyVector nonvalidatedPubKeys;
         std::vector<uint256> nonvalidatedHashes;
@@ -240,7 +237,6 @@ static void BLSVerify_LargeAggregatedBlock1000PreVerified(benchmark::State& stat
 
         bool valid = aggSigCopy.VerifyInsecureAggregated(nonvalidatedPubKeys, nonvalidatedHashes);
         assert(valid);
-        i = (i + 1) % pubKeys.size();
     }
 }
 

From b99d94a0f4d70e3cf021844a3cd0a1aa5e992da6 Mon Sep 17 00:00:00 2001
From: InhumanPerfection <39734219+InhumanPerfection@users.noreply.github.com>
Date: Mon, 15 Oct 2018 14:53:38 +0300
Subject: [PATCH 187/400] Minor build documentation updates (#2343)

* update fedora required packages

* fix ccache path

* fix formatting

* glibc back compat
---
 doc/build-generic.md |  4 +++-
 doc/build-unix.md    | 12 ++++++------
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/doc/build-generic.md b/doc/build-generic.md
index 3e6c6ae9086b..d1ae09a1de2a 100644
--- a/doc/build-generic.md
+++ b/doc/build-generic.md
@@ -56,6 +56,8 @@ Please replace `<host>` with your local system's `host-platform-triplet`. The fo
 If you want to cross-compile for another platform, choose the appropriate `<host>` and make sure to build the
 dependencies with the same host before.
 
+If you want to build for the same host but different distro, add `--enable-glibc-back-compat` when calling `./configure`.
+
 
 ccache
 ------
@@ -67,7 +69,7 @@ The default maximum cache size is 5G, which might not be enough to cache multipl
 very often. It is advised to increase the maximum cache size:
 
 ```bash
-$ ./depends/<host>/bin/ccache -M20G
+$ ./depends/<host>/native/bin/ccache -M20G
 ```
 
 Additional Configure Flags
diff --git a/doc/build-unix.md b/doc/build-unix.md
index 95ead44f647a..8cce23b8b376 100644
--- a/doc/build-unix.md
+++ b/doc/build-unix.md
@@ -10,22 +10,22 @@ Building the dependencies and Dash Core requires some essential build tools and
 
 Run the following commands to install required packages:
 
-#####Debian/Ubuntu:
+##### Debian/Ubuntu:
 ```bash
 $ sudo apt-get install curl build-essential libtool autotools-dev automake pkg-config python3 bsdmainutils cmake
 ```
 
-#####Fedora:
+##### Fedora:
 ```bash
-$ sudo dnf install gcc-c++ libtool make autoconf automake python3 cmake
+$ sudo dnf install gcc-c++ libtool make autoconf automake python3 cmake libstdc++-static patch
 ```
 
-#####Arch Linux
+##### Arch Linux:
 ```bash
 $ pacman -S base-devel python3 cmake
 ```
 
-#####FreeBSD/OpenBSD
+##### FreeBSD/OpenBSD:
 ```bash
 pkg_add gmake cmake libtool
 pkg_add autoconf # (select highest version, e.g. 2.69)
@@ -141,4 +141,4 @@ $ export AUTOMAKE_VERSION=1.15 # replace this with the automake version that you
 $ ./autogen.sh
 $ ./configure --prefix=<prefix> CC=egcc CXX=eg++ CPP=ecpp
 $ gmake # do not use -jX, this is broken
-```
\ No newline at end of file
+```

From f7b0b57596a679489b3fe0cceab24cdc95532565 Mon Sep 17 00:00:00 2001
From: UdjinM6 <UdjinM6@users.noreply.github.com>
Date: Mon, 15 Oct 2018 14:58:47 +0300
Subject: [PATCH 188/400] Pick rounds with the most inputs available to mix
 first (#2278)

* Alternative solution: pick rounds with the most inputs available to mix first

* randomly skip some inputs when we have at least one of this denom already

* More randomization in PrepareDenominate

* fix `vecSteps[nBit] >= 1 ?` and adjust speed/privacy ratio for more speed i.e. `GetRandInt(5) == 0`

* fix typos

* no comments
---
 src/privatesend-client.cpp | 80 +++++++++++++++++++++-----------------
 src/privatesend-client.h   |  2 +-
 2 files changed, 45 insertions(+), 37 deletions(-)

diff --git a/src/privatesend-client.cpp b/src/privatesend-client.cpp
index b3668b302e73..c82ab9266098 100644
--- a/src/privatesend-client.cpp
+++ b/src/privatesend-client.cpp
@@ -1167,17 +1167,6 @@ void CPrivateSendClientManager::ProcessPendingDsaRequest(CConnman& connman)
 
 bool CPrivateSendClientSession::SubmitDenominate(CConnman& connman)
 {
-    // This is just a local helper
-    auto GetStartRound = [](bool fMixLowest, bool fScanFromTheMiddle) -> int
-    {
-        if (fScanFromTheMiddle) {
-            return privateSendClient.nPrivateSendRounds / 2;
-        } else if (!fMixLowest) {
-            return privateSendClient.nPrivateSendRounds - 1;
-        }
-        return 0;
-    };
-
     LOCK2(cs_main, pwalletMain->cs_wallet);
 
     std::string strError;
@@ -1188,28 +1177,36 @@ bool CPrivateSendClientSession::SubmitDenominate(CConnman& connman)
         return false;
     }
 
-    // lean towards "highest" branch but still mix via "lowest" one someties
-    bool fMixLowest = privateSendClient.nLiquidityProvider || (GetRandInt(4) == 0);
-    // Try to use only inputs with the same number of rounds, from low to high, or vice versa
-    int nLoopStep = fMixLowest ? 1 : -1;
-    // lean towards edges but still mix starting from the middle someties
-    // Note: liqudity providers always start from 0
-    bool fScanFromTheMiddle = (privateSendClient.nLiquidityProvider == 0) && (GetRandInt(4) == 0);
-
-    int nRoundStart = GetStartRound(fMixLowest, fScanFromTheMiddle);
-    int nRoundEdge = GetStartRound(fMixLowest, false);
+    std::vector< std::pair<int, size_t> > vecInputsByRounds;
+    // Note: liquidity providers are fine with whatever number of inputs they've got
+    bool fDryRun = privateSendClient.nLiquidityProvider == 0;
 
-    // Submit transaction to the pool if we get here
-    while (true) {
-        for (int i = nRoundStart; i >= 0 && i < privateSendClient.nPrivateSendRounds; i += nLoopStep) {
-            if (PrepareDenominate(i, i, strError, vecPSInOutPairs, vecPSInOutPairsTmp)) {
-                LogPrintf("CPrivateSendClientSession::SubmitDenominate -- Running PrivateSend denominate for %d rounds, success\n", i);
+    for (int i = 0; i < privateSendClient.nPrivateSendRounds; i++) {
+        if (PrepareDenominate(i, i, strError, vecPSInOutPairs, vecPSInOutPairsTmp, fDryRun)) {
+            LogPrintf("CPrivateSendClientSession::SubmitDenominate -- Running PrivateSend denominate for %d rounds, success\n", i);
+            if (!fDryRun) {
                 return SendDenominate(vecPSInOutPairsTmp, connman);
             }
+            vecInputsByRounds.emplace_back(i, vecPSInOutPairsTmp.size());
+        } else {
             LogPrint("privatesend", "CPrivateSendClientSession::SubmitDenominate -- Running PrivateSend denominate for %d rounds, error: %s\n", i, strError);
         }
-        if (nRoundStart == nRoundEdge) break;
-        nRoundStart = nRoundEdge;
+    }
+
+    // more inputs first, for equal input count prefer the one with less rounds
+    std::sort(vecInputsByRounds.begin(), vecInputsByRounds.end(), [](const auto& a, const auto& b) {
+        return a.second > b.second || (a.second == b.second && a.first < b.first);
+    });
+
+    LogPrint("privatesend", "vecInputsByRounds for denom %d\n", nSessionDenom);
+    for (const auto& pair : vecInputsByRounds) {
+        LogPrint("privatesend", "vecInputsByRounds: rounds: %d, inputs: %d\n", pair.first, pair.second);
+    }
+
+    int nRounds = vecInputsByRounds.begin()->first;
+    if (PrepareDenominate(nRounds, nRounds, strError, vecPSInOutPairs, vecPSInOutPairsTmp)) {
+        LogPrintf("CPrivateSendClientSession::SubmitDenominate -- Running PrivateSend denominate for %d rounds, success\n", nRounds);
+        return SendDenominate(vecPSInOutPairsTmp, connman);
     }
 
     // We failed? That's strange but let's just make final attempt and try to mix everything
@@ -1259,7 +1256,7 @@ bool CPrivateSendClientSession::SelectDenominate(std::string& strErrorRet, std::
     return true;
 }
 
-bool CPrivateSendClientSession::PrepareDenominate(int nMinRounds, int nMaxRounds, std::string& strErrorRet, const std::vector< std::pair<CTxDSIn, CTxOut> >& vecPSInOutPairsIn, std::vector< std::pair<CTxDSIn, CTxOut> >& vecPSInOutPairsRet)
+bool CPrivateSendClientSession::PrepareDenominate(int nMinRounds, int nMaxRounds, std::string& strErrorRet, const std::vector< std::pair<CTxDSIn, CTxOut> >& vecPSInOutPairsIn, std::vector< std::pair<CTxDSIn, CTxOut> >& vecPSInOutPairsRet, bool fDryRun)
 {
     std::vector<int> vecBits;
     if (!CPrivateSend::GetDenominationsBits(nSessionDenom, vecBits)) {
@@ -1271,16 +1268,15 @@ bool CPrivateSendClientSession::PrepareDenominate(int nMinRounds, int nMaxRounds
         pwalletMain->LockCoin(pair.first.prevout);
     }
 
-    // Try to add every needed denomination, repeat up to 5-PRIVATESEND_ENTRY_MAX_SIZE times.
     // NOTE: No need to randomize order of inputs because they were
     // initially shuffled in CWallet::SelectPSInOutPairsByDenominations already.
-    int nStepsMax = 5 + GetRandInt(PRIVATESEND_ENTRY_MAX_SIZE - 5 + 1);
     int nDenomResult{0};
 
     std::vector<CAmount> vecStandardDenoms = CPrivateSend::GetStandardDenominations();
     std::vector<int> vecSteps(vecStandardDenoms.size(), 0);
     vecPSInOutPairsRet.clear();
 
+    // Try to add up to PRIVATESEND_ENTRY_MAX_SIZE of every needed denomination
     for (const auto& pair: vecPSInOutPairsIn) {
         if (pair.second.nRounds < nMinRounds || pair.second.nRounds > nMaxRounds) {
             // unlock unused coins
@@ -1289,10 +1285,23 @@ bool CPrivateSendClientSession::PrepareDenominate(int nMinRounds, int nMaxRounds
         }
         bool fFound = false;
         for (const auto& nBit : vecBits) {
-            if (vecSteps[nBit] >= nStepsMax) break;
+            if (vecSteps[nBit] >= PRIVATESEND_ENTRY_MAX_SIZE) break;
             CAmount nValueDenom = vecStandardDenoms[nBit];
             if (pair.second.nValue == nValueDenom) {
-                CScript scriptDenom = keyHolderStorage.AddKey(pwalletMain);
+                CScript scriptDenom;
+                if (fDryRun) {
+                    scriptDenom = CScript();
+                } else {
+                    // randomly skip some inputs when we have at least one of the same denom already
+                    // TODO: make it adjustable via options/cmd-line params
+                    if (vecSteps[nBit] >= 1 && GetRandInt(5) == 0) {
+                        // still count it as a step to randomize number of inputs
+                        // if we have more than (or exactly) PRIVATESEND_ENTRY_MAX_SIZE of them
+                        ++vecSteps[nBit];
+                        break;
+                    }
+                    scriptDenom = keyHolderStorage.AddKey(pwalletMain);
+                }
                 vecPSInOutPairsRet.emplace_back(pair.first, CTxOut(nValueDenom, scriptDenom));
                 fFound = true;
                 nDenomResult |= 1 << nBit;
@@ -1301,8 +1310,8 @@ bool CPrivateSendClientSession::PrepareDenominate(int nMinRounds, int nMaxRounds
                 break;
             }
         }
-        if (!fFound) {
-            // unlock unused coins
+        if (!fFound || fDryRun) {
+            // unlock unused coins and if we are not going to mix right away
             pwalletMain->UnlockCoin(pair.first.prevout);
         }
     }
@@ -1317,7 +1326,6 @@ bool CPrivateSendClientSession::PrepareDenominate(int nMinRounds, int nMaxRounds
         return false;
     }
 
-    // We also do not care about full amount as long as we have right denominations
     return true;
 }
 
diff --git a/src/privatesend-client.h b/src/privatesend-client.h
index c63f39754096..7e9d7d8ee088 100644
--- a/src/privatesend-client.h
+++ b/src/privatesend-client.h
@@ -110,7 +110,7 @@ class CPrivateSendClientSession : public CPrivateSendBaseSession
     /// step 0: select denominated inputs and txouts
     bool SelectDenominate(std::string& strErrorRet, std::vector< std::pair<CTxDSIn, CTxOut> >& vecPSInOutPairsRet);
     /// step 1: prepare denominated inputs and outputs
-    bool PrepareDenominate(int nMinRounds, int nMaxRounds, std::string& strErrorRet, const std::vector< std::pair<CTxDSIn, CTxOut> >& vecPSInOutPairsIn, std::vector< std::pair<CTxDSIn, CTxOut> >& vecPSInOutPairsRet);
+    bool PrepareDenominate(int nMinRounds, int nMaxRounds, std::string& strErrorRet, const std::vector< std::pair<CTxDSIn, CTxOut> >& vecPSInOutPairsIn, std::vector< std::pair<CTxDSIn, CTxOut> >& vecPSInOutPairsRet, bool fDryRun = false);
     /// step 2: send denominated inputs and outputs prepared in step 1
     bool SendDenominate(const std::vector< std::pair<CTxDSIn, CTxOut> >& vecPSInOutPairsIn, CConnman& connman);
 

From 90ad75911a0dd12be01e5a7cbc4fa2acfcf27189 Mon Sep 17 00:00:00 2001
From: UdjinM6 <UdjinM6@users.noreply.github.com>
Date: Mon, 15 Oct 2018 14:59:57 +0300
Subject: [PATCH 189/400] Fix auto-IS and tests (#2331)

* fix CTxLockRequest::GetMinFee()

* Force regular IS txes to include MIN_FEE * n_inputs fee on creation regardless of auto-IS status

* set_autoix_spork_state should bump mocked time

* make sure IS fee matches the expected one

* turn off spork16 and test all types of txes again
---
 qa/rpc-tests/p2p-autoinstantsend.py | 13 +++++++++++++
 src/instantx.cpp                    |  6 +++---
 src/instantx.h                      |  2 +-
 src/qt/coincontroldialog.cpp        |  2 +-
 src/wallet/wallet.cpp               |  4 ++--
 5 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/qa/rpc-tests/p2p-autoinstantsend.py b/qa/rpc-tests/p2p-autoinstantsend.py
index fb3ca47d3c2b..4a52f3fef0ca 100755
--- a/qa/rpc-tests/p2p-autoinstantsend.py
+++ b/qa/rpc-tests/p2p-autoinstantsend.py
@@ -190,6 +190,8 @@ def get_autoix_spork_state(self):
         return info['SPORK_16_INSTANTSEND_AUTOLOCKS']
 
     def set_autoix_spork_state(self, state):
+        set_mocktime(get_mocktime() + 1)
+        set_node_times(self.nodes, get_mocktime())
         if state:
             value = 0
         else:
@@ -260,6 +262,10 @@ def check_IX_lock(self, txid):
     def send_regular_IX(self):
         receiver_addr = self.nodes[self.receiver_idx].getnewaddress()
         txid = self.nodes[0].instantsendtoaddress(receiver_addr, 1.0)
+        MIN_FEE = satoshi_round(-0.0001)
+        fee = self.nodes[0].gettransaction(txid)['fee']
+        expected_fee = MIN_FEE * len(self.nodes[0].getrawtransaction(txid, True)['vin'])
+        assert_equal(fee, expected_fee)
         return self.check_IX_lock(txid)
 
 
@@ -296,5 +302,12 @@ def run_test(self):
         assert(self.send_simple_tx())
         assert(not self.send_complex_tx())
 
+        self.set_autoix_spork_state(False)
+        assert(not self.get_autoix_spork_state())
+
+        assert(self.send_regular_IX())
+        assert(not self.send_simple_tx())
+        assert(not self.send_complex_tx())
+
 if __name__ == '__main__':
     AutoInstantSendTest().main()
diff --git a/src/instantx.cpp b/src/instantx.cpp
index ad5f1691fe0a..c67826b4978c 100644
--- a/src/instantx.cpp
+++ b/src/instantx.cpp
@@ -979,7 +979,7 @@ bool CTxLockRequest::IsValid() const
 
     CAmount nValueOut = tx->GetValueOut();
 
-    if (nValueIn - nValueOut < GetMinFee()) {
+    if (nValueIn - nValueOut < GetMinFee(false)) {
         LogPrint("instantsend", "CTxLockRequest::IsValid -- did not include enough fees in transaction: fees=%d, tx=%s", nValueOut - nValueIn, ToString());
         return false;
     }
@@ -987,9 +987,9 @@ bool CTxLockRequest::IsValid() const
     return true;
 }
 
-CAmount CTxLockRequest::GetMinFee() const
+CAmount CTxLockRequest::GetMinFee(bool fForceMinFee) const
 {
-    if (IsSimple()) {
+    if (!fForceMinFee && CInstantSend::CanAutoLock() && IsSimple()) {
         return CAmount();
     }
     CAmount nMinFee = MIN_FEE;
diff --git a/src/instantx.h b/src/instantx.h
index 72361c66212b..381c1c79936c 100644
--- a/src/instantx.h
+++ b/src/instantx.h
@@ -191,7 +191,7 @@ class CTxLockRequest
     }
 
     bool IsValid() const;
-    CAmount GetMinFee() const;
+    CAmount GetMinFee(bool fForceMinFee) const;
     int GetMaxSignatures() const;
 
     // checks if related transaction is "simple" to lock it automatically
diff --git a/src/qt/coincontroldialog.cpp b/src/qt/coincontroldialog.cpp
index df2611d46224..85c0062ad6db 100644
--- a/src/qt/coincontroldialog.cpp
+++ b/src/qt/coincontroldialog.cpp
@@ -569,7 +569,7 @@ void CoinControlDialog::updateLabels(WalletModel *model, QDialog* dialog)
             nPayFee = coinControl->nMinimumTotalFee;
 
         // InstantSend Fee
-        if (coinControl->fUseInstantSend) nPayFee = std::max(nPayFee, CTxLockRequest(txDummy).GetMinFee());
+        if (coinControl->fUseInstantSend) nPayFee = std::max(nPayFee, CTxLockRequest(txDummy).GetMinFee(true));
 
         // Allow free? (require at least hard-coded threshold and default to that if no estimate)
         double mempoolEstimatePriority = mempool.estimateSmartPriority(nTxConfirmTarget);
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
index b37363b5cbf5..27bfea7d94a9 100644
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -3408,7 +3408,7 @@ bool CWallet::ConvertList(std::vector<CTxIn> vecTxIn, std::vector<CAmount>& vecA
 bool CWallet::CreateTransaction(const std::vector<CRecipient>& vecSend, CWalletTx& wtxNew, CReserveKey& reservekey, CAmount& nFeeRet,
                                 int& nChangePosInOut, std::string& strFailReason, const CCoinControl* coinControl, bool sign, AvailableCoinsType nCoinType, bool fUseInstantSend, int nExtraPayloadSize)
 {
-    CAmount nFeePay = fUseInstantSend ? CTxLockRequest().GetMinFee() : 0;
+    CAmount nFeePay = fUseInstantSend ? CTxLockRequest().GetMinFee(true) : 0;
 
     CAmount nValue = 0;
     int nChangePosRequest = nChangePosInOut;
@@ -3751,7 +3751,7 @@ bool CWallet::CreateTransaction(const std::vector<CRecipient>& vecSend, CWalletT
                     nFeeNeeded = coinControl->nMinimumTotalFee;
                 }
                 if(fUseInstantSend) {
-                    nFeeNeeded = std::max(nFeeNeeded, CTxLockRequest(txNew).GetMinFee());
+                    nFeeNeeded = std::max(nFeeNeeded, CTxLockRequest(txNew).GetMinFee(true));
                 }
                 if (coinControl && coinControl->fOverrideFeeRate)
                     nFeeNeeded = coinControl->nFeeRate.GetFee(nBytes);

From 81d60bc2839fdb021bb171825b32351d2ba31256 Mon Sep 17 00:00:00 2001
From: gladcow <sergey@dash.org>
Date: Thu, 18 Oct 2018 16:24:30 +0300
Subject: [PATCH 190/400] Fix the issue with transaction amount precision in IS
 tests (#2353)

* fix issue with trx amounts precision in autoix-mempool.py

* fix issue with trx amounts precision in p2p-autoinstantsend.py

* fix issue with trx amounts precision in p2p-instantsend.py

* Rallback adding empty line

* Rallback adding empty line
---
 qa/rpc-tests/autoix-mempool.py      | 4 ++--
 qa/rpc-tests/p2p-autoinstantsend.py | 4 ++--
 qa/rpc-tests/p2p-instantsend.py     | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/qa/rpc-tests/autoix-mempool.py b/qa/rpc-tests/autoix-mempool.py
index 178ef1f2dfbf..c4f60db32a7f 100755
--- a/qa/rpc-tests/autoix-mempool.py
+++ b/qa/rpc-tests/autoix-mempool.py
@@ -228,8 +228,8 @@ def create_raw_trx(self, node_from, node_to, amount, min_inputs, max_inputs):
         change_address = node_from.getnewaddress()
         fee = 0.001
         outputs={}
-        outputs[receiver_address] = amount
-        outputs[change_address] = in_amount - amount - fee
+        outputs[receiver_address] = satoshi_round(amount)
+        outputs[change_address] = satoshi_round(in_amount - amount - fee)
         rawtx = node_from.createrawtransaction(inputs, outputs)
         return node_from.signrawtransaction(rawtx)
 
diff --git a/qa/rpc-tests/p2p-autoinstantsend.py b/qa/rpc-tests/p2p-autoinstantsend.py
index 4a52f3fef0ca..08792d9c03bd 100755
--- a/qa/rpc-tests/p2p-autoinstantsend.py
+++ b/qa/rpc-tests/p2p-autoinstantsend.py
@@ -239,8 +239,8 @@ def create_raw_trx(self, node_from, node_to, amount, min_inputs, max_inputs):
         change_address = node_from.getnewaddress()
         fee = 0.001
         outputs={}
-        outputs[receiver_address] = amount
-        outputs[change_address] = in_amount - amount - fee
+        outputs[receiver_address] = satoshi_round(amount)
+        outputs[change_address] = satoshi_round(in_amount - amount - fee)
         rawtx = node_from.createrawtransaction(inputs, outputs)
         return node_from.signrawtransaction(rawtx)
 
diff --git a/qa/rpc-tests/p2p-instantsend.py b/qa/rpc-tests/p2p-instantsend.py
index 33aaa755b6b0..29eb9efe0036 100755
--- a/qa/rpc-tests/p2p-instantsend.py
+++ b/qa/rpc-tests/p2p-instantsend.py
@@ -140,8 +140,8 @@ def create_raw_trx(self, node_from, node_to, amount):
         change_address = node_from.getnewaddress()
         fee = 0.001
         outputs={}
-        outputs[receiver_address] = amount
-        outputs[change_address] = in_amount - amount - fee
+        outputs[receiver_address] = satoshi_round(amount)
+        outputs[change_address] = satoshi_round(in_amount - amount - fee)
         rawtx = node_from.createrawtransaction(inputs, outputs)
         return node_from.signrawtransaction(rawtx)
 

From 11a0cbf84db4f0930da8510e2be06e2104fdbda3 Mon Sep 17 00:00:00 2001
From: gladcow <sergey@dash.org>
Date: Sat, 20 Oct 2018 17:08:02 +0300
Subject: [PATCH 191/400] InstantSend-related tests refactoring (#2333)

* create base class for dash-specific tests

* use common base class in p2p-autoinstantsend.py

* use common base class in p2p-instantsend.py

* rename check_IX_lock to wait_for_instantlock
---
 qa/rpc-tests/autoix-mempool.py                | 171 +---------------
 qa/rpc-tests/p2p-autoinstantsend.py           | 189 ++----------------
 qa/rpc-tests/p2p-instantsend.py               | 128 +-----------
 qa/rpc-tests/test_framework/test_framework.py | 176 +++++++++++++++-
 4 files changed, 202 insertions(+), 462 deletions(-)

diff --git a/qa/rpc-tests/autoix-mempool.py b/qa/rpc-tests/autoix-mempool.py
index c4f60db32a7f..77416f89c078 100755
--- a/qa/rpc-tests/autoix-mempool.py
+++ b/qa/rpc-tests/autoix-mempool.py
@@ -4,7 +4,7 @@
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 from test_framework.mininode import *
-from test_framework.test_framework import BitcoinTestFramework
+from test_framework.test_framework import DashTestFramework
 from test_framework.util import *
 from time import *
 
@@ -16,116 +16,17 @@
 
 '''
 
-MASTERNODE_COLLATERAL = 1000
 MAX_MEMPOOL_SIZE = 5 # max node mempool in MBs
 MB_SIZE = 1000000 # C++ code use this coefficient to calc MB in mempool
 AUTO_IX_MEM_THRESHOLD = 0.1
 
 
-class MasternodeInfo:
-    def __init__(self, key, collateral_id, collateral_out):
-        self.key = key
-        self.collateral_id = collateral_id
-        self.collateral_out = collateral_out
-
-
-class AutoIXMempoolTest(BitcoinTestFramework):
+class AutoIXMempoolTest(DashTestFramework):
     def __init__(self):
-        super().__init__()
-        self.mn_count = 10
-        self.num_nodes = self.mn_count + 3
-        self.mninfo = []
-        self.setup_clean_chain = True
-        self.is_network_split = False
-        # set sender,  receiver,  isolated nodes
+        super().__init__(13, 10, ["-maxmempool=%d" % MAX_MEMPOOL_SIZE])
+        # set sender,  receiver
         self.receiver_idx = self.num_nodes - 2
         self.sender_idx = self.num_nodes - 3
-        # additional args
-        self.extra_args = ["-maxmempool=%d" % MAX_MEMPOOL_SIZE]
-
-    def create_simple_node(self):
-        idx = len(self.nodes)
-        args = ["-debug"] + self.extra_args
-        self.nodes.append(start_node(idx, self.options.tmpdir,
-                                     args))
-        for i in range(0, idx):
-            connect_nodes(self.nodes[i], idx)
-
-    def get_mnconf_file(self):
-        return os.path.join(self.options.tmpdir, "node0/regtest/masternode.conf")
-
-    def prepare_masternodes(self):
-        for idx in range(0, self.mn_count):
-            key = self.nodes[0].masternode("genkey")
-            address = self.nodes[0].getnewaddress()
-            txid = self.nodes[0].sendtoaddress(address, MASTERNODE_COLLATERAL)
-            txrow = self.nodes[0].getrawtransaction(txid, True)
-            collateral_vout = 0
-            for vout_idx in range(0, len(txrow["vout"])):
-                vout = txrow["vout"][vout_idx]
-                if vout["value"] == MASTERNODE_COLLATERAL:
-                    collateral_vout = vout_idx
-            self.nodes[0].lockunspent(False,
-                                      [{"txid": txid, "vout": collateral_vout}])
-            self.mninfo.append(MasternodeInfo(key, txid, collateral_vout))
-
-    def write_mn_config(self):
-        conf = self.get_mnconf_file()
-        f = open(conf, 'a')
-        for idx in range(0, self.mn_count):
-            f.write("mn%d 127.0.0.1:%d %s %s %d\n" % (idx + 1, p2p_port(idx + 1),
-                                                      self.mninfo[idx].key,
-                                                      self.mninfo[idx].collateral_id,
-                                                      self.mninfo[idx].collateral_out))
-        f.close()
-
-    def create_masternodes(self):
-        for idx in range(0, self.mn_count):
-            args = ['-debug=masternode', '-externalip=127.0.0.1', '-masternode=1',
-                    '-masternodeprivkey=%s' % self.mninfo[idx].key] + self.extra_args
-            self.nodes.append(start_node(idx + 1, self.options.tmpdir, args))
-            for i in range(0, idx + 1):
-                connect_nodes(self.nodes[i], idx + 1)
-
-    def setup_network(self):
-        self.nodes = []
-        # create faucet node for collateral and transactions
-        args = ["-debug"] + self.extra_args
-        self.nodes.append(start_node(0, self.options.tmpdir, args))
-        required_balance = MASTERNODE_COLLATERAL * self.mn_count + 1
-        while self.nodes[0].getbalance() < required_balance:
-            set_mocktime(get_mocktime() + 1)
-            set_node_times(self.nodes, get_mocktime())
-            self.nodes[0].generate(1)
-        # create masternodes
-        self.prepare_masternodes()
-        self.write_mn_config()
-        stop_node(self.nodes[0], 0)
-        args = ["-debug",
-                "-sporkkey=cP4EKFyJsHT39LDqgdcB43Y3YXjNyjb5Fuas1GQSeAtjnZWmZEQK"] + \
-               self.extra_args
-        self.nodes[0] = start_node(0, self.options.tmpdir,
-                                   args)
-        self.create_masternodes()
-        # create connected simple nodes
-        for i in range(0, self.num_nodes - self.mn_count - 1):
-            self.create_simple_node()
-        set_mocktime(get_mocktime() + 1)
-        set_node_times(self.nodes, get_mocktime())
-        self.nodes[0].generate(1)
-        # sync nodes
-        self.sync_all()
-        set_mocktime(get_mocktime() + 1)
-        set_node_times(self.nodes, get_mocktime())
-        sync_masternodes(self.nodes)
-        for i in range(1, self.mn_count + 1):
-            res = self.nodes[0].masternode("start-alias", "mn%d" % i)
-            assert(res["result"] == 'successful')
-        sync_masternodes(self.nodes)
-        mn_info = self.nodes[0].masternodelist("status")
-        assert(len(mn_info) == self.mn_count)
-        for status in mn_info.values():
-            assert(status == 'ENABLED')
 
     def get_autoix_bip9_status(self):
         info = self.nodes[0].getblockchaininfo()
@@ -187,78 +88,18 @@ def set_autoix_spork_state(self, state):
             value = 4070908800
         self.nodes[0].spork('SPORK_16_INSTANTSEND_AUTOLOCKS', value)
 
-    def enforce_masternode_payments(self):
-        self.nodes[0].spork('SPORK_8_MASTERNODE_PAYMENT_ENFORCEMENT', 0)
-
-    def create_raw_trx(self, node_from, node_to, amount, min_inputs, max_inputs):
-        assert(min_inputs <= max_inputs)
-        # fill inputs
-        inputs=[]
-        balances = node_from.listunspent()
-        in_amount = 0.0
-        last_amount = 0.0
-        for tx in balances:
-            if len(inputs) < min_inputs:
-                input = {}
-                input["txid"] = tx['txid']
-                input['vout'] = tx['vout']
-                in_amount += float(tx['amount'])
-                inputs.append(input)
-            elif in_amount > amount:
-                break
-            elif len(inputs) < max_inputs:
-                input = {}
-                input["txid"] = tx['txid']
-                input['vout'] = tx['vout']
-                in_amount += float(tx['amount'])
-                inputs.append(input)
-            else:
-                input = {}
-                input["txid"] = tx['txid']
-                input['vout'] = tx['vout']
-                in_amount -= last_amount
-                in_amount += float(tx['amount'])
-                inputs[-1] = input
-            last_amount = float(tx['amount'])
-
-        assert(len(inputs) > 0)
-        assert(in_amount > amount)
-        # fill outputs
-        receiver_address = node_to.getnewaddress()
-        change_address = node_from.getnewaddress()
-        fee = 0.001
-        outputs={}
-        outputs[receiver_address] = satoshi_round(amount)
-        outputs[change_address] = satoshi_round(in_amount - amount - fee)
-        rawtx = node_from.createrawtransaction(inputs, outputs)
-        return node_from.signrawtransaction(rawtx)
-
-    def check_IX_lock(self, txid, node):
-        # wait for instantsend locks
-        start = time()
-        locked = False
-        while True:
-            is_trx = node.gettransaction(txid)
-            if is_trx['instantlock']:
-                locked = True
-                break
-            if time() > start + 10:
-                break
-            sleep(0.1)
-        return locked
-
     # sends regular IX with high fee and may inputs (not-simple transaction)
     def send_regular_IX(self, sender, receiver):
         receiver_addr = receiver.getnewaddress()
         txid = sender.instantsendtoaddress(receiver_addr, 1.0)
-        return self.check_IX_lock(txid, sender)
+        return self.wait_for_instantlock(txid, sender)
 
     # sends simple trx, it should become IX if autolocks are allowed
     def send_simple_tx(self, sender, receiver):
         raw_tx = self.create_raw_trx(sender, receiver, 1.0, 1, 4)
         txid = self.nodes[0].sendrawtransaction(raw_tx['hex'])
         self.sync_all()
-        return self.check_IX_lock(txid, sender)
+        return self.wait_for_instantlock(txid, sender)
 
     def get_mempool_size(self, node):
         info = node.getmempoolinfo()
diff --git a/qa/rpc-tests/p2p-autoinstantsend.py b/qa/rpc-tests/p2p-autoinstantsend.py
index 08792d9c03bd..ddf8cbf770f2 100755
--- a/qa/rpc-tests/p2p-autoinstantsend.py
+++ b/qa/rpc-tests/p2p-autoinstantsend.py
@@ -4,7 +4,7 @@
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 from test_framework.mininode import *
-from test_framework.test_framework import BitcoinTestFramework
+from test_framework.test_framework import DashTestFramework
 from test_framework.util import *
 from time import *
 
@@ -22,120 +22,14 @@
 transactions with high fee. 
 '''
 
-MASTERNODE_COLLATERAL = 1000
-
-
-class MasternodeInfo:
-    def __init__(self, key, collateral_id, collateral_out):
-        self.key = key
-        self.collateral_id = collateral_id
-        self.collateral_out = collateral_out
-
-
-class AutoInstantSendTest(BitcoinTestFramework):
+class AutoInstantSendTest(DashTestFramework):
     def __init__(self):
-        super().__init__()
-        self.mn_count = 10
-        self.num_nodes = self.mn_count + 4
-        self.mninfo = []
-        self.setup_clean_chain = True
-        self.is_network_split = False
+        super().__init__(14, 10, [])
         # set sender,  receiver,  isolated nodes
         self.isolated_idx = self.num_nodes - 1
         self.receiver_idx = self.num_nodes - 2
         self.sender_idx = self.num_nodes - 3
 
-    def create_simple_node(self):
-        idx = len(self.nodes)
-        self.nodes.append(start_node(idx, self.options.tmpdir,
-                                     ["-debug"]))
-        for i in range(0, idx):
-            connect_nodes(self.nodes[i], idx)
-
-    def get_mnconf_file(self):
-        return os.path.join(self.options.tmpdir, "node0/regtest/masternode.conf")
-
-    def prepare_masternodes(self):
-        for idx in range(0, self.mn_count):
-            key = self.nodes[0].masternode("genkey")
-            address = self.nodes[0].getnewaddress()
-            txid = self.nodes[0].sendtoaddress(address, MASTERNODE_COLLATERAL)
-            txrow = self.nodes[0].getrawtransaction(txid, True)
-            collateral_vout = 0
-            for vout_idx in range(0, len(txrow["vout"])):
-                vout = txrow["vout"][vout_idx]
-                if vout["value"] == MASTERNODE_COLLATERAL:
-                    collateral_vout = vout_idx
-            self.nodes[0].lockunspent(False,
-                                      [{"txid": txid, "vout": collateral_vout}])
-            self.mninfo.append(MasternodeInfo(key, txid, collateral_vout))
-
-    def write_mn_config(self):
-        conf = self.get_mnconf_file()
-        f = open(conf, 'a')
-        for idx in range(0, self.mn_count):
-            f.write("mn%d 127.0.0.1:%d %s %s %d\n" % (idx + 1, p2p_port(idx + 1),
-                                                      self.mninfo[idx].key,
-                                                      self.mninfo[idx].collateral_id,
-                                                      self.mninfo[idx].collateral_out))
-        f.close()
-
-    def create_masternodes(self):
-        for idx in range(0, self.mn_count):
-            self.nodes.append(start_node(idx + 1, self.options.tmpdir,
-                                         ['-debug=masternode', '-externalip=127.0.0.1',
-                                          '-masternode=1',
-                                          '-masternodeprivkey=%s' % self.mninfo[idx].key
-                                          ]))
-            for i in range(0, idx + 1):
-                connect_nodes(self.nodes[i], idx + 1)
-
-    def sentinel(self):
-        for i in range(1, self.mn_count + 1):
-            self.nodes[i].sentinelping("1.1.0")
-
-    def setup_network(self):
-        self.nodes = []
-        # create faucet node for collateral and transactions
-        self.nodes.append(start_node(0, self.options.tmpdir, ["-debug"]))
-        required_balance = MASTERNODE_COLLATERAL * self.mn_count + 1
-        while self.nodes[0].getbalance() < required_balance:
-            set_mocktime(get_mocktime() + 1)
-            set_node_times(self.nodes, get_mocktime())
-            self.nodes[0].generate(1)
-        # create masternodes
-        self.prepare_masternodes()
-        self.write_mn_config()
-        stop_node(self.nodes[0], 0)
-        self.nodes[0] = start_node(0, self.options.tmpdir,
-                                   ["-debug", "-sporkkey=cP4EKFyJsHT39LDqgdcB43Y3YXjNyjb5Fuas1GQSeAtjnZWmZEQK"])
-        self.create_masternodes()
-        # create connected simple nodes
-        for i in range(0, self.num_nodes - self.mn_count - 1):
-            self.create_simple_node()
-        # feed the sender with some balance
-        sender_addr = self.nodes[self.sender_idx].getnewaddress()
-        self.nodes[0].sendtoaddress(sender_addr, 1)
-        # make sender funds mature for InstantSend
-        for i in range(0, 2):
-            set_mocktime(get_mocktime() + 1)
-            set_node_times(self.nodes, get_mocktime())
-            self.nodes[0].generate(1)
-        # sync nodes
-        self.sync_all()
-        set_mocktime(get_mocktime() + 1)
-        set_node_times(self.nodes, get_mocktime())
-        sync_masternodes(self.nodes)
-        for i in range(1, self.mn_count + 1):
-            res = self.nodes[0].masternode("start-alias", "mn%d" % i)
-            assert(res["result"] == 'successful')
-        sync_masternodes(self.nodes)
-        #self.sentinel()
-        mn_info = self.nodes[0].masternodelist("status")
-        assert(len(mn_info) == self.mn_count)
-        for status in mn_info.values():
-            assert(status == 'ENABLED')
-
     def get_autoix_bip9_status(self):
         info = self.nodes[0].getblockchaininfo()
         return info['bip9_softforks']['autoix']['status']
@@ -198,66 +92,6 @@ def set_autoix_spork_state(self, state):
             value = 4070908800
         self.nodes[0].spork('SPORK_16_INSTANTSEND_AUTOLOCKS', value)
 
-    def enforce_masternode_payments(self):
-        self.nodes[0].spork('SPORK_8_MASTERNODE_PAYMENT_ENFORCEMENT', 0)
-
-    def create_raw_trx(self, node_from, node_to, amount, min_inputs, max_inputs):
-        assert(min_inputs <= max_inputs)
-        # fill inputs
-        inputs=[]
-        balances = node_from.listunspent()
-        in_amount = 0.0
-        last_amount = 0.0
-        for tx in balances:
-            if len(inputs) < min_inputs:
-                input = {}
-                input["txid"] = tx['txid']
-                input['vout'] = tx['vout']
-                in_amount += float(tx['amount'])
-                inputs.append(input)
-            elif in_amount > amount:
-                break
-            elif len(inputs) < max_inputs:
-                input = {}
-                input["txid"] = tx['txid']
-                input['vout'] = tx['vout']
-                in_amount += float(tx['amount'])
-                inputs.append(input)
-            else:
-                input = {}
-                input["txid"] = tx['txid']
-                input['vout'] = tx['vout']
-                in_amount -= last_amount
-                in_amount += float(tx['amount'])
-                inputs[-1] = input
-            last_amount = float(tx['amount'])
-
-        assert(len(inputs) > 0)
-        assert(in_amount > amount)
-        # fill outputs
-        receiver_address = node_to.getnewaddress()
-        change_address = node_from.getnewaddress()
-        fee = 0.001
-        outputs={}
-        outputs[receiver_address] = satoshi_round(amount)
-        outputs[change_address] = satoshi_round(in_amount - amount - fee)
-        rawtx = node_from.createrawtransaction(inputs, outputs)
-        return node_from.signrawtransaction(rawtx)
-
-    def check_IX_lock(self, txid):
-        # wait for instantsend locks
-        start = time()
-        locked = False
-        while True:
-            is_trx = self.nodes[0].gettransaction(txid)
-            if is_trx['instantlock']:
-                locked = True
-                break
-            if time() > start + 10:
-                break
-            sleep(0.1)
-        return locked
-
     # sends regular IX with high fee and may inputs (not-simple transaction)
     def send_regular_IX(self):
         receiver_addr = self.nodes[self.receiver_idx].getnewaddress()
@@ -266,24 +100,32 @@ def send_regular_IX(self):
         fee = self.nodes[0].gettransaction(txid)['fee']
         expected_fee = MIN_FEE * len(self.nodes[0].getrawtransaction(txid, True)['vin'])
         assert_equal(fee, expected_fee)
-        return self.check_IX_lock(txid)
-
+        return self.wait_for_instantlock(txid, self.nodes[0])
 
     # sends simple trx, it should become IX if autolocks are allowed
     def send_simple_tx(self):
         raw_tx = self.create_raw_trx(self.nodes[0], self.nodes[self.receiver_idx], 1.0, 1, 4)
         txid = self.nodes[0].sendrawtransaction(raw_tx['hex'])
         self.sync_all()
-        return self.check_IX_lock(txid)
+        return self.wait_for_instantlock(txid, self.nodes[0])
 
     # sends complex trx, it should never become IX
     def send_complex_tx(self):
         raw_tx = self.create_raw_trx(self.nodes[0], self.nodes[self.receiver_idx], 1.0, 5, 100)
         txid = self.nodes[0].sendrawtransaction(raw_tx['hex'])
         self.sync_all()
-        return self.check_IX_lock(txid)
+        return self.wait_for_instantlock(txid, self.nodes[0])
 
     def run_test(self):
+        # feed the sender with some balance
+        sender_addr = self.nodes[self.sender_idx].getnewaddress()
+        self.nodes[0].sendtoaddress(sender_addr, 1)
+        # make sender funds mature for InstantSend
+        for i in range(0, 2):
+            set_mocktime(get_mocktime() + 1)
+            set_node_times(self.nodes, get_mocktime())
+            self.nodes[0].generate(1)
+            
         self.enforce_masternode_payments()  # required for bip9 activation
         assert(self.get_autoix_bip9_status() == 'defined')
         assert(not self.get_autoix_spork_state())
@@ -309,5 +151,6 @@ def run_test(self):
         assert(not self.send_simple_tx())
         assert(not self.send_complex_tx())
 
+
 if __name__ == '__main__':
     AutoInstantSendTest().main()
diff --git a/qa/rpc-tests/p2p-instantsend.py b/qa/rpc-tests/p2p-instantsend.py
index 29eb9efe0036..4f4981226e76 100755
--- a/qa/rpc-tests/p2p-instantsend.py
+++ b/qa/rpc-tests/p2p-instantsend.py
@@ -4,7 +4,7 @@
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 from test_framework.mininode import *
-from test_framework.test_framework import BitcoinTestFramework
+from test_framework.test_framework import DashTestFramework
 from test_framework.util import *
 from time import *
 
@@ -12,95 +12,15 @@
 InstantSendTest -- test InstantSend functionality (prevent doublespend for unconfirmed transactions)
 '''
 
-MASTERNODE_COLLATERAL = 1000
-
-
-class MasternodeInfo:
-    def __init__(self, key, collateral_id, collateral_out):
-        self.key = key
-        self.collateral_id = collateral_id
-        self.collateral_out = collateral_out
-
-
-class InstantSendTest(BitcoinTestFramework):
+class InstantSendTest(DashTestFramework):
     def __init__(self):
-        super().__init__()
-        self.mn_count = 10
-        self.num_nodes = self.mn_count + 4
-        self.mninfo = []
-        self.setup_clean_chain = True
-        self.is_network_split = False
+        super().__init__(14, 10, [])
         # set sender,  receiver,  isolated nodes
         self.isolated_idx = self.num_nodes - 1
         self.receiver_idx = self.num_nodes - 2
         self.sender_idx = self.num_nodes - 3
 
-    def create_simple_node(self):
-        idx = len(self.nodes)
-        self.nodes.append(start_node(idx, self.options.tmpdir,
-                                     ["-debug"]))
-        for i in range(0, idx):
-            connect_nodes(self.nodes[i], idx)
-
-    def get_mnconf_file(self):
-        return os.path.join(self.options.tmpdir, "node0/regtest/masternode.conf")
-
-    def prepare_masternodes(self):
-        for idx in range(0, self.mn_count):
-            key = self.nodes[0].masternode("genkey")
-            address = self.nodes[0].getnewaddress()
-            txid = self.nodes[0].sendtoaddress(address, MASTERNODE_COLLATERAL)
-            txrow = self.nodes[0].getrawtransaction(txid, True)
-            collateral_vout = 0
-            for vout_idx in range(0, len(txrow["vout"])):
-                vout = txrow["vout"][vout_idx]
-                if vout["value"] == MASTERNODE_COLLATERAL:
-                    collateral_vout = vout_idx
-            self.nodes[0].lockunspent(False,
-                                      [{"txid": txid, "vout": collateral_vout}])
-            self.mninfo.append(MasternodeInfo(key, txid, collateral_vout))
-
-    def write_mn_config(self):
-        conf = self.get_mnconf_file()
-        f = open(conf, 'a')
-        for idx in range(0, self.mn_count):
-            f.write("mn%d 127.0.0.1:%d %s %s %d\n" % (idx + 1, p2p_port(idx + 1),
-                                                      self.mninfo[idx].key,
-                                                      self.mninfo[idx].collateral_id,
-                                                      self.mninfo[idx].collateral_out))
-        f.close()
-
-    def create_masternodes(self):
-        for idx in range(0, self.mn_count):
-            self.nodes.append(start_node(idx + 1, self.options.tmpdir,
-                                         ['-debug=masternode', '-externalip=127.0.0.1',
-                                          '-masternode=1',
-                                          '-masternodeprivkey=%s' % self.mninfo[idx].key
-                                          ]))
-            for i in range(0, idx + 1):
-                connect_nodes(self.nodes[i], idx + 1)
-
-    def sentinel(self):
-        for i in range(1, self.mn_count + 1):
-            self.nodes[i].sentinelping("1.1.0")
-
-    def setup_network(self):
-        self.nodes = []
-        # create faucet node for collateral and transactions
-        self.nodes.append(start_node(0, self.options.tmpdir, ["-debug"]))
-        required_balance = MASTERNODE_COLLATERAL * self.mn_count + 1
-        while self.nodes[0].getbalance() < required_balance:
-            set_mocktime(get_mocktime() + 1)
-            self.nodes[0].generate(1)
-        # create masternodes
-        self.prepare_masternodes()
-        self.write_mn_config()
-        stop_node(self.nodes[0], 0)
-        self.nodes[0] = start_node(0, self.options.tmpdir, ["-debug"])
-        self.create_masternodes()
-        # create connected simple nodes
-        for i in range(0, self.num_nodes - self.mn_count - 1):
-            self.create_simple_node()
+    def run_test(self):
         # feed the sender with some balance
         sender_addr = self.nodes[self.sender_idx].getnewaddress()
         self.nodes[0].sendtoaddress(sender_addr, 1)
@@ -108,48 +28,10 @@ def setup_network(self):
         for i in range(0, 2):
             set_mocktime(get_mocktime() + 1)
             self.nodes[0].generate(1)
-        # sync nodes
-        self.sync_all()
-        set_mocktime(get_mocktime() + 1)
-        sync_masternodes(self.nodes)
-        for i in range(1, self.mn_count + 1):
-            res = self.nodes[0].masternode("start-alias", "mn%d" % i)
-            assert(res["result"] == 'successful')
-        sync_masternodes(self.nodes)
-        #self.sentinel()
-        mn_info = self.nodes[0].masternodelist("status")
-        assert(len(mn_info) == self.mn_count)
-        for status in mn_info.values():
-            assert(status == 'ENABLED')
-
-    def create_raw_trx(self, node_from, node_to, amount):
-        # fill inputs
-        inputs=[]
-        balances = node_from.listunspent()
-        for tx in balances:
-            if tx['amount'] > amount:
-                input = {}
-                input["txid"] = tx['txid']
-                input['vout'] = tx['vout']
-                in_amount = float(tx['amount'])
-                inputs.append(input)
-                break
-        assert(len(inputs) > 0)
-        # fill outputs
-        receiver_address = node_to.getnewaddress()
-        change_address = node_from.getnewaddress()
-        fee = 0.001
-        outputs={}
-        outputs[receiver_address] = satoshi_round(amount)
-        outputs[change_address] = satoshi_round(in_amount - amount - fee)
-        rawtx = node_from.createrawtransaction(inputs, outputs)
-        return node_from.signrawtransaction(rawtx)
-
-    def run_test(self):
         # create doublepending transaction,  but don't relay it
         dblspnd_tx = self.create_raw_trx(self.nodes[self.sender_idx],
                                        self.nodes[self.isolated_idx],
-                                       0.5)
+                                       0.5, 1, 100)
         # stop one node to isolate it from network
         stop_node(self.nodes[self.isolated_idx], self.isolated_idx)
         # instantsend to receiver
diff --git a/qa/rpc-tests/test_framework/test_framework.py b/qa/rpc-tests/test_framework/test_framework.py
index 3c4a4313a1f4..e63282ee8ddc 100755
--- a/qa/rpc-tests/test_framework/test_framework.py
+++ b/qa/rpc-tests/test_framework/test_framework.py
@@ -12,13 +12,17 @@
 import shutil
 import tempfile
 import traceback
+from time import time, sleep
 
 from .util import (
     initialize_chain,
+    start_node,
     start_nodes,
     connect_nodes_bi,
+    connect_nodes,
     sync_blocks,
     sync_mempools,
+    sync_masternodes,
     stop_nodes,
     stop_node,
     enable_coverage,
@@ -27,7 +31,11 @@
     PortSeed,
     set_cache_mocktime,
     set_genesis_mocktime,
-    get_mocktime
+    get_mocktime,
+    set_mocktime,
+    set_node_times,
+    p2p_port,
+    satoshi_round
 )
 from .authproxy import JSONRPCException
 
@@ -195,6 +203,172 @@ def main(self):
             sys.exit(1)
 
 
+MASTERNODE_COLLATERAL = 1000
+
+
+class MasternodeInfo:
+    def __init__(self, key, collateral_id, collateral_out):
+        self.key = key
+        self.collateral_id = collateral_id
+        self.collateral_out = collateral_out
+
+
+class DashTestFramework(BitcoinTestFramework):
+    def __init__(self, num_nodes, masterodes_count, extra_args):
+        super().__init__()
+        self.mn_count = masterodes_count
+        self.num_nodes = num_nodes
+        self.mninfo = []
+        self.setup_clean_chain = True
+        self.is_network_split = False
+        # additional args
+        self.extra_args = extra_args
+
+    def create_simple_node(self):
+        idx = len(self.nodes)
+        args = ["-debug"] + self.extra_args
+        self.nodes.append(start_node(idx, self.options.tmpdir,
+                                     args))
+        for i in range(0, idx):
+            connect_nodes(self.nodes[i], idx)
+
+    def get_mnconf_file(self):
+        return os.path.join(self.options.tmpdir, "node0/regtest/masternode.conf")
+
+    def prepare_masternodes(self):
+        for idx in range(0, self.mn_count):
+            key = self.nodes[0].masternode("genkey")
+            address = self.nodes[0].getnewaddress()
+            txid = self.nodes[0].sendtoaddress(address, MASTERNODE_COLLATERAL)
+            txrow = self.nodes[0].getrawtransaction(txid, True)
+            collateral_vout = 0
+            for vout_idx in range(0, len(txrow["vout"])):
+                vout = txrow["vout"][vout_idx]
+                if vout["value"] == MASTERNODE_COLLATERAL:
+                    collateral_vout = vout_idx
+            self.nodes[0].lockunspent(False,
+                                      [{"txid": txid, "vout": collateral_vout}])
+            self.mninfo.append(MasternodeInfo(key, txid, collateral_vout))
+
+    def write_mn_config(self):
+        conf = self.get_mnconf_file()
+        f = open(conf, 'a')
+        for idx in range(0, self.mn_count):
+            f.write("mn%d 127.0.0.1:%d %s %s %d\n" % (idx + 1, p2p_port(idx + 1),
+                                                      self.mninfo[idx].key,
+                                                      self.mninfo[idx].collateral_id,
+                                                      self.mninfo[idx].collateral_out))
+        f.close()
+
+    def create_masternodes(self):
+        for idx in range(0, self.mn_count):
+            args = ['-debug=masternode', '-externalip=127.0.0.1', '-masternode=1',
+                    '-masternodeprivkey=%s' % self.mninfo[idx].key] + self.extra_args
+            self.nodes.append(start_node(idx + 1, self.options.tmpdir, args))
+            for i in range(0, idx + 1):
+                connect_nodes(self.nodes[i], idx + 1)
+
+    def setup_network(self):
+        self.nodes = []
+        # create faucet node for collateral and transactions
+        args = ["-debug"] + self.extra_args
+        self.nodes.append(start_node(0, self.options.tmpdir, args))
+        required_balance = MASTERNODE_COLLATERAL * self.mn_count + 1
+        while self.nodes[0].getbalance() < required_balance:
+            set_mocktime(get_mocktime() + 1)
+            set_node_times(self.nodes, get_mocktime())
+            self.nodes[0].generate(1)
+        # create masternodes
+        self.prepare_masternodes()
+        self.write_mn_config()
+        stop_node(self.nodes[0], 0)
+        args = ["-debug",
+                "-sporkkey=cP4EKFyJsHT39LDqgdcB43Y3YXjNyjb5Fuas1GQSeAtjnZWmZEQK"] + \
+               self.extra_args
+        self.nodes[0] = start_node(0, self.options.tmpdir,
+                                   args)
+        self.create_masternodes()
+        # create connected simple nodes
+        for i in range(0, self.num_nodes - self.mn_count - 1):
+            self.create_simple_node()
+        set_mocktime(get_mocktime() + 1)
+        set_node_times(self.nodes, get_mocktime())
+        self.nodes[0].generate(1)
+        # sync nodes
+        self.sync_all()
+        set_mocktime(get_mocktime() + 1)
+        set_node_times(self.nodes, get_mocktime())
+        sync_masternodes(self.nodes)
+        for i in range(1, self.mn_count + 1):
+            res = self.nodes[0].masternode("start-alias", "mn%d" % i)
+            assert (res["result"] == 'successful')
+        sync_masternodes(self.nodes)
+        mn_info = self.nodes[0].masternodelist("status")
+        assert (len(mn_info) == self.mn_count)
+        for status in mn_info.values():
+            assert (status == 'ENABLED')
+
+    def enforce_masternode_payments(self):
+        self.nodes[0].spork('SPORK_8_MASTERNODE_PAYMENT_ENFORCEMENT', 0)
+
+    def create_raw_trx(self, node_from, node_to, amount, min_inputs, max_inputs):
+        assert (min_inputs <= max_inputs)
+        # fill inputs
+        inputs = []
+        balances = node_from.listunspent()
+        in_amount = 0.0
+        last_amount = 0.0
+        for tx in balances:
+            if len(inputs) < min_inputs:
+                input = {}
+                input["txid"] = tx['txid']
+                input['vout'] = tx['vout']
+                in_amount += float(tx['amount'])
+                inputs.append(input)
+            elif in_amount > amount:
+                break
+            elif len(inputs) < max_inputs:
+                input = {}
+                input["txid"] = tx['txid']
+                input['vout'] = tx['vout']
+                in_amount += float(tx['amount'])
+                inputs.append(input)
+            else:
+                input = {}
+                input["txid"] = tx['txid']
+                input['vout'] = tx['vout']
+                in_amount -= last_amount
+                in_amount += float(tx['amount'])
+                inputs[-1] = input
+            last_amount = float(tx['amount'])
+
+        assert (len(inputs) > 0)
+        assert (in_amount > amount)
+        # fill outputs
+        receiver_address = node_to.getnewaddress()
+        change_address = node_from.getnewaddress()
+        fee = 0.001
+        outputs = {}
+        outputs[receiver_address] = satoshi_round(amount)
+        outputs[change_address] = satoshi_round(in_amount - amount - fee)
+        rawtx = node_from.createrawtransaction(inputs, outputs)
+        return node_from.signrawtransaction(rawtx)
+
+    def wait_for_instantlock(self, txid, node):
+        # wait for instantsend locks
+        start = time()
+        locked = False
+        while True:
+            is_trx = node.gettransaction(txid)
+            if is_trx['instantlock']:
+                locked = True
+                break
+            if time() > start + 10:
+                break
+            sleep(0.1)
+        return locked
+
+
 # Test framework for doing p2p comparison testing, which sets up some bitcoind
 # binaries:
 # 1 binary: test binary

From a450553847ba9b9e1a2efa56243ee3838829048b Mon Sep 17 00:00:00 2001
From: UdjinM6 <UdjinM6@users.noreply.github.com>
Date: Sat, 20 Oct 2018 17:08:23 +0300
Subject: [PATCH 192/400] Fix qt configure to detect clang version correctly
 (#2344)

> /usr/bin/xcrun -sdk macosx clang -v
Apple LLVM version 10.0.0 (clang-1000.11.45.2)
Target: x86_64-apple-darwin18.0.0
Thread model: posix
InstalledDir: /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin

Before:
> XCRUN=`/usr/bin/xcrun -sdk macosx clang -v 2>&1`; echo "$XCRUN" | sed -n 's/.*version \([0-9]\).*/\1/p'
1

After:
> XCRUN=`/usr/bin/xcrun -sdk macosx clang -v 2>&1`; echo "$XCRUN" | sed -n 's/.*version \([0-9]*\).*/\1/p'
10
---
 depends/packages/qt.mk                    |  5 ++++-
 depends/patches/qt/fix_qt_configure.patch | 11 +++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)
 create mode 100644 depends/patches/qt/fix_qt_configure.patch

diff --git a/depends/packages/qt.mk b/depends/packages/qt.mk
index 1f5af9be4118..e6936b9f1e03 100644
--- a/depends/packages/qt.mk
+++ b/depends/packages/qt.mk
@@ -9,7 +9,9 @@ $(package)_linux_dependencies=freetype fontconfig libxcb libX11 xproto libXext
 $(package)_build_subdir=qtbase
 $(package)_qt_libs=corelib network widgets gui plugins testlib
 $(package)_patches=mac-qmake.conf mingw-uuidof.patch pidlist_absolute.patch fix-xcb-include-order.patch
-$(package)_patches+=fix_qt_pkgconfig.patch fix-cocoahelpers-macos.patch qfixed-coretext.patch
+$(package)_patches+=fix_qt_configure.patch fix_qt_pkgconfig.patch fix-cocoahelpers-macos.patch qfixed-coretext.patch
+# NOTE: fix_qt_configure.patch is only needed for Qt 5.7, newer versions don't have this issue.
+# Remove it after bumping $(package)_version to 5.8+.
 
 $(package)_qttranslations_file_name=qttranslations-$($(package)_suffix)
 $(package)_qttranslations_sha256_hash=3a15aebd523c6d89fb97b2d3df866c94149653a26d27a00aac9b6d3020bc5a1d
@@ -140,6 +142,7 @@ define $(package)_preprocess_cmds
   patch -p1 < $($(package)_patch_dir)/mingw-uuidof.patch && \
   patch -p1 < $($(package)_patch_dir)/pidlist_absolute.patch && \
   patch -p1 < $($(package)_patch_dir)/fix-xcb-include-order.patch && \
+  patch -p1 < $($(package)_patch_dir)/fix_qt_configure.patch && \
   patch -p1 < $($(package)_patch_dir)/fix_qt_pkgconfig.patch && \
   patch -p1 < $($(package)_patch_dir)/fix-cocoahelpers-macos.patch && \
   patch -p1 < $($(package)_patch_dir)/qfixed-coretext.patch && \
diff --git a/depends/patches/qt/fix_qt_configure.patch b/depends/patches/qt/fix_qt_configure.patch
new file mode 100644
index 000000000000..3466a6c24d79
--- /dev/null
+++ b/depends/patches/qt/fix_qt_configure.patch
@@ -0,0 +1,11 @@
+--- old/qtbase/configure
++++ new/qtbase/configure
+@@ -2846,7 +2846,7 @@
+         # with the system. We use 'xcrun' to check the clang version that's part of
+         # the Xcode installation.
+         XCRUN=`/usr/bin/xcrun -sdk macosx clang -v 2>&1`
+-        CLANGVERSION=`echo "$XCRUN" | sed -n 's/.*version \([0-9]\).*/\1/p'`
++        CLANGVERSION=`echo "$XCRUN" | sed -n 's/.*version \([0-9]*\).*/\1/p'`
+         expr "$CLANGVERSION" : '[0-9]' > /dev/null || { echo "Unable to determine CLANG version from output of xcrun: $XCRUN" ; exit 2 ; }
+         if [ "$CLANGVERSION" -ge 3 ]; then
+             PLATFORM=macx-clang

From e2de632f8c4890b2ea43616607724b6324c7f8be Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Sat, 20 Oct 2018 16:08:40 +0200
Subject: [PATCH 193/400] Move handling of `size != SerSize` into SetBuf/GetBuf
 (#2356)

* Move handling of size >= SerSize into SetBuf/GetBuf

Instead of performing this in the individual implementations of
InternalSetBuf and InternalGetBuf

* Assert that size if GetBuf is always SerSize
---
 src/bls/bls.cpp | 43 ++++++++-----------------------------------
 src/bls/bls.h   | 35 +++++++++++++++++++++--------------
 2 files changed, 29 insertions(+), 49 deletions(-)

diff --git a/src/bls/bls.cpp b/src/bls/bls.cpp
index b1ab28ac68b7..40b6630a8f2a 100644
--- a/src/bls/bls.cpp
+++ b/src/bls/bls.cpp
@@ -16,18 +16,14 @@
 #include <assert.h>
 #include <string.h>
 
-bool CBLSId::InternalSetBuf(const void* buf, size_t size)
+bool CBLSId::InternalSetBuf(const void* buf)
 {
-    assert(size == sizeof(uint256));
     memcpy(impl.begin(), buf, sizeof(uint256));
     return true;
 }
 
-bool CBLSId::InternalGetBuf(void* buf, size_t size) const
+bool CBLSId::InternalGetBuf(void* buf) const
 {
-    if (size != GetSerSize()) {
-        return false;
-    }
     memcpy(buf, impl.begin(), sizeof(uint256));
     return true;
 }
@@ -60,12 +56,8 @@ CBLSId CBLSId::FromHash(const uint256& hash)
     return id;
 }
 
-bool CBLSSecretKey::InternalSetBuf(const void* buf, size_t size)
+bool CBLSSecretKey::InternalSetBuf(const void* buf)
 {
-    if (size != GetSerSize()) {
-        return false;
-    }
-
     try {
         impl = bls::PrivateKey::FromBytes((const uint8_t*)buf);
         return true;
@@ -74,12 +66,8 @@ bool CBLSSecretKey::InternalSetBuf(const void* buf, size_t size)
     }
 }
 
-bool CBLSSecretKey::InternalGetBuf(void* buf, size_t size) const
+bool CBLSSecretKey::InternalGetBuf(void* buf) const
 {
-    if (size != GetSerSize()) {
-        return false;
-    }
-
     impl.Serialize((uint8_t*)buf);
     return true;
 }
@@ -185,12 +173,8 @@ CBLSSignature CBLSSecretKey::Sign(const uint256& hash) const
     return sigRet;
 }
 
-bool CBLSPublicKey::InternalSetBuf(const void* buf, size_t size)
+bool CBLSPublicKey::InternalSetBuf(const void* buf)
 {
-    if (size != GetSerSize()) {
-        return false;
-    }
-
     try {
         impl = bls::PublicKey::FromBytes((const uint8_t*)buf);
         return true;
@@ -199,12 +183,8 @@ bool CBLSPublicKey::InternalSetBuf(const void* buf, size_t size)
     }
 }
 
-bool CBLSPublicKey::InternalGetBuf(void* buf, size_t size) const
+bool CBLSPublicKey::InternalGetBuf(void* buf) const
 {
-    if (size != GetSerSize()) {
-        return false;
-    }
-
     impl.Serialize((uint8_t*)buf);
     return true;
 }
@@ -279,12 +259,8 @@ bool CBLSPublicKey::DHKeyExchange(const CBLSSecretKey& sk, const CBLSPublicKey&
     return true;
 }
 
-bool CBLSSignature::InternalSetBuf(const void* buf, size_t size)
+bool CBLSSignature::InternalSetBuf(const void* buf)
 {
-    if (size != GetSerSize()) {
-        return false;
-    }
-
     try {
         impl = bls::InsecureSignature::FromBytes((const uint8_t*)buf);
         return true;
@@ -293,11 +269,8 @@ bool CBLSSignature::InternalSetBuf(const void* buf, size_t size)
     }
 }
 
-bool CBLSSignature::InternalGetBuf(void* buf, size_t size) const
+bool CBLSSignature::InternalGetBuf(void* buf) const
 {
-    if (size != GetSerSize()) {
-        return false;
-    }
     impl.Serialize((uint8_t*)buf);
     return true;
 }
diff --git a/src/bls/bls.h b/src/bls/bls.h
index e64da0dbc81c..435b3538fe4e 100644
--- a/src/bls/bls.h
+++ b/src/bls/bls.h
@@ -41,8 +41,8 @@ class CBLSWrapper
 
     inline constexpr size_t GetSerSize() const { return SerSize; }
 
-    virtual bool InternalSetBuf(const void* buf, size_t size) = 0;
-    virtual bool InternalGetBuf(void* buf, size_t size) const = 0;
+    virtual bool InternalSetBuf(const void* buf) = 0;
+    virtual bool InternalGetBuf(void* buf) const = 0;
 
 public:
     static const size_t SerSize = _SerSize;
@@ -84,10 +84,15 @@ class CBLSWrapper
 
     void SetBuf(const void* buf, size_t size)
     {
-        if (std::all_of((const char*)buf, (const char*)buf + size, [](char c) { return c == 0; })) {
+        if (size != SerSize) {
+            Reset();
+            return;
+        }
+
+        if (std::all_of((const char*)buf, (const char*)buf + SerSize, [](char c) { return c == 0; })) {
             Reset();
         } else {
-            fValid = InternalSetBuf(buf, size);
+            fValid = InternalSetBuf(buf);
             if (!fValid) {
                 Reset();
             }
@@ -102,10 +107,12 @@ class CBLSWrapper
 
     void GetBuf(void* buf, size_t size) const
     {
+        assert(size == SerSize);
+
         if (!fValid) {
-            memset(buf, 0, size);
+            memset(buf, 0, SerSize);
         } else {
-            bool ok = InternalGetBuf(buf, size);
+            bool ok = InternalGetBuf(buf);
             assert(ok);
         }
     }
@@ -201,8 +208,8 @@ class CBLSId : public CBLSWrapper<uint256, BLS_CURVE_ID_SIZE, CBLSId>
     static CBLSId FromHash(const uint256& hash);
 
 protected:
-    bool InternalSetBuf(const void* buf, size_t size);
-    bool InternalGetBuf(void* buf, size_t size) const;
+    bool InternalSetBuf(const void* buf);
+    bool InternalGetBuf(void* buf) const;
 };
 
 class CBLSSecretKey : public CBLSWrapper<bls::PrivateKey, BLS_CURVE_SECKEY_SIZE, CBLSSecretKey>
@@ -224,8 +231,8 @@ class CBLSSecretKey : public CBLSWrapper<bls::PrivateKey, BLS_CURVE_SECKEY_SIZE,
     CBLSSignature Sign(const uint256& hash) const;
 
 protected:
-    bool InternalSetBuf(const void* buf, size_t size);
-    bool InternalGetBuf(void* buf, size_t size) const;
+    bool InternalSetBuf(const void* buf);
+    bool InternalGetBuf(void* buf) const;
 };
 
 class CBLSPublicKey : public CBLSWrapper<bls::PublicKey, BLS_CURVE_PUBKEY_SIZE, CBLSPublicKey>
@@ -245,8 +252,8 @@ class CBLSPublicKey : public CBLSWrapper<bls::PublicKey, BLS_CURVE_PUBKEY_SIZE,
     bool DHKeyExchange(const CBLSSecretKey& sk, const CBLSPublicKey& pk);
 
 protected:
-    bool InternalSetBuf(const void* buf, size_t size);
-    bool InternalGetBuf(void* buf, size_t size) const;
+    bool InternalSetBuf(const void* buf);
+    bool InternalGetBuf(void* buf) const;
 };
 
 class CBLSSignature : public CBLSWrapper<bls::InsecureSignature, BLS_CURVE_SIG_SIZE, CBLSSignature>
@@ -275,8 +282,8 @@ class CBLSSignature : public CBLSWrapper<bls::InsecureSignature, BLS_CURVE_SIG_S
     bool Recover(const std::vector<CBLSSignature>& sigs, const std::vector<CBLSId>& ids);
 
 protected:
-    bool InternalSetBuf(const void* buf, size_t size);
-    bool InternalGetBuf(void* buf, size_t size) const;
+    bool InternalSetBuf(const void* buf);
+    bool InternalGetBuf(void* buf) const;
 };
 
 typedef std::vector<CBLSId> BLSIdVector;

From 7b76bbb57524a6bac4e4aee9fa4f27377e99bbc8 Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Sat, 20 Oct 2018 16:08:54 +0200
Subject: [PATCH 194/400]  Update Chia BLS libs to latest master (#2357)

* Undefine ERROR before including chia BLS stuff to avoid warnings

* Update Chia BLS libs to latest master
---
 depends/packages/chia_bls.mk | 4 ++--
 src/bls/bls.cpp              | 4 ++--
 src/bls/bls.h                | 1 +
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/depends/packages/chia_bls.mk b/depends/packages/chia_bls.mk
index 5ad17be881a5..8f9f0617b269 100644
--- a/depends/packages/chia_bls.mk
+++ b/depends/packages/chia_bls.mk
@@ -1,9 +1,9 @@
 package=chia_bls
-$(package)_version=b24c15cef6567a855e901b4774d1d22efb063ea9
+$(package)_version=ef06290c1d92eea79b46af135bcc823b019612a6
 # It's actually from https://github.com/Chia-Network/bls-signatures, but we have so many patches atm that it's forked
 $(package)_download_path=https://github.com/codablock/bls-signatures/archive
 $(package)_file_name=$($(package)_version).tar.gz
-$(package)_sha256_hash=96b5f9b70179e2e76123fb19b7a00dec9188b571757db15949bf9f1d8dee864f
+$(package)_sha256_hash=1e665359fdb946efce943340a324534f72832ecde97c4ebd4ad189f63e029300
 $(package)_dependencies=gmp
 #$(package)_patches=...TODO (when we switch back to https://github.com/Chia-Network/bls-signatures)
 
diff --git a/src/bls/bls.cpp b/src/bls/bls.cpp
index 40b6630a8f2a..83cac42f7711 100644
--- a/src/bls/bls.cpp
+++ b/src/bls/bls.cpp
@@ -444,9 +444,9 @@ struct secure_user_allocator {
 // otherwise locking of mutexes slows down the system at places were you'd never expect it
 // downside is that we must make sure that all threads have destroyed their copy of the pool before the global
 // LockedPool is destroyed. This means that all worker threads must finish before static destruction begins
-// we use sizeof(relic::bn_t) as the pool request size as this is what Chia's BLS library will request in most cases
+// we use sizeof(bn_t) as the pool request size as this is what Chia's BLS library will request in most cases
 // In case something larger is requested, we directly call into LockedPool and accept the slowness
-thread_local static boost::pool<secure_user_allocator> securePool(sizeof(relic::bn_t) + sizeof(size_t));
+thread_local static boost::pool<secure_user_allocator> securePool(sizeof(bn_t) + sizeof(size_t));
 
 static void* secure_allocate(size_t n)
 {
diff --git a/src/bls/bls.h b/src/bls/bls.h
index 435b3538fe4e..0072f90f24ab 100644
--- a/src/bls/bls.h
+++ b/src/bls/bls.h
@@ -10,6 +10,7 @@
 #include "uint256.h"
 #include "utilstrencodings.h"
 
+#undef ERROR // chia BLS uses relic, which defines ERROR, which in turn causes win32/win64 builds to print many warnings
 #include <chiabls/bls.hpp>
 #include <chiabls/privatekey.hpp>
 #include <chiabls/publickey.hpp>

From 3313bbd5154b80454469b220862e1aee7e754a7e Mon Sep 17 00:00:00 2001
From: -k <slowdive@me.com>
Date: Sun, 21 Oct 2018 15:39:05 -0400
Subject: [PATCH 195/400] Backport bitcoin #13623 Migrate gitian-build.sh to
 python (#2319)

* backport python version of gitian-build from bitcoin

rename gitian-build script

fix release notes typo

0.12.3-backports

* change gitian host IP address

* docker/etc fixes

* use docker as default virtualization tech

* add checksum to depends download stage

* add SDK download

checksum added

* remove SDK check

* fix verification
---
 contrib/README.md       |   2 +-
 contrib/gitian-build.py | 241 +++++++++++++++++++++++
 contrib/gitian-build.sh | 423 ----------------------------------------
 doc/gitian-building.md  |   6 +-
 doc/release-process.md  |   4 +-
 5 files changed, 247 insertions(+), 429 deletions(-)
 create mode 100755 contrib/gitian-build.py
 delete mode 100755 contrib/gitian-build.sh

diff --git a/contrib/README.md b/contrib/README.md
index df8c11bdc64b..19d04640f4ab 100644
--- a/contrib/README.md
+++ b/contrib/README.md
@@ -34,7 +34,7 @@ PGP keys used for signing Bitcoin Core [Gitian release](/doc/release-process.md)
 ### [MacDeploy](/contrib/macdeploy) ###
 Scripts and notes for Mac builds. 
 
-### [Gitian-build](/contrib/gitian-build.sh) ###
+### [Gitian-build](/contrib/gitian-build.py) ###
 Script for running full Gitian builds.
 
 Test and Verify Tools 
diff --git a/contrib/gitian-build.py b/contrib/gitian-build.py
new file mode 100755
index 000000000000..70569702178f
--- /dev/null
+++ b/contrib/gitian-build.py
@@ -0,0 +1,241 @@
+#!/usr/bin/env python3
+
+import argparse
+import os
+import subprocess
+import sys
+
+def setup():
+    global args, workdir
+    programs = ['ruby', 'git', 'make', 'wget']
+    if args.lxc:
+        programs += ['apt-cacher-ng', 'lxc', 'debootstrap']
+    elif args.kvm:
+        programs += ['apt-cacher-ng', 'python-vm-builder', 'qemu-kvm', 'qemu-utils']
+    elif args.docker and not os.path.isfile('/lib/systemd/system/docker.service'):
+        dockers = ['docker.io', 'docker-ce']
+        for i in dockers:
+            return_code = subprocess.call(['sudo', 'apt-get', 'install', '-qq', i])
+            if return_code == 0:
+                break
+        if return_code != 0:
+            print('Cannot find any way to install Docker', file=sys.stderr)
+            exit(1)
+    subprocess.check_call(['sudo', 'apt-get', 'install', '-qq'] + programs)
+    if not os.path.isdir('gitian.sigs'):
+        subprocess.check_call(['git', 'clone', 'https://github.com/dashpay/gitian.sigs.git'])
+    if not os.path.isdir('dash-detached-sigs'):
+        subprocess.check_call(['git', 'clone', 'https://github.com/dashpay/dash-detached-sigs.git'])
+    if not os.path.isdir('gitian-builder'):
+        subprocess.check_call(['git', 'clone', 'https://github.com/devrandom/gitian-builder.git'])
+    if not os.path.isdir('dash'):
+        subprocess.check_call(['git', 'clone', 'https://github.com/dashpay/dash.git'])
+    os.chdir('gitian-builder')
+    make_image_prog = ['bin/make-base-vm', '--suite', 'bionic', '--arch', 'amd64']
+    if args.docker:
+        make_image_prog += ['--docker']
+    elif args.lxc:
+        make_image_prog += ['--lxc']
+    subprocess.check_call(make_image_prog)
+    os.chdir(workdir)
+    if args.is_bionic and not args.kvm and not args.docker:
+        subprocess.check_call(['sudo', 'sed', '-i', 's/lxcbr0/br0/', '/etc/default/lxc-net'])
+        print('Reboot is required')
+        exit(0)
+
+def build():
+    global args, workdir
+
+    os.makedirs('dashcore-binaries/' + args.version, exist_ok=True)
+    print('\nBuilding Dependencies\n')
+    os.chdir('gitian-builder')
+    os.makedirs('inputs', exist_ok=True)
+
+    subprocess.check_call(['wget', '-N', '-P', 'inputs', 'https://downloads.sourceforge.net/project/osslsigncode/osslsigncode/osslsigncode-1.7.1.tar.gz'])
+    subprocess.check_call(['wget', '-N', '-P', 'inputs', 'https://bitcoincore.org/cfields/osslsigncode-Backports-to-1.7.1.patch'])
+    subprocess.check_output(["echo 'a8c4e9cafba922f89de0df1f2152e7be286aba73f78505169bc351a7938dd911 inputs/osslsigncode-Backports-to-1.7.1.patch' | sha256sum -c"], shell=True)
+    subprocess.check_output(["echo 'f9a8cdb38b9c309326764ebc937cba1523a3a751a7ab05df3ecc99d18ae466c9 inputs/osslsigncode-1.7.1.tar.gz' | sha256sum -c"], shell=True)
+    subprocess.check_call(['make', '-C', '../dash/depends', 'download', 'SOURCES_PATH=' + os.getcwd() + '/cache/common'])
+
+    if args.linux:
+        print('\nCompiling ' + args.version + ' Linux')
+        subprocess.check_call(['bin/gbuild', '-j', args.jobs, '-m', args.memory, '--commit', 'dash='+args.commit, '--url', 'dash='+args.url, '../dash/contrib/gitian-descriptors/gitian-linux.yml'])
+        subprocess.check_call(['bin/gsign', '-p', args.sign_prog, '--signer', args.signer, '--release', args.version+'-linux', '--destination', '../gitian.sigs/', '../dash/contrib/gitian-descriptors/gitian-linux.yml'])
+        subprocess.check_call('mv build/out/dashcore-*.tar.gz build/out/src/dashcore-*.tar.gz ../dashcore-binaries/'+args.version, shell=True)
+
+    if args.windows:
+        print('\nCompiling ' + args.version + ' Windows')
+        subprocess.check_call(['bin/gbuild', '-j', args.jobs, '-m', args.memory, '--commit', 'dash='+args.commit, '--url', 'dash='+args.url, '../dash/contrib/gitian-descriptors/gitian-win.yml'])
+        subprocess.check_call(['bin/gsign', '-p', args.sign_prog, '--signer', args.signer, '--release', args.version+'-win-unsigned', '--destination', '../gitian.sigs/', '../dash/contrib/gitian-descriptors/gitian-win.yml'])
+        subprocess.check_call('mv build/out/dashcore-*-win-unsigned.tar.gz inputs/dashcore-win-unsigned.tar.gz', shell=True)
+        subprocess.check_call('mv build/out/dashcore-*.zip build/out/dashcore-*.exe ../dashcore-binaries/'+args.version, shell=True)
+
+    if args.macos:
+        print('\nCompiling ' + args.version + ' MacOS')
+        subprocess.check_call(['wget', '-N', '-P', 'inputs', 'https://bitcoincore.org/depends-sources/sdks/MacOSX10.11.sdk.tar.gz'])
+        subprocess.check_output(["echo 'bec9d089ebf2e2dd59b1a811a38ec78ebd5da18cbbcd6ab39d1e59f64ac5033f inputs/MacOSX10.11.sdk.tar.gz' | sha256sum -c"], shell=True)
+        subprocess.check_call(['bin/gbuild', '-j', args.jobs, '-m', args.memory, '--commit', 'dash='+args.commit, '--url', 'dash='+args.url, '../dash/contrib/gitian-descriptors/gitian-osx.yml'])
+        subprocess.check_call(['bin/gsign', '-p', args.sign_prog, '--signer', args.signer, '--release', args.version+'-osx-unsigned', '--destination', '../gitian.sigs/', '../dash/contrib/gitian-descriptors/gitian-osx.yml'])
+        subprocess.check_call('mv build/out/dashcore-*-osx-unsigned.tar.gz inputs/dashcore-osx-unsigned.tar.gz', shell=True)
+        subprocess.check_call('mv build/out/dashcore-*.tar.gz build/out/dashcore-*.dmg ../dashcore-binaries/'+args.version, shell=True)
+
+    os.chdir(workdir)
+
+    if args.commit_files:
+        print('\nCommitting '+args.version+' Unsigned Sigs\n')
+        os.chdir('gitian.sigs')
+        subprocess.check_call(['git', 'add', args.version+'-linux/'+args.signer])
+        subprocess.check_call(['git', 'add', args.version+'-win-unsigned/'+args.signer])
+        subprocess.check_call(['git', 'add', args.version+'-osx-unsigned/'+args.signer])
+        subprocess.check_call(['git', 'commit', '-m', 'Add '+args.version+' unsigned sigs for '+args.signer])
+        os.chdir(workdir)
+
+def sign():
+    global args, workdir
+    os.chdir('gitian-builder')
+
+    if args.windows:
+        print('\nSigning ' + args.version + ' Windows')
+        subprocess.check_call(['bin/gbuild', '-i', '--commit', 'signature='+args.commit, '../dash/contrib/gitian-descriptors/gitian-win-signer.yml'])
+        subprocess.check_call(['bin/gsign', '-p', args.sign_prog, '--signer', args.signer, '--release', args.version+'-win-signed', '--destination', '../gitian.sigs/', '../dash/contrib/gitian-descriptors/gitian-win-signer.yml'])
+        subprocess.check_call('mv build/out/dashcore-*win64-setup.exe ../dashcore-binaries/'+args.version, shell=True)
+        subprocess.check_call('mv build/out/dashcore-*win32-setup.exe ../dashcore-binaries/'+args.version, shell=True)
+
+    if args.macos:
+        print('\nSigning ' + args.version + ' MacOS')
+        subprocess.check_call(['bin/gbuild', '-i', '--commit', 'signature='+args.commit, '../dash/contrib/gitian-descriptors/gitian-osx-signer.yml'])
+        subprocess.check_call(['bin/gsign', '-p', args.sign_prog, '--signer', args.signer, '--release', args.version+'-osx-signed', '--destination', '../gitian.sigs/', '../dash/contrib/gitian-descriptors/gitian-osx-signer.yml'])
+        subprocess.check_call('mv build/out/dashcore-osx-signed.dmg ../dashcore-binaries/'+args.version+'/dashcore-'+args.version+'-osx.dmg', shell=True)
+
+    os.chdir(workdir)
+
+    if args.commit_files:
+        print('\nCommitting '+args.version+' Signed Sigs\n')
+        os.chdir('gitian.sigs')
+        subprocess.check_call(['git', 'add', args.version+'-win-signed/'+args.signer])
+        subprocess.check_call(['git', 'add', args.version+'-osx-signed/'+args.signer])
+        subprocess.check_call(['git', 'commit', '-a', '-m', 'Add '+args.version+' signed binary sigs for '+args.signer])
+        os.chdir(workdir)
+
+def verify():
+    global args, workdir
+    os.chdir('gitian-builder')
+
+    print('\nVerifying v'+args.version+' Linux\n')
+    subprocess.call(['bin/gverify', '-v', '-d', '../gitian.sigs/', '-r', args.version+'-linux', '../dash/contrib/gitian-descriptors/gitian-linux.yml'])
+    print('\nVerifying v'+args.version+' Windows\n')
+    subprocess.call(['bin/gverify', '-v', '-d', '../gitian.sigs/', '-r', args.version+'-win-unsigned', '../dash/contrib/gitian-descriptors/gitian-win.yml'])
+    print('\nVerifying v'+args.version+' MacOS\n')
+    subprocess.call(['bin/gverify', '-v', '-d', '../gitian.sigs/', '-r', args.version+'-osx-unsigned', '../dash/contrib/gitian-descriptors/gitian-osx.yml'])
+    print('\nVerifying v'+args.version+' Signed Windows\n')
+    subprocess.call(['bin/gverify', '-v', '-d', '../gitian.sigs/', '-r', args.version+'-win-signed', '../dash/contrib/gitian-descriptors/gitian-win-signer.yml'])
+    print('\nVerifying v'+args.version+' Signed MacOS\n')
+    subprocess.call(['bin/gverify', '-v', '-d', '../gitian.sigs/', '-r', args.version+'-osx-signed', '../dash/contrib/gitian-descriptors/gitian-osx-signer.yml'])
+
+    os.chdir(workdir)
+
+def main():
+    global args, workdir
+
+    parser = argparse.ArgumentParser(usage='%(prog)s [options] signer version')
+    parser.add_argument('-c', '--commit', action='store_true', dest='commit', help='Indicate that the version argument is for a commit or branch')
+    parser.add_argument('-p', '--pull', action='store_true', dest='pull', help='Indicate that the version argument is the number of a github repository pull request')
+    parser.add_argument('-u', '--url', dest='url', default='https://github.com/dashpay/dash', help='Specify the URL of the repository. Default is %(default)s')
+    parser.add_argument('-v', '--verify', action='store_true', dest='verify', help='Verify the Gitian build')
+    parser.add_argument('-b', '--build', action='store_true', dest='build', help='Do a Gitian build')
+    parser.add_argument('-s', '--sign', action='store_true', dest='sign', help='Make signed binaries for Windows and MacOS')
+    parser.add_argument('-B', '--buildsign', action='store_true', dest='buildsign', help='Build both signed and unsigned binaries')
+    parser.add_argument('-o', '--os', dest='os', default='lwm', help='Specify which Operating Systems the build is for. Default is %(default)s. l for Linux, w for Windows, m for MacOS')
+    parser.add_argument('-j', '--jobs', dest='jobs', default='2', help='Number of processes to use. Default %(default)s')
+    parser.add_argument('-m', '--memory', dest='memory', default='2000', help='Memory to allocate in MiB. Default %(default)s')
+    parser.add_argument('-V', '--virtualization', dest='virtualization', default='docker', help='Specify virtualization technology to use: lxc for LXC, kvm for KVM, docker for Docker. Default is %(default)s')
+    parser.add_argument('-S', '--setup', action='store_true', dest='setup', help='Set up the Gitian building environment. Only works on Debian-based systems (Ubuntu, Debian)')
+    parser.add_argument('-D', '--detach-sign', action='store_true', dest='detach_sign', help='Create the assert file for detached signing. Will not commit anything.')
+    parser.add_argument('-n', '--no-commit', action='store_false', dest='commit_files', help='Do not commit anything to git')
+    parser.add_argument('signer', help='GPG signer to sign each build assert file')
+    parser.add_argument('version', help='Version number, commit, or branch to build. If building a commit or branch, the -c option must be specified')
+
+    args = parser.parse_args()
+    workdir = os.getcwd()
+
+    args.linux = 'l' in args.os
+    args.windows = 'w' in args.os
+    args.macos = 'm' in args.os
+
+    args.is_bionic = b'bionic' in subprocess.check_output(['lsb_release', '-cs'])
+
+    if args.buildsign:
+        args.build = True
+        args.sign = True
+
+    args.sign_prog = 'true' if args.detach_sign else 'gpg --detach-sign'
+
+    args.lxc = (args.virtualization == 'lxc')
+    args.kvm = (args.virtualization == 'kvm')
+    args.docker = (args.virtualization == 'docker')
+
+    script_name = os.path.basename(sys.argv[0])
+    # Set all USE_* environment variables for gitian-builder: USE_LXC, USE_DOCKER and USE_VBOX
+    os.environ['USE_VBOX'] = ''
+    if args.lxc:
+        os.environ['USE_LXC'] = '1'
+        os.environ['USE_DOCKER'] = ''
+        if 'GITIAN_HOST_IP' not in os.environ.keys():
+            os.environ['GITIAN_HOST_IP'] = '10.0.3.1'
+        if 'LXC_GUEST_IP' not in os.environ.keys():
+            os.environ['LXC_GUEST_IP'] = '10.0.3.5'
+    elif args.kvm:
+        os.environ['USE_LXC'] = ''
+        os.environ['USE_DOCKER'] = ''
+    elif args.docker:
+        os.environ['USE_LXC'] = ''
+        os.environ['USE_DOCKER'] = '1'
+    else:
+        print(script_name+': Wrong virtualization option.')
+        print('Try '+script_name+' --help for more information')
+        exit(1)
+
+    # Signer and version shouldn't be empty
+    if args.signer == '':
+        print(script_name+': Missing signer.')
+        print('Try '+script_name+' --help for more information')
+        exit(1)
+    if args.version == '':
+        print(script_name+': Missing version.')
+        print('Try '+script_name+' --help for more information')
+        exit(1)
+
+    # Add leading 'v' for tags
+    if args.commit and args.pull:
+        raise Exception('Cannot have both commit and pull')
+    args.commit = ('' if args.commit else 'v') + args.version
+
+    if args.setup:
+        setup()
+
+    if not args.build and not args.sign and not args.verify:
+        exit(0)
+
+    os.chdir('dash')
+    if args.pull:
+        subprocess.check_call(['git', 'fetch', args.url, 'refs/pull/'+args.version+'/merge'])
+        os.chdir('../gitian-builder/inputs/dash')
+        subprocess.check_call(['git', 'fetch', args.url, 'refs/pull/'+args.version+'/merge'])
+        args.commit = subprocess.check_output(['git', 'show', '-s', '--format=%H', 'FETCH_HEAD'], universal_newlines=True, encoding='utf8').strip()
+        args.version = 'pull-' + args.version
+    print(args.commit)
+    subprocess.check_call(['git', 'fetch'])
+    subprocess.check_call(['git', 'checkout', args.commit])
+    os.chdir(workdir)
+
+    if args.build:
+        build()
+
+    if args.sign:
+        sign()
+
+    if args.verify:
+        verify()
+
+if __name__ == '__main__':
+    main()
diff --git a/contrib/gitian-build.sh b/contrib/gitian-build.sh
deleted file mode 100755
index 8044fbf57575..000000000000
--- a/contrib/gitian-build.sh
+++ /dev/null
@@ -1,423 +0,0 @@
-# Copyright (c) 2016 The Bitcoin Core developers
-# Distributed under the MIT software license, see the accompanying
-# file COPYING or http://www.opensource.org/licenses/mit-license.php.
-
-# What to do
-sign=false
-verify=false
-build=false
-setupenv=false
-
-# Systems to build
-linux=true
-windows=true
-osx=true
-
-# Other Basic variables
-SIGNER=
-VERSION=
-commit=false
-url=https://github.com/dashpay/dash
-proc=2
-mem=2000
-lxc=true
-docker=false
-osslTarUrl=http://downloads.sourceforge.net/project/osslsigncode/osslsigncode/osslsigncode-1.7.1.tar.gz
-osslPatchUrl=https://bitcoincore.org/cfields/osslsigncode-Backports-to-1.7.1.patch
-scriptName=$(basename -- "$0")
-signProg="gpg --detach-sign"
-commitFiles=true
-
-SDK_URL=${SDK_URL:-https://bitcoincore.org/depends-sources/sdks}
-OSX_SDK=${OSX_SDK:-10.11}
-
-# Help Message
-read -d '' usage <<- EOF
-Usage: $scriptName [-c|u|v|b|s|B|o|h|j|m|] signer version
-
-Run this script from the directory containing the dash, gitian-builder, gitian.sigs, and dash-detached-sigs.
-
-Arguments:
-signer          GPG signer to sign each build assert file
-version		Version number, commit, or branch to build. If building a commit or branch, the -c option must be specified
-
-Options:
--c|--commit	Indicate that the version argument is for a commit or branch
--u|--url	Specify the URL of the repository. Default is https://github.com/dashpay/dash
--v|--verify 	Verify the gitian build
--b|--build	Do a gitian build
--s|--sign	Make signed binaries for Windows and Mac OSX
--B|--buildsign	Build both signed and unsigned binaries
--o|--os		Specify which Operating Systems the build is for. Default is lwx. l for linux, w for windows, x for osx
--j		Number of processes to use. Default 2
--m		Memory to allocate in MiB. Default 2000
---kvm           Use KVM
---lxc           Use LXC
---docker        Use Docker
---setup         Setup the gitian building environment. Uses KVM. If you want to use lxc, use the --lxc option. If you want to use Docker, use --docker. Only works on Debian-based systems (Ubuntu, Debian)
---detach-sign   Create the assert file for detached signing. Will not commit anything.
---no-commit     Do not commit anything to git
--h|--help	Print this help message
-EOF
-
-# Get options and arguments
-while :; do
-    case $1 in
-        # Verify
-        -v|--verify)
-	    verify=true
-            ;;
-        # Build
-        -b|--build)
-	    build=true
-            ;;
-        # Sign binaries
-        -s|--sign)
-	    sign=true
-            ;;
-        # Build then Sign
-        -B|--buildsign)
-	    sign=true
-	    build=true
-            ;;
-        # PGP Signer
-        -S|--signer)
-	    if [ -n "$2" ]
-	    then
-		SIGNER="$2"
-		shift
-	    else
-		echo 'Error: "--signer" requires a non-empty argument.'
-		exit 1
-	    fi
-           ;;
-        # Operating Systems
-        -o|--os)
-	    if [ -n "$2" ]
-	    then
-		linux=false
-		windows=false
-		osx=false
-		if [[ "$2" = *"l"* ]]
-		then
-		    linux=true
-		fi
-		if [[ "$2" = *"w"* ]]
-		then
-		    windows=true
-		fi
-		if [[ "$2" = *"x"* ]]
-		then
-		    osx=true
-		fi
-		shift
-	    else
-		echo 'Error: "--os" requires an argument containing an l (for linux), w (for windows), or x (for Mac OSX)\n'
-		exit 1
-	    fi
-	    ;;
-	# Help message
-	-h|--help)
-	    echo "$usage"
-	    exit 0
-	    ;;
-	# Commit or branch
-	-c|--commit)
-	    commit=true
-	    ;;
-	# Number of Processes
-	-j)
-	    if [ -n "$2" ]
-	    then
-		proc=$2
-		shift
-	    else
-		echo 'Error: "-j" requires an argument'
-		exit 1
-	    fi
-	    ;;
-	# Memory to allocate
-	-m)
-	    if [ -n "$2" ]
-	    then
-		mem=$2
-		shift
-	    else
-		echo 'Error: "-m" requires an argument'
-		exit 1
-	    fi
-	    ;;
-	# URL
-	-u)
-	    if [ -n "$2" ]
-	    then
-		url=$2
-		shift
-	    else
-		echo 'Error: "-u" requires an argument'
-		exit 1
-	    fi
-	    ;;
-        # kvm
-        --lxc)
-            lxc=true
-            docker=false
-            ;;
-        # kvm
-        --kvm)
-            lxc=false
-            docker=false
-            ;;
-        # docker
-        --docker)
-            lxc=false
-            docker=true
-            ;;
-        # Detach sign
-        --detach-sign)
-            signProg="true"
-            commitFiles=false
-            ;;
-        # Commit files
-        --no-commit)
-            commitFiles=false
-            ;;
-        # Setup
-        --setup)
-            setup=true
-            ;;
-	*)               # Default case: If no more options then break out of the loop.
-             break
-    esac
-    shift
-done
-
-# Set up LXC
-if [[ $lxc = true ]]
-then
-    export USE_LXC=1
-    export LXC_BRIDGE=lxcbr0
-    sudo ifconfig lxcbr0 up 10.0.3.2
-elif [[ $docker = true ]]
-then
-    export USE_DOCKER=1
-fi
-
-# Check for OSX SDK
-if [[ ! -e "gitian-builder/inputs/MacOSX10.11.sdk.tar.gz" && $osx == true ]]
-then
-    echo "Cannot build for OSX, SDK does not exist. Will build for other OSes"
-    osx=false
-fi
-
-# Get signer
-if [[ -n"$1" ]]
-then
-    SIGNER="$1"
-    shift
-fi
-
-# Get version
-if [[ -n "$1" ]]
-then
-    VERSION=$1
-    COMMIT=$VERSION
-    shift
-fi
-
-# Check that a signer is specified
-if [[ "$SIGNER" == "" ]]
-then
-    echo "$scriptName: Missing signer."
-    echo "Try $scriptName --help for more information"
-    exit 1
-fi
-
-# Check that a version is specified
-if [[ $VERSION == "" ]]
-then
-    echo "$scriptName: Missing version."
-    echo "Try $scriptName --help for more information"
-    exit 1
-fi
-
-# Add a "v" if no -c
-if [[ $commit = false ]]
-then
-	COMMIT="v${VERSION}"
-fi
-echo ${COMMIT}
-
-# Setup build environment
-if [[ $setup = true ]]
-then
-    sudo apt-get install ruby apache2 git apt-cacher-ng python-vm-builder qemu-kvm qemu-utils
-    git clone https://github.com/dashpay/gitian.sigs.git
-    git clone https://github.com/dashpay/dash-detached-sigs.git
-    git clone https://github.com/devrandom/gitian-builder.git
-    pushd ./gitian-builder
-    if [[ -n "$USE_LXC" ]]
-    then
-        sudo apt-get install lxc
-        bin/make-base-vm --suite bionic --arch amd64 --lxc
-    elif [[ -n "$USE_DOCKER" ]]
-    then
-        sudo apt-get install docker-ce
-        bin/make-base-vm --suite bionic --arch amd64 --docker
-    else
-        bin/make-base-vm --suite bionic --arch amd64
-    fi
-    popd
-fi
-
-# Set up build
-pushd ./dash
-git fetch
-git checkout ${COMMIT}
-popd
-
-# Build
-if [[ $build = true ]]
-then
-	# Make output folder
-	mkdir -p ./dashcore-binaries/${VERSION}
-	
-	# Build Dependencies
-	echo ""
-	echo "Building Dependencies"
-	echo ""
-	pushd ./gitian-builder	
-	mkdir -p inputs
-	wget -N -P inputs $osslPatchUrl
-	wget -N -P inputs $osslTarUrl
-	make -C ../dash/depends download SOURCES_PATH=`pwd`/cache/common
-
-	# Linux
-	if [[ $linux = true ]]
-	then
-            echo ""
-	    echo "Compiling ${VERSION} Linux"
-	    echo ""
-	    ./bin/gbuild -j ${proc} -m ${mem} --commit dash=${COMMIT} --url dash=${url} ../dash/contrib/gitian-descriptors/gitian-linux.yml
-	    ./bin/gsign -p "$signProg" --signer "$SIGNER" --release ${VERSION}-linux --destination ../gitian.sigs/ ../dash/contrib/gitian-descriptors/gitian-linux.yml
-	    mv build/out/dashcore-*.tar.gz build/out/src/dashcore-*.tar.gz ../dashcore-binaries/${VERSION}
-	fi
-	# Windows
-	if [[ $windows = true ]]
-	then
-	    echo ""
-	    echo "Compiling ${VERSION} Windows"
-	    echo ""
-	    ./bin/gbuild -j ${proc} -m ${mem} --commit dash=${COMMIT} --url dash=${url} ../dash/contrib/gitian-descriptors/gitian-win.yml
-	    ./bin/gsign -p "$signProg" --signer "$SIGNER" --release ${VERSION}-win-unsigned --destination ../gitian.sigs/ ../dash/contrib/gitian-descriptors/gitian-win.yml
-	    mv build/out/dashcore-*-win-unsigned.tar.gz inputs/dashcore-win-unsigned.tar.gz
-	    mv build/out/dashcore-*.zip build/out/dashcore-*.exe ../dashcore-binaries/${VERSION}
-	fi
-	# Mac OSX
-	if [[ $osx = true ]]
-	then
-	    echo ""
-	    echo "Compiling ${VERSION} Mac OSX"
-	    echo ""
-
-	    if [ -n "$OSX_SDK" ]; then
-	        if [ ! -f inputs/MacOSX${OSX_SDK}.sdk.tar.gz ]; then
-	            curl --location --fail $SDK_URL/MacOSX${OSX_SDK}.sdk.tar.gz -o inputs/MacOSX${OSX_SDK}.sdk.tar.gz
-	        fi
-	    fi
-
-	    ./bin/gbuild -j ${proc} -m ${mem} --commit dash=${COMMIT} --url dash=${url} ../dash/contrib/gitian-descriptors/gitian-osx.yml
-	    ./bin/gsign -p "$signProg" --signer "$SIGNER" --release ${VERSION}-osx-unsigned --destination ../gitian.sigs/ ../dash/contrib/gitian-descriptors/gitian-osx.yml
-	    mv build/out/dashcore-*-osx-unsigned.tar.gz inputs/dashcore-osx-unsigned.tar.gz
-	    mv build/out/dashcore-*.tar.gz build/out/dashcore-*.dmg ../dashcore-binaries/${VERSION}
-	fi
-	popd
-
-        if [[ $commitFiles = true ]]
-        then
-	    # Commit to gitian.sigs repo
-            echo ""
-            echo "Committing ${VERSION} Unsigned Sigs"
-            echo ""
-            pushd gitian.sigs
-            git add ${VERSION}-linux/"${SIGNER}"
-            git add ${VERSION}-win-unsigned/"${SIGNER}"
-            git add ${VERSION}-osx-unsigned/"${SIGNER}"
-            git commit -a -m "Add ${VERSION} unsigned sigs for ${SIGNER}"
-            popd
-        fi
-fi
-
-# Verify the build
-if [[ $verify = true ]]
-then
-	# Linux
-	pushd ./gitian-builder
-	echo ""
-	echo "Verifying v${VERSION} Linux"
-	echo ""
-	./bin/gverify -v -d ../gitian.sigs/ -r ${VERSION}-linux ../dash/contrib/gitian-descriptors/gitian-linux.yml
-	# Windows
-	echo ""
-	echo "Verifying v${VERSION} Windows"
-	echo ""
-	./bin/gverify -v -d ../gitian.sigs/ -r ${VERSION}-win-unsigned ../dash/contrib/gitian-descriptors/gitian-win.yml
-	# Mac OSX	
-	echo ""
-	echo "Verifying v${VERSION} Mac OSX"
-	echo ""	
-	./bin/gverify -v -d ../gitian.sigs/ -r ${VERSION}-osx-unsigned ../dash/contrib/gitian-descriptors/gitian-osx.yml
-	# Signed Windows
-	echo ""
-	echo "Verifying v${VERSION} Signed Windows"
-	echo ""
-	./bin/gverify -v -d ../gitian.sigs/ -r ${VERSION}-osx-signed ../dash/contrib/gitian-descriptors/gitian-osx-signer.yml
-	# Signed Mac OSX
-	echo ""
-	echo "Verifying v${VERSION} Signed Mac OSX"
-	echo ""
-	./bin/gverify -v -d ../gitian.sigs/ -r ${VERSION}-osx-signed ../dash/contrib/gitian-descriptors/gitian-osx-signer.yml
-	popd
-fi
-
-# Sign binaries
-if [[ $sign = true ]]
-then
-	
-        pushd ./gitian-builder
-	# Sign Windows
-	if [[ $windows = true ]]
-	then
-	    echo ""
-	    echo "Signing ${VERSION} Windows"
-	    echo ""
-	    ./bin/gbuild -i --commit signature=${COMMIT} ../dash/contrib/gitian-descriptors/gitian-win-signer.yml
-	    ./bin/gsign -p "$signProg" --signer "$SIGNER" --release ${VERSION}-win-signed --destination ../gitian.sigs/ ../dash/contrib/gitian-descriptors/gitian-win-signer.yml
-	    mv build/out/dashcore-*win64-setup.exe ../dashcore-binaries/${VERSION}
-	    mv build/out/dashcore-*win32-setup.exe ../dashcore-binaries/${VERSION}
-	fi
-	# Sign Mac OSX
-	if [[ $osx = true ]]
-	then
-	    echo ""
-	    echo "Signing ${VERSION} Mac OSX"
-	    echo ""
-	    ./bin/gbuild -i --commit signature=${COMMIT} ../dash/contrib/gitian-descriptors/gitian-osx-signer.yml
-	    ./bin/gsign -p "$signProg" --signer "$SIGNER" --release ${VERSION}-osx-signed --destination ../gitian.sigs/ ../dash/contrib/gitian-descriptors/gitian-osx-signer.yml
-	    mv build/out/dashcore-osx-signed.dmg ../dashcore-binaries/${VERSION}/dashcore-${VERSION}-osx.dmg
-	fi
-	popd
-
-        if [[ $commitFiles = true ]]
-        then
-            # Commit Sigs
-            pushd gitian.sigs
-            echo ""
-            echo "Committing ${VERSION} Signed Sigs"
-            echo ""
-            git add ${VERSION}-win-signed/"${SIGNER}"
-            git add ${VERSION}-osx-signed/"${SIGNER}"
-            git commit -a -m "Add ${VERSION} signed binary sigs for ${SIGNER}"
-            popd
-        fi
-fi
diff --git a/doc/gitian-building.md b/doc/gitian-building.md
index 2538751a4e14..b121091025cc 100644
--- a/doc/gitian-building.md
+++ b/doc/gitian-building.md
@@ -270,14 +270,14 @@ echo "%sudo ALL=NOPASSWD: /usr/bin/lxc-execute" >> /etc/sudoers.d/gitian-lxc
 # make /etc/rc.local script that sets up bridge between guest and host
 echo '#!/bin/sh -e' > /etc/rc.local
 echo 'brctl addbr lxcbr0' >> /etc/rc.local
-echo 'ifconfig lxcbr0 10.0.3.2/24 up' >> /etc/rc.local
+echo 'ifconfig lxcbr0 10.0.3.1/24 up' >> /etc/rc.local
 echo 'iptables -t nat -A POSTROUTING -o eth0 -j MASQUERADE' >> /etc/rc.local
 echo 'echo 1 > /proc/sys/net/ipv4/ip_forward' >> /etc/rc.local
 echo 'exit 0' >> /etc/rc.local
 # make sure that USE_LXC is always set when logging in as debian,
 # and configure LXC IP addresses
 echo 'export USE_LXC=1' >> /home/debian/.profile
-echo 'export GITIAN_HOST_IP=10.0.3.2' >> /home/debian/.profile
+echo 'export GITIAN_HOST_IP=10.0.3.1' >> /home/debian/.profile
 echo 'export LXC_GUEST_IP=10.0.3.5' >> /home/debian/.profile
 reboot
 ```
@@ -344,7 +344,7 @@ There will be a lot of warnings printed during the build of the image. These can
 Getting and building the inputs
 --------------------------------
 
-At this point you have two options, you can either use the automated script (found in [contrib/gitian-build.sh](/contrib/gitian-build.sh)) or you could manually do everything by following this guide. If you're using the automated script, then run it with the "--setup" command. Afterwards, run it with the "--build" command (example: "contrib/gitian-building.sh -b signer 0.13.0"). Otherwise ignore this.
+At this point you have two options, you can either use the automated script (found in [contrib/gitian-build.py](/contrib/gitian-build.py)) or you could manually do everything by following this guide. If you're using the automated script, then run it with the "--setup" command. Afterwards, run it with the "--build" command (example: "contrib/gitian-building.sh -b signer 0.13.0"). Otherwise ignore this.
 
 Follow the instructions in [doc/release-process.md](release-process.md#fetch-and-create-inputs-first-time-or-when-dependency-versions-change)
 in the Dash Core repository under 'Fetch and create inputs' to install sources which require
diff --git a/doc/release-process.md b/doc/release-process.md
index 0a6e4d488f85..c199086d28d3 100644
--- a/doc/release-process.md
+++ b/doc/release-process.md
@@ -24,7 +24,7 @@ Before every major release:
 
 ### First time / New builders
 
-If you're using the automated script (found in [contrib/gitian-build.sh](/contrib/gitian-build.sh)), then at this point you should run it with the "--setup" command. Otherwise ignore this.
+If you're using the automated script (found in [contrib/gitian-build.py](/contrib/gitian-build.py)), then at this point you should run it with the "--setup" command. Otherwise ignore this.
 
 Check out the source code in the following directory hierarchy.
 
@@ -64,7 +64,7 @@ Tag version (or release candidate) in git
 
 ### Setup and perform Gitian builds
 
-If you're using the automated script (found in [contrib/gitian-build.sh](/contrib/gitian-build.sh)), then at this point you should run it with the "--build" command. Otherwise ignore this.
+If you're using the automated script (found in [contrib/gitian-build.py](/contrib/gitian-build.py)), then at this point you should run it with the "--build" command. Otherwise ignore this.
 
 Setup Gitian descriptors:
 

From c9d274518833865d8023218b7ae14cfb11cc66f5 Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Sun, 21 Oct 2018 21:45:16 +0200
Subject: [PATCH 196/400] Use BLS keys for the DIP3 operator key (#2352)

* Use BLS keys for operator keys

* Add "bls generate" RPC to generate BLS keys

* Use unique_ptr to store blsKeyOperator and blsPubKeyOperator

Needed because the Chia BLS library crashes when keys are created before
the library is initialized, even if keys are not used. This is the case here
as we have static instances here.

* Remove unnecessary CheckSignature calls

This seems to be some garbage I left in by mistake.

* Fixed review comments

* Fix rpc help for operator keys

All keys that are used as examples are random. None of the secret keys
belongs to any of the public keys.

* Use .GetHash() instead of ::SerializeHash() for BLS pubkeys in txmempool.cpp

* Rename mapProTxBlsPubKeys to mapProTxBlsPubKeyHashes
---
 qa/rpc-tests/dip3-deterministicmns.py   |  24 +++--
 src/activemasternode.cpp                |  16 +--
 src/activemasternode.h                  |   7 +-
 src/evo/deterministicmns.cpp            |  24 ++---
 src/evo/deterministicmns.h              |  13 +--
 src/evo/providertx.cpp                  |  58 +++++++----
 src/evo/providertx.h                    |  17 ++--
 src/evo/simplifiedmns.cpp               |  10 +-
 src/evo/simplifiedmns.h                 |   5 +-
 src/governance-object.cpp               |  31 +++++-
 src/governance-object.h                 |   3 +
 src/governance-vote.cpp                 |  30 +++++-
 src/governance-vote.h                   |   3 +
 src/init.cpp                            |  29 +++++-
 src/instantx.cpp                        |  32 ++++--
 src/masternode-payments.cpp             |  10 +-
 src/masternode.cpp                      |  22 ++---
 src/masternode.h                        |  15 +--
 src/masternodeman.cpp                   |  46 ++++-----
 src/masternodeman.h                     |   1 -
 src/net_processing.cpp                  |   2 +-
 src/privatesend-client.cpp              |   2 +-
 src/privatesend-server.cpp              |   2 +-
 src/privatesend.cpp                     |  54 ++++++++---
 src/privatesend.h                       |   5 +-
 src/rpc/governance.cpp                  |  26 +++--
 src/rpc/masternode.cpp                  |   4 +-
 src/rpc/rpcevo.cpp                      | 123 ++++++++++++++++++------
 src/test/evo_deterministicmns_tests.cpp |  59 +++++++-----
 src/test/evo_simplifiedmns_tests.cpp    |  42 ++++----
 src/test/test_dash.cpp                  |   1 +
 src/txmempool.cpp                       |  28 ++++--
 src/txmempool.h                         |   3 +
 33 files changed, 485 insertions(+), 262 deletions(-)

diff --git a/qa/rpc-tests/dip3-deterministicmns.py b/qa/rpc-tests/dip3-deterministicmns.py
index c53f48051355..ffb07925072e 100755
--- a/qa/rpc-tests/dip3-deterministicmns.py
+++ b/qa/rpc-tests/dip3-deterministicmns.py
@@ -279,7 +279,9 @@ def create_mn(self, node, idx, alias):
         mn.is_protx = False
         mn.p2p_port = p2p_port(mn.idx)
 
-        mn.mnkey = node.masternode('genkey')
+        blsKey = node.bls('generate')
+        mn.legacyMnkey = node.masternode('genkey')
+        mn.blsMnkey = blsKey['secret']
         mn.collateral_address = node.getnewaddress()
         mn.collateral_txid = node.sendtoaddress(mn.collateral_address, 1000)
         rawtx = node.getrawtransaction(mn.collateral_txid, 1)
@@ -302,10 +304,12 @@ def create_mn_protx(self, node, idx, alias):
         mn.is_protx = True
         mn.p2p_port = p2p_port(mn.idx)
 
+        blsKey = node.bls('generate')
         mn.ownerAddr = node.getnewaddress()
-        mn.operatorAddr = mn.ownerAddr
+        mn.operatorAddr = blsKey['public']
         mn.votingAddr = mn.ownerAddr
-        mn.mnkey = node.dumpprivkey(mn.operatorAddr)
+        mn.legacyMnkey = node.masternode('genkey')
+        mn.blsMnkey = blsKey['secret']
         mn.collateral_address = node.getnewaddress()
 
         mn.collateral_txid = node.protx('register', mn.collateral_address, '1000', '127.0.0.1:%d' % mn.p2p_port, '0', mn.ownerAddr, mn.operatorAddr, mn.votingAddr, 0, mn.collateral_address)
@@ -323,7 +327,7 @@ def create_mn_protx(self, node, idx, alias):
     def start_mn(self, mn):
         while len(self.nodes) <= mn.idx:
             self.nodes.append(None)
-        extra_args = ['-masternode=1', '-masternodeprivkey=%s' % mn.mnkey]
+        extra_args = ['-masternode=1', '-masternodeprivkey=%s' % mn.legacyMnkey, '-masternodeblsprivkey=%s' % mn.blsMnkey]
         n = start_node(mn.idx, self.options.tmpdir, self.extra_args + extra_args, redirect_stderr=True)
         self.nodes[mn.idx] = n
         for i in range(0, self.num_nodes):
@@ -341,7 +345,7 @@ def upgrade_mn_protx(self, mn):
         return mn
 
     def test_protx_update_service(self, mn):
-        self.nodes[0].protx('update_service', mn.collateral_txid, '127.0.0.2:%d' % mn.p2p_port, '0')
+        self.nodes[0].protx('update_service', mn.collateral_txid, '127.0.0.2:%d' % mn.p2p_port, '0', mn.blsMnkey)
         self.nodes[0].generate(1)
         self.sync_all()
         for node in self.nodes:
@@ -351,7 +355,7 @@ def test_protx_update_service(self, mn):
             assert_equal(mn_list['%s-%d' % (mn.collateral_txid, mn.collateral_vout)]['address'], '127.0.0.2:%d' % mn.p2p_port)
 
         # undo
-        self.nodes[0].protx('update_service', mn.collateral_txid, '127.0.0.1:%d' % mn.p2p_port, '0')
+        self.nodes[0].protx('update_service', mn.collateral_txid, '127.0.0.1:%d' % mn.p2p_port, '0', mn.blsMnkey)
         self.nodes[0].generate(1)
 
     def force_finish_mnsync(self, node):
@@ -374,7 +378,7 @@ def force_finish_mnsync_list(self, node):
             time.sleep(0.1)
 
     def write_mnconf_line(self, mn, f):
-        conf_line = "%s %s:%d %s %s %d\n" % (mn.alias, '127.0.0.1', mn.p2p_port, mn.mnkey, mn.collateral_txid, mn.collateral_vout)
+        conf_line = "%s %s:%d %s %s %d\n" % (mn.alias, '127.0.0.1', mn.p2p_port, mn.legacyMnkey, mn.collateral_txid, mn.collateral_vout)
         f.write(conf_line)
 
     def write_mnconf(self, mns):
@@ -594,12 +598,14 @@ def test_fail_create_protx(self, node):
         # Try to create ProTx (should still fail)
         address = node.getnewaddress()
         key = node.getnewaddress()
-        assert_raises_jsonrpc(None, "bad-tx-type", node.protx, 'register', address, '1000', '127.0.0.1:10000', '0', key, key, key, 0, address)
+        blsKey = node.bls('generate')
+        assert_raises_jsonrpc(None, "bad-tx-type", node.protx, 'register', address, '1000', '127.0.0.1:10000', '0', key, blsKey['public'], key, 0, address)
 
     def test_success_create_protx(self, node):
         address = node.getnewaddress()
         key = node.getnewaddress()
-        txid = node.protx('register', address, '1000', '127.0.0.1:10000', '0', key, key, key, 0, address)
+        blsKey = node.bls('generate')
+        txid = node.protx('register', address, '1000', '127.0.0.1:10000', '0', key, blsKey['public'], key, 0, address)
         rawtx = node.getrawtransaction(txid, 1)
         self.mine_double_spend(node, rawtx['vin'], address, use_mnmerkleroot_from_tip=True)
         self.sync_all()
diff --git a/src/activemasternode.cpp b/src/activemasternode.cpp
index 844622f36df9..a2d5e430ef00 100644
--- a/src/activemasternode.cpp
+++ b/src/activemasternode.cpp
@@ -59,7 +59,7 @@ void CActiveDeterministicMasternodeManager::Init()
 
     CDeterministicMNList mnList = deterministicMNManager->GetListAtChainTip();
 
-    CDeterministicMNCPtr dmn = mnList.GetMNByOperatorKey(activeMasternodeInfo.keyIDOperator);
+    CDeterministicMNCPtr dmn = mnList.GetMNByOperatorKey(*activeMasternodeInfo.blsPubKeyOperator);
     if (!dmn) {
         // MN not appeared on the chain yet
         return;
@@ -234,7 +234,7 @@ bool CActiveLegacyMasternodeManager::SendMasternodePing(CConnman& connman)
     mnp.nSentinelVersion = nSentinelVersion;
     mnp.fSentinelIsCurrent =
             (abs(GetAdjustedTime() - nSentinelPingTime) < MASTERNODE_SENTINEL_PING_MAX_SECONDS);
-    if(!mnp.Sign(activeMasternodeInfo.keyOperator, activeMasternodeInfo.keyIDOperator)) {
+    if(!mnp.Sign(activeMasternodeInfo.legacyKeyOperator, activeMasternodeInfo.legacyKeyIDOperator)) {
         LogPrintf("CActiveLegacyMasternodeManager::SendMasternodePing -- ERROR: Couldn't sign Masternode Ping\n");
         return false;
     }
@@ -351,11 +351,11 @@ void CActiveLegacyMasternodeManager::ManageStateRemote()
         return;
 
     LogPrint("masternode", "CActiveLegacyMasternodeManager::ManageStateRemote -- Start status = %s, type = %s, pinger enabled = %d, keyIDOperator = %s\n",
-             GetStatus(), GetTypeString(), fPingerEnabled, activeMasternodeInfo.keyIDOperator.ToString());
+             GetStatus(), GetTypeString(), fPingerEnabled, activeMasternodeInfo.legacyKeyIDOperator.ToString());
 
-    mnodeman.CheckMasternode(activeMasternodeInfo.keyIDOperator, true);
+    mnodeman.CheckMasternode(activeMasternodeInfo.legacyKeyIDOperator, true);
     masternode_info_t infoMn;
-    if(mnodeman.GetMasternodeInfo(activeMasternodeInfo.keyIDOperator, infoMn)) {
+    if(mnodeman.GetMasternodeInfo(activeMasternodeInfo.legacyKeyIDOperator, infoMn)) {
         if(infoMn.nProtocolVersion != PROTOCOL_VERSION) {
             nState = ACTIVE_MASTERNODE_NOT_CAPABLE;
             strNotCapableReason = "Invalid protocol version";
@@ -376,12 +376,6 @@ void CActiveLegacyMasternodeManager::ManageStateRemote()
         }
         auto dmn = deterministicMNManager->GetListAtChainTip().GetMN(infoMn.outpoint.hash);
         if (dmn) {
-            if (dmn->pdmnState->keyIDOperator != infoMn.keyIDOperator) {
-                nState = ACTIVE_MASTERNODE_NOT_CAPABLE;
-                strNotCapableReason = strprintf("Masternode collateral is a ProTx and masternode key does not match key from -masternodeprivkey");
-                LogPrintf("CActiveLegacyMasternodeManager::ManageStateRemote -- %s: %s\n", GetStateString(), strNotCapableReason);
-                return;
-            }
             if (dmn->pdmnState->addr != infoMn.addr) {
                 nState = ACTIVE_MASTERNODE_NOT_CAPABLE;
                 strNotCapableReason = strprintf("Masternode collateral is a ProTx and ProTx address does not match local address");
diff --git a/src/activemasternode.h b/src/activemasternode.h
index 22f761caba5a..2101bf3445fc 100644
--- a/src/activemasternode.h
+++ b/src/activemasternode.h
@@ -30,8 +30,11 @@ extern CActiveDeterministicMasternodeManager* activeMasternodeManager;
 
 struct CActiveMasternodeInfo {
     // Keys for the active Masternode
-    CKeyID keyIDOperator;
-    CKey keyOperator;
+    CKeyID legacyKeyIDOperator;
+    CKey legacyKeyOperator;
+
+    std::unique_ptr<CBLSPublicKey> blsPubKeyOperator;
+    std::unique_ptr<CBLSSecretKey> blsKeyOperator;
 
     // Initialized while registering Masternode
     COutPoint outpoint;
diff --git a/src/evo/deterministicmns.cpp b/src/evo/deterministicmns.cpp
index 3e2aef77d071..c3056eea0e5a 100644
--- a/src/evo/deterministicmns.cpp
+++ b/src/evo/deterministicmns.cpp
@@ -33,9 +33,9 @@ std::string CDeterministicMNState::ToString() const
     }
 
     return strprintf("CDeterministicMNState(nRegisteredHeight=%d, nLastPaidHeight=%d, nPoSePenalty=%d, nPoSeRevivedHeight=%d, nPoSeBanHeight=%d, nRevocationReason=%d, "
-                     "keyIDOwner=%s, keyIDOperator=%s, keyIDVoting=%s, addr=%s, nProtocolVersion=%d, payoutAddress=%s, operatorRewardAddress=%s)",
+                     "keyIDOwner=%s, pubKeyOperator=%s, keyIDVoting=%s, addr=%s, nProtocolVersion=%d, payoutAddress=%s, operatorRewardAddress=%s)",
                      nRegisteredHeight, nLastPaidHeight, nPoSePenalty, nPoSeRevivedHeight, nPoSeBanHeight, nRevocationReason,
-                     keyIDOwner.ToString(), keyIDOperator.ToString(), keyIDVoting.ToString(), addr.ToStringIPPort(false), nProtocolVersion, payoutAddress, operatorRewardAddress);
+                     keyIDOwner.ToString(), pubKeyOperator.ToString(), keyIDVoting.ToString(), addr.ToStringIPPort(false), nProtocolVersion, payoutAddress, operatorRewardAddress);
 }
 
 void CDeterministicMNState::ToJson(UniValue& obj) const
@@ -49,7 +49,7 @@ void CDeterministicMNState::ToJson(UniValue& obj) const
     obj.push_back(Pair("PoSeBanHeight", nPoSeBanHeight));
     obj.push_back(Pair("revocationReason", nRevocationReason));
     obj.push_back(Pair("keyIDOwner", keyIDOwner.ToString()));
-    obj.push_back(Pair("keyIDOperator", keyIDOperator.ToString()));
+    obj.push_back(Pair("pubKeyOperator", pubKeyOperator.ToString()));
     obj.push_back(Pair("keyIDVoting", keyIDVoting.ToString()));
     obj.push_back(Pair("addr", addr.ToStringIPPort(false)));
     obj.push_back(Pair("protocolVersion", nProtocolVersion));
@@ -132,10 +132,10 @@ CDeterministicMNCPtr CDeterministicMNList::GetValidMN(const uint256& proTxHash)
     return dmn;
 }
 
-CDeterministicMNCPtr CDeterministicMNList::GetMNByOperatorKey(const CKeyID& keyID)
+CDeterministicMNCPtr CDeterministicMNList::GetMNByOperatorKey(const CBLSPublicKey& pubKey)
 {
     for (const auto& p : mnMap) {
-        if (p.second->pdmnState->keyIDOperator == keyID) {
+        if (p.second->pdmnState->pubKeyOperator == pubKey) {
             return p.second;
         }
     }
@@ -256,7 +256,7 @@ void CDeterministicMNList::AddMN(const CDeterministicMNCPtr &dmn)
     mnMap = mnMap.set(dmn->proTxHash, dmn);
     AddUniqueProperty(dmn, dmn->pdmnState->addr);
     AddUniqueProperty(dmn, dmn->pdmnState->keyIDOwner);
-    AddUniqueProperty(dmn, dmn->pdmnState->keyIDOperator);
+    AddUniqueProperty(dmn, dmn->pdmnState->pubKeyOperator);
 }
 
 void CDeterministicMNList::UpdateMN(const uint256 &proTxHash, const CDeterministicMNStateCPtr &pdmnState)
@@ -270,7 +270,7 @@ void CDeterministicMNList::UpdateMN(const uint256 &proTxHash, const CDeterminist
 
     UpdateUniqueProperty(dmn, oldState->addr, pdmnState->addr);
     UpdateUniqueProperty(dmn, oldState->keyIDOwner, pdmnState->keyIDOwner);
-    UpdateUniqueProperty(dmn, oldState->keyIDOperator, pdmnState->keyIDOperator);
+    UpdateUniqueProperty(dmn, oldState->pubKeyOperator, pdmnState->pubKeyOperator);
 }
 
 void CDeterministicMNList::RemoveMN(const uint256& proTxHash)
@@ -279,7 +279,7 @@ void CDeterministicMNList::RemoveMN(const uint256& proTxHash)
     assert(dmn != nullptr);
     DeleteUniqueProperty(dmn, dmn->pdmnState->addr);
     DeleteUniqueProperty(dmn, dmn->pdmnState->keyIDOwner);
-    DeleteUniqueProperty(dmn, dmn->pdmnState->keyIDOperator);
+    DeleteUniqueProperty(dmn, dmn->pdmnState->pubKeyOperator);
     mnMap = mnMap.erase(proTxHash);
 }
 
@@ -387,7 +387,7 @@ bool CDeterministicMNManager::BuildNewListFromBlock(const CBlock& block, const C
 
             if (newList.HasUniqueProperty(proTx.addr))
                 return _state.DoS(100, false, REJECT_CONFLICT, "bad-protx-dup-addr");
-            if (newList.HasUniqueProperty(proTx.keyIDOwner) || newList.HasUniqueProperty(proTx.keyIDOperator))
+            if (newList.HasUniqueProperty(proTx.keyIDOwner) || newList.HasUniqueProperty(proTx.pubKeyOperator))
                 return _state.DoS(100, false, REJECT_CONFLICT, "bad-protx-dup-key");
 
             auto dmn = std::make_shared<CDeterministicMN>(tx.GetHash(), proTx);
@@ -426,7 +426,7 @@ bool CDeterministicMNManager::BuildNewListFromBlock(const CBlock& block, const C
 
             if (newState->nPoSeBanHeight != -1) {
                 // only revive when all keys are set
-                if (!newState->keyIDOperator.IsNull() && !newState->keyIDVoting.IsNull() && !newState->keyIDOwner.IsNull()) {
+                if (newState->pubKeyOperator.IsValid() && !newState->keyIDVoting.IsNull() && !newState->keyIDOwner.IsNull()) {
                     newState->nPoSeBanHeight = -1;
                     newState->nPoSeRevivedHeight = nHeight;
 
@@ -450,12 +450,12 @@ bool CDeterministicMNManager::BuildNewListFromBlock(const CBlock& block, const C
                 return _state.DoS(100, false, REJECT_INVALID, "bad-protx-hash");
             }
             auto newState = std::make_shared<CDeterministicMNState>(*dmn->pdmnState);
-            if (newState->keyIDOperator != proTx.keyIDOperator) {
+            if (newState->pubKeyOperator != proTx.pubKeyOperator) {
                 // reset all operator related fields and put MN into PoSe-banned state in case the operator key changes
                 newState->ResetOperatorFields();
                 newState->BanIfNotBanned(nHeight);
             }
-            newState->keyIDOperator = proTx.keyIDOperator;
+            newState->pubKeyOperator = proTx.pubKeyOperator;
             newState->keyIDVoting = proTx.keyIDVoting;
             newState->scriptPayout = proTx.scriptPayout;
 
diff --git a/src/evo/deterministicmns.h b/src/evo/deterministicmns.h
index c1699c65b134..b390524f5690 100644
--- a/src/evo/deterministicmns.h
+++ b/src/evo/deterministicmns.h
@@ -9,6 +9,7 @@
 #include "providertx.h"
 #include "dbwrapper.h"
 #include "sync.h"
+#include "bls/bls.h"
 
 #include "immer/map.hpp"
 #include "immer/map_transient.hpp"
@@ -30,7 +31,7 @@ class CDeterministicMNState
     uint16_t nRevocationReason{CProUpRevTx::REASON_NOT_SPECIFIED};
 
     CKeyID keyIDOwner;
-    CKeyID keyIDOperator;
+    CBLSPublicKey pubKeyOperator;
     CKeyID keyIDVoting;
     CService addr;
     int32_t nProtocolVersion;
@@ -42,7 +43,7 @@ class CDeterministicMNState
     CDeterministicMNState(const CProRegTx& proTx)
     {
         keyIDOwner = proTx.keyIDOwner;
-        keyIDOperator = proTx.keyIDOperator;
+        pubKeyOperator = proTx.pubKeyOperator;
         keyIDVoting = proTx.keyIDVoting;
         addr = proTx.addr;
         nProtocolVersion = proTx.nProtocolVersion;
@@ -63,7 +64,7 @@ class CDeterministicMNState
         READWRITE(nPoSeBanHeight);
         READWRITE(nRevocationReason);
         READWRITE(keyIDOwner);
-        READWRITE(keyIDOperator);
+        READWRITE(pubKeyOperator);
         READWRITE(keyIDVoting);
         READWRITE(addr);
         READWRITE(nProtocolVersion);
@@ -73,7 +74,7 @@ class CDeterministicMNState
 
     void ResetOperatorFields()
     {
-        keyIDOperator.SetNull();
+        pubKeyOperator = CBLSPublicKey();
         addr = CService();
         nProtocolVersion = 0;
         scriptOperatorPayout = CScript();
@@ -95,7 +96,7 @@ class CDeterministicMNState
                nPoSeBanHeight == rhs.nPoSeBanHeight &&
                nRevocationReason == rhs.nRevocationReason &&
                keyIDOwner == rhs.keyIDOwner &&
-               keyIDOperator == rhs.keyIDOperator &&
+               pubKeyOperator == rhs.pubKeyOperator &&
                keyIDVoting == rhs.keyIDVoting &&
                addr == rhs.addr &&
                nProtocolVersion == rhs.nProtocolVersion &&
@@ -257,7 +258,7 @@ class CDeterministicMNList
     }
     CDeterministicMNCPtr GetMN(const uint256& proTxHash) const;
     CDeterministicMNCPtr GetValidMN(const uint256& proTxHash) const;
-    CDeterministicMNCPtr GetMNByOperatorKey(const CKeyID& keyID);
+    CDeterministicMNCPtr GetMNByOperatorKey(const CBLSPublicKey& pubKey);
     CDeterministicMNCPtr GetMNPayee() const;
 
     /**
diff --git a/src/evo/providertx.cpp b/src/evo/providertx.cpp
index 8ec449a13a55..c360d512d596 100644
--- a/src/evo/providertx.cpp
+++ b/src/evo/providertx.cpp
@@ -42,15 +42,31 @@ static bool CheckService(const uint256& proTxHash, const ProTx& proTx, const CBl
 }
 
 template <typename ProTx>
-static bool CheckInputsHashAndSig(const CTransaction &tx, const ProTx& proTx, const CKeyID &keyID, CValidationState& state)
+static bool CheckSig(const ProTx& proTx, const CKeyID& keyID, CValidationState& state)
+{
+    std::string strError;
+    if (!CHashSigner::VerifyHash(::SerializeHash(proTx), keyID, proTx.vchSig, strError))
+        return state.DoS(100, false, REJECT_INVALID, "bad-protx-sig", false, strError);
+    return true;
+}
+
+template <typename ProTx>
+static bool CheckSig(const ProTx& proTx, const CBLSPublicKey& pubKey, CValidationState& state)
+{
+    if (!proTx.sig.VerifyInsecure(pubKey, ::SerializeHash(proTx)))
+        return state.DoS(100, false, REJECT_INVALID, "bad-protx-sig", false);
+    return true;
+}
+
+template <typename ProTx, typename PubKey>
+static bool CheckInputsHashAndSig(const CTransaction &tx, const ProTx& proTx, const PubKey& pubKey, CValidationState& state)
 {
     uint256 inputsHash = CalcTxInputsHash(tx);
     if (inputsHash != proTx.inputsHash)
         return state.DoS(100, false, REJECT_INVALID, "bad-protx-inputs-hash");
 
-    std::string strError;
-    if (!CHashSigner::VerifyHash(::SerializeHash(proTx), keyID, proTx.vchSig, strError))
-        return state.DoS(100, false, REJECT_INVALID, "bad-protx-sig", false, strError);
+    if (!CheckSig(proTx, pubKey, state))
+        return false;
 
     return true;
 }
@@ -70,7 +86,7 @@ bool CheckProRegTx(const CTransaction& tx, const CBlockIndex* pindexPrev, CValid
         return state.DoS(10, false, REJECT_INVALID, "bad-protx-collateral-index");
     if (tx.vout[ptx.nCollateralIndex].nValue != 1000 * COIN)
         return state.DoS(10, false, REJECT_INVALID, "bad-protx-collateral");
-    if (ptx.keyIDOwner.IsNull() || ptx.keyIDOperator.IsNull() || ptx.keyIDVoting.IsNull())
+    if (ptx.keyIDOwner.IsNull() || !ptx.pubKeyOperator.IsValid() || ptx.keyIDVoting.IsNull())
         return state.DoS(10, false, REJECT_INVALID, "bad-protx-key-null");
     // we may support P2SH later, but restrict it for now (while in transitioning phase from old MN list to deterministic list)
     if (!ptx.scriptPayout.IsPayToPublicKeyHash())
@@ -82,7 +98,7 @@ bool CheckProRegTx(const CTransaction& tx, const CBlockIndex* pindexPrev, CValid
         return state.DoS(10, false, REJECT_INVALID, "bad-protx-payee-dest");
     }
     // don't allow reuse of collateral key for other keys (don't allow people to put the collateral key onto an online server)
-    if (payoutDest == CTxDestination(ptx.keyIDOwner) || payoutDest == CTxDestination(ptx.keyIDOperator) || payoutDest == CTxDestination(ptx.keyIDVoting)) {
+    if (payoutDest == CTxDestination(ptx.keyIDOwner) || payoutDest == CTxDestination(ptx.keyIDVoting)) {
         return state.DoS(10, false, REJECT_INVALID, "bad-protx-payee-reuse");
     }
 
@@ -101,12 +117,12 @@ bool CheckProRegTx(const CTransaction& tx, const CBlockIndex* pindexPrev, CValid
 
     if (pindexPrev) {
         auto mnList = deterministicMNManager->GetListForBlock(pindexPrev->GetBlockHash());
-        if (mnList.HasUniqueProperty(ptx.keyIDOwner) || mnList.HasUniqueProperty(ptx.keyIDOperator)) {
+        if (mnList.HasUniqueProperty(ptx.keyIDOwner) || mnList.HasUniqueProperty(ptx.pubKeyOperator)) {
             return state.DoS(10, false, REJECT_DUPLICATE, "bad-protx-dup-key");
         }
 
         if (!deterministicMNManager->IsDeterministicMNsSporkActive(pindexPrev->nHeight)) {
-            if (ptx.keyIDOwner != ptx.keyIDOperator || ptx.keyIDOwner != ptx.keyIDVoting) {
+            if (ptx.keyIDOwner != ptx.keyIDVoting) {
                 return state.DoS(10, false, REJECT_INVALID, "bad-protx-key-not-same");
             }
         }
@@ -147,7 +163,7 @@ bool CheckProUpServTx(const CTransaction& tx, const CBlockIndex* pindexPrev, CVa
         }
 
         // we can only check the signature if pindexPrev != NULL and the MN is known
-        if (!CheckInputsHashAndSig(tx, ptx, mn->pdmnState->keyIDOperator, state))
+        if (!CheckInputsHashAndSig(tx, ptx, mn->pdmnState->pubKeyOperator, state))
             return false;
     }
 
@@ -165,7 +181,7 @@ bool CheckProUpRegTx(const CTransaction& tx, const CBlockIndex* pindexPrev, CVal
     if (ptx.nVersion > CProRegTx::CURRENT_VERSION)
         return state.DoS(100, false, REJECT_INVALID, "bad-protx-version");
 
-    if (ptx.keyIDOperator.IsNull() || ptx.keyIDVoting.IsNull())
+    if (!ptx.pubKeyOperator.IsValid() || ptx.keyIDVoting.IsNull())
         return state.DoS(10, false, REJECT_INVALID, "bad-protx-key-null");
     // we may support P2SH later, but restrict it for now (while in transitioning phase from old MN list to deterministic list)
     if (!ptx.scriptPayout.IsPayToPublicKeyHash())
@@ -184,7 +200,7 @@ bool CheckProUpRegTx(const CTransaction& tx, const CBlockIndex* pindexPrev, CVal
             return state.DoS(100, false, REJECT_INVALID, "bad-protx-hash");
 
         // don't allow reuse of collateral key for other keys (don't allow people to put the collateral key onto an online server)
-        if (payoutDest == CTxDestination(dmn->pdmnState->keyIDOwner) || payoutDest == CTxDestination(ptx.keyIDOperator) || payoutDest == CTxDestination(ptx.keyIDVoting)) {
+        if (payoutDest == CTxDestination(dmn->pdmnState->keyIDOwner) || payoutDest == CTxDestination(ptx.keyIDVoting)) {
             return state.DoS(10, false, REJECT_INVALID, "bad-protx-payee-reuse");
         }
 
@@ -197,15 +213,15 @@ bool CheckProUpRegTx(const CTransaction& tx, const CBlockIndex* pindexPrev, CVal
         if (coin.out.scriptPubKey != ptx.scriptPayout)
             return state.DoS(10, false, REJECT_INVALID, "bad-protx-payee-collateral");
 
-        if (mnList.HasUniqueProperty(ptx.keyIDOperator)) {
-            auto otherDmn = mnList.GetUniquePropertyMN(ptx.keyIDOperator);
+        if (mnList.HasUniqueProperty(ptx.pubKeyOperator)) {
+            auto otherDmn = mnList.GetUniquePropertyMN(ptx.pubKeyOperator);
             if (ptx.proTxHash != otherDmn->proTxHash) {
                 return state.DoS(10, false, REJECT_DUPLICATE, "bad-protx-dup-key");
             }
         }
 
         if (!deterministicMNManager->IsDeterministicMNsSporkActive(pindexPrev->nHeight)) {
-            if (dmn->pdmnState->keyIDOwner != ptx.keyIDOperator || dmn->pdmnState->keyIDOwner != ptx.keyIDVoting) {
+            if (dmn->pdmnState->keyIDOwner != ptx.keyIDVoting) {
                 return state.DoS(10, false, REJECT_INVALID, "bad-protx-key-not-same");
             }
         }
@@ -239,7 +255,7 @@ bool CheckProUpRevTx(const CTransaction& tx, const CBlockIndex* pindexPrev, CVal
         if (!dmn)
             return state.DoS(100, false, REJECT_INVALID, "bad-protx-hash");
 
-        if (!CheckInputsHashAndSig(tx, ptx, dmn->pdmnState->keyIDOperator, state))
+        if (!CheckInputsHashAndSig(tx, ptx, dmn->pdmnState->pubKeyOperator, state))
             return false;
     }
 
@@ -254,8 +270,8 @@ std::string CProRegTx::ToString() const
         payee = CBitcoinAddress(dest).ToString();
     }
 
-    return strprintf("CProRegTx(nVersion=%d, nProtocolVersion=%d, nCollateralIndex=%d, addr=%s, nOperatorReward=%f, keyIDOwner=%s, keyIDOperator=%s, keyIDVoting=%s, scriptPayout=%s)",
-        nVersion, nProtocolVersion, nCollateralIndex, addr.ToString(), (double)nOperatorReward / 100, keyIDOwner.ToString(), keyIDOperator.ToString(), keyIDVoting.ToString(), payee);
+    return strprintf("CProRegTx(nVersion=%d, nProtocolVersion=%d, nCollateralIndex=%d, addr=%s, nOperatorReward=%f, keyIDOwner=%s, pubKeyOperator=%s, keyIDVoting=%s, scriptPayout=%s)",
+        nVersion, nProtocolVersion, nCollateralIndex, addr.ToString(), (double)nOperatorReward / 100, keyIDOwner.ToString(), pubKeyOperator.ToString(), keyIDVoting.ToString(), payee);
 }
 
 void CProRegTx::ToJson(UniValue& obj) const
@@ -267,7 +283,7 @@ void CProRegTx::ToJson(UniValue& obj) const
     obj.push_back(Pair("collateralIndex", (int)nCollateralIndex));
     obj.push_back(Pair("service", addr.ToString(false)));
     obj.push_back(Pair("keyIDOwner", keyIDOwner.ToString()));
-    obj.push_back(Pair("keyIDOperator", keyIDOperator.ToString()));
+    obj.push_back(Pair("pubKeyOperator", pubKeyOperator.ToString()));
     obj.push_back(Pair("keyIDVoting", keyIDVoting.ToString()));
 
     CTxDestination dest;
@@ -316,8 +332,8 @@ std::string CProUpRegTx::ToString() const
         payee = CBitcoinAddress(dest).ToString();
     }
 
-    return strprintf("CProUpRegTx(nVersion=%d, proTxHash=%s, keyIDOperator=%s, keyIDVoting=%s, payoutAddress=%s)",
-                     nVersion, proTxHash.ToString(), keyIDOperator.ToString(), keyIDVoting.ToString(), payee);
+    return strprintf("CProUpRegTx(nVersion=%d, proTxHash=%s, pubKeyOperator=%s, keyIDVoting=%s, payoutAddress=%s)",
+                     nVersion, proTxHash.ToString(), pubKeyOperator.ToString(), keyIDVoting.ToString(), payee);
 }
 
 void CProUpRegTx::ToJson(UniValue& obj) const
@@ -326,7 +342,7 @@ void CProUpRegTx::ToJson(UniValue& obj) const
     obj.setObject();
     obj.push_back(Pair("version", nVersion));
     obj.push_back(Pair("proTxHash", proTxHash.ToString()));
-    obj.push_back(Pair("keyIDOperator", keyIDOperator.ToString()));
+    obj.push_back(Pair("pubKeyOperator", pubKeyOperator.ToString()));
     obj.push_back(Pair("keyIDVoting", keyIDVoting.ToString()));
     CTxDestination dest;
     if (ExtractDestination(scriptPayout, dest)) {
diff --git a/src/evo/providertx.h b/src/evo/providertx.h
index 1aa0f1729ded..41ffa9c738ca 100644
--- a/src/evo/providertx.h
+++ b/src/evo/providertx.h
@@ -7,6 +7,7 @@
 
 #include "primitives/transaction.h"
 #include "consensus/validation.h"
+#include "bls/bls.h"
 
 #include "netaddress.h"
 #include "pubkey.h"
@@ -25,7 +26,7 @@ class CProRegTx
     uint32_t nCollateralIndex{(uint32_t) - 1};
     CService addr;
     CKeyID keyIDOwner;
-    CKeyID keyIDOperator;
+    CBLSPublicKey pubKeyOperator;
     CKeyID keyIDVoting;
     uint16_t nOperatorReward{0};
     CScript scriptPayout;
@@ -43,7 +44,7 @@ class CProRegTx
         READWRITE(nCollateralIndex);
         READWRITE(addr);
         READWRITE(keyIDOwner);
-        READWRITE(keyIDOperator);
+        READWRITE(pubKeyOperator);
         READWRITE(keyIDVoting);
         READWRITE(*(CScriptBase*)(&scriptPayout));
         READWRITE(nOperatorReward);
@@ -69,7 +70,7 @@ class CProUpServTx
     CService addr;
     CScript scriptOperatorPayout;
     uint256 inputsHash; // replay protection
-    std::vector<unsigned char> vchSig;
+    CBLSSignature sig;
 
 public:
     ADD_SERIALIZE_METHODS;
@@ -84,7 +85,7 @@ class CProUpServTx
         READWRITE(*(CScriptBase*)(&scriptOperatorPayout));
         READWRITE(inputsHash);
         if (!(s.GetType() & SER_GETHASH)) {
-            READWRITE(vchSig);
+            READWRITE(sig);
         }
     }
 
@@ -101,7 +102,7 @@ class CProUpRegTx
 public:
     uint16_t nVersion{CURRENT_VERSION}; // message version
     uint256 proTxHash;
-    CKeyID keyIDOperator;
+    CBLSPublicKey pubKeyOperator;
     CKeyID keyIDVoting;
     CScript scriptPayout;
     uint256 inputsHash; // replay protection
@@ -115,7 +116,7 @@ class CProUpRegTx
     {
         READWRITE(nVersion);
         READWRITE(proTxHash);
-        READWRITE(keyIDOperator);
+        READWRITE(pubKeyOperator);
         READWRITE(keyIDVoting);
         READWRITE(*(CScriptBase*)(&scriptPayout));
         READWRITE(inputsHash);
@@ -148,7 +149,7 @@ class CProUpRevTx
     uint256 proTxHash;
     uint16_t nReason{REASON_NOT_SPECIFIED};
     uint256 inputsHash; // replay protection
-    std::vector<unsigned char> vchSig;
+    CBLSSignature sig;
 
 public:
     ADD_SERIALIZE_METHODS;
@@ -161,7 +162,7 @@ class CProUpRevTx
         READWRITE(nReason);
         READWRITE(inputsHash);
         if (!(s.GetType() & SER_GETHASH)) {
-            READWRITE(vchSig);
+            READWRITE(sig);
         }
     }
 
diff --git a/src/evo/simplifiedmns.cpp b/src/evo/simplifiedmns.cpp
index 9c426a9cae94..3b590c9ecf7e 100644
--- a/src/evo/simplifiedmns.cpp
+++ b/src/evo/simplifiedmns.cpp
@@ -15,7 +15,7 @@
 CSimplifiedMNListEntry::CSimplifiedMNListEntry(const CDeterministicMN& dmn) :
     proRegTxHash(dmn.proTxHash),
     service(dmn.pdmnState->addr),
-    keyIDOperator(dmn.pdmnState->keyIDOperator),
+    pubKeyOperator(dmn.pdmnState->pubKeyOperator),
     keyIDVoting(dmn.pdmnState->keyIDVoting),
     isValid(dmn.pdmnState->nPoSeBanHeight == -1)
 {
@@ -30,8 +30,8 @@ uint256 CSimplifiedMNListEntry::CalcHash() const
 
 std::string CSimplifiedMNListEntry::ToString() const
 {
-    return strprintf("CSimplifiedMNListEntry(proRegTxHash=%s, service=%s, keyIDOperator=%s, keyIDVoting=%s, isValie=%d)",
-        proRegTxHash.ToString(), service.ToString(false), keyIDOperator.ToString(), keyIDVoting.ToString(), isValid);
+    return strprintf("CSimplifiedMNListEntry(proRegTxHash=%s, service=%s, pubKeyOperator=%s, keyIDVoting=%s, isValie=%d)",
+        proRegTxHash.ToString(), service.ToString(false), pubKeyOperator.ToString(), keyIDVoting.ToString(), isValid);
 }
 
 void CSimplifiedMNListEntry::ToJson(UniValue& obj) const
@@ -40,8 +40,8 @@ void CSimplifiedMNListEntry::ToJson(UniValue& obj) const
     obj.setObject();
     obj.push_back(Pair("proRegTxHash", proRegTxHash.ToString()));
     obj.push_back(Pair("service", service.ToString(false)));
-    obj.push_back(Pair("keyIDOperator", keyIDOperator.ToString()));
-    obj.push_back(Pair("keyIDVoting", keyIDOperator.ToString()));
+    obj.push_back(Pair("pubKeyOperator", pubKeyOperator.ToString()));
+    obj.push_back(Pair("keyIDVoting", keyIDVoting.ToString()));
     obj.push_back(Pair("isValid", isValid));
 }
 
diff --git a/src/evo/simplifiedmns.h b/src/evo/simplifiedmns.h
index 64465dda8a48..31abaeec001a 100644
--- a/src/evo/simplifiedmns.h
+++ b/src/evo/simplifiedmns.h
@@ -9,6 +9,7 @@
 #include "pubkey.h"
 #include "netaddress.h"
 #include "merkleblock.h"
+#include "bls/bls.h"
 
 class UniValue;
 class CDeterministicMNList;
@@ -19,7 +20,7 @@ class CSimplifiedMNListEntry
 public:
     uint256 proRegTxHash;
     CService service;
-    CKeyID keyIDOperator;
+    CBLSPublicKey pubKeyOperator;
     CKeyID keyIDVoting;
     bool isValid;
 
@@ -35,7 +36,7 @@ class CSimplifiedMNListEntry
     {
         READWRITE(proRegTxHash);
         READWRITE(service);
-        READWRITE(keyIDOperator);
+        READWRITE(pubKeyOperator);
         READWRITE(keyIDVoting);
         READWRITE(isValid);
     }
diff --git a/src/governance-object.cpp b/src/governance-object.cpp
index 839352efa681..276afc578383 100644
--- a/src/governance-object.cpp
+++ b/src/governance-object.cpp
@@ -330,6 +330,24 @@ bool CGovernanceObject::CheckSignature(const CKeyID& keyID) const
     return true;
 }
 
+bool CGovernanceObject::Sign(const CBLSSecretKey& key)
+{
+    CBLSSignature sig = key.Sign(GetSignatureHash());
+    sig.GetBuf(vchSig);
+    return true;
+}
+
+bool CGovernanceObject::CheckSignature(const CBLSPublicKey& pubKey) const
+{
+    CBLSSignature sig;
+    sig.SetBuf(vchSig);
+    if (!sig.VerifyInsecure(pubKey, GetSignatureHash())) {
+        LogPrintf("CGovernanceObject::CheckSignature -- VerifyInsecure() failed\n");
+        return false;
+    }
+    return true;
+}
+
 /**
    Return the actual object from the vchData JSON structure.
 
@@ -508,9 +526,16 @@ bool CGovernanceObject::IsValidLocally(std::string& strError, bool& fMissingMast
         }
 
         // Check that we have a valid MN signature
-        if (!CheckSignature(infoMn.keyIDOperator)) {
-            strError = "Invalid masternode signature for: " + strOutpoint + ", pubkey id = " + infoMn.keyIDOperator.ToString();
-            return false;
+        if (deterministicMNManager->IsDeterministicMNsSporkActive()) {
+            if (!CheckSignature(infoMn.blsPubKeyOperator)) {
+                strError = "Invalid masternode signature for: " + strOutpoint + ", pubkey id = " + infoMn.blsPubKeyOperator.ToString();
+                return false;
+            }
+        } else {
+            if (!CheckSignature(infoMn.legacyKeyIDOperator)) {
+                strError = "Invalid masternode signature for: " + strOutpoint + ", pubkey id = " + infoMn.legacyKeyIDOperator.ToString();
+                return false;
+            }
         }
 
         return true;
diff --git a/src/governance-object.h b/src/governance-object.h
index 58b8e8967df1..e4faa7cdfb1b 100644
--- a/src/governance-object.h
+++ b/src/governance-object.h
@@ -16,6 +16,7 @@
 #include "sync.h"
 #include "util.h"
 #include "utilstrencodings.h"
+#include "bls/bls.h"
 
 #include <univalue.h>
 
@@ -260,6 +261,8 @@ class CGovernanceObject
     void SetMasternodeOutpoint(const COutPoint& outpoint);
     bool Sign(const CKey& key, const CKeyID& keyID);
     bool CheckSignature(const CKeyID& keyID) const;
+    bool Sign(const CBLSSecretKey& key);
+    bool CheckSignature(const CBLSPublicKey& pubKey) const;
 
     std::string GetSignatureMessage() const;
     uint256 GetSignatureHash() const;
diff --git a/src/governance-vote.cpp b/src/governance-vote.cpp
index 7e68675ce753..7b083b986dc6 100644
--- a/src/governance-vote.cpp
+++ b/src/governance-vote.cpp
@@ -214,6 +214,26 @@ bool CGovernanceVote::CheckSignature(const CKeyID& keyID) const
     return true;
 }
 
+bool CGovernanceVote::Sign(const CBLSSecretKey& key)
+{
+    uint256 hash = GetSignatureHash();
+    CBLSSignature sig = key.Sign(hash);
+    sig.GetBuf(vchSig);
+    return true;
+}
+
+bool CGovernanceVote::CheckSignature(const CBLSPublicKey& pubKey) const
+{
+    uint256 hash = GetSignatureHash();
+    CBLSSignature sig;
+    sig.SetBuf(vchSig);
+    if (!sig.VerifyInsecure(pubKey, hash)) {
+        LogPrintf("CGovernanceVote::CheckSignature -- VerifyInsecure() failed\n");
+        return false;
+    }
+    return true;
+}
+
 bool CGovernanceVote::IsValid(bool useVotingKey) const
 {
     if (nTime > GetAdjustedTime() + (60 * 60)) {
@@ -239,7 +259,15 @@ bool CGovernanceVote::IsValid(bool useVotingKey) const
         return false;
     }
 
-    return CheckSignature(useVotingKey ? infoMn.keyIDVoting : infoMn.keyIDOperator);
+    if (useVotingKey) {
+        return CheckSignature(infoMn.keyIDVoting);
+    } else {
+        if (deterministicMNManager->IsDeterministicMNsSporkActive()) {
+            return CheckSignature(infoMn.blsPubKeyOperator);
+        } else {
+            return CheckSignature(infoMn.legacyKeyIDOperator);
+        }
+    }
 }
 
 bool operator==(const CGovernanceVote& vote1, const CGovernanceVote& vote2)
diff --git a/src/governance-vote.h b/src/governance-vote.h
index 0a2ac0489f48..6879e2ba0191 100644
--- a/src/governance-vote.h
+++ b/src/governance-vote.h
@@ -7,6 +7,7 @@
 
 #include "key.h"
 #include "primitives/transaction.h"
+#include "bls/bls.h"
 
 class CGovernanceVote;
 class CConnman;
@@ -96,6 +97,8 @@ class CGovernanceVote
 
     bool Sign(const CKey& key, const CKeyID& keyID);
     bool CheckSignature(const CKeyID& keyID) const;
+    bool Sign(const CBLSSecretKey& key);
+    bool CheckSignature(const CBLSPublicKey& pubKey) const;
     bool IsValid(bool useVotingKey) const;
     void Relay(CConnman& connman) const;
 
diff --git a/src/init.cpp b/src/init.cpp
index 2dd8e1926b36..c8071fc9ae1a 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -1899,21 +1899,44 @@ bool AppInitMain(boost::thread_group& threadGroup, CScheduler& scheduler)
         std::string strMasterNodePrivKey = GetArg("-masternodeprivkey", "");
         if(!strMasterNodePrivKey.empty()) {
             CPubKey pubKeyMasternode;
-            if(!CMessageSigner::GetKeysFromSecret(strMasterNodePrivKey, activeMasternodeInfo.keyOperator, pubKeyMasternode))
+            if(!CMessageSigner::GetKeysFromSecret(strMasterNodePrivKey, activeMasternodeInfo.legacyKeyOperator, pubKeyMasternode))
                 return InitError(_("Invalid masternodeprivkey. Please see documenation."));
 
-            activeMasternodeInfo.keyIDOperator = pubKeyMasternode.GetID();
+            activeMasternodeInfo.legacyKeyIDOperator = pubKeyMasternode.GetID();
 
-            LogPrintf("  keyIDOperator: %s\n", CBitcoinAddress(activeMasternodeInfo.keyIDOperator).ToString());
+            LogPrintf("  keyIDOperator: %s\n", CBitcoinAddress(activeMasternodeInfo.legacyKeyIDOperator).ToString());
         } else {
             return InitError(_("You must specify a masternodeprivkey in the configuration. Please see documentation for help."));
         }
 
+        std::string strMasterNodeBLSPrivKey = GetArg("-masternodeblsprivkey", "");
+        if(!strMasterNodeBLSPrivKey.empty()) {
+            auto binKey = ParseHex(strMasterNodeBLSPrivKey);
+            CBLSSecretKey keyOperator;
+            keyOperator.SetBuf(binKey);
+            if (keyOperator.IsValid()) {
+                activeMasternodeInfo.blsKeyOperator = std::make_unique<CBLSSecretKey>(keyOperator);
+                activeMasternodeInfo.blsPubKeyOperator = std::make_unique<CBLSPublicKey>(activeMasternodeInfo.blsKeyOperator->GetPublicKey());
+                LogPrintf("  blsPubKeyOperator: %s\n", keyOperator.GetPublicKey().ToString());
+            } else {
+                return InitError(_("Invalid masternodeblsprivkey. Please see documenation."));
+            }
+        } else {
+            InitWarning(_("You should specify a masternodeblsprivkey in the configuration. Please see documentation for help."));
+        }
+
         // init and register activeMasternodeManager
         activeMasternodeManager = new CActiveDeterministicMasternodeManager();
         RegisterValidationInterface(activeMasternodeManager);
     }
 
+    if (activeMasternodeInfo.blsKeyOperator == nullptr) {
+        activeMasternodeInfo.blsKeyOperator = std::make_unique<CBLSSecretKey>();
+    }
+    if (activeMasternodeInfo.blsPubKeyOperator == nullptr) {
+        activeMasternodeInfo.blsPubKeyOperator = std::make_unique<CBLSPublicKey>();
+    }
+
 #ifdef ENABLE_WALLET
     LogPrintf("Using masternode config file %s\n", GetMasternodeConfigFile().string());
 
diff --git a/src/instantx.cpp b/src/instantx.cpp
index c67826b4978c..501cafd4ae15 100644
--- a/src/instantx.cpp
+++ b/src/instantx.cpp
@@ -1071,13 +1071,22 @@ bool CTxLockVote::CheckSignature() const
         return false;
     }
 
-    if (sporkManager.IsSporkActive(SPORK_6_NEW_SIGS)) {
+    if (deterministicMNManager->IsDeterministicMNsSporkActive()) {
         uint256 hash = GetSignatureHash();
 
-        if (!CHashSigner::VerifyHash(hash, infoMn.keyIDOperator, vchMasternodeSignature, strError)) {
+        CBLSSignature sig;
+        sig.SetBuf(vchMasternodeSignature);
+        if (!sig.IsValid() || !sig.VerifyInsecure(infoMn.blsPubKeyOperator, hash)) {
+            LogPrintf("CTxLockVote::CheckSignature -- VerifyInsecure() failed\n");
+            return false;
+        }
+    } else if (sporkManager.IsSporkActive(SPORK_6_NEW_SIGS)) {
+        uint256 hash = GetSignatureHash();
+
+        if (!CHashSigner::VerifyHash(hash, infoMn.legacyKeyIDOperator, vchMasternodeSignature, strError)) {
             // could be a signature in old format
             std::string strMessage = txHash.ToString() + outpoint.ToStringShort();
-        if (!CMessageSigner::VerifyMessage(infoMn.keyIDOperator, vchMasternodeSignature, strMessage, strError)) {
+            if (!CMessageSigner::VerifyMessage(infoMn.legacyKeyIDOperator, vchMasternodeSignature, strMessage, strError)) {
                 // nope, not in old format either
                 LogPrintf("CTxLockVote::CheckSignature -- VerifyMessage() failed, error: %s\n", strError);
                 return false;
@@ -1085,7 +1094,7 @@ bool CTxLockVote::CheckSignature() const
         }
     } else {
         std::string strMessage = txHash.ToString() + outpoint.ToStringShort();
-        if (!CMessageSigner::VerifyMessage(infoMn.keyIDOperator, vchMasternodeSignature, strMessage, strError)) {
+        if (!CMessageSigner::VerifyMessage(infoMn.legacyKeyIDOperator, vchMasternodeSignature, strMessage, strError)) {
             LogPrintf("CTxLockVote::CheckSignature -- VerifyMessage() failed, error: %s\n", strError);
             return false;
         }
@@ -1098,27 +1107,32 @@ bool CTxLockVote::Sign()
 {
     std::string strError;
 
-    if (sporkManager.IsSporkActive(SPORK_6_NEW_SIGS)) {
+    if (deterministicMNManager->IsDeterministicMNsSporkActive()) {
+        uint256 hash = GetSignatureHash();
+
+        CBLSSignature sig = activeMasternodeInfo.blsKeyOperator->Sign(hash);
+        sig.GetBuf(vchMasternodeSignature);
+    } else if (sporkManager.IsSporkActive(SPORK_6_NEW_SIGS)) {
         uint256 hash = GetSignatureHash();
 
-        if (!CHashSigner::SignHash(hash, activeMasternodeInfo.keyOperator, vchMasternodeSignature)) {
+        if (!CHashSigner::SignHash(hash, activeMasternodeInfo.legacyKeyOperator, vchMasternodeSignature)) {
             LogPrintf("CTxLockVote::Sign -- SignHash() failed\n");
             return false;
         }
 
-        if (!CHashSigner::VerifyHash(hash, activeMasternodeInfo.keyIDOperator, vchMasternodeSignature, strError)) {
+        if (!CHashSigner::VerifyHash(hash, activeMasternodeInfo.legacyKeyIDOperator, vchMasternodeSignature, strError)) {
             LogPrintf("CTxLockVote::Sign -- VerifyHash() failed, error: %s\n", strError);
             return false;
         }
     } else {
         std::string strMessage = txHash.ToString() + outpoint.ToStringShort();
 
-        if (!CMessageSigner::SignMessage(strMessage, vchMasternodeSignature, activeMasternodeInfo.keyOperator)) {
+        if (!CMessageSigner::SignMessage(strMessage, vchMasternodeSignature, activeMasternodeInfo.legacyKeyOperator)) {
             LogPrintf("CTxLockVote::Sign -- SignMessage() failed\n");
             return false;
         }
 
-        if (!CMessageSigner::VerifyMessage(activeMasternodeInfo.keyIDOperator, vchMasternodeSignature, strMessage, strError)) {
+        if (!CMessageSigner::VerifyMessage(activeMasternodeInfo.legacyKeyIDOperator, vchMasternodeSignature, strMessage, strError)) {
             LogPrintf("CTxLockVote::Sign -- VerifyMessage() failed, error: %s\n", strError);
             return false;
         }
diff --git a/src/masternode-payments.cpp b/src/masternode-payments.cpp
index 97ea640e5fa6..fb1ad614144d 100644
--- a/src/masternode-payments.cpp
+++ b/src/masternode-payments.cpp
@@ -491,7 +491,7 @@ void CMasternodePayments::ProcessMessage(CNode* pfrom, const std::string& strCom
         }
 
         int nDos = 0;
-        if(!vote.CheckSignature(mnInfo.keyIDOperator, nCachedBlockHeight, nDos)) {
+        if(!vote.CheckSignature(mnInfo.legacyKeyIDOperator, nCachedBlockHeight, nDos)) {
             if(nDos) {
                 LOCK(cs_main);
                 LogPrintf("MASTERNODEPAYMENTVOTE -- ERROR: invalid signature\n");
@@ -551,12 +551,12 @@ bool CMasternodePaymentVote::Sign()
     if (sporkManager.IsSporkActive(SPORK_6_NEW_SIGS)) {
         uint256 hash = GetSignatureHash();
 
-        if(!CHashSigner::SignHash(hash, activeMasternodeInfo.keyOperator, vchSig)) {
+        if(!CHashSigner::SignHash(hash, activeMasternodeInfo.legacyKeyOperator, vchSig)) {
             LogPrintf("CMasternodePaymentVote::%s -- SignHash() failed\n", __func__);
             return false;
         }
 
-        if (!CHashSigner::VerifyHash(hash, activeMasternodeInfo.keyIDOperator, vchSig, strError)) {
+        if (!CHashSigner::VerifyHash(hash, activeMasternodeInfo.legacyKeyIDOperator, vchSig, strError)) {
             LogPrintf("CMasternodePaymentVote::%s -- VerifyHash() failed, error: %s\n", __func__, strError);
             return false;
         }
@@ -565,12 +565,12 @@ bool CMasternodePaymentVote::Sign()
                     std::to_string(nBlockHeight) +
                     ScriptToAsmStr(payee);
 
-        if(!CMessageSigner::SignMessage(strMessage, vchSig, activeMasternodeInfo.keyOperator)) {
+        if(!CMessageSigner::SignMessage(strMessage, vchSig, activeMasternodeInfo.legacyKeyOperator)) {
             LogPrintf("CMasternodePaymentVote::%s -- SignMessage() failed\n", __func__);
             return false;
         }
 
-        if(!CMessageSigner::VerifyMessage(activeMasternodeInfo.keyIDOperator, vchSig, strMessage, strError)) {
+        if(!CMessageSigner::VerifyMessage(activeMasternodeInfo.legacyKeyIDOperator, vchSig, strMessage, strError)) {
             LogPrintf("CMasternodePaymentVote::%s -- VerifyMessage() failed, error: %s\n", __func__, strError);
             return false;
         }
diff --git a/src/masternode.cpp b/src/masternode.cpp
index 6dad0e224d31..7e93980ff4f0 100644
--- a/src/masternode.cpp
+++ b/src/masternode.cpp
@@ -56,7 +56,7 @@ CMasternode::CMasternode(const CMasternodeBroadcast& mnb) :
 
 CMasternode::CMasternode(const uint256 &proTxHash, const CDeterministicMNCPtr& dmn) :
     masternode_info_t{ MASTERNODE_ENABLED, dmn->pdmnState->nProtocolVersion, GetAdjustedTime(),
-                       COutPoint(proTxHash, dmn->nCollateralIndex), dmn->pdmnState->addr, CKeyID(), dmn->pdmnState->keyIDOwner, dmn->pdmnState->keyIDOperator, dmn->pdmnState->keyIDVoting},
+                       COutPoint(proTxHash, dmn->nCollateralIndex), dmn->pdmnState->addr, CKeyID(), dmn->pdmnState->keyIDOwner, dmn->pdmnState->pubKeyOperator, dmn->pdmnState->keyIDVoting},
     fAllowMixingTx(true)
 {
     CTxDestination dest;
@@ -74,7 +74,7 @@ bool CMasternode::UpdateFromNewBroadcast(CMasternodeBroadcast& mnb, CConnman& co
 
     pubKeyMasternode = mnb.pubKeyMasternode;
     keyIDOwner = mnb.pubKeyMasternode.GetID();
-    keyIDOperator = mnb.pubKeyMasternode.GetID();
+    legacyKeyIDOperator = mnb.pubKeyMasternode.GetID();
     keyIDVoting = mnb.pubKeyMasternode.GetID();
     sigTime = mnb.sigTime;
     vchSig = mnb.vchSig;
@@ -89,7 +89,7 @@ bool CMasternode::UpdateFromNewBroadcast(CMasternodeBroadcast& mnb, CConnman& co
         mnodeman.mapSeenMasternodePing.insert(std::make_pair(lastPing.GetHash(), lastPing));
     }
     // if it matches our Masternode privkey...
-    if(fMasternodeMode && keyIDOperator == activeMasternodeInfo.keyIDOperator) {
+    if(fMasternodeMode && legacyKeyIDOperator == activeMasternodeInfo.legacyKeyIDOperator) {
         nPoSeBanScore = -MASTERNODE_POSE_BAN_MAX_SCORE;
         if(nProtocolVersion == PROTOCOL_VERSION) {
             // ... and PROTOCOL_VERSION, then we've been remotely activated ...
@@ -203,7 +203,7 @@ void CMasternode::Check(bool fForce)
     }
 
     int nActiveStatePrev = nActiveState;
-    bool fOurMasternode = fMasternodeMode && activeMasternodeInfo.keyIDOperator == keyIDOperator;
+    bool fOurMasternode = fMasternodeMode && activeMasternodeInfo.legacyKeyIDOperator == legacyKeyIDOperator;
 
                    // masternode doesn't meet payment protocol requirements ...
     bool fRequireUpdate = nProtocolVersion < mnpayments.GetMinMasternodePaymentsProto() ||
@@ -512,7 +512,7 @@ bool CMasternodeBroadcast::SimpleCheck(int& nDos)
     }
 
     CScript pubkeyScript2;
-    pubkeyScript2 = GetScriptForDestination(keyIDOperator);
+    pubkeyScript2 = GetScriptForDestination(legacyKeyIDOperator);
 
     if(pubkeyScript2.size() != 25) {
         LogPrintf("CMasternodeBroadcast::SimpleCheck -- keyIDOperator has the wrong size\n");
@@ -569,7 +569,7 @@ bool CMasternodeBroadcast::Update(CMasternode* pmn, int& nDos, CConnman& connman
     }
 
     // if ther was no masternode broadcast recently or if it matches our Masternode privkey...
-    if(!pmn->IsBroadcastedWithin(MASTERNODE_MIN_MNB_SECONDS) || (fMasternodeMode && keyIDOperator == activeMasternodeInfo.keyIDOperator)) {
+    if(!pmn->IsBroadcastedWithin(MASTERNODE_MIN_MNB_SECONDS) || (fMasternodeMode && legacyKeyIDOperator == activeMasternodeInfo.legacyKeyIDOperator)) {
         // take the newest entry
         LogPrintf("CMasternodeBroadcast::Update -- Got UPDATED Masternode entry: addr=%s\n", addr.ToString());
         if(pmn->UpdateFromNewBroadcast(*this, connman)) {
@@ -586,7 +586,7 @@ bool CMasternodeBroadcast::CheckOutpoint(int& nDos)
 {
     // we are a masternode with the same outpoint (i.e. already activated) and this mnb is ours (matches our Masternode privkey)
     // so nothing to do here for us
-    if(fMasternodeMode && outpoint == activeMasternodeInfo.outpoint && keyIDOperator == activeMasternodeInfo.keyIDOperator) {
+    if(fMasternodeMode && outpoint == activeMasternodeInfo.outpoint && legacyKeyIDOperator == activeMasternodeInfo.legacyKeyIDOperator) {
         return false;
     }
 
@@ -692,7 +692,7 @@ bool CMasternodeBroadcast::Sign(const CKey& keyCollateralAddress)
         }
     } else {
         std::string strMessage = addr.ToString(false) + std::to_string(sigTime) +
-                        keyIDCollateralAddress.ToString() + keyIDOperator.ToString() +
+                        keyIDCollateralAddress.ToString() + legacyKeyIDOperator.ToString() +
                         std::to_string(nProtocolVersion);
 
         if (!CMessageSigner::SignMessage(strMessage, vchSig, keyCollateralAddress)) {
@@ -720,7 +720,7 @@ bool CMasternodeBroadcast::CheckSignature(int& nDos) const
         if (!CHashSigner::VerifyHash(hash, keyIDCollateralAddress, vchSig, strError)) {
             // maybe it's in old format
             std::string strMessage = addr.ToString(false) + std::to_string(sigTime) +
-                            keyIDCollateralAddress.ToString() + keyIDOperator.ToString() +
+                            keyIDCollateralAddress.ToString() + legacyKeyIDOperator.ToString() +
                             std::to_string(nProtocolVersion);
 
             if (!CMessageSigner::VerifyMessage(keyIDCollateralAddress, vchSig, strMessage, strError)){
@@ -732,7 +732,7 @@ bool CMasternodeBroadcast::CheckSignature(int& nDos) const
         }
     } else {
         std::string strMessage = addr.ToString(false) + std::to_string(sigTime) +
-                        keyIDCollateralAddress.ToString() + keyIDOperator.ToString() +
+                        keyIDCollateralAddress.ToString() + legacyKeyIDOperator.ToString() +
                         std::to_string(nProtocolVersion);
 
         if(!CMessageSigner::VerifyMessage(keyIDCollateralAddress, vchSig, strMessage, strError)){
@@ -935,7 +935,7 @@ bool CMasternodePing::CheckAndUpdate(CMasternode* pmn, bool fFromNewBroadcast, i
         return false;
     }
 
-    if (!CheckSignature(pmn->keyIDOperator, nDos)) return false;
+    if (!CheckSignature(pmn->legacyKeyIDOperator, nDos)) return false;
 
     // so, ping seems to be ok
 
diff --git a/src/masternode.h b/src/masternode.h
index 6b9be5df6c1e..4af7de98853a 100644
--- a/src/masternode.h
+++ b/src/masternode.h
@@ -8,6 +8,7 @@
 #include "key.h"
 #include "validation.h"
 #include "spork.h"
+#include "bls/bls.h"
 
 #include "evo/deterministicmns.h"
 
@@ -110,15 +111,15 @@ struct masternode_info_t
                       CPubKey const& pkCollAddr, CPubKey const& pkMN) :
         nActiveState{activeState}, nProtocolVersion{protoVer}, sigTime{sTime},
         outpoint{outpnt}, addr{addr},
-        pubKeyCollateralAddress{pkCollAddr}, pubKeyMasternode{pkMN}, keyIDCollateralAddress{pkCollAddr.GetID()}, keyIDOwner{pkMN.GetID()}, keyIDOperator{pkMN.GetID()}, keyIDVoting{pkMN.GetID()} {}
+        pubKeyCollateralAddress{pkCollAddr}, pubKeyMasternode{pkMN}, keyIDCollateralAddress{pkCollAddr.GetID()}, keyIDOwner{pkMN.GetID()}, legacyKeyIDOperator{pkMN.GetID()}, keyIDVoting{pkMN.GetID()} {}
 
     // only called when the network is in deterministic MN list mode
     masternode_info_t(int activeState, int protoVer, int64_t sTime,
                       COutPoint const& outpnt, CService const& addr,
-                      CKeyID const& pkCollAddr, CKeyID const& pkOwner, CKeyID const& pkOperator, CKeyID const& pkVoting) :
+                      CKeyID const& pkCollAddr, CKeyID const& pkOwner, CBLSPublicKey const& pkOperator, CKeyID const& pkVoting) :
         nActiveState{activeState}, nProtocolVersion{protoVer}, sigTime{sTime},
         outpoint{outpnt}, addr{addr},
-        pubKeyCollateralAddress{}, pubKeyMasternode{}, keyIDCollateralAddress{pkCollAddr}, keyIDOwner{pkOwner}, keyIDOperator{pkOperator}, keyIDVoting{pkVoting} {}
+        pubKeyCollateralAddress{}, pubKeyMasternode{}, keyIDCollateralAddress{pkCollAddr}, keyIDOwner{pkOwner}, blsPubKeyOperator{pkOperator}, keyIDVoting{pkVoting} {}
 
     int nActiveState = 0;
     int nProtocolVersion = 0;
@@ -130,7 +131,8 @@ struct masternode_info_t
     CPubKey pubKeyMasternode{}; // this will be invalid/unset when the network switches to deterministic MNs (luckely it's only important for the broadcast hash)
     CKeyID keyIDCollateralAddress{};
     CKeyID keyIDOwner{};
-    CKeyID keyIDOperator{};
+    CKeyID legacyKeyIDOperator{};
+    CBLSPublicKey blsPubKeyOperator;
     CKeyID keyIDVoting{};
 
     int64_t nLastDsq = 0; //the dsq count from the last dsq broadcast of this node
@@ -201,7 +203,8 @@ class CMasternode : public masternode_info_t
         READWRITE(pubKeyMasternode);
         READWRITE(keyIDCollateralAddress);
         READWRITE(keyIDOwner);
-        READWRITE(keyIDOperator);
+        READWRITE(legacyKeyIDOperator);
+        READWRITE(blsPubKeyOperator);
         READWRITE(keyIDVoting);
         READWRITE(lastPing);
         READWRITE(vchSig);
@@ -358,7 +361,7 @@ class CMasternodeBroadcast : public CMasternode
         if (ser_action.ForRead()) {
             keyIDCollateralAddress = pubKeyCollateralAddress.GetID();
             keyIDOwner = pubKeyMasternode.GetID();
-            keyIDOperator = pubKeyMasternode.GetID();
+            legacyKeyIDOperator = pubKeyMasternode.GetID();
             keyIDVoting = pubKeyMasternode.GetID();
         }
     }
diff --git a/src/masternodeman.cpp b/src/masternodeman.cpp
index 1dbda34f9453..65edc1f52ec0 100644
--- a/src/masternodeman.cpp
+++ b/src/masternodeman.cpp
@@ -388,7 +388,7 @@ void CMasternodeMan::AddDeterministicMasternodes()
 
             // make sure we use the splitted keys from now on
             mn->keyIDOwner = dmn->pdmnState->keyIDOwner;
-            mn->keyIDOperator = dmn->pdmnState->keyIDOperator;
+            mn->blsPubKeyOperator = dmn->pdmnState->pubKeyOperator;
             mn->keyIDVoting = dmn->pdmnState->keyIDVoting;
             mn->addr = dmn->pdmnState->addr;
             mn->nProtocolVersion = dmn->pdmnState->nProtocolVersion;
@@ -598,15 +598,10 @@ bool CMasternodeMan::GetMasternodeInfo(const COutPoint& outpoint, masternode_inf
 bool CMasternodeMan::GetMasternodeInfo(const CKeyID& keyIDOperator, masternode_info_t& mnInfoRet) {
     LOCK(cs);
     if (deterministicMNManager->IsDeterministicMNsSporkActive()) {
-        auto mnList = deterministicMNManager->GetListAtChainTip();
-        auto dmn = mnList.GetMNByOperatorKey(keyIDOperator);
-        if (dmn) {
-            return GetMasternodeInfo(COutPoint(dmn->proTxHash, dmn->nCollateralIndex), mnInfoRet);
-        }
         return false;
     } else {
         for (const auto& mnpair : mapMasternodes) {
-            if (mnpair.second.keyIDOperator == keyIDOperator) {
+            if (mnpair.second.legacyKeyIDOperator == keyIDOperator) {
                 mnInfoRet = mnpair.second.GetInfo();
                 return true;
             }
@@ -615,11 +610,6 @@ bool CMasternodeMan::GetMasternodeInfo(const CKeyID& keyIDOperator, masternode_i
     }
 }
 
-bool CMasternodeMan::GetMasternodeInfo(const CPubKey& pubKeyOperator, masternode_info_t& mnInfoRet)
-{
-    return GetMasternodeInfo(pubKeyOperator.GetID(), mnInfoRet);
-}
-
 bool CMasternodeMan::GetMasternodeInfo(const CScript& payee, masternode_info_t& mnInfoRet)
 {
     CTxDestination dest;
@@ -1399,24 +1389,24 @@ void CMasternodeMan::SendVerifyReply(CNode* pnode, CMasternodeVerification& mnv,
     if (sporkManager.IsSporkActive(SPORK_6_NEW_SIGS)) {
         uint256 hash = mnv.GetSignatureHash1(blockHash);
 
-        if(!CHashSigner::SignHash(hash, activeMasternodeInfo.keyOperator, mnv.vchSig1)) {
+        if(!CHashSigner::SignHash(hash, activeMasternodeInfo.legacyKeyOperator, mnv.vchSig1)) {
             LogPrintf("CMasternodeMan::SendVerifyReply -- SignHash() failed\n");
             return;
         }
 
-        if (!CHashSigner::VerifyHash(hash, activeMasternodeInfo.keyIDOperator, mnv.vchSig1, strError)) {
+        if (!CHashSigner::VerifyHash(hash, activeMasternodeInfo.legacyKeyIDOperator, mnv.vchSig1, strError)) {
             LogPrintf("CMasternodeMan::SendVerifyReply -- VerifyHash() failed, error: %s\n", strError);
             return;
         }
     } else {
         std::string strMessage = strprintf("%s%d%s", activeMasternodeInfo.service.ToString(false), mnv.nonce, blockHash.ToString());
 
-        if(!CMessageSigner::SignMessage(strMessage, mnv.vchSig1, activeMasternodeInfo.keyOperator)) {
+        if(!CMessageSigner::SignMessage(strMessage, mnv.vchSig1, activeMasternodeInfo.legacyKeyOperator)) {
             LogPrintf("MasternodeMan::SendVerifyReply -- SignMessage() failed\n");
             return;
         }
 
-        if(!CMessageSigner::VerifyMessage(activeMasternodeInfo.keyIDOperator, mnv.vchSig1, strMessage, strError)) {
+        if(!CMessageSigner::VerifyMessage(activeMasternodeInfo.legacyKeyIDOperator, mnv.vchSig1, strMessage, strError)) {
             LogPrintf("MasternodeMan::SendVerifyReply -- VerifyMessage() failed, error: %s\n", strError);
             return;
         }
@@ -1486,10 +1476,10 @@ void CMasternodeMan::ProcessVerifyReply(CNode* pnode, CMasternodeVerification& m
             if(CAddress(mnpair.second.addr, NODE_NETWORK) == pnode->addr) {
                 bool fFound = false;
                 if (sporkManager.IsSporkActive(SPORK_6_NEW_SIGS)) {
-                    fFound = CHashSigner::VerifyHash(hash1, mnpair.second.keyIDOperator, mnv.vchSig1, strError);
+                    fFound = CHashSigner::VerifyHash(hash1, mnpair.second.legacyKeyIDOperator, mnv.vchSig1, strError);
                     // we don't care about mnv with signature in old format
                 } else {
-                    fFound = CMessageSigner::VerifyMessage(mnpair.second.keyIDOperator, mnv.vchSig1, strMessage1, strError);
+                    fFound = CMessageSigner::VerifyMessage(mnpair.second.legacyKeyIDOperator, mnv.vchSig1, strMessage1, strError);
                 }
                 if (fFound) {
                     // found it!
@@ -1511,12 +1501,12 @@ void CMasternodeMan::ProcessVerifyReply(CNode* pnode, CMasternodeVerification& m
                     if (sporkManager.IsSporkActive(SPORK_6_NEW_SIGS)) {
                         uint256 hash2 = mnv.GetSignatureHash2(blockHash);
 
-                        if(!CHashSigner::SignHash(hash2, activeMasternodeInfo.keyOperator, mnv.vchSig2)) {
+                        if(!CHashSigner::SignHash(hash2, activeMasternodeInfo.legacyKeyOperator, mnv.vchSig2)) {
                             LogPrintf("MasternodeMan::ProcessVerifyReply -- SignHash() failed\n");
                             return;
                         }
 
-                        if(!CHashSigner::VerifyHash(hash2, activeMasternodeInfo.keyIDOperator, mnv.vchSig2, strError)) {
+                        if(!CHashSigner::VerifyHash(hash2, activeMasternodeInfo.legacyKeyIDOperator, mnv.vchSig2, strError)) {
                             LogPrintf("MasternodeMan::ProcessVerifyReply -- VerifyHash() failed, error: %s\n", strError);
                             return;
                         }
@@ -1524,12 +1514,12 @@ void CMasternodeMan::ProcessVerifyReply(CNode* pnode, CMasternodeVerification& m
                         std::string strMessage2 = strprintf("%s%d%s%s%s", mnv.addr.ToString(false), mnv.nonce, blockHash.ToString(),
                                                 mnv.masternodeOutpoint1.ToStringShort(), mnv.masternodeOutpoint2.ToStringShort());
 
-                        if(!CMessageSigner::SignMessage(strMessage2, mnv.vchSig2, activeMasternodeInfo.keyOperator)) {
+                        if(!CMessageSigner::SignMessage(strMessage2, mnv.vchSig2, activeMasternodeInfo.legacyKeyOperator)) {
                             LogPrintf("MasternodeMan::ProcessVerifyReply -- SignMessage() failed\n");
                             return;
                         }
 
-                        if(!CMessageSigner::VerifyMessage(activeMasternodeInfo.keyIDOperator, mnv.vchSig2, strMessage2, strError)) {
+                        if(!CMessageSigner::VerifyMessage(activeMasternodeInfo.legacyKeyIDOperator, mnv.vchSig2, strMessage2, strError)) {
                             LogPrintf("MasternodeMan::ProcessVerifyReply -- VerifyMessage() failed, error: %s\n", strError);
                             return;
                         }
@@ -1642,12 +1632,12 @@ void CMasternodeMan::ProcessVerifyBroadcast(CNode* pnode, const CMasternodeVerif
             uint256 hash1 = mnv.GetSignatureHash1(blockHash);
             uint256 hash2 = mnv.GetSignatureHash2(blockHash);
 
-            if(!CHashSigner::VerifyHash(hash1, pmn1->keyIDOperator, mnv.vchSig1, strError)) {
+            if(!CHashSigner::VerifyHash(hash1, pmn1->legacyKeyIDOperator, mnv.vchSig1, strError)) {
                 LogPrintf("MasternodeMan::ProcessVerifyBroadcast -- VerifyHash() failed, error: %s\n", strError);
                 return;
             }
 
-            if(!CHashSigner::VerifyHash(hash2, pmn2->keyIDOperator, mnv.vchSig2, strError)) {
+            if(!CHashSigner::VerifyHash(hash2, pmn2->legacyKeyIDOperator, mnv.vchSig2, strError)) {
                 LogPrintf("MasternodeMan::ProcessVerifyBroadcast -- VerifyHash() failed, error: %s\n", strError);
                 return;
             }
@@ -1656,12 +1646,12 @@ void CMasternodeMan::ProcessVerifyBroadcast(CNode* pnode, const CMasternodeVerif
             std::string strMessage2 = strprintf("%s%d%s%s%s", mnv.addr.ToString(false), mnv.nonce, blockHash.ToString(),
                                     mnv.masternodeOutpoint1.ToStringShort(), mnv.masternodeOutpoint2.ToStringShort());
 
-            if(!CMessageSigner::VerifyMessage(pmn1->keyIDOperator, mnv.vchSig1, strMessage1, strError)) {
+            if(!CMessageSigner::VerifyMessage(pmn1->legacyKeyIDOperator, mnv.vchSig1, strMessage1, strError)) {
                 LogPrintf("CMasternodeMan::ProcessVerifyBroadcast -- VerifyMessage() for masternode1 failed, error: %s\n", strError);
                 return;
             }
 
-            if(!CMessageSigner::VerifyMessage(pmn2->keyIDOperator, mnv.vchSig2, strMessage2, strError)) {
+            if(!CMessageSigner::VerifyMessage(pmn2->legacyKeyIDOperator, mnv.vchSig2, strMessage2, strError)) {
                 LogPrintf("CMasternodeMan::ProcessVerifyBroadcast -- VerifyMessage() for masternode2 failed, error: %s\n", strError);
                 return;
             }
@@ -1781,7 +1771,7 @@ bool CMasternodeMan::CheckMnbAndUpdateMasternodeList(CNode* pfrom, CMasternodeBr
         Add(mnb);
         masternodeSync.BumpAssetLastTime("CMasternodeMan::CheckMnbAndUpdateMasternodeList - new");
         // if it matches our Masternode privkey...
-        if(fMasternodeMode && mnb.keyIDOperator == activeMasternodeInfo.keyIDOperator) {
+        if(fMasternodeMode && mnb.legacyKeyIDOperator == activeMasternodeInfo.legacyKeyIDOperator) {
             mnb.nPoSeBanScore = -MASTERNODE_POSE_BAN_MAX_SCORE;
             if(mnb.nProtocolVersion == PROTOCOL_VERSION) {
                 // ... and PROTOCOL_VERSION, then we've been remotely activated ...
@@ -1865,7 +1855,7 @@ void CMasternodeMan::CheckMasternode(const CKeyID& keyIDOperator, bool fForce)
     if (deterministicMNManager->IsDeterministicMNsSporkActive())
         return;
     for (auto& mnpair : mapMasternodes) {
-        if (mnpair.second.keyIDOperator == keyIDOperator) {
+        if (mnpair.second.legacyKeyIDOperator == keyIDOperator) {
             mnpair.second.Check(fForce);
             return;
         }
diff --git a/src/masternodeman.h b/src/masternodeman.h
index 750ba90978a0..418ba24c3ff3 100644
--- a/src/masternodeman.h
+++ b/src/masternodeman.h
@@ -173,7 +173,6 @@ class CMasternodeMan
     bool GetMasternodeInfo(const uint256& proTxHash, masternode_info_t& mnInfoRet);
     bool GetMasternodeInfo(const COutPoint& outpoint, masternode_info_t& mnInfoRet);
     bool GetMasternodeInfo(const CKeyID& keyIDOperator, masternode_info_t& mnInfoRet);
-    bool GetMasternodeInfo(const CPubKey& pubKeyOperator, masternode_info_t& mnInfoRet);
     bool GetMasternodeInfo(const CScript& payee, masternode_info_t& mnInfoRet);
 
     /// Find an entry in the masternode list that is next to be paid
diff --git a/src/net_processing.cpp b/src/net_processing.cpp
index e5bf5541c32f..7eb1acd4e609 100644
--- a/src/net_processing.cpp
+++ b/src/net_processing.cpp
@@ -1997,7 +1997,7 @@ bool static ProcessMessage(CNode* pfrom, const std::string& strCommand, CDataStr
                 // we have no idea about (e.g we were offline)? How to handle them?
             }
 
-            if(!dstx.CheckSignature(mn.keyIDOperator)) {
+            if (!dstx.CheckSignature(mn.legacyKeyIDOperator, mn.blsPubKeyOperator)) {
                 LogPrint("privatesend", "DSTX -- CheckSignature() failed for %s\n", hashTx.ToString());
                 return false;
             }
diff --git a/src/privatesend-client.cpp b/src/privatesend-client.cpp
index c82ab9266098..cf14df8ad042 100644
--- a/src/privatesend-client.cpp
+++ b/src/privatesend-client.cpp
@@ -64,7 +64,7 @@ void CPrivateSendClientManager::ProcessMessage(CNode* pfrom, const std::string&
         masternode_info_t infoMn;
         if(!mnodeman.GetMasternodeInfo(dsq.masternodeOutpoint, infoMn)) return;
 
-        if(!dsq.CheckSignature(infoMn.keyIDOperator)) {
+        if(!dsq.CheckSignature(infoMn.legacyKeyIDOperator, infoMn.blsPubKeyOperator)) {
             // we probably have outdated info
             mnodeman.AskForMN(pfrom, dsq.masternodeOutpoint, connman);
             return;
diff --git a/src/privatesend-server.cpp b/src/privatesend-server.cpp
index 4f7b76a38fdc..5bb005836837 100644
--- a/src/privatesend-server.cpp
+++ b/src/privatesend-server.cpp
@@ -102,7 +102,7 @@ void CPrivateSendServer::ProcessMessage(CNode* pfrom, const std::string& strComm
         masternode_info_t mnInfo;
         if(!mnodeman.GetMasternodeInfo(dsq.masternodeOutpoint, mnInfo)) return;
 
-        if(!dsq.CheckSignature(mnInfo.keyIDOperator)) {
+        if(!dsq.CheckSignature(mnInfo.legacyKeyIDOperator, mnInfo.blsPubKeyOperator)) {
             // we probably have outdated info
             mnodeman.AskForMN(pfrom, dsq.masternodeOutpoint, connman);
             return;
diff --git a/src/privatesend.cpp b/src/privatesend.cpp
index 0e3c3bf670b3..20bc0e37df63 100644
--- a/src/privatesend.cpp
+++ b/src/privatesend.cpp
@@ -51,15 +51,19 @@ bool CDarksendQueue::Sign()
 
     std::string strError = "";
 
-    if (sporkManager.IsSporkActive(SPORK_6_NEW_SIGS)) {
+    if (deterministicMNManager->IsDeterministicMNsSporkActive()) {
+        uint256 hash = GetSignatureHash();
+        CBLSSignature sig = activeMasternodeInfo.blsKeyOperator->Sign(hash);
+        sig.GetBuf(vchSig);
+    } else if (sporkManager.IsSporkActive(SPORK_6_NEW_SIGS)) {
         uint256 hash = GetSignatureHash();
 
-        if (!CHashSigner::SignHash(hash, activeMasternodeInfo.keyOperator, vchSig)) {
+        if (!CHashSigner::SignHash(hash, activeMasternodeInfo.legacyKeyOperator, vchSig)) {
             LogPrintf("CDarksendQueue::Sign -- SignHash() failed\n");
             return false;
         }
 
-        if (!CHashSigner::VerifyHash(hash, activeMasternodeInfo.keyIDOperator, vchSig, strError)) {
+        if (!CHashSigner::VerifyHash(hash, activeMasternodeInfo.legacyKeyIDOperator, vchSig, strError)) {
             LogPrintf("CDarksendQueue::Sign -- VerifyHash() failed, error: %s\n", strError);
             return false;
         }
@@ -69,12 +73,12 @@ bool CDarksendQueue::Sign()
                         std::to_string(nTime) +
                         std::to_string(fReady);
 
-        if(!CMessageSigner::SignMessage(strMessage, vchSig, activeMasternodeInfo.keyOperator)) {
+        if(!CMessageSigner::SignMessage(strMessage, vchSig, activeMasternodeInfo.legacyKeyOperator)) {
             LogPrintf("CDarksendQueue::Sign -- SignMessage() failed, %s\n", ToString());
             return false;
         }
 
-        if(!CMessageSigner::VerifyMessage(activeMasternodeInfo.keyIDOperator, vchSig, strMessage, strError)) {
+        if(!CMessageSigner::VerifyMessage(activeMasternodeInfo.legacyKeyIDOperator, vchSig, strMessage, strError)) {
             LogPrintf("CDarksendQueue::Sign -- VerifyMessage() failed, error: %s\n", strError);
             return false;
         }
@@ -83,11 +87,19 @@ bool CDarksendQueue::Sign()
     return true;
 }
 
-bool CDarksendQueue::CheckSignature(const CKeyID& keyIDOperator) const
+bool CDarksendQueue::CheckSignature(const CKeyID& keyIDOperator, const CBLSPublicKey& blsPubKey) const
 {
     std::string strError = "";
+    if (deterministicMNManager->IsDeterministicMNsSporkActive()) {
+        uint256 hash = GetSignatureHash();
 
-    if (sporkManager.IsSporkActive(SPORK_6_NEW_SIGS)) {
+        CBLSSignature sig;
+        sig.SetBuf(vchSig);
+        if (!sig.IsValid() || !sig.VerifyInsecure(blsPubKey, hash)) {
+            LogPrintf("CTxLockVote::CheckSignature -- VerifyInsecure() failed\n");
+            return false;
+        }
+    } else if (sporkManager.IsSporkActive(SPORK_6_NEW_SIGS)) {
         uint256 hash = GetSignatureHash();
 
         if (!CHashSigner::VerifyHash(hash, keyIDOperator, vchSig, strError)) {
@@ -131,27 +143,32 @@ bool CDarksendBroadcastTx::Sign()
 
     std::string strError = "";
 
-    if (sporkManager.IsSporkActive(SPORK_6_NEW_SIGS)) {
+    if (deterministicMNManager->IsDeterministicMNsSporkActive()) {
+        uint256 hash = GetSignatureHash();
+
+        CBLSSignature sig = activeMasternodeInfo.blsKeyOperator->Sign(hash);
+        sig.GetBuf(vchSig);
+    } else if (sporkManager.IsSporkActive(SPORK_6_NEW_SIGS)) {
         uint256 hash = GetSignatureHash();
 
-        if (!CHashSigner::SignHash(hash, activeMasternodeInfo.keyOperator, vchSig)) {
+        if (!CHashSigner::SignHash(hash, activeMasternodeInfo.legacyKeyOperator, vchSig)) {
             LogPrintf("CDarksendBroadcastTx::Sign -- SignHash() failed\n");
             return false;
         }
 
-        if (!CHashSigner::VerifyHash(hash, activeMasternodeInfo.keyIDOperator, vchSig, strError)) {
+        if (!CHashSigner::VerifyHash(hash, activeMasternodeInfo.legacyKeyIDOperator, vchSig, strError)) {
             LogPrintf("CDarksendBroadcastTx::Sign -- VerifyHash() failed, error: %s\n", strError);
             return false;
         }
     } else {
         std::string strMessage = tx->GetHash().ToString() + std::to_string(sigTime);
 
-        if(!CMessageSigner::SignMessage(strMessage, vchSig, activeMasternodeInfo.keyOperator)) {
+        if(!CMessageSigner::SignMessage(strMessage, vchSig, activeMasternodeInfo.legacyKeyOperator)) {
             LogPrintf("CDarksendBroadcastTx::Sign -- SignMessage() failed\n");
             return false;
         }
 
-        if(!CMessageSigner::VerifyMessage(activeMasternodeInfo.keyIDOperator, vchSig, strMessage, strError)) {
+        if(!CMessageSigner::VerifyMessage(activeMasternodeInfo.legacyKeyIDOperator, vchSig, strMessage, strError)) {
             LogPrintf("CDarksendBroadcastTx::Sign -- VerifyMessage() failed, error: %s\n", strError);
             return false;
         }
@@ -160,11 +177,20 @@ bool CDarksendBroadcastTx::Sign()
     return true;
 }
 
-bool CDarksendBroadcastTx::CheckSignature(const CKeyID& keyIDOperator) const
+bool CDarksendBroadcastTx::CheckSignature(const CKeyID& keyIDOperator, const CBLSPublicKey& blsPubKey) const
 {
     std::string strError = "";
 
-    if (sporkManager.IsSporkActive(SPORK_6_NEW_SIGS)) {
+    if (deterministicMNManager->IsDeterministicMNsSporkActive()) {
+        uint256 hash = GetSignatureHash();
+
+        CBLSSignature sig;
+        sig.SetBuf(vchSig);
+        if (!sig.IsValid() || !sig.VerifyInsecure(blsPubKey, hash)) {
+            LogPrintf("CTxLockVote::CheckSignature -- VerifyInsecure() failed\n");
+            return false;
+        }
+    } else if (sporkManager.IsSporkActive(SPORK_6_NEW_SIGS)) {
         uint256 hash = GetSignatureHash();
 
         if (!CHashSigner::VerifyHash(hash, keyIDOperator, vchSig, strError)) {
diff --git a/src/privatesend.h b/src/privatesend.h
index b505c7fbc15a..cad73729ae7e 100644
--- a/src/privatesend.h
+++ b/src/privatesend.h
@@ -12,6 +12,7 @@
 #include "sync.h"
 #include "tinyformat.h"
 #include "timedata.h"
+#include "bls/bls.h"
 
 class CPrivateSend;
 class CConnman;
@@ -229,7 +230,7 @@ class CDarksendQueue
      */
     bool Sign();
     /// Check if we have a valid Masternode address
-    bool CheckSignature(const CKeyID& keyIDOperator) const;
+    bool CheckSignature(const CKeyID& keyIDOperator, const CBLSPublicKey& blsPubKey) const;
 
     bool Relay(CConnman &connman);
 
@@ -307,7 +308,7 @@ class CDarksendBroadcastTx
     uint256 GetSignatureHash() const;
 
     bool Sign();
-    bool CheckSignature(const CKeyID& keyIDOperator) const;
+    bool CheckSignature(const CKeyID& keyIDOperator, const CBLSPublicKey& blsPubKey) const;
 
     void SetConfirmedHeight(int nConfirmedHeightIn) { nConfirmedHeight = nConfirmedHeightIn; }
     bool IsExpired(int nHeight);
diff --git a/src/rpc/governance.cpp b/src/rpc/governance.cpp
index 4084fbfbcade..f0375085c8f0 100644
--- a/src/rpc/governance.cpp
+++ b/src/rpc/governance.cpp
@@ -244,7 +244,7 @@ UniValue gobject_submit(const JSONRPCRequest& request)
 
     bool fMnFound = mnodeman.Has(activeMasternodeInfo.outpoint);
 
-    DBG( std::cout << "gobject: submit activeMasternodeInfo.keyIDOperator = " << activeMasternodeInfo.keyIDOperator.ToString()
+    DBG( std::cout << "gobject: submit activeMasternodeInfo.keyIDOperator = " << activeMasternodeInfo.legacyKeyIDOperator.ToString()
          << ", outpoint = " << activeMasternodeInfo.outpoint.ToStringShort()
          << ", params.size() = " << request.params.size()
          << ", fMnFound = " << fMnFound << std::endl; );
@@ -294,7 +294,11 @@ UniValue gobject_submit(const JSONRPCRequest& request)
     if (govobj.GetObjectType() == GOVERNANCE_OBJECT_TRIGGER) {
         if (fMnFound) {
             govobj.SetMasternodeOutpoint(activeMasternodeInfo.outpoint);
-            govobj.Sign(activeMasternodeInfo.keyOperator, activeMasternodeInfo.keyIDOperator);
+            if (deterministicMNManager->IsDeterministicMNsSporkActive()) {
+                govobj.Sign(*activeMasternodeInfo.blsKeyOperator);
+            } else {
+                govobj.Sign(activeMasternodeInfo.legacyKeyOperator, activeMasternodeInfo.legacyKeyIDOperator);
+            }
         } else {
             LogPrintf("gobject(submit) -- Object submission rejected because node is not a masternode\n");
             throw JSONRPCError(RPC_INVALID_PARAMETER, "Only valid masternodes can submit this type of object");
@@ -353,6 +357,10 @@ UniValue gobject_vote_conf(const JSONRPCRequest& request)
     if (request.fHelp || request.params.size() != 4)
         gobject_vote_conf_help();
 
+    if(deterministicMNManager->IsDeterministicMNsSporkActive()) {
+        throw JSONRPCError(RPC_INVALID_PARAMETER, "Can't use vote-conf when deterministic masternodes are active");
+    }
+
     uint256 hash;
 
     hash = ParseHashV(request.params[1], "Object hash");
@@ -402,20 +410,8 @@ UniValue gobject_vote_conf(const JSONRPCRequest& request)
         return returnObj;
     }
 
-    if (deterministicMNManager->IsDeterministicMNsSporkActive()) {
-        if (govObjType == GOVERNANCE_OBJECT_PROPOSAL && mn.keyIDVoting != activeMasternodeInfo.keyIDOperator) {
-            nFailed++;
-            statusObj.push_back(Pair("result", "failed"));
-            statusObj.push_back(Pair("errorMessage", "Can't vote on proposal when operator key does not match voting key"));
-            resultsObj.push_back(Pair("dash.conf", statusObj));
-            returnObj.push_back(Pair("overall", strprintf("Voted successfully %d time(s) and failed %d time(s).", nSuccessful, nFailed)));
-            returnObj.push_back(Pair("detail", resultsObj));
-            return returnObj;
-        }
-    }
-
     CGovernanceVote vote(mn.outpoint, hash, eVoteSignal, eVoteOutcome);
-    if (!vote.Sign(activeMasternodeInfo.keyOperator, activeMasternodeInfo.keyIDOperator)) {
+    if (!vote.Sign(activeMasternodeInfo.legacyKeyOperator, activeMasternodeInfo.legacyKeyIDOperator)) {
         nFailed++;
         statusObj.push_back(Pair("result", "failed"));
         statusObj.push_back(Pair("errorMessage", "Failure to sign."));
diff --git a/src/rpc/masternode.cpp b/src/rpc/masternode.cpp
index 284278e4dc46..ec700665c943 100644
--- a/src/rpc/masternode.cpp
+++ b/src/rpc/masternode.cpp
@@ -1063,7 +1063,7 @@ UniValue masternodelist(const JSONRPCRequest& request)
                 obj.push_back(Pair(strOutpoint, HexStr(mn.keyIDOwner)));
             } else if (strMode == "keyIDOperator") {
                 if (strFilter !="" && strOutpoint.find(strFilter) == std::string::npos) continue;
-                obj.push_back(Pair(strOutpoint, HexStr(mn.keyIDOperator)));
+                obj.push_back(Pair(strOutpoint, HexStr(mn.legacyKeyIDOperator)));
             } else if (strMode == "keyIDVoting") {
                 if (strFilter !="" && strOutpoint.find(strFilter) == std::string::npos) continue;
                 obj.push_back(Pair(strOutpoint, HexStr(mn.keyIDVoting)));
@@ -1248,7 +1248,7 @@ UniValue masternodebroadcast(const JSONRPCRequest& request)
                 resultObj.push_back(Pair("outpoint", mnb.outpoint.ToStringShort()));
                 resultObj.push_back(Pair("addr", mnb.addr.ToString()));
                 resultObj.push_back(Pair("keyIDCollateralAddress", CBitcoinAddress(mnb.keyIDCollateralAddress).ToString()));
-                resultObj.push_back(Pair("keyIDMasternode", CBitcoinAddress(mnb.keyIDOperator).ToString()));
+                resultObj.push_back(Pair("keyIDMasternode", CBitcoinAddress(mnb.legacyKeyIDOperator).ToString()));
                 resultObj.push_back(Pair("vchSig", EncodeBase64(&mnb.vchSig[0], mnb.vchSig.size())));
                 resultObj.push_back(Pair("sigTime", mnb.sigTime));
                 resultObj.push_back(Pair("protocolVersion", mnb.nProtocolVersion));
diff --git a/src/rpc/rpcevo.cpp b/src/rpc/rpcevo.cpp
index 72a12b5c4c12..63c828d8f5c9 100644
--- a/src/rpc/rpcevo.cpp
+++ b/src/rpc/rpcevo.cpp
@@ -22,6 +22,8 @@
 #include "evo/deterministicmns.h"
 #include "evo/simplifiedmns.h"
 
+#include "bls/bls.h"
+
 #ifdef ENABLE_WALLET
 extern UniValue signrawtransaction(const JSONRPCRequest& request);
 extern UniValue sendrawtransaction(const JSONRPCRequest& request);
@@ -57,15 +59,33 @@ static CKeyID ParsePubKeyIDFromAddress(const std::string& strAddress, const std:
     return keyID;
 }
 
+static CBLSPublicKey ParseBLSPubKey(const std::string& hexKey, const std::string& paramName)
+{
+    auto binKey = ParseHex(hexKey);
+    CBLSPublicKey pubKey;
+    pubKey.SetBuf(binKey);
+    if (!pubKey.IsValid()) {
+        throw JSONRPCError(RPC_INVALID_PARAMETER, strprintf("%s must be a valid BLS address, not %s", paramName, hexKey));
+    }
+    return pubKey;
+}
+
+static CBLSSecretKey ParseBLSSecretKey(const std::string& hexKey, const std::string& paramName)
+{
+    auto binKey = ParseHex(hexKey);
+    CBLSSecretKey secKey;
+    secKey.SetBuf(binKey);
+    if (!secKey.IsValid()) {
+        throw JSONRPCError(RPC_INVALID_PARAMETER, strprintf("%s must be a valid BLS secret key", paramName));
+    }
+    return secKey;
+}
 
 #ifdef ENABLE_WALLET
 
 template<typename SpecialTxPayload>
 static void FundSpecialTx(CMutableTransaction& tx, SpecialTxPayload payload)
 {
-    // resize so that fee calculation is correct
-    payload.vchSig.resize(65);
-
     CDataStream ds(SER_NETWORK, PROTOCOL_VERSION);
     ds << payload;
     tx.vExtraPayload.assign(ds.begin(), ds.end());
@@ -107,6 +127,15 @@ static void SignSpecialTxPayload(const CMutableTransaction& tx, SpecialTxPayload
     }
 }
 
+template<typename SpecialTxPayload>
+static void SignSpecialTxPayload(const CMutableTransaction& tx, SpecialTxPayload& payload, const CBLSSecretKey& key)
+{
+    payload.inputsHash = CalcTxInputsHash(tx);
+
+    uint256 hash = ::SerializeHash(payload);
+    payload.sig = key.Sign(hash);
+}
+
 static std::string SignAndSendSpecialTx(const CMutableTransaction& tx)
 {
     LOCK(cs_main);
@@ -160,7 +189,7 @@ void protx_register_help()
             "9. \"payoutAddress\"       (string, required) The dash address to use for masternode reward payments\n"
             "                         Must match \"collateralAddress\"."
             "\nExamples:\n"
-            + HelpExampleCli("protx", "register \"XwnLY9Tf7Zsef8gMGL2fhWA9ZmMjt4KPwG\" 1000 \"1.2.3.4:1234\" 0 \"93Fd7XY2zF4q9YKTZUSFxLgp4Xs7MuaMnvY9kpvH7V8oXWqsCC1\" XwnLY9Tf7Zsef8gMGL2fhWA9ZmMjt4KPwG")
+            + HelpExampleCli("protx", "register \"XrVhS9LogauRJGJu2sHuryjhpuex4RNPSb\" 1000 \"1.2.3.4:1234\" 0 \"Xt9AMWaYSz7tR7Uo7gzXA3m4QmeWgrR3rr\" \"Xt9AMWaYSz7tR7Uo7gzXA3m4QmeWgrR3rr\" \"Xt9AMWaYSz7tR7Uo7gzXA3m4QmeWgrR3rr\" 0 \"XrVhS9LogauRJGJu2sHuryjhpuex4RNPSb\"")
     );
 }
 
@@ -200,11 +229,8 @@ UniValue protx_register(const JSONRPCRequest& request)
         ptx.nProtocolVersion = PROTOCOL_VERSION;
 
     CKey keyOwner = ParsePrivKey(request.params[5].get_str(), true);
-    CKeyID keyIDOperator = keyOwner.GetPubKey().GetID();
+    CBLSPublicKey pubKeyOperator = ParseBLSPubKey(request.params[6].get_str(), "operator BLS address");
     CKeyID keyIDVoting = keyOwner.GetPubKey().GetID();
-    if (request.params[6].get_str() != "0" && request.params[6].get_str() != "") {
-        keyIDOperator = ParsePubKeyIDFromAddress(request.params[6].get_str(), "operator address");
-    }
     if (request.params[7].get_str() != "0" && request.params[7].get_str() != "") {
         keyIDVoting = ParsePubKeyIDFromAddress(request.params[7].get_str(), "voting address");
     }
@@ -219,10 +245,11 @@ UniValue protx_register(const JSONRPCRequest& request)
         throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, strprintf("invalid payout address: %s", request.params[9].get_str()));
 
     ptx.keyIDOwner = keyOwner.GetPubKey().GetID();
-    ptx.keyIDOperator = keyIDOperator;
+    ptx.pubKeyOperator = pubKeyOperator;
     ptx.keyIDVoting = keyIDVoting;
     ptx.scriptPayout = GetScriptForDestination(payoutAddress.Get());
 
+    SignSpecialTxPayload(tx, ptx, keyOwner); // make sure sig is set, otherwise fee calculation won't be correct
     FundSpecialTx(tx, ptx);
 
     uint32_t collateralIndex = (uint32_t) - 1;
@@ -235,7 +262,7 @@ UniValue protx_register(const JSONRPCRequest& request)
     assert(collateralIndex != (uint32_t) - 1);
     ptx.nCollateralIndex = collateralIndex;
 
-    SignSpecialTxPayload(tx, ptx, keyOwner);
+    SignSpecialTxPayload(tx, ptx, keyOwner); // redo signing
     SetTxPayload(tx, ptx);
 
     return SignAndSendSpecialTx(tx);
@@ -244,7 +271,7 @@ UniValue protx_register(const JSONRPCRequest& request)
 void protx_update_service_help()
 {
     throw std::runtime_error(
-            "protx update_service \"proTxHash\" \"ipAndPort\" protocolVersion (\"operatorPayoutAddress\")\n"
+            "protx update_service \"proTxHash\" \"ipAndPort\" protocolVersion \"operatorKey\" (\"operatorPayoutAddress\")\n"
             "\nCreates and sends a ProUpServTx to the network. This will update the address and protocol version\n"
             "of a masternode. The operator key of the masternode must be known to your wallet.\n"
             "If this is done for a masternode that got PoSe-banned, the ProUpServTx will also revive this masternode.\n"
@@ -254,10 +281,12 @@ void protx_update_service_help()
             "                              Must be unique on the network.\n"
             "3. \"protocolVersion\"          (numeric, required) The protocol version of your masternode.\n"
             "                              Can be 0 to default to the clients protocol version\n"
-            "4. \"operatorPayoutAddress\"    (string, optional) The address used for operator reward payments.\n"
+            "4. \"operatorKey\"              (string, required) The operator private key belonging to the\n"
+            "                              registered operator public key.\n"
+            "5. \"operatorPayoutAddress\"    (string, optional) The address used for operator reward payments.\n"
             "                              Only allowed when the ProRegTx had a non-zero operatorReward value.\n"
             "\nExamples:\n"
-            + HelpExampleCli("protx", "update_service \"0123456701234567012345670123456701234567012345670123456701234567\" \"1.2.3.4:1234\" 0")
+            + HelpExampleCli("protx", "update_service \"0123456701234567012345670123456701234567012345670123456701234567\" \"1.2.3.4:1234\" 0 5a2e15982e62f1e0b7cf9783c64cf7e3af3f90a52d6c40f6f95d624c0b1621cd")
     );
 }
 
@@ -279,8 +308,10 @@ UniValue protx_update_service(const JSONRPCRequest& request)
         ptx.nProtocolVersion = PROTOCOL_VERSION;
     }
 
-    if (request.params.size() > 4) {
-        CBitcoinAddress payoutAddress(request.params[4].get_str());
+    CBLSSecretKey keyOperator = ParseBLSSecretKey(request.params[4].get_str(), "operatorKey");
+
+    if (request.params.size() > 5) {
+        CBitcoinAddress payoutAddress(request.params[5].get_str());
         if (!payoutAddress.IsValid())
             throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, strprintf("invalid operator payout address: %s", request.params[4].get_str()));
         ptx.scriptOperatorPayout = GetScriptForDestination(payoutAddress.Get());
@@ -291,9 +322,8 @@ UniValue protx_update_service(const JSONRPCRequest& request)
         throw std::runtime_error(strprintf("masternode with proTxHash %s not found", ptx.proTxHash.ToString()));
     }
 
-    CKey keyOperator;
-    if (!pwalletMain->GetKey(dmn->pdmnState->keyIDOperator, keyOperator)) {
-        throw std::runtime_error(strprintf("operator key %s not found in your wallet", dmn->pdmnState->keyIDOperator.ToString()));
+    if (keyOperator.GetPublicKey() != dmn->pdmnState->pubKeyOperator) {
+        throw JSONRPCError(RPC_INVALID_PARAMETER, strprintf("the operator key does not belong to the registered public key"));
     }
 
     CMutableTransaction tx;
@@ -316,7 +346,7 @@ void protx_update_registrar_help()
             "The owner key of the masternode must be known to your wallet.\n"
             "\nArguments:\n"
             "1. \"proTxHash\"           (string, required) The hash of the initial ProRegTx.\n"
-            "2. \"operatorKeyAddr\"     (string, required) The operator key address. The private key does not have to be known by your wallet.\n"
+            "2. \"operatorPubKey\"      (string, required) The operator public key. The private key does not have to be known by you.\n"
             "                         It has to match the private key which is later used when operating the masternode.\n"
             "                         If set to \"0\" or an empty string, the last on-chain operator key of the masternode will be used.\n"
             "3. \"votingKeyAddr\"       (string, required) The voting key address. The private key does not have to be known by your wallet.\n"
@@ -326,7 +356,7 @@ void protx_update_registrar_help()
             "                         Must match \"collateralAddress\" of initial ProRegTx.\n"
             "                         If set to \"0\" or an empty string, the last on-chain payout address of the masternode will be used.\n"
             "\nExamples:\n"
-            + HelpExampleCli("protx", "update_registrar \"0123456701234567012345670123456701234567012345670123456701234567\" \"<operatorKeyAddr>\" \"0\" \"XwnLY9Tf7Zsef8gMGL2fhWA9ZmMjt4KPwG\"")
+            + HelpExampleCli("protx", "update_registrar \"0123456701234567012345670123456701234567012345670123456701234567\" \"982eb34b7c7f614f29e5c665bc3605f1beeef85e3395ca12d3be49d2868ecfea5566f11cedfad30c51b2403f2ad95b67\" \"0\" \"XwnLY9Tf7Zsef8gMGL2fhWA9ZmMjt4KPwG\"")
     );
 }
 
@@ -343,12 +373,12 @@ UniValue protx_update_registrar(const JSONRPCRequest& request)
     if (!dmn) {
         throw JSONRPCError(RPC_INVALID_PARAMETER, strprintf("masternode %s not found", ptx.proTxHash.ToString()));
     }
-    ptx.keyIDOperator = dmn->pdmnState->keyIDOperator;
+    ptx.pubKeyOperator = dmn->pdmnState->pubKeyOperator;
     ptx.keyIDVoting = dmn->pdmnState->keyIDVoting;
     ptx.scriptPayout = dmn->pdmnState->scriptPayout;
 
     if (request.params[2].get_str() != "0" && request.params[2].get_str() != "") {
-        ptx.keyIDOperator = ParsePubKeyIDFromAddress(request.params[2].get_str(), "operator address");
+        ptx.pubKeyOperator = ParseBLSPubKey(request.params[2].get_str(), "operator BLS address");
     }
     if (request.params[3].get_str() != "0" && request.params[3].get_str() != "") {
         ptx.keyIDVoting = ParsePubKeyIDFromAddress(request.params[3].get_str(), "operator address");
@@ -386,9 +416,11 @@ void protx_revoke_help()
             "The operator key of the masternode must be known to your wallet.\n"
             "\nArguments:\n"
             "1. \"proTxHash\"           (string, required) The hash of the initial ProRegTx.\n"
-            "2. reason                  (numeric, optional) The reason for revocation.\n"
+            "2. \"operatorKey\"         (string, required) The operator private key belonging to the\n"
+            "                         registered operator public key.\n"
+            "3. reason                  (numeric, optional) The reason for revocation.\n"
             "\nExamples:\n"
-            + HelpExampleCli("protx", "revoke \"0123456701234567012345670123456701234567012345670123456701234567\" \"<operatorKeyAddr>\"")
+            + HelpExampleCli("protx", "revoke \"0123456701234567012345670123456701234567012345670123456701234567\" \"072f36a77261cdd5d64c32d97bac417540eddca1d5612f416feb07ff75a8e240\"")
     );
 }
 
@@ -401,8 +433,10 @@ UniValue protx_revoke(const JSONRPCRequest& request)
     ptx.nVersion = CProRegTx::CURRENT_VERSION;
     ptx.proTxHash = ParseHashV(request.params[1], "proTxHash");
 
-    if (request.params.size() > 2) {
-        int32_t nReason = ParseInt32V(request.params[2], "reason");
+    CBLSSecretKey keyOperator = ParseBLSSecretKey(request.params[2].get_str(), "operatorKey");
+
+    if (request.params.size() > 3) {
+        int32_t nReason = ParseInt32V(request.params[3], "reason");
         if (nReason < 0 || nReason >= CProUpRevTx::REASON_LAST)
             throw JSONRPCError(RPC_INVALID_PARAMETER, strprintf("invalid reason %d, must be between 0 and %d", nReason, CProUpRevTx::REASON_LAST));
         ptx.nReason = (uint16_t)nReason;
@@ -413,9 +447,8 @@ UniValue protx_revoke(const JSONRPCRequest& request)
         throw JSONRPCError(RPC_INVALID_PARAMETER, strprintf("masternode %s not found", ptx.proTxHash.ToString()));
     }
 
-    CKey keyOperator;
-    if (!pwalletMain->GetKey(dmn->pdmnState->keyIDOperator, keyOperator)) {
-        throw std::runtime_error(strprintf("operator key %s not found in your wallet", dmn->pdmnState->keyIDOwner.ToString()));
+    if (keyOperator.GetPublicKey() != dmn->pdmnState->pubKeyOperator) {
+        throw JSONRPCError(RPC_INVALID_PARAMETER, strprintf("the operator key does not belong to the registered public key"));
     }
 
     CMutableTransaction tx;
@@ -471,7 +504,7 @@ UniValue BuildDMNListEntry(const CDeterministicMNCPtr& dmn, bool detailed)
     o.push_back(Pair("confirmations", confirmations));
 
     bool hasOwnerKey = pwalletMain->HaveKey(dmn->pdmnState->keyIDOwner);
-    bool hasOperatorKey = pwalletMain->HaveKey(dmn->pdmnState->keyIDOperator);
+    bool hasOperatorKey = false; //pwalletMain->HaveKey(dmn->pdmnState->keyIDOperator);
     bool hasVotingKey = pwalletMain->HaveKey(dmn->pdmnState->keyIDVoting);
 
     bool ownsCollateral = false;
@@ -522,7 +555,6 @@ UniValue protx_list(const JSONRPCRequest& request)
         deterministicMNManager->GetListAtChainTip().ForEachMN(false, [&](const CDeterministicMNCPtr& dmn) {
             if (setOutpts.count(dmn->proTxHash) ||
                 pwalletMain->HaveKey(dmn->pdmnState->keyIDOwner) ||
-                pwalletMain->HaveKey(dmn->pdmnState->keyIDOperator) ||
                 pwalletMain->HaveKey(dmn->pdmnState->keyIDVoting) ||
                 CheckWalletOwnsScript(dmn->pdmnState->scriptPayout) ||
                 CheckWalletOwnsScript(dmn->pdmnState->scriptOperatorPayout)) {
@@ -646,9 +678,38 @@ UniValue protx(const JSONRPCRequest& request)
 }
 #endif//ENABLE_WALLET
 
+UniValue bls_generate(const JSONRPCRequest& request)
+{
+    CBLSSecretKey sk;
+    sk.MakeNewKey();
+
+    UniValue ret(UniValue::VOBJ);
+    ret.push_back(Pair("secret", sk.ToString()));
+    ret.push_back(Pair("public", sk.GetPublicKey().ToString()));
+    return ret;
+}
+
+UniValue _bls(const JSONRPCRequest& request)
+{
+    if (request.params.empty()) {
+        throw std::runtime_error(
+                "bls \"command\" ...\n"
+        );
+    }
+
+    std::string command = request.params[0].get_str();
+
+    if (command == "generate") {
+        return bls_generate(request);
+    } else {
+        throw std::runtime_error("invalid command: " + command);
+    }
+}
+
 static const CRPCCommand commands[] =
 { //  category              name                      actor (function)         okSafeMode
   //  --------------------- ------------------------  -----------------------  ----------
+    { "evo",                "bls",                    &_bls,                   false, {}  },
 #ifdef ENABLE_WALLET
     // these require the wallet to be enabled to fund the transactions
     { "evo",                "protx",                  &protx,                  false, {}  },
diff --git a/src/test/evo_deterministicmns_tests.cpp b/src/test/evo_deterministicmns_tests.cpp
index af9e241437d0..b14cf8ea4fb9 100644
--- a/src/test/evo_deterministicmns_tests.cpp
+++ b/src/test/evo_deterministicmns_tests.cpp
@@ -94,9 +94,10 @@ static void SignTransaction(CMutableTransaction& tx, const CKey& coinbaseKey)
     }
 }
 
-static CMutableTransaction CreateProRegTx(SimpleUTXOMap& utxos, int port, const CScript& scriptPayout, const CKey& coinbaseKey, CKey& mnKeyRet)
+static CMutableTransaction CreateProRegTx(SimpleUTXOMap& utxos, int port, const CScript& scriptPayout, const CKey& coinbaseKey, CKey& ownerKeyRet, CBLSSecretKey& operatorKeyRet)
 {
-    mnKeyRet.MakeNewKey(true);
+    ownerKeyRet.MakeNewKey(true);
+    operatorKeyRet.MakeNewKey();
 
     CAmount change;
     auto inputs = SelectUTXOs(utxos, 1000 * COIN, change);
@@ -105,9 +106,9 @@ static CMutableTransaction CreateProRegTx(SimpleUTXOMap& utxos, int port, const
     proTx.nProtocolVersion = PROTOCOL_VERSION;
     proTx.nCollateralIndex = 0;
     proTx.addr = LookupNumeric("1.1.1.1", port);
-    proTx.keyIDOwner = mnKeyRet.GetPubKey().GetID();
-    proTx.keyIDOperator = mnKeyRet.GetPubKey().GetID();
-    proTx.keyIDVoting = mnKeyRet.GetPubKey().GetID();
+    proTx.keyIDOwner = ownerKeyRet.GetPubKey().GetID();
+    proTx.pubKeyOperator = operatorKeyRet.GetPublicKey();
+    proTx.keyIDVoting = ownerKeyRet.GetPubKey().GetID();
     proTx.scriptPayout = scriptPayout;
 
     CMutableTransaction tx;
@@ -115,14 +116,14 @@ static CMutableTransaction CreateProRegTx(SimpleUTXOMap& utxos, int port, const
     tx.nType = TRANSACTION_PROVIDER_REGISTER;
     FundTransaction(tx, utxos, scriptPayout, 1000 * COIN, coinbaseKey);
     proTx.inputsHash = CalcTxInputsHash(tx);
-    CHashSigner::SignHash(::SerializeHash(proTx), mnKeyRet, proTx.vchSig);
+    CHashSigner::SignHash(::SerializeHash(proTx), ownerKeyRet, proTx.vchSig);
     SetTxPayload(tx, proTx);
     SignTransaction(tx, coinbaseKey);
 
     return tx;
 }
 
-static CMutableTransaction CreateProUpServTx(SimpleUTXOMap& utxos, const uint256& proTxHash, const CKey& mnKey, int port, const CScript& scriptOperatorPayout, const CKey& coinbaseKey)
+static CMutableTransaction CreateProUpServTx(SimpleUTXOMap& utxos, const uint256& proTxHash, const CBLSSecretKey& operatorKey, int port, const CScript& scriptOperatorPayout, const CKey& coinbaseKey)
 {
     CAmount change;
     auto inputs = SelectUTXOs(utxos, 1 * COIN, change);
@@ -138,21 +139,21 @@ static CMutableTransaction CreateProUpServTx(SimpleUTXOMap& utxos, const uint256
     tx.nType = TRANSACTION_PROVIDER_UPDATE_SERVICE;
     FundTransaction(tx, utxos, GetScriptForDestination(coinbaseKey.GetPubKey().GetID()), 1 * COIN, coinbaseKey);
     proTx.inputsHash = CalcTxInputsHash(tx);
-    CHashSigner::SignHash(::SerializeHash(proTx), mnKey, proTx.vchSig);
+    proTx.sig = operatorKey.Sign(::SerializeHash(proTx));
     SetTxPayload(tx, proTx);
     SignTransaction(tx, coinbaseKey);
 
     return tx;
 }
 
-static CMutableTransaction CreateProUpRegTx(SimpleUTXOMap& utxos, const uint256& proTxHash, const CKey& mnKey, const CKeyID& keyIDOperator, const CKeyID& keyIDVoting, const CScript& scriptPayout, const CKey& coinbaseKey)
+static CMutableTransaction CreateProUpRegTx(SimpleUTXOMap& utxos, const uint256& proTxHash, const CKey& mnKey, const CBLSPublicKey& pubKeyOperator, const CKeyID& keyIDVoting, const CScript& scriptPayout, const CKey& coinbaseKey)
 {
     CAmount change;
     auto inputs = SelectUTXOs(utxos, 1 * COIN, change);
 
     CProUpRegTx proTx;
     proTx.proTxHash = proTxHash;
-    proTx.keyIDOperator = keyIDOperator;
+    proTx.pubKeyOperator = pubKeyOperator;
     proTx.keyIDVoting = keyIDVoting;
     proTx.scriptPayout = scriptPayout;
 
@@ -168,7 +169,7 @@ static CMutableTransaction CreateProUpRegTx(SimpleUTXOMap& utxos, const uint256&
     return tx;
 }
 
-static CMutableTransaction CreateProUpRevTx(SimpleUTXOMap& utxos, const uint256& proTxHash, const CKey& mnKey, const CKey& coinbaseKey)
+static CMutableTransaction CreateProUpRevTx(SimpleUTXOMap& utxos, const uint256& proTxHash, const CBLSSecretKey& operatorKey, const CKey& coinbaseKey)
 {
     CAmount change;
     auto inputs = SelectUTXOs(utxos, 1 * COIN, change);
@@ -181,7 +182,7 @@ static CMutableTransaction CreateProUpRevTx(SimpleUTXOMap& utxos, const uint256&
     tx.nType = TRANSACTION_PROVIDER_UPDATE_REVOKE;
     FundTransaction(tx, utxos, GetScriptForDestination(coinbaseKey.GetPubKey().GetID()), 1 * COIN, coinbaseKey);
     proTx.inputsHash = CalcTxInputsHash(tx);
-    CHashSigner::SignHash(::SerializeHash(proTx), mnKey, proTx.vchSig);
+    proTx.sig = operatorKey.Sign(::SerializeHash(proTx));
     SetTxPayload(tx, proTx);
     SignTransaction(tx, coinbaseKey);
 
@@ -218,8 +219,9 @@ BOOST_AUTO_TEST_SUITE(evo_dip3_activation_tests)
 BOOST_FIXTURE_TEST_CASE(dip3_activation, TestChainDIP3BeforeActivationSetup)
 {
     auto utxos = BuildSimpleUtxoMap(coinbaseTxns);
-    CKey mnKey;
-    auto tx = CreateProRegTx(utxos, 1, GetScriptForDestination(payoutAddress.Get()), coinbaseKey, mnKey);
+    CKey ownerKey;
+    CBLSSecretKey operatorKey;
+    auto tx = CreateProRegTx(utxos, 1, GetScriptForDestination(payoutAddress.Get()), coinbaseKey, ownerKey, operatorKey);
     std::vector<CMutableTransaction> txns = {tx};
 
     int nHeight = chainActive.Height();
@@ -260,14 +262,17 @@ BOOST_FIXTURE_TEST_CASE(dip3_protx, TestChainDIP3Setup)
     int port = 1;
 
     std::vector<uint256> dmnHashes;
-    std::map<uint256, CKey> mnKeys;
+    std::map<uint256, CKey> ownerKeys;
+    std::map<uint256, CBLSSecretKey> operatorKeys;
 
     // register one MN per block
     for (size_t i = 0; i < 6; i++) {
-        CKey mnKey;
-        auto tx = CreateProRegTx(utxos, port++, GenerateRandomAddress(), coinbaseKey, mnKey);
+        CKey ownerKey;
+        CBLSSecretKey operatorKey;
+        auto tx = CreateProRegTx(utxos, port++, GenerateRandomAddress(), coinbaseKey, ownerKey, operatorKey);
         dmnHashes.emplace_back(tx.GetHash());
-        mnKeys.emplace(tx.GetHash(), mnKey);
+        ownerKeys.emplace(tx.GetHash(), ownerKey);
+        operatorKeys.emplace(tx.GetHash(), operatorKey);
         CreateAndProcessBlock({tx}, coinbaseKey);
         deterministicMNManager->UpdatedBlockTip(chainActive.Tip());
 
@@ -302,10 +307,12 @@ BOOST_FIXTURE_TEST_CASE(dip3_protx, TestChainDIP3Setup)
     for (size_t i = 0; i < 3; i++) {
         std::vector<CMutableTransaction> txns;
         for (size_t j = 0; j < 3; j++) {
-            CKey mnKey;
-            auto tx = CreateProRegTx(utxos, port++, GenerateRandomAddress(), coinbaseKey, mnKey);
+            CKey ownerKey;
+            CBLSSecretKey operatorKey;
+            auto tx = CreateProRegTx(utxos, port++, GenerateRandomAddress(), coinbaseKey, ownerKey, operatorKey);
             dmnHashes.emplace_back(tx.GetHash());
-            mnKeys.emplace(tx.GetHash(), mnKey);
+            ownerKeys.emplace(tx.GetHash(), ownerKey);
+            operatorKeys.emplace(tx.GetHash(), operatorKey);
             txns.emplace_back(tx);
         }
         CreateAndProcessBlock(txns, coinbaseKey);
@@ -320,7 +327,7 @@ BOOST_FIXTURE_TEST_CASE(dip3_protx, TestChainDIP3Setup)
     }
 
     // test ProUpServTx
-    auto tx = CreateProUpServTx(utxos, dmnHashes[0], mnKeys[dmnHashes[0]], 1000, CScript(), coinbaseKey);
+    auto tx = CreateProUpServTx(utxos, dmnHashes[0], operatorKeys[dmnHashes[0]], 1000, CScript(), coinbaseKey);
     CreateAndProcessBlock({tx}, coinbaseKey);
     deterministicMNManager->UpdatedBlockTip(chainActive.Tip());
     BOOST_ASSERT(chainActive.Height() == nHeight + 1);
@@ -330,7 +337,7 @@ BOOST_FIXTURE_TEST_CASE(dip3_protx, TestChainDIP3Setup)
     BOOST_ASSERT(dmn != nullptr && dmn->pdmnState->addr.GetPort() == 1000);
 
     // test ProUpRevTx
-    tx = CreateProUpRevTx(utxos, dmnHashes[0], mnKeys[dmnHashes[0]], coinbaseKey);
+    tx = CreateProUpRevTx(utxos, dmnHashes[0], operatorKeys[dmnHashes[0]], coinbaseKey);
     CreateAndProcessBlock({tx}, coinbaseKey);
     deterministicMNManager->UpdatedBlockTip(chainActive.Tip());
     BOOST_ASSERT(chainActive.Height() == nHeight + 1);
@@ -356,10 +363,10 @@ BOOST_FIXTURE_TEST_CASE(dip3_protx, TestChainDIP3Setup)
     }
 
     // test reviving the MN
-    CKey newOperatorKey;
-    newOperatorKey.MakeNewKey(false);
+    CBLSSecretKey newOperatorKey;
+    newOperatorKey.MakeNewKey();
     dmn = deterministicMNManager->GetListAtChainTip().GetMN(dmnHashes[0]);
-    tx = CreateProUpRegTx(utxos, dmnHashes[0], mnKeys[dmnHashes[0]], newOperatorKey.GetPubKey().GetID(), newOperatorKey.GetPubKey().GetID(), dmn->pdmnState->scriptPayout, coinbaseKey);
+    tx = CreateProUpRegTx(utxos, dmnHashes[0], ownerKeys[dmnHashes[0]], newOperatorKey.GetPublicKey(), ownerKeys[dmnHashes[0]].GetPubKey().GetID(), dmn->pdmnState->scriptPayout, coinbaseKey);
     CreateAndProcessBlock({tx}, coinbaseKey);
     deterministicMNManager->UpdatedBlockTip(chainActive.Tip());
     BOOST_ASSERT(chainActive.Height() == nHeight + 1);
diff --git a/src/test/evo_simplifiedmns_tests.cpp b/src/test/evo_simplifiedmns_tests.cpp
index a3684cb3bccb..9e17e65542f2 100644
--- a/src/test/evo_simplifiedmns_tests.cpp
+++ b/src/test/evo_simplifiedmns_tests.cpp
@@ -4,6 +4,7 @@
 
 #include "test/test_dash.h"
 
+#include "bls/bls.h"
 #include "evo/simplifiedmns.h"
 #include "netbase.h"
 
@@ -21,7 +22,13 @@ BOOST_AUTO_TEST_CASE(simplifiedmns_merkleroots)
         std::string ip = strprintf("%d.%d.%d.%d", 0, 0, 0, i);
         Lookup(ip.c_str(), smle.service, i, false);
 
-        smle.keyIDOperator.SetHex(strprintf("%040x", i));
+        uint8_t skBuf[CBLSSecretKey::SerSize];
+        memset(skBuf, 0, sizeof(skBuf));
+        skBuf[0] = (uint8_t)i;
+        CBLSSecretKey sk;
+        sk.SetBuf(skBuf, sizeof(skBuf));
+
+        smle.pubKeyOperator = sk.GetPublicKey();
         smle.keyIDVoting.SetHex(strprintf("%040x", i));
         smle.isValid = true;
 
@@ -29,21 +36,21 @@ BOOST_AUTO_TEST_CASE(simplifiedmns_merkleroots)
     }
 
     std::vector<std::string> expectedHashes = {
-        "aa8bfb825f433bcd6f1039f27c77ed269386e05577b0fe9afc4e16b1af0076b2",
-        "686a19dba9b515f77f11027cd1e92e6a8c650448bf4616101fd5ddbe6e2629e7",
-        "c2efc1b08daa791c71e1d5887be3eaa136381f783fcc5b7efdc5909db38701bb",
-        "ce394197d6e1684467fbf2e1619f71ae9d1a6cf6548b2235e4289f95d4bccbbd",
-        "aeeaf7b498aa7d5fa92ee0028499b4f165c31662f5e9b0a80e6e13b38fd61f8d",
-        "0c1c8dc9dc82eb5432a557580e5d3d930943ce0d0db5daebc51267afb46b6d48",
-        "1c4add10ea844a46734473e48c2f781059b35382219d0cf67d6432b540e0bbbe",
-        "1ae1ad5ff4dd4c09469d21d569a025d467dca1e407581a2815175528e139b7da",
-        "d59b231cdc80ce7eda3a3f37608abda818659c189d31a7ef42024d496e290cbc",
-        "2d5e6c87e3d4e5b3fdd600f561e8dec1ea720560569398006050480232f1257c",
-        "3d6af35f08efeea22f3c8fcb78038e56dac221f3173ca4e2230ea8ae3cbd3c60",
-        "ecf547077c37b79da954c4ef46a3c4fb136746366bfb81192ed01de96fd66348",
-        "626af5fb8192ead7bbd79ad7bfe2c3ea82714fdfd9ac49b88d7a411aa6956853",
-        "6c84a4485fb2ba35b4dcd4d89cbdd3d813446514bb7a2046b6b1b9813beaac0f",
-        "453ca2a83140da73a37794fe6fddd701ea5066f21c2f1df8a33b6ff6134043c3",
+        "1465924a81df1d0fb46d2571e65296c0fddab30d1b4d104f182f80a6e45362fa",
+        "cb466084403067b699a50bd46e53145ebfd57af9a076a13432f524e41ec2d899",
+        "0f6a720d0119f5b83469d884ec2a7d739c1d653142e5d36b569cddaf735a6149",
+        "8794379559c77d67902a5e894739bd574f25ff6cd48612f7156c5fafaefefd4e",
+        "4738d4f17c76b4e61f028d9426f40242eb56977fe805704d980ff57ad3f60b90",
+        "6342b7ce87a299a0fb070ec040a45613f082b0c99395698a6f712e85be87ad06",
+        "0be7143f4fb357333350a7e28606713933e9819c83c71009b9ea97476d86b78e",
+        "d13dfedc920490a8c6d9b555d740f2944ac83eeb8c3923a51261371a8118ffe0",
+        "c0c4638fcefe09380adff61d59c064be03a18690245b89be20223df737590d46",
+        "4cce41032bb341adb9b9f3f6ba1de3c812f0d1630e3a561c7aae00f39e49c6d4",
+        "3e8c9ad9e2cf0520a96b6bc58aafb7009365a1d8f357047a40430b782142ed69",
+        "bde7a1b61a263a7e0dfe474c850c4f9d642d9a03da501a366800e03093e48cd9",
+        "e221a3e14868251083eea718e698cc81739b016665a9024d798a14c0e9417c35",
+        "b1be038e40bc8ee6a19dbbe70c92d7bc0880ccc54c4bd54eab6b7a30d0650ab1",
+        "0607e1d850e27c336e8d65722fc82eae7ab5331fd88a4fbfcff6c3a1bb6364da",
     };
     std::vector<std::string> calculatedHashes;
 
@@ -56,8 +63,9 @@ BOOST_AUTO_TEST_CASE(simplifiedmns_merkleroots)
 
     CSimplifiedMNList sml(entries);
 
-    std::string expectedMerkleRoot = "926efc8dc7b5b060254b102670b918133fea67c5e1bc2703d596e49672878c22";
+    std::string expectedMerkleRoot = "a7fae13820022ddba6cf54ba9b234dfed54ccfa86c2635c5627287f1ffa5497f";
     std::string calculatedMerkleRoot = sml.CalcMerkleRoot(nullptr).ToString();
+    //printf("merkleRoot=\"%s\",\n", calculatedMerkleRoot.c_str());
 
     BOOST_CHECK(expectedMerkleRoot == calculatedMerkleRoot);
 }
diff --git a/src/test/test_dash.cpp b/src/test/test_dash.cpp
index 2654382264d7..b618cc14bed7 100644
--- a/src/test/test_dash.cpp
+++ b/src/test/test_dash.cpp
@@ -43,6 +43,7 @@ extern void noui_connect();
 BasicTestingSetup::BasicTestingSetup(const std::string& chainName)
 {
         ECC_Start();
+        BLSInit();
         SetupEnvironment();
         SetupNetworking();
         InitSignatureCache();
diff --git a/src/txmempool.cpp b/src/txmempool.cpp
index a0eea414685a..f27cb704a2cf 100644
--- a/src/txmempool.cpp
+++ b/src/txmempool.cpp
@@ -448,7 +448,7 @@ bool CTxMemPool::addUnchecked(const uint256& hash, const CTxMemPoolEntry &entry,
         }
         mapProTxAddresses.emplace(proTx.addr, tx.GetHash());
         mapProTxPubKeyIDs.emplace(proTx.keyIDOwner, tx.GetHash());
-        mapProTxPubKeyIDs.emplace(proTx.keyIDOperator, tx.GetHash());
+        mapProTxBlsPubKeyHashes.emplace(proTx.pubKeyOperator.GetHash(), tx.GetHash());
     } else if (tx.nType == TRANSACTION_PROVIDER_UPDATE_SERVICE) {
         CProUpServTx proTx;
         if (!GetTxPayload(tx, proTx)) {
@@ -460,7 +460,7 @@ bool CTxMemPool::addUnchecked(const uint256& hash, const CTxMemPoolEntry &entry,
         if (!GetTxPayload(tx, proTx)) {
             assert(false);
         }
-        mapProTxPubKeyIDs.emplace(proTx.keyIDOperator, tx.GetHash());
+        mapProTxBlsPubKeyHashes.emplace(proTx.pubKeyOperator.GetHash(), tx.GetHash());
     }
 
     return true;
@@ -645,7 +645,7 @@ void CTxMemPool::removeUnchecked(txiter it, MemPoolRemovalReason reason)
         }
         mapProTxAddresses.erase(proTx.addr);
         mapProTxPubKeyIDs.erase(proTx.keyIDOwner);
-        mapProTxPubKeyIDs.erase(proTx.keyIDOperator);
+        mapProTxBlsPubKeyHashes.erase(proTx.pubKeyOperator.GetHash());
     } else if (it->GetTx().nType == TRANSACTION_PROVIDER_UPDATE_SERVICE) {
         CProUpServTx proTx;
         if (!GetTxPayload(it->GetTx(), proTx)) {
@@ -657,7 +657,7 @@ void CTxMemPool::removeUnchecked(txiter it, MemPoolRemovalReason reason)
         if (!GetTxPayload(it->GetTx(), proTx)) {
             assert(false);
         }
-        mapProTxPubKeyIDs.erase(proTx.keyIDOperator);
+        mapProTxBlsPubKeyHashes.erase(proTx.pubKeyOperator.GetHash());
     }
 
     totalTxSize -= it->GetTxSize();
@@ -796,6 +796,16 @@ void CTxMemPool::removeProTxPubKeyConflicts(const CTransaction &tx, const CKeyID
     }
 }
 
+void CTxMemPool::removeProTxPubKeyConflicts(const CTransaction &tx, const CBLSPublicKey &pubKey)
+{
+    if (mapProTxBlsPubKeyHashes.count(pubKey.GetHash())) {
+        uint256 conflictHash = mapProTxBlsPubKeyHashes[pubKey.GetHash()];
+        if (conflictHash != tx.GetHash() && mapTx.count(conflictHash)) {
+            removeRecursive(mapTx.find(conflictHash)->GetTx(), MemPoolRemovalReason::CONFLICT);
+        }
+    }
+}
+
 void CTxMemPool::removeProTxConflicts(const CTransaction &tx)
 {
     if (tx.nType == TRANSACTION_PROVIDER_REGISTER) {
@@ -811,7 +821,7 @@ void CTxMemPool::removeProTxConflicts(const CTransaction &tx)
             }
         }
         removeProTxPubKeyConflicts(tx, proTx.keyIDOwner);
-        removeProTxPubKeyConflicts(tx, proTx.keyIDOperator);
+        removeProTxPubKeyConflicts(tx, proTx.pubKeyOperator);
     } else if (tx.nType == TRANSACTION_PROVIDER_UPDATE_SERVICE) {
         CProUpServTx proTx;
         if (!GetTxPayload(tx, proTx)) {
@@ -830,7 +840,7 @@ void CTxMemPool::removeProTxConflicts(const CTransaction &tx)
             assert(false);
         }
 
-        removeProTxPubKeyConflicts(tx, proTx.keyIDOperator);
+        removeProTxPubKeyConflicts(tx, proTx.pubKeyOperator);
     }
 }
 
@@ -1117,7 +1127,7 @@ bool CTxMemPool::existsProviderTxConflict(const CTransaction &tx) const {
         CProRegTx proTx;
         if (!GetTxPayload(tx, proTx))
             assert(false);
-        return mapProTxAddresses.count(proTx.addr) || mapProTxPubKeyIDs.count(proTx.keyIDOwner) || mapProTxPubKeyIDs.count(proTx.keyIDOperator);
+        return mapProTxAddresses.count(proTx.addr) || mapProTxPubKeyIDs.count(proTx.keyIDOwner) || mapProTxBlsPubKeyHashes.count(proTx.pubKeyOperator.GetHash());
     } else if (tx.nType == TRANSACTION_PROVIDER_UPDATE_SERVICE) {
         CProUpServTx proTx;
         if (!GetTxPayload(tx, proTx))
@@ -1128,8 +1138,8 @@ bool CTxMemPool::existsProviderTxConflict(const CTransaction &tx) const {
         CProUpRegTx proTx;
         if (!GetTxPayload(tx, proTx))
             assert(false);
-        auto it = mapProTxPubKeyIDs.find(proTx.keyIDOperator);
-        return it != mapProTxPubKeyIDs.end() && it->second != proTx.proTxHash;
+        auto it = mapProTxBlsPubKeyHashes.find(proTx.pubKeyOperator.GetHash());
+        return it != mapProTxBlsPubKeyHashes.end() && it->second != proTx.proTxHash;
     }
     return false;
 }
diff --git a/src/txmempool.h b/src/txmempool.h
index 38f4dbcff401..fa5eb1354de1 100644
--- a/src/txmempool.h
+++ b/src/txmempool.h
@@ -22,6 +22,7 @@
 #include "sync.h"
 #include "random.h"
 #include "netaddress.h"
+#include "bls/bls.h"
 
 #undef foreach
 #include "boost/multi_index_container.hpp"
@@ -535,6 +536,7 @@ class CTxMemPool
 
     std::map<CService, uint256> mapProTxAddresses;
     std::map<CKeyID, uint256> mapProTxPubKeyIDs;
+    std::map<uint256, uint256> mapProTxBlsPubKeyHashes;
 
     void UpdateParent(txiter entry, txiter parent, bool add);
     void UpdateChild(txiter entry, txiter child, bool add);
@@ -579,6 +581,7 @@ class CTxMemPool
     void removeForReorg(const CCoinsViewCache *pcoins, unsigned int nMemPoolHeight, int flags);
     void removeConflicts(const CTransaction &tx);
     void removeProTxPubKeyConflicts(const CTransaction &tx, const CKeyID &keyId);
+    void removeProTxPubKeyConflicts(const CTransaction &tx, const CBLSPublicKey &pubKey);
     void removeProTxConflicts(const CTransaction &tx);
     void removeForBlock(const std::vector<CTransactionRef>& vtx, unsigned int nBlockHeight);
 

From 266dd32323afb0294ba356d1ad5814527444b32c Mon Sep 17 00:00:00 2001
From: Nathan Marley <nathan.marley@gmail.com>
Date: Sun, 21 Oct 2018 12:46:10 -0700
Subject: [PATCH 197/400] mkdir -p to allow re-start of failed chia build
 (#2359)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Adds -p option so that `mkdir` does not error if build dir already exists.

Before this change, if chia_bls build failed for some previous reason (e.g. b/c cmake was not installed), the chia_bls build would always fail in the future because the `build` directory already exists. Previous error message:

```
$ make -j4
Configuring chia_bls...
mkdir: cannot create directory ‘build’: File exists
make: *** [/Users/nmarley/projects/dash/depends/work/build/x86_64-apple-darwin18.0.0/chia_bls/b24c15cef6567a855e901b4774d1d22efb063ea9-e5023308c2a/./.stamp_configured] Error 1
```
---
 depends/packages/chia_bls.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/depends/packages/chia_bls.mk b/depends/packages/chia_bls.mk
index 8f9f0617b269..03295faf308d 100644
--- a/depends/packages/chia_bls.mk
+++ b/depends/packages/chia_bls.mk
@@ -35,7 +35,7 @@ define $(package)_config_cmds
   export CFLAGS="$($(package)_cflags) $($(package)_cppflags)" && \
   export CXXFLAGS="$($(package)_cxxflags) $($(package)_cppflags)" && \
   export LDFLAGS="$($(package)_ldflags)" && \
-  mkdir build && cd build && \
+  mkdir -p build && cd build && \
   cmake ../ $($(package)_config_opts)
 endef
 

From d998dc13eddab496cd90ffd7a229e97ae8f6f594 Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Tue, 23 Oct 2018 10:23:14 +0200
Subject: [PATCH 198/400] Add cmake to non-mac gitian descriptors (#2360)

Needed since we added Chia bls-signatures
---
 contrib/gitian-descriptors/gitian-linux.yml | 1 +
 contrib/gitian-descriptors/gitian-win.yml   | 1 +
 2 files changed, 2 insertions(+)

diff --git a/contrib/gitian-descriptors/gitian-linux.yml b/contrib/gitian-descriptors/gitian-linux.yml
index f9993948c4d0..154d769a2915 100755
--- a/contrib/gitian-descriptors/gitian-linux.yml
+++ b/contrib/gitian-descriptors/gitian-linux.yml
@@ -23,6 +23,7 @@ packages:
 - "autoconf"
 - "libtool"
 - "automake"
+- "cmake"
 - "faketime"
 - "bsdmainutils"
 - "ca-certificates"
diff --git a/contrib/gitian-descriptors/gitian-win.yml b/contrib/gitian-descriptors/gitian-win.yml
index 1fc5afa1833d..91aba2d58b20 100755
--- a/contrib/gitian-descriptors/gitian-win.yml
+++ b/contrib/gitian-descriptors/gitian-win.yml
@@ -13,6 +13,7 @@ packages:
 - "autoconf"
 - "libtool"
 - "automake"
+- "cmake"
 - "faketime"
 - "bsdmainutils"
 - "mingw-w64"

From 1c9ed7806abe00d6eb307e0244275c43a45476d6 Mon Sep 17 00:00:00 2001
From: gladcow <sergey@dash.org>
Date: Tue, 23 Oct 2018 14:15:08 +0300
Subject: [PATCH 199/400] GDB automation with Python script to measure memory
 usage in dashd (#1609)

* standart STL containers and Masternode-related classes processing

* masternode-related classes

* fix st containers processing,  use reflection to process simple classes

* Content descrioption in README.md

* Increase python scripts performance

Use gdb objects instead strings and type info for creating Pyton wrappers

* fixed simple classes list

* addition to README

* fix nits

* missed `the`

Co-Authored-By: gladcow <sergey@dash.org>

* fix nits

Co-Authored-By: gladcow <sergey@dash.org>

* fixed grammatical issues

Co-Authored-By: gladcow <sergey@dash.org>

* fixed phrase construction

Co-Authored-By: gladcow <sergey@dash.org>

* missed point

Co-Authored-By: gladcow <sergey@dash.org>

* fixed grammatical issues

Co-Authored-By: gladcow <sergey@dash.org>

* remove double space

Co-Authored-By: gladcow <sergey@dash.org>

* fixed grammatical issues

Co-Authored-By: gladcow <sergey@dash.org>
---
 contrib/auto_gdb/README.md           |  45 +++++
 contrib/auto_gdb/common_helpers.py   |  57 ++++++
 contrib/auto_gdb/dash_dbg.sh         |   4 +
 contrib/auto_gdb/debug.gdb           |  12 ++
 contrib/auto_gdb/log_size.py         |  34 ++++
 contrib/auto_gdb/simple_class_obj.py |  58 ++++++
 contrib/auto_gdb/stl_containers.py   | 264 +++++++++++++++++++++++++++
 contrib/auto_gdb/test_used_size.gdb  |   5 +
 contrib/auto_gdb/used_size.py        |  44 +++++
 9 files changed, 523 insertions(+)
 create mode 100644 contrib/auto_gdb/README.md
 create mode 100644 contrib/auto_gdb/common_helpers.py
 create mode 100755 contrib/auto_gdb/dash_dbg.sh
 create mode 100644 contrib/auto_gdb/debug.gdb
 create mode 100644 contrib/auto_gdb/log_size.py
 create mode 100644 contrib/auto_gdb/simple_class_obj.py
 create mode 100644 contrib/auto_gdb/stl_containers.py
 create mode 100644 contrib/auto_gdb/test_used_size.gdb
 create mode 100644 contrib/auto_gdb/used_size.py

diff --git a/contrib/auto_gdb/README.md b/contrib/auto_gdb/README.md
new file mode 100644
index 000000000000..ab75e7959449
--- /dev/null
+++ b/contrib/auto_gdb/README.md
@@ -0,0 +1,45 @@
+# Contents
+This directory contains tools to automatically get data about the memory consumption by some objects in dashd process with the help of GDB debugger.
+
+## dash_dbg.sh
+This shell script attaches GDB to the running dashd process (should be built with debug info), executes debug.gdb script and detaches.
+By default it uses testnet settings, see script comments to attach it to mainnet dashd.
+
+## debug.gdb
+Contains debugger instructions to execute during attach: loads python code and executes it for the objects we want to investigate.
+
+## log_size.py
+Contains definition of the gdb command log_size. After this script loads it can be called from gdb command line or other gdb scripts.
+Command params:
+`log_size arg0 arg1`
+`arg0` - name of object whose memory will be written in log file
+`arg1` - name of the log file
+Example:
+```
+log_size mnodeman "memlog.txt"
+```
+
+## used_size.py
+Contains definition of the gdb command used_size. After loading of this script it can be called from gdb command line or other gdb scripts.
+Command params:
+`used_size arg0 arg1`
+`arg0` - variable to store memory used by the object
+`arg1` - name of object whose memory will be calculated and stored in the first argument
+Example:
+```
+>(gdb) set $size = 0
+>(gdb) used_size $size mnodeman
+>(gdb) p $size
+```
+
+## stl_containers.py
+Contains helper classes to calculate memory used by the STL containers (list, vector, map, set, pair).
+
+## simple_class_obj.py
+Contains a helper class to calculate the memory used by an object as a sum of the memory used by its fields.
+All processed objects of such type are listed in the this file, you can add new types you are interested in to this list.
+If a type is not listed here, its size is the return of sizeof (except STL containers which are processed in stl_containers.py).
+
+## common_helpers.py
+Several helper functions that are used in other python code.
+
diff --git a/contrib/auto_gdb/common_helpers.py b/contrib/auto_gdb/common_helpers.py
new file mode 100644
index 000000000000..7dcc6c021db6
--- /dev/null
+++ b/contrib/auto_gdb/common_helpers.py
@@ -0,0 +1,57 @@
+#!/usr/bin/python
+#
+
+try:
+    import gdb
+except ImportError as e:
+    raise ImportError("This script must be run in GDB: ", str(e))
+import sys
+import os
+sys.path.append(os.getcwd())
+import stl_containers
+import simple_class_obj
+
+SIZE_OF_INT = 4
+SIZE_OF_BOOL = 1
+SIZE_OF_INT64 = 8
+SIZE_OF_UINT256 = 32
+
+
+def get_special_type_obj(gobj):
+    obj_type = gobj.type.strip_typedefs()
+    if stl_containers.VectorObj.is_this_type(obj_type):
+        return stl_containers.VectorObj(gobj)
+    if stl_containers.ListObj.is_this_type(obj_type):
+        return stl_containers.ListObj(gobj)
+    if stl_containers.PairObj.is_this_type(obj_type):
+        return stl_containers.PairObj(gobj)
+    if stl_containers.MapObj.is_this_type(obj_type):
+        return stl_containers.MapObj(gobj)
+    if stl_containers.SetObj.is_this_type(obj_type):
+        return stl_containers.SetObj(gobj)
+    if simple_class_obj.SimpleClassObj.is_this_type(obj_type):
+        return simple_class_obj.SimpleClassObj(gobj)
+    return False
+
+
+def is_special_type(obj_type):
+    if stl_containers.VectorObj.is_this_type(obj_type):
+        return True
+    if stl_containers.ListObj.is_this_type(obj_type):
+        return True
+    if stl_containers.PairObj.is_this_type(obj_type):
+        return True
+    if stl_containers.MapObj.is_this_type(obj_type):
+        return True
+    if stl_containers.SetObj.is_this_type(obj_type):
+        return True
+    if simple_class_obj.SimpleClassObj.is_this_type(obj_type):
+        return True
+    return False
+
+
+def get_instance_size(gobj):
+    obj = get_special_type_obj(gobj)
+    if not obj:
+        return gobj.type.sizeof
+    return obj.get_used_size()
diff --git a/contrib/auto_gdb/dash_dbg.sh b/contrib/auto_gdb/dash_dbg.sh
new file mode 100755
index 000000000000..ebe3ed54ec9c
--- /dev/null
+++ b/contrib/auto_gdb/dash_dbg.sh
@@ -0,0 +1,4 @@
+#!/bin/bash
+# use testnet settings,  if you need mainnet,  use ~/.dashcore/dashd.pid file instead
+dash_pid=$(<~/.dashcore/testnet3/dashd.pid)
+sudo gdb -batch -ex "source debug.gdb" dashd ${dash_pid}
diff --git a/contrib/auto_gdb/debug.gdb b/contrib/auto_gdb/debug.gdb
new file mode 100644
index 000000000000..2c79aa89c49b
--- /dev/null
+++ b/contrib/auto_gdb/debug.gdb
@@ -0,0 +1,12 @@
+set pagination off
+source used_size.py
+source log_size.py
+source test_used_size.gdb
+#logsize privateSendClient "memlog.txt"
+#logsize privateSendServer "memlog.txt"
+#logsize mnodeman "memlog.txt"
+logsize mnpayments "memlog.txt"
+#logsize instantsend "memlog.txt"
+#logsize sporkManager "memlog.txt"
+#logsize masternodeSync "memlog.txt"
+#logsize governance "memlog.txt"
diff --git a/contrib/auto_gdb/log_size.py b/contrib/auto_gdb/log_size.py
new file mode 100644
index 000000000000..08eaa9048ccb
--- /dev/null
+++ b/contrib/auto_gdb/log_size.py
@@ -0,0 +1,34 @@
+#!/usr/bin/python
+#
+
+try:
+    import gdb
+except ImportError as e:
+    raise ImportError("This script must be run in GDB: ", str(e))
+import traceback
+import datetime
+import sys
+import os
+sys.path.append(os.getcwd())
+import common_helpers
+
+
+class LogSizeCommand (gdb.Command):
+    """calc size of the memory used by the object and write it to file"""
+
+    def __init__ (self):
+        super (LogSizeCommand, self).__init__ ("logsize", gdb.COMMAND_USER)
+
+    def invoke(self, arg, from_tty):
+        try:
+            args = gdb.string_to_argv(arg)
+            obj = gdb.parse_and_eval(args[0])
+            logfile = open(args[1], 'a')
+            size = common_helpers.get_instance_size(obj)
+            logfile.write("%s %s: %d\n" % (str(datetime.datetime.now()), args[0], size))
+            logfile.close()
+        except Exception as e:
+            print(traceback.format_exc())
+            raise e
+
+LogSizeCommand()
diff --git a/contrib/auto_gdb/simple_class_obj.py b/contrib/auto_gdb/simple_class_obj.py
new file mode 100644
index 000000000000..7aa0166e01ee
--- /dev/null
+++ b/contrib/auto_gdb/simple_class_obj.py
@@ -0,0 +1,58 @@
+#!/usr/bin/python
+#
+
+try:
+    import gdb
+except ImportError as e:
+    raise ImportError("This script must be run in GDB: ", str(e))
+import sys
+import os
+sys.path.append(os.getcwd())
+import common_helpers
+
+
+simple_types = ["CMasternode", "CMasternodeVerification",
+                "CMasternodeBroadcast", "CMasternodePing",
+                "CMasternodeMan", "CDarksendQueue", "CDarkSendEntry",
+                "CTransaction", "CMutableTransaction", "CPrivateSendBaseSession",
+                "CPrivateSendBaseManager", "CPrivateSendClientSession",
+                "CPrivateSendClientManager", "CPrivateSendServer", "CMasternodePayments",
+                "CMasternodePaymentVote", "CMasternodeBlockPayees",
+                "CMasternodePayee", "CInstantSend", "CTxLockRequest",
+                "CTxLockVote", "CTxLockCandidate", "COutPoint",
+                "COutPointLock", "CSporkManager", "CMasternodeSync",
+                "CGovernanceManager", "CRateCheckBuffer", "CGovernanceObject",
+                "CGovernanceVote", "CGovernanceObjectVoteFile"]
+
+simple_templates = ["CacheMultiMap", "CacheMap"]
+
+
+class SimpleClassObj:
+
+    def __init__ (self, gobj):
+        self.obj = gobj
+
+    @classmethod
+    def is_this_type(cls, obj_type):
+        str_type = str(obj_type)
+        if str_type in simple_types:
+            return True
+        for templ in simple_templates:
+            if str_type.find(templ + "<") == 0:
+                return True
+        return False
+
+    def get_used_size(self):
+        size = 0
+        fields = self.obj.type.fields()
+        for f in fields:
+            # check if it is static field
+            if not hasattr(f, "bitpos"):
+                continue
+            # process base class size
+            if f.is_base_class:
+                size += common_helpers.get_instance_size(self.obj.cast(f.type.strip_typedefs()))
+                continue
+            # process simple field
+            size += common_helpers.get_instance_size(self.obj[f.name])
+        return size
diff --git a/contrib/auto_gdb/stl_containers.py b/contrib/auto_gdb/stl_containers.py
new file mode 100644
index 000000000000..cb6763c5e0b1
--- /dev/null
+++ b/contrib/auto_gdb/stl_containers.py
@@ -0,0 +1,264 @@
+#!/usr/bin/python
+#
+
+try:
+    import gdb
+except ImportError as e:
+    raise ImportError("This script must be run in GDB: ", str(e))
+import sys
+import os
+sys.path.append(os.getcwd())
+import common_helpers
+
+
+def find_type(orig, name):
+    typ = orig.strip_typedefs()
+    while True:
+        # Strip cv qualifiers
+        search = '%s::%s' % (typ.unqualified(), name)
+        try:
+            return gdb.lookup_type(search)
+        except RuntimeError:
+            pass
+        # type is not found,  try superclass search
+        field = typ.fields()[0]
+        if not field.is_base_class:
+            raise ValueError("Cannot find type %s::%s" % (str(orig), name))
+        typ = field.type
+
+
+def get_value_from_aligned_membuf(buf, valtype):
+    """Returns the value held in a __gnu_cxx::__aligned_membuf."""
+    return buf['_M_storage'].address.cast(valtype.pointer()).dereference()
+
+
+def get_value_from_node(node):
+    valtype = node.type.template_argument(0)
+    return get_value_from_aligned_membuf(node['_M_storage'], valtype)
+
+
+class VectorObj:
+
+    def __init__ (self, gobj):
+        self.obj = gobj
+
+    @classmethod
+    def is_this_type(cls, obj_type):
+        type_name = str(obj_type)
+        if type_name.find("std::vector<") == 0:
+            return True
+        if type_name.find("std::__cxx11::vector<") == 0:
+            return True
+        return False
+
+    def element_type(self):
+        return self.obj.type.template_argument(0)
+
+    def size(self):
+        return int(self.obj['_M_impl']['_M_finish'] -
+                   self.obj['_M_impl']['_M_start'])
+
+    def get_used_size(self):
+        if common_helpers.is_special_type(self.element_type()):
+            size = self.obj.type.sizeof
+            item = self.obj['_M_impl']['_M_start']
+            finish = self.obj['_M_impl']['_M_finish']
+            while item != finish:
+                elem = item.dereference()
+                obj = common_helpers.get_special_type_obj(elem)
+                size += obj.get_used_size()
+                item = item + 1
+            return size
+        return self.obj.type.sizeof + self.size() * self.element_type().sizeof
+
+
+class ListObj:
+
+    def __init__ (self, gobj):
+        self.obj = gobj
+
+    @classmethod
+    def is_this_type(cls, obj_type):
+        type_name = str(obj_type)
+        if type_name.find("std::list<") == 0:
+            return True
+        if type_name.find("std::__cxx11::list<") == 0:
+            return True
+        return False
+
+    def element_type(self):
+        return self.obj.type.template_argument(0)
+
+    def get_used_size(self):
+        is_special = common_helpers.is_special_type(self.element_type())
+        head = self.obj['_M_impl']['_M_node']
+#        nodetype = find_type(self.obj.type, '_Node')
+        nodetype = head.type
+        nodetype = nodetype.strip_typedefs().pointer()
+        current = head['_M_next']
+        size = self.obj.type.sizeof
+        while current != head.address:
+            if is_special:
+                elem = current.cast(nodetype).dereference()
+                size += common_helpers.get_instance_size(elem)
+            else:
+                size += self.element_type().sizeof
+            current = current['_M_next']
+
+        return size
+
+
+class PairObj:
+
+    def __init__ (self, gobj):
+        self.obj = gobj
+
+    @classmethod
+    def is_this_type(cls, obj_type):
+        type_name = str(obj_type)
+        if type_name.find("std::pair<") == 0:
+            return True
+        if type_name.find("std::__cxx11::pair<") == 0:
+            return True
+        return False
+
+    def key_type(self):
+        return self.obj.type.template_argument(0)
+
+    def value_type(self):
+        return self.obj.type.template_argument(1)
+
+    def get_used_size(self):
+        if not common_helpers.is_special_type(self.key_type()) and not common_helpers.is_special_type(self.value_type()):
+            return self.key_type().sizeof + self.value_type().sizeof
+
+        size = 0
+
+        if common_helpers.is_special_type(self.key_type()):
+            obj = common_helpers.get_special_type_obj(self.obj['first'])
+            size += obj.get_used_size()
+        else:
+            size += self.key_type().sizeof
+
+        if common_helpers.is_special_type(self.value_type()):
+            obj = common_helpers.get_special_type_obj(self.obj['second'])
+            size += obj.get_used_size()
+        else:
+            size += self.value_type().sizeof
+
+        return size
+
+
+class MapObj:
+
+    def __init__ (self, gobj):
+        self.obj = gobj
+        self.obj_type = gobj.type
+        rep_type = find_type(self.obj_type, "_Rep_type")
+        self.node_type = find_type(rep_type, "_Link_type")
+        self.node_type = self.node_type.strip_typedefs()
+
+    @classmethod
+    def is_this_type(cls, obj_type):
+        type_name = str(obj_type)
+        if type_name.find("std::map<") == 0:
+            return True
+        if type_name.find("std::__cxx11::map<") == 0:
+            return True
+        return False
+
+    def key_type(self):
+        return self.obj_type.template_argument(0).strip_typedefs()
+
+    def value_type(self):
+        return self.obj_type.template_argument(1).strip_typedefs()
+
+    def size(self):
+        res = int(self.obj['_M_t']['_M_impl']['_M_node_count'])
+        return res
+
+    def get_used_size(self):
+        if not common_helpers.is_special_type(self.key_type()) and not common_helpers.is_special_type(self.value_type()):
+            return self.obj_type.sizeof + self.size() * (self.key_type().sizeof + self.value_type().sizeof)
+        if self.size() == 0:
+            return self.obj_type.sizeof
+        size = self.obj_type.sizeof
+        row_node = self.obj['_M_t']['_M_impl']['_M_header']['_M_left']
+        for i in range(self.size()):
+            node_val = row_node.cast(self.node_type).dereference()
+            pair = get_value_from_node(node_val)
+
+            obj = common_helpers.get_special_type_obj(pair)
+            size += obj.get_used_size()
+
+            node = row_node
+            if node.dereference()['_M_right']:
+                node = node.dereference()['_M_right']
+                while node.dereference()['_M_left']:
+                    node = node.dereference()['_M_left']
+            else:
+                parent = node.dereference()['_M_parent']
+                while node == parent.dereference()['_M_right']:
+                    node = parent
+                    parent = parent.dereference()['_M_parent']
+                if node.dereference()['_M_right'] != parent:
+                    node = parent
+            row_node = node
+        return size
+
+
+class SetObj:
+
+    def __init__ (self, gobj):
+        self.obj = gobj
+        self.obj_type = gobj.type
+        rep_type = find_type(self.obj_type, "_Rep_type")
+        self.node_type = find_type(rep_type, "_Link_type")
+        self.node_type = self.node_type.strip_typedefs()
+
+    @classmethod
+    def is_this_type(cls, obj_type):
+        type_name = str(obj_type)
+        if type_name.find("std::set<") == 0:
+            return True
+        if type_name.find("std::__cxx11::set<") == 0:
+            return True
+        return False
+
+    def element_type(self):
+        return self.obj_type.template_argument(0)
+
+    def size(self):
+        res = int(self.obj['_M_t']['_M_impl']['_M_node_count'])
+        return res
+
+    def get_used_size(self):
+        if not common_helpers.is_special_type(self.element_type()):
+            return self.obj_type.sizeof + self.size() * self.element_type().sizeof
+        if self.size() == 0:
+            return self.obj_type.sizeof
+        size = self.obj_type.sizeof
+        row_node = self.obj['_M_t']['_M_impl']['_M_header']['_M_left']
+        for i in range(self.size()):
+            node_val = row_node.cast(self.node_type).dereference()
+            val = get_value_from_node(node_val)
+
+            obj = common_helpers.get_special_type_obj(val)
+            size += obj.get_used_size()
+
+            node = row_node
+            if node.dereference()['_M_right']:
+                node = node.dereference()['_M_right']
+                while node.dereference()['_M_left']:
+                    node = node.dereference()['_M_left']
+            else:
+                parent = node.dereference()['_M_parent']
+                while node == parent.dereference()['_M_right']:
+                    node = parent
+                    parent = parent.dereference()['_M_parent']
+                if node.dereference()['_M_right'] != parent:
+                    node = parent
+            row_node = node
+        return size
+
+
diff --git a/contrib/auto_gdb/test_used_size.gdb b/contrib/auto_gdb/test_used_size.gdb
new file mode 100644
index 000000000000..b46d11d2fc2c
--- /dev/null
+++ b/contrib/auto_gdb/test_used_size.gdb
@@ -0,0 +1,5 @@
+define test_used_size
+	set $size_ext = 0
+	usedsize $size_ext $arg0
+	p $size_ext
+end
diff --git a/contrib/auto_gdb/used_size.py b/contrib/auto_gdb/used_size.py
new file mode 100644
index 000000000000..5285965210aa
--- /dev/null
+++ b/contrib/auto_gdb/used_size.py
@@ -0,0 +1,44 @@
+#!/usr/bin/python
+#
+
+try:
+    import gdb
+except ImportError as e:
+    raise ImportError("This script must be run in GDB: ", str(e))
+import traceback
+import sys
+import os
+sys.path.append(os.getcwd())
+import common_helpers
+
+
+class UsedSizeCommand (gdb.Command):
+    """calc size of the memory used by the object"""
+
+    def __init__ (self):
+        super (UsedSizeCommand, self).__init__ ("usedsize", gdb.COMMAND_USER)
+
+    @classmethod
+    def assign_value(cls, obj_name, value):
+        gdb.execute("set " + obj_name + " = " + str(value))
+
+    @classmethod
+    def get_type(cls, obj_name):
+        return gdb.parse_and_eval(obj_name).type
+
+    def invoke(self, arg, from_tty):
+        try:
+            args = gdb.string_to_argv(arg)
+            obj = gdb.parse_and_eval(args[1])
+            obj_type = obj.type
+            print (args[1] + " is " + str(obj_type))
+            size = common_helpers.get_instance_size(obj)
+            UsedSizeCommand.assign_value(args[0], size)
+            print (size)
+
+        except Exception as e:
+            print(traceback.format_exc())
+            raise e
+
+UsedSizeCommand()
+

From eaa856eb7894fd1ba618d7ca2343c28845ab6ec0 Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Tue, 23 Oct 2018 13:15:38 +0200
Subject: [PATCH 200/400] Remove nProtocolVersion and add mode/type fields to
 DIP3 (#2358)

* Remove nProtocolVersion fields from deterministic masternode lists

This field was part of my initial implementation from DIP3. One of the last
changes of DIP3 was then to remove this field, which I did not bring back
into code yet. This commit removes it now.

We use PROTOCOL_VERSION now in cases were compatibility in the the pre-DIP3
list is needed.

* Add type and mode fields in DIP3 special TXs

These were added to DIP3 but not in-code yet.

* Add DMN_PROTO_VERSION
---
 qa/rpc-tests/dip3-deterministicmns.py   | 10 ++--
 src/activemasternode.cpp                |  7 ---
 src/evo/deterministicmns.cpp            |  8 ++-
 src/evo/deterministicmns.h              | 16 ++++--
 src/evo/providertx.cpp                  | 21 ++++----
 src/evo/providertx.h                    | 10 ++--
 src/masternode.cpp                      |  2 +-
 src/masternodeman.cpp                   |  8 +--
 src/rpc/rpcevo.cpp                      | 65 ++++++++++---------------
 src/test/evo_deterministicmns_tests.cpp |  2 -
 src/version.h                           |  7 +--
 11 files changed, 67 insertions(+), 89 deletions(-)

diff --git a/qa/rpc-tests/dip3-deterministicmns.py b/qa/rpc-tests/dip3-deterministicmns.py
index ffb07925072e..59776bbd858a 100755
--- a/qa/rpc-tests/dip3-deterministicmns.py
+++ b/qa/rpc-tests/dip3-deterministicmns.py
@@ -312,7 +312,7 @@ def create_mn_protx(self, node, idx, alias):
         mn.blsMnkey = blsKey['secret']
         mn.collateral_address = node.getnewaddress()
 
-        mn.collateral_txid = node.protx('register', mn.collateral_address, '1000', '127.0.0.1:%d' % mn.p2p_port, '0', mn.ownerAddr, mn.operatorAddr, mn.votingAddr, 0, mn.collateral_address)
+        mn.collateral_txid = node.protx('register', mn.collateral_address, '1000', '127.0.0.1:%d' % mn.p2p_port, mn.ownerAddr, mn.operatorAddr, mn.votingAddr, 0, mn.collateral_address)
         rawtx = node.getrawtransaction(mn.collateral_txid, 1)
 
         mn.collateral_vout = -1
@@ -345,7 +345,7 @@ def upgrade_mn_protx(self, mn):
         return mn
 
     def test_protx_update_service(self, mn):
-        self.nodes[0].protx('update_service', mn.collateral_txid, '127.0.0.2:%d' % mn.p2p_port, '0', mn.blsMnkey)
+        self.nodes[0].protx('update_service', mn.collateral_txid, '127.0.0.2:%d' % mn.p2p_port, mn.blsMnkey)
         self.nodes[0].generate(1)
         self.sync_all()
         for node in self.nodes:
@@ -355,7 +355,7 @@ def test_protx_update_service(self, mn):
             assert_equal(mn_list['%s-%d' % (mn.collateral_txid, mn.collateral_vout)]['address'], '127.0.0.2:%d' % mn.p2p_port)
 
         # undo
-        self.nodes[0].protx('update_service', mn.collateral_txid, '127.0.0.1:%d' % mn.p2p_port, '0', mn.blsMnkey)
+        self.nodes[0].protx('update_service', mn.collateral_txid, '127.0.0.1:%d' % mn.p2p_port, mn.blsMnkey)
         self.nodes[0].generate(1)
 
     def force_finish_mnsync(self, node):
@@ -599,13 +599,13 @@ def test_fail_create_protx(self, node):
         address = node.getnewaddress()
         key = node.getnewaddress()
         blsKey = node.bls('generate')
-        assert_raises_jsonrpc(None, "bad-tx-type", node.protx, 'register', address, '1000', '127.0.0.1:10000', '0', key, blsKey['public'], key, 0, address)
+        assert_raises_jsonrpc(None, "bad-tx-type", node.protx, 'register', address, '1000', '127.0.0.1:10000', key, blsKey['public'], key, 0, address)
 
     def test_success_create_protx(self, node):
         address = node.getnewaddress()
         key = node.getnewaddress()
         blsKey = node.bls('generate')
-        txid = node.protx('register', address, '1000', '127.0.0.1:10000', '0', key, blsKey['public'], key, 0, address)
+        txid = node.protx('register', address, '1000', '127.0.0.1:10000', key, blsKey['public'], key, 0, address)
         rawtx = node.getrawtransaction(txid, 1)
         self.mine_double_spend(node, rawtx['vin'], address, use_mnmerkleroot_from_tip=True)
         self.sync_all()
diff --git a/src/activemasternode.cpp b/src/activemasternode.cpp
index a2d5e430ef00..89dd94d22ce9 100644
--- a/src/activemasternode.cpp
+++ b/src/activemasternode.cpp
@@ -85,13 +85,6 @@ void CActiveDeterministicMasternodeManager::Init()
         return;
     }
 
-    if (mnListEntry->pdmnState->nProtocolVersion != PROTOCOL_VERSION) {
-        state = MASTERNODE_ERROR;
-        strError = "Local protocol version does not match version from ProTx. You may need to update the ProTx";
-        LogPrintf("CActiveDeterministicMasternodeManager::Init -- ERROR: %s", strError);
-        return;
-    }
-
     activeMasternodeInfo.outpoint = COutPoint(mnListEntry->proTxHash, mnListEntry->nCollateralIndex);
     state = MASTERNODE_READY;
 }
diff --git a/src/evo/deterministicmns.cpp b/src/evo/deterministicmns.cpp
index c3056eea0e5a..9c7048d7b9bf 100644
--- a/src/evo/deterministicmns.cpp
+++ b/src/evo/deterministicmns.cpp
@@ -33,9 +33,9 @@ std::string CDeterministicMNState::ToString() const
     }
 
     return strprintf("CDeterministicMNState(nRegisteredHeight=%d, nLastPaidHeight=%d, nPoSePenalty=%d, nPoSeRevivedHeight=%d, nPoSeBanHeight=%d, nRevocationReason=%d, "
-                     "keyIDOwner=%s, pubKeyOperator=%s, keyIDVoting=%s, addr=%s, nProtocolVersion=%d, payoutAddress=%s, operatorRewardAddress=%s)",
+                     "keyIDOwner=%s, pubKeyOperator=%s, keyIDVoting=%s, addr=%s, payoutAddress=%s, operatorRewardAddress=%s)",
                      nRegisteredHeight, nLastPaidHeight, nPoSePenalty, nPoSeRevivedHeight, nPoSeBanHeight, nRevocationReason,
-                     keyIDOwner.ToString(), pubKeyOperator.ToString(), keyIDVoting.ToString(), addr.ToStringIPPort(false), nProtocolVersion, payoutAddress, operatorRewardAddress);
+                     keyIDOwner.ToString(), pubKeyOperator.ToString(), keyIDVoting.ToString(), addr.ToStringIPPort(false), payoutAddress, operatorRewardAddress);
 }
 
 void CDeterministicMNState::ToJson(UniValue& obj) const
@@ -52,7 +52,6 @@ void CDeterministicMNState::ToJson(UniValue& obj) const
     obj.push_back(Pair("pubKeyOperator", pubKeyOperator.ToString()));
     obj.push_back(Pair("keyIDVoting", keyIDVoting.ToString()));
     obj.push_back(Pair("addr", addr.ToStringIPPort(false)));
-    obj.push_back(Pair("protocolVersion", nProtocolVersion));
 
     CTxDestination dest;
     if (ExtractDestination(scriptPayout, dest)) {
@@ -395,7 +394,7 @@ bool CDeterministicMNManager::BuildNewListFromBlock(const CBlock& block, const C
             CDeterministicMNState dmnState = *dmn->pdmnState;
             dmnState.nRegisteredHeight = nHeight;
 
-            if (proTx.addr == CService() || proTx.nProtocolVersion == 0) {
+            if (proTx.addr == CService()) {
                 // start in banned pdmnState as we need to wait for a ProUpServTx
                 dmnState.nPoSeBanHeight = nHeight;
             }
@@ -421,7 +420,6 @@ bool CDeterministicMNManager::BuildNewListFromBlock(const CBlock& block, const C
             }
             auto newState = std::make_shared<CDeterministicMNState>(*dmn->pdmnState);
             newState->addr = proTx.addr;
-            newState->nProtocolVersion = proTx.nProtocolVersion;
             newState->scriptOperatorPayout = proTx.scriptOperatorPayout;
 
             if (newState->nPoSeBanHeight != -1) {
diff --git a/src/evo/deterministicmns.h b/src/evo/deterministicmns.h
index b390524f5690..027217ccc20e 100644
--- a/src/evo/deterministicmns.h
+++ b/src/evo/deterministicmns.h
@@ -34,7 +34,6 @@ class CDeterministicMNState
     CBLSPublicKey pubKeyOperator;
     CKeyID keyIDVoting;
     CService addr;
-    int32_t nProtocolVersion;
     CScript scriptPayout;
     CScript scriptOperatorPayout;
 
@@ -46,7 +45,6 @@ class CDeterministicMNState
         pubKeyOperator = proTx.pubKeyOperator;
         keyIDVoting = proTx.keyIDVoting;
         addr = proTx.addr;
-        nProtocolVersion = proTx.nProtocolVersion;
         scriptPayout = proTx.scriptPayout;
     }
     template<typename Stream>
@@ -67,7 +65,6 @@ class CDeterministicMNState
         READWRITE(pubKeyOperator);
         READWRITE(keyIDVoting);
         READWRITE(addr);
-        READWRITE(nProtocolVersion);
         READWRITE(*(CScriptBase*)(&scriptPayout));
         READWRITE(*(CScriptBase*)(&scriptOperatorPayout));
     }
@@ -76,7 +73,6 @@ class CDeterministicMNState
     {
         pubKeyOperator = CBLSPublicKey();
         addr = CService();
-        nProtocolVersion = 0;
         scriptOperatorPayout = CScript();
         nRevocationReason = CProUpRevTx::REASON_NOT_SPECIFIED;
     }
@@ -99,7 +95,6 @@ class CDeterministicMNState
                pubKeyOperator == rhs.pubKeyOperator &&
                keyIDVoting == rhs.keyIDVoting &&
                addr == rhs.addr &&
-               nProtocolVersion == rhs.nProtocolVersion &&
                scriptPayout == rhs.scriptPayout &&
                scriptOperatorPayout == rhs.scriptOperatorPayout;
     }
@@ -223,6 +218,17 @@ class CDeterministicMNList
         return mnMap.size();
     }
 
+    size_t GetValidMNsCount() const
+    {
+        size_t count = 0;
+        for (const auto& p : mnMap) {
+            if (IsMNValid(p.second)) {
+                count++;
+            }
+        }
+        return count;
+    }
+
     template<typename Callback>
     void ForEachMN(bool onlyValid, Callback&& cb) const {
         for (const auto& p : mnMap) {
diff --git a/src/evo/providertx.cpp b/src/evo/providertx.cpp
index c360d512d596..03c99ce4877c 100644
--- a/src/evo/providertx.cpp
+++ b/src/evo/providertx.cpp
@@ -20,9 +20,6 @@
 template <typename ProTx>
 static bool CheckService(const uint256& proTxHash, const ProTx& proTx, const CBlockIndex* pindexPrev, CValidationState& state)
 {
-    if (proTx.nProtocolVersion < MIN_PROTX_PROTO_VERSION || proTx.nProtocolVersion > MAX_PROTX_PROTO_VERSION)
-        return state.DoS(10, false, REJECT_INVALID, "bad-protx-proto-version");
-
     if (!proTx.addr.IsValid())
         return state.DoS(10, false, REJECT_INVALID, "bad-protx-addr");
     if (Params().NetworkIDString() != CBaseChainParams::REGTEST && !proTx.addr.IsRoutable())
@@ -81,6 +78,10 @@ bool CheckProRegTx(const CTransaction& tx, const CBlockIndex* pindexPrev, CValid
 
     if (ptx.nVersion > CProRegTx::CURRENT_VERSION)
         return state.DoS(100, false, REJECT_INVALID, "bad-protx-version");
+    if (ptx.nType != 0)
+        return state.DoS(100, false, REJECT_INVALID, "bad-protx-type");
+    if (ptx.nMode != 0)
+        return state.DoS(100, false, REJECT_INVALID, "bad-protx-mode");
 
     if (ptx.nCollateralIndex >= tx.vout.size())
         return state.DoS(10, false, REJECT_INVALID, "bad-protx-collateral-index");
@@ -109,7 +110,7 @@ bool CheckProRegTx(const CTransaction& tx, const CBlockIndex* pindexPrev, CValid
 
     // It's allowed to set addr/protocolVersion to 0, which will put the MN into PoSe-banned state and require a ProUpServTx to be issues later
     // If any of both is set, it must be valid however
-    if ((ptx.addr != CService() || ptx.nProtocolVersion != 0) && !CheckService(tx.GetHash(), ptx, pindexPrev, state))
+    if (ptx.addr != CService() && !CheckService(tx.GetHash(), ptx, pindexPrev, state))
         return false;
 
     if (ptx.nOperatorReward > 10000)
@@ -180,6 +181,8 @@ bool CheckProUpRegTx(const CTransaction& tx, const CBlockIndex* pindexPrev, CVal
 
     if (ptx.nVersion > CProRegTx::CURRENT_VERSION)
         return state.DoS(100, false, REJECT_INVALID, "bad-protx-version");
+    if (ptx.nMode != 0)
+        return state.DoS(100, false, REJECT_INVALID, "bad-protx-mode");
 
     if (!ptx.pubKeyOperator.IsValid() || ptx.keyIDVoting.IsNull())
         return state.DoS(10, false, REJECT_INVALID, "bad-protx-key-null");
@@ -270,8 +273,8 @@ std::string CProRegTx::ToString() const
         payee = CBitcoinAddress(dest).ToString();
     }
 
-    return strprintf("CProRegTx(nVersion=%d, nProtocolVersion=%d, nCollateralIndex=%d, addr=%s, nOperatorReward=%f, keyIDOwner=%s, pubKeyOperator=%s, keyIDVoting=%s, scriptPayout=%s)",
-        nVersion, nProtocolVersion, nCollateralIndex, addr.ToString(), (double)nOperatorReward / 100, keyIDOwner.ToString(), pubKeyOperator.ToString(), keyIDVoting.ToString(), payee);
+    return strprintf("CProRegTx(nVersion=%d, nCollateralIndex=%d, addr=%s, nOperatorReward=%f, keyIDOwner=%s, pubKeyOperator=%s, keyIDVoting=%s, scriptPayout=%s)",
+        nVersion, nCollateralIndex, addr.ToString(), (double)nOperatorReward / 100, keyIDOwner.ToString(), pubKeyOperator.ToString(), keyIDVoting.ToString(), payee);
 }
 
 void CProRegTx::ToJson(UniValue& obj) const
@@ -279,7 +282,6 @@ void CProRegTx::ToJson(UniValue& obj) const
     obj.clear();
     obj.setObject();
     obj.push_back(Pair("version", nVersion));
-    obj.push_back(Pair("protocolVersion", nProtocolVersion));
     obj.push_back(Pair("collateralIndex", (int)nCollateralIndex));
     obj.push_back(Pair("service", addr.ToString(false)));
     obj.push_back(Pair("keyIDOwner", keyIDOwner.ToString()));
@@ -304,8 +306,8 @@ std::string CProUpServTx::ToString() const
         payee = CBitcoinAddress(dest).ToString();
     }
 
-    return strprintf("CProUpServTx(nVersion=%d, proTxHash=%s, nProtocolVersion=%d, addr=%s, operatorPayoutAddress=%s)",
-                     nVersion, proTxHash.ToString(), nProtocolVersion, addr.ToString(), payee);
+    return strprintf("CProUpServTx(nVersion=%d, proTxHash=%s, addr=%s, operatorPayoutAddress=%s)",
+                     nVersion, proTxHash.ToString(), addr.ToString(), payee);
 }
 
 void CProUpServTx::ToJson(UniValue& obj) const
@@ -314,7 +316,6 @@ void CProUpServTx::ToJson(UniValue& obj) const
     obj.setObject();
     obj.push_back(Pair("version", nVersion));
     obj.push_back(Pair("proTxHash", proTxHash.ToString()));
-    obj.push_back(Pair("protocolVersion", nProtocolVersion));
     obj.push_back(Pair("service", addr.ToString(false)));
     CTxDestination dest;
     if (ExtractDestination(scriptOperatorPayout, dest)) {
diff --git a/src/evo/providertx.h b/src/evo/providertx.h
index 41ffa9c738ca..6ee36cb3771f 100644
--- a/src/evo/providertx.h
+++ b/src/evo/providertx.h
@@ -22,7 +22,8 @@ class CProRegTx
 
 public:
     uint16_t nVersion{CURRENT_VERSION}; // message version
-    int32_t nProtocolVersion{0};
+    uint16_t nType{0}; // only 0 supported for now
+    uint16_t nMode{0}; // only 0 supported for now
     uint32_t nCollateralIndex{(uint32_t) - 1};
     CService addr;
     CKeyID keyIDOwner;
@@ -40,7 +41,8 @@ class CProRegTx
     inline void SerializationOp(Stream& s, Operation ser_action)
     {
         READWRITE(nVersion);
-        READWRITE(nProtocolVersion);
+        READWRITE(nType);
+        READWRITE(nMode);
         READWRITE(nCollateralIndex);
         READWRITE(addr);
         READWRITE(keyIDOwner);
@@ -66,7 +68,6 @@ class CProUpServTx
 public:
     uint16_t nVersion{CURRENT_VERSION}; // message version
     uint256 proTxHash;
-    int32_t nProtocolVersion{0};
     CService addr;
     CScript scriptOperatorPayout;
     uint256 inputsHash; // replay protection
@@ -80,7 +81,6 @@ class CProUpServTx
     {
         READWRITE(nVersion);
         READWRITE(proTxHash);
-        READWRITE(nProtocolVersion);
         READWRITE(addr);
         READWRITE(*(CScriptBase*)(&scriptOperatorPayout));
         READWRITE(inputsHash);
@@ -102,6 +102,7 @@ class CProUpRegTx
 public:
     uint16_t nVersion{CURRENT_VERSION}; // message version
     uint256 proTxHash;
+    uint16_t nMode{0}; // only 0 supported for now
     CBLSPublicKey pubKeyOperator;
     CKeyID keyIDVoting;
     CScript scriptPayout;
@@ -116,6 +117,7 @@ class CProUpRegTx
     {
         READWRITE(nVersion);
         READWRITE(proTxHash);
+        READWRITE(nMode);
         READWRITE(pubKeyOperator);
         READWRITE(keyIDVoting);
         READWRITE(*(CScriptBase*)(&scriptPayout));
diff --git a/src/masternode.cpp b/src/masternode.cpp
index 7e93980ff4f0..dc01830fac58 100644
--- a/src/masternode.cpp
+++ b/src/masternode.cpp
@@ -55,7 +55,7 @@ CMasternode::CMasternode(const CMasternodeBroadcast& mnb) :
 {}
 
 CMasternode::CMasternode(const uint256 &proTxHash, const CDeterministicMNCPtr& dmn) :
-    masternode_info_t{ MASTERNODE_ENABLED, dmn->pdmnState->nProtocolVersion, GetAdjustedTime(),
+    masternode_info_t{ MASTERNODE_ENABLED, DMN_PROTO_VERSION, GetAdjustedTime(),
                        COutPoint(proTxHash, dmn->nCollateralIndex), dmn->pdmnState->addr, CKeyID(), dmn->pdmnState->keyIDOwner, dmn->pdmnState->pubKeyOperator, dmn->pdmnState->keyIDVoting},
     fAllowMixingTx(true)
 {
diff --git a/src/masternodeman.cpp b/src/masternodeman.cpp
index 65edc1f52ec0..6cd434035486 100644
--- a/src/masternodeman.cpp
+++ b/src/masternodeman.cpp
@@ -391,7 +391,7 @@ void CMasternodeMan::AddDeterministicMasternodes()
             mn->blsPubKeyOperator = dmn->pdmnState->pubKeyOperator;
             mn->keyIDVoting = dmn->pdmnState->keyIDVoting;
             mn->addr = dmn->pdmnState->addr;
-            mn->nProtocolVersion = dmn->pdmnState->nProtocolVersion;
+            mn->nProtocolVersion = DMN_PROTO_VERSION;
 
             // If it appeared in the valid list, it is enabled no matter what
             mn->nActiveState = CMasternode::MASTERNODE_ENABLED;
@@ -455,11 +455,7 @@ int CMasternodeMan::CountMasternodes(int nProtocolVersion)
 
     if (deterministicMNManager->IsDeterministicMNsSporkActive()) {
         auto mnList = deterministicMNManager->GetListAtChainTip();
-        mnList.ForEachMN(true, [&](const CDeterministicMNCPtr& dmn) {
-            if (dmn->pdmnState->nProtocolVersion >= nProtocolVersion) {
-                nCount++;
-            }
-        });
+        nCount = (int)mnList.GetValidMNsCount();
     } else {
         for (const auto& mnpair : mapMasternodes) {
             if(mnpair.second.nProtocolVersion < nProtocolVersion) continue;
diff --git a/src/rpc/rpcevo.cpp b/src/rpc/rpcevo.cpp
index 63c828d8f5c9..66657b4d5a10 100644
--- a/src/rpc/rpcevo.cpp
+++ b/src/rpc/rpcevo.cpp
@@ -160,7 +160,7 @@ static std::string SignAndSendSpecialTx(const CMutableTransaction& tx)
 void protx_register_help()
 {
     throw std::runtime_error(
-            "protx register \"collateralAddress\" collateralAmount \"ipAndPort\" protocolVersion \"ownerKeyAddr\" \"operatorKeyAddr\" \"votingKeyAddr\" operatorReward \"payoutAddress\"\n"
+            "protx register \"collateralAddress\" collateralAmount \"ipAndPort\" \"ownerKeyAddr\" \"operatorKeyAddr\" \"votingKeyAddr\" operatorReward \"payoutAddress\"\n"
             "\nCreates and sends a ProTx to the network. The resulting transaction will move the specified amount\n"
             "to the address specified by collateralAddress and will then function as the collateral of your\n"
             "masternode.\n"
@@ -173,29 +173,27 @@ void protx_register_help()
             "                         Must be exactly 1000 Dash.\n"
             "3. \"ipAndPort\"           (string, required) IP and port in the form \"IP:PORT\".\n"
             "                         Must be unique on the network. Can be set to 0, which will require a ProUpServTx afterwards.\n"
-            "4. \"protocolVersion\"     (numeric, required) The protocol version of your masternode.\n"
-            "                         Can be 0 to default to the clients protocol version.\n"
-            "5. \"ownerKeyAddr\"        (string, required) The owner key used for payee updates and proposal voting.\n"
+            "4. \"ownerKeyAddr\"        (string, required) The owner key used for payee updates and proposal voting.\n"
             "                         The private key belonging to this address be known in your wallet. The address must\n"
             "                         be unused and must differ from the collateralAddress\n"
-            "6. \"operatorKeyAddr\"     (string, required) The operator key address. The private key does not have to be known by your wallet.\n"
+            "5. \"operatorKeyAddr\"     (string, required) The operator key address. The private key does not have to be known by your wallet.\n"
             "                         It has to match the private key which is later used when operating the masternode.\n"
             "                         If set to \"0\" or an empty string, ownerAddr will be used.\n"
-            "7. \"votingKeyAddr\"       (string, required) The voting key address. The private key does not have to be known by your wallet.\n"
+            "6. \"votingKeyAddr\"       (string, required) The voting key address. The private key does not have to be known by your wallet.\n"
             "                         It has to match the private key which is later used when voting on proposals.\n"
             "                         If set to \"0\" or an empty string, ownerAddr will be used.\n"
-            "8. \"operatorReward\"      (numeric, required) The fraction in %% to share with the operator. If non-zero,\n"
-            "                         \"ipAndPort\" and \"protocolVersion\" must be zero as well. The value must be between 0 and 100.\n"
-            "9. \"payoutAddress\"       (string, required) The dash address to use for masternode reward payments\n"
+            "7. \"operatorReward\"      (numeric, required) The fraction in %% to share with the operator. If non-zero,\n"
+            "                         \"ipAndPort\" must be zero as well. The value must be between 0 and 100.\n"
+            "8. \"payoutAddress\"       (string, required) The dash address to use for masternode reward payments\n"
             "                         Must match \"collateralAddress\"."
             "\nExamples:\n"
-            + HelpExampleCli("protx", "register \"XrVhS9LogauRJGJu2sHuryjhpuex4RNPSb\" 1000 \"1.2.3.4:1234\" 0 \"Xt9AMWaYSz7tR7Uo7gzXA3m4QmeWgrR3rr\" \"Xt9AMWaYSz7tR7Uo7gzXA3m4QmeWgrR3rr\" \"Xt9AMWaYSz7tR7Uo7gzXA3m4QmeWgrR3rr\" 0 \"XrVhS9LogauRJGJu2sHuryjhpuex4RNPSb\"")
+            + HelpExampleCli("protx", "register \"XrVhS9LogauRJGJu2sHuryjhpuex4RNPSb\" 1000 \"1.2.3.4:1234\" \"Xt9AMWaYSz7tR7Uo7gzXA3m4QmeWgrR3rr\" \"Xt9AMWaYSz7tR7Uo7gzXA3m4QmeWgrR3rr\" \"Xt9AMWaYSz7tR7Uo7gzXA3m4QmeWgrR3rr\" 0 \"XrVhS9LogauRJGJu2sHuryjhpuex4RNPSb\"")
     );
 }
 
 UniValue protx_register(const JSONRPCRequest& request)
 {
-    if (request.fHelp || request.params.size() != 10)
+    if (request.fHelp || request.params.size() != 9)
         protx_register_help();
 
     CBitcoinAddress collateralAddress(request.params[1].get_str());
@@ -224,25 +222,21 @@ UniValue protx_register(const JSONRPCRequest& request)
             throw std::runtime_error(strprintf("invalid network address %s", request.params[3].get_str()));
     }
 
-    ptx.nProtocolVersion = ParseInt32V(request.params[4], "protocolVersion");
-    if (ptx.nProtocolVersion == 0 && ptx.addr != CService())
-        ptx.nProtocolVersion = PROTOCOL_VERSION;
-
-    CKey keyOwner = ParsePrivKey(request.params[5].get_str(), true);
-    CBLSPublicKey pubKeyOperator = ParseBLSPubKey(request.params[6].get_str(), "operator BLS address");
+    CKey keyOwner = ParsePrivKey(request.params[4].get_str(), true);
+    CBLSPublicKey pubKeyOperator = ParseBLSPubKey(request.params[5].get_str(), "operator BLS address");
     CKeyID keyIDVoting = keyOwner.GetPubKey().GetID();
-    if (request.params[7].get_str() != "0" && request.params[7].get_str() != "") {
-        keyIDVoting = ParsePubKeyIDFromAddress(request.params[7].get_str(), "voting address");
+    if (request.params[6].get_str() != "0" && request.params[6].get_str() != "") {
+        keyIDVoting = ParsePubKeyIDFromAddress(request.params[6].get_str(), "voting address");
     }
 
-    double operatorReward = ParseDoubleV(request.params[8], "operatorReward");
+    double operatorReward = ParseDoubleV(request.params[7], "operatorReward");
     if (operatorReward < 0 || operatorReward > 100)
         throw JSONRPCError(RPC_INVALID_PARAMETER, "operatorReward must be between 0 and 100");
     ptx.nOperatorReward = (uint16_t)(operatorReward * 100);
 
-    CBitcoinAddress payoutAddress(request.params[9].get_str());
+    CBitcoinAddress payoutAddress(request.params[8].get_str());
     if (!payoutAddress.IsValid())
-        throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, strprintf("invalid payout address: %s", request.params[9].get_str()));
+        throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, strprintf("invalid payout address: %s", request.params[8].get_str()));
 
     ptx.keyIDOwner = keyOwner.GetPubKey().GetID();
     ptx.pubKeyOperator = pubKeyOperator;
@@ -271,28 +265,26 @@ UniValue protx_register(const JSONRPCRequest& request)
 void protx_update_service_help()
 {
     throw std::runtime_error(
-            "protx update_service \"proTxHash\" \"ipAndPort\" protocolVersion \"operatorKey\" (\"operatorPayoutAddress\")\n"
-            "\nCreates and sends a ProUpServTx to the network. This will update the address and protocol version\n"
+            "protx update_service \"proTxHash\" \"ipAndPort\" \"operatorKey\" (\"operatorPayoutAddress\")\n"
+            "\nCreates and sends a ProUpServTx to the network. This will update the IP address\n"
             "of a masternode. The operator key of the masternode must be known to your wallet.\n"
             "If this is done for a masternode that got PoSe-banned, the ProUpServTx will also revive this masternode.\n"
             "\nArguments:\n"
             "1. \"proTxHash\"                (string, required) The hash of the initial ProRegTx.\n"
             "2. \"ipAndPort\"                (string, required) IP and port in the form \"IP:PORT\".\n"
             "                              Must be unique on the network.\n"
-            "3. \"protocolVersion\"          (numeric, required) The protocol version of your masternode.\n"
-            "                              Can be 0 to default to the clients protocol version\n"
-            "4. \"operatorKey\"              (string, required) The operator private key belonging to the\n"
+            "3. \"operatorKey\"              (string, required) The operator private key belonging to the\n"
             "                              registered operator public key.\n"
-            "5. \"operatorPayoutAddress\"    (string, optional) The address used for operator reward payments.\n"
+            "4. \"operatorPayoutAddress\"    (string, optional) The address used for operator reward payments.\n"
             "                              Only allowed when the ProRegTx had a non-zero operatorReward value.\n"
             "\nExamples:\n"
-            + HelpExampleCli("protx", "update_service \"0123456701234567012345670123456701234567012345670123456701234567\" \"1.2.3.4:1234\" 0 5a2e15982e62f1e0b7cf9783c64cf7e3af3f90a52d6c40f6f95d624c0b1621cd")
+            + HelpExampleCli("protx", "update_service \"0123456701234567012345670123456701234567012345670123456701234567\" \"1.2.3.4:1234\" 5a2e15982e62f1e0b7cf9783c64cf7e3af3f90a52d6c40f6f95d624c0b1621cd")
     );
 }
 
 UniValue protx_update_service(const JSONRPCRequest& request)
 {
-    if (request.fHelp || (request.params.size() != 4 && request.params.size() != 5))
+    if (request.fHelp || (request.params.size() != 3 && request.params.size() != 4))
         protx_update_service_help();
 
     CProUpServTx ptx;
@@ -303,15 +295,10 @@ UniValue protx_update_service(const JSONRPCRequest& request)
         throw std::runtime_error(strprintf("invalid network address %s", request.params[3].get_str()));
     }
 
-    ptx.nProtocolVersion = ParseInt32V(request.params[3], "protocolVersion");
-    if (ptx.nProtocolVersion == 0) {
-        ptx.nProtocolVersion = PROTOCOL_VERSION;
-    }
-
-    CBLSSecretKey keyOperator = ParseBLSSecretKey(request.params[4].get_str(), "operatorKey");
+    CBLSSecretKey keyOperator = ParseBLSSecretKey(request.params[3].get_str(), "operatorKey");
 
-    if (request.params.size() > 5) {
-        CBitcoinAddress payoutAddress(request.params[5].get_str());
+    if (request.params.size() > 4) {
+        CBitcoinAddress payoutAddress(request.params[4].get_str());
         if (!payoutAddress.IsValid())
             throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, strprintf("invalid operator payout address: %s", request.params[4].get_str()));
         ptx.scriptOperatorPayout = GetScriptForDestination(payoutAddress.Get());
@@ -410,7 +397,7 @@ void protx_revoke_help()
     throw std::runtime_error(
             "protx revoke \"proTxHash\"\n"
             "\nCreates and sends a ProUpRevTx to the network. This will revoke the operator key of the masternode and\n"
-            "put it into the PoSe-banned state. It will also set the service and protocol version fields of the masternode\n"
+            "put it into the PoSe-banned state. It will also set the service field of the masternode\n"
             "to zero. Use this in case your operator key got compromised or you want to stop providing your service\n"
             "to the masternode owner.\n"
             "The operator key of the masternode must be known to your wallet.\n"
diff --git a/src/test/evo_deterministicmns_tests.cpp b/src/test/evo_deterministicmns_tests.cpp
index b14cf8ea4fb9..33d775e6b5de 100644
--- a/src/test/evo_deterministicmns_tests.cpp
+++ b/src/test/evo_deterministicmns_tests.cpp
@@ -103,7 +103,6 @@ static CMutableTransaction CreateProRegTx(SimpleUTXOMap& utxos, int port, const
     auto inputs = SelectUTXOs(utxos, 1000 * COIN, change);
 
     CProRegTx proTx;
-    proTx.nProtocolVersion = PROTOCOL_VERSION;
     proTx.nCollateralIndex = 0;
     proTx.addr = LookupNumeric("1.1.1.1", port);
     proTx.keyIDOwner = ownerKeyRet.GetPubKey().GetID();
@@ -130,7 +129,6 @@ static CMutableTransaction CreateProUpServTx(SimpleUTXOMap& utxos, const uint256
 
     CProUpServTx proTx;
     proTx.proTxHash = proTxHash;
-    proTx.nProtocolVersion = PROTOCOL_VERSION;
     proTx.addr = LookupNumeric("1.1.1.1", port);
     proTx.scriptOperatorPayout = scriptOperatorPayout;
 
diff --git a/src/version.h b/src/version.h
index 30130fe617b0..fa357eed7994 100644
--- a/src/version.h
+++ b/src/version.h
@@ -44,10 +44,7 @@ static const int DIP0001_PROTOCOL_VERSION = 70208;
 //! short-id-based block download starts with this version
 static const int SHORT_IDS_BLOCKS_VERSION = 70209;
 
-//! minimum ProTx proto version
-static const int MIN_PROTX_PROTO_VERSION = 70211;
-
-//! maximum ProTx proto version (slightly higher then current PROTOCOL_VERSION to ensure masternodes can upgrade)
-static const int MAX_PROTX_PROTO_VERSION = PROTOCOL_VERSION + 2;
+//! introduction of DIP3/deterministic masternodes
+static const int DMN_PROTO_VERSION = 70211;
 
 #endif // BITCOIN_VERSION_H

From c4351fd3285c308bfe10f042fddd52ea1ca39394 Mon Sep 17 00:00:00 2001
From: PastaPastaPasta <pasta@dashboost.org>
Date: Tue, 23 Oct 2018 06:16:17 -0500
Subject: [PATCH 201/400] revert 737, DEFAULT_TRANSACTION_MAXFEE = 0.1 * COIN
 (#2362)

---
 src/validation.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/validation.h b/src/validation.h
index 96b9cd35743b..99a4ed81dda4 100644
--- a/src/validation.h
+++ b/src/validation.h
@@ -58,7 +58,7 @@ static const bool DEFAULT_WHITELISTFORCERELAY = true;
 /** Default for -minrelaytxfee, minimum relay fee for transactions */
 static const unsigned int DEFAULT_MIN_RELAY_TX_FEE = 1000;
 //! -maxtxfee default
-static const CAmount DEFAULT_TRANSACTION_MAXFEE = 0.2 * COIN; // "smallest denom" + X * "denom tails"
+static const CAmount DEFAULT_TRANSACTION_MAXFEE = 0.1 * COIN;
 //! Discourage users to set fees higher than this amount (in duffs) per kB
 static const CAmount HIGH_TX_FEE_PER_KB = 0.01 * COIN;
 //! -maxtxfee will warn if called with a higher fee than this amount (in duffs)

From 3c9237aa40a5dbb97ce52342614608476e1e644a Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Wed, 24 Oct 2018 13:31:22 +0200
Subject: [PATCH 202/400] Use VersionBitsState instead of VersionBitsTipState
 to avoid cs_main lock (#2370)

It wasn't even locked, which causes AssertLockHeld to fail.
---
 src/dsnotificationinterface.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/dsnotificationinterface.cpp b/src/dsnotificationinterface.cpp
index 5e7fbcef5acc..562e4e39d501 100644
--- a/src/dsnotificationinterface.cpp
+++ b/src/dsnotificationinterface.cpp
@@ -46,7 +46,7 @@ void CDSNotificationInterface::UpdatedBlockTip(const CBlockIndex *pindexNew, con
     fDIP0003ActiveAtTip = (VersionBitsState(pindexNew->pprev, Params().GetConsensus(), Consensus::DEPLOYMENT_DIP0003, versionbitscache) == THRESHOLD_ACTIVE);
     // update instantsend autolock activation flag
     instantsend.isAutoLockBip9Active =
-            (VersionBitsTipState(Params().GetConsensus(), Consensus::DEPLOYMENT_ISAUTOLOCKS) == THRESHOLD_ACTIVE);
+            (VersionBitsState(pindexNew->pprev, Params().GetConsensus(), Consensus::DEPLOYMENT_ISAUTOLOCKS, versionbitscache) == THRESHOLD_ACTIVE);
 
     if (fInitialDownload)
         return;

From 53e12b7b40b1a3bb0ede3805826a5a6e884d5697 Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Wed, 24 Oct 2018 13:31:45 +0200
Subject: [PATCH 203/400] Don't bail out from ProcessMasternodeConnections in
 regtest (#2368)

We actually do masternode testing now and we will rely on this behavior
---
 src/masternodeman.cpp | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/masternodeman.cpp b/src/masternodeman.cpp
index 6cd434035486..f40e7634ff13 100644
--- a/src/masternodeman.cpp
+++ b/src/masternodeman.cpp
@@ -871,9 +871,6 @@ bool CMasternodeMan::GetMasternodeRanks(CMasternodeMan::rank_pair_vec_t& vecMast
 
 void CMasternodeMan::ProcessMasternodeConnections(CConnman& connman)
 {
-    //we don't care about this for regtest
-    if(Params().NetworkIDString() == CBaseChainParams::REGTEST) return;
-
     std::vector<masternode_info_t> vecMnInfo; // will be empty when no wallet
 #ifdef ENABLE_WALLET
     privateSendClient.GetMixingMasternodesInfo(vecMnInfo);

From 0402240a2eec0110a21d0327057749155cd77119 Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Thu, 25 Oct 2018 09:15:49 +0200
Subject: [PATCH 204/400] Bump CMAKE_CXX_STANDARD to 14 in CMakeLists.txt
 (#2377)

We still don't really use this file (it won't even work), but it's good
to have CLion not brable about unknown stuff all the time.
---
 CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 99cbed2b494a..55f43ca69a39 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -8,7 +8,7 @@
 cmake_minimum_required(VERSION 3.7)
 project(dash)
 
-set(CMAKE_CXX_STANDARD 11)
+set(CMAKE_CXX_STANDARD 14)
 
 include_directories(
         src

From de426e962a10ee19979938ed9b2babf611a439c4 Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Thu, 25 Oct 2018 09:16:13 +0200
Subject: [PATCH 205/400] Give tail calls enough time to print errors (#2376)

---
 Jenkinsfile.gitian | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Jenkinsfile.gitian b/Jenkinsfile.gitian
index 7e1a6117f79b..e6d4a66ade0f 100644
--- a/Jenkinsfile.gitian
+++ b/Jenkinsfile.gitian
@@ -102,6 +102,10 @@ for(int i = 0; i < targets.size(); i++) {
                 tail -F var/install.log &
                 tail -F var/build.log &
                 USE_DOCKER=1 ./bin/gbuild -j ${proc} -m ${mem} --commit dash=${commit} --url dash=${repositoryUrl} ../dash/contrib/gitian-descriptors/gitian-${target}.yml
+                RET=$?
+                # give the above tail calls enough time to print everything on failure
+                sleep 2s
+                exit $RET
               """
             } finally {
               // make sure it doesn't run forever

From 1c25356ff8d208daf8fb90645e757b523bf6dc47 Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Thu, 25 Oct 2018 09:16:38 +0200
Subject: [PATCH 206/400] Allow to use low difficulty and higher block rewards
 for devnet (#2369)

* Allow to use low difficulty and higher block rewards for devnet

Configurable through -minimumdifficultyblocks, -highsubsidyblocks and -highsubsidyfactor

* Fix review comments

* Handle review comments
---
 src/chainparams.cpp    | 13 +++++++++++++
 src/chainparams.h      |  5 +++++
 src/consensus/params.h |  5 +++++
 src/init.cpp           |  9 +++++++++
 src/pow.cpp            |  6 ++++++
 src/validation.cpp     |  5 +++++
 6 files changed, 43 insertions(+)

diff --git a/src/chainparams.cpp b/src/chainparams.cpp
index 265d3c366d84..9816a5ad427e 100644
--- a/src/chainparams.cpp
+++ b/src/chainparams.cpp
@@ -554,6 +554,13 @@ class CDevNetParams : public CChainParams {
             0.01                          // * estimated number of transactions per second
         };
     }
+
+    void UpdateSubsidyAndDiffParams(int nMinimumDifficultyBlocks, int nHighSubsidyBlocks, int nHighSubsidyFactor)
+    {
+        consensus.nMinimumDifficultyBlocks = nMinimumDifficultyBlocks;
+        consensus.nHighSubsidyBlocks = nHighSubsidyBlocks;
+        consensus.nHighSubsidyFactor = nHighSubsidyFactor;
+    }
 };
 static CDevNetParams *devNetParams;
 
@@ -731,3 +738,9 @@ void UpdateRegtestBudgetParameters(int nMasternodePaymentsStartBlock, int nBudge
 {
     regTestParams.UpdateBudgetParameters(nMasternodePaymentsStartBlock, nBudgetPaymentsStartBlock, nSuperblockStartBlock);
 }
+
+void UpdateDevnetSubsidyAndDiffParams(int nMinimumDifficultyBlocks, int nHighSubsidyBlocks, int nHighSubsidyFactor)
+{
+    assert(devNetParams);
+    devNetParams->UpdateSubsidyAndDiffParams(nMinimumDifficultyBlocks, nHighSubsidyBlocks, nHighSubsidyFactor);
+}
diff --git a/src/chainparams.h b/src/chainparams.h
index 29e3b9588474..3c93e0c9aa2f 100644
--- a/src/chainparams.h
+++ b/src/chainparams.h
@@ -148,4 +148,9 @@ void UpdateRegtestBIP9Parameters(Consensus::DeploymentPos d, int64_t nStartTime,
  */
 void UpdateRegtestBudgetParameters(int nMasternodePaymentsStartBlock, int nBudgetPaymentsStartBlock, int nSuperblockStartBlock);
 
+/**
+ * Allows modifying the subsidy and difficulty devnet parameters.
+ */
+void UpdateDevnetSubsidyAndDiffParams(int nMinimumDifficultyBlocks, int nHighSubsidyBlocks, int nHighSubsidyFactor);
+
 #endif // BITCOIN_CHAINPARAMS_H
diff --git a/src/consensus/params.h b/src/consensus/params.h
index f602bc029ec6..6c3efccf7a05 100644
--- a/src/consensus/params.h
+++ b/src/consensus/params.h
@@ -91,6 +91,11 @@ struct Params {
     int64_t DifficultyAdjustmentInterval() const { return nPowTargetTimespan / nPowTargetSpacing; }
     uint256 nMinimumChainWork;
     uint256 defaultAssumeValid;
+
+    /** these parameters are only used on devnet and can be configured from the outside */
+    int nMinimumDifficultyBlocks{0};
+    int nHighSubsidyBlocks{0};
+    int nHighSubsidyFactor{1};
 };
 } // namespace Consensus
 
diff --git a/src/init.cpp b/src/init.cpp
index c8071fc9ae1a..86626e3dc825 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -1323,6 +1323,15 @@ bool AppInitParameterInteraction()
         UpdateRegtestBudgetParameters(nMasternodePaymentsStartBlock, nBudgetPaymentsStartBlock, nSuperblockStartBlock);
     }
 
+    if (chainparams.NetworkIDString() == CBaseChainParams::DEVNET) {
+        int nMinimumDifficultyBlocks = GetArg("-minimumdifficultyblocks", chainparams.GetConsensus().nMinimumDifficultyBlocks);
+        int nHighSubsidyBlocks = GetArg("-highsubsidyblocks", chainparams.GetConsensus().nHighSubsidyBlocks);
+        int nHighSubsidyFactor = GetArg("-highsubsidyfactor", chainparams.GetConsensus().nHighSubsidyFactor);
+        UpdateDevnetSubsidyAndDiffParams(nMinimumDifficultyBlocks, nHighSubsidyBlocks, nHighSubsidyFactor);
+    } else if (IsArgSet("-minimumdifficultyblocks") || IsArgSet("-highsubsidyblocks") || IsArgSet("-highsubsidyfactor")) {
+        return InitError("Difficulty and subsidy parameters may only be overridden on devnet.");
+    }
+
     return true;
 }
 
diff --git a/src/pow.cpp b/src/pow.cpp
index 749ff9db2849..34af27b9b1d2 100644
--- a/src/pow.cpp
+++ b/src/pow.cpp
@@ -210,6 +210,12 @@ unsigned int GetNextWorkRequiredBTC(const CBlockIndex* pindexLast, const CBlockH
 
 unsigned int GetNextWorkRequired(const CBlockIndex* pindexLast, const CBlockHeader *pblock, const Consensus::Params& params)
 {
+    // this is only active on devnets
+    if (pindexLast->nHeight < params.nMinimumDifficultyBlocks) {
+        unsigned int nProofOfWorkLimit = UintToArith256(params.powLimit).GetCompact();
+        return nProofOfWorkLimit;
+    }
+
     // Most recent algo first
     if (pindexLast->nHeight + 1 >= params.nPowDGWHeight) {
         return DarkGravityWave(pindexLast, pblock, params);
diff --git a/src/validation.cpp b/src/validation.cpp
index b1768672506e..aaebe6dd7dd3 100644
--- a/src/validation.cpp
+++ b/src/validation.cpp
@@ -1171,6 +1171,11 @@ CAmount GetBlockSubsidy(int nPrevBits, int nPrevHeight, const Consensus::Params&
         nSubsidy -= nSubsidy/14;
     }
 
+    // this is only active on devnets
+    if (nPrevHeight < consensusParams.nHighSubsidyBlocks) {
+        nSubsidy *= consensusParams.nHighSubsidyFactor;
+    }
+
     // Hard fork to reduce the block reward by 10 extra percent (allowing budget/superblocks)
     CAmount nSuperblockPart = (nPrevHeight > consensusParams.nBudgetPaymentsStartBlock) ? nSubsidy/10 : 0;
 

From fdfb077428a0edbd3abbe5fd15d5caed0ad0b988 Mon Sep 17 00:00:00 2001
From: thephez <thephez@users.noreply.github.com>
Date: Thu, 25 Oct 2018 03:17:02 -0400
Subject: [PATCH 207/400] Update ProRegTx serialization order (#2378)

Makes consistent with both DIP-3 and the order above
---
 src/evo/providertx.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/evo/providertx.h b/src/evo/providertx.h
index 6ee36cb3771f..46edd83b1f63 100644
--- a/src/evo/providertx.h
+++ b/src/evo/providertx.h
@@ -48,8 +48,8 @@ class CProRegTx
         READWRITE(keyIDOwner);
         READWRITE(pubKeyOperator);
         READWRITE(keyIDVoting);
-        READWRITE(*(CScriptBase*)(&scriptPayout));
         READWRITE(nOperatorReward);
+        READWRITE(*(CScriptBase*)(&scriptPayout));
         READWRITE(inputsHash);
         if (!(s.GetType() & SER_GETHASH)) {
             READWRITE(vchSig);

From e3046adb3ef53b6fd525b3364646d0846601111e Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Thu, 25 Oct 2018 09:17:37 +0200
Subject: [PATCH 208/400] Clear devNetParams and mimic behavior of other param
 types (#2367)

* Clear devNetParams and mimic behavior of other param types

Mainnet, testnet and regtest params are global and thus zero initialized,
we should mimic the same for devnet params.

Not doing so results in all kinds of issues on devnet.

* Remove unnecessary <string.h> includein chainparamsbase.cpp
---
 src/chainparams.cpp     | 4 +++-
 src/chainparamsbase.cpp | 5 ++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/chainparams.cpp b/src/chainparams.cpp
index 9816a5ad427e..14a1e7e17c4a 100644
--- a/src/chainparams.cpp
+++ b/src/chainparams.cpp
@@ -722,7 +722,9 @@ CChainParams& Params(const std::string& chain)
 void SelectParams(const std::string& network)
 {
     if (network == CBaseChainParams::DEVNET) {
-        devNetParams = new CDevNetParams();
+        devNetParams = (CDevNetParams*)new uint8_t[sizeof(CDevNetParams)];
+        memset(devNetParams, 0, sizeof(CDevNetParams));
+        new (devNetParams) CDevNetParams();
     }
 
     SelectBaseParams(network);
diff --git a/src/chainparamsbase.cpp b/src/chainparamsbase.cpp
index 6f07818c5a1e..80a00654dfde 100644
--- a/src/chainparamsbase.cpp
+++ b/src/chainparamsbase.cpp
@@ -109,7 +109,10 @@ void SelectBaseParams(const std::string& chain)
     if (chain == CBaseChainParams::DEVNET) {
         std::string devNetName = GetDevNetName();
         assert(!devNetName.empty());
-        devNetParams = new CBaseDevNetParams(devNetName);
+
+        devNetParams = (CBaseDevNetParams*)new uint8_t[sizeof(CBaseDevNetParams)];
+        memset(devNetParams, 0, sizeof(CBaseDevNetParams));
+        new (devNetParams) CBaseDevNetParams(devNetName);
     }
 
     pCurrentBaseParams = &BaseParams(chain);

From 0ad2906c544d10ff584e1e48872cf36b00eb75da Mon Sep 17 00:00:00 2001
From: thephez <thephez@users.noreply.github.com>
Date: Thu, 25 Oct 2018 10:29:00 -0400
Subject: [PATCH 209/400] Clarify addlocked description in getbalance RPC
 (#2364)

* Trivial - Typo in getbalance RPC

* Clarify addlocked description in getbalance RPC

Co-Authored-By: thephez <thephez@gmail.com>
---
 src/wallet/rpcwallet.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index 7ee20e1c63e9..0b6a09b3ae6d 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -772,7 +772,7 @@ UniValue getbalance(const JSONRPCRequest& request)
             "\nArguments:\n"
             "1. \"account\"        (string, optional) DEPRECATED. The selected account, or \"*\" for entire wallet. It may be the default account using \"\".\n"
             "2. minconf          (numeric, optional, default=1) Only include transactions confirmed at least this many times.\n"
-            "3. addlocked      (bool, optional, default=false) Whether to add  balance from transactions locked via InstantSend.\n"
+            "3. addlocked      (bool, optional, default=false) Whether to include the value of transactions locked via InstantSend in the wallet's balance.\n"
             "4. include_watchonly (bool, optional, default=false) Also include balance in watch-only addresses (see 'importaddress')\n"
             "\nResult:\n"
             "amount              (numeric) The total amount in " + CURRENCY_UNIT + " received for this account.\n"

From e3df91082288c168a19053342d06f44c10d24cb0 Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Thu, 25 Oct 2018 16:29:50 +0200
Subject: [PATCH 210/400] Allow referencing other TX outputs for ProRegTx
 collateral (#2366)

* Pass CCoinsView reference to special TX handling methods

* Allow referencing other TX outputs for ProRegTx collateral

* Remove "collateralAmount" from "protx register"

* Rename "protx register" to "protx fund_register"

* Remove UpdateSpork15Value from CDeterministicMNManager

Was not used/implemented anymore

* Lock masternode collaterals after chain/DIP3 is fully initialized

Otherwise detection of collaterals does not work.

* Implement new "protx register" RPC which uses existing collaterals

* Remove "masternode info" RPC

It is not consistent with other "masternode" RPCs anymore as it requires
the ProRegTx hash while all other RPCs work with the collateral.

* Load sporks from disk cache before initializing the chain

Otherwise spork15 is not loaded when we check it for the first time.

* Implement "protx info" RPC

* Use "protx info" instead of "masternode info" in DIP3 tests

* Test external collaterals for ProTx

* Handle review comments

* Don't pass CCoinView reference when it's not used

* Revert "Pass CCoinsView reference to special TX handling methods"

This reverts commit 28688724e112c8fe18e44aef055768dbbc068d7d.

* Use GetUTXOCoin instead of now removed coinsView

Also remove collateral height check as GetUTXOCoin only returns confirmed
coins.

* Add conflict handling for external collaterals to mempool

* Handle review comments (squashed Github suggestions)

Co-Authored-By: codablock <ablock84@gmail.com>
---
 qa/rpc-tests/dip3-deterministicmns.py   | 153 ++++++++++--------
 src/activemasternode.cpp                |   7 +-
 src/evo/deterministicmns.cpp            |  82 +++++++---
 src/evo/deterministicmns.h              |  27 ++--
 src/evo/providertx.cpp                  | 104 ++++++++----
 src/evo/providertx.h                    |   7 +-
 src/init.cpp                            |  22 ++-
 src/masternode-payments.cpp             |   2 +-
 src/masternode.cpp                      |   4 +-
 src/masternodeman.cpp                   |  23 ++-
 src/rpc/governance.cpp                  |   4 +-
 src/rpc/masternode.cpp                  |  88 +---------
 src/rpc/rpcevo.cpp                      | 203 +++++++++++++++++-------
 src/test/evo_deterministicmns_tests.cpp |   3 +-
 src/txmempool.cpp                       |  23 ++-
 src/txmempool.h                         |   2 +
 src/wallet/wallet.cpp                   |  25 ++-
 src/wallet/wallet.h                     |   1 +
 18 files changed, 464 insertions(+), 316 deletions(-)

diff --git a/qa/rpc-tests/dip3-deterministicmns.py b/qa/rpc-tests/dip3-deterministicmns.py
index 59776bbd858a..9858c85c719c 100755
--- a/qa/rpc-tests/dip3-deterministicmns.py
+++ b/qa/rpc-tests/dip3-deterministicmns.py
@@ -151,7 +151,7 @@ def run_test(self):
         self.force_finish_mnsync_list(before_dip3_mn.node)
         self.start_alias(self.nodes[0], before_dip3_mn.alias)
 
-        self.wait_for_mnlists(mns, True, False)
+        self.wait_for_mnlists(mns)
         self.wait_for_mnlists_same()
 
         # Test if nodes deny creating new non-ProTx MNs now
@@ -159,32 +159,45 @@ def run_test(self):
         self.start_alias(self.nodes[0], after_dip3_mn.alias, should_fail=True)
 
         first_upgrade_count = 5
+        mns_after_upgrade = []
+        mns_to_restart = []
+        mns_protx = []
         print("upgrading first %d MNs to use ProTx (but not deterministic MN lists)" % first_upgrade_count)
         for i in range(first_upgrade_count):
-            mns[i] = self.upgrade_mn_protx(mns[i])
+            # let a few of the protx MNs refer to the old collaterals
+            fund = (i % 2) == 0
+            mns[i] = self.upgrade_mn_protx(mns[i], fund)
             self.nodes[0].generate(1)
+
+            if fund:
+                # collateral has moved, so we need to start it again
+                mns_to_restart.append(mns[i])
+            else:
+                # collateral has not moved, so it should still be in the masternode list even after upgrade
+                mns_after_upgrade.append(mns[i])
+            mns_protx.append(mns[i])
+        for i in range(first_upgrade_count, len(mns)):
+            mns_after_upgrade.append(mns[i])
         self.write_mnconf(mns)
 
-        print("wait for upgraded MNs to disappear from MN lists (their collateral was spent)")
-        self.wait_for_mnlists(mns, True, False, check=True)
+        print("wait for freshly funded and upgraded MNs to disappear from MN lists (their collateral was spent)")
+        self.wait_for_mnlists(mns_after_upgrade, check=True)
         self.wait_for_mnlists_same()
 
         print("restarting controller and upgraded MNs")
         self.restart_controller_node()
         self.force_finish_mnsync_list(self.nodes[0])
-        for mn in mns:
-            if mn.is_protx:
-                print("restarting MN %s" % mn.alias)
-                self.stop_node(mn.idx)
-                self.start_mn(mn)
-                self.force_finish_mnsync_list(mn.node)
+        for mn in mns_to_restart:
+            print("restarting MN %s" % mn.alias)
+            self.stop_node(mn.idx)
+            self.start_mn(mn)
+            self.force_finish_mnsync_list(mn.node)
         print('start-alias on upgraded nodes')
-        for mn in mns:
-            if mn.is_protx:
-                self.start_alias(self.nodes[0], mn.alias)
+        for mn in mns_to_restart:
+            self.start_alias(self.nodes[0], mn.alias)
 
         print("wait for upgraded MNs to appear in MN list")
-        self.wait_for_mnlists(mns, True, True)
+        self.wait_for_mnlists(mns)
         self.wait_for_mnlists_same()
 
         print("testing MN payment votes (with mixed ProTx and legacy nodes)")
@@ -203,7 +216,7 @@ def run_test(self):
         for i in range(spork15_offset - 1):
             self.nodes[0].generate(1)
             self.sync_all()
-            self.wait_for_mnlists(mns, True, True)
+            self.wait_for_mnlists(mns)
             self.wait_for_mnlists_same()
 
         print("mining final block which should switch network to deterministic lists")
@@ -214,7 +227,7 @@ def run_test(self):
         ##### From now on, we don't wait for mnlists to become correct anymore, we always assert that they are correct immediately
 
         print("assert that not upgraded MNs disappeared from MN list")
-        self.assert_mnlists(mns, False, True)
+        self.assert_mnlists(mns_protx)
 
         # enable enforcement and keep it on from now on
         self.nodes[0].spork('SPORK_8_MASTERNODE_PAYMENT_ENFORCEMENT', 0)
@@ -222,41 +235,42 @@ def run_test(self):
 
         print("test that MNs disappear from the list when the ProTx collateral is spent")
         spend_mns_count = 3
-        mns_tmp = [] + mns
+        mns_tmp = [] + mns_protx
         dummy_txins = []
         for i in range(spend_mns_count):
-            dummy_txin = self.spend_mn_collateral(mns[i], with_dummy_input_output=True)
+            dummy_txin = self.spend_mn_collateral(mns_protx[i], with_dummy_input_output=True)
             dummy_txins.append(dummy_txin)
             self.nodes[0].generate(1)
             self.sync_all()
-            mns_tmp.remove(mns[i])
-            self.assert_mnlists(mns_tmp, False, True)
+            mns_tmp.remove(mns_protx[i])
+            self.assert_mnlists(mns_tmp)
 
         print("test that reverting the blockchain on a single node results in the mnlist to be reverted as well")
         for i in range(spend_mns_count):
             self.nodes[0].invalidateblock(self.nodes[0].getbestblockhash())
-            mns_tmp.append(mns[spend_mns_count - 1 - i])
-            self.assert_mnlist(self.nodes[0], mns_tmp, False, True)
+            mns_tmp.append(mns_protx[spend_mns_count - 1 - i])
+            self.assert_mnlist(self.nodes[0], mns_tmp)
 
         print("cause a reorg with a double spend and check that mnlists are still correct on all nodes")
         self.mine_double_spend(self.nodes[0], dummy_txins, self.nodes[0].getnewaddress(), use_mnmerkleroot_from_tip=True)
         self.nodes[0].generate(spend_mns_count)
         self.sync_all()
-        self.assert_mnlists(mns_tmp, False, True)
+        self.assert_mnlists(mns_tmp)
 
         print("upgrade remaining MNs to ProTx")
         for i in range(first_upgrade_count, len(mns)):
-            mns[i] = self.upgrade_mn_protx(mns[i])
+            mns[i] = self.upgrade_mn_protx(mns[i], True)
             mn = mns[i]
             self.nodes[0].generate(1)
+            mns_protx.append(mn)
             print("restarting MN %s" % mn.alias)
             self.stop_node(mn.idx)
             self.start_mn(mn)
             self.sync_all()
             self.force_finish_mnsync(mn.node)
-            self.assert_mnlists(mns, False, True)
+            self.assert_mnlists(mns_protx)
 
-        self.assert_mnlists(mns, False, True)
+        self.assert_mnlists(mns_protx)
 
         print("test mn payment enforcement with deterministic MNs")
         for i in range(20):
@@ -269,7 +283,7 @@ def run_test(self):
         self.test_instantsend(20, 5)
 
         print("testing ProUpServTx")
-        for mn in mns:
+        for mn in mns_protx:
             self.test_protx_update_service(mn)
 
     def create_mn(self, node, idx, alias):
@@ -297,7 +311,7 @@ def create_mn(self, node, idx, alias):
 
         return mn
 
-    def create_mn_protx(self, node, idx, alias):
+    def create_mn_protx_base(self, node, idx, alias):
         mn = Masternode()
         mn.idx = idx
         mn.alias = alias
@@ -310,12 +324,19 @@ def create_mn_protx(self, node, idx, alias):
         mn.votingAddr = mn.ownerAddr
         mn.legacyMnkey = node.masternode('genkey')
         mn.blsMnkey = blsKey['secret']
-        mn.collateral_address = node.getnewaddress()
 
-        mn.collateral_txid = node.protx('register', mn.collateral_address, '1000', '127.0.0.1:%d' % mn.p2p_port, mn.ownerAddr, mn.operatorAddr, mn.votingAddr, 0, mn.collateral_address)
-        rawtx = node.getrawtransaction(mn.collateral_txid, 1)
+        return mn
 
+    # create a protx MN and also fund it (using collateral inside ProRegTx)
+    def create_mn_protx_fund(self, node, idx, alias):
+        mn = self.create_mn_protx_base(node, idx, alias)
+        mn.collateral_address = node.getnewaddress()
+
+        mn.protx_hash = node.protx('fund_register', mn.collateral_address, '127.0.0.1:%d' % mn.p2p_port, mn.ownerAddr, mn.operatorAddr, mn.votingAddr, 0, mn.collateral_address)
+        mn.collateral_txid = mn.protx_hash
         mn.collateral_vout = -1
+
+        rawtx = node.getrawtransaction(mn.collateral_txid, 1)
         for txout in rawtx['vout']:
             if txout['value'] == Decimal(1000):
                 mn.collateral_vout = txout['n']
@@ -324,6 +345,17 @@ def create_mn_protx(self, node, idx, alias):
 
         return mn
 
+    # create a protx MN which refers to an existing collateral
+    def create_mn_protx(self, node, idx, alias, collateral_txid, collateral_vout):
+        mn = self.create_mn_protx_base(node, idx, alias)
+        mn.rewards_address = node.getnewaddress()
+
+        mn.protx_hash = node.protx('register', collateral_txid, collateral_vout, '127.0.0.1:%d' % mn.p2p_port, mn.ownerAddr, mn.operatorAddr, mn.votingAddr, 0, mn.rewards_address)
+        mn.collateral_txid = collateral_txid
+        mn.collateral_vout = collateral_vout
+
+        return mn
+
     def start_mn(self, mn):
         while len(self.nodes) <= mn.idx:
             self.nodes.append(None)
@@ -339,23 +371,26 @@ def start_mn(self, mn):
     def spend_mn_collateral(self, mn, with_dummy_input_output=False):
         return self.spend_input(mn.collateral_txid, mn.collateral_vout, 1000, with_dummy_input_output)
 
-    def upgrade_mn_protx(self, mn):
-        self.spend_mn_collateral(mn)
-        mn = self.create_mn_protx(self.nodes[0], mn.idx, 'mn-protx-%d' % mn.idx)
+    def upgrade_mn_protx(self, mn, refund):
+        if refund:
+            self.spend_mn_collateral(mn)
+            mn = self.create_mn_protx_fund(self.nodes[0], mn.idx, 'mn-protx-%d' % mn.idx)
+        else:
+            mn = self.create_mn_protx(self.nodes[0], mn.idx, 'mn-protx-%d' % mn.idx, mn.collateral_txid, mn.collateral_vout)
         return mn
 
     def test_protx_update_service(self, mn):
-        self.nodes[0].protx('update_service', mn.collateral_txid, '127.0.0.2:%d' % mn.p2p_port, mn.blsMnkey)
+        self.nodes[0].protx('update_service', mn.protx_hash, '127.0.0.2:%d' % mn.p2p_port, mn.blsMnkey)
         self.nodes[0].generate(1)
         self.sync_all()
         for node in self.nodes:
-            mn_info = node.masternode('info', mn.collateral_txid)
+            protx_info = node.protx('info', mn.protx_hash)
             mn_list = node.masternode('list')
-            assert_equal(mn_info['state']['addr'], '127.0.0.2:%d' % mn.p2p_port)
+            assert_equal(protx_info['state']['addr'], '127.0.0.2:%d' % mn.p2p_port)
             assert_equal(mn_list['%s-%d' % (mn.collateral_txid, mn.collateral_vout)]['address'], '127.0.0.2:%d' % mn.p2p_port)
 
         # undo
-        self.nodes[0].protx('update_service', mn.collateral_txid, '127.0.0.1:%d' % mn.p2p_port, mn.blsMnkey)
+        self.nodes[0].protx('update_service', mn.protx_hash, '127.0.0.1:%d' % mn.p2p_port, mn.blsMnkey)
         self.nodes[0].generate(1)
 
     def force_finish_mnsync(self, node):
@@ -510,30 +545,29 @@ def wait_for_winners(self, node, height, timeout=5):
             time.sleep(0.5)
         raise AssertionError("wait_for_winners for height {} timed out: {}".format(height, node.masternode('winners')))
 
-    def wait_for_mnlists(self, mns, include_legacy, include_protx, timeout=30, check=False):
+    def wait_for_mnlists(self, mns, timeout=30, check=False):
         for node in self.nodes:
-            self.wait_for_mnlist(node, mns, include_legacy, include_protx, timeout, check=check)
+            self.wait_for_mnlist(node, mns, timeout, check=check)
 
-    def wait_for_mnlist(self, node, mns, include_legacy, include_protx, timeout=30, check=False):
+    def wait_for_mnlist(self, node, mns, timeout=30, check=False):
         st = time.time()
         while time.time() < st + timeout:
             if check:
                 node.masternode('check')
-            if self.compare_mnlist(node, mns, include_legacy, include_protx):
+            if self.compare_mnlist(node, mns):
                 return
             time.sleep(0.5)
         raise AssertionError("wait_for_mnlist timed out")
 
-    def assert_mnlists(self, mns, include_legacy, include_protx):
+    def assert_mnlists(self, mns):
         for node in self.nodes:
-            self.assert_mnlist(node, mns, include_legacy, include_protx)
+            self.assert_mnlist(node, mns)
 
-    def assert_mnlist(self, node, mns, include_legacy, include_protx):
-        if not self.compare_mnlist(node, mns, include_legacy, include_protx):
+    def assert_mnlist(self, node, mns):
+        if not self.compare_mnlist(node, mns):
             expected = []
             for mn in mns:
-                if (mn.is_protx and include_protx) or (not mn.is_protx and include_legacy):
-                    expected.append('%s-%d' % (mn.collateral_txid, mn.collateral_vout))
+                expected.append('%s-%d' % (mn.collateral_txid, mn.collateral_vout))
             print('mnlist: ' + str(node.masternode('list', 'status')))
             print('expected: ' + str(expected))
             raise AssertionError("mnlists does not match provided mns")
@@ -554,26 +588,13 @@ def compare_sporks(self):
                 return False
         return True
 
-    def compare_mnlist(self, node, mns, include_legacy, include_protx):
+    def compare_mnlist(self, node, mns):
         mnlist = node.masternode('list', 'status')
         for mn in mns:
             s = '%s-%d' % (mn.collateral_txid, mn.collateral_vout)
             in_list = s in mnlist
-
-            if mn.is_protx:
-                if include_protx:
-                    if not in_list:
-                        return False
-                else:
-                    if in_list:
-                        return False
-            else:
-                if include_legacy:
-                    if not in_list:
-                        return False
-                else:
-                    if in_list:
-                        return False
+            if not in_list:
+                return False
             mnlist.pop(s, None)
         if len(mnlist) != 0:
             return False
@@ -599,13 +620,13 @@ def test_fail_create_protx(self, node):
         address = node.getnewaddress()
         key = node.getnewaddress()
         blsKey = node.bls('generate')
-        assert_raises_jsonrpc(None, "bad-tx-type", node.protx, 'register', address, '1000', '127.0.0.1:10000', key, blsKey['public'], key, 0, address)
+        assert_raises_jsonrpc(None, "bad-tx-type", node.protx, 'fund_register', address, '127.0.0.1:10000', key, blsKey['public'], key, 0, address)
 
     def test_success_create_protx(self, node):
         address = node.getnewaddress()
         key = node.getnewaddress()
         blsKey = node.bls('generate')
-        txid = node.protx('register', address, '1000', '127.0.0.1:10000', key, blsKey['public'], key, 0, address)
+        txid = node.protx('fund_register', address, '127.0.0.1:10000', key, blsKey['public'], key, 0, address)
         rawtx = node.getrawtransaction(txid, 1)
         self.mine_double_spend(node, rawtx['vin'], address, use_mnmerkleroot_from_tip=True)
         self.sync_all()
diff --git a/src/activemasternode.cpp b/src/activemasternode.cpp
index 89dd94d22ce9..bbe47aae8bdd 100644
--- a/src/activemasternode.cpp
+++ b/src/activemasternode.cpp
@@ -85,7 +85,7 @@ void CActiveDeterministicMasternodeManager::Init()
         return;
     }
 
-    activeMasternodeInfo.outpoint = COutPoint(mnListEntry->proTxHash, mnListEntry->nCollateralIndex);
+    activeMasternodeInfo.outpoint = mnListEntry->collateralOutpoint;
     state = MASTERNODE_READY;
 }
 
@@ -103,7 +103,8 @@ void CActiveDeterministicMasternodeManager::UpdatedBlockTip(const CBlockIndex* p
     if (state == MASTERNODE_WAITING_FOR_PROTX) {
         Init();
     } else if (state == MASTERNODE_READY) {
-        if (!deterministicMNManager->HasValidMNAtBlock(pindexNew->GetBlockHash(), mnListEntry->proTxHash)) {
+        auto mnList = deterministicMNManager->GetListForBlock(pindexNew->GetBlockHash());
+        if (!mnList.IsMNValid(mnListEntry->proTxHash)) {
             // MN disappeared from MN list
             state = MASTERNODE_REMOVED;
             activeMasternodeInfo.outpoint.SetNull();
@@ -367,7 +368,7 @@ void CActiveLegacyMasternodeManager::ManageStateRemote()
             LogPrintf("CActiveLegacyMasternodeManager::ManageStateRemote -- %s: %s\n", GetStateString(), strNotCapableReason);
             return;
         }
-        auto dmn = deterministicMNManager->GetListAtChainTip().GetMN(infoMn.outpoint.hash);
+        auto dmn = deterministicMNManager->GetListAtChainTip().GetMNByCollateral(infoMn.outpoint);
         if (dmn) {
             if (dmn->pdmnState->addr != infoMn.addr) {
                 nState = ACTIVE_MASTERNODE_NOT_CAPABLE;
diff --git a/src/evo/deterministicmns.cpp b/src/evo/deterministicmns.cpp
index 9c7048d7b9bf..534bfbc92743 100644
--- a/src/evo/deterministicmns.cpp
+++ b/src/evo/deterministicmns.cpp
@@ -66,7 +66,7 @@ void CDeterministicMNState::ToJson(UniValue& obj) const
 
 std::string CDeterministicMN::ToString() const
 {
-    return strprintf("CDeterministicMN(proTxHash=%s, nCollateralIndex=%d, nOperatorReward=%f, state=%s", proTxHash.ToString(), nCollateralIndex, (double)nOperatorReward / 100, pdmnState->ToString());
+    return strprintf("CDeterministicMN(proTxHash=%s, collateralOutpoint=%s, nOperatorReward=%f, state=%s", proTxHash.ToString(), collateralOutpoint.ToStringShort(), (double)nOperatorReward / 100, pdmnState->ToString());
 }
 
 void CDeterministicMN::ToJson(UniValue& obj) const
@@ -78,7 +78,8 @@ void CDeterministicMN::ToJson(UniValue& obj) const
     pdmnState->ToJson(stateObj);
 
     obj.push_back(Pair("proTxHash", proTxHash.ToString()));
-    obj.push_back(Pair("collateralIndex", (int)nCollateralIndex));
+    obj.push_back(Pair("collateralHash", collateralOutpoint.hash.ToString()));
+    obj.push_back(Pair("collateralIndex", (int)collateralOutpoint.n));
     obj.push_back(Pair("operatorReward", (double)nOperatorReward / 100));
     obj.push_back(Pair("state", stateObj));
 }
@@ -141,6 +142,11 @@ CDeterministicMNCPtr CDeterministicMNList::GetMNByOperatorKey(const CBLSPublicKe
     return nullptr;
 }
 
+CDeterministicMNCPtr CDeterministicMNList::GetMNByCollateral(const COutPoint& collateralOutpoint) const
+{
+    return GetUniquePropertyMN(collateralOutpoint);
+}
+
 static int CompareByLastPaid_GetHeight(const CDeterministicMN &dmn)
 {
     int h = dmn.pdmnState->nLastPaidHeight;
@@ -253,6 +259,7 @@ void CDeterministicMNList::AddMN(const CDeterministicMNCPtr &dmn)
 {
     assert(!mnMap.find(dmn->proTxHash));
     mnMap = mnMap.set(dmn->proTxHash, dmn);
+    AddUniqueProperty(dmn, dmn->collateralOutpoint);
     AddUniqueProperty(dmn, dmn->pdmnState->addr);
     AddUniqueProperty(dmn, dmn->pdmnState->keyIDOwner);
     AddUniqueProperty(dmn, dmn->pdmnState->pubKeyOperator);
@@ -276,6 +283,7 @@ void CDeterministicMNList::RemoveMN(const uint256& proTxHash)
 {
     auto dmn = GetMN(proTxHash);
     assert(dmn != nullptr);
+    DeleteUniqueProperty(dmn, dmn->collateralOutpoint);
     DeleteUniqueProperty(dmn, dmn->pdmnState->addr);
     DeleteUniqueProperty(dmn, dmn->pdmnState->keyIDOwner);
     DeleteUniqueProperty(dmn, dmn->pdmnState->pubKeyOperator);
@@ -368,13 +376,12 @@ bool CDeterministicMNManager::BuildNewListFromBlock(const CBlock& block, const C
 
         // check if any existing MN collateral is spent by this transaction
         for (const auto& in : tx.vin) {
-            const uint256& proTxHash = in.prevout.hash;
-            auto dmn = newList.GetMN(proTxHash);
-            if (dmn && dmn->nCollateralIndex == in.prevout.n) {
-                newList.RemoveMN(proTxHash);
+            auto dmn = newList.GetMNByCollateral(in.prevout);
+            if (dmn && dmn->collateralOutpoint == in.prevout) {
+                newList.RemoveMN(dmn->proTxHash);
 
-                LogPrintf("CDeterministicMNManager::%s -- MN %s removed from list because collateral was spent. nHeight=%d, mapCurMNs.allMNsCount=%d\n",
-                          __func__, proTxHash.ToString(), nHeight, newList.GetAllMNsCount());
+                LogPrintf("CDeterministicMNManager::%s -- MN %s removed from list because collateral was spent. collateralOutpoint=%s, nHeight=%d, mapCurMNs.allMNsCount=%d\n",
+                          __func__, dmn->proTxHash.ToString(), dmn->collateralOutpoint.ToStringShort(), nHeight, newList.GetAllMNsCount());
             }
         }
 
@@ -389,7 +396,25 @@ bool CDeterministicMNManager::BuildNewListFromBlock(const CBlock& block, const C
             if (newList.HasUniqueProperty(proTx.keyIDOwner) || newList.HasUniqueProperty(proTx.pubKeyOperator))
                 return _state.DoS(100, false, REJECT_CONFLICT, "bad-protx-dup-key");
 
-            auto dmn = std::make_shared<CDeterministicMN>(tx.GetHash(), proTx);
+            auto dmn = std::make_shared<CDeterministicMN>();
+            dmn->proTxHash = tx.GetHash();
+
+            // collateralOutpoint is either pointing to an external collateral or to the ProRegTx itself
+            if (proTx.collateralOutpoint.hash.IsNull()) {
+                dmn->collateralOutpoint = COutPoint(tx.GetHash(), proTx.collateralOutpoint.n);
+            } else {
+                dmn->collateralOutpoint = proTx.collateralOutpoint;
+            }
+
+            Coin coin;
+            if (!proTx.collateralOutpoint.hash.IsNull() && (!GetUTXOCoin(dmn->collateralOutpoint, coin) || coin.out.nValue != 1000 * COIN)) {
+                // should actually never get to this point as CheckProRegTx should have handled this case.
+                // We do this additional check nevertheless to be 100% sure
+                return _state.DoS(100, false, REJECT_INVALID, "bad-protx-collateral");
+            }
+
+            dmn->nOperatorReward = proTx.nOperatorReward;
+            dmn->pdmnState = std::make_shared<CDeterministicMNState>(proTx);
 
             CDeterministicMNState dmnState = *dmn->pdmnState;
             dmnState.nRegisteredHeight = nHeight;
@@ -550,26 +575,45 @@ CDeterministicMNList CDeterministicMNManager::GetListAtChainTip()
     return GetListForBlock(tipBlockHash);
 }
 
-CDeterministicMNCPtr CDeterministicMNManager::GetMN(const uint256& blockHash, const uint256& proTxHash)
+bool CDeterministicMNManager::HasValidMNCollateralAtChainTip(const COutPoint& outpoint)
 {
-    auto mnList = GetListForBlock(blockHash);
-    return mnList.GetMN(proTxHash);
+    auto mnList = GetListAtChainTip();
+    auto dmn = mnList.GetMNByCollateral(outpoint);
+    return dmn && mnList.IsMNValid(dmn);
 }
 
-bool CDeterministicMNManager::HasValidMNAtBlock(const uint256& blockHash, const uint256& proTxHash)
+bool CDeterministicMNManager::HasMNCollateralAtChainTip(const COutPoint& outpoint)
 {
-    auto mnList = GetListForBlock(blockHash);
-    return mnList.IsMNValid(proTxHash);
+    auto mnList = GetListAtChainTip();
+    auto dmn = mnList.GetMNByCollateral(outpoint);
+    return dmn != nullptr;
 }
 
-bool CDeterministicMNManager::HasValidMNAtChainTip(const uint256& proTxHash)
+int64_t CDeterministicMNManager::GetSpork15Value()
 {
-    return GetListAtChainTip().IsMNValid(proTxHash);
+    return sporkManager.GetSporkValue(SPORK_15_DETERMINISTIC_MNS_ENABLED);
 }
 
-int64_t CDeterministicMNManager::GetSpork15Value()
+bool CDeterministicMNManager::IsProTxWithCollateral(const CTransactionRef& tx, uint32_t n)
 {
-    return sporkManager.GetSporkValue(SPORK_15_DETERMINISTIC_MNS_ENABLED);
+    if (tx->nVersion < 3 || tx->nType != TRANSACTION_PROVIDER_REGISTER) {
+        return false;
+    }
+    CProRegTx proTx;
+    if (!GetTxPayload(*tx, proTx)) {
+        return false;
+    }
+
+    if (!proTx.collateralOutpoint.hash.IsNull()) {
+        return false;
+    }
+    if (proTx.collateralOutpoint.n >= tx->vout.size() || proTx.collateralOutpoint.n != n) {
+        return false;
+    }
+    if (tx->vout[n].nValue != 1000 * COIN) {
+        return false;
+    }
+    return true;
 }
 
 bool CDeterministicMNManager::IsDeterministicMNsSporkActive(int nHeight)
diff --git a/src/evo/deterministicmns.h b/src/evo/deterministicmns.h
index 027217ccc20e..09ba21d32296 100644
--- a/src/evo/deterministicmns.h
+++ b/src/evo/deterministicmns.h
@@ -115,18 +115,11 @@ class CDeterministicMN
 {
 public:
     CDeterministicMN() {}
-    CDeterministicMN(const uint256& _proTxHash, const CProRegTx& _proTx)
-    {
-        proTxHash = _proTxHash;
-        nCollateralIndex = _proTx.nCollateralIndex;
-        nOperatorReward = _proTx.nOperatorReward;
-        pdmnState = std::make_shared<CDeterministicMNState>(_proTx);
-    }
     template<typename Stream>
     CDeterministicMN(deserialize_type, Stream& s) { s >> *this;}
 
     uint256 proTxHash;
-    uint32_t nCollateralIndex;
+    COutPoint collateralOutpoint;
     uint16_t nOperatorReward;
     CDeterministicMNStateCPtr pdmnState;
 
@@ -137,7 +130,7 @@ class CDeterministicMN
     inline void SerializationOp(Stream& s, Operation ser_action)
     {
         READWRITE(proTxHash);
-        READWRITE(nCollateralIndex);
+        READWRITE(collateralOutpoint);
         READWRITE(nOperatorReward);
         READWRITE(pdmnState);
     }
@@ -258,6 +251,8 @@ class CDeterministicMNList
 
     bool IsMNValid(const uint256& proTxHash) const;
     bool IsMNPoSeBanned(const uint256& proTxHash) const;
+    bool IsMNValid(const CDeterministicMNCPtr& dmn) const;
+    bool IsMNPoSeBanned(const CDeterministicMNCPtr& dmn) const;
 
     bool HasMN(const uint256& proTxHash) const {
         return GetMN(proTxHash) != nullptr;
@@ -265,6 +260,7 @@ class CDeterministicMNList
     CDeterministicMNCPtr GetMN(const uint256& proTxHash) const;
     CDeterministicMNCPtr GetValidMN(const uint256& proTxHash) const;
     CDeterministicMNCPtr GetMNByOperatorKey(const CBLSPublicKey& pubKey);
+    CDeterministicMNCPtr GetMNByCollateral(const COutPoint& collateralOutpoint) const;
     CDeterministicMNCPtr GetMNPayee() const;
 
     /**
@@ -298,9 +294,6 @@ class CDeterministicMNList
     }
 
 private:
-    bool IsMNValid(const CDeterministicMNCPtr& dmn) const;
-    bool IsMNPoSeBanned(const CDeterministicMNCPtr& dmn) const;
-
     template<typename T>
     void AddUniqueProperty(const CDeterministicMNCPtr& dmn, const T& v)
     {
@@ -396,14 +389,16 @@ class CDeterministicMNManager
     CDeterministicMNList GetListForBlock(const uint256& blockHash);
     CDeterministicMNList GetListAtChainTip();
 
-    CDeterministicMNCPtr GetMN(const uint256& blockHash, const uint256& proTxHash);
-    bool HasValidMNAtBlock(const uint256& blockHash, const uint256& proTxHash);
-    bool HasValidMNAtChainTip(const uint256& proTxHash);
+    // TODO remove after removal of old non-deterministic lists
+    bool HasValidMNCollateralAtChainTip(const COutPoint& outpoint);
+    bool HasMNCollateralAtChainTip(const COutPoint& outpoint);
+
+    // Test if given TX is a ProRegTx which also contains the collateral at index n
+    bool IsProTxWithCollateral(const CTransactionRef& tx, uint32_t n);
 
     bool IsDeterministicMNsSporkActive(int nHeight = -1);
 
 private:
-    void UpdateSpork15Value();
     int64_t GetSpork15Value();
     void CleanupCache(int nHeight);
 };
diff --git a/src/evo/providertx.cpp b/src/evo/providertx.cpp
index 03c99ce4877c..6b7463dd4098 100644
--- a/src/evo/providertx.cpp
+++ b/src/evo/providertx.cpp
@@ -55,13 +55,22 @@ static bool CheckSig(const ProTx& proTx, const CBLSPublicKey& pubKey, CValidatio
     return true;
 }
 
-template <typename ProTx, typename PubKey>
-static bool CheckInputsHashAndSig(const CTransaction &tx, const ProTx& proTx, const PubKey& pubKey, CValidationState& state)
+template <typename ProTx>
+static bool CheckInputsHash(const CTransaction &tx, const ProTx& proTx, CValidationState& state)
 {
     uint256 inputsHash = CalcTxInputsHash(tx);
     if (inputsHash != proTx.inputsHash)
         return state.DoS(100, false, REJECT_INVALID, "bad-protx-inputs-hash");
 
+    return true;
+}
+
+template <typename ProTx, typename PubKey>
+static bool CheckInputsHashAndSig(const CTransaction &tx, const ProTx& proTx, const PubKey& pubKey, CValidationState& state)
+{
+    if (!CheckInputsHash(tx, proTx, state))
+        return false;
+
     if (!CheckSig(proTx, pubKey, state))
         return false;
 
@@ -83,10 +92,18 @@ bool CheckProRegTx(const CTransaction& tx, const CBlockIndex* pindexPrev, CValid
     if (ptx.nMode != 0)
         return state.DoS(100, false, REJECT_INVALID, "bad-protx-mode");
 
-    if (ptx.nCollateralIndex >= tx.vout.size())
-        return state.DoS(10, false, REJECT_INVALID, "bad-protx-collateral-index");
-    if (tx.vout[ptx.nCollateralIndex].nValue != 1000 * COIN)
-        return state.DoS(10, false, REJECT_INVALID, "bad-protx-collateral");
+    // when collateralOutpoint refers to an external collateral, we check it further down
+    if (ptx.collateralOutpoint.hash.IsNull()) {
+        if (ptx.collateralOutpoint.n >= tx.vout.size())
+            return state.DoS(10, false, REJECT_INVALID, "bad-protx-collateral-index");
+        if (tx.vout[ptx.collateralOutpoint.n].nValue != 1000 * COIN)
+            return state.DoS(10, false, REJECT_INVALID, "bad-protx-collateral");
+
+        // This is a temporary restriction that will be lifted later
+        // It is required while we are transitioning from the old MN list to the deterministic list
+        if (tx.vout[ptx.collateralOutpoint.n].scriptPubKey != ptx.scriptPayout)
+            return state.DoS(10, false, REJECT_INVALID, "bad-protx-payee-collateral");
+    }
     if (ptx.keyIDOwner.IsNull() || !ptx.pubKeyOperator.IsValid() || ptx.keyIDVoting.IsNull())
         return state.DoS(10, false, REJECT_INVALID, "bad-protx-key-null");
     // we may support P2SH later, but restrict it for now (while in transitioning phase from old MN list to deterministic list)
@@ -103,11 +120,6 @@ bool CheckProRegTx(const CTransaction& tx, const CBlockIndex* pindexPrev, CValid
         return state.DoS(10, false, REJECT_INVALID, "bad-protx-payee-reuse");
     }
 
-    // This is a temporary restriction that will be lifted later
-    // It is required while we are transitioning from the old MN list to the deterministic list
-    if (tx.vout[ptx.nCollateralIndex].scriptPubKey != ptx.scriptPayout)
-        return state.DoS(10, false, REJECT_INVALID, "bad-protx-payee-collateral");
-
     // It's allowed to set addr/protocolVersion to 0, which will put the MN into PoSe-banned state and require a ProUpServTx to be issues later
     // If any of both is set, it must be valid however
     if (ptx.addr != CService() && !CheckService(tx.GetHash(), ptx, pindexPrev, state))
@@ -116,12 +128,38 @@ bool CheckProRegTx(const CTransaction& tx, const CBlockIndex* pindexPrev, CValid
     if (ptx.nOperatorReward > 10000)
         return state.DoS(10, false, REJECT_INVALID, "bad-protx-operator-reward");
 
+    CKeyID keyForPayloadSig;
+
+    if (!ptx.collateralOutpoint.hash.IsNull()) {
+        Coin coin;
+        if (!GetUTXOCoin(ptx.collateralOutpoint, coin) || coin.out.nValue != 1000 * COIN) {
+            return state.DoS(10, false, REJECT_INVALID, "bad-protx-collateral");
+        }
+
+        CTxDestination txDest;
+        if (!ExtractDestination(coin.out.scriptPubKey, txDest)) {
+            return state.DoS(10, false, REJECT_INVALID, "bad-protx-collateral-dest");
+        }
+
+        // Extract key from collateral. This only works for P2PK and P2PKH collaterals and will fail for P2SH.
+        // Issuer of this ProRegTx must prove ownership with this key by signing the ProRegTx
+        CBitcoinAddress txAddr(txDest);
+        if (!txAddr.GetKeyID(keyForPayloadSig)) {
+            return state.DoS(10, false, REJECT_INVALID, "bad-protx-collateral-pkh");
+        }
+    }
+
     if (pindexPrev) {
         auto mnList = deterministicMNManager->GetListForBlock(pindexPrev->GetBlockHash());
         if (mnList.HasUniqueProperty(ptx.keyIDOwner) || mnList.HasUniqueProperty(ptx.pubKeyOperator)) {
             return state.DoS(10, false, REJECT_DUPLICATE, "bad-protx-dup-key");
         }
 
+        // check for collaterals which are already used in other MNs
+        if (!ptx.collateralOutpoint.hash.IsNull() && mnList.HasUniqueProperty(ptx.collateralOutpoint)) {
+            return state.DoS(10, false, REJECT_DUPLICATE, "bad-protx-dup-collateral");
+        }
+
         if (!deterministicMNManager->IsDeterministicMNsSporkActive(pindexPrev->nHeight)) {
             if (ptx.keyIDOwner != ptx.keyIDVoting) {
                 return state.DoS(10, false, REJECT_INVALID, "bad-protx-key-not-same");
@@ -129,8 +167,21 @@ bool CheckProRegTx(const CTransaction& tx, const CBlockIndex* pindexPrev, CValid
         }
     }
 
-    if (!CheckInputsHashAndSig(tx, ptx, ptx.keyIDOwner, state))
-        return false;
+    if (!keyForPayloadSig.IsNull()) {
+        // collateral is not part of this ProRegTx, so we must verify ownership of the collateral
+        if (!CheckInputsHashAndSig(tx, ptx, keyForPayloadSig, state)) {
+            return false;
+        }
+    } else {
+        // collateral is part of this ProRegTx, so we know the collateral is owned by the issuer
+        if (!ptx.vchSig.empty()) {
+            return state.DoS(100, false, REJECT_INVALID, "bad-protx-sig");
+        }
+        if (!CheckInputsHash(tx, ptx, state)) {
+            return false;
+        }
+    }
+
     return true;
 }
 
@@ -149,7 +200,8 @@ bool CheckProUpServTx(const CTransaction& tx, const CBlockIndex* pindexPrev, CVa
         return false;
 
     if (pindexPrev) {
-        auto mn = deterministicMNManager->GetMN(pindexPrev->GetBlockHash(), ptx.proTxHash);
+        auto mnList = deterministicMNManager->GetListForBlock(pindexPrev->GetBlockHash());
+        auto mn = mnList.GetMN(ptx.proTxHash);
         if (!mn)
             return state.DoS(100, false, REJECT_INVALID, "bad-protx-hash");
 
@@ -210,7 +262,7 @@ bool CheckProUpRegTx(const CTransaction& tx, const CBlockIndex* pindexPrev, CVal
         // This is a temporary restriction that will be lifted later
         // It is required while we are transitioning from the old MN list to the deterministic list
         Coin coin;
-        if (!GetUTXOCoin(COutPoint(dmn->proTxHash, dmn->nCollateralIndex), coin) || coin.IsSpent()) {
+        if (!GetUTXOCoin(dmn->collateralOutpoint, coin)) {
             return state.DoS(100, false, REJECT_INVALID, "bad-protx-payee-collateral");
         }
         if (coin.out.scriptPubKey != ptx.scriptPayout)
@@ -273,8 +325,8 @@ std::string CProRegTx::ToString() const
         payee = CBitcoinAddress(dest).ToString();
     }
 
-    return strprintf("CProRegTx(nVersion=%d, nCollateralIndex=%d, addr=%s, nOperatorReward=%f, keyIDOwner=%s, pubKeyOperator=%s, keyIDVoting=%s, scriptPayout=%s)",
-        nVersion, nCollateralIndex, addr.ToString(), (double)nOperatorReward / 100, keyIDOwner.ToString(), pubKeyOperator.ToString(), keyIDVoting.ToString(), payee);
+    return strprintf("CProRegTx(nVersion=%d, collateralOutpoint=%s, addr=%s, nOperatorReward=%f, keyIDOwner=%s, pubKeyOperator=%s, keyIDVoting=%s, scriptPayout=%s)",
+        nVersion, collateralOutpoint.ToStringShort(), addr.ToString(), (double)nOperatorReward / 100, keyIDOwner.ToString(), pubKeyOperator.ToString(), keyIDVoting.ToString(), payee);
 }
 
 void CProRegTx::ToJson(UniValue& obj) const
@@ -282,7 +334,8 @@ void CProRegTx::ToJson(UniValue& obj) const
     obj.clear();
     obj.setObject();
     obj.push_back(Pair("version", nVersion));
-    obj.push_back(Pair("collateralIndex", (int)nCollateralIndex));
+    obj.push_back(Pair("collateralHash", collateralOutpoint.hash.ToString()));
+    obj.push_back(Pair("collateralIndex", (int)collateralOutpoint.n));
     obj.push_back(Pair("service", addr.ToString(false)));
     obj.push_back(Pair("keyIDOwner", keyIDOwner.ToString()));
     obj.push_back(Pair("pubKeyOperator", pubKeyOperator.ToString()));
@@ -368,18 +421,3 @@ void CProUpRevTx::ToJson(UniValue& obj) const
     obj.push_back(Pair("reason", (int)nReason));
     obj.push_back(Pair("inputsHash", inputsHash.ToString()));
 }
-
-bool IsProTxCollateral(const CTransaction& tx, uint32_t n)
-{
-    return GetProTxCollateralIndex(tx) == n;
-}
-
-uint32_t GetProTxCollateralIndex(const CTransaction& tx)
-{
-    if (tx.nVersion < 3 || tx.nType != TRANSACTION_PROVIDER_REGISTER)
-        return (uint32_t) - 1;
-    CProRegTx proTx;
-    if (!GetTxPayload(tx, proTx))
-        assert(false);
-    return proTx.nCollateralIndex;
-}
diff --git a/src/evo/providertx.h b/src/evo/providertx.h
index 46edd83b1f63..a0a451efc995 100644
--- a/src/evo/providertx.h
+++ b/src/evo/providertx.h
@@ -24,7 +24,7 @@ class CProRegTx
     uint16_t nVersion{CURRENT_VERSION}; // message version
     uint16_t nType{0}; // only 0 supported for now
     uint16_t nMode{0}; // only 0 supported for now
-    uint32_t nCollateralIndex{(uint32_t) - 1};
+    COutPoint collateralOutpoint{uint256(), (uint32_t)-1}; // if hash is null, we refer to a ProRegTx output
     CService addr;
     CKeyID keyIDOwner;
     CBLSPublicKey pubKeyOperator;
@@ -43,7 +43,7 @@ class CProRegTx
         READWRITE(nVersion);
         READWRITE(nType);
         READWRITE(nMode);
-        READWRITE(nCollateralIndex);
+        READWRITE(collateralOutpoint);
         READWRITE(addr);
         READWRITE(keyIDOwner);
         READWRITE(pubKeyOperator);
@@ -179,7 +179,4 @@ bool CheckProUpServTx(const CTransaction& tx, const CBlockIndex* pindexPrev, CVa
 bool CheckProUpRegTx(const CTransaction& tx, const CBlockIndex* pindexPrev, CValidationState& state);
 bool CheckProUpRevTx(const CTransaction& tx, const CBlockIndex* pindexPrev, CValidationState& state);
 
-bool IsProTxCollateral(const CTransaction& tx, uint32_t n);
-uint32_t GetProTxCollateralIndex(const CTransaction& tx);
-
 #endif//DASH_PROVIDERTX_H
diff --git a/src/init.cpp b/src/init.cpp
index 86626e3dc825..eaa8b2a697f0 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -810,6 +810,13 @@ void ThreadImport(std::vector<boost::filesystem::path> vImportFiles)
     if (activeMasternodeManager && fDIP0003ActiveAtTip)
         activeMasternodeManager->Init();
 
+#ifdef ENABLE_WALLET
+    // we can't do this before DIP3 is fully initialized
+    if (pwalletMain) {
+        pwalletMain->AutoLockMasternodeCollaterals();
+    }
+#endif
+
     LoadMempool();
     fDumpMempoolLater = !fRequestShutdown;
 }
@@ -1837,6 +1844,14 @@ bool AppInitMain(boost::thread_group& threadGroup, CScheduler& scheduler)
 
     // ********************************************************* Step 9: data directory maintenance
 
+    if (!fLiteMode) {
+        uiInterface.InitMessage(_("Loading sporks cache..."));
+        CFlatDB<CSporkManager> flatdb6("sporks.dat", "magicSporkCache");
+        if (!flatdb6.Load(sporkManager)) {
+            return InitError(_("Failed to load sporks cache from") + "\n" + (GetDataDir() / "sporks.dat").string());
+        }
+    }
+
     // if pruning, unset the service bit and perform the initial blockstore prune
     // after any wallet rescanning has taken place.
     if (fPruneMode) {
@@ -2044,13 +2059,6 @@ bool AppInitMain(boost::thread_group& threadGroup, CScheduler& scheduler)
                 return InitError(_("Failed to load InstantSend data cache from") + "\n" + (pathDB / strDBName).string());
             }
         }
-
-        strDBName = "sporks.dat";
-        uiInterface.InitMessage(_("Loading sporks cache..."));
-        CFlatDB<CSporkManager> flatdb6(strDBName, "magicSporkCache");
-        if(!flatdb6.Load(sporkManager)) {
-            return InitError(_("Failed to load sporks cache from") + "\n" + (pathDB / strDBName).string());
-        }
     }
 
     // ********************************************************* Step 11c: schedule Dash-specific tasks
diff --git a/src/masternode-payments.cpp b/src/masternode-payments.cpp
index fb1ad614144d..5403110f95e2 100644
--- a/src/masternode-payments.cpp
+++ b/src/masternode-payments.cpp
@@ -627,7 +627,7 @@ bool CMasternodePayments::IsScheduled(const masternode_info_t& mnInfo, int nNotB
     if (deterministicMNManager->IsDeterministicMNsSporkActive()) {
         auto projectedPayees = deterministicMNManager->GetListAtChainTip().GetProjectedMNPayees(8);
         for (const auto &dmn : projectedPayees) {
-            if (dmn->proTxHash == mnInfo.outpoint.hash) {
+            if (dmn->collateralOutpoint == mnInfo.outpoint) {
                 return true;
             }
         }
diff --git a/src/masternode.cpp b/src/masternode.cpp
index dc01830fac58..57dfa9c09d5d 100644
--- a/src/masternode.cpp
+++ b/src/masternode.cpp
@@ -56,7 +56,7 @@ CMasternode::CMasternode(const CMasternodeBroadcast& mnb) :
 
 CMasternode::CMasternode(const uint256 &proTxHash, const CDeterministicMNCPtr& dmn) :
     masternode_info_t{ MASTERNODE_ENABLED, DMN_PROTO_VERSION, GetAdjustedTime(),
-                       COutPoint(proTxHash, dmn->nCollateralIndex), dmn->pdmnState->addr, CKeyID(), dmn->pdmnState->keyIDOwner, dmn->pdmnState->pubKeyOperator, dmn->pdmnState->keyIDVoting},
+                       dmn->collateralOutpoint, dmn->pdmnState->addr, CKeyID(), dmn->pdmnState->keyIDOwner, dmn->pdmnState->pubKeyOperator, dmn->pdmnState->keyIDVoting},
     fAllowMixingTx(true)
 {
     CTxDestination dest;
@@ -352,7 +352,7 @@ void CMasternode::UpdateLastPaid(const CBlockIndex *pindex, int nMaxBlocksToScan
     if(!pindex) return;
 
     if (deterministicMNManager->IsDeterministicMNsSporkActive(pindex->nHeight)) {
-        auto dmn = deterministicMNManager->GetListForBlock(pindex->GetBlockHash()).GetMN(outpoint.hash);
+        auto dmn = deterministicMNManager->GetListForBlock(pindex->GetBlockHash()).GetMNByCollateral(outpoint);
         if (!dmn || dmn->pdmnState->nLastPaidHeight == -1) {
             LogPrint("masternode", "CMasternode::UpdateLastPaidBlock -- searching for block with payment to %s -- not found\n", outpoint.ToStringShort());
         } else {
diff --git a/src/masternodeman.cpp b/src/masternodeman.cpp
index f40e7634ff13..a79082386595 100644
--- a/src/masternodeman.cpp
+++ b/src/masternodeman.cpp
@@ -383,7 +383,7 @@ void CMasternodeMan::AddDeterministicMasternodes()
         auto mnList = deterministicMNManager->GetListAtChainTip();
         mnList.ForEachMN(true, [this](const CDeterministicMNCPtr& dmn) {
             // call Find() on each deterministic MN to force creation of CMasternode object
-            auto mn = Find(COutPoint(dmn->proTxHash, dmn->nCollateralIndex));
+            auto mn = Find(dmn->collateralOutpoint);
             assert(mn);
 
             // make sure we use the splitted keys from now on
@@ -416,7 +416,7 @@ void CMasternodeMan::RemoveNonDeterministicMasternodes()
         std::set<COutPoint> mnSet;
         auto mnList = deterministicMNManager->GetListAtChainTip();
         mnList.ForEachMN(true, [&](const CDeterministicMNCPtr& dmn) {
-            mnSet.insert(COutPoint(dmn->proTxHash, dmn->nCollateralIndex));
+            mnSet.insert(dmn->collateralOutpoint);
         });
         auto it = mapMasternodes.begin();
         while (it != mapMasternodes.end()) {
@@ -539,11 +539,8 @@ CMasternode* CMasternodeMan::Find(const COutPoint &outpoint)
         // on-chain, like vote counts
 
         auto mnList = deterministicMNManager->GetListAtChainTip();
-        if (!mnList.IsMNValid(outpoint.hash)) {
-            return nullptr;
-        }
-        auto dmn = mnList.GetMN(outpoint.hash);
-        if (!dmn) {
+        auto dmn = mnList.GetMNByCollateral(outpoint);
+        if (!dmn || !mnList.IsMNValid(dmn)) {
             return nullptr;
         }
 
@@ -578,7 +575,7 @@ bool CMasternodeMan::GetMasternodeInfo(const uint256& proTxHash, masternode_info
     auto dmn = deterministicMNManager->GetListAtChainTip().GetValidMN(proTxHash);
     if (!dmn)
         return false;
-    return GetMasternodeInfo(COutPoint(proTxHash, dmn->nCollateralIndex), mnInfoRet);
+    return GetMasternodeInfo(dmn->collateralOutpoint, mnInfoRet);
 }
 
 bool CMasternodeMan::GetMasternodeInfo(const COutPoint& outpoint, masternode_info_t& mnInfoRet)
@@ -626,7 +623,7 @@ bool CMasternodeMan::Has(const COutPoint& outpoint)
 {
     LOCK(cs);
     if (deterministicMNManager->IsDeterministicMNsSporkActive()) {
-        return deterministicMNManager->HasValidMNAtChainTip(outpoint.hash);
+        return deterministicMNManager->HasValidMNCollateralAtChainTip(outpoint);
     } else {
         return mapMasternodes.find(outpoint) != mapMasternodes.end();
     }
@@ -754,7 +751,7 @@ masternode_info_t CMasternodeMan::FindRandomNotInVec(const std::vector<COutPoint
             }
         }
         if(fExclude) continue;
-        if (deterministicMNManager->IsDeterministicMNsSporkActive() && !deterministicMNManager->HasValidMNAtChainTip(pmn->outpoint.hash))
+        if (deterministicMNManager->IsDeterministicMNsSporkActive() && !deterministicMNManager->HasValidMNCollateralAtChainTip(pmn->outpoint))
             continue;
         // found the one not in vecToExclude
         LogPrint("masternode", "CMasternodeMan::FindRandomNotInVec -- found, masternode=%s\n", pmn->outpoint.ToStringShort());
@@ -771,8 +768,10 @@ std::map<COutPoint, CMasternode> CMasternodeMan::GetFullMasternodeMap()
 
     if (deterministicMNManager->IsDeterministicMNsSporkActive()) {
         std::map<COutPoint, CMasternode> result;
+        auto mnList = deterministicMNManager->GetListAtChainTip();
         for (const auto &p : mapMasternodes) {
-            if (deterministicMNManager->HasValidMNAtChainTip(p.first.hash)) {
+            auto dmn = mnList.GetMNByCollateral(p.first);
+            if (dmn && mnList.IsMNValid(dmn)) {
                 result.emplace(p.first, p.second);
             }
         }
@@ -796,7 +795,7 @@ bool CMasternodeMan::GetMasternodeScores(const uint256& nBlockHash, CMasternodeM
 
     // calculate scores
     for (const auto& mnpair : mapMasternodes) {
-        if (deterministicMNManager->IsDeterministicMNsSporkActive() && !deterministicMNManager->HasValidMNAtChainTip(mnpair.second.outpoint.hash))
+        if (deterministicMNManager->IsDeterministicMNsSporkActive() && !deterministicMNManager->HasValidMNCollateralAtChainTip(mnpair.second.outpoint))
             continue;
 
         if (mnpair.second.nProtocolVersion >= nMinProtocol) {
diff --git a/src/rpc/governance.cpp b/src/rpc/governance.cpp
index f0375085c8f0..f08a4767c9d6 100644
--- a/src/rpc/governance.cpp
+++ b/src/rpc/governance.cpp
@@ -586,7 +586,7 @@ UniValue gobject_vote_many(const JSONRPCRequest& request)
                     continue;
                 }
 
-                if (nTxHash == dmn->proTxHash && (uint32_t)nOutputIndex == dmn->nCollateralIndex) {
+                if (nTxHash == dmn->collateralOutpoint.hash && (uint32_t)nOutputIndex == dmn->collateralOutpoint.n) {
                     found = true;
                     break;
                 }
@@ -595,7 +595,7 @@ UniValue gobject_vote_many(const JSONRPCRequest& request)
                 CKey ownerKey;
                 if (pwalletMain->GetKey(dmn->pdmnState->keyIDVoting, ownerKey)) {
                     CBitcoinSecret secret(ownerKey);
-                    CMasternodeConfig::CMasternodeEntry mne(dmn->proTxHash.ToString(), dmn->pdmnState->addr.ToStringIPPort(false), secret.ToString(), dmn->proTxHash.ToString(), itostr(dmn->nCollateralIndex));
+                    CMasternodeConfig::CMasternodeEntry mne(dmn->proTxHash.ToString(), dmn->pdmnState->addr.ToStringIPPort(false), secret.ToString(), dmn->collateralOutpoint.hash.ToString(), itostr(dmn->collateralOutpoint.n));
                     entries.push_back(mne);
                 }
             }
diff --git a/src/rpc/masternode.cpp b/src/rpc/masternode.cpp
index ec700665c943..ad2e2da1fffb 100644
--- a/src/rpc/masternode.cpp
+++ b/src/rpc/masternode.cpp
@@ -597,89 +597,6 @@ UniValue masternode_genkey(const JSONRPCRequest& request)
     return CBitcoinSecret(secret).ToString();
 }
 
-void masternode_info_help()
-{
-    throw std::runtime_error(
-            "masternode info \"proTxHash\"\n"
-            "Print masternode information of specified masternode\n"
-            "\nArguments:\n"
-            "1. proTxHash        (string, required) proTxHash of masternode\n"
-    );
-}
-
-UniValue masternode_info(const JSONRPCRequest& request)
-{
-    if (request.fHelp || request.params.size() != 2)
-        masternode_info_help();
-
-    std::string strProTxHash = request.params[1].get_str();
-    if (!IsHex(strProTxHash) || strProTxHash.size() != 64)
-        throw JSONRPCError(RPC_INVALID_PARAMETER, "Invalid \"proTxHash\"");
-
-    uint256 proTxHash;
-    proTxHash.SetHex(strProTxHash);
-
-    CTransactionRef tx;
-    uint256 hashBlock;
-
-    auto dmn = deterministicMNManager->GetListAtChainTip().GetMN(proTxHash);
-    if (!dmn) {
-        tx = mempool.get(proTxHash);
-        if (tx) {
-            if (tx->nVersion < 3 || tx->nType != TRANSACTION_PROVIDER_REGISTER)
-                throw JSONRPCError(RPC_INVALID_PARAMETER, "TX is not a ProTx");
-            CProRegTx tmpProTx;
-            if (!GetTxPayload(*tx, tmpProTx))
-                throw JSONRPCError(RPC_INVALID_PARAMETER, "TX is not a valid ProTx");
-            dmn = std::make_shared<CDeterministicMN>(tx->GetHash(), tmpProTx);
-        } else {
-            throw JSONRPCError(RPC_INVALID_PARAMETER, "ProTx not found");
-        }
-    } else {
-        if (!GetTransaction(proTxHash, tx, Params().GetConsensus(), hashBlock, true))
-            throw JSONRPCError(RPC_INVALID_PARAMETER, "Parent transaction of ProTx not found");
-
-        if (!mapBlockIndex.count(hashBlock))
-            throw JSONRPCError(RPC_INVALID_PARAMETER, "Parent transaction of ProTx not found");
-    }
-
-    UniValue obj(UniValue::VOBJ);
-
-    UniValue stateObj;
-    dmn->pdmnState->ToJson(stateObj);
-    obj.push_back(Pair("state", stateObj));
-
-    if (!hashBlock.IsNull()) {
-        UniValue blockObj(UniValue::VOBJ);
-        blockObj.push_back(Pair("blockhash", hashBlock.GetHex()));
-
-        LOCK(cs_main);
-        BlockMap::iterator mi = mapBlockIndex.find(hashBlock);
-        if (mi != mapBlockIndex.end() && (*mi).second) {
-            CBlockIndex *pindex = (*mi).second;
-            if (chainActive.Contains(pindex)) {
-                blockObj.push_back(Pair("height", pindex->nHeight));
-                blockObj.push_back(Pair("confirmations", 1 + chainActive.Height() - pindex->nHeight));
-                blockObj.push_back(Pair("time", pindex->GetBlockTime()));
-                blockObj.push_back(Pair("blocktime", pindex->GetBlockTime()));
-            } else {
-                blockObj.push_back(Pair("height", -1));
-                blockObj.push_back(Pair("confirmations", 0));
-            }
-        }
-        obj.push_back(Pair("block", blockObj));
-
-        if (GetUTXOHeight(COutPoint(proTxHash, dmn->nCollateralIndex)) < 0) {
-            obj.push_back(Pair("isSpent", true));
-        }
-
-    } else {
-        obj.push_back(Pair("fromMempool", true));
-    }
-
-    return obj;
-}
-
 void masternode_list_conf_help()
 {
     throw std::runtime_error(
@@ -741,7 +658,8 @@ UniValue masternode_status(const JSONRPCRequest& request)
         auto dmn = activeMasternodeManager->GetDMN();
         if (dmn) {
             mnObj.push_back(Pair("proTxHash", dmn->proTxHash.ToString()));
-            mnObj.push_back(Pair("collateralIndex", (int)dmn->nCollateralIndex));
+            mnObj.push_back(Pair("collateralHash", dmn->collateralOutpoint.hash.ToString()));
+            mnObj.push_back(Pair("collateralIndex", (int)dmn->collateralOutpoint.n));
             UniValue stateObj;
             dmn->pdmnState->ToJson(stateObj);
             mnObj.push_back(Pair("dmnState", stateObj));
@@ -902,8 +820,6 @@ UniValue masternode(const JSONRPCRequest& request)
 #endif // ENABLE_WALLET
     } else if (strCommand == "genkey") {
         return masternode_genkey(request);
-    } else if (strCommand == "info") {
-        return masternode_info(request);
     } else if (strCommand == "list-conf") {
         return masternode_list_conf(request);
 #ifdef ENABLE_WALLET
diff --git a/src/rpc/rpcevo.cpp b/src/rpc/rpcevo.cpp
index 66657b4d5a10..00a04961e749 100644
--- a/src/rpc/rpcevo.cpp
+++ b/src/rpc/rpcevo.cpp
@@ -116,9 +116,15 @@ static void FundSpecialTx(CMutableTransaction& tx, SpecialTxPayload payload)
 }
 
 template<typename SpecialTxPayload>
-static void SignSpecialTxPayload(const CMutableTransaction& tx, SpecialTxPayload& payload, const CKey& key)
+static void UpdateSpecialTxInputsHash(const CMutableTransaction& tx, SpecialTxPayload& payload)
 {
     payload.inputsHash = CalcTxInputsHash(tx);
+}
+
+template<typename SpecialTxPayload>
+static void SignSpecialTxPayload(const CMutableTransaction& tx, SpecialTxPayload& payload, const CKey& key)
+{
+    UpdateSpecialTxInputsHash(tx, payload);
     payload.vchSig.clear();
 
     uint256 hash = ::SerializeHash(payload);
@@ -130,7 +136,7 @@ static void SignSpecialTxPayload(const CMutableTransaction& tx, SpecialTxPayload
 template<typename SpecialTxPayload>
 static void SignSpecialTxPayload(const CMutableTransaction& tx, SpecialTxPayload& payload, const CBLSSecretKey& key)
 {
-    payload.inputsHash = CalcTxInputsHash(tx);
+    UpdateSpecialTxInputsHash(tx, payload);
 
     uint256 hash = ::SerializeHash(payload);
     payload.sig = key.Sign(hash);
@@ -139,8 +145,9 @@ static void SignSpecialTxPayload(const CMutableTransaction& tx, SpecialTxPayload
 static std::string SignAndSendSpecialTx(const CMutableTransaction& tx)
 {
     LOCK(cs_main);
+
     CValidationState state;
-    if (!CheckSpecialTx(tx, NULL, state))
+    if (!CheckSpecialTx(tx, chainActive.Tip(), state))
         throw std::runtime_error(FormatStateMessage(state));
 
     CDataStream ds(SER_NETWORK, PROTOCOL_VERSION);
@@ -157,11 +164,11 @@ static std::string SignAndSendSpecialTx(const CMutableTransaction& tx)
     return sendrawtransaction(sendRequest).get_str();
 }
 
-void protx_register_help()
+void protx_fund_register_help()
 {
     throw std::runtime_error(
-            "protx register \"collateralAddress\" collateralAmount \"ipAndPort\" \"ownerKeyAddr\" \"operatorKeyAddr\" \"votingKeyAddr\" operatorReward \"payoutAddress\"\n"
-            "\nCreates and sends a ProTx to the network. The resulting transaction will move the specified amount\n"
+            "protx fund_register \"collateralAddress\" \"ipAndPort\" \"ownerKeyAddr\" \"operatorKeyAddr\" \"votingKeyAddr\" operatorReward \"payoutAddress\"\n"
+            "\nCreates, funds and sends a ProTx to the network. The resulting transaction will move 1000 Dash\n"
             "to the address specified by collateralAddress and will then function as the collateral of your\n"
             "masternode.\n"
             "A few of the limitations you see in the arguments are temporary and might be lifted after DIP3\n"
@@ -169,94 +176,155 @@ void protx_register_help()
             "\nArguments:\n"
             "1. \"collateralAddress\"   (string, required) The dash address to send the collateral to.\n"
             "                         Must be a P2PKH address.\n"
-            "2. \"collateralAmount\"    (numeric or string, required) The collateral amount.\n"
-            "                         Must be exactly 1000 Dash.\n"
-            "3. \"ipAndPort\"           (string, required) IP and port in the form \"IP:PORT\".\n"
+            "2. \"ipAndPort\"           (string, required) IP and port in the form \"IP:PORT\".\n"
             "                         Must be unique on the network. Can be set to 0, which will require a ProUpServTx afterwards.\n"
-            "4. \"ownerKeyAddr\"        (string, required) The owner key used for payee updates and proposal voting.\n"
+            "3. \"ownerKeyAddr\"        (string, required) The owner key used for payee updates and proposal voting.\n"
             "                         The private key belonging to this address be known in your wallet. The address must\n"
             "                         be unused and must differ from the collateralAddress\n"
-            "5. \"operatorKeyAddr\"     (string, required) The operator key address. The private key does not have to be known by your wallet.\n"
+            "4. \"operatorKeyAddr\"     (string, required) The operator key address. The private key does not have to be known by your wallet.\n"
             "                         It has to match the private key which is later used when operating the masternode.\n"
             "                         If set to \"0\" or an empty string, ownerAddr will be used.\n"
-            "6. \"votingKeyAddr\"       (string, required) The voting key address. The private key does not have to be known by your wallet.\n"
+            "5. \"votingKeyAddr\"       (string, required) The voting key address. The private key does not have to be known by your wallet.\n"
             "                         It has to match the private key which is later used when voting on proposals.\n"
             "                         If set to \"0\" or an empty string, ownerAddr will be used.\n"
-            "7. \"operatorReward\"      (numeric, required) The fraction in %% to share with the operator. If non-zero,\n"
+            "6. \"operatorReward\"      (numeric, required) The fraction in % to share with the operator. If non-zero,\n"
             "                         \"ipAndPort\" must be zero as well. The value must be between 0 and 100.\n"
-            "8. \"payoutAddress\"       (string, required) The dash address to use for masternode reward payments\n"
+            "7. \"payoutAddress\"       (string, required) The dash address to use for masternode reward payments\n"
             "                         Must match \"collateralAddress\"."
             "\nExamples:\n"
-            + HelpExampleCli("protx", "register \"XrVhS9LogauRJGJu2sHuryjhpuex4RNPSb\" 1000 \"1.2.3.4:1234\" \"Xt9AMWaYSz7tR7Uo7gzXA3m4QmeWgrR3rr\" \"Xt9AMWaYSz7tR7Uo7gzXA3m4QmeWgrR3rr\" \"Xt9AMWaYSz7tR7Uo7gzXA3m4QmeWgrR3rr\" 0 \"XrVhS9LogauRJGJu2sHuryjhpuex4RNPSb\"")
+            + HelpExampleCli("protx", "fund_register \"XrVhS9LogauRJGJu2sHuryjhpuex4RNPSb\" \"1.2.3.4:1234\" \"Xt9AMWaYSz7tR7Uo7gzXA3m4QmeWgrR3rr\" \"Xt9AMWaYSz7tR7Uo7gzXA3m4QmeWgrR3rr\" \"Xt9AMWaYSz7tR7Uo7gzXA3m4QmeWgrR3rr\" 0 \"XrVhS9LogauRJGJu2sHuryjhpuex4RNPSb\"")
+    );
+}
+
+void protx_register_help()
+{
+    throw std::runtime_error(
+            "protx register \"collateralHash\" collateralIndex \"ipAndPort\" \"ownerKeyAddr\" \"operatorKeyAddr\" \"votingKeyAddr\" operatorReward \"payoutAddress\"\n"
+            "\nSame as \"protx fund_register\", but with an externally referenced collateral.\n"
+            "The collateral is specified through \"collateralHash\" and \"collateralIndex\" and must be an unspent\n"
+            "transaction output. It must also not be used by any other masternode.\n"
+            "\nArguments:\n"
+            "1. \"collateralHash\"     (string, required) The collateral transaction hash.\n"
+            "2. collateralIndex      (numeric, required) The collateral transaction output index.\n"
+            "3., 4., 5. ...          See help text of \"protx fund_register\"\n"
+            "\nExamples:\n"
+            + HelpExampleCli("protx", "register \"0123456701234567012345670123456701234567012345670123456701234567\" 0 \"1.2.3.4:1234\" \"Xt9AMWaYSz7tR7Uo7gzXA3m4QmeWgrR3rr\" \"Xt9AMWaYSz7tR7Uo7gzXA3m4QmeWgrR3rr\" \"Xt9AMWaYSz7tR7Uo7gzXA3m4QmeWgrR3rr\" 0 \"XrVhS9LogauRJGJu2sHuryjhpuex4RNPSb\"")
     );
 }
 
+// handles register and fund_register in one method
 UniValue protx_register(const JSONRPCRequest& request)
 {
-    if (request.fHelp || request.params.size() != 9)
-        protx_register_help();
+    bool isFundRegister = request.params[0].get_str() == "fund_register";
 
-    CBitcoinAddress collateralAddress(request.params[1].get_str());
-    if (!collateralAddress.IsValid())
-        throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, strprintf("invalid collaterall address: %s", request.params[1].get_str()));
-    CScript collateralScript = GetScriptForDestination(collateralAddress.Get());
+    if (isFundRegister && (request.fHelp || request.params.size() != 8)) {
+        protx_fund_register_help();
+    } else if (!isFundRegister && (request.fHelp || request.params.size() != 9)) {
+        protx_register_help();
+    }
 
-    CAmount collateralAmount;
-    if (!ParseMoney(request.params[2].get_str(), collateralAmount))
-        throw std::runtime_error(strprintf("invalid collateral amount %s", request.params[2].get_str()));
-    if (collateralAmount != 1000 * COIN)
-        throw std::runtime_error(strprintf("invalid collateral amount %d. only 1000 DASH is supported at the moment", collateralAmount));
+    size_t paramIdx = 1;
 
-    CTxOut collateralTxOut(collateralAmount, collateralScript);
+    CAmount collateralAmount = 1000 * COIN;
 
     CMutableTransaction tx;
     tx.nVersion = 3;
     tx.nType = TRANSACTION_PROVIDER_REGISTER;
-    tx.vout.emplace_back(collateralTxOut);
 
     CProRegTx ptx;
     ptx.nVersion = CProRegTx::CURRENT_VERSION;
 
-    if (request.params[3].get_str() != "0" && request.params[3].get_str() != "") {
-        if (!Lookup(request.params[3].get_str().c_str(), ptx.addr, Params().GetDefaultPort(), false))
-            throw std::runtime_error(strprintf("invalid network address %s", request.params[3].get_str()));
+    if (isFundRegister) {
+        CBitcoinAddress collateralAddress(request.params[paramIdx].get_str());
+        if (!collateralAddress.IsValid())
+            throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, strprintf("invalid collaterall address: %s", request.params[paramIdx].get_str()));
+        CScript collateralScript = GetScriptForDestination(collateralAddress.Get());
+
+        CTxOut collateralTxOut(collateralAmount, collateralScript);
+        tx.vout.emplace_back(collateralTxOut);
+
+        paramIdx++;
+    } else {
+        uint256 collateralHash = ParseHashV(request.params[paramIdx], "collateralHash");
+        int32_t collateralIndex = ParseInt32V(request.params[paramIdx + 1], "collateralIndex");
+        if (collateralHash.IsNull() || collateralIndex < 0) {
+            throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, strprintf("invalid hash or index: %s-%d", collateralHash.ToString(), collateralIndex));
+        }
+
+        ptx.collateralOutpoint = COutPoint(collateralHash, (uint32_t)collateralIndex);
+        paramIdx += 2;
+
+        // TODO unlock on failure
+        LOCK(pwalletMain->cs_wallet);
+        pwalletMain->LockCoin(ptx.collateralOutpoint);
+    }
+
+    if (request.params[paramIdx].get_str() != "0" && request.params[paramIdx].get_str() != "") {
+        if (!Lookup(request.params[paramIdx].get_str().c_str(), ptx.addr, Params().GetDefaultPort(), false))
+            throw std::runtime_error(strprintf("invalid network address %s", request.params[paramIdx].get_str()));
     }
 
-    CKey keyOwner = ParsePrivKey(request.params[4].get_str(), true);
-    CBLSPublicKey pubKeyOperator = ParseBLSPubKey(request.params[5].get_str(), "operator BLS address");
+    CKey keyOwner = ParsePrivKey(request.params[paramIdx + 1].get_str(), true);
+    CBLSPublicKey pubKeyOperator = ParseBLSPubKey(request.params[paramIdx + 2].get_str(), "operator BLS address");
     CKeyID keyIDVoting = keyOwner.GetPubKey().GetID();
-    if (request.params[6].get_str() != "0" && request.params[6].get_str() != "") {
-        keyIDVoting = ParsePubKeyIDFromAddress(request.params[6].get_str(), "voting address");
+    if (request.params[paramIdx + 3].get_str() != "0" && request.params[paramIdx + 3].get_str() != "") {
+        keyIDVoting = ParsePubKeyIDFromAddress(request.params[paramIdx + 3].get_str(), "voting address");
     }
 
-    double operatorReward = ParseDoubleV(request.params[7], "operatorReward");
+    double operatorReward = ParseDoubleV(request.params[paramIdx + 4], "operatorReward");
     if (operatorReward < 0 || operatorReward > 100)
         throw JSONRPCError(RPC_INVALID_PARAMETER, "operatorReward must be between 0 and 100");
     ptx.nOperatorReward = (uint16_t)(operatorReward * 100);
 
-    CBitcoinAddress payoutAddress(request.params[8].get_str());
+    CBitcoinAddress payoutAddress(request.params[paramIdx + 5].get_str());
     if (!payoutAddress.IsValid())
-        throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, strprintf("invalid payout address: %s", request.params[8].get_str()));
+        throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, strprintf("invalid payout address: %s", request.params[paramIdx + 5].get_str()));
 
     ptx.keyIDOwner = keyOwner.GetPubKey().GetID();
     ptx.pubKeyOperator = pubKeyOperator;
     ptx.keyIDVoting = keyIDVoting;
     ptx.scriptPayout = GetScriptForDestination(payoutAddress.Get());
 
-    SignSpecialTxPayload(tx, ptx, keyOwner); // make sure sig is set, otherwise fee calculation won't be correct
+    if (!isFundRegister) {
+        // make sure fee calculation works
+        ptx.vchSig.resize(65);
+    }
+
+    UpdateSpecialTxInputsHash(tx, ptx);
     FundSpecialTx(tx, ptx);
 
-    uint32_t collateralIndex = (uint32_t) - 1;
-    for (uint32_t i = 0; i < tx.vout.size(); i++) {
-        if (tx.vout[i] == collateralTxOut) {
-            collateralIndex = i;
-            break;
+    if (isFundRegister) {
+        uint32_t collateralIndex = (uint32_t) -1;
+        for (uint32_t i = 0; i < tx.vout.size(); i++) {
+            if (tx.vout[i].nValue == collateralAmount) {
+                collateralIndex = i;
+                break;
+            }
         }
+        assert(collateralIndex != (uint32_t) -1);
+        ptx.collateralOutpoint.n = collateralIndex;
     }
-    assert(collateralIndex != (uint32_t) - 1);
-    ptx.nCollateralIndex = collateralIndex;
 
-    SignSpecialTxPayload(tx, ptx, keyOwner); // redo signing
+    if (isFundRegister) {
+        UpdateSpecialTxInputsHash(tx, ptx);
+    } else {
+        // referencing external collateral, so lets prove we own it
+
+        Coin coin;
+        if (!GetUTXOCoin(ptx.collateralOutpoint, coin)) {
+            throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, strprintf("collateral not found: %s", ptx.collateralOutpoint.ToStringShort()));
+        }
+        CTxDestination txDest;
+        CKeyID keyID;
+        if (!ExtractDestination(coin.out.scriptPubKey, txDest) || !CBitcoinAddress(txDest).GetKeyID(keyID)) {
+            throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, strprintf("collateral type not supported: %s", ptx.collateralOutpoint.ToStringShort()));
+        }
+        CKey key;
+        if (!pwalletMain->GetKey(keyID, key)) {
+            throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, strprintf("collateral key not in wallet: %s", CBitcoinAddress(keyID).ToString()));
+        }
+        SignSpecialTxPayload(tx, ptx, key);
+    }
     SetTxPayload(tx, ptx);
 
     return SignAndSendSpecialTx(tx);
@@ -487,7 +555,7 @@ UniValue BuildDMNListEntry(const CDeterministicMNCPtr& dmn, bool detailed)
 
     dmn->ToJson(o);
 
-    int confirmations = GetUTXOConfirmations(COutPoint(dmn->proTxHash, dmn->nCollateralIndex));
+    int confirmations = GetUTXOConfirmations(dmn->collateralOutpoint);
     o.push_back(Pair("confirmations", confirmations));
 
     bool hasOwnerKey = pwalletMain->HaveKey(dmn->pdmnState->keyIDOwner);
@@ -497,8 +565,8 @@ UniValue BuildDMNListEntry(const CDeterministicMNCPtr& dmn, bool detailed)
     bool ownsCollateral = false;
     CTransactionRef collateralTx;
     uint256 tmpHashBlock;
-    if (GetTransaction(dmn->proTxHash, collateralTx, Params().GetConsensus(), tmpHashBlock)) {
-        ownsCollateral = CheckWalletOwnsScript(collateralTx->vout[dmn->nCollateralIndex].scriptPubKey);
+    if (GetTransaction(dmn->collateralOutpoint.hash, collateralTx, Params().GetConsensus(), tmpHashBlock)) {
+        ownsCollateral = CheckWalletOwnsScript(collateralTx->vout[dmn->collateralOutpoint.n].scriptPubKey);
     }
 
     UniValue walletObj(UniValue::VOBJ);
@@ -534,13 +602,13 @@ UniValue protx_list(const JSONRPCRequest& request)
 
         std::vector<COutPoint> vOutpts;
         pwalletMain->ListProTxCoins(vOutpts);
-        std::set<uint256> setOutpts;
+        std::set<COutPoint> setOutpts;
         for (const auto& outpt : vOutpts) {
-            setOutpts.emplace(outpt.hash);
+            setOutpts.emplace(outpt);
         }
 
         deterministicMNManager->GetListAtChainTip().ForEachMN(false, [&](const CDeterministicMNCPtr& dmn) {
-            if (setOutpts.count(dmn->proTxHash) ||
+            if (setOutpts.count(dmn->collateralOutpoint) ||
                 pwalletMain->HaveKey(dmn->pdmnState->keyIDOwner) ||
                 pwalletMain->HaveKey(dmn->pdmnState->keyIDVoting) ||
                 CheckWalletOwnsScript(dmn->pdmnState->scriptPayout) ||
@@ -572,6 +640,30 @@ UniValue protx_list(const JSONRPCRequest& request)
     return ret;
 }
 
+void protx_info_help()
+{
+    throw std::runtime_error(
+            "protx info \"proTxHash\"\n"
+            "\nReturns detailed information about a deterministic masternode.\n"
+            "\nArguments:\n"
+            "1. \"proTxHash\"           (string, required) The hash of the initial ProRegTx.\n"
+    );
+}
+
+UniValue protx_info(const JSONRPCRequest& request)
+{
+    if (request.fHelp || request.params.size() != 2)
+        protx_info_help();
+
+    uint256 proTxHash = ParseHashV(request.params[1], "proTxHash");
+    auto mnList = deterministicMNManager->GetListAtChainTip();
+    auto dmn = mnList.GetMN(proTxHash);
+    if (!dmn) {
+        throw JSONRPCError(RPC_INVALID_PARAMETER, strprintf("%s not found", proTxHash.ToString()));
+    }
+    return BuildDMNListEntry(dmn, true);
+}
+
 void protx_diff_help()
 {
     throw std::runtime_error(
@@ -638,6 +730,7 @@ UniValue protx(const JSONRPCRequest& request)
                 "\nAvailable commands:\n"
                 "  register          - Create and send ProTx to network\n"
                 "  list              - List ProTxs\n"
+                "  info              - Return information about a ProTx\n"
                 "  update_service    - Create and send ProUpServTx to network\n"
                 "  update_registrar  - Create and send ProUpRegTx to network\n"
                 "  revoke            - Create and send ProUpRevTx to network\n"
@@ -647,10 +740,12 @@ UniValue protx(const JSONRPCRequest& request)
 
     std::string command = request.params[0].get_str();
 
-    if (command == "register") {
+    if (command == "fund_register" || command == "register") {
         return protx_register(request);
     } else if (command == "list") {
         return protx_list(request);
+    } else if (command == "info") {
+        return protx_info(request);
     } else if (command == "update_service") {
         return protx_update_service(request);
     } else if (command == "update_registrar") {
diff --git a/src/test/evo_deterministicmns_tests.cpp b/src/test/evo_deterministicmns_tests.cpp
index 33d775e6b5de..ca0eb0bcd0e1 100644
--- a/src/test/evo_deterministicmns_tests.cpp
+++ b/src/test/evo_deterministicmns_tests.cpp
@@ -103,7 +103,7 @@ static CMutableTransaction CreateProRegTx(SimpleUTXOMap& utxos, int port, const
     auto inputs = SelectUTXOs(utxos, 1000 * COIN, change);
 
     CProRegTx proTx;
-    proTx.nCollateralIndex = 0;
+    proTx.collateralOutpoint.n = 0;
     proTx.addr = LookupNumeric("1.1.1.1", port);
     proTx.keyIDOwner = ownerKeyRet.GetPubKey().GetID();
     proTx.pubKeyOperator = operatorKeyRet.GetPublicKey();
@@ -115,7 +115,6 @@ static CMutableTransaction CreateProRegTx(SimpleUTXOMap& utxos, int port, const
     tx.nType = TRANSACTION_PROVIDER_REGISTER;
     FundTransaction(tx, utxos, scriptPayout, 1000 * COIN, coinbaseKey);
     proTx.inputsHash = CalcTxInputsHash(tx);
-    CHashSigner::SignHash(::SerializeHash(proTx), ownerKeyRet, proTx.vchSig);
     SetTxPayload(tx, proTx);
     SignTransaction(tx, coinbaseKey);
 
diff --git a/src/txmempool.cpp b/src/txmempool.cpp
index f27cb704a2cf..9021314c4740 100644
--- a/src/txmempool.cpp
+++ b/src/txmempool.cpp
@@ -449,6 +449,9 @@ bool CTxMemPool::addUnchecked(const uint256& hash, const CTxMemPoolEntry &entry,
         mapProTxAddresses.emplace(proTx.addr, tx.GetHash());
         mapProTxPubKeyIDs.emplace(proTx.keyIDOwner, tx.GetHash());
         mapProTxBlsPubKeyHashes.emplace(proTx.pubKeyOperator.GetHash(), tx.GetHash());
+        if (!proTx.collateralOutpoint.hash.IsNull()) {
+            mapProTxCollaterals.emplace(proTx.collateralOutpoint, tx.GetHash());
+        }
     } else if (tx.nType == TRANSACTION_PROVIDER_UPDATE_SERVICE) {
         CProUpServTx proTx;
         if (!GetTxPayload(tx, proTx)) {
@@ -646,6 +649,7 @@ void CTxMemPool::removeUnchecked(txiter it, MemPoolRemovalReason reason)
         mapProTxAddresses.erase(proTx.addr);
         mapProTxPubKeyIDs.erase(proTx.keyIDOwner);
         mapProTxBlsPubKeyHashes.erase(proTx.pubKeyOperator.GetHash());
+        mapProTxCollaterals.erase(proTx.collateralOutpoint);
     } else if (it->GetTx().nType == TRANSACTION_PROVIDER_UPDATE_SERVICE) {
         CProUpServTx proTx;
         if (!GetTxPayload(it->GetTx(), proTx)) {
@@ -806,6 +810,16 @@ void CTxMemPool::removeProTxPubKeyConflicts(const CTransaction &tx, const CBLSPu
     }
 }
 
+void CTxMemPool::removeProTxCollateralConflicts(const CTransaction &tx, const COutPoint &collateralOutpoint)
+{
+    if (mapProTxCollaterals.count(collateralOutpoint)) {
+        uint256 conflictHash = mapProTxCollaterals[collateralOutpoint];
+        if (conflictHash != tx.GetHash() && mapTx.count(conflictHash)) {
+            removeRecursive(mapTx.find(conflictHash)->GetTx(), MemPoolRemovalReason::CONFLICT);
+        }
+    }
+}
+
 void CTxMemPool::removeProTxConflicts(const CTransaction &tx)
 {
     if (tx.nType == TRANSACTION_PROVIDER_REGISTER) {
@@ -822,6 +836,9 @@ void CTxMemPool::removeProTxConflicts(const CTransaction &tx)
         }
         removeProTxPubKeyConflicts(tx, proTx.keyIDOwner);
         removeProTxPubKeyConflicts(tx, proTx.pubKeyOperator);
+        if (!proTx.collateralOutpoint.hash.IsNull()) {
+            removeProTxCollateralConflicts(tx, proTx.collateralOutpoint);
+        }
     } else if (tx.nType == TRANSACTION_PROVIDER_UPDATE_SERVICE) {
         CProUpServTx proTx;
         if (!GetTxPayload(tx, proTx)) {
@@ -1127,7 +1144,11 @@ bool CTxMemPool::existsProviderTxConflict(const CTransaction &tx) const {
         CProRegTx proTx;
         if (!GetTxPayload(tx, proTx))
             assert(false);
-        return mapProTxAddresses.count(proTx.addr) || mapProTxPubKeyIDs.count(proTx.keyIDOwner) || mapProTxBlsPubKeyHashes.count(proTx.pubKeyOperator.GetHash());
+        if (mapProTxAddresses.count(proTx.addr) || mapProTxPubKeyIDs.count(proTx.keyIDOwner) || mapProTxBlsPubKeyHashes.count(proTx.pubKeyOperator.GetHash()))
+            return true;
+        if (!proTx.collateralOutpoint.hash.IsNull() && mapProTxCollaterals.count(proTx.collateralOutpoint))
+            return true;
+        return false;
     } else if (tx.nType == TRANSACTION_PROVIDER_UPDATE_SERVICE) {
         CProUpServTx proTx;
         if (!GetTxPayload(tx, proTx))
diff --git a/src/txmempool.h b/src/txmempool.h
index fa5eb1354de1..81ceedc53d91 100644
--- a/src/txmempool.h
+++ b/src/txmempool.h
@@ -537,6 +537,7 @@ class CTxMemPool
     std::map<CService, uint256> mapProTxAddresses;
     std::map<CKeyID, uint256> mapProTxPubKeyIDs;
     std::map<uint256, uint256> mapProTxBlsPubKeyHashes;
+    std::map<COutPoint, uint256> mapProTxCollaterals;
 
     void UpdateParent(txiter entry, txiter parent, bool add);
     void UpdateChild(txiter entry, txiter child, bool add);
@@ -582,6 +583,7 @@ class CTxMemPool
     void removeConflicts(const CTransaction &tx);
     void removeProTxPubKeyConflicts(const CTransaction &tx, const CKeyID &keyId);
     void removeProTxPubKeyConflicts(const CTransaction &tx, const CBLSPublicKey &pubKey);
+    void removeProTxCollateralConflicts(const CTransaction &tx, const COutPoint &collateralOutpoint);
     void removeProTxConflicts(const CTransaction &tx);
     void removeForBlock(const std::vector<CTransactionRef>& vtx, unsigned int nBlockHeight);
 
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
index 27bfea7d94a9..f11e6b9fc253 100644
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -1119,11 +1119,10 @@ bool CWallet::AddToWallet(const CWalletTx& wtxIn, bool fFlushOnClose)
         }
         AddToSpends(hash);
 
-        uint32_t proTxCollateralIdx = GetProTxCollateralIndex(*wtx.tx);
         for(unsigned int i = 0; i < wtx.tx->vout.size(); ++i) {
             if (IsMine(wtx.tx->vout[i]) && !IsSpent(hash, i)) {
                 setWalletUTXO.insert(COutPoint(hash, i));
-                if (i == proTxCollateralIdx) {
+                if (deterministicMNManager->IsProTxWithCollateral(wtx.tx, i) || deterministicMNManager->HasMNCollateralAtChainTip(COutPoint(hash, i))) {
                     LockCoin(COutPoint(hash, i));
                 }
             }
@@ -3967,13 +3966,9 @@ DBErrors CWallet::LoadWallet(bool& fFirstRunRet)
     {
         LOCK2(cs_main, cs_wallet);
         for (auto& pair : mapWallet) {
-            uint32_t proTxCollateralIdx = GetProTxCollateralIndex(*pair.second.tx);
             for(unsigned int i = 0; i < pair.second.tx->vout.size(); ++i) {
                 if (IsMine(pair.second.tx->vout[i]) && !IsSpent(pair.first, i)) {
                     setWalletUTXO.insert(COutPoint(pair.first, i));
-                    if (i == proTxCollateralIdx) {
-                        LockCoin(COutPoint(pair.first, i));
-                    }
                 }
             }
         }
@@ -3988,6 +3983,22 @@ DBErrors CWallet::LoadWallet(bool& fFirstRunRet)
     return DB_LOAD_OK;
 }
 
+// Goes through all wallet transactions and checks if they are masternode collaterals, in which case these are locked
+// This avoids accidential spending of collaterals. They can still be unlocked manually if a spend is really intended.
+void CWallet::AutoLockMasternodeCollaterals()
+{
+    LOCK2(cs_main, cs_wallet);
+    for (const auto& pair : mapWallet) {
+        for (unsigned int i = 0; i < pair.second.tx->vout.size(); ++i) {
+            if (IsMine(pair.second.tx->vout[i]) && !IsSpent(pair.first, i)) {
+                if (deterministicMNManager->IsProTxWithCollateral(pair.second.tx, i) || deterministicMNManager->HasMNCollateralAtChainTip(COutPoint(pair.first, i))) {
+                    LockCoin(COutPoint(pair.first, i));
+                }
+            }
+        }
+    }
+}
+
 DBErrors CWallet::ZapSelectTx(std::vector<uint256>& vHashIn, std::vector<uint256>& vHashOut)
 {
     if (!fFileBacked)
@@ -4634,7 +4645,7 @@ void CWallet::ListProTxCoins(std::vector<COutPoint>& vOutpts)
     for (const auto &o : setWalletUTXO) {
         if (mapWallet.count(o.hash)) {
             const auto &p = mapWallet[o.hash];
-            if (IsProTxCollateral(*p.tx, o.n)) {
+            if (deterministicMNManager->IsProTxWithCollateral(p.tx, o.n) || deterministicMNManager->HasMNCollateralAtChainTip(o)) {
                 vOutpts.emplace_back(o);
             }
         }
diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h
index fad981547831..67feaa891d50 100644
--- a/src/wallet/wallet.h
+++ b/src/wallet/wallet.h
@@ -1004,6 +1004,7 @@ class CWallet : public CCryptoKeyStore, public CValidationInterface
     void SetBestChain(const CBlockLocator& loc) override;
 
     DBErrors LoadWallet(bool& fFirstRunRet);
+    void AutoLockMasternodeCollaterals();
     DBErrors ZapWalletTx(std::vector<CWalletTx>& vWtx);
     DBErrors ZapSelectTx(std::vector<uint256>& vHashIn, std::vector<uint256>& vHashOut);
 

From 59932401bb11aacae29aff1c2ec2e4b0584c409a Mon Sep 17 00:00:00 2001
From: PastaPastaPasta <pasta@dashboost.org>
Date: Thu, 25 Oct 2018 09:31:32 -0500
Subject: [PATCH 211/400] Change internal references of Darksend to PrivateSend
 (#2372)

* Change all references to darksend to privatesend

* comment references to darksend
---
 src/masternodeman.h        |  2 +-
 src/net_processing.cpp     |  4 +--
 src/privatesend-client.cpp | 22 ++++++-------
 src/privatesend-client.h   | 10 +++---
 src/privatesend-server.cpp | 28 ++++++++--------
 src/privatesend-server.h   |  8 ++---
 src/privatesend.cpp        | 66 +++++++++++++++++++-------------------
 src/privatesend.h          | 52 +++++++++++++++---------------
 src/qt/overviewpage.cpp    |  2 +-
 src/wallet/wallet.cpp      |  2 +-
 src/wallet/wallet.h        |  2 +-
 11 files changed, 99 insertions(+), 99 deletions(-)

diff --git a/src/masternodeman.h b/src/masternodeman.h
index 418ba24c3ff3..3e14b23b9872 100644
--- a/src/masternodeman.h
+++ b/src/masternodeman.h
@@ -94,7 +94,7 @@ class CMasternodeMan
     std::map<uint256, CMasternodePing> mapSeenMasternodePing;
     // Keep track of all verifications I've seen
     std::map<uint256, CMasternodeVerification> mapSeenMasternodeVerification;
-    // keep track of dsq count to prevent masternodes from gaming darksend queue
+    // keep track of dsq count to prevent masternodes from gaming privatesend queue
     int64_t nDsqCount;
 
 
diff --git a/src/net_processing.cpp b/src/net_processing.cpp
index 7eb1acd4e609..980ec5509d6f 100644
--- a/src/net_processing.cpp
+++ b/src/net_processing.cpp
@@ -1224,7 +1224,7 @@ void static ProcessGetData(CNode* pfrom, const Consensus::Params& consensusParam
                 }
 
                 if (!push && inv.type == MSG_DSTX) {
-                    CDarksendBroadcastTx dstx = CPrivateSend::GetDSTX(inv.hash);
+                    CPrivateSendBroadcastTx dstx = CPrivateSend::GetDSTX(inv.hash);
                     if(dstx) {
                         connman.PushMessage(pfrom, msgMaker.Make(NetMsgType::DSTX, dstx));
                         push = true;
@@ -1940,7 +1940,7 @@ bool static ProcessMessage(CNode* pfrom, const std::string& strCommand, CDataStr
         std::vector<uint256> vEraseQueue;
         CTransactionRef ptx;
         CTxLockRequest txLockRequest;
-        CDarksendBroadcastTx dstx;
+        CPrivateSendBroadcastTx dstx;
         int nInvType = MSG_TX;
         bool fCanAutoLock = false;
 
diff --git a/src/privatesend-client.cpp b/src/privatesend-client.cpp
index cf14df8ad042..593049ea4e23 100644
--- a/src/privatesend-client.cpp
+++ b/src/privatesend-client.cpp
@@ -41,7 +41,7 @@ void CPrivateSendClientManager::ProcessMessage(CNode* pfrom, const std::string&
             return;
         }
 
-        CDarksendQueue dsq;
+        CPrivateSendQueue dsq;
         vRecv >> dsq;
 
         {
@@ -49,7 +49,7 @@ void CPrivateSendClientManager::ProcessMessage(CNode* pfrom, const std::string&
             if(!lockRecv) return;
 
             // process every dsq only once
-            for (const auto& q : vecDarksendQueue) {
+            for (const auto& q : vecPrivateSendQueue) {
                 if(q == dsq) {
                     // LogPrint("privatesend", "DSQUEUE -- %s seen\n", dsq.ToString());
                     return;
@@ -86,7 +86,7 @@ void CPrivateSendClientManager::ProcessMessage(CNode* pfrom, const std::string&
             TRY_LOCK(cs_vecqueue, lockRecv);
             if(!lockRecv) return;
 
-            for (const auto& q : vecDarksendQueue) {
+            for (const auto& q : vecPrivateSendQueue) {
                 if(q.masternodeOutpoint == dsq.masternodeOutpoint) {
                     // no way same mn can send another "not yet ready" dsq this soon
                     LogPrint("privatesend", "DSQUEUE -- Masternode %s is sending WAY too many dsq messages\n", infoMn.addr.ToString());
@@ -111,7 +111,7 @@ void CPrivateSendClientManager::ProcessMessage(CNode* pfrom, const std::string&
                     dsq.fTried = true;
                 }
             }
-            vecDarksendQueue.push_back(dsq);
+            vecPrivateSendQueue.push_back(dsq);
             dsq.Relay(connman);
         }
 
@@ -819,7 +819,7 @@ bool CPrivateSendClientSession::DoAutomaticDenominating(CConnman& connman, bool
         return false;
     }
 
-    TRY_LOCK(cs_darksend, lockDS);
+    TRY_LOCK(cs_privatesend, lockDS);
     if(!lockDS) {
         strAutoDenomResult = _("Lock is already in place.");
         return false;
@@ -994,7 +994,7 @@ bool CPrivateSendClientSession::JoinExistingQueue(CAmount nBalanceNeedsAnonymize
 
     std::vector<CAmount> vecStandardDenoms = CPrivateSend::GetStandardDenominations();
     // Look through the queues and see if anything matches
-    CDarksendQueue dsq;
+    CPrivateSendQueue dsq;
     while (privateSendClient.GetQueueItemAndTry(dsq)) {
         masternode_info_t infoMn;
 
@@ -1018,7 +1018,7 @@ bool CPrivateSendClientSession::JoinExistingQueue(CAmount nBalanceNeedsAnonymize
         }
 
         // mixing rate limit i.e. nLastDsq check should already pass in DSQUEUE ProcessMessage
-        // in order for dsq to get into vecDarksendQueue, so we should be safe to mix already,
+        // in order for dsq to get into vecPrivateSendQueue, so we should be safe to mix already,
         // no need for additional verification here
 
         LogPrint("privatesend", "CPrivateSendClientSession::JoinExistingQueue -- found valid queue: %s\n", dsq.ToString());
@@ -1042,7 +1042,7 @@ bool CPrivateSendClientSession::JoinExistingQueue(CAmount nBalanceNeedsAnonymize
 
         nSessionDenom = dsq.nDenom;
         infoMixingMasternode = infoMn;
-        pendingDsaRequest = CPendingDsaRequest(infoMn.addr, CDarksendAccept(nSessionDenom, txMyCollateral));
+        pendingDsaRequest = CPendingDsaRequest(infoMn.addr, CPrivateSendAccept(nSessionDenom, txMyCollateral));
         connman.AddPendingMasternode(infoMn.addr);
         // TODO: add new state POOL_STATE_CONNECTING and bump MIN_PRIVATESEND_PEER_PROTO_VERSION
         SetState(POOL_STATE_QUEUE);
@@ -1066,7 +1066,7 @@ bool CPrivateSendClientSession::StartNewQueue(CAmount nValueMin, CAmount nBalanc
     // ** find the coins we'll use
     std::vector<CTxIn> vecTxIn;
     CAmount nValueInTmp = 0;
-    if(!pwalletMain->SelectCoinsDark(nValueMin, nBalanceNeedsAnonymized, vecTxIn, nValueInTmp, 0, privateSendClient.nPrivateSendRounds - 1)) {
+    if(!pwalletMain->SelectPrivateCoins(nValueMin, nBalanceNeedsAnonymized, vecTxIn, nValueInTmp, 0, privateSendClient.nPrivateSendRounds - 1)) {
         // this should never happen
         LogPrintf("CPrivateSendClientSession::StartNewQueue -- Can't mix: no compatible inputs found!\n");
         strAutoDenomResult = _("Can't mix: no compatible inputs found!");
@@ -1118,7 +1118,7 @@ bool CPrivateSendClientSession::StartNewQueue(CAmount nValueMin, CAmount nBalanc
 
         infoMixingMasternode = infoMn;
         connman.AddPendingMasternode(infoMn.addr);
-        pendingDsaRequest = CPendingDsaRequest(infoMn.addr, CDarksendAccept(nSessionDenom, txMyCollateral));
+        pendingDsaRequest = CPendingDsaRequest(infoMn.addr, CPrivateSendAccept(nSessionDenom, txMyCollateral));
         // TODO: add new state POOL_STATE_CONNECTING and bump MIN_PRIVATESEND_PEER_PROTO_VERSION
         SetState(POOL_STATE_QUEUE);
         nTimeLastSuccessfulStep = GetTime();
@@ -1573,7 +1573,7 @@ bool CPrivateSendClientSession::CreateDenominated(const CompactTallyItem& tallyI
     return true;
 }
 
-void CPrivateSendClientSession::RelayIn(const CDarkSendEntry& entry, CConnman& connman)
+void CPrivateSendClientSession::RelayIn(const CPrivateSendEntry& entry, CConnman& connman)
 {
     if(!infoMixingMasternode.fInfoValid) return;
 
diff --git a/src/privatesend-client.h b/src/privatesend-client.h
index 7e9d7d8ee088..3999b3ed7278 100644
--- a/src/privatesend-client.h
+++ b/src/privatesend-client.h
@@ -45,24 +45,24 @@ class CPendingDsaRequest
     static const int TIMEOUT = 15;
 
     CService addr;
-    CDarksendAccept dsa;
+    CPrivateSendAccept dsa;
     int64_t nTimeCreated;
 
 public:
     CPendingDsaRequest():
         addr(CService()),
-        dsa(CDarksendAccept()),
+        dsa(CPrivateSendAccept()),
         nTimeCreated(0)
     {}
 
-    CPendingDsaRequest(const CService& addr_, const CDarksendAccept& dsa_):
+    CPendingDsaRequest(const CService& addr_, const CPrivateSendAccept& dsa_):
         addr(addr_),
         dsa(dsa_),
         nTimeCreated(GetTime())
     {}
 
     CService GetAddr() { return addr; }
-    CDarksendAccept GetDSA() { return dsa; }
+    CPrivateSendAccept GetDSA() { return dsa; }
     bool IsExpired() { return GetTime() - nTimeCreated > TIMEOUT; }
 
     friend bool operator==(const CPendingDsaRequest& a, const CPendingDsaRequest& b)
@@ -126,7 +126,7 @@ class CPrivateSendClientSession : public CPrivateSendBaseSession
     /// As a client, check and sign the final transaction
     bool SignFinalTransaction(const CTransaction& finalTransactionNew, CNode* pnode, CConnman& connman);
 
-    void RelayIn(const CDarkSendEntry& entry, CConnman& connman);
+    void RelayIn(const CPrivateSendEntry& entry, CConnman& connman);
 
     void SetNull();
 
diff --git a/src/privatesend-server.cpp b/src/privatesend-server.cpp
index 5bb005836837..5c2166c55421 100644
--- a/src/privatesend-server.cpp
+++ b/src/privatesend-server.cpp
@@ -40,7 +40,7 @@ void CPrivateSendServer::ProcessMessage(CNode* pfrom, const std::string& strComm
             return;
         }
 
-        CDarksendAccept dsa;
+        CPrivateSendAccept dsa;
         vRecv >> dsa;
 
         LogPrint("privatesend", "DSACCEPT -- nDenom %d (%s)  txCollateral %s", dsa.nDenom, CPrivateSend::GetDenominationsToString(dsa.nDenom), dsa.txCollateral.ToString());
@@ -84,11 +84,11 @@ void CPrivateSendServer::ProcessMessage(CNode* pfrom, const std::string& strComm
             return;
         }
 
-        CDarksendQueue dsq;
+        CPrivateSendQueue dsq;
         vRecv >> dsq;
 
         // process every dsq only once
-        for (const auto& q : vecDarksendQueue) {
+        for (const auto& q : vecPrivateSendQueue) {
             if(q == dsq) {
                 // LogPrint("privatesend", "DSQUEUE -- %s seen\n", dsq.ToString());
                 return;
@@ -109,7 +109,7 @@ void CPrivateSendServer::ProcessMessage(CNode* pfrom, const std::string& strComm
         }
 
         if(!dsq.fReady) {
-            for (const auto& q : vecDarksendQueue) {
+            for (const auto& q : vecPrivateSendQueue) {
                 if(q.masternodeOutpoint == dsq.masternodeOutpoint) {
                     // no way same mn can send another "not yet ready" dsq this soon
                     LogPrint("privatesend", "DSQUEUE -- Masternode %s is sending WAY too many dsq messages\n", mnInfo.addr.ToString());
@@ -127,7 +127,7 @@ void CPrivateSendServer::ProcessMessage(CNode* pfrom, const std::string& strComm
             mnodeman.AllowMixing(dsq.masternodeOutpoint);
 
             LogPrint("privatesend", "DSQUEUE -- new PrivateSend queue (%s) from masternode %s\n", dsq.ToString(), mnInfo.addr.ToString());
-            vecDarksendQueue.push_back(dsq);
+            vecPrivateSendQueue.push_back(dsq);
             dsq.Relay(connman);
         }
 
@@ -148,7 +148,7 @@ void CPrivateSendServer::ProcessMessage(CNode* pfrom, const std::string& strComm
             return;
         }
 
-        CDarkSendEntry entry;
+        CPrivateSendEntry entry;
         vRecv >> entry;
 
         LogPrint("privatesend", "DSVIN -- txCollateral %s", entry.txCollateral->ToString());
@@ -349,7 +349,7 @@ void CPrivateSendServer::CommitFinalTransaction(CConnman& connman)
 
     // create and sign masternode dstx transaction
     if(!CPrivateSend::GetDSTX(hashTx)) {
-        CDarksendBroadcastTx dstxNew(finalTransaction, activeMasternodeInfo.outpoint, GetAdjustedTime());
+        CPrivateSendBroadcastTx dstxNew(finalTransaction, activeMasternodeInfo.outpoint, GetAdjustedTime());
         dstxNew.Sign();
         CPrivateSend::AddDSTX(dstxNew);
     }
@@ -510,7 +510,7 @@ void CPrivateSendServer::CheckForCompleteQueue(CConnman& connman)
     if(nState == POOL_STATE_QUEUE && IsSessionReady()) {
         SetState(POOL_STATE_ACCEPTING_ENTRIES);
 
-        CDarksendQueue dsq(nSessionDenom, activeMasternodeInfo.outpoint, GetAdjustedTime(), true);
+        CPrivateSendQueue dsq(nSessionDenom, activeMasternodeInfo.outpoint, GetAdjustedTime(), true);
         LogPrint("privatesend", "CPrivateSendServer::CheckForCompleteQueue -- queue is ready, signing and relaying (%s)\n", dsq.ToString());
         dsq.Sign();
         dsq.Relay(connman);
@@ -563,7 +563,7 @@ bool CPrivateSendServer::IsInputScriptSigValid(const CTxIn& txin)
 //
 // Add a clients transaction to the pool
 //
-bool CPrivateSendServer::AddEntry(const CDarkSendEntry& entryNew, PoolMessage& nMessageIDRet)
+bool CPrivateSendServer::AddEntry(const CPrivateSendEntry& entryNew, PoolMessage& nMessageIDRet)
 {
     if(!fMasternodeMode) return false;
 
@@ -669,7 +669,7 @@ bool CPrivateSendServer::IsOutputsCompatibleWithSessionDenom(const std::vector<C
     return true;
 }
 
-bool CPrivateSendServer::IsAcceptableDSA(const CDarksendAccept& dsa, PoolMessage& nMessageIDRet)
+bool CPrivateSendServer::IsAcceptableDSA(const CPrivateSendAccept& dsa, PoolMessage& nMessageIDRet)
 {
     if(!fMasternodeMode) return false;
 
@@ -691,7 +691,7 @@ bool CPrivateSendServer::IsAcceptableDSA(const CDarksendAccept& dsa, PoolMessage
     return true;
 }
 
-bool CPrivateSendServer::CreateNewSession(const CDarksendAccept& dsa, PoolMessage& nMessageIDRet, CConnman& connman)
+bool CPrivateSendServer::CreateNewSession(const CPrivateSendAccept& dsa, PoolMessage& nMessageIDRet, CConnman& connman)
 {
     if(!fMasternodeMode || nSessionID != 0) return false;
 
@@ -716,11 +716,11 @@ bool CPrivateSendServer::CreateNewSession(const CDarksendAccept& dsa, PoolMessag
 
     if(!fUnitTest) {
         //broadcast that I'm accepting entries, only if it's the first entry through
-        CDarksendQueue dsq(nSessionDenom, activeMasternodeInfo.outpoint, GetAdjustedTime(), false);
+        CPrivateSendQueue dsq(nSessionDenom, activeMasternodeInfo.outpoint, GetAdjustedTime(), false);
         LogPrint("privatesend", "CPrivateSendServer::CreateNewSession -- signing and relaying new queue: %s\n", dsq.ToString());
         dsq.Sign();
         dsq.Relay(connman);
-        vecDarksendQueue.push_back(dsq);
+        vecPrivateSendQueue.push_back(dsq);
     }
 
     vecSessionCollaterals.push_back(MakeTransactionRef(dsa.txCollateral));
@@ -730,7 +730,7 @@ bool CPrivateSendServer::CreateNewSession(const CDarksendAccept& dsa, PoolMessag
     return true;
 }
 
-bool CPrivateSendServer::AddUserToExistingSession(const CDarksendAccept& dsa, PoolMessage& nMessageIDRet)
+bool CPrivateSendServer::AddUserToExistingSession(const CPrivateSendAccept& dsa, PoolMessage& nMessageIDRet)
 {
     if(!fMasternodeMode || nSessionID == 0 || IsSessionReady()) return false;
 
diff --git a/src/privatesend-server.h b/src/privatesend-server.h
index f9219627ca8b..67ea5e0dbdfc 100644
--- a/src/privatesend-server.h
+++ b/src/privatesend-server.h
@@ -25,7 +25,7 @@ class CPrivateSendServer : public CPrivateSendBaseSession, public CPrivateSendBa
     bool fUnitTest;
 
     /// Add a clients entry to the pool
-    bool AddEntry(const CDarkSendEntry& entryNew, PoolMessage& nMessageIDRet);
+    bool AddEntry(const CPrivateSendEntry& entryNew, PoolMessage& nMessageIDRet);
     /// Add signature to a txin
     bool AddScriptSig(const CTxIn& txin);
 
@@ -41,9 +41,9 @@ class CPrivateSendServer : public CPrivateSendBaseSession, public CPrivateSendBa
     void CommitFinalTransaction(CConnman& connman);
 
     /// Is this nDenom and txCollateral acceptable?
-    bool IsAcceptableDSA(const CDarksendAccept& dsa, PoolMessage &nMessageIDRet);
-    bool CreateNewSession(const CDarksendAccept& dsa, PoolMessage &nMessageIDRet, CConnman& connman);
-    bool AddUserToExistingSession(const CDarksendAccept& dsa, PoolMessage &nMessageIDRet);
+    bool IsAcceptableDSA(const CPrivateSendAccept& dsa, PoolMessage &nMessageIDRet);
+    bool CreateNewSession(const CPrivateSendAccept& dsa, PoolMessage &nMessageIDRet, CConnman& connman);
+    bool AddUserToExistingSession(const CPrivateSendAccept& dsa, PoolMessage &nMessageIDRet);
     /// Do we have enough users to take entries?
     bool IsSessionReady() { return (int)vecSessionCollaterals.size() >= CPrivateSend::GetMaxPoolTransactions(); }
 
diff --git a/src/privatesend.cpp b/src/privatesend.cpp
index 20bc0e37df63..725a2fa7a604 100644
--- a/src/privatesend.cpp
+++ b/src/privatesend.cpp
@@ -17,7 +17,7 @@
 
 #include <string>
 
-bool CDarkSendEntry::AddScriptSig(const CTxIn& txin)
+bool CPrivateSendEntry::AddScriptSig(const CTxIn& txin)
 {
     for (auto& txdsin : vecTxDSIn) {
         if(txdsin.prevout == txin.prevout && txdsin.nSequence == txin.nSequence) {
@@ -33,7 +33,7 @@ bool CDarkSendEntry::AddScriptSig(const CTxIn& txin)
     return false;
 }
 
-uint256 CDarksendQueue::GetSignatureHash() const
+uint256 CPrivateSendQueue::GetSignatureHash() const
 {
     // Remove after migration to 70211
     {
@@ -45,7 +45,7 @@ uint256 CDarksendQueue::GetSignatureHash() const
     // return SerializeHash(*this);
 }
 
-bool CDarksendQueue::Sign()
+bool CPrivateSendQueue::Sign()
 {
     if(!fMasternodeMode) return false;
 
@@ -59,12 +59,12 @@ bool CDarksendQueue::Sign()
         uint256 hash = GetSignatureHash();
 
         if (!CHashSigner::SignHash(hash, activeMasternodeInfo.legacyKeyOperator, vchSig)) {
-            LogPrintf("CDarksendQueue::Sign -- SignHash() failed\n");
+            LogPrintf("CPrivateSendQueue::Sign -- SignHash() failed\n");
             return false;
         }
 
         if (!CHashSigner::VerifyHash(hash, activeMasternodeInfo.legacyKeyIDOperator, vchSig, strError)) {
-            LogPrintf("CDarksendQueue::Sign -- VerifyHash() failed, error: %s\n", strError);
+            LogPrintf("CPrivateSendQueue::Sign -- VerifyHash() failed, error: %s\n", strError);
             return false;
         }
     } else {
@@ -74,12 +74,12 @@ bool CDarksendQueue::Sign()
                         std::to_string(fReady);
 
         if(!CMessageSigner::SignMessage(strMessage, vchSig, activeMasternodeInfo.legacyKeyOperator)) {
-            LogPrintf("CDarksendQueue::Sign -- SignMessage() failed, %s\n", ToString());
+            LogPrintf("CPrivateSendQueue::Sign -- SignMessage() failed, %s\n", ToString());
             return false;
         }
 
         if(!CMessageSigner::VerifyMessage(activeMasternodeInfo.legacyKeyIDOperator, vchSig, strMessage, strError)) {
-            LogPrintf("CDarksendQueue::Sign -- VerifyMessage() failed, error: %s\n", strError);
+            LogPrintf("CPrivateSendQueue::Sign -- VerifyMessage() failed, error: %s\n", strError);
             return false;
         }
     }
@@ -87,7 +87,7 @@ bool CDarksendQueue::Sign()
     return true;
 }
 
-bool CDarksendQueue::CheckSignature(const CKeyID& keyIDOperator, const CBLSPublicKey& blsPubKey) const
+bool CPrivateSendQueue::CheckSignature(const CKeyID& keyIDOperator, const CBLSPublicKey& blsPubKey) const
 {
     std::string strError = "";
     if (deterministicMNManager->IsDeterministicMNsSporkActive()) {
@@ -104,7 +104,7 @@ bool CDarksendQueue::CheckSignature(const CKeyID& keyIDOperator, const CBLSPubli
 
         if (!CHashSigner::VerifyHash(hash, keyIDOperator, vchSig, strError)) {
             // we don't care about queues with old signature format
-            LogPrintf("CDarksendQueue::CheckSignature -- VerifyHash() failed, error: %s\n", strError);
+            LogPrintf("CPrivateSendQueue::CheckSignature -- VerifyHash() failed, error: %s\n", strError);
             return false;
         }
     } else {
@@ -114,7 +114,7 @@ bool CDarksendQueue::CheckSignature(const CKeyID& keyIDOperator, const CBLSPubli
                         std::to_string(fReady);
 
         if(!CMessageSigner::VerifyMessage(keyIDOperator, vchSig, strMessage, strError)) {
-            LogPrintf("CDarksendQueue::CheckSignature -- Got bad Masternode queue signature: %s; error: %s\n", ToString(), strError);
+            LogPrintf("CPrivateSendQueue::CheckSignature -- Got bad Masternode queue signature: %s; error: %s\n", ToString(), strError);
             return false;
         }
     }
@@ -122,7 +122,7 @@ bool CDarksendQueue::CheckSignature(const CKeyID& keyIDOperator, const CBLSPubli
     return true;
 }
 
-bool CDarksendQueue::Relay(CConnman& connman)
+bool CPrivateSendQueue::Relay(CConnman& connman)
 {
     connman.ForEachNode([&connman, this](CNode* pnode) {
         CNetMsgMaker msgMaker(pnode->GetSendVersion());
@@ -132,12 +132,12 @@ bool CDarksendQueue::Relay(CConnman& connman)
     return true;
 }
 
-uint256 CDarksendBroadcastTx::GetSignatureHash() const
+uint256 CPrivateSendBroadcastTx::GetSignatureHash() const
 {
     return SerializeHash(*this);
 }
 
-bool CDarksendBroadcastTx::Sign()
+bool CPrivateSendBroadcastTx::Sign()
 {
     if(!fMasternodeMode) return false;
 
@@ -152,24 +152,24 @@ bool CDarksendBroadcastTx::Sign()
         uint256 hash = GetSignatureHash();
 
         if (!CHashSigner::SignHash(hash, activeMasternodeInfo.legacyKeyOperator, vchSig)) {
-            LogPrintf("CDarksendBroadcastTx::Sign -- SignHash() failed\n");
+            LogPrintf("CPrivateSendBroadcastTx::Sign -- SignHash() failed\n");
             return false;
         }
 
         if (!CHashSigner::VerifyHash(hash, activeMasternodeInfo.legacyKeyIDOperator, vchSig, strError)) {
-            LogPrintf("CDarksendBroadcastTx::Sign -- VerifyHash() failed, error: %s\n", strError);
+            LogPrintf("CPrivateSendBroadcastTx::Sign -- VerifyHash() failed, error: %s\n", strError);
             return false;
         }
     } else {
         std::string strMessage = tx->GetHash().ToString() + std::to_string(sigTime);
 
         if(!CMessageSigner::SignMessage(strMessage, vchSig, activeMasternodeInfo.legacyKeyOperator)) {
-            LogPrintf("CDarksendBroadcastTx::Sign -- SignMessage() failed\n");
+            LogPrintf("CPrivateSendBroadcastTx::Sign -- SignMessage() failed\n");
             return false;
         }
 
         if(!CMessageSigner::VerifyMessage(activeMasternodeInfo.legacyKeyIDOperator, vchSig, strMessage, strError)) {
-            LogPrintf("CDarksendBroadcastTx::Sign -- VerifyMessage() failed, error: %s\n", strError);
+            LogPrintf("CPrivateSendBroadcastTx::Sign -- VerifyMessage() failed, error: %s\n", strError);
             return false;
         }
     }
@@ -177,7 +177,7 @@ bool CDarksendBroadcastTx::Sign()
     return true;
 }
 
-bool CDarksendBroadcastTx::CheckSignature(const CKeyID& keyIDOperator, const CBLSPublicKey& blsPubKey) const
+bool CPrivateSendBroadcastTx::CheckSignature(const CKeyID& keyIDOperator, const CBLSPublicKey& blsPubKey) const
 {
     std::string strError = "";
 
@@ -195,14 +195,14 @@ bool CDarksendBroadcastTx::CheckSignature(const CKeyID& keyIDOperator, const CBL
 
         if (!CHashSigner::VerifyHash(hash, keyIDOperator, vchSig, strError)) {
             // we don't care about dstxes with old signature format
-            LogPrintf("CDarksendBroadcastTx::CheckSignature -- VerifyHash() failed, error: %s\n", strError);
+            LogPrintf("CPrivateSendBroadcastTx::CheckSignature -- VerifyHash() failed, error: %s\n", strError);
             return false;
         }
     } else {
         std::string strMessage = tx->GetHash().ToString() + std::to_string(sigTime);
 
         if(!CMessageSigner::VerifyMessage(keyIDOperator, vchSig, strMessage, strError)) {
-            LogPrintf("CDarksendBroadcastTx::CheckSignature -- Got bad dstx signature, error: %s\n", strError);
+            LogPrintf("CPrivateSendBroadcastTx::CheckSignature -- Got bad dstx signature, error: %s\n", strError);
             return false;
         }
     }
@@ -210,7 +210,7 @@ bool CDarksendBroadcastTx::CheckSignature(const CKeyID& keyIDOperator, const CBL
     return true;
 }
 
-bool CDarksendBroadcastTx::IsExpired(int nHeight)
+bool CPrivateSendBroadcastTx::IsExpired(int nHeight)
 {
     // expire confirmed DSTXes after ~1h since confirmation
     return (nConfirmedHeight != -1) && (nHeight - nConfirmedHeight > 24);
@@ -219,7 +219,7 @@ bool CDarksendBroadcastTx::IsExpired(int nHeight)
 void CPrivateSendBaseSession::SetNull()
 {
     // Both sides
-    LOCK(cs_darksend);
+    LOCK(cs_privatesend);
     nState = POOL_STATE_IDLE;
     nSessionID = 0;
     nSessionDenom = 0;
@@ -232,7 +232,7 @@ void CPrivateSendBaseSession::SetNull()
 void CPrivateSendBaseManager::SetNull()
 {
     LOCK(cs_vecqueue);
-    vecDarksendQueue.clear();
+    vecPrivateSendQueue.clear();
 }
 
 void CPrivateSendBaseManager::CheckQueue()
@@ -241,21 +241,21 @@ void CPrivateSendBaseManager::CheckQueue()
     if(!lockDS) return; // it's ok to fail here, we run this quite frequently
 
     // check mixing queue objects for timeouts
-    std::vector<CDarksendQueue>::iterator it = vecDarksendQueue.begin();
-    while(it != vecDarksendQueue.end()) {
+    std::vector<CPrivateSendQueue>::iterator it = vecPrivateSendQueue.begin();
+    while(it != vecPrivateSendQueue.end()) {
         if((*it).IsExpired()) {
             LogPrint("privatesend", "CPrivateSendBaseManager::%s -- Removing expired queue (%s)\n", __func__, (*it).ToString());
-            it = vecDarksendQueue.erase(it);
+            it = vecPrivateSendQueue.erase(it);
         } else ++it;
     }
 }
 
-bool CPrivateSendBaseManager::GetQueueItemAndTry(CDarksendQueue& dsqRet)
+bool CPrivateSendBaseManager::GetQueueItemAndTry(CPrivateSendQueue& dsqRet)
 {
     TRY_LOCK(cs_vecqueue, lockDS);
     if(!lockDS) return false; // it's ok to fail here, we run this quite frequently
 
-    for (auto& dsq : vecDarksendQueue) {
+    for (auto& dsq : vecPrivateSendQueue) {
         // only try each queue once
         if(dsq.fTried || dsq.IsExpired()) continue;
         dsq.fTried = true;
@@ -281,7 +281,7 @@ std::string CPrivateSendBaseSession::GetStateString() const
 
 // Definitions for static data members
 std::vector<CAmount> CPrivateSend::vecStandardDenominations;
-std::map<uint256, CDarksendBroadcastTx> CPrivateSend::mapDSTX;
+std::map<uint256, CPrivateSendBroadcastTx> CPrivateSend::mapDSTX;
 CCriticalSection CPrivateSend::cs_mapdstx;
 
 void CPrivateSend::InitStandardDenominations()
@@ -513,23 +513,23 @@ std::string CPrivateSend::GetMessageByID(PoolMessage nMessageID)
     }
 }
 
-void CPrivateSend::AddDSTX(const CDarksendBroadcastTx& dstx)
+void CPrivateSend::AddDSTX(const CPrivateSendBroadcastTx& dstx)
 {
     LOCK(cs_mapdstx);
     mapDSTX.insert(std::make_pair(dstx.tx->GetHash(), dstx));
 }
 
-CDarksendBroadcastTx CPrivateSend::GetDSTX(const uint256& hash)
+CPrivateSendBroadcastTx CPrivateSend::GetDSTX(const uint256& hash)
 {
     LOCK(cs_mapdstx);
     auto it = mapDSTX.find(hash);
-    return (it == mapDSTX.end()) ? CDarksendBroadcastTx() : it->second;
+    return (it == mapDSTX.end()) ? CPrivateSendBroadcastTx() : it->second;
 }
 
 void CPrivateSend::CheckDSTXes(int nHeight)
 {
     LOCK(cs_mapdstx);
-    std::map<uint256, CDarksendBroadcastTx>::iterator it = mapDSTX.begin();
+    std::map<uint256, CPrivateSendBroadcastTx>::iterator it = mapDSTX.begin();
     while(it != mapDSTX.end()) {
         if (it->second.IsExpired(nHeight)) {
             mapDSTX.erase(it++);
diff --git a/src/privatesend.h b/src/privatesend.h
index cad73729ae7e..efb5571ec59e 100644
--- a/src/privatesend.h
+++ b/src/privatesend.h
@@ -96,18 +96,18 @@ class CTxDSIn : public CTxIn
         {}
 };
 
-class CDarksendAccept
+class CPrivateSendAccept
 {
 public:
     int nDenom;
     CMutableTransaction txCollateral;
 
-    CDarksendAccept() :
+    CPrivateSendAccept() :
         nDenom(0),
         txCollateral(CMutableTransaction())
         {};
 
-    CDarksendAccept(int nDenom, const CMutableTransaction& txCollateral) :
+    CPrivateSendAccept(int nDenom, const CMutableTransaction& txCollateral) :
         nDenom(nDenom),
         txCollateral(txCollateral)
         {};
@@ -125,14 +125,14 @@ class CDarksendAccept
         READWRITE(txCollateral);
     }
 
-    friend bool operator==(const CDarksendAccept& a, const CDarksendAccept& b)
+    friend bool operator==(const CPrivateSendAccept& a, const CPrivateSendAccept& b)
     {
         return a.nDenom == b.nDenom && a.txCollateral == b.txCollateral;
     }
 };
 
 // A clients transaction in the mixing pool
-class CDarkSendEntry
+class CPrivateSendEntry
 {
 public:
     std::vector<CTxDSIn> vecTxDSIn;
@@ -141,14 +141,14 @@ class CDarkSendEntry
     // memory only
     CService addr;
 
-    CDarkSendEntry() :
+    CPrivateSendEntry() :
         vecTxDSIn(std::vector<CTxDSIn>()),
         vecTxOut(std::vector<CTxOut>()),
         txCollateral(MakeTransactionRef()),
         addr(CService())
         {}
 
-    CDarkSendEntry(const std::vector<CTxDSIn>& vecTxDSIn, const std::vector<CTxOut>& vecTxOut, const CTransaction& txCollateral) :
+    CPrivateSendEntry(const std::vector<CTxDSIn>& vecTxDSIn, const std::vector<CTxOut>& vecTxOut, const CTransaction& txCollateral) :
         vecTxDSIn(vecTxDSIn),
         vecTxOut(vecTxOut),
         txCollateral(MakeTransactionRef(txCollateral)),
@@ -171,7 +171,7 @@ class CDarkSendEntry
 /**
  * A currently in progress mixing merge and denomination information
  */
-class CDarksendQueue
+class CPrivateSendQueue
 {
 public:
     int nDenom;
@@ -183,7 +183,7 @@ class CDarksendQueue
     // memory only
     bool fTried;
 
-    CDarksendQueue() :
+    CPrivateSendQueue() :
         nDenom(0),
         nInputCount(0),
         masternodeOutpoint(COutPoint()),
@@ -193,7 +193,7 @@ class CDarksendQueue
         fTried(false)
         {}
 
-    CDarksendQueue(int nDenom, COutPoint outpoint, int64_t nTime, bool fReady) :
+    CPrivateSendQueue(int nDenom, COutPoint outpoint, int64_t nTime, bool fReady) :
         nDenom(nDenom),
         nInputCount(0),
         masternodeOutpoint(outpoint),
@@ -243,7 +243,7 @@ class CDarksendQueue
                         nDenom, nTime, fReady ? "true" : "false", fTried ? "true" : "false", masternodeOutpoint.ToStringShort());
     }
 
-    friend bool operator==(const CDarksendQueue& a, const CDarksendQueue& b)
+    friend bool operator==(const CPrivateSendQueue& a, const CPrivateSendQueue& b)
     {
         return a.nDenom == b.nDenom && a.masternodeOutpoint == b.masternodeOutpoint && a.nTime == b.nTime && a.fReady == b.fReady;
     }
@@ -251,7 +251,7 @@ class CDarksendQueue
 
 /** Helper class to store mixing transaction (tx) information.
  */
-class CDarksendBroadcastTx
+class CPrivateSendBroadcastTx
 {
 private:
     // memory only
@@ -264,7 +264,7 @@ class CDarksendBroadcastTx
     std::vector<unsigned char> vchSig;
     int64_t sigTime;
 
-    CDarksendBroadcastTx() :
+    CPrivateSendBroadcastTx() :
         nConfirmedHeight(-1),
         tx(MakeTransactionRef()),
         masternodeOutpoint(),
@@ -272,7 +272,7 @@ class CDarksendBroadcastTx
         sigTime(0)
         {}
 
-    CDarksendBroadcastTx(const CTransactionRef& _tx, COutPoint _outpoint, int64_t _sigTime) :
+    CPrivateSendBroadcastTx(const CTransactionRef& _tx, COutPoint _outpoint, int64_t _sigTime) :
         nConfirmedHeight(-1),
         tx(_tx),
         masternodeOutpoint(_outpoint),
@@ -292,17 +292,17 @@ class CDarksendBroadcastTx
         READWRITE(sigTime);
     }
 
-    friend bool operator==(const CDarksendBroadcastTx& a, const CDarksendBroadcastTx& b)
+    friend bool operator==(const CPrivateSendBroadcastTx& a, const CPrivateSendBroadcastTx& b)
     {
         return *a.tx == *b.tx;
     }
-    friend bool operator!=(const CDarksendBroadcastTx& a, const CDarksendBroadcastTx& b)
+    friend bool operator!=(const CPrivateSendBroadcastTx& a, const CPrivateSendBroadcastTx& b)
     {
         return !(a == b);
     }
     explicit operator bool() const
     {
-        return *this != CDarksendBroadcastTx();
+        return *this != CPrivateSendBroadcastTx();
     }
 
     uint256 GetSignatureHash() const;
@@ -318,9 +318,9 @@ class CDarksendBroadcastTx
 class CPrivateSendBaseSession
 {
 protected:
-    mutable CCriticalSection cs_darksend;
+    mutable CCriticalSection cs_privatesend;
 
-    std::vector<CDarkSendEntry> vecEntries; // Masternode/clients entries
+    std::vector<CPrivateSendEntry> vecEntries; // Masternode/clients entries
 
     PoolState nState; // should be one of the POOL_STATE_XXX values
     int64_t nTimeLastSuccessfulStep; // the time when last successful mixing step was performed
@@ -356,16 +356,16 @@ class CPrivateSendBaseManager
     mutable CCriticalSection cs_vecqueue;
 
     // The current mixing sessions in progress on the network
-    std::vector<CDarksendQueue> vecDarksendQueue;
+    std::vector<CPrivateSendQueue> vecPrivateSendQueue;
 
     void SetNull();
     void CheckQueue();
 
 public:
-    CPrivateSendBaseManager() : vecDarksendQueue() {}
+    CPrivateSendBaseManager() : vecPrivateSendQueue() {}
 
-    int GetQueueSize() const { return vecDarksendQueue.size(); }
-    bool GetQueueItemAndTry(CDarksendQueue& dsqRet);
+    int GetQueueSize() const { return vecPrivateSendQueue.size(); }
+    bool GetQueueItemAndTry(CPrivateSendQueue& dsqRet);
 };
 
 // helper class
@@ -382,7 +382,7 @@ class CPrivateSend
 
     // static members
     static std::vector<CAmount> vecStandardDenominations;
-    static std::map<uint256, CDarksendBroadcastTx> mapDSTX;
+    static std::map<uint256, CPrivateSendBroadcastTx> mapDSTX;
 
     static CCriticalSection cs_mapdstx;
 
@@ -417,8 +417,8 @@ class CPrivateSend
 
     static bool IsCollateralAmount(CAmount nInputAmount);
 
-    static void AddDSTX(const CDarksendBroadcastTx& dstx);
-    static CDarksendBroadcastTx GetDSTX(const uint256& hash);
+    static void AddDSTX(const CPrivateSendBroadcastTx& dstx);
+    static CPrivateSendBroadcastTx GetDSTX(const uint256& hash);
 
     static void UpdatedBlockTip(const CBlockIndex *pindex);
     static void SyncTransaction(const CTransaction& tx, const CBlockIndex *pindex, int posInBlock);
diff --git a/src/qt/overviewpage.cpp b/src/qt/overviewpage.cpp
index b285506dd4ca..3f62b36e443e 100644
--- a/src/qt/overviewpage.cpp
+++ b/src/qt/overviewpage.cpp
@@ -557,7 +557,7 @@ void OverviewPage::privateSendStatus()
         ui->labelPrivateSendEnabled->setToolTip(strWarning);
     }
 
-    // check darksend status and unlock if needed
+    // check privatesend status and unlock if needed
     if(nBestHeight != privateSendClient.nCachedNumBlocks) {
         // Balance and number of transactions might have changed
         privateSendClient.nCachedNumBlocks = nBestHeight;
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
index f11e6b9fc253..4c7b658e9cf6 100644
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -3158,7 +3158,7 @@ bool CWallet::SelectCoinsGrouppedByAddresses(std::vector<CompactTallyItem>& vecT
     return vecTallyRet.size() > 0;
 }
 
-bool CWallet::SelectCoinsDark(CAmount nValueMin, CAmount nValueMax, std::vector<CTxIn>& vecTxInRet, CAmount& nValueRet, int nPrivateSendRoundsMin, int nPrivateSendRoundsMax) const
+bool CWallet::SelectPrivateCoins(CAmount nValueMin, CAmount nValueMax, std::vector<CTxIn>& vecTxInRet, CAmount& nValueRet, int nPrivateSendRoundsMin, int nPrivateSendRoundsMax) const
 {
     CCoinControl *coinControl=NULL;
 
diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h
index 67feaa891d50..d05d529c2e18 100644
--- a/src/wallet/wallet.h
+++ b/src/wallet/wallet.h
@@ -808,7 +808,7 @@ class CWallet : public CCryptoKeyStore, public CValidationInterface
     // Coin selection
     bool SelectPSInOutPairsByDenominations(int nDenom, CAmount nValueMin, CAmount nValueMax, std::vector< std::pair<CTxDSIn, CTxOut> >& vecPSInOutPairsRet);
     bool GetCollateralTxDSIn(CTxDSIn& txdsinRet, CAmount& nValueRet) const;
-    bool SelectCoinsDark(CAmount nValueMin, CAmount nValueMax, std::vector<CTxIn>& vecTxInRet, CAmount& nValueRet, int nPrivateSendRoundsMin, int nPrivateSendRoundsMax) const;
+    bool SelectPrivateCoins(CAmount nValueMin, CAmount nValueMax, std::vector<CTxIn>& vecTxInRet, CAmount& nValueRet, int nPrivateSendRoundsMin, int nPrivateSendRoundsMax) const;
 
     bool SelectCoinsGrouppedByAddresses(std::vector<CompactTallyItem>& vecTallyRet, bool fSkipDenominated = true, bool fAnonymizable = true, bool fSkipUnconfirmed = true) const;
 

From 6433a944a0448a34570fae553882c4714a84f8c9 Mon Sep 17 00:00:00 2001
From: PastaPastaPasta <pasta@dashboost.org>
Date: Thu, 25 Oct 2018 09:32:08 -0500
Subject: [PATCH 212/400] [Trivial] typo Groupped -> Grouped (#2374)

---
 src/privatesend-client.cpp |  8 ++++----
 src/wallet/wallet.cpp      | 10 +++++-----
 src/wallet/wallet.h        |  2 +-
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/privatesend-client.cpp b/src/privatesend-client.cpp
index 593049ea4e23..32c232b43068 100644
--- a/src/privatesend-client.cpp
+++ b/src/privatesend-client.cpp
@@ -1335,8 +1335,8 @@ bool CPrivateSendClientSession::MakeCollateralAmounts(CConnman& connman)
     if (!pwalletMain) return false;
 
     std::vector<CompactTallyItem> vecTally;
-    if(!pwalletMain->SelectCoinsGrouppedByAddresses(vecTally, false, false)) {
-        LogPrint("privatesend", "CPrivateSendClientSession::MakeCollateralAmounts -- SelectCoinsGrouppedByAddresses can't find any inputs!\n");
+    if(!pwalletMain->SelectCoinsGroupedByAddresses(vecTally, false, false)) {
+        LogPrint("privatesend", "CPrivateSendClientSession::MakeCollateralAmounts -- SelectCoinsGroupedByAddresses can't find any inputs!\n");
         return false;
     }
 
@@ -1439,8 +1439,8 @@ bool CPrivateSendClientSession::CreateDenominated(CConnman& connman)
     LOCK2(cs_main, pwalletMain->cs_wallet);
 
     std::vector<CompactTallyItem> vecTally;
-    if(!pwalletMain->SelectCoinsGrouppedByAddresses(vecTally)) {
-        LogPrint("privatesend", "CPrivateSendClientSession::CreateDenominated -- SelectCoinsGrouppedByAddresses can't find any inputs!\n");
+    if(!pwalletMain->SelectCoinsGroupedByAddresses(vecTally)) {
+        LogPrint("privatesend", "CPrivateSendClientSession::CreateDenominated -- SelectCoinsGroupedByAddresses can't find any inputs!\n");
         return false;
     }
 
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
index 4c7b658e9cf6..1515637be844 100644
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -2376,7 +2376,7 @@ CAmount CWallet::GetAnonymizableBalance(bool fSkipDenominated, bool fSkipUnconfi
     if(fLiteMode) return 0;
 
     std::vector<CompactTallyItem> vecTally;
-    if(!SelectCoinsGrouppedByAddresses(vecTally, fSkipDenominated, true, fSkipUnconfirmed)) return 0;
+    if(!SelectCoinsGroupedByAddresses(vecTally, fSkipDenominated, true, fSkipUnconfirmed)) return 0;
 
     CAmount nTotal = 0;
 
@@ -3059,7 +3059,7 @@ struct CompareByAmount
     }
 };
 
-bool CWallet::SelectCoinsGrouppedByAddresses(std::vector<CompactTallyItem>& vecTallyRet, bool fSkipDenominated, bool fAnonymizable, bool fSkipUnconfirmed) const
+bool CWallet::SelectCoinsGroupedByAddresses(std::vector<CompactTallyItem>& vecTallyRet, bool fSkipDenominated, bool fAnonymizable, bool fSkipUnconfirmed) const
 {
     LOCK2(cs_main, cs_wallet);
 
@@ -3069,12 +3069,12 @@ bool CWallet::SelectCoinsGrouppedByAddresses(std::vector<CompactTallyItem>& vecT
     if(fAnonymizable && fSkipUnconfirmed) {
         if(fSkipDenominated && fAnonymizableTallyCachedNonDenom) {
             vecTallyRet = vecAnonymizableTallyCachedNonDenom;
-            LogPrint("selectcoins", "SelectCoinsGrouppedByAddresses - using cache for non-denom inputs %d\n", vecTallyRet.size());
+            LogPrint("selectcoins", "SelectCoinsGroupedByAddresses - using cache for non-denom inputs %d\n", vecTallyRet.size());
             return vecTallyRet.size() > 0;
         }
         if(!fSkipDenominated && fAnonymizableTallyCached) {
             vecTallyRet = vecAnonymizableTallyCached;
-            LogPrint("selectcoins", "SelectCoinsGrouppedByAddresses - using cache for all inputs %d\n", vecTallyRet.size());
+            LogPrint("selectcoins", "SelectCoinsGroupedByAddresses - using cache for all inputs %d\n", vecTallyRet.size());
             return vecTallyRet.size() > 0;
         }
     }
@@ -3149,7 +3149,7 @@ bool CWallet::SelectCoinsGrouppedByAddresses(std::vector<CompactTallyItem>& vecT
 
     // debug
     if (LogAcceptCategory("selectcoins")) {
-        std::string strMessage = "SelectCoinsGrouppedByAddresses - vecTallyRet:\n";
+        std::string strMessage = "SelectCoinsGroupedByAddresses - vecTallyRet:\n";
         for (const auto& item : vecTallyRet)
             strMessage += strprintf("  %s %f\n", CBitcoinAddress(item.txdest).ToString().c_str(), float(item.nAmount)/COIN);
         LogPrint("selectcoins", "%s", strMessage);
diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h
index d05d529c2e18..b80df65c4fa7 100644
--- a/src/wallet/wallet.h
+++ b/src/wallet/wallet.h
@@ -810,7 +810,7 @@ class CWallet : public CCryptoKeyStore, public CValidationInterface
     bool GetCollateralTxDSIn(CTxDSIn& txdsinRet, CAmount& nValueRet) const;
     bool SelectPrivateCoins(CAmount nValueMin, CAmount nValueMax, std::vector<CTxIn>& vecTxInRet, CAmount& nValueRet, int nPrivateSendRoundsMin, int nPrivateSendRoundsMax) const;
 
-    bool SelectCoinsGrouppedByAddresses(std::vector<CompactTallyItem>& vecTallyRet, bool fSkipDenominated = true, bool fAnonymizable = true, bool fSkipUnconfirmed = true) const;
+    bool SelectCoinsGroupedByAddresses(std::vector<CompactTallyItem>& vecTallyRet, bool fSkipDenominated = true, bool fAnonymizable = true, bool fSkipUnconfirmed = true) const;
 
     /// Get 1000DASH output and keys which can be used for the Masternode
     bool GetMasternodeOutpointAndKeys(COutPoint& outpointRet, CPubKey& pubKeyRet, CKey& keyRet, const std::string& strTxHash = "", const std::string& strOutputIndex = "");

From 25b6dae9ea3bcc035d9b5bbe19d51a7d368fe290 Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Fri, 26 Oct 2018 07:03:14 +0200
Subject: [PATCH 213/400] Code style and RPC help string cleanups for DIP2/DIP3
 (#2379)

* Fix code style in DIP2/DIP3 code (single statement ifs with curly braces)

* Fix DIP3 RPC help strings

* Handle review comments

* Handle more review comments
---
 src/evo/cbtx.cpp             |  20 ++++---
 src/evo/deterministicmns.cpp |  12 ++--
 src/evo/providertx.cpp       | 108 +++++++++++++++++++++++------------
 src/evo/specialtx.cpp        |  24 +++++---
 src/rpc/rpcevo.cpp           |  78 ++++++++++++++++---------
 5 files changed, 158 insertions(+), 84 deletions(-)

diff --git a/src/evo/cbtx.cpp b/src/evo/cbtx.cpp
index 85a56aae7439..cf48c69fa078 100644
--- a/src/evo/cbtx.cpp
+++ b/src/evo/cbtx.cpp
@@ -14,19 +14,21 @@ bool CheckCbTx(const CTransaction& tx, const CBlockIndex* pindexPrev, CValidatio
 {
     AssertLockHeld(cs_main);
 
-    if (!tx.IsCoinBase())
+    if (!tx.IsCoinBase()) {
         return state.DoS(100, false, REJECT_INVALID, "bad-cbtx-invalid");
+    }
 
     CCbTx cbTx;
-    if (!GetTxPayload(tx, cbTx))
+    if (!GetTxPayload(tx, cbTx)) {
         return state.DoS(100, false, REJECT_INVALID, "bad-tx-payload");
+    }
 
-    if (cbTx.nVersion > CCbTx::CURRENT_VERSION)
+    if (cbTx.nVersion > CCbTx::CURRENT_VERSION) {
         return state.DoS(100, false, REJECT_INVALID, "bad-cbtx-version");
+    }
 
-    if (pindexPrev) {
-        if (pindexPrev->nHeight + 1 != cbTx.nHeight)
-            return state.DoS(100, false, REJECT_INVALID, "bad-cbtx-height");
+    if (pindexPrev && pindexPrev->nHeight + 1 != cbTx.nHeight) {
+        return state.DoS(100, false, REJECT_INVALID, "bad-cbtx-height");
     }
 
     return true;
@@ -37,12 +39,14 @@ bool CheckCbTxMerkleRootMNList(const CBlock& block, const CBlockIndex* pindex, C
 {
     AssertLockHeld(cs_main);
 
-    if (block.vtx[0]->nType != TRANSACTION_COINBASE)
+    if (block.vtx[0]->nType != TRANSACTION_COINBASE) {
         return true;
+    }
 
     CCbTx cbTx;
-    if (!GetTxPayload(*block.vtx[0], cbTx))
+    if (!GetTxPayload(*block.vtx[0], cbTx)) {
         return state.DoS(100, false, REJECT_INVALID, "bad-tx-payload");
+    }
 
     if (pindex) {
         uint256 calculatedMerkleRoot;
diff --git a/src/evo/deterministicmns.cpp b/src/evo/deterministicmns.cpp
index 534bfbc92743..ff01d3f74a52 100644
--- a/src/evo/deterministicmns.cpp
+++ b/src/evo/deterministicmns.cpp
@@ -175,8 +175,9 @@ static bool CompareByLastPaid(const CDeterministicMNCPtr &_a, const CDeterminist
 
 CDeterministicMNCPtr CDeterministicMNList::GetMNPayee() const
 {
-    if (mnMap.size() == 0)
+    if (mnMap.size() == 0) {
         return nullptr;
+    }
 
     CDeterministicMNCPtr best;
     ForEachMN(true, [&](const CDeterministicMNCPtr& dmn) {
@@ -391,10 +392,12 @@ bool CDeterministicMNManager::BuildNewListFromBlock(const CBlock& block, const C
                 assert(false); // this should have been handled already
             }
 
-            if (newList.HasUniqueProperty(proTx.addr))
+            if (newList.HasUniqueProperty(proTx.addr)) {
                 return _state.DoS(100, false, REJECT_CONFLICT, "bad-protx-dup-addr");
-            if (newList.HasUniqueProperty(proTx.keyIDOwner) || newList.HasUniqueProperty(proTx.pubKeyOperator))
+            }
+            if (newList.HasUniqueProperty(proTx.keyIDOwner) || newList.HasUniqueProperty(proTx.pubKeyOperator)) {
                 return _state.DoS(100, false, REJECT_CONFLICT, "bad-protx-dup-key");
+            }
 
             auto dmn = std::make_shared<CDeterministicMN>();
             dmn->proTxHash = tx.GetHash();
@@ -436,8 +439,9 @@ bool CDeterministicMNManager::BuildNewListFromBlock(const CBlock& block, const C
                 assert(false); // this should have been handled already
             }
 
-            if (newList.HasUniqueProperty(proTx.addr) && newList.GetUniquePropertyMN(proTx.addr)->proTxHash != proTx.proTxHash)
+            if (newList.HasUniqueProperty(proTx.addr) && newList.GetUniquePropertyMN(proTx.addr)->proTxHash != proTx.proTxHash) {
                 return _state.DoS(100, false, REJECT_CONFLICT, "bad-protx-dup-addr");
+            }
 
             CDeterministicMNCPtr dmn = newList.GetMN(proTx.proTxHash);
             if (!dmn) {
diff --git a/src/evo/providertx.cpp b/src/evo/providertx.cpp
index 6b7463dd4098..67e112d15294 100644
--- a/src/evo/providertx.cpp
+++ b/src/evo/providertx.cpp
@@ -20,13 +20,16 @@
 template <typename ProTx>
 static bool CheckService(const uint256& proTxHash, const ProTx& proTx, const CBlockIndex* pindexPrev, CValidationState& state)
 {
-    if (!proTx.addr.IsValid())
+    if (!proTx.addr.IsValid()) {
         return state.DoS(10, false, REJECT_INVALID, "bad-protx-addr");
-    if (Params().NetworkIDString() != CBaseChainParams::REGTEST && !proTx.addr.IsRoutable())
+    }
+    if (Params().NetworkIDString() != CBaseChainParams::REGTEST && !proTx.addr.IsRoutable()) {
         return state.DoS(10, false, REJECT_INVALID, "bad-protx-addr");
+    }
 
-    if (!proTx.addr.IsIPv4())
+    if (!proTx.addr.IsIPv4()) {
         return state.DoS(10, false, REJECT_INVALID, "bad-protx-addr");
+    }
 
     if (pindexPrev) {
         auto mnList = deterministicMNManager->GetListForBlock(pindexPrev->GetBlockHash());
@@ -42,16 +45,18 @@ template <typename ProTx>
 static bool CheckSig(const ProTx& proTx, const CKeyID& keyID, CValidationState& state)
 {
     std::string strError;
-    if (!CHashSigner::VerifyHash(::SerializeHash(proTx), keyID, proTx.vchSig, strError))
+    if (!CHashSigner::VerifyHash(::SerializeHash(proTx), keyID, proTx.vchSig, strError)) {
         return state.DoS(100, false, REJECT_INVALID, "bad-protx-sig", false, strError);
+    }
     return true;
 }
 
 template <typename ProTx>
 static bool CheckSig(const ProTx& proTx, const CBLSPublicKey& pubKey, CValidationState& state)
 {
-    if (!proTx.sig.VerifyInsecure(pubKey, ::SerializeHash(proTx)))
+    if (!proTx.sig.VerifyInsecure(pubKey, ::SerializeHash(proTx))) {
         return state.DoS(100, false, REJECT_INVALID, "bad-protx-sig", false);
+    }
     return true;
 }
 
@@ -59,8 +64,9 @@ template <typename ProTx>
 static bool CheckInputsHash(const CTransaction &tx, const ProTx& proTx, CValidationState& state)
 {
     uint256 inputsHash = CalcTxInputsHash(tx);
-    if (inputsHash != proTx.inputsHash)
+    if (inputsHash != proTx.inputsHash) {
         return state.DoS(100, false, REJECT_INVALID, "bad-protx-inputs-hash");
+    }
 
     return true;
 }
@@ -68,11 +74,13 @@ static bool CheckInputsHash(const CTransaction &tx, const ProTx& proTx, CValidat
 template <typename ProTx, typename PubKey>
 static bool CheckInputsHashAndSig(const CTransaction &tx, const ProTx& proTx, const PubKey& pubKey, CValidationState& state)
 {
-    if (!CheckInputsHash(tx, proTx, state))
+    if (!CheckInputsHash(tx, proTx, state)) {
         return false;
+    }
 
-    if (!CheckSig(proTx, pubKey, state))
+    if (!CheckSig(proTx, pubKey, state)) {
         return false;
+    }
 
     return true;
 }
@@ -82,33 +90,42 @@ bool CheckProRegTx(const CTransaction& tx, const CBlockIndex* pindexPrev, CValid
     AssertLockHeld(cs_main);
 
     CProRegTx ptx;
-    if (!GetTxPayload(tx, ptx))
+    if (!GetTxPayload(tx, ptx)) {
         return state.DoS(100, false, REJECT_INVALID, "bad-tx-payload");
+    }
 
-    if (ptx.nVersion > CProRegTx::CURRENT_VERSION)
+    if (ptx.nVersion > CProRegTx::CURRENT_VERSION) {
         return state.DoS(100, false, REJECT_INVALID, "bad-protx-version");
-    if (ptx.nType != 0)
+    }
+    if (ptx.nType != 0) {
         return state.DoS(100, false, REJECT_INVALID, "bad-protx-type");
-    if (ptx.nMode != 0)
+    }
+    if (ptx.nMode != 0) {
         return state.DoS(100, false, REJECT_INVALID, "bad-protx-mode");
+    }
 
     // when collateralOutpoint refers to an external collateral, we check it further down
     if (ptx.collateralOutpoint.hash.IsNull()) {
-        if (ptx.collateralOutpoint.n >= tx.vout.size())
+        if (ptx.collateralOutpoint.n >= tx.vout.size()) {
             return state.DoS(10, false, REJECT_INVALID, "bad-protx-collateral-index");
-        if (tx.vout[ptx.collateralOutpoint.n].nValue != 1000 * COIN)
+        }
+        if (tx.vout[ptx.collateralOutpoint.n].nValue != 1000 * COIN) {
             return state.DoS(10, false, REJECT_INVALID, "bad-protx-collateral");
+        }
 
         // This is a temporary restriction that will be lifted later
         // It is required while we are transitioning from the old MN list to the deterministic list
-        if (tx.vout[ptx.collateralOutpoint.n].scriptPubKey != ptx.scriptPayout)
+        if (tx.vout[ptx.collateralOutpoint.n].scriptPubKey != ptx.scriptPayout) {
             return state.DoS(10, false, REJECT_INVALID, "bad-protx-payee-collateral");
+        }
     }
-    if (ptx.keyIDOwner.IsNull() || !ptx.pubKeyOperator.IsValid() || ptx.keyIDVoting.IsNull())
+    if (ptx.keyIDOwner.IsNull() || !ptx.pubKeyOperator.IsValid() || ptx.keyIDVoting.IsNull()) {
         return state.DoS(10, false, REJECT_INVALID, "bad-protx-key-null");
+    }
     // we may support P2SH later, but restrict it for now (while in transitioning phase from old MN list to deterministic list)
-    if (!ptx.scriptPayout.IsPayToPublicKeyHash())
+    if (!ptx.scriptPayout.IsPayToPublicKeyHash()) {
         return state.DoS(10, false, REJECT_INVALID, "bad-protx-payee");
+    }
 
     CTxDestination payoutDest;
     if (!ExtractDestination(ptx.scriptPayout, payoutDest)) {
@@ -122,11 +139,13 @@ bool CheckProRegTx(const CTransaction& tx, const CBlockIndex* pindexPrev, CValid
 
     // It's allowed to set addr/protocolVersion to 0, which will put the MN into PoSe-banned state and require a ProUpServTx to be issues later
     // If any of both is set, it must be valid however
-    if (ptx.addr != CService() && !CheckService(tx.GetHash(), ptx, pindexPrev, state))
+    if (ptx.addr != CService() && !CheckService(tx.GetHash(), ptx, pindexPrev, state)) {
         return false;
+    }
 
-    if (ptx.nOperatorReward > 10000)
+    if (ptx.nOperatorReward > 10000) {
         return state.DoS(10, false, REJECT_INVALID, "bad-protx-operator-reward");
+    }
 
     CKeyID keyForPayloadSig;
 
@@ -190,20 +209,24 @@ bool CheckProUpServTx(const CTransaction& tx, const CBlockIndex* pindexPrev, CVa
     AssertLockHeld(cs_main);
 
     CProUpServTx ptx;
-    if (!GetTxPayload(tx, ptx))
+    if (!GetTxPayload(tx, ptx)) {
         return state.DoS(100, false, REJECT_INVALID, "bad-tx-payload");
+    }
 
-    if (ptx.nVersion > CProRegTx::CURRENT_VERSION)
+    if (ptx.nVersion > CProRegTx::CURRENT_VERSION) {
         return state.DoS(100, false, REJECT_INVALID, "bad-protx-version");
+    }
 
-    if (!CheckService(ptx.proTxHash, ptx, pindexPrev, state))
+    if (!CheckService(ptx.proTxHash, ptx, pindexPrev, state)) {
         return false;
+    }
 
     if (pindexPrev) {
         auto mnList = deterministicMNManager->GetListForBlock(pindexPrev->GetBlockHash());
         auto mn = mnList.GetMN(ptx.proTxHash);
-        if (!mn)
+        if (!mn) {
             return state.DoS(100, false, REJECT_INVALID, "bad-protx-hash");
+        }
 
         if (ptx.scriptOperatorPayout != CScript()) {
             if (mn->nOperatorReward == 0) {
@@ -211,13 +234,15 @@ bool CheckProUpServTx(const CTransaction& tx, const CBlockIndex* pindexPrev, CVa
                 return state.DoS(10, false, REJECT_INVALID, "bad-protx-operator-payee");
             }
             // we may support P2SH later, but restrict it for now (while in transitioning phase from old MN list to deterministic list)
-            if (!ptx.scriptOperatorPayout.IsPayToPublicKeyHash())
+            if (!ptx.scriptOperatorPayout.IsPayToPublicKeyHash()) {
                 return state.DoS(10, false, REJECT_INVALID, "bad-protx-operator-payee");
+            }
         }
 
         // we can only check the signature if pindexPrev != NULL and the MN is known
-        if (!CheckInputsHashAndSig(tx, ptx, mn->pdmnState->pubKeyOperator, state))
+        if (!CheckInputsHashAndSig(tx, ptx, mn->pdmnState->pubKeyOperator, state)) {
             return false;
+        }
     }
 
     return true;
@@ -228,19 +253,24 @@ bool CheckProUpRegTx(const CTransaction& tx, const CBlockIndex* pindexPrev, CVal
     AssertLockHeld(cs_main);
 
     CProUpRegTx ptx;
-    if (!GetTxPayload(tx, ptx))
+    if (!GetTxPayload(tx, ptx)) {
         return state.DoS(100, false, REJECT_INVALID, "bad-tx-payload");
+    }
 
-    if (ptx.nVersion > CProRegTx::CURRENT_VERSION)
+    if (ptx.nVersion > CProRegTx::CURRENT_VERSION) {
         return state.DoS(100, false, REJECT_INVALID, "bad-protx-version");
-    if (ptx.nMode != 0)
+    }
+    if (ptx.nMode != 0) {
         return state.DoS(100, false, REJECT_INVALID, "bad-protx-mode");
+    }
 
-    if (!ptx.pubKeyOperator.IsValid() || ptx.keyIDVoting.IsNull())
+    if (!ptx.pubKeyOperator.IsValid() || ptx.keyIDVoting.IsNull()) {
         return state.DoS(10, false, REJECT_INVALID, "bad-protx-key-null");
+    }
     // we may support P2SH later, but restrict it for now (while in transitioning phase from old MN list to deterministic list)
-    if (!ptx.scriptPayout.IsPayToPublicKeyHash())
+    if (!ptx.scriptPayout.IsPayToPublicKeyHash()) {
         return state.DoS(10, false, REJECT_INVALID, "bad-protx-payee");
+    }
 
     CTxDestination payoutDest;
     if (!ExtractDestination(ptx.scriptPayout, payoutDest)) {
@@ -251,8 +281,9 @@ bool CheckProUpRegTx(const CTransaction& tx, const CBlockIndex* pindexPrev, CVal
     if (pindexPrev) {
         auto mnList = deterministicMNManager->GetListForBlock(pindexPrev->GetBlockHash());
         auto dmn = mnList.GetMN(ptx.proTxHash);
-        if (!dmn)
+        if (!dmn) {
             return state.DoS(100, false, REJECT_INVALID, "bad-protx-hash");
+        }
 
         // don't allow reuse of collateral key for other keys (don't allow people to put the collateral key onto an online server)
         if (payoutDest == CTxDestination(dmn->pdmnState->keyIDOwner) || payoutDest == CTxDestination(ptx.keyIDVoting)) {
@@ -265,8 +296,9 @@ bool CheckProUpRegTx(const CTransaction& tx, const CBlockIndex* pindexPrev, CVal
         if (!GetUTXOCoin(dmn->collateralOutpoint, coin)) {
             return state.DoS(100, false, REJECT_INVALID, "bad-protx-payee-collateral");
         }
-        if (coin.out.scriptPubKey != ptx.scriptPayout)
+        if (coin.out.scriptPubKey != ptx.scriptPayout) {
             return state.DoS(10, false, REJECT_INVALID, "bad-protx-payee-collateral");
+        }
 
         if (mnList.HasUniqueProperty(ptx.pubKeyOperator)) {
             auto otherDmn = mnList.GetUniquePropertyMN(ptx.pubKeyOperator);
@@ -281,8 +313,9 @@ bool CheckProUpRegTx(const CTransaction& tx, const CBlockIndex* pindexPrev, CVal
             }
         }
 
-        if (!CheckInputsHashAndSig(tx, ptx, dmn->pdmnState->keyIDOwner, state))
+        if (!CheckInputsHashAndSig(tx, ptx, dmn->pdmnState->keyIDOwner, state)) {
             return false;
+        }
     }
 
     return true;
@@ -293,16 +326,19 @@ bool CheckProUpRevTx(const CTransaction& tx, const CBlockIndex* pindexPrev, CVal
     AssertLockHeld(cs_main);
 
     CProUpRevTx ptx;
-    if (!GetTxPayload(tx, ptx))
+    if (!GetTxPayload(tx, ptx)) {
         return state.DoS(100, false, REJECT_INVALID, "bad-tx-payload");
+    }
 
-    if (ptx.nVersion > CProRegTx::CURRENT_VERSION)
+    if (ptx.nVersion > CProRegTx::CURRENT_VERSION) {
         return state.DoS(100, false, REJECT_INVALID, "bad-protx-version");
+    }
 
     // ptx.nReason < CProUpRevTx::REASON_NOT_SPECIFIED is always `false` since
     // ptx.nReason is unsigned and CProUpRevTx::REASON_NOT_SPECIFIED == 0
-    if (ptx.nReason > CProUpRevTx::REASON_LAST)
+    if (ptx.nReason > CProUpRevTx::REASON_LAST) {
         return state.DoS(100, false, REJECT_INVALID, "bad-protx-reason");
+    }
 
     if (pindexPrev) {
         auto mnList = deterministicMNManager->GetListForBlock(pindexPrev->GetBlockHash());
diff --git a/src/evo/specialtx.cpp b/src/evo/specialtx.cpp
index c6622a5a4ba3..149a51908bda 100644
--- a/src/evo/specialtx.cpp
+++ b/src/evo/specialtx.cpp
@@ -43,8 +43,9 @@ bool CheckSpecialTx(const CTransaction& tx, const CBlockIndex* pindexPrev, CVali
 
 bool ProcessSpecialTx(const CTransaction& tx, const CBlockIndex* pindex, CValidationState& state)
 {
-    if (tx.nVersion < 3 || tx.nType == TRANSACTION_NORMAL)
+    if (tx.nVersion < 3 || tx.nType == TRANSACTION_NORMAL) {
         return true;
+    }
 
     switch (tx.nType) {
         case TRANSACTION_PROVIDER_REGISTER:
@@ -61,8 +62,9 @@ bool ProcessSpecialTx(const CTransaction& tx, const CBlockIndex* pindex, CValida
 
 bool UndoSpecialTx(const CTransaction& tx, const CBlockIndex* pindex)
 {
-    if (tx.nVersion < 3 || tx.nType == TRANSACTION_NORMAL)
+    if (tx.nVersion < 3 || tx.nType == TRANSACTION_NORMAL) {
         return true;
+    }
 
     switch (tx.nType) {
         case TRANSACTION_PROVIDER_REGISTER:
@@ -81,17 +83,21 @@ bool ProcessSpecialTxsInBlock(const CBlock& block, const CBlockIndex* pindex, CV
 {
     for (int i = 0; i < (int)block.vtx.size(); i++) {
         const CTransaction& tx = *block.vtx[i];
-        if (!CheckSpecialTx(tx, pindex->pprev, state))
+        if (!CheckSpecialTx(tx, pindex->pprev, state)) {
             return false;
-        if (!ProcessSpecialTx(tx, pindex, state))
+        }
+        if (!ProcessSpecialTx(tx, pindex, state)) {
             return false;
+        }
     }
 
-    if (!deterministicMNManager->ProcessBlock(block, pindex->pprev, state))
+    if (!deterministicMNManager->ProcessBlock(block, pindex->pprev, state)) {
         return false;
+    }
 
-    if (!CheckCbTxMerkleRootMNList(block, pindex, state))
+    if (!CheckCbTxMerkleRootMNList(block, pindex, state)) {
         return false;
+    }
 
     return true;
 }
@@ -100,12 +106,14 @@ bool UndoSpecialTxsInBlock(const CBlock& block, const CBlockIndex* pindex)
 {
     for (int i = (int)block.vtx.size() - 1; i >= 0; --i) {
         const CTransaction& tx = *block.vtx[i];
-        if (!UndoSpecialTx(tx, pindex))
+        if (!UndoSpecialTx(tx, pindex)) {
             return false;
+        }
     }
 
-    if (!deterministicMNManager->UndoBlock(block, pindex))
+    if (!deterministicMNManager->UndoBlock(block, pindex)) {
         return false;
+    }
 
     return true;
 }
diff --git a/src/rpc/rpcevo.cpp b/src/rpc/rpcevo.cpp
index 00a04961e749..214ac1848f94 100644
--- a/src/rpc/rpcevo.cpp
+++ b/src/rpc/rpcevo.cpp
@@ -45,8 +45,9 @@ static CKey ParsePrivKey(const std::string &strKeyOrAddress, bool allowAddresses
     }
 
     CBitcoinSecret secret;
-    if (!secret.SetString(strKeyOrAddress) || !secret.IsValid())
+    if (!secret.SetString(strKeyOrAddress) || !secret.IsValid()) {
         throw std::runtime_error(strprintf("invalid priv-key/address %s", strKeyOrAddress));
+    }
     return secret.GetKey();
 }
 
@@ -54,8 +55,9 @@ static CKeyID ParsePubKeyIDFromAddress(const std::string& strAddress, const std:
 {
     CBitcoinAddress address(strAddress);
     CKeyID keyID;
-    if (!address.IsValid() || !address.GetKeyID(keyID))
+    if (!address.IsValid() || !address.GetKeyID(keyID)) {
         throw JSONRPCError(RPC_INVALID_PARAMETER, strprintf("%s must be a valid P2PKH address, not %s", paramName, strAddress));
+    }
     return keyID;
 }
 
@@ -103,8 +105,9 @@ static void FundSpecialTx(CMutableTransaction& tx, SpecialTxPayload payload)
     int nChangePos = -1;
     std::string strFailReason;
     std::set<int> setSubtractFeeFromOutputs;
-    if (!pwalletMain->FundTransaction(tx, nFee, false, feeRate, nChangePos, strFailReason, false, false, setSubtractFeeFromOutputs, true, CNoDestination()))
+    if (!pwalletMain->FundTransaction(tx, nFee, false, feeRate, nChangePos, strFailReason, false, false, setSubtractFeeFromOutputs, true, CNoDestination())) {
         throw JSONRPCError(RPC_INTERNAL_ERROR, strFailReason);
+    }
 
     if (dummyTxOutAdded && tx.vout.size() > 1) {
         // FundTransaction added a change output, so we don't need the dummy txout anymore
@@ -147,8 +150,9 @@ static std::string SignAndSendSpecialTx(const CMutableTransaction& tx)
     LOCK(cs_main);
 
     CValidationState state;
-    if (!CheckSpecialTx(tx, chainActive.Tip(), state))
+    if (!CheckSpecialTx(tx, chainActive.Tip(), state)) {
         throw std::runtime_error(FormatStateMessage(state));
+    }
 
     CDataStream ds(SER_NETWORK, PROTOCOL_VERSION);
     ds << tx;
@@ -181,9 +185,8 @@ void protx_fund_register_help()
             "3. \"ownerKeyAddr\"        (string, required) The owner key used for payee updates and proposal voting.\n"
             "                         The private key belonging to this address be known in your wallet. The address must\n"
             "                         be unused and must differ from the collateralAddress\n"
-            "4. \"operatorKeyAddr\"     (string, required) The operator key address. The private key does not have to be known by your wallet.\n"
+            "4. \"operatorPubKey\"      (string, required) The operator public key. The private key does not have to be known.\n"
             "                         It has to match the private key which is later used when operating the masternode.\n"
-            "                         If set to \"0\" or an empty string, ownerAddr will be used.\n"
             "5. \"votingKeyAddr\"       (string, required) The voting key address. The private key does not have to be known by your wallet.\n"
             "                         It has to match the private key which is later used when voting on proposals.\n"
             "                         If set to \"0\" or an empty string, ownerAddr will be used.\n"
@@ -192,7 +195,7 @@ void protx_fund_register_help()
             "7. \"payoutAddress\"       (string, required) The dash address to use for masternode reward payments\n"
             "                         Must match \"collateralAddress\"."
             "\nExamples:\n"
-            + HelpExampleCli("protx", "fund_register \"XrVhS9LogauRJGJu2sHuryjhpuex4RNPSb\" \"1.2.3.4:1234\" \"Xt9AMWaYSz7tR7Uo7gzXA3m4QmeWgrR3rr\" \"Xt9AMWaYSz7tR7Uo7gzXA3m4QmeWgrR3rr\" \"Xt9AMWaYSz7tR7Uo7gzXA3m4QmeWgrR3rr\" 0 \"XrVhS9LogauRJGJu2sHuryjhpuex4RNPSb\"")
+            + HelpExampleCli("protx", "fund_register \"XrVhS9LogauRJGJu2sHuryjhpuex4RNPSb\" \"1.2.3.4:1234\" \"Xt9AMWaYSz7tR7Uo7gzXA3m4QmeWgrR3rr\" \"93746e8731c57f87f79b3620a7982924e2931717d49540a85864bd543de11c43fb868fd63e501a1db37e19ed59ae6db4\" \"Xt9AMWaYSz7tR7Uo7gzXA3m4QmeWgrR3rr\" 0 \"XrVhS9LogauRJGJu2sHuryjhpuex4RNPSb\"")
     );
 }
 
@@ -236,8 +239,9 @@ UniValue protx_register(const JSONRPCRequest& request)
 
     if (isFundRegister) {
         CBitcoinAddress collateralAddress(request.params[paramIdx].get_str());
-        if (!collateralAddress.IsValid())
+        if (!collateralAddress.IsValid()) {
             throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, strprintf("invalid collaterall address: %s", request.params[paramIdx].get_str()));
+        }
         CScript collateralScript = GetScriptForDestination(collateralAddress.Get());
 
         CTxOut collateralTxOut(collateralAmount, collateralScript);
@@ -260,8 +264,9 @@ UniValue protx_register(const JSONRPCRequest& request)
     }
 
     if (request.params[paramIdx].get_str() != "0" && request.params[paramIdx].get_str() != "") {
-        if (!Lookup(request.params[paramIdx].get_str().c_str(), ptx.addr, Params().GetDefaultPort(), false))
+        if (!Lookup(request.params[paramIdx].get_str().c_str(), ptx.addr, Params().GetDefaultPort(), false)) {
             throw std::runtime_error(strprintf("invalid network address %s", request.params[paramIdx].get_str()));
+        }
     }
 
     CKey keyOwner = ParsePrivKey(request.params[paramIdx + 1].get_str(), true);
@@ -272,13 +277,15 @@ UniValue protx_register(const JSONRPCRequest& request)
     }
 
     double operatorReward = ParseDoubleV(request.params[paramIdx + 4], "operatorReward");
-    if (operatorReward < 0 || operatorReward > 100)
+    if (operatorReward < 0 || operatorReward > 100) {
         throw JSONRPCError(RPC_INVALID_PARAMETER, "operatorReward must be between 0 and 100");
+    }
     ptx.nOperatorReward = (uint16_t)(operatorReward * 100);
 
     CBitcoinAddress payoutAddress(request.params[paramIdx + 5].get_str());
-    if (!payoutAddress.IsValid())
+    if (!payoutAddress.IsValid()) {
         throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, strprintf("invalid payout address: %s", request.params[paramIdx + 5].get_str()));
+    }
 
     ptx.keyIDOwner = keyOwner.GetPubKey().GetID();
     ptx.pubKeyOperator = pubKeyOperator;
@@ -367,8 +374,9 @@ UniValue protx_update_service(const JSONRPCRequest& request)
 
     if (request.params.size() > 4) {
         CBitcoinAddress payoutAddress(request.params[4].get_str());
-        if (!payoutAddress.IsValid())
+        if (!payoutAddress.IsValid()) {
             throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, strprintf("invalid operator payout address: %s", request.params[4].get_str()));
+        }
         ptx.scriptOperatorPayout = GetScriptForDestination(payoutAddress.Get());
     }
 
@@ -395,7 +403,7 @@ UniValue protx_update_service(const JSONRPCRequest& request)
 void protx_update_registrar_help()
 {
     throw std::runtime_error(
-            "protx update_registrar \"proTxHash\" \"operatorKeyAddr\" \"votingKeyAddr\" operatorReward \"payoutAddress\"\n"
+            "protx update_registrar \"proTxHash\" \"operatorKeyAddr\" \"votingKeyAddr\" \"payoutAddress\"\n"
             "\nCreates and sends a ProUpRegTx to the network. This will update the operator key, voting key and payout\n"
             "address of the masternode specified by \"proTxHash\".\n"
             "The owner key of the masternode must be known to your wallet.\n"
@@ -407,18 +415,19 @@ void protx_update_registrar_help()
             "3. \"votingKeyAddr\"       (string, required) The voting key address. The private key does not have to be known by your wallet.\n"
             "                         It has to match the private key which is later used when voting on proposals.\n"
             "                         If set to \"0\" or an empty string, the last on-chain voting key of the masternode will be used.\n"
-            "5. \"payoutAddress\"       (string, required) The dash address to use for masternode reward payments\n"
+            "4. \"payoutAddress\"       (string, required) The dash address to use for masternode reward payments\n"
             "                         Must match \"collateralAddress\" of initial ProRegTx.\n"
             "                         If set to \"0\" or an empty string, the last on-chain payout address of the masternode will be used.\n"
             "\nExamples:\n"
-            + HelpExampleCli("protx", "update_registrar \"0123456701234567012345670123456701234567012345670123456701234567\" \"982eb34b7c7f614f29e5c665bc3605f1beeef85e3395ca12d3be49d2868ecfea5566f11cedfad30c51b2403f2ad95b67\" \"0\" \"XwnLY9Tf7Zsef8gMGL2fhWA9ZmMjt4KPwG\"")
+            + HelpExampleCli("protx", "update_registrar \"0123456701234567012345670123456701234567012345670123456701234567\" \"982eb34b7c7f614f29e5c665bc3605f1beeef85e3395ca12d3be49d2868ecfea5566f11cedfad30c51b2403f2ad95b67\" \"XwnLY9Tf7Zsef8gMGL2fhWA9ZmMjt4KPwG\"")
     );
 }
 
 UniValue protx_update_registrar(const JSONRPCRequest& request)
 {
-    if (request.fHelp || request.params.size() != 5)
+    if (request.fHelp || request.params.size() != 5) {
         protx_update_registrar_help();
+    }
 
     CProUpRegTx ptx;
     ptx.nVersion = CProRegTx::CURRENT_VERSION;
@@ -440,8 +449,9 @@ UniValue protx_update_registrar(const JSONRPCRequest& request)
     }
 
     CBitcoinAddress payoutAddress(request.params[4].get_str());
-    if (!payoutAddress.IsValid())
+    if (!payoutAddress.IsValid()) {
         throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, strprintf("invalid payout address: %s", request.params[4].get_str()));
+    }
     ptx.scriptPayout = GetScriptForDestination(payoutAddress.Get());
 
     CKey keyOwner;
@@ -481,8 +491,9 @@ void protx_revoke_help()
 
 UniValue protx_revoke(const JSONRPCRequest& request)
 {
-    if (request.fHelp || (request.params.size() != 2 && request.params.size() != 3))
+    if (request.fHelp || (request.params.size() != 2 && request.params.size() != 3)) {
         protx_revoke_help();
+    }
 
     CProUpRevTx ptx;
     ptx.nVersion = CProRegTx::CURRENT_VERSION;
@@ -492,8 +503,9 @@ UniValue protx_revoke(const JSONRPCRequest& request)
 
     if (request.params.size() > 3) {
         int32_t nReason = ParseInt32V(request.params[3], "reason");
-        if (nReason < 0 || nReason >= CProUpRevTx::REASON_LAST)
+        if (nReason < 0 || nReason >= CProUpRevTx::REASON_LAST) {
             throw JSONRPCError(RPC_INVALID_PARAMETER, strprintf("invalid reason %d, must be between 0 and %d", nReason, CProUpRevTx::REASON_LAST));
+        }
         ptx.nReason = (uint16_t)nReason;
     }
 
@@ -548,8 +560,9 @@ static bool CheckWalletOwnsScript(const CScript& script) {
 
 UniValue BuildDMNListEntry(const CDeterministicMNCPtr& dmn, bool detailed)
 {
-    if (!detailed)
+    if (!detailed) {
         return dmn->proTxHash.ToString();
+    }
 
     UniValue o(UniValue::VOBJ);
 
@@ -583,20 +596,23 @@ UniValue BuildDMNListEntry(const CDeterministicMNCPtr& dmn, bool detailed)
 
 UniValue protx_list(const JSONRPCRequest& request)
 {
-    if (request.fHelp)
+    if (request.fHelp) {
         protx_list_help();
+    }
 
     std::string type = "wallet";
-    if (request.params.size() > 1)
+    if (request.params.size() > 1) {
         type = request.params[1].get_str();
+    }
 
     UniValue ret(UniValue::VARR);
 
     LOCK2(cs_main, pwalletMain->cs_wallet);
 
     if (type == "wallet") {
-        if (request.params.size() > 3)
+        if (request.params.size() > 3) {
             protx_list_help();
+        }
 
         bool detailed = request.params.size() > 2 ? ParseBoolV(request.params[2], "detailed") : false;
 
@@ -617,14 +633,16 @@ UniValue protx_list(const JSONRPCRequest& request)
             }
         });
     } else if (type == "valid" || type == "registered") {
-        if (request.params.size() > 4)
+        if (request.params.size() > 4) {
             protx_list_help();
+        }
 
         LOCK(cs_main);
 
         int height = request.params.size() > 2 ? ParseInt32V(request.params[2], "height") : chainActive.Height();
-        if (height < 1 || height > chainActive.Height())
+        if (height < 1 || height > chainActive.Height()) {
             throw JSONRPCError(RPC_INVALID_PARAMETER, "invalid height specified");
+        }
 
         bool detailed = request.params.size() > 3 ? ParseBoolV(request.params[3], "detailed") : false;
 
@@ -652,8 +670,9 @@ void protx_info_help()
 
 UniValue protx_info(const JSONRPCRequest& request)
 {
-    if (request.fHelp || request.params.size() != 2)
+    if (request.fHelp || request.params.size() != 2) {
         protx_info_help();
+    }
 
     uint256 proTxHash = ParseHashV(request.params[1], "proTxHash");
     auto mnList = deterministicMNManager->GetListAtChainTip();
@@ -699,8 +718,9 @@ static uint256 ParseBlock(const UniValue& v, std::string strName)
 
 UniValue protx_diff(const JSONRPCRequest& request)
 {
-    if (request.fHelp || request.params.size() != 3)
+    if (request.fHelp || request.params.size() != 3) {
         protx_diff_help();
+    }
 
     LOCK(cs_main);
     uint256 baseBlockHash = ParseBlock(request.params[1], "baseBlock");
@@ -729,6 +749,7 @@ UniValue protx(const JSONRPCRequest& request)
                 "1. \"command\"        (string, required) The command to execute\n"
                 "\nAvailable commands:\n"
                 "  register          - Create and send ProTx to network\n"
+                "  fund_register     - Fund, create and send ProTx to network\n"
                 "  list              - List ProTxs\n"
                 "  info              - Return information about a ProTx\n"
                 "  update_service    - Create and send ProUpServTx to network\n"
@@ -800,6 +821,7 @@ static const CRPCCommand commands[] =
 
 void RegisterEvoRPCCommands(CRPCTable &tableRPC)
 {
-    for (unsigned int vcidx = 0; vcidx < ARRAYLEN(commands); vcidx++)
+    for (unsigned int vcidx = 0; vcidx < ARRAYLEN(commands); vcidx++) {
         tableRPC.appendCommand(commands[vcidx].name, &commands[vcidx]);
+    }
 }

From 733cd95123421d33420a56512ef7596188763b06 Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Fri, 26 Oct 2018 07:03:33 +0200
Subject: [PATCH 214/400] Remove global fDIP0003ActiveAtTip and fix wrong use
 of VersionBitsState in auto IX (#2380)

* Remove global fDIP0003ActiveAtTip flag and always use VersionBitsState

fDIP0003ActiveAtTip was used much more often when introduced but turned out
to be not very useful in most places. Always use VersionBitsState now.

* Fix wrong use of VersionBitsState auto IX

* Make sure isAutoLockBip9Active flag is reset in case of chain reorgs
---
 src/dsnotificationinterface.cpp |  3 +--
 src/init.cpp                    | 15 +++++++++------
 src/validation.cpp              | 22 ++++++++++++----------
 src/validation.h                |  2 --
 4 files changed, 22 insertions(+), 20 deletions(-)

diff --git a/src/dsnotificationinterface.cpp b/src/dsnotificationinterface.cpp
index 562e4e39d501..4f611e02edeb 100644
--- a/src/dsnotificationinterface.cpp
+++ b/src/dsnotificationinterface.cpp
@@ -43,10 +43,9 @@ void CDSNotificationInterface::UpdatedBlockTip(const CBlockIndex *pindexNew, con
 
     // Update global DIP0001 activation status
     fDIP0001ActiveAtTip = pindexNew->nHeight >= Params().GetConsensus().DIP0001Height;
-    fDIP0003ActiveAtTip = (VersionBitsState(pindexNew->pprev, Params().GetConsensus(), Consensus::DEPLOYMENT_DIP0003, versionbitscache) == THRESHOLD_ACTIVE);
     // update instantsend autolock activation flag
     instantsend.isAutoLockBip9Active =
-            (VersionBitsState(pindexNew->pprev, Params().GetConsensus(), Consensus::DEPLOYMENT_ISAUTOLOCKS, versionbitscache) == THRESHOLD_ACTIVE);
+            (VersionBitsState(pindexNew, Params().GetConsensus(), Consensus::DEPLOYMENT_ISAUTOLOCKS, versionbitscache) == THRESHOLD_ACTIVE);
 
     if (fInitialDownload)
         return;
diff --git a/src/init.cpp b/src/init.cpp
index eaa8b2a697f0..28b50d6c4af1 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -807,7 +807,15 @@ void ThreadImport(std::vector<boost::filesystem::path> vImportFiles)
     // GetMainSignals().UpdatedBlockTip(chainActive.Tip());
     pdsNotificationInterface->InitializeCurrentBlockTip();
 
-    if (activeMasternodeManager && fDIP0003ActiveAtTip)
+    bool fDIP003Active;
+    {
+        LOCK(cs_main);
+        if (chainActive.Tip()->pprev) {
+            fDIP003Active = VersionBitsState(chainActive.Tip()->pprev, Params().GetConsensus(), Consensus::DEPLOYMENT_DIP0003, versionbitscache) == THRESHOLD_ACTIVE;
+        }
+    }
+
+    if (activeMasternodeManager && fDIP003Active)
         activeMasternodeManager->Init();
 
 #ifdef ENABLE_WALLET
@@ -1760,11 +1768,6 @@ bool AppInitMain(boost::thread_group& threadGroup, CScheduler& scheduler)
                     break;
                 }
 
-                // Needs to be called after chain is initialized
-                if (chainActive.Tip() && chainActive.Tip()->pprev) {
-                    fDIP0003ActiveAtTip = VersionBitsState(chainActive.Tip()->pprev, Params().GetConsensus(), Consensus::DEPLOYMENT_DIP0003, versionbitscache) == THRESHOLD_ACTIVE;
-                }
-
                 uiInterface.InitMessage(_("Verifying blocks..."));
                 if (fHavePruned && GetArg("-checkblocks", DEFAULT_CHECKBLOCKS) > MIN_BLOCKS_TO_KEEP) {
                     LogPrintf("Prune: pruned datadir may not have more than %d blocks; only checking available blocks",
diff --git a/src/validation.cpp b/src/validation.cpp
index aaebe6dd7dd3..f92a305fa37f 100644
--- a/src/validation.cpp
+++ b/src/validation.cpp
@@ -1740,10 +1740,6 @@ static DisconnectResult DisconnectBlock(const CBlock& block, CValidationState& s
         }
     }
 
-    if (pindex->pprev && pindex->pprev->pprev && VersionBitsState(pindex->pprev->pprev, Params().GetConsensus(), Consensus::DEPLOYMENT_DIP0003, versionbitscache) != THRESHOLD_ACTIVE) {
-        fDIP0003ActiveAtTip = false;
-    }
-
     // move best block pointer to prevout block
     view.SetBestBlock(pindex->pprev->GetBlockHash());
 
@@ -1758,6 +1754,10 @@ static DisconnectResult DisconnectBlock(const CBlock& block, CValidationState& s
         }
     }
 
+    // make sure the flag is reset in case of a chain reorg
+    instantsend.isAutoLockBip9Active =
+            (VersionBitsState(pindex->pprev, Params().GetConsensus(), Consensus::DEPLOYMENT_ISAUTOLOCKS, versionbitscache) == THRESHOLD_ACTIVE);
+
     return fClean ? DISCONNECT_OK : DISCONNECT_UNCLEAN;
 }
 
@@ -2011,12 +2011,6 @@ static bool ConnectBlock(const CBlock& block, CValidationState& state, CBlockInd
         flags |= SCRIPT_VERIFY_NULLDUMMY;
     }
 
-    if (!fJustCheck && VersionBitsState(pindex->pprev, chainparams.GetConsensus(), Consensus::DEPLOYMENT_DIP0003, versionbitscache) == THRESHOLD_ACTIVE) {
-        if (!fDIP0003ActiveAtTip)
-            LogPrintf("ConnectBlock -- DIP0003 got activated at height %d\n", pindex->nHeight);
-        fDIP0003ActiveAtTip = true;
-    }
-
     int64_t nTime2 = GetTimeMicros(); nTimeForks += nTime2 - nTime1;
     LogPrint("bench", "    - Fork checks: %.2fms [%.2fs]\n", 0.001 * (nTime2 - nTime1), nTimeForks * 0.000001);
 
@@ -2250,6 +2244,14 @@ static bool ConnectBlock(const CBlock& block, CValidationState& state, CBlockInd
     // add this block to the view's block chain
     view.SetBestBlock(pindex->GetBlockHash());
 
+    if (!fJustCheck) {
+        // check if previous block had DIP3 disabled and the new block has it enabled
+        if (VersionBitsState(pindex->pprev, chainparams.GetConsensus(), Consensus::DEPLOYMENT_DIP0003, versionbitscache) != THRESHOLD_ACTIVE &&
+            VersionBitsState(pindex, chainparams.GetConsensus(), Consensus::DEPLOYMENT_DIP0003, versionbitscache) == THRESHOLD_ACTIVE) {
+            LogPrintf("%s -- DIP0003 got activated at height %d\n", __func__, pindex->nHeight);
+        }
+    }
+
     int64_t nTime5 = GetTimeMicros(); nTimeIndex += nTime5 - nTime4;
     LogPrint("bench", "    - Index writing: %.2fms [%.2fs]\n", 0.001 * (nTime5 - nTime4), nTimeIndex * 0.000001);
 
diff --git a/src/validation.h b/src/validation.h
index 99a4ed81dda4..a0c0301a2d7f 100644
--- a/src/validation.h
+++ b/src/validation.h
@@ -186,8 +186,6 @@ extern bool fLargeWorkInvalidChainFound;
 extern std::map<uint256, int64_t> mapRejectedBlocks;
 
 extern std::atomic<bool> fDIP0001ActiveAtTip;
-extern std::atomic<bool> fDIP0003ActiveAtTip;
-
 
 /** Block hash whose ancestors we will assume to have valid scripts without checking them. */
 extern uint256 hashAssumeValid;

From 0692de1c58b09ef018e90222f9d89f8125600c84 Mon Sep 17 00:00:00 2001
From: UdjinM6 <UdjinM6@users.noreply.github.com>
Date: Fri, 26 Oct 2018 08:03:48 +0300
Subject: [PATCH 215/400] Fix prepare_masternodes/create_masternodes in
 DashTestFramework (#2382)

Specify masternodeblsprivkey which is required in masternode mode now.
This should fix IS test failures which occur because of `Warning: You should specify a masternodeblsprivkey in the configuration. Please see documentation for help.` init error (there are other issues, so auto-IS test are still going to fail).
---
 qa/rpc-tests/test_framework/test_framework.py | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/qa/rpc-tests/test_framework/test_framework.py b/qa/rpc-tests/test_framework/test_framework.py
index e63282ee8ddc..884de4095a1b 100755
--- a/qa/rpc-tests/test_framework/test_framework.py
+++ b/qa/rpc-tests/test_framework/test_framework.py
@@ -207,8 +207,9 @@ def main(self):
 
 
 class MasternodeInfo:
-    def __init__(self, key, collateral_id, collateral_out):
+    def __init__(self, key, blsKey, collateral_id, collateral_out):
         self.key = key
+        self.blsKey = blsKey
         self.collateral_id = collateral_id
         self.collateral_out = collateral_out
 
@@ -238,6 +239,7 @@ def get_mnconf_file(self):
     def prepare_masternodes(self):
         for idx in range(0, self.mn_count):
             key = self.nodes[0].masternode("genkey")
+            blsKey = self.nodes[0].bls('generate')['secret']
             address = self.nodes[0].getnewaddress()
             txid = self.nodes[0].sendtoaddress(address, MASTERNODE_COLLATERAL)
             txrow = self.nodes[0].getrawtransaction(txid, True)
@@ -248,7 +250,7 @@ def prepare_masternodes(self):
                     collateral_vout = vout_idx
             self.nodes[0].lockunspent(False,
                                       [{"txid": txid, "vout": collateral_vout}])
-            self.mninfo.append(MasternodeInfo(key, txid, collateral_vout))
+            self.mninfo.append(MasternodeInfo(key, blsKey, txid, collateral_vout))
 
     def write_mn_config(self):
         conf = self.get_mnconf_file()
@@ -263,7 +265,8 @@ def write_mn_config(self):
     def create_masternodes(self):
         for idx in range(0, self.mn_count):
             args = ['-debug=masternode', '-externalip=127.0.0.1', '-masternode=1',
-                    '-masternodeprivkey=%s' % self.mninfo[idx].key] + self.extra_args
+                    '-masternodeprivkey=%s' % self.mninfo[idx].key,
+                    '-masternodeblsprivkey=%s' % self.mninfo[idx].blsKey] + self.extra_args
             self.nodes.append(start_node(idx + 1, self.options.tmpdir, args))
             for i in range(0, idx + 1):
                 connect_nodes(self.nodes[i], idx + 1)

From d1debfc267c1737f1bfd2a46b7cae3c2626ee21e Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Fri, 26 Oct 2018 07:04:22 +0200
Subject: [PATCH 216/400] Implement mt_pooled_secure_allocator and use it for
 BLS secure allocation (#2375)

* Add pooled_secure_allocator and mt_pooled_secure_allocator

* Use mt_pooled_secure_allocator for BLS secure allocation

The old solution relied on thread-local-storage and was thus not compatible
to libc6 2.11 (which is the minimum supported version we use).

Also, the old solution turned out to be erroneous. It would have crashed
or memory leaked when ownership of CBLSPrivateKey would be handled over
to another thread.

* Add new header files to Makefile.am

* Fix copyright headers of new files

* Bail out early from secure deallocation

* Clean up global BLS keys when shutting down
---
 src/Makefile.am                           |  2 +
 src/bls/bls.cpp                           | 49 +++----------
 src/init.cpp                              |  4 ++
 src/support/allocators/mt_pooled_secure.h | 85 +++++++++++++++++++++++
 src/support/allocators/pooled_secure.h    | 73 +++++++++++++++++++
 5 files changed, 173 insertions(+), 40 deletions(-)
 create mode 100644 src/support/allocators/mt_pooled_secure.h
 create mode 100644 src/support/allocators/pooled_secure.h

diff --git a/src/Makefile.am b/src/Makefile.am
index 8cbd73d0f3f2..659af594ff7d 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -172,6 +172,8 @@ BITCOIN_CORE_H = \
   script/ismine.h \
   spork.h \
   streams.h \
+  support/allocators/mt_pooled_secure.h \
+  support/allocators/pooled_secure.h \
   support/allocators/secure.h \
   support/allocators/zeroafterfree.h \
   support/cleanse.h \
diff --git a/src/bls/bls.cpp b/src/bls/bls.cpp
index 83cac42f7711..8de75f42b28a 100644
--- a/src/bls/bls.cpp
+++ b/src/bls/bls.cpp
@@ -9,8 +9,7 @@
 #include "tinyformat.h"
 
 #ifndef BUILD_BITCOIN_INTERNAL
-#include "support/allocators/secure.h"
-#include <boost/pool/pool_alloc.hpp>
+#include "support/allocators/mt_pooled_secure.h"
 #endif
 
 #include <assert.h>
@@ -425,40 +424,14 @@ bool CBLSSignature::Recover(const std::vector<CBLSSignature>& sigs, const std::v
 }
 
 #ifndef BUILD_BITCOIN_INTERNAL
-struct secure_user_allocator {
-    typedef std::size_t size_type;
-    typedef std::ptrdiff_t difference_type;
 
-    static char* malloc(const size_type bytes)
-    {
-        return static_cast<char*>(LockedPoolManager::Instance().alloc(bytes));
-    }
-
-    static void free(char* const block)
-    {
-        LockedPoolManager::Instance().free(block);
-    }
-};
-
-// every thread has it's own pool allocator for secure data to speed things up
-// otherwise locking of mutexes slows down the system at places were you'd never expect it
-// downside is that we must make sure that all threads have destroyed their copy of the pool before the global
-// LockedPool is destroyed. This means that all worker threads must finish before static destruction begins
-// we use sizeof(bn_t) as the pool request size as this is what Chia's BLS library will request in most cases
-// In case something larger is requested, we directly call into LockedPool and accept the slowness
-thread_local static boost::pool<secure_user_allocator> securePool(sizeof(bn_t) + sizeof(size_t));
+static mt_pooled_secure_allocator<uint8_t> g_blsSecureAllocator(sizeof(bn_t) + sizeof(size_t));
 
 static void* secure_allocate(size_t n)
 {
-    void* p;
-    if (n <= securePool.get_requested_size() - sizeof(size_t)) {
-        p = securePool.ordered_malloc();
-    } else {
-        p = secure_user_allocator::malloc(n + sizeof(size_t));
-    }
-    *(size_t*)p = n;
-    p = (uint8_t*)p + sizeof(size_t);
-    return p;
+    uint8_t* ptr = g_blsSecureAllocator.allocate(n + sizeof(size_t));
+    *(size_t*)ptr = n;
+    return ptr + sizeof(size_t);
 }
 
 static void secure_free(void* p)
@@ -466,14 +439,10 @@ static void secure_free(void* p)
     if (!p) {
         return;
     }
-    p = (uint8_t*)p - sizeof(size_t);
-    size_t n = *(size_t*)p;
-    memory_cleanse(p, n + sizeof(size_t));
-    if (n <= securePool.get_requested_size() - sizeof(size_t)) {
-        securePool.ordered_free(p);
-    } else {
-        secure_user_allocator::free((char*)p);
-    }
+
+    uint8_t* ptr = (uint8_t*)p - sizeof(size_t);
+    size_t n = *(size_t*)ptr;
+    return g_blsSecureAllocator.deallocate(ptr, n);
 }
 #endif
 
diff --git a/src/init.cpp b/src/init.cpp
index 28b50d6c4af1..fe87b9417ed7 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -324,6 +324,10 @@ void PrepareShutdown()
         UnregisterValidationInterface(activeMasternodeManager);
     }
 
+    // make sure to clean up BLS keys before global destructors are called (they have allocated from the secure memory pool)
+    activeMasternodeInfo.blsKeyOperator.reset();
+    activeMasternodeInfo.blsPubKeyOperator.reset();
+
 #ifndef WIN32
     try {
         boost::filesystem::remove(GetPidFile());
diff --git a/src/support/allocators/mt_pooled_secure.h b/src/support/allocators/mt_pooled_secure.h
new file mode 100644
index 000000000000..d857da161647
--- /dev/null
+++ b/src/support/allocators/mt_pooled_secure.h
@@ -0,0 +1,85 @@
+// Copyright (c) 2014-2018 The Dash Core developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+#ifndef BITCOIN_SUPPORT_ALLOCATORS_MT_POOLED_SECURE_H
+#define BITCOIN_SUPPORT_ALLOCATORS_MT_POOLED_SECURE_H
+
+#include "pooled_secure.h"
+
+#include <thread>
+#include <mutex>
+
+//
+// Manages a pool of pools to balance allocation between those when multiple threads are involved
+// This allocator is fully thread safe
+//
+template <typename T>
+struct mt_pooled_secure_allocator : public std::allocator<T> {
+    // MSVC8 default copy constructor is broken
+    typedef std::allocator<T> base;
+    typedef typename base::size_type size_type;
+    typedef typename base::difference_type difference_type;
+    typedef typename base::pointer pointer;
+    typedef typename base::const_pointer const_pointer;
+    typedef typename base::reference reference;
+    typedef typename base::const_reference const_reference;
+    typedef typename base::value_type value_type;
+    mt_pooled_secure_allocator(size_type nrequested_size = 32,
+                               size_type nnext_size = 32,
+                               size_type nmax_size = 0) throw()
+    {
+        // we add enough bytes to the requested size so that we can store the bucket as well
+        nrequested_size += sizeof(size_t);
+
+        size_t pools_count = std::thread::hardware_concurrency();
+        pools.resize(pools_count);
+        for (size_t i = 0; i < pools_count; i++) {
+            pools[i] = std::make_unique<internal_pool>(nrequested_size, nnext_size, nmax_size);
+        }
+    }
+    ~mt_pooled_secure_allocator() throw() {}
+
+    T* allocate(std::size_t n, const void* hint = 0)
+    {
+        size_t bucket = get_bucket();
+        std::lock_guard<std::mutex> lock(pools[bucket]->mutex);
+        uint8_t* ptr = pools[bucket]->allocate(n * sizeof(T) + sizeof(size_t));
+        *(size_t*)ptr = bucket;
+        return static_cast<T*>(ptr + sizeof(size_t));
+    }
+
+    void deallocate(T* p, std::size_t n)
+    {
+        if (!p) {
+            return;
+        }
+        uint8_t* ptr = (uint8_t*)p - sizeof(size_t);
+        size_t bucket = *(size_t*)ptr;
+        std::lock_guard<std::mutex> lock(pools[bucket]->mutex);
+        pools[bucket]->deallocate(ptr, n * sizeof(T));
+    }
+
+private:
+    size_t get_bucket()
+    {
+        auto tid = std::this_thread::get_id();
+        size_t x = std::hash<std::thread::id>{}(std::this_thread::get_id());
+        return x % pools.size();
+    }
+
+    struct internal_pool : pooled_secure_allocator<uint8_t> {
+        internal_pool(size_type nrequested_size,
+                      size_type nnext_size,
+                      size_type nmax_size) :
+                      pooled_secure_allocator(nrequested_size, nnext_size, nmax_size)
+        {
+        }
+        std::mutex mutex;
+    };
+
+private:
+    std::vector<std::unique_ptr<internal_pool>> pools;
+};
+
+#endif // BITCOIN_SUPPORT_ALLOCATORS_MT_POOLED_SECURE_H
diff --git a/src/support/allocators/pooled_secure.h b/src/support/allocators/pooled_secure.h
new file mode 100644
index 000000000000..03fb2610ce10
--- /dev/null
+++ b/src/support/allocators/pooled_secure.h
@@ -0,0 +1,73 @@
+// Copyright (c) 2014-2018 The Dash Core developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+#ifndef BITCOIN_SUPPORT_ALLOCATORS_POOLED_SECURE_H
+#define BITCOIN_SUPPORT_ALLOCATORS_POOLED_SECURE_H
+
+#include "support/lockedpool.h"
+#include "support/cleanse.h"
+
+#include <string>
+#include <vector>
+
+#include <boost/pool/pool_alloc.hpp>
+
+//
+// Allocator that allocates memory in chunks from a pool, which in turn allocates larger chunks from secure memory
+// Memory is cleaned when freed as well. This allocator is NOT thread safe
+//
+template <typename T>
+struct pooled_secure_allocator : public std::allocator<T> {
+    // MSVC8 default copy constructor is broken
+    typedef std::allocator<T> base;
+    typedef typename base::size_type size_type;
+    typedef typename base::difference_type difference_type;
+    typedef typename base::pointer pointer;
+    typedef typename base::const_pointer const_pointer;
+    typedef typename base::reference reference;
+    typedef typename base::const_reference const_reference;
+    typedef typename base::value_type value_type;
+    pooled_secure_allocator(const size_type nrequested_size = 32,
+                            const size_type nnext_size = 32,
+                            const size_type nmax_size = 0) throw() :
+                            pool(nrequested_size, nnext_size, nmax_size){}
+    ~pooled_secure_allocator() throw() {}
+
+    T* allocate(std::size_t n, const void* hint = 0)
+    {
+        size_t chunks = (n * sizeof(T) + pool.get_requested_size() - 1) / pool.get_requested_size();
+        return static_cast<T*>(pool.ordered_malloc(chunks));
+    }
+
+    void deallocate(T* p, std::size_t n)
+    {
+        if (!p) {
+            return;
+        }
+
+        size_t chunks = (n * sizeof(T) + pool.get_requested_size() - 1) / pool.get_requested_size();
+        memory_cleanse(p, chunks * pool.get_requested_size());
+        pool.ordered_free(p, chunks);
+    }
+
+public:
+    struct internal_secure_allocator {
+        typedef std::size_t size_type;
+        typedef std::ptrdiff_t difference_type;
+
+        static char* malloc(const size_type bytes)
+        {
+            return static_cast<char*>(LockedPoolManager::Instance().alloc(bytes));
+        }
+
+        static void free(char* const block)
+        {
+            LockedPoolManager::Instance().free(block);
+        }
+    };
+private:
+    boost::pool<internal_secure_allocator> pool;
+};
+
+#endif // BITCOIN_SUPPORT_ALLOCATORS_POOLED_SECURE_H

From fcea333ba860d35a520231dd1270f20107c7eb2d Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Fri, 26 Oct 2018 12:15:43 +0200
Subject: [PATCH 217/400] Rewrite handling of too long depends builds in
 .travis.yml (#2385)

The old solution was unnecessarily complicated and resulted in failed tests
to be shown as successful (the exit code was ignored).
---
 .travis.yml | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 70267409a506..d2a05ba47653 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -68,18 +68,13 @@ script:
     - export TRAVIS_COMMIT_LOG=`git log --format=fuller -1`
     # Our scripts try to be Travis agnostic
     - $DOCKER_RUN_IN_BUILDER ./ci/build_depends.sh;
-    # Skip Dash Core build if depends build take more than 20 mins.
-    - if [ $SECONDS -lt 1200 ]; then $DOCKER_RUN_IN_BUILDER ./ci/build_src.sh && export SRC_BUILT="true"; fi
-    - |
-      if [ "$SRC_BUILT" = "true" ]; then
-        travis_wait 30 $DOCKER_RUN_IN_BUILDER ./ci/test_unittests.sh;
-        $DOCKER_RUN_IN_BUILDER ./ci/test_integrationtests.sh;
-        if [ "$DOCKER_BUILD" = "true" ]; then BUILD_DIR=build-ci/dashcore-$BUILD_TARGET ./docker/build-docker.sh; fi;
-      else
-        # Let the build fail immediately. Caches are still uploaded even after failure. The next Travis run should then
-        # use the caches and thus be much faster, causing the build to succeed
-        false
-      fi;
+    # Gracefully stop build without running into timeouts (which won't update caches) when building depends took too long
+    # Next build should fix this situation as it will start with a populated depends cache
+    - if [ $SECONDS -gt 1200 ]; then export DEPENDS_TIMEOUT="true"; false; fi # The "false" here ensures that the build is marked as failed even though the whole script returns 0
+    - test "$DEPENDS_TIMEOUT" != "true" && $DOCKER_RUN_IN_BUILDER ./ci/build_src.sh
+    - test "$DEPENDS_TIMEOUT" != "true" && $DOCKER_RUN_IN_BUILDER ./ci/test_unittests.sh
+    - test "$DEPENDS_TIMEOUT" != "true" && $DOCKER_RUN_IN_BUILDER ./ci/test_integrationtests.sh
+    - test "$DEPENDS_TIMEOUT" != "true" && if [ "$DOCKER_BUILD" = "true" ]; then BUILD_DIR=build-ci/dashcore-$BUILD_TARGET ./docker/build-docker.sh; fi
 after_script:
     - echo $TRAVIS_COMMIT_RANGE
     - echo $TRAVIS_COMMIT_LOG

From 8f9b004cab48e27eaccea5b2e72f69974baff1ff Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Fri, 26 Oct 2018 18:41:40 +0200
Subject: [PATCH 218/400] Support "fast" mode when calling sync_masternodes
 (#2383)

This will call "mnsync next" multiple times to force finishing of mnsync.
Also reduce sleep time to 200ms.
---
 qa/rpc-tests/autoix-mempool.py                |  8 ++++----
 qa/rpc-tests/invalidblockrequest.py           |  2 +-
 qa/rpc-tests/p2p-autoinstantsend.py           |  8 ++++----
 qa/rpc-tests/p2p-fullblocktest.py             |  2 +-
 qa/rpc-tests/test_framework/test_framework.py |  4 ++--
 qa/rpc-tests/test_framework/util.py           | 16 ++++++++++------
 6 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/qa/rpc-tests/autoix-mempool.py b/qa/rpc-tests/autoix-mempool.py
index 77416f89c078..c3d65926a135 100755
--- a/qa/rpc-tests/autoix-mempool.py
+++ b/qa/rpc-tests/autoix-mempool.py
@@ -49,7 +49,7 @@ def activate_autoix_bip9(self):
             if counter % sync_period == 0:
                 # sync nodes
                 self.sync_all()
-                sync_masternodes(self.nodes)
+                sync_masternodes(self.nodes, True)
 
         while self.get_autoix_bip9_status() == 'started':
             set_mocktime(get_mocktime() + 1)
@@ -59,7 +59,7 @@ def activate_autoix_bip9(self):
             if counter % sync_period == 0:
                 # sync nodes
                 self.sync_all()
-                sync_masternodes(self.nodes)
+                sync_masternodes(self.nodes, True)
 
         while self.get_autoix_bip9_status() == 'locked_in':
             set_mocktime(get_mocktime() + 1)
@@ -69,11 +69,11 @@ def activate_autoix_bip9(self):
             if counter % sync_period == 0:
                 # sync nodes
                 self.sync_all()
-                sync_masternodes(self.nodes)
+                sync_masternodes(self.nodes, True)
 
         # sync nodes
         self.sync_all()
-        sync_masternodes(self.nodes)
+        sync_masternodes(self.nodes, True)
 
         assert(self.get_autoix_bip9_status() == 'active')
 
diff --git a/qa/rpc-tests/invalidblockrequest.py b/qa/rpc-tests/invalidblockrequest.py
index dd581d85153d..b6f1e4ffe6f0 100755
--- a/qa/rpc-tests/invalidblockrequest.py
+++ b/qa/rpc-tests/invalidblockrequest.py
@@ -33,7 +33,7 @@ def run_test(self):
         self.tip = None
         self.block_time = None
         NetworkThread().start() # Start up network handling in another thread
-        sync_masternodes(self.nodes)
+        sync_masternodes(self.nodes, True)
         test.run()
 
     def get_tests(self):
diff --git a/qa/rpc-tests/p2p-autoinstantsend.py b/qa/rpc-tests/p2p-autoinstantsend.py
index ddf8cbf770f2..db2af7ce2862 100755
--- a/qa/rpc-tests/p2p-autoinstantsend.py
+++ b/qa/rpc-tests/p2p-autoinstantsend.py
@@ -51,7 +51,7 @@ def activate_autoix_bip9(self):
             if counter % sync_period == 0:
                 # sync nodes
                 self.sync_all()
-                sync_masternodes(self.nodes)
+                sync_masternodes(self.nodes, True)
 
         while self.get_autoix_bip9_status() == 'started':
             set_mocktime(get_mocktime() + 1)
@@ -61,7 +61,7 @@ def activate_autoix_bip9(self):
             if counter % sync_period == 0:
                 # sync nodes
                 self.sync_all()
-                sync_masternodes(self.nodes)
+                sync_masternodes(self.nodes, True)
 
         while self.get_autoix_bip9_status() == 'locked_in':
             set_mocktime(get_mocktime() + 1)
@@ -71,11 +71,11 @@ def activate_autoix_bip9(self):
             if counter % sync_period == 0:
                 # sync nodes
                 self.sync_all()
-                sync_masternodes(self.nodes)
+                sync_masternodes(self.nodes, True)
 
         # sync nodes
         self.sync_all()
-        sync_masternodes(self.nodes)
+        sync_masternodes(self.nodes, True)
 
         assert(self.get_autoix_bip9_status() == 'active')
 
diff --git a/qa/rpc-tests/p2p-fullblocktest.py b/qa/rpc-tests/p2p-fullblocktest.py
index f2a541b61c98..ed34563d8ef7 100755
--- a/qa/rpc-tests/p2p-fullblocktest.py
+++ b/qa/rpc-tests/p2p-fullblocktest.py
@@ -69,7 +69,7 @@ def run_test(self):
         self.test = TestManager(self, self.options.tmpdir)
         self.test.add_all_connections(self.nodes)
         NetworkThread().start() # Start up network handling in another thread
-        sync_masternodes(self.nodes)
+        sync_masternodes(self.nodes, True)
         self.test.run()
 
     def add_transactions_to_block(self, block, tx_list):
diff --git a/qa/rpc-tests/test_framework/test_framework.py b/qa/rpc-tests/test_framework/test_framework.py
index 884de4095a1b..cb270ba8bd3f 100755
--- a/qa/rpc-tests/test_framework/test_framework.py
+++ b/qa/rpc-tests/test_framework/test_framework.py
@@ -301,11 +301,11 @@ def setup_network(self):
         self.sync_all()
         set_mocktime(get_mocktime() + 1)
         set_node_times(self.nodes, get_mocktime())
-        sync_masternodes(self.nodes)
+        sync_masternodes(self.nodes, True)
         for i in range(1, self.mn_count + 1):
             res = self.nodes[0].masternode("start-alias", "mn%d" % i)
             assert (res["result"] == 'successful')
-        sync_masternodes(self.nodes)
+        sync_masternodes(self.nodes, True)
         mn_info = self.nodes[0].masternodelist("status")
         assert (len(mn_info) == self.mn_count)
         for status in mn_info.values():
diff --git a/qa/rpc-tests/test_framework/util.py b/qa/rpc-tests/test_framework/util.py
index 6cb94be5922a..e6d204567648 100644
--- a/qa/rpc-tests/test_framework/util.py
+++ b/qa/rpc-tests/test_framework/util.py
@@ -105,11 +105,15 @@ def get_mnsync_status(node):
     result = node.mnsync("status")
     return result['IsSynced']
 
-def wait_to_sync(node):
-    synced = False
-    while not synced:
+def wait_to_sync(node, fast_mnsync=False):
+    while True:
         synced = get_mnsync_status(node)
-        time.sleep(0.5)
+        if synced:
+            break
+        time.sleep(0.2)
+        if fast_mnsync:
+            # skip mnsync states
+            node.mnsync("next")
 
 def p2p_port(n):
     assert(n <= MAX_NODES)
@@ -191,9 +195,9 @@ def sync_mempools(rpc_connections, *, wait=1, timeout=60):
         timeout -= wait
     raise AssertionError("Mempool sync failed")
 
-def sync_masternodes(rpc_connections):
+def sync_masternodes(rpc_connections, fast_mnsync=False):
     for node in rpc_connections:
-        wait_to_sync(node)
+        wait_to_sync(node, fast_mnsync)
 
 bitcoind_processes = {}
 

From b5142ee2ce1709657225e077947911512922417d Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Fri, 26 Oct 2018 18:42:11 +0200
Subject: [PATCH 219/400] Implement RemoveAskFor to indicate that we're not
 interested in an item anymore (#2384)

* Implement RemoveAskFor to indicate that we're not interested in an item anymore

When an INV item is received from the first node, the item is requested
immediately. If the same item is received from another node, an entry is
added to mapAskFor which marks the item for re-requesting in case the first
node did not respond. When the item is received from the first node,
the item was previously never removed from mapAskFor. Only the later getdata
loop in SendMessages would then gradually remove items from the map. This
is quite delayed however as the entries in mapAskFor have a timeout value.

RemoveAskFor allows to remove all entries from mapAskFor and setAskFor
when we are not interested in the item anymore (e.g. because we received
it already).

* Call RemoveAskFor whenever we receive a message

* Only pass hash instead of CInv object to RemoveAskFor
---
 src/governance.cpp          | 21 +++++++++++++++------
 src/instantx.cpp            |  5 ++++-
 src/masternode-payments.cpp |  5 ++++-
 src/masternodeman.cpp       | 15 ++++++++++++---
 src/net.cpp                 | 22 ++++++++++++++++++++++
 src/net.h                   |  2 ++
 src/net_processing.cpp      |  5 ++---
 src/spork.cpp               |  2 +-
 8 files changed, 62 insertions(+), 15 deletions(-)

diff --git a/src/governance.cpp b/src/governance.cpp
index e0586362bdef..f0acab6b291d 100644
--- a/src/governance.cpp
+++ b/src/governance.cpp
@@ -132,7 +132,10 @@ void CGovernanceManager::ProcessMessage(CNode* pfrom, const std::string& strComm
 
         uint256 nHash = govobj.GetHash();
 
-        pfrom->setAskFor.erase(nHash);
+        {
+            LOCK(cs_main);
+            connman.RemoveAskFor(nHash);
+        }
 
         if (pfrom->nVersion < MIN_GOVERNANCE_PEER_PROTO_VERSION) {
             LogPrint("gobject", "MNGOVERNANCEOBJECT -- peer=%d using obsolete version %i\n", pfrom->id, pfrom->nVersion);
@@ -220,7 +223,10 @@ void CGovernanceManager::ProcessMessage(CNode* pfrom, const std::string& strComm
 
         uint256 nHash = vote.GetHash();
 
-        pfrom->setAskFor.erase(nHash);
+        {
+            LOCK(cs_main);
+            connman.RemoveAskFor(nHash);
+        }
 
         if (pfrom->nVersion < MIN_GOVERNANCE_PEER_PROTO_VERSION) {
             LogPrint("gobject", "MNGOVERNANCEOBJECTVOTE -- peer=%d using obsolete version %i\n", pfrom->id, pfrom->nVersion);
@@ -1113,10 +1119,13 @@ int CGovernanceManager::RequestGovernanceObjectVotes(const std::vector<CNode*>&
             // only use up to date peers
             if (pnode->nVersion < MIN_GOVERNANCE_PEER_PROTO_VERSION) continue;
             // stop early to prevent setAskFor overflow
-            size_t nProjectedSize = pnode->setAskFor.size() + nProjectedVotes;
-            if (nProjectedSize > SETASKFOR_MAX_SZ / 2) continue;
-            // to early to ask the same node
-            if (mapAskedRecently[nHashGovobj].count(pnode->addr)) continue;
+            {
+                LOCK(cs_main);
+                size_t nProjectedSize = pnode->setAskFor.size() + nProjectedVotes;
+                if (nProjectedSize > SETASKFOR_MAX_SZ / 2) continue;
+                // to early to ask the same node
+                if (mapAskedRecently[nHashGovobj].count(pnode->addr)) continue;
+            }
 
             RequestGovernanceObject(pnode, nHashGovobj, connman, true);
             mapAskedRecently[nHashGovobj][pnode->addr] = nNow + nTimeout;
diff --git a/src/instantx.cpp b/src/instantx.cpp
index 501cafd4ae15..aa9274689064 100644
--- a/src/instantx.cpp
+++ b/src/instantx.cpp
@@ -73,7 +73,10 @@ void CInstantSend::ProcessMessage(CNode* pfrom, const std::string& strCommand, C
 
         uint256 nVoteHash = vote.GetHash();
 
-        pfrom->setAskFor.erase(nVoteHash);
+        {
+            LOCK(cs_main);
+            connman.RemoveAskFor(nVoteHash);
+        }
 
         // Ignore any InstantSend messages until masternode list is synced
         if (!masternodeSync.IsMasternodeListSynced()) return;
diff --git a/src/masternode-payments.cpp b/src/masternode-payments.cpp
index 5403110f95e2..38280fe84d73 100644
--- a/src/masternode-payments.cpp
+++ b/src/masternode-payments.cpp
@@ -446,7 +446,10 @@ void CMasternodePayments::ProcessMessage(CNode* pfrom, const std::string& strCom
 
         uint256 nHash = vote.GetHash();
 
-        pfrom->setAskFor.erase(nHash);
+        {
+            LOCK(cs_main);
+            connman.RemoveAskFor(nHash);
+        }
 
         // TODO: clear setAskFor for MSG_MASTERNODE_PAYMENT_BLOCK too
 
diff --git a/src/masternodeman.cpp b/src/masternodeman.cpp
index a79082386595..f6860a04a12d 100644
--- a/src/masternodeman.cpp
+++ b/src/masternodeman.cpp
@@ -977,7 +977,10 @@ void CMasternodeMan::ProcessMessage(CNode* pfrom, const std::string& strCommand,
         CMasternodeBroadcast mnb;
         vRecv >> mnb;
 
-        pfrom->setAskFor.erase(mnb.GetHash());
+        {
+            LOCK(cs_main);
+            connman.RemoveAskFor(mnb.GetHash());
+        }
 
         if(!masternodeSync.IsBlockchainSynced()) return;
 
@@ -1003,7 +1006,10 @@ void CMasternodeMan::ProcessMessage(CNode* pfrom, const std::string& strCommand,
 
         uint256 nHash = mnp.GetHash();
 
-        pfrom->setAskFor.erase(nHash);
+        {
+            LOCK(cs_main);
+            connman.RemoveAskFor(nHash);
+        }
 
         if(!masternodeSync.IsBlockchainSynced()) return;
 
@@ -1066,7 +1072,10 @@ void CMasternodeMan::ProcessMessage(CNode* pfrom, const std::string& strCommand,
         CMasternodeVerification mnv;
         vRecv >> mnv;
 
-        pfrom->setAskFor.erase(mnv.GetHash());
+        {
+            LOCK(cs_main);
+            connman.RemoveAskFor(mnv.GetHash());
+        }
 
         if(!masternodeSync.IsMasternodeListSynced()) return;
 
diff --git a/src/net.cpp b/src/net.cpp
index d6d3841e7c48..1d84431965ba 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -2655,6 +2655,16 @@ void CConnman::RelayInvFiltered(CInv &inv, const CTransaction& relatedTx, const
     }
 }
 
+void CConnman::RemoveAskFor(const uint256& hash)
+{
+    mapAlreadyAskedFor.erase(hash);
+
+    LOCK(cs_vNodes);
+    for (const auto& pnode : vNodes) {
+        pnode->RemoveAskFor(hash);
+    }
+}
+
 void CConnman::RecordBytesRecv(uint64_t bytes)
 {
     LOCK(cs_totalBytesRecv);
@@ -2906,6 +2916,18 @@ void CNode::AskFor(const CInv& inv)
     mapAskFor.insert(std::make_pair(nRequestTime, inv));
 }
 
+void CNode::RemoveAskFor(const uint256& hash)
+{
+    setAskFor.erase(hash);
+    for (auto it = mapAskFor.begin(); it != mapAskFor.end();) {
+        if (it->second.hash == hash) {
+            it = mapAskFor.erase(it);
+        } else {
+            ++it;
+        }
+    }
+}
+
 bool CConnman::NodeFullyConnected(const CNode* pnode)
 {
     return pnode && pnode->fSuccessfullyConnected && !pnode->fDisconnect;
diff --git a/src/net.h b/src/net.h
index 03ef7069c181..56aea9fc04eb 100644
--- a/src/net.h
+++ b/src/net.h
@@ -310,6 +310,7 @@ class CConnman
     void RelayTransaction(const CTransaction& tx, const CDataStream& ss);
     void RelayInv(CInv &inv, const int minProtoVersion = MIN_PEER_PROTO_VERSION);
     void RelayInvFiltered(CInv &inv, const CTransaction &relatedTx, const int minProtoVersion = MIN_PEER_PROTO_VERSION);
+    void RemoveAskFor(const uint256& hash);
 
     // Addrman functions
     size_t GetAddressCount() const;
@@ -929,6 +930,7 @@ class CNode
     }
 
     void AskFor(const CInv& inv);
+    void RemoveAskFor(const uint256& hash);
 
     void CloseSocketDisconnect();
 
diff --git a/src/net_processing.cpp b/src/net_processing.cpp
index 980ec5509d6f..199da49742c2 100644
--- a/src/net_processing.cpp
+++ b/src/net_processing.cpp
@@ -1962,7 +1962,6 @@ bool static ProcessMessage(CNode* pfrom, const std::string& strCommand, CDataStr
 
         CInv inv(nInvType, tx.GetHash());
         pfrom->AddInventoryKnown(inv);
-        pfrom->setAskFor.erase(inv.hash);
 
         // Process custom logic, no matter if tx will be accepted to mempool later or not
         if (strCommand == NetMsgType::TXLOCKREQUEST || fCanAutoLock) {
@@ -2009,11 +2008,11 @@ bool static ProcessMessage(CNode* pfrom, const std::string& strCommand, CDataStr
 
         LOCK(cs_main);
 
+        connman.RemoveAskFor(inv.hash);
+
         bool fMissingInputs = false;
         CValidationState state;
 
-        mapAlreadyAskedFor.erase(inv.hash);
-
         if (!AlreadyHave(inv) && AcceptToMemoryPool(mempool, state, ptx, true, &fMissingInputs)) {
             // Process custom txes, this changes AlreadyHave to "true"
             if (strCommand == NetMsgType::DSTX) {
diff --git a/src/spork.cpp b/src/spork.cpp
index 0dbb4a387271..8e4e19ff4ae2 100644
--- a/src/spork.cpp
+++ b/src/spork.cpp
@@ -123,7 +123,7 @@ void CSporkManager::ProcessSpork(CNode* pfrom, const std::string& strCommand, CD
         std::string strLogMsg;
         {
             LOCK(cs_main);
-            pfrom->setAskFor.erase(hash);
+            connman.RemoveAskFor(hash);
             if(!chainActive.Tip()) return;
             strLogMsg = strprintf("SPORK -- hash: %s id: %d value: %10d bestHeight: %d peer=%d", hash.ToString(), spork.nSporkID, spork.nValue, chainActive.Height(), pfrom->id);
         }

From e66c4e184ffaee8c933ffbd8b7498f6372dd59c7 Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Fri, 26 Oct 2018 18:42:28 +0200
Subject: [PATCH 220/400] Don't revert to INV based block announcements when
 the previous block is the devnet genesis block (#2388)

Assume that the other node already has the previous block if it matches
the devnet genesis block.
---
 src/net_processing.cpp | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/net_processing.cpp b/src/net_processing.cpp
index 199da49742c2..6c38e19f9acd 100644
--- a/src/net_processing.cpp
+++ b/src/net_processing.cpp
@@ -3229,12 +3229,21 @@ bool SendMessages(CNode* pto, CConnman& connman, const std::atomic<bool>& interr
                         break;
                     }
                     pBestIndex = pindex;
+                    bool isPrevDevnetGenesisBlock = false;
+                    if (!consensusParams.hashDevnetGenesisBlock.IsNull() &&
+                        pindex->pprev != nullptr &&
+                        pindex->pprev->GetBlockHash() == consensusParams.hashDevnetGenesisBlock) {
+                        // even though the devnet genesis block was never transferred through the wire and thus not
+                        // appear anywhere in the node state where we track what other nodes have or not have, we can
+                        // assume that the other node already knows the devnet genesis block
+                        isPrevDevnetGenesisBlock = true;
+                    }
                     if (fFoundStartingHeader) {
                         // add this to the headers message
                         vHeaders.push_back(pindex->GetBlockHeader());
                     } else if (PeerHasHeader(&state, pindex)) {
                         continue; // keep looking for the first new block
-                    } else if (pindex->pprev == NULL || PeerHasHeader(&state, pindex->pprev)) {
+                    } else if (pindex->pprev == NULL || PeerHasHeader(&state, pindex->pprev) || isPrevDevnetGenesisBlock) {
                         // Peer doesn't have this header but they do have the prior one.
                         // Start sending headers.
                         fFoundStartingHeader = true;

From 28a6007a40d6dd03fd01ade6d7d61e4c140ee310 Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Fri, 26 Oct 2018 18:42:52 +0200
Subject: [PATCH 221/400] Prepare DIP3 for testnet and reuse DIP3 deployment
 for autoix deployment (#2389)

* Add BIP9 parameters for DIP3 deployment on testnet

* Remove autoix BIP9 deployment and reuse DIP3 deployment

* Add BIP9CheckMasternodesUpgraded to chain params

This controls if miners should check for upgraded masternodes first before
adding BIP9 bits to the block version. This only makes sense in network
where masternodes are up and running before BIP9 activation, which is not
necessarely the case in regtest and devnet.

Also refactor ComputeBlockVersion to use fCheckMasternodesUpgraded instead
of the inverse fAssumeMasternodeIsUpgraded. It is set to false by default
and only set to true in CreateNewBlock.

* Check for upgraded masternodes for DIP3 activation (only mainnet and testnet)

* Bump PROTOCOL_VERSION and DMN_PROTO_VERSION

We probably have nodes with 70211 already running on testnet.
---
 qa/rpc-tests/autoix-mempool.py      |  3 ++-
 qa/rpc-tests/p2p-autoinstantsend.py |  3 ++-
 src/chainparams.cpp                 | 36 ++++++++++-------------------
 src/chainparams.h                   |  2 ++
 src/consensus/params.h              |  1 -
 src/dsnotificationinterface.cpp     |  4 ++--
 src/instantx.h                      |  2 --
 src/miner.cpp                       |  2 +-
 src/rpc/blockchain.cpp              |  1 -
 src/validation.cpp                  | 13 ++++++-----
 src/validation.h                    |  2 +-
 src/version.h                       |  4 ++--
 src/versionbits.cpp                 |  5 ----
 13 files changed, 31 insertions(+), 47 deletions(-)

diff --git a/qa/rpc-tests/autoix-mempool.py b/qa/rpc-tests/autoix-mempool.py
index c3d65926a135..f66f6a7a9c67 100755
--- a/qa/rpc-tests/autoix-mempool.py
+++ b/qa/rpc-tests/autoix-mempool.py
@@ -30,7 +30,8 @@ def __init__(self):
 
     def get_autoix_bip9_status(self):
         info = self.nodes[0].getblockchaininfo()
-        return info['bip9_softforks']['autoix']['status']
+        # we reuse the dip3 deployment
+        return info['bip9_softforks']['dip0003']['status']
 
     def activate_autoix_bip9(self):
         # sync nodes periodically
diff --git a/qa/rpc-tests/p2p-autoinstantsend.py b/qa/rpc-tests/p2p-autoinstantsend.py
index db2af7ce2862..be43796309bc 100755
--- a/qa/rpc-tests/p2p-autoinstantsend.py
+++ b/qa/rpc-tests/p2p-autoinstantsend.py
@@ -32,7 +32,8 @@ def __init__(self):
 
     def get_autoix_bip9_status(self):
         info = self.nodes[0].getblockchaininfo()
-        return info['bip9_softforks']['autoix']['status']
+        # we reuse the dip3 deployment
+        return info['bip9_softforks']['dip0003']['status']
 
     def activate_autoix_bip9(self):
         # sync nodes periodically
diff --git a/src/chainparams.cpp b/src/chainparams.cpp
index 14a1e7e17c4a..0ef8ff759ec5 100644
--- a/src/chainparams.cpp
+++ b/src/chainparams.cpp
@@ -174,13 +174,6 @@ class CMainParams : public CChainParams {
         consensus.vDeployments[Consensus::DEPLOYMENT_BIP147].nWindowSize = 4032;
         consensus.vDeployments[Consensus::DEPLOYMENT_BIP147].nThreshold = 3226; // 80% of 4032
 
-        // Deployment of InstantSend autolocks
-        consensus.vDeployments[Consensus::DEPLOYMENT_ISAUTOLOCKS].bit = 4;
-        consensus.vDeployments[Consensus::DEPLOYMENT_ISAUTOLOCKS].nStartTime = 1533945600; // Aug 11th, 2018
-        consensus.vDeployments[Consensus::DEPLOYMENT_ISAUTOLOCKS].nTimeout = 1565481600; // Aug 11th, 2019
-        consensus.vDeployments[Consensus::DEPLOYMENT_ISAUTOLOCKS].nWindowSize = 4032;
-        consensus.vDeployments[Consensus::DEPLOYMENT_ISAUTOLOCKS].nThreshold = 3226; // 80% of 4032
-
         // The best chain should have at least this much work.
         consensus.nMinimumChainWork = uint256S("0x00000000000000000000000000000000000000000000081021b74f9f47bbd7bc"); // 888900
 
@@ -239,6 +232,7 @@ class CMainParams : public CChainParams {
 
         vSporkAddresses = {"Xgtyuk76vhuFW2iT7UAiHgNdWXCf3J34wh"};
         nMinSporkKeys = 1;
+        fBIP9CheckMasternodesUpgraded = true;
 
         checkpointData = (CCheckpointData) {
             boost::assign::map_list_of
@@ -335,12 +329,12 @@ class CTestNetParams : public CChainParams {
         consensus.vDeployments[Consensus::DEPLOYMENT_BIP147].nWindowSize = 100;
         consensus.vDeployments[Consensus::DEPLOYMENT_BIP147].nThreshold = 50; // 50% of 100
 
-        // Deployment of InstantSend autolocks
-        consensus.vDeployments[Consensus::DEPLOYMENT_ISAUTOLOCKS].bit = 4;
-        consensus.vDeployments[Consensus::DEPLOYMENT_ISAUTOLOCKS].nStartTime = 1532476800; // Jul 25th, 2018
-        consensus.vDeployments[Consensus::DEPLOYMENT_ISAUTOLOCKS].nTimeout = 1564012800; // Jul 25th, 2019
-        consensus.vDeployments[Consensus::DEPLOYMENT_ISAUTOLOCKS].nWindowSize = 100;
-        consensus.vDeployments[Consensus::DEPLOYMENT_ISAUTOLOCKS].nThreshold = 50; // 50% of 100
+        // Deployment of DIP0003
+        consensus.vDeployments[Consensus::DEPLOYMENT_DIP0003].bit = 3;
+        consensus.vDeployments[Consensus::DEPLOYMENT_DIP0003].nStartTime = 1540504800; // Oct 26, 2018
+        consensus.vDeployments[Consensus::DEPLOYMENT_DIP0003].nTimeout = 1572040800; // Oct 26, 2019
+        consensus.vDeployments[Consensus::DEPLOYMENT_DIP0003].nWindowSize = 100;
+        consensus.vDeployments[Consensus::DEPLOYMENT_DIP0003].nThreshold = 50; // 50% of 100
 
         // The best chain should have at least this much work.
         consensus.nMinimumChainWork = uint256S("0x000000000000000000000000000000000000000000000000003be69c34b1244f"); // 143200
@@ -396,6 +390,7 @@ class CTestNetParams : public CChainParams {
 
         vSporkAddresses = {"yjPtiKh2uwk3bDutTEA2q9mCtXyiZRWn55"};
         nMinSporkKeys = 1;
+        fBIP9CheckMasternodesUpgraded = true;
 
         checkpointData = (CCheckpointData) {
             boost::assign::map_list_of
@@ -482,13 +477,6 @@ class CDevNetParams : public CChainParams {
         consensus.vDeployments[Consensus::DEPLOYMENT_DIP0003].nWindowSize = 100;
         consensus.vDeployments[Consensus::DEPLOYMENT_DIP0003].nThreshold = 50; // 50% of 100
 
-        // Deployment of InstantSend autolocks
-        consensus.vDeployments[Consensus::DEPLOYMENT_ISAUTOLOCKS].bit = 4;
-        consensus.vDeployments[Consensus::DEPLOYMENT_ISAUTOLOCKS].nStartTime = 1535752800; // Sep 1st, 2018
-        consensus.vDeployments[Consensus::DEPLOYMENT_ISAUTOLOCKS].nTimeout = 1567288800; // Sep 1st, 2019
-        consensus.vDeployments[Consensus::DEPLOYMENT_ISAUTOLOCKS].nWindowSize = 100;
-        consensus.vDeployments[Consensus::DEPLOYMENT_ISAUTOLOCKS].nThreshold = 50; // 50% of 100
-
         // The best chain should have at least this much work.
         consensus.nMinimumChainWork = uint256S("0x000000000000000000000000000000000000000000000000000000000000000");
 
@@ -541,6 +529,8 @@ class CDevNetParams : public CChainParams {
 
         vSporkAddresses = {"yjPtiKh2uwk3bDutTEA2q9mCtXyiZRWn55"};
         nMinSporkKeys = 1;
+        // devnets are started with no blocks and no MN, so we can't check for upgraded MN (as there are none)
+        fBIP9CheckMasternodesUpgraded = false;
 
         checkpointData = (CCheckpointData) {
             boost::assign::map_list_of
@@ -616,10 +606,6 @@ class CRegTestParams : public CChainParams {
         consensus.vDeployments[Consensus::DEPLOYMENT_DIP0003].bit = 3;
         consensus.vDeployments[Consensus::DEPLOYMENT_DIP0003].nStartTime = 0;
         consensus.vDeployments[Consensus::DEPLOYMENT_DIP0003].nTimeout = 999999999999ULL;
-        consensus.vDeployments[Consensus::DEPLOYMENT_ISAUTOLOCKS].bit = 4;
-        consensus.vDeployments[Consensus::DEPLOYMENT_ISAUTOLOCKS].nStartTime = 0;
-        consensus.vDeployments[Consensus::DEPLOYMENT_ISAUTOLOCKS].nTimeout = 999999999999ULL;
-
 
         // The best chain should have at least this much work.
         consensus.nMinimumChainWork = uint256S("0x00");
@@ -655,6 +641,8 @@ class CRegTestParams : public CChainParams {
         // privKey: cP4EKFyJsHT39LDqgdcB43Y3YXjNyjb5Fuas1GQSeAtjnZWmZEQK
         vSporkAddresses = {"yj949n1UH6fDhw6HtVE5VMj2iSTaSWBMcW"};
         nMinSporkKeys = 1;
+        // regtest usually has no masternodes in most tests, so don't check for upgraged MNs
+        fBIP9CheckMasternodesUpgraded = false;
 
         checkpointData = (CCheckpointData){
             boost::assign::map_list_of
diff --git a/src/chainparams.h b/src/chainparams.h
index 3c93e0c9aa2f..52606b17561c 100644
--- a/src/chainparams.h
+++ b/src/chainparams.h
@@ -90,6 +90,7 @@ class CChainParams
     int FulfilledRequestExpireTime() const { return nFulfilledRequestExpireTime; }
     const std::vector<std::string>& SporkAddresses() const { return vSporkAddresses; }
     int MinSporkKeys() const { return nMinSporkKeys; }
+    bool BIP9CheckMasternodesUpgraded() const { return fBIP9CheckMasternodesUpgraded; }
 protected:
     CChainParams() {}
 
@@ -119,6 +120,7 @@ class CChainParams
     int nFulfilledRequestExpireTime;
     std::vector<std::string> vSporkAddresses;
     int nMinSporkKeys;
+    bool fBIP9CheckMasternodesUpgraded;
 };
 
 /**
diff --git a/src/consensus/params.h b/src/consensus/params.h
index 6c3efccf7a05..b59491cf3689 100644
--- a/src/consensus/params.h
+++ b/src/consensus/params.h
@@ -19,7 +19,6 @@ enum DeploymentPos
     DEPLOYMENT_DIP0001, // Deployment of DIP0001 and lower transaction fees.
     DEPLOYMENT_BIP147, // Deployment of BIP147 (NULLDUMMY)
     DEPLOYMENT_DIP0003, // Deployment of DIP0002 and DIP0003 (txv3 and deterministic MN lists)
-    DEPLOYMENT_ISAUTOLOCKS, // Deployment of automatic IS locks for simple transactions
     // NOTE: Also add new deployments to VersionBitsDeploymentInfo in versionbits.cpp
     MAX_VERSION_BITS_DEPLOYMENTS
 };
diff --git a/src/dsnotificationinterface.cpp b/src/dsnotificationinterface.cpp
index 4f611e02edeb..ec37ee6cfec1 100644
--- a/src/dsnotificationinterface.cpp
+++ b/src/dsnotificationinterface.cpp
@@ -43,9 +43,9 @@ void CDSNotificationInterface::UpdatedBlockTip(const CBlockIndex *pindexNew, con
 
     // Update global DIP0001 activation status
     fDIP0001ActiveAtTip = pindexNew->nHeight >= Params().GetConsensus().DIP0001Height;
-    // update instantsend autolock activation flag
+    // update instantsend autolock activation flag (we reuse the DIP3 deployment)
     instantsend.isAutoLockBip9Active =
-            (VersionBitsState(pindexNew, Params().GetConsensus(), Consensus::DEPLOYMENT_ISAUTOLOCKS, versionbitscache) == THRESHOLD_ACTIVE);
+            (VersionBitsState(pindexNew, Params().GetConsensus(), Consensus::DEPLOYMENT_DIP0003, versionbitscache) == THRESHOLD_ACTIVE);
 
     if (fInitialDownload)
         return;
diff --git a/src/instantx.h b/src/instantx.h
index 381c1c79936c..44230bdd12f6 100644
--- a/src/instantx.h
+++ b/src/instantx.h
@@ -28,8 +28,6 @@ extern CInstantSend instantsend;
 
 static const int MIN_INSTANTSEND_PROTO_VERSION      = 70210;
 
-static const int MIN_INSTANTSEND_WITHOUT_FEE_PROTO_VERSION = 70211;
-
 /// For how long we are going to accept votes/locks
 /// after we saw the first one for a specific transaction
 static const int INSTANTSEND_LOCK_TIMEOUT_SECONDS   = 15;
diff --git a/src/miner.cpp b/src/miner.cpp
index 413ba197ad1f..3a1cf7dde29b 100644
--- a/src/miner.cpp
+++ b/src/miner.cpp
@@ -137,7 +137,7 @@ std::unique_ptr<CBlockTemplate> BlockAssembler::CreateNewBlock(const CScript& sc
     CBlockIndex* pindexPrev = chainActive.Tip();
     nHeight = pindexPrev->nHeight + 1;
 
-    pblock->nVersion = ComputeBlockVersion(pindexPrev, chainparams.GetConsensus());
+    pblock->nVersion = ComputeBlockVersion(pindexPrev, chainparams.GetConsensus(), chainparams.BIP9CheckMasternodesUpgraded());
     // -regtest only: allow overriding block.nVersion with
     // -blockversion=N to test forking scenarios
     if (chainparams.MineBlocksOnDemand())
diff --git a/src/rpc/blockchain.cpp b/src/rpc/blockchain.cpp
index 14b5dc00600e..582e47e353f7 100644
--- a/src/rpc/blockchain.cpp
+++ b/src/rpc/blockchain.cpp
@@ -1287,7 +1287,6 @@ UniValue getblockchaininfo(const JSONRPCRequest& request)
     BIP9SoftForkDescPushBack(bip9_softforks, "dip0001", consensusParams, Consensus::DEPLOYMENT_DIP0001);
     BIP9SoftForkDescPushBack(bip9_softforks, "dip0003", consensusParams, Consensus::DEPLOYMENT_DIP0003);
     BIP9SoftForkDescPushBack(bip9_softforks, "bip147", consensusParams, Consensus::DEPLOYMENT_BIP147);
-    BIP9SoftForkDescPushBack(bip9_softforks, "autoix", consensusParams, Consensus::DEPLOYMENT_ISAUTOLOCKS);
     obj.push_back(Pair("softforks",             softforks));
     obj.push_back(Pair("bip9_softforks", bip9_softforks));
 
diff --git a/src/validation.cpp b/src/validation.cpp
index f92a305fa37f..5ec27ca16783 100644
--- a/src/validation.cpp
+++ b/src/validation.cpp
@@ -1755,8 +1755,9 @@ static DisconnectResult DisconnectBlock(const CBlock& block, CValidationState& s
     }
 
     // make sure the flag is reset in case of a chain reorg
+    // (we reused the DIP3 deployment)
     instantsend.isAutoLockBip9Active =
-            (VersionBitsState(pindex->pprev, Params().GetConsensus(), Consensus::DEPLOYMENT_ISAUTOLOCKS, versionbitscache) == THRESHOLD_ACTIVE);
+            (VersionBitsState(pindex->pprev, Params().GetConsensus(), Consensus::DEPLOYMENT_DIP0003, versionbitscache) == THRESHOLD_ACTIVE);
 
     return fClean ? DISCONNECT_OK : DISCONNECT_UNCLEAN;
 }
@@ -1796,7 +1797,7 @@ void ThreadScriptCheck() {
 // Protected by cs_main
 VersionBitsCache versionbitscache;
 
-int32_t ComputeBlockVersion(const CBlockIndex* pindexPrev, const Consensus::Params& params, bool fAssumeMasternodeIsUpgraded)
+int32_t ComputeBlockVersion(const CBlockIndex* pindexPrev, const Consensus::Params& params, bool fCheckMasternodesUpgraded)
 {
     LOCK(cs_main);
     int32_t nVersion = VERSIONBITS_TOP_BITS;
@@ -1805,7 +1806,7 @@ int32_t ComputeBlockVersion(const CBlockIndex* pindexPrev, const Consensus::Para
         Consensus::DeploymentPos pos = Consensus::DeploymentPos(i);
         ThresholdState state = VersionBitsState(pindexPrev, params, pos, versionbitscache);
         const struct BIP9DeploymentInfo& vbinfo = VersionBitsDeploymentInfo[pos];
-        if (vbinfo.check_mn_protocol && state == THRESHOLD_STARTED && !fAssumeMasternodeIsUpgraded) {
+        if (vbinfo.check_mn_protocol && state == THRESHOLD_STARTED && fCheckMasternodesUpgraded) {
             std::vector<CTxOut> voutMasternodePayments;
             masternode_info_t mnInfo;
             if (!mnpayments.GetBlockTxOuts(pindexPrev->nHeight + 1, 0, voutMasternodePayments)) {
@@ -1823,7 +1824,7 @@ int32_t ComputeBlockVersion(const CBlockIndex* pindexPrev, const Consensus::Para
                 // unknown masternode
                 continue;
             }
-            if (mnInfo.nProtocolVersion < MIN_INSTANTSEND_WITHOUT_FEE_PROTO_VERSION) {
+            if (mnInfo.nProtocolVersion < DMN_PROTO_VERSION) {
                 // masternode is not upgraded yet
                 continue;
             }
@@ -1866,7 +1867,7 @@ class WarningBitsConditionChecker : public AbstractThresholdConditionChecker
     {
         return ((pindex->nVersion & VERSIONBITS_TOP_MASK) == VERSIONBITS_TOP_BITS) &&
                ((pindex->nVersion >> bit) & 1) != 0 &&
-               ((ComputeBlockVersion(pindex->pprev, params, true) >> bit) & 1) == 0;
+               ((ComputeBlockVersion(pindex->pprev, params) >> bit) & 1) == 0;
     }
 };
 
@@ -2422,7 +2423,7 @@ void static UpdateTip(CBlockIndex *pindexNew, const CChainParams& chainParams) {
         // Check the version of the last 100 blocks to see if we need to upgrade:
         for (int i = 0; i < 100 && pindex != NULL; i++)
         {
-            int32_t nExpectedVersion = ComputeBlockVersion(pindex->pprev, chainParams.GetConsensus(), true);
+            int32_t nExpectedVersion = ComputeBlockVersion(pindex->pprev, chainParams.GetConsensus());
             if (pindex->nVersion > VERSIONBITS_LAST_OLD_BLOCK_VERSION && (pindex->nVersion & ~nExpectedVersion) != 0)
                 ++nUpgraded;
             pindex = pindex->pprev;
diff --git a/src/validation.h b/src/validation.h
index a0c0301a2d7f..c11999026875 100644
--- a/src/validation.h
+++ b/src/validation.h
@@ -544,7 +544,7 @@ extern VersionBitsCache versionbitscache;
 /**
  * Determine what nVersion a new block should use.
  */
-int32_t ComputeBlockVersion(const CBlockIndex* pindexPrev, const Consensus::Params& params, bool fAssumeMasternodeIsUpgraded = false);
+int32_t ComputeBlockVersion(const CBlockIndex* pindexPrev, const Consensus::Params& params, bool fCheckMasternodesUpgraded = false);
 
 /**
  * Return true if hash can be found in chainActive at nBlockHeight height.
diff --git a/src/version.h b/src/version.h
index fa357eed7994..9d389bc4e7ce 100644
--- a/src/version.h
+++ b/src/version.h
@@ -11,7 +11,7 @@
  */
 
 
-static const int PROTOCOL_VERSION = 70211;
+static const int PROTOCOL_VERSION = 70212;
 
 //! initial proto version, to be increased after version/verack negotiation
 static const int INIT_PROTO_VERSION = 209;
@@ -45,6 +45,6 @@ static const int DIP0001_PROTOCOL_VERSION = 70208;
 static const int SHORT_IDS_BLOCKS_VERSION = 70209;
 
 //! introduction of DIP3/deterministic masternodes
-static const int DMN_PROTO_VERSION = 70211;
+static const int DMN_PROTO_VERSION = 70212;
 
 #endif // BITCOIN_VERSION_H
diff --git a/src/versionbits.cpp b/src/versionbits.cpp
index 29aa97366d87..f7bf567a7fe9 100644
--- a/src/versionbits.cpp
+++ b/src/versionbits.cpp
@@ -30,11 +30,6 @@ const struct BIP9DeploymentInfo VersionBitsDeploymentInfo[Consensus::MAX_VERSION
     {
         /*.name =*/ "dip0003",
         /*.gbt_force =*/ true,
-        /*.check_mn_protocol =*/ false,
-    },
-    {
-        /*.name =*/ "autoix",
-        /*.gbt_force =*/ true,
         /*.check_mn_protocol =*/ true,
     }
 };

From 9eb9c99d59d6f947e51dfddcea5fbb8ff31f0236 Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Fri, 26 Oct 2018 18:43:08 +0200
Subject: [PATCH 222/400] Bump version to 0.13.0 (#2386)

---
 README.md                                   | 2 +-
 configure.ac                                | 4 ++--
 contrib/gitian-descriptors/gitian-linux.yml | 2 +-
 contrib/gitian-descriptors/gitian-osx.yml   | 2 +-
 contrib/gitian-descriptors/gitian-win.yml   | 2 +-
 doc/Doxyfile                                | 2 +-
 doc/README.md                               | 2 +-
 doc/README_windows.txt                      | 2 +-
 src/clientversion.h                         | 4 ++--
 9 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/README.md b/README.md
index a6fb97854b2a..9445a4768655 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-Dash Core staging tree 0.12.4
+Dash Core staging tree 0.13.0
 ===============================
 
 `master:` [![Build Status](https://travis-ci.org/dashpay/dash.svg?branch=master)](https://travis-ci.org/dashpay/dash) `develop:` [![Build Status](https://travis-ci.org/dashpay/dash.svg?branch=develop)](https://travis-ci.org/dashpay/dash/branches)
diff --git a/configure.ac b/configure.ac
index 89b19aabe9f1..8313a7bda58b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,8 +1,8 @@
 dnl require autoconf 2.60 (AS_ECHO/AS_ECHO_N)
 AC_PREREQ([2.60])
 define(_CLIENT_VERSION_MAJOR, 0)
-define(_CLIENT_VERSION_MINOR, 12)
-define(_CLIENT_VERSION_REVISION, 4)
+define(_CLIENT_VERSION_MINOR, 13)
+define(_CLIENT_VERSION_REVISION, 0)
 define(_CLIENT_VERSION_BUILD, 0)
 define(_CLIENT_VERSION_IS_RELEASE, false)
 define(_COPYRIGHT_YEAR, 2018)
diff --git a/contrib/gitian-descriptors/gitian-linux.yml b/contrib/gitian-descriptors/gitian-linux.yml
index 154d769a2915..ab3323166b00 100755
--- a/contrib/gitian-descriptors/gitian-linux.yml
+++ b/contrib/gitian-descriptors/gitian-linux.yml
@@ -1,5 +1,5 @@
 ---
-name: "dash-linux-0.12"
+name: "dash-linux-0.13"
 enable_cache: true
 suites:
 - "bionic"
diff --git a/contrib/gitian-descriptors/gitian-osx.yml b/contrib/gitian-descriptors/gitian-osx.yml
index 5218e9047dfc..80fba15d852e 100644
--- a/contrib/gitian-descriptors/gitian-osx.yml
+++ b/contrib/gitian-descriptors/gitian-osx.yml
@@ -1,5 +1,5 @@
 ---
-name: "dash-osx-0.12"
+name: "dash-osx-0.13"
 enable_cache: true
 suites:
 - "bionic"
diff --git a/contrib/gitian-descriptors/gitian-win.yml b/contrib/gitian-descriptors/gitian-win.yml
index 91aba2d58b20..ccb36c7bbc49 100755
--- a/contrib/gitian-descriptors/gitian-win.yml
+++ b/contrib/gitian-descriptors/gitian-win.yml
@@ -1,5 +1,5 @@
 ---
-name: "dash-win-0.12"
+name: "dash-win-0.13"
 enable_cache: true
 suites:
 - "bionic"
diff --git a/doc/Doxyfile b/doc/Doxyfile
index 27caefebda08..c55bc2f66d69 100644
--- a/doc/Doxyfile
+++ b/doc/Doxyfile
@@ -41,7 +41,7 @@ PROJECT_NAME           = "Dash Core"
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = 0.12.4.0
+PROJECT_NUMBER         = 0.13.0.0
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a
diff --git a/doc/README.md b/doc/README.md
index 64b707ba12d3..5081c6dceebc 100644
--- a/doc/README.md
+++ b/doc/README.md
@@ -1,4 +1,4 @@
-Dash Core 0.12.4
+Dash Core 0.13.0
 =====================
 
 This is the official reference wallet for Dash digital currency and comprises the backbone of the Dash peer-to-peer network. You can [download Dash Core](https://www.dash.org/downloads/) or [build it yourself](#building) using the guides below.
diff --git a/doc/README_windows.txt b/doc/README_windows.txt
index b539fd9d1d80..32b150c60e72 100644
--- a/doc/README_windows.txt
+++ b/doc/README_windows.txt
@@ -1,4 +1,4 @@
-Dash Core 0.12.4
+Dash Core 0.13.0
 =====================
 
 Intro
diff --git a/src/clientversion.h b/src/clientversion.h
index 6150c700ab81..7a35e56b13cf 100644
--- a/src/clientversion.h
+++ b/src/clientversion.h
@@ -15,8 +15,8 @@
 
 //! These need to be macros, as clientversion.cpp's and dash*-res.rc's voodoo requires it
 #define CLIENT_VERSION_MAJOR 0
-#define CLIENT_VERSION_MINOR 12
-#define CLIENT_VERSION_REVISION 4
+#define CLIENT_VERSION_MINOR 13
+#define CLIENT_VERSION_REVISION 0
 #define CLIENT_VERSION_BUILD 0
 
 //! Set to true for release, false for prerelease or test build

From e34701295d580690c66e2bd2863c07d063f864d2 Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Tue, 30 Oct 2018 10:59:03 +0100
Subject: [PATCH 223/400] Fix crash when deterministic MN list is empty and
 keep paying superblocks in this case (#2387)

* Don't crash when spork15 is enabled but no MNs have been registered

* Don't bail out when no masternode payee is found

We should pay superblocks even if no masternode payee is found.

* Add missing newline to LogPrint call

* Handle review comments
---
 src/masternode-payments.cpp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/masternode-payments.cpp b/src/masternode-payments.cpp
index 38280fe84d73..0c654ac284df 100644
--- a/src/masternode-payments.cpp
+++ b/src/masternode-payments.cpp
@@ -248,8 +248,7 @@ void FillBlockPayments(CMutableTransaction& txNew, int nBlockHeight, CAmount blo
     }
 
     if (!mnpayments.GetMasternodeTxOuts(nBlockHeight, blockReward, voutMasternodePaymentsRet)) {
-        // no idea whom to pay (MN list empty?), lets hope for the best
-        return;
+        LogPrint("mnpayments", "%s -- no masternode to pay (MN list probably empty)\n", __func__);
     }
 
     txNew.vout.insert(txNew.vout.end(), voutMasternodePaymentsRet.begin(), voutMasternodePaymentsRet.end());
@@ -366,7 +365,10 @@ bool CMasternodePayments::GetMasternodeTxOuts(int nBlockHeight, CAmount blockRew
     voutMasternodePaymentsRet.clear();
 
     if(!GetBlockTxOuts(nBlockHeight, blockReward, voutMasternodePaymentsRet)) {
-        assert(!deterministicMNManager->IsDeterministicMNsSporkActive(nBlockHeight));
+        if (deterministicMNManager->IsDeterministicMNsSporkActive(nBlockHeight)) {
+            LogPrintf("CMasternodePayments::%s -- deterministic masternode lists enabled and no payee\n", __func__);
+            return false;
+        }
 
         // no masternode detected...
         int nCount = 0;

From 50f133ad0a8c7756fc124a3f5997934b626bcea0 Mon Sep 17 00:00:00 2001
From: Anton Suprunchuk <antouhou@gmail.com>
Date: Tue, 30 Oct 2018 09:59:32 +0000
Subject: [PATCH 224/400] Add merkle tree and coinbase transaction to the
 `protx diff` rpc command (#2392)

---
 src/evo/simplifiedmns.cpp | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/evo/simplifiedmns.cpp b/src/evo/simplifiedmns.cpp
index 3b590c9ecf7e..febdefef5832 100644
--- a/src/evo/simplifiedmns.cpp
+++ b/src/evo/simplifiedmns.cpp
@@ -2,6 +2,7 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
+#include "core_io.h"
 #include "simplifiedmns.h"
 #include "specialtx.h"
 #include "deterministicmns.h"
@@ -84,6 +85,12 @@ void CSimplifiedMNListDiff::ToJson(UniValue& obj) const
     obj.push_back(Pair("baseBlockHash", baseBlockHash.ToString()));
     obj.push_back(Pair("blockHash", blockHash.ToString()));
 
+    CDataStream ssCbTxMerkleTree(SER_NETWORK, PROTOCOL_VERSION);
+    ssCbTxMerkleTree << cbTxMerkleTree;
+    obj.push_back(Pair("cbTxMerkleTree", HexStr(ssCbTxMerkleTree.begin(), ssCbTxMerkleTree.end())));
+
+    obj.push_back(Pair("cbTx", EncodeHexTx(*cbTx)));
+
     UniValue deletedMNsArr(UniValue::VARR);
     for (const auto& h : deletedMNs) {
         deletedMNsArr.push_back(h.ToString());

From 4a78b161ffe7e94819df4034a2221cc4655419ce Mon Sep 17 00:00:00 2001
From: UdjinM6 <UdjinM6@users.noreply.github.com>
Date: Tue, 30 Oct 2018 12:59:50 +0300
Subject: [PATCH 225/400] PrivateSend spending txes should have "outgoing" icon
 on overview screen (#2396)

---
 src/qt/transactiontablemodel.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/qt/transactiontablemodel.cpp b/src/qt/transactiontablemodel.cpp
index db16222d9149..342e44851c07 100644
--- a/src/qt/transactiontablemodel.cpp
+++ b/src/qt/transactiontablemodel.cpp
@@ -410,6 +410,7 @@ QVariant TransactionTableModel::txAddressDecoration(const TransactionRecord *wtx
     case TransactionRecord::RecvWithAddress:
     case TransactionRecord::RecvFromOther:
         return QIcon(":/icons/" + theme + "/tx_input");
+    case TransactionRecord::PrivateSend:
     case TransactionRecord::SendToAddress:
     case TransactionRecord::SendToOther:
         return QIcon(":/icons/" + theme + "/tx_output");

From c6cf4d9a479cffc125b6adf06930430fe1c60ec9 Mon Sep 17 00:00:00 2001
From: UdjinM6 <UdjinM6@users.noreply.github.com>
Date: Tue, 30 Oct 2018 13:00:04 +0300
Subject: [PATCH 226/400] Relay txes through MN network faster than through
 regular nodes (#2397)

* Half the delay for relaying txes to Masternode outbound peers comparing to regular ones

* No delay for relaying txes if our node is a Masternode
---
 src/net_processing.cpp | 9 ++++++---
 src/validation.h       | 3 ++-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/net_processing.cpp b/src/net_processing.cpp
index 6c38e19f9acd..908e0ba42a68 100644
--- a/src/net_processing.cpp
+++ b/src/net_processing.cpp
@@ -3343,11 +3343,14 @@ bool SendMessages(CNode* pto, CConnman& connman, const std::atomic<bool>& interr
             pto->vInventoryBlockToSend.clear();
 
             // Check whether periodic sends should happen
-            bool fSendTrickle = pto->fWhitelisted;
+            // Note: If this node is running in a Masternode mode, it makes no sense to delay outgoing txes
+            // because we never produce any txes ourselves i.e. no privacy is lost in this case.
+            bool fSendTrickle = pto->fWhitelisted || fMasternodeMode;
             if (pto->nNextInvSend < nNow) {
                 fSendTrickle = true;
-                // Use half the delay for outbound peers, as there is less privacy concern for them.
-                pto->nNextInvSend = PoissonNextSend(nNow, INVENTORY_BROADCAST_INTERVAL >> !pto->fInbound);
+                // Use half the delay for regular outbound peers, as there is less privacy concern for them,
+                // and quarter the delay for Masternode outbound peers, as there is even less privacy concern in this case.
+                pto->nNextInvSend = PoissonNextSend(nNow, INVENTORY_BROADCAST_INTERVAL >> !pto->fInbound >> pto->fMasternode);
             }
 
             // Time to send but the peer has requested we not relay transactions.
diff --git a/src/validation.h b/src/validation.h
index c11999026875..2577a8a0071e 100644
--- a/src/validation.h
+++ b/src/validation.h
@@ -112,7 +112,8 @@ static const unsigned int AVG_LOCAL_ADDRESS_BROADCAST_INTERVAL = 24 * 24 * 60;
 /** Average delay between peer address broadcasts in seconds. */
 static const unsigned int AVG_ADDRESS_BROADCAST_INTERVAL = 30;
 /** Average delay between trickled inventory transmissions in seconds.
- *  Blocks and whitelisted receivers bypass this, outbound peers get half this delay. */
+ *  Blocks and whitelisted receivers bypass this, regular outbound peers get half this delay,
+ *  Masternode outbound peers get quarter this delay. */
 static const unsigned int INVENTORY_BROADCAST_INTERVAL = 5;
 /** Maximum number of inventory items to send per transmission.
  *  Limits the impact of low-fee transaction floods.

From 13f2eb449874e80257b4ab385d9a90a286e8d5bc Mon Sep 17 00:00:00 2001
From: UdjinM6 <UdjinM6@users.noreply.github.com>
Date: Tue, 30 Oct 2018 13:00:21 +0300
Subject: [PATCH 227/400] Force fvisibility=hidden when compiling on macos
 (#2398)

This should remove tons of warnings about mismatching visibility
---
 depends/builders/darwin.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/depends/builders/darwin.mk b/depends/builders/darwin.mk
index 27f550ab036a..d15d6feea6f4 100644
--- a/depends/builders/darwin.mk
+++ b/depends/builders/darwin.mk
@@ -11,7 +11,7 @@ build_darwin_DOWNLOAD = curl --location --fail --connect-timeout $(DOWNLOAD_CONN
 
 #darwin host on darwin builder. overrides darwin host preferences.
 darwin_CC=$(shell xcrun -f clang) -mmacosx-version-min=$(OSX_MIN_VERSION)
-darwin_CXX:=$(shell xcrun -f clang++) -mmacosx-version-min=$(OSX_MIN_VERSION) -stdlib=libc++
+darwin_CXX:=$(shell xcrun -f clang++) -mmacosx-version-min=$(OSX_MIN_VERSION) -stdlib=libc++ -fvisibility=hidden
 darwin_AR:=$(shell xcrun -f ar)
 darwin_RANLIB:=$(shell xcrun -f ranlib)
 darwin_STRIP:=$(shell xcrun -f strip)

From c8804ea5a904f2d1b83b085d84beae8a369ea846 Mon Sep 17 00:00:00 2001
From: UdjinM6 <UdjinM6@users.noreply.github.com>
Date: Tue, 30 Oct 2018 13:00:37 +0300
Subject: [PATCH 228/400] Do not ignore patches in depends (#2399)

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 54ee8b6b5a10..204c463e7457 100644
--- a/.gitignore
+++ b/.gitignore
@@ -62,6 +62,7 @@ libconftest.dylib*
 *.o
 *.o-*
 *.patch
+!depends/patches/*/*.patch
 *.a
 *.pb.cc
 *.pb.h

From 052af81b4bd0d236c2e9ca0d4911bf38c2715eb9 Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Wed, 31 Oct 2018 10:57:14 +0100
Subject: [PATCH 229/400] Ensure correct order of destruction for BLS secure
 allocator (#2401)

Uses the same trick as LockedPoolManager::Instance()
---
 src/bls/bls.cpp | 23 ++++++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)

diff --git a/src/bls/bls.cpp b/src/bls/bls.cpp
index 8de75f42b28a..caba36f9758c 100644
--- a/src/bls/bls.cpp
+++ b/src/bls/bls.cpp
@@ -425,11 +425,28 @@ bool CBLSSignature::Recover(const std::vector<CBLSSignature>& sigs, const std::v
 
 #ifndef BUILD_BITCOIN_INTERNAL
 
-static mt_pooled_secure_allocator<uint8_t> g_blsSecureAllocator(sizeof(bn_t) + sizeof(size_t));
+static std::once_flag init_flag;
+static mt_pooled_secure_allocator<uint8_t>* secure_allocator_instance;
+static void create_secure_allocator()
+{
+    // make sure LockedPoolManager is initialized first (ensures destruction order)
+    LockedPoolManager::Instance();
+
+    // static variable in function scope ensures it's initialized when first accessed
+    // and destroyed before LockedPoolManager
+    static mt_pooled_secure_allocator<uint8_t> a(sizeof(bn_t) + sizeof(size_t));
+    secure_allocator_instance = &a;
+}
+
+static mt_pooled_secure_allocator<uint8_t>& get_secure_allocator()
+{
+    std::call_once(init_flag, create_secure_allocator);
+    return *secure_allocator_instance;
+}
 
 static void* secure_allocate(size_t n)
 {
-    uint8_t* ptr = g_blsSecureAllocator.allocate(n + sizeof(size_t));
+    uint8_t* ptr = get_secure_allocator().allocate(n + sizeof(size_t));
     *(size_t*)ptr = n;
     return ptr + sizeof(size_t);
 }
@@ -442,7 +459,7 @@ static void secure_free(void* p)
 
     uint8_t* ptr = (uint8_t*)p - sizeof(size_t);
     size_t n = *(size_t*)ptr;
-    return g_blsSecureAllocator.deallocate(ptr, n);
+    return get_secure_allocator().deallocate(ptr, n);
 }
 #endif
 

From 70eb710b12e1cbcc28677e9ab1ef90bfc7a0b611 Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Wed, 31 Oct 2018 10:58:02 +0100
Subject: [PATCH 230/400] Undefine DOUBLE after include Chia BLS headers
 (#2400)

These cause compilation errors on some platforms.
Observed this when I tried to cross compile win32
locally on a Debian Stretch machine.
---
 src/bls/bls.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/bls/bls.h b/src/bls/bls.h
index 0072f90f24ab..c50a96ee11ec 100644
--- a/src/bls/bls.h
+++ b/src/bls/bls.h
@@ -15,6 +15,7 @@
 #include <chiabls/privatekey.hpp>
 #include <chiabls/publickey.hpp>
 #include <chiabls/signature.hpp>
+#undef DOUBLE
 
 #include <array>
 #include <unistd.h>

From 6560ac64b3997b0ebc2784b2002213d4af2e8fd2 Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Thu, 1 Nov 2018 07:41:16 +0100
Subject: [PATCH 231/400] Properly escape $ in Jenkinsfile.gitian (#2404)

---
 Jenkinsfile.gitian | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Jenkinsfile.gitian b/Jenkinsfile.gitian
index e6d4a66ade0f..f695706fb9d6 100644
--- a/Jenkinsfile.gitian
+++ b/Jenkinsfile.gitian
@@ -102,10 +102,10 @@ for(int i = 0; i < targets.size(); i++) {
                 tail -F var/install.log &
                 tail -F var/build.log &
                 USE_DOCKER=1 ./bin/gbuild -j ${proc} -m ${mem} --commit dash=${commit} --url dash=${repositoryUrl} ../dash/contrib/gitian-descriptors/gitian-${target}.yml
-                RET=$?
+                RET=\$?
                 # give the above tail calls enough time to print everything on failure
                 sleep 2s
-                exit $RET
+                exit \$RET
               """
             } finally {
               // make sure it doesn't run forever

From 30a2b283a83f63dbf58182cd2a7e0d26255d306e Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Thu, 1 Nov 2018 22:57:10 +0100
Subject: [PATCH 232/400] Sign ProRegTx collaterals with a string message
 instead of payload hash, split `protx register` into `prepare`/`submit`
 (#2395)

---
 qa/rpc-tests/dip3-deterministicmns.py |   6 +-
 src/evo/providertx.cpp                |  77 ++++++++++----
 src/evo/providertx.h                  |   4 +
 src/rpc/rpcevo.cpp                    | 146 +++++++++++++++++++++-----
 4 files changed, 181 insertions(+), 52 deletions(-)

diff --git a/qa/rpc-tests/dip3-deterministicmns.py b/qa/rpc-tests/dip3-deterministicmns.py
index 9858c85c719c..84450102f448 100755
--- a/qa/rpc-tests/dip3-deterministicmns.py
+++ b/qa/rpc-tests/dip3-deterministicmns.py
@@ -332,7 +332,7 @@ def create_mn_protx_fund(self, node, idx, alias):
         mn = self.create_mn_protx_base(node, idx, alias)
         mn.collateral_address = node.getnewaddress()
 
-        mn.protx_hash = node.protx('fund_register', mn.collateral_address, '127.0.0.1:%d' % mn.p2p_port, mn.ownerAddr, mn.operatorAddr, mn.votingAddr, 0, mn.collateral_address)
+        mn.protx_hash = node.protx('register_fund', mn.collateral_address, '127.0.0.1:%d' % mn.p2p_port, mn.ownerAddr, mn.operatorAddr, mn.votingAddr, 0, mn.collateral_address)
         mn.collateral_txid = mn.protx_hash
         mn.collateral_vout = -1
 
@@ -620,13 +620,13 @@ def test_fail_create_protx(self, node):
         address = node.getnewaddress()
         key = node.getnewaddress()
         blsKey = node.bls('generate')
-        assert_raises_jsonrpc(None, "bad-tx-type", node.protx, 'fund_register', address, '127.0.0.1:10000', key, blsKey['public'], key, 0, address)
+        assert_raises_jsonrpc(None, "bad-tx-type", node.protx, 'register_fund', address, '127.0.0.1:10000', key, blsKey['public'], key, 0, address)
 
     def test_success_create_protx(self, node):
         address = node.getnewaddress()
         key = node.getnewaddress()
         blsKey = node.bls('generate')
-        txid = node.protx('fund_register', address, '127.0.0.1:10000', key, blsKey['public'], key, 0, address)
+        txid = node.protx('register_fund', address, '127.0.0.1:10000', key, blsKey['public'], key, 0, address)
         rawtx = node.getrawtransaction(txid, 1)
         self.mine_double_spend(node, rawtx['vin'], address, use_mnmerkleroot_from_tip=True)
         self.sync_all()
diff --git a/src/evo/providertx.cpp b/src/evo/providertx.cpp
index 67e112d15294..9d2222d28e53 100644
--- a/src/evo/providertx.cpp
+++ b/src/evo/providertx.cpp
@@ -42,7 +42,7 @@ static bool CheckService(const uint256& proTxHash, const ProTx& proTx, const CBl
 }
 
 template <typename ProTx>
-static bool CheckSig(const ProTx& proTx, const CKeyID& keyID, CValidationState& state)
+static bool CheckHashSig(const ProTx& proTx, const CKeyID& keyID, CValidationState& state)
 {
     std::string strError;
     if (!CHashSigner::VerifyHash(::SerializeHash(proTx), keyID, proTx.vchSig, strError)) {
@@ -52,7 +52,17 @@ static bool CheckSig(const ProTx& proTx, const CKeyID& keyID, CValidationState&
 }
 
 template <typename ProTx>
-static bool CheckSig(const ProTx& proTx, const CBLSPublicKey& pubKey, CValidationState& state)
+static bool CheckStringSig(const ProTx& proTx, const CKeyID& keyID, CValidationState& state)
+{
+    std::string strError;
+    if (!CMessageSigner::VerifyMessage(keyID, proTx.vchSig,  proTx.MakeSignString(), strError)) {
+        return state.DoS(100, false, REJECT_INVALID, "bad-protx-sig", false, strError);
+    }
+    return true;
+}
+
+template <typename ProTx>
+static bool CheckHashSig(const ProTx& proTx, const CBLSPublicKey& pubKey, CValidationState& state)
 {
     if (!proTx.sig.VerifyInsecure(pubKey, ::SerializeHash(proTx))) {
         return state.DoS(100, false, REJECT_INVALID, "bad-protx-sig", false);
@@ -71,20 +81,6 @@ static bool CheckInputsHash(const CTransaction &tx, const ProTx& proTx, CValidat
     return true;
 }
 
-template <typename ProTx, typename PubKey>
-static bool CheckInputsHashAndSig(const CTransaction &tx, const ProTx& proTx, const PubKey& pubKey, CValidationState& state)
-{
-    if (!CheckInputsHash(tx, proTx, state)) {
-        return false;
-    }
-
-    if (!CheckSig(proTx, pubKey, state)) {
-        return false;
-    }
-
-    return true;
-}
-
 bool CheckProRegTx(const CTransaction& tx, const CBlockIndex* pindexPrev, CValidationState& state)
 {
     AssertLockHeld(cs_main);
@@ -186,9 +182,13 @@ bool CheckProRegTx(const CTransaction& tx, const CBlockIndex* pindexPrev, CValid
         }
     }
 
+    if (!CheckInputsHash(tx, ptx, state)) {
+        return false;
+    }
+
     if (!keyForPayloadSig.IsNull()) {
         // collateral is not part of this ProRegTx, so we must verify ownership of the collateral
-        if (!CheckInputsHashAndSig(tx, ptx, keyForPayloadSig, state)) {
+        if (!CheckStringSig(ptx, keyForPayloadSig, state)) {
             return false;
         }
     } else {
@@ -196,9 +196,6 @@ bool CheckProRegTx(const CTransaction& tx, const CBlockIndex* pindexPrev, CValid
         if (!ptx.vchSig.empty()) {
             return state.DoS(100, false, REJECT_INVALID, "bad-protx-sig");
         }
-        if (!CheckInputsHash(tx, ptx, state)) {
-            return false;
-        }
     }
 
     return true;
@@ -240,7 +237,10 @@ bool CheckProUpServTx(const CTransaction& tx, const CBlockIndex* pindexPrev, CVa
         }
 
         // we can only check the signature if pindexPrev != NULL and the MN is known
-        if (!CheckInputsHashAndSig(tx, ptx, mn->pdmnState->pubKeyOperator, state)) {
+        if (!CheckInputsHash(tx, ptx, state)) {
+            return false;
+        }
+        if (!CheckHashSig(ptx, mn->pdmnState->pubKeyOperator, state)) {
             return false;
         }
     }
@@ -313,7 +313,10 @@ bool CheckProUpRegTx(const CTransaction& tx, const CBlockIndex* pindexPrev, CVal
             }
         }
 
-        if (!CheckInputsHashAndSig(tx, ptx, dmn->pdmnState->keyIDOwner, state)) {
+        if (!CheckInputsHash(tx, ptx, state)) {
+            return false;
+        }
+        if (!CheckHashSig(ptx, dmn->pdmnState->keyIDOwner, state)) {
             return false;
         }
     }
@@ -346,13 +349,41 @@ bool CheckProUpRevTx(const CTransaction& tx, const CBlockIndex* pindexPrev, CVal
         if (!dmn)
             return state.DoS(100, false, REJECT_INVALID, "bad-protx-hash");
 
-        if (!CheckInputsHashAndSig(tx, ptx, dmn->pdmnState->pubKeyOperator, state))
+        if (!CheckInputsHash(tx, ptx, state))
+            return false;
+        if (!CheckHashSig(ptx, dmn->pdmnState->pubKeyOperator, state))
             return false;
     }
 
     return true;
 }
 
+std::string CProRegTx::MakeSignString() const
+{
+    std::string s;
+
+    // We only include the important stuff in the string form...
+
+    CTxDestination destPayout;
+    CBitcoinAddress addrPayout;
+    std::string strPayout;
+    if (ExtractDestination(scriptPayout, destPayout) && addrPayout.Set(destPayout)) {
+        strPayout = addrPayout.ToString();
+    } else {
+        strPayout = HexStr(scriptPayout.begin(), scriptPayout.end());
+    }
+
+    s += strPayout + "|";
+    s += strprintf("%d", nOperatorReward) + "|";
+    s += CBitcoinAddress(keyIDOwner).ToString() + "|";
+    s += CBitcoinAddress(keyIDVoting).ToString() + "|";
+
+    // ... and also the full hash of the payload as a protection agains malleability and replays
+    s += ::SerializeHash(*this).ToString();
+
+    return s;
+}
+
 std::string CProRegTx::ToString() const
 {
     CTxDestination dest;
diff --git a/src/evo/providertx.h b/src/evo/providertx.h
index a0a451efc995..e105f2c9547b 100644
--- a/src/evo/providertx.h
+++ b/src/evo/providertx.h
@@ -56,6 +56,10 @@ class CProRegTx
         }
     }
 
+    // When signing with the collateral key, we don't sign the hash but a generated message instead
+    // This is needed for HW wallet support which can only sign text messages as of now
+    std::string MakeSignString() const;
+
     std::string ToString() const;
     void ToJson(UniValue& obj) const;
 };
diff --git a/src/rpc/rpcevo.cpp b/src/rpc/rpcevo.cpp
index 214ac1848f94..01a40816eee8 100644
--- a/src/rpc/rpcevo.cpp
+++ b/src/rpc/rpcevo.cpp
@@ -125,7 +125,7 @@ static void UpdateSpecialTxInputsHash(const CMutableTransaction& tx, SpecialTxPa
 }
 
 template<typename SpecialTxPayload>
-static void SignSpecialTxPayload(const CMutableTransaction& tx, SpecialTxPayload& payload, const CKey& key)
+static void SignSpecialTxPayloadByHash(const CMutableTransaction& tx, SpecialTxPayload& payload, const CKey& key)
 {
     UpdateSpecialTxInputsHash(tx, payload);
     payload.vchSig.clear();
@@ -137,7 +137,19 @@ static void SignSpecialTxPayload(const CMutableTransaction& tx, SpecialTxPayload
 }
 
 template<typename SpecialTxPayload>
-static void SignSpecialTxPayload(const CMutableTransaction& tx, SpecialTxPayload& payload, const CBLSSecretKey& key)
+static void SignSpecialTxPayloadByString(const CMutableTransaction& tx, SpecialTxPayload& payload, const CKey& key)
+{
+    UpdateSpecialTxInputsHash(tx, payload);
+    payload.vchSig.clear();
+
+    std::string m = payload.MakeSignString();
+    if (!CMessageSigner::SignMessage(m, payload.vchSig, key)) {
+        throw JSONRPCError(RPC_INTERNAL_ERROR, "failed to sign special tx");
+    }
+}
+
+template<typename SpecialTxPayload>
+static void SignSpecialTxPayloadByHash(const CMutableTransaction& tx, SpecialTxPayload& payload, const CBLSSecretKey& key)
 {
     UpdateSpecialTxInputsHash(tx, payload);
 
@@ -168,10 +180,10 @@ static std::string SignAndSendSpecialTx(const CMutableTransaction& tx)
     return sendrawtransaction(sendRequest).get_str();
 }
 
-void protx_fund_register_help()
+void protx_register_fund_help()
 {
     throw std::runtime_error(
-            "protx fund_register \"collateralAddress\" \"ipAndPort\" \"ownerKeyAddr\" \"operatorKeyAddr\" \"votingKeyAddr\" operatorReward \"payoutAddress\"\n"
+            "protx register_fund \"collateralAddress\" \"ipAndPort\" \"ownerKeyAddr\" \"operatorKeyAddr\" \"votingKeyAddr\" operatorReward \"payoutAddress\"\n"
             "\nCreates, funds and sends a ProTx to the network. The resulting transaction will move 1000 Dash\n"
             "to the address specified by collateralAddress and will then function as the collateral of your\n"
             "masternode.\n"
@@ -195,7 +207,7 @@ void protx_fund_register_help()
             "7. \"payoutAddress\"       (string, required) The dash address to use for masternode reward payments\n"
             "                         Must match \"collateralAddress\"."
             "\nExamples:\n"
-            + HelpExampleCli("protx", "fund_register \"XrVhS9LogauRJGJu2sHuryjhpuex4RNPSb\" \"1.2.3.4:1234\" \"Xt9AMWaYSz7tR7Uo7gzXA3m4QmeWgrR3rr\" \"93746e8731c57f87f79b3620a7982924e2931717d49540a85864bd543de11c43fb868fd63e501a1db37e19ed59ae6db4\" \"Xt9AMWaYSz7tR7Uo7gzXA3m4QmeWgrR3rr\" 0 \"XrVhS9LogauRJGJu2sHuryjhpuex4RNPSb\"")
+            + HelpExampleCli("protx", "register_fund \"XrVhS9LogauRJGJu2sHuryjhpuex4RNPSb\" \"1.2.3.4:1234\" \"Xt9AMWaYSz7tR7Uo7gzXA3m4QmeWgrR3rr\" \"93746e8731c57f87f79b3620a7982924e2931717d49540a85864bd543de11c43fb868fd63e501a1db37e19ed59ae6db4\" \"Xt9AMWaYSz7tR7Uo7gzXA3m4QmeWgrR3rr\" 0 \"XrVhS9LogauRJGJu2sHuryjhpuex4RNPSb\"")
     );
 }
 
@@ -203,27 +215,66 @@ void protx_register_help()
 {
     throw std::runtime_error(
             "protx register \"collateralHash\" collateralIndex \"ipAndPort\" \"ownerKeyAddr\" \"operatorKeyAddr\" \"votingKeyAddr\" operatorReward \"payoutAddress\"\n"
-            "\nSame as \"protx fund_register\", but with an externally referenced collateral.\n"
+            "\nSame as \"protx register_fund\", but with an externally referenced collateral.\n"
             "The collateral is specified through \"collateralHash\" and \"collateralIndex\" and must be an unspent\n"
             "transaction output. It must also not be used by any other masternode.\n"
             "\nArguments:\n"
             "1. \"collateralHash\"     (string, required) The collateral transaction hash.\n"
             "2. collateralIndex      (numeric, required) The collateral transaction output index.\n"
-            "3., 4., 5. ...          See help text of \"protx fund_register\"\n"
+            "3., 4., 5. ...          See help text of \"protx register_fund\"\n"
             "\nExamples:\n"
             + HelpExampleCli("protx", "register \"0123456701234567012345670123456701234567012345670123456701234567\" 0 \"1.2.3.4:1234\" \"Xt9AMWaYSz7tR7Uo7gzXA3m4QmeWgrR3rr\" \"Xt9AMWaYSz7tR7Uo7gzXA3m4QmeWgrR3rr\" \"Xt9AMWaYSz7tR7Uo7gzXA3m4QmeWgrR3rr\" 0 \"XrVhS9LogauRJGJu2sHuryjhpuex4RNPSb\"")
     );
 }
 
-// handles register and fund_register in one method
+void protx_register_prepare_help()
+{
+    throw std::runtime_error(
+            "protx register_prepare \"collateralHash\" collateralIndex \"ipAndPort\" \"ownerKeyAddr\" \"operatorKeyAddr\" \"votingKeyAddr\" operatorReward \"payoutAddress\"\n"
+            "\nCreates an unsigned ProTx and returns it. The ProTx must be signed externally with the collateral\n"
+            "key and then passed to \"protx register_submit\". The prepared transaction will also contain inputs\n"
+            "and outputs to cover fees.\n"
+            "\nArguments:\n"
+            "1., 2., 3., ...         See help text of \"protx register_fund\".\n"
+            "\nResult:\n"
+            "{                         (json object)\n"
+            "  \"tx\" :                  (string) The serialized ProTx in hex format.\n"
+            "  \"collateralAddress\" :   (string) The collateral address.\n"
+            "  \"signMessage\" :         (string) The string message that needs to be signed with\n"
+            "                          the collateral key.\n"
+            "}\n"
+            "\nExamples:\n"
+            + HelpExampleCli("protx", "register_prepare \"XrVhS9LogauRJGJu2sHuryjhpuex4RNPSb\" \"1.2.3.4:1234\" \"Xt9AMWaYSz7tR7Uo7gzXA3m4QmeWgrR3rr\" \"93746e8731c57f87f79b3620a7982924e2931717d49540a85864bd543de11c43fb868fd63e501a1db37e19ed59ae6db4\" \"Xt9AMWaYSz7tR7Uo7gzXA3m4QmeWgrR3rr\" 0 \"XrVhS9LogauRJGJu2sHuryjhpuex4RNPSb\"")
+    );
+}
+
+void protx_register_submit_help()
+{
+    throw std::runtime_error(
+            "protx register_submit \"tx\" \"sig\"\n"
+            "\nSubmits the specified ProTx to the network. This command will also sign the inputs of the transaction\n"
+            "which were previously added by \"protx register_prepare\" to cover transaction fees\n"
+            "\nArguments:\n"
+            "1. \"tx\"                 (string, required) The serialized transaction previosly returned by \"protx register_prepare\"\n"
+            "2. \"sig\"                (string, required) The signature signed with the collateral key. Must be in base64 format.\n"
+            "\nExamples:\n"
+            + HelpExampleCli("protx", "register_submit \"tx\" \"sig\"")
+    );
+}
+
+// handles register, register_prepare and register_fund in one method
 UniValue protx_register(const JSONRPCRequest& request)
 {
-    bool isFundRegister = request.params[0].get_str() == "fund_register";
+    bool isExternalRegister = request.params[0].get_str() == "register";
+    bool isFundRegister = request.params[0].get_str() == "register_fund";
+    bool isPrepareRegister = request.params[0].get_str() == "register_prepare";
 
     if (isFundRegister && (request.fHelp || request.params.size() != 8)) {
-        protx_fund_register_help();
-    } else if (!isFundRegister && (request.fHelp || request.params.size() != 9)) {
+        protx_register_fund_help();
+    } else if (isExternalRegister && (request.fHelp || request.params.size() != 9)) {
         protx_register_help();
+    } else if (isPrepareRegister && (request.fHelp || request.params.size() != 9)) {
+        protx_register_prepare_help();
     }
 
     size_t paramIdx = 1;
@@ -297,8 +348,8 @@ UniValue protx_register(const JSONRPCRequest& request)
         ptx.vchSig.resize(65);
     }
 
-    UpdateSpecialTxInputsHash(tx, ptx);
     FundSpecialTx(tx, ptx);
+    UpdateSpecialTxInputsHash(tx, ptx);
 
     if (isFundRegister) {
         uint32_t collateralIndex = (uint32_t) -1;
@@ -310,12 +361,11 @@ UniValue protx_register(const JSONRPCRequest& request)
         }
         assert(collateralIndex != (uint32_t) -1);
         ptx.collateralOutpoint.n = collateralIndex;
-    }
 
-    if (isFundRegister) {
-        UpdateSpecialTxInputsHash(tx, ptx);
+        SetTxPayload(tx, ptx);
+        return SignAndSendSpecialTx(tx);
     } else {
-        // referencing external collateral, so lets prove we own it
+        // referencing external collateral
 
         Coin coin;
         if (!GetUTXOCoin(ptx.collateralOutpoint, coin)) {
@@ -326,14 +376,54 @@ UniValue protx_register(const JSONRPCRequest& request)
         if (!ExtractDestination(coin.out.scriptPubKey, txDest) || !CBitcoinAddress(txDest).GetKeyID(keyID)) {
             throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, strprintf("collateral type not supported: %s", ptx.collateralOutpoint.ToStringShort()));
         }
-        CKey key;
-        if (!pwalletMain->GetKey(keyID, key)) {
-            throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, strprintf("collateral key not in wallet: %s", CBitcoinAddress(keyID).ToString()));
+
+        if (isPrepareRegister) {
+            // external signing with collateral key
+            ptx.vchSig.clear();
+            SetTxPayload(tx, ptx);
+
+            UniValue ret(UniValue::VOBJ);
+            ret.push_back(Pair("tx", EncodeHexTx(tx)));
+            ret.push_back(Pair("collateralAddress", CBitcoinAddress(txDest).ToString()));
+            ret.push_back(Pair("signMessage", ptx.MakeSignString()));
+            return ret;
+        } else {
+            // lets prove we own the collateral
+            CKey key;
+            if (!pwalletMain->GetKey(keyID, key)) {
+                throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, strprintf("collateral key not in wallet: %s", CBitcoinAddress(keyID).ToString()));
+            }
+            SignSpecialTxPayloadByString(tx, ptx, key);
+            SetTxPayload(tx, ptx);
+            return SignAndSendSpecialTx(tx);
         }
-        SignSpecialTxPayload(tx, ptx, key);
     }
-    SetTxPayload(tx, ptx);
+}
+
+UniValue protx_register_submit(const JSONRPCRequest& request)
+{
+    if (request.fHelp || request.params.size() != 3) {
+        protx_register_submit_help();
+    }
 
+    CMutableTransaction tx;
+    if (!DecodeHexTx(tx, request.params[1].get_str())) {
+        throw JSONRPCError(RPC_INVALID_PARAMETER, "transaction not deserializable");
+    }
+    if (tx.nType != TRANSACTION_PROVIDER_REGISTER) {
+        throw JSONRPCError(RPC_INVALID_PARAMETER, "transaction not a ProRegTx");
+    }
+    CProRegTx ptx;
+    if (!GetTxPayload(tx, ptx)) {
+        throw JSONRPCError(RPC_INVALID_PARAMETER, "transaction payload not deserializable");
+    }
+    if (!ptx.vchSig.empty()) {
+        throw JSONRPCError(RPC_INVALID_PARAMETER, "payload signature not empty");
+    }
+
+    ptx.vchSig = DecodeBase64(request.params[2].get_str().c_str());
+
+    SetTxPayload(tx, ptx);
     return SignAndSendSpecialTx(tx);
 }
 
@@ -394,7 +484,7 @@ UniValue protx_update_service(const JSONRPCRequest& request)
     tx.nType = TRANSACTION_PROVIDER_UPDATE_SERVICE;
 
     FundSpecialTx(tx, ptx);
-    SignSpecialTxPayload(tx, ptx, keyOperator);
+    SignSpecialTxPayloadByHash(tx, ptx, keyOperator);
     SetTxPayload(tx, ptx);
 
     return SignAndSendSpecialTx(tx);
@@ -464,7 +554,7 @@ UniValue protx_update_registrar(const JSONRPCRequest& request)
     tx.nType = TRANSACTION_PROVIDER_UPDATE_REGISTRAR;
 
     FundSpecialTx(tx, ptx);
-    SignSpecialTxPayload(tx, ptx, keyOwner);
+    SignSpecialTxPayloadByHash(tx, ptx, keyOwner);
     SetTxPayload(tx, ptx);
 
     return SignAndSendSpecialTx(tx);
@@ -523,7 +613,7 @@ UniValue protx_revoke(const JSONRPCRequest& request)
     tx.nType = TRANSACTION_PROVIDER_UPDATE_REVOKE;
 
     FundSpecialTx(tx, ptx);
-    SignSpecialTxPayload(tx, ptx, keyOperator);
+    SignSpecialTxPayloadByHash(tx, ptx, keyOperator);
     SetTxPayload(tx, ptx);
 
     return SignAndSendSpecialTx(tx);
@@ -749,7 +839,9 @@ UniValue protx(const JSONRPCRequest& request)
                 "1. \"command\"        (string, required) The command to execute\n"
                 "\nAvailable commands:\n"
                 "  register          - Create and send ProTx to network\n"
-                "  fund_register     - Fund, create and send ProTx to network\n"
+                "  register_fund     - Fund, create and send ProTx to network\n"
+                "  register_prepare  - Create an unsigned ProTx\n"
+                "  register_submit   - Sign and submit a ProTx\n"
                 "  list              - List ProTxs\n"
                 "  info              - Return information about a ProTx\n"
                 "  update_service    - Create and send ProUpServTx to network\n"
@@ -761,8 +853,10 @@ UniValue protx(const JSONRPCRequest& request)
 
     std::string command = request.params[0].get_str();
 
-    if (command == "fund_register" || command == "register") {
+    if (command == "register" || command == "register_fund" || command == "register_prepare") {
         return protx_register(request);
+    } if (command == "register_submit") {
+        return protx_register_submit(request);
     } else if (command == "list") {
         return protx_list(request);
     } else if (command == "info") {

From 7011fec1b4f82442e68528b3910ea7e94a602470 Mon Sep 17 00:00:00 2001
From: thephez <thephez@users.noreply.github.com>
Date: Thu, 1 Nov 2018 17:57:43 -0400
Subject: [PATCH 233/400] RPC: Add help details for the bls RPC (#2403)

* RPC: Add help details for the bls RPC

* RPC: Refactor to match gobject RPC behavior

* RPC: Use command instead of strCommand for consistency within file

* RPC: BLS help cleanup

* RCP: Remove leading underscore on bls_help
---
 src/rpc/rpcevo.cpp | 38 ++++++++++++++++++++++++++++++++++----
 1 file changed, 34 insertions(+), 4 deletions(-)

diff --git a/src/rpc/rpcevo.cpp b/src/rpc/rpcevo.cpp
index 01a40816eee8..349160a4b70e 100644
--- a/src/rpc/rpcevo.cpp
+++ b/src/rpc/rpcevo.cpp
@@ -875,8 +875,27 @@ UniValue protx(const JSONRPCRequest& request)
 }
 #endif//ENABLE_WALLET
 
+void bls_generate_help()
+{
+    throw std::runtime_error(
+            "bls generate\n"
+            "\nReturns a BLS secret/public key pair.\n"
+            "\nResult:\n"
+            "{\n"
+            "  \"secret\": \"xxxx\",        (string) BLS secret key\n"
+            "  \"public\": \"xxxx\",        (string) BLS public key\n"
+            "}\n"
+            "\nExamples:\n"
+            + HelpExampleCli("bls generate", "")
+    );
+}
+
 UniValue bls_generate(const JSONRPCRequest& request)
 {
+    if (request.fHelp || request.params.size() != 1) {
+        bls_generate_help();
+    }
+
     CBLSSecretKey sk;
     sk.MakeNewKey();
 
@@ -886,12 +905,23 @@ UniValue bls_generate(const JSONRPCRequest& request)
     return ret;
 }
 
+void bls_help()
+{
+    throw std::runtime_error(
+            "bls \"command\" ...\n"
+            "Set of commands to execute BLS related actions.\n"
+            "To get help on individual commands, use \"help bls command\".\n"
+            "\nArguments:\n"
+            "1. \"command\"        (string, required) The command to execute\n"
+            "\nAvailable commands:\n"
+            "  generate          - Create a BLS secret/public key pair\n"
+            );
+}
+
 UniValue _bls(const JSONRPCRequest& request)
 {
     if (request.params.empty()) {
-        throw std::runtime_error(
-                "bls \"command\" ...\n"
-        );
+        bls_help();
     }
 
     std::string command = request.params[0].get_str();
@@ -899,7 +929,7 @@ UniValue _bls(const JSONRPCRequest& request)
     if (command == "generate") {
         return bls_generate(request);
     } else {
-        throw std::runtime_error("invalid command: " + command);
+        bls_help();
     }
 }
 

From 9c455caea9ed62a3fdda699ebfc646690462624b Mon Sep 17 00:00:00 2001
From: UdjinM6 <UdjinM6@users.noreply.github.com>
Date: Fri, 2 Nov 2018 00:58:01 +0300
Subject: [PATCH 234/400] A couple of fixes for init steps (#2405)

* fLiteMode should be set via GetBoolArg before first usage

Also move related stuff to be closer to each other

* Cleanup Dash-specific init steps

* Move deterministicMNManager creation slightly higher for consistensy
---
 src/init.cpp | 47 +++++++++++++++++++++++++----------------------
 1 file changed, 25 insertions(+), 22 deletions(-)

diff --git a/src/init.cpp b/src/init.cpp
index fe87b9417ed7..3aa2596d8388 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -1719,12 +1719,11 @@ bool AppInitMain(boost::thread_group& threadGroup, CScheduler& scheduler)
                 delete evoDb;
 
                 evoDb = new CEvoDB(nEvoDbCache, false, fReindex || fReindexChainState);
-
+                deterministicMNManager = new CDeterministicMNManager(*evoDb);
                 pblocktree = new CBlockTreeDB(nBlockTreeDBCache, false, fReindex);
                 pcoinsdbview = new CCoinsViewDB(nCoinDBCache, false, fReindex || fReindexChainState);
                 pcoinscatcher = new CCoinsViewErrorCatcher(pcoinsdbview);
                 pcoinsTip = new CCoinsViewCache(pcoinscatcher);
-                deterministicMNManager = new CDeterministicMNManager(*evoDb);
 
                 if (fReindex) {
                     pblocktree->WriteReindexing(true);
@@ -1849,7 +1848,20 @@ bool AppInitMain(boost::thread_group& threadGroup, CScheduler& scheduler)
     LogPrintf("No wallet support compiled in!\n");
 #endif
 
-    // ********************************************************* Step 9: data directory maintenance
+    // ********************************************************* Step 9a: check lite mode and load sporks
+
+    // lite mode disables all Dash-specific functionality
+    fLiteMode = GetBoolArg("-litemode", false);
+    LogPrintf("fLiteMode %d\n", fLiteMode);
+
+    if(fLiteMode) {
+        InitWarning(_("You are starting in lite mode, all Dash-specific functionality is disabled."));
+    }
+
+    if((!fLiteMode && fTxIndex == false)
+       && chainparams.NetworkIDString() != CBaseChainParams::REGTEST) { // TODO remove this when pruning is fixed. See https://github.com/dashpay/dash/pull/1817 and https://github.com/dashpay/dash/pull/1743
+        return InitError(_("Transaction index can't be disabled in full mode. Either start with -litemode command line switch or enable transaction index."));
+    }
 
     if (!fLiteMode) {
         uiInterface.InitMessage(_("Loading sporks cache..."));
@@ -1859,6 +1871,8 @@ bool AppInitMain(boost::thread_group& threadGroup, CScheduler& scheduler)
         }
     }
 
+    // ********************************************************* Step 9b: data directory maintenance
+
     // if pruning, unset the service bit and perform the initial blockstore prune
     // after any wallet rescanning has taken place.
     if (fPruneMode) {
@@ -1904,22 +1918,10 @@ bool AppInitMain(boost::thread_group& threadGroup, CScheduler& scheduler)
         uiInterface.NotifyBlockTip.disconnect(BlockNotifyGenesisWait);
     }
 
-    // ********************************************************* Step 11a: setup PrivateSend
+    // ********************************************************* Step 11a: setup Masternode related stuff
     fMasternodeMode = GetBoolArg("-masternode", false);
     // TODO: masternode should have no wallet
 
-    //lite mode disables all Dash-specific functionality
-    fLiteMode = GetBoolArg("-litemode", false);
-
-    if(fLiteMode) {
-        InitWarning(_("You are starting in lite mode, all Dash-specific functionality is disabled."));
-    }
-
-    if((!fLiteMode && fTxIndex == false)
-       && chainparams.NetworkIDString() != CBaseChainParams::REGTEST) { // TODO remove this when pruning is fixed. See https://github.com/dashpay/dash/pull/1817 and https://github.com/dashpay/dash/pull/1743
-        return InitError(_("Transaction index can't be disabled in full mode. Either start with -litemode command line switch or enable transaction index."));
-    }
-
     if(fLiteMode && fMasternodeMode) {
         return InitError(_("You can not start a masternode in lite mode."));
     }
@@ -1990,6 +1992,8 @@ bool AppInitMain(boost::thread_group& threadGroup, CScheduler& scheduler)
         }
     }
 
+    // ********************************************************* Step 11b: setup PrivateSend
+
     privateSendClient.nLiquidityProvider = std::min(std::max((int)GetArg("-liquidityprovider", DEFAULT_PRIVATESEND_LIQUIDITY), MIN_PRIVATESEND_LIQUIDITY), MAX_PRIVATESEND_LIQUIDITY);
     int nMaxRounds = MAX_PRIVATESEND_ROUNDS;
     if(privateSendClient.nLiquidityProvider) {
@@ -2003,12 +2007,7 @@ bool AppInitMain(boost::thread_group& threadGroup, CScheduler& scheduler)
     privateSendClient.nPrivateSendSessions = std::min(std::max((int)GetArg("-privatesendsessions", DEFAULT_PRIVATESEND_SESSIONS), MIN_PRIVATESEND_SESSIONS), MAX_PRIVATESEND_SESSIONS);
     privateSendClient.nPrivateSendRounds = std::min(std::max((int)GetArg("-privatesendrounds", DEFAULT_PRIVATESEND_ROUNDS), MIN_PRIVATESEND_ROUNDS), nMaxRounds);
     privateSendClient.nPrivateSendAmount = std::min(std::max((int)GetArg("-privatesendamount", DEFAULT_PRIVATESEND_AMOUNT), MIN_PRIVATESEND_AMOUNT), MAX_PRIVATESEND_AMOUNT);
-#endif // ENABLE_WALLET
 
-    fEnableInstantSend = GetBoolArg("-enableinstantsend", 1);
-
-    LogPrintf("fLiteMode %d\n", fLiteMode);
-#ifdef ENABLE_WALLET
     LogPrintf("PrivateSend liquidityprovider: %d\n", privateSendClient.nLiquidityProvider);
     LogPrintf("PrivateSend rounds: %d\n", privateSendClient.nPrivateSendRounds);
     LogPrintf("PrivateSend amount: %d\n", privateSendClient.nPrivateSendAmount);
@@ -2016,7 +2015,11 @@ bool AppInitMain(boost::thread_group& threadGroup, CScheduler& scheduler)
 
     CPrivateSend::InitStandardDenominations();
 
-    // ********************************************************* Step 11b: Load cache data
+    // ********************************************************* Step 11c: setup InstantSend
+
+    fEnableInstantSend = GetBoolArg("-enableinstantsend", 1);
+
+    // ********************************************************* Step 11d: Load cache data
 
     // LOAD SERIALIZED DAT FILES INTO DATA CACHES FOR INTERNAL USE
 

From 7e8f07bb92fc56b7c70d00090471f5e914f2afcb Mon Sep 17 00:00:00 2001
From: UdjinM6 <UdjinM6@users.noreply.github.com>
Date: Fri, 2 Nov 2018 00:58:17 +0300
Subject: [PATCH 235/400] A couple of fixes for shutdown sequence (#2406)

* Do not run scheduled DoMaintenance if shutdown was requested

* Don't dump cache files if the load sequence was interrupted

* Stop privatesend and release keys before wallet flush

* fix typo
---
 src/activemasternode.cpp    |  7 +++++++
 src/activemasternode.h      |  2 +-
 src/governance.cpp          |  3 ++-
 src/init.cpp                | 18 ++++++++++++------
 src/instantx.cpp            |  8 ++++++++
 src/instantx.h              |  2 +-
 src/masternode-payments.cpp |  8 ++++++++
 src/masternode-payments.h   |  2 +-
 src/masternode-sync.cpp     |  8 ++++++++
 src/masternode-sync.h       |  2 +-
 src/netfulfilledman.cpp     |  8 ++++++++
 src/netfulfilledman.h       |  2 +-
 12 files changed, 58 insertions(+), 12 deletions(-)

diff --git a/src/activemasternode.cpp b/src/activemasternode.cpp
index bbe47aae8bdd..f1eee8131236 100644
--- a/src/activemasternode.cpp
+++ b/src/activemasternode.cpp
@@ -255,6 +255,13 @@ bool CActiveLegacyMasternodeManager::UpdateSentinelPing(int version)
     return true;
 }
 
+void CActiveLegacyMasternodeManager::DoMaintenance(CConnman &connman)
+{
+    if (ShutdownRequested()) return;
+
+    ManageState(connman);
+}
+
 void CActiveLegacyMasternodeManager::ManageStateInitial(CConnman& connman)
 {
     if (deterministicMNManager->IsDeterministicMNsSporkActive())
diff --git a/src/activemasternode.h b/src/activemasternode.h
index 2101bf3445fc..cbe805b9a488 100644
--- a/src/activemasternode.h
+++ b/src/activemasternode.h
@@ -116,7 +116,7 @@ class CActiveLegacyMasternodeManager
 
     bool UpdateSentinelPing(int version);
 
-    void DoMaintenance(CConnman &connman) { ManageState(connman); }
+    void DoMaintenance(CConnman &connman);
 
 private:
     void ManageStateInitial(CConnman& connman);
diff --git a/src/governance.cpp b/src/governance.cpp
index f0acab6b291d..11633ebedaab 100644
--- a/src/governance.cpp
+++ b/src/governance.cpp
@@ -8,6 +8,7 @@
 #include "governance-object.h"
 #include "governance-validators.h"
 #include "governance-vote.h"
+#include "init.h"
 #include "masternode-sync.h"
 #include "masternode.h"
 #include "masternodeman.h"
@@ -570,7 +571,7 @@ struct sortProposalsByVotes {
 
 void CGovernanceManager::DoMaintenance(CConnman& connman)
 {
-    if (fLiteMode || !masternodeSync.IsSynced()) return;
+    if (fLiteMode || !masternodeSync.IsSynced() || ShutdownRequested()) return;
 
     // CHECK OBJECTS WE'VE ASKED FOR, REMOVE OLD ENTRIES
 
diff --git a/src/init.cpp b/src/init.cpp
index 3aa2596d8388..b9f4a1fba247 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -236,7 +236,18 @@ void PrepareShutdown()
     StopREST();
     StopRPC();
     StopHTTPServer();
+
+    // fRPCInWarmup should be `false` if we completed the loading sequence
+    // before a shutdown request was received
+    std::string statusmessage;
+    bool fRPCInWarmup = RPCIsInWarmup(&statusmessage);
+
 #ifdef ENABLE_WALLET
+    if (!fLiteMode && !fRPCInWarmup) {
+        // Stop PrivateSend, release keys
+        privateSendClient.fEnablePrivateSend = false;
+        privateSendClient.ResetPool();
+    }
     if (pwalletMain)
         pwalletMain->Flush(false);
 #endif
@@ -245,12 +256,7 @@ void PrepareShutdown()
     peerLogic.reset();
     g_connman.reset();
 
-    if (!fLiteMode) {
-#ifdef ENABLE_WALLET
-        // Stop PrivateSend, release keys
-        privateSendClient.fEnablePrivateSend = false;
-        privateSendClient.ResetPool();
-#endif
+    if (!fLiteMode && !fRPCInWarmup) {
         // STORE DATA CACHES INTO SERIALIZED DAT FILES
         CFlatDB<CMasternodeMan> flatdb1("mncache.dat", "magicMasternodeCache");
         flatdb1.Dump(mnodeman);
diff --git a/src/instantx.cpp b/src/instantx.cpp
index aa9274689064..14fa774dc03d 100644
--- a/src/instantx.cpp
+++ b/src/instantx.cpp
@@ -3,6 +3,7 @@
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #include "activemasternode.h"
+#include "init.h"
 #include "instantx.h"
 #include "key.h"
 #include "validation.h"
@@ -920,6 +921,13 @@ std::string CInstantSend::ToString() const
     return strprintf("Lock Candidates: %llu, Votes %llu", mapTxLockCandidates.size(), mapTxLockVotes.size());
 }
 
+void CInstantSend::DoMaintenance()
+{
+    if (ShutdownRequested()) return;
+
+    CheckAndRemove();
+}
+
 bool CInstantSend::CanAutoLock()
 {
     if (!isAutoLockBip9Active) {
diff --git a/src/instantx.h b/src/instantx.h
index 44230bdd12f6..15b60868bafa 100644
--- a/src/instantx.h
+++ b/src/instantx.h
@@ -150,7 +150,7 @@ class CInstantSend
 
     std::string ToString() const;
 
-    void DoMaintenance() { CheckAndRemove(); }
+    void DoMaintenance();
 
     /// checks if we can automatically lock "simple" transactions
     static bool CanAutoLock();
diff --git a/src/masternode-payments.cpp b/src/masternode-payments.cpp
index 0c654ac284df..3ec15f7c1bb0 100644
--- a/src/masternode-payments.cpp
+++ b/src/masternode-payments.cpp
@@ -5,6 +5,7 @@
 #include "activemasternode.h"
 #include "consensus/validation.h"
 #include "governance-classes.h"
+#include "init.h"
 #include "masternode-payments.h"
 #include "masternode-sync.h"
 #include "masternodeman.h"
@@ -1288,3 +1289,10 @@ void CMasternodePayments::UpdatedBlockTip(const CBlockIndex *pindex, CConnman& c
     CheckBlockVotes(nFutureBlock - 1);
     ProcessBlock(nFutureBlock, connman);
 }
+
+void CMasternodePayments::DoMaintenance()
+{
+    if (ShutdownRequested()) return;
+
+    CheckAndRemove();
+}
diff --git a/src/masternode-payments.h b/src/masternode-payments.h
index e1e2eb9eecad..984551c923f4 100644
--- a/src/masternode-payments.h
+++ b/src/masternode-payments.h
@@ -218,7 +218,7 @@ class CMasternodePayments
 
     void UpdatedBlockTip(const CBlockIndex *pindex, CConnman& connman);
 
-    void DoMaintenance() { CheckAndRemove(); }
+    void DoMaintenance();
 };
 
 #endif
diff --git a/src/masternode-sync.cpp b/src/masternode-sync.cpp
index 2581de6ebe90..5cfa2cc1ee6d 100644
--- a/src/masternode-sync.cpp
+++ b/src/masternode-sync.cpp
@@ -4,6 +4,7 @@
 
 #include "activemasternode.h"
 #include "governance.h"
+#include "init.h"
 #include "validation.h"
 #include "masternode-payments.h"
 #include "masternode-sync.h"
@@ -504,3 +505,10 @@ void CMasternodeSync::UpdatedBlockTip(const CBlockIndex *pindexNew, bool fInitia
         SwitchToNextAsset(connman);
     }
 }
+
+void CMasternodeSync::DoMaintenance(CConnman &connman)
+{
+    if (ShutdownRequested()) return;
+
+    ProcessTick(connman);
+}
diff --git a/src/masternode-sync.h b/src/masternode-sync.h
index e0632c267238..2d98c8a1cb10 100644
--- a/src/masternode-sync.h
+++ b/src/masternode-sync.h
@@ -74,7 +74,7 @@ class CMasternodeSync
     void NotifyHeaderTip(const CBlockIndex *pindexNew, bool fInitialDownload, CConnman& connman);
     void UpdatedBlockTip(const CBlockIndex *pindexNew, bool fInitialDownload, CConnman& connman);
 
-    void DoMaintenance(CConnman &connman) { ProcessTick(connman); }
+    void DoMaintenance(CConnman &connman);
 };
 
 #endif
diff --git a/src/netfulfilledman.cpp b/src/netfulfilledman.cpp
index 54888d80d772..4df96b87a0a2 100644
--- a/src/netfulfilledman.cpp
+++ b/src/netfulfilledman.cpp
@@ -3,6 +3,7 @@
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #include "chainparams.h"
+#include "init.h"
 #include "netfulfilledman.h"
 #include "util.h"
 
@@ -73,3 +74,10 @@ std::string CNetFulfilledRequestManager::ToString() const
     info << "Nodes with fulfilled requests: " << (int)mapFulfilledRequests.size();
     return info.str();
 }
+
+void CNetFulfilledRequestManager::DoMaintenance()
+{
+    if (ShutdownRequested()) return;
+
+    CheckAndRemove();
+}
diff --git a/src/netfulfilledman.h b/src/netfulfilledman.h
index 2a67d23eb16e..17503e0be9ae 100644
--- a/src/netfulfilledman.h
+++ b/src/netfulfilledman.h
@@ -45,7 +45,7 @@ class CNetFulfilledRequestManager
 
     std::string ToString() const;
 
-    void DoMaintenance() { CheckAndRemove(); }
+    void DoMaintenance();
 };
 
 #endif

From 1f56600c4b6d2124716a16757244cce558e72e03 Mon Sep 17 00:00:00 2001
From: thephez <thephez@users.noreply.github.com>
Date: Thu, 1 Nov 2018 17:58:36 -0400
Subject: [PATCH 236/400] Trivial: Protx operator reward clarification (#2407)

Add decimal places to clarify:
1. Non-integers are valid (e.g. 3.25)
2. Granularity - anything beyond x.xx is rounded (e.g. 3.259 -> 3.26)

This is due to DIP3 allowing values 0-10000 for operator reward (1/10000
= 0.01%)
---
 src/rpc/rpcevo.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/rpc/rpcevo.cpp b/src/rpc/rpcevo.cpp
index 349160a4b70e..8fe3a37d1ac8 100644
--- a/src/rpc/rpcevo.cpp
+++ b/src/rpc/rpcevo.cpp
@@ -203,7 +203,7 @@ void protx_register_fund_help()
             "                         It has to match the private key which is later used when voting on proposals.\n"
             "                         If set to \"0\" or an empty string, ownerAddr will be used.\n"
             "6. \"operatorReward\"      (numeric, required) The fraction in % to share with the operator. If non-zero,\n"
-            "                         \"ipAndPort\" must be zero as well. The value must be between 0 and 100.\n"
+            "                         \"ipAndPort\" must be zero as well. The value must be between 0.00 and 100.00.\n"
             "7. \"payoutAddress\"       (string, required) The dash address to use for masternode reward payments\n"
             "                         Must match \"collateralAddress\"."
             "\nExamples:\n"
@@ -329,7 +329,7 @@ UniValue protx_register(const JSONRPCRequest& request)
 
     double operatorReward = ParseDoubleV(request.params[paramIdx + 4], "operatorReward");
     if (operatorReward < 0 || operatorReward > 100) {
-        throw JSONRPCError(RPC_INVALID_PARAMETER, "operatorReward must be between 0 and 100");
+        throw JSONRPCError(RPC_INVALID_PARAMETER, "operatorReward must be between 0.00 and 100.00");
     }
     ptx.nOperatorReward = (uint16_t)(operatorReward * 100);
 

From 51addf9a035cdec33045be09f4dd90f736b14abd Mon Sep 17 00:00:00 2001
From: UdjinM6 <UdjinM6@users.noreply.github.com>
Date: Fri, 2 Nov 2018 00:58:57 +0300
Subject: [PATCH 237/400] Fix p2p-instantsend.py test (#2408)

---
 qa/rpc-tests/p2p-instantsend.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/qa/rpc-tests/p2p-instantsend.py b/qa/rpc-tests/p2p-instantsend.py
index 4f4981226e76..e16b26173cb2 100755
--- a/qa/rpc-tests/p2p-instantsend.py
+++ b/qa/rpc-tests/p2p-instantsend.py
@@ -27,6 +27,7 @@ def run_test(self):
         # make sender funds mature for InstantSend
         for i in range(0, 2):
             set_mocktime(get_mocktime() + 1)
+            set_node_times(self.nodes, get_mocktime())
             self.nodes[0].generate(1)
         # create doublepending transaction,  but don't relay it
         dblspnd_tx = self.create_raw_trx(self.nodes[self.sender_idx],
@@ -47,6 +48,7 @@ def run_test(self):
                 break
             if time() > start + 10:
                 break
+            sleep(0.1)
         assert(locked)
         # start last node
         self.nodes[self.isolated_idx] = start_node(self.isolated_idx,
@@ -56,6 +58,7 @@ def run_test(self):
         self.nodes[self.isolated_idx].sendrawtransaction(dblspnd_tx['hex'])
         # generate block on isolated node with doublespend transaction
         set_mocktime(get_mocktime() + 1)
+        set_node_times(self.nodes, get_mocktime())
         self.nodes[self.isolated_idx].generate(1)
         wrong_block = self.nodes[self.isolated_idx].getbestblockhash()
         # connect isolated block to network

From 5e829a3b1b8ba94c29fcd56742979261e1a8899d Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Thu, 1 Nov 2018 22:59:11 +0100
Subject: [PATCH 238/400] Update Chia bls-signature to latest version (#2409)

Brings in:
1. https://github.com/Chia-Network/bls-signatures/pull/41
2. https://github.com/Chia-Network/bls-signatures/pull/46
3. A few commits from https://github.com/codablock/bls-signatures are now
   merged into upstream.

This removes the need for manual initialization of the BLS library. This is
now done internally and in a thread-safe way.

Also switch to using tags instead of raw commit hashes. Makes testing
easier and also removes the risk of Github deleting commits due to
cleanup jobs.
---
 depends/packages/chia_bls.mk |  4 ++--
 src/bench/bench_dash.cpp     |  1 -
 src/bls/bls.cpp              | 11 -----------
 src/bls/bls.h                |  2 --
 src/init.cpp                 |  3 ---
 src/test/test_dash.cpp       |  1 -
 6 files changed, 2 insertions(+), 20 deletions(-)

diff --git a/depends/packages/chia_bls.mk b/depends/packages/chia_bls.mk
index 03295faf308d..85eb21472e1c 100644
--- a/depends/packages/chia_bls.mk
+++ b/depends/packages/chia_bls.mk
@@ -1,9 +1,9 @@
 package=chia_bls
-$(package)_version=ef06290c1d92eea79b46af135bcc823b019612a6
+$(package)_version=v20181101
 # It's actually from https://github.com/Chia-Network/bls-signatures, but we have so many patches atm that it's forked
 $(package)_download_path=https://github.com/codablock/bls-signatures/archive
 $(package)_file_name=$($(package)_version).tar.gz
-$(package)_sha256_hash=1e665359fdb946efce943340a324534f72832ecde97c4ebd4ad189f63e029300
+$(package)_sha256_hash=b3ec74a77a7b6795f84b05e051a0824ef8d9e05b04b2993f01040f35689aa87c
 $(package)_dependencies=gmp
 #$(package)_patches=...TODO (when we switch back to https://github.com/Chia-Network/bls-signatures)
 
diff --git a/src/bench/bench_dash.cpp b/src/bench/bench_dash.cpp
index a1d208502470..82b1cf3b3ebd 100644
--- a/src/bench/bench_dash.cpp
+++ b/src/bench/bench_dash.cpp
@@ -19,7 +19,6 @@ main(int argc, char** argv)
     ECC_Start();
     ECCVerifyHandle verifyHandle;
 
-    BLSInit();
     SetupEnvironment();
     fPrintToDebugLog = false; // don't want to write to debug.log file
 
diff --git a/src/bls/bls.cpp b/src/bls/bls.cpp
index caba36f9758c..02a793551866 100644
--- a/src/bls/bls.cpp
+++ b/src/bls/bls.cpp
@@ -462,14 +462,3 @@ static void secure_free(void* p)
     return get_secure_allocator().deallocate(ptr, n);
 }
 #endif
-
-bool BLSInit()
-{
-    if (!bls::BLS::Init()) {
-        return false;
-    }
-#ifndef BUILD_BITCOIN_INTERNAL
-    bls::BLS::SetSecureAllocator(secure_allocate, secure_free);
-#endif
-    return true;
-}
diff --git a/src/bls/bls.h b/src/bls/bls.h
index c50a96ee11ec..f62ab67566a4 100644
--- a/src/bls/bls.h
+++ b/src/bls/bls.h
@@ -300,6 +300,4 @@ typedef std::shared_ptr<BLSPublicKeyVector> BLSPublicKeyVectorPtr;
 typedef std::shared_ptr<BLSSecretKeyVector> BLSSecretKeyVectorPtr;
 typedef std::shared_ptr<BLSSignatureVector> BLSSignatureVectorPtr;
 
-bool BLSInit();
-
 #endif // DASH_CRYPTO_BLS_H
diff --git a/src/init.cpp b/src/init.cpp
index b9f4a1fba247..9c789b2a70c8 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -852,9 +852,6 @@ bool InitSanityCheck(void)
     if (!glibc_sanity_test() || !glibcxx_sanity_test())
         return false;
 
-    if (!BLSInit())
-        return false;
-
     return true;
 }
 
diff --git a/src/test/test_dash.cpp b/src/test/test_dash.cpp
index b618cc14bed7..2654382264d7 100644
--- a/src/test/test_dash.cpp
+++ b/src/test/test_dash.cpp
@@ -43,7 +43,6 @@ extern void noui_connect();
 BasicTestingSetup::BasicTestingSetup(const std::string& chainName)
 {
         ECC_Start();
-        BLSInit();
         SetupEnvironment();
         SetupNetworking();
         InitSignatureCache();

From 02442673d2cef09455a982ef66ec39b3bd0a2b6c Mon Sep 17 00:00:00 2001
From: thephez <thephez@users.noreply.github.com>
Date: Fri, 2 Nov 2018 04:18:05 -0400
Subject: [PATCH 239/400] Trivial: Correct protx diff RPC help (#2410)

---
 src/rpc/rpcevo.cpp | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/src/rpc/rpcevo.cpp b/src/rpc/rpcevo.cpp
index 8fe3a37d1ac8..c2a84fe916e2 100644
--- a/src/rpc/rpcevo.cpp
+++ b/src/rpc/rpcevo.cpp
@@ -778,17 +778,9 @@ void protx_diff_help()
     throw std::runtime_error(
             "protx diff \"baseBlock\" \"block\"\n"
             "\nCalculates a diff between two deterministic masternode lists. The result also contains proof data.\n"
-            "specified, it defaults to \"wallet\". All types have the optional argument \"detailed\" which if set to\n"
-            "\"true\" will result in a detailed list to be returned. If set to \"false\", only the hashes of the ProTx\n"
-            "will be returned.\n"
-            "\nAvailable types:\n"
-            "  wallet (detailed)              - List only ProTx which are found in your wallet. This will also include ProTx which\n"
-            "                                   failed PoSe verfication\n"
-            "  valid (height) (detailed)      - List only ProTx which are active/valid at the given chain height. If height is not\n"
-            "                                   specified, it defaults to the current chain-tip\n"
-            "  registered (height) (detaileD) - List all ProTx which are registered at the given chain height. If height is not\n"
-            "                                   specified, it defaults to the current chain-tip. This will also include ProTx\n"
-            "                                   which failed PoSe verification at that height\n"
+            "\nArguments:\n"
+            "1. \"baseBlock\"           (numeric, required) The starting block height.\n"
+            "2. \"block\"               (numeric, required) The ending block height.\n"
     );
 }
 

From 23f169c44aede1b5e6e10bba6c75fdfbf219e73f Mon Sep 17 00:00:00 2001
From: UdjinM6 <UdjinM6@users.noreply.github.com>
Date: Sun, 4 Nov 2018 14:55:16 +0300
Subject: [PATCH 240/400] Drop custom PS logic for guessing fees etc. from
 SelectCoins (#2371)

* drop most of custom PS logic from SelectCoins and inject it into regular flow (i.e. SelectCoinsMinConf)

* different priority for different denoms

* move CompareByPriority higher

* update comment

Co-Authored-By: UdjinM6 <udjinm6@gmail.com>
---
 src/wallet/wallet.cpp | 110 +++++++++++++++++++++++-------------------
 src/wallet/wallet.h   |   2 +-
 2 files changed, 61 insertions(+), 51 deletions(-)

diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
index 1515637be844..9e88f53646e2 100644
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -86,8 +86,10 @@ std::string COutput::ToString() const
 
 int COutput::Priority() const
 {
-    for (const auto& d : CPrivateSend::GetStandardDenominations())
-        if(tx->tx->vout[i].nValue == d) return 10000;
+    for (const auto& d : CPrivateSend::GetStandardDenominations()) {
+        // large denoms have lower value
+        if(tx->tx->vout[i].nValue == d) return (float)COIN / d * 10000;
+    }
     if(tx->tx->vout[i].nValue < 1*COIN) return 20000;
 
     //nondenom return largest first
@@ -2687,6 +2689,15 @@ static void ApproximateBestSubset(std::vector<std::pair<CAmount, std::pair<const
     }
 }
 
+struct CompareByPriority
+{
+    bool operator()(const COutput& t1,
+                    const COutput& t2) const
+    {
+        return t1.Priority() > t2.Priority();
+    }
+};
+
 // move denoms down
 bool less_then_denom (const COutput& out1, const COutput& out2)
 {
@@ -2704,7 +2715,7 @@ bool less_then_denom (const COutput& out1, const COutput& out2)
 }
 
 bool CWallet::SelectCoinsMinConf(const CAmount& nTargetValue, const int nConfMine, const int nConfTheirs, const uint64_t nMaxAncestors, std::vector<COutput> vCoins,
-                                 std::set<std::pair<const CWalletTx*,unsigned int> >& setCoinsRet, CAmount& nValueRet, bool fUseInstantSend) const
+                                 std::set<std::pair<const CWalletTx*,unsigned int> >& setCoinsRet, CAmount& nValueRet, AvailableCoinsType nCoinType, bool fUseInstantSend) const
 {
     setCoinsRet.clear();
     nValueRet = 0;
@@ -2720,11 +2731,24 @@ bool CWallet::SelectCoinsMinConf(const CAmount& nTargetValue, const int nConfMin
 
     random_shuffle(vCoins.begin(), vCoins.end(), GetRandInt);
 
-    // move denoms down on the list
-    std::sort(vCoins.begin(), vCoins.end(), less_then_denom);
+    int tryDenomStart = 0;
+    CAmount nMinChange = MIN_CHANGE;
+
+    if (nCoinType == ONLY_DENOMINATED) {
+        // larger denoms first
+        std::sort(vCoins.rbegin(), vCoins.rend(), CompareByPriority());
+        // we actually want denoms only, so let's skip "non-denom only" step
+        tryDenomStart = 1;
+        // no change is allowed
+        nMinChange = 0;
+    } else {
+        // move denoms down on the list
+        // try not to use denominated coins when not needed, save denoms for privatesend
+        std::sort(vCoins.begin(), vCoins.end(), less_then_denom);
+    }
 
     // try to find nondenom first to prevent unneeded spending of mixed coins
-    for (unsigned int tryDenom = 0; tryDenom < 2; tryDenom++)
+    for (unsigned int tryDenom = tryDenomStart; tryDenom < 2; tryDenom++)
     {
         LogPrint("selectcoins", "tryDenom: %d\n", tryDenom);
         vValue.clear();
@@ -2747,6 +2771,13 @@ bool CWallet::SelectCoinsMinConf(const CAmount& nTargetValue, const int nConfMin
             CAmount n = pcoin->tx->vout[i].nValue;
             if (tryDenom == 0 && CPrivateSend::IsDenominatedAmount(n)) continue; // we don't want denom values on first run
 
+            if (nCoinType == ONLY_DENOMINATED) {
+                // Make sure it's actually anonymized
+                COutPoint outpoint = COutPoint(pcoin->GetHash(), i);
+                int nRounds = GetRealOutpointPrivateSendRounds(outpoint);
+                if (nRounds < privateSendClient.nPrivateSendRounds) continue;
+            }
+
             std::pair<CAmount, std::pair<const CWalletTx*,unsigned int> > coin = std::make_pair(n, std::make_pair(pcoin, i));
 
             if (n == nTargetValue)
@@ -2755,7 +2786,7 @@ bool CWallet::SelectCoinsMinConf(const CAmount& nTargetValue, const int nConfMin
                 nValueRet += coin.first;
                 return true;
             }
-            else if (n < nTargetValue + MIN_CHANGE)
+            else if (n < nTargetValue + nMinChange)
             {
                 vValue.push_back(coin);
                 nTotalLower += n;
@@ -2789,7 +2820,9 @@ bool CWallet::SelectCoinsMinConf(const CAmount& nTargetValue, const int nConfMin
             }
             setCoinsRet.insert(coinLowestLarger.second);
             nValueRet += coinLowestLarger.first;
-            return true;
+            // There is no change in PS, so we know the fee beforehand,
+            // can see if we exceeded the max fee and thus fail quickly.
+            return nCoinType == ONLY_DENOMINATED ? (nValueRet - nTargetValue <= maxTxFee) : true;
         }
 
         // nTotalLower > nTargetValue
@@ -2804,13 +2837,13 @@ bool CWallet::SelectCoinsMinConf(const CAmount& nTargetValue, const int nConfMin
     CAmount nBest;
 
     ApproximateBestSubset(vValue, nTotalLower, nTargetValue, vfBest, nBest, fUseInstantSend);
-    if (nBest != nTargetValue && nTotalLower >= nTargetValue + MIN_CHANGE)
-        ApproximateBestSubset(vValue, nTotalLower, nTargetValue + MIN_CHANGE, vfBest, nBest, fUseInstantSend);
+    if (nBest != nTargetValue && nTotalLower >= nTargetValue + nMinChange)
+        ApproximateBestSubset(vValue, nTotalLower, nTargetValue + nMinChange, vfBest, nBest, fUseInstantSend);
 
     // If we have a bigger coin and (either the stochastic approximation didn't find a good solution,
     //                                   or the next bigger coin is closer), return the bigger coin
     if (coinLowestLarger.second.first &&
-        ((nBest != nTargetValue && nBest < nTargetValue + MIN_CHANGE) || coinLowestLarger.first <= nBest))
+        ((nBest != nTargetValue && nBest < nTargetValue + nMinChange) || coinLowestLarger.first <= nBest))
     {
         setCoinsRet.insert(coinLowestLarger.second);
         nValueRet += coinLowestLarger.first;
@@ -2829,7 +2862,9 @@ bool CWallet::SelectCoinsMinConf(const CAmount& nTargetValue, const int nConfMin
         LogPrint("selectcoins", "%s - total %s\n", s, FormatMoney(nBest));
     }
 
-    return true;
+    // There is no change in PS, so we know the fee beforehand,
+    // can see if we exceeded the max fee and thus fail quickly.
+    return nCoinType == ONLY_DENOMINATED ? (nValueRet - nTargetValue <= maxTxFee) : true;
 }
 
 bool CWallet::SelectCoins(const std::vector<COutput>& vAvailableCoins, const CAmount& nTargetValue, std::set<std::pair<const CWalletTx*,unsigned int> >& setCoinsRet, CAmount& nValueRet, const CCoinControl* coinControl, AvailableCoinsType nCoinType, bool fUseInstantSend) const
@@ -2859,28 +2894,6 @@ bool CWallet::SelectCoins(const std::vector<COutput>& vAvailableCoins, const CAm
         return (nValueRet >= nTargetValue);
     }
 
-    //if we're doing only denominated, we need to round up to the nearest smallest denomination
-    if(nCoinType == ONLY_DENOMINATED) {
-        std::vector<CAmount> vecPrivateSendDenominations = CPrivateSend::GetStandardDenominations();
-        CAmount nSmallestDenom = vecPrivateSendDenominations.back();
-        // Make outputs by looping through denominations, from large to small
-        for (const auto& nDenom : vecPrivateSendDenominations)
-        {
-            for (const auto& out : vCoins)
-            {
-                //make sure it's the denom we're looking for, round the amount up to smallest denom
-                if(out.tx->tx->vout[out.i].nValue == nDenom && nValueRet + nDenom < nTargetValue + nSmallestDenom) {
-                    COutPoint outpoint = COutPoint(out.tx->GetHash(),out.i);
-                    int nRounds = GetCappedOutpointPrivateSendRounds(outpoint);
-                    // make sure it's actually anonymized
-                    if(nRounds < privateSendClient.nPrivateSendRounds) continue;
-                    nValueRet += nDenom;
-                    setCoinsRet.insert(std::make_pair(out.tx, out.i));
-                }
-            }
-        }
-        return (nValueRet >= nTargetValue);
-    }
     // calculate value from preset inputs and store them
     std::set<std::pair<const CWalletTx*, uint32_t> > setPresetCoins;
     CAmount nValueFromPresetInputs = 0;
@@ -2897,6 +2910,12 @@ bool CWallet::SelectCoins(const std::vector<COutput>& vAvailableCoins, const CAm
             // Clearly invalid input, fail
             if (pcoin->tx->vout.size() <= outpoint.n)
                 return false;
+            if (nCoinType == ONLY_DENOMINATED) {
+                // Make sure to include anonymized preset inputs only,
+                // even if some non-anonymized inputs were manually selected via CoinControl
+                int nRounds = GetRealOutpointPrivateSendRounds(outpoint);
+                if (nRounds < privateSendClient.nPrivateSendRounds) continue;
+            }
             nValueFromPresetInputs += pcoin->tx->vout[outpoint.n].nValue;
             setPresetCoins.insert(std::make_pair(pcoin, outpoint.n));
         } else
@@ -2916,13 +2935,13 @@ bool CWallet::SelectCoins(const std::vector<COutput>& vAvailableCoins, const CAm
     bool fRejectLongChains = GetBoolArg("-walletrejectlongchains", DEFAULT_WALLET_REJECT_LONG_CHAINS);
 
     bool res = nTargetValue <= nValueFromPresetInputs ||
-        SelectCoinsMinConf(nTargetValue - nValueFromPresetInputs, 1, 6, 0, vCoins, setCoinsRet, nValueRet, fUseInstantSend) ||
-        SelectCoinsMinConf(nTargetValue - nValueFromPresetInputs, 1, 1, 0, vCoins, setCoinsRet, nValueRet, fUseInstantSend) ||
-        (bSpendZeroConfChange && SelectCoinsMinConf(nTargetValue - nValueFromPresetInputs, 0, 1, 2, vCoins, setCoinsRet, nValueRet, fUseInstantSend)) ||
-        (bSpendZeroConfChange && SelectCoinsMinConf(nTargetValue - nValueFromPresetInputs, 0, 1, std::min((size_t)4, nMaxChainLength/3), vCoins, setCoinsRet, nValueRet, fUseInstantSend)) ||
-        (bSpendZeroConfChange && SelectCoinsMinConf(nTargetValue - nValueFromPresetInputs, 0, 1, nMaxChainLength/2, vCoins, setCoinsRet, nValueRet, fUseInstantSend)) ||
-        (bSpendZeroConfChange && SelectCoinsMinConf(nTargetValue - nValueFromPresetInputs, 0, 1, nMaxChainLength, vCoins, setCoinsRet, nValueRet, fUseInstantSend)) ||
-        (bSpendZeroConfChange && !fRejectLongChains && SelectCoinsMinConf(nTargetValue - nValueFromPresetInputs, 0, 1, std::numeric_limits<uint64_t>::max(), vCoins, setCoinsRet, nValueRet, fUseInstantSend));
+        SelectCoinsMinConf(nTargetValue - nValueFromPresetInputs, 1, 6, 0, vCoins, setCoinsRet, nValueRet, nCoinType, fUseInstantSend) ||
+        SelectCoinsMinConf(nTargetValue - nValueFromPresetInputs, 1, 1, 0, vCoins, setCoinsRet, nValueRet, nCoinType, fUseInstantSend) ||
+        (bSpendZeroConfChange && SelectCoinsMinConf(nTargetValue - nValueFromPresetInputs, 0, 1, 2, vCoins, setCoinsRet, nValueRet, nCoinType, fUseInstantSend)) ||
+        (bSpendZeroConfChange && SelectCoinsMinConf(nTargetValue - nValueFromPresetInputs, 0, 1, std::min((size_t)4, nMaxChainLength/3), vCoins, setCoinsRet, nValueRet, nCoinType, fUseInstantSend)) ||
+        (bSpendZeroConfChange && SelectCoinsMinConf(nTargetValue - nValueFromPresetInputs, 0, 1, nMaxChainLength/2, vCoins, setCoinsRet, nValueRet, nCoinType, fUseInstantSend)) ||
+        (bSpendZeroConfChange && SelectCoinsMinConf(nTargetValue - nValueFromPresetInputs, 0, 1, nMaxChainLength, vCoins, setCoinsRet, nValueRet, nCoinType, fUseInstantSend)) ||
+        (bSpendZeroConfChange && !fRejectLongChains && SelectCoinsMinConf(nTargetValue - nValueFromPresetInputs, 0, 1, std::numeric_limits<uint64_t>::max(), vCoins, setCoinsRet, nValueRet, nCoinType, fUseInstantSend));
 
     // because SelectCoinsMinConf clears the setCoinsRet, we now add the possible inputs to the coinset
     setCoinsRet.insert(setPresetCoins.begin(), setPresetCoins.end());
@@ -2933,15 +2952,6 @@ bool CWallet::SelectCoins(const std::vector<COutput>& vAvailableCoins, const CAm
     return res;
 }
 
-struct CompareByPriority
-{
-    bool operator()(const COutput& t1,
-                    const COutput& t2) const
-    {
-        return t1.Priority() > t2.Priority();
-    }
-};
-
 bool CWallet::FundTransaction(CMutableTransaction& tx, CAmount& nFeeRet, bool overrideEstimatedFeeRate, const CFeeRate& specificFeeRate, int& nChangePosInOut, std::string& strFailReason, bool includeWatching, bool lockUnspents, const std::set<int>& setSubtractFeeFromOutputs, bool keepReserveKey, const CTxDestination& destChange)
 {
     std::vector<CRecipient> vecSend;
diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h
index b80df65c4fa7..963096ad0bdb 100644
--- a/src/wallet/wallet.h
+++ b/src/wallet/wallet.h
@@ -803,7 +803,7 @@ class CWallet : public CCryptoKeyStore, public CValidationInterface
      * completion the coin set and corresponding actual target value is
      * assembled
      */
-    bool SelectCoinsMinConf(const CAmount& nTargetValue, int nConfMine, int nConfTheirs, uint64_t nMaxAncestors, std::vector<COutput> vCoins, std::set<std::pair<const CWalletTx*,unsigned int> >& setCoinsRet, CAmount& nValueRet, bool fUseInstantSend = false) const;
+    bool SelectCoinsMinConf(const CAmount& nTargetValue, int nConfMine, int nConfTheirs, uint64_t nMaxAncestors, std::vector<COutput> vCoins, std::set<std::pair<const CWalletTx*,unsigned int> >& setCoinsRet, CAmount& nValueRet, AvailableCoinsType nCoinType=ALL_COINS, bool fUseInstantSend = false) const;
 
     // Coin selection
     bool SelectPSInOutPairsByDenominations(int nDenom, CAmount nValueMin, CAmount nValueMax, std::vector< std::pair<CTxDSIn, CTxOut> >& vecPSInOutPairsRet);

From f03629d6d97525c5e3319cac1e2aeda3b77f5f56 Mon Sep 17 00:00:00 2001
From: strophy <32928115+strophy@users.noreply.github.com>
Date: Sun, 4 Nov 2018 19:55:32 +0800
Subject: [PATCH 241/400] Explicitly specify which branch of Wine to install
 (#2411)

Specifying only `wine` results in this message under Ubuntu Bionic:

Package wine is a virtual package provided by:
  wine-stable 3.0-1ubuntu1
  wine-development 3.6-1
You should explicitly select one to install.

Compilation
---
 doc/build-cross.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/build-cross.md b/doc/build-cross.md
index 283648577ab5..ce6a05f24dad 100644
--- a/doc/build-cross.md
+++ b/doc/build-cross.md
@@ -40,7 +40,7 @@ Windows 64bit/32bit Cross-compilation
 Cross-compiling to Windows requires a few additional packages to be installed:
 
 ```bash
-$ sudo apt-get install nsis wine wine64 bc
+$ sudo apt-get install nsis wine-stable wine64 bc
 ```
 
 For Windows 64bit, install :

From 9da9d575aa81de540fd53a3acdf360166a6905c7 Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Sun, 4 Nov 2018 12:55:50 +0100
Subject: [PATCH 242/400] Allow collaterals for non-DIP3 MNs which were created
 after DIP3/BIP9 activation (#2412)

* Remove reference to now removed "protocolVersion"

* Allow to use non-DIP3 collaterals after DIP3 activation

This removes a rule which only made sense when we assumed all collaterals
would remain in DIP3 ProRegTx transactions after DIP3 activation.

As we allow to refer external collaterals now, this rule should vanish as
well.

* Sleep in case block time is ahead of real time

See comment. This was not a problem before as we had enough time passed
between the last block that caused this and the start-alias call.
Now we added another start-alias call which is directly after we generated
many blocks.
---
 qa/rpc-tests/dip3-deterministicmns.py | 29 +++++++++++++++++++++------
 src/evo/providertx.cpp                |  2 +-
 src/governance-object.cpp             |  2 --
 src/masternode.cpp                    | 21 -------------------
 src/masternode.h                      |  1 -
 5 files changed, 24 insertions(+), 31 deletions(-)

diff --git a/qa/rpc-tests/dip3-deterministicmns.py b/qa/rpc-tests/dip3-deterministicmns.py
index 84450102f448..6464a4b3eae5 100755
--- a/qa/rpc-tests/dip3-deterministicmns.py
+++ b/qa/rpc-tests/dip3-deterministicmns.py
@@ -108,7 +108,7 @@ def run_test(self):
             self.nodes[0].generate(1)
         self.test_fail_create_protx(self.nodes[0])
 
-        # prepare mn which should still be accepted later when dip3 activates (because it is funded before final activation)
+        # prepare mn which should still be accepted later when dip3 activates
         print("creating collateral for mn-before-dip3")
         before_dip3_mn = self.create_mn(self.nodes[0], mn_idx, 'mn-before-dip3')
         mn_idx += 1
@@ -140,12 +140,12 @@ def run_test(self):
             time.sleep(1)
 
         print("testing if we can start a mn which was created before dip3 activation")
-        mns.append(before_dip3_mn)
-        self.write_mnconf(mns + [after_dip3_mn])
+        self.write_mnconf(mns + [before_dip3_mn, after_dip3_mn])
         self.restart_controller_node()
         self.force_finish_mnsync(self.nodes[0])
 
         print("start MN %s" % before_dip3_mn.alias)
+        mns.append(before_dip3_mn)
         self.start_mn(before_dip3_mn)
         self.wait_for_sporks()
         self.force_finish_mnsync_list(before_dip3_mn.node)
@@ -154,9 +154,17 @@ def run_test(self):
         self.wait_for_mnlists(mns)
         self.wait_for_mnlists_same()
 
-        # Test if nodes deny creating new non-ProTx MNs now
-        print("testing if MN start fails when using collateral which was created after dip3 activation")
-        self.start_alias(self.nodes[0], after_dip3_mn.alias, should_fail=True)
+        # Test if nodes still allow creating new non-ProTx MNs now
+        print("testing if MN start succeeds when using collateral which was created after dip3 activation")
+        print("start MN %s" % after_dip3_mn.alias)
+        mns.append(after_dip3_mn)
+        self.start_mn(after_dip3_mn)
+        self.wait_for_sporks()
+        self.force_finish_mnsync_list(after_dip3_mn.node)
+        self.start_alias(self.nodes[0], after_dip3_mn.alias)
+
+        self.wait_for_mnlists(mns)
+        self.wait_for_mnlists_same()
 
         first_upgrade_count = 5
         mns_after_upgrade = []
@@ -423,6 +431,15 @@ def write_mnconf(self, mns):
                 self.write_mnconf_line(mn, f)
 
     def start_alias(self, node, alias, should_fail=False):
+        # When generating blocks very fast, the logic in miner.cpp:UpdateTime might result in block times ahead of the real time
+        # This can easily accumulate to 30 seconds or more, which results in start-alias to fail as it expects the sigTime
+        # to be less or equal to the confirmation block time
+        # Solution is to sleep in this case.
+        lastblocktime = node.getblock(node.getbestblockhash())['time']
+        sleeptime = lastblocktime - time.time()
+        if sleeptime > 0:
+            time.sleep(sleeptime + 1) # +1 to be extra sure
+
         start_result = node.masternode('start-alias', alias)
         if not should_fail:
             assert_equal(start_result, {'result': 'successful', 'alias': alias})
diff --git a/src/evo/providertx.cpp b/src/evo/providertx.cpp
index 9d2222d28e53..b0f1b0e5f9d8 100644
--- a/src/evo/providertx.cpp
+++ b/src/evo/providertx.cpp
@@ -133,7 +133,7 @@ bool CheckProRegTx(const CTransaction& tx, const CBlockIndex* pindexPrev, CValid
         return state.DoS(10, false, REJECT_INVALID, "bad-protx-payee-reuse");
     }
 
-    // It's allowed to set addr/protocolVersion to 0, which will put the MN into PoSe-banned state and require a ProUpServTx to be issues later
+    // It's allowed to set addr to 0, which will put the MN into PoSe-banned state and require a ProUpServTx to be issues later
     // If any of both is set, it must be valid however
     if (ptx.addr != CService() && !CheckService(tx.GetHash(), ptx, pindexPrev, state)) {
         return false;
diff --git a/src/governance-object.cpp b/src/governance-object.cpp
index 276afc578383..73ec9f46601a 100644
--- a/src/governance-object.cpp
+++ b/src/governance-object.cpp
@@ -510,8 +510,6 @@ bool CGovernanceObject::IsValidLocally(std::string& strError, bool& fMissingMast
             CMasternode::CollateralStatus err = CMasternode::CheckCollateral(masternodeOutpoint, CKeyID());
             if (err == CMasternode::COLLATERAL_UTXO_NOT_FOUND) {
                 strError = "Failed to find Masternode UTXO, missing masternode=" + strOutpoint + "\n";
-            } else if (err == CMasternode::COLLATERAL_UTXO_NOT_PROTX) {
-                strError = "Masternode UTXO is not a ProTx, missing masternode=" + strOutpoint + "\n";
             } else if (err == CMasternode::COLLATERAL_INVALID_AMOUNT) {
                 strError = "Masternode UTXO should have 1000 DASH, missing masternode=" + strOutpoint + "\n";
             } else if (err == CMasternode::COLLATERAL_INVALID_PUBKEY) {
diff --git a/src/masternode.cpp b/src/masternode.cpp
index 57dfa9c09d5d..ba8e5a35ce86 100644
--- a/src/masternode.cpp
+++ b/src/masternode.cpp
@@ -140,22 +140,6 @@ CMasternode::CollateralStatus CMasternode::CheckCollateral(const COutPoint& outp
         return COLLATERAL_INVALID_PUBKEY;
     }
 
-    CTransactionRef tx;
-    uint256 hashBlock;
-    if (!GetTransaction(outpoint.hash, tx, Params().GetConsensus(), hashBlock, true)) {
-        // should not happen
-        return COLLATERAL_UTXO_NOT_FOUND;
-    }
-    if (tx->nType != TRANSACTION_PROVIDER_REGISTER) {
-        assert(mapBlockIndex.count(hashBlock));
-
-        CBlockIndex *pindex = mapBlockIndex[hashBlock];
-        if (VersionBitsState(pindex->pprev, Params().GetConsensus(), Consensus::DEPLOYMENT_DIP0003, versionbitscache) == THRESHOLD_ACTIVE) {
-            LogPrintf("CMasternode::CheckCollateral -- ERROR: Collateral of masternode %s was created after DIP3 activation and is not a ProTx\n", outpoint.ToStringShort());
-            return COLLATERAL_UTXO_NOT_PROTX;
-        }
-    }
-
     nHeightRet = coin.nHeight;
     return COLLATERAL_OK;
 }
@@ -599,11 +583,6 @@ bool CMasternodeBroadcast::CheckOutpoint(int& nDos)
         return false;
     }
 
-    if (err == COLLATERAL_UTXO_NOT_PROTX) {
-        LogPrint("masternode", "CMasternodeBroadcast::CheckOutpoint -- Masternode UTXO should be a ProTx, masternode=%s\n", outpoint.ToStringShort());
-        return false;
-    }
-
     if (err == COLLATERAL_INVALID_AMOUNT) {
         LogPrint("masternode", "CMasternodeBroadcast::CheckOutpoint -- Masternode UTXO should have 1000 DASH, masternode=%s\n", outpoint.ToStringShort());
         nDos = 33;
diff --git a/src/masternode.h b/src/masternode.h
index 4af7de98853a..4e60c9deaca1 100644
--- a/src/masternode.h
+++ b/src/masternode.h
@@ -169,7 +169,6 @@ class CMasternode : public masternode_info_t
         COLLATERAL_UTXO_NOT_FOUND,
         COLLATERAL_INVALID_AMOUNT,
         COLLATERAL_INVALID_PUBKEY,
-        COLLATERAL_UTXO_NOT_PROTX,
     };
 
 

From bea590958b9dadbfe6e4f9985981259d33039935 Mon Sep 17 00:00:00 2001
From: UdjinM6 <UdjinM6@users.noreply.github.com>
Date: Mon, 5 Nov 2018 12:28:04 +0300
Subject: [PATCH 243/400] Fix auto-IS tests (#2414)

* no `-debug` by default (it's too heavy)

* drop useless `sync_masternodes` calls and add a couple where they could be actually usefull

* change autoix-mempool.py test logic:
1. use separate nodes to send test txes
2. sync nodes while filling the mempool
---
 qa/rpc-tests/autoix-mempool.py                | 50 +++++++++++--------
 qa/rpc-tests/p2p-autoinstantsend.py           |  6 +--
 qa/rpc-tests/test_framework/test_framework.py | 10 ++--
 3 files changed, 34 insertions(+), 32 deletions(-)

diff --git a/qa/rpc-tests/autoix-mempool.py b/qa/rpc-tests/autoix-mempool.py
index f66f6a7a9c67..9266a06b5101 100755
--- a/qa/rpc-tests/autoix-mempool.py
+++ b/qa/rpc-tests/autoix-mempool.py
@@ -50,7 +50,6 @@ def activate_autoix_bip9(self):
             if counter % sync_period == 0:
                 # sync nodes
                 self.sync_all()
-                sync_masternodes(self.nodes, True)
 
         while self.get_autoix_bip9_status() == 'started':
             set_mocktime(get_mocktime() + 1)
@@ -60,7 +59,6 @@ def activate_autoix_bip9(self):
             if counter % sync_period == 0:
                 # sync nodes
                 self.sync_all()
-                sync_masternodes(self.nodes, True)
 
         while self.get_autoix_bip9_status() == 'locked_in':
             set_mocktime(get_mocktime() + 1)
@@ -70,11 +68,9 @@ def activate_autoix_bip9(self):
             if counter % sync_period == 0:
                 # sync nodes
                 self.sync_all()
-                sync_masternodes(self.nodes, True)
 
         # sync nodes
         self.sync_all()
-        sync_masternodes(self.nodes, True)
 
         assert(self.get_autoix_bip9_status() == 'active')
 
@@ -102,19 +98,26 @@ def send_simple_tx(self, sender, receiver):
         self.sync_all()
         return self.wait_for_instantlock(txid, sender)
 
-    def get_mempool_size(self, node):
+    def get_mempool_usage(self, node):
         info = node.getmempoolinfo()
         return info['usage']
 
     def fill_mempool(self):
-        node = self.nodes[0]
-        rec_address = node.getnewaddress()
-        while self.get_mempool_size(node) < MAX_MEMPOOL_SIZE * MB_SIZE * AUTO_IX_MEM_THRESHOLD + 10000:
-            node.sendtoaddress(rec_address, 1.0)
-            sleep(0.1)
+        # send lots of txes to yourself just to fill the mempool
+        counter = 0
+        sync_period = 10
+        dummy_address = self.nodes[0].getnewaddress()
+        while self.get_mempool_usage(self.nodes[self.sender_idx]) < MAX_MEMPOOL_SIZE * MB_SIZE * AUTO_IX_MEM_THRESHOLD:
+            self.nodes[0].sendtoaddress(dummy_address, 1.0)
+            counter += 1
+            if counter % sync_period == 0:
+                # sync nodes
+                self.sync_all()
         self.sync_all()
 
     def run_test(self):
+        # make sure masternodes are synced
+        sync_masternodes(self.nodes)
         self.enforce_masternode_payments()  # required for bip9 activation
         self.activate_autoix_bip9()
         self.set_autoix_spork_state(True)
@@ -123,25 +126,28 @@ def run_test(self):
         assert(self.get_autoix_bip9_status() == 'active')
         assert(self.get_autoix_spork_state())
 
-        # autoIX is working
-        assert(self.send_simple_tx(self.nodes[0], self.nodes[self.receiver_idx]))
-
-        # send funds for InstantSend  after filling mempool and give them 6 confirmations
-        rec_address = self.nodes[self.receiver_idx].getnewaddress()
-        self.nodes[0].sendtoaddress(rec_address, 500.0)
-        self.nodes[0].sendtoaddress(rec_address, 500.0)
-        self.sync_all()
-        for i in range(0, 2):
-            self.nodes[self.receiver_idx].generate(1)
+        # create 3 inputs for txes on sender node and give them 6 confirmations
+        sender = self.nodes[self.sender_idx]
+        receiver = self.nodes[self.receiver_idx]
+        sender_address = sender.getnewaddress()
+        for i in range(0, 3):
+            self.nodes[0].sendtoaddress(sender_address, 2.0)
+        for i in range(0, 6):
+            set_mocktime(get_mocktime() + 1)
+            set_node_times(self.nodes, get_mocktime())
+            self.nodes[0].generate(1)
         self.sync_all()
 
+        # autoIX is working
+        assert(self.send_simple_tx(sender, receiver))
+
         # fill mempool with transactions
         self.fill_mempool()
 
         # autoIX is not working now
-        assert(not self.send_simple_tx(self.nodes[self.receiver_idx], self.nodes[0]))
+        assert(not self.send_simple_tx(sender, receiver))
         # regular IX is still working
-        assert(self.send_regular_IX(self.nodes[self.receiver_idx], self.nodes[0]))
+        assert(self.send_regular_IX(sender, receiver))
 
 
 if __name__ == '__main__':
diff --git a/qa/rpc-tests/p2p-autoinstantsend.py b/qa/rpc-tests/p2p-autoinstantsend.py
index be43796309bc..3177515141a2 100755
--- a/qa/rpc-tests/p2p-autoinstantsend.py
+++ b/qa/rpc-tests/p2p-autoinstantsend.py
@@ -52,7 +52,6 @@ def activate_autoix_bip9(self):
             if counter % sync_period == 0:
                 # sync nodes
                 self.sync_all()
-                sync_masternodes(self.nodes, True)
 
         while self.get_autoix_bip9_status() == 'started':
             set_mocktime(get_mocktime() + 1)
@@ -62,7 +61,6 @@ def activate_autoix_bip9(self):
             if counter % sync_period == 0:
                 # sync nodes
                 self.sync_all()
-                sync_masternodes(self.nodes, True)
 
         while self.get_autoix_bip9_status() == 'locked_in':
             set_mocktime(get_mocktime() + 1)
@@ -72,11 +70,9 @@ def activate_autoix_bip9(self):
             if counter % sync_period == 0:
                 # sync nodes
                 self.sync_all()
-                sync_masternodes(self.nodes, True)
 
         # sync nodes
         self.sync_all()
-        sync_masternodes(self.nodes, True)
 
         assert(self.get_autoix_bip9_status() == 'active')
 
@@ -118,6 +114,8 @@ def send_complex_tx(self):
         return self.wait_for_instantlock(txid, self.nodes[0])
 
     def run_test(self):
+        # make sure masternodes are synced
+        sync_masternodes(self.nodes)
         # feed the sender with some balance
         sender_addr = self.nodes[self.sender_idx].getnewaddress()
         self.nodes[0].sendtoaddress(sender_addr, 1)
diff --git a/qa/rpc-tests/test_framework/test_framework.py b/qa/rpc-tests/test_framework/test_framework.py
index cb270ba8bd3f..c209550fcac9 100755
--- a/qa/rpc-tests/test_framework/test_framework.py
+++ b/qa/rpc-tests/test_framework/test_framework.py
@@ -227,7 +227,7 @@ def __init__(self, num_nodes, masterodes_count, extra_args):
 
     def create_simple_node(self):
         idx = len(self.nodes)
-        args = ["-debug"] + self.extra_args
+        args = self.extra_args
         self.nodes.append(start_node(idx, self.options.tmpdir,
                                      args))
         for i in range(0, idx):
@@ -264,7 +264,7 @@ def write_mn_config(self):
 
     def create_masternodes(self):
         for idx in range(0, self.mn_count):
-            args = ['-debug=masternode', '-externalip=127.0.0.1', '-masternode=1',
+            args = ['-externalip=127.0.0.1', '-masternode=1',
                     '-masternodeprivkey=%s' % self.mninfo[idx].key,
                     '-masternodeblsprivkey=%s' % self.mninfo[idx].blsKey] + self.extra_args
             self.nodes.append(start_node(idx + 1, self.options.tmpdir, args))
@@ -274,7 +274,7 @@ def create_masternodes(self):
     def setup_network(self):
         self.nodes = []
         # create faucet node for collateral and transactions
-        args = ["-debug"] + self.extra_args
+        args = self.extra_args
         self.nodes.append(start_node(0, self.options.tmpdir, args))
         required_balance = MASTERNODE_COLLATERAL * self.mn_count + 1
         while self.nodes[0].getbalance() < required_balance:
@@ -285,8 +285,7 @@ def setup_network(self):
         self.prepare_masternodes()
         self.write_mn_config()
         stop_node(self.nodes[0], 0)
-        args = ["-debug",
-                "-sporkkey=cP4EKFyJsHT39LDqgdcB43Y3YXjNyjb5Fuas1GQSeAtjnZWmZEQK"] + \
+        args = ["-sporkkey=cP4EKFyJsHT39LDqgdcB43Y3YXjNyjb5Fuas1GQSeAtjnZWmZEQK"] + \
                self.extra_args
         self.nodes[0] = start_node(0, self.options.tmpdir,
                                    args)
@@ -305,7 +304,6 @@ def setup_network(self):
         for i in range(1, self.mn_count + 1):
             res = self.nodes[0].masternode("start-alias", "mn%d" % i)
             assert (res["result"] == 'successful')
-        sync_masternodes(self.nodes, True)
         mn_info = self.nodes[0].masternodelist("status")
         assert (len(mn_info) == self.mn_count)
         for status in mn_info.values():

From 1d56dffdafb6ee924a4fffa1578d9a3011bb7409 Mon Sep 17 00:00:00 2001
From: UdjinM6 <UdjinM6@users.noreply.github.com>
Date: Mon, 5 Nov 2018 12:28:38 +0300
Subject: [PATCH 244/400] Unify help display logic for various "complex" rpc
 commands (#2415)

* Unify help display logic for various "complex" rpc commands

* add [[ noreturn ]] attribute and drop dummy returns
---
 src/rpc/governance.cpp | 18 ++++++----------
 src/rpc/masternode.cpp |  5 ++---
 src/rpc/rpcevo.cpp     | 48 +++++++++++++++++++++++-------------------
 3 files changed, 34 insertions(+), 37 deletions(-)

diff --git a/src/rpc/governance.cpp b/src/rpc/governance.cpp
index f08a4767c9d6..639211f6fb71 100644
--- a/src/rpc/governance.cpp
+++ b/src/rpc/governance.cpp
@@ -945,7 +945,7 @@ UniValue gobject_getcurrentvotes(const JSONRPCRequest& request)
     return bResult;
 }
 
-void gobject_help()
+[[ noreturn ]] void gobject_help()
 {
     throw std::runtime_error(
             "gobject \"command\"...\n"
@@ -975,15 +975,9 @@ UniValue gobject(const JSONRPCRequest& request)
     if (request.params.size() >= 1)
         strCommand = request.params[0].get_str();
 
-    if ((request.fHelp && strCommand.empty())  ||
-        (
-#ifdef ENABLE_WALLET
-         strCommand != "prepare" &&
-#endif // ENABLE_WALLET
-         strCommand != "vote-many" && strCommand != "vote-conf" && strCommand != "vote-alias" && strCommand != "submit" && strCommand != "count" &&
-         strCommand != "deserialize" && strCommand != "get" && strCommand != "getvotes" && strCommand != "getcurrentvotes" && strCommand != "list" && strCommand != "diff" &&
-         strCommand != "check" ))
-            gobject_help();
+    if (request.fHelp || strCommand.empty()) {
+        gobject_help();
+    }
 
     if (strCommand == "count") {
         return gobject_count(request);
@@ -1026,9 +1020,9 @@ UniValue gobject(const JSONRPCRequest& request)
     } else if (strCommand == "getcurrentvotes") {
         // GETVOTES FOR SPECIFIC GOVERNANCE OBJECT
         return gobject_getcurrentvotes(request);
+    } else {
+        gobject_help();
     }
-
-    throw std::runtime_error("invalid command: " + strCommand);
 }
 
 UniValue voteraw(const JSONRPCRequest& request)
diff --git a/src/rpc/masternode.cpp b/src/rpc/masternode.cpp
index ad2e2da1fffb..1fb482a00f25 100644
--- a/src/rpc/masternode.cpp
+++ b/src/rpc/masternode.cpp
@@ -757,7 +757,7 @@ UniValue masternode_check(const JSONRPCRequest& request)
     return obj;
 }
 
-void masternode_help()
+[[ noreturn ]] void masternode_help()
 {
     throw std::runtime_error(
         "masternode \"command\"...\n"
@@ -794,7 +794,7 @@ UniValue masternode(const JSONRPCRequest& request)
         throw JSONRPCError(RPC_INVALID_PARAMETER, "DEPRECATED, please use start-all instead");
 #endif // ENABLE_WALLET
 
-    if (request.fHelp && strCommand.empty()) {
+    if (request.fHelp || strCommand.empty()) {
         masternode_help();
     }
 
@@ -834,7 +834,6 @@ UniValue masternode(const JSONRPCRequest& request)
         return masternode_check(request);
     } else {
         masternode_help();
-        return UniValue::VNULL; // avoid compiler warnings
     }
 }
 
diff --git a/src/rpc/rpcevo.cpp b/src/rpc/rpcevo.cpp
index c2a84fe916e2..3f455d17c3ab 100644
--- a/src/rpc/rpcevo.cpp
+++ b/src/rpc/rpcevo.cpp
@@ -819,28 +819,32 @@ UniValue protx_diff(const JSONRPCRequest& request)
     return ret;
 }
 
+[[ noreturn ]] void protx_help()
+{
+    throw std::runtime_error(
+            "protx \"command\" ...\n"
+            "Set of commands to execute ProTx related actions.\n"
+            "To get help on individual commands, use \"help protx command\".\n"
+            "\nArguments:\n"
+            "1. \"command\"        (string, required) The command to execute\n"
+            "\nAvailable commands:\n"
+            "  register          - Create and send ProTx to network\n"
+            "  register_fund     - Fund, create and send ProTx to network\n"
+            "  register_prepare  - Create an unsigned ProTx\n"
+            "  register_submit   - Sign and submit a ProTx\n"
+            "  list              - List ProTxs\n"
+            "  info              - Return information about a ProTx\n"
+            "  update_service    - Create and send ProUpServTx to network\n"
+            "  update_registrar  - Create and send ProUpRegTx to network\n"
+            "  revoke            - Create and send ProUpRevTx to network\n"
+            "  diff              - Calculate a diff and a proof between two masternode lists\n"
+    );
+}
 
 UniValue protx(const JSONRPCRequest& request)
 {
-    if (request.params.empty()) {
-        throw std::runtime_error(
-                "protx \"command\" ...\n"
-                "Set of commands to execute ProTx related actions.\n"
-                "To get help on individual commands, use \"help protx command\".\n"
-                "\nArguments:\n"
-                "1. \"command\"        (string, required) The command to execute\n"
-                "\nAvailable commands:\n"
-                "  register          - Create and send ProTx to network\n"
-                "  register_fund     - Fund, create and send ProTx to network\n"
-                "  register_prepare  - Create an unsigned ProTx\n"
-                "  register_submit   - Sign and submit a ProTx\n"
-                "  list              - List ProTxs\n"
-                "  info              - Return information about a ProTx\n"
-                "  update_service    - Create and send ProUpServTx to network\n"
-                "  update_registrar  - Create and send ProUpRegTx to network\n"
-                "  revoke            - Create and send ProUpRevTx to network\n"
-                "  diff              - Calculate a diff and a proof between two masternode lists\n"
-        );
+    if (request.fHelp || request.params.empty()) {
+        protx_help();
     }
 
     std::string command = request.params[0].get_str();
@@ -862,7 +866,7 @@ UniValue protx(const JSONRPCRequest& request)
     } else if (command == "diff") {
         return protx_diff(request);
     } else {
-        throw std::runtime_error("invalid command: " + command);
+        protx_help();
     }
 }
 #endif//ENABLE_WALLET
@@ -897,7 +901,7 @@ UniValue bls_generate(const JSONRPCRequest& request)
     return ret;
 }
 
-void bls_help()
+[[ noreturn ]] void bls_help()
 {
     throw std::runtime_error(
             "bls \"command\" ...\n"
@@ -912,7 +916,7 @@ void bls_help()
 
 UniValue _bls(const JSONRPCRequest& request)
 {
-    if (request.params.empty()) {
+    if (request.fHelp || request.params.empty()) {
         bls_help();
     }
 

From e9bb822c102d6da0a57efb84d2a4462ee1486595 Mon Sep 17 00:00:00 2001
From: PastaPastaPasta <pasta@dashboost.org>
Date: Mon, 5 Nov 2018 03:29:07 -0600
Subject: [PATCH 245/400] Clang format PrivateSend files (#2373)

---
 src/privatesend-client.cpp | 630 +++++++++++++++++++------------------
 src/privatesend-client.h   |  64 ++--
 src/privatesend-server.cpp | 246 +++++++--------
 src/privatesend-server.h   |   9 +-
 src/privatesend-util.cpp   |   8 +-
 src/privatesend-util.h     |   3 +-
 src/privatesend.cpp        | 193 +++++++-----
 src/privatesend.h          |  78 +++--
 8 files changed, 636 insertions(+), 595 deletions(-)

diff --git a/src/privatesend-client.cpp b/src/privatesend-client.cpp
index 32c232b43068..d83bd45e111b 100644
--- a/src/privatesend-client.cpp
+++ b/src/privatesend-client.cpp
@@ -3,7 +3,6 @@
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 #include "privatesend-client.h"
 
-#include "wallet/coincontrol.h"
 #include "consensus/validation.h"
 #include "core_io.h"
 #include "init.h"
@@ -15,6 +14,7 @@
 #include "txmempool.h"
 #include "util.h"
 #include "utilmoneystr.h"
+#include "wallet/coincontrol.h"
 
 #include <memory>
 
@@ -22,22 +22,21 @@ CPrivateSendClientManager privateSendClient;
 
 void CPrivateSendClientManager::ProcessMessage(CNode* pfrom, const std::string& strCommand, CDataStream& vRecv, CConnman& connman)
 {
-    if(fMasternodeMode) return;
-    if(fLiteMode) return; // ignore all Dash related functionality
-    if(!masternodeSync.IsBlockchainSynced()) return;
+    if (fMasternodeMode) return;
+    if (fLiteMode) return; // ignore all Dash related functionality
+    if (!masternodeSync.IsBlockchainSynced()) return;
 
-    if(!CheckDiskSpace()) {
+    if (!CheckDiskSpace()) {
         ResetPool();
         fEnablePrivateSend = false;
         LogPrintf("CPrivateSendClientManager::ProcessMessage -- Not enough disk space, disabling PrivateSend.\n");
         return;
     }
 
-    if(strCommand == NetMsgType::DSQUEUE) {
-        if(pfrom->nVersion < MIN_PRIVATESEND_PEER_PROTO_VERSION) {
+    if (strCommand == NetMsgType::DSQUEUE) {
+        if (pfrom->nVersion < MIN_PRIVATESEND_PEER_PROTO_VERSION) {
             LogPrint("privatesend", "DSQUEUE -- peer=%d using obsolete version %i\n", pfrom->id, pfrom->nVersion);
-            connman.PushMessage(pfrom, CNetMsgMaker(pfrom->GetSendVersion()).Make(NetMsgType::REJECT, strCommand, REJECT_OBSOLETE,
-                               strprintf("Version must be %d or greater", MIN_PRIVATESEND_PEER_PROTO_VERSION)));
+            connman.PushMessage(pfrom, CNetMsgMaker(pfrom->GetSendVersion()).Make(NetMsgType::REJECT, strCommand, REJECT_OBSOLETE, strprintf("Version must be %d or greater", MIN_PRIVATESEND_PEER_PROTO_VERSION)));
             return;
         }
 
@@ -46,11 +45,11 @@ void CPrivateSendClientManager::ProcessMessage(CNode* pfrom, const std::string&
 
         {
             TRY_LOCK(cs_vecqueue, lockRecv);
-            if(!lockRecv) return;
+            if (!lockRecv) return;
 
             // process every dsq only once
             for (const auto& q : vecPrivateSendQueue) {
-                if(q == dsq) {
+                if (q == dsq) {
                     // LogPrint("privatesend", "DSQUEUE -- %s seen\n", dsq.ToString());
                     return;
                 }
@@ -59,19 +58,19 @@ void CPrivateSendClientManager::ProcessMessage(CNode* pfrom, const std::string&
 
         LogPrint("privatesend", "DSQUEUE -- %s new\n", dsq.ToString());
 
-        if(dsq.IsExpired()) return;
+        if (dsq.IsExpired()) return;
 
         masternode_info_t infoMn;
-        if(!mnodeman.GetMasternodeInfo(dsq.masternodeOutpoint, infoMn)) return;
+        if (!mnodeman.GetMasternodeInfo(dsq.masternodeOutpoint, infoMn)) return;
 
-        if(!dsq.CheckSignature(infoMn.legacyKeyIDOperator, infoMn.blsPubKeyOperator)) {
+        if (!dsq.CheckSignature(infoMn.legacyKeyIDOperator, infoMn.blsPubKeyOperator)) {
             // we probably have outdated info
             mnodeman.AskForMN(pfrom, dsq.masternodeOutpoint, connman);
             return;
         }
 
         // if the queue is ready, submit if we can
-        if(dsq.fReady) {
+        if (dsq.fReady) {
             LOCK(cs_deqsessions);
             for (auto& session : deqSessions) {
                 masternode_info_t mnMixing;
@@ -84,25 +83,25 @@ void CPrivateSendClientManager::ProcessMessage(CNode* pfrom, const std::string&
         } else {
             LOCK(cs_deqsessions); // have to lock this first to avoid deadlocks with cs_vecqueue
             TRY_LOCK(cs_vecqueue, lockRecv);
-            if(!lockRecv) return;
+            if (!lockRecv) return;
 
             for (const auto& q : vecPrivateSendQueue) {
-                if(q.masternodeOutpoint == dsq.masternodeOutpoint) {
+                if (q.masternodeOutpoint == dsq.masternodeOutpoint) {
                     // no way same mn can send another "not yet ready" dsq this soon
                     LogPrint("privatesend", "DSQUEUE -- Masternode %s is sending WAY too many dsq messages\n", infoMn.addr.ToString());
                     return;
                 }
             }
 
-            int nThreshold = infoMn.nLastDsq + mnodeman.CountEnabled(MIN_PRIVATESEND_PEER_PROTO_VERSION)/5;
+            int nThreshold = infoMn.nLastDsq + mnodeman.CountEnabled(MIN_PRIVATESEND_PEER_PROTO_VERSION) / 5;
             LogPrint("privatesend", "DSQUEUE -- nLastDsq: %d  threshold: %d  nDsqCount: %d\n", infoMn.nLastDsq, nThreshold, mnodeman.nDsqCount);
             //don't allow a few nodes to dominate the queuing process
-            if(infoMn.nLastDsq != 0 && nThreshold > mnodeman.nDsqCount) {
+            if (infoMn.nLastDsq != 0 && nThreshold > mnodeman.nDsqCount) {
                 LogPrint("privatesend", "DSQUEUE -- Masternode %s is sending too many dsq messages\n", infoMn.addr.ToString());
                 return;
             }
 
-            if(!mnodeman.AllowMixing(dsq.masternodeOutpoint)) return;
+            if (!mnodeman.AllowMixing(dsq.masternodeOutpoint)) return;
 
             LogPrint("privatesend", "DSQUEUE -- new PrivateSend queue (%s) from masternode %s\n", dsq.ToString(), infoMn.addr.ToString());
             for (auto& session : deqSessions) {
@@ -118,8 +117,7 @@ void CPrivateSendClientManager::ProcessMessage(CNode* pfrom, const std::string&
     } else if (
         strCommand == NetMsgType::DSSTATUSUPDATE ||
         strCommand == NetMsgType::DSFINALTX ||
-        strCommand == NetMsgType::DSCOMPLETE
-    ) {
+        strCommand == NetMsgType::DSCOMPLETE) {
         LOCK(cs_deqsessions);
         for (auto& session : deqSessions) {
             session.ProcessMessage(pfrom, strCommand, vRecv, connman);
@@ -129,21 +127,19 @@ void CPrivateSendClientManager::ProcessMessage(CNode* pfrom, const std::string&
 
 void CPrivateSendClientSession::ProcessMessage(CNode* pfrom, const std::string& strCommand, CDataStream& vRecv, CConnman& connman)
 {
-    if(fMasternodeMode) return;
-    if(fLiteMode) return; // ignore all Dash related functionality
-    if(!masternodeSync.IsBlockchainSynced()) return;
-
-    if(strCommand == NetMsgType::DSSTATUSUPDATE) {
+    if (fMasternodeMode) return;
+    if (fLiteMode) return; // ignore all Dash related functionality
+    if (!masternodeSync.IsBlockchainSynced()) return;
 
-        if(pfrom->nVersion < MIN_PRIVATESEND_PEER_PROTO_VERSION) {
+    if (strCommand == NetMsgType::DSSTATUSUPDATE) {
+        if (pfrom->nVersion < MIN_PRIVATESEND_PEER_PROTO_VERSION) {
             LogPrint("privatesend", "DSSTATUSUPDATE -- peer=%d using obsolete version %i\n", pfrom->id, pfrom->nVersion);
-            connman.PushMessage(pfrom, CNetMsgMaker(pfrom->GetSendVersion()).Make(NetMsgType::REJECT, strCommand, REJECT_OBSOLETE,
-                               strprintf("Version must be %d or greater", MIN_PRIVATESEND_PEER_PROTO_VERSION)));
+            connman.PushMessage(pfrom, CNetMsgMaker(pfrom->GetSendVersion()).Make(NetMsgType::REJECT, strCommand, REJECT_OBSOLETE, strprintf("Version must be %d or greater", MIN_PRIVATESEND_PEER_PROTO_VERSION)));
             return;
         }
 
-        if(!infoMixingMasternode.fInfoValid) return;
-        if(infoMixingMasternode.addr != pfrom->addr) {
+        if (!infoMixingMasternode.fInfoValid) return;
+        if (infoMixingMasternode.addr != pfrom->addr) {
             //LogPrintf("DSSTATUSUPDATE -- message doesn't match current Masternode: infoMixingMasternode %s addr %s\n", infoMixingMasternode.addr.ToString(), pfrom->addr.ToString());
             return;
         }
@@ -155,39 +151,37 @@ void CPrivateSendClientSession::ProcessMessage(CNode* pfrom, const std::string&
         int nMsgMessageID;
         vRecv >> nMsgSessionID >> nMsgState >> nMsgEntriesCount >> nMsgStatusUpdate >> nMsgMessageID;
 
-        if(nMsgState < POOL_STATE_MIN || nMsgState > POOL_STATE_MAX) {
+        if (nMsgState < POOL_STATE_MIN || nMsgState > POOL_STATE_MAX) {
             LogPrint("privatesend", "DSSTATUSUPDATE -- nMsgState is out of bounds: %d\n", nMsgState);
             return;
         }
 
-        if(nMsgStatusUpdate < STATUS_REJECTED || nMsgStatusUpdate > STATUS_ACCEPTED) {
+        if (nMsgStatusUpdate < STATUS_REJECTED || nMsgStatusUpdate > STATUS_ACCEPTED) {
             LogPrint("privatesend", "DSSTATUSUPDATE -- nMsgStatusUpdate is out of bounds: %d\n", nMsgStatusUpdate);
             return;
         }
 
-        if(nMsgMessageID < MSG_POOL_MIN || nMsgMessageID > MSG_POOL_MAX) {
+        if (nMsgMessageID < MSG_POOL_MIN || nMsgMessageID > MSG_POOL_MAX) {
             LogPrint("privatesend", "DSSTATUSUPDATE -- nMsgMessageID is out of bounds: %d\n", nMsgMessageID);
             return;
         }
 
         LogPrint("privatesend", "DSSTATUSUPDATE -- nMsgSessionID %d  nMsgState: %d  nEntriesCount: %d  nMsgStatusUpdate: %d  nMsgMessageID %d (%s)\n",
-                nMsgSessionID, nMsgState, nEntriesCount, nMsgStatusUpdate, nMsgMessageID, CPrivateSend::GetMessageByID(PoolMessage(nMsgMessageID)));
+            nMsgSessionID, nMsgState, nEntriesCount, nMsgStatusUpdate, nMsgMessageID, CPrivateSend::GetMessageByID(PoolMessage(nMsgMessageID)));
 
-        if(!CheckPoolStateUpdate(PoolState(nMsgState), nMsgEntriesCount, PoolStatusUpdate(nMsgStatusUpdate), PoolMessage(nMsgMessageID), nMsgSessionID)) {
+        if (!CheckPoolStateUpdate(PoolState(nMsgState), nMsgEntriesCount, PoolStatusUpdate(nMsgStatusUpdate), PoolMessage(nMsgMessageID), nMsgSessionID)) {
             LogPrint("privatesend", "DSSTATUSUPDATE -- CheckPoolStateUpdate failed\n");
         }
 
-    } else if(strCommand == NetMsgType::DSFINALTX) {
-
-        if(pfrom->nVersion < MIN_PRIVATESEND_PEER_PROTO_VERSION) {
+    } else if (strCommand == NetMsgType::DSFINALTX) {
+        if (pfrom->nVersion < MIN_PRIVATESEND_PEER_PROTO_VERSION) {
             LogPrint("privatesend", "DSFINALTX -- peer=%d using obsolete version %i\n", pfrom->id, pfrom->nVersion);
-            connman.PushMessage(pfrom, CNetMsgMaker(pfrom->GetSendVersion()).Make(NetMsgType::REJECT, strCommand, REJECT_OBSOLETE,
-                               strprintf("Version must be %d or greater", MIN_PRIVATESEND_PEER_PROTO_VERSION)));
+            connman.PushMessage(pfrom, CNetMsgMaker(pfrom->GetSendVersion()).Make(NetMsgType::REJECT, strCommand, REJECT_OBSOLETE, strprintf("Version must be %d or greater", MIN_PRIVATESEND_PEER_PROTO_VERSION)));
             return;
         }
 
-        if(!infoMixingMasternode.fInfoValid) return;
-        if(infoMixingMasternode.addr != pfrom->addr) {
+        if (!infoMixingMasternode.fInfoValid) return;
+        if (infoMixingMasternode.addr != pfrom->addr) {
             //LogPrintf("DSFINALTX -- message doesn't match current Masternode: infoMixingMasternode %s addr %s\n", infoMixingMasternode.addr.ToString(), pfrom->addr.ToString());
             return;
         }
@@ -196,7 +190,7 @@ void CPrivateSendClientSession::ProcessMessage(CNode* pfrom, const std::string&
         vRecv >> nMsgSessionID;
         CTransaction txNew(deserialize, vRecv);
 
-        if(nSessionID != nMsgSessionID) {
+        if (nSessionID != nMsgSessionID) {
             LogPrint("privatesend", "DSFINALTX -- message doesn't match current PrivateSend session: nSessionID: %d  nMsgSessionID: %d\n", nSessionID, nMsgSessionID);
             return;
         }
@@ -206,17 +200,15 @@ void CPrivateSendClientSession::ProcessMessage(CNode* pfrom, const std::string&
         //check to see if input is spent already? (and probably not confirmed)
         SignFinalTransaction(txNew, pfrom, connman);
 
-    } else if(strCommand == NetMsgType::DSCOMPLETE) {
-
-        if(pfrom->nVersion < MIN_PRIVATESEND_PEER_PROTO_VERSION) {
+    } else if (strCommand == NetMsgType::DSCOMPLETE) {
+        if (pfrom->nVersion < MIN_PRIVATESEND_PEER_PROTO_VERSION) {
             LogPrint("privatesend", "DSCOMPLETE -- peer=%d using obsolete version %i\n", pfrom->id, pfrom->nVersion);
-            connman.PushMessage(pfrom, CNetMsgMaker(pfrom->GetSendVersion()).Make(NetMsgType::REJECT, strCommand, REJECT_OBSOLETE,
-                               strprintf("Version must be %d or greater", MIN_PRIVATESEND_PEER_PROTO_VERSION)));
+            connman.PushMessage(pfrom, CNetMsgMaker(pfrom->GetSendVersion()).Make(NetMsgType::REJECT, strCommand, REJECT_OBSOLETE, strprintf("Version must be %d or greater", MIN_PRIVATESEND_PEER_PROTO_VERSION)));
             return;
         }
 
-        if(!infoMixingMasternode.fInfoValid) return;
-        if(infoMixingMasternode.addr != pfrom->addr) {
+        if (!infoMixingMasternode.fInfoValid) return;
+        if (infoMixingMasternode.addr != pfrom->addr) {
             LogPrint("privatesend", "DSCOMPLETE -- message doesn't match current Masternode: infoMixingMasternode=%s  addr=%s\n", infoMixingMasternode.addr.ToString(), pfrom->addr.ToString());
             return;
         }
@@ -225,12 +217,12 @@ void CPrivateSendClientSession::ProcessMessage(CNode* pfrom, const std::string&
         int nMsgMessageID;
         vRecv >> nMsgSessionID >> nMsgMessageID;
 
-        if(nMsgMessageID < MSG_POOL_MIN || nMsgMessageID > MSG_POOL_MAX) {
+        if (nMsgMessageID < MSG_POOL_MIN || nMsgMessageID > MSG_POOL_MAX) {
             LogPrint("privatesend", "DSCOMPLETE -- nMsgMessageID is out of bounds: %d\n", nMsgMessageID);
             return;
         }
 
-        if(nSessionID != nMsgSessionID) {
+        if (nSessionID != nMsgSessionID) {
             LogPrint("privatesend", "DSCOMPLETE -- message doesn't match current PrivateSend session: nSessionID: %d  nMsgSessionID: %d\n", nSessionID, nMsgSessionID);
             return;
         }
@@ -278,9 +270,12 @@ void CPrivateSendClientSession::UnlockCoins()
 {
     if (!pwalletMain) return;
 
-    while(true) {
+    while (true) {
         TRY_LOCK(pwalletMain->cs_wallet, lockWallet);
-        if(!lockWallet) {MilliSleep(50); continue;}
+        if (!lockWallet) {
+            MilliSleep(50);
+            continue;
+        }
         for (const auto& outpoint : vecOutPointLocked)
             pwalletMain->UnlockCoin(outpoint);
         break;
@@ -295,46 +290,57 @@ std::string CPrivateSendClientSession::GetStatus(bool fWaitForBlock)
     nStatusMessageProgress += 10;
     std::string strSuffix = "";
 
-    if(fWaitForBlock || !masternodeSync.IsBlockchainSynced())
+    if (fWaitForBlock || !masternodeSync.IsBlockchainSynced())
         return strAutoDenomResult;
 
-    switch(nState) {
-        case POOL_STATE_IDLE:
-            return _("PrivateSend is idle.");
-        case POOL_STATE_QUEUE:
-            if(     nStatusMessageProgress % 70 <= 30) strSuffix = ".";
-            else if(nStatusMessageProgress % 70 <= 50) strSuffix = "..";
-            else if(nStatusMessageProgress % 70 <= 70) strSuffix = "...";
-            return strprintf(_("Submitted to masternode, waiting in queue %s"), strSuffix);
-        case POOL_STATE_ACCEPTING_ENTRIES:
-            if(nEntriesCount == 0) {
+    switch (nState) {
+    case POOL_STATE_IDLE:
+        return _("PrivateSend is idle.");
+    case POOL_STATE_QUEUE:
+        if (nStatusMessageProgress % 70 <= 30)
+            strSuffix = ".";
+        else if (nStatusMessageProgress % 70 <= 50)
+            strSuffix = "..";
+        else if (nStatusMessageProgress % 70 <= 70)
+            strSuffix = "...";
+        return strprintf(_("Submitted to masternode, waiting in queue %s"), strSuffix);
+    case POOL_STATE_ACCEPTING_ENTRIES:
+        if (nEntriesCount == 0) {
+            nStatusMessageProgress = 0;
+            return strAutoDenomResult;
+        } else if (fLastEntryAccepted) {
+            if (nStatusMessageProgress % 10 > 8) {
+                fLastEntryAccepted = false;
                 nStatusMessageProgress = 0;
-                return strAutoDenomResult;
-            } else if(fLastEntryAccepted) {
-                if(nStatusMessageProgress % 10 > 8) {
-                    fLastEntryAccepted = false;
-                    nStatusMessageProgress = 0;
-                }
-                return _("PrivateSend request complete:") + " " + _("Your transaction was accepted into the pool!");
-            } else {
-                if(     nStatusMessageProgress % 70 <= 40) return strprintf(_("Submitted following entries to masternode: %u / %d"), nEntriesCount, CPrivateSend::GetMaxPoolTransactions());
-                else if(nStatusMessageProgress % 70 <= 50) strSuffix = ".";
-                else if(nStatusMessageProgress % 70 <= 60) strSuffix = "..";
-                else if(nStatusMessageProgress % 70 <= 70) strSuffix = "...";
-                return strprintf(_("Submitted to masternode, waiting for more entries ( %u / %d ) %s"), nEntriesCount, CPrivateSend::GetMaxPoolTransactions(), strSuffix);
             }
-        case POOL_STATE_SIGNING:
-            if(     nStatusMessageProgress % 70 <= 40) return _("Found enough users, signing ...");
-            else if(nStatusMessageProgress % 70 <= 50) strSuffix = ".";
-            else if(nStatusMessageProgress % 70 <= 60) strSuffix = "..";
-            else if(nStatusMessageProgress % 70 <= 70) strSuffix = "...";
-            return strprintf(_("Found enough users, signing ( waiting %s )"), strSuffix);
-        case POOL_STATE_ERROR:
-            return _("PrivateSend request incomplete:") + " " + strLastMessage + " " + _("Will retry...");
-        case POOL_STATE_SUCCESS:
-            return _("PrivateSend request complete:") + " " + strLastMessage;
-       default:
-            return strprintf(_("Unknown state: id = %u"), nState);
+            return _("PrivateSend request complete:") + " " + _("Your transaction was accepted into the pool!");
+        } else {
+            if (nStatusMessageProgress % 70 <= 40)
+                return strprintf(_("Submitted following entries to masternode: %u / %d"), nEntriesCount, CPrivateSend::GetMaxPoolTransactions());
+            else if (nStatusMessageProgress % 70 <= 50)
+                strSuffix = ".";
+            else if (nStatusMessageProgress % 70 <= 60)
+                strSuffix = "..";
+            else if (nStatusMessageProgress % 70 <= 70)
+                strSuffix = "...";
+            return strprintf(_("Submitted to masternode, waiting for more entries ( %u / %d ) %s"), nEntriesCount, CPrivateSend::GetMaxPoolTransactions(), strSuffix);
+        }
+    case POOL_STATE_SIGNING:
+        if (nStatusMessageProgress % 70 <= 40)
+            return _("Found enough users, signing ...");
+        else if (nStatusMessageProgress % 70 <= 50)
+            strSuffix = ".";
+        else if (nStatusMessageProgress % 70 <= 60)
+            strSuffix = "..";
+        else if (nStatusMessageProgress % 70 <= 70)
+            strSuffix = "...";
+        return strprintf(_("Found enough users, signing ( waiting %s )"), strSuffix);
+    case POOL_STATE_ERROR:
+        return _("PrivateSend request incomplete:") + " " + strLastMessage + " " + _("Will retry...");
+    case POOL_STATE_SUCCESS:
+        return _("PrivateSend request complete:") + " " + strLastMessage;
+    default:
+        return strprintf(_("Unknown state: id = %u"), nState);
     }
 }
 
@@ -385,7 +391,7 @@ bool CPrivateSendClientManager::GetMixingMasternodesInfo(std::vector<masternode_
 void CPrivateSendClientSession::CheckPool()
 {
     // reset if we're here for 10 seconds
-    if((nState == POOL_STATE_ERROR || nState == POOL_STATE_SUCCESS) && GetTime() - nTimeLastSuccessfulStep >= 10) {
+    if ((nState == POOL_STATE_ERROR || nState == POOL_STATE_SUCCESS) && GetTime() - nTimeLastSuccessfulStep >= 10) {
         LogPrint("privatesend", "CPrivateSendClientSession::CheckPool -- timeout, RESETTING\n");
         UnlockCoins();
         if (nState == POOL_STATE_ERROR) {
@@ -402,31 +408,31 @@ void CPrivateSendClientSession::CheckPool()
 //
 bool CPrivateSendClientSession::CheckTimeout()
 {
-    if(fMasternodeMode) return false;
+    if (fMasternodeMode) return false;
 
     // catching hanging sessions
-    switch(nState) {
-        case POOL_STATE_ERROR:
-            LogPrint("privatesend", "CPrivateSendClientSession::CheckTimeout -- Pool error -- Running CheckPool\n");
-            CheckPool();
-            break;
-        case POOL_STATE_SUCCESS:
-            LogPrint("privatesend", "CPrivateSendClientSession::CheckTimeout -- Pool success -- Running CheckPool\n");
-            CheckPool();
-            break;
-        default:
-            break;
+    switch (nState) {
+    case POOL_STATE_ERROR:
+        LogPrint("privatesend", "CPrivateSendClientSession::CheckTimeout -- Pool error -- Running CheckPool\n");
+        CheckPool();
+        break;
+    case POOL_STATE_SUCCESS:
+        LogPrint("privatesend", "CPrivateSendClientSession::CheckTimeout -- Pool success -- Running CheckPool\n");
+        CheckPool();
+        break;
+    default:
+        break;
     }
 
     int nLagTime = 10; // give the server a few extra seconds before resetting.
     int nTimeout = (nState == POOL_STATE_SIGNING) ? PRIVATESEND_SIGNING_TIMEOUT : PRIVATESEND_QUEUE_TIMEOUT;
     bool fTimeout = GetTime() - nTimeLastSuccessfulStep >= nTimeout + nLagTime;
 
-    if(nState == POOL_STATE_IDLE || !fTimeout)
+    if (nState == POOL_STATE_IDLE || !fTimeout)
         return false;
 
     LogPrint("privatesend", "CPrivateSendClientSession::CheckTimeout -- %s timed out (%ds) -- resetting\n",
-            (nState == POOL_STATE_SIGNING) ? "Signing" : "Session", nTimeout);
+        (nState == POOL_STATE_SIGNING) ? "Signing" : "Session", nTimeout);
     UnlockCoins();
     keyHolderStorage.ReturnAll();
     SetNull();
@@ -440,8 +446,8 @@ bool CPrivateSendClientSession::CheckTimeout()
 //
 void CPrivateSendClientManager::CheckTimeout()
 {
-    if(fMasternodeMode) return;
-    if(!fEnablePrivateSend) return;
+    if (fMasternodeMode) return;
+    if (!fEnablePrivateSend) return;
 
     CheckQueue();
 
@@ -457,14 +463,14 @@ void CPrivateSendClientManager::CheckTimeout()
 // Execute a mixing denomination via a Masternode.
 // This is only ran from clients
 //
-bool CPrivateSendClientSession::SendDenominate(const std::vector< std::pair<CTxDSIn, CTxOut> >& vecPSInOutPairsIn, CConnman& connman)
+bool CPrivateSendClientSession::SendDenominate(const std::vector<std::pair<CTxDSIn, CTxOut> >& vecPSInOutPairsIn, CConnman& connman)
 {
-    if(fMasternodeMode) {
+    if (fMasternodeMode) {
         LogPrintf("CPrivateSendClientSession::SendDenominate -- PrivateSend from a Masternode is not supported currently.\n");
         return false;
     }
 
-    if(txMyCollateral == CMutableTransaction()) {
+    if (txMyCollateral == CMutableTransaction()) {
         LogPrintf("CPrivateSendClient:SendDenominate -- PrivateSend collateral not set\n");
         return false;
     }
@@ -477,7 +483,7 @@ bool CPrivateSendClientSession::SendDenominate(const std::vector< std::pair<CTxD
         vecOutPointLocked.push_back(pair.first.prevout);
 
     // we should already be connected to a Masternode
-    if(!nSessionID) {
+    if (!nSessionID) {
         LogPrintf("CPrivateSendClientSession::SendDenominate -- No Masternode has been selected yet.\n");
         UnlockCoins();
         keyHolderStorage.ReturnAll();
@@ -485,7 +491,7 @@ bool CPrivateSendClientSession::SendDenominate(const std::vector< std::pair<CTxD
         return false;
     }
 
-    if(!CheckDiskSpace()) {
+    if (!CheckDiskSpace()) {
         UnlockCoins();
         keyHolderStorage.ReturnAll();
         SetNull();
@@ -522,15 +528,15 @@ bool CPrivateSendClientSession::SendDenominate(const std::vector< std::pair<CTxD
 // Incoming message from Masternode updating the progress of mixing
 bool CPrivateSendClientSession::CheckPoolStateUpdate(PoolState nStateNew, int nEntriesCountNew, PoolStatusUpdate nStatusUpdate, PoolMessage nMessageID, int nSessionIDNew)
 {
-    if(fMasternodeMode) return false;
+    if (fMasternodeMode) return false;
 
     // do not update state when mixing client state is one of these
-    if(nState == POOL_STATE_IDLE || nState == POOL_STATE_ERROR || nState == POOL_STATE_SUCCESS) return false;
+    if (nState == POOL_STATE_IDLE || nState == POOL_STATE_ERROR || nState == POOL_STATE_SUCCESS) return false;
 
     strAutoDenomResult = _("Masternode:") + " " + CPrivateSend::GetMessageByID(nMessageID);
 
     // if rejected at any state
-    if(nStatusUpdate == STATUS_REJECTED) {
+    if (nStatusUpdate == STATUS_REJECTED) {
         LogPrintf("CPrivateSendClientSession::CheckPoolStateUpdate -- entry is rejected by Masternode\n");
         UnlockCoins();
         keyHolderStorage.ReturnAll();
@@ -540,15 +546,14 @@ bool CPrivateSendClientSession::CheckPoolStateUpdate(PoolState nStateNew, int nE
         return true;
     }
 
-    if(nStatusUpdate == STATUS_ACCEPTED && nState == nStateNew) {
-        if(nStateNew == POOL_STATE_QUEUE && nSessionID == 0 && nSessionIDNew != 0) {
+    if (nStatusUpdate == STATUS_ACCEPTED && nState == nStateNew) {
+        if (nStateNew == POOL_STATE_QUEUE && nSessionID == 0 && nSessionIDNew != 0) {
             // new session id should be set only in POOL_STATE_QUEUE state
             nSessionID = nSessionIDNew;
             nTimeLastSuccessfulStep = GetTime();
             LogPrintf("CPrivateSendClientSession::CheckPoolStateUpdate -- set nSessionID to %d\n", nSessionID);
             return true;
-        }
-        else if(nStateNew == POOL_STATE_ACCEPTING_ENTRIES && nEntriesCount != nEntriesCountNew) {
+        } else if (nStateNew == POOL_STATE_ACCEPTING_ENTRIES && nEntriesCount != nEntriesCountNew) {
             nEntriesCount = nEntriesCountNew;
             nTimeLastSuccessfulStep = GetTime();
             fLastEntryAccepted = true;
@@ -570,8 +575,8 @@ bool CPrivateSendClientSession::SignFinalTransaction(const CTransaction& finalTr
 {
     if (!pwalletMain) return false;
 
-    if(fMasternodeMode || pnode == nullptr) return false;
-    if(!infoMixingMasternode.fInfoValid) return false;
+    if (fMasternodeMode || pnode == nullptr) return false;
+    if (!infoMixingMasternode.fInfoValid) return false;
 
     finalMutableTransaction = finalTransactionNew;
     LogPrintf("CPrivateSendClientSession::SignFinalTransaction -- finalMutableTransaction=%s", finalMutableTransaction.ToString());
@@ -580,7 +585,7 @@ bool CPrivateSendClientSession::SignFinalTransaction(const CTransaction& finalTr
     sort(finalMutableTransaction.vin.begin(), finalMutableTransaction.vin.end(), CompareInputBIP69());
     sort(finalMutableTransaction.vout.begin(), finalMutableTransaction.vout.end(), CompareOutputBIP69());
 
-    if(finalMutableTransaction.GetHash() != finalTransactionNew.GetHash()) {
+    if (finalMutableTransaction.GetHash() != finalTransactionNew.GetHash()) {
         LogPrintf("CPrivateSendClientSession::SignFinalTransaction -- WARNING! Masternode %s is not BIP69 compliant!\n", infoMixingMasternode.outpoint.ToStringShort());
         UnlockCoins();
         keyHolderStorage.ReturnAll();
@@ -598,22 +603,22 @@ bool CPrivateSendClientSession::SignFinalTransaction(const CTransaction& finalTr
             CScript prevPubKey = CScript();
             CTxIn txin = CTxIn();
 
-            for(unsigned int i = 0; i < finalMutableTransaction.vin.size(); i++) {
-                if(finalMutableTransaction.vin[i] == txdsin) {
+            for (unsigned int i = 0; i < finalMutableTransaction.vin.size(); i++) {
+                if (finalMutableTransaction.vin[i] == txdsin) {
                     nMyInputIndex = i;
                     prevPubKey = txdsin.prevPubKey;
                     txin = txdsin;
                 }
             }
 
-            if(nMyInputIndex >= 0) { //might have to do this one input at a time?
+            if (nMyInputIndex >= 0) { //might have to do this one input at a time?
                 int nFoundOutputsCount = 0;
                 CAmount nValue1 = 0;
                 CAmount nValue2 = 0;
 
                 for (const auto& txoutFinal : finalMutableTransaction.vout) {
-                    for (const auto& txout: entry.vecTxOut) {
-                        if(txoutFinal == txout) {
+                    for (const auto& txout : entry.vecTxOut) {
+                        if (txoutFinal == txout) {
                             nFoundOutputsCount++;
                             nValue1 += txoutFinal.nValue;
                         }
@@ -624,7 +629,7 @@ bool CPrivateSendClientSession::SignFinalTransaction(const CTransaction& finalTr
                     nValue2 += txout.nValue;
 
                 int nTargetOuputsCount = entry.vecTxOut.size();
-                if(nFoundOutputsCount < nTargetOuputsCount || nValue1 != nValue2) {
+                if (nFoundOutputsCount < nTargetOuputsCount || nValue1 != nValue2) {
                     // in this case, something went wrong and we'll refuse to sign. It's possible we'll be charged collateral. But that's
                     // better then signing if the transaction doesn't look like what we wanted.
                     LogPrintf("CPrivateSendClientSession::SignFinalTransaction -- My entries are not correct! Refusing to sign: nFoundOutputsCount: %d, nTargetOuputsCount: %d\n", nFoundOutputsCount, nTargetOuputsCount);
@@ -638,7 +643,7 @@ bool CPrivateSendClientSession::SignFinalTransaction(const CTransaction& finalTr
                 const CKeyStore& keystore = *pwalletMain;
 
                 LogPrint("privatesend", "CPrivateSendClientSession::SignFinalTransaction -- Signing my input %i\n", nMyInputIndex);
-                if(!SignSignature(keystore, prevPubKey, finalMutableTransaction, nMyInputIndex, int(SIGHASH_ALL|SIGHASH_ANYONECANPAY))) { // changes scriptSig
+                if (!SignSignature(keystore, prevPubKey, finalMutableTransaction, nMyInputIndex, int(SIGHASH_ALL | SIGHASH_ANYONECANPAY))) { // changes scriptSig
                     LogPrint("privatesend", "CPrivateSendClientSession::SignFinalTransaction -- Unable to sign my own transaction!\n");
                     // not sure what to do here, it will timeout...?
                 }
@@ -649,7 +654,7 @@ bool CPrivateSendClientSession::SignFinalTransaction(const CTransaction& finalTr
         }
     }
 
-    if(sigs.empty()) {
+    if (sigs.empty()) {
         LogPrintf("CPrivateSendClientSession::SignFinalTransaction -- can't sign anything!\n");
         UnlockCoins();
         keyHolderStorage.ReturnAll();
@@ -671,9 +676,9 @@ bool CPrivateSendClientSession::SignFinalTransaction(const CTransaction& finalTr
 // mixing transaction was completed (failed or successful)
 void CPrivateSendClientSession::CompletedTransaction(PoolMessage nMessageID)
 {
-    if(fMasternodeMode) return;
+    if (fMasternodeMode) return;
 
-    if(nMessageID == MSG_SUCCESS) {
+    if (nMessageID == MSG_SUCCESS) {
         LogPrintf("CompletedTransaction -- success\n");
         privateSendClient.UpdatedSuccessBlock();
         keyHolderStorage.KeepAll();
@@ -688,7 +693,7 @@ void CPrivateSendClientSession::CompletedTransaction(PoolMessage nMessageID)
 
 void CPrivateSendClientManager::UpdatedSuccessBlock()
 {
-    if(fMasternodeMode) return;
+    if (fMasternodeMode) return;
     nCachedLastSuccessBlock = nCachedBlockHeight;
 }
 
@@ -704,10 +709,10 @@ void CPrivateSendClientManager::AddSkippedDenom(const CAmount& nDenomValue)
 
 bool CPrivateSendClientManager::WaitForAnotherBlock()
 {
-    if(!masternodeSync.IsMasternodeListSynced())
+    if (!masternodeSync.IsMasternodeListSynced())
         return true;
 
-    if(fPrivateSendMultiSession)
+    if (fPrivateSendMultiSession)
         return false;
 
     return nCachedBlockHeight - nCachedLastSuccessBlock < nMinBlocksToWait;
@@ -722,52 +727,52 @@ bool CPrivateSendClientManager::CheckAutomaticBackup()
         return false;
     }
 
-    switch(nWalletBackups) {
-        case 0:
-            LogPrint("privatesend", "CPrivateSendClientManager::CheckAutomaticBackup -- Automatic backups disabled, no mixing available.\n");
-            strAutoDenomResult = _("Automatic backups disabled") + ", " + _("no mixing available.");
-            fEnablePrivateSend = false; // stop mixing
-            pwalletMain->nKeysLeftSinceAutoBackup = 0; // no backup, no "keys since last backup"
-            return false;
-        case -1:
-            // Automatic backup failed, nothing else we can do until user fixes the issue manually.
-            // There is no way to bring user attention in daemon mode so we just update status and
-            // keep spamming if debug is on.
-            LogPrint("privatesend", "CPrivateSendClientManager::CheckAutomaticBackup -- ERROR! Failed to create automatic backup.\n");
-            strAutoDenomResult = _("ERROR! Failed to create automatic backup") + ", " + _("see debug.log for details.");
-            return false;
-        case -2:
-            // We were able to create automatic backup but keypool was not replenished because wallet is locked.
-            // There is no way to bring user attention in daemon mode so we just update status and
-            // keep spamming if debug is on.
-            LogPrint("privatesend", "CPrivateSendClientManager::CheckAutomaticBackup -- WARNING! Failed to create replenish keypool, please unlock your wallet to do so.\n");
-            strAutoDenomResult = _("WARNING! Failed to replenish keypool, please unlock your wallet to do so.") + ", " + _("see debug.log for details.");
-            return false;
+    switch (nWalletBackups) {
+    case 0:
+        LogPrint("privatesend", "CPrivateSendClientManager::CheckAutomaticBackup -- Automatic backups disabled, no mixing available.\n");
+        strAutoDenomResult = _("Automatic backups disabled") + ", " + _("no mixing available.");
+        fEnablePrivateSend = false;                // stop mixing
+        pwalletMain->nKeysLeftSinceAutoBackup = 0; // no backup, no "keys since last backup"
+        return false;
+    case -1:
+        // Automatic backup failed, nothing else we can do until user fixes the issue manually.
+        // There is no way to bring user attention in daemon mode so we just update status and
+        // keep spamming if debug is on.
+        LogPrint("privatesend", "CPrivateSendClientManager::CheckAutomaticBackup -- ERROR! Failed to create automatic backup.\n");
+        strAutoDenomResult = _("ERROR! Failed to create automatic backup") + ", " + _("see debug.log for details.");
+        return false;
+    case -2:
+        // We were able to create automatic backup but keypool was not replenished because wallet is locked.
+        // There is no way to bring user attention in daemon mode so we just update status and
+        // keep spamming if debug is on.
+        LogPrint("privatesend", "CPrivateSendClientManager::CheckAutomaticBackup -- WARNING! Failed to create replenish keypool, please unlock your wallet to do so.\n");
+        strAutoDenomResult = _("WARNING! Failed to replenish keypool, please unlock your wallet to do so.") + ", " + _("see debug.log for details.");
+        return false;
     }
 
-    if(pwalletMain->nKeysLeftSinceAutoBackup < PRIVATESEND_KEYS_THRESHOLD_STOP) {
+    if (pwalletMain->nKeysLeftSinceAutoBackup < PRIVATESEND_KEYS_THRESHOLD_STOP) {
         // We should never get here via mixing itself but probably smth else is still actively using keypool
         LogPrint("privatesend", "CPrivateSendClientManager::CheckAutomaticBackup -- Very low number of keys left: %d, no mixing available.\n", pwalletMain->nKeysLeftSinceAutoBackup);
         strAutoDenomResult = strprintf(_("Very low number of keys left: %d") + ", " + _("no mixing available."), pwalletMain->nKeysLeftSinceAutoBackup);
         // It's getting really dangerous, stop mixing
         fEnablePrivateSend = false;
         return false;
-    } else if(pwalletMain->nKeysLeftSinceAutoBackup < PRIVATESEND_KEYS_THRESHOLD_WARNING) {
+    } else if (pwalletMain->nKeysLeftSinceAutoBackup < PRIVATESEND_KEYS_THRESHOLD_WARNING) {
         // Low number of keys left but it's still more or less safe to continue
         LogPrint("privatesend", "CPrivateSendClientManager::CheckAutomaticBackup -- Very low number of keys left: %d\n", pwalletMain->nKeysLeftSinceAutoBackup);
         strAutoDenomResult = strprintf(_("Very low number of keys left: %d"), pwalletMain->nKeysLeftSinceAutoBackup);
 
-        if(fCreateAutoBackups) {
+        if (fCreateAutoBackups) {
             LogPrint("privatesend", "CPrivateSendClientManager::CheckAutomaticBackup -- Trying to create new backup.\n");
             std::string warningString;
             std::string errorString;
 
-            if(!AutoBackupWallet(pwalletMain, "", warningString, errorString)) {
-                if(!warningString.empty()) {
+            if (!AutoBackupWallet(pwalletMain, "", warningString, errorString)) {
+                if (!warningString.empty()) {
                     // There were some issues saving backup but yet more or less safe to continue
                     LogPrintf("CPrivateSendClientManager::CheckAutomaticBackup -- WARNING! Something went wrong on automatic backup: %s\n", warningString);
                 }
-                if(!errorString.empty()) {
+                if (!errorString.empty()) {
                     // Things are really broken
                     LogPrintf("CPrivateSendClientManager::CheckAutomaticBackup -- ERROR! Failed to create automatic backup: %s\n", errorString);
                     strAutoDenomResult = strprintf(_("ERROR! Failed to create automatic backup") + ": %s", errorString);
@@ -790,10 +795,10 @@ bool CPrivateSendClientManager::CheckAutomaticBackup()
 //
 bool CPrivateSendClientSession::DoAutomaticDenominating(CConnman& connman, bool fDryRun)
 {
-    if(fMasternodeMode) return false; // no client-side mixing on masternodes
-    if(nState != POOL_STATE_IDLE) return false;
+    if (fMasternodeMode) return false; // no client-side mixing on masternodes
+    if (nState != POOL_STATE_IDLE) return false;
 
-    if(!masternodeSync.IsMasternodeListSynced()) {
+    if (!masternodeSync.IsMasternodeListSynced()) {
         strAutoDenomResult = _("Can't mix while sync in progress.");
         return false;
     }
@@ -807,118 +812,118 @@ bool CPrivateSendClientSession::DoAutomaticDenominating(CConnman& connman, bool
     CAmount nValueMin = CPrivateSend::GetSmallestDenomination();
 
     {
-    LOCK2(cs_main, pwalletMain->cs_wallet);
-
-    if(!fDryRun && pwalletMain->IsLocked(true)) {
-        strAutoDenomResult = _("Wallet is locked.");
-        return false;
-    }
-
-    if(GetEntriesCount() > 0) {
-        strAutoDenomResult = _("Mixing in progress...");
-        return false;
-    }
-
-    TRY_LOCK(cs_privatesend, lockDS);
-    if(!lockDS) {
-        strAutoDenomResult = _("Lock is already in place.");
-        return false;
-    }
-
-    if(mnodeman.size() == 0) {
-        LogPrint("privatesend", "CPrivateSendClientSession::DoAutomaticDenominating -- No Masternodes detected\n");
-        strAutoDenomResult = _("No Masternodes detected.");
-        return false;
-    }
-
-    // if there are no confirmed DS collateral inputs yet
-    if(!pwalletMain->HasCollateralInputs()) {
-        // should have some additional amount for them
-        nValueMin += CPrivateSend::GetMaxCollateralAmount();
-    }
+        LOCK2(cs_main, pwalletMain->cs_wallet);
 
-    // including denoms but applying some restrictions
-    nBalanceNeedsAnonymized = pwalletMain->GetNeedsToBeAnonymizedBalance(nValueMin);
-
-    // anonymizable balance is way too small
-    if(nBalanceNeedsAnonymized < nValueMin) {
-        LogPrintf("CPrivateSendClientSession::DoAutomaticDenominating -- Not enough funds to anonymize\n");
-        strAutoDenomResult = _("Not enough funds to anonymize.");
-        return false;
-    }
+        if (!fDryRun && pwalletMain->IsLocked(true)) {
+            strAutoDenomResult = _("Wallet is locked.");
+            return false;
+        }
 
-    // excluding denoms
-    CAmount nBalanceAnonimizableNonDenom = pwalletMain->GetAnonymizableBalance(true);
-    // denoms
-    CAmount nBalanceDenominatedConf = pwalletMain->GetDenominatedBalance();
-    CAmount nBalanceDenominatedUnconf = pwalletMain->GetDenominatedBalance(true);
-    CAmount nBalanceDenominated = nBalanceDenominatedConf + nBalanceDenominatedUnconf;
+        if (GetEntriesCount() > 0) {
+            strAutoDenomResult = _("Mixing in progress...");
+            return false;
+        }
 
-    LogPrint("privatesend", "CPrivateSendClientSession::DoAutomaticDenominating -- nValueMin: %f, nBalanceNeedsAnonymized: %f, nBalanceAnonimizableNonDenom: %f, nBalanceDenominatedConf: %f, nBalanceDenominatedUnconf: %f, nBalanceDenominated: %f\n",
-            (float)nValueMin/COIN,
-            (float)nBalanceNeedsAnonymized/COIN,
-            (float)nBalanceAnonimizableNonDenom/COIN,
-            (float)nBalanceDenominatedConf/COIN,
-            (float)nBalanceDenominatedUnconf/COIN,
-            (float)nBalanceDenominated/COIN);
+        TRY_LOCK(cs_privatesend, lockDS);
+        if (!lockDS) {
+            strAutoDenomResult = _("Lock is already in place.");
+            return false;
+        }
 
-    if(fDryRun) return true;
+        if (mnodeman.size() == 0) {
+            LogPrint("privatesend", "CPrivateSendClientSession::DoAutomaticDenominating -- No Masternodes detected\n");
+            strAutoDenomResult = _("No Masternodes detected.");
+            return false;
+        }
 
-    // Check if we have should create more denominated inputs i.e.
-    // there are funds to denominate and denominated balance does not exceed
-    // max amount to mix yet.
-    if(nBalanceAnonimizableNonDenom >= nValueMin + CPrivateSend::GetCollateralAmount() && nBalanceDenominated < privateSendClient.nPrivateSendAmount*COIN)
-        return CreateDenominated(connman);
+        // if there are no confirmed DS collateral inputs yet
+        if (!pwalletMain->HasCollateralInputs()) {
+            // should have some additional amount for them
+            nValueMin += CPrivateSend::GetMaxCollateralAmount();
+        }
 
-    //check if we have the collateral sized inputs
-    if(!pwalletMain->HasCollateralInputs())
-        return !pwalletMain->HasCollateralInputs(false) && MakeCollateralAmounts(connman);
+        // including denoms but applying some restrictions
+        nBalanceNeedsAnonymized = pwalletMain->GetNeedsToBeAnonymizedBalance(nValueMin);
 
-    if(nSessionID) {
-        strAutoDenomResult = _("Mixing in progress...");
-        return false;
-    }
+        // anonymizable balance is way too small
+        if (nBalanceNeedsAnonymized < nValueMin) {
+            LogPrintf("CPrivateSendClientSession::DoAutomaticDenominating -- Not enough funds to anonymize\n");
+            strAutoDenomResult = _("Not enough funds to anonymize.");
+            return false;
+        }
 
-    // Initial phase, find a Masternode
-    // Clean if there is anything left from previous session
-    UnlockCoins();
-    keyHolderStorage.ReturnAll();
-    SetNull();
+        // excluding denoms
+        CAmount nBalanceAnonimizableNonDenom = pwalletMain->GetAnonymizableBalance(true);
+        // denoms
+        CAmount nBalanceDenominatedConf = pwalletMain->GetDenominatedBalance();
+        CAmount nBalanceDenominatedUnconf = pwalletMain->GetDenominatedBalance(true);
+        CAmount nBalanceDenominated = nBalanceDenominatedConf + nBalanceDenominatedUnconf;
+
+        LogPrint("privatesend", "CPrivateSendClientSession::DoAutomaticDenominating -- nValueMin: %f, nBalanceNeedsAnonymized: %f, nBalanceAnonimizableNonDenom: %f, nBalanceDenominatedConf: %f, nBalanceDenominatedUnconf: %f, nBalanceDenominated: %f\n",
+            (float)nValueMin / COIN,
+            (float)nBalanceNeedsAnonymized / COIN,
+            (float)nBalanceAnonimizableNonDenom / COIN,
+            (float)nBalanceDenominatedConf / COIN,
+            (float)nBalanceDenominatedUnconf / COIN,
+            (float)nBalanceDenominated / COIN);
+
+        if (fDryRun) return true;
+
+        // Check if we have should create more denominated inputs i.e.
+        // there are funds to denominate and denominated balance does not exceed
+        // max amount to mix yet.
+        if (nBalanceAnonimizableNonDenom >= nValueMin + CPrivateSend::GetCollateralAmount() && nBalanceDenominated < privateSendClient.nPrivateSendAmount * COIN)
+            return CreateDenominated(connman);
+
+        //check if we have the collateral sized inputs
+        if (!pwalletMain->HasCollateralInputs())
+            return !pwalletMain->HasCollateralInputs(false) && MakeCollateralAmounts(connman);
+
+        if (nSessionID) {
+            strAutoDenomResult = _("Mixing in progress...");
+            return false;
+        }
 
-    // should be no unconfirmed denoms in non-multi-session mode
-    if(!privateSendClient.fPrivateSendMultiSession && nBalanceDenominatedUnconf > 0) {
-        LogPrintf("CPrivateSendClientSession::DoAutomaticDenominating -- Found unconfirmed denominated outputs, will wait till they confirm to continue.\n");
-        strAutoDenomResult = _("Found unconfirmed denominated outputs, will wait till they confirm to continue.");
-        return false;
-    }
+        // Initial phase, find a Masternode
+        // Clean if there is anything left from previous session
+        UnlockCoins();
+        keyHolderStorage.ReturnAll();
+        SetNull();
 
-    //check our collateral and create new if needed
-    std::string strReason;
-    if(txMyCollateral == CMutableTransaction()) {
-        if(!pwalletMain->CreateCollateralTransaction(txMyCollateral, strReason)) {
-            LogPrintf("CPrivateSendClientSession::DoAutomaticDenominating -- create collateral error:%s\n", strReason);
+        // should be no unconfirmed denoms in non-multi-session mode
+        if (!privateSendClient.fPrivateSendMultiSession && nBalanceDenominatedUnconf > 0) {
+            LogPrintf("CPrivateSendClientSession::DoAutomaticDenominating -- Found unconfirmed denominated outputs, will wait till they confirm to continue.\n");
+            strAutoDenomResult = _("Found unconfirmed denominated outputs, will wait till they confirm to continue.");
             return false;
         }
-    } else {
-        if(!CPrivateSend::IsCollateralValid(txMyCollateral)) {
-            LogPrintf("CPrivateSendClientSession::DoAutomaticDenominating -- invalid collateral, recreating...\n");
-            if(!pwalletMain->CreateCollateralTransaction(txMyCollateral, strReason)) {
-                LogPrintf("CPrivateSendClientSession::DoAutomaticDenominating -- create collateral error: %s\n", strReason);
+
+        //check our collateral and create new if needed
+        std::string strReason;
+        if (txMyCollateral == CMutableTransaction()) {
+            if (!pwalletMain->CreateCollateralTransaction(txMyCollateral, strReason)) {
+                LogPrintf("CPrivateSendClientSession::DoAutomaticDenominating -- create collateral error:%s\n", strReason);
                 return false;
             }
+        } else {
+            if (!CPrivateSend::IsCollateralValid(txMyCollateral)) {
+                LogPrintf("CPrivateSendClientSession::DoAutomaticDenominating -- invalid collateral, recreating...\n");
+                if (!pwalletMain->CreateCollateralTransaction(txMyCollateral, strReason)) {
+                    LogPrintf("CPrivateSendClientSession::DoAutomaticDenominating -- create collateral error: %s\n", strReason);
+                    return false;
+                }
+            }
         }
-    }
     } // LOCK2(cs_main, pwalletMain->cs_wallet);
 
     bool fUseQueue = GetRandInt(100) > 33;
     // don't use the queues all of the time for mixing unless we are a liquidity provider
-    if((privateSendClient.nLiquidityProvider || fUseQueue) && JoinExistingQueue(nBalanceNeedsAnonymized, connman))
+    if ((privateSendClient.nLiquidityProvider || fUseQueue) && JoinExistingQueue(nBalanceNeedsAnonymized, connman))
         return true;
 
     // do not initiate queue if we are a liquidity provider to avoid useless inter-mixing
-    if(privateSendClient.nLiquidityProvider) return false;
+    if (privateSendClient.nLiquidityProvider) return false;
 
-    if(StartNewQueue(nValueMin, nBalanceNeedsAnonymized, connman))
+    if (StartNewQueue(nValueMin, nBalanceNeedsAnonymized, connman))
         return true;
 
     strAutoDenomResult = _("No compatible Masternode found.");
@@ -952,7 +957,7 @@ bool CPrivateSendClientManager::DoAutomaticDenominating(CConnman& connman, bool
     int nThreshold_low = nThreshold_high * 0.7;
     LogPrint("privatesend", "Checking vecMasternodesUsed: size: %d, threshold: %d\n", (int)vecMasternodesUsed.size(), nThreshold_high);
 
-    if((int)vecMasternodesUsed.size() > nThreshold_high) {
+    if ((int)vecMasternodesUsed.size() > nThreshold_high) {
         vecMasternodesUsed.erase(vecMasternodesUsed.begin(), vecMasternodesUsed.begin() + vecMasternodesUsed.size() - nThreshold_low);
         LogPrint("privatesend", "  vecMasternodesUsed: new size: %d, threshold: %d\n", (int)vecMasternodesUsed.size(), nThreshold_high);
     }
@@ -990,7 +995,7 @@ masternode_info_t CPrivateSendClientManager::GetNotUsedMasternode()
 
 bool CPrivateSendClientSession::JoinExistingQueue(CAmount nBalanceNeedsAnonymized, CConnman& connman)
 {
-    if (!pwalletMain)  return false;
+    if (!pwalletMain) return false;
 
     std::vector<CAmount> vecStandardDenoms = CPrivateSend::GetStandardDenominations();
     // Look through the queues and see if anything matches
@@ -998,12 +1003,12 @@ bool CPrivateSendClientSession::JoinExistingQueue(CAmount nBalanceNeedsAnonymize
     while (privateSendClient.GetQueueItemAndTry(dsq)) {
         masternode_info_t infoMn;
 
-        if(!mnodeman.GetMasternodeInfo(dsq.masternodeOutpoint, infoMn)) {
+        if (!mnodeman.GetMasternodeInfo(dsq.masternodeOutpoint, infoMn)) {
             LogPrintf("CPrivateSendClientSession::JoinExistingQueue -- dsq masternode is not in masternode list, masternode=%s\n", dsq.masternodeOutpoint.ToStringShort());
             continue;
         }
 
-        if(infoMn.nProtocolVersion < MIN_PRIVATESEND_PEER_PROTO_VERSION) continue;
+        if (infoMn.nProtocolVersion < MIN_PRIVATESEND_PEER_PROTO_VERSION) continue;
 
         // skip next mn payments winners
         if (mnpayments.IsScheduled(infoMn, 0)) {
@@ -1012,7 +1017,7 @@ bool CPrivateSendClientSession::JoinExistingQueue(CAmount nBalanceNeedsAnonymize
         }
 
         std::vector<int> vecBits;
-        if(!CPrivateSend::GetDenominationsBits(dsq.nDenom, vecBits)) {
+        if (!CPrivateSend::GetDenominationsBits(dsq.nDenom, vecBits)) {
             // incompatible denom
             continue;
         }
@@ -1023,7 +1028,7 @@ bool CPrivateSendClientSession::JoinExistingQueue(CAmount nBalanceNeedsAnonymize
 
         LogPrint("privatesend", "CPrivateSendClientSession::JoinExistingQueue -- found valid queue: %s\n", dsq.ToString());
 
-        std::vector< std::pair<CTxDSIn, CTxOut> > vecPSInOutPairsTmp;
+        std::vector<std::pair<CTxDSIn, CTxOut> > vecPSInOutPairsTmp;
         CAmount nMinAmount = vecStandardDenoms[vecBits.front()];
         CAmount nMaxAmount = nBalanceNeedsAnonymized;
 
@@ -1048,7 +1053,7 @@ bool CPrivateSendClientSession::JoinExistingQueue(CAmount nBalanceNeedsAnonymize
         SetState(POOL_STATE_QUEUE);
         nTimeLastSuccessfulStep = GetTime();
         LogPrintf("CPrivateSendClientSession::JoinExistingQueue -- pending connection (from queue): nSessionDenom: %d (%s), addr=%s\n",
-                  nSessionDenom, CPrivateSend::GetDenominationsToString(nSessionDenom), infoMn.addr.ToString());
+            nSessionDenom, CPrivateSend::GetDenominationsToString(nSessionDenom), infoMn.addr.ToString());
         strAutoDenomResult = _("Trying to connect...");
         return true;
     }
@@ -1066,7 +1071,7 @@ bool CPrivateSendClientSession::StartNewQueue(CAmount nValueMin, CAmount nBalanc
     // ** find the coins we'll use
     std::vector<CTxIn> vecTxIn;
     CAmount nValueInTmp = 0;
-    if(!pwalletMain->SelectPrivateCoins(nValueMin, nBalanceNeedsAnonymized, vecTxIn, nValueInTmp, 0, privateSendClient.nPrivateSendRounds - 1)) {
+    if (!pwalletMain->SelectPrivateCoins(nValueMin, nBalanceNeedsAnonymized, vecTxIn, nValueInTmp, 0, privateSendClient.nPrivateSendRounds - 1)) {
         // this should never happen
         LogPrintf("CPrivateSendClientSession::StartNewQueue -- Can't mix: no compatible inputs found!\n");
         strAutoDenomResult = _("Can't mix: no compatible inputs found!");
@@ -1074,10 +1079,10 @@ bool CPrivateSendClientSession::StartNewQueue(CAmount nValueMin, CAmount nBalanc
     }
 
     // otherwise, try one randomly
-    while(nTries < 10) {
+    while (nTries < 10) {
         masternode_info_t infoMn = privateSendClient.GetNotUsedMasternode();
 
-        if(!infoMn.fInfoValid) {
+        if (!infoMn.fInfoValid) {
             LogPrintf("CPrivateSendClientSession::StartNewQueue -- Can't find random masternode!\n");
             strAutoDenomResult = _("Can't find random Masternode.");
             return false;
@@ -1092,11 +1097,11 @@ bool CPrivateSendClientSession::StartNewQueue(CAmount nValueMin, CAmount nBalanc
             continue;
         }
 
-        if(infoMn.nLastDsq != 0 && infoMn.nLastDsq + nMnCountEnabled/5 > mnodeman.nDsqCount) {
+        if (infoMn.nLastDsq != 0 && infoMn.nLastDsq + nMnCountEnabled / 5 > mnodeman.nDsqCount) {
             LogPrintf("CPrivateSendClientSession::StartNewQueue -- Too early to mix on this masternode!"
-                        " masternode=%s  addr=%s  nLastDsq=%d  CountEnabled/5=%d  nDsqCount=%d\n",
-                        infoMn.outpoint.ToStringShort(), infoMn.addr.ToString(), infoMn.nLastDsq,
-                        nMnCountEnabled/5, mnodeman.nDsqCount);
+                      " masternode=%s  addr=%s  nLastDsq=%d  CountEnabled/5=%d  nDsqCount=%d\n",
+                infoMn.outpoint.ToStringShort(), infoMn.addr.ToString(), infoMn.nLastDsq,
+                nMnCountEnabled / 5, mnodeman.nDsqCount);
             nTries++;
             continue;
         }
@@ -1112,7 +1117,7 @@ bool CPrivateSendClientSession::StartNewQueue(CAmount nValueMin, CAmount nBalanc
         std::vector<CAmount> vecAmounts;
         pwalletMain->ConvertList(vecTxIn, vecAmounts);
         // try to get a single random denom out of vecAmounts
-        while(nSessionDenom == 0) {
+        while (nSessionDenom == 0) {
             nSessionDenom = CPrivateSend::GetDenominationsByAmounts(vecAmounts);
         }
 
@@ -1123,7 +1128,7 @@ bool CPrivateSendClientSession::StartNewQueue(CAmount nValueMin, CAmount nBalanc
         SetState(POOL_STATE_QUEUE);
         nTimeLastSuccessfulStep = GetTime();
         LogPrintf("CPrivateSendClientSession::StartNewQueue -- pending connection, nSessionDenom: %d (%s), addr=%s\n",
-                nSessionDenom, CPrivateSend::GetDenominationsToString(nSessionDenom), infoMn.addr.ToString());
+            nSessionDenom, CPrivateSend::GetDenominationsToString(nSessionDenom), infoMn.addr.ToString());
         strAutoDenomResult = _("Trying to connect...");
         return true;
     }
@@ -1170,14 +1175,14 @@ bool CPrivateSendClientSession::SubmitDenominate(CConnman& connman)
     LOCK2(cs_main, pwalletMain->cs_wallet);
 
     std::string strError;
-    std::vector< std::pair<CTxDSIn, CTxOut> > vecPSInOutPairs, vecPSInOutPairsTmp;
+    std::vector<std::pair<CTxDSIn, CTxOut> > vecPSInOutPairs, vecPSInOutPairsTmp;
 
     if (!SelectDenominate(strError, vecPSInOutPairs)) {
         LogPrintf("CPrivateSendClientSession::SubmitDenominate -- SelectDenominate failed, error: %s\n", strError);
         return false;
     }
 
-    std::vector< std::pair<int, size_t> > vecInputsByRounds;
+    std::vector<std::pair<int, size_t> > vecInputsByRounds;
     // Note: liquidity providers are fine with whatever number of inputs they've got
     bool fDryRun = privateSendClient.nLiquidityProvider == 0;
 
@@ -1221,7 +1226,7 @@ bool CPrivateSendClientSession::SubmitDenominate(CConnman& connman)
     return false;
 }
 
-bool CPrivateSendClientSession::SelectDenominate(std::string& strErrorRet, std::vector< std::pair<CTxDSIn, CTxOut> >& vecPSInOutPairsRet)
+bool CPrivateSendClientSession::SelectDenominate(std::string& strErrorRet, std::vector<std::pair<CTxDSIn, CTxOut> >& vecPSInOutPairsRet)
 {
     if (!pwalletMain) {
         strErrorRet = "Wallet is not initialized";
@@ -1256,7 +1261,7 @@ bool CPrivateSendClientSession::SelectDenominate(std::string& strErrorRet, std::
     return true;
 }
 
-bool CPrivateSendClientSession::PrepareDenominate(int nMinRounds, int nMaxRounds, std::string& strErrorRet, const std::vector< std::pair<CTxDSIn, CTxOut> >& vecPSInOutPairsIn, std::vector< std::pair<CTxDSIn, CTxOut> >& vecPSInOutPairsRet, bool fDryRun)
+bool CPrivateSendClientSession::PrepareDenominate(int nMinRounds, int nMaxRounds, std::string& strErrorRet, const std::vector<std::pair<CTxDSIn, CTxOut> >& vecPSInOutPairsIn, std::vector<std::pair<CTxDSIn, CTxOut> >& vecPSInOutPairsRet, bool fDryRun)
 {
     std::vector<int> vecBits;
     if (!CPrivateSend::GetDenominationsBits(nSessionDenom, vecBits)) {
@@ -1277,7 +1282,7 @@ bool CPrivateSendClientSession::PrepareDenominate(int nMinRounds, int nMaxRounds
     vecPSInOutPairsRet.clear();
 
     // Try to add up to PRIVATESEND_ENTRY_MAX_SIZE of every needed denomination
-    for (const auto& pair: vecPSInOutPairsIn) {
+    for (const auto& pair : vecPSInOutPairsIn) {
         if (pair.second.nRounds < nMinRounds || pair.second.nRounds > nMaxRounds) {
             // unlock unused coins
             pwalletMain->UnlockCoin(pair.first.prevout);
@@ -1335,20 +1340,20 @@ bool CPrivateSendClientSession::MakeCollateralAmounts(CConnman& connman)
     if (!pwalletMain) return false;
 
     std::vector<CompactTallyItem> vecTally;
-    if(!pwalletMain->SelectCoinsGroupedByAddresses(vecTally, false, false)) {
+    if (!pwalletMain->SelectCoinsGroupedByAddresses(vecTally, false, false)) {
         LogPrint("privatesend", "CPrivateSendClientSession::MakeCollateralAmounts -- SelectCoinsGroupedByAddresses can't find any inputs!\n");
         return false;
     }
 
     // First try to use only non-denominated funds
     for (const auto& item : vecTally) {
-        if(!MakeCollateralAmounts(item, false, connman)) continue;
+        if (!MakeCollateralAmounts(item, false, connman)) continue;
         return true;
     }
 
     // There should be at least some denominated funds we should be able to break in pieces to continue mixing
     for (const auto& item : vecTally) {
-        if(!MakeCollateralAmounts(item, true, connman)) continue;
+        if (!MakeCollateralAmounts(item, true, connman)) continue;
         return true;
     }
 
@@ -1365,7 +1370,7 @@ bool CPrivateSendClientSession::MakeCollateralAmounts(const CompactTallyItem& ta
     LOCK2(cs_main, pwalletMain->cs_wallet);
 
     // denominated input is always a single one, so we can check its amount directly and return early
-    if(!fTryDenominated && tallyItem.vecOutPoints.size() == 1 && CPrivateSend::IsDenominatedAmount(tallyItem.nAmount))
+    if (!fTryDenominated && tallyItem.vecOutPoints.size() == 1 && CPrivateSend::IsDenominatedAmount(tallyItem.nAmount))
         return false;
 
     CWalletTx wtx;
@@ -1396,14 +1401,14 @@ bool CPrivateSendClientSession::MakeCollateralAmounts(const CompactTallyItem& ta
         coinControl.Select(outpoint);
 
     bool fSuccess = pwalletMain->CreateTransaction(vecSend, wtx, reservekeyChange,
-            nFeeRet, nChangePosRet, strFail, &coinControl, true, ONLY_NONDENOMINATED);
-    if(!fSuccess) {
+        nFeeRet, nChangePosRet, strFail, &coinControl, true, ONLY_NONDENOMINATED);
+    if (!fSuccess) {
         LogPrintf("CPrivateSendClientSession::MakeCollateralAmounts -- ONLY_NONDENOMINATED: %s\n", strFail);
         // If we failed then most likely there are not enough funds on this address.
-        if(fTryDenominated) {
+        if (fTryDenominated) {
             // Try to also use denominated coins (we can't mix denominated without collaterals anyway).
-            if(!pwalletMain->CreateTransaction(vecSend, wtx, reservekeyChange,
-                                nFeeRet, nChangePosRet, strFail, &coinControl, true, ALL_COINS)) {
+            if (!pwalletMain->CreateTransaction(vecSend, wtx, reservekeyChange,
+                    nFeeRet, nChangePosRet, strFail, &coinControl, true, ALL_COINS)) {
                 LogPrintf("CPrivateSendClientSession::MakeCollateralAmounts -- ALL_COINS Error: %s\n", strFail);
                 reservekeyCollateral.ReturnKey();
                 return false;
@@ -1421,7 +1426,7 @@ bool CPrivateSendClientSession::MakeCollateralAmounts(const CompactTallyItem& ta
 
     // use the same nCachedLastSuccessBlock as for DS mixing to prevent race
     CValidationState state;
-    if(!pwalletMain->CommitTransaction(wtx, reservekeyChange, &connman, state)) {
+    if (!pwalletMain->CommitTransaction(wtx, reservekeyChange, &connman, state)) {
         LogPrintf("CPrivateSendClientSession::MakeCollateralAmounts -- CommitTransaction failed! Reason given: %s\n", state.GetRejectReason());
         return false;
     }
@@ -1439,7 +1444,7 @@ bool CPrivateSendClientSession::CreateDenominated(CConnman& connman)
     LOCK2(cs_main, pwalletMain->cs_wallet);
 
     std::vector<CompactTallyItem> vecTally;
-    if(!pwalletMain->SelectCoinsGroupedByAddresses(vecTally)) {
+    if (!pwalletMain->SelectCoinsGroupedByAddresses(vecTally)) {
         LogPrint("privatesend", "CPrivateSendClientSession::CreateDenominated -- SelectCoinsGroupedByAddresses can't find any inputs!\n");
         return false;
     }
@@ -1447,7 +1452,7 @@ bool CPrivateSendClientSession::CreateDenominated(CConnman& connman)
     bool fCreateMixingCollaterals = !pwalletMain->HasCollateralInputs();
 
     for (const auto& item : vecTally) {
-        if(!CreateDenominated(item, fCreateMixingCollaterals, connman)) continue;
+        if (!CreateDenominated(item, fCreateMixingCollaterals, connman)) continue;
         return true;
     }
 
@@ -1466,13 +1471,13 @@ bool CPrivateSendClientSession::CreateDenominated(const CompactTallyItem& tallyI
     CAmount nValueLeft = tallyItem.nAmount;
     nValueLeft -= CPrivateSend::GetCollateralAmount(); // leave some room for fees
 
-    LogPrintf("CPrivateSendClientSession::CreateDenominated -- 0 - %s nValueLeft: %f\n", CBitcoinAddress(tallyItem.txdest).ToString(), (float)nValueLeft/COIN);
+    LogPrintf("CPrivateSendClientSession::CreateDenominated -- 0 - %s nValueLeft: %f\n", CBitcoinAddress(tallyItem.txdest).ToString(), (float)nValueLeft / COIN);
 
     // ****** Add an output for mixing collaterals ************ /
 
-    if(fCreateMixingCollaterals) {
+    if (fCreateMixingCollaterals) {
         CScript scriptCollateral = keyHolderStorageDenom.AddKey(pwalletMain);
-        vecSend.push_back((CRecipient){ scriptCollateral, CPrivateSend::GetMaxCollateralAmount(), false });
+        vecSend.push_back((CRecipient){scriptCollateral, CPrivateSend::GetMaxCollateralAmount(), false});
         nValueLeft -= CPrivateSend::GetMaxCollateralAmount();
     }
 
@@ -1487,20 +1492,20 @@ bool CPrivateSendClientSession::CreateDenominated(const CompactTallyItem& tallyI
         for (auto it = vecStandardDenoms.rbegin(); it != vecStandardDenoms.rend(); ++it) {
             CAmount nDenomValue = *it;
 
-            if(fSkip) {
+            if (fSkip) {
                 // Note: denoms are skipped if there are already DENOMS_COUNT_MAX of them
                 // and there are still larger denoms which can be used for mixing
 
                 // check skipped denoms
-                if(privateSendClient.IsDenomSkipped(nDenomValue)) {
-                    strAutoDenomResult = strprintf(_("Too many %f denominations, skipping."), (float)nDenomValue/COIN);
+                if (privateSendClient.IsDenomSkipped(nDenomValue)) {
+                    strAutoDenomResult = strprintf(_("Too many %f denominations, skipping."), (float)nDenomValue / COIN);
                     LogPrintf("CPrivateSendClientSession::CreateDenominated -- %s\n", strAutoDenomResult);
                     continue;
                 }
 
                 // find new denoms to skip if any (ignore the largest one)
-                if(nDenomValue != vecStandardDenoms.front() && pwalletMain->CountInputsWithAmount(nDenomValue) > DENOMS_COUNT_MAX) {
-                    strAutoDenomResult = strprintf(_("Too many %f denominations, removing."), (float)nDenomValue/COIN);
+                if (nDenomValue != vecStandardDenoms.front() && pwalletMain->CountInputsWithAmount(nDenomValue) > DENOMS_COUNT_MAX) {
+                    strAutoDenomResult = strprintf(_("Too many %f denominations, removing."), (float)nDenomValue / COIN);
                     LogPrintf("CPrivateSendClientSession::CreateDenominated -- %s\n", strAutoDenomResult);
                     privateSendClient.AddSkippedDenom(nDenomValue);
                     continue;
@@ -1510,25 +1515,25 @@ bool CPrivateSendClientSession::CreateDenominated(const CompactTallyItem& tallyI
             int nOutputs = 0;
 
             // add each output up to 11 times until it can't be added again
-            while(nValueLeft - nDenomValue >= 0 && nOutputs <= 10) {
+            while (nValueLeft - nDenomValue >= 0 && nOutputs <= 10) {
                 CScript scriptDenom = keyHolderStorageDenom.AddKey(pwalletMain);
 
-                vecSend.push_back((CRecipient){ scriptDenom, nDenomValue, false });
+                vecSend.push_back((CRecipient){scriptDenom, nDenomValue, false});
 
                 //increment outputs and subtract denomination amount
                 nOutputs++;
                 nValueLeft -= nDenomValue;
-                LogPrintf("CPrivateSendClientSession::CreateDenominated -- 1 - totalOutputs: %d, nOutputsTotal: %d, nOutputs: %d, nValueLeft: %f\n", nOutputsTotal + nOutputs, nOutputsTotal, nOutputs, (float)nValueLeft/COIN);
+                LogPrintf("CPrivateSendClientSession::CreateDenominated -- 1 - totalOutputs: %d, nOutputsTotal: %d, nOutputs: %d, nValueLeft: %f\n", nOutputsTotal + nOutputs, nOutputsTotal, nOutputs, (float)nValueLeft / COIN);
             }
 
             nOutputsTotal += nOutputs;
-            if(nValueLeft == 0) break;
+            if (nValueLeft == 0) break;
         }
-        LogPrintf("CPrivateSendClientSession::CreateDenominated -- 2 - nOutputsTotal: %d, nValueLeft: %f\n", nOutputsTotal, (float)nValueLeft/COIN);
+        LogPrintf("CPrivateSendClientSession::CreateDenominated -- 2 - nOutputsTotal: %d, nValueLeft: %f\n", nOutputsTotal, (float)nValueLeft / COIN);
         // if there were no outputs added, start over without skipping
         fSkip = !fSkip;
     } while (nOutputsTotal == 0 && !fSkip);
-    LogPrintf("CPrivateSendClientSession::CreateDenominated -- 3 - nOutputsTotal: %d, nValueLeft: %f\n", nOutputsTotal, (float)nValueLeft/COIN);
+    LogPrintf("CPrivateSendClientSession::CreateDenominated -- 3 - nOutputsTotal: %d, nValueLeft: %f\n", nOutputsTotal, (float)nValueLeft / COIN);
 
     // No reasons to create mixing collaterals if we can't create denoms to mix
     if (nOutputsTotal == 0) return false;
@@ -1551,8 +1556,8 @@ bool CPrivateSendClientSession::CreateDenominated(const CompactTallyItem& tallyI
     CReserveKey reservekeyChange(pwalletMain);
 
     bool fSuccess = pwalletMain->CreateTransaction(vecSend, wtx, reservekeyChange,
-            nFeeRet, nChangePosRet, strFail, &coinControl, true, ONLY_NONDENOMINATED);
-    if(!fSuccess) {
+        nFeeRet, nChangePosRet, strFail, &coinControl, true, ONLY_NONDENOMINATED);
+    if (!fSuccess) {
         LogPrintf("CPrivateSendClientSession::CreateDenominated -- Error: %s\n", strFail);
         keyHolderStorageDenom.ReturnAll();
         return false;
@@ -1561,7 +1566,7 @@ bool CPrivateSendClientSession::CreateDenominated(const CompactTallyItem& tallyI
     keyHolderStorageDenom.KeepAll();
 
     CValidationState state;
-    if(!pwalletMain->CommitTransaction(wtx, reservekeyChange, &connman, state)) {
+    if (!pwalletMain->CommitTransaction(wtx, reservekeyChange, &connman, state)) {
         LogPrintf("CPrivateSendClientSession::CreateDenominated -- CommitTransaction failed! Reason given: %s\n", state.GetRejectReason());
         return false;
     }
@@ -1575,7 +1580,7 @@ bool CPrivateSendClientSession::CreateDenominated(const CompactTallyItem& tallyI
 
 void CPrivateSendClientSession::RelayIn(const CPrivateSendEntry& entry, CConnman& connman)
 {
-    if(!infoMixingMasternode.fInfoValid) return;
+    if (!infoMixingMasternode.fInfoValid) return;
 
     connman.ForNode(infoMixingMasternode.addr, [&entry, &connman](CNode* pnode) {
         LogPrintf("CPrivateSendClientSession::RelayIn -- found master, relaying message to %s\n", pnode->addr.ToString());
@@ -1591,19 +1596,18 @@ void CPrivateSendClientSession::SetState(PoolState nStateNew)
     nState = nStateNew;
 }
 
-void CPrivateSendClientManager::UpdatedBlockTip(const CBlockIndex *pindex)
+void CPrivateSendClientManager::UpdatedBlockTip(const CBlockIndex* pindex)
 {
     nCachedBlockHeight = pindex->nHeight;
     LogPrint("privatesend", "CPrivateSendClientManager::UpdatedBlockTip -- nCachedBlockHeight: %d\n", nCachedBlockHeight);
-
 }
 
 void CPrivateSendClientManager::DoMaintenance(CConnman& connman)
 {
-    if(fLiteMode) return; // disable all Dash specific functionality
-    if(fMasternodeMode) return; // no client-side mixing on masternodes
+    if (fLiteMode) return;       // disable all Dash specific functionality
+    if (fMasternodeMode) return; // no client-side mixing on masternodes
 
-    if(!masternodeSync.IsBlockchainSynced() || ShutdownRequested())
+    if (!masternodeSync.IsBlockchainSynced() || ShutdownRequested())
         return;
 
     static unsigned int nTick = 0;
@@ -1612,7 +1616,7 @@ void CPrivateSendClientManager::DoMaintenance(CConnman& connman)
     nTick++;
     CheckTimeout();
     ProcessPendingDsaRequest(connman);
-    if(nDoAutoNextRun == nTick) {
+    if (nDoAutoNextRun == nTick) {
         DoAutomaticDenominating(connman);
         nDoAutoNextRun = nTick + PRIVATESEND_AUTO_TIMEOUT_MIN + GetRandInt(PRIVATESEND_AUTO_TIMEOUT_MAX - PRIVATESEND_AUTO_TIMEOUT_MIN);
     }
diff --git a/src/privatesend-client.h b/src/privatesend-client.h
index 3999b3ed7278..2ad319cea8a3 100644
--- a/src/privatesend-client.h
+++ b/src/privatesend-client.h
@@ -6,35 +6,35 @@
 #define PRIVATESENDCLIENT_H
 
 #include "masternode.h"
+#include "privatesend-util.h"
 #include "privatesend.h"
 #include "wallet/wallet.h"
-#include "privatesend-util.h"
 
 class CPrivateSendClientManager;
 class CConnman;
 
-static const int DENOMS_COUNT_MAX                   = 100;
+static const int DENOMS_COUNT_MAX = 100;
 
-static const int MIN_PRIVATESEND_SESSIONS           = 1;
-static const int MIN_PRIVATESEND_ROUNDS             = 2;
-static const int MIN_PRIVATESEND_AMOUNT             = 2;
-static const int MIN_PRIVATESEND_LIQUIDITY          = 0;
-static const int MAX_PRIVATESEND_SESSIONS           = 10;
-static const int MAX_PRIVATESEND_ROUNDS             = 16;
-static const int MAX_PRIVATESEND_AMOUNT             = MAX_MONEY / COIN;
-static const int MAX_PRIVATESEND_LIQUIDITY          = 100;
-static const int DEFAULT_PRIVATESEND_SESSIONS       = 4;
-static const int DEFAULT_PRIVATESEND_ROUNDS         = 4;
-static const int DEFAULT_PRIVATESEND_AMOUNT         = 1000;
-static const int DEFAULT_PRIVATESEND_LIQUIDITY      = 0;
+static const int MIN_PRIVATESEND_SESSIONS = 1;
+static const int MIN_PRIVATESEND_ROUNDS = 2;
+static const int MIN_PRIVATESEND_AMOUNT = 2;
+static const int MIN_PRIVATESEND_LIQUIDITY = 0;
+static const int MAX_PRIVATESEND_SESSIONS = 10;
+static const int MAX_PRIVATESEND_ROUNDS = 16;
+static const int MAX_PRIVATESEND_AMOUNT = MAX_MONEY / COIN;
+static const int MAX_PRIVATESEND_LIQUIDITY = 100;
+static const int DEFAULT_PRIVATESEND_SESSIONS = 4;
+static const int DEFAULT_PRIVATESEND_ROUNDS = 4;
+static const int DEFAULT_PRIVATESEND_AMOUNT = 1000;
+static const int DEFAULT_PRIVATESEND_LIQUIDITY = 0;
 
-static const bool DEFAULT_PRIVATESEND_MULTISESSION  = false;
+static const bool DEFAULT_PRIVATESEND_MULTISESSION = false;
 
 // Warn user if mixing in gui or try to create backup if mixing in daemon mode
 // when we have only this many keys left
 static const int PRIVATESEND_KEYS_THRESHOLD_WARNING = 100;
 // Stop mixing completely, it's too dangerous to continue when we have only this many keys left
-static const int PRIVATESEND_KEYS_THRESHOLD_STOP    = 50;
+static const int PRIVATESEND_KEYS_THRESHOLD_STOP = 50;
 
 // The main object for accessing mixing
 extern CPrivateSendClientManager privateSendClient;
@@ -49,17 +49,19 @@ class CPendingDsaRequest
     int64_t nTimeCreated;
 
 public:
-    CPendingDsaRequest():
+    CPendingDsaRequest() :
         addr(CService()),
         dsa(CPrivateSendAccept()),
         nTimeCreated(0)
-    {}
+    {
+    }
 
-    CPendingDsaRequest(const CService& addr_, const CPrivateSendAccept& dsa_):
+    CPendingDsaRequest(const CService& addr_, const CPrivateSendAccept& dsa_) :
         addr(addr_),
         dsa(dsa_),
         nTimeCreated(GetTime())
-    {}
+    {
+    }
 
     CService GetAddr() { return addr; }
     CPrivateSendAccept GetDSA() { return dsa; }
@@ -108,14 +110,14 @@ class CPrivateSendClientSession : public CPrivateSendBaseSession
     bool StartNewQueue(CAmount nValueMin, CAmount nBalanceNeedsAnonymized, CConnman& connman);
 
     /// step 0: select denominated inputs and txouts
-    bool SelectDenominate(std::string& strErrorRet, std::vector< std::pair<CTxDSIn, CTxOut> >& vecPSInOutPairsRet);
+    bool SelectDenominate(std::string& strErrorRet, std::vector<std::pair<CTxDSIn, CTxOut> >& vecPSInOutPairsRet);
     /// step 1: prepare denominated inputs and outputs
-    bool PrepareDenominate(int nMinRounds, int nMaxRounds, std::string& strErrorRet, const std::vector< std::pair<CTxDSIn, CTxOut> >& vecPSInOutPairsIn, std::vector< std::pair<CTxDSIn, CTxOut> >& vecPSInOutPairsRet, bool fDryRun = false);
+    bool PrepareDenominate(int nMinRounds, int nMaxRounds, std::string& strErrorRet, const std::vector<std::pair<CTxDSIn, CTxOut> >& vecPSInOutPairsIn, std::vector<std::pair<CTxDSIn, CTxOut> >& vecPSInOutPairsRet, bool fDryRun = false);
     /// step 2: send denominated inputs and outputs prepared in step 1
-    bool SendDenominate(const std::vector< std::pair<CTxDSIn, CTxOut> >& vecPSInOutPairsIn, CConnman& connman);
+    bool SendDenominate(const std::vector<std::pair<CTxDSIn, CTxOut> >& vecPSInOutPairsIn, CConnman& connman);
 
     /// Get Masternode updates about the progress of mixing
-    bool CheckPoolStateUpdate(PoolState nStateNew, int nEntriesCountNew, PoolStatusUpdate nStatusUpdate, PoolMessage nMessageID, int nSessionIDNew=0);
+    bool CheckPoolStateUpdate(PoolState nStateNew, int nEntriesCountNew, PoolStatusUpdate nStatusUpdate, PoolMessage nMessageID, int nSessionIDNew = 0);
     // Set the 'state' value, with some logging and capturing when the state changed
     void SetState(PoolState nStateNew);
 
@@ -141,7 +143,8 @@ class CPrivateSendClientSession : public CPrivateSendBaseSession
         txMyCollateral(),
         pendingDsaRequest(),
         keyHolderStorage()
-        {}
+    {
+    }
 
     void ProcessMessage(CNode* pfrom, const std::string& strCommand, CDataStream& vRecv, CConnman& connman);
 
@@ -154,7 +157,7 @@ class CPrivateSendClientSession : public CPrivateSendBaseSession
     bool GetMixingMasternodeInfo(masternode_info_t& mnInfoRet) const;
 
     /// Passively run mixing in the background according to the configuration in settings
-    bool DoAutomaticDenominating(CConnman& connman, bool fDryRun=false);
+    bool DoAutomaticDenominating(CConnman& connman, bool fDryRun = false);
 
     /// As a client, submit part of a future mixing transaction to a Masternode to start the process
     bool SubmitDenominate(CConnman& connman);
@@ -198,7 +201,7 @@ class CPrivateSendClientManager : public CPrivateSendBaseManager
     bool fEnablePrivateSend;
     bool fPrivateSendMultiSession;
 
-    int nCachedNumBlocks; //used for the overview screen
+    int nCachedNumBlocks;    //used for the overview screen
     bool fCreateAutoBackups; //builtin support for automatic backups
 
     CPrivateSendClientManager() :
@@ -216,7 +219,8 @@ class CPrivateSendClientManager : public CPrivateSendBaseManager
         fPrivateSendMultiSession(DEFAULT_PRIVATESEND_MULTISESSION),
         nCachedNumBlocks(std::numeric_limits<int>::max()),
         fCreateAutoBackups(true)
-        {}
+    {
+    }
 
     void ProcessMessage(CNode* pfrom, const std::string& strCommand, CDataStream& vRecv, CConnman& connman);
 
@@ -234,7 +238,7 @@ class CPrivateSendClientManager : public CPrivateSendBaseManager
     bool GetMixingMasternodesInfo(std::vector<masternode_info_t>& vecMnInfoRet) const;
 
     /// Passively run mixing in the background according to the configuration in settings
-    bool DoAutomaticDenominating(CConnman& connman, bool fDryRun=false);
+    bool DoAutomaticDenominating(CConnman& connman, bool fDryRun = false);
 
     void CheckTimeout();
 
@@ -245,7 +249,7 @@ class CPrivateSendClientManager : public CPrivateSendBaseManager
 
     void UpdatedSuccessBlock();
 
-    void UpdatedBlockTip(const CBlockIndex *pindex);
+    void UpdatedBlockTip(const CBlockIndex* pindex);
 
     void DoMaintenance(CConnman& connman);
 };
diff --git a/src/privatesend-server.cpp b/src/privatesend-server.cpp
index 5c2166c55421..3db14067dd80 100644
--- a/src/privatesend-server.cpp
+++ b/src/privatesend-server.cpp
@@ -19,21 +19,19 @@ CPrivateSendServer privateSendServer;
 
 void CPrivateSendServer::ProcessMessage(CNode* pfrom, const std::string& strCommand, CDataStream& vRecv, CConnman& connman)
 {
-    if(!fMasternodeMode) return;
-    if(fLiteMode) return; // ignore all Dash related functionality
-    if(!masternodeSync.IsBlockchainSynced()) return;
-
-    if(strCommand == NetMsgType::DSACCEPT) {
+    if (!fMasternodeMode) return;
+    if (fLiteMode) return; // ignore all Dash related functionality
+    if (!masternodeSync.IsBlockchainSynced()) return;
 
-        if(pfrom->nVersion < MIN_PRIVATESEND_PEER_PROTO_VERSION) {
+    if (strCommand == NetMsgType::DSACCEPT) {
+        if (pfrom->nVersion < MIN_PRIVATESEND_PEER_PROTO_VERSION) {
             LogPrint("privatesend", "DSACCEPT -- peer=%d using obsolete version %i\n", pfrom->id, pfrom->nVersion);
-            connman.PushMessage(pfrom, CNetMsgMaker(pfrom->GetSendVersion()).Make(NetMsgType::REJECT, strCommand, REJECT_OBSOLETE,
-                               strprintf("Version must be %d or greater", MIN_PRIVATESEND_PEER_PROTO_VERSION)));
+            connman.PushMessage(pfrom, CNetMsgMaker(pfrom->GetSendVersion()).Make(NetMsgType::REJECT, strCommand, REJECT_OBSOLETE, strprintf("Version must be %d or greater", MIN_PRIVATESEND_PEER_PROTO_VERSION)));
             PushStatus(pfrom, STATUS_REJECTED, ERR_VERSION, connman);
             return;
         }
 
-        if(IsSessionReady()) {
+        if (IsSessionReady()) {
             // too many users in this session already, reject new ones
             LogPrintf("DSACCEPT -- queue is already full!\n");
             PushStatus(pfrom, STATUS_ACCEPTED, ERR_QUEUE_FULL, connman);
@@ -46,14 +44,13 @@ void CPrivateSendServer::ProcessMessage(CNode* pfrom, const std::string& strComm
         LogPrint("privatesend", "DSACCEPT -- nDenom %d (%s)  txCollateral %s", dsa.nDenom, CPrivateSend::GetDenominationsToString(dsa.nDenom), dsa.txCollateral.ToString());
 
         masternode_info_t mnInfo;
-        if(!mnodeman.GetMasternodeInfo(activeMasternodeInfo.outpoint, mnInfo)) {
+        if (!mnodeman.GetMasternodeInfo(activeMasternodeInfo.outpoint, mnInfo)) {
             PushStatus(pfrom, STATUS_REJECTED, ERR_MN_LIST, connman);
             return;
         }
 
-        if(vecSessionCollaterals.size() == 0 && mnInfo.nLastDsq != 0 &&
-            mnInfo.nLastDsq + mnodeman.CountEnabled(MIN_PRIVATESEND_PEER_PROTO_VERSION)/5 > mnodeman.nDsqCount)
-        {
+        if (vecSessionCollaterals.size() == 0 && mnInfo.nLastDsq != 0 &&
+            mnInfo.nLastDsq + mnodeman.CountEnabled(MIN_PRIVATESEND_PEER_PROTO_VERSION) / 5 > mnodeman.nDsqCount) {
             LogPrintf("DSACCEPT -- last dsq too recent, must wait: addr=%s\n", pfrom->addr.ToString());
             PushStatus(pfrom, STATUS_REJECTED, ERR_RECENT, connman);
             return;
@@ -61,9 +58,9 @@ void CPrivateSendServer::ProcessMessage(CNode* pfrom, const std::string& strComm
 
         PoolMessage nMessageID = MSG_NOERR;
 
-        bool fResult = nSessionID == 0  ? CreateNewSession(dsa, nMessageID, connman)
-                                        : AddUserToExistingSession(dsa, nMessageID);
-        if(fResult) {
+        bool fResult = nSessionID == 0 ? CreateNewSession(dsa, nMessageID, connman)
+                                       : AddUserToExistingSession(dsa, nMessageID);
+        if (fResult) {
             LogPrintf("DSACCEPT -- is compatible, please submit!\n");
             PushStatus(pfrom, STATUS_ACCEPTED, nMessageID, connman);
             return;
@@ -73,14 +70,13 @@ void CPrivateSendServer::ProcessMessage(CNode* pfrom, const std::string& strComm
             return;
         }
 
-    } else if(strCommand == NetMsgType::DSQUEUE) {
+    } else if (strCommand == NetMsgType::DSQUEUE) {
         TRY_LOCK(cs_vecqueue, lockRecv);
-        if(!lockRecv) return;
+        if (!lockRecv) return;
 
-        if(pfrom->nVersion < MIN_PRIVATESEND_PEER_PROTO_VERSION) {
+        if (pfrom->nVersion < MIN_PRIVATESEND_PEER_PROTO_VERSION) {
             LogPrint("privatesend", "DSQUEUE -- peer=%d using obsolete version %i\n", pfrom->id, pfrom->nVersion);
-            connman.PushMessage(pfrom, CNetMsgMaker(pfrom->GetSendVersion()).Make(NetMsgType::REJECT, strCommand, REJECT_OBSOLETE,
-                               strprintf("Version must be %d or greater", MIN_PRIVATESEND_PEER_PROTO_VERSION)));
+            connman.PushMessage(pfrom, CNetMsgMaker(pfrom->GetSendVersion()).Make(NetMsgType::REJECT, strCommand, REJECT_OBSOLETE, strprintf("Version must be %d or greater", MIN_PRIVATESEND_PEER_PROTO_VERSION)));
             return;
         }
 
@@ -89,7 +85,7 @@ void CPrivateSendServer::ProcessMessage(CNode* pfrom, const std::string& strComm
 
         // process every dsq only once
         for (const auto& q : vecPrivateSendQueue) {
-            if(q == dsq) {
+            if (q == dsq) {
                 // LogPrint("privatesend", "DSQUEUE -- %s seen\n", dsq.ToString());
                 return;
             }
@@ -97,30 +93,30 @@ void CPrivateSendServer::ProcessMessage(CNode* pfrom, const std::string& strComm
 
         LogPrint("privatesend", "DSQUEUE -- %s new\n", dsq.ToString());
 
-        if(dsq.IsExpired()) return;
+        if (dsq.IsExpired()) return;
 
         masternode_info_t mnInfo;
-        if(!mnodeman.GetMasternodeInfo(dsq.masternodeOutpoint, mnInfo)) return;
+        if (!mnodeman.GetMasternodeInfo(dsq.masternodeOutpoint, mnInfo)) return;
 
-        if(!dsq.CheckSignature(mnInfo.legacyKeyIDOperator, mnInfo.blsPubKeyOperator)) {
+        if (!dsq.CheckSignature(mnInfo.legacyKeyIDOperator, mnInfo.blsPubKeyOperator)) {
             // we probably have outdated info
             mnodeman.AskForMN(pfrom, dsq.masternodeOutpoint, connman);
             return;
         }
 
-        if(!dsq.fReady) {
+        if (!dsq.fReady) {
             for (const auto& q : vecPrivateSendQueue) {
-                if(q.masternodeOutpoint == dsq.masternodeOutpoint) {
+                if (q.masternodeOutpoint == dsq.masternodeOutpoint) {
                     // no way same mn can send another "not yet ready" dsq this soon
                     LogPrint("privatesend", "DSQUEUE -- Masternode %s is sending WAY too many dsq messages\n", mnInfo.addr.ToString());
                     return;
                 }
             }
 
-            int nThreshold = mnInfo.nLastDsq + mnodeman.CountEnabled(MIN_PRIVATESEND_PEER_PROTO_VERSION)/5;
+            int nThreshold = mnInfo.nLastDsq + mnodeman.CountEnabled(MIN_PRIVATESEND_PEER_PROTO_VERSION) / 5;
             LogPrint("privatesend", "DSQUEUE -- nLastDsq: %d  threshold: %d  nDsqCount: %d\n", mnInfo.nLastDsq, nThreshold, mnodeman.nDsqCount);
             //don't allow a few nodes to dominate the queuing process
-            if(mnInfo.nLastDsq != 0 && nThreshold > mnodeman.nDsqCount) {
+            if (mnInfo.nLastDsq != 0 && nThreshold > mnodeman.nDsqCount) {
                 LogPrint("privatesend", "DSQUEUE -- Masternode %s is sending too many dsq messages\n", mnInfo.addr.ToString());
                 return;
             }
@@ -131,18 +127,16 @@ void CPrivateSendServer::ProcessMessage(CNode* pfrom, const std::string& strComm
             dsq.Relay(connman);
         }
 
-    } else if(strCommand == NetMsgType::DSVIN) {
-
-        if(pfrom->nVersion < MIN_PRIVATESEND_PEER_PROTO_VERSION) {
+    } else if (strCommand == NetMsgType::DSVIN) {
+        if (pfrom->nVersion < MIN_PRIVATESEND_PEER_PROTO_VERSION) {
             LogPrint("privatesend", "DSVIN -- peer=%d using obsolete version %i\n", pfrom->id, pfrom->nVersion);
-            connman.PushMessage(pfrom, CNetMsgMaker(pfrom->GetSendVersion()).Make(NetMsgType::REJECT, strCommand, REJECT_OBSOLETE,
-                               strprintf("Version must be %d or greater", MIN_PRIVATESEND_PEER_PROTO_VERSION)));
+            connman.PushMessage(pfrom, CNetMsgMaker(pfrom->GetSendVersion()).Make(NetMsgType::REJECT, strCommand, REJECT_OBSOLETE, strprintf("Version must be %d or greater", MIN_PRIVATESEND_PEER_PROTO_VERSION)));
             PushStatus(pfrom, STATUS_REJECTED, ERR_VERSION, connman);
             return;
         }
 
         //do we have enough users in the current session?
-        if(!IsSessionReady()) {
+        if (!IsSessionReady()) {
             LogPrintf("DSVIN -- session not complete!\n");
             PushStatus(pfrom, STATUS_REJECTED, ERR_SESSION, connman);
             return;
@@ -153,20 +147,20 @@ void CPrivateSendServer::ProcessMessage(CNode* pfrom, const std::string& strComm
 
         LogPrint("privatesend", "DSVIN -- txCollateral %s", entry.txCollateral->ToString());
 
-        if(entry.vecTxDSIn.size() > PRIVATESEND_ENTRY_MAX_SIZE) {
+        if (entry.vecTxDSIn.size() > PRIVATESEND_ENTRY_MAX_SIZE) {
             LogPrintf("DSVIN -- ERROR: too many inputs! %d/%d\n", entry.vecTxDSIn.size(), PRIVATESEND_ENTRY_MAX_SIZE);
             PushStatus(pfrom, STATUS_REJECTED, ERR_MAXIMUM, connman);
             return;
         }
 
-        if(entry.vecTxOut.size() > PRIVATESEND_ENTRY_MAX_SIZE) {
+        if (entry.vecTxOut.size() > PRIVATESEND_ENTRY_MAX_SIZE) {
             LogPrintf("DSVIN -- ERROR: too many outputs! %d/%d\n", entry.vecTxOut.size(), PRIVATESEND_ENTRY_MAX_SIZE);
             PushStatus(pfrom, STATUS_REJECTED, ERR_MAXIMUM, connman);
             return;
         }
 
         //do we have the same denominations as the current session?
-        if(!IsOutputsCompatibleWithSessionDenom(entry.vecTxOut)) {
+        if (!IsOutputsCompatibleWithSessionDenom(entry.vecTxOut)) {
             LogPrintf("DSVIN -- not compatible with existing transactions!\n");
             PushStatus(pfrom, STATUS_REJECTED, ERR_EXISTING_TX, connman);
             return;
@@ -183,12 +177,12 @@ void CPrivateSendServer::ProcessMessage(CNode* pfrom, const std::string& strComm
                 nValueOut += txout.nValue;
                 tx.vout.push_back(txout);
 
-                if(txout.scriptPubKey.size() != 25) {
+                if (txout.scriptPubKey.size() != 25) {
                     LogPrintf("DSVIN -- non-standard pubkey detected! scriptPubKey=%s\n", ScriptToAsmStr(txout.scriptPubKey));
                     PushStatus(pfrom, STATUS_REJECTED, ERR_NON_STANDARD_PUBKEY, connman);
                     return;
                 }
-                if(!txout.scriptPubKey.IsPayToPublicKeyHash()) {
+                if (!txout.scriptPubKey.IsPayToPublicKeyHash()) {
                     LogPrintf("DSVIN -- invalid script! scriptPubKey=%s\n", ScriptToAsmStr(txout.scriptPubKey));
                     PushStatus(pfrom, STATUS_REJECTED, ERR_INVALID_SCRIPT, connman);
                     return;
@@ -201,7 +195,7 @@ void CPrivateSendServer::ProcessMessage(CNode* pfrom, const std::string& strComm
                 LogPrint("privatesend", "DSVIN -- txin=%s\n", txin.ToString());
 
                 Coin coin;
-                if(GetUTXOCoin(txin.prevout, coin)) {
+                if (GetUTXOCoin(txin.prevout, coin)) {
                     nValueIn += coin.out.nValue;
                 } else {
                     LogPrintf("DSVIN -- missing input! txin=%s\n", txin.ToString());
@@ -212,7 +206,7 @@ void CPrivateSendServer::ProcessMessage(CNode* pfrom, const std::string& strComm
 
             // There should be no fee in mixing tx
             CAmount nFee = nValueIn - nValueOut;
-            if(nFee != 0) {
+            if (nFee != 0) {
                 LogPrintf("DSVIN -- there should be no fee in mixing tx! fees: %lld, tx=%s", nFee, tx.ToString());
                 PushStatus(pfrom, STATUS_REJECTED, ERR_FEES, connman);
                 return;
@@ -222,7 +216,7 @@ void CPrivateSendServer::ProcessMessage(CNode* pfrom, const std::string& strComm
         PoolMessage nMessageID = MSG_NOERR;
 
         entry.addr = pfrom->addr;
-        if(AddEntry(entry, nMessageID)) {
+        if (AddEntry(entry, nMessageID)) {
             PushStatus(pfrom, STATUS_ACCEPTED, nMessageID, connman);
             CheckPool(connman);
             RelayStatus(STATUS_ACCEPTED, connman);
@@ -231,12 +225,10 @@ void CPrivateSendServer::ProcessMessage(CNode* pfrom, const std::string& strComm
             SetNull();
         }
 
-    } else if(strCommand == NetMsgType::DSSIGNFINALTX) {
-
-        if(pfrom->nVersion < MIN_PRIVATESEND_PEER_PROTO_VERSION) {
+    } else if (strCommand == NetMsgType::DSSIGNFINALTX) {
+        if (pfrom->nVersion < MIN_PRIVATESEND_PEER_PROTO_VERSION) {
             LogPrint("privatesend", "DSSIGNFINALTX -- peer=%d using obsolete version %i\n", pfrom->id, pfrom->nVersion);
-            connman.PushMessage(pfrom, CNetMsgMaker(pfrom->GetSendVersion()).Make(NetMsgType::REJECT, strCommand, REJECT_OBSOLETE,
-                               strprintf("Version must be %d or greater", MIN_PRIVATESEND_PEER_PROTO_VERSION)));
+            connman.PushMessage(pfrom, CNetMsgMaker(pfrom->GetSendVersion()).Make(NetMsgType::REJECT, strCommand, REJECT_OBSOLETE, strprintf("Version must be %d or greater", MIN_PRIVATESEND_PEER_PROTO_VERSION)));
             return;
         }
 
@@ -250,7 +242,7 @@ void CPrivateSendServer::ProcessMessage(CNode* pfrom, const std::string& strComm
 
         for (const auto& txin : vecTxIn) {
             nTxInIndex++;
-            if(!AddScriptSig(txin)) {
+            if (!AddScriptSig(txin)) {
                 LogPrint("privatesend", "DSSIGNFINALTX -- AddScriptSig() failed at %d/%d, session: %d\n", nTxInIndex, nTxInsCount, nSessionID);
                 RelayStatus(STATUS_REJECTED, connman);
                 return;
@@ -302,7 +294,7 @@ void CPrivateSendServer::CreateFinalTransaction(CConnman& connman)
     CMutableTransaction txNew;
 
     // make our new transaction
-    for(int i = 0; i < GetEntriesCount(); i++) {
+    for (int i = 0; i < GetEntriesCount(); i++) {
         for (const auto& txout : vecEntries[i].vecTxOut)
             txNew.vout.push_back(txout);
 
@@ -323,7 +315,7 @@ void CPrivateSendServer::CreateFinalTransaction(CConnman& connman)
 
 void CPrivateSendServer::CommitFinalTransaction(CConnman& connman)
 {
-    if(!fMasternodeMode) return; // check and relay final tx only on masternode
+    if (!fMasternodeMode) return; // check and relay final tx only on masternode
 
     CTransactionRef finalTransaction = MakeTransactionRef(finalMutableTransaction);
     uint256 hashTx = finalTransaction->GetHash();
@@ -334,9 +326,8 @@ void CPrivateSendServer::CommitFinalTransaction(CConnman& connman)
         // See if the transaction is valid
         TRY_LOCK(cs_main, lockMain);
         CValidationState validationState;
-        mempool.PrioritiseTransaction(hashTx, hashTx.ToString(), 1000, 0.1*COIN);
-        if(!lockMain || !AcceptToMemoryPool(mempool, validationState, finalTransaction, false, NULL, false, maxTxFee, true))
-        {
+        mempool.PrioritiseTransaction(hashTx, hashTx.ToString(), 1000, 0.1 * COIN);
+        if (!lockMain || !AcceptToMemoryPool(mempool, validationState, finalTransaction, false, NULL, false, maxTxFee, true)) {
             LogPrintf("CPrivateSendServer::CommitFinalTransaction -- AcceptToMemoryPool() error: Transaction not valid\n");
             SetNull();
             // not much we can do in this case, just notify clients
@@ -348,7 +339,7 @@ void CPrivateSendServer::CommitFinalTransaction(CConnman& connman)
     LogPrintf("CPrivateSendServer::CommitFinalTransaction -- CREATING DSTX\n");
 
     // create and sign masternode dstx transaction
-    if(!CPrivateSend::GetDSTX(hashTx)) {
+    if (!CPrivateSend::GetDSTX(hashTx)) {
         CPrivateSendBroadcastTx dstxNew(finalTransaction, activeMasternodeInfo.outpoint, GetAdjustedTime());
         dstxNew.Sign();
         CPrivateSend::AddDSTX(dstxNew);
@@ -384,33 +375,33 @@ void CPrivateSendServer::CommitFinalTransaction(CConnman& connman)
 //
 void CPrivateSendServer::ChargeFees(CConnman& connman)
 {
-    if(!fMasternodeMode) return;
+    if (!fMasternodeMode) return;
 
     //we don't need to charge collateral for every offence.
-    if(GetRandInt(100) > 33) return;
+    if (GetRandInt(100) > 33) return;
 
     std::vector<CTransactionRef> vecOffendersCollaterals;
 
-    if(nState == POOL_STATE_ACCEPTING_ENTRIES) {
+    if (nState == POOL_STATE_ACCEPTING_ENTRIES) {
         for (const auto& txCollateral : vecSessionCollaterals) {
             bool fFound = false;
             for (const auto& entry : vecEntries)
-                if(*entry.txCollateral == *txCollateral)
+                if (*entry.txCollateral == *txCollateral)
                     fFound = true;
 
             // This queue entry didn't send us the promised transaction
-            if(!fFound) {
+            if (!fFound) {
                 LogPrintf("CPrivateSendServer::ChargeFees -- found uncooperative node (didn't send transaction), found offence\n");
                 vecOffendersCollaterals.push_back(txCollateral);
             }
         }
     }
 
-    if(nState == POOL_STATE_SIGNING) {
+    if (nState == POOL_STATE_SIGNING) {
         // who didn't sign?
         for (const auto& entry : vecEntries) {
             for (const auto& txdsin : entry.vecTxDSIn) {
-                if(!txdsin.fHasSig) {
+                if (!txdsin.fHasSig) {
                     LogPrintf("CPrivateSendServer::ChargeFees -- found uncooperative node (didn't sign), found offence\n");
                     vecOffendersCollaterals.push_back(entry.txCollateral);
                 }
@@ -419,25 +410,25 @@ void CPrivateSendServer::ChargeFees(CConnman& connman)
     }
 
     // no offences found
-    if(vecOffendersCollaterals.empty()) return;
+    if (vecOffendersCollaterals.empty()) return;
 
     //mostly offending? Charge sometimes
-    if((int)vecOffendersCollaterals.size() >= Params().PoolMaxTransactions() - 1 && GetRandInt(100) > 33) return;
+    if ((int)vecOffendersCollaterals.size() >= Params().PoolMaxTransactions() - 1 && GetRandInt(100) > 33) return;
 
     //everyone is an offender? That's not right
-    if((int)vecOffendersCollaterals.size() >= Params().PoolMaxTransactions()) return;
+    if ((int)vecOffendersCollaterals.size() >= Params().PoolMaxTransactions()) return;
 
     //charge one of the offenders randomly
     std::random_shuffle(vecOffendersCollaterals.begin(), vecOffendersCollaterals.end());
 
-    if(nState == POOL_STATE_ACCEPTING_ENTRIES || nState == POOL_STATE_SIGNING) {
+    if (nState == POOL_STATE_ACCEPTING_ENTRIES || nState == POOL_STATE_SIGNING) {
         LogPrintf("CPrivateSendServer::ChargeFees -- found uncooperative node (didn't %s transaction), charging fees: %s",
-                (nState == POOL_STATE_SIGNING) ? "sign" : "send", vecOffendersCollaterals[0]->ToString());
+            (nState == POOL_STATE_SIGNING) ? "sign" : "send", vecOffendersCollaterals[0]->ToString());
 
         LOCK(cs_main);
 
         CValidationState state;
-        if(!AcceptToMemoryPool(mempool, state, vecOffendersCollaterals[0], false, NULL, false, maxTxFee)) {
+        if (!AcceptToMemoryPool(mempool, state, vecOffendersCollaterals[0], false, NULL, false, maxTxFee)) {
             // should never really happen
             LogPrintf("CPrivateSendServer::ChargeFees -- ERROR: AcceptToMemoryPool failed!\n");
         } else {
@@ -460,16 +451,16 @@ void CPrivateSendServer::ChargeFees(CConnman& connman)
 */
 void CPrivateSendServer::ChargeRandomFees(CConnman& connman)
 {
-    if(!fMasternodeMode) return;
+    if (!fMasternodeMode) return;
 
     LOCK(cs_main);
 
     for (const auto& txCollateral : vecSessionCollaterals) {
-        if(GetRandInt(100) > 10) return;
+        if (GetRandInt(100) > 10) return;
         LogPrintf("CPrivateSendServer::ChargeRandomFees -- charging random fees, txCollateral=%s", txCollateral->ToString());
 
         CValidationState state;
-        if(!AcceptToMemoryPool(mempool, state, txCollateral, false, NULL, false, maxTxFee)) {
+        if (!AcceptToMemoryPool(mempool, state, txCollateral, false, NULL, false, maxTxFee)) {
             // should never really happen
             LogPrintf("CPrivateSendServer::ChargeRandomFees -- ERROR: AcceptToMemoryPool failed!\n");
         } else {
@@ -483,16 +474,16 @@ void CPrivateSendServer::ChargeRandomFees(CConnman& connman)
 //
 void CPrivateSendServer::CheckTimeout(CConnman& connman)
 {
-    if(!fMasternodeMode) return;
+    if (!fMasternodeMode) return;
 
     CheckQueue();
 
     int nTimeout = (nState == POOL_STATE_SIGNING) ? PRIVATESEND_SIGNING_TIMEOUT : PRIVATESEND_QUEUE_TIMEOUT;
     bool fTimeout = GetTime() - nTimeLastSuccessfulStep >= nTimeout;
 
-    if(nState != POOL_STATE_IDLE && fTimeout) {
+    if (nState != POOL_STATE_IDLE && fTimeout) {
         LogPrint("privatesend", "CPrivateSendServer::CheckTimeout -- %s timed out (%ds) -- resetting\n",
-                (nState == POOL_STATE_SIGNING) ? "Signing" : "Session", nTimeout);
+            (nState == POOL_STATE_SIGNING) ? "Signing" : "Session", nTimeout);
         ChargeFees(connman);
         SetNull();
     }
@@ -505,9 +496,9 @@ void CPrivateSendServer::CheckTimeout(CConnman& connman)
 */
 void CPrivateSendServer::CheckForCompleteQueue(CConnman& connman)
 {
-    if(!fMasternodeMode) return;
+    if (!fMasternodeMode) return;
 
-    if(nState == POOL_STATE_QUEUE && IsSessionReady()) {
+    if (nState == POOL_STATE_QUEUE && IsSessionReady()) {
         SetState(POOL_STATE_ACCEPTING_ENTRIES);
 
         CPrivateSendQueue dsq(nSessionDenom, activeMasternodeInfo.outpoint, GetAdjustedTime(), true);
@@ -529,14 +520,13 @@ bool CPrivateSendServer::IsInputScriptSigValid(const CTxIn& txin)
     CScript sigPubKey = CScript();
 
     for (const auto& entry : vecEntries) {
-
         for (const auto& txout : entry.vecTxOut)
             txNew.vout.push_back(txout);
 
         for (const auto& txdsin : entry.vecTxDSIn) {
             txNew.vin.push_back(txdsin);
 
-            if(txdsin.prevout == txin.prevout) {
+            if (txdsin.prevout == txin.prevout) {
                 nTxInIndex = i;
                 sigPubKey = txdsin.prevPubKey;
             }
@@ -544,10 +534,10 @@ bool CPrivateSendServer::IsInputScriptSigValid(const CTxIn& txin)
         }
     }
 
-    if(nTxInIndex >= 0) { //might have to do this one input at a time?
+    if (nTxInIndex >= 0) { //might have to do this one input at a time?
         txNew.vin[nTxInIndex].scriptSig = txin.scriptSig;
-        LogPrint("privatesend", "CPrivateSendServer::IsInputScriptSigValid -- verifying scriptSig %s\n", ScriptToAsmStr(txin.scriptSig).substr(0,24));
-        if(!VerifyScript(txNew.vin[nTxInIndex].scriptSig, sigPubKey, SCRIPT_VERIFY_P2SH | SCRIPT_VERIFY_STRICTENC, MutableTransactionSignatureChecker(&txNew, nTxInIndex))) {
+        LogPrint("privatesend", "CPrivateSendServer::IsInputScriptSigValid -- verifying scriptSig %s\n", ScriptToAsmStr(txin.scriptSig).substr(0, 24));
+        if (!VerifyScript(txNew.vin[nTxInIndex].scriptSig, sigPubKey, SCRIPT_VERIFY_P2SH | SCRIPT_VERIFY_STRICTENC, MutableTransactionSignatureChecker(&txNew, nTxInIndex))) {
             LogPrint("privatesend", "CPrivateSendServer::IsInputScriptSigValid -- VerifyScript() failed on input %d\n", nTxInIndex);
             return false;
         }
@@ -565,23 +555,23 @@ bool CPrivateSendServer::IsInputScriptSigValid(const CTxIn& txin)
 //
 bool CPrivateSendServer::AddEntry(const CPrivateSendEntry& entryNew, PoolMessage& nMessageIDRet)
 {
-    if(!fMasternodeMode) return false;
+    if (!fMasternodeMode) return false;
 
     for (const auto& txin : entryNew.vecTxDSIn) {
-        if(txin.prevout.IsNull()) {
+        if (txin.prevout.IsNull()) {
             LogPrint("privatesend", "CPrivateSendServer::AddEntry -- input not valid!\n");
             nMessageIDRet = ERR_INVALID_INPUT;
             return false;
         }
     }
 
-    if(!CPrivateSend::IsCollateralValid(*entryNew.txCollateral)) {
+    if (!CPrivateSend::IsCollateralValid(*entryNew.txCollateral)) {
         LogPrint("privatesend", "CPrivateSendServer::AddEntry -- collateral not valid!\n");
         nMessageIDRet = ERR_INVALID_COLLATERAL;
         return false;
     }
 
-    if(GetEntriesCount() >= CPrivateSend::GetMaxPoolTransactions()) {
+    if (GetEntriesCount() >= CPrivateSend::GetMaxPoolTransactions()) {
         LogPrint("privatesend", "CPrivateSendServer::AddEntry -- entries is full!\n");
         nMessageIDRet = ERR_ENTRIES_FULL;
         return false;
@@ -591,7 +581,7 @@ bool CPrivateSendServer::AddEntry(const CPrivateSendEntry& entryNew, PoolMessage
         LogPrint("privatesend", "looking for txin -- %s\n", txin.ToString());
         for (const auto& entry : vecEntries) {
             for (const auto& txdsin : entry.vecTxDSIn) {
-                if(txdsin.prevout == txin.prevout) {
+                if (txdsin.prevout == txin.prevout) {
                     LogPrint("privatesend", "CPrivateSendServer::AddEntry -- found in txin\n");
                     nMessageIDRet = ERR_ALREADY_HAVE;
                     return false;
@@ -611,38 +601,38 @@ bool CPrivateSendServer::AddEntry(const CPrivateSendEntry& entryNew, PoolMessage
 
 bool CPrivateSendServer::AddScriptSig(const CTxIn& txinNew)
 {
-    LogPrint("privatesend", "CPrivateSendServer::AddScriptSig -- scriptSig=%s\n", ScriptToAsmStr(txinNew.scriptSig).substr(0,24));
+    LogPrint("privatesend", "CPrivateSendServer::AddScriptSig -- scriptSig=%s\n", ScriptToAsmStr(txinNew.scriptSig).substr(0, 24));
 
     for (const auto& entry : vecEntries) {
         for (const auto& txdsin : entry.vecTxDSIn) {
-            if(txdsin.scriptSig == txinNew.scriptSig) {
+            if (txdsin.scriptSig == txinNew.scriptSig) {
                 LogPrint("privatesend", "CPrivateSendServer::AddScriptSig -- already exists\n");
                 return false;
             }
         }
     }
 
-    if(!IsInputScriptSigValid(txinNew)) {
+    if (!IsInputScriptSigValid(txinNew)) {
         LogPrint("privatesend", "CPrivateSendServer::AddScriptSig -- Invalid scriptSig\n");
         return false;
     }
 
-    LogPrint("privatesend", "CPrivateSendServer::AddScriptSig -- scriptSig=%s new\n", ScriptToAsmStr(txinNew.scriptSig).substr(0,24));
+    LogPrint("privatesend", "CPrivateSendServer::AddScriptSig -- scriptSig=%s new\n", ScriptToAsmStr(txinNew.scriptSig).substr(0, 24));
 
     for (auto& txin : finalMutableTransaction.vin) {
-        if(txin.prevout == txinNew.prevout && txin.nSequence == txinNew.nSequence) {
+        if (txin.prevout == txinNew.prevout && txin.nSequence == txinNew.nSequence) {
             txin.scriptSig = txinNew.scriptSig;
-            LogPrint("privatesend", "CPrivateSendServer::AddScriptSig -- adding to finalMutableTransaction, scriptSig=%s\n", ScriptToAsmStr(txinNew.scriptSig).substr(0,24));
+            LogPrint("privatesend", "CPrivateSendServer::AddScriptSig -- adding to finalMutableTransaction, scriptSig=%s\n", ScriptToAsmStr(txinNew.scriptSig).substr(0, 24));
         }
     }
-    for(int i = 0; i < GetEntriesCount(); i++) {
-        if(vecEntries[i].AddScriptSig(txinNew)) {
-            LogPrint("privatesend", "CPrivateSendServer::AddScriptSig -- adding to entries, scriptSig=%s\n", ScriptToAsmStr(txinNew.scriptSig).substr(0,24));
+    for (int i = 0; i < GetEntriesCount(); i++) {
+        if (vecEntries[i].AddScriptSig(txinNew)) {
+            LogPrint("privatesend", "CPrivateSendServer::AddScriptSig -- adding to entries, scriptSig=%s\n", ScriptToAsmStr(txinNew.scriptSig).substr(0, 24));
             return true;
         }
     }
 
-    LogPrintf("CPrivateSendServer::AddScriptSig -- Couldn't set sig!\n" );
+    LogPrintf("CPrivateSendServer::AddScriptSig -- Couldn't set sig!\n");
     return false;
 }
 
@@ -651,19 +641,19 @@ bool CPrivateSendServer::IsSignaturesComplete()
 {
     for (const auto& entry : vecEntries)
         for (const auto& txdsin : entry.vecTxDSIn)
-            if(!txdsin.fHasSig) return false;
+            if (!txdsin.fHasSig) return false;
 
     return true;
 }
 
 bool CPrivateSendServer::IsOutputsCompatibleWithSessionDenom(const std::vector<CTxOut>& vecTxOut)
 {
-    if(CPrivateSend::GetDenominations(vecTxOut) == 0) return false;
+    if (CPrivateSend::GetDenominations(vecTxOut) == 0) return false;
 
     for (const auto& entry : vecEntries) {
         LogPrintf("CPrivateSendServer::IsOutputsCompatibleWithSessionDenom -- vecTxOut denom %d, entry.vecTxOut denom %d\n",
-                CPrivateSend::GetDenominations(vecTxOut), CPrivateSend::GetDenominations(entry.vecTxOut));
-        if(CPrivateSend::GetDenominations(vecTxOut) != CPrivateSend::GetDenominations(entry.vecTxOut)) return false;
+            CPrivateSend::GetDenominations(vecTxOut), CPrivateSend::GetDenominations(entry.vecTxOut));
+        if (CPrivateSend::GetDenominations(vecTxOut) != CPrivateSend::GetDenominations(entry.vecTxOut)) return false;
     }
 
     return true;
@@ -671,18 +661,18 @@ bool CPrivateSendServer::IsOutputsCompatibleWithSessionDenom(const std::vector<C
 
 bool CPrivateSendServer::IsAcceptableDSA(const CPrivateSendAccept& dsa, PoolMessage& nMessageIDRet)
 {
-    if(!fMasternodeMode) return false;
+    if (!fMasternodeMode) return false;
 
     // is denom even smth legit?
     std::vector<int> vecBits;
-    if(!CPrivateSend::GetDenominationsBits(dsa.nDenom, vecBits)) {
+    if (!CPrivateSend::GetDenominationsBits(dsa.nDenom, vecBits)) {
         LogPrint("privatesend", "CPrivateSendServer::%s -- denom not valid!\n", __func__);
         nMessageIDRet = ERR_DENOM;
         return false;
     }
 
     // check collateral
-    if(!fUnitTest && !CPrivateSend::IsCollateralValid(dsa.txCollateral)) {
+    if (!fUnitTest && !CPrivateSend::IsCollateralValid(dsa.txCollateral)) {
         LogPrint("privatesend", "CPrivateSendServer::%s -- collateral not valid!\n", __func__);
         nMessageIDRet = ERR_INVALID_COLLATERAL;
         return false;
@@ -693,28 +683,28 @@ bool CPrivateSendServer::IsAcceptableDSA(const CPrivateSendAccept& dsa, PoolMess
 
 bool CPrivateSendServer::CreateNewSession(const CPrivateSendAccept& dsa, PoolMessage& nMessageIDRet, CConnman& connman)
 {
-    if(!fMasternodeMode || nSessionID != 0) return false;
+    if (!fMasternodeMode || nSessionID != 0) return false;
 
     // new session can only be started in idle mode
-    if(nState != POOL_STATE_IDLE) {
+    if (nState != POOL_STATE_IDLE) {
         nMessageIDRet = ERR_MODE;
         LogPrintf("CPrivateSendServer::CreateNewSession -- incompatible mode: nState=%d\n", nState);
         return false;
     }
 
-    if(!IsAcceptableDSA(dsa, nMessageIDRet)) {
+    if (!IsAcceptableDSA(dsa, nMessageIDRet)) {
         return false;
     }
 
     // start new session
     nMessageIDRet = MSG_NOERR;
-    nSessionID = GetRandInt(999999)+1;
+    nSessionID = GetRandInt(999999) + 1;
     nSessionDenom = dsa.nDenom;
 
     SetState(POOL_STATE_QUEUE);
     nTimeLastSuccessfulStep = GetTime();
 
-    if(!fUnitTest) {
+    if (!fUnitTest) {
         //broadcast that I'm accepting entries, only if it's the first entry through
         CPrivateSendQueue dsq(nSessionDenom, activeMasternodeInfo.outpoint, GetAdjustedTime(), false);
         LogPrint("privatesend", "CPrivateSendServer::CreateNewSession -- signing and relaying new queue: %s\n", dsq.ToString());
@@ -725,29 +715,29 @@ bool CPrivateSendServer::CreateNewSession(const CPrivateSendAccept& dsa, PoolMes
 
     vecSessionCollaterals.push_back(MakeTransactionRef(dsa.txCollateral));
     LogPrintf("CPrivateSendServer::CreateNewSession -- new session created, nSessionID: %d  nSessionDenom: %d (%s)  vecSessionCollaterals.size(): %d\n",
-            nSessionID, nSessionDenom, CPrivateSend::GetDenominationsToString(nSessionDenom), vecSessionCollaterals.size());
+        nSessionID, nSessionDenom, CPrivateSend::GetDenominationsToString(nSessionDenom), vecSessionCollaterals.size());
 
     return true;
 }
 
 bool CPrivateSendServer::AddUserToExistingSession(const CPrivateSendAccept& dsa, PoolMessage& nMessageIDRet)
 {
-    if(!fMasternodeMode || nSessionID == 0 || IsSessionReady()) return false;
+    if (!fMasternodeMode || nSessionID == 0 || IsSessionReady()) return false;
 
-    if(!IsAcceptableDSA(dsa, nMessageIDRet)) {
+    if (!IsAcceptableDSA(dsa, nMessageIDRet)) {
         return false;
     }
 
     // we only add new users to an existing session when we are in queue mode
-    if(nState != POOL_STATE_QUEUE) {
+    if (nState != POOL_STATE_QUEUE) {
         nMessageIDRet = ERR_MODE;
         LogPrintf("CPrivateSendServer::AddUserToExistingSession -- incompatible mode: nState=%d\n", nState);
         return false;
     }
 
-    if(dsa.nDenom != nSessionDenom) {
+    if (dsa.nDenom != nSessionDenom) {
         LogPrintf("CPrivateSendServer::AddUserToExistingSession -- incompatible denom %d (%s) != nSessionDenom %d (%s)\n",
-                    dsa.nDenom, CPrivateSend::GetDenominationsToString(dsa.nDenom), nSessionDenom, CPrivateSend::GetDenominationsToString(nSessionDenom));
+            dsa.nDenom, CPrivateSend::GetDenominationsToString(dsa.nDenom), nSessionDenom, CPrivateSend::GetDenominationsToString(nSessionDenom));
         nMessageIDRet = ERR_DENOM;
         return false;
     }
@@ -759,7 +749,7 @@ bool CPrivateSendServer::AddUserToExistingSession(const CPrivateSendAccept& dsa,
     vecSessionCollaterals.push_back(MakeTransactionRef(dsa.txCollateral));
 
     LogPrintf("CPrivateSendServer::AddUserToExistingSession -- new user accepted, nSessionID: %d  nSessionDenom: %d (%s)  vecSessionCollaterals.size(): %d\n",
-            nSessionID, nSessionDenom, CPrivateSend::GetDenominationsToString(nSessionDenom), vecSessionCollaterals.size());
+        nSessionID, nSessionDenom, CPrivateSend::GetDenominationsToString(nSessionDenom), vecSessionCollaterals.size());
 
     return true;
 }
@@ -767,7 +757,7 @@ bool CPrivateSendServer::AddUserToExistingSession(const CPrivateSendAccept& dsa,
 void CPrivateSendServer::RelayFinalTransaction(const CTransaction& txFinal, CConnman& connman)
 {
     LogPrint("privatesend", "CPrivateSendServer::%s -- nSessionID: %d  nSessionDenom: %d (%s)\n",
-            __func__, nSessionID, nSessionDenom, CPrivateSend::GetDenominationsToString(nSessionDenom));
+        __func__, nSessionID, nSessionDenom, CPrivateSend::GetDenominationsToString(nSessionDenom));
 
     // final mixing tx with empty signatures should be relayed to mixing participants only
     for (const auto entry : vecEntries) {
@@ -776,7 +766,7 @@ void CPrivateSendServer::RelayFinalTransaction(const CTransaction& txFinal, CCon
             connman.PushMessage(pnode, msgMaker.Make(NetMsgType::DSFINALTX, nSessionID, txFinal));
             return true;
         });
-        if(!fOk) {
+        if (!fOk) {
             // no such node? maybe this client disconnected or our own connection went down
             RelayStatus(STATUS_REJECTED, connman);
             break;
@@ -786,7 +776,7 @@ void CPrivateSendServer::RelayFinalTransaction(const CTransaction& txFinal, CCon
 
 void CPrivateSendServer::PushStatus(CNode* pnode, PoolStatusUpdate nStatusUpdate, PoolMessage nMessageID, CConnman& connman)
 {
-    if(!pnode) return;
+    if (!pnode) return;
     CNetMsgMaker msgMaker(pnode->GetSendVersion());
     connman.PushMessage(pnode, msgMaker.Make(NetMsgType::DSSTATUSUPDATE, nSessionID, (int)nState, (int)vecEntries.size(), (int)nStatusUpdate, (int)nMessageID));
 }
@@ -801,7 +791,7 @@ void CPrivateSendServer::RelayStatus(PoolStatusUpdate nStatusUpdate, CConnman& c
             PushStatus(pnode, nStatusUpdate, nMessageID, connman);
             return true;
         });
-        if(!fOk) {
+        if (!fOk) {
             // no such node? maybe this client disconnected or our own connection went down
             ++nDisconnected;
         }
@@ -810,7 +800,7 @@ void CPrivateSendServer::RelayStatus(PoolStatusUpdate nStatusUpdate, CConnman& c
 
     // smth went wrong
     LogPrintf("CPrivateSendServer::%s -- can't continue, %llu client(s) disconnected, nSessionID: %d  nSessionDenom: %d (%s)\n",
-            __func__, nDisconnected, nSessionID, nSessionDenom, CPrivateSend::GetDenominationsToString(nSessionDenom));
+        __func__, nDisconnected, nSessionID, nSessionDenom, CPrivateSend::GetDenominationsToString(nSessionDenom));
 
     // notify everyone else that this session should be terminated
     for (const auto& entry : vecEntries) {
@@ -820,7 +810,7 @@ void CPrivateSendServer::RelayStatus(PoolStatusUpdate nStatusUpdate, CConnman& c
         });
     }
 
-    if(nDisconnected == vecEntries.size()) {
+    if (nDisconnected == vecEntries.size()) {
         // all clients disconnected, there is probably some issues with our own connection
         // do not charge any fees, just reset the pool
         SetNull();
@@ -830,7 +820,7 @@ void CPrivateSendServer::RelayStatus(PoolStatusUpdate nStatusUpdate, CConnman& c
 void CPrivateSendServer::RelayCompletedTransaction(PoolMessage nMessageID, CConnman& connman)
 {
     LogPrint("privatesend", "CPrivateSendServer::%s -- nSessionID: %d  nSessionDenom: %d (%s)\n",
-            __func__, nSessionID, nSessionDenom, CPrivateSend::GetDenominationsToString(nSessionDenom));
+        __func__, nSessionID, nSessionDenom, CPrivateSend::GetDenominationsToString(nSessionDenom));
 
     // final mixing tx with empty signatures should be relayed to mixing participants only
     for (const auto& entry : vecEntries) {
@@ -839,7 +829,7 @@ void CPrivateSendServer::RelayCompletedTransaction(PoolMessage nMessageID, CConn
             connman.PushMessage(pnode, msgMaker.Make(NetMsgType::DSCOMPLETE, nSessionID, (int)nMessageID));
             return true;
         });
-        if(!fOk) {
+        if (!fOk) {
             // no such node? maybe client disconnected or our own connection went down
             RelayStatus(STATUS_REJECTED, connman);
             break;
@@ -849,9 +839,9 @@ void CPrivateSendServer::RelayCompletedTransaction(PoolMessage nMessageID, CConn
 
 void CPrivateSendServer::SetState(PoolState nStateNew)
 {
-    if(!fMasternodeMode) return;
+    if (!fMasternodeMode) return;
 
-    if(nStateNew == POOL_STATE_ERROR || nStateNew == POOL_STATE_SUCCESS) {
+    if (nStateNew == POOL_STATE_ERROR || nStateNew == POOL_STATE_SUCCESS) {
         LogPrint("privatesend", "CPrivateSendServer::SetState -- Can't set state to ERROR or SUCCESS as a Masternode. \n");
         return;
     }
@@ -862,10 +852,10 @@ void CPrivateSendServer::SetState(PoolState nStateNew)
 
 void CPrivateSendServer::DoMaintenance(CConnman& connman)
 {
-    if(fLiteMode) return; // disable all Dash specific functionality
-    if(!fMasternodeMode) return; // only run on masternodes
+    if (fLiteMode) return;        // disable all Dash specific functionality
+    if (!fMasternodeMode) return; // only run on masternodes
 
-    if(!masternodeSync.IsBlockchainSynced() || ShutdownRequested())
+    if (!masternodeSync.IsBlockchainSynced() || ShutdownRequested())
         return;
 
     privateSendServer.CheckTimeout(connman);
diff --git a/src/privatesend-server.h b/src/privatesend-server.h
index 67ea5e0dbdfc..22042c66d9da 100644
--- a/src/privatesend-server.h
+++ b/src/privatesend-server.h
@@ -41,9 +41,9 @@ class CPrivateSendServer : public CPrivateSendBaseSession, public CPrivateSendBa
     void CommitFinalTransaction(CConnman& connman);
 
     /// Is this nDenom and txCollateral acceptable?
-    bool IsAcceptableDSA(const CPrivateSendAccept& dsa, PoolMessage &nMessageIDRet);
-    bool CreateNewSession(const CPrivateSendAccept& dsa, PoolMessage &nMessageIDRet, CConnman& connman);
-    bool AddUserToExistingSession(const CPrivateSendAccept& dsa, PoolMessage &nMessageIDRet);
+    bool IsAcceptableDSA(const CPrivateSendAccept& dsa, PoolMessage& nMessageIDRet);
+    bool CreateNewSession(const CPrivateSendAccept& dsa, PoolMessage& nMessageIDRet, CConnman& connman);
+    bool AddUserToExistingSession(const CPrivateSendAccept& dsa, PoolMessage& nMessageIDRet);
     /// Do we have enough users to take entries?
     bool IsSessionReady() { return (int)vecSessionCollaterals.size() >= CPrivateSend::GetMaxPoolTransactions(); }
 
@@ -66,7 +66,8 @@ class CPrivateSendServer : public CPrivateSendBaseSession, public CPrivateSendBa
     void SetNull();
 
 public:
-    CPrivateSendServer() : vecSessionCollaterals(), fUnitTest(false) {}
+    CPrivateSendServer() :
+        vecSessionCollaterals(), fUnitTest(false) {}
 
     void ProcessMessage(CNode* pfrom, const std::string& strCommand, CDataStream& vRecv, CConnman& connman);
 
diff --git a/src/privatesend-util.cpp b/src/privatesend-util.cpp
index 4fc59eaaab63..ad96b58d3e6f 100644
--- a/src/privatesend-util.cpp
+++ b/src/privatesend-util.cpp
@@ -38,7 +38,7 @@ CScript CKeyHolderStorage::AddKey(CWallet* pwallet)
 
 void CKeyHolderStorage::KeepAll()
 {
-    std::vector<std::unique_ptr<CKeyHolder>> tmp;
+    std::vector<std::unique_ptr<CKeyHolder> > tmp;
     {
         // don't hold cs_storage while calling KeepKey(), which might lock cs_wallet
         LOCK(cs_storage);
@@ -46,7 +46,7 @@ void CKeyHolderStorage::KeepAll()
     }
 
     if (tmp.size() > 0) {
-        for (auto &key : tmp) {
+        for (auto& key : tmp) {
             key->KeepKey();
         }
         LogPrintf("CKeyHolderStorage::%s -- %lld keys kept\n", __func__, tmp.size());
@@ -55,7 +55,7 @@ void CKeyHolderStorage::KeepAll()
 
 void CKeyHolderStorage::ReturnAll()
 {
-    std::vector<std::unique_ptr<CKeyHolder>> tmp;
+    std::vector<std::unique_ptr<CKeyHolder> > tmp;
     {
         // don't hold cs_storage while calling ReturnKey(), which might lock cs_wallet
         LOCK(cs_storage);
@@ -63,7 +63,7 @@ void CKeyHolderStorage::ReturnAll()
     }
 
     if (tmp.size() > 0) {
-        for (auto &key : tmp) {
+        for (auto& key : tmp) {
             key->ReturnKey();
         }
         LogPrintf("CKeyHolderStorage::%s -- %lld keys returned\n", __func__, tmp.size());
diff --git a/src/privatesend-util.h b/src/privatesend-util.h
index 9040eb011a0f..4cae27318eda 100644
--- a/src/privatesend-util.h
+++ b/src/privatesend-util.h
@@ -12,6 +12,7 @@ class CKeyHolder
 private:
     CReserveKey reserveKey;
     CPubKey pubKey;
+
 public:
     CKeyHolder(CWallet* pwalletIn);
     CKeyHolder(CKeyHolder&&) = default;
@@ -20,7 +21,6 @@ class CKeyHolder
     void ReturnKey();
 
     CScript GetScriptForDestination() const;
-
 };
 
 class CKeyHolderStorage
@@ -33,6 +33,5 @@ class CKeyHolderStorage
     CScript AddKey(CWallet* pwalletIn);
     void KeepAll();
     void ReturnAll();
-
 };
 #endif //PRIVATESENDUTIL_H
diff --git a/src/privatesend.cpp b/src/privatesend.cpp
index 725a2fa7a604..45e4c4a92af0 100644
--- a/src/privatesend.cpp
+++ b/src/privatesend.cpp
@@ -20,8 +20,8 @@
 bool CPrivateSendEntry::AddScriptSig(const CTxIn& txin)
 {
     for (auto& txdsin : vecTxDSIn) {
-        if(txdsin.prevout == txin.prevout && txdsin.nSequence == txin.nSequence) {
-            if(txdsin.fHasSig) return false;
+        if (txdsin.prevout == txin.prevout && txdsin.nSequence == txin.nSequence) {
+            if (txdsin.fHasSig) return false;
 
             txdsin.scriptSig = txin.scriptSig;
             txdsin.fHasSig = true;
@@ -37,9 +37,9 @@ uint256 CPrivateSendQueue::GetSignatureHash() const
 {
     // Remove after migration to 70211
     {
-    masternode_info_t mnInfo;
-    mnodeman.GetMasternodeInfo(masternodeOutpoint, mnInfo);
-    return SerializeHash(*this, SER_GETHASH, mnInfo.nProtocolVersion);
+        masternode_info_t mnInfo;
+        mnodeman.GetMasternodeInfo(masternodeOutpoint, mnInfo);
+        return SerializeHash(*this, SER_GETHASH, mnInfo.nProtocolVersion);
     }
     // END remove, replace with the code below
     // return SerializeHash(*this);
@@ -47,7 +47,7 @@ uint256 CPrivateSendQueue::GetSignatureHash() const
 
 bool CPrivateSendQueue::Sign()
 {
-    if(!fMasternodeMode) return false;
+    if (!fMasternodeMode) return false;
 
     std::string strError = "";
 
@@ -69,16 +69,16 @@ bool CPrivateSendQueue::Sign()
         }
     } else {
         std::string strMessage = CTxIn(masternodeOutpoint).ToString() +
-                        std::to_string(nDenom) +
-                        std::to_string(nTime) +
-                        std::to_string(fReady);
+                                 std::to_string(nDenom) +
+                                 std::to_string(nTime) +
+                                 std::to_string(fReady);
 
-        if(!CMessageSigner::SignMessage(strMessage, vchSig, activeMasternodeInfo.legacyKeyOperator)) {
+        if (!CMessageSigner::SignMessage(strMessage, vchSig, activeMasternodeInfo.legacyKeyOperator)) {
             LogPrintf("CPrivateSendQueue::Sign -- SignMessage() failed, %s\n", ToString());
             return false;
         }
 
-        if(!CMessageSigner::VerifyMessage(activeMasternodeInfo.legacyKeyIDOperator, vchSig, strMessage, strError)) {
+        if (!CMessageSigner::VerifyMessage(activeMasternodeInfo.legacyKeyIDOperator, vchSig, strMessage, strError)) {
             LogPrintf("CPrivateSendQueue::Sign -- VerifyMessage() failed, error: %s\n", strError);
             return false;
         }
@@ -109,11 +109,11 @@ bool CPrivateSendQueue::CheckSignature(const CKeyID& keyIDOperator, const CBLSPu
         }
     } else {
         std::string strMessage = CTxIn(masternodeOutpoint).ToString() +
-                        std::to_string(nDenom) +
-                        std::to_string(nTime) +
-                        std::to_string(fReady);
+                                 std::to_string(nDenom) +
+                                 std::to_string(nTime) +
+                                 std::to_string(fReady);
 
-        if(!CMessageSigner::VerifyMessage(keyIDOperator, vchSig, strMessage, strError)) {
+        if (!CMessageSigner::VerifyMessage(keyIDOperator, vchSig, strMessage, strError)) {
             LogPrintf("CPrivateSendQueue::CheckSignature -- Got bad Masternode queue signature: %s; error: %s\n", ToString(), strError);
             return false;
         }
@@ -139,7 +139,7 @@ uint256 CPrivateSendBroadcastTx::GetSignatureHash() const
 
 bool CPrivateSendBroadcastTx::Sign()
 {
-    if(!fMasternodeMode) return false;
+    if (!fMasternodeMode) return false;
 
     std::string strError = "";
 
@@ -163,12 +163,12 @@ bool CPrivateSendBroadcastTx::Sign()
     } else {
         std::string strMessage = tx->GetHash().ToString() + std::to_string(sigTime);
 
-        if(!CMessageSigner::SignMessage(strMessage, vchSig, activeMasternodeInfo.legacyKeyOperator)) {
+        if (!CMessageSigner::SignMessage(strMessage, vchSig, activeMasternodeInfo.legacyKeyOperator)) {
             LogPrintf("CPrivateSendBroadcastTx::Sign -- SignMessage() failed\n");
             return false;
         }
 
-        if(!CMessageSigner::VerifyMessage(activeMasternodeInfo.legacyKeyIDOperator, vchSig, strMessage, strError)) {
+        if (!CMessageSigner::VerifyMessage(activeMasternodeInfo.legacyKeyIDOperator, vchSig, strMessage, strError)) {
             LogPrintf("CPrivateSendBroadcastTx::Sign -- VerifyMessage() failed, error: %s\n", strError);
             return false;
         }
@@ -201,7 +201,7 @@ bool CPrivateSendBroadcastTx::CheckSignature(const CKeyID& keyIDOperator, const
     } else {
         std::string strMessage = tx->GetHash().ToString() + std::to_string(sigTime);
 
-        if(!CMessageSigner::VerifyMessage(keyIDOperator, vchSig, strMessage, strError)) {
+        if (!CMessageSigner::VerifyMessage(keyIDOperator, vchSig, strMessage, strError)) {
             LogPrintf("CPrivateSendBroadcastTx::CheckSignature -- Got bad dstx signature, error: %s\n", strError);
             return false;
         }
@@ -238,26 +238,27 @@ void CPrivateSendBaseManager::SetNull()
 void CPrivateSendBaseManager::CheckQueue()
 {
     TRY_LOCK(cs_vecqueue, lockDS);
-    if(!lockDS) return; // it's ok to fail here, we run this quite frequently
+    if (!lockDS) return; // it's ok to fail here, we run this quite frequently
 
     // check mixing queue objects for timeouts
     std::vector<CPrivateSendQueue>::iterator it = vecPrivateSendQueue.begin();
-    while(it != vecPrivateSendQueue.end()) {
-        if((*it).IsExpired()) {
+    while (it != vecPrivateSendQueue.end()) {
+        if ((*it).IsExpired()) {
             LogPrint("privatesend", "CPrivateSendBaseManager::%s -- Removing expired queue (%s)\n", __func__, (*it).ToString());
             it = vecPrivateSendQueue.erase(it);
-        } else ++it;
+        } else
+            ++it;
     }
 }
 
 bool CPrivateSendBaseManager::GetQueueItemAndTry(CPrivateSendQueue& dsqRet)
 {
     TRY_LOCK(cs_vecqueue, lockDS);
-    if(!lockDS) return false; // it's ok to fail here, we run this quite frequently
+    if (!lockDS) return false; // it's ok to fail here, we run this quite frequently
 
     for (auto& dsq : vecPrivateSendQueue) {
         // only try each queue once
-        if(dsq.fTried || dsq.IsExpired()) continue;
+        if (dsq.fTried || dsq.IsExpired()) continue;
         dsq.fTried = true;
         dsqRet = dsq;
         return true;
@@ -268,14 +269,21 @@ bool CPrivateSendBaseManager::GetQueueItemAndTry(CPrivateSendQueue& dsqRet)
 
 std::string CPrivateSendBaseSession::GetStateString() const
 {
-    switch(nState) {
-        case POOL_STATE_IDLE:                   return "IDLE";
-        case POOL_STATE_QUEUE:                  return "QUEUE";
-        case POOL_STATE_ACCEPTING_ENTRIES:      return "ACCEPTING_ENTRIES";
-        case POOL_STATE_SIGNING:                return "SIGNING";
-        case POOL_STATE_ERROR:                  return "ERROR";
-        case POOL_STATE_SUCCESS:                return "SUCCESS";
-        default:                                return "UNKNOWN";
+    switch (nState) {
+    case POOL_STATE_IDLE:
+        return "IDLE";
+    case POOL_STATE_QUEUE:
+        return "QUEUE";
+    case POOL_STATE_ACCEPTING_ENTRIES:
+        return "ACCEPTING_ENTRIES";
+    case POOL_STATE_SIGNING:
+        return "SIGNING";
+    case POOL_STATE_ERROR:
+        return "ERROR";
+    case POOL_STATE_SUCCESS:
+        return "SUCCESS";
+    default:
+        return "UNKNOWN";
     }
 }
 
@@ -299,10 +307,10 @@ void CPrivateSend::InitStandardDenominations()
     /* Disabled
     vecStandardDenominations.push_back( (100      * COIN)+100000 );
     */
-    vecStandardDenominations.push_back( (10       * COIN)+10000 );
-    vecStandardDenominations.push_back( (1        * COIN)+1000 );
-    vecStandardDenominations.push_back( (.1       * COIN)+100 );
-    vecStandardDenominations.push_back( (.01      * COIN)+10 );
+    vecStandardDenominations.push_back((10 * COIN) + 10000);
+    vecStandardDenominations.push_back((1 * COIN) + 1000);
+    vecStandardDenominations.push_back((.1 * COIN) + 100);
+    vecStandardDenominations.push_back((.01 * COIN) + 10);
     /* Disabled till we need them
     vecStandardDenominations.push_back( (.001     * COIN)+1 );
     */
@@ -311,8 +319,8 @@ void CPrivateSend::InitStandardDenominations()
 // check to make sure the collateral provided by the client is valid
 bool CPrivateSend::IsCollateralValid(const CTransaction& txCollateral)
 {
-    if(txCollateral.vout.empty()) return false;
-    if(txCollateral.nLockTime != 0) return false;
+    if (txCollateral.vout.empty()) return false;
+    if (txCollateral.nLockTime != 0) return false;
 
     CAmount nValueIn = 0;
     CAmount nValueOut = 0;
@@ -321,15 +329,15 @@ bool CPrivateSend::IsCollateralValid(const CTransaction& txCollateral)
         nValueOut += txout.nValue;
 
         bool fAllowData = mnpayments.GetMinMasternodePaymentsProto() > 70208;
-        if(!txout.scriptPubKey.IsPayToPublicKeyHash() && !(fAllowData && txout.scriptPubKey.IsUnspendable())) {
-            LogPrintf ("CPrivateSend::IsCollateralValid -- Invalid Script, txCollateral=%s", txCollateral.ToString());
+        if (!txout.scriptPubKey.IsPayToPublicKeyHash() && !(fAllowData && txout.scriptPubKey.IsUnspendable())) {
+            LogPrintf("CPrivateSend::IsCollateralValid -- Invalid Script, txCollateral=%s", txCollateral.ToString());
             return false;
         }
     }
 
     for (const auto& txin : txCollateral.vin) {
         Coin coin;
-        if(!GetUTXOCoin(txin.prevout, coin)) {
+        if (!GetUTXOCoin(txin.prevout, coin)) {
             LogPrint("privatesend", "CPrivateSend::IsCollateralValid -- Unknown inputs in collateral transaction, txCollateral=%s", txCollateral.ToString());
             return false;
         }
@@ -337,7 +345,7 @@ bool CPrivateSend::IsCollateralValid(const CTransaction& txCollateral)
     }
 
     //collateral transactions are required to pay out a small fee to the miners
-    if(nValueIn - nValueOut < GetCollateralAmount()) {
+    if (nValueIn - nValueOut < GetCollateralAmount()) {
         LogPrint("privatesend", "CPrivateSend::IsCollateralValid -- did not include enough fees in transaction: fees: %d, txCollateral=%s", nValueOut - nValueIn, txCollateral.ToString());
         return false;
     }
@@ -347,7 +355,7 @@ bool CPrivateSend::IsCollateralValid(const CTransaction& txCollateral)
     {
         LOCK(cs_main);
         CValidationState validationState;
-        if(!AcceptToMemoryPool(mempool, validationState, MakeTransactionRef(txCollateral), false, NULL, false, maxTxFee, true)) {
+        if (!AcceptToMemoryPool(mempool, validationState, MakeTransactionRef(txCollateral), false, NULL, false, maxTxFee, true)) {
             LogPrint("privatesend", "CPrivateSend::IsCollateralValid -- didn't pass AcceptToMemoryPool()\n");
             return false;
         }
@@ -382,17 +390,17 @@ std::string CPrivateSend::GetDenominationsToString(int nDenom)
     std::string strDenom = "";
     int nMaxDenoms = vecStandardDenominations.size();
 
-    if(nDenom >= (1 << nMaxDenoms)) {
+    if (nDenom >= (1 << nMaxDenoms)) {
         return "out-of-bounds";
     }
 
     for (int i = 0; i < nMaxDenoms; ++i) {
-        if(nDenom & (1 << i)) {
+        if (nDenom & (1 << i)) {
             strDenom += (strDenom.empty() ? "" : "+") + FormatMoney(vecStandardDenominations[i]);
         }
     }
 
-    if(strDenom.empty()) {
+    if (strDenom.empty()) {
         return "non-denom";
     }
 
@@ -420,12 +428,12 @@ int CPrivateSend::GetDenominations(const std::vector<CTxOut>& vecTxOut, bool fSi
     for (const auto& txout : vecTxOut) {
         bool found = false;
         for (auto& s : vecDenomUsed) {
-            if(txout.nValue == s.first) {
+            if (txout.nValue == s.first) {
                 s.second = 1;
                 found = true;
             }
         }
-        if(!found) return 0;
+        if (!found) return 0;
     }
 
     int nDenom = 0;
@@ -434,13 +442,13 @@ int CPrivateSend::GetDenominations(const std::vector<CTxOut>& vecTxOut, bool fSi
     for (const auto& s : vecDenomUsed) {
         int bit = (fSingleRandomDenom ? GetRandInt(2) : 1) & s.second;
         nDenom |= bit << c++;
-        if(fSingleRandomDenom && bit) break; // use just one random denomination
+        if (fSingleRandomDenom && bit) break; // use just one random denomination
     }
 
     return nDenom;
 }
 
-bool CPrivateSend::GetDenominationsBits(int nDenom, std::vector<int> &vecBitsRet)
+bool CPrivateSend::GetDenominationsBits(int nDenom, std::vector<int>& vecBitsRet)
 {
     // ( bit on if present, 4 denominations example )
     // bit 0 - 100DASH+1
@@ -450,12 +458,12 @@ bool CPrivateSend::GetDenominationsBits(int nDenom, std::vector<int> &vecBitsRet
 
     int nMaxDenoms = vecStandardDenominations.size();
 
-    if(nDenom >= (1 << nMaxDenoms)) return false;
+    if (nDenom >= (1 << nMaxDenoms)) return false;
 
     vecBitsRet.clear();
 
     for (int i = 0; i < nMaxDenoms; ++i) {
-        if(nDenom & (1 << i)) {
+        if (nDenom & (1 << i)) {
             vecBitsRet.push_back(i);
         }
     }
@@ -479,7 +487,7 @@ int CPrivateSend::GetDenominationsByAmounts(const std::vector<CAmount>& vecAmoun
 bool CPrivateSend::IsDenominatedAmount(CAmount nInputAmount)
 {
     for (const auto& nDenomValue : vecStandardDenominations)
-        if(nInputAmount == nDenomValue)
+        if (nInputAmount == nDenomValue)
             return true;
     return false;
 }
@@ -487,29 +495,52 @@ bool CPrivateSend::IsDenominatedAmount(CAmount nInputAmount)
 std::string CPrivateSend::GetMessageByID(PoolMessage nMessageID)
 {
     switch (nMessageID) {
-        case ERR_ALREADY_HAVE:          return _("Already have that input.");
-        case ERR_DENOM:                 return _("No matching denominations found for mixing.");
-        case ERR_ENTRIES_FULL:          return _("Entries are full.");
-        case ERR_EXISTING_TX:           return _("Not compatible with existing transactions.");
-        case ERR_FEES:                  return _("Transaction fees are too high.");
-        case ERR_INVALID_COLLATERAL:    return _("Collateral not valid.");
-        case ERR_INVALID_INPUT:         return _("Input is not valid.");
-        case ERR_INVALID_SCRIPT:        return _("Invalid script detected.");
-        case ERR_INVALID_TX:            return _("Transaction not valid.");
-        case ERR_MAXIMUM:               return _("Entry exceeds maximum size.");
-        case ERR_MN_LIST:               return _("Not in the Masternode list.");
-        case ERR_MODE:                  return _("Incompatible mode.");
-        case ERR_NON_STANDARD_PUBKEY:   return _("Non-standard public key detected.");
-        case ERR_NOT_A_MN:              return _("This is not a Masternode."); // not used
-        case ERR_QUEUE_FULL:            return _("Masternode queue is full.");
-        case ERR_RECENT:                return _("Last PrivateSend was too recent.");
-        case ERR_SESSION:               return _("Session not complete!");
-        case ERR_MISSING_TX:            return _("Missing input transaction information.");
-        case ERR_VERSION:               return _("Incompatible version.");
-        case MSG_NOERR:                 return _("No errors detected.");
-        case MSG_SUCCESS:               return _("Transaction created successfully.");
-        case MSG_ENTRIES_ADDED:         return _("Your entries added successfully.");
-        default:                        return _("Unknown response.");
+    case ERR_ALREADY_HAVE:
+        return _("Already have that input.");
+    case ERR_DENOM:
+        return _("No matching denominations found for mixing.");
+    case ERR_ENTRIES_FULL:
+        return _("Entries are full.");
+    case ERR_EXISTING_TX:
+        return _("Not compatible with existing transactions.");
+    case ERR_FEES:
+        return _("Transaction fees are too high.");
+    case ERR_INVALID_COLLATERAL:
+        return _("Collateral not valid.");
+    case ERR_INVALID_INPUT:
+        return _("Input is not valid.");
+    case ERR_INVALID_SCRIPT:
+        return _("Invalid script detected.");
+    case ERR_INVALID_TX:
+        return _("Transaction not valid.");
+    case ERR_MAXIMUM:
+        return _("Entry exceeds maximum size.");
+    case ERR_MN_LIST:
+        return _("Not in the Masternode list.");
+    case ERR_MODE:
+        return _("Incompatible mode.");
+    case ERR_NON_STANDARD_PUBKEY:
+        return _("Non-standard public key detected.");
+    case ERR_NOT_A_MN:
+        return _("This is not a Masternode."); // not used
+    case ERR_QUEUE_FULL:
+        return _("Masternode queue is full.");
+    case ERR_RECENT:
+        return _("Last PrivateSend was too recent.");
+    case ERR_SESSION:
+        return _("Session not complete!");
+    case ERR_MISSING_TX:
+        return _("Missing input transaction information.");
+    case ERR_VERSION:
+        return _("Incompatible version.");
+    case MSG_NOERR:
+        return _("No errors detected.");
+    case MSG_SUCCESS:
+        return _("Transaction created successfully.");
+    case MSG_ENTRIES_ADDED:
+        return _("Your entries added successfully.");
+    default:
+        return _("Unknown response.");
     }
 }
 
@@ -530,7 +561,7 @@ void CPrivateSend::CheckDSTXes(int nHeight)
 {
     LOCK(cs_mapdstx);
     std::map<uint256, CPrivateSendBroadcastTx>::iterator it = mapDSTX.begin();
-    while(it != mapDSTX.end()) {
+    while (it != mapDSTX.end()) {
         if (it->second.IsExpired(nHeight)) {
             mapDSTX.erase(it++);
         } else {
@@ -540,14 +571,14 @@ void CPrivateSend::CheckDSTXes(int nHeight)
     LogPrint("privatesend", "CPrivateSend::CheckDSTXes -- mapDSTX.size()=%llu\n", mapDSTX.size());
 }
 
-void CPrivateSend::UpdatedBlockTip(const CBlockIndex *pindex)
+void CPrivateSend::UpdatedBlockTip(const CBlockIndex* pindex)
 {
-    if(pindex && !fLiteMode && masternodeSync.IsMasternodeListSynced()) {
+    if (pindex && !fLiteMode && masternodeSync.IsMasternodeListSynced()) {
         CheckDSTXes(pindex->nHeight);
     }
 }
 
-void CPrivateSend::SyncTransaction(const CTransaction& tx, const CBlockIndex *pindex, int posInBlock)
+void CPrivateSend::SyncTransaction(const CTransaction& tx, const CBlockIndex* pindex, int posInBlock)
 {
     if (tx.IsCoinBase()) return;
 
diff --git a/src/privatesend.h b/src/privatesend.h
index efb5571ec59e..c49924ec2dfc 100644
--- a/src/privatesend.h
+++ b/src/privatesend.h
@@ -5,28 +5,28 @@
 #ifndef PRIVATESEND_H
 #define PRIVATESEND_H
 
+#include "bls/bls.h"
 #include "chain.h"
 #include "chainparams.h"
 #include "primitives/transaction.h"
 #include "pubkey.h"
 #include "sync.h"
-#include "tinyformat.h"
 #include "timedata.h"
-#include "bls/bls.h"
+#include "tinyformat.h"
 
 class CPrivateSend;
 class CConnman;
 
 // timeouts
-static const int PRIVATESEND_AUTO_TIMEOUT_MIN       = 5;
-static const int PRIVATESEND_AUTO_TIMEOUT_MAX       = 15;
-static const int PRIVATESEND_QUEUE_TIMEOUT          = 30;
-static const int PRIVATESEND_SIGNING_TIMEOUT        = 15;
+static const int PRIVATESEND_AUTO_TIMEOUT_MIN = 5;
+static const int PRIVATESEND_AUTO_TIMEOUT_MAX = 15;
+static const int PRIVATESEND_QUEUE_TIMEOUT = 30;
+static const int PRIVATESEND_SIGNING_TIMEOUT = 15;
 
 //! minimum peer version accepted by mixing pool
 static const int MIN_PRIVATESEND_PEER_PROTO_VERSION = 70210;
 
-static const size_t PRIVATESEND_ENTRY_MAX_SIZE      = 9;
+static const size_t PRIVATESEND_ENTRY_MAX_SIZE = 9;
 
 // pool responses
 enum PoolMessage {
@@ -87,13 +87,15 @@ class CTxDSIn : public CTxIn
         CTxIn(txin),
         prevPubKey(script),
         fHasSig(false)
-        {}
+    {
+    }
 
     CTxDSIn() :
         CTxIn(),
         prevPubKey(),
         fHasSig(false)
-        {}
+    {
+    }
 };
 
 class CPrivateSendAccept
@@ -104,18 +106,17 @@ class CPrivateSendAccept
 
     CPrivateSendAccept() :
         nDenom(0),
-        txCollateral(CMutableTransaction())
-        {};
+        txCollateral(CMutableTransaction()){};
 
     CPrivateSendAccept(int nDenom, const CMutableTransaction& txCollateral) :
         nDenom(nDenom),
-        txCollateral(txCollateral)
-        {};
+        txCollateral(txCollateral){};
 
     ADD_SERIALIZE_METHODS;
 
     template <typename Stream, typename Operation>
-    inline void SerializationOp(Stream& s, Operation ser_action) {
+    inline void SerializationOp(Stream& s, Operation ser_action)
+    {
         READWRITE(nDenom);
         int nVersion = s.GetVersion();
         if (nVersion > 70208 && nVersion <= 70210) {
@@ -146,19 +147,22 @@ class CPrivateSendEntry
         vecTxOut(std::vector<CTxOut>()),
         txCollateral(MakeTransactionRef()),
         addr(CService())
-        {}
+    {
+    }
 
     CPrivateSendEntry(const std::vector<CTxDSIn>& vecTxDSIn, const std::vector<CTxOut>& vecTxOut, const CTransaction& txCollateral) :
         vecTxDSIn(vecTxDSIn),
         vecTxOut(vecTxOut),
         txCollateral(MakeTransactionRef(txCollateral)),
         addr(CService())
-        {}
+    {
+    }
 
     ADD_SERIALIZE_METHODS;
 
     template <typename Stream, typename Operation>
-    inline void SerializationOp(Stream& s, Operation ser_action) {
+    inline void SerializationOp(Stream& s, Operation ser_action)
+    {
         READWRITE(vecTxDSIn);
         READWRITE(txCollateral);
         READWRITE(vecTxOut);
@@ -191,7 +195,8 @@ class CPrivateSendQueue
         fReady(false),
         vchSig(std::vector<unsigned char>()),
         fTried(false)
-        {}
+    {
+    }
 
     CPrivateSendQueue(int nDenom, COutPoint outpoint, int64_t nTime, bool fReady) :
         nDenom(nDenom),
@@ -201,12 +206,14 @@ class CPrivateSendQueue
         fReady(fReady),
         vchSig(std::vector<unsigned char>()),
         fTried(false)
-        {}
+    {
+    }
 
     ADD_SERIALIZE_METHODS;
 
     template <typename Stream, typename Operation>
-    inline void SerializationOp(Stream& s, Operation ser_action) {
+    inline void SerializationOp(Stream& s, Operation ser_action)
+    {
         READWRITE(nDenom);
         int nVersion = s.GetVersion();
         if (nVersion > 70208 && nVersion <= 70210) {
@@ -232,7 +239,7 @@ class CPrivateSendQueue
     /// Check if we have a valid Masternode address
     bool CheckSignature(const CKeyID& keyIDOperator, const CBLSPublicKey& blsPubKey) const;
 
-    bool Relay(CConnman &connman);
+    bool Relay(CConnman& connman);
 
     /// Is this queue expired?
     bool IsExpired() { return GetAdjustedTime() - nTime > PRIVATESEND_QUEUE_TIMEOUT; }
@@ -240,7 +247,7 @@ class CPrivateSendQueue
     std::string ToString() const
     {
         return strprintf("nDenom=%d, nTime=%lld, fReady=%s, fTried=%s, masternode=%s",
-                        nDenom, nTime, fReady ? "true" : "false", fTried ? "true" : "false", masternodeOutpoint.ToStringShort());
+            nDenom, nTime, fReady ? "true" : "false", fTried ? "true" : "false", masternodeOutpoint.ToStringShort());
     }
 
     friend bool operator==(const CPrivateSendQueue& a, const CPrivateSendQueue& b)
@@ -270,7 +277,8 @@ class CPrivateSendBroadcastTx
         masternodeOutpoint(),
         vchSig(),
         sigTime(0)
-        {}
+    {
+    }
 
     CPrivateSendBroadcastTx(const CTransactionRef& _tx, COutPoint _outpoint, int64_t _sigTime) :
         nConfirmedHeight(-1),
@@ -278,12 +286,14 @@ class CPrivateSendBroadcastTx
         masternodeOutpoint(_outpoint),
         vchSig(),
         sigTime(_sigTime)
-        {}
+    {
+    }
 
     ADD_SERIALIZE_METHODS;
 
     template <typename Stream, typename Operation>
-    inline void SerializationOp(Stream& s, Operation ser_action) {
+    inline void SerializationOp(Stream& s, Operation ser_action)
+    {
         READWRITE(tx);
         READWRITE(masternodeOutpoint);
         if (!(s.GetType() & SER_GETHASH)) {
@@ -322,7 +332,7 @@ class CPrivateSendBaseSession
 
     std::vector<CPrivateSendEntry> vecEntries; // Masternode/clients entries
 
-    PoolState nState; // should be one of the POOL_STATE_XXX values
+    PoolState nState;                // should be one of the POOL_STATE_XXX values
     int64_t nTimeLastSuccessfulStep; // the time when last successful mixing step was performed
 
     int nSessionID; // 0 if no mixing session is active
@@ -341,7 +351,8 @@ class CPrivateSendBaseSession
         nSessionID(0),
         finalMutableTransaction(),
         nSessionDenom(0)
-        {}
+    {
+    }
 
     int GetState() const { return nState; }
     std::string GetStateString() const;
@@ -362,7 +373,8 @@ class CPrivateSendBaseManager
     void CheckQueue();
 
 public:
-    CPrivateSendBaseManager() : vecPrivateSendQueue() {}
+    CPrivateSendBaseManager() :
+        vecPrivateSendQueue() {}
 
     int GetQueueSize() const { return vecPrivateSendQueue.size(); }
     bool GetQueueItemAndTry(CPrivateSendQueue& dsqRet);
@@ -376,7 +388,7 @@ class CPrivateSend
     CPrivateSend() {}
     ~CPrivateSend() {}
     CPrivateSend(CPrivateSend const&) = delete;
-    CPrivateSend& operator= (CPrivateSend const&) = delete;
+    CPrivateSend& operator=(CPrivateSend const&) = delete;
 
     static const CAmount COLLATERAL = 0.001 * COIN;
 
@@ -401,7 +413,7 @@ class CPrivateSend
     /// Get the denominations for a list of outputs (returns a bitshifted integer)
     static int GetDenominations(const std::vector<CTxOut>& vecTxOut, bool fSingleRandomDenom = false);
     static std::string GetDenominationsToString(int nDenom);
-    static bool GetDenominationsBits(int nDenom, std::vector<int> &vecBitsRet);
+    static bool GetDenominationsBits(int nDenom, std::vector<int>& vecBitsRet);
 
     static std::string GetMessageByID(PoolMessage nMessageID);
 
@@ -413,15 +425,15 @@ class CPrivateSend
     /// If the collateral is valid given by a client
     static bool IsCollateralValid(const CTransaction& txCollateral);
     static CAmount GetCollateralAmount() { return COLLATERAL; }
-    static CAmount GetMaxCollateralAmount() { return COLLATERAL*4; }
+    static CAmount GetMaxCollateralAmount() { return COLLATERAL * 4; }
 
     static bool IsCollateralAmount(CAmount nInputAmount);
 
     static void AddDSTX(const CPrivateSendBroadcastTx& dstx);
     static CPrivateSendBroadcastTx GetDSTX(const uint256& hash);
 
-    static void UpdatedBlockTip(const CBlockIndex *pindex);
-    static void SyncTransaction(const CTransaction& tx, const CBlockIndex *pindex, int posInBlock);
+    static void UpdatedBlockTip(const CBlockIndex* pindex);
+    static void SyncTransaction(const CTransaction& tx, const CBlockIndex* pindex, int posInBlock);
 };
 
 #endif

From 98bdf35f9d9cfaf22d21c9b92059dedeba39b34b Mon Sep 17 00:00:00 2001
From: PastaPastaPasta <pasta@dashboost.org>
Date: Mon, 5 Nov 2018 03:29:33 -0600
Subject: [PATCH 246/400] bump PS copyright (#2417)

---
 src/privatesend-client.cpp | 3 ++-
 src/privatesend-client.h   | 2 +-
 src/privatesend-server.cpp | 3 ++-
 src/privatesend-server.h   | 2 +-
 src/privatesend-util.cpp   | 3 ++-
 src/privatesend-util.h     | 2 +-
 src/privatesend.cpp        | 3 ++-
 src/privatesend.h          | 2 +-
 8 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/privatesend-client.cpp b/src/privatesend-client.cpp
index d83bd45e111b..4880464c1be2 100644
--- a/src/privatesend-client.cpp
+++ b/src/privatesend-client.cpp
@@ -1,6 +1,7 @@
-// Copyright (c) 2014-2017 The Dash Core developers
+// Copyright (c) 2014-2018 The Dash Core developers
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
 #include "privatesend-client.h"
 
 #include "consensus/validation.h"
diff --git a/src/privatesend-client.h b/src/privatesend-client.h
index 2ad319cea8a3..aec8a97d3db7 100644
--- a/src/privatesend-client.h
+++ b/src/privatesend-client.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2017 The Dash Core developers
+// Copyright (c) 2014-2018 The Dash Core developers
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/privatesend-server.cpp b/src/privatesend-server.cpp
index 3db14067dd80..322c406286df 100644
--- a/src/privatesend-server.cpp
+++ b/src/privatesend-server.cpp
@@ -1,6 +1,7 @@
-// Copyright (c) 2014-2017 The Dash Core developers
+// Copyright (c) 2014-2018 The Dash Core developers
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
 #include "privatesend-server.h"
 
 #include "activemasternode.h"
diff --git a/src/privatesend-server.h b/src/privatesend-server.h
index 22042c66d9da..c4deeefcaadf 100644
--- a/src/privatesend-server.h
+++ b/src/privatesend-server.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2017 The Dash Core developers
+// Copyright (c) 2014-2018 The Dash Core developers
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/privatesend-util.cpp b/src/privatesend-util.cpp
index ad96b58d3e6f..99571e0d866b 100644
--- a/src/privatesend-util.cpp
+++ b/src/privatesend-util.cpp
@@ -1,6 +1,7 @@
-// Copyright (c) 2014-2017 The Dash Core developers
+// Copyright (c) 2014-2018 The Dash Core developers
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
 #include "privatesend-util.h"
 
 CKeyHolder::CKeyHolder(CWallet* pwallet) :
diff --git a/src/privatesend-util.h b/src/privatesend-util.h
index 4cae27318eda..348ce8502386 100644
--- a/src/privatesend-util.h
+++ b/src/privatesend-util.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2017 The Dash Core developers
+// Copyright (c) 2014-2018 The Dash Core developers
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/privatesend.cpp b/src/privatesend.cpp
index 45e4c4a92af0..a71b7a9f8725 100644
--- a/src/privatesend.cpp
+++ b/src/privatesend.cpp
@@ -1,6 +1,7 @@
-// Copyright (c) 2014-2017 The Dash Core developers
+// Copyright (c) 2014-2018 The Dash Core developers
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
 #include "privatesend.h"
 
 #include "activemasternode.h"
diff --git a/src/privatesend.h b/src/privatesend.h
index c49924ec2dfc..d6e1b520da53 100644
--- a/src/privatesend.h
+++ b/src/privatesend.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2017 The Dash Core developers
+// Copyright (c) 2014-2018 The Dash Core developers
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 

From f0df5bffa63202655a80a55a2513344fb20e54e6 Mon Sep 17 00:00:00 2001
From: PastaPastaPasta <pasta@dashboost.org>
Date: Tue, 6 Nov 2018 02:54:23 -0600
Subject: [PATCH 247/400] Clang evo folder and activemasternode.* (#2418)

* clang + manual formatting

* clang activemasternode.*

* bump copyright

* weirdness correction
---
 src/activemasternode.cpp     | 161 +++++++++++++++++++----------------
 src/activemasternode.h       |  19 +++--
 src/evo/cbtx.cpp             |   6 +-
 src/evo/cbtx.h               |   6 +-
 src/evo/deterministicmns.cpp |  52 +++++------
 src/evo/deterministicmns.h   |  61 +++++++------
 src/evo/evodb.cpp            |   4 +-
 src/evo/evodb.h              |   6 +-
 src/evo/providertx.cpp       |  26 +++---
 src/evo/providertx.h         |  12 +--
 src/evo/simplifiedmns.cpp    |  14 +--
 src/evo/simplifiedmns.h      |  14 +--
 src/evo/specialtx.cpp        |  60 ++++++-------
 src/evo/specialtx.h          |   4 +-
 14 files changed, 233 insertions(+), 212 deletions(-)

diff --git a/src/activemasternode.cpp b/src/activemasternode.cpp
index f1eee8131236..b13437a8d3e7 100644
--- a/src/activemasternode.cpp
+++ b/src/activemasternode.cpp
@@ -1,17 +1,16 @@
-// Copyright (c) 2014-2017 The Dash Core developers
+// Copyright (c) 2014-2018 The Dash Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #include "activemasternode.h"
-#include "masternode.h"
+#include "evo/deterministicmns.h"
+#include "init.h"
 #include "masternode-sync.h"
+#include "masternode.h"
 #include "masternodeman.h"
 #include "netbase.h"
 #include "protocol.h"
-#include "netbase.h"
 #include "warnings.h"
-#include "init.h"
-#include "evo/deterministicmns.h"
 
 // Keep track of the active Masternode
 CActiveMasternodeInfo activeMasternodeInfo;
@@ -21,24 +20,36 @@ CActiveDeterministicMasternodeManager* activeMasternodeManager;
 std::string CActiveDeterministicMasternodeManager::GetStateString() const
 {
     switch (state) {
-        case MASTERNODE_WAITING_FOR_PROTX:  return "WAITING_FOR_PROTX";
-        case MASTERNODE_POSE_BANNED:        return "POSE_BANNED";
-        case MASTERNODE_REMOVED:            return "REMOVED";
-        case MASTERNODE_READY:              return "READY";
-        case MASTERNODE_ERROR:              return "ERROR";
-        default:                            return "UNKNOWN";
+    case MASTERNODE_WAITING_FOR_PROTX:
+        return "WAITING_FOR_PROTX";
+    case MASTERNODE_POSE_BANNED:
+        return "POSE_BANNED";
+    case MASTERNODE_REMOVED:
+        return "REMOVED";
+    case MASTERNODE_READY:
+        return "READY";
+    case MASTERNODE_ERROR:
+        return "ERROR";
+    default:
+        return "UNKNOWN";
     }
 }
 
 std::string CActiveDeterministicMasternodeManager::GetStatus() const
 {
     switch (state) {
-        case MASTERNODE_WAITING_FOR_PROTX:  return "Waiting for ProTx to appear on-chain";
-        case MASTERNODE_POSE_BANNED:        return "Masternode was PoSe banned";
-        case MASTERNODE_REMOVED:            return "Masternode removed from list";
-        case MASTERNODE_READY:              return "Ready";
-        case MASTERNODE_ERROR:              return "Error. " + strError;
-        default:                            return "Unknown";
+    case MASTERNODE_WAITING_FOR_PROTX:
+        return "Waiting for ProTx to appear on-chain";
+    case MASTERNODE_POSE_BANNED:
+        return "Masternode was PoSe banned";
+    case MASTERNODE_REMOVED:
+        return "Masternode removed from list";
+    case MASTERNODE_READY:
+        return "Ready";
+    case MASTERNODE_ERROR:
+        return "Error. " + strError;
+    default:
+        return "Unknown";
     }
 }
 
@@ -46,11 +57,9 @@ void CActiveDeterministicMasternodeManager::Init()
 {
     LOCK(cs_main);
 
-    if (!fMasternodeMode)
-        return;
+    if (!fMasternodeMode) return;
 
-    if (!deterministicMNManager->IsDeterministicMNsSporkActive())
-        return;
+    if (!deterministicMNManager->IsDeterministicMNsSporkActive()) return;
 
     if (!GetLocalAddress(activeMasternodeInfo.service)) {
         state = MASTERNODE_ERROR;
@@ -93,12 +102,9 @@ void CActiveDeterministicMasternodeManager::UpdatedBlockTip(const CBlockIndex* p
 {
     LOCK(cs_main);
 
-    if (!fMasternodeMode)
-        return;
+    if (!fMasternodeMode) return;
 
-    if (!deterministicMNManager->IsDeterministicMNsSporkActive(pindexNew->nHeight)) {
-        return;
-    }
+    if (!deterministicMNManager->IsDeterministicMNsSporkActive(pindexNew->nHeight)) return;
 
     if (state == MASTERNODE_WAITING_FOR_PROTX) {
         Init();
@@ -117,7 +123,7 @@ void CActiveDeterministicMasternodeManager::UpdatedBlockTip(const CBlockIndex* p
     }
 }
 
-bool CActiveDeterministicMasternodeManager::GetLocalAddress(CService &addrRet)
+bool CActiveDeterministicMasternodeManager::GetLocalAddress(CService& addrRet)
 {
     // First try to find whatever local address is specified by externalip option
     bool fFoundLocal = GetLocal(addrRet) && CMasternode::IsValidNetAddr(addrRet);
@@ -126,7 +132,7 @@ bool CActiveDeterministicMasternodeManager::GetLocalAddress(CService &addrRet)
             fFoundLocal = true;
         }
     }
-    if(!fFoundLocal) {
+    if (!fFoundLocal) {
         strError = "Can't detect valid external address. Please consider using the externalip configuration option if problem persists. Make sure to use IPv4 address only.";
         LogPrintf("CActiveDeterministicMasternodeManager::GetLocalAddress -- ERROR: %s\n", strError);
         return false;
@@ -138,31 +144,30 @@ bool CActiveDeterministicMasternodeManager::GetLocalAddress(CService &addrRet)
 
 void CActiveLegacyMasternodeManager::ManageState(CConnman& connman)
 {
-    if (deterministicMNManager->IsDeterministicMNsSporkActive())
-        return;
+    if (deterministicMNManager->IsDeterministicMNsSporkActive()) return;
 
     LogPrint("masternode", "CActiveLegacyMasternodeManager::ManageState -- Start\n");
-    if(!fMasternodeMode) {
+    if (!fMasternodeMode) {
         LogPrint("masternode", "CActiveLegacyMasternodeManager::ManageState -- Not a masternode, returning\n");
         return;
     }
-    if(Params().NetworkIDString() != CBaseChainParams::REGTEST && !masternodeSync.IsBlockchainSynced()) {
+    if (Params().NetworkIDString() != CBaseChainParams::REGTEST && !masternodeSync.IsBlockchainSynced()) {
         nState = ACTIVE_MASTERNODE_SYNC_IN_PROCESS;
         LogPrintf("CActiveLegacyMasternodeManager::ManageState -- %s: %s\n", GetStateString(), GetStatus());
         return;
     }
 
-    if(nState == ACTIVE_MASTERNODE_SYNC_IN_PROCESS) {
+    if (nState == ACTIVE_MASTERNODE_SYNC_IN_PROCESS) {
         nState = ACTIVE_MASTERNODE_INITIAL;
     }
 
     LogPrint("masternode", "CActiveLegacyMasternodeManager::ManageState -- status = %s, type = %s, pinger enabled = %d\n", GetStatus(), GetTypeString(), fPingerEnabled);
 
-    if(eType == MASTERNODE_UNKNOWN) {
+    if (eType == MASTERNODE_UNKNOWN) {
         ManageStateInitial(connman);
     }
 
-    if(eType == MASTERNODE_REMOTE) {
+    if (eType == MASTERNODE_REMOTE) {
         ManageStateRemote();
     }
 
@@ -172,31 +177,43 @@ void CActiveLegacyMasternodeManager::ManageState(CConnman& connman)
 std::string CActiveLegacyMasternodeManager::GetStateString() const
 {
     switch (nState) {
-        case ACTIVE_MASTERNODE_INITIAL:         return "INITIAL";
-        case ACTIVE_MASTERNODE_SYNC_IN_PROCESS: return "SYNC_IN_PROCESS";
-        case ACTIVE_MASTERNODE_INPUT_TOO_NEW:   return "INPUT_TOO_NEW";
-        case ACTIVE_MASTERNODE_NOT_CAPABLE:     return "NOT_CAPABLE";
-        case ACTIVE_MASTERNODE_STARTED:         return "STARTED";
-        default:                                return "UNKNOWN";
+    case ACTIVE_MASTERNODE_INITIAL:
+        return "INITIAL";
+    case ACTIVE_MASTERNODE_SYNC_IN_PROCESS:
+        return "SYNC_IN_PROCESS";
+    case ACTIVE_MASTERNODE_INPUT_TOO_NEW:
+        return "INPUT_TOO_NEW";
+    case ACTIVE_MASTERNODE_NOT_CAPABLE:
+        return "NOT_CAPABLE";
+    case ACTIVE_MASTERNODE_STARTED:
+        return "STARTED";
+    default:
+        return "UNKNOWN";
     }
 }
 
 std::string CActiveLegacyMasternodeManager::GetStatus() const
 {
     switch (nState) {
-        case ACTIVE_MASTERNODE_INITIAL:         return "Node just started, not yet activated";
-        case ACTIVE_MASTERNODE_SYNC_IN_PROCESS: return "Sync in progress. Must wait until sync is complete to start Masternode";
-        case ACTIVE_MASTERNODE_INPUT_TOO_NEW:   return strprintf("Masternode input must have at least %d confirmations", Params().GetConsensus().nMasternodeMinimumConfirmations);
-        case ACTIVE_MASTERNODE_NOT_CAPABLE:     return "Not capable masternode: " + strNotCapableReason;
-        case ACTIVE_MASTERNODE_STARTED:         return "Masternode successfully started";
-        default:                                return "Unknown";
+    case ACTIVE_MASTERNODE_INITIAL:
+        return "Node just started, not yet activated";
+    case ACTIVE_MASTERNODE_SYNC_IN_PROCESS:
+        return "Sync in progress. Must wait until sync is complete to start Masternode";
+    case ACTIVE_MASTERNODE_INPUT_TOO_NEW:
+        return strprintf("Masternode input must have at least %d confirmations", Params().GetConsensus().nMasternodeMinimumConfirmations);
+    case ACTIVE_MASTERNODE_NOT_CAPABLE:
+        return "Not capable masternode: " + strNotCapableReason;
+    case ACTIVE_MASTERNODE_STARTED:
+        return "Masternode successfully started";
+    default:
+        return "Unknown";
     }
 }
 
 std::string CActiveLegacyMasternodeManager::GetTypeString() const
 {
     std::string strType;
-    switch(eType) {
+    switch (eType) {
     case MASTERNODE_REMOTE:
         strType = "REMOTE";
         break;
@@ -209,15 +226,14 @@ std::string CActiveLegacyMasternodeManager::GetTypeString() const
 
 bool CActiveLegacyMasternodeManager::SendMasternodePing(CConnman& connman)
 {
-    if (deterministicMNManager->IsDeterministicMNsSporkActive())
-        return false;
+    if (deterministicMNManager->IsDeterministicMNsSporkActive()) return false;
 
-    if(!fPingerEnabled) {
+    if (!fPingerEnabled) {
         LogPrint("masternode", "CActiveLegacyMasternodeManager::SendMasternodePing -- %s: masternode ping service is disabled, skipping...\n", GetStateString());
         return false;
     }
 
-    if(!mnodeman.Has(activeMasternodeInfo.outpoint)) {
+    if (!mnodeman.Has(activeMasternodeInfo.outpoint)) {
         strNotCapableReason = "Masternode not in masternode list";
         nState = ACTIVE_MASTERNODE_NOT_CAPABLE;
         LogPrintf("CActiveLegacyMasternodeManager::SendMasternodePing -- %s: %s\n", GetStateString(), strNotCapableReason);
@@ -227,14 +243,14 @@ bool CActiveLegacyMasternodeManager::SendMasternodePing(CConnman& connman)
     CMasternodePing mnp(activeMasternodeInfo.outpoint);
     mnp.nSentinelVersion = nSentinelVersion;
     mnp.fSentinelIsCurrent =
-            (abs(GetAdjustedTime() - nSentinelPingTime) < MASTERNODE_SENTINEL_PING_MAX_SECONDS);
-    if(!mnp.Sign(activeMasternodeInfo.legacyKeyOperator, activeMasternodeInfo.legacyKeyIDOperator)) {
+        (abs(GetAdjustedTime() - nSentinelPingTime) < MASTERNODE_SENTINEL_PING_MAX_SECONDS);
+    if (!mnp.Sign(activeMasternodeInfo.legacyKeyOperator, activeMasternodeInfo.legacyKeyIDOperator)) {
         LogPrintf("CActiveLegacyMasternodeManager::SendMasternodePing -- ERROR: Couldn't sign Masternode Ping\n");
         return false;
     }
 
     // Update lastPing for our masternode in Masternode list
-    if(mnodeman.IsMasternodePingedWithin(activeMasternodeInfo.outpoint, MASTERNODE_MIN_MNP_SECONDS, mnp.sigTime)) {
+    if (mnodeman.IsMasternodePingedWithin(activeMasternodeInfo.outpoint, MASTERNODE_MIN_MNP_SECONDS, mnp.sigTime)) {
         LogPrintf("CActiveLegacyMasternodeManager::SendMasternodePing -- Too early to send Masternode Ping\n");
         return false;
     }
@@ -255,7 +271,7 @@ bool CActiveLegacyMasternodeManager::UpdateSentinelPing(int version)
     return true;
 }
 
-void CActiveLegacyMasternodeManager::DoMaintenance(CConnman &connman)
+void CActiveLegacyMasternodeManager::DoMaintenance(CConnman& connman)
 {
     if (ShutdownRequested()) return;
 
@@ -264,8 +280,7 @@ void CActiveLegacyMasternodeManager::DoMaintenance(CConnman &connman)
 
 void CActiveLegacyMasternodeManager::ManageStateInitial(CConnman& connman)
 {
-    if (deterministicMNManager->IsDeterministicMNsSporkActive())
-        return;
+    if (deterministicMNManager->IsDeterministicMNsSporkActive()) return;
 
     LogPrint("masternode", "CActiveLegacyMasternodeManager::ManageStateInitial -- status = %s, type = %s, pinger enabled = %d\n", GetStatus(), GetTypeString(), fPingerEnabled);
 
@@ -280,7 +295,7 @@ void CActiveLegacyMasternodeManager::ManageStateInitial(CConnman& connman)
 
     // First try to find whatever local address is specified by externalip option
     bool fFoundLocal = GetLocal(activeMasternodeInfo.service) && CMasternode::IsValidNetAddr(activeMasternodeInfo.service);
-    if(!fFoundLocal) {
+    if (!fFoundLocal) {
         bool empty = true;
         // If we have some peers, let's try to find our local address from one of them
         connman.ForEachNodeContinueIf(CConnman::AllNodes, [&fFoundLocal, &empty](CNode* pnode) {
@@ -304,7 +319,7 @@ void CActiveLegacyMasternodeManager::ManageStateInitial(CConnman& connman)
         }
     }
 
-    if(!fFoundLocal) {
+    if (!fFoundLocal) {
         nState = ACTIVE_MASTERNODE_NOT_CAPABLE;
         strNotCapableReason = "Can't detect valid external address. Please consider using the externalip configuration option if problem persists. Make sure to use IPv4 address only.";
         LogPrintf("CActiveLegacyMasternodeManager::ManageStateInitial -- %s: %s\n", GetStateString(), strNotCapableReason);
@@ -312,21 +327,21 @@ void CActiveLegacyMasternodeManager::ManageStateInitial(CConnman& connman)
     }
 
     int mainnetDefaultPort = Params(CBaseChainParams::MAIN).GetDefaultPort();
-    if(Params().NetworkIDString() == CBaseChainParams::MAIN) {
-        if(activeMasternodeInfo.service.GetPort() != mainnetDefaultPort) {
+    if (Params().NetworkIDString() == CBaseChainParams::MAIN) {
+        if (activeMasternodeInfo.service.GetPort() != mainnetDefaultPort) {
             nState = ACTIVE_MASTERNODE_NOT_CAPABLE;
             strNotCapableReason = strprintf("Invalid port: %u - only %d is supported on mainnet.", activeMasternodeInfo.service.GetPort(), mainnetDefaultPort);
             LogPrintf("CActiveLegacyMasternodeManager::ManageStateInitial -- %s: %s\n", GetStateString(), strNotCapableReason);
             return;
         }
-    } else if(activeMasternodeInfo.service.GetPort() == mainnetDefaultPort) {
+    } else if (activeMasternodeInfo.service.GetPort() == mainnetDefaultPort) {
         nState = ACTIVE_MASTERNODE_NOT_CAPABLE;
         strNotCapableReason = strprintf("Invalid port: %u - %d is only supported on mainnet.", activeMasternodeInfo.service.GetPort(), mainnetDefaultPort);
         LogPrintf("CActiveLegacyMasternodeManager::ManageStateInitial -- %s: %s\n", GetStateString(), strNotCapableReason);
         return;
     }
 
-    if(Params().NetworkIDString() != CBaseChainParams::REGTEST) {
+    if (Params().NetworkIDString() != CBaseChainParams::REGTEST) {
         // Check socket connectivity
         LogPrintf("CActiveLegacyMasternodeManager::ManageStateInitial -- Checking inbound connection to '%s'\n", activeMasternodeInfo.service.ToString());
         SOCKET hSocket;
@@ -348,28 +363,27 @@ void CActiveLegacyMasternodeManager::ManageStateInitial(CConnman& connman)
 
 void CActiveLegacyMasternodeManager::ManageStateRemote()
 {
-    if (deterministicMNManager->IsDeterministicMNsSporkActive())
-        return;
+    if (deterministicMNManager->IsDeterministicMNsSporkActive()) return;
 
     LogPrint("masternode", "CActiveLegacyMasternodeManager::ManageStateRemote -- Start status = %s, type = %s, pinger enabled = %d, keyIDOperator = %s\n",
-             GetStatus(), GetTypeString(), fPingerEnabled, activeMasternodeInfo.legacyKeyIDOperator.ToString());
+        GetStatus(), GetTypeString(), fPingerEnabled, activeMasternodeInfo.legacyKeyIDOperator.ToString());
 
     mnodeman.CheckMasternode(activeMasternodeInfo.legacyKeyIDOperator, true);
     masternode_info_t infoMn;
-    if(mnodeman.GetMasternodeInfo(activeMasternodeInfo.legacyKeyIDOperator, infoMn)) {
-        if(infoMn.nProtocolVersion != PROTOCOL_VERSION) {
+    if (mnodeman.GetMasternodeInfo(activeMasternodeInfo.legacyKeyIDOperator, infoMn)) {
+        if (infoMn.nProtocolVersion != PROTOCOL_VERSION) {
             nState = ACTIVE_MASTERNODE_NOT_CAPABLE;
             strNotCapableReason = "Invalid protocol version";
             LogPrintf("CActiveLegacyMasternodeManager::ManageStateRemote -- %s: %s\n", GetStateString(), strNotCapableReason);
             return;
         }
-        if(activeMasternodeInfo.service != infoMn.addr) {
+        if (activeMasternodeInfo.service != infoMn.addr) {
             nState = ACTIVE_MASTERNODE_NOT_CAPABLE;
             strNotCapableReason = "Broadcasted IP doesn't match our external address. Make sure you issued a new broadcast if IP of this masternode changed recently.";
             LogPrintf("CActiveLegacyMasternodeManager::ManageStateRemote -- %s: %s\n", GetStateString(), strNotCapableReason);
             return;
         }
-        if(!CMasternode::IsValidStateForAutoStart(infoMn.nActiveState)) {
+        if (!CMasternode::IsValidStateForAutoStart(infoMn.nActiveState)) {
             nState = ACTIVE_MASTERNODE_NOT_CAPABLE;
             strNotCapableReason = strprintf("Masternode in %s state", CMasternode::StateToString(infoMn.nActiveState));
             LogPrintf("CActiveLegacyMasternodeManager::ManageStateRemote -- %s: %s\n", GetStateString(), strNotCapableReason);
@@ -385,15 +399,14 @@ void CActiveLegacyMasternodeManager::ManageStateRemote()
             }
             LogPrintf("CActiveLegacyMasternodeManager::ManageStateRemote -- Collateral is a ProTx\n");
         }
-        if(nState != ACTIVE_MASTERNODE_STARTED) {
+        if (nState != ACTIVE_MASTERNODE_STARTED) {
             LogPrintf("CActiveLegacyMasternodeManager::ManageStateRemote -- STARTED!\n");
             activeMasternodeInfo.outpoint = infoMn.outpoint;
             activeMasternodeInfo.service = infoMn.addr;
             fPingerEnabled = true;
             nState = ACTIVE_MASTERNODE_STARTED;
         }
-    }
-    else {
+    } else {
         nState = ACTIVE_MASTERNODE_NOT_CAPABLE;
         strNotCapableReason = "Masternode not in masternode list";
         LogPrintf("CActiveLegacyMasternodeManager::ManageStateRemote -- %s: %s\n", GetStateString(), strNotCapableReason);
diff --git a/src/activemasternode.h b/src/activemasternode.h
index cbe805b9a488..7b3ef45009f0 100644
--- a/src/activemasternode.h
+++ b/src/activemasternode.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2017 The Dash Core developers
+// Copyright (c) 2014-2018 The Dash Core developers
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
@@ -11,8 +11,8 @@
 #include "primitives/transaction.h"
 #include "validationinterface.h"
 
-#include "evo/providertx.h"
 #include "evo/deterministicmns.h"
+#include "evo/providertx.h"
 
 struct CActiveMasternodeInfo;
 class CActiveLegacyMasternodeManager;
@@ -69,7 +69,7 @@ class CActiveDeterministicMasternodeManager : public CValidationInterface
     std::string GetStatus() const;
 
 private:
-    bool GetLocalAddress(CService &addrRet);
+    bool GetLocalAddress(CService& addrRet);
 };
 
 // Responsible for activating the Masternode and pinging the network (legacy MN list)
@@ -101,11 +101,12 @@ class CActiveLegacyMasternodeManager
     std::string strNotCapableReason;
 
 
-    CActiveLegacyMasternodeManager()
-        : eType(MASTERNODE_UNKNOWN),
-          fPingerEnabled(false),
-          nState(ACTIVE_MASTERNODE_INITIAL)
-    {}
+    CActiveLegacyMasternodeManager() :
+        eType(MASTERNODE_UNKNOWN),
+        fPingerEnabled(false),
+        nState(ACTIVE_MASTERNODE_INITIAL)
+    {
+    }
 
     /// Manage state of active Masternode
     void ManageState(CConnman& connman);
@@ -116,7 +117,7 @@ class CActiveLegacyMasternodeManager
 
     bool UpdateSentinelPing(int version);
 
-    void DoMaintenance(CConnman &connman);
+    void DoMaintenance(CConnman& connman);
 
 private:
     void ManageStateInitial(CConnman& connman);
diff --git a/src/evo/cbtx.cpp b/src/evo/cbtx.cpp
index cf48c69fa078..9d0d5cd904a4 100644
--- a/src/evo/cbtx.cpp
+++ b/src/evo/cbtx.cpp
@@ -1,14 +1,14 @@
-// Copyright (c) 2017 The Dash Core developers
+// Copyright (c) 2017-2018 The Dash Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #include "cbtx.h"
-#include "specialtx.h"
 #include "deterministicmns.h"
 #include "simplifiedmns.h"
+#include "specialtx.h"
 
-#include "validation.h"
 #include "univalue.h"
+#include "validation.h"
 
 bool CheckCbTx(const CTransaction& tx, const CBlockIndex* pindexPrev, CValidationState& state)
 {
diff --git a/src/evo/cbtx.h b/src/evo/cbtx.h
index 0cc508bfa323..c9b1c0e1eb02 100644
--- a/src/evo/cbtx.h
+++ b/src/evo/cbtx.h
@@ -1,12 +1,12 @@
-// Copyright (c) 2017 The Dash Core developers
+// Copyright (c) 2017-2018 The Dash Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #ifndef DASH_CBTX_H
 #define DASH_CBTX_H
 
-#include "primitives/transaction.h"
 #include "consensus/validation.h"
+#include "primitives/transaction.h"
 
 class CBlock;
 class CBlockIndex;
@@ -43,4 +43,4 @@ bool CheckCbTx(const CTransaction& tx, const CBlockIndex* pindexPrev, CValidatio
 bool CheckCbTxMerkleRootMNList(const CBlock& block, const CBlockIndex* pindex, CValidationState& state);
 bool CalcCbTxMerkleRootMNList(const CBlock& block, const CBlockIndex* pindexPrev, uint256& merkleRootRet, CValidationState& state);
 
-#endif//DASH_CBTX_H
+#endif //DASH_CBTX_H
diff --git a/src/evo/deterministicmns.cpp b/src/evo/deterministicmns.cpp
index ff01d3f74a52..91bd0f228ee8 100644
--- a/src/evo/deterministicmns.cpp
+++ b/src/evo/deterministicmns.cpp
@@ -5,13 +5,13 @@
 #include "deterministicmns.h"
 #include "specialtx.h"
 
-#include "validation.h"
-#include "validationinterface.h"
-#include "chainparams.h"
-#include "script/standard.h"
 #include "base58.h"
+#include "chainparams.h"
 #include "core_io.h"
+#include "script/standard.h"
 #include "spork.h"
+#include "validation.h"
+#include "validationinterface.h"
 
 #include <univalue.h>
 
@@ -33,9 +33,9 @@ std::string CDeterministicMNState::ToString() const
     }
 
     return strprintf("CDeterministicMNState(nRegisteredHeight=%d, nLastPaidHeight=%d, nPoSePenalty=%d, nPoSeRevivedHeight=%d, nPoSeBanHeight=%d, nRevocationReason=%d, "
-                     "keyIDOwner=%s, pubKeyOperator=%s, keyIDVoting=%s, addr=%s, payoutAddress=%s, operatorRewardAddress=%s)",
-                     nRegisteredHeight, nLastPaidHeight, nPoSePenalty, nPoSeRevivedHeight, nPoSeBanHeight, nRevocationReason,
-                     keyIDOwner.ToString(), pubKeyOperator.ToString(), keyIDVoting.ToString(), addr.ToStringIPPort(false), payoutAddress, operatorRewardAddress);
+        "keyIDOwner=%s, pubKeyOperator=%s, keyIDVoting=%s, addr=%s, payoutAddress=%s, operatorRewardAddress=%s)",
+        nRegisteredHeight, nLastPaidHeight, nPoSePenalty, nPoSeRevivedHeight, nPoSeBanHeight, nRevocationReason,
+        keyIDOwner.ToString(), pubKeyOperator.ToString(), keyIDVoting.ToString(), addr.ToStringIPPort(false), payoutAddress, operatorRewardAddress);
 }
 
 void CDeterministicMNState::ToJson(UniValue& obj) const
@@ -147,18 +147,18 @@ CDeterministicMNCPtr CDeterministicMNList::GetMNByCollateral(const COutPoint& co
     return GetUniquePropertyMN(collateralOutpoint);
 }
 
-static int CompareByLastPaid_GetHeight(const CDeterministicMN &dmn)
+static int CompareByLastPaid_GetHeight(const CDeterministicMN& dmn)
 {
-    int h = dmn.pdmnState->nLastPaidHeight;
-    if (dmn.pdmnState->nPoSeRevivedHeight != -1 && dmn.pdmnState->nPoSeRevivedHeight > h) {
-        h = dmn.pdmnState->nPoSeRevivedHeight;
-    } else if (h == 0) {
-        h = dmn.pdmnState->nRegisteredHeight;
+    int height = dmn.pdmnState->nLastPaidHeight;
+    if (dmn.pdmnState->nPoSeRevivedHeight != -1 && dmn.pdmnState->nPoSeRevivedHeight > height) {
+        height = dmn.pdmnState->nPoSeRevivedHeight;
+    } else if (height == 0) {
+        height = dmn.pdmnState->nRegisteredHeight;
     }
-    return h;
+    return height;
 }
 
-static bool CompareByLastPaid(const CDeterministicMN &_a, const CDeterministicMN &_b)
+static bool CompareByLastPaid(const CDeterministicMN& _a, const CDeterministicMN& _b)
 {
     int ah = CompareByLastPaid_GetHeight(_a);
     int bh = CompareByLastPaid_GetHeight(_b);
@@ -168,7 +168,7 @@ static bool CompareByLastPaid(const CDeterministicMN &_a, const CDeterministicMN
         return ah < bh;
     }
 }
-static bool CompareByLastPaid(const CDeterministicMNCPtr &_a, const CDeterministicMNCPtr &_b)
+static bool CompareByLastPaid(const CDeterministicMNCPtr& _a, const CDeterministicMNCPtr& _b)
 {
     return CompareByLastPaid(*_a, *_b);
 }
@@ -256,7 +256,7 @@ CDeterministicMNList CDeterministicMNList::ApplyDiff(const CDeterministicMNListD
     return result;
 }
 
-void CDeterministicMNList::AddMN(const CDeterministicMNCPtr &dmn)
+void CDeterministicMNList::AddMN(const CDeterministicMNCPtr& dmn)
 {
     assert(!mnMap.find(dmn->proTxHash));
     mnMap = mnMap.set(dmn->proTxHash, dmn);
@@ -266,7 +266,7 @@ void CDeterministicMNList::AddMN(const CDeterministicMNCPtr &dmn)
     AddUniqueProperty(dmn, dmn->pdmnState->pubKeyOperator);
 }
 
-void CDeterministicMNList::UpdateMN(const uint256 &proTxHash, const CDeterministicMNStateCPtr &pdmnState)
+void CDeterministicMNList::UpdateMN(const uint256& proTxHash, const CDeterministicMNStateCPtr& pdmnState)
 {
     auto oldDmn = mnMap.find(proTxHash);
     assert(oldDmn != nullptr);
@@ -320,7 +320,7 @@ bool CDeterministicMNManager::ProcessBlock(const CBlock& block, const CBlockInde
     if ((nHeight % SNAPSHOT_LIST_PERIOD) == 0) {
         evoDb.Write(std::make_pair(DB_LIST_SNAPSHOT, diff.blockHash), newList);
         LogPrintf("CDeterministicMNManager::%s -- Wrote snapshot. nHeight=%d, mapCurMNs.allMNsCount=%d\n",
-                  __func__, nHeight, newList.GetAllMNsCount());
+            __func__, nHeight, newList.GetAllMNsCount());
     }
 
     if (nHeight == GetSpork15Value()) {
@@ -382,7 +382,7 @@ bool CDeterministicMNManager::BuildNewListFromBlock(const CBlock& block, const C
                 newList.RemoveMN(dmn->proTxHash);
 
                 LogPrintf("CDeterministicMNManager::%s -- MN %s removed from list because collateral was spent. collateralOutpoint=%s, nHeight=%d, mapCurMNs.allMNsCount=%d\n",
-                          __func__, dmn->proTxHash.ToString(), dmn->collateralOutpoint.ToStringShort(), nHeight, newList.GetAllMNsCount());
+                    __func__, dmn->proTxHash.ToString(), dmn->collateralOutpoint.ToStringShort(), nHeight, newList.GetAllMNsCount());
             }
         }
 
@@ -432,7 +432,7 @@ bool CDeterministicMNManager::BuildNewListFromBlock(const CBlock& block, const C
             newList.AddMN(dmn);
 
             LogPrintf("CDeterministicMNManager::%s -- MN %s added at height %d: %s\n",
-                      __func__, tx.GetHash().ToString(), nHeight, proTx.ToString());
+                __func__, tx.GetHash().ToString(), nHeight, proTx.ToString());
         } else if (tx.nType == TRANSACTION_PROVIDER_UPDATE_SERVICE) {
             CProUpServTx proTx;
             if (!GetTxPayload(tx, proTx)) {
@@ -458,14 +458,14 @@ bool CDeterministicMNManager::BuildNewListFromBlock(const CBlock& block, const C
                     newState->nPoSeRevivedHeight = nHeight;
 
                     LogPrintf("CDeterministicMNManager::%s -- MN %s revived at height %d\n",
-                              __func__, proTx.proTxHash.ToString(), nHeight);
+                        __func__, proTx.proTxHash.ToString(), nHeight);
                 }
             }
 
             newList.UpdateMN(proTx.proTxHash, newState);
 
             LogPrintf("CDeterministicMNManager::%s -- MN %s updated at height %d: %s\n",
-                      __func__, proTx.proTxHash.ToString(), nHeight, proTx.ToString());
+                __func__, proTx.proTxHash.ToString(), nHeight, proTx.ToString());
         } else if (tx.nType == TRANSACTION_PROVIDER_UPDATE_REGISTRAR) {
             CProUpRegTx proTx;
             if (!GetTxPayload(tx, proTx)) {
@@ -489,7 +489,7 @@ bool CDeterministicMNManager::BuildNewListFromBlock(const CBlock& block, const C
             newList.UpdateMN(proTx.proTxHash, newState);
 
             LogPrintf("CDeterministicMNManager::%s -- MN %s updated at height %d: %s\n",
-                      __func__, proTx.proTxHash.ToString(), nHeight, proTx.ToString());
+                __func__, proTx.proTxHash.ToString(), nHeight, proTx.ToString());
         } else if (tx.nType == TRANSACTION_PROVIDER_UPDATE_REVOKE) {
             CProUpRevTx proTx;
             if (!GetTxPayload(tx, proTx)) {
@@ -508,7 +508,7 @@ bool CDeterministicMNManager::BuildNewListFromBlock(const CBlock& block, const C
             newList.UpdateMN(proTx.proTxHash, newState);
 
             LogPrintf("CDeterministicMNManager::%s -- MN %s revoked operator key at height %d: %s\n",
-                      __func__, proTx.proTxHash.ToString(), nHeight, proTx.ToString());
+                __func__, proTx.proTxHash.ToString(), nHeight, proTx.ToString());
         }
     }
 
@@ -538,7 +538,7 @@ CDeterministicMNList CDeterministicMNManager::GetListForBlock(const uint256& blo
     CDeterministicMNList snapshot;
     std::list<CDeterministicMNListDiff> listDiff;
 
-    while(true) {
+    while (true) {
         // try using cache before reading from disk
         it = mnListsCache.find(blockHashTmp);
         if (it != mnListsCache.end()) {
diff --git a/src/evo/deterministicmns.h b/src/evo/deterministicmns.h
index 09ba21d32296..719a1dad178b 100644
--- a/src/evo/deterministicmns.h
+++ b/src/evo/deterministicmns.h
@@ -5,11 +5,11 @@
 #ifndef DASH_DETERMINISTICMNS_H
 #define DASH_DETERMINISTICMNS_H
 
+#include "bls/bls.h"
+#include "dbwrapper.h"
 #include "evodb.h"
 #include "providertx.h"
-#include "dbwrapper.h"
 #include "sync.h"
-#include "bls/bls.h"
 
 #include "immer/map.hpp"
 #include "immer/map_transient.hpp"
@@ -47,8 +47,11 @@ class CDeterministicMNState
         addr = proTx.addr;
         scriptPayout = proTx.scriptPayout;
     }
-    template<typename Stream>
-    CDeterministicMNState(deserialize_type, Stream& s) { s >> *this;}
+    template <typename Stream>
+    CDeterministicMNState(deserialize_type, Stream& s)
+    {
+        s >> *this;
+    }
 
     ADD_SERIALIZE_METHODS;
 
@@ -115,8 +118,11 @@ class CDeterministicMN
 {
 public:
     CDeterministicMN() {}
-    template<typename Stream>
-    CDeterministicMN(deserialize_type, Stream& s) { s >> *this;}
+    template <typename Stream>
+    CDeterministicMN(deserialize_type, Stream& s)
+    {
+        s >> *this;
+    }
 
     uint256 proTxHash;
     COutPoint collateralOutpoint;
@@ -144,7 +150,7 @@ typedef std::shared_ptr<const CDeterministicMN> CDeterministicMNCPtr;
 
 class CDeterministicMNListDiff;
 
-template<typename Stream, typename K, typename T, typename Hash, typename Equal>
+template <typename Stream, typename K, typename T, typename Hash, typename Equal>
 void SerializeImmerMap(Stream& os, const immer::map<K, T, Hash, Equal>& m)
 {
     WriteCompactSize(os, m.size());
@@ -152,13 +158,12 @@ void SerializeImmerMap(Stream& os, const immer::map<K, T, Hash, Equal>& m)
         Serialize(os, (*mi));
 }
 
-template<typename Stream, typename K, typename T, typename Hash, typename Equal>
+template <typename Stream, typename K, typename T, typename Hash, typename Equal>
 void UnserializeImmerMap(Stream& is, immer::map<K, T, Hash, Equal>& m)
 {
     m = immer::map<K, T, Hash, Equal>();
     unsigned int nSize = ReadCompactSize(is);
-    for (unsigned int i = 0; i < nSize; i++)
-    {
+    for (unsigned int i = 0; i < nSize; i++) {
         std::pair<K, T> item;
         Unserialize(is, item);
         m = m.set(item.first, item.second);
@@ -169,7 +174,7 @@ class CDeterministicMNList
 {
 public:
     typedef immer::map<uint256, CDeterministicMNCPtr> MnMap;
-    typedef immer::map<uint256, std::pair<uint256, uint32_t>> MnUniquePropertyMap;
+    typedef immer::map<uint256, std::pair<uint256, uint32_t> > MnUniquePropertyMap;
 
 private:
     uint256 blockHash;
@@ -184,9 +189,10 @@ class CDeterministicMNList
 public:
     CDeterministicMNList() {}
     explicit CDeterministicMNList(const uint256& _blockHash, int _height) :
-            blockHash(_blockHash),
-            nHeight(_height)
-    {}
+        blockHash(_blockHash),
+        nHeight(_height)
+    {
+    }
 
     ADD_SERIALIZE_METHODS;
 
@@ -205,7 +211,6 @@ class CDeterministicMNList
     }
 
 public:
-
     size_t GetAllMNsCount() const
     {
         return mnMap.size();
@@ -222,8 +227,9 @@ class CDeterministicMNList
         return count;
     }
 
-    template<typename Callback>
-    void ForEachMN(bool onlyValid, Callback&& cb) const {
+    template <typename Callback>
+    void ForEachMN(bool onlyValid, Callback&& cb) const
+    {
         for (const auto& p : mnMap) {
             if (!onlyValid || IsMNValid(p.second)) {
                 cb(p.second);
@@ -254,7 +260,8 @@ class CDeterministicMNList
     bool IsMNValid(const CDeterministicMNCPtr& dmn) const;
     bool IsMNPoSeBanned(const CDeterministicMNCPtr& dmn) const;
 
-    bool HasMN(const uint256& proTxHash) const {
+    bool HasMN(const uint256& proTxHash) const
+    {
         return GetMN(proTxHash) != nullptr;
     }
     CDeterministicMNCPtr GetMN(const uint256& proTxHash) const;
@@ -274,16 +281,16 @@ class CDeterministicMNList
     CDeterministicMNListDiff BuildDiff(const CDeterministicMNList& to) const;
     CDeterministicMNList ApplyDiff(const CDeterministicMNListDiff& diff) const;
 
-    void AddMN(const CDeterministicMNCPtr &dmn);
-    void UpdateMN(const uint256 &proTxHash, const CDeterministicMNStateCPtr &pdmnState);
+    void AddMN(const CDeterministicMNCPtr& dmn);
+    void UpdateMN(const uint256& proTxHash, const CDeterministicMNStateCPtr& pdmnState);
     void RemoveMN(const uint256& proTxHash);
 
-    template<typename T>
+    template <typename T>
     bool HasUniqueProperty(const T& v) const
     {
         return mnUniquePropertyMap.count(::SerializeHash(v)) != 0;
     }
-    template<typename T>
+    template <typename T>
     CDeterministicMNCPtr GetUniquePropertyMN(const T& v) const
     {
         auto p = mnUniquePropertyMap.find(::SerializeHash(v));
@@ -294,7 +301,7 @@ class CDeterministicMNList
     }
 
 private:
-    template<typename T>
+    template <typename T>
     void AddUniqueProperty(const CDeterministicMNCPtr& dmn, const T& v)
     {
         auto hash = ::SerializeHash(v);
@@ -306,7 +313,7 @@ class CDeterministicMNList
         }
         mnUniquePropertyMap = mnUniquePropertyMap.set(hash, newEntry);
     }
-    template<typename T>
+    template <typename T>
     void DeleteUniqueProperty(const CDeterministicMNCPtr& dmn, const T& oldValue)
     {
         auto oldHash = ::SerializeHash(oldValue);
@@ -318,7 +325,7 @@ class CDeterministicMNList
             mnUniquePropertyMap = mnUniquePropertyMap.set(oldHash, std::make_pair(dmn->proTxHash, p->second - 1));
         }
     }
-    template<typename T>
+    template <typename T>
     void UpdateUniqueProperty(const CDeterministicMNCPtr& dmn, const T& oldValue, const T& newValue)
     {
         if (oldValue == newValue) {
@@ -381,7 +388,7 @@ class CDeterministicMNManager
     bool ProcessBlock(const CBlock& block, const CBlockIndex* pindexPrev, CValidationState& state);
     bool UndoBlock(const CBlock& block, const CBlockIndex* pindex);
 
-    void UpdatedBlockTip(const CBlockIndex *pindex);
+    void UpdatedBlockTip(const CBlockIndex* pindex);
 
     // the returned list will not contain the correct block hash (we can't know it yet as the coinbase TX is not updated yet)
     bool BuildNewListFromBlock(const CBlock& block, const CBlockIndex* pindexPrev, CValidationState& state, CDeterministicMNList& mnListRet);
@@ -405,4 +412,4 @@ class CDeterministicMNManager
 
 extern CDeterministicMNManager* deterministicMNManager;
 
-#endif//DASH_DETERMINISTICMNS_H
+#endif //DASH_DETERMINISTICMNS_H
diff --git a/src/evo/evodb.cpp b/src/evo/evodb.cpp
index 5b91c3d2b3f4..755579f2753f 100644
--- a/src/evo/evodb.cpp
+++ b/src/evo/evodb.cpp
@@ -7,7 +7,7 @@
 CEvoDB* evoDb;
 
 CEvoDB::CEvoDB(size_t nCacheSize, bool fMemory, bool fWipe) :
-        db(fMemory ? "" : (GetDataDir() / "evodb"), nCacheSize, fMemory, fWipe),
-        dbTransaction(db)
+    db(fMemory ? "" : (GetDataDir() / "evodb"), nCacheSize, fMemory, fWipe),
+    dbTransaction(db)
 {
 }
diff --git a/src/evo/evodb.h b/src/evo/evodb.h
index a830513e5078..0bdcc5a27eb4 100644
--- a/src/evo/evodb.h
+++ b/src/evo/evodb.h
@@ -25,14 +25,14 @@ class CEvoDB
         return t;
     }
 
-    template<typename K, typename V>
+    template <typename K, typename V>
     bool Read(const K& key, V& value)
     {
         LOCK(cs);
         return dbTransaction.Read(key, value);
     }
 
-    template<typename K, typename V>
+    template <typename K, typename V>
     void Write(const K& key, const V& value)
     {
         LOCK(cs);
@@ -61,4 +61,4 @@ class CEvoDB
 
 extern CEvoDB* evoDb;
 
-#endif//DASH_EVODB_H
+#endif //DASH_EVODB_H
diff --git a/src/evo/providertx.cpp b/src/evo/providertx.cpp
index b0f1b0e5f9d8..abf3afce9656 100644
--- a/src/evo/providertx.cpp
+++ b/src/evo/providertx.cpp
@@ -2,20 +2,20 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
+#include "deterministicmns.h"
 #include "providertx.h"
 #include "specialtx.h"
-#include "deterministicmns.h"
 
-#include "hash.h"
-#include "clientversion.h"
-#include "streams.h"
-#include "messagesigner.h"
+#include "base58.h"
 #include "chainparams.h"
-#include "validation.h"
-#include "univalue.h"
+#include "clientversion.h"
 #include "core_io.h"
+#include "hash.h"
+#include "messagesigner.h"
 #include "script/standard.h"
-#include "base58.h"
+#include "streams.h"
+#include "univalue.h"
+#include "validation.h"
 
 template <typename ProTx>
 static bool CheckService(const uint256& proTxHash, const ProTx& proTx, const CBlockIndex* pindexPrev, CValidationState& state)
@@ -55,7 +55,7 @@ template <typename ProTx>
 static bool CheckStringSig(const ProTx& proTx, const CKeyID& keyID, CValidationState& state)
 {
     std::string strError;
-    if (!CMessageSigner::VerifyMessage(keyID, proTx.vchSig,  proTx.MakeSignString(), strError)) {
+    if (!CMessageSigner::VerifyMessage(keyID, proTx.vchSig, proTx.MakeSignString(), strError)) {
         return state.DoS(100, false, REJECT_INVALID, "bad-protx-sig", false, strError);
     }
     return true;
@@ -71,7 +71,7 @@ static bool CheckHashSig(const ProTx& proTx, const CBLSPublicKey& pubKey, CValid
 }
 
 template <typename ProTx>
-static bool CheckInputsHash(const CTransaction &tx, const ProTx& proTx, CValidationState& state)
+static bool CheckInputsHash(const CTransaction& tx, const ProTx& proTx, CValidationState& state)
 {
     uint256 inputsHash = CalcTxInputsHash(tx);
     if (inputsHash != proTx.inputsHash) {
@@ -427,7 +427,7 @@ std::string CProUpServTx::ToString() const
     }
 
     return strprintf("CProUpServTx(nVersion=%d, proTxHash=%s, addr=%s, operatorPayoutAddress=%s)",
-                     nVersion, proTxHash.ToString(), addr.ToString(), payee);
+        nVersion, proTxHash.ToString(), addr.ToString(), payee);
 }
 
 void CProUpServTx::ToJson(UniValue& obj) const
@@ -454,7 +454,7 @@ std::string CProUpRegTx::ToString() const
     }
 
     return strprintf("CProUpRegTx(nVersion=%d, proTxHash=%s, pubKeyOperator=%s, keyIDVoting=%s, payoutAddress=%s)",
-                     nVersion, proTxHash.ToString(), pubKeyOperator.ToString(), keyIDVoting.ToString(), payee);
+        nVersion, proTxHash.ToString(), pubKeyOperator.ToString(), keyIDVoting.ToString(), payee);
 }
 
 void CProUpRegTx::ToJson(UniValue& obj) const
@@ -476,7 +476,7 @@ void CProUpRegTx::ToJson(UniValue& obj) const
 std::string CProUpRevTx::ToString() const
 {
     return strprintf("CProUpRevTx(nVersion=%d, proTxHash=%s, nReason=%d)",
-                     nVersion, proTxHash.ToString(), nReason);
+        nVersion, proTxHash.ToString(), nReason);
 }
 
 void CProUpRevTx::ToJson(UniValue& obj) const
diff --git a/src/evo/providertx.h b/src/evo/providertx.h
index e105f2c9547b..bb5c0f18ebc0 100644
--- a/src/evo/providertx.h
+++ b/src/evo/providertx.h
@@ -5,9 +5,9 @@
 #ifndef DASH_PROVIDERTX_H
 #define DASH_PROVIDERTX_H
 
-#include "primitives/transaction.h"
-#include "consensus/validation.h"
 #include "bls/bls.h"
+#include "consensus/validation.h"
+#include "primitives/transaction.h"
 
 #include "netaddress.h"
 #include "pubkey.h"
@@ -21,9 +21,9 @@ class CProRegTx
     static const uint16_t CURRENT_VERSION = 1;
 
 public:
-    uint16_t nVersion{CURRENT_VERSION}; // message version
-    uint16_t nType{0}; // only 0 supported for now
-    uint16_t nMode{0}; // only 0 supported for now
+    uint16_t nVersion{CURRENT_VERSION};                    // message version
+    uint16_t nType{0};                                     // only 0 supported for now
+    uint16_t nMode{0};                                     // only 0 supported for now
     COutPoint collateralOutpoint{uint256(), (uint32_t)-1}; // if hash is null, we refer to a ProRegTx output
     CService addr;
     CKeyID keyIDOwner;
@@ -183,4 +183,4 @@ bool CheckProUpServTx(const CTransaction& tx, const CBlockIndex* pindexPrev, CVa
 bool CheckProUpRegTx(const CTransaction& tx, const CBlockIndex* pindexPrev, CValidationState& state);
 bool CheckProUpRevTx(const CTransaction& tx, const CBlockIndex* pindexPrev, CValidationState& state);
 
-#endif//DASH_PROVIDERTX_H
+#endif //DASH_PROVIDERTX_H
diff --git a/src/evo/simplifiedmns.cpp b/src/evo/simplifiedmns.cpp
index febdefef5832..16e7b49f63e9 100644
--- a/src/evo/simplifiedmns.cpp
+++ b/src/evo/simplifiedmns.cpp
@@ -1,17 +1,17 @@
-// Copyright (c) 2017 The Dash Core developers
+// Copyright (c) 2017-2018 The Dash Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
+#include "cbtx.h"
 #include "core_io.h"
+#include "deterministicmns.h"
 #include "simplifiedmns.h"
 #include "specialtx.h"
-#include "deterministicmns.h"
-#include "cbtx.h"
 
-#include "validation.h"
-#include "univalue.h"
-#include "consensus/merkle.h"
 #include "chainparams.h"
+#include "consensus/merkle.h"
+#include "univalue.h"
+#include "validation.h"
 
 CSimplifiedMNListEntry::CSimplifiedMNListEntry(const CDeterministicMN& dmn) :
     proRegTxHash(dmn.proTxHash),
@@ -68,7 +68,7 @@ CSimplifiedMNList::CSimplifiedMNList(const CDeterministicMNList& dmnList)
     });
 }
 
-uint256 CSimplifiedMNList::CalcMerkleRoot(bool *pmutated) const
+uint256 CSimplifiedMNList::CalcMerkleRoot(bool* pmutated) const
 {
     std::vector<uint256> leaves;
     leaves.reserve(mnList.size());
diff --git a/src/evo/simplifiedmns.h b/src/evo/simplifiedmns.h
index 31abaeec001a..0a95a344f07b 100644
--- a/src/evo/simplifiedmns.h
+++ b/src/evo/simplifiedmns.h
@@ -1,15 +1,15 @@
-// Copyright (c) 2017 The Dash Core developers
+// Copyright (c) 2017-2018 The Dash Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #ifndef DASH_SIMPLIFIEDMNS_H
 #define DASH_SIMPLIFIEDMNS_H
 
-#include "serialize.h"
-#include "pubkey.h"
-#include "netaddress.h"
-#include "merkleblock.h"
 #include "bls/bls.h"
+#include "merkleblock.h"
+#include "netaddress.h"
+#include "pubkey.h"
+#include "serialize.h"
 
 class UniValue;
 class CDeterministicMNList;
@@ -58,7 +58,7 @@ class CSimplifiedMNList
     CSimplifiedMNList(const std::vector<CSimplifiedMNListEntry>& smlEntries);
     CSimplifiedMNList(const CDeterministicMNList& dmnList);
 
-    uint256 CalcMerkleRoot(bool *pmutated = NULL) const;
+    uint256 CalcMerkleRoot(bool* pmutated = NULL) const;
 };
 
 /// P2P messages
@@ -110,4 +110,4 @@ class CSimplifiedMNListDiff
 
 bool BuildSimplifiedMNListDiff(const uint256& baseBlockHash, const uint256& blockHash, CSimplifiedMNListDiff& mnListDiffRet, std::string& errorRet);
 
-#endif//DASH_SIMPLIFIEDMNS_H
+#endif //DASH_SIMPLIFIEDMNS_H
diff --git a/src/evo/specialtx.cpp b/src/evo/specialtx.cpp
index 149a51908bda..f73e72c61627 100644
--- a/src/evo/specialtx.cpp
+++ b/src/evo/specialtx.cpp
@@ -2,17 +2,17 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include "primitives/transaction.h"
-#include "primitives/block.h"
+#include "chainparams.h"
+#include "clientversion.h"
 #include "consensus/validation.h"
 #include "hash.h"
-#include "clientversion.h"
+#include "primitives/block.h"
+#include "primitives/transaction.h"
 #include "validation.h"
-#include "chainparams.h"
 
-#include "specialtx.h"
-#include "deterministicmns.h"
 #include "cbtx.h"
+#include "deterministicmns.h"
+#include "specialtx.h"
 
 bool CheckSpecialTx(const CTransaction& tx, const CBlockIndex* pindexPrev, CValidationState& state)
 {
@@ -26,16 +26,16 @@ bool CheckSpecialTx(const CTransaction& tx, const CBlockIndex* pindexPrev, CVali
     }
 
     switch (tx.nType) {
-        case TRANSACTION_PROVIDER_REGISTER:
-            return CheckProRegTx(tx, pindexPrev, state);
-        case TRANSACTION_PROVIDER_UPDATE_SERVICE:
-            return CheckProUpServTx(tx, pindexPrev, state);
-        case TRANSACTION_PROVIDER_UPDATE_REGISTRAR:
-            return CheckProUpRegTx(tx, pindexPrev, state);
-        case TRANSACTION_PROVIDER_UPDATE_REVOKE:
-            return CheckProUpRevTx(tx, pindexPrev, state);
-        case TRANSACTION_COINBASE:
-            return CheckCbTx(tx, pindexPrev, state);
+    case TRANSACTION_PROVIDER_REGISTER:
+        return CheckProRegTx(tx, pindexPrev, state);
+    case TRANSACTION_PROVIDER_UPDATE_SERVICE:
+        return CheckProUpServTx(tx, pindexPrev, state);
+    case TRANSACTION_PROVIDER_UPDATE_REGISTRAR:
+        return CheckProUpRegTx(tx, pindexPrev, state);
+    case TRANSACTION_PROVIDER_UPDATE_REVOKE:
+        return CheckProUpRevTx(tx, pindexPrev, state);
+    case TRANSACTION_COINBASE:
+        return CheckCbTx(tx, pindexPrev, state);
     }
 
     return state.DoS(10, false, REJECT_INVALID, "bad-tx-type");
@@ -48,13 +48,13 @@ bool ProcessSpecialTx(const CTransaction& tx, const CBlockIndex* pindex, CValida
     }
 
     switch (tx.nType) {
-        case TRANSACTION_PROVIDER_REGISTER:
-        case TRANSACTION_PROVIDER_UPDATE_SERVICE:
-        case TRANSACTION_PROVIDER_UPDATE_REGISTRAR:
-        case TRANSACTION_PROVIDER_UPDATE_REVOKE:
-            return true; // handled in batches per block
-        case TRANSACTION_COINBASE:
-            return true; // nothing to do
+    case TRANSACTION_PROVIDER_REGISTER:
+    case TRANSACTION_PROVIDER_UPDATE_SERVICE:
+    case TRANSACTION_PROVIDER_UPDATE_REGISTRAR:
+    case TRANSACTION_PROVIDER_UPDATE_REVOKE:
+        return true; // handled in batches per block
+    case TRANSACTION_COINBASE:
+        return true; // nothing to do
     }
 
     return state.DoS(100, false, REJECT_INVALID, "bad-tx-type");
@@ -67,13 +67,13 @@ bool UndoSpecialTx(const CTransaction& tx, const CBlockIndex* pindex)
     }
 
     switch (tx.nType) {
-        case TRANSACTION_PROVIDER_REGISTER:
-        case TRANSACTION_PROVIDER_UPDATE_SERVICE:
-        case TRANSACTION_PROVIDER_UPDATE_REGISTRAR:
-        case TRANSACTION_PROVIDER_UPDATE_REVOKE:
-            return true; // handled in batches per block
-        case TRANSACTION_COINBASE:
-            return true; // nothing to do
+    case TRANSACTION_PROVIDER_REGISTER:
+    case TRANSACTION_PROVIDER_UPDATE_SERVICE:
+    case TRANSACTION_PROVIDER_UPDATE_REGISTRAR:
+    case TRANSACTION_PROVIDER_UPDATE_REVOKE:
+        return true; // handled in batches per block
+    case TRANSACTION_COINBASE:
+        return true; // nothing to do
     }
 
     return false;
diff --git a/src/evo/specialtx.h b/src/evo/specialtx.h
index 2d900da534c7..9eb49ea02017 100644
--- a/src/evo/specialtx.h
+++ b/src/evo/specialtx.h
@@ -5,9 +5,9 @@
 #ifndef DASH_SPECIALTX_H
 #define DASH_SPECIALTX_H
 
+#include "primitives/transaction.h"
 #include "streams.h"
 #include "version.h"
-#include "primitives/transaction.h"
 
 class CBlock;
 class CBlockIndex;
@@ -49,4 +49,4 @@ void SetTxPayload(CMutableTransaction& tx, const T& payload)
 
 uint256 CalcTxInputsHash(const CTransaction& tx);
 
-#endif//DASH_SPECIALTX_H
+#endif //DASH_SPECIALTX_H

From e961c71343df01e4f856da84d485a42bfce4fb25 Mon Sep 17 00:00:00 2001
From: UdjinM6 <UdjinM6@users.noreply.github.com>
Date: Wed, 7 Nov 2018 10:39:06 +0300
Subject: [PATCH 248/400] Translations 201811 (#2249)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* update en source

* remove pt_BR

it's no longer present on Transifex

* Update existing translations

NOTE: there are some mismatches in zh_CN

dash_zh_CN.ts: Mismatch between 'Start &all' and '启动全部(%A)'
dash_zh_CN.ts: Mismatch between 'Open the %1 debug log file from the current data directory. This can take a few seconds for large log files.' and '打开当前目录中的调试日志文件。日志文件大的话可能要等上几秒钟。'
dash_zh_CN.ts: Mismatch between 'Too many %f denominations, removing.' and '太多面额化资金，正在移除。'
dash_zh_CN.ts: Mismatch between 'Initialization sanity check failed. %s is shutting down.' and '初始化完整性检查失败。% 即将关闭。'

* Add ar, ko, th

NOTE: there are 2 mismatches in ar

dash_ar.ts: Mismatch between '(of %1 GB needed)' and '(على 1% جيغابايت محتاجة)'
dash_ar.ts: Mismatch between 'Output debugging information (default: %u, supplying <category> is optional)' and 'معلومات تصحيح الخرج  <category>ا(ختياري)'

* update bg, it, ja, ko, nl, pl, th

* fix ru

* add tr

* fix
---
 src/Makefile.qt.include                     |    5 +-
 src/qt/dash_locale.qrc                      |    4 +
 src/qt/dashstrings.cpp                      |   24 +-
 src/qt/locale/dash_ar.ts                    | 5253 ++++++++++++++++++
 src/qt/locale/dash_bg.ts                    |  133 +-
 src/qt/locale/dash_de.ts                    |   86 +-
 src/qt/locale/dash_en.ts                    |  310 +-
 src/qt/locale/dash_es.ts                    |  513 +-
 src/qt/locale/dash_fi.ts                    |   85 +-
 src/qt/locale/dash_fr.ts                    |   95 +-
 src/qt/locale/dash_it.ts                    |  136 +-
 src/qt/locale/dash_ja.ts                    | 4923 ++++++++++++-----
 src/qt/locale/dash_ko.ts                    | 5329 +++++++++++++++++++
 src/qt/locale/dash_nl.ts                    |  137 +-
 src/qt/locale/dash_pl.ts                    |  135 +-
 src/qt/locale/dash_pt.ts                    | 3898 ++++++++------
 src/qt/locale/dash_ru.ts                    |  143 +-
 src/qt/locale/dash_sk.ts                    |  147 +-
 src/qt/locale/dash_th.ts                    | 5329 +++++++++++++++++++
 src/qt/locale/{dash_pt_BR.ts => dash_tr.ts} | 2705 +++++-----
 src/qt/locale/dash_vi.ts                    |   85 +-
 src/qt/locale/dash_zh_CN.ts                 |   85 +-
 src/qt/locale/dash_zh_TW.ts                 |   83 -
 23 files changed, 23983 insertions(+), 5660 deletions(-)
 create mode 100644 src/qt/locale/dash_ar.ts
 create mode 100644 src/qt/locale/dash_ko.ts
 create mode 100644 src/qt/locale/dash_th.ts
 rename src/qt/locale/{dash_pt_BR.ts => dash_tr.ts} (51%)

diff --git a/src/Makefile.qt.include b/src/Makefile.qt.include
index c81768d1128d..a31cad006b5a 100644
--- a/src/Makefile.qt.include
+++ b/src/Makefile.qt.include
@@ -8,6 +8,7 @@ EXTRA_LIBRARIES += qt/libdashqt.a
 
 # dash qt core #
 QT_TS = \
+  qt/locale/dash_ar.ts \
   qt/locale/dash_bg.ts \
   qt/locale/dash_de.ts \
   qt/locale/dash_en.ts \
@@ -16,13 +17,15 @@ QT_TS = \
   qt/locale/dash_fr.ts \
   qt/locale/dash_it.ts \
   qt/locale/dash_ja.ts \
+  qt/locale/dash_ko.ts \
   qt/locale/dash_nl.ts \
   qt/locale/dash_pl.ts \
   qt/locale/dash_pt.ts \
-  qt/locale/dash_pt_BR.ts \
   qt/locale/dash_ru.ts \
   qt/locale/dash_sk.ts \
   qt/locale/dash_sv.ts \
+  qt/locale/dash_th.ts \
+  qt/locale/dash_tr.ts \
   qt/locale/dash_vi.ts \
   qt/locale/dash_zh_CN.ts \
   qt/locale/dash_zh_TW.ts
diff --git a/src/qt/dash_locale.qrc b/src/qt/dash_locale.qrc
index 542d2059d9a9..91ccd5100092 100644
--- a/src/qt/dash_locale.qrc
+++ b/src/qt/dash_locale.qrc
@@ -1,5 +1,6 @@
 <!DOCTYPE RCC><RCC version="1.0">
     <qresource prefix="/translations">
+        <file alias="ar">locale/dash_ar.qm</file>
         <file alias="bg">locale/dash_bg.qm</file>
         <file alias="de">locale/dash_de.qm</file>
         <file alias="en">locale/dash_en.qm</file>
@@ -8,12 +9,15 @@
         <file alias="fr">locale/dash_fr.qm</file>
         <file alias="it">locale/dash_it.qm</file>
         <file alias="ja">locale/dash_ja.qm</file>
+        <file alias="ko">locale/dash_ko.qm</file>
         <file alias="nl">locale/dash_nl.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="sk">locale/dash_sk.qm</file>
         <file alias="sv">locale/dash_sv.qm</file>
+        <file alias="th">locale/dash_th.qm</file>
+        <file alias="tr">locale/dash_tr.qm</file>
         <file alias="vi">locale/dash_vi.qm</file>
         <file alias="zh_CN">locale/dash_zh_CN.qm</file>
         <file alias="zh_TW">locale/dash_zh_TW.qm</file>
diff --git a/src/qt/dashstrings.cpp b/src/qt/dashstrings.cpp
index ac3318ba33af..7fe00c06893d 100644
--- a/src/qt/dashstrings.cpp
+++ b/src/qt/dashstrings.cpp
@@ -12,6 +12,9 @@ static const char UNUSED *dash_strings[] = {
 QT_TRANSLATE_NOOP("dash-core", "Dash Core"),
 QT_TRANSLATE_NOOP("dash-core", "The %s developers"),
 QT_TRANSLATE_NOOP("dash-core", ""
+"%s file contains all private keys from this wallet. Do not share it with "
+"anyone!"),
+QT_TRANSLATE_NOOP("dash-core", ""
 "(1 = keep tx meta data e.g. account owner and payment request information, 2 "
 "= drop tx meta data)"),
 QT_TRANSLATE_NOOP("dash-core", ""
@@ -91,6 +94,9 @@ QT_TRANSLATE_NOOP("dash-core", ""
 "Execute command when the best block changes (%s in cmd is replaced by block "
 "hash)"),
 QT_TRANSLATE_NOOP("dash-core", ""
+"Extra transactions to keep in memory for compact block reconstructions "
+"(default: %u)"),
+QT_TRANSLATE_NOOP("dash-core", ""
 "Failed to create backup, file already exists! This could happen if you "
 "restarted wallet in less than 60 seconds. You can continue if you are ok "
 "with this."),
@@ -212,9 +218,6 @@ QT_TRANSLATE_NOOP("dash-core", ""
 "Set the number of script verification threads (%u to %d, 0 = auto, <0 = "
 "leave that many cores free, default: %d)"),
 QT_TRANSLATE_NOOP("dash-core", ""
-"Show N confirmations for a successfully locked transaction (%u-%u, default: "
-"%u)"),
-QT_TRANSLATE_NOOP("dash-core", ""
 "Specify full path to directory for automatic wallet backups (must exist)"),
 QT_TRANSLATE_NOOP("dash-core", ""
 "Support filtering of blocks and transaction with bloom filters (default: %u)"),
@@ -238,6 +241,9 @@ QT_TRANSLATE_NOOP("dash-core", ""
 "Total length of network version string (%i) exceeds maximum length (%i). "
 "Reduce the number or size of uacomments."),
 QT_TRANSLATE_NOOP("dash-core", ""
+"Transaction index can't be disabled in full mode. Either start with -"
+"litemode command line switch or enable transaction index."),
+QT_TRANSLATE_NOOP("dash-core", ""
 "Tries to keep outbound traffic under the given target (in MiB per 24h), 0 = "
 "no limit (default: %d)"),
 QT_TRANSLATE_NOOP("dash-core", ""
@@ -312,6 +318,8 @@ QT_TRANSLATE_NOOP("dash-core", ""
 "Whitelisted peers cannot be DoS banned and their transactions are always "
 "relayed, even if they are already in the mempool, useful e.g. for a gateway"),
 QT_TRANSLATE_NOOP("dash-core", ""
+"You are starting in lite mode, all Dash-specific functionality is disabled."),
+QT_TRANSLATE_NOOP("dash-core", ""
 "You must specify a masternodeprivkey in the configuration. Please see "
 "documentation for help."),
 QT_TRANSLATE_NOOP("dash-core", ""
@@ -366,6 +374,8 @@ QT_TRANSLATE_NOOP("dash-core", "Do you want to rebuild the block database now?")
 QT_TRANSLATE_NOOP("dash-core", "Done loading"),
 QT_TRANSLATE_NOOP("dash-core", "ERROR! Failed to create automatic backup"),
 QT_TRANSLATE_NOOP("dash-core", "Enable publish hash block in <address>"),
+QT_TRANSLATE_NOOP("dash-core", "Enable publish hash of governance objects (like proposals) in <address>"),
+QT_TRANSLATE_NOOP("dash-core", "Enable publish hash of governance votes in <address>"),
 QT_TRANSLATE_NOOP("dash-core", "Enable publish hash transaction (locked via InstantSend) in <address>"),
 QT_TRANSLATE_NOOP("dash-core", "Enable publish hash transaction in <address>"),
 QT_TRANSLATE_NOOP("dash-core", "Enable publish raw block in <address>"),
@@ -393,10 +403,12 @@ QT_TRANSLATE_NOOP("dash-core", "Failed to create backup, error: %s"),
 QT_TRANSLATE_NOOP("dash-core", "Failed to delete backup, error: %s"),
 QT_TRANSLATE_NOOP("dash-core", "Failed to find mixing queue to join"),
 QT_TRANSLATE_NOOP("dash-core", "Failed to listen on any port. Use -listen=0 if you want this."),
+QT_TRANSLATE_NOOP("dash-core", "Failed to load InstantSend data cache from"),
 QT_TRANSLATE_NOOP("dash-core", "Failed to load fulfilled requests cache from"),
 QT_TRANSLATE_NOOP("dash-core", "Failed to load governance cache from"),
 QT_TRANSLATE_NOOP("dash-core", "Failed to load masternode cache from"),
 QT_TRANSLATE_NOOP("dash-core", "Failed to load masternode payments cache from"),
+QT_TRANSLATE_NOOP("dash-core", "Failed to load sporks cache from"),
 QT_TRANSLATE_NOOP("dash-core", "Failed to parse host:port string"),
 QT_TRANSLATE_NOOP("dash-core", "Failed to start a new mixing queue"),
 QT_TRANSLATE_NOOP("dash-core", "Fee (in %s/kB) to add to transactions you send (default: %s)"),
@@ -419,6 +431,7 @@ QT_TRANSLATE_NOOP("dash-core", "Invalid -proxy address: '%s'"),
 QT_TRANSLATE_NOOP("dash-core", "Invalid amount for -%s=<amount>: '%s'"),
 QT_TRANSLATE_NOOP("dash-core", "Invalid amount for -fallbackfee=<amount>: '%s'"),
 QT_TRANSLATE_NOOP("dash-core", "Invalid amount for -paytxfee=<amount>: '%s' (must be at least %s)"),
+QT_TRANSLATE_NOOP("dash-core", "Invalid input count."),
 QT_TRANSLATE_NOOP("dash-core", "Invalid masternodeprivkey. Please see documenation."),
 QT_TRANSLATE_NOOP("dash-core", "Invalid netmask specified in -whitelist: '%s'"),
 QT_TRANSLATE_NOOP("dash-core", "Invalid port detected in masternode.conf"),
@@ -435,6 +448,7 @@ QT_TRANSLATE_NOOP("dash-core", "Last successful PrivateSend action was too recen
 QT_TRANSLATE_NOOP("dash-core", "Line: %d"),
 QT_TRANSLATE_NOOP("dash-core", "Listen for JSON-RPC connections on <port> (default: %u or testnet: %u)"),
 QT_TRANSLATE_NOOP("dash-core", "Listen for connections on <port> (default: %u or testnet: %u)"),
+QT_TRANSLATE_NOOP("dash-core", "Loading InstantSend data cache..."),
 QT_TRANSLATE_NOOP("dash-core", "Loading addresses..."),
 QT_TRANSLATE_NOOP("dash-core", "Loading banlist..."),
 QT_TRANSLATE_NOOP("dash-core", "Loading block index..."),
@@ -442,6 +456,7 @@ QT_TRANSLATE_NOOP("dash-core", "Loading fulfilled requests cache..."),
 QT_TRANSLATE_NOOP("dash-core", "Loading governance cache..."),
 QT_TRANSLATE_NOOP("dash-core", "Loading masternode cache..."),
 QT_TRANSLATE_NOOP("dash-core", "Loading masternode payment cache..."),
+QT_TRANSLATE_NOOP("dash-core", "Loading sporks cache..."),
 QT_TRANSLATE_NOOP("dash-core", "Loading wallet... (%3.2f %%)"),
 QT_TRANSLATE_NOOP("dash-core", "Loading wallet..."),
 QT_TRANSLATE_NOOP("dash-core", "Location of the auth cookie (default: data dir)"),
@@ -545,6 +560,7 @@ QT_TRANSLATE_NOOP("dash-core", "Transaction has too long of a mempool chain"),
 QT_TRANSLATE_NOOP("dash-core", "Transaction must have at least one recipient"),
 QT_TRANSLATE_NOOP("dash-core", "Transaction not valid."),
 QT_TRANSLATE_NOOP("dash-core", "Transaction too large for fee policy"),
+QT_TRANSLATE_NOOP("dash-core", "Transaction too large"),
 QT_TRANSLATE_NOOP("dash-core", "Trying to connect..."),
 QT_TRANSLATE_NOOP("dash-core", "Unable to bind to %s on this computer (bind returned error %s)"),
 QT_TRANSLATE_NOOP("dash-core", "Unable to bind to %s on this computer. %s is probably already running."),
@@ -570,6 +586,7 @@ QT_TRANSLATE_NOOP("dash-core", "Very low number of keys left: %d"),
 QT_TRANSLATE_NOOP("dash-core", "Wallet %s resides outside data directory %s"),
 QT_TRANSLATE_NOOP("dash-core", "Wallet debugging/testing options:"),
 QT_TRANSLATE_NOOP("dash-core", "Wallet is locked."),
+QT_TRANSLATE_NOOP("dash-core", "Wallet is not initialized"),
 QT_TRANSLATE_NOOP("dash-core", "Wallet needed to be rewritten: restart %s to complete"),
 QT_TRANSLATE_NOOP("dash-core", "Wallet options:"),
 QT_TRANSLATE_NOOP("dash-core", "Wallet window title"),
@@ -578,6 +595,7 @@ QT_TRANSLATE_NOOP("dash-core", "Warning: unknown new rules activated (versionbit
 QT_TRANSLATE_NOOP("dash-core", "Wasn't able to create wallet backup folder %s!"),
 QT_TRANSLATE_NOOP("dash-core", "Whether to operate in a blocks only mode (default: %u)"),
 QT_TRANSLATE_NOOP("dash-core", "Will retry..."),
+QT_TRANSLATE_NOOP("dash-core", "You can not start a masternode in lite mode."),
 QT_TRANSLATE_NOOP("dash-core", "Your entries added successfully."),
 QT_TRANSLATE_NOOP("dash-core", "Your transaction was accepted into the pool!"),
 QT_TRANSLATE_NOOP("dash-core", "Zapping all transactions from wallet..."),
diff --git a/src/qt/locale/dash_ar.ts b/src/qt/locale/dash_ar.ts
new file mode 100644
index 000000000000..5f588b8305f1
--- /dev/null
+++ b/src/qt/locale/dash_ar.ts
@@ -0,0 +1,5253 @@
+<TS language="ar" version="2.1">
+<context>
+    <name>AddressBookPage</name>
+    <message>
+        <source>Right-click to edit address or label</source>
+        <translation>انقر بالزر الايمن لتعديل العنوان </translation>
+    </message>
+    <message>
+        <source>Create a new address</source>
+        <translation>انشاء عنوان جديد </translation>
+    </message>
+    <message>
+        <source>&amp;New</source>
+        <translation>جديد </translation>
+    </message>
+    <message>
+        <source>Copy the currently selected address to the system clipboard</source>
+        <translation>قم بنسخ العنوان المختار لحافظة النظام </translation>
+    </message>
+    <message>
+        <source>&amp;Copy</source>
+        <translation>نسخ </translation>
+    </message>
+    <message>
+        <source>Delete the currently selected address from the list</source>
+        <translation>حذف العنوان المحدد من القائمة </translation>
+    </message>
+    <message>
+        <source>&amp;Delete</source>
+        <translation>حذف </translation>
+    </message>
+    <message>
+        <source>Export the data in the current tab to a file</source>
+        <translation>تحميل البيانات في علامة التبويب الحالية إلى ملف </translation>
+    </message>
+    <message>
+        <source>&amp;Export</source>
+        <translation>تصدير </translation>
+    </message>
+    <message>
+        <source>C&amp;lose</source>
+        <translation>غلق </translation>
+    </message>
+    <message>
+        <source>Choose the address to send coins to</source>
+        <translation>اختر العنوان الذي سترسل له العملات </translation>
+    </message>
+    <message>
+        <source>Choose the address to receive coins with</source>
+        <translation>اختر العنوان الذي تستقبل عليه العملات </translation>
+    </message>
+    <message>
+        <source>C&amp;hoose</source>
+        <translation>اختر </translation>
+    </message>
+    <message>
+        <source>Sending addresses</source>
+        <translation>عناوين الإرسال </translation>
+    </message>
+    <message>
+        <source>Receiving addresses</source>
+        <translation>عناوين الاستقبال </translation>
+    </message>
+    <message>
+        <source>These are your Dash addresses for sending payments. Always check the amount and the receiving address before sending coins.</source>
+        <translation>هذه هي عناوين داش التابعة لك من أجل إرسال الدفعات. تحقق دائما من المبلغ و عنوان المرسل المستقبل قبل إرسال العملات </translation>
+    </message>
+    <message>
+        <source>These are your Dash addresses for receiving payments. It is recommended to use a new receiving address for each transaction.</source>
+        <translation>هذه هي عناوين داش التابعة لك من أجل إستقبال الدفعات. ينصح استخدام عنوان جديد من أجل كل صفقة </translation>
+    </message>
+    <message>
+        <source>&amp;Copy Address</source>
+        <translation>انسخ العنوان </translation>
+    </message>
+    <message>
+        <source>Copy &amp;Label</source>
+        <translation>نسخ الوصف </translation>
+    </message>
+    <message>
+        <source>&amp;Edit</source>
+        <translation>تعديل</translation>
+    </message>
+    <message>
+        <source>Export Address List</source>
+        <translation>تصدير قائمة العناوين</translation>
+    </message>
+    <message>
+        <source>Comma separated file (*.csv)</source>
+        <translation>ملف مفصول بفواصل (*.csv)</translation>
+    </message>
+    <message>
+        <source>Exporting Failed</source>
+        <translation>فشل التصدير</translation>
+    </message>
+    <message>
+        <source>There was an error trying to save the address list to %1. Please try again.</source>
+        <translation>لقد حدث خطأ أثناء حفظ قائمة العناوين إلى %1. يرجى المحاولة مرة أخرى.</translation>
+    </message>
+</context>
+<context>
+    <name>AddressTableModel</name>
+    <message>
+        <source>Label</source>
+        <translation>وصف</translation>
+    </message>
+    <message>
+        <source>Address</source>
+        <translation>عنوان</translation>
+    </message>
+    <message>
+        <source>(no label)</source>
+        <translation>(لا وصف)</translation>
+    </message>
+</context>
+<context>
+    <name>AskPassphraseDialog</name>
+    <message>
+        <source>Passphrase Dialog</source>
+        <translation>حوار جملة السر</translation>
+    </message>
+    <message>
+        <source>Enter passphrase</source>
+        <translation>ادخل جملة السر</translation>
+    </message>
+    <message>
+        <source>New passphrase</source>
+        <translation>جملة السر جديدة</translation>
+    </message>
+    <message>
+        <source>Repeat new passphrase</source>
+        <translation>اعد كتابة جملة السر الجديدة</translation>
+    </message>
+    <message>
+        <source>Enter the new passphrase to the wallet.&lt;br/&gt;Please use a passphrase of &lt;b&gt;ten or more random characters&lt;/b&gt;, or &lt;b&gt;eight or more words&lt;/b&gt;.</source>
+        <translation>أدخل عبارة مرور جديدة إلى المحفظة. الرجاء استخدام عبارة مرور تتكون من10 حروف عشوائية على الاقل, أو ثمانية كلمات على الاقل</translation>
+    </message>
+    <message>
+        <source>Encrypt wallet</source>
+        <translation>تشفير المحفظة</translation>
+    </message>
+    <message>
+        <source>This operation needs your wallet passphrase to unlock the wallet.</source>
+        <translation>هذه العملية تحتاج كلمة مرور محفظتك لفتحها</translation>
+    </message>
+    <message>
+        <source>Unlock wallet for mixing only</source>
+        <translation>افتح المحفظة لدمج فقط</translation>
+    </message>
+    <message>
+        <source>Unlock wallet</source>
+        <translation>إفتح المحفظة</translation>
+    </message>
+    <message>
+        <source>This operation needs your wallet passphrase to decrypt the wallet.</source>
+        <translation>هذه العملية تحتاج كلمة مرور محفظتك لفك تشفيرها</translation>
+    </message>
+    <message>
+        <source>Decrypt wallet</source>
+        <translation>فك تشفير المحفظة</translation>
+    </message>
+    <message>
+        <source>Change passphrase</source>
+        <translation>تغيير كلمة المرور</translation>
+    </message>
+    <message>
+        <source>Enter the old passphrase and new passphrase to the wallet.</source>
+        <translation>أدخل كلمة المرور القديمة والجديدة للمحفظة</translation>
+    </message>
+    <message>
+        <source>Confirm wallet encryption</source>
+        <translation>تأكيد تشفير المحفظة</translation>
+    </message>
+    <message>
+        <source>Warning: If you encrypt your wallet and lose your passphrase, you will &lt;b&gt;LOSE ALL OF YOUR DASH&lt;/b&gt;!</source>
+        <translation>تحذير: إذا قمت بتشفير محفظتك وفقدت كلمة المرور الخاص بك, ستفقد كل عملات داش الخاصة بك</translation>
+    </message>
+    <message>
+        <source>Are you sure you wish to encrypt your wallet?</source>
+        <translation>هل أنت متأكد من رغبتك في تشفير محفظتك ؟</translation>
+    </message>
+    <message>
+        <source>Wallet encrypted</source>
+        <translation>محفظة مشفرة</translation>
+    </message>
+    <message>
+        <source>%1 will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your funds from being stolen by malware infecting your computer.</source>
+        <translation>%1 سوف يغلق الآن لإنهاء عملية التشفير. تذكر أن تشفير محفظتك لا يمكنه حماية أموالك بالكامل من التعرض للسرقة بسبب البرامج الضارة التي تصيب جهاز الكمبيوتر الخاص بك.</translation>
+    </message>
+    <message>
+        <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. Previous backups of the unencrypted wallet file contain the same HD seed and still have full access to all your funds just like the new, encrypted wallet.</source>
+        <translation>مهم:يجب استبدال أي نسخ احتياطية سابقة قمت بها من ملف المحفظة بملف المحفظة المشفر حديثًا. تحتوي النسخ الاحتياطية السابقة لملف المحفظة غير المشفرة على نفس البذرة عالية الدقة ، ولا تزال تتمتع بالوصول الكامل إلى جميع أموالك مثل المحفظة الجديدة المشفرة.</translation>
+    </message>
+    <message>
+        <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</source>
+        <translation>هام: أي نسخة إحتياطية سابقة قمت بها لمحفظتك يجب استبدالها بأخرى حديثة، مشفرة. لأسباب أمنية، النسخ الاحتياطية السابقة لملفات المحفظة الغير مشفرة تصبح عديمة الفائدة مع بداية استخدام المحفظة المشفرة الجديدة</translation>
+    </message>
+    <message>
+        <source>Wallet encryption failed</source>
+        <translation>فشل تشفير المحفظة</translation>
+    </message>
+    <message>
+        <source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source>
+        <translation>فشل تشفير المحفظة بسبب خطأ داخلي. لم يتم تشفير محفظتك</translation>
+    </message>
+    <message>
+        <source>The supplied passphrases do not match.</source>
+        <translation>كلمتي المرور ليستا متطابقتان</translation>
+    </message>
+    <message>
+        <source>Wallet unlock failed</source>
+        <translation>فشل فتح المحفظة</translation>
+    </message>
+    <message>
+        <source>The passphrase entered for the wallet decryption was incorrect.</source>
+        <translation>كلمة المرور التي تم إدخالها لفك تشفير المحفظة غير صحيحة</translation>
+    </message>
+    <message>
+        <source>Wallet decryption failed</source>
+        <translation>فشل فك التشفير المحفظة</translation>
+    </message>
+    <message>
+        <source>Wallet passphrase was successfully changed.</source>
+        <translation>لقد تم تغير عبارة مرور المحفظة بنجاح</translation>
+    </message>
+    <message>
+        <source>Warning: The Caps Lock key is on!</source>
+        <translation>تحذير: مفتاح الحروف الكبيرة مفعل</translation>
+    </message>
+</context>
+<context>
+    <name>BanTableModel</name>
+    <message>
+        <source>IP/Netmask</source>
+        <translation>عنوان البروتوكول/مخفي</translation>
+    </message>
+    <message>
+        <source>Banned Until</source>
+        <translation>محظور حتى</translation>
+    </message>
+</context>
+<context>
+    <name>BitcoinGUI</name>
+    <message>
+        <source>A fatal error occurred. Dash Core can no longer continue safely and will quit.</source>
+        <translation>خطأ فادح حدث . لا يمكن اتمام داش بامان سيتم الخروج</translation>
+    </message>
+    <message>
+        <source>Dash Core</source>
+        <translation>جوهر الداش</translation>
+    </message>
+    <message>
+        <source>Wallet</source>
+        <translation>محفظة</translation>
+    </message>
+    <message>
+        <source>Node</source>
+        <translation>جهاز</translation>
+    </message>
+    <message>
+        <source>&amp;Overview</source>
+        <translation>نظرة عامة</translation>
+    </message>
+    <message>
+        <source>Show general overview of wallet</source>
+        <translation>إظهار نظرة عامة على المحفظة</translation>
+    </message>
+    <message>
+        <source>&amp;Send</source>
+        <translation>ارسل</translation>
+    </message>
+    <message>
+        <source>Send coins to a Dash address</source>
+        <translation>ارسل عملات الى عنوان داش</translation>
+    </message>
+    <message>
+        <source>&amp;Receive</source>
+        <translation>استقبل</translation>
+    </message>
+    <message>
+        <source>Request payments (generates QR codes and dash: URIs)</source>
+        <translation>أطلب دفعات (يولد كودات الرمز المربع وبيت كوين: العناوين المعطاة)</translation>
+    </message>
+    <message>
+        <source>&amp;Transactions</source>
+        <translation>المعاملات</translation>
+    </message>
+    <message>
+        <source>Browse transaction history</source>
+        <translation>تصفح سجل المعاملات</translation>
+    </message>
+    <message>
+        <source>&amp;Masternodes</source>
+        <translation>العقد الرئيسية</translation>
+    </message>
+    <message>
+        <source>Browse masternodes</source>
+        <translation>تصفح العقد الرئيسية</translation>
+    </message>
+    <message>
+        <source>E&amp;xit</source>
+        <translation>خروج</translation>
+    </message>
+    <message>
+        <source>Quit application</source>
+        <translation>الخروج من التطبيق</translation>
+    </message>
+    <message>
+        <source>Show information about Dash Core</source>
+        <translation>أظهر المعلومات حولة داش الأساسية</translation>
+    </message>
+    <message>
+        <source>About &amp;Qt</source>
+        <translation>عن Qt</translation>
+    </message>
+    <message>
+        <source>Show information about Qt</source>
+        <translation>اظهر المعلومات حول Qt</translation>
+    </message>
+    <message>
+        <source>&amp;Options...</source>
+        <translation>خيارات</translation>
+    </message>
+    <message>
+        <source>&amp;About %1</source>
+        <translation>حوالي %1</translation>
+    </message>
+    <message>
+        <source>Modify configuration options for %1</source>
+        <translation>تغيير خيارات الإعداد لأساس ل%1</translation>
+    </message>
+    <message>
+        <source>&amp;Show / Hide</source>
+        <translation>عرض / اخفاء</translation>
+    </message>
+    <message>
+        <source>Show or hide the main Window</source>
+        <translation>عرض او اخفاء النافذة الرئيسية</translation>
+    </message>
+    <message>
+        <source>&amp;Encrypt Wallet...</source>
+        <translation>تشفير المحفظة</translation>
+    </message>
+    <message>
+        <source>Encrypt the private keys that belong to your wallet</source>
+        <translation>تشفير المفتاح الخاص بمحفظتك</translation>
+    </message>
+    <message>
+        <source>&amp;Backup Wallet...</source>
+        <translation>احتياط للمحفظة</translation>
+    </message>
+    <message>
+        <source>Backup wallet to another location</source>
+        <translation>احفظ نسخة احتياطية للمحفظة في مكان آخر</translation>
+    </message>
+    <message>
+        <source>&amp;Change Passphrase...</source>
+        <translation>تغيير كلمة المرور</translation>
+    </message>
+    <message>
+        <source>Change the passphrase used for wallet encryption</source>
+        <translation>تغيير كلمة المرور المستخدمة لتشفير المحفظة</translation>
+    </message>
+    <message>
+        <source>&amp;Unlock Wallet...</source>
+        <translation>إفتح المحفظة</translation>
+    </message>
+    <message>
+        <source>Unlock wallet</source>
+        <translation>إفتح المحفظة</translation>
+    </message>
+    <message>
+        <source>&amp;Lock Wallet</source>
+        <translation>غلق المحفظة</translation>
+    </message>
+    <message>
+        <source>Sign &amp;message...</source>
+        <translation>توقيع الرسالة</translation>
+    </message>
+    <message>
+        <source>Sign messages with your Dash addresses to prove you own them</source>
+        <translation>وقَع الرسائل بواسطة اداش الخاص بك لإثبات امتلاكك لهم</translation>
+    </message>
+    <message>
+        <source>&amp;Verify message...</source>
+        <translation>التحقق من الرسالة</translation>
+    </message>
+    <message>
+        <source>Verify messages to ensure they were signed with specified Dash addresses</source>
+        <translation>تحقق من الرسائل للتأكد من أنَها وُقعت برسائل داش محدَدة</translation>
+    </message>
+    <message>
+        <source>&amp;Information</source>
+        <translation>معلومات</translation>
+    </message>
+    <message>
+        <source>Show diagnostic information</source>
+        <translation>عرض معلومات التشخيص</translation>
+    </message>
+    <message>
+        <source>&amp;Debug console</source>
+        <translation>وحدة تصحيح الأخطاء</translation>
+    </message>
+    <message>
+        <source>Open debugging console</source>
+        <translation>فتح وحدة التحكم في التصحيح</translation>
+    </message>
+    <message>
+        <source>&amp;Network Monitor</source>
+        <translation>مراقبة الشبكة</translation>
+    </message>
+    <message>
+        <source>Show network monitor</source>
+        <translation>إظهار شاشة الشبكة</translation>
+    </message>
+    <message>
+        <source>&amp;Peers list</source>
+        <translation>قائمة الزملاء</translation>
+    </message>
+    <message>
+        <source>Show peers info</source>
+        <translation>عرض معلومات الزملاء</translation>
+    </message>
+    <message>
+        <source>Wallet &amp;Repair</source>
+        <translation>المحفظة والإصلاح</translation>
+    </message>
+    <message>
+        <source>Show wallet repair options</source>
+        <translation>عرض خيارات إصلاح المحفظة</translation>
+    </message>
+    <message>
+        <source>Open Wallet &amp;Configuration File</source>
+        <translation>فتح ملف المحفظة والتهيئة</translation>
+    </message>
+    <message>
+        <source>Open configuration file</source>
+        <translation>افتح ملف التهيئة</translation>
+    </message>
+    <message>
+        <source>Open &amp;Masternode Configuration File</source>
+        <translation>فتح ملف تكوين العقدة الرئيسية</translation>
+    </message>
+    <message>
+        <source>Open Masternode configuration file</source>
+        <translation>افتح ملف تهيئة العقدة الرئيسية</translation>
+    </message>
+    <message>
+        <source>Show Automatic &amp;Backups</source>
+        <translation>عرض النسخ الاحتياطية التلقائية</translation>
+    </message>
+    <message>
+        <source>Show automatically created wallet backups</source>
+        <translation>إظهار النسخ الاحتياطية المحفظة تلقائيا إنشاء</translation>
+    </message>
+    <message>
+        <source>&amp;Sending addresses...</source>
+        <translation>عناوين الإرسال...</translation>
+    </message>
+    <message>
+        <source>Show the list of used sending addresses and labels</source>
+        <translation>عرض قائمة عناوين الإرسال المستخدمة والملصقات</translation>
+    </message>
+    <message>
+        <source>&amp;Receiving addresses...</source>
+        <translation>عناوين الاستقبال...</translation>
+    </message>
+    <message>
+        <source>Show the list of used receiving addresses and labels</source>
+        <translation>عرض قائمة عناوين الإستقبال المستخدمة والملصقات</translation>
+    </message>
+    <message>
+        <source>Open &amp;URI...</source>
+        <translation>فتح URI</translation>
+    </message>
+    <message>
+        <source>Open a dash: URI or payment request</source>
+        <translation>افتح شرطة: عنوان أوري أو طلب الدفع</translation>
+    </message>
+    <message>
+        <source>&amp;Command-line options</source>
+        <translation>خيارات سطر الأوامر</translation>
+    </message>
+    <message>
+        <source>Show the %1 help message to get a list with possible Dash command-line options</source>
+        <translation>عرض رسالة المساعدة%1 للحصول على قائمة مع خيارات سطر أوامر داش المحتملة</translation>
+    </message>
+    <message>
+        <source>%1 client</source>
+        <translation>الزبون %1</translation>
+    </message>
+    <message>
+        <source>&amp;PrivateSend information</source>
+        <translation> المعلومات إرسال خاص </translation>
+    </message>
+    <message>
+        <source>Show the PrivateSend basic information</source>
+        <translation>خاص إرسال المعلومات إظهار خاص إرسال المعلومات الأساسية</translation>
+    </message>
+    <message>
+        <source>&amp;File</source>
+        <translation>ملف</translation>
+    </message>
+    <message>
+        <source>&amp;Settings</source>
+        <translation>الاعدادات</translation>
+    </message>
+    <message>
+        <source>&amp;Tools</source>
+        <translation>أدوات</translation>
+    </message>
+    <message>
+        <source>&amp;Help</source>
+        <translation>مساعدة</translation>
+    </message>
+    <message>
+        <source>Tabs toolbar</source>
+        <translation>شريط أدوات علامات التبويب</translation>
+    </message>
+    <message numerus="yes">
+        <source>%n active connection(s) to Dash network</source>
+        <translation><numerusform>%n اتصالات نشطة بشبكة داش</numerusform><numerusform>%n اتصالات نشطة بشبكة داش</numerusform><numerusform>%n اتصالات نشطة بشبكة داش</numerusform><numerusform>%n اتصالات نشطة بشبكة داش</numerusform><numerusform>%n اتصالات نشطة بشبكة داش</numerusform><numerusform>%n اتصالات نشطة بشبكة داش</numerusform></translation>
+    </message>
+    <message>
+        <source>Network activity disabled</source>
+        <translation>تم إلغاء تفعيل الشبكه</translation>
+    </message>
+    <message>
+        <source>Syncing Headers (%1%)...</source>
+        <translation>مزامنة الرؤوس (%1%) ...</translation>
+    </message>
+    <message>
+        <source>Synchronizing with network...</source>
+        <translation>جار المزامنة مع الشبكة ...</translation>
+    </message>
+    <message>
+        <source>Indexing blocks on disk...</source>
+        <translation>ترتيب الفهرسة الكتل على القرص...</translation>
+    </message>
+    <message>
+        <source>Processing blocks on disk...</source>
+        <translation>معالجة الكتل على القرص...</translation>
+    </message>
+    <message>
+        <source>Reindexing blocks on disk...</source>
+        <translation>إعادة الفهرسة الكتل على القرص ...</translation>
+    </message>
+    <message>
+        <source>Connecting to peers...</source>
+        <translation>اتصال إلي القرناء...</translation>
+    </message>
+    <message numerus="yes">
+        <source>Processed %n block(s) of transaction history.</source>
+        <translation><numerusform>تمت معالجة %n من كتل سجل المعاملات.</numerusform><numerusform>تمت معالجة %n من كتل سجل المعاملات.</numerusform><numerusform>تمت معالجة %n من كتل سجل المعاملات.</numerusform><numerusform>تمت معالجة %n من كتل سجل المعاملات.</numerusform><numerusform>تمت معالجة %n من كتل سجل المعاملات.</numerusform><numerusform>تمت معالجة %n من كتل سجل المعاملات.</numerusform></translation>
+    </message>
+    <message>
+        <source>%1 behind</source>
+        <translation>%1 خلف</translation>
+    </message>
+    <message>
+        <source>Catching up...</source>
+        <translation>يمسك...</translation>
+    </message>
+    <message>
+        <source>Last received block was generated %1 ago.</source>
+        <translation>تم إنشاء آخر كتلة تم تلقيها منذ %1.</translation>
+    </message>
+    <message>
+        <source>Transactions after this will not yet be visible.</source>
+        <translation>لن تكون المعاملات بعد ذلك مرئية بعد.</translation>
+    </message>
+    <message>
+        <source>Up to date</source>
+        <translation>حتى الآن</translation>
+    </message>
+    <message>
+        <source>Synchronizing additional data: %p%</source>
+        <translation>مزامنة بيانات إضافية: %p%</translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation>خطأ</translation>
+    </message>
+    <message>
+        <source>Warning</source>
+        <translation>تحذير</translation>
+    </message>
+    <message>
+        <source>Information</source>
+        <translation>معلومات</translation>
+    </message>
+    <message>
+        <source>Date: %1
+</source>
+        <translation>التاريخ:%1
+</translation>
+    </message>
+    <message>
+        <source>Amount: %1
+</source>
+        <translation>المبلغ:%1
+</translation>
+    </message>
+    <message>
+        <source>Type: %1
+</source>
+        <translation>النوع:%1
+</translation>
+    </message>
+    <message>
+        <source>Label: %1
+</source>
+        <translation>التصنيف:%1
+</translation>
+    </message>
+    <message>
+        <source>Address: %1
+</source>
+        <translation>العنوان:%1
+</translation>
+    </message>
+    <message>
+        <source>Sent transaction</source>
+        <translation>تم إرسال المعاملة</translation>
+    </message>
+    <message>
+        <source>Incoming transaction</source>
+        <translation>المعاملات الواردة</translation>
+    </message>
+    <message>
+        <source>HD key generation is &lt;b&gt;enabled&lt;/b&gt;</source>
+        <translation>الجيل مفتاح هد هو 1 تمكين 1</translation>
+    </message>
+    <message>
+        <source>HD key generation is &lt;b&gt;disabled&lt;/b&gt;</source>
+        <translation>الجيل مفتاح هد هو 1 تعطيل 1</translation>
+    </message>
+    <message>
+        <source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;unlocked&lt;/b&gt;</source>
+        <translation>المحفظة هي 1 مشفرة 1 وحاليا 2 مقفلة 2</translation>
+    </message>
+    <message>
+        <source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;unlocked&lt;/b&gt; for mixing only</source>
+        <translation>المحفظة هو 1 مشفرة 1 وحاليا 2 مقفلة 2 للخلط فقط</translation>
+    </message>
+    <message>
+        <source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;locked&lt;/b&gt;</source>
+        <translation>المحفظة هي 1 مشفرة 1 وحاليا 2 مؤمن 2</translation>
+    </message>
+</context>
+<context>
+    <name>ClientModel</name>
+    <message>
+        <source>Total: %1 (PS compatible: %2 / Enabled: %3)</source>
+        <translation>الإجمالي: %1 (متوافق مع بس: %2 / ممكن: %3)</translation>
+    </message>
+    <message>
+        <source>Network Alert</source>
+        <translation>تنبيه الشبكة</translation>
+    </message>
+</context>
+<context>
+    <name>CoinControlDialog</name>
+    <message>
+        <source>Quantity:</source>
+        <translation>كمية:</translation>
+    </message>
+    <message>
+        <source>Bytes:</source>
+        <translation>بايت:</translation>
+    </message>
+    <message>
+        <source>Amount:</source>
+        <translation>كمية:</translation>
+    </message>
+    <message>
+        <source>Fee:</source>
+        <translation>رسوم الاشتراك:</translation>
+    </message>
+    <message>
+        <source>Coin Selection</source>
+        <translation>اختيار عملة</translation>
+    </message>
+    <message>
+        <source>Dust:</source>
+        <translation>غبار:</translation>
+    </message>
+    <message>
+        <source>After Fee:</source>
+        <translation>بعد الرسوم:</translation>
+    </message>
+    <message>
+        <source>Change:</source>
+        <translation>يتغيرون:</translation>
+    </message>
+    <message>
+        <source>(un)select all</source>
+        <translation>(إلغاء) تحديد الكل</translation>
+    </message>
+    <message>
+        <source>toggle lock state</source>
+        <translation>تبديل حالة قفل</translation>
+    </message>
+    <message>
+        <source>Tree mode</source>
+        <translation>وضع الشجرة</translation>
+    </message>
+    <message>
+        <source>List mode</source>
+        <translation>وضع القائمة</translation>
+    </message>
+    <message>
+        <source>(1 locked)</source>
+        <translation>(1 مقفل)</translation>
+    </message>
+    <message>
+        <source>Amount</source>
+        <translation>كمية</translation>
+    </message>
+    <message>
+        <source>Received with label</source>
+        <translation>تم استلامها مع التصنيف</translation>
+    </message>
+    <message>
+        <source>Received with address</source>
+        <translation>تلقى مع عنوان</translation>
+    </message>
+    <message>
+        <source>PS Rounds</source>
+        <translation>بس جولة</translation>
+    </message>
+    <message>
+        <source>Date</source>
+        <translation>تاريخ</translation>
+    </message>
+    <message>
+        <source>Confirmations</source>
+        <translation>تأكيدات</translation>
+    </message>
+    <message>
+        <source>Confirmed</source>
+        <translation>تم تأكيد</translation>
+    </message>
+    <message>
+        <source>Copy address</source>
+        <translation>نسخ عنوان</translation>
+    </message>
+    <message>
+        <source>Copy label</source>
+        <translation>نسخ التسمية</translation>
+    </message>
+    <message>
+        <source>Copy amount</source>
+        <translation>مبلغ النسخ</translation>
+    </message>
+    <message>
+        <source>Copy transaction ID</source>
+        <translation>نسخ معرف المعاملة</translation>
+    </message>
+    <message>
+        <source>Lock unspent</source>
+        <translation>قفل غير منفقة</translation>
+    </message>
+    <message>
+        <source>Unlock unspent</source>
+        <translation>إلغاء فتح</translation>
+    </message>
+    <message>
+        <source>Copy quantity</source>
+        <translation>نسخ الكمية</translation>
+    </message>
+    <message>
+        <source>Copy fee</source>
+        <translation>رسوم النسخ</translation>
+    </message>
+    <message>
+        <source>Copy after fee</source>
+        <translation>نسخ بعد رسوم</translation>
+    </message>
+    <message>
+        <source>Copy bytes</source>
+        <translation>نسخ وحدات البايت</translation>
+    </message>
+    <message>
+        <source>Copy dust</source>
+        <translation>نسخ الغبار</translation>
+    </message>
+    <message>
+        <source>Copy change</source>
+        <translation>نسخ التغيير</translation>
+    </message>
+    <message>
+        <source>Please switch to "List mode" to use this function.</source>
+        <translation>يرجى التبديل إلى "وضع قائمة" لاستخدام هذه الوظيفة.</translation>
+    </message>
+    <message>
+        <source>(%1 locked)</source>
+        <translation>(%1 مقفل)</translation>
+    </message>
+    <message>
+        <source>yes</source>
+        <translation>نعم </translation>
+    </message>
+    <message>
+        <source>no</source>
+        <translation>لا</translation>
+    </message>
+    <message>
+        <source>This label turns red if any recipient receives an amount smaller than the current dust threshold.</source>
+        <translation>يتحول هذا التصنيف إلى اللون الأحمر إذا تلقى أي مستلم مبلغا أصغر من عتبة الغبار الحالية.</translation>
+    </message>
+    <message>
+        <source>Can vary +/- %1 duff(s) per input.</source>
+        <translation>يمكن أن تختلف +/-%1 داف (ق) لكل مدخلات.</translation>
+    </message>
+    <message>
+        <source>(no label)</source>
+        <translation>(بدون تسمية)</translation>
+    </message>
+    <message>
+        <source>change from %1 (%2)</source>
+        <translation>تغيير من %1 (%2)</translation>
+    </message>
+    <message>
+        <source>(change)</source>
+        <translation>(يتغيرون)</translation>
+    </message>
+    <message>
+        <source>n/a</source>
+        <translation>غير معروف</translation>
+    </message>
+</context>
+<context>
+    <name>EditAddressDialog</name>
+    <message>
+        <source>Edit Address</source>
+        <translation>عدل العنوان</translation>
+    </message>
+    <message>
+        <source>&amp;Label</source>
+        <translation>&amp;وصف</translation>
+    </message>
+    <message>
+        <source>The label associated with this address list entry</source>
+        <translation>الملصق المرتبط بقائمة العناوين المدخلة</translation>
+    </message>
+    <message>
+        <source>&amp;Address</source>
+        <translation>&amp;العنوان</translation>
+    </message>
+    <message>
+        <source>The address associated with this address list entry. This can only be modified for sending addresses.</source>
+        <translation>العنوان المرتبط بقائمة العناوين المدخلة. و التي يمكن تعديلها فقط بواسطة ارسال العناوين</translation>
+    </message>
+    <message>
+        <source>New receiving address</source>
+        <translation>عنوان أستلام جديد</translation>
+    </message>
+    <message>
+        <source>New sending address</source>
+        <translation>عنوان إرسال جديد</translation>
+    </message>
+    <message>
+        <source>Edit receiving address</source>
+        <translation>تعديل عنوان الأستلام</translation>
+    </message>
+    <message>
+        <source>Edit sending address</source>
+        <translation>تعديل عنوان الارسال</translation>
+    </message>
+    <message>
+        <source>The entered address "%1" is not a valid Dash address.</source>
+        <translation>العنوان الذي تم إدخاله "%1" ليس عنوانًا صالحًا لداش.</translation>
+    </message>
+    <message>
+        <source>The entered address "%1" is already in the address book.</source>
+        <translation>هدا العنوان "%1" موجود مسبقا في دفتر العناوين</translation>
+    </message>
+    <message>
+        <source>Could not unlock wallet.</source>
+        <translation> يمكن فتح المحفظة.</translation>
+    </message>
+    <message>
+        <source>New key generation failed.</source>
+        <translation>فشل توليد مفتاح جديد.</translation>
+    </message>
+</context>
+<context>
+    <name>FreespaceChecker</name>
+    <message>
+        <source>A new data directory will be created.</source>
+        <translation>سيتم انشاء دليل بيانات جديد</translation>
+    </message>
+    <message>
+        <source>name</source>
+        <translation>الاسم</translation>
+    </message>
+    <message>
+        <source>Directory already exists. Add %1 if you intend to create a new directory here.</source>
+        <translation>الدليل موجوج بالفعل. أضف %1 لو نويت إنشاء دليل جديد هنا.</translation>
+    </message>
+    <message>
+        <source>Path already exists, and is not a directory.</source>
+        <translation>المسار موجود بالفعل، وهو ليس دليلاً.</translation>
+    </message>
+    <message>
+        <source>Cannot create data directory here.</source>
+        <translation>لا يمكن انشاء دليل بيانات هنا .</translation>
+    </message>
+</context>
+<context>
+    <name>HelpMessageDialog</name>
+    <message>
+        <source>version</source>
+        <translation>الإصدار</translation>
+    </message>
+    <message>
+        <source>(%1-bit)</source>
+        <translation>(%1-بت)</translation>
+    </message>
+    <message>
+        <source>About %1</source>
+        <translation>حوالي %1</translation>
+    </message>
+    <message>
+        <source>Command-line options</source>
+        <translation>خيارات سطر الأوامر</translation>
+    </message>
+    <message>
+        <source>Usage:</source>
+        <translation>المستخدم</translation>
+    </message>
+    <message>
+        <source>command-line options</source>
+        <translation>خيارات سطر الأوامر</translation>
+    </message>
+    <message>
+        <source>UI Options:</source>
+        <translation>خيارات واجهة المستخدم</translation>
+    </message>
+    <message>
+        <source>Choose data directory on startup (default: %u)</source>
+        <translation>اختر دليل البيانات عند بدء التشغير (افتراضي: %u)</translation>
+    </message>
+    <message>
+        <source>Set language, for example "de_DE" (default: system locale)</source>
+        <translation>أضع لغة, على سبيل المثال " de_DE "  (افتراضي:- مكان النظام)</translation>
+    </message>
+    <message>
+        <source>Start minimized</source>
+        <translation>الدخول مصغر</translation>
+    </message>
+    <message>
+        <source>Set SSL root certificates for payment request (default: -system-)</source>
+        <translation>أضع شهادة بروتوكول الشبقة الأمنية لطلب المدفوع (افتراضي: -نظام-)</translation>
+    </message>
+    <message>
+        <source>Show splash screen on startup (default: %u)</source>
+        <translation>أظهر شاشة البداية عند بدء التشغيل (افتراضي: %u)</translation>
+    </message>
+    <message>
+        <source>Reset all settings changed in the GUI</source>
+        <translation>اعد تعديل جميع النظم المتغيرة في GUI</translation>
+    </message>
+    <message>
+        <source>PrivateSend information</source>
+        <translation>معلومات الإرسال المخفي</translation>
+    </message>
+    </context>
+<context>
+    <name>Intro</name>
+    <message>
+        <source>Welcome</source>
+        <translation>أهلا</translation>
+    </message>
+    <message>
+        <source>Welcome to %1.</source>
+        <translation> اهلا بكم في %1</translation>
+    </message>
+    <message>
+        <source>As this is the first time the program is launched, you can choose where %1 will store its data.</source>
+        <translation>بما انه هذه اول مرة لانطلاق هذا البرنامج, فيمكنك ان تختار اين سيخزن %1 بياناته</translation>
+    </message>
+    <message>
+        <source>%1 will download and store a copy of the Dash block chain. At least %2GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</source>
+        <translation>سيعمل%1 على تنزيل نسخة من سلسلة كتلة داش وتخزينها. سيتم تخزين ما لا يقل عن %2 جيغابايت من البيانات في هذا الدليل ، وسيزداد بمرور الوقت. سيتم أيضًا تخزين المحفظة في هذا الدليل.</translation>
+    </message>
+    <message>
+        <source>Use the default data directory</source>
+        <translation>استخدام دليل البانات الافتراضي</translation>
+    </message>
+    <message>
+        <source>Use a custom data directory:</source>
+        <translation>استخدام دليل بيانات مخصص:</translation>
+    </message>
+    <message>
+        <source>Error: Specified data directory "%1" cannot be created.</source>
+        <translation>خطأ: لا يمكن تكوين دليل بيانات مخصص ل %1</translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation>خطأ</translation>
+    </message>
+    <message>
+        <source>%1 GB of free space available</source>
+        <translation>يتوفر %1 جيغابايت من المساحة المتاحة</translation>
+    </message>
+    </context>
+<context>
+    <name>MasternodeList</name>
+    <message>
+        <source>Form</source>
+        <translation>نمودج</translation>
+    </message>
+    <message>
+        <source>My Masternodes</source>
+        <translation>ماسترنود حقي</translation>
+    </message>
+    <message>
+        <source>Note: Status of your masternodes in local wallet can potentially be slightly incorrect.&lt;br /&gt;Always wait for wallet to sync additional data and then double check from another node&lt;br /&gt;if your masternode should be running but you still do not see "ENABLED" in "Status" field.</source>
+        <translation>ملاحظة: من المحتمل أن تكون حالة رموزك في المحفظة المحلية غير صحيحة بعض الشيء.&lt;br /&gt;انتظر دائما للمحفظة لمزامنة بيانات إضافية ومن ثم تحقق مرة أخرى من عقدة أخرى&lt;br /&gt; إذا كان يجب تشغيل ماسترنود الخاص بك ولكنك لا تزال لا ترى "متاحة" في حقل "الحالة".</translation>
+    </message>
+    <message>
+        <source>Alias</source>
+        <translation>الاسم المستعار</translation>
+    </message>
+    <message>
+        <source>Address</source>
+        <translation>عنوان</translation>
+    </message>
+    <message>
+        <source>Protocol</source>
+        <translation>بروتوكول</translation>
+    </message>
+    <message>
+        <source>Status</source>
+        <translation>الحالة.</translation>
+    </message>
+    <message>
+        <source>Active</source>
+        <translation>نشيط</translation>
+    </message>
+    <message>
+        <source>Last Seen</source>
+        <translation>آخر زيارة</translation>
+    </message>
+    <message>
+        <source>Payee</source>
+        <translation>المستفيد</translation>
+    </message>
+    <message>
+        <source>S&amp;tart alias</source>
+        <translation>بدأ الإسم المستعار</translation>
+    </message>
+    <message>
+        <source>Start &amp;all</source>
+        <translation>بدأ الكل</translation>
+    </message>
+    <message>
+        <source>Start &amp;MISSING</source>
+        <translation>بدأ المفقود</translation>
+    </message>
+    <message>
+        <source>&amp;Update status</source>
+        <translation>تحديث الحالة</translation>
+    </message>
+    <message>
+        <source>Show additional Masternode information</source>
+        <translation>عرض معلومات ماسترنود إضافية</translation>
+    </message>
+    <message>
+        <source>Show &amp;Info...</source>
+        <translation>إظهار المعلومات</translation>
+    </message>
+    <message>
+        <source>Status will be updated automatically in (sec):</source>
+        <translation>سيتم تحديث الحالة تلقائيا خلال (تواني):</translation>
+    </message>
+    <message>
+        <source>0</source>
+        <translation>0</translation>
+    </message>
+    <message>
+        <source>All Masternodes</source>
+        <translation>جميع ماسترنود</translation>
+    </message>
+    <message>
+        <source>Filter List:</source>
+        <translation>قائمة تصفية:</translation>
+    </message>
+    <message>
+        <source>Filter masternode list</source>
+        <translation>تصفية قائمة ماسترنود</translation>
+    </message>
+    <message>
+        <source>Node Count:</source>
+        <translation>عدد نود</translation>
+    </message>
+    <message>
+        <source>Start alias</source>
+        <translation>بدأ الإسم المستعار</translation>
+    </message>
+    <message>
+        <source>Confirm masternode start</source>
+        <translation>تأكيد بداية ماسترنود</translation>
+    </message>
+    <message>
+        <source>Are you sure you want to start masternode %1?</source>
+        <translation>هل أنت متأكد أنك تريد بدء ماسترنود %1؟</translation>
+    </message>
+    <message>
+        <source>Confirm all masternodes start</source>
+        <translation>تأكيد لبدأ كل ماسترنود</translation>
+    </message>
+    <message>
+        <source>Are you sure you want to start ALL masternodes?</source>
+        <translation>هل أنت متأكد أنك تريد أن تبدأ جميع ماسترنود؟</translation>
+    </message>
+    <message>
+        <source>Command is not available right now</source>
+        <translation>الأمر غير متوفر الآن</translation>
+    </message>
+    <message>
+        <source>You can't use this command until masternode list is synced</source>
+        <translation>لا يمكنك استخدام هذا الأمر حتى تتم مزامنة قائمة ماسترنود</translation>
+    </message>
+    <message>
+        <source>Confirm missing masternodes start</source>
+        <translation>تأكيد ماسترنود في عداد المفقودين تبدأ</translation>
+    </message>
+    <message>
+        <source>Are you sure you want to start MISSING masternodes?</source>
+        <translation>هل أنت متأكد أنك تريد أن تبدأ ماسترنود مفقود؟</translation>
+    </message>
+    <message>
+        <source>Additional information for Masternode %1</source>
+        <translation>معلومات إضافية عن ماسترنود %1</translation>
+    </message>
+    <message>
+        <source>Masternode Private Key</source>
+        <translation>مفتاح الخاص لماسترنود</translation>
+    </message>
+    <message>
+        <source>Private Key</source>
+        <translation>مفتاح سري</translation>
+    </message>
+    <message>
+        <source>Collateral</source>
+        <translation>جانبية</translation>
+    </message>
+    <message>
+        <source>IP</source>
+        <translation>IP</translation>
+    </message>
+    <message>
+        <source>Version</source>
+        <translation>الإصدار</translation>
+    </message>
+    <message>
+        <source>Unknown</source>
+        <translation>غير معرف</translation>
+    </message>
+    <message>
+        <source>Sentinel</source>
+        <translation>الحارس</translation>
+    </message>
+</context>
+<context>
+    <name>ModalOverlay</name>
+    <message>
+        <source>Form</source>
+        <translation>نمودج</translation>
+    </message>
+    <message>
+        <source>Recent transactions may not yet be visible, and therefore your wallet's balance might be incorrect. This information will be correct once your wallet has finished synchronizing with the Dash network, as detailed below.</source>
+        <translation>قد لا تكون المعاملات الأخيرة مرئية بعد ، وبالتالي قد يكون رصيد محفظتك غير صحيح. ستكون هذه المعلومات صحيحة بمجرد انتهاء محفظتك من المزامنة مع شبكة داش ، كما هو مفصل أدناه.</translation>
+    </message>
+    <message>
+        <source>Attempting to spend Dash that are affected by not-yet-displayed transactions will not be accepted by the network.</source>
+        <translation>لن تقبل الشبكة محاولة إنفاق داش المتأثرة بالمعاملات التي لم يتم عرضها بعد.</translation>
+    </message>
+    <message>
+        <source>Number of blocks left</source>
+        <translation>عدد الكتل الفاضلة</translation>
+    </message>
+    <message>
+        <source>Unknown...</source>
+        <translation>غير معرف</translation>
+    </message>
+    <message>
+        <source>Last block time</source>
+        <translation>اخر وقت الكتلة</translation>
+    </message>
+    <message>
+        <source>Progress</source>
+        <translation>تقدم</translation>
+    </message>
+    <message>
+        <source>Progress increase per hour</source>
+        <translation>تقدم يزيد بلساعة</translation>
+    </message>
+    <message>
+        <source>calculating...</source>
+        <translation>تحسب الان...</translation>
+    </message>
+    <message>
+        <source>Estimated time left until synced</source>
+        <translation>الوقت المتبقي للمزامنة</translation>
+    </message>
+    <message>
+        <source>Hide</source>
+        <translation>إخفاء</translation>
+    </message>
+    <message>
+        <source>Unknown. Syncing Headers (%1)...</source>
+        <translation>غير معروف. مزامنة الرؤوس (%1) ...</translation>
+    </message>
+</context>
+<context>
+    <name>OpenURIDialog</name>
+    <message>
+        <source>Open URI</source>
+        <translation>افتح URL</translation>
+    </message>
+    <message>
+        <source>Open payment request from URI or file</source>
+        <translation>حدد طلب الدفع من ملف او URI</translation>
+    </message>
+    <message>
+        <source>URI:</source>
+        <translation>العنوان:</translation>
+    </message>
+    <message>
+        <source>Select payment request file</source>
+        <translation>حدد ملف طلب الدفع</translation>
+    </message>
+    <message>
+        <source>Select payment request file to open</source>
+        <translation>حدد ملف طلب الدفع لفتحه</translation>
+    </message>
+</context>
+<context>
+    <name>OptionsDialog</name>
+    <message>
+        <source>Options</source>
+        <translation>خيارات ...</translation>
+    </message>
+    <message>
+        <source>&amp;Main</source>
+        <translation>&amp;الرئيسي</translation>
+    </message>
+    <message>
+        <source>Size of &amp;database cache</source>
+        <translation>حجم ذاكرة التخزين المؤقت لقاعدة البيانات</translation>
+    </message>
+    <message>
+        <source>MB</source>
+        <translation>م ب</translation>
+    </message>
+    <message>
+        <source>Number of script &amp;verification threads</source>
+        <translation>عدد مؤشرات التحقق من البرنامج النصي</translation>
+    </message>
+    <message>
+        <source>(0 = auto, &lt;0 = leave that many cores free)</source>
+        <translation>(0 = تلقائي، &lt;0 = اترك ذلك العديد من النوى مجانا )</translation>
+    </message>
+    <message>
+        <source>Amount of Dash to keep anonymized</source>
+        <translation>مبلغ من داش للحفاظ على مجهولة المصدر</translation>
+    </message>
+    <message>
+        <source>W&amp;allet</source>
+        <translation>&amp;محفظة</translation>
+    </message>
+    <message>
+        <source>Show additional tab listing all your masternodes in first sub-tab&lt;br/&gt;and all masternodes on the network in second sub-tab.</source>
+        <translation>عرض علامة تبويب إضافية تسرد جميع رموزك في أول علامة تبويب فرعية &lt;br/&gt;وجميع ماسترنود على الشبكة في علامة التبويب الفرعية الثانية.</translation>
+    </message>
+    <message>
+        <source>Show Masternodes Tab</source>
+        <translation>إظهار جدول ماسترنود</translation>
+    </message>
+    <message>
+        <source>Show additional information and buttons for PrivateSend on overview screen.</source>
+        <translation>عرض معلومات إضافية وأزرار لشاشة الإرسال الخاص في نظرة عامة.</translation>
+    </message>
+    <message>
+        <source>Enable advanced PrivateSend interface</source>
+        <translation>تمكين واجهة الإرسال المخفي المتقدمة</translation>
+    </message>
+    <message>
+        <source>Show warning dialog when PrivateSend detects that wallet has very low number of keys left.</source>
+        <translation>إظهار مربع حوار التحذير عندما يكتشف الإرسال المخفي أن هناك عددًا منخفضًا جدًا من المفاتيح في المحفظة.</translation>
+    </message>
+    <message>
+        <source>Warn if PrivateSend is running out of keys</source>
+        <translation>تحذير إذا نفدت مفاتيح الإرسال المخفي</translation>
+    </message>
+    <message>
+        <source>Whether to use experimental PrivateSend mode with multiple mixing sessions per block.&lt;br/&gt;Note: You must use this feature carefully.&lt;br/&gt;Make sure you always have recent wallet (auto)backup in a safe place!</source>
+        <translation>لتحديد ما إذا كنت تريد استخدام وضع الإرسال المخفي التجريبي مع جلسات خلط متعددة لكل مقطع.&lt;br/&gt;ملاحظة: يجب عليك استخدام هذه الميزة بعناية. &lt;br/&gt;تأكد من أن لديك دائمًا احتياطي محفظة (تلقائي) حديث في مكان آمن!</translation>
+    </message>
+    <message>
+        <source>Enable PrivateSend &amp;multi-session</source>
+        <translation>تمكين الإرسال المخفي جلسة متعددة</translation>
+    </message>
+    <message>
+        <source>If you disable the spending of unconfirmed change, the change from a transaction&lt;br/&gt;cannot be used until that transaction has at least one confirmation.&lt;br/&gt;This also affects how your balance is computed.</source>
+        <translation>إذا قمت بتعطيل الإنفاق من التغيير غير المؤكد ، فإن التغيير من معاملة&lt;br/&gt; لا يمكن استخدامه حتى يكون لهذه المعاملة تأكيد واحد على الأقل. &lt;br/&gt; يؤثر هذا أيضًا على كيفية حساب رصيدك.</translation>
+    </message>
+    <message>
+        <source>PrivateSend rounds to use</source>
+        <translation>جولات لإستعمال الإرسال المخفي</translation>
+    </message>
+    <message>
+        <source>This amount acts as a threshold to turn off PrivateSend once it's reached.</source>
+        <translation>يعمل هذا المقدار كعتبة لإيقاف تشغيل الإرسال المخفي بمجرد الوصول إليه.</translation>
+    </message>
+    <message>
+        <source>Automatically open the Dash Core client port on the router. This only works when your router supports UPnP and it is enabled.</source>
+        <translation>فتح منفذ عميل داش كور تلقائيًا على جهاز التوجيه. هذا يعمل فقط عندما يدعم جهاز التوجيه الخاص بك UPnP وتمكينه.</translation>
+    </message>
+    <message>
+        <source>Accept connections from outside</source>
+        <translation>اقبل الاتصالات من الخارج</translation>
+    </message>
+    <message>
+        <source>Allow incoming connections</source>
+        <translation>السماح بالاتصالات الواردة</translation>
+    </message>
+    <message>
+        <source>Connect to the Dash network through a SOCKS5 proxy.</source>
+        <translation>الاتصال بشبكة داش من خلال وكيل SOCKS5.</translation>
+    </message>
+    <message>
+        <source>&amp;Connect through SOCKS5 proxy (default proxy):</source>
+        <translation>الاتصال من خلال وكيل SOCKS5 (الوكيل الافتراضي):</translation>
+    </message>
+    <message>
+        <source>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Exit in the menu.</source>
+        <translation>التصغير بدلاً من الخروج من التطبيق عند إغلاق النافذة. عند تفعيل هذا الخيار، سيتم إغلاق التطبيق فقط بعد اختيار الخروج من القائمة.</translation>
+    </message>
+    <message>
+        <source>Third party URLs (e.g. a block explorer) that appear in the transactions tab as context menu items.&lt;br/&gt;%s in the URL is replaced by transaction hash. Multiple URLs are separated by vertical bar |.</source>
+        <translation>عناوين التابعة لجهات خارجية (مثل مستكشف كتلة) التي تظهر في علامة تبويب المعاملات كعناصر قائمة السياق &lt;br/&gt; يتم استبدال %s في عنوان بتجزئة المعاملة. عناوين متعددة مفصولة بشريط عمودي.</translation>
+    </message>
+    <message>
+        <source>Expert</source>
+        <translation>تصدير</translation>
+    </message>
+    <message>
+        <source>This setting determines the amount of individual masternodes that an input will be anonymized through.&lt;br/&gt;More rounds of anonymization gives a higher degree of privacy, but also costs more in fees.</source>
+        <translation>يحدد هذا الإعداد مقدار ماسترنود الفردية التي سيتم جعل مدخلات مجهولة المصدر.&lt;br/&gt;تعطي المزيد من جولات إخفاء الهوية درجة أعلى من الخصوصية ، ولكنها أيضًا تكلف أكثر في الرسوم.</translation>
+    </message>
+    <message>
+        <source>Whether to show coin control features or not.</source>
+        <translation>ما اذا أردت إظهار ميزات التحكم في العملة أم لا.</translation>
+    </message>
+    <message>
+        <source>Automatically start %1 after logging in to the system.</source>
+        <translation>ابدأ تلقائيًا %1 بعد تسجيل الدخول إلى النظام.</translation>
+    </message>
+    <message>
+        <source>&amp;Start %1 on system login</source>
+        <translation>تشغيل %1 عند الدخول إلى النظام</translation>
+    </message>
+    <message>
+        <source>Enable coin &amp;control features</source>
+        <translation>تفعيل ميزات التحكم في العملة</translation>
+    </message>
+    <message>
+        <source>&amp;Spend unconfirmed change</source>
+        <translation>دفع الفكة غير المؤكدة</translation>
+    </message>
+    <message>
+        <source>&amp;Network</source>
+        <translation>&amp;الشبكة</translation>
+    </message>
+    <message>
+        <source>Map port using &amp;UPnP</source>
+        <translation>ربط المنفذ باستخدام UPnP</translation>
+    </message>
+    <message>
+        <source>Proxy &amp;IP:</source>
+        <translation>بروكسي &amp;اي بي:</translation>
+    </message>
+    <message>
+        <source>IP address of the proxy (e.g. IPv4: 127.0.0.1 / IPv6: ::1)</source>
+        <translation>عنوان IP للوكيل (e.g. IPv4: 127.0.0.1 / IPv6: ::1)</translation>
+    </message>
+    <message>
+        <source>&amp;Port:</source>
+        <translation>&amp;المنفذ:</translation>
+    </message>
+    <message>
+        <source>Port of the proxy (e.g. 9050)</source>
+        <translation>منفذ البروكسي (مثلا 9050)</translation>
+    </message>
+    <message>
+        <source>Used for reaching peers via:</source>
+        <translation>مستخدم للاتصال بالاصدقاء من خلال:</translation>
+    </message>
+    <message>
+        <source>Shows, if the supplied default SOCKS5 proxy is used to reach peers via this network type.</source>
+        <translation>يظهر ، إذا تم استخدام بروكسي SOCKS5 الافتراضي الموفر للوصول إلى الأقران عبر نوع الشبكة هذا.</translation>
+    </message>
+    <message>
+        <source>IPv4</source>
+        <translation>IPv4</translation>
+    </message>
+    <message>
+        <source>IPv6</source>
+        <translation>IPv6</translation>
+    </message>
+    <message>
+        <source>Tor</source>
+        <translation>تور</translation>
+    </message>
+    <message>
+        <source>Connect to the Dash network through a separate SOCKS5 proxy for Tor hidden services.</source>
+        <translation>اتصل بشبكة داش من خلال وكيل SOCKS5 منفصل لخدمات المخفية.</translation>
+    </message>
+    <message>
+        <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services:</source>
+        <translation>استخدم بروكسي SOCKS5 منفصل للوصول إلى الأقران عبر خدمات المخفية:</translation>
+    </message>
+    <message>
+        <source>&amp;Window</source>
+        <translation>نافذه</translation>
+    </message>
+    <message>
+        <source>&amp;Hide the icon from the system tray.</source>
+        <translation>إخفاء الرمز من علبة النظام</translation>
+    </message>
+    <message>
+        <source>Hide tray icon</source>
+        <translation>رمز علبة اخفاء</translation>
+    </message>
+    <message>
+        <source>Show only a tray icon after minimizing the window.</source>
+        <translation>إظهار آيقونة الصينية فقط بعد تصغير النافذة.</translation>
+    </message>
+    <message>
+        <source>&amp;Minimize to the tray instead of the taskbar</source>
+        <translation>التصغير إلى صينية النظام بدلاً من شريط المهام</translation>
+    </message>
+    <message>
+        <source>M&amp;inimize on close</source>
+        <translation>تصغير عند الإغلاق</translation>
+    </message>
+    <message>
+        <source>&amp;Display</source>
+        <translation>&amp;عرض</translation>
+    </message>
+    <message>
+        <source>User Interface &amp;language:</source>
+        <translation>واجهة المستخدم &amp;اللغة:</translation>
+    </message>
+    <message>
+        <source>The user interface language can be set here. This setting will take effect after restarting %1.</source>
+        <translation>يمكن تعيين لغة واجهة المستخدم هنا. سيتم تفعيل هذا الإعداد بعد إعادة تشغيل%1.</translation>
+    </message>
+    <message>
+        <source>Language missing or translation incomplete? Help contributing translations here:
+https://www.transifex.com/projects/p/dash/</source>
+        <translation>لغة مفقودة أو ترجمة غير مكتملة؟ ساعد في المساهمة بالترجمات هنا:
+https://www.transifex.com/projects/p/dash/</translation>
+    </message>
+    <message>
+        <source>User Interface Theme:</source>
+        <translation>موضوع واجهة المستخدم:</translation>
+    </message>
+    <message>
+        <source>&amp;Unit to show amounts in:</source>
+        <translation>الوحدة لإظهار المبالغ فيها:</translation>
+    </message>
+    <message>
+        <source>Choose the default subdivision unit to show in the interface and when sending coins.</source>
+        <translation>اختر وحدة التقسيم الفرعية الافتراضية للعرض في الواجهة وعند إرسال العملات.</translation>
+    </message>
+    <message>
+        <source>Decimal digits</source>
+        <translation>أرقام عشرية</translation>
+    </message>
+    <message>
+        <source>Third party transaction URLs</source>
+        <translation>عناوين لجهات خارجية</translation>
+    </message>
+    <message>
+        <source>Active command-line options that override above options:</source>
+        <translation>خيارات سطر الأوامر النشطة التي تتجاوز الخيارات أعلاه:</translation>
+    </message>
+    <message>
+        <source>Reset all client options to default.</source>
+        <translation>إعادة تعيين كل إعدادات العميل للحالة الإفتراضية.</translation>
+    </message>
+    <message>
+        <source>&amp;Reset Options</source>
+        <translation>&amp;استعادة الخيارات</translation>
+    </message>
+    <message>
+        <source>&amp;OK</source>
+        <translation>تم</translation>
+    </message>
+    <message>
+        <source>&amp;Cancel</source>
+        <translation>الغاء</translation>
+    </message>
+    <message>
+        <source>default</source>
+        <translation>الافتراضي</translation>
+    </message>
+    <message>
+        <source>none</source>
+        <translation>لا شيء</translation>
+    </message>
+    <message>
+        <source>Confirm options reset</source>
+        <translation>تأكيد استعادة الخيارات</translation>
+    </message>
+    <message>
+        <source>Client restart required to activate changes.</source>
+        <translation>يتطلب إعادة تشغيل العميل لتفعيل التغييرات.</translation>
+    </message>
+    <message>
+        <source>Client will be shut down. Do you want to proceed?</source>
+        <translation>سوف يتم إيقاف العميل تماماً. هل تريد الإستمرار؟</translation>
+    </message>
+    <message>
+        <source>This change would require a client restart.</source>
+        <translation>هذا التغيير يتطلب إعادة تشغيل العميل بشكل كامل.</translation>
+    </message>
+    <message>
+        <source>The supplied proxy address is invalid.</source>
+        <translation>عنوان الوكيل توفيره غير صالح.</translation>
+    </message>
+</context>
+<context>
+    <name>OverviewPage</name>
+    <message>
+        <source>Form</source>
+        <translation>نمودج</translation>
+    </message>
+    <message>
+        <source>The displayed information may be out of date. Your wallet automatically synchronizes with the Dash network after a connection is established, but this process has not completed yet.</source>
+        <translation>قد تكون المعلومات المعروضة قديمة. تتزامن محفظتك تلقائيًا مع شبكة داش بعد إنشاء الاتصال ، ولكن هذه العملية لم تكتمل بعد.</translation>
+    </message>
+    <message>
+        <source>Available:</source>
+        <translation>متوفر</translation>
+    </message>
+    <message>
+        <source>Your current spendable balance</source>
+        <translation>رصيدك القابل للصرف</translation>
+    </message>
+    <message>
+        <source>Pending:</source>
+        <translation>معلق:</translation>
+    </message>
+    <message>
+        <source>Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance</source>
+        <translation>إجمالي المعاملات التي لم يتم تأكيدها بعد ولا تحتسب ضمن الرصيد القابل للانفاق</translation>
+    </message>
+    <message>
+        <source>Immature:</source>
+        <translation>غير ناضجة</translation>
+    </message>
+    <message>
+        <source>Mined balance that has not yet matured</source>
+        <translation>الرصيد المعدّن الذي لم ينضج بعد</translation>
+    </message>
+    <message>
+        <source>Balances</source>
+        <translation>الأرصدة</translation>
+    </message>
+    <message>
+        <source>Unconfirmed transactions to watch-only addresses</source>
+        <translation>معاملات غير مؤكدة للعناوين المشاهدة فقط</translation>
+    </message>
+    <message>
+        <source>Mined balance in watch-only addresses that has not yet matured</source>
+        <translation>الرصيد المعدّن في العناوين المشاهدة فقط التي لم تنضج بعد</translation>
+    </message>
+    <message>
+        <source>Total:</source>
+        <translation>المجموع:</translation>
+    </message>
+    <message>
+        <source>Your current total balance</source>
+        <translation>رصيدك الكلي الحالي</translation>
+    </message>
+    <message>
+        <source>Current total balance in watch-only addresses</source>
+        <translation>الرصيد الإجمالي الحالي في العناوين المشاهدة فقط</translation>
+    </message>
+    <message>
+        <source>Watch-only:</source>
+        <translation>مشاهدة فقط:</translation>
+    </message>
+    <message>
+        <source>Your current balance in watch-only addresses</source>
+        <translation>رصيدك الحالي في العناوين المشاهدة فقط</translation>
+    </message>
+    <message>
+        <source>Spendable:</source>
+        <translation>قابل للصرف:</translation>
+    </message>
+    <message>
+        <source>PrivateSend</source>
+        <translation>الإرسال المخفي</translation>
+    </message>
+    <message>
+        <source>Status:</source>
+        <translation>الحالة:</translation>
+    </message>
+    <message>
+        <source>Enabled/Disabled</source>
+        <translation>متاح/غير متاح</translation>
+    </message>
+    <message>
+        <source>Completion:</source>
+        <translation>إكمال:</translation>
+    </message>
+    <message>
+        <source>Try to manually submit a PrivateSend request.</source>
+        <translation>حاول تقديم طلب الإرسال المخفي يدويًا.</translation>
+    </message>
+    <message>
+        <source>Reset the current status of PrivateSend (can interrupt PrivateSend if it's in the process of Mixing, which can cost you money!)</source>
+        <translation>إعادة تعيين الحالة الحالية لـ الإرسال المخفي (يمكن مقاطعة الإرسال المخفي إذا كانت في عملية خلط ، مما قد يكلفك المال!)</translation>
+    </message>
+    <message>
+        <source>Information about PrivateSend and Mixing</source>
+        <translation>معلومات حول الإرسال المخفي والدمج</translation>
+    </message>
+    <message>
+        <source>Info</source>
+        <translation>معلومات</translation>
+    </message>
+    <message>
+        <source>Amount and Rounds:</source>
+        <translation>الكمية و الجولات</translation>
+    </message>
+    <message>
+        <source>0 DASH / 0 Rounds</source>
+        <translation>0 داش / 0 جولات</translation>
+    </message>
+    <message>
+        <source>Submitted Denom:</source>
+        <translation>المقدم denom :</translation>
+    </message>
+    <message>
+        <source>n/a</source>
+        <translation>غير معروف</translation>
+    </message>
+    <message>
+        <source>Recent transactions</source>
+        <translation>أحدث المعاملات</translation>
+    </message>
+    <message>
+        <source>Start/Stop Mixing</source>
+        <translation>بدأ/إنهاء/دمج</translation>
+    </message>
+    <message>
+        <source>PrivateSend Balance:</source>
+        <translation>رصيد الإرسال المخفي</translation>
+    </message>
+    <message>
+        <source>The denominations you submitted to the Masternode.&lt;br&gt;To mix, other users must submit the exact same denominations.</source>
+        <translation>الفئات التي قدمتها إلى ماسترنود &lt;br&gt; لدمج ، يجب على المستخدمين الآخرين تقديم نفس الفئات نفسها.</translation>
+    </message>
+    <message>
+        <source>(Last Message)</source>
+        <translation>( آخر رسالة )</translation>
+    </message>
+    <message>
+        <source>Try Mix</source>
+        <translation>محاولة الدمج</translation>
+    </message>
+    <message>
+        <source>Reset</source>
+        <translation>إعادة تعيين</translation>
+    </message>
+    <message>
+        <source>out of sync</source>
+        <translation>خارج المزامنه</translation>
+    </message>
+    <message>
+        <source>Automatic backups are disabled, no mixing available!</source>
+        <translation>تم تعطيل النسخ الاحتياطية التلقائية ، ولا يوجد دمج متاح!</translation>
+    </message>
+    <message>
+        <source>Start Mixing</source>
+        <translation>بدأ دمج</translation>
+    </message>
+    <message>
+        <source>Stop Mixing</source>
+        <translation>إنهاء دمج</translation>
+    </message>
+    <message>
+        <source>No inputs detected</source>
+        <translation>لم يتم اكتشاف أي مدخلات</translation>
+    </message>
+    <message numerus="yes">
+        <source>%n Rounds</source>
+        <translation><numerusform>%n جولات</numerusform><numerusform>%n جولات</numerusform><numerusform>%n جولات</numerusform><numerusform>%n جولات</numerusform><numerusform>%n جولات</numerusform><numerusform>%n جولات</numerusform></translation>
+    </message>
+    <message>
+        <source>Found enough compatible inputs to anonymize %1</source>
+        <translation>تم العثور على مدخلات متوافقة كافية لإخفاء الهوية%1</translation>
+    </message>
+    <message>
+        <source>Not enough compatible inputs to anonymize &lt;span style='color:red;'&gt;%1&lt;/span&gt;,&lt;br&gt;will anonymize &lt;span style='color:red;'&gt;%2&lt;/span&gt; instead</source>
+        <translation>لا توجد مدخلات متوافقة كافية لإخفاء الهوية &lt;span style='color:red;'&gt; %1 &lt;/span&gt;. &lt;br&gt;سوف مجهول &lt;span style='color:red;'&gt;%2&lt;/span&gt; بدلا من </translation>
+    </message>
+    <message>
+        <source>Overall progress</source>
+        <translation>التقدم العام</translation>
+    </message>
+    <message>
+        <source>Denominated</source>
+        <translation>المقومة</translation>
+    </message>
+    <message>
+        <source>Mixed</source>
+        <translation>دمج</translation>
+    </message>
+    <message>
+        <source>Anonymized</source>
+        <translation>مجهول</translation>
+    </message>
+    <message numerus="yes">
+        <source>Denominated inputs have %5 of %n rounds on average</source>
+        <translation><numerusform>تبلغ قيمة المدخلات المقومة %5 من %n من الجولات في المتوسط</numerusform><numerusform>تبلغ قيمة المدخلات المقومة %5 من %n من الجولات في المتوسط</numerusform><numerusform>تبلغ قيمة المدخلات المقومة %5 من %n من الجولات في المتوسط</numerusform><numerusform>تبلغ قيمة المدخلات المقومة %5 من %n من الجولات في المتوسط</numerusform><numerusform>تبلغ قيمة المدخلات المقومة %5 من %n من الجولات في المتوسط</numerusform><numerusform>تبلغ قيمة المدخلات المقومة %5 من %n من الجولات في المتوسط</numerusform></translation>
+    </message>
+    <message>
+        <source>keys left: %1</source>
+        <translation>المفاتيح المتبقية:%1</translation>
+    </message>
+    <message>
+        <source>Disabled</source>
+        <translation>غير متاح</translation>
+    </message>
+    <message>
+        <source>Very low number of keys left since last automatic backup!</source>
+        <translation>عدد قليل جدا من مفاتيح اليسار منذ آخر النسخ الاحتياطي التلقائي!</translation>
+    </message>
+    <message>
+        <source>We are about to create a new automatic backup for you, however &lt;span style='color:red;'&gt; you should always make sure you have backups saved in some safe place&lt;/span&gt;!</source>
+        <translation>نحن على وشك إنشاء نسخة احتياطية تلقائية جديدة لك &lt;span style='color:red;'&gt;يجب عليك دائمًا التأكد من الاحتفاظ بنسخ احتياطية في مكان آمن &lt;/span&gt;!</translation>
+    </message>
+    <message>
+        <source>WARNING! Something went wrong on automatic backup</source>
+        <translation>تحذير! حدث خطأ ما في النسخ الاحتياطي التلقائي</translation>
+    </message>
+    <message>
+        <source>ERROR! Failed to create automatic backup</source>
+        <translation>خطأ! فشل إنشاء نسخة احتياطية تلقائية</translation>
+    </message>
+    <message>
+        <source>Mixing is disabled, please close your wallet and fix the issue!</source>
+        <translation>تم تعطيل المزج ، يرجى إغلاق محفظتك وإصلاح المشكلة!</translation>
+    </message>
+    <message>
+        <source>Enabled</source>
+        <translation>متاح</translation>
+    </message>
+    <message>
+        <source>see debug.log for details.</source>
+        <translation>انظر debug.log لمزيد من المعلومات</translation>
+    </message>
+    <message>
+        <source>WARNING! Failed to replenish keypool, please unlock your wallet to do so.</source>
+        <translation>تحذير! تعذّر تجديد مفتاح ، يرجى إلغاء قفل محفظتك للقيام بذلك.</translation>
+    </message>
+    <message>
+        <source>Last PrivateSend message:
+</source>
+        <translation>آخر رسالة ابإرسال المخفي
+</translation>
+    </message>
+    <message>
+        <source>N/A</source>
+        <translation>غير معروف</translation>
+    </message>
+    <message>
+        <source>PrivateSend was successfully reset.</source>
+        <translation>تم اعادة ضبط الإرسال المخفي بنجاح ..</translation>
+    </message>
+    <message>
+        <source>If you don't want to see internal PrivateSend fees/transactions select "Most Common" as Type on the "Transactions" tab.</source>
+        <translation>إذا كنت لا ترغب في رؤية رسوم / معاملات الإرسال المخفي الداخلي حدد "الأكثر شيوعًا" كأنواع في علامة التبويب "المعاملات".</translation>
+    </message>
+    <message>
+        <source>PrivateSend requires at least %1 to use.</source>
+        <translation>يتطلب الإرسال المخفي على الأقل%1 لاستخدامه.</translation>
+    </message>
+    <message>
+        <source>Wallet is locked and user declined to unlock. Disabling PrivateSend.</source>
+        <translation>تم قفل المحفظة ورفض المستخدم إلغاء القفل. تعطيل الإرسال المخفي</translation>
+    </message>
+</context>
+<context>
+    <name>PaymentServer</name>
+    <message>
+        <source>Payment request error</source>
+        <translation>خطأ في طلب الدفع</translation>
+    </message>
+    <message>
+        <source>Cannot start dash: click-to-pay handler</source>
+        <translation>لا يمكن بدء داش: معالج الدفع مقابل الدفع</translation>
+    </message>
+    <message>
+        <source>URI handling</source>
+        <translation>التعامل مع العنوان</translation>
+    </message>
+    <message>
+        <source>Payment request fetch URL is invalid: %1</source>
+        <translation>عنوان الخاص بجلب طلب الدفع غير صالح:%1</translation>
+    </message>
+    <message>
+        <source>Invalid payment address %1</source>
+        <translation>عنوان الدفع غير صالح %1</translation>
+    </message>
+    <message>
+        <source>URI cannot be parsed! This can be caused by an invalid Dash address or malformed URI parameters.</source>
+        <translation>لا يمكن تحليل العنوان! يمكن أن يكون ذلك بسبب عنوان داش غير صالح أو معلمات العنوان غير صحيحة.</translation>
+    </message>
+    <message>
+        <source>Payment request file handling</source>
+        <translation>التعامل مع ملف طلب الدفع</translation>
+    </message>
+    <message>
+        <source>Payment request file cannot be read! This can be caused by an invalid payment request file.</source>
+        <translation>لا يمكن قراءة ملف طلب الدفع! يمكن أن يحدث هذا بسبب ملف لطلب الدفع غير صالح.</translation>
+    </message>
+    <message>
+        <source>Payment request rejected</source>
+        <translation>تم رفض طلب الدفع</translation>
+    </message>
+    <message>
+        <source>Payment request network doesn't match client network.</source>
+        <translation>لا تتطابق شبكة طلب الدفع مع شبكة العميل.</translation>
+    </message>
+    <message>
+        <source>Payment request expired.</source>
+        <translation>انتهاء صلاحية طلب الدفع.</translation>
+    </message>
+    <message>
+        <source>Payment request is not initialized.</source>
+        <translation>لم يتم تهيئة طلب الدفع.</translation>
+    </message>
+    <message>
+        <source>Unverified payment requests to custom payment scripts are unsupported.</source>
+        <translation>طلبات الدفع غير المؤكدة إلى نصوص الدفع المخصصة غير مدعومة.</translation>
+    </message>
+    <message>
+        <source>Invalid payment request.</source>
+        <translation>طلب دفع غير صالح.</translation>
+    </message>
+    <message>
+        <source>Requested payment amount of %1 is too small (considered dust).</source>
+        <translation>المبلغ المطلوب للدفع %1 صغير جداً (يعتبر غبار).</translation>
+    </message>
+    <message>
+        <source>Refund from %1</source>
+        <translation>إعادة مال من %1</translation>
+    </message>
+    <message>
+        <source>Payment request %1 is too large (%2 bytes, allowed %3 bytes).</source>
+        <translation>طلب الدفع %1 كبير جداً (%2 بايت، المسموح به %3 بايت).</translation>
+    </message>
+    <message>
+        <source>Error communicating with %1: %2</source>
+        <translation>حدث خطأ في الاتصال بـ %1: %2</translation>
+    </message>
+    <message>
+        <source>Payment request cannot be parsed!</source>
+        <translation>لا يمكن تحليل طلب الدفع!</translation>
+    </message>
+    <message>
+        <source>Bad response from server %1</source>
+        <translation>استجابة سيئة من الملقم %1</translation>
+    </message>
+    <message>
+        <source>Network request error</source>
+        <translation>خطأ في طلب الشبكة</translation>
+    </message>
+    <message>
+        <source>Payment acknowledged</source>
+        <translation>اعتراف بالدفع</translation>
+    </message>
+</context>
+<context>
+    <name>PeerTableModel</name>
+    <message>
+        <source>NodeId</source>
+        <translation>رقم العقدة</translation>
+    </message>
+    <message>
+        <source>Node/Service</source>
+        <translation>عقدة/خدمة</translation>
+    </message>
+    <message>
+        <source>User Agent</source>
+        <translation>وكيل المستخدم</translation>
+    </message>
+    <message>
+        <source>Ping</source>
+        <translation>رنين</translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Dash Core</source>
+        <translation>جوهر الداش</translation>
+    </message>
+    <message>
+        <source>%1 didn't yet exit safely...</source>
+        <translation>%1 لم يخرج بعد بأمان...</translation>
+    </message>
+    <message>
+        <source>Error reading masternode configuration file: %1</source>
+        <translation>خطأ في قراءة ملف تهيئة ماسترنود :%1</translation>
+    </message>
+    <message>
+        <source>Amount</source>
+        <translation>مبلغ</translation>
+    </message>
+    <message>
+        <source>Enter a Dash address (e.g. %1)</source>
+        <translation>أدخل عنوان داش (على سبيل المثال%1)</translation>
+    </message>
+    <message>
+        <source>%1 d</source>
+        <translation>%1 يوم</translation>
+    </message>
+    <message>
+        <source>%1 h</source>
+        <translation>%1 ساعة</translation>
+    </message>
+    <message>
+        <source>%1 m</source>
+        <translation>%1 دقيقة</translation>
+    </message>
+    <message>
+        <source>%1 s</source>
+        <translation>%1 ثانية</translation>
+    </message>
+    <message>
+        <source>None</source>
+        <translation>لا شيء</translation>
+    </message>
+    <message>
+        <source>N/A</source>
+        <translation>غير معروف</translation>
+    </message>
+    <message>
+        <source>%1 ms</source>
+        <translation>%1 جزء من الثانية</translation>
+    </message>
+    <message numerus="yes">
+        <source>%n second(s)</source>
+        <translation><numerusform>%n تواني</numerusform><numerusform>%n تواني</numerusform><numerusform>%n تواني</numerusform><numerusform>%n تواني</numerusform><numerusform>%n تواني</numerusform><numerusform>%n تواني</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>%n minute(s)</source>
+        <translation><numerusform>%n دقائق</numerusform><numerusform>%n دقائق</numerusform><numerusform>%n دقائق</numerusform><numerusform>%n دقائق</numerusform><numerusform>%n دقائق</numerusform><numerusform>%n دقائق</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>%n hour(s)</source>
+        <translation><numerusform>%n ساعات</numerusform><numerusform>%n ساعات</numerusform><numerusform>%n ساعات</numerusform><numerusform>%n ساعات</numerusform><numerusform>%n ساعات</numerusform><numerusform>%n ساعات</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>%n day(s)</source>
+        <translation><numerusform>%n أيام</numerusform><numerusform>%n أيام</numerusform><numerusform>%n أيام</numerusform><numerusform>%n أيام</numerusform><numerusform>%n أيام</numerusform><numerusform>%n أيام</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>%n week(s)</source>
+        <translation><numerusform>%n أسابيع</numerusform><numerusform>%n أسابيع</numerusform><numerusform>%n أسابيع</numerusform><numerusform>%n أسابيع</numerusform><numerusform>%n أسابيع</numerusform><numerusform>%n أسابيع</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>%n year(s)</source>
+        <translation><numerusform>%n أعوام</numerusform><numerusform>%n أعوام</numerusform><numerusform>%n أعوام</numerusform><numerusform>%n أعوام</numerusform><numerusform>%n أعوام</numerusform><numerusform>%n أعوام</numerusform></translation>
+    </message>
+    <message>
+        <source>%1 and %2</source>
+        <translation>%1 و %2</translation>
+    </message>
+    <message>
+        <source>unknown</source>
+        <translation>غير معروف</translation>
+    </message>
+</context>
+<context>
+    <name>QObject::QObject</name>
+    <message>
+        <source>Error: Specified data directory "%1" does not exist.</source>
+        <translation>خطأ: دليل البيانات المحدد "%1" غير موجود.</translation>
+    </message>
+    <message>
+        <source>Error: Cannot parse configuration file: %1. Only use key=value syntax.</source>
+        <translation>خطأ: لا يمكن تحليل ملف التهيئة:%1. استخدم فقط بناء الجملة = القيمة الأساسية.</translation>
+    </message>
+    <message>
+        <source>Error: %1</source>
+        <translation>خطأ: %1</translation>
+    </message>
+</context>
+<context>
+    <name>QRDialog</name>
+    <message>
+        <source>QR-Code Title</source>
+        <translation>عنوان QR-Code</translation>
+    </message>
+    <message>
+        <source>QR Code</source>
+        <translation>رمز كيو ار</translation>
+    </message>
+    <message>
+        <source>&amp;Save Image...</source>
+        <translation>&amp;حفظ الصورة</translation>
+    </message>
+    <message>
+        <source>Error creating QR Code.</source>
+        <translation>خطأ في إنشاء رمز الاستجابة السريعة.</translation>
+    </message>
+</context>
+<context>
+    <name>QRGeneralImageWidget</name>
+    <message>
+        <source>&amp;Save Image...</source>
+        <translation>&amp;حفظ الصورة</translation>
+    </message>
+    <message>
+        <source>&amp;Copy Image</source>
+        <translation>&amp;نسخ الصورة</translation>
+    </message>
+    <message>
+        <source>Save QR Code</source>
+        <translation>حفظ رمز الاستجابة السريعة QR</translation>
+    </message>
+    <message>
+        <source>PNG Image (*.png)</source>
+        <translation>صورة PNG (*.png)</translation>
+    </message>
+</context>
+<context>
+    <name>QRImageWidget</name>
+    <message>
+        <source>&amp;Save Image...</source>
+        <translation>&amp;حفظ الصورة</translation>
+    </message>
+    <message>
+        <source>&amp;Copy Image</source>
+        <translation>&amp;نسخ الصورة</translation>
+    </message>
+    <message>
+        <source>Save QR Code</source>
+        <translation>حفظ رمز الاستجابة السريعة QR</translation>
+    </message>
+    <message>
+        <source>PNG Image (*.png)</source>
+        <translation>صورة PNG (*.png)</translation>
+    </message>
+</context>
+<context>
+    <name>RPCConsole</name>
+    <message>
+        <source>Tools window</source>
+        <translation>نافذة الأدوات</translation>
+    </message>
+    <message>
+        <source>&amp;Information</source>
+        <translation>المعلومات</translation>
+    </message>
+    <message>
+        <source>General</source>
+        <translation>عام</translation>
+    </message>
+    <message>
+        <source>Name</source>
+        <translation>الاسم</translation>
+    </message>
+    <message>
+        <source>N/A</source>
+        <translation>غير معروف</translation>
+    </message>
+    <message>
+        <source>Number of connections</source>
+        <translation>عدد الاتصالات</translation>
+    </message>
+    <message>
+        <source>&amp;Open</source>
+        <translation>الفتح</translation>
+    </message>
+    <message>
+        <source>Startup time</source>
+        <translation>وقت البدء</translation>
+    </message>
+    <message>
+        <source>Network</source>
+        <translation>الشبكه</translation>
+    </message>
+    <message>
+        <source>Last block time</source>
+        <translation>اخر وقت الكتلة</translation>
+    </message>
+    <message>
+        <source>Debug log file</source>
+        <translation>تصحيح ملف السجل</translation>
+    </message>
+    <message>
+        <source>Current number of blocks</source>
+        <translation>عدد الكتل الحالي</translation>
+    </message>
+    <message>
+        <source>Client version</source>
+        <translation>نسخه العميل</translation>
+    </message>
+    <message>
+        <source>Using BerkeleyDB version</source>
+        <translation>باستخدام BerkeleyDB إصدار</translation>
+    </message>
+    <message>
+        <source>Block chain</source>
+        <translation>سلسلة الكتل</translation>
+    </message>
+    <message>
+        <source>Number of Masternodes</source>
+        <translation>ارقام ماسترنود</translation>
+    </message>
+    <message>
+        <source>Memory Pool</source>
+        <translation>تجمع الذاكرة</translation>
+    </message>
+    <message>
+        <source>Current number of transactions</source>
+        <translation>عدد المعاملات الحالي</translation>
+    </message>
+    <message>
+        <source>Memory usage</source>
+        <translation>استخدام الذاكرة</translation>
+    </message>
+    <message>
+        <source>&amp;Console</source>
+        <translation>وحدة التحكم</translation>
+    </message>
+    <message>
+        <source>Clear console</source>
+        <translation>مسح وحدة التحكم</translation>
+    </message>
+    <message>
+        <source>&amp;Network Traffic</source>
+        <translation>&amp;حركة مرور الشبكة</translation>
+    </message>
+    <message>
+        <source>&amp;Clear</source>
+        <translation>&amp;مسح</translation>
+    </message>
+    <message>
+        <source>Totals</source>
+        <translation>المجاميع</translation>
+    </message>
+    <message>
+        <source>Received</source>
+        <translation>إستقبل</translation>
+    </message>
+    <message>
+        <source>Sent</source>
+        <translation>تم الإرسال</translation>
+    </message>
+    <message>
+        <source>&amp;Peers</source>
+        <translation>&amp;اصدقاء</translation>
+    </message>
+    <message>
+        <source>Banned peers</source>
+        <translation>الأقران الممنوعين</translation>
+    </message>
+    <message>
+        <source>Select a peer to view detailed information.</source>
+        <translation>حدد نظير لعرض معلومات مفصلة.</translation>
+    </message>
+    <message>
+        <source>Whitelisted</source>
+        <translation>اللائحة البيضاء</translation>
+    </message>
+    <message>
+        <source>Direction</source>
+        <translation>جهة</translation>
+    </message>
+    <message>
+        <source>Version</source>
+        <translation>الإصدار</translation>
+    </message>
+    <message>
+        <source>Starting Block</source>
+        <translation>كتلة البداية</translation>
+    </message>
+    <message>
+        <source>Synced Headers</source>
+        <translation>رؤوس متزامنة</translation>
+    </message>
+    <message>
+        <source>Synced Blocks</source>
+        <translation>كتل متزامنة</translation>
+    </message>
+    <message>
+        <source>Wallet Path</source>
+        <translation>محفظة path</translation>
+    </message>
+    <message>
+        <source>User Agent</source>
+        <translation>وكيل المستخدم</translation>
+    </message>
+    <message>
+        <source>Datadir</source>
+        <translation>دليل البيانات</translation>
+    </message>
+    <message>
+        <source>Open the %1 debug log file from the current data directory. This can take a few seconds for large log files.</source>
+        <translation>افتح ملف سجل تصحيح %1 من دليل البيانات الحالي. قد يستغرق هذا بضع ثوانٍ لملفات السجل الكبيرة.</translation>
+    </message>
+    <message>
+        <source>Decrease font size</source>
+        <translation>تصغير حجم الخط</translation>
+    </message>
+    <message>
+        <source>Increase font size</source>
+        <translation>تكبير حجم الخط</translation>
+    </message>
+    <message>
+        <source>Services</source>
+        <translation>خدمات</translation>
+    </message>
+    <message>
+        <source>Ban Score</source>
+        <translation>نقاط الحظر</translation>
+    </message>
+    <message>
+        <source>Connection Time</source>
+        <translation>مدة الاتصال</translation>
+    </message>
+    <message>
+        <source>Last Send</source>
+        <translation>آخر استقبال</translation>
+    </message>
+    <message>
+        <source>Last Receive</source>
+        <translation>آخر إرسال</translation>
+    </message>
+    <message>
+        <source>Ping Time</source>
+        <translation>وقت الرنين</translation>
+    </message>
+    <message>
+        <source>The duration of a currently outstanding ping.</source>
+        <translation>مدة الرنين المعلقة حالياً.</translation>
+    </message>
+    <message>
+        <source>Ping Wait</source>
+        <translation>انتظار الرنين</translation>
+    </message>
+    <message>
+        <source>Min Ping</source>
+        <translation>أقل رنين</translation>
+    </message>
+    <message>
+        <source>Time Offset</source>
+        <translation>إزاحة الوقت</translation>
+    </message>
+    <message>
+        <source>&amp;Wallet Repair</source>
+        <translation>إصلاح المحفظة</translation>
+    </message>
+    <message>
+        <source>Salvage wallet</source>
+        <translation>محفظة الإنقاذ</translation>
+    </message>
+    <message>
+        <source>Rescan blockchain files</source>
+        <translation>إعادة فحص ملفات بلوكشين</translation>
+    </message>
+    <message>
+        <source>Recover transactions 1</source>
+        <translation>استرداد المعاملات 1</translation>
+    </message>
+    <message>
+        <source>Recover transactions 2</source>
+        <translation>استرداد المعاملات 2</translation>
+    </message>
+    <message>
+        <source>Upgrade wallet format</source>
+        <translation>ترقية تنسيق المحفظة</translation>
+    </message>
+    <message>
+        <source>The buttons below will restart the wallet with command-line options to repair the wallet, fix issues with corrupt blockhain files or missing/obsolete transactions.</source>
+        <translation>ستقوم الأزرار الموجودة أدناه بإعادة تشغيل المحفظة باستخدام خيارات سطر الأوامر لإصلاح المحفظة ، وإصلاح المشكلات المتعلقة بملفات بلوكشين الفاسدة أو معاملات مفقودة / قديمة.</translation>
+    </message>
+    <message>
+        <source>-salvagewallet: Attempt to recover private keys from a corrupt wallet.dat.</source>
+        <translation>محفظة النقود: محاولة استرداد المفاتيح الخاصة من wallet.dat فاسدة.</translation>
+    </message>
+    <message>
+        <source>-rescan: Rescan the block chain for missing wallet transactions.</source>
+        <translation>إعادة المسح: إعادة فحص سلسلة الكتل الخاصة بمعاملات المحفظة المفقودة.</translation>
+    </message>
+    <message>
+        <source>-zapwallettxes=1: Recover transactions from blockchain (keep meta-data, e.g. account owner).</source>
+        <translation>zapwallettxes = 1: استرداد المعاملات من بلوكشين (الاحتفاظ ببيانات التعريف ، على سبيل المثال ، مالك الحساب).</translation>
+    </message>
+    <message>
+        <source>-zapwallettxes=2: Recover transactions from blockchain (drop meta-data).</source>
+        <translation>zapwallettxes = 2: استرداد المعاملات من بلوكشين (إسقاط بيانات التعريف).</translation>
+    </message>
+    <message>
+        <source>-upgradewallet: Upgrade wallet to latest format on startup. (Note: this is NOT an update of the wallet itself!)</source>
+        <translation>ترقية المحفظة: ترقية المحفظة إلى أحدث تنسيق عند بدء التشغيل. (ملاحظة: هذا ليس تحديثًا للمحفظة نفسها!)</translation>
+    </message>
+    <message>
+        <source>Wallet repair options.</source>
+        <translation>خيارات إصلاح المحفظة.</translation>
+    </message>
+    <message>
+        <source>Rebuild index</source>
+        <translation>إعادة بناء الفهرس</translation>
+    </message>
+    <message>
+        <source>-reindex: Rebuild block chain index from current blk000??.dat files.</source>
+        <translation>إعادة بناء فهرس سلسلة كتلة من الملفات الحالية blk000 ؟؟.</translation>
+    </message>
+    <message>
+        <source>&amp;Disconnect</source>
+        <translation>قطع الاتصال</translation>
+    </message>
+    <message>
+        <source>Ban for</source>
+        <translation>حظر ل</translation>
+    </message>
+    <message>
+        <source>1 &amp;hour</source>
+        <translation>1 &amp;ساعة</translation>
+    </message>
+    <message>
+        <source>1 &amp;day</source>
+        <translation>1 &amp; يوم</translation>
+    </message>
+    <message>
+        <source>1 &amp;week</source>
+        <translation>1 &amp; اسبوع</translation>
+    </message>
+    <message>
+        <source>1 &amp;year</source>
+        <translation>1 &amp; سنة</translation>
+    </message>
+    <message>
+        <source>&amp;Unban</source>
+        <translation>رفع الحظر</translation>
+    </message>
+    <message>
+        <source>Welcome to the %1 RPC console.</source>
+        <translation>مرحبًا بك في وحدة التحكم %1 RPC.</translation>
+    </message>
+    <message>
+        <source>Use up and down arrows to navigate history, and &lt;b&gt;Ctrl-L&lt;/b&gt; to clear screen.</source>
+        <translation>استخدم اسهم الاعلى و الاسفل للتنقل بين السجلات و &lt;b&gt;Ctrl-L&lt;/b&gt;  لمسح الشاشة</translation>
+    </message>
+    <message>
+        <source>Type &lt;b&gt;help&lt;/b&gt; for an overview of available commands.</source>
+        <translation>نوع &lt;b&gt;مساعدة&lt;/b&gt;للحصول على نظرة عامة على الأوامر المتاحة.</translation>
+    </message>
+    <message>
+        <source>WARNING: Scammers have been active, telling users to type commands here, stealing their wallet contents. Do not use this console without fully understanding the ramification of a command.</source>
+        <translation>تحذير: المخادعون نشطون ، ويطلبون من المستخدمين كتابة الأوامر هنا ، وسرقة محتويات محفظتهم. لا تستخدم وحدة التحكم هذه بدون فهم تباين أمر ما تمامًا</translation>
+    </message>
+    <message>
+        <source>In:</source>
+        <translation>داخل:</translation>
+    </message>
+    <message>
+        <source>Out:</source>
+        <translation>خارج:</translation>
+    </message>
+    <message>
+        <source>Network activity disabled</source>
+        <translation>تم إلغاء تفعيل الشبكه</translation>
+    </message>
+    <message>
+        <source>%1 B</source>
+        <translation>%1 بايت</translation>
+    </message>
+    <message>
+        <source>%1 KB</source>
+        <translation>%1 كيلو بايت</translation>
+    </message>
+    <message>
+        <source>%1 MB</source>
+        <translation>%1 ميقا بايت</translation>
+    </message>
+    <message>
+        <source>%1 GB</source>
+        <translation>%1 قيقا بايت</translation>
+    </message>
+    <message>
+        <source>(node id: %1)</source>
+        <translation>(معرف العقدة: %1)</translation>
+    </message>
+    <message>
+        <source>via %1</source>
+        <translation>خلال %1</translation>
+    </message>
+    <message>
+        <source>never</source>
+        <translation>ابدا</translation>
+    </message>
+    <message>
+        <source>Inbound</source>
+        <translation>داخل</translation>
+    </message>
+    <message>
+        <source>Outbound</source>
+        <translation>خارجي</translation>
+    </message>
+    <message>
+        <source>Yes</source>
+        <translation>نعم</translation>
+    </message>
+    <message>
+        <source>No</source>
+        <translation>لا</translation>
+    </message>
+    <message>
+        <source>Unknown</source>
+        <translation>غير معروف</translation>
+    </message>
+</context>
+<context>
+    <name>ReceiveCoinsDialog</name>
+    <message>
+        <source>Reuse one of the previously used receiving addresses.&lt;br&gt;Reusing addresses has security and privacy issues.&lt;br&gt;Do not use this unless re-generating a payment request made before.</source>
+        <translation>إعادة استخدام أحد عناوين الاستلام المستخدمة مسبقًا.&lt;br&gt; إعادة استخدام العناوين لديها قضايا الأمن والخصوصية.&lt;br&gt; لا تستخدم هذا إلا إذا أعدت إنشاء طلب دفع مقدم من قبل.</translation>
+    </message>
+    <message>
+        <source>R&amp;euse an existing receiving address (not recommended)</source>
+        <translation>إعادة استخدام عنوان استلام موجود (غير مستحسن)</translation>
+    </message>
+    <message>
+        <source>An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Dash network.</source>
+        <translation>رسالة اختيارية لإرفاقها بطلب الدفع ، والتي سيتم عرضها عند فتح الطلب. ملاحظة: لن يتم إرسال الرسالة مع الدفع عبر شبكة داش.</translation>
+    </message>
+    <message>
+        <source>&amp;Message:</source>
+        <translation>&amp;رسالة:</translation>
+    </message>
+    <message>
+        <source>An optional label to associate with the new receiving address.</source>
+        <translation>تسمية اختيارية لربطها بعنوان المستلم الجديد.</translation>
+    </message>
+    <message>
+        <source>An optional message to attach to the payment request, which will be displayed when the request is opened.&lt;br&gt;Note: The message will not be sent with the payment over the Dash network.</source>
+        <translation>رسالة اختيارية لإرفاقها بطلب الدفع ، والتي سيتم عرضها عند فتح الطلب.&lt;br&gt; ملاحظة: لن يتم إرسال الرسالة مع الدفع عبر شبكة داش.</translation>
+    </message>
+    <message>
+        <source>Use this form to request payments. All fields are &lt;b&gt;optional&lt;/b&gt;.</source>
+        <translation>استخدم هذا النموذج لطلب الدفعات. جميع الحقول &lt;b&gt;اختيارية&lt;/b&gt;.</translation>
+    </message>
+    <message>
+        <source>&amp;Label:</source>
+        <translation>&amp;وصف :</translation>
+    </message>
+    <message>
+        <source>An optional amount to request. Leave this empty or zero to not request a specific amount.</source>
+        <translation>مبلغ اختياري للطلب. اترك هذا فارغًا أو صفراً لعدم طلب مبلغ محدد.</translation>
+    </message>
+    <message>
+        <source>&amp;Amount:</source>
+        <translation>&amp;القيمة</translation>
+    </message>
+    <message>
+        <source>&amp;Request payment</source>
+        <translation>&amp;طلب دفعة</translation>
+    </message>
+    <message>
+        <source>Clear all fields of the form.</source>
+        <translation>مسح كل حقول النموذج المطلوبة</translation>
+    </message>
+    <message>
+        <source>Clear</source>
+        <translation>مسح</translation>
+    </message>
+    <message>
+        <source>Request InstantSend</source>
+        <translation>طلب الإرسال الفوري</translation>
+    </message>
+    <message>
+        <source>Requested payments history</source>
+        <translation>سجل طلبات الدفع</translation>
+    </message>
+    <message>
+        <source>Show the selected request (does the same as double clicking an entry)</source>
+        <translation>إظهار الطلب المحدد (يقوم بنفس نتيجة النقر المزدوج على أي إدخال)</translation>
+    </message>
+    <message>
+        <source>Show</source>
+        <translation>عرض</translation>
+    </message>
+    <message>
+        <source>Remove the selected entries from the list</source>
+        <translation>قم بإزالة الإدخالات المحددة من القائمة</translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation>ازل</translation>
+    </message>
+    <message>
+        <source>Copy URI</source>
+        <translation>نسخ العنوان</translation>
+    </message>
+    <message>
+        <source>Copy label</source>
+        <translation> انسخ التسمية</translation>
+    </message>
+    <message>
+        <source>Copy message</source>
+        <translation>انسخ الرسالة</translation>
+    </message>
+    <message>
+        <source>Copy amount</source>
+        <translation>نسخ الكمية</translation>
+    </message>
+</context>
+<context>
+    <name>ReceiveRequestDialog</name>
+    <message>
+        <source>QR Code</source>
+        <translation>رمز كيو ار</translation>
+    </message>
+    <message>
+        <source>Copy &amp;URI</source>
+        <translation>نسخ  &amp;URI</translation>
+    </message>
+    <message>
+        <source>Copy &amp;Address</source>
+        <translation>نسخ &amp;العنوان</translation>
+    </message>
+    <message>
+        <source>&amp;Save Image...</source>
+        <translation>&amp;حفظ الصورة</translation>
+    </message>
+    <message>
+        <source>Request payment to %1</source>
+        <translation>طلب الدفعة إلى %1</translation>
+    </message>
+    <message>
+        <source>Payment information</source>
+        <translation>معلومات الدفع</translation>
+    </message>
+    <message>
+        <source>URI</source>
+        <translation> URI</translation>
+    </message>
+    <message>
+        <source>Address</source>
+        <translation>عنوان</translation>
+    </message>
+    <message>
+        <source>Amount</source>
+        <translation>مبلغ</translation>
+    </message>
+    <message>
+        <source>Label</source>
+        <translation>وصف</translation>
+    </message>
+    <message>
+        <source>Message</source>
+        <translation>رسالة </translation>
+    </message>
+    <message>
+        <source>InstantSend</source>
+        <translation>الإرسال الفوري</translation>
+    </message>
+    <message>
+        <source>Yes</source>
+        <translation>نعم</translation>
+    </message>
+    <message>
+        <source>No</source>
+        <translation>لا</translation>
+    </message>
+    <message>
+        <source>Resulting URI too long, try to reduce the text for label / message.</source>
+        <translation>العنوان المستخدم طويل جدًا، حاول أن تقوم بتقليل نص التسمية / الرسالة.</translation>
+    </message>
+    <message>
+        <source>Error encoding URI into QR Code.</source>
+        <translation>خطأ في ترميز العنوان إلى الرمز المربع.</translation>
+    </message>
+</context>
+<context>
+    <name>RecentRequestsTableModel</name>
+    <message>
+        <source>Date</source>
+        <translation>تاريخ</translation>
+    </message>
+    <message>
+        <source>Label</source>
+        <translation>وصف</translation>
+    </message>
+    <message>
+        <source>Message</source>
+        <translation>رسالة </translation>
+    </message>
+    <message>
+        <source>(no label)</source>
+        <translation>(لا وصف)</translation>
+    </message>
+    <message>
+        <source>(no message)</source>
+        <translation>( لا رسائل )</translation>
+    </message>
+    <message>
+        <source>(no amount requested)</source>
+        <translation>(لا يوجد مبلغ مطلوب)</translation>
+    </message>
+    <message>
+        <source>Requested</source>
+        <translation>تم الطلب</translation>
+    </message>
+</context>
+<context>
+    <name>SendCoinsDialog</name>
+    <message>
+        <source>Send Coins</source>
+        <translation>إرسال Coins</translation>
+    </message>
+    <message>
+        <source>Coin Control Features</source>
+        <translation>ميزات التحكم بالعملة</translation>
+    </message>
+    <message>
+        <source>Inputs...</source>
+        <translation>المدخلات...</translation>
+    </message>
+    <message>
+        <source>automatically selected</source>
+        <translation>اختيار تلقائيا</translation>
+    </message>
+    <message>
+        <source>Insufficient funds!</source>
+        <translation>الرصيد غير كافي!</translation>
+    </message>
+    <message>
+        <source>Quantity:</source>
+        <translation>الكمية :</translation>
+    </message>
+    <message>
+        <source>Bytes:</source>
+        <translation>بايت</translation>
+    </message>
+    <message>
+        <source>Amount:</source>
+        <translation>القيمة :</translation>
+    </message>
+    <message>
+        <source>Fee:</source>
+        <translation>رسوم :</translation>
+    </message>
+    <message>
+        <source>Dust:</source>
+        <translation>غبار:</translation>
+    </message>
+    <message>
+        <source>After Fee:</source>
+        <translation>بعد الرسوم :</translation>
+    </message>
+    <message>
+        <source>Change:</source>
+        <translation>تعديل :</translation>
+    </message>
+    <message>
+        <source>If this is activated, but the change address is empty or invalid, change will be sent to a newly generated address.</source>
+        <translation>إذا تم تنشيط هذا، ولكن عنوان الفكة فارغ أو غير صالح، فسيتم إرسال الفكة إلى عنوان تم إنشاؤه حديثًا.</translation>
+    </message>
+    <message>
+        <source>Custom change address</source>
+        <translation>تغيير عنوان الفكة</translation>
+    </message>
+    <message>
+        <source>Transaction Fee:</source>
+        <translation>رسوم المعاملة:</translation>
+    </message>
+    <message>
+        <source>Choose...</source>
+        <translation>إختر …</translation>
+    </message>
+    <message>
+        <source>Using the fallbackfee can result in sending a transaction that will take several hours or days (or never) to confirm. Consider choosing your fee manually or wait until your have validated the complete chain.</source>
+        <translation>قد يؤدي استخدام fallbackfee إلى إرسال معاملة تستغرق عدة ساعات أو أيام (أو أبداً) للتأكيد. فكر في اختيار الرسوم يدويًا أو انتظر حتى يتم التحقق من صحة السلسلة الكاملة.</translation>
+    </message>
+    <message>
+        <source>Warning: Fee estimation is currently not possible.</source>
+        <translation>تحذير: تقدير الرسوم غير ممكن في الوقت الحالي.</translation>
+    </message>
+    <message>
+        <source>collapse fee-settings</source>
+        <translation>خفض اعدادات الرسوم</translation>
+    </message>
+    <message>
+        <source>Confirmation time target:</source>
+        <translation>هدف وقت التأكيد:</translation>
+    </message>
+    <message>
+        <source>PrivateSend</source>
+        <translation>الإرسال المخفي</translation>
+    </message>
+    <message>
+        <source>InstantSend</source>
+        <translation>الإسال الفوري</translation>
+    </message>
+    <message>
+        <source>If the custom fee is set to 1000 duffs and the transaction is only 250 bytes, then "per kilobyte" only pays 250 duffs in fee,&lt;br /&gt;while "at least" pays 1000 duffs. For transactions bigger than a kilobyte both pay by kilobyte.</source>
+        <translation>إذا تم تعيين الرسوم الجمركية على 1000 دافع وكانت المعاملة 250 بايتًا فقط ، فإن "كل كيلوبايت" يدفع 250 جنيهًا فقط رسومًا ،&lt;br /&gt; بينما "على الأقل" يدفع 1000 دفين. لمعاملات أكبر من كيلوبايت تدفع كل من كيلوبايت.</translation>
+    </message>
+    <message>
+        <source>If the custom fee is set to 1000 duffs and the transaction is only 250 bytes, then "per kilobyte" only pays 250 duffs in fee,&lt;br /&gt;while "total at least" pays 1000 duffs. For transactions bigger than a kilobyte both pay by kilobyte.</source>
+        <translation>إذا تم تعيين الرسوم الجمركية على 1000 دافع وكانت المعاملة 250 بايتًا فقط ، فإن "كل كيلوبايت" يدفع 250 جنيهًا فقط رسومًا ، &lt;br /&gt; بينما "الإجمالي على الأقل" يدفع 1000 دفين. لمعاملات أكبر من كيلوبايت تدفع كل من كيلوبايت.</translation>
+    </message>
+    <message>
+        <source>Paying only the minimum fee is just fine as long as there is less transaction volume than space in the blocks.&lt;br /&gt;But be aware that this can end up in a never confirming transaction once there is more demand for dash transactions than the network can process.</source>
+        <translation>إن دفع الحد الأدنى فقط من الرسوم يكون على ما يرام طالما أن حجم المعاملات أقل من المساحة الموجودة في الكتل.&lt;br /&gt; ولكن كن على علم بأن هذا يمكن أن ينتهي في معاملة تؤكد أبدا عندما يكون هناك المزيد من الطلب على معاملات اندفاعة مما يمكن أن تعالجه الشبكة.</translation>
+    </message>
+    <message>
+        <source>per kilobyte</source>
+        <translation>لكل كيلوبايت</translation>
+    </message>
+    <message>
+        <source>Hide</source>
+        <translation>إخفاء</translation>
+    </message>
+    <message>
+        <source>total at least</source>
+        <translation>مجموع على الأقل</translation>
+    </message>
+    <message>
+        <source>(read the tooltip)</source>
+        <translation>(اقرأ تلميح الأدوات)</translation>
+    </message>
+    <message>
+        <source>Recommended:</source>
+        <translation>موصى به:</translation>
+    </message>
+    <message>
+        <source>Custom:</source>
+        <translation>تخصيص:</translation>
+    </message>
+    <message>
+        <source>(Smart fee not initialized yet. This usually takes a few blocks...)</source>
+        <translation>(الرسوم الذكية لم يتم تهيئتها بعد. عادة ما يستغرق ذلك بضع كتل ...)</translation>
+    </message>
+    <message>
+        <source>normal</source>
+        <translation>طبيعي</translation>
+    </message>
+    <message>
+        <source>fast</source>
+        <translation>سريع</translation>
+    </message>
+    <message>
+        <source>Confirm the send action</source>
+        <translation>تأكيد الإرسال</translation>
+    </message>
+    <message>
+        <source>S&amp;end</source>
+        <translation>&amp;ارسال</translation>
+    </message>
+    <message>
+        <source>Clear all fields of the form.</source>
+        <translation>مسح كل حقول النموذج المطلوبة</translation>
+    </message>
+    <message>
+        <source>Clear &amp;All</source>
+        <translation>مسح الكل</translation>
+    </message>
+    <message>
+        <source>Send to multiple recipients at once</source>
+        <translation>إرسال إلى عدة مستلمين في وقت واحد</translation>
+    </message>
+    <message>
+        <source>Add &amp;Recipient</source>
+        <translation>أضافة &amp;مستلم</translation>
+    </message>
+    <message>
+        <source>Balance:</source>
+        <translation>الرصيد:</translation>
+    </message>
+    <message>
+        <source>Copy quantity</source>
+        <translation>نسخ الكمية </translation>
+    </message>
+    <message>
+        <source>Copy amount</source>
+        <translation>نسخ الكمية</translation>
+    </message>
+    <message>
+        <source>Copy fee</source>
+        <translation>نسخ الرسوم</translation>
+    </message>
+    <message>
+        <source>Copy after fee</source>
+        <translation>نسخ بعد الرسوم</translation>
+    </message>
+    <message>
+        <source>Copy bytes</source>
+        <translation>نسخ البايتات </translation>
+    </message>
+    <message>
+        <source>Copy dust</source>
+        <translation>نسخ الغبار</translation>
+    </message>
+    <message>
+        <source>Copy change</source>
+        <translation>نسخ التعديل</translation>
+    </message>
+    <message>
+        <source>using</source>
+        <translation>إستخدام</translation>
+    </message>
+    <message>
+        <source>anonymous funds</source>
+        <translation>مدفوعات مجهولة</translation>
+    </message>
+    <message>
+        <source>(privatesend requires this amount to be rounded up to the nearest %1).</source>
+        <translation>(يتطلب الإرسال المخفي تقريب هذا المبلغ إلى أقرب%1).</translation>
+    </message>
+    <message>
+        <source>any available funds (not anonymous)</source>
+        <translation>أي أموال متاحة (غير مجهولة)</translation>
+    </message>
+    <message>
+        <source>and InstantSend</source>
+        <translation>و الإرسال الفوري</translation>
+    </message>
+    <message>
+        <source>%1 to %2</source>
+        <translation>%1 الى %2</translation>
+    </message>
+    <message>
+        <source>Are you sure you want to send?</source>
+        <translation>هل أنت متأكد من أنك تريد أن ترسل؟</translation>
+    </message>
+    <message>
+        <source>are added as transaction fee</source>
+        <translation>تضاف كرسوم المعاملة</translation>
+    </message>
+    <message>
+        <source>Total Amount = &lt;b&gt;%1&lt;/b&gt;&lt;br /&gt;= %2</source>
+        <translation>مجمود المبلغ = &lt;b&gt; %1&lt;/b&gt; &lt;br /&gt; = %2</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;(%1 of %2 entries displayed)&lt;/b&gt;</source>
+        <translation>&lt;b&gt;( %1 على %2 المداخلات المعروضة)&lt;/b&gt;</translation>
+    </message>
+    <message>
+        <source>Confirm send coins</source>
+        <translation>تأكيد الإرسال Coins</translation>
+    </message>
+    <message>
+        <source>The recipient address is not valid. Please recheck.</source>
+        <translation>عنوان المستلم غير صالح. يرجى إعادة الفحص.</translation>
+    </message>
+    <message>
+        <source>The amount to pay must be larger than 0.</source>
+        <translation>المبلغ المدفوع يجب ان يكون اكبر من 0</translation>
+    </message>
+    <message>
+        <source>The amount exceeds your balance.</source>
+        <translation>القيمة تتجاوز رصيدك</translation>
+    </message>
+    <message>
+        <source>The total exceeds your balance when the %1 transaction fee is included.</source>
+        <translation>المجموع يتجاوز رصيدك عندما يتم اضافة %1 رسوم العملية</translation>
+    </message>
+    <message>
+        <source>Duplicate address found: addresses should only be used once each.</source>
+        <translation>تم العثور على عنوان مكرر: يجب استخدام العناوين مرة واحدة فقط.</translation>
+    </message>
+    <message>
+        <source>Transaction creation failed!</source>
+        <translation>فشل في إنشاء المعاملة!</translation>
+    </message>
+    <message>
+        <source>The transaction was rejected with the following reason: %1</source>
+        <translation>تم رفض المعاملة للسبب التالي: %1</translation>
+    </message>
+    <message>
+        <source>A fee higher than %1 is considered an absurdly high fee.</source>
+        <translation>تعتبر الرسوم الأعلى من %1 رسوماً باهظة.</translation>
+    </message>
+    <message>
+        <source>Payment request expired.</source>
+        <translation>انتهاء صلاحية طلب الدفع.</translation>
+    </message>
+    <message numerus="yes">
+        <source>%n block(s)</source>
+        <translation><numerusform>%n كتل</numerusform><numerusform>%n كتل</numerusform><numerusform>%n كتل</numerusform><numerusform>%n كتل</numerusform><numerusform>%n كتل</numerusform><numerusform>%n كتل</numerusform></translation>
+    </message>
+    <message>
+        <source>Pay only the required fee of %1</source>
+        <translation>دفع فقط الرسوم المطلوبة ل %1</translation>
+    </message>
+    <message numerus="yes">
+        <source>Estimated to begin confirmation within %n block(s).</source>
+        <translation><numerusform>يقدر أن يبدأ التأكيد ضمن %n من الكتل.</numerusform><numerusform>يقدر أن يبدأ التأكيد ضمن %n من الكتل.</numerusform><numerusform>يقدر أن يبدأ التأكيد ضمن %n من الكتل.</numerusform><numerusform>يقدر أن يبدأ التأكيد ضمن %n من الكتل.</numerusform><numerusform>يقدر أن يبدأ التأكيد ضمن %n من الكتل.</numerusform><numerusform>يقدر أن يبدأ التأكيد ضمن %n من الكتل.</numerusform></translation>
+    </message>
+    <message>
+        <source>Warning: Invalid Dash address</source>
+        <translation>تحذير: عنوان داش غير صالح</translation>
+    </message>
+    <message>
+        <source>Warning: Unknown change address</source>
+        <translation>تحذير: عنوان الفكة غير معروف</translation>
+    </message>
+    <message>
+        <source>Confirm custom change address</source>
+        <translation>تأكيد تغيير العنوان الفكة</translation>
+    </message>
+    <message>
+        <source>The address you selected for change is not part of this wallet. Any or all funds in your wallet may be sent to this address. Are you sure?</source>
+        <translation>العنوان الذي حددته للتغيير ليس جزءًا من هذه المحفظة. يمكن إرسال أي أو كل الأموال في محفظتك إلى هذا العنوان. هل أنت واثق؟</translation>
+    </message>
+    <message>
+        <source>(no label)</source>
+        <translation>(لا وصف)</translation>
+    </message>
+</context>
+<context>
+    <name>SendCoinsEntry</name>
+    <message>
+        <source>This is a normal payment.</source>
+        <translation>هذا دفع اعتيادي</translation>
+    </message>
+    <message>
+        <source>Pay &amp;To:</source>
+        <translation>ادفع &amp;الى :</translation>
+    </message>
+    <message>
+        <source>The Dash address to send the payment to</source>
+        <translation>عنوان داش لإرسال الدفعة إلى</translation>
+    </message>
+    <message>
+        <source>Choose previously used address</source>
+        <translation>اختر عنوانا مستخدم سابقا</translation>
+    </message>
+    <message>
+        <source>Alt+A</source>
+        <translation>Alt+A</translation>
+    </message>
+    <message>
+        <source>Paste address from clipboard</source>
+        <translation>انسخ العنوان من لوحة المفاتيح</translation>
+    </message>
+    <message>
+        <source>Alt+P</source>
+        <translation>Alt+P</translation>
+    </message>
+    <message>
+        <source>Remove this entry</source>
+        <translation>ازل هذه المداخله</translation>
+    </message>
+    <message>
+        <source>&amp;Label:</source>
+        <translation>&amp;وصف :</translation>
+    </message>
+    <message>
+        <source>Enter a label for this address to add it to the list of used addresses</source>
+        <translation>أدخل تسمية لهذا العنوان لإضافته إلى قائمة العناوين المستخدمة</translation>
+    </message>
+    <message>
+        <source>A&amp;mount:</source>
+        <translation>&amp;القيمة</translation>
+    </message>
+    <message>
+        <source>The fee will be deducted from the amount being sent. The recipient will receive a lower amount of Dash than you enter in the amount field. If multiple recipients are selected, the fee is split equally.</source>
+        <translation>سيتم خصم الرسوم من المبلغ الذي يتم إرساله. سوف يتلقى المستلم كمية أقل من الشرطة من إدخالها في حقل المبلغ. في حالة تحديد عدة مستلمين ، يتم تقسيم الرسوم بالتساوي.</translation>
+    </message>
+    <message>
+        <source>S&amp;ubtract fee from amount</source>
+        <translation>طرح الرسوم من المبلغ</translation>
+    </message>
+    <message>
+        <source>Message:</source>
+        <translation>الرسائل</translation>
+    </message>
+    <message>
+        <source>A message that was attached to the dash: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Dash network.</source>
+        <translation>رسالة تم إرفاقها بخط العطف: عنوان الذي سيتم تخزينه مع المعاملة كمرجع لك. ملاحظة: لن يتم إرسال هذه الرسالة عبر شبكة داش.</translation>
+    </message>
+    <message>
+        <source>This is an unauthenticated payment request.</source>
+        <translation>هذا طلب دفع لم يتم مصادقته.</translation>
+    </message>
+    <message>
+        <source>This is an authenticated payment request.</source>
+        <translation>هذا طلب دفع تمت مصادقته.</translation>
+    </message>
+    <message>
+        <source>Pay To:</source>
+        <translation>ادفع &amp;الى :</translation>
+    </message>
+    <message>
+        <source>Memo:</source>
+        <translation>مذكرة:</translation>
+    </message>
+    <message>
+        <source>Enter a label for this address to add it to your address book</source>
+        <translation>إدخال تسمية لهذا العنوان لإضافته إلى دفتر العناوين الخاص بك</translation>
+    </message>
+</context>
+<context>
+    <name>SendConfirmationDialog</name>
+    <message>
+        <source>Yes</source>
+        <translation>نعم</translation>
+    </message>
+</context>
+<context>
+    <name>ShutdownWindow</name>
+    <message>
+        <source>%1 is shutting down...</source>
+        <translation>اتمام إيقاف %1...</translation>
+    </message>
+    <message>
+        <source>Do not shut down the computer until this window disappears.</source>
+        <translation>لا توقف عمل الكمبيوتر حتى تختفي هذه النافذة</translation>
+    </message>
+</context>
+<context>
+    <name>SignVerifyMessageDialog</name>
+    <message>
+        <source>Signatures - Sign / Verify a Message</source>
+        <translation>التواقيع - التوقيع /تأكيد الرسالة</translation>
+    </message>
+    <message>
+        <source>&amp;Sign Message</source>
+        <translation>&amp;توقيع الرسالة</translation>
+    </message>
+    <message>
+        <source>You can sign messages/agreements with your addresses to prove you can receive Dash sent to them. Be careful not to sign anything vague or random, as phishing attacks may try to trick you into signing your identity over to them. Only sign fully-detailed statements you agree to.</source>
+        <translation>يمكنك توقيع الرسائل / الاتفاقيات مع العناوين الخاصة بك لإثبات أنك يمكن أن تتلقى داش المرسلة إليهم. احرص على عدم التوقيع على أي شيء غامض أو عشوائي ، حيث إن هجمات التصيد الاحتيالي قد تحاول خداعك لتوقيع هويتك عليها. توقيع فقط عبارات تفصيلية كاملة توافق على.</translation>
+    </message>
+    <message>
+        <source>The Dash address to sign the message with</source>
+        <translation>عنوان داش للتوقيع على الرسالة</translation>
+    </message>
+    <message>
+        <source>Choose previously used address</source>
+        <translation>اختر عنوانا مستخدم سابقا</translation>
+    </message>
+    <message>
+        <source>Alt+A</source>
+        <translation>Alt+A</translation>
+    </message>
+    <message>
+        <source>Paste address from clipboard</source>
+        <translation>انسخ العنوان من لوحة المفاتيح</translation>
+    </message>
+    <message>
+        <source>Alt+P</source>
+        <translation>Alt+P</translation>
+    </message>
+    <message>
+        <source>Enter the message you want to sign here</source>
+        <translation>ادخل الرسالة التي تريد توقيعها هنا</translation>
+    </message>
+    <message>
+        <source>Signature</source>
+        <translation>التوقيع</translation>
+    </message>
+    <message>
+        <source>Copy the current signature to the system clipboard</source>
+        <translation>نسخ التوقيع الحالي إلى حافظة النظام</translation>
+    </message>
+    <message>
+        <source>Sign the message to prove you own this Dash address</source>
+        <translation>وقع على الرسالة لإثبات أنك تملك عنوان داش هذا</translation>
+    </message>
+    <message>
+        <source>Sign &amp;Message</source>
+        <translation>توقيع $الرسالة</translation>
+    </message>
+    <message>
+        <source>Reset all sign message fields</source>
+        <translation>إعادة تعيين كافة حقول رسالة التوقيع</translation>
+    </message>
+    <message>
+        <source>Clear &amp;All</source>
+        <translation>مسح الكل</translation>
+    </message>
+    <message>
+        <source>&amp;Verify Message</source>
+        <translation>&amp;تحقق رسالة</translation>
+    </message>
+    <message>
+        <source>Enter the receiver's address, message (ensure you copy line breaks, spaces, tabs, etc. exactly) and signature below to verify the message. Be careful not to read more into the signature than what is in the signed message itself, to avoid being tricked by a man-in-the-middle attack. Note that this only proves the signing party receives with the address, it cannot prove sendership of any transaction!</source>
+        <translation>أدخل عنوان المتلقي ، رسالة (تأكد من نسخ فواصل الأسطر والمسافات وعلامات التبويب وما إلى ذلك تمامًا) والتوقيع أدناه للتحقق من الرسالة. يجب الحرص على عدم قراءة المزيد في التوقيع أكثر مما هو موجود في الرسالة الموقّعة نفسها ، لتجنب التعرض للخداع من خلال هجوم رجل في الوسط. لاحظ أن هذا يثبت فقط أن الطرف المتلقي يتلقى العنوان ، فلا يمكنه إثبات إرسال أي معاملة!</translation>
+    </message>
+    <message>
+        <source>The Dash address the message was signed with</source>
+        <translation>عنوان داش الذي تم توقيع الرسالة به</translation>
+    </message>
+    <message>
+        <source>Verify the message to ensure it was signed with the specified Dash address</source>
+        <translation>تحقق من الرسالة للتأكد من توقيعها باستخدام عنوان داش المحدد</translation>
+    </message>
+    <message>
+        <source>Verify &amp;Message</source>
+        <translation>تحقق &amp;الرسالة</translation>
+    </message>
+    <message>
+        <source>Reset all verify message fields</source>
+        <translation>إعادة تعيين جميع حقول التحقق من الرسالة</translation>
+    </message>
+    <message>
+        <source>Click "Sign Message" to generate signature</source>
+        <translation>اضغط  "توقيع الرسالة" لتوليد التوقيع</translation>
+    </message>
+    <message>
+        <source>The entered address is invalid.</source>
+        <translation>العنوان المدخل غير صالح</translation>
+    </message>
+    <message>
+        <source>Please check the address and try again.</source>
+        <translation>الرجاء التأكد من العنوان والمحاولة مرة اخرى</translation>
+    </message>
+    <message>
+        <source>The entered address does not refer to a key.</source>
+        <translation>العنوان المدخل لا يشير الى مفتاح</translation>
+    </message>
+    <message>
+        <source>Wallet unlock was cancelled.</source>
+        <translation>تم الغاء عملية فتح المحفظة</translation>
+    </message>
+    <message>
+        <source>Private key for the entered address is not available.</source>
+        <translation>المفتاح الخاص للعنوان المدخل غير موجود.</translation>
+    </message>
+    <message>
+        <source>Message signing failed.</source>
+        <translation>فشل توقيع الرسالة.</translation>
+    </message>
+    <message>
+        <source>Message signed.</source>
+        <translation>الرسالة موقعة.</translation>
+    </message>
+    <message>
+        <source>The signature could not be decoded.</source>
+        <translation>لا يمكن فك تشفير التوقيع.</translation>
+    </message>
+    <message>
+        <source>Please check the signature and try again.</source>
+        <translation>فضلا تاكد من التوقيع وحاول مرة اخرى</translation>
+    </message>
+    <message>
+        <source>The signature did not match the message digest.</source>
+        <translation>لم يتطابق التوقيع مع ملخص الرسالة.</translation>
+    </message>
+    <message>
+        <source>Message verification failed.</source>
+        <translation>فشلت عملية التأكد من الرسالة.</translation>
+    </message>
+    <message>
+        <source>Message verified.</source>
+        <translation>تم تأكيد الرسالة.</translation>
+    </message>
+</context>
+<context>
+    <name>SplashScreen</name>
+    <message>
+        <source>[testnet]</source>
+        <translation>[testnet]</translation>
+    </message>
+    <message>
+        <source>Version %1</source>
+        <translation>نسخة %1</translation>
+    </message>
+</context>
+<context>
+    <name>TrafficGraphWidget</name>
+    <message>
+        <source>KB/s</source>
+        <translation>كيلوبايت/ث</translation>
+    </message>
+</context>
+<context>
+    <name>TransactionDesc</name>
+    <message numerus="yes">
+        <source>Open for %n more block(s)</source>
+        <translation><numerusform>فتح لـ %n كتل إضافية</numerusform><numerusform>فتح لـ %n كتل إضافية</numerusform><numerusform>فتح لـ %n كتل إضافية</numerusform><numerusform>فتح لـ %n كتل إضافية</numerusform><numerusform>فتح لـ %n كتل إضافية</numerusform><numerusform>فتح لـ %n كتل إضافية</numerusform></translation>
+    </message>
+    <message>
+        <source>Open until %1</source>
+        <translation>مفتوح حتى %1</translation>
+    </message>
+    <message>
+        <source>conflicted</source>
+        <translation>يتعارض</translation>
+    </message>
+    <message>
+        <source>%1/offline</source>
+        <translation>%1 غير متواجد</translation>
+    </message>
+    <message>
+        <source>0/unconfirmed, %1</source>
+        <translation>0/غير مؤكد ،%1</translation>
+    </message>
+    <message>
+        <source>in memory pool</source>
+        <translation>في تجمع الذاكرة</translation>
+    </message>
+    <message>
+        <source>not in memory pool</source>
+        <translation>ليس في تجمع الذاكرة</translation>
+    </message>
+    <message>
+        <source>abandoned</source>
+        <translation>مهجور</translation>
+    </message>
+    <message>
+        <source>%1/unconfirmed</source>
+        <translation>غير مؤكدة/%1</translation>
+    </message>
+    <message>
+        <source>%1 confirmations</source>
+        <translation>تأكيد %1</translation>
+    </message>
+    <message>
+        <source>verified via InstantSend</source>
+        <translation>محقق من فبل الإرسال الفوري</translation>
+    </message>
+    <message>
+        <source>InstantSend verification in progress - %1 of %2 signatures</source>
+        <translation>الإرسال الغوري التحقق قيد التقدم - %1 على %2 إمضاءات</translation>
+    </message>
+    <message>
+        <source>InstantSend verification failed</source>
+        <translation>فشل التحقق من الإرسال الفوري</translation>
+    </message>
+    <message>
+        <source>Status</source>
+        <translation>الحالة.</translation>
+    </message>
+    <message>
+        <source>, has not been successfully broadcast yet</source>
+        <translation>,  لم يتم حتى الآن البث بنجاح</translation>
+    </message>
+    <message numerus="yes">
+        <source>, broadcast through %n node(s)</source>
+        <translation><numerusform>البث من خلال عقد %n</numerusform><numerusform>البث من خلال عقد %n</numerusform><numerusform>البث من خلال عقد %n</numerusform><numerusform>البث من خلال عقد %n</numerusform><numerusform>البث من خلال عقد %n</numerusform><numerusform>البث من خلال عقد %n</numerusform></translation>
+    </message>
+    <message>
+        <source>Date</source>
+        <translation>تاريخ</translation>
+    </message>
+    <message>
+        <source>Source</source>
+        <translation>المصدر</translation>
+    </message>
+    <message>
+        <source>Generated</source>
+        <translation>تم اصداره.</translation>
+    </message>
+    <message>
+        <source>From</source>
+        <translation>من</translation>
+    </message>
+    <message>
+        <source>unknown</source>
+        <translation>غير معروف</translation>
+    </message>
+    <message>
+        <source>To</source>
+        <translation>الى</translation>
+    </message>
+    <message>
+        <source>own address</source>
+        <translation>عنوانه</translation>
+    </message>
+    <message>
+        <source>watch-only</source>
+        <translation>مشاهدة فقط</translation>
+    </message>
+    <message>
+        <source>label</source>
+        <translation>وصف</translation>
+    </message>
+    <message>
+        <source>Credit</source>
+        <translation>رصيد</translation>
+    </message>
+    <message numerus="yes">
+        <source>matures in %n more block(s)</source>
+        <translation><numerusform>ينضج في %n كتل إضافية</numerusform><numerusform>ينضج في %n كتل إضافية</numerusform><numerusform>ينضج في %n كتل إضافية</numerusform><numerusform>ينضج في %n كتل إضافية</numerusform><numerusform>ينضج في %n كتل إضافية</numerusform><numerusform>ينضج في %n كتل إضافية</numerusform></translation>
+    </message>
+    <message>
+        <source>not accepted</source>
+        <translation>غير مقبولة</translation>
+    </message>
+    <message>
+        <source>Debit</source>
+        <translation>دين</translation>
+    </message>
+    <message>
+        <source>Total debit</source>
+        <translation>إجمالي الخصم</translation>
+    </message>
+    <message>
+        <source>Total credit</source>
+        <translation>إجمالي الرصيد</translation>
+    </message>
+    <message>
+        <source>Transaction fee</source>
+        <translation>رسوم المعاملة</translation>
+    </message>
+    <message>
+        <source>Net amount</source>
+        <translation>صافي المبلغ</translation>
+    </message>
+    <message>
+        <source>Message</source>
+        <translation>رسالة </translation>
+    </message>
+    <message>
+        <source>Comment</source>
+        <translation>تعليق</translation>
+    </message>
+    <message>
+        <source>Transaction ID</source>
+        <translation>رقم المعاملة</translation>
+    </message>
+    <message>
+        <source>Output index</source>
+        <translation>مؤشر المخرجات</translation>
+    </message>
+    <message>
+        <source>Transaction total size</source>
+        <translation>الحجم الكلي للمعاملات</translation>
+    </message>
+    <message>
+        <source>Merchant</source>
+        <translation>تاجر</translation>
+    </message>
+    <message>
+        <source>Generated coins must mature %1 blocks before they can be spent. When you generated this block, it was broadcast to the network to be added to the block chain. If it fails to get into the chain, its state will change to "not accepted" and it won't be spendable. This may occasionally happen if another node generates a block within a few seconds of yours.</source>
+        <translation>يجب أن تنضج العملات المولدة%1 قبل أن يتم إنفاقها. عند إنشاء هذا الحظر ، تم بثه إلى الشبكة ليتم إضافته إلى سلسلة الحظر. إذا فشلت في الدخول إلى السلسلة ، ستتغير حالتها إلى "غير مقبولة" ولن تكون قابلة للانفاق. قد يحدث هذا أحيانًا إذا أدت عقدة أخرى إلى إنشاء كتلة في غضون ثوانٍ قليلة من حسابك.</translation>
+    </message>
+    <message>
+        <source>Debug information</source>
+        <translation>معلومات التصحيح</translation>
+    </message>
+    <message>
+        <source>Transaction</source>
+        <translation>معاملة</translation>
+    </message>
+    <message>
+        <source>Inputs</source>
+        <translation>المدخلات</translation>
+    </message>
+    <message>
+        <source>Amount</source>
+        <translation>مبلغ</translation>
+    </message>
+    <message>
+        <source>true</source>
+        <translation>صحيح</translation>
+    </message>
+    <message>
+        <source>false</source>
+        <translation>خاطئ</translation>
+    </message>
+</context>
+<context>
+    <name>TransactionDescDialog</name>
+    <message>
+        <source>This pane shows a detailed description of the transaction</source>
+        <translation>يبين هذا الجزء وصفا مفصلا لهده المعاملة</translation>
+    </message>
+    <message>
+        <source>Details for %1</source>
+        <translation>تفاصيل عن %1</translation>
+    </message>
+</context>
+<context>
+    <name>TransactionTableModel</name>
+    <message>
+        <source>Date</source>
+        <translation>تاريخ</translation>
+    </message>
+    <message>
+        <source>Type</source>
+        <translation>النوع</translation>
+    </message>
+    <message>
+        <source>Address / Label</source>
+        <translation>تسمية / عنوان</translation>
+    </message>
+    <message numerus="yes">
+        <source>Open for %n more block(s)</source>
+        <translation><numerusform>فتح لـ %n كتل إضافية</numerusform><numerusform>فتح لـ %n كتل إضافية</numerusform><numerusform>فتح لـ %n كتل إضافية</numerusform><numerusform>فتح لـ %n كتل إضافية</numerusform><numerusform>فتح لـ %n كتل إضافية</numerusform><numerusform>فتح لـ %n كتل إضافية</numerusform></translation>
+    </message>
+    <message>
+        <source>Open until %1</source>
+        <translation>مفتوح حتى %1</translation>
+    </message>
+    <message>
+        <source>Offline</source>
+        <translation>غير متصل</translation>
+    </message>
+    <message>
+        <source>Unconfirmed</source>
+        <translation>غير مؤكد</translation>
+    </message>
+    <message>
+        <source>Abandoned</source>
+        <translation>مهجور</translation>
+    </message>
+    <message>
+        <source>Confirming (%1 of %2 recommended confirmations)</source>
+        <translation>قيد التأكيد (%1 من %2 تأكيد موصى به)</translation>
+    </message>
+    <message>
+        <source>Confirmed (%1 confirmations)</source>
+        <translation>تأكيد %1 الإرسال</translation>
+    </message>
+    <message>
+        <source>Conflicted</source>
+        <translation>يتعارض</translation>
+    </message>
+    <message>
+        <source>Immature (%1 confirmations, will be available after %2)</source>
+        <translation>غير ناضجة (تأكيدات %1 ، ستكون متوفرة بعد %2)</translation>
+    </message>
+    <message>
+        <source>This block was not received by any other nodes and will probably not be accepted!</source>
+        <translation>لم يتم تلقى هذه الكتلة (Block) من قبل أي العقد الأخرى وربما لن تكون مقبولة!</translation>
+    </message>
+    <message>
+        <source>Generated but not accepted</source>
+        <translation>ولدت ولكن لم تقبل</translation>
+    </message>
+    <message>
+        <source>Received with</source>
+        <translation>استقبل مع</translation>
+    </message>
+    <message>
+        <source>Received from</source>
+        <translation>استقبل من</translation>
+    </message>
+    <message>
+        <source>Received via PrivateSend</source>
+        <translation>تلقى عن طريق الإرسال المخفي</translation>
+    </message>
+    <message>
+        <source>Sent to</source>
+        <translation>أرسل إلى</translation>
+    </message>
+    <message>
+        <source>Payment to yourself</source>
+        <translation>دفع لنفسك</translation>
+    </message>
+    <message>
+        <source>Mined</source>
+        <translation>Mined</translation>
+    </message>
+    <message>
+        <source>PrivateSend Denominate</source>
+        <translation>الإرسال المخفي المقوم</translation>
+    </message>
+    <message>
+        <source>PrivateSend Collateral Payment</source>
+        <translation>الإرسال المخفي الدفع الجانبي</translation>
+    </message>
+    <message>
+        <source>PrivateSend Make Collateral Inputs</source>
+        <translation>الإرسال المخفي جعل المدخلات الجانبية</translation>
+    </message>
+    <message>
+        <source>PrivateSend Create Denominations</source>
+        <translation>الإرسال المخفي إنشاء الطوائف</translation>
+    </message>
+    <message>
+        <source>PrivateSend</source>
+        <translation>لإرسال المخفي</translation>
+    </message>
+    <message>
+        <source>watch-only</source>
+        <translation>مشاهدة فقط</translation>
+    </message>
+    <message>
+        <source>(n/a)</source>
+        <translation>غير متوفر</translation>
+    </message>
+    <message>
+        <source>(no label)</source>
+        <translation>(لا وصف)</translation>
+    </message>
+    <message>
+        <source>Transaction status. Hover over this field to show number of confirmations.</source>
+        <translation>حالة التحويل. مرر فوق هذا الحقل لعرض عدد  التأكيدات.</translation>
+    </message>
+    <message>
+        <source>Date and time that the transaction was received.</source>
+        <translation>التاريخ والوقت الذي تم فيه تلقي المعاملة.</translation>
+    </message>
+    <message>
+        <source>Type of transaction.</source>
+        <translation>نوع المعاملات</translation>
+    </message>
+    <message>
+        <source>Whether or not a watch-only address is involved in this transaction.</source>
+        <translation>ما إذا كان العنوان المشاهدة فقط متضمنًا في هذه المعاملة أم لا.</translation>
+    </message>
+    <message>
+        <source>User-defined intent/purpose of the transaction.</source>
+        <translation>هدف / غرض محدد من قبل المستخدم للمعاملات.</translation>
+    </message>
+    <message>
+        <source>Amount removed from or added to balance.</source>
+        <translation>المبلغ الذي أزيل أو أضيف الى الرصيد</translation>
+    </message>
+</context>
+<context>
+    <name>TransactionView</name>
+    <message>
+        <source>All</source>
+        <translation>الكل</translation>
+    </message>
+    <message>
+        <source>Today</source>
+        <translation>اليوم</translation>
+    </message>
+    <message>
+        <source>This week</source>
+        <translation>هدا الاسبوع</translation>
+    </message>
+    <message>
+        <source>This month</source>
+        <translation>هدا الشهر</translation>
+    </message>
+    <message>
+        <source>Last month</source>
+        <translation>الشهر الماضي</translation>
+    </message>
+    <message>
+        <source>This year</source>
+        <translation>هدا العام</translation>
+    </message>
+    <message>
+        <source>Range...</source>
+        <translation>المدى...</translation>
+    </message>
+    <message>
+        <source>Most Common</source>
+        <translation>الاكثر انتشارا</translation>
+    </message>
+    <message>
+        <source>Received with</source>
+        <translation>استقبل مع</translation>
+    </message>
+    <message>
+        <source>Sent to</source>
+        <translation>أرسل إلى</translation>
+    </message>
+    <message>
+        <source>PrivateSend</source>
+        <translation>الإرسال المخفي</translation>
+    </message>
+    <message>
+        <source>PrivateSend Make Collateral Inputs</source>
+        <translation>الإرسال المخفي جعل المدخلات الجانبية</translation>
+    </message>
+    <message>
+        <source>PrivateSend Create Denominations</source>
+        <translation>الإرسال المخفي إنشاء الطوائف</translation>
+    </message>
+    <message>
+        <source>PrivateSend Denominate</source>
+        <translation>الإرسال المخفي المقوم</translation>
+    </message>
+    <message>
+        <source>PrivateSend Collateral Payment</source>
+        <translation>الإرسال المخفي الدفع الجانبي</translation>
+    </message>
+    <message>
+        <source>To yourself</source>
+        <translation>إليك</translation>
+    </message>
+    <message>
+        <source>Mined</source>
+        <translation>Mined</translation>
+    </message>
+    <message>
+        <source>Other</source>
+        <translation>اخرى</translation>
+    </message>
+    <message>
+        <source>Enter address or label to search</source>
+        <translation>ادخل عنوان أووصف للبحث</translation>
+    </message>
+    <message>
+        <source>Min amount</source>
+        <translation>الحد الأدنى</translation>
+    </message>
+    <message>
+        <source>Abandon transaction</source>
+        <translation>التخلي عن المعاملة</translation>
+    </message>
+    <message>
+        <source>Copy address</source>
+        <translation>  انسخ عنوان</translation>
+    </message>
+    <message>
+        <source>Copy label</source>
+        <translation> انسخ التسمية</translation>
+    </message>
+    <message>
+        <source>Copy amount</source>
+        <translation>نسخ الكمية</translation>
+    </message>
+    <message>
+        <source>Copy transaction ID</source>
+        <translation>نسخ رقم العملية</translation>
+    </message>
+    <message>
+        <source>Copy raw transaction</source>
+        <translation>نسخ المعاملة الخام</translation>
+    </message>
+    <message>
+        <source>Copy full transaction details</source>
+        <translation>نسخ كامل تفاصيل المعاملة</translation>
+    </message>
+    <message>
+        <source>Edit label</source>
+        <translation>عدل الوصف</translation>
+    </message>
+    <message>
+        <source>Show transaction details</source>
+        <translation>عرض تفاصيل المعاملة</translation>
+    </message>
+    <message>
+        <source>Export Transaction History</source>
+        <translation>تصدير تفاصيل المعاملات</translation>
+    </message>
+    <message>
+        <source>Comma separated file (*.csv)</source>
+        <translation>ملف مفصول بفواصل (*.csv)</translation>
+    </message>
+    <message>
+        <source>Confirmed</source>
+        <translation>تأكيد</translation>
+    </message>
+    <message>
+        <source>Watch-only</source>
+        <translation>مشاهدة فقط</translation>
+    </message>
+    <message>
+        <source>Date</source>
+        <translation>تاريخ</translation>
+    </message>
+    <message>
+        <source>Type</source>
+        <translation>النوع</translation>
+    </message>
+    <message>
+        <source>Label</source>
+        <translation>وصف</translation>
+    </message>
+    <message>
+        <source>Address</source>
+        <translation>عنوان</translation>
+    </message>
+    <message>
+        <source>ID</source>
+        <translation>العنوان</translation>
+    </message>
+    <message>
+        <source>Exporting Failed</source>
+        <translation>فشل التصدير</translation>
+    </message>
+    <message>
+        <source>There was an error trying to save the transaction history to %1.</source>
+        <translation>حدث خطأ أثناء محاولة حفظ محفوظات المعاملة إلى %1.</translation>
+    </message>
+    <message>
+        <source>Exporting Successful</source>
+        <translation>نجح التصدير</translation>
+    </message>
+    <message>
+        <source>The transaction history was successfully saved to %1.</source>
+        <translation>تم حفظ محفوظات المعاملة بنجاح إلى %1.</translation>
+    </message>
+    <message>
+        <source>Range:</source>
+        <translation>المدى:</translation>
+    </message>
+    <message>
+        <source>to</source>
+        <translation>الى</translation>
+    </message>
+</context>
+<context>
+    <name>UnitDisplayStatusBarControl</name>
+    <message>
+        <source>Unit to show amounts in. Click to select another unit.</source>
+        <translation>الوحدة لإظهار المبالغ فيها. انقر لتحديد وحدة أخرى.</translation>
+    </message>
+</context>
+<context>
+    <name>WalletFrame</name>
+    <message>
+        <source>No wallet has been loaded.</source>
+        <translation>لا يوجد محفظة تم تحميلها.</translation>
+    </message>
+</context>
+<context>
+    <name>WalletModel</name>
+    <message>
+        <source>Send Coins</source>
+        <translation>إرسال Coins</translation>
+    </message>
+    <message>
+        <source>InstantSend doesn't support sending values that high yet. Transactions are currently limited to %1 DASH.</source>
+        <translation>لا يدعم الإرسال الفوري  إرسال قيم عالية حتى الآن. تقتصر المعاملات حاليًا على%1 داش .</translation>
+    </message>
+    <message>
+        <source>Used way too many inputs (&gt;%1) for this InstantSend transaction, fees could be huge.</source>
+        <translation>تستخدم طريقة إدخال كثيرة (&gt;%1) لهذه المعاملة الإرسال الفوري ، قد تكون الرسوم كبيرة</translation>
+    </message>
+</context>
+<context>
+    <name>WalletView</name>
+    <message>
+        <source>&amp;Export</source>
+        <translation>&amp;تصدير</translation>
+    </message>
+    <message>
+        <source>Export the data in the current tab to a file</source>
+        <translation>تحميل البيانات في علامة التبويب الحالية إلى ملف.</translation>
+    </message>
+    <message>
+        <source>Selected amount:</source>
+        <translation>المبلغ المحدد:</translation>
+    </message>
+    <message>
+        <source>Backup Wallet</source>
+        <translation>نسخ احتياط للمحفظة</translation>
+    </message>
+    <message>
+        <source>Wallet Data (*.dat)</source>
+        <translation>بيانات المحفظة (*.dat)</translation>
+    </message>
+    <message>
+        <source>Backup Failed</source>
+        <translation>فشل النسخ الاحتياطي</translation>
+    </message>
+    <message>
+        <source>There was an error trying to save the wallet data to %1.</source>
+        <translation>حدث خطأ أثناء محاولة حفظ بيانات المحفظة إلى%1.</translation>
+    </message>
+    <message>
+        <source>Backup Successful</source>
+        <translation>نجاح  النسخ الاحتياطي</translation>
+    </message>
+    <message>
+        <source>The wallet data was successfully saved to %1.</source>
+        <translation>تم حفظ بيانات المحفظة بنجاح إلى %1.</translation>
+    </message>
+</context>
+<context>
+    <name>dash-core</name>
+    <message>
+        <source>Bind to given address and always listen on it. Use [host]:port notation for IPv6</source>
+        <translation>ربط عنوان معين والاستماع دائما على ذلك. استخدم [host]: تدوين المنفذ لـ IPv6</translation>
+    </message>
+    <message>
+        <source>Error: Listening for incoming connections failed (listen returned error %s)</source>
+        <translation>خطأ: فشل الاستماع إلى الاتصالات الواردة (تم إرجاع الخطأ %s)</translation>
+    </message>
+    <message>
+        <source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source>
+        <translation>تنفيذ الأمر عند تلقي تنبيه ذي صلة أو ظهور شوكة طويلة بالفعل (يتم استبدال %s في cmd بالرسالة)</translation>
+    </message>
+    <message>
+        <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source>
+        <translation>تنفيذ الأمر عند تغيير معاملة المحفظة (يتم استبدال %s في cmd بـ TxID)</translation>
+    </message>
+    <message>
+        <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source>
+        <translation>تنفيذ الأمر عند تغيير أفضل كتلة (يتم استبدال %s في cmd بتجزئة التجميع)</translation>
+    </message>
+    <message>
+        <source>Name to construct url for KeePass entry that stores the wallet passphrase</source>
+        <translation>اسم لإنشاء عنوان لإدخال KeePass الذي يخزن عبارة مرور المحفظة</translation>
+    </message>
+    <message>
+        <source>Set maximum size of high-priority/low-fee transactions in bytes (default: %d)</source>
+        <translation>تعيين الحد الأقصى لحجم المعاملات عالية الأولوية / منخفضة الرسوم بالبايت (الافتراضي: %d)</translation>
+    </message>
+    <message>
+        <source>Set the number of script verification threads (%u to %d, 0 = auto, &lt;0 = leave that many cores free, default: %d)</source>
+        <translation>تعيين عدد سلاسل عمليات التحقق من البرنامج النصي (%u إلى %d ، 0 = auto ، &lt;0 = ترك العديد من النوى خالية ، الافتراضي: %d)</translation>
+    </message>
+    <message>
+        <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source>
+        <translation>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</translation>
+    </message>
+    <message>
+        <source>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</source>
+        <translation>تحذير: لا يبدو أن الشبكة توافق تمامًا! يبدو أن بعض المشتغلين بالتعدين يواجهون مشكلات.</translation>
+    </message>
+    <message>
+        <source>Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.</source>
+        <translation>تحذير: لا يبدو أننا نتفق تمامًا مع نظرائنا! قد تحتاج إلى الترقية ، أو قد تحتاج العقد الأخرى إلى الترقية.</translation>
+    </message>
+    <message>
+        <source>You must specify a masternodeprivkey in the configuration. Please see documentation for help.</source>
+        <translation>يجب عليك تحديد masternodeprivkey في التكوين. يرجى الاطلاع على الوثائق للمساعدة.</translation>
+    </message>
+    <message>
+        <source>Accept command line and JSON-RPC commands</source>
+        <translation>قبول أوامر وحدة التحكم وأوامر JSON-RPC</translation>
+    </message>
+    <message>
+        <source>Add a node to connect to and attempt to keep the connection open</source>
+        <translation>أضف عقدة للاتصال بها ومحاولة للحفاظ على اتصال مفتوح</translation>
+    </message>
+    <message>
+        <source>Allow DNS lookups for -addnode, -seednode and -connect</source>
+        <translation>السماح بعمليات البحث عن DNS لـ -ddnode و -seednode و -connect</translation>
+    </message>
+    <message>
+        <source>Already have that input.</source>
+        <translation>بالفعل هذا الإدخال.</translation>
+    </message>
+    <message>
+        <source>Block creation options:</source>
+        <translation>خيارات صناعة الكتل</translation>
+    </message>
+    <message>
+        <source>Cannot downgrade wallet</source>
+        <translation>لا يمكن تخفيض قيمة المحفظة</translation>
+    </message>
+    <message>
+        <source>Cannot write default address</source>
+        <translation> لا يمكن كتابة العنوان الافتراضي</translation>
+    </message>
+    <message>
+        <source>Collateral not valid.</source>
+        <translation>ضمانات غير صالحة.</translation>
+    </message>
+    <message>
+        <source>Connect to a node to retrieve peer addresses, and disconnect</source>
+        <translation>الاتصال بعقدة لاسترداد عناوين النظير ، وقطع الاتصال</translation>
+    </message>
+    <message>
+        <source>Connection options:</source>
+        <translation>خيارات الاتصال:</translation>
+    </message>
+    <message>
+        <source>Corrupted block database detected</source>
+        <translation>تم الكشف عن قاعدة بيانات كتل تالفة</translation>
+    </message>
+    <message>
+        <source>Debugging/Testing options:</source>
+        <translation>خيارات التصحيح / الاختبار:</translation>
+    </message>
+    <message>
+        <source>Do not load the wallet and disable wallet RPC calls</source>
+        <translation>لا تقم بتحميل المحفظة وتعطيل استدعاءات RPC للمحفظة</translation>
+    </message>
+    <message>
+        <source>Do you want to rebuild the block database now?</source>
+        <translation>هل تريد إعادة بناء قاعدة بيانات الكتل الآن؟</translation>
+    </message>
+    <message>
+        <source>Done loading</source>
+        <translation>انتهاء التحميل</translation>
+    </message>
+    <message>
+        <source>Entries are full.</source>
+        <translation>إدخالات ممتلئة.</translation>
+    </message>
+    <message>
+        <source>Error initializing block database</source>
+        <translation>خطأ في تهيئة قاعدة البيانات</translation>
+    </message>
+    <message>
+        <source>Error initializing wallet database environment %s!</source>
+        <translation>حدث خطأ أثناء تهيئة بيئة قاعدة بيانات المحفظة %s!</translation>
+    </message>
+    <message>
+        <source>Error loading block database</source>
+        <translation>خطأ في تحميل قاعدة بيانات الكتل</translation>
+    </message>
+    <message>
+        <source>Error opening block database</source>
+        <translation>خطأ في فتح قاعدة بيانات الكتل</translation>
+    </message>
+    <message>
+        <source>Error reading from database, shutting down.</source>
+        <translation>خطأ في القراءة من قاعدة البيانات ، والتوقف.</translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation>خطأ</translation>
+    </message>
+    <message>
+        <source>Error: Disk space is low!</source>
+        <translation>تحذير: مساحة القرص منخفضة</translation>
+    </message>
+    <message>
+        <source>Failed to listen on any port. Use -listen=0 if you want this.</source>
+        <translation>فشل في الاستماع على أي منفذ. استخدام الاستماع = 0 إذا كنت تريد هذا.</translation>
+    </message>
+    <message>
+        <source>(1 = keep tx meta data e.g. account owner and payment request information, 2 = drop tx meta data)</source>
+        <translation>(1 = الاحتفاظ ببيانات التعريف tx ، على سبيل المثال ، مالك الحساب ومعلومات طلب الدفع ، 2 = بيانات تعريف tx drop)</translation>
+    </message>
+    <message>
+        <source>-maxtxfee is set very high! Fees this large could be paid on a single transaction.</source>
+        <translation>يتم تعيين maxtxfee عالية جدا! يمكن دفع هذه الرسوم في معاملة واحدة.</translation>
+    </message>
+    <message>
+        <source>A fee rate (in %s/kB) that will be used when fee estimation has insufficient data (default: %s)</source>
+        <translation>سعر الرسوم (بالكيلو %s / kB) الذي سيتم استخدامه عندما يكون تقدير الرسوم غير كافٍ للبيانات (الافتراضي: %s)</translation>
+    </message>
+    <message>
+        <source>Accept relayed transactions received from whitelisted peers even when not relaying transactions (default: %d)</source>
+        <translation>قبول المعاملات المرحّلة التي تم استلامها من أقران القائمة البيضاء حتى عند عدم ترحيل المعاملات (القيمة الافتراضية: %d)</translation>
+    </message>
+    <message>
+        <source>Allow JSON-RPC connections from specified source. Valid for &lt;ip&gt; are a single IP (e.g. 1.2.3.4), a network/netmask (e.g. 1.2.3.4/255.255.255.0) or a network/CIDR (e.g. 1.2.3.4/24). This option can be specified multiple times</source>
+        <translation>السماح لاتصالات JSON-RPC من المصدر المحدد. صالحة ل&lt;ip&gt; عبارة عن عنوان IP فردي (على سبيل المثال ، 1.2.3.4) ، وشبكة / قناع شبكة (على سبيل المثال 1.2.3.4/255.255.255.0) أو شبكة / CIDR (على سبيل المثال 1.2.3.4/24). يمكن تحديد هذا الخيار عدة مرات</translation>
+    </message>
+    <message>
+        <source>Bind to given address and whitelist peers connecting to it. Use [host]:port notation for IPv6</source>
+        <translation>ربط العنوان المعطى وأقرانه في القائمة البيضاء بالاتصال به. استخدم [host]: تدوين المنفذ لـ IPv6</translation>
+    </message>
+    <message>
+        <source>Bind to given address to listen for JSON-RPC connections. Use [host]:port notation for IPv6. This option can be specified multiple times (default: bind to all interfaces)</source>
+        <translation>ربط عنوان معين للاستماع إلى اتصالات JSON-RPC. استخدم [host]: تدوين المنفذ لـ IPv6. يمكن تحديد هذا الخيار عدة مرات (افتراضي: ربط لجميع الواجهات)</translation>
+    </message>
+    <message>
+        <source>Create new files with system default permissions, instead of umask 077 (only effective with disabled wallet functionality)</source>
+        <translation>إنشاء ملفات جديدة بأذونات النظام الافتراضية ، بدلاً من umask 077 (فعال فقط مع وظيفة المحفظة المعطلة)</translation>
+    </message>
+    <message>
+        <source>Delete all wallet transactions and only recover those parts of the blockchain through -rescan on startup</source>
+        <translation>حذف جميع معاملات المحفظة واسترداد فقط تلك الأجزاء من سلسلة الكتل عبر -escan عند بدء التشغيل</translation>
+    </message>
+    <message>
+        <source>Error loading %s: You can't enable HD on a already existing non-HD wallet</source>
+        <translation>حدث خطأ أثناء تحميل %s: لا يمكنك تمكين HD في محفظة غير عالية موجودة بالفعل</translation>
+    </message>
+    <message>
+        <source>Found unconfirmed denominated outputs, will wait till they confirm to continue.</source>
+        <translation>العثور على نتائج مقومة غير مؤكدة ، سوف تنتظر حتى تؤكد استمرارها.</translation>
+    </message>
+    <message>
+        <source>How thorough the block verification of -checkblocks is (0-4, default: %u)</source>
+        <translation>مدى دقة التحقق من كتلة -checkblocks (0-4 ، الافتراضي: %u)</translation>
+    </message>
+    <message>
+        <source>If paytxfee is not set, include enough fee so transactions begin confirmation on average within n blocks (default: %u)</source>
+        <translation>إذا لم يتم تعيين paytxfee ، قم بتضمين رسوم كافية حتى تبدأ المعاملات في التأكيد في المتوسط داخل كتل n (الافتراضي: %u)</translation>
+    </message>
+    <message>
+        <source>If this block is in the chain assume that it and its ancestors are valid and potentially skip their script verification (0 to verify all, default: %s, testnet: %s)</source>
+        <translation>إذا كانت هذه المجموعة في السلسلة تفترض أنها وأصولها صالحة ، ومن المحتمل أن تتخطى التحقق من البرنامج النصي (0 للتحقق من الكل ، الافتراضي: %s ، testnet: %s)</translation>
+    </message>
+    <message>
+        <source>Invalid amount for -maxtxfee=&lt;amount&gt;: '%s' (must be at least the minrelay fee of %s to prevent stuck transactions)</source>
+        <translation>كمية غير صالحة لـ -maxtxfee = : '%s' &lt;amount&gt; (يجب أن تكون على الأقل رسوم minrelay %s لمنع المعاملات عالقة)</translation>
+    </message>
+    <message>
+        <source>Maintain a full transaction index, used by the getrawtransaction rpc call (default: %u)</source>
+        <translation>احتفظ بفهرس للمعاملات كامل ، يستخدم من قبل استدعاء getrawtransaction (الافتراضي: %u)</translation>
+    </message>
+    <message>
+        <source>Make sure to encrypt your wallet and delete all non-encrypted backups after you verified that wallet works!</source>
+        <translation>تأكد من تشفير محفظتك وحذف جميع النسخ الاحتياطية غير المشفرة بعد التحقق من أن هذه المحفظة تعمل!</translation>
+    </message>
+    <message>
+        <source>Maximum size of data in data carrier transactions we relay and mine (default: %u)</source>
+        <translation>الحد الأقصى لحجم البيانات في معاملات شركات نقل البيانات التي نقوم بترحيلها وبياناتي (الافتراضي: %u)</translation>
+    </message>
+    <message>
+        <source>Number of seconds to keep misbehaving peers from reconnecting (default: %u)</source>
+        <translation>عدد الثواني للاحتفاظ بسوء تصرف الأقران من إعادة الاتصال (الإعداد الافتراضي: %u)</translation>
+    </message>
+    <message>
+        <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: %s)</source>
+        <translation>استخدام وكيل SOCKS5 منفصل للوصول إلى الأقران عبر خدمات تور المخفية (القيمة الافتراضية: %s)</translation>
+    </message>
+    <message>
+        <source>User defined mnemonic for HD wallet (bip39). Only has effect during wallet creation/first start (default: randomly generated)</source>
+        <translation>تعريف المستخدم ذاكري لمحرك HD (bip39). يكون تأثيره فقط أثناء إنشاء المحفظة / البدء الأول (افتراضي: يتم إنشاؤه عشوائيًا)</translation>
+    </message>
+    <message>
+        <source>User defined seed for HD wallet (should be in hex). Only has effect during wallet creation/first start (default: randomly generated)</source>
+        <translation>تعريف المستخدم البذور لمحفظ HD (يجب أن يكون في ست عشري). يكون تأثيره فقط أثناء إنشاء المحفظة / البدء الأول (افتراضي: يتم إنشاؤه عشوائيًا)</translation>
+    </message>
+    <message>
+        <source>Whitelisted peers cannot be DoS banned and their transactions are always relayed, even if they are already in the mempool, useful e.g. for a gateway</source>
+        <translation>لا يمكن حظر الزملاء في القائمة البيضاء في DoS ويتم ترحيل معاملاتهم دائمًا ، حتى إذا كانت موجودة بالفعل في mempool ، على سبيل المثال ، على سبيل المثال ، لبوابة</translation>
+    </message>
+    <message>
+        <source>You need to rebuild the database using -reindex-chainstate to change -txindex</source>
+        <translation>تحتاج إلى إعادة بناء قاعدة البيانات باستخدام -reindex-chainstate لتغيير -txindex</translation>
+    </message>
+    <message>
+        <source>(default: %s)</source>
+        <translation>(القيمة الافتراضية: %s)</translation>
+    </message>
+    <message>
+        <source>Accept public REST requests (default: %u)</source>
+        <translation>قبول طلبات REST العامة (القيمة الافتراضية: %u)</translation>
+    </message>
+    <message>
+        <source>Always query for peer addresses via DNS lookup (default: %u)</source>
+        <translation>استعلم دومًا عن عناوين النظير عبر البحث عن DNS (الافتراضي: %u)</translation>
+    </message>
+    <message>
+        <source>Can't mix: no compatible inputs found!</source>
+        <translation>لا يمكن الجمع: لم يتم العثور على مدخلات متوافقة!</translation>
+    </message>
+    <message>
+        <source>Chain selection options:</source>
+        <translation>خيارات اختيار السلسلة:</translation>
+    </message>
+    <message>
+        <source>Connect through SOCKS5 proxy</source>
+        <translation>الاتصال من خلال وكيل SOCKS5</translation>
+    </message>
+    <message>
+        <source>Connect to KeePassHttp on port &lt;port&gt; (default: %u)</source>
+        <translation>الاتصال KeePassHttp على المنفذ&lt;port&gt; ( الافتراضي: %u ) </translation>
+    </message>
+    <message>
+        <source>Enable the client to act as a masternode (0-1, default: %u)</source>
+        <translation>تمكين العميل ليكون بمثابة ماسترنود (0-1 ، الافتراضي: %u)</translation>
+    </message>
+    <message>
+        <source>Entry exceeds maximum size.</source>
+        <translation>يتجاوز الدخول الحد الأقصى للحجم.</translation>
+    </message>
+    <message>
+        <source>Error loading %s: You can't disable HD on a already existing HD wallet</source>
+        <translation>حدث خطأ أثناء تحميل %s: لا يمكنك تعطيل HD في محفظة HD موجودة بالفعل</translation>
+    </message>
+    <message>
+        <source>Failed to load fulfilled requests cache from</source>
+        <translation>فشل في تحميل ذاكرة التخزين المؤقت للطلبات التي تم تنفيذها.</translation>
+    </message>
+    <message>
+        <source>Failed to load governance cache from</source>
+        <translation>فشل تحميل ذاكرة التخزين المؤقتة من</translation>
+    </message>
+    <message>
+        <source>Failed to load masternode cache from</source>
+        <translation>فشل تحميل ذاكرة التخزين المؤقتة من</translation>
+    </message>
+    <message>
+        <source>Failed to load masternode payments cache from</source>
+        <translation>أخفق تحميل ذاكرة التخزين المؤقت لمدفوعات ماسترنود من</translation>
+    </message>
+    <message>
+        <source>Found enough users, signing ( waiting %s )</source>
+        <translation>العثور على عدد كافٍ من المستخدمين ، والتوقيع (الانتظار %s)</translation>
+    </message>
+    <message>
+        <source>Found enough users, signing ...</source>
+        <translation>العثور على عدد كافٍ من المستخدمين ، والتوقيع ...</translation>
+    </message>
+    <message>
+        <source>How many blocks to check at startup (default: %u, 0 = all)</source>
+        <translation>كم عدد الكتل المطلوب فحصها عند بدء التشغيل (الافتراضي: %u، 0 =)</translation>
+    </message>
+    <message>
+        <source>Importing...</source>
+        <translation>استيراد...</translation>
+    </message>
+    <message>
+        <source>Include IP addresses in debug output (default: %u)</source>
+        <translation>تضمين عناوين IP في مخرجات التصحيح (القيمة الافتراضية: %u)</translation>
+    </message>
+    <message>
+        <source>Incompatible mode.</source>
+        <translation>وضع غير متوافق.</translation>
+    </message>
+    <message>
+        <source>Incompatible version.</source>
+        <translation>إصدار غير متوافق.</translation>
+    </message>
+    <message>
+        <source>Incorrect or no genesis block found. Wrong datadir for network?</source>
+        <translation>لم يتم العثور على كتلة تكوين أو لم تكون صحيحة. datadir خاطئة للشبكة؟</translation>
+    </message>
+    <message>
+        <source>Information</source>
+        <translation>معلومات</translation>
+    </message>
+    <message>
+        <source>Input is not valid.</source>
+        <translation>الإدخال غير صالح ..</translation>
+    </message>
+    <message>
+        <source>Insufficient funds.</source>
+        <translation>رصيد غير كاف.</translation>
+    </message>
+    <message>
+        <source>Invalid -onion address: '%s'</source>
+        <translation>عنوان - صالح غير صالح: '%s'</translation>
+    </message>
+    <message>
+        <source>Invalid -proxy address: '%s'</source>
+        <translation>عنوان البروكسي غير صحيح : '%s'</translation>
+    </message>
+    <message>
+        <source>Invalid amount for -paytxfee=&lt;amount&gt;: '%s' (must be at least %s)</source>
+        <translation>مبلغ غير صالح لـ -paytxfee = : '%s' &lt;amount&gt; (يجب أن يكون على الأقل %s)</translation>
+    </message>
+    <message>
+        <source>Keypool ran out, please call keypoolrefill first</source>
+        <translation>ركض خارج ، يرجى الاتصال الأولى</translation>
+    </message>
+    <message>
+        <source>Listen for JSON-RPC connections on &lt;port&gt; (default: %u or testnet: %u)</source>
+        <translation>استمع لاتصالات JSON-RPC&lt;port&gt; (الإعداد الافتراضي: %u أو testnet: %u)</translation>
+    </message>
+    <message>
+        <source>Listen for connections on &lt;port&gt; (default: %u or testnet: %u)</source>
+        <translation>استمع لاتصالات&lt;port&gt;(الإعداد الافتراضي: %u أو testnet: %u)</translation>
+    </message>
+    <message>
+        <source>Loading banlist...</source>
+        <translation>جاري تحميل قائمة الحظر...</translation>
+    </message>
+    <message>
+        <source>Loading fulfilled requests cache...</source>
+        <translation>جارٍ تحميل ذاكرة التخزين المؤقت للطلبات المكتملة ...</translation>
+    </message>
+    <message>
+        <source>Loading masternode cache...</source>
+        <translation>جارٍ تحميل ذاكرة التخزين المؤقت في ماسترنود ...</translation>
+    </message>
+    <message>
+        <source>Loading masternode payment cache...</source>
+        <translation>جارٍ تحميل ذاكرة التخزين المؤقت للدفع ماسترنود ...</translation>
+    </message>
+    <message>
+        <source>Lock is already in place.</source>
+        <translation>قفل بالفعل في المكان.</translation>
+    </message>
+    <message>
+        <source>Lock masternodes from masternode configuration file (default: %u)</source>
+        <translation>قفل ماسترنود من ملف تهيئة ماسترنود (الإعداد الافتراضي: %u)</translation>
+    </message>
+    <message>
+        <source>Maximum per-connection receive buffer, &lt;n&gt;*1000 bytes (default: %u)</source>
+        <translation>الحد الأقصى لاستقبال كل مخزن مؤقت ، &lt;n&gt;* 1000 بايت (افتراضيًا: %u)</translation>
+    </message>
+    <message>
+        <source>Maximum per-connection send buffer, &lt;n&gt;*1000 bytes (default: %u)</source>
+        <translation>الحد الأقصى لكل اتصال الإرسال المؤقت ، &lt;n&gt;* 1000 بايت (افتراضيًا: %u)</translation>
+    </message>
+    <message>
+        <source>Mixing in progress...</source>
+        <translation>الدمج قيد التقدم ...</translation>
+    </message>
+    <message>
+        <source>Mnemonic passphrase is too long, must be at most 256 characters</source>
+        <translation>عبارة المرور الطويلة طويلة جدًا ويجب أن تكون 256 حرفًا على الأكثر</translation>
+    </message>
+    <message>
+        <source>Need to specify a port with -whitebind: '%s'</source>
+        <translation>تحتاج إلى تحديد منفذ مع -whitebind: '%s'</translation>
+    </message>
+    <message>
+        <source>No Masternodes detected.</source>
+        <translation>لم يتم اكتشاف ماسترنود.</translation>
+    </message>
+    <message>
+        <source>No compatible Masternode found.</source>
+        <translation>لم يتم العثور على متسترنود متوافق.</translation>
+    </message>
+    <message>
+        <source>Not in the Masternode list.</source>
+        <translation>ليس في قائمة ماسترنود.</translation>
+    </message>
+    <message>
+        <source>Only connect to nodes in network &lt;net&gt; (ipv4, ipv6 or onion)</source>
+        <translation>فقط الاتصال بالعقد في الشبكة &lt;net&gt;  (ipv4, ipv6 or onion)</translation>
+    </message>
+    <message>
+        <source>Port: %d</source>
+        <translation>Port: %d</translation>
+    </message>
+    <message>
+        <source>Prepend debug output with timestamp (default: %u)</source>
+        <translation>إعداد إخراج debug مع الطابع الزمني (الافتراضي: %u)</translation>
+    </message>
+    <message>
+        <source>Rebuild chain state and block index from the blk*.dat files on disk</source>
+        <translation>إعادة إنشاء حالة سلسلة وكتلة فهرس من ملفات blk * .dat على القرص</translation>
+    </message>
+    <message>
+        <source>Rebuild chain state from the currently indexed blocks</source>
+        <translation>إعادة بناء سلسلة السلسلة من الكتل المفهرسة حاليًا</translation>
+    </message>
+    <message>
+        <source>Send trace/debug info to debug.log file (default: %u)</source>
+        <translation>إرسال معلومات التتبع / التصحيح إلى ملف debug.log (الافتراضي: %u)</translation>
+    </message>
+    <message>
+        <source>Send transactions as zero-fee transactions if possible (default: %u)</source>
+        <translation>إرسال المعاملات بصفقات صفرية إن أمكن (الافتراضي: %u)</translation>
+    </message>
+    <message>
+        <source>Set key pool size to &lt;n&gt; (default: %u)</source>
+        <translation>تعيين حجم تجمع مفتاح &lt;n&gt; (افتراضي: %u)</translation>
+    </message>
+    <message>
+        <source>Set the number of threads to service RPC calls (default: %d)</source>
+        <translation>تعيين عدد مؤشرات الترابط لخدمة المكالمات RPC (الافتراضي: %d)</translation>
+    </message>
+    <message>
+        <source>Specify configuration file (default: %s)</source>
+        <translation>تحديد ملف التهيئة (افتراضي: %s)</translation>
+    </message>
+    <message>
+        <source>Specify connection timeout in milliseconds (minimum: 1, default: %d)</source>
+        <translation>تحديد مهلة الاتصال بالمللي ثانية (الحد الأدنى: 1 ، القيمة الافتراضية: %d)</translation>
+    </message>
+    <message>
+        <source>Specify masternode configuration file (default: %s)</source>
+        <translation>تحديد ملف تهيئة ماسترنود (الإعداد الافتراضي: %s)</translation>
+    </message>
+    <message>
+        <source>Specify pid file (default: %s)</source>
+        <translation>تحديد ملف pid (الافتراضي: %s)</translation>
+    </message>
+    <message>
+        <source>Spend unconfirmed change when sending transactions (default: %u)</source>
+        <translation>اقضي على تغيير غير مؤكد عند إرسال المعاملات (القيمة الافتراضية: %u)</translation>
+    </message>
+    <message>
+        <source>Submitted following entries to masternode: %u / %d</source>
+        <translation>يتم إرسال الإدخالات التالية إلى ماسترنود : %u / %d</translation>
+    </message>
+    <message>
+        <source>Submitted to masternode, waiting for more entries ( %u / %d ) %s</source>
+        <translation>تم إرساله إلى ماسترنود ، في انتظار المزيد من الإدخالات ( %u / %d) %s</translation>
+    </message>
+    <message>
+        <source>Submitted to masternode, waiting in queue %s</source>
+        <translation>تم إرساله إلى ماسترنود ، في الانتظار في قائمة الانتظار %s</translation>
+    </message>
+    <message>
+        <source>Synchroning blockchain...</source>
+        <translation>تزامن بلوكشين ...</translation>
+    </message>
+    <message>
+        <source>Synchronization failed</source>
+        <translation>فشل التزامن</translation>
+    </message>
+    <message>
+        <source>Synchronization finished</source>
+        <translation>انتهى التزامن</translation>
+    </message>
+    <message>
+        <source>Synchronizing masternodes...</source>
+        <translation>تزامن ماسترنود...</translation>
+    </message>
+    <message>
+        <source>This is not a Masternode.</source>
+        <translation>هذه ليست ماسترنود.</translation>
+    </message>
+    <message>
+        <source>Threshold for disconnecting misbehaving peers (default: %u)</source>
+        <translation>الحد الأدنى لفصل أقران سوء السلوك (الافتراضي: %u)</translation>
+    </message>
+    <message>
+        <source>Too many %f denominations, removing.</source>
+        <translation>عدد كبير جدًا من %f فئة ، إزالة.</translation>
+    </message>
+    <message>
+        <source>Tor control port password (default: empty)</source>
+        <translation>كلمة مرور منفذ تحكم تور (القيمة الافتراضية: فارغة)</translation>
+    </message>
+    <message>
+        <source>Tor control port to use if onion listening enabled (default: %s)</source>
+        <translation>منفذ تحكم Tor لاستخدامه في حالة تفعيل الاستماع بالبصل (افتراضي: %s)</translation>
+    </message>
+    <message>
+        <source>Unable to start HTTP server. See debug log for details.</source>
+        <translation>غير قادر على بدء خادم ال HTTP. راجع سجل تصحيح الأخطاء للحصول على التفاصيل.</translation>
+    </message>
+    <message>
+        <source>Unknown response.</source>
+        <translation>استجابة غير معروفة.</translation>
+    </message>
+    <message>
+        <source>Unsupported argument -benchmark ignored, use -debug=bench.</source>
+        <translation>الوسيطة غير مدعومة - بامتياز تجاهلها ، استخدم -debug = bench.</translation>
+    </message>
+    <message>
+        <source>Unsupported argument -debugnet ignored, use -debug=net.</source>
+        <translation>تم تجاهل الوسيطة غير المدعومة -debugnet ، استخدم -debug = net.</translation>
+    </message>
+    <message>
+        <source>Unsupported argument -tor found, use -onion.</source>
+        <translation>تم العثور على وسيطة غير مدعومة -tor ، استخدم -onion.</translation>
+    </message>
+    <message>
+        <source>Upgrade wallet to latest format on startup</source>
+        <translation>ترقية المحفظة إلى التنسيق الأحدث عند بدء التشغيل</translation>
+    </message>
+    <message>
+        <source>Use KeePass 2 integration using KeePassHttp plugin (default: %u)</source>
+        <translation>استخدام تكامل KeePass 2 باستخدام المكون الإضافي KeePassHttp (الإعداد الافتراضي: %u)</translation>
+    </message>
+    <message>
+        <source>Use UPnP to map the listening port (default: %u)</source>
+        <translation>استخدام UPnP لتعيين منفذ الاستماع (الافتراضي: %u)</translation>
+    </message>
+    <message>
+        <source>Use the test chain</source>
+        <translation>إستخدم السلسلة التجريبية</translation>
+    </message>
+    <message>
+        <source>User Agent comment (%s) contains unsafe characters.</source>
+        <translation>يحتوي تعليق وكيل المستخدم (%s) على أحرف غير آمنة.</translation>
+    </message>
+    <message>
+        <source>Will retry...</source>
+        <translation>سيعيد المحاولة ...</translation>
+    </message>
+    <message>
+        <source>Invalid masternodeprivkey. Please see documenation.</source>
+        <translation>ماسترنود غير صحيح. يرجى الاطلاع على الوثائق</translation>
+    </message>
+    <message>
+        <source>Can't find random Masternode.</source>
+        <translation>لا يمكن العثور على ماسترنود عشوائي.</translation>
+    </message>
+    <message>
+        <source>Can't mix while sync in progress.</source>
+        <translation>لا يمكن الدمج  أثناء المزامنة قيد التقدم.</translation>
+    </message>
+    <message>
+        <source>Could not parse masternode.conf</source>
+        <translation>لا يمكن تحليل masternode.conf</translation>
+    </message>
+    <message>
+        <source>Invalid netmask specified in -whitelist: '%s'</source>
+        <translation>قناع الشبكة غير صالح محدد في-القائمة البيضاء: '%s'</translation>
+    </message>
+    <message>
+        <source>Invalid port detected in masternode.conf</source>
+        <translation>تم اكتشاف منفذ غير صالح في masternode.conf</translation>
+    </message>
+    <message>
+        <source>Invalid script detected.</source>
+        <translation>تم اكتشاف نص برمجي غير صالح.</translation>
+    </message>
+    <message>
+        <source>KeePassHttp id for the established association</source>
+        <translation>معرف KeePassHttp للرابطة المنشأة</translation>
+    </message>
+    <message>
+        <source>KeePassHttp key for AES encrypted communication with KeePass</source>
+        <translation>مفتاح KeePassHttp للتواصل المشفر مع AES KeePass</translation>
+    </message>
+    <message>
+        <source>Keep at most &lt;n&gt; unconnectable transactions in memory (default: %u)</source>
+        <translation>ابقى على اقصى حد &lt;n&gt; معاملات غير قابلة للاتصال في الذاكرة (القيمة الافتراضية: %u)</translation>
+    </message>
+    <message>
+        <source>Disable all Dash specific functionality (Masternodes, PrivateSend, InstantSend, Governance) (0-1, default: %u)</source>
+        <translation>تعطيل جميع وظائف داش المحددة (ماسترنود ، الإرسال المخفي  ، الإرسال الفوري ، الحوكمة) (0-1 ، القيمة الافتراضية: %u)</translation>
+    </message>
+    <message>
+        <source>Discover own IP addresses (default: 1 when listening and no -externalip or -proxy)</source>
+        <translation>اكتشاف عناوين IP الخاصة (الافتراضي: 1 عند الاستماع وعدم وجود - أو "خضوع")</translation>
+    </message>
+    <message>
+        <source>Do not keep transactions in the mempool longer than &lt;n&gt; hours (default: %u)</source>
+        <translation>لا تحتفظ بالمعاملات في الذاكرة أكثر من &lt;n&gt; ساعات (الافتراضي: %u)</translation>
+    </message>
+    <message>
+        <source>Enable InstantSend, show confirmations for locked transactions (0-1, default: %u)</source>
+        <translation>تمكين الإرسال الفوري ، عرض التأكيدات للمعاملات المقفلة (0-1 ، القيمة الافتراضية: %u)</translation>
+    </message>
+    <message>
+        <source>Enable multiple PrivateSend mixing sessions per block, experimental (0-1, default: %u)</source>
+        <translation>تمكين جلسات دمج الإرسال المحمي متعددة لكل كتلة ، تجريبية (0-1 ، القيمة الافتراضية: %u)</translation>
+    </message>
+    <message>
+        <source>Enable use of automated PrivateSend for funds stored in this wallet (0-1, default: %u)</source>
+        <translation>تمكين استخدام الإرسال المخفي التلقائي للأموال المخزنة في هذه المحفظة (0-1 ، القيمة الافتراضية: %u)</translation>
+    </message>
+    <message>
+        <source>Execute command when a wallet InstantSend transaction is successfully locked (%s in cmd is replaced by TxID)</source>
+        <translation>تنفيذ الأمر عند قفل معاملة الإرسال الفوري في المحفظة بنجاح (يتم استبدال %s في cmd بـ TxID)</translation>
+    </message>
+    <message>
+        <source>Failed to create backup, file already exists! This could happen if you restarted wallet in less than 60 seconds. You can continue if you are ok with this.</source>
+        <translation>فشل إنشاء نسخة احتياطية ، يوجد ملف بالفعل! قد يحدث هذا إذا أعدت تشغيل المحفظة في أقل من 60 ثانية. يمكنك الاستمرار إذا كنت على ما يرام مع هذا.</translation>
+    </message>
+    <message>
+        <source>Fees (in %s/kB) smaller than this are considered zero fee for relaying, mining and transaction creation (default: %s)</source>
+        <translation>الرسوم (بالكيلو %s / kB) الأصغر من ذلك تعتبر رسومًا صفرًا في حالة الترحيل والتعدين وإنشاء المعاملات (الافتراضي: %s)</translation>
+    </message>
+    <message>
+        <source>Fees (in %s/kB) smaller than this are considered zero fee for transaction creation (default: %s)</source>
+        <translation>الرسوم (بـ %s / kB) الأصغر من ذلك تعتبر رسومًا صفرًا لإنشاء المعاملات (الافتراضي: %s)</translation>
+    </message>
+    <message>
+        <source>If &lt;category&gt; is not supplied or if &lt;category&gt; = 1, output all debugging information.</source>
+        <translation>إذا &lt;category&gt; لا يتم توفير أو إذا &lt;category&gt; = 1 ، إخراج كافة معلومات التصحيح</translation>
+    </message>
+    <message>
+        <source>InstantSend doesn't support sending values that high yet. Transactions are currently limited to %1 DASH.</source>
+        <translation>لا يدعم الإرسال الغوري إرسال قيم عالية حتى الآن. تقتصر المعاملات حاليًا على%1 داش.</translation>
+    </message>
+    <message>
+        <source>InstantSend requires inputs with at least %d confirmations, you might need to wait a few minutes and try again.</source>
+        <translation>يتطلب الإرسال الفوري مدخلات مع %d تأكيدات على الأقل ، قد تحتاج إلى الانتظار بضع دقائق وإعادة المحاولة.</translation>
+    </message>
+    <message>
+        <source>Maintain a full address index, used to query for the balance, txids and unspent outputs for addresses (default: %u)</source>
+        <translation>الاحتفاظ بفهرس كامل للعنوان ، يُستخدم للاستعلام عن الرصيد ، و txids والمخرجات غير المنفقة للعناوين (القيمة الافتراضية: %u)</translation>
+    </message>
+    <message>
+        <source>Maintain a full spent index, used to query the spending txid and input index for an outpoint (default: %u)</source>
+        <translation>الاحتفاظ بفهرس كامل مستنفد ، يُستخدم للاستعلام عن إنفاق txid ومُدخل فهرس نقطة خارجية (افتراضي: %u)</translation>
+    </message>
+    <message>
+        <source>Maintain a timestamp index for block hashes, used to query blocks hashes by a range of timestamps (default: %u)</source>
+        <translation>الحفاظ على فهرس الطابع الزمني لكتل التجزئات ، المستخدمة في الاستعلام عن تجزئة القطع بواسطة مجموعة من الطوابع الزمنية (الإعداد الافتراضي: %u)</translation>
+    </message>
+    <message>
+        <source>Maintain at most &lt;n&gt; connections to peers (temporary service connections excluded) (default: %u)</source>
+        <translation>الحفاظ على الأكثر  &lt;n&gt; اتصالات للأقران (باستثناء اتصالات الخدمة المؤقتة) (الافتراضي: %u)</translation>
+    </message>
+    <message>
+        <source>PrivateSend uses exact denominated amounts to send funds, you might simply need to anonymize some more coins.</source>
+        <translation>تستخدم الإرسال المخفي مبالغ محددة بدقة لإرسال الأموال ، قد تحتاج ببساطة إلى إخفاء بعض العملات الأخرى.</translation>
+    </message>
+    <message>
+        <source>Prune configured below the minimum of %d MiB.  Please use a higher number.</source>
+        <translation>تم تكوين Prune أسفل الحد الأدنى من %d MiB. يرجى استخدام عدد أكبر.</translation>
+    </message>
+    <message>
+        <source>Prune: last wallet synchronisation goes beyond pruned data. You need to -reindex (download the whole blockchain again in case of pruned node)</source>
+        <translation>تقليم: آخر تزامن المحفظة يتجاوز البيانات المحصورة. تحتاج إلى -reindex (قم بتنزيل بلوكشين بأكمله مرة أخرى في حالة عقدة مقشرة)</translation>
+    </message>
+    <message>
+        <source>Randomize credentials for every proxy connection. This enables Tor stream isolation (default: %u)</source>
+        <translation>عشوائية وثائق الاعتماد لكل اتصال عبر وكيل. يتيح ذلك عزل تيار تور (القيمة الافتراضية: %u)</translation>
+    </message>
+    <message>
+        <source>Rescans are not possible in pruned mode. You will need to use -reindex which will download the whole blockchain again.</source>
+        <translation>إعادة المسح ليست ممكنة في وضع مجسم. سوف تحتاج إلى استخدام -reindex التي ستقوم بتنزيل بلوكشين كله مرة أخرى.</translation>
+    </message>
+    <message>
+        <source>Specify full path to directory for automatic wallet backups (must exist)</source>
+        <translation>تحديد المسار الكامل للدليل للنسخ الاحتياطية للمحفظة التلقائية (يجب أن تكون موجودة)</translation>
+    </message>
+    <message>
+        <source>Support filtering of blocks and transaction with bloom filters (default: %u)</source>
+        <translation>دعم تصفية الكتل والمعاملات مع مرشحات bloom (الافتراضي: %u)</translation>
+    </message>
+    <message>
+        <source>The block database contains a block which appears to be from the future. This may be due to your computer's date and time being set incorrectly. Only rebuild the block database if you are sure that your computer's date and time are correct</source>
+        <translation>تحتوي قاعدة البيانات كتلة على كتلة يبدو من المستقبل. قد يكون هذا بسبب تعيين تاريخ ووقت الكمبيوتر الخاص بك بشكل غير صحيح. فقط إعادة إنشاء قاعدة البيانات كتلة إذا كنت متأكداً من صحة التاريخ والوقت للكمبيوتر الخاص بك</translation>
+    </message>
+    <message>
+        <source>The transaction amount is too small to send after the fee has been deducted</source>
+        <translation>قيمة المعاملة صغيرة جدًا ولا يمكن إرسالها بعد خصم الرسوم</translation>
+    </message>
+    <message>
+        <source>Total length of network version string (%i) exceeds maximum length (%i). Reduce the number or size of uacomments.</source>
+        <translation>إجمالي طول سلسلة إصدار الشبكة (%i) يتجاوز الحد الأقصى للطول (%i). تقليل عدد أو حجم </translation>
+    </message>
+    <message>
+        <source>Tries to keep outbound traffic under the given target (in MiB per 24h), 0 = no limit (default: %d)</source>
+        <translation>يحاول الحفاظ على حركة المرور الصادرة تحت الهدف المحدد (في MiB لكل 24 ساعة) ، 0 = بلا حدود (الافتراضي: %d)</translation>
+    </message>
+    <message>
+        <source>Unable to locate enough PrivateSend denominated funds for this transaction.</source>
+        <translation>غير قادر على تحديد ما يكفي من الأموال المخصصة الإرسال المحمي لهذه الصفقة ..</translation>
+    </message>
+    <message>
+        <source>Unsupported argument -socks found. Setting SOCKS version isn't possible anymore, only SOCKS5 proxies are supported.</source>
+        <translation>تم العثور على وسيطة غير مدعومة. إعداد SOCKS غير ممكن بعد الآن ، يتم دعم بروكسيات SOCKS5 فقط.</translation>
+    </message>
+    <message>
+        <source>Unsupported argument -whitelistalwaysrelay ignored, use -whitelistrelay and/or -whitelistforcerelay.</source>
+        <translation>الوسيطة غير المدعومة -whitelistalwaysrelay تم تجاهلها واستخدامها - و / أو whitelistforcerelay و / أو -whitelistforcerelay.</translation>
+    </message>
+    <message>
+        <source>Use UPnP to map the listening port (default: 1 when listening and no -proxy)</source>
+        <translation>استخدام UPnP لتعيين منفذ الاستماع (الافتراضي: 1 عند الاستماع و no -proxy)</translation>
+    </message>
+    <message>
+        <source>WARNING! Failed to replenish keypool, please unlock your wallet to do so.</source>
+        <translation>تحذير! تعذّر تجديد مفتاح keypool ، يرجى إلغاء قفل محفظتك للقيام بذلك.</translation>
+    </message>
+    <message>
+        <source>Wallet is locked, can't replenish keypool! Automatic backups and mixing are disabled, please unlock your wallet to replenish keypool.</source>
+        <translation>المحفظة مؤمّنة ، ولا يمكن تجديد مفتاح keypool! تم تعطيل النسخ الاحتياطي التلقائي والاختلاط ، يرجى فتح محفظتك لتجديد keypool</translation>
+    </message>
+    <message>
+        <source>Warning: Unknown block versions being mined! It's possible unknown rules are in effect</source>
+        <translation>تحذير: يتم نسخ إصدارات الحظر غير المعروفة! من المحتمل أن تكون قواعد غير معروفة سارية المفعول</translation>
+    </message>
+    <message>
+        <source>You need to rebuild the database using -reindex to go back to unpruned mode.  This will redownload the entire blockchain</source>
+        <translation>تحتاج إلى إعادة إنشاء قاعدة البيانات باستخدام -reindex للعودة إلى الوضعية الغير مجردة. هذا سوف يعيد تحميل سلسلة الكتل بأكملها</translation>
+    </message>
+    <message>
+        <source>(%d could be used only on mainnet)</source>
+        <translation>(%d يمكن استخدامها فقط على mainnet)</translation>
+    </message>
+    <message>
+        <source>(default: %u)</source>
+        <translation>(القيمة الافتراضية: %u)</translation>
+    </message>
+    <message>
+        <source>(must be %d for mainnet)</source>
+        <translation>(يجب أن يكون %d لـ mainnet)</translation>
+    </message>
+    <message>
+        <source>-maxmempool must be at least %d MB</source>
+        <translation>يجب أن يكون maxmempool على الأقل %d ميغابايت</translation>
+    </message>
+    <message>
+        <source>&lt;category&gt; can be:</source>
+        <translation>&lt;category&gt; يمكن أن يكون</translation>
+    </message>
+    <message>
+        <source>Append comment to the user agent string</source>
+        <translation>إلحاق تعليق إلى سلسلة وكيل المستخدم</translation>
+    </message>
+    <message>
+        <source>Automatic backups disabled</source>
+        <translation>النسخ الاحتياطي التلقائي تعطيل</translation>
+    </message>
+    <message>
+        <source>Automatically create Tor hidden service (default: %d)</source>
+        <translation>إنشاء خدمة تور المخفية تلقائيًا (القيمة الافتراضية: %d)</translation>
+    </message>
+    <message>
+        <source>ERROR! Failed to create automatic backup</source>
+        <translation>خطأ! فشل إنشاء نسخة احتياطية تلقائية</translation>
+    </message>
+    <message>
+        <source>Enable publish hash block in &lt;address&gt;</source>
+        <translation>تمكين حظر التجزئة في &lt;address&gt;</translation>
+    </message>
+    <message>
+        <source>Enable publish hash transaction (locked via InstantSend) in &lt;address&gt;</source>
+        <translation>تمكين عملية التجزئة المنشورة (مؤمنة عبر الإرسال الفوري) في &lt;address&gt;</translation>
+    </message>
+    <message>
+        <source>Enable publish hash transaction in &lt;address&gt;</source>
+        <translation>تمكين معالجة التجزئة في &lt;address&gt;</translation>
+    </message>
+    <message>
+        <source>Enable publish raw block in &lt;address&gt;</source>
+        <translation>تمكين نشر كتلة الخام في &lt;address&gt;</translation>
+    </message>
+    <message>
+        <source>Enable publish raw transaction (locked via InstantSend) in &lt;address&gt;</source>
+        <translation>تمكين نشر المعاملة الأولية (مؤمّنة عبر InstantSend) في &lt;address&gt;</translation>
+    </message>
+    <message>
+        <source>Enable publish raw transaction in &lt;address&gt;</source>
+        <translation>تمكين نشر المعاملة الأولية في &lt;address&gt;</translation>
+    </message>
+    <message>
+        <source>Enable transaction replacement in the memory pool (default: %u)</source>
+        <translation>تمكين استبدال المعاملة في تجمع الذاكرة (الافتراضي: %u)</translation>
+    </message>
+    <message>
+        <source>Error: A fatal internal error occurred, see debug.log for details</source>
+        <translation>خطأ: حدث خطأ داخلي فادح، راجع debug.log للحصول على التفاصيل</translation>
+    </message>
+    <message>
+        <source>Failed to create backup %s!</source>
+        <translation>فشل إنشاء النسخة الاحتياطية %s!</translation>
+    </message>
+    <message>
+        <source>Failed to create backup, error: %s</source>
+        <translation>أخفق إنشاء نسخة احتياطية ، خطأ: %s</translation>
+    </message>
+    <message>
+        <source>Failed to delete backup, error: %s</source>
+        <translation>أخفق حذف النسخة الاحتياطية ، الخطأ: %s</translation>
+    </message>
+    <message>
+        <source>Failed to parse host:port string</source>
+        <translation>فشل تحليل المضيف: سلسلة المنفذ</translation>
+    </message>
+    <message>
+        <source>Fee (in %s/kB) to add to transactions you send (default: %s)</source>
+        <translation>الرسوم (في %s / kB) لإضافتها إلى المعاملات التي ترسلها (الافتراضي: %s)</translation>
+    </message>
+    <message>
+        <source>Imports blocks from external blk000??.dat file on startup</source>
+        <translation>استيراد كتل من ملف blk000??.dat الخارجي عند بدء التشغيل</translation>
+    </message>
+    <message>
+        <source>InstantSend options:</source>
+        <translation>خيارات الإرسال الفوري:</translation>
+    </message>
+    <message>
+        <source>Invalid amount for -fallbackfee=&lt;amount&gt;: '%s'</source>
+        <translation>المبلغ غير صالح forfallbackfee = &lt;amount&gt; :'%s</translation>
+    </message>
+    <message>
+        <source>Keep the transaction memory pool below &lt;n&gt; megabytes (default: %u)</source>
+        <translation>إبقاء تجمع ذاكرة المعاملة أدناه &lt;n&gt; ميغابايت (افتراضي: %u)</translation>
+    </message>
+    <message>
+        <source>Last PrivateSend was too recent.</source>
+        <translation>اخر إرسال مخفي كان حديث للغاية</translation>
+    </message>
+    <message>
+        <source>Last successful PrivateSend action was too recent.</source>
+        <translation>آخر إجراء الإرسال المخفي ناجح كان حديث للغاية.</translation>
+    </message>
+    <message>
+        <source>Line: %d</source>
+        <translation>سطر: %d</translation>
+    </message>
+    <message>
+        <source>Loading addresses...</source>
+        <translation>تحميل العنوان</translation>
+    </message>
+    <message>
+        <source>Loading block index...</source>
+        <translation>تحميل مؤشر الكتلة</translation>
+    </message>
+    <message>
+        <source>Loading governance cache...</source>
+        <translation>جارٍ تحميل ذاكرة التخزين المؤقتة ...</translation>
+    </message>
+    <message>
+        <source>Loading wallet... (%3.2f %%)</source>
+        <translation>جارٍ تحميل المحفظة ... (%3.2f %%)</translation>
+    </message>
+    <message>
+        <source>Loading wallet...</source>
+        <translation>تحميل المحفظه</translation>
+    </message>
+    <message>
+        <source>Location of the auth cookie (default: data dir)</source>
+        <translation>موقع ملف تعريف ارتباط المصادقة (القيمة الافتراضية: دليل البيانات)</translation>
+    </message>
+    <message>
+        <source>Make the wallet broadcast transactions</source>
+        <translation>إنتاج معاملات بث المحفظة</translation>
+    </message>
+    <message>
+        <source>Masternode cache is empty, skipping payments and governance cache...</source>
+        <translation>ذاكرة التخزين المؤقت ماسترنود فارغة ، وتخطي الدفعات وذاكرة التخزين المؤقت للحوكمة ...</translation>
+    </message>
+    <message>
+        <source>Masternode options:</source>
+        <translation>خيارات ماسترنود</translation>
+    </message>
+    <message>
+        <source>Masternode queue is full.</source>
+        <translation>طابور ماسترنود ممتلئ.</translation>
+    </message>
+    <message>
+        <source>Masternode:</source>
+        <translation>ماسترنود</translation>
+    </message>
+    <message>
+        <source>Minimum bytes per sigop in transactions we relay and mine (default: %u)</source>
+        <translation>.الحد الأدنى من البايت لكل sigop في المعاملات التي نقوم بترحيلها وبياناتي (الافتراضي: %u)</translation>
+    </message>
+    <message>
+        <source>Missing input transaction information.</source>
+        <translation>معلومات حول معاملات الإدخال مفقودة.</translation>
+    </message>
+    <message>
+        <source>No errors detected.</source>
+        <translation>لم يتم اكتشاف أخطاء.</translation>
+    </message>
+    <message>
+        <source>No matching denominations found for mixing.</source>
+        <translation>لم يتم العثور على فئات مطابقة للاختلاط.</translation>
+    </message>
+    <message>
+        <source>Node relay options:</source>
+        <translation>خيارات ترحيل العقد:</translation>
+    </message>
+    <message>
+        <source>Non-standard public key detected.</source>
+        <translation>تم اكتشاف مفتاح عام غير قياسي.</translation>
+    </message>
+    <message>
+        <source>Not compatible with existing transactions.</source>
+        <translation>غير متوافق مع المعاملات الحالية.</translation>
+    </message>
+    <message>
+        <source>Not enough file descriptors available.</source>
+        <translation>لا تتوفر واصفات ملفات كافية.</translation>
+    </message>
+    <message>
+        <source>Not enough funds to anonymize.</source>
+        <translation>لا توجد أموال كافية لإخفاء الهوية.</translation>
+    </message>
+    <message>
+        <source>Number of automatic wallet backups (default: %u)</source>
+        <translation>عدد النسخ الاحتياطية للمحفظة التلقائية (الافتراضي: %u)</translation>
+    </message>
+    <message>
+        <source>Options:</source>
+        <translation>خيارات: </translation>
+    </message>
+    <message>
+        <source>Password for JSON-RPC connections</source>
+        <translation>كلمة المرور لاتصالات JSON-RPC</translation>
+    </message>
+    <message>
+        <source>Print version and exit</source>
+        <translation>طباعة النسخة ومن ثم الخروج</translation>
+    </message>
+    <message>
+        <source>PrivateSend is idle.</source>
+        <translation>الإرسال المخفي غير نشط.</translation>
+    </message>
+    <message>
+        <source>PrivateSend options:</source>
+        <translation>خيارات الإرسال المخفي:</translation>
+    </message>
+    <message>
+        <source>PrivateSend request complete:</source>
+        <translation>اكتمل طلب الإرسال المخفي:</translation>
+    </message>
+    <message>
+        <source>PrivateSend request incomplete:</source>
+        <translation>طلب الإرسال المخفي غير مكتمل:</translation>
+    </message>
+    <message>
+        <source>Prune cannot be configured with a negative value.</source>
+        <translation>لا يمكن تهيئة التجريد بقيمة سالبة.</translation>
+    </message>
+    <message>
+        <source>Prune mode is incompatible with -txindex.</source>
+        <translation>وضع التجريد غير متوافق مع -txindex.</translation>
+    </message>
+    <message>
+        <source>Pruning blockstore...</source>
+        <translation>تجريد مخزن الكتل...</translation>
+    </message>
+    <message>
+        <source>Rescan the block chain for missing wallet transactions on startup</source>
+        <translation>إعادة فحص سلسلة كتلة معاملات المحفظة المفقودة عند بدء التشغيل</translation>
+    </message>
+    <message>
+        <source>The wallet will avoid paying less than the minimum relay fee.</source>
+        <translation>سوف تتجنب المحفظة دفع أقل من الحد الأدنى لرسوم التتابع.</translation>
+    </message>
+    <message>
+        <source>This is the minimum transaction fee you pay on every transaction.</source>
+        <translation>هذا هو الحد الأدنى من رسوم المعاملة التي تدفعها في كل معاملة.</translation>
+    </message>
+    <message>
+        <source>This is the transaction fee you will pay if you send a transaction.</source>
+        <translation>هذه هي رسوم المعاملة التي ستدفعها إذا أرسلت معاملة.</translation>
+    </message>
+    <message>
+        <source>Transaction amounts must not be negative</source>
+        <translation>يجب ألا تكون قيمة المعاملة سلبية</translation>
+    </message>
+    <message>
+        <source>Transaction has too long of a mempool chain</source>
+        <translation>المعاملة طويلة جدًا من سلسلة </translation>
+    </message>
+    <message>
+        <source>Transaction must have at least one recipient</source>
+        <translation>يجب أن تحتوي المعاملة على مستلم واحد على الأقل</translation>
+    </message>
+    <message>
+        <source>Trying to connect...</source>
+        <translation>تحاول الاتصال...</translation>
+    </message>
+    <message>
+        <source>Unable to bind to %s on this computer. %s is probably already running.</source>
+        <translation>يتعذر الربط مع %s على هذا الكمبيوتر. من المحتمل أن %s قيد التشغيل بالفعل.</translation>
+    </message>
+    <message>
+        <source>Upgrading UTXO database</source>
+        <translation>ترقية قاعدة بيانات UTXO</translation>
+    </message>
+    <message>
+        <source>Use devnet chain with provided name</source>
+        <translation>استخدم سلسلة devnet بالاسم المقدم</translation>
+    </message>
+    <message>
+        <source>Wallet debugging/testing options:</source>
+        <translation>خيارات تصحيح / اختبار المحفظة:</translation>
+    </message>
+    <message>
+        <source>Wallet needed to be rewritten: restart %s to complete</source>
+        <translation>يلزم إعادة كتابة المحفظة: إعادة تشغيل %s لإكمال العملية</translation>
+    </message>
+    <message>
+        <source>Warning: unknown new rules activated (versionbit %i)</source>
+        <translation>تحذير: قواعد جديدة غير معروفة مفعلة (versionbit %i)</translation>
+    </message>
+    <message>
+        <source>Wasn't able to create wallet backup folder %s!</source>
+        <translation>لم يكن قادراً على إنشاء مجلد النسخ الاحتياطي المحفظة %s!</translation>
+    </message>
+    <message>
+        <source>Whether to operate in a blocks only mode (default: %u)</source>
+        <translation>ما إذا كان سيتم العمل في وضع الكتل فقط (الإعداد الافتراضي: %u)</translation>
+    </message>
+    <message>
+        <source>ZeroMQ notification options:</source>
+        <translation>خيارات إعلام ZeroMQ:</translation>
+    </message>
+    <message>
+        <source>no mixing available.</source>
+        <translation>لا خلط المتاحة.</translation>
+    </message>
+    <message>
+        <source>see debug.log for details.</source>
+        <translation>انظر debug.log للحصول على التفاصيل.</translation>
+    </message>
+    <message>
+        <source>RPC server options:</source>
+        <translation>خيارات خادم RPC:</translation>
+    </message>
+    <message>
+        <source>Dash Core</source>
+        <translation>جوهر الداش</translation>
+    </message>
+    <message>
+        <source>The %s developers</source>
+        <translation>%s المبرمجون</translation>
+    </message>
+    <message>
+        <source>Accept connections from outside (default: 1 if no -proxy or -connect/-noconnect)</source>
+        <translation>قبول الاتصالات من الخارج (الافتراضي: 1 إذا لم يكن هناك أي -proxy أو -connect / -noconnect)</translation>
+    </message>
+    <message>
+        <source>Cannot obtain a lock on data directory %s. %s is probably already running.</source>
+        <translation>لا يمكن الحصول على قفل على دليل البيانات %s. من المحتمل أن %s يعمل بالفعل.</translation>
+    </message>
+    <message>
+        <source>Connect only to the specified node(s); -noconnect or -connect=0 alone to disable automatic connections</source>
+        <translation>الاتصال فقط (بالعقدة) المحددة ؛ -اتصال أو اتصال = 0 فقط لتعطيل الاتصالات التلقائية</translation>
+    </message>
+    <message>
+        <source>Distributed under the MIT software license, see the accompanying file %s or %s</source>
+        <translation>موزعة تحت ترخيص برنامج MIT ، راجع الملف المرافق %s أو %s</translation>
+    </message>
+    <message>
+        <source>Error reading %s! All keys read correctly, but transaction data or address book entries might be missing or incorrect.</source>
+        <translation>خطأ في قراءة %s! قراءة كافة المفاتيح بشكل صحيح ، ولكن قد تكون بيانات المعاملة أو إدخالات دفتر العناوين مفقودة أو غير صحيحة.</translation>
+    </message>
+    <message>
+        <source>Force relay of transactions from whitelisted peers even if they violate local relay policy (default: %d)</source>
+        <translation>فرض ترحيل المعاملات من أقران القائمة البيضاء حتى إذا كانت تنتهك سياسة الترحيل المحلي (افتراضي: %d)</translation>
+    </message>
+    <message>
+        <source>Incorrect or no devnet genesis block found. Wrong datadir for devnet specified?</source>
+        <translation>تم العثور على كتلة تكوين devnet غير صحيحة أو لا. datadir خاطئة ل devnet المحدد؟</translation>
+    </message>
+    <message>
+        <source>Maximum allowed median peer time offset adjustment. Local perspective of time may be influenced by peers forward or backward by this amount. (default: %u seconds)</source>
+        <translation>الحد الأقصى المسموح به من متوسط الوقت لتعديل الأقران. قد يتأثر المنظور المحلي للوقت بالأقران إلى الأمام أو إلى الخلف بهذا المقدار. (افتراضي: %u ثانية)</translation>
+    </message>
+    <message>
+        <source>Maximum total fees (in %s) to use in a single wallet transaction or raw transaction; setting this too low may abort large transactions (default: %s)</source>
+        <translation>الحد الأقصى للرسوم الإجمالية (في %s) لاستخدامها في معاملة محفظة واحدة أو معاملة أولية ؛ قد يؤدي تعيين هذا منخفض جدًا إلى إحباط المعاملات الكبيرة (الإعداد الافتراضي: %s)</translation>
+    </message>
+    <message>
+        <source>Override spork address. Only useful for regtest and devnet. Using this on mainnet or testnet will ban you.</source>
+        <translation>تجاوز عنوان السكة. مفيدة فقط ل regtest و devnet. استخدام هذا على mainnet أو testnet سيحظر لك.</translation>
+    </message>
+    <message>
+        <source>Please check that your computer's date and time are correct! If your clock is wrong, %s will not work properly.</source>
+        <translation>يرجى التحقق من صحة تاريخ ووقت جهازك! إذا كانت ساعتك خاطئة ، فلن يعمل %s بشكل صحيح.</translation>
+    </message>
+    <message>
+        <source>Please contribute if you find %s useful. Visit %s for further information about the software.</source>
+        <translation>يرجى المساهمة إذا وجدت %s مفيداً. تفضل بزيارة %s لمزيد من المعلومات حول البرنامج.</translation>
+    </message>
+    <message>
+        <source>Provide liquidity to PrivateSend by infrequently mixing coins on a continual basis (%u-%u, default: %u, 1=very frequent, high fees, %u=very infrequent, low fees)</source>
+        <translation>توفير السيولة إلى الإرسال المخفي عن طريق خلط العملات المعدنية بشكل متكرر على أساس مستمر (%u-%u ، القيمة الافتراضية: %u ، 1 = متكررة للغاية ، رسوم عالية ، %u = نادر جداً ، رسوم منخفضة)</translation>
+    </message>
+    <message>
+        <source>Query for peer addresses via DNS lookup, if low on addresses (default: 1 unless -connect/-noconnect)</source>
+        <translation>الاستعلام عن عناوين النظير عبر البحث عن DNS ، إذا كان منخفضًا في العناوين (افتراضي: 1 ، ما لم يتم الاتصال / الاتصال)</translation>
+    </message>
+    <message>
+        <source>Reduce storage requirements by enabling pruning (deleting) of old blocks. This allows the pruneblockchain RPC to be called to delete specific blocks, and enables automatic pruning of old blocks if a target size in MiB is provided. This mode is incompatible with -txindex and -rescan. Warning: Reverting this setting requires re-downloading the entire blockchain. (default: 0 = disable pruning blocks, 1 = allow manual pruning via RPC, &gt;%u = automatically prune block files to stay under the specified target size in MiB)</source>
+        <translation>تقليل متطلبات التخزين عن طريق تمكين التقليم (حذف) الكتل القديمة. يسمح هذا باستدعاء RUN pruneblockchain لحذف كتل معينة ، وتمكين التقليم التلقائي للكتل القديمة إذا تم توفير حجم الهدف في MiB. هذا الوضع غير متوافق مع -txindex و -rescan. تحذير: يتطلب إعادة هذا الإعداد إعادة تنزيل blockchain بالكامل. (افتراضي: 0 = تعطيل كتل التشذيب ، 1 = السماح بالتقليم اليدوي عن طريق RPC ،&gt; %u = ملفات التجميع تلقائياً للتخفيض تحت حجم الهدف المحدد في MiB)</translation>
+    </message>
+    <message>
+        <source>Set lowest fee rate (in %s/kB) for transactions to be included in block creation. (default: %s)</source>
+        <translation>تعيين أدنى معدل رسوم (في %s / kB) للمعاملات ليتم تضمينها في إنشاء كتلة. (افتراضي: %s)</translation>
+    </message>
+    <message>
+        <source>This is the transaction fee you may pay when fee estimates are not available.</source>
+        <translation>هذه هي رسوم المعاملة التي قد تدفعها عندما لا تكون تقديرات الرسوم متوفرة.</translation>
+    </message>
+    <message>
+        <source>This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit %s and cryptographic software written by Eric Young and UPnP software written by Thomas Bernard.</source>
+        <translation>يتضمن هذا المنتج برنامجًا تم تطويره بواسطة OpenSSL Project للاستخدام في OpenSSL Toolkit %s وبرنامج التشفير الذي كتبه Eric Young و UPnP الذي كتبه Thomas Bernard.</translation>
+    </message>
+    <message>
+        <source>Unable to locate enough PrivateSend non-denominated funds for this transaction.</source>
+        <translation>غير قادر على تحديد ما يكفي من الأموال المخصصة غير المقومة الإرسال المخفي لهذه الصفقة.</translation>
+    </message>
+    <message>
+        <source>Use N separate masternodes for each denominated input to mix funds (%u-%u, default: %u)</source>
+        <translation>استخدم N ماسترنود منفصلة لكل إدخال مقنن لخلط الصناديق (%u-%u ، القيمة الافتراضية: %u)</translation>
+    </message>
+    <message>
+        <source>Use hierarchical deterministic key generation (HD) after BIP39/BIP44. Only has effect during wallet creation/first start</source>
+        <translation>استخدام جيل المفتاح الحتمي الهرمي (HD) بعد BIP39 / BIP44. يكون تأثيره فقط أثناء إنشاء المحفظة / البدء الأول</translation>
+    </message>
+    <message>
+        <source>User defined mnemonic passphrase for HD wallet (BIP39). Only has effect during wallet creation/first start (default: empty string)</source>
+        <translation>تعريف المستخدم عبارة مرور ذاكري لمحفظة HD (BIP39). يكون تأثيره فقط أثناء إنشاء المحفظة / البدء الأول (افتراضي: سلسلة فارغة)</translation>
+    </message>
+    <message>
+        <source>Username and hashed password for JSON-RPC connections. The field &lt;userpw&gt; comes in the format: &lt;USERNAME&gt;:&lt;SALT&gt;$&lt;HASH&gt;. A canonical python script is included in share/rpcuser. The client then connects normally using the rpcuser=&lt;USERNAME&gt;/rpcpassword=&lt;PASSWORD&gt; pair of arguments. This option can be specified multiple times</source>
+        <translation>اسم المستخدم وكلمة المرور المجزأة لاتصالات JSON-RPC. الميدان&lt;userpw&gt; يأتي في الشكل:&lt;USERNAME&gt; : &lt;SALT&gt; $&lt;HASH&gt; يتم تضمين النصي بيثون الكنسي في المشاركة / rpcuser. ثم يتصل العميل عادة باستخدام rpcuser = &lt;USERNAME&gt; /rpcpassword&lt;PASSWORD&gt;  زوج من الحجج. يمكن تحديد هذا الخيار عدة مرات</translation>
+    </message>
+    <message>
+        <source>Wallet will not create transactions that violate mempool chain limits (default: %u)</source>
+        <translation>لن تنشئ المحفظة المعاملات التي تنتهك حدود سلسلة mempool (القيمة الافتراضية: %u)</translation>
+    </message>
+    <message>
+        <source>Warning: At least %d of %d masternodes are running on a newer software version. Please check latest releases, you might need to update too.</source>
+        <translation>تحذير: يتم تشغيل %d من %d ماسترنود على إصدار برنامج أحدث. يرجى التحقق من أحدث الإصدارات ، فقد تحتاج إلى التحديث أيضًا.</translation>
+    </message>
+    <message>
+        <source>Warning: Every masternode (out of %d known ones) is running on a newer software version. Please check latest releases, it's very likely that you missed a major/critical update.</source>
+        <translation>تحذير: يتم تشغيل كل ماسترنود (خارج %d المعروفة) على إصدار برنامج أحدث. يرجى التحقق من أحدث الإصدارات ، من المحتمل جدًا أنك فاتتك تحديثًا رئيسيًا / هامًا.</translation>
+    </message>
+    <message>
+        <source>Warning: Wallet file corrupt, data salvaged! Original %s saved as %s in %s; if your balance or transactions are incorrect you should restore from a backup.</source>
+        <translation>تحذير: ملف المحفظة فاسد ، تم انقاذ البيانات! تم حفظ %s الأصلي ك %s في %s؛ إذا كان رصيدك أو كانت معاملاتك غير صحيحة، فيجب عليك الإستعادة من نسخة احتياطية.</translation>
+    </message>
+    <message>
+        <source>Whitelist peers connecting from the given IP address (e.g. 1.2.3.4) or CIDR notated network (e.g. 1.2.3.0/24). Can be specified multiple times.</source>
+        <translation>أقران القائمة البيضاء المتصلين من عنوان IP المحدد (مثل 1.2.3.4) أو شبكة CIDR Notated (على سبيل المثال 1.2.3.0/24). يمكن تحديده عدة مرات.</translation>
+    </message>
+    <message>
+        <source>%s corrupt, salvage failed</source>
+        <translation>%s فاسدة ، فشلت عملية الإنقاذ</translation>
+    </message>
+    <message>
+        <source>%s is not a valid backup folder!</source>
+        <translation>%s ليس مجلد نسخ احتياطي صالح!</translation>
+    </message>
+    <message>
+        <source>%s is set very high!</source>
+        <translation>%s عالٍ جداً</translation>
+    </message>
+    <message>
+        <source>(press q to shutdown and continue later)</source>
+        <translation>(اضغط على q للإيقاف والاستمرار في وقت لاحق)</translation>
+    </message>
+    <message>
+        <source>-devnet can only be specified once</source>
+        <translation>لا يمكن تحديد -devnet إلا مرة واحدة</translation>
+    </message>
+    <message>
+        <source>-port must be specified when -devnet and -listen are specified</source>
+        <translation>يجب تحديد المنفذ عند تحديد -devnet و -listen</translation>
+    </message>
+    <message>
+        <source>-rpcport must be specified when -devnet and -server are specified</source>
+        <translation>يجب تحديد -ppcport عند تحديد -devnet و -server </translation>
+    </message>
+    <message>
+        <source>Allow RFC1918 addresses to be relayed and connected to (default: %u)</source>
+        <translation>السماح بعناوين RFC1918 والتواصل معها (الإعداد الافتراضي:%u)</translation>
+    </message>
+    <message>
+        <source>Attempt to recover private keys from a corrupt wallet on startup</source>
+        <translation>محاولة استرداد المفاتيح الخاصة من المحفظة في حالة تلفها عند بدء التشغيل</translation>
+    </message>
+    <message>
+        <source>Cannot resolve -%s address: '%s'</source>
+        <translation>لا يمكن حل - عنوان%s: '%s'</translation>
+    </message>
+    <message>
+        <source>Change index out of range</source>
+        <translation>فهرس الفكة خارج النطاق</translation>
+    </message>
+    <message>
+        <source>Copyright (C)</source>
+        <translation>حقوق الطبع والنشر (C)</translation>
+    </message>
+    <message>
+        <source>Error loading %s</source>
+        <translation>خطأ في تحميل %s</translation>
+    </message>
+    <message>
+        <source>Error loading %s: Wallet corrupted</source>
+        <translation>حدث خطأ أثناء تحميل%s: Wallet corrupted</translation>
+    </message>
+    <message>
+        <source>Error loading %s: Wallet requires newer version of %s</source>
+        <translation>حدث خطأ أثناء تحميل%s: تتطلب المحفظة إصدارًا أحدث من%s</translation>
+    </message>
+    <message>
+        <source>Error upgrading chainstate database</source>
+        <translation>خطأ في ترقية قاعدة بيانات chainstate</translation>
+    </message>
+    <message>
+        <source>Failed to find mixing queue to join</source>
+        <translation>فشل في العثور على قائمة انتظار الخلط للانضمام</translation>
+    </message>
+    <message>
+        <source>Failed to start a new mixing queue</source>
+        <translation>فشل في بدء صف مختلط جديد</translation>
+    </message>
+    <message>
+        <source>Initialization sanity check failed. %s is shutting down.</source>
+        <translation>فشل بالتحقق في اختبار التعقل. تم إيقاف %s.</translation>
+    </message>
+    <message>
+        <source>Invalid amount for -%s=&lt;amount&gt;: '%s'</source>
+        <translation>مبلغ غير صالح لـ -%s =&lt;amount&gt;: '%s'</translation>
+    </message>
+    <message>
+        <source>Invalid spork address specified with -sporkaddr</source>
+        <translation>عنوان spork غير صالح محدد بـ -sporkaddr</translation>
+    </message>
+    <message>
+        <source>Keep N DASH anonymized (%u-%u, default: %u)</source>
+        <translation>الاحتفاظ بـ N داش مجهولة المصدر (%u-%u ، القيمة الافتراضية: %u)</translation>
+    </message>
+    <message>
+        <source>Print this help message and exit</source>
+        <translation>اطبع رسالة المساعدة هذه واخرج منها</translation>
+    </message>
+    <message>
+        <source>Receive and display P2P network alerts (default: %u)</source>
+        <translation>تلقي تنبيهات شبكة P2P وعرضها (الافتراضي: %u)</translation>
+    </message>
+    <message>
+        <source>Reducing -maxconnections from %d to %d, because of system limitations.</source>
+        <translation>تقليل -maxconnections من %d إلى %d ، بسبب قيود النظام.</translation>
+    </message>
+    <message>
+        <source>Relay and mine data carrier transactions (default: %u)</source>
+        <translation>معاملات ترحيل البيانات وبيانات الألغام (الافتراضي: %u)</translation>
+    </message>
+    <message>
+        <source>Relay non-P2SH multisig (default: %u)</source>
+        <translation>Relay non-P2SH multisig (default: %u)</translation>
+    </message>
+    <message>
+        <source>Rescanning...</source>
+        <translation>إعادة مسح</translation>
+    </message>
+    <message>
+        <source>Run in the background as a daemon and accept commands</source>
+        <translation>تشغيل في الخلفية بشكل مخفي لقبول الأوامر</translation>
+    </message>
+    <message>
+        <source>Send trace/debug info to console instead of debug.log file</source>
+        <translation>إرسال معلومات التتبع / التصحيح إلى وحدة التحكم بدلاً من ملف debug.log</translation>
+    </message>
+    <message>
+        <source>Session not complete!</source>
+        <translation>الجلسة غير كاملة!</translation>
+    </message>
+    <message>
+        <source>Session timed out.</source>
+        <translation>انتهت الجلسة.</translation>
+    </message>
+    <message>
+        <source>Set database cache size in megabytes (%d to %d, default: %d)</source>
+        <translation>تعيين حجم ذاكرة التخزين المؤقت لقاعدة البيانات بالميغابايت (%d إلى %d ، القيمة الافتراضية: %d)</translation>
+    </message>
+    <message>
+        <source>Set maximum block size in bytes (default: %d)</source>
+        <translation>تعيين الحد الأقصى لحجم الفدرة بالبايت (الافتراضي: %d)</translation>
+    </message>
+    <message>
+        <source>Set the masternode private key</source>
+        <translation>تعيين مفتاح خاص ماسترنود</translation>
+    </message>
+    <message>
+        <source>Show all debugging options (usage: --help -help-debug)</source>
+        <translation>عرض جميع خيارات التصحيح (الاستخدام: - مساعدة - تصحيح الأخطاء - تصحيح الأخطاء)</translation>
+    </message>
+    <message>
+        <source>Shrink debug.log file on client startup (default: 1 when no -debug)</source>
+        <translation>تقليص ملف debug.log على بدء تشغيل العميل (الافتراضي: 1 عند عدم - debug)</translation>
+    </message>
+    <message>
+        <source>Signing transaction failed</source>
+        <translation>فشل توقيع المعاملة</translation>
+    </message>
+    <message>
+        <source>Specify data directory</source>
+        <translation>حدد مجلد المعلومات</translation>
+    </message>
+    <message>
+        <source>Specify wallet file (within data directory)</source>
+        <translation>تحديد ملف المحفظة (داخل دليل البيانات)</translation>
+    </message>
+    <message>
+        <source>Specify your own public address</source>
+        <translation>حدد عنوانك العام هنا</translation>
+    </message>
+    <message>
+        <source>Starting network threads...</source>
+        <translation>بدء مؤشرات شبكة الاتصال...</translation>
+    </message>
+    <message>
+        <source>Synchronization pending...</source>
+        <translation>التزامن في انتظار ...</translation>
+    </message>
+    <message>
+        <source>Synchronizing governance objects...</source>
+        <translation>مزامنة كائنات الحوكمة ...</translation>
+    </message>
+    <message>
+        <source>Synchronizing masternode payments...</source>
+        <translation>تزامن المدفوعات ماسترنود ...</translation>
+    </message>
+    <message>
+        <source>The source code is available from %s.</source>
+        <translation>شفرة المصدر متاحة من %s.</translation>
+    </message>
+    <message>
+        <source>The transaction amount is too small to pay the fee</source>
+        <translation>قيمة المعاملة صغيرة جدا لدفع الأجر</translation>
+    </message>
+    <message>
+        <source>This is experimental software.</source>
+        <translation>هذا برنامج تجريبي.</translation>
+    </message>
+    <message>
+        <source>Transaction amount too small</source>
+        <translation>قيمة العملية صغيره جدا</translation>
+    </message>
+    <message>
+        <source>Transaction created successfully.</source>
+        <translation>تم إنشاء المعاملة بنجاح.</translation>
+    </message>
+    <message>
+        <source>Transaction fees are too high.</source>
+        <translation>رسوم المعاملات مرتفعة للغاية.</translation>
+    </message>
+    <message>
+        <source>Transaction not valid.</source>
+        <translation>المعاملة غير صالحة.</translation>
+    </message>
+    <message>
+        <source>Transaction too large for fee policy</source>
+        <translation>قيمة المعاملة كبيرة جدا لسياسة الأجر</translation>
+    </message>
+    <message>
+        <source>Unable to bind to %s on this computer (bind returned error %s)</source>
+        <translation>يتعذر الربط مع %s على هذا الكمبيوتر (الربط انتج خطأ %s)</translation>
+    </message>
+    <message>
+        <source>Unable to sign spork message, wrong key?</source>
+        <translation>غير قادر على التوقيع على رسالة ورش ، مفتاح خاطئ؟</translation>
+    </message>
+    <message>
+        <source>Unknown network specified in -onlynet: '%s'</source>
+        <translation>شبكة غير معروفة محددة في -onlynet: '%s'</translation>
+    </message>
+    <message>
+        <source>Unknown state: id = %u</source>
+        <translation>حالة غير معروفة: id = %u</translation>
+    </message>
+    <message>
+        <source>Username for JSON-RPC connections</source>
+        <translation>اسم المستخدم لاتصالات JSON-RPC</translation>
+    </message>
+    <message>
+        <source>Verifying blocks...</source>
+        <translation>التحقق من الكتل...</translation>
+    </message>
+    <message>
+        <source>Verifying wallet...</source>
+        <translation>التحقق من المحفظة ...</translation>
+    </message>
+    <message>
+        <source>Very low number of keys left: %d</source>
+        <translation>عدد منخفض جدًا من المفاتيح المتبقية: %d</translation>
+    </message>
+    <message>
+        <source>Wallet %s resides outside data directory %s</source>
+        <translation>تتواجد المحفظة %s خارج دليل البيانات %s</translation>
+    </message>
+    <message>
+        <source>Wallet is locked.</source>
+        <translation>المحفظة مؤمنة.</translation>
+    </message>
+    <message>
+        <source>Wallet options:</source>
+        <translation>خيارات المحفظة :</translation>
+    </message>
+    <message>
+        <source>Wallet window title</source>
+        <translation>عنوان نافذة المحفظة</translation>
+    </message>
+    <message>
+        <source>Warning</source>
+        <translation>تحذير</translation>
+    </message>
+    <message>
+        <source>Your entries added successfully.</source>
+        <translation>تمت إضافة إدخالاتك بنجاح.</translation>
+    </message>
+    <message>
+        <source>Your transaction was accepted into the pool!</source>
+        <translation>تم قبول معاملتك!</translation>
+    </message>
+    <message>
+        <source>Zapping all transactions from wallet...</source>
+        <translation>إزالة جميع المعاملات من المحفظة...</translation>
+    </message>
+</context>
+</TS>
\ No newline at end of file
diff --git a/src/qt/locale/dash_bg.ts b/src/qt/locale/dash_bg.ts
index 609c494c6655..1d417f656b16 100644
--- a/src/qt/locale/dash_bg.ts
+++ b/src/qt/locale/dash_bg.ts
@@ -794,7 +794,7 @@
         <translation>Моля преминете към "Режим Списък" за да използвате тази функция.</translation>
     </message>
     <message>
-        <source>Non-anonymized input selected. &lt;b&gt;PrivateSend will be disabled.&lt;/b&gt;&lt;br&gt;&lt;br&gt;If you still want to use PrivateSend, please deselect all non-nonymized inputs first and then check PrivateSend checkbox again.</source>
+        <source>Non-anonymized input selected. &lt;b&gt;PrivateSend will be disabled.&lt;/b&gt;&lt;br&gt;&lt;br&gt;If you still want to use PrivateSend, please deselect all non-anonymized inputs first and then check the PrivateSend checkbox again.</source>
         <translation>Избран е не анонимизиран вход. &lt;b&gt;PrivateSend ще бъде изключен.&lt;/b&gt;&lt;br&gt;&lt;br&gt;Ако все още желаете да използвате PrivateSend, моля отмаркирайте всички не анонимизирани входове и след това изберете PrivateSend опцията отново.</translation>
     </message>
     <message>
@@ -834,73 +834,6 @@
         <translation>няма такъв</translation>
     </message>
 </context>
-<context>
-    <name>DarksendConfig</name>
-    <message>
-        <source>Configure PrivateSend</source>
-        <translation>Конфигуриране на PrivateSend</translation>
-    </message>
-    <message>
-        <source>Basic Privacy</source>
-        <translation>Нормална сигурност</translation>
-    </message>
-    <message>
-        <source>High Privacy</source>
-        <translation>Висока сигурност</translation>
-    </message>
-    <message>
-        <source>Maximum Privacy</source>
-        <translation>Максимална сигурност</translation>
-    </message>
-    <message>
-        <source>Please select a privacy level.</source>
-        <translation>Моля изберете ниво на сигурност.</translation>
-    </message>
-    <message>
-        <source>Use 2 separate masternodes to mix funds up to 1000 DASH</source>
-        <translation>Използване на 2 различни masternodes за смесване на средства до 1000 DASH</translation>
-    </message>
-    <message>
-        <source>Use 8 separate masternodes to mix funds up to 1000 DASH</source>
-        <translation>Използване на 8 различни masternodes за смесване на средства до 1000 DASH</translation>
-    </message>
-    <message>
-        <source>Use 16 separate masternodes</source>
-        <translation>Използване на 16 различни masternodes за смесване на средства до 1000 DASH</translation>
-    </message>
-    <message>
-        <source>This option is the quickest and will cost about ~0.025 DASH to anonymize 1000 DASH</source>
-        <translation>Това е най-бързият вариант, анонимизиране на 1000 DASH ще ви струва около 0.025 DASH</translation>
-    </message>
-    <message>
-        <source>This option is moderately fast and will cost about 0.05 DASH to anonymize 1000 DASH</source>
-        <translation>Това е средно бърз вариант, анонимизиране на 1000 DASH ще ви струва около 0.05 DASH</translation>
-    </message>
-    <message>
-        <source>0.1 DASH per 1000 DASH you anonymize.</source>
-        <translation>0.1 DASH за всеки 1000 DASH които анонимизирате.</translation>
-    </message>
-    <message>
-        <source>This is the slowest and most secure option. Using maximum anonymity will cost</source>
-        <translation>Това е най-бавния и най-сигурен начин. Използването на максимална анонимност ще ви коства</translation>
-    </message>
-    <message>
-        <source>PrivateSend Configuration</source>
-        <translation>PrivateSend конфигурация</translation>
-    </message>
-    <message>
-        <source>PrivateSend was successfully set to basic (%1 and 2 rounds). You can change this at any time by opening Dash's configuration screen.</source>
-        <translation>PrivateSend беше успешно настроен до основно ниво (%1  2 цикъла). Може да промените това по всяко време, като отворите екрана за конфигурация на Dash.</translation>
-    </message>
-    <message>
-        <source>PrivateSend was successfully set to high (%1 and 8 rounds). You can change this at any time by opening Dash's configuration screen.</source>
-        <translation>PrivateSend беше успешно настроен до високо ниво (%1 и 8 цикъла). Може да промените това по всяко време, като отворите екрана за конфигурация на Dash.</translation>
-    </message>
-    <message>
-        <source>PrivateSend was successfully set to maximum (%1 and 16 rounds). You can change this at any time by opening Dash's configuration screen.</source>
-        <translation>PrivateSend беше успешно настроен до максимално ниво (%1 и 16 цикъла). Може да промените това по всяко време, като отворите екрана за конфигурация на Dash.</translation>
-    </message>
-</context>
 <context>
     <name>EditAddressDialog</name>
     <message>
@@ -1038,8 +971,8 @@
         <translation>PrivateSend информация</translation>
     </message>
     <message>
-        <source>&lt;h3&gt;PrivateSend Basics&lt;/h3&gt; PrivateSend gives you true financial privacy by obscuring the origins of your funds. All the Dash in your wallet is comprised of different "inputs" which you can think of as separate, discrete coins.&lt;br&gt; PrivateSend uses an innovative process to mix your inputs with the inputs of two other people, without having your coins ever leave your wallet. You retain control of your money at all times.&lt;hr&gt; &lt;b&gt;The PrivateSend process works like this:&lt;/b&gt;&lt;ol type="1"&gt; &lt;li&gt;PrivateSend begins by breaking your transaction inputs down into standard denominations. These denominations are 0.01 DASH, 0.1 DASH, 1 DASH and 10 DASH -- sort of like the paper money you use every day.&lt;/li&gt; &lt;li&gt;Your wallet then sends requests to specially configured software nodes on the network, called "masternodes." These masternodes are informed then that you are interested in mixing a certain denomination. No identifiable information is sent to the masternodes, so they never know "who" you are.&lt;/li&gt; &lt;li&gt;When two other people send similar messages, indicating that they wish to mix the same denomination, a mixing session begins. The masternode mixes up the inputs and instructs all three users' wallets to pay the now-transformed input back to themselves. Your wallet pays that denomination directly to itself, but in a different address (called a change address).&lt;/li&gt; &lt;li&gt;In order to fully obscure your funds, your wallet must repeat this process a number of times with each denomination. Each time the process is completed, it's called a "round." Each round of PrivateSend makes it exponentially more difficult to determine where your funds originated.&lt;/li&gt; &lt;li&gt;This mixing process happens in the background without any intervention on your part. When you wish to make a transaction, your funds will already be anonymized. No additional waiting is required.&lt;/li&gt; &lt;/ol&gt; &lt;hr&gt;&lt;b&gt;IMPORTANT:&lt;/b&gt; Your wallet only contains 1000 of these "change addresses." Every time a mixing event happens, up to 9 of your addresses are used up. This means those 1000 addresses last for about 100 mixing events. When 900 of them are used, your wallet must create more addresses. It can only do this, however, if you have automatic backups enabled.&lt;br&gt; Consequently, users who have backups disabled will also have PrivateSend disabled. &lt;hr&gt;For more info see &lt;a href="https://dashpay.atlassian.net/wiki/display/DOC/PrivateSend"&gt;https://dashpay.atlassian.net/wiki/display/DOC/PrivateSend&lt;/a&gt;         </source>
-        <translation>&lt;h3&gt;PrivateSend основни понятия&lt;/h3&gt; PrivateSend ви дава истинска финансова независимост чрез скриване произхода на средствата ви. Всички Dash монети в портфейла ви са съставени от различни "входове" които можете да приемете като отделни дискретни монети&lt;br&gt; PrivateSend използва иновативен процес като смесва вашите входове с входовете на други двама души без монетите да напускат изобщо портфейла ви. Имате пълен контрол върху парите си през цялото време. &lt;hr&gt; &lt;b&gt; PrivateSend процесът работи по следния начин:&lt;/b&gt;&lt;ol type="1"&gt; &lt;li&gt;PrivateSend започва чрез разделяне на транзакцията ви до стандартни деноминации. Тези деноминации са 0.01 DASH, 0.1 DASH, 1 DASH и 10 DASH --подобно на стандартните пари, които ползваме ежедневно.&lt;/li&gt; &lt;li&gt;Вашия портфейл изпраща запитване към специално конфигурираните софтуерни възли в мрежата, наречени "masternodes." Тези masternodes са информирани, че се интересувате от смесване на определена деноминация. Никаква идентификационна информация не се изпраща към   masternodes, така, че те никога не знаят "кой" сте.&lt;/li&gt; &lt;li&gt;Когато други двама души изпратят подобни съобщения, обозначаващи, че искат да смесят същата деноминация, смесващата сесия започва. Masternode смесват входовете и инструктират портфейлите на тримата потребители да платят новотрансформираните входове обратно към притежателите им. Вашият портфейл плаща деноминацията директно на себе си, но с различен адрес (наричан сменен адрес).  &lt;/li&gt; &lt;li&gt;С цел напълно скриване на доходите ви, вашият портфейл трябва да повтори този процес няколко пъти във всяка деноминация.  Всеки път завършеният процес се нарича "цикъл." Всеки цикъл на PrivateSend прави откриването на първоначалния източник на вашите средства напълно непроследим.&lt;/li&gt; &lt;li&gt;Този смесващ процес се случва като процес на заден фон без никаква намеса от ваша страна. Когато искате да направите транзакция, вашите средства са винаги анонимни. Не е необходимо допълнително изчакване. &lt;/li&gt; &lt;/ol&gt; &lt;hr&gt;&lt;b&gt;ВАЖНО:&lt;/b&gt; Вашият портфейл съдържа само 1000 от тези "сменяеми адреси". Всеки път когато се случва смесването до 9 от вашите адреси се ползват.  Това означава, че тези 1000 адреси се миксират в около 100 смесващи събития. Когато 900 се използват, вашия портфейл трябва да създаде повече адреси. Това може да стане само ако имате автоматично архивиране.&lt;br&gt; Следователно, потребителите, на които е изключено автоматичното архивиране, нямат и  PrivateSend включено. &lt;hr&gt;За повече информация вижте&lt;a href="https://dashpay.atlassian.net/wiki/display/DOC/PrivateSend"&gt;https://dashpay.atlassian.net/wiki/display/DOC/PrivateSend&lt;/a&gt;         </translation>
+        <source>&lt;h3&gt;PrivateSend Basics&lt;/h3&gt; PrivateSend gives you true financial privacy by obscuring the origins of your funds. All the Dash in your wallet is comprised of different "inputs" which you can think of as separate, discrete coins.&lt;br&gt; PrivateSend uses an innovative process to mix your inputs with the inputs of two other people, without having your coins ever leave your wallet. You retain control of your money at all times.&lt;hr&gt; &lt;b&gt;The PrivateSend process works like this:&lt;/b&gt;&lt;ol type="1"&gt; &lt;li&gt;PrivateSend begins by breaking your transaction inputs down into standard denominations. These denominations are 0.01 DASH, 0.1 DASH, 1 DASH and 10 DASH -- sort of like the paper money you use every day.&lt;/li&gt; &lt;li&gt;Your wallet then sends requests to specially configured software nodes on the network, called "masternodes." These masternodes are informed then that you are interested in mixing a certain denomination. No identifiable information is sent to the masternodes, so they never know "who" you are.&lt;/li&gt; &lt;li&gt;When two other people send similar messages, indicating that they wish to mix the same denomination, a mixing session begins. The masternode mixes up the inputs and instructs all three users' wallets to pay the now-transformed input back to themselves. Your wallet pays that denomination directly to itself, but in a different address (called a change address).&lt;/li&gt; &lt;li&gt;In order to fully obscure your funds, your wallet must repeat this process a number of times with each denomination. Each time the process is completed, it's called a "round." Each round of PrivateSend makes it exponentially more difficult to determine where your funds originated.&lt;/li&gt; &lt;li&gt;This mixing process happens in the background without any intervention on your part. When you wish to make a transaction, your funds will already be anonymized. No additional waiting is required.&lt;/li&gt; &lt;/ol&gt; &lt;hr&gt;&lt;b&gt;IMPORTANT:&lt;/b&gt; Your wallet only contains 1000 of these "change addresses." Every time a mixing event happens, up to 9 of your addresses are used up. This means those 1000 addresses last for about 100 mixing events. When 900 of them are used, your wallet must create more addresses. It can only do this, however, if you have automatic backups enabled.&lt;br&gt; Consequently, users who have backups disabled will also have PrivateSend disabled. &lt;hr&gt;For more information, see the &lt;a href="https://docs.dash.org/en/latest/wallets/dashcore/privatesend-instantsend.html"&gt;PrivateSend documentation&lt;/a&gt;.         </source>
+        <translation>&lt;h3&gt;PrivateSend основни понятия&lt;/h3&gt; PrivateSend ви дава истинска финансова независимост чрез скриване произхода на средствата ви. Всички Dash монети в портфейла ви са съставени от различни "входове" които можете да приемете като отделни дискретни монети&lt;br&gt; PrivateSend използва иновативен процес като смесва вашите входове с входовете на други двама души без монетите да напускат изобщо портфейла ви. Имате пълен контрол върху парите си през цялото време. &lt;hr&gt; &lt;b&gt; PrivateSend процесът работи по следния начин:&lt;/b&gt;&lt;ol type="1"&gt; &lt;li&gt;PrivateSend започва чрез разделяне на транзакцията ви до стандартни деноминации. Тези деноминации са 0.01 DASH, 0.1 DASH, 1 DASH и 10 DASH --подобно на стандартните пари, които ползваме ежедневно.&lt;/li&gt; &lt;li&gt;Вашия портфейл изпраща запитване към специално конфигурираните софтуерни възли в мрежата, наречени "masternodes." Тези masternodes са информирани, че се интересувате от смесване на определена деноминация. Никаква идентификационна информация не се изпраща към   masternodes, така, че те никога не знаят "кой" сте.&lt;/li&gt; &lt;li&gt;Когато други двама души изпратят подобни съобщения, обозначаващи, че искат да смесят същата деноминация, смесващата сесия започва. Masternode смесват входовете и инструктират портфейлите на тримата потребители да платят новотрансформираните входове обратно към притежателите им. Вашият портфейл плаща деноминацията директно на себе си, но с различен адрес (наричан сменен адрес).  &lt;/li&gt; &lt;li&gt;С цел напълно скриване на доходите ви, вашият портфейл трябва да повтори този процес няколко пъти във всяка деноминация.  Всеки път завършеният процес се нарича "цикъл." Всеки цикъл на PrivateSend прави откриването на първоначалния източник на вашите средства напълно непроследим.&lt;/li&gt; &lt;li&gt;Този смесващ процес се случва като процес на заден фон без никаква намеса от ваша страна. Когато искате да направите транзакция, вашите средства са винаги анонимни. Не е необходимо допълнително изчакване. &lt;/li&gt; &lt;/ol&gt; &lt;hr&gt;&lt;b&gt;ВАЖНО:&lt;/b&gt; Вашият портфейл съдържа само 1000 от тези "сменяеми адреси". Всеки път когато се случва смесването до 9 от вашите адреси се ползват.  Това означава, че тези 1000 адреси се миксират в около 100 смесващи събития. Когато 900 се използват, вашия портфейл трябва да създаде повече адреси. Това може да стане само ако имате автоматично архивиране.&lt;br&gt; Следователно, потребителите, на които е изключено автоматичното архивиране, нямат и  PrivateSend включено. &lt;hr&gt;За повече информация вижте &lt;a href="https://docs.dash.org/en/latest/wallets/dashcore/privatesend-instantsend.html"&gt;документацията за PrivateSend&lt;/a&gt;.</translation>
     </message>
 </context>
 <context>
@@ -4480,6 +4413,10 @@ https://www.transifex.com/projects/p/dash/</translation>
         <source>Disable all Dash specific functionality (Masternodes, PrivateSend, InstantSend, Governance) (0-1, default: %u)</source>
         <translation>Изключване на всички специфични Dash функции (PrivateSend, InstantSend, Governance) (0-1, по подразбиране: %u)</translation>
     </message>
+    <message>
+        <source>%s file contains all private keys from this wallet. Do not share it with anyone!</source>
+        <translation>Файл %s  съдържа всички частни ключове от този портфейл. Не го споделяйте с никого!</translation>
+    </message>
     <message>
         <source>Discover own IP addresses (default: 1 when listening and no -externalip or -proxy)</source>
         <translation>Открий собствения IP адрес (по подразбиране: 1, когато слуша и няма -externalip или -proxy)</translation>
@@ -4504,6 +4441,10 @@ https://www.transifex.com/projects/p/dash/</translation>
         <source>Execute command when a wallet InstantSend transaction is successfully locked (%s in cmd is replaced by TxID)</source>
         <translation>Изпълнена команда когато транзакцията в  InstantSend портфейла е успешно заключена (%s в cmd е заместен от TxID)</translation>
     </message>
+    <message>
+        <source>Extra transactions to keep in memory for compact block reconstructions (default: %u)</source>
+        <translation>Допълнителни транзакции поддържани в паметта за реконструкции на компактни блокове (по подразбиране: %u)</translation>
+    </message>
     <message>
         <source>Failed to create backup, file already exists! This could happen if you restarted wallet in less than 60 seconds. You can continue if you are ok with this.</source>
         <translation>Не може да се създаде копие, файлът вече съществува! Това може да се случи, ако сте рестартирали портфейла си преди по-малко от 60 секунди. Може да продължите, ако сте разбрали това.</translation>
@@ -4584,6 +4525,10 @@ https://www.transifex.com/projects/p/dash/</translation>
         <source>Total length of network version string (%i) exceeds maximum length (%i). Reduce the number or size of uacomments.</source>
         <translation>Общата дължина на мрежовата версия на низ (%i) надвишава максималната дължина (%i). Намалете  броя или размера на коментарите.</translation>
     </message>
+    <message>
+        <source>Transaction index can't be disabled in full mode. Either start with -litemode command line switch or enable transaction index.</source>
+        <translation>Индексът на транзакциите не може да бъде деактивиран в пълен режим. Или започнете с превключване  -litemode от командния ред или активирайте индексиране на транзакциите.</translation>
+    </message>
     <message>
         <source>Tries to keep outbound traffic under the given target (in MiB per 24h), 0 = no limit (default: %d)</source>
         <translation>Опитва се да поддържа изходящият трафик по зададената цел (в MiB за 24h), 0 = без лимит (по подразбиране: %d)</translation>
@@ -4616,6 +4561,10 @@ https://www.transifex.com/projects/p/dash/</translation>
         <source>Warning: Unknown block versions being mined! It's possible unknown rules are in effect</source>
         <translation>ВНИМАНИЕ: Непозната версия на блока!Възможно е да са активирани неизвестни правила</translation>
     </message>
+    <message>
+        <source>You are starting in lite mode, all Dash-specific functionality is disabled.</source>
+        <translation>Стартирали сте в олекотен режим, всички Dash- специфични функционалности са изключени.</translation>
+    </message>
     <message>
         <source>You need to rebuild the database using -reindex to go back to unpruned mode.  This will redownload the entire blockchain</source>
         <translation>Необходимо е повторно изграждане на базата данни използвайки -reindex за да се върнете в неизчистен режим.Това ще изтегли отново съществуващата блок-верига</translation>
@@ -4660,6 +4609,14 @@ https://www.transifex.com/projects/p/dash/</translation>
         <source>Enable publish hash block in &lt;address&gt;</source>
         <translation>Включва публикуване на блок хеш в &lt;address&gt;</translation>
     </message>
+    <message>
+        <source>Enable publish hash of governance objects (like proposals) in &lt;address&gt;</source>
+        <translation>Активиране публикуването на хеш от обектите за управление (като предложения) в &lt;address&gt;</translation>
+    </message>
+    <message>
+        <source>Enable publish hash of governance votes in &lt;address&gt;</source>
+        <translation>Активиране публикуването на хеш от управляващите гласове в &lt;address&gt;</translation>
+    </message>
     <message>
         <source>Enable publish hash transaction (locked via InstantSend) in &lt;address&gt;</source>
         <translation>Включва публикуване хеша на транзакцията  (заключен чрез InstantSend) в &lt;address&gt;</translation>
@@ -4700,6 +4657,14 @@ https://www.transifex.com/projects/p/dash/</translation>
         <source>Failed to delete backup, error: %s</source>
         <translation>Неуспешно изтриване на архив, грешка: %s</translation>
     </message>
+    <message>
+        <source>Failed to load InstantSend data cache from</source>
+        <translation>Неуспешно зареждане на  InstantSend кеша за данни от</translation>
+    </message>
+    <message>
+        <source>Failed to load sporks cache from</source>
+        <translation>Неуспешно зареждане на кеша за sporks от</translation>
+    </message>
     <message>
         <source>Failed to parse host:port string</source>
         <translation>Неуспешен разбор на host:port стринг</translation>
@@ -4720,6 +4685,10 @@ https://www.transifex.com/projects/p/dash/</translation>
         <source>Invalid amount for -fallbackfee=&lt;amount&gt;: '%s'</source>
         <translation>Невалидно количество за -fallbackfee=&lt;amount&gt;: '%s'</translation>
     </message>
+    <message>
+        <source>Invalid input count.</source>
+        <translation>Невалиден брой входове.</translation>
+    </message>
     <message>
         <source>Keep the transaction memory pool below &lt;n&gt; megabytes (default: %u)</source>
         <translation>Дръж мемпула за транзакциите под &lt;n&gt; мегабайта (по подразбиране: %u)</translation>
@@ -4736,6 +4705,10 @@ https://www.transifex.com/projects/p/dash/</translation>
         <source>Line: %d</source>
         <translation>Линия: %d</translation>
     </message>
+    <message>
+        <source>Loading InstantSend data cache...</source>
+        <translation>Зареждане на InstantSend кеш данни...</translation>
+    </message>
     <message>
         <source>Loading addresses...</source>
         <translation>Зареждане на адреси...</translation>
@@ -4748,6 +4721,10 @@ https://www.transifex.com/projects/p/dash/</translation>
         <source>Loading governance cache...</source>
         <translation>Зарежда се  masternode кеш...</translation>
     </message>
+    <message>
+        <source>Loading sporks cache...</source>
+        <translation>Зареждане на sporks кеш...</translation>
+    </message>
     <message>
         <source>Loading wallet... (%3.2f %%)</source>
         <translation>Зареждане на портфейла... (%3.2f %%)</translation>
@@ -4888,6 +4865,10 @@ https://www.transifex.com/projects/p/dash/</translation>
         <source>Transaction must have at least one recipient</source>
         <translation>Транзакцията трябва да има поне един получател.</translation>
     </message>
+    <message>
+        <source>Transaction too large</source>
+        <translation>Транзакцията е твърде голяма</translation>
+    </message>
     <message>
         <source>Trying to connect...</source>
         <translation>Опит за свързване...</translation>
@@ -4908,6 +4889,10 @@ https://www.transifex.com/projects/p/dash/</translation>
         <source>Wallet debugging/testing options:</source>
         <translation>Опции за Откриване на грешки/Тестване на портфейла:</translation>
     </message>
+    <message>
+        <source>Wallet is not initialized</source>
+        <translation>Портфейлът не е инициализиран</translation>
+    </message>
     <message>
         <source>Wallet needed to be rewritten: restart %s to complete</source>
         <translation>Портфейлът трябва да бъде презаписан: рестартирайте %s за да завършите</translation>
@@ -4924,6 +4909,10 @@ https://www.transifex.com/projects/p/dash/</translation>
         <source>Whether to operate in a blocks only mode (default: %u)</source>
         <translation>Дали да работи само в блоков режим (по подразбиране: %u)</translation>
     </message>
+    <message>
+        <source>You can not start a masternode in lite mode.</source>
+        <translation>Не може да стартирате masternode в олекотен режим.</translation>
+    </message>
     <message>
         <source>ZeroMQ notification options:</source>
         <translation>ZeroMQ опции за уведомяване:</translation>
@@ -5012,10 +5001,6 @@ https://www.transifex.com/projects/p/dash/</translation>
         <source>Set lowest fee rate (in %s/kB) for transactions to be included in block creation. (default: %s)</source>
         <translation>Задайте най-ниска такса (в %s / kB) за транзакции, които да бъдат включени в създаването на блок. (по подразбиране:%s)</translation>
     </message>
-    <message>
-        <source>Show N confirmations for a successfully locked transaction (%u-%u, default: %u)</source>
-        <translation>Покажи N потвърждения при успешно заключена транзакция (%u-%u, по подразбиране: %u)</translation>
-    </message>
     <message>
         <source>This is the transaction fee you may pay when fee estimates are not available.</source>
         <translation>Това е таксата за транзакция, която можете да платите, когато не са налице оценки на таксите.</translation>
diff --git a/src/qt/locale/dash_de.ts b/src/qt/locale/dash_de.ts
index d15b9cbbc106..6309ebf64fcd 100644
--- a/src/qt/locale/dash_de.ts
+++ b/src/qt/locale/dash_de.ts
@@ -793,10 +793,6 @@
         <source>Please switch to "List mode" to use this function.</source>
         <translation>Wechseln Sie bitte zum "Listenmodus" um die Funktion zu benutzen.</translation>
     </message>
-    <message>
-        <source>Non-anonymized input selected. &lt;b&gt;PrivateSend will be disabled.&lt;/b&gt;&lt;br&gt;&lt;br&gt;If you still want to use PrivateSend, please deselect all non-nonymized inputs first and then check PrivateSend checkbox again.</source>
-        <translation>Nicht-anonymisierter Input ausgewählt. &lt;b&gt;PrivateSend wird deaktiviert.&lt;/b&gt;&lt;br&gt;&lt;br&gt;Sollten Sie trotzdem PrivateSend verwenden wollen, müssen Sie zuerst alle nicht-anonymisierten Inputs entmarkieren und  das Ankreuzfeld "PrivateSend" erneut auswählen.</translation>
-    </message>
     <message>
         <source>(%1 locked)</source>
         <translation>(%1 gesperrt)</translation>
@@ -834,73 +830,6 @@
         <translation>k.A.</translation>
     </message>
 </context>
-<context>
-    <name>DarksendConfig</name>
-    <message>
-        <source>Configure PrivateSend</source>
-        <translation>PrivateSend konfigurieren</translation>
-    </message>
-    <message>
-        <source>Basic Privacy</source>
-        <translation>Einfacher Datenschutz</translation>
-    </message>
-    <message>
-        <source>High Privacy</source>
-        <translation>Hoher Datenschutz</translation>
-    </message>
-    <message>
-        <source>Maximum Privacy</source>
-        <translation>Maximaler Datenschutz</translation>
-    </message>
-    <message>
-        <source>Please select a privacy level.</source>
-        <translation>Bitten wählen Sie eine Datenschutz-Stufe.</translation>
-    </message>
-    <message>
-        <source>Use 2 separate masternodes to mix funds up to 1000 DASH</source>
-        <translation>Benutze 2 separate Masternodes um bis zu 1000 DASH zu mixen</translation>
-    </message>
-    <message>
-        <source>Use 8 separate masternodes to mix funds up to 1000 DASH</source>
-        <translation>Benutze 8 separate Masternodes um bis zu 1000 DASH zu mixen</translation>
-    </message>
-    <message>
-        <source>Use 16 separate masternodes</source>
-        <translation>Benutze 16 separate Masternodes</translation>
-    </message>
-    <message>
-        <source>This option is the quickest and will cost about ~0.025 DASH to anonymize 1000 DASH</source>
-        <translation>Diese Option ist am Schnellsten und kostet ungefähr 0,025 DASH, um 1000 DASH zu anonymisieren</translation>
-    </message>
-    <message>
-        <source>This option is moderately fast and will cost about 0.05 DASH to anonymize 1000 DASH</source>
-        <translation>Diese Option ist einigermaßen schnell und kostet ungefähr 0,05 DASH, um 1000 DASH zu anonymisieren</translation>
-    </message>
-    <message>
-        <source>0.1 DASH per 1000 DASH you anonymize.</source>
-        <translation>0,1 DASH pro 1000 zu anonymisierende Dash.</translation>
-    </message>
-    <message>
-        <source>This is the slowest and most secure option. Using maximum anonymity will cost</source>
-        <translation>Dies ist die langsamste und sicherste Option. Maximale Anonymität kostet</translation>
-    </message>
-    <message>
-        <source>PrivateSend Configuration</source>
-        <translation>PrivateSend Konfiguration</translation>
-    </message>
-    <message>
-        <source>PrivateSend was successfully set to basic (%1 and 2 rounds). You can change this at any time by opening Dash's configuration screen.</source>
-        <translation>PrivateSend wurde erfolgreich auf einfachen Datenschutz (%1 und 2 Runden) gesetzt. Sie können dies jederzeit im Konfigurationsfenster von Dash ändern.</translation>
-    </message>
-    <message>
-        <source>PrivateSend was successfully set to high (%1 and 8 rounds). You can change this at any time by opening Dash's configuration screen.</source>
-        <translation>PrivateSend wurde erfolgreich auf hohen Datenschutz (%1 und 8 Runden) gesetzt. Sie können dies jederzeit im Konfigurationsfenster von Dash ändern.</translation>
-    </message>
-    <message>
-        <source>PrivateSend was successfully set to maximum (%1 and 16 rounds). You can change this at any time by opening Dash's configuration screen.</source>
-        <translation>PrivateSend wurde erfolgreich auf maximalen Datenschutz (%1 und 16 Runden) gesetzt. Sie können dies jederzeit im Konfigurationsfenster von Dash ändern.</translation>
-    </message>
-</context>
 <context>
     <name>EditAddressDialog</name>
     <message>
@@ -1037,12 +966,7 @@
         <source>PrivateSend information</source>
         <translation>PrivateSend Informationen</translation>
     </message>
-    <message>
-        <source>&lt;h3&gt;PrivateSend Basics&lt;/h3&gt; PrivateSend gives you true financial privacy by obscuring the origins of your funds. All the Dash in your wallet is comprised of different "inputs" which you can think of as separate, discrete coins.&lt;br&gt; PrivateSend uses an innovative process to mix your inputs with the inputs of two other people, without having your coins ever leave your wallet. You retain control of your money at all times.&lt;hr&gt; &lt;b&gt;The PrivateSend process works like this:&lt;/b&gt;&lt;ol type="1"&gt; &lt;li&gt;PrivateSend begins by breaking your transaction inputs down into standard denominations. These denominations are 0.01 DASH, 0.1 DASH, 1 DASH and 10 DASH -- sort of like the paper money you use every day.&lt;/li&gt; &lt;li&gt;Your wallet then sends requests to specially configured software nodes on the network, called "masternodes." These masternodes are informed then that you are interested in mixing a certain denomination. No identifiable information is sent to the masternodes, so they never know "who" you are.&lt;/li&gt; &lt;li&gt;When two other people send similar messages, indicating that they wish to mix the same denomination, a mixing session begins. The masternode mixes up the inputs and instructs all three users' wallets to pay the now-transformed input back to themselves. Your wallet pays that denomination directly to itself, but in a different address (called a change address).&lt;/li&gt; &lt;li&gt;In order to fully obscure your funds, your wallet must repeat this process a number of times with each denomination. Each time the process is completed, it's called a "round." Each round of PrivateSend makes it exponentially more difficult to determine where your funds originated.&lt;/li&gt; &lt;li&gt;This mixing process happens in the background without any intervention on your part. When you wish to make a transaction, your funds will already be anonymized. No additional waiting is required.&lt;/li&gt; &lt;/ol&gt; &lt;hr&gt;&lt;b&gt;IMPORTANT:&lt;/b&gt; Your wallet only contains 1000 of these "change addresses." Every time a mixing event happens, up to 9 of your addresses are used up. This means those 1000 addresses last for about 100 mixing events. When 900 of them are used, your wallet must create more addresses. It can only do this, however, if you have automatic backups enabled.&lt;br&gt; Consequently, users who have backups disabled will also have PrivateSend disabled. &lt;hr&gt;For more info see &lt;a href="https://dashpay.atlassian.net/wiki/display/DOC/PrivateSend"&gt;https://dashpay.atlassian.net/wiki/display/DOC/PrivateSend&lt;/a&gt;         </source>
-        <translation>&lt;h3&gt;Basisinformation zu PrivateSend&lt;/h3&gt; PrivateSend bietet finanziellen Datenschutz durch geschickte Verschleierung der Herkunft Ihres Geldes. Die Dash in Ihrer Geldbörse setzen sich aus völlig unterschiedlichen eigenständigen "Inputs" zusammen.&lt;br&gt; PrivateSend benutzt einen innovativen Prozeß, um Ihre "Inputs" mit denen von 2 anderen Personen zu mischen, ohne das Ihr Geld jemals Ihre Geldbörse verlassen muß, d.h. Sie haben während dieses Prozesses immer die Kontrolle über Ihr Geld.&lt;hr&gt;&lt;b&gt;Der PrivateSend-Prozess funktioniert folgendermaßen:&lt;/b&gt;&lt;ol type="1"&gt;&lt;li&gt;PrivateSend stückelt Ihre "Inputs" in kleinere Teile. Diese sind 0,01 DASH, 0,1 DASH, 1DASH und 10 DASH -- im Prinzip wie Münzen oder Scheine, wie wir sie jeden Tag benutzen.&lt;/li&gt; &lt;li&gt;Ihre Geldbörse sendet dann eine entsprechende Mixing Anforderungen an spezielle Dash-Server im Internet, die sogenannten "Masternodes". Damit werden diese Masternodes darüber informiert, daß Sie Ihre gestückelten DASH gerne mixen würden. Dabei wird keinerlei Information über Sie versendet, d.h. die Masternodes wissen nie, wer genau mixen möchte.&lt;/li&gt; &lt;li&gt; Sobald zwei andere Personen eine gleiche Mixing-Anforderung mit der gleichen Stückelung senden beginnt der Mixing-Prozeß. Der Masternode vermischt (daher das Wort "Mixing") die gestückelten Inputs und weist das Ergebnis wieder den Geldbörsen zu, allerdings mit neuen Empfängeradressen (die natürlich zu Ihrer Wallet gehören), so daß man sie nicht mehr den ursprünglichen Adressen zuordnen kann.. Man kann sich das so vorstellen wie wenn 3 Personen jeweils 100 Euro in der gleichen Anzahl von 10 Euro Scheinen, 5 Euro Scheinen, 2- und 1-Euro Münzen auf einen Tisch legen, alles einmal gut durchmischen, und sich anschießend ohne hinzusehen wieder 100 Euro vom Tischen nehmen. Jeder hat genau so viele Euro wie vorher, aber keiner weiß, wessen Scheine oder Münzen er letztendlich in seiner Geldbörse hat, oder wo sie herkommen. Und das Gute dabei ist, im Dash Mixing Prozeß verlassen die Scheine oder Münzen niemals die Geldbörse ihres Besitzers, daher kann kein Betrug stattfinden.&lt;/li&gt; &lt;li&gt;Um die Herkunft Ihres Guthabens vollständig zu verschleiern muß dieser Prozeß mehrmals wiederholt werden, d.h. es gibt mehrere "Runden" des Mixing-Prozesses. Die Anzahl der Runden ist einstellbar, je mehr, desto besser ist die Herkunft Ihres Guthabens verschleiert, aber um so länger dauert der Prozeß.&lt;/li&gt; &lt;li&gt;
-Der Mixing-Prozeß läuft nach dem Start vollständig im Hintergrund, d.h. es ist keine Benutzerinteraktion mehr erforderlich. Das Wallet informiert Sie über den Fortschrittsbalken über den aktuellen Status des Prozesses.&lt;/li&gt; &lt;/ol&gt; &lt;hr&gt;&lt;b&gt;WICHTIG:&lt;/b&gt; beim Mischen der Inputs werden die einzelnen Stückelungen einer NEUEN Empfängeradresse zugeordnet (siehe Oben). Ihre Geldbörse hat bereits beim ersten Start 1000 dieser "Wechseladressen" auf Vorrat erzeugt. Bei jedem Mischen werden 9 dieser Wechseladressen verbraucht, d.h. nach ungefähr 100 Mischvorgänge sind diese 1000 Wechseladressen aufgebraucht. Die Geldbörse ist so eingestellt, daß sie bei Erreichen von 900 benutzen Wechseladressen wieder genug neue Wechseladressen erzeugt, damit man auch in der Zukunft wieder mischen kann. Die neuen Wechseladressen werden aber nur dann erzeugt, wenn man in den Einstellungen "Automatische Datensicherungen" aktiviert hat.&lt;br&gt; Daher ist bei Benutzern, die "Automatische Datensicherungen" deaktiviert haben, automatisch auch PrivateSend dekativiert.&lt;hr&gt; Weitere Information hierzu finden Sie auf  &lt;a href="https://dashpay.atlassian.net/wiki/display/DOC/PrivateSend"&gt;https://dashpay.atlassian.net/wiki/display/DOC/PrivateSend&lt;/a&gt;</translation>
-    </message>
-</context>
+    </context>
 <context>
     <name>Intro</name>
     <message>
@@ -1830,10 +1754,6 @@ https://www.transifex.com/projects/p/dash/</translation>
         <source>We are about to create a new automatic backup for you, however &lt;span style='color:red;'&gt; you should always make sure you have backups saved in some safe place&lt;/span&gt;!</source>
         <translation>Datensicherungen werden automatisch gemacht, aber &lt;span style='color:red;'&gt; Sie sollten zusätzlich immer noch Datensicherungen an einem sicheren Ort haben&lt;/span&gt;!</translation>
     </message>
-    <message>
-        <source>Note: You can turn this message off in options.</source>
-        <translation>Hinweis: diese Nachricht kann man unter "Einstellungen" abschalten.</translation>
-    </message>
     <message>
         <source>WARNING! Something went wrong on automatic backup</source>
         <translation>Warnung! Die automatische Datensicherung ist nicht in Ordnung</translation>
@@ -5014,10 +4934,6 @@ https://www.transifex.com/projects/p/dash/</translation>
         <source>Set lowest fee rate (in %s/kB) for transactions to be included in block creation. (default: %s)</source>
         <translation>Niedrigste Gebühr (in %s/kB) für Transaktionen einstellen, die bei der Blockerzeugung berücksichtigt werden sollen. (default: %s)</translation>
     </message>
-    <message>
-        <source>Show N confirmations for a successfully locked transaction (%u-%u, default: %u)</source>
-        <translation>Anzahl Bestätigungen für eine erfolgreich gesperrte Transaktion (%u-%u, voreingestellt: %u) </translation>
-    </message>
     <message>
         <source>This is the transaction fee you may pay when fee estimates are not available.</source>
         <translation>Das ist die Transaktionsgebühr, welche du zahlen müsstest, wenn die Gebührenschätzungen nicht verfügbar sind.</translation>
diff --git a/src/qt/locale/dash_en.ts b/src/qt/locale/dash_en.ts
index 76d8e0b12f79..85b199ef5976 100644
--- a/src/qt/locale/dash_en.ts
+++ b/src/qt/locale/dash_en.ts
@@ -317,12 +317,12 @@
         <translation>A fatal error occurred. Dash Core can no longer continue safely and will quit.</translation>
     </message>
     <message>
-        <location filename="../bitcoingui.cpp" line="+1127"/>
+        <location filename="../bitcoingui.cpp" line="+1129"/>
         <source>Dash Core</source>
         <translation>Dash Core</translation>
     </message>
     <message>
-        <location line="-984"/>
+        <location line="-986"/>
         <source>Wallet</source>
         <translation>Wallet</translation>
     </message>
@@ -728,7 +728,7 @@
         <translation>Transactions after this will not yet be visible.</translation>
     </message>
     <message>
-        <location line="+29"/>
+        <location line="+31"/>
         <source>Up to date</source>
         <translation>Up to date</translation>
     </message>
@@ -1006,8 +1006,8 @@
     </message>
     <message>
         <location line="+196"/>
-        <source>Non-anonymized input selected. &lt;b&gt;PrivateSend will be disabled.&lt;/b&gt;&lt;br&gt;&lt;br&gt;If you still want to use PrivateSend, please deselect all non-nonymized inputs first and then check PrivateSend checkbox again.</source>
-        <translation>Non-anonymized input selected. &lt;b&gt;PrivateSend will be disabled.&lt;/b&gt;&lt;br&gt;&lt;br&gt;If you still want to use PrivateSend, please deselect all non-nonymized inputs first and then check PrivateSend checkbox again.</translation>
+        <source>Non-anonymized input selected. &lt;b&gt;PrivateSend will be disabled.&lt;/b&gt;&lt;br&gt;&lt;br&gt;If you still want to use PrivateSend, please deselect all non-anonymized inputs first and then check the PrivateSend checkbox again.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+29"/>
@@ -1056,91 +1056,6 @@
         <translation>n/a</translation>
     </message>
 </context>
-<context>
-    <name>DarksendConfig</name>
-    <message>
-        <location filename="../forms/darksendconfig.ui" line="+14"/>
-        <source>Configure PrivateSend</source>
-        <translation>Configure PrivateSend</translation>
-    </message>
-    <message>
-        <location line="+12"/>
-        <source>Basic Privacy</source>
-        <translation>Basic Privacy</translation>
-    </message>
-    <message>
-        <location line="+13"/>
-        <source>High Privacy</source>
-        <translation>High Privacy</translation>
-    </message>
-    <message>
-        <location line="+13"/>
-        <source>Maximum Privacy</source>
-        <translation>Maximum Privacy</translation>
-    </message>
-    <message>
-        <location line="+13"/>
-        <source>Please select a privacy level.</source>
-        <translation>Please select a privacy level.</translation>
-    </message>
-    <message>
-        <location line="+13"/>
-        <source>Use 2 separate masternodes to mix funds up to 1000 DASH</source>
-        <translation>Use 2 separate masternodes to mix funds up to 1000 DASH</translation>
-    </message>
-    <message>
-        <location line="+13"/>
-        <source>Use 8 separate masternodes to mix funds up to 1000 DASH</source>
-        <translation>Use 8 separate masternodes to mix funds up to 1000 DASH</translation>
-    </message>
-    <message>
-        <location line="+13"/>
-        <source>Use 16 separate masternodes</source>
-        <translation>Use 16 separate masternodes</translation>
-    </message>
-    <message>
-        <location line="+13"/>
-        <source>This option is the quickest and will cost about ~0.025 DASH to anonymize 1000 DASH</source>
-        <translation>This option is the quickest and will cost about ~0.025 DASH to anonymize 1000 DASH</translation>
-    </message>
-    <message>
-        <location line="+13"/>
-        <source>This option is moderately fast and will cost about 0.05 DASH to anonymize 1000 DASH</source>
-        <translation>This option is moderately fast and will cost about 0.05 DASH to anonymize 1000 DASH</translation>
-    </message>
-    <message>
-        <location line="+26"/>
-        <source>0.1 DASH per 1000 DASH you anonymize.</source>
-        <translation>0.1 DASH per 1000 DASH you anonymize.</translation>
-    </message>
-    <message>
-        <location line="-13"/>
-        <source>This is the slowest and most secure option. Using maximum anonymity will cost</source>
-        <translation>This is the slowest and most secure option. Using maximum anonymity will cost</translation>
-    </message>
-    <message>
-        <location filename="../darksendconfig.cpp" line="+43"/>
-        <location line="+15"/>
-        <location line="+15"/>
-        <source>PrivateSend Configuration</source>
-        <translation>PrivateSend Configuration</translation>
-    </message>
-    <message>
-        <location line="-29"/>
-        <source>PrivateSend was successfully set to basic (%1 and 2 rounds). You can change this at any time by opening Dash&apos;s configuration screen.</source>
-        <translation>PrivateSend was successfully set to basic (%1 and 2 rounds). You can change this at any time by opening Dash&apos;s configuration screen.</translation>
-    </message>
-    <message>
-        <location line="+15"/>
-        <source>PrivateSend was successfully set to high (%1 and 8 rounds). You can change this at any time by opening Dash&apos;s configuration screen.</source>
-        <translation>PrivateSend was successfully set to high (%1 and 8 rounds). You can change this at any time by opening Dash&apos;s configuration screen.</translation>
-    </message>
-    <message>
-        <location line="+15"/>
-        <source>PrivateSend was successfully set to maximum (%1 and 16 rounds). You can change this at any time by opening Dash&apos;s configuration screen.</source>
-        <translation>PrivateSend was successfully set to maximum (%1 and 16 rounds). You can change this at any time by opening Dash&apos;s configuration screen.</translation>
-    </message>
-</context>
 <context>
     <name>EditAddressDialog</name>
     <message>
@@ -1312,8 +1227,8 @@
     </message>
     <message>
         <location line="+4"/>
-        <source>&lt;h3&gt;PrivateSend Basics&lt;/h3&gt; PrivateSend gives you true financial privacy by obscuring the origins of your funds. All the Dash in your wallet is comprised of different &quot;inputs&quot; which you can think of as separate, discrete coins.&lt;br&gt; PrivateSend uses an innovative process to mix your inputs with the inputs of two other people, without having your coins ever leave your wallet. You retain control of your money at all times.&lt;hr&gt; &lt;b&gt;The PrivateSend process works like this:&lt;/b&gt;&lt;ol type=&quot;1&quot;&gt; &lt;li&gt;PrivateSend begins by breaking your transaction inputs down into standard denominations. These denominations are 0.01 DASH, 0.1 DASH, 1 DASH and 10 DASH -- sort of like the paper money you use every day.&lt;/li&gt; &lt;li&gt;Your wallet then sends requests to specially configured software nodes on the network, called &quot;masternodes.&quot; These masternodes are informed then that you are interested in mixing a certain denomination. No identifiable information is sent to the masternodes, so they never know &quot;who&quot; you are.&lt;/li&gt; &lt;li&gt;When two other people send similar messages, indicating that they wish to mix the same denomination, a mixing session begins. The masternode mixes up the inputs and instructs all three users&apos; wallets to pay the now-transformed input back to themselves. Your wallet pays that denomination directly to itself, but in a different address (called a change address).&lt;/li&gt; &lt;li&gt;In order to fully obscure your funds, your wallet must repeat this process a number of times with each denomination. Each time the process is completed, it&apos;s called a &quot;round.&quot; Each round of PrivateSend makes it exponentially more difficult to determine where your funds originated.&lt;/li&gt; &lt;li&gt;This mixing process happens in the background without any intervention on your part. When you wish to make a transaction, your funds will already be anonymized. No additional waiting is required.&lt;/li&gt; &lt;/ol&gt; &lt;hr&gt;&lt;b&gt;IMPORTANT:&lt;/b&gt; Your wallet only contains 1000 of these &quot;change addresses.&quot; Every time a mixing event happens, up to 9 of your addresses are used up. This means those 1000 addresses last for about 100 mixing events. When 900 of them are used, your wallet must create more addresses. It can only do this, however, if you have automatic backups enabled.&lt;br&gt; Consequently, users who have backups disabled will also have PrivateSend disabled. &lt;hr&gt;For more info see &lt;a href=&quot;https://dashpay.atlassian.net/wiki/display/DOC/PrivateSend&quot;&gt;https://dashpay.atlassian.net/wiki/display/DOC/PrivateSend&lt;/a&gt;         </source>
-        <translation>&lt;h3&gt;PrivateSend Basics&lt;/h3&gt; PrivateSend gives you true financial privacy by obscuring the origins of your funds. All the Dash in your wallet is comprised of different &quot;inputs&quot; which you can think of as separate, discrete coins.&lt;br&gt; PrivateSend uses an innovative process to mix your inputs with the inputs of two other people, without having your coins ever leave your wallet. You retain control of your money at all times.&lt;hr&gt; &lt;b&gt;The PrivateSend process works like this:&lt;/b&gt;&lt;ol type=&quot;1&quot;&gt; &lt;li&gt;PrivateSend begins by breaking your transaction inputs down into standard denominations. These denominations are 0.01 DASH, 0.1 DASH, 1 DASH and 10 DASH -- sort of like the paper money you use every day.&lt;/li&gt; &lt;li&gt;Your wallet then sends requests to specially configured software nodes on the network, called &quot;masternodes.&quot; These masternodes are informed then that you are interested in mixing a certain denomination. No identifiable information is sent to the masternodes, so they never know &quot;who&quot; you are.&lt;/li&gt; &lt;li&gt;When two other people send similar messages, indicating that they wish to mix the same denomination, a mixing session begins. The masternode mixes up the inputs and instructs all three users&apos; wallets to pay the now-transformed input back to themselves. Your wallet pays that denomination directly to itself, but in a different address (called a change address).&lt;/li&gt; &lt;li&gt;In order to fully obscure your funds, your wallet must repeat this process a number of times with each denomination. Each time the process is completed, it&apos;s called a &quot;round.&quot; Each round of PrivateSend makes it exponentially more difficult to determine where your funds originated.&lt;/li&gt; &lt;li&gt;This mixing process happens in the background without any intervention on your part. When you wish to make a transaction, your funds will already be anonymized. No additional waiting is required.&lt;/li&gt; &lt;/ol&gt; &lt;hr&gt;&lt;b&gt;IMPORTANT:&lt;/b&gt; Your wallet only contains 1000 of these &quot;change addresses.&quot; Every time a mixing event happens, up to 9 of your addresses are used up. This means those 1000 addresses last for about 100 mixing events. When 900 of them are used, your wallet must create more addresses. It can only do this, however, if you have automatic backups enabled.&lt;br&gt; Consequently, users who have backups disabled will also have PrivateSend disabled. &lt;hr&gt;For more info see &lt;a href=&quot;https://dashpay.atlassian.net/wiki/display/DOC/PrivateSend&quot;&gt;https://dashpay.atlassian.net/wiki/display/DOC/PrivateSend&lt;/a&gt;         </translation>
+        <source>&lt;h3&gt;PrivateSend Basics&lt;/h3&gt; PrivateSend gives you true financial privacy by obscuring the origins of your funds. All the Dash in your wallet is comprised of different &quot;inputs&quot; which you can think of as separate, discrete coins.&lt;br&gt; PrivateSend uses an innovative process to mix your inputs with the inputs of two other people, without having your coins ever leave your wallet. You retain control of your money at all times.&lt;hr&gt; &lt;b&gt;The PrivateSend process works like this:&lt;/b&gt;&lt;ol type=&quot;1&quot;&gt; &lt;li&gt;PrivateSend begins by breaking your transaction inputs down into standard denominations. These denominations are 0.01 DASH, 0.1 DASH, 1 DASH and 10 DASH -- sort of like the paper money you use every day.&lt;/li&gt; &lt;li&gt;Your wallet then sends requests to specially configured software nodes on the network, called &quot;masternodes.&quot; These masternodes are informed then that you are interested in mixing a certain denomination. No identifiable information is sent to the masternodes, so they never know &quot;who&quot; you are.&lt;/li&gt; &lt;li&gt;When two other people send similar messages, indicating that they wish to mix the same denomination, a mixing session begins. The masternode mixes up the inputs and instructs all three users&apos; wallets to pay the now-transformed input back to themselves. Your wallet pays that denomination directly to itself, but in a different address (called a change address).&lt;/li&gt; &lt;li&gt;In order to fully obscure your funds, your wallet must repeat this process a number of times with each denomination. Each time the process is completed, it&apos;s called a &quot;round.&quot; Each round of PrivateSend makes it exponentially more difficult to determine where your funds originated.&lt;/li&gt; &lt;li&gt;This mixing process happens in the background without any intervention on your part. When you wish to make a transaction, your funds will already be anonymized. No additional waiting is required.&lt;/li&gt; &lt;/ol&gt; &lt;hr&gt;&lt;b&gt;IMPORTANT:&lt;/b&gt; Your wallet only contains 1000 of these &quot;change addresses.&quot; Every time a mixing event happens, up to 9 of your addresses are used up. This means those 1000 addresses last for about 100 mixing events. When 900 of them are used, your wallet must create more addresses. It can only do this, however, if you have automatic backups enabled.&lt;br&gt; Consequently, users who have backups disabled will also have PrivateSend disabled. &lt;hr&gt;For more information, see the &lt;a href=&quot;https://docs.dash.org/en/latest/wallets/dashcore/privatesend-instantsend.html&quot;&gt;PrivateSend documentation&lt;/a&gt;.         </source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -1388,53 +1303,53 @@
     </message>
     <message>
         <location line="+34"/>
-        <location filename="../masternodelist.cpp" line="+493"/>
+        <location filename="../masternodelist.cpp" line="+497"/>
         <source>Alias</source>
         <translation>Alias</translation>
     </message>
     <message>
         <location line="+5"/>
-        <location line="+130"/>
+        <location line="+133"/>
         <source>Address</source>
         <translation>Address</translation>
     </message>
     <message>
-        <location line="-125"/>
-        <location line="+130"/>
+        <location line="-128"/>
+        <location line="+133"/>
         <location filename="../masternodelist.cpp" line="+5"/>
         <source>Protocol</source>
         <translation>Protocol</translation>
     </message>
     <message>
-        <location line="-125"/>
-        <location line="+130"/>
+        <location line="-128"/>
+        <location line="+133"/>
         <location filename="../masternodelist.cpp" line="+3"/>
         <source>Status</source>
         <translation>Status</translation>
     </message>
     <message>
-        <location line="-125"/>
-        <location line="+130"/>
+        <location line="-128"/>
+        <location line="+133"/>
         <location filename="../masternodelist.cpp" line="+2"/>
         <source>Active</source>
         <translation>Active</translation>
     </message>
     <message>
-        <location line="-125"/>
-        <location line="+130"/>
+        <location line="-128"/>
+        <location line="+133"/>
         <location filename="../masternodelist.cpp" line="+1"/>
         <source>Last Seen</source>
         <translation>Last Seen</translation>
     </message>
     <message>
-        <location line="-125"/>
-        <location line="+130"/>
+        <location line="-128"/>
+        <location line="+133"/>
         <location filename="../masternodelist.cpp" line="-2"/>
         <source>Payee</source>
         <translation>Payee</translation>
     </message>
     <message>
-        <location line="-117"/>
+        <location line="-120"/>
         <source>S&amp;tart alias</source>
         <translation>S&amp;tart alias</translation>
     </message>
@@ -1470,17 +1385,17 @@
     </message>
     <message>
         <location line="+7"/>
-        <location line="+119"/>
+        <location line="+122"/>
         <source>0</source>
         <translation>0</translation>
     </message>
     <message>
-        <location line="-94"/>
+        <location line="-97"/>
         <source>All Masternodes</source>
         <translation>All Masternodes</translation>
     </message>
     <message>
-        <location line="+60"/>
+        <location line="+63"/>
         <source>Filter List:</source>
         <translation>Filter List:</translation>
     </message>
@@ -1495,12 +1410,12 @@
         <translation>Node Count:</translation>
     </message>
     <message>
-        <location filename="../masternodelist.cpp" line="-439"/>
+        <location filename="../masternodelist.cpp" line="-443"/>
         <source>Start alias</source>
         <translation>Start alias</translation>
     </message>
     <message>
-        <location line="+289"/>
+        <location line="+293"/>
         <source>Confirm masternode start</source>
         <translation>Confirm masternode start</translation>
     </message>
@@ -2017,7 +1932,7 @@ https://www.transifex.com/projects/p/dash/</translation>
         <translation>&amp;Cancel</translation>
     </message>
     <message>
-        <location filename="../optionsdialog.cpp" line="+108"/>
+        <location filename="../optionsdialog.cpp" line="+110"/>
         <source>default</source>
         <translation>default</translation>
     </message>
@@ -2144,7 +2059,7 @@ https://www.transifex.com/projects/p/dash/</translation>
     </message>
     <message>
         <location line="+35"/>
-        <location filename="../overviewpage.cpp" line="+502"/>
+        <location filename="../overviewpage.cpp" line="+511"/>
         <location line="+12"/>
         <location line="+8"/>
         <location line="+61"/>
@@ -2245,7 +2160,7 @@ https://www.transifex.com/projects/p/dash/</translation>
         <translation>Reset</translation>
     </message>
     <message>
-        <location filename="../overviewpage.cpp" line="-471"/>
+        <location filename="../overviewpage.cpp" line="-481"/>
         <location line="+1"/>
         <location line="+1"/>
         <source>out of sync</source>
@@ -2258,14 +2173,14 @@ https://www.transifex.com/projects/p/dash/</translation>
     </message>
     <message>
         <location line="+4"/>
-        <location line="+308"/>
+        <location line="+318"/>
         <location line="+155"/>
         <source>Start Mixing</source>
         <translation>Start Mixing</translation>
     </message>
     <message>
-        <location line="-461"/>
-        <location line="+464"/>
+        <location line="-471"/>
+        <location line="+474"/>
         <source>Stop Mixing</source>
         <translation>Stop Mixing</translation>
     </message>
@@ -2331,7 +2246,7 @@ https://www.transifex.com/projects/p/dash/</translation>
     <message>
         <location line="+15"/>
         <location line="+48"/>
-        <location line="+140"/>
+        <location line="+131"/>
         <location line="+1"/>
         <location line="+1"/>
         <location line="+3"/>
@@ -2339,7 +2254,7 @@ https://www.transifex.com/projects/p/dash/</translation>
         <translation>Disabled</translation>
     </message>
     <message>
-        <location line="-180"/>
+        <location line="-171"/>
         <source>Very low number of keys left since last automatic backup!</source>
         <translation>Very low number of keys left since last automatic backup!</translation>
     </message>
@@ -4661,7 +4576,7 @@ https://www.transifex.com/projects/p/dash/</translation>
         <translation>(n/a)</translation>
     </message>
     <message>
-        <location line="+219"/>
+        <location line="+243"/>
         <source>(no label)</source>
         <translation>(no label)</translation>
     </message>
@@ -5009,7 +4924,7 @@ https://www.transifex.com/projects/p/dash/</translation>
 <context>
     <name>dash-core</name>
     <message>
-        <location filename="../dashstrings.cpp" line="+33"/>
+        <location filename="../dashstrings.cpp" line="+36"/>
         <source>Bind to given address and always listen on it. Use [host]:port notation for IPv6</source>
         <translation>Bind to given address and always listen on it. Use [host]:port notation for IPv6</translation>
     </message>
@@ -5034,7 +4949,7 @@ https://www.transifex.com/projects/p/dash/</translation>
         <translation>Execute command when the best block changes (%s in cmd is replaced by block hash)</translation>
     </message>
     <message>
-        <location line="+71"/>
+        <location line="+74"/>
         <source>Name to construct url for KeePass entry that stores the wallet passphrase</source>
         <translation>Name to construct url for KeePass entry that stores the wallet passphrase</translation>
     </message>
@@ -5049,12 +4964,12 @@ https://www.transifex.com/projects/p/dash/</translation>
         <translation>Set the number of script verification threads (%u to %d, 0 = auto, &lt;0 = leave that many cores free, default: %d)</translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+14"/>
         <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source>
         <translation>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</translation>
     </message>
     <message>
-        <location line="+67"/>
+        <location line="+70"/>
         <source>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</source>
         <translation>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</translation>
     </message>
@@ -5064,7 +4979,7 @@ https://www.transifex.com/projects/p/dash/</translation>
         <translation>Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.</translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+11"/>
         <source>You must specify a masternodeprivkey in the configuration. Please see documentation for help.</source>
         <translation>You must specify a masternodeprivkey in the configuration. Please see documentation for help.</translation>
     </message>
@@ -5144,7 +5059,7 @@ https://www.transifex.com/projects/p/dash/</translation>
         <translation>Done loading</translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location line="+12"/>
         <source>Entries are full.</source>
         <translation>Entries are full.</translation>
     </message>
@@ -5189,7 +5104,7 @@ https://www.transifex.com/projects/p/dash/</translation>
         <translation>Failed to listen on any port. Use -listen=0 if you want this.</translation>
     </message>
     <message>
-        <location line="-381"/>
+        <location line="-388"/>
         <source>(1 = keep tx meta data e.g. account owner and payment request information, 2 = drop tx meta data)</source>
         <translation>(1 = keep tx meta data e.g. account owner and payment request information, 2 = drop tx meta data)</translation>
     </message>
@@ -5239,7 +5154,7 @@ https://www.transifex.com/projects/p/dash/</translation>
         <translation>Error loading %s: You can&apos;t enable HD on a already existing non-HD wallet</translation>
     </message>
     <message>
-        <location line="+32"/>
+        <location line="+35"/>
         <source>Found unconfirmed denominated outputs, will wait till they confirm to continue.</source>
         <translation>Found unconfirmed denominated outputs, will wait till they confirm to continue.</translation>
     </message>
@@ -5309,7 +5224,7 @@ https://www.transifex.com/projects/p/dash/</translation>
         <translation>Whitelisted peers cannot be DoS banned and their transactions are always relayed, even if they are already in the mempool, useful e.g. for a gateway</translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+11"/>
         <source>You need to rebuild the database using -reindex-chainstate to change -txindex</source>
         <translation>You need to rebuild the database using -reindex-chainstate to change -txindex</translation>
     </message>
@@ -5349,7 +5264,7 @@ https://www.transifex.com/projects/p/dash/</translation>
         <translation>Connect to KeePassHttp on port &lt;port&gt; (default: %u)</translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+19"/>
         <source>Enable the client to act as a masternode (0-1, default: %u)</source>
         <translation>Enable the client to act as a masternode (0-1, default: %u)</translation>
     </message>
@@ -5364,7 +5279,7 @@ https://www.transifex.com/projects/p/dash/</translation>
         <translation>Error loading %s: You can&apos;t disable HD on a already existing HD wallet</translation>
     </message>
     <message>
-        <location line="+13"/>
+        <location line="+14"/>
         <source>Failed to load fulfilled requests cache from</source>
         <translation>Failed to load fulfilled requests cache from</translation>
     </message>
@@ -5384,7 +5299,7 @@ https://www.transifex.com/projects/p/dash/</translation>
         <translation>Failed to load masternode payments cache from</translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+5"/>
         <source>Found enough users, signing ( waiting %s )</source>
         <translation>Found enough users, signing ( waiting %s )</translation>
     </message>
@@ -5454,7 +5369,7 @@ https://www.transifex.com/projects/p/dash/</translation>
         <translation>Invalid amount for -paytxfee=&lt;amount&gt;: &apos;%s&apos; (must be at least %s)</translation>
     </message>
     <message>
-        <location line="+11"/>
+        <location line="+12"/>
         <source>Keypool ran out, please call keypoolrefill first</source>
         <translation>Keypool ran out, please call keypoolrefill first</translation>
     </message>
@@ -5469,7 +5384,7 @@ https://www.transifex.com/projects/p/dash/</translation>
         <translation>Listen for connections on &lt;port&gt; (default: %u or testnet: %u)</translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+3"/>
         <source>Loading banlist...</source>
         <translation>Loading banlist...</translation>
     </message>
@@ -5489,7 +5404,7 @@ https://www.transifex.com/projects/p/dash/</translation>
         <translation>Loading masternode payment cache...</translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+5"/>
         <source>Lock is already in place.</source>
         <translation>Lock is already in place.</translation>
     </message>
@@ -5669,7 +5584,7 @@ https://www.transifex.com/projects/p/dash/</translation>
         <translation>Tor control port to use if onion listening enabled (default: %s)</translation>
     </message>
     <message>
-        <location line="+13"/>
+        <location line="+14"/>
         <source>Unable to start HTTP server. See debug log for details.</source>
         <translation>Unable to start HTTP server. See debug log for details.</translation>
     </message>
@@ -5719,17 +5634,17 @@ https://www.transifex.com/projects/p/dash/</translation>
         <translation>User Agent comment (%s) contains unsafe characters.</translation>
     </message>
     <message>
-        <location line="+15"/>
+        <location line="+16"/>
         <source>Will retry...</source>
         <translation>Will retry...</translation>
     </message>
     <message>
-        <location line="-158"/>
+        <location line="-162"/>
         <source>Invalid masternodeprivkey. Please see documenation.</source>
         <translation>Invalid masternodeprivkey. Please see documenation.</translation>
     </message>
     <message>
-        <location line="-75"/>
+        <location line="-80"/>
         <source>Can&apos;t find random Masternode.</source>
         <translation>Can&apos;t find random Masternode.</translation>
     </message>
@@ -5744,7 +5659,7 @@ https://www.transifex.com/projects/p/dash/</translation>
         <translation>Could not parse masternode.conf</translation>
     </message>
     <message>
-        <location line="+61"/>
+        <location line="+66"/>
         <source>Invalid netmask specified in -whitelist: &apos;%s&apos;</source>
         <translation>Invalid netmask specified in -whitelist: &apos;%s&apos;</translation>
     </message>
@@ -5774,12 +5689,17 @@ https://www.transifex.com/projects/p/dash/</translation>
         <translation>Keep at most &lt;n&gt; unconnectable transactions in memory (default: %u)</translation>
     </message>
     <message>
-        <location line="-376"/>
+        <location line="-386"/>
         <source>Disable all Dash specific functionality (Masternodes, PrivateSend, InstantSend, Governance) (0-1, default: %u)</source>
         <translation>Disable all Dash specific functionality (Masternodes, PrivateSend, InstantSend, Governance) (0-1, default: %u)</translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="-43"/>
+        <source>%s file contains all private keys from this wallet. Do not share it with anyone!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+46"/>
         <source>Discover own IP addresses (default: 1 when listening and no -externalip or -proxy)</source>
         <translation>Discover own IP addresses (default: 1 when listening and no -externalip or -proxy)</translation>
     </message>
@@ -5810,6 +5730,11 @@ https://www.transifex.com/projects/p/dash/</translation>
     </message>
     <message>
         <location line="+9"/>
+        <source>Extra transactions to keep in memory for compact block reconstructions (default: %u)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
         <source>Failed to create backup, file already exists! This could happen if you restarted wallet in less than 60 seconds. You can continue if you are ok with this.</source>
         <translation>Failed to create backup, file already exists! This could happen if you restarted wallet in less than 60 seconds. You can continue if you are ok with this.</translation>
     </message>
@@ -5884,7 +5809,7 @@ https://www.transifex.com/projects/p/dash/</translation>
         <translation>Rescans are not possible in pruned mode. You will need to use -reindex which will download the whole blockchain again.</translation>
     </message>
     <message>
-        <location line="+14"/>
+        <location line="+11"/>
         <source>Specify full path to directory for automatic wallet backups (must exist)</source>
         <translation>Specify full path to directory for automatic wallet backups (must exist)</translation>
     </message>
@@ -5908,6 +5833,11 @@ https://www.transifex.com/projects/p/dash/</translation>
         <source>Total length of network version string (%i) exceeds maximum length (%i). Reduce the number or size of uacomments.</source>
         <translation>Total length of network version string (%i) exceeds maximum length (%i). Reduce the number or size of uacomments.</translation>
     </message>
+    <message>
+        <location line="+3"/>
+        <source>Transaction index can&apos;t be disabled in full mode. Either start with -litemode command line switch or enable transaction index.</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location line="+3"/>
         <source>Tries to keep outbound traffic under the given target (in MiB per 24h), 0 = no limit (default: %d)</source>
@@ -5949,7 +5879,12 @@ https://www.transifex.com/projects/p/dash/</translation>
         <translation>Warning: Unknown block versions being mined! It&apos;s possible unknown rules are in effect</translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="+16"/>
+        <source>You are starting in lite mode, all Dash-specific functionality is disabled.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
         <source>You need to rebuild the database using -reindex to go back to unpruned mode.  This will redownload the entire blockchain</source>
         <translation>You need to rebuild the database using -reindex to go back to unpruned mode.  This will redownload the entire blockchain</translation>
     </message>
@@ -6003,6 +5938,16 @@ https://www.transifex.com/projects/p/dash/</translation>
         <source>Enable publish hash block in &lt;address&gt;</source>
         <translation>Enable publish hash block in &lt;address&gt;</translation>
     </message>
+    <message>
+        <location line="+1"/>
+        <source>Enable publish hash of governance objects (like proposals) in &lt;address&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Enable publish hash of governance votes in &lt;address&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location line="+1"/>
         <source>Enable publish hash transaction (locked via InstantSend) in &lt;address&gt;</source>
@@ -6054,7 +5999,17 @@ https://www.transifex.com/projects/p/dash/</translation>
         <translation>Failed to delete backup, error: %s</translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="+3"/>
+        <source>Failed to load InstantSend data cache from</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Failed to load sporks cache from</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
         <source>Failed to parse host:port string</source>
         <translation>Failed to parse host:port string</translation>
     </message>
@@ -6079,7 +6034,12 @@ https://www.transifex.com/projects/p/dash/</translation>
         <translation>Invalid amount for -fallbackfee=&lt;amount&gt;: &apos;%s&apos;</translation>
     </message>
     <message>
-        <location line="+11"/>
+        <location line="+2"/>
+        <source>Invalid input count.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
         <source>Keep the transaction memory pool below &lt;n&gt; megabytes (default: %u)</source>
         <translation>Keep the transaction memory pool below &lt;n&gt; megabytes (default: %u)</translation>
     </message>
@@ -6100,6 +6060,11 @@ https://www.transifex.com/projects/p/dash/</translation>
     </message>
     <message>
         <location line="+3"/>
+        <source>Loading InstantSend data cache...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
         <source>Loading addresses...</source>
         <translation>Loading addresses...</translation>
     </message>
@@ -6115,6 +6080,11 @@ https://www.transifex.com/projects/p/dash/</translation>
     </message>
     <message>
         <location line="+3"/>
+        <source>Loading sporks cache...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
         <source>Loading wallet... (%3.2f %%)</source>
         <translation>Loading wallet... (%3.2f %%)</translation>
     </message>
@@ -6290,6 +6260,11 @@ https://www.transifex.com/projects/p/dash/</translation>
     </message>
     <message>
         <location line="+3"/>
+        <source>Transaction too large</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
         <source>Trying to connect...</source>
         <translation>Trying to connect...</translation>
     </message>
@@ -6315,6 +6290,11 @@ https://www.transifex.com/projects/p/dash/</translation>
     </message>
     <message>
         <location line="+2"/>
+        <source>Wallet is not initialized</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
         <source>Wallet needed to be rewritten: restart %s to complete</source>
         <translation>Wallet needed to be rewritten: restart %s to complete</translation>
     </message>
@@ -6334,7 +6314,12 @@ https://www.transifex.com/projects/p/dash/</translation>
         <translation>Whether to operate in a blocks only mode (default: %u)</translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+2"/>
+        <source>You can not start a masternode in lite mode.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
         <source>ZeroMQ notification options:</source>
         <translation>ZeroMQ notification options:</translation>
     </message>
@@ -6349,12 +6334,12 @@ https://www.transifex.com/projects/p/dash/</translation>
         <translation>see debug.log for details.</translation>
     </message>
     <message>
-        <location line="-99"/>
+        <location line="-102"/>
         <source>RPC server options:</source>
         <translation>RPC server options:</translation>
     </message>
     <message>
-        <location line="-475"/>
+        <location line="-490"/>
         <source>Dash Core</source>
         <translation>Dash Core</translation>
     </message>
@@ -6364,7 +6349,7 @@ https://www.transifex.com/projects/p/dash/</translation>
         <translation>The %s developers</translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location line="+13"/>
         <source>Accept connections from outside (default: 1 if no -proxy or -connect/-noconnect)</source>
         <translation>Accept connections from outside (default: 1 if no -proxy or -connect/-noconnect)</translation>
     </message>
@@ -6389,7 +6374,7 @@ https://www.transifex.com/projects/p/dash/</translation>
         <translation>Error reading %s! All keys read correctly, but transaction data or address book entries might be missing or incorrect.</translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+30"/>
         <source>Force relay of transactions from whitelisted peers even if they violate local relay policy (default: %d)</source>
         <translation>Force relay of transactions from whitelisted peers even if they violate local relay policy (default: %d)</translation>
     </message>
@@ -6444,12 +6429,7 @@ https://www.transifex.com/projects/p/dash/</translation>
         <translation>Set lowest fee rate (in %s/kB) for transactions to be included in block creation. (default: %s)</translation>
     </message>
     <message>
-        <location line="+8"/>
-        <source>Show N confirmations for a successfully locked transaction (%u-%u, default: %u)</source>
-        <translation>Show N confirmations for a successfully locked transaction (%u-%u, default: %u)</translation>
-    </message>
-    <message>
-        <location line="+17"/>
+        <location line="+22"/>
         <source>This is the transaction fee you may pay when fee estimates are not available.</source>
         <translation>This is the transaction fee you may pay when fee estimates are not available.</translation>
     </message>
@@ -6459,7 +6439,7 @@ https://www.transifex.com/projects/p/dash/</translation>
         <translation>This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit %s and cryptographic software written by Eric Young and UPnP software written by Thomas Bernard.</translation>
     </message>
     <message>
-        <location line="+12"/>
+        <location line="+15"/>
         <source>Unable to locate enough PrivateSend non-denominated funds for this transaction.</source>
         <translation>Unable to locate enough PrivateSend non-denominated funds for this transaction.</translation>
     </message>
@@ -6509,7 +6489,7 @@ https://www.transifex.com/projects/p/dash/</translation>
         <translation>Whitelist peers connecting from the given IP address (e.g. 1.2.3.4) or CIDR notated network (e.g. 1.2.3.0/24). Can be specified multiple times.</translation>
     </message>
     <message>
-        <location line="+14"/>
+        <location line="+16"/>
         <source>%s corrupt, salvage failed</source>
         <translation>%s corrupt, salvage failed</translation>
     </message>
@@ -6569,7 +6549,7 @@ https://www.transifex.com/projects/p/dash/</translation>
         <translation>Copyright (C)</translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+22"/>
         <source>Error loading %s</source>
         <translation>Error loading %s</translation>
     </message>
@@ -6594,7 +6574,7 @@ https://www.transifex.com/projects/p/dash/</translation>
         <translation>Failed to find mixing queue to join</translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="+9"/>
         <source>Failed to start a new mixing queue</source>
         <translation>Failed to start a new mixing queue</translation>
     </message>
@@ -6609,7 +6589,7 @@ https://www.transifex.com/projects/p/dash/</translation>
         <translation>Invalid amount for -%s=&lt;amount&gt;: &apos;%s&apos;</translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="+8"/>
         <source>Invalid spork address specified with -sporkaddr</source>
         <translation>Invalid spork address specified with -sporkaddr</translation>
     </message>
@@ -6619,7 +6599,7 @@ https://www.transifex.com/projects/p/dash/</translation>
         <translation>Keep N DASH anonymized (%u-%u, default: %u)</translation>
     </message>
     <message>
-        <location line="+49"/>
+        <location line="+51"/>
         <source>Print this help message and exit</source>
         <translation>Print this help message and exit</translation>
     </message>
@@ -6774,7 +6754,7 @@ https://www.transifex.com/projects/p/dash/</translation>
         <translation>Transaction too large for fee policy</translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+3"/>
         <source>Unable to bind to %s on this computer (bind returned error %s)</source>
         <translation>Unable to bind to %s on this computer (bind returned error %s)</translation>
     </message>
@@ -6824,7 +6804,7 @@ https://www.transifex.com/projects/p/dash/</translation>
         <translation>Wallet is locked.</translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+3"/>
         <source>Wallet options:</source>
         <translation>Wallet options:</translation>
     </message>
@@ -6839,7 +6819,7 @@ https://www.transifex.com/projects/p/dash/</translation>
         <translation>Warning</translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+6"/>
         <source>Your entries added successfully.</source>
         <translation>Your entries added successfully.</translation>
     </message>
diff --git a/src/qt/locale/dash_es.ts b/src/qt/locale/dash_es.ts
index cbbb1eb6895f..62a7d4a8c8ff 100644
--- a/src/qt/locale/dash_es.ts
+++ b/src/qt/locale/dash_es.ts
@@ -11,7 +11,7 @@
     </message>
     <message>
         <source>&amp;New</source>
-        <translation>Nuevo</translation>
+        <translation>&amp;Nuevo</translation>
     </message>
     <message>
         <source>Copy the currently selected address to the system clipboard</source>
@@ -19,7 +19,7 @@
     </message>
     <message>
         <source>&amp;Copy</source>
-        <translation>Copiar</translation>
+        <translation>&amp;Copiar</translation>
     </message>
     <message>
         <source>Delete the currently selected address from the list</source>
@@ -27,7 +27,7 @@
     </message>
     <message>
         <source>&amp;Delete</source>
-        <translation>Eliminar</translation>
+        <translation>&amp;Eliminar</translation>
     </message>
     <message>
         <source>Export the data in the current tab to a file</source>
@@ -35,11 +35,11 @@
     </message>
     <message>
         <source>&amp;Export</source>
-        <translation>Exportar</translation>
+        <translation>&amp;Exportar</translation>
     </message>
     <message>
         <source>C&amp;lose</source>
-        <translation>Cerrar</translation>
+        <translation>C&amp;errar</translation>
     </message>
     <message>
         <source>Choose the address to send coins to</source>
@@ -51,7 +51,7 @@
     </message>
     <message>
         <source>C&amp;hoose</source>
-        <translation>Escoger</translation>
+        <translation>E&amp;scoger</translation>
     </message>
     <message>
         <source>Sending addresses</source>
@@ -71,15 +71,15 @@
     </message>
     <message>
         <source>&amp;Copy Address</source>
-        <translation>Copiar Dirección</translation>
+        <translation>&amp;Copiar Dirección</translation>
     </message>
     <message>
         <source>Copy &amp;Label</source>
-        <translation>Copiar Etiqueta</translation>
+        <translation>Copiar &amp;Etiqueta</translation>
     </message>
     <message>
         <source>&amp;Edit</source>
-        <translation>Editar</translation>
+        <translation>&amp;Editar</translation>
     </message>
     <message>
         <source>Export Address List</source>
@@ -133,31 +133,31 @@
     </message>
     <message>
         <source>Enter the new passphrase to the wallet.&lt;br/&gt;Please use a passphrase of &lt;b&gt;ten or more random characters&lt;/b&gt;, or &lt;b&gt;eight or more words&lt;/b&gt;.</source>
-        <translation>Introduzca la nueva contraseña del monedero.&lt;br/&gt;Por favor, use una contraseña con &lt;b&gt;diez o más caracteres aleatorios&lt;/b&gt;, u &lt;b&gt;ocho o más palabras&lt;/b&gt;.</translation>
+        <translation>Introduzca la nueva contraseña de la billetera.&lt;br/&gt;Por favor, use una contraseña con &lt;b&gt;diez o más caracteres aleatorios&lt;/b&gt;, u &lt;b&gt;ocho o más palabras&lt;/b&gt;.</translation>
     </message>
     <message>
         <source>Encrypt wallet</source>
-        <translation>Cifrar el monedero</translation>
+        <translation>Cifrar la billetera</translation>
     </message>
     <message>
         <source>This operation needs your wallet passphrase to unlock the wallet.</source>
-        <translation>Esta operación requiere su contraseña para desbloquear el monedero.</translation>
+        <translation>Esta operación requiere su contraseña para desbloquear la billetera.</translation>
     </message>
     <message>
         <source>Unlock wallet for mixing only</source>
-        <translation>Desbloquear monedero solo para mezcla</translation>
+        <translation>Desbloquear la billetera solo para mezcla</translation>
     </message>
     <message>
         <source>Unlock wallet</source>
-        <translation>Desbloquear monedero</translation>
+        <translation>Desbloquear la billetera</translation>
     </message>
     <message>
         <source>This operation needs your wallet passphrase to decrypt the wallet.</source>
-        <translation>Esta operación requiere su contraseña para descifrar el monedero.</translation>
+        <translation>Esta operación requiere su contraseña para descifrar la billetera.</translation>
     </message>
     <message>
         <source>Decrypt wallet</source>
-        <translation>Descifrar el monedero</translation>
+        <translation>Descifrar la billetera</translation>
     </message>
     <message>
         <source>Change passphrase</source>
@@ -165,43 +165,43 @@
     </message>
     <message>
         <source>Enter the old passphrase and new passphrase to the wallet.</source>
-        <translation>Ingresa la antigua frase de acceso y la nueva contraseña del monedero.</translation>
+        <translation>Ingresa la antigua frase de acceso y la nueva contraseña de la billetera.</translation>
     </message>
     <message>
         <source>Confirm wallet encryption</source>
-        <translation>Confirmar cifrado del monedero</translation>
+        <translation>Confirmar cifrado de la billetera</translation>
     </message>
     <message>
         <source>Warning: If you encrypt your wallet and lose your passphrase, you will &lt;b&gt;LOSE ALL OF YOUR DASH&lt;/b&gt;!</source>
-        <translation>Advertencia: Si cifra su monedero y pierde su contraseña, ¡&lt;b&gt;PERDERÁ TODOS SUS DASH&lt;/b&gt;!</translation>
+        <translation>Advertencia: Si cifra su billetera y pierde su contraseña, ¡&lt;b&gt;PERDERÁ TODOS SUS DASH&lt;/b&gt;!</translation>
     </message>
     <message>
         <source>Are you sure you wish to encrypt your wallet?</source>
-        <translation>¿Esta seguro que desea cifrar su monedero?</translation>
+        <translation>¿Esta seguro que desea cifrar su billetera?</translation>
     </message>
     <message>
         <source>Wallet encrypted</source>
-        <translation>Monedero cifrado</translation>
+        <translation>Billetera cifrado</translation>
     </message>
     <message>
         <source>%1 will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your funds from being stolen by malware infecting your computer.</source>
-        <translation>%1 se cerrará al finalizar el proceso de encriptación. Recuerda que el cifrado de tu monedero no protege totalmente tus fondos de ser robados por infección de malware en tu computador.</translation>
+        <translation>%1 se cerrará al finalizar el proceso de encriptación. Recuerda que el cifrado de tu billetera no protege totalmente tus fondos de ser robados por infección de malware en tu computador.</translation>
     </message>
     <message>
         <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. Previous backups of the unencrypted wallet file contain the same HD seed and still have full access to all your funds just like the new, encrypted wallet.</source>
-        <translation>IMPORTANTE: Todas las copias de seguridad anteriores que haya realizado de su archivo de monedero se deben reemplazar con el archivo del monedero cifrado recién generado. Las copias de seguridad anteriores del archivo de monedero sin cifrar contienen la misma semilla HD y aun contienen el acceso completo a todos tus fondos al igual que el nuevo monedero cifrado.</translation>
+        <translation>IMPORTANTE: Todas las copias de seguridad anteriores que haya realizado de su archivo de la billetera se deben reemplazar con el archivo de la billetera cifrado recién generado. Las copias de seguridad anteriores del archivo de la billetera sin cifrar contienen la misma semilla HD y aun contienen el acceso completo a todos tus fondos al igual que la nueva billetera cifrada.</translation>
     </message>
     <message>
         <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</source>
-        <translation>IMPORTANTE: Cualquier copia de seguridad que haya realizado previamente de su archivo del monedero debe reemplazarse con el nuevo archivo de monedero cifrado. Por razones de seguridad, las copias de seguridad previas del archivo del monedero no cifradas serán inservibles en cuanto comience a usar el nuevo monedero cifrado.</translation>
+        <translation>IMPORTANTE: Cualquier copia de seguridad que haya realizado previamente de su archivo de la billetera debe reemplazarse con el nuevo archivo de la billetera cifrado. Por razones de seguridad, las copias de seguridad previas del archivo de la billetera no cifradas serán inservibles en cuanto comience a usar la nueva billetera cifrado.</translation>
     </message>
     <message>
         <source>Wallet encryption failed</source>
-        <translation>Ha fallado el cifrado del monedero</translation>
+        <translation>Ha fallado el cifrado de la billetera</translation>
     </message>
     <message>
         <source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source>
-        <translation>Ha fallado el cifrado del monedero debido a un error interno. Su monedero no fue cifrado.</translation>
+        <translation>Ha fallado el cifrado de la billetera debido a un error interno. Su billetera no fue cifrada.</translation>
     </message>
     <message>
         <source>The supplied passphrases do not match.</source>
@@ -209,19 +209,19 @@
     </message>
     <message>
         <source>Wallet unlock failed</source>
-        <translation>Ha fallado el desbloqueo del monedero</translation>
+        <translation>Ha fallado el desbloqueo de la billetera</translation>
     </message>
     <message>
         <source>The passphrase entered for the wallet decryption was incorrect.</source>
-        <translation>La contraseña introducida para descifrar el monedero es incorrecta.</translation>
+        <translation>La contraseña introducida para descifrar la billetera es incorrecta.</translation>
     </message>
     <message>
         <source>Wallet decryption failed</source>
-        <translation>Ha fallado el descifrado del monedero</translation>
+        <translation>Ha fallado el descifrado de la billetera</translation>
     </message>
     <message>
         <source>Wallet passphrase was successfully changed.</source>
-        <translation>Se ha cambiado correctamente la contraseña del monedero.</translation>
+        <translation>Se ha cambiado correctamente la contraseña de la billetera</translation>
     </message>
     <message>
         <source>Warning: The Caps Lock key is on!</source>
@@ -251,7 +251,7 @@
     </message>
     <message>
         <source>Wallet</source>
-        <translation>Monedero</translation>
+        <translation>Billetera</translation>
     </message>
     <message>
         <source>Node</source>
@@ -259,15 +259,15 @@
     </message>
     <message>
         <source>&amp;Overview</source>
-        <translation>Vista general</translation>
+        <translation>&amp;Vista general</translation>
     </message>
     <message>
         <source>Show general overview of wallet</source>
-        <translation>Mostrar vista general del monedero</translation>
+        <translation>Mostrar vista general de la billetera</translation>
     </message>
     <message>
         <source>&amp;Send</source>
-        <translation>Enviar</translation>
+        <translation>&amp;Enviar</translation>
     </message>
     <message>
         <source>Send coins to a Dash address</source>
@@ -275,7 +275,7 @@
     </message>
     <message>
         <source>&amp;Receive</source>
-        <translation>Recibir</translation>
+        <translation>&amp;Recibir</translation>
     </message>
     <message>
         <source>Request payments (generates QR codes and dash: URIs)</source>
@@ -283,7 +283,7 @@
     </message>
     <message>
         <source>&amp;Transactions</source>
-        <translation>Transacciones</translation>
+        <translation>&amp;Transacciones</translation>
     </message>
     <message>
         <source>Browse transaction history</source>
@@ -291,7 +291,7 @@
     </message>
     <message>
         <source>&amp;Masternodes</source>
-        <translation>Masternodes</translation>
+        <translation>&amp;Masternodes</translation>
     </message>
     <message>
         <source>Browse masternodes</source>
@@ -299,7 +299,7 @@
     </message>
     <message>
         <source>E&amp;xit</source>
-        <translation>Salir</translation>
+        <translation>S&amp;alir</translation>
     </message>
     <message>
         <source>Quit application</source>
@@ -311,7 +311,7 @@
     </message>
     <message>
         <source>About &amp;Qt</source>
-        <translation>Acerca de Qt</translation>
+        <translation>Acerca de &amp;Qt</translation>
     </message>
     <message>
         <source>Show information about Qt</source>
@@ -319,11 +319,11 @@
     </message>
     <message>
         <source>&amp;Options...</source>
-        <translation>Opciones...</translation>
+        <translation>&amp;Opciones...</translation>
     </message>
     <message>
         <source>&amp;About %1</source>
-        <translation>Acerca de %1</translation>
+        <translation>&amp;Acerca de %1</translation>
     </message>
     <message>
         <source>Modify configuration options for %1</source>
@@ -331,7 +331,7 @@
     </message>
     <message>
         <source>&amp;Show / Hide</source>
-        <translation>Mostrar / ocultar</translation>
+        <translation>&amp;Mostrar / ocultar</translation>
     </message>
     <message>
         <source>Show or hide the main Window</source>
@@ -339,43 +339,43 @@
     </message>
     <message>
         <source>&amp;Encrypt Wallet...</source>
-        <translation>Cifrar monedero…</translation>
+        <translation>&amp;Cifrar billetera…</translation>
     </message>
     <message>
         <source>Encrypt the private keys that belong to your wallet</source>
-        <translation>Cifrar las llaves privadas que pertenezcan a su monedero</translation>
+        <translation>Cifrar las llaves privadas que pertenezcan a su billetera</translation>
     </message>
     <message>
         <source>&amp;Backup Wallet...</source>
-        <translation>Copia de seguridad del Monedero...</translation>
+        <translation>&amp;Copia de seguridad de la billetera...</translation>
     </message>
     <message>
         <source>Backup wallet to another location</source>
-        <translation>Crear copia de seguridad del monedero en otra ubicación</translation>
+        <translation>Crear copia de seguridad de la billetera en otra ubicación</translation>
     </message>
     <message>
         <source>&amp;Change Passphrase...</source>
-        <translation>Cambiar contraseña…</translation>
+        <translation>&amp;Cambiar contraseña…</translation>
     </message>
     <message>
         <source>Change the passphrase used for wallet encryption</source>
-        <translation>Cambiar la contraseña utilizada para el cifrado del monedero</translation>
+        <translation>Cambiar la contraseña utilizada para el cifrado de la billetera</translation>
     </message>
     <message>
         <source>&amp;Unlock Wallet...</source>
-        <translation>Desbloquear Monedero</translation>
+        <translation>&amp;Desbloquear billetera</translation>
     </message>
     <message>
         <source>Unlock wallet</source>
-        <translation>Desbloquear monedero</translation>
+        <translation>Desbloquear billetera</translation>
     </message>
     <message>
         <source>&amp;Lock Wallet</source>
-        <translation>Bloquear Monedero</translation>
+        <translation>&amp;Bloquear billetera</translation>
     </message>
     <message>
         <source>Sign &amp;message...</source>
-        <translation>Firmar mensaje...</translation>
+        <translation>Firmar &amp;mensaje...</translation>
     </message>
     <message>
         <source>Sign messages with your Dash addresses to prove you own them</source>
@@ -383,7 +383,7 @@
     </message>
     <message>
         <source>&amp;Verify message...</source>
-        <translation>Verificar mensaje...</translation>
+        <translation>&amp;Verificar mensaje...</translation>
     </message>
     <message>
         <source>Verify messages to ensure they were signed with specified Dash addresses</source>
@@ -391,7 +391,7 @@
     </message>
     <message>
         <source>&amp;Information</source>
-        <translation>Información</translation>
+        <translation>&amp;Información</translation>
     </message>
     <message>
         <source>Show diagnostic information</source>
@@ -399,7 +399,7 @@
     </message>
     <message>
         <source>&amp;Debug console</source>
-        <translation>Consola de depuración</translation>
+        <translation>&amp;Consola de depuración</translation>
     </message>
     <message>
         <source>Open debugging console</source>
@@ -407,7 +407,7 @@
     </message>
     <message>
         <source>&amp;Network Monitor</source>
-        <translation>Monitor de Red</translation>
+        <translation>&amp;Monitor de Red</translation>
     </message>
     <message>
         <source>Show network monitor</source>
@@ -415,7 +415,7 @@
     </message>
     <message>
         <source>&amp;Peers list</source>
-        <translation>Lista de Pares</translation>
+        <translation>&amp;Lista de Pares</translation>
     </message>
     <message>
         <source>Show peers info</source>
@@ -423,15 +423,15 @@
     </message>
     <message>
         <source>Wallet &amp;Repair</source>
-        <translation>Reparar Monedero</translation>
+        <translation>Reparar &amp;billetera</translation>
     </message>
     <message>
         <source>Show wallet repair options</source>
-        <translation>Mostrar opciones para reparar monedero</translation>
+        <translation>Mostrar opciones para reparar billetera</translation>
     </message>
     <message>
         <source>Open Wallet &amp;Configuration File</source>
-        <translation>Abrir Archivo de Configuración del Monedero</translation>
+        <translation>Abrir Archivo de &amp;Configuración de la billetera</translation>
     </message>
     <message>
         <source>Open configuration file</source>
@@ -439,7 +439,7 @@
     </message>
     <message>
         <source>Open &amp;Masternode Configuration File</source>
-        <translation>Abrir Archivo de Configuración de Masternode</translation>
+        <translation>Abrir Archivo de Configuración de &amp;Masternode</translation>
     </message>
     <message>
         <source>Open Masternode configuration file</source>
@@ -447,15 +447,15 @@
     </message>
     <message>
         <source>Show Automatic &amp;Backups</source>
-        <translation>Mostrar Copias de Seguridad Automáticas</translation>
+        <translation>Mostrar &amp;Copias de Seguridad Automáticas</translation>
     </message>
     <message>
         <source>Show automatically created wallet backups</source>
-        <translation>Mostrar las copias de seguridad del monedero creadas automáticamente</translation>
+        <translation>Mostrar las copias de seguridad de la billetera creadas automáticamente</translation>
     </message>
     <message>
         <source>&amp;Sending addresses...</source>
-        <translation>Direcciones de envío...</translation>
+        <translation>&amp;Direcciones de envío...</translation>
     </message>
     <message>
         <source>Show the list of used sending addresses and labels</source>
@@ -463,7 +463,7 @@
     </message>
     <message>
         <source>&amp;Receiving addresses...</source>
-        <translation>Direcciones de recepción...</translation>
+        <translation>&amp;Direcciones de recepción...</translation>
     </message>
     <message>
         <source>Show the list of used receiving addresses and labels</source>
@@ -471,7 +471,7 @@
     </message>
     <message>
         <source>Open &amp;URI...</source>
-        <translation>Abrir URI...</translation>
+        <translation>Abrir &amp;URI...</translation>
     </message>
     <message>
         <source>Open a dash: URI or payment request</source>
@@ -479,7 +479,7 @@
     </message>
     <message>
         <source>&amp;Command-line options</source>
-        <translation>Opciones de consola de comandos</translation>
+        <translation>&amp;Opciones de consola de comandos</translation>
     </message>
     <message>
         <source>Show the %1 help message to get a list with possible Dash command-line options</source>
@@ -491,7 +491,7 @@
     </message>
     <message>
         <source>&amp;PrivateSend information</source>
-        <translation>Información de PrivateSend</translation>
+        <translation>&amp;Información de PrivateSend</translation>
     </message>
     <message>
         <source>Show the PrivateSend basic information</source>
@@ -499,19 +499,19 @@
     </message>
     <message>
         <source>&amp;File</source>
-        <translation>Archivo</translation>
+        <translation>&amp;Archivo</translation>
     </message>
     <message>
         <source>&amp;Settings</source>
-        <translation>Configuración</translation>
+        <translation>&amp;Configuración</translation>
     </message>
     <message>
         <source>&amp;Tools</source>
-        <translation>Herramientas</translation>
+        <translation>&amp;Herramientas</translation>
     </message>
     <message>
         <source>&amp;Help</source>
-        <translation>Ayuda</translation>
+        <translation>&amp;Ayuda</translation>
     </message>
     <message>
         <source>Tabs toolbar</source>
@@ -637,15 +637,15 @@
     </message>
     <message>
         <source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;unlocked&lt;/b&gt;</source>
-        <translation>El monedero está &lt;b&gt;cifrado&lt;/b&gt; y actualmente &lt;b&gt;desbloqueado&lt;/b&gt;</translation>
+        <translation>La billetera está &lt;b&gt;cifrada&lt;/b&gt; y actualmente &lt;b&gt;desbloqueada&lt;/b&gt;</translation>
     </message>
     <message>
         <source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;unlocked&lt;/b&gt; for mixing only</source>
-        <translation>El monedero está &lt;b&gt;encriptado&lt;/b&gt;y actualmente&lt;b&gt;desbloqueado&lt;/b&gt;solo para el mezclado</translation>
+        <translation>La billetera está &lt;b&gt;encriptada&lt;/b&gt;y actualmente&lt;b&gt;desbloqueada&lt;/b&gt;solo para el mezclado</translation>
     </message>
     <message>
         <source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;locked&lt;/b&gt;</source>
-        <translation>El monedero está &lt;b&gt;cifrado&lt;/b&gt; y actualmente &lt;b&gt;bloqueado&lt;/b&gt;</translation>
+        <translation>La billetera está &lt;b&gt;cifrada&lt;/b&gt; y actualmente &lt;b&gt;bloqueada&lt;/b&gt;</translation>
     </message>
 </context>
 <context>
@@ -793,10 +793,6 @@
         <source>Please switch to "List mode" to use this function.</source>
         <translation>Por favor, cambie a "Modo Lista" para poder usar esta función.</translation>
     </message>
-    <message>
-        <source>Non-anonymized input selected. &lt;b&gt;PrivateSend will be disabled.&lt;/b&gt;&lt;br&gt;&lt;br&gt;If you still want to use PrivateSend, please deselect all non-nonymized inputs first and then check PrivateSend checkbox again.</source>
-        <translation>Entrada no-anónima seleccionada.&lt;b&gt;PrivateSend será deshabilitado.&lt;/b&gt;&lt;br&gt;&lt;br&gt;Si aún quiere usar PrivateSend, por favor, deseleccione todas las entradas no-anónimas primero y luego marque la casilla de verificación PrivateSend de nuevo.</translation>
-    </message>
     <message>
         <source>(%1 locked)</source>
         <translation>(%1 bloqueadas)</translation>
@@ -811,7 +807,7 @@
     </message>
     <message>
         <source>This label turns red if any recipient receives an amount smaller than the current dust threshold.</source>
-        <translation>Esta etiqueta se vuelve roja si cualquier receptor recibe una cantidad mas pequeña que el límite mínimo actual de polvo.</translation>
+        <translation>Esta etiqueta se vuelve roja si cualquier receptor recibe una cantidad mas pequeña que el límite, mínimo actual de polvo.</translation>
     </message>
     <message>
         <source>Can vary +/- %1 duff(s) per input.</source>
@@ -834,73 +830,6 @@
         <translation>n/d</translation>
     </message>
 </context>
-<context>
-    <name>DarksendConfig</name>
-    <message>
-        <source>Configure PrivateSend</source>
-        <translation>Configurar PrivateSend</translation>
-    </message>
-    <message>
-        <source>Basic Privacy</source>
-        <translation>Privacidad Básica</translation>
-    </message>
-    <message>
-        <source>High Privacy</source>
-        <translation>Privacidad Alta</translation>
-    </message>
-    <message>
-        <source>Maximum Privacy</source>
-        <translation>Privacidad Máxima</translation>
-    </message>
-    <message>
-        <source>Please select a privacy level.</source>
-        <translation>Por favor, seleccione un nivel de privacidad.</translation>
-    </message>
-    <message>
-        <source>Use 2 separate masternodes to mix funds up to 1000 DASH</source>
-        <translation>Usar 2 masternodes distintos para mezclar fondos hasta 1000 DASH</translation>
-    </message>
-    <message>
-        <source>Use 8 separate masternodes to mix funds up to 1000 DASH</source>
-        <translation>Usar 8 masternodes diferentes para mezclar fondos hasta 1000 DASH</translation>
-    </message>
-    <message>
-        <source>Use 16 separate masternodes</source>
-        <translation>Usar 16 masternodes diferentes</translation>
-    </message>
-    <message>
-        <source>This option is the quickest and will cost about ~0.025 DASH to anonymize 1000 DASH</source>
-        <translation>Esta es la opción más rápida y anonimizar 1000 DASH costará alrededor de 0.025 DASH</translation>
-    </message>
-    <message>
-        <source>This option is moderately fast and will cost about 0.05 DASH to anonymize 1000 DASH</source>
-        <translation>Esta opción es moderadamente rápida y anonimizar 1000 DASH costará alrededor de 0.05 DASH</translation>
-    </message>
-    <message>
-        <source>0.1 DASH per 1000 DASH you anonymize.</source>
-        <translation>0.1 DASH por cada 1000 DASH que anonimice.</translation>
-    </message>
-    <message>
-        <source>This is the slowest and most secure option. Using maximum anonymity will cost</source>
-        <translation>Esta es la opción más lenta y segura de todas. Usar la anonimización máxima costará</translation>
-    </message>
-    <message>
-        <source>PrivateSend Configuration</source>
-        <translation>Configuración de PrivateSend</translation>
-    </message>
-    <message>
-        <source>PrivateSend was successfully set to basic (%1 and 2 rounds). You can change this at any time by opening Dash's configuration screen.</source>
-        <translation>PrivateSend se configuró correctamente a básico (%1 y 2 rondas). Puedes canbiar esto en cualquier momento, abriendo la ventana de configuración de Dash.</translation>
-    </message>
-    <message>
-        <source>PrivateSend was successfully set to high (%1 and 8 rounds). You can change this at any time by opening Dash's configuration screen.</source>
-        <translation>PrivateSend se configuró correctamente a alto (%1 y 8 rondas). Puedes cambiar esto en cualquier momento abriendo la ventana de configuración de Dash.</translation>
-    </message>
-    <message>
-        <source>PrivateSend was successfully set to maximum (%1 and 16 rounds). You can change this at any time by opening Dash's configuration screen.</source>
-        <translation>PrivateSend se configuró correctamente a máximo (%1 y 16 rondas). Puedes cambiar esto en cualquier momento, abriendo la ventana de configuración de Dash.</translation>
-    </message>
-</context>
 <context>
     <name>EditAddressDialog</name>
     <message>
@@ -909,7 +838,7 @@
     </message>
     <message>
         <source>&amp;Label</source>
-        <translation>Etiqueta</translation>
+        <translation>&amp;Etiqueta</translation>
     </message>
     <message>
         <source>The label associated with this address list entry</source>
@@ -917,7 +846,7 @@
     </message>
     <message>
         <source>&amp;Address</source>
-        <translation>Dirección</translation>
+        <translation>&amp;Dirección</translation>
     </message>
     <message>
         <source>The address associated with this address list entry. This can only be modified for sending addresses.</source>
@@ -949,7 +878,7 @@
     </message>
     <message>
         <source>Could not unlock wallet.</source>
-        <translation>No se pudo desbloquear el monedero.</translation>
+        <translation>No se pudo desbloquear la billetera.</translation>
     </message>
     <message>
         <source>New key generation failed.</source>
@@ -1037,11 +966,7 @@
         <source>PrivateSend information</source>
         <translation>Información de PrivateSend</translation>
     </message>
-    <message>
-        <source>&lt;h3&gt;PrivateSend Basics&lt;/h3&gt; PrivateSend gives you true financial privacy by obscuring the origins of your funds. All the Dash in your wallet is comprised of different "inputs" which you can think of as separate, discrete coins.&lt;br&gt; PrivateSend uses an innovative process to mix your inputs with the inputs of two other people, without having your coins ever leave your wallet. You retain control of your money at all times.&lt;hr&gt; &lt;b&gt;The PrivateSend process works like this:&lt;/b&gt;&lt;ol type="1"&gt; &lt;li&gt;PrivateSend begins by breaking your transaction inputs down into standard denominations. These denominations are 0.01 DASH, 0.1 DASH, 1 DASH and 10 DASH -- sort of like the paper money you use every day.&lt;/li&gt; &lt;li&gt;Your wallet then sends requests to specially configured software nodes on the network, called "masternodes." These masternodes are informed then that you are interested in mixing a certain denomination. No identifiable information is sent to the masternodes, so they never know "who" you are.&lt;/li&gt; &lt;li&gt;When two other people send similar messages, indicating that they wish to mix the same denomination, a mixing session begins. The masternode mixes up the inputs and instructs all three users' wallets to pay the now-transformed input back to themselves. Your wallet pays that denomination directly to itself, but in a different address (called a change address).&lt;/li&gt; &lt;li&gt;In order to fully obscure your funds, your wallet must repeat this process a number of times with each denomination. Each time the process is completed, it's called a "round." Each round of PrivateSend makes it exponentially more difficult to determine where your funds originated.&lt;/li&gt; &lt;li&gt;This mixing process happens in the background without any intervention on your part. When you wish to make a transaction, your funds will already be anonymized. No additional waiting is required.&lt;/li&gt; &lt;/ol&gt; &lt;hr&gt;&lt;b&gt;IMPORTANT:&lt;/b&gt; Your wallet only contains 1000 of these "change addresses." Every time a mixing event happens, up to 9 of your addresses are used up. This means those 1000 addresses last for about 100 mixing events. When 900 of them are used, your wallet must create more addresses. It can only do this, however, if you have automatic backups enabled.&lt;br&gt; Consequently, users who have backups disabled will also have PrivateSend disabled. &lt;hr&gt;For more info see &lt;a href="https://dashpay.atlassian.net/wiki/display/DOC/PrivateSend"&gt;https://dashpay.atlassian.net/wiki/display/DOC/PrivateSend&lt;/a&gt;         </source>
-        <translation>&lt;h3&gt;Conceptos básico de PrivateSend&lt;/h3&gt;PrivateSend te da verdadera privacidad financiera al ocultar los orígenes de tus fondos. Todos los Dash en su monedero están compuestos por diferentes "depositos" en las que puede pensar como monedas separadas, discretas.&lt;br&gt;PrivateSend utiliza un proceso innovador que mezcla sus depósitos con las depósitos de otras dos personas, sin que sus monedas salgan de su monedero. Usted retiene el control de su dinero en todo momento.&lt;hr&gt;&lt;b&gt;El proceso de PrivateSend funciona así:&lt;/b&gt;&lt;ol type="1"&gt;&lt;li&gt;PrivateSend comienza dividiendo los depósitos de sus transacciones en denominaciones estándar. Éstas denominaciones son 0.01 DASH, 0.1 DASH, 1 DASH y 10 DASH - algo así como el papel moneda que usas todos los días.&lt;/li&gt;&lt;li&gt;Entonces, su monedero envía solicitudes a nodos de software especialmente configurados en la red, llamados "masternodes". Estos masternodes son informados que usted está interesado en mezclar una cierta denominación. Información no identificable es enviada a los masternodes, por lo que nunca saben "quién" es usted.&lt;/li&gt;&lt;li&gt;Cuando otras dos personas envían mensajes similares, indicando que desean mezclar la misma denominación, comienza una sesión de mezclado. El masternode mezcla los depósitos e instruye a los monederos de los tres usuarios para que paguen el depósito ahora transformado a si mismos. Su monedero paga esa denominación directamente a sí misma, pero en una dirección diferente (llamada dirección de cambio). En orden de ocultar totalmente sus fondos, su monedero debe repetir este proceso varias veces con cada denominación. Cada vez que se completa el proceso, se denomina "ronda". Cada ronda de PrivateSend hace que sea exponencialmente más difícil determinar de dónde provienen los fondos.&lt;/li&gt;&lt;li&gt;Este proceso de mezclado ocurre en segundo plano sin ninguna intervención de su parte. Cuando desee realizar una transacción, sus fondos ya serán anónimos. No se requiere tiempo de espera adicional.&lt;/li&gt;&lt;/ol&gt;&lt;hr&gt;&lt;b&gt;IMPORTATE:&lt;/b&gt;Su mondero solo contiene 1000 de estas "direcciones de cambio". Cada vez que ocurre un evento de mezclado, hasta 9 de sus direcciones son usadas. Esto significa que esas 1000 direcciones duran alrededor de 100 eventos de mezclado. Cuando 900 de ellas sean usadas, su monedero debe crear más direcciones. Sin embargo, solo podra hacer esto si tiene las copias de seguridad automáticas habilitadas.&lt;br&gt;En consecuencia, los usuarios que tengan las copias de seguridad deshabilitadas también tendrán PrivateSend deshabilitado.&lt;hr&gt;Para mas información visite&lt;a href="https://dashpay.atlassian.net/wiki/display/DOC/PrivateSend"&gt;https://dashpay.atlassian.net/wiki/display/DOC/PrivateSend&lt;/a&gt;</translation>
-    </message>
-</context>
+    </context>
 <context>
     <name>Intro</name>
     <message>
@@ -1058,7 +983,7 @@
     </message>
     <message>
         <source>%1 will download and store a copy of the Dash block chain. At least %2GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</source>
-        <translation>%1 se descargara y almacenara una copia de la cadena de bloques de Dash. Por lo menos %2GB de datos se almacenaran en este directorio, y crecerá con el tiempo. El monedero también se almacenara en este directorio.</translation>
+        <translation>%1 se descargara y almacenara una copia de la cadena de bloques de Dash. Por lo menos %2GB de datos se almacenaran en este directorio, y crecerá con el tiempo. La billetera también se almacenara en este directorio.</translation>
     </message>
     <message>
         <source>Use the default data directory</source>
@@ -1097,7 +1022,7 @@
     </message>
     <message>
         <source>Note: Status of your masternodes in local wallet can potentially be slightly incorrect.&lt;br /&gt;Always wait for wallet to sync additional data and then double check from another node&lt;br /&gt;if your masternode should be running but you still do not see "ENABLED" in "Status" field.</source>
-        <translation>Nota: El estado de sus masternodes en el monedero local puede estar ligeramente incorrecto.&lt;br /&gt;Siempre espere a que el monedero sincronice los datos adicionales y luego vuelva a verificar desde otro nodo&lt;br /&gt;Si su masternode debería estar ejecutándose pero aún no ve "HABILITADO" en el campo "Estado".</translation>
+        <translation>Nota: El estado de sus masternodes en la billetera local puede estar ligeramente incorrecto.&lt;br /&gt;Siempre espere a que la billetera sincronice los datos adicionales y luego vuelva a verificar desde otro nodo&lt;br /&gt;Si su masternode debería estar ejecutándose pero aún no ve "HABILITADO" en el campo "Estado".</translation>
     </message>
     <message>
         <source>Alias</source>
@@ -1129,19 +1054,19 @@
     </message>
     <message>
         <source>S&amp;tart alias</source>
-        <translation>Iniciar alias</translation>
+        <translation>I&amp;niciar alias</translation>
     </message>
     <message>
         <source>Start &amp;all</source>
-        <translation>Iniciar todo</translation>
+        <translation>Iniciar &amp;todo</translation>
     </message>
     <message>
         <source>Start &amp;MISSING</source>
-        <translation>Iniciar FALTANTE</translation>
+        <translation>Iniciar &amp;FALTANTE</translation>
     </message>
     <message>
         <source>&amp;Update status</source>
-        <translation>Actualizar estado</translation>
+        <translation>&amp;Actualizar estado</translation>
     </message>
     <message>
         <source>Show additional Masternode information</source>
@@ -1149,7 +1074,7 @@
     </message>
     <message>
         <source>Show &amp;Info...</source>
-        <translation>Mostrar Información</translation>
+        <translation>Mostrar &amp;Información</translation>
     </message>
     <message>
         <source>Status will be updated automatically in (sec):</source>
@@ -1252,7 +1177,7 @@
     </message>
     <message>
         <source>Recent transactions may not yet be visible, and therefore your wallet's balance might be incorrect. This information will be correct once your wallet has finished synchronizing with the Dash network, as detailed below.</source>
-        <translation>Es posible que las transacciones recientes aún no estén visibles y, por lo tanto, el saldo de su monedero podría ser incorrecto. Esta información será corregida una vez que su monedero haya terminado de sincronizarse con la red de Dash, como se detalla a continuación.</translation>
+        <translation>Es posible que las transacciones recientes aún no estén visibles y, por lo tanto, el saldo de su billetera podría ser incorrecto. Esta información será corregida una vez que su billetera haya terminado de sincronizarse con la red de Dash, como se detalla a continuación.</translation>
     </message>
     <message>
         <source>Attempting to spend Dash that are affected by not-yet-displayed transactions will not be accepted by the network.</source>
@@ -1326,11 +1251,11 @@
     </message>
     <message>
         <source>&amp;Main</source>
-        <translation>Principal</translation>
+        <translation>&amp;Principal</translation>
     </message>
     <message>
         <source>Size of &amp;database cache</source>
-        <translation>Tamaño de la memoria caché en la base de datos</translation>
+        <translation>Tamaño de la &amp;memoria caché en la base de datos</translation>
     </message>
     <message>
         <source>MB</source>
@@ -1338,7 +1263,7 @@
     </message>
     <message>
         <source>Number of script &amp;verification threads</source>
-        <translation>Número de hilos de verificación de instrucciones</translation>
+        <translation>Número de hilos de &amp;verificación de instrucciones</translation>
     </message>
     <message>
         <source>(0 = auto, &lt;0 = leave that many cores free)</source>
@@ -1350,7 +1275,7 @@
     </message>
     <message>
         <source>W&amp;allet</source>
-        <translation>Monedero</translation>
+        <translation>B&amp;illetera</translation>
     </message>
     <message>
         <source>Show additional tab listing all your masternodes in first sub-tab&lt;br/&gt;and all masternodes on the network in second sub-tab.</source>
@@ -1370,7 +1295,7 @@
     </message>
     <message>
         <source>Show warning dialog when PrivateSend detects that wallet has very low number of keys left.</source>
-        <translation>Muestra el cuadro de diálogo de advertencia cuando PrivateSend detecta que el monedero tiene muy pocas llaves restantes.</translation>
+        <translation>Muestra el cuadro de diálogo de advertencia cuando PrivateSend detecta que la billetera tiene muy pocas llaves restantes.</translation>
     </message>
     <message>
         <source>Warn if PrivateSend is running out of keys</source>
@@ -1378,11 +1303,11 @@
     </message>
     <message>
         <source>Whether to use experimental PrivateSend mode with multiple mixing sessions per block.&lt;br/&gt;Note: You must use this feature carefully.&lt;br/&gt;Make sure you always have recent wallet (auto)backup in a safe place!</source>
-        <translation>Ya sea para usar el modo experimental PrivateSend con múltiples sesiones de mezclado por bloque.&lt;br/&gt;Nota: debe usar esta función con cuidado.&lt;br/&gt;¡Asegúrese de tener siempre una copia de seguridad (automática) del monedero en un lugar seguro!</translation>
+        <translation>Ya sea para usar el modo experimental PrivateSend con múltiples sesiones de mezclado por bloque.&lt;br/&gt;Nota: debe usar esta función con cuidado.&lt;br/&gt;¡Asegúrese de tener siempre una copia de seguridad (automática) de la billetera en un lugar seguro!</translation>
     </message>
     <message>
         <source>Enable PrivateSend &amp;multi-session</source>
-        <translation>Habilitar multisesión de PrivateSend</translation>
+        <translation>Habilitar &amp;multisesión de PrivateSend</translation>
     </message>
     <message>
         <source>If you disable the spending of unconfirmed change, the change from a transaction&lt;br/&gt;cannot be used until that transaction has at least one confirmation.&lt;br/&gt;This also affects how your balance is computed.</source>
@@ -1414,7 +1339,7 @@
     </message>
     <message>
         <source>&amp;Connect through SOCKS5 proxy (default proxy):</source>
-        <translation>Conectarse a través de proxy SOCKS5 (proxy predeterminado):</translation>
+        <translation>&amp;Conectarse a través de proxy SOCKS5 (proxy predeterminado):</translation>
     </message>
     <message>
         <source>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Exit in the menu.</source>
@@ -1442,27 +1367,27 @@
     </message>
     <message>
         <source>&amp;Start %1 on system login</source>
-        <translation>Iniciar %1 al ingresar al sistema</translation>
+        <translation>&amp;Iniciar %1 al ingresar al sistema</translation>
     </message>
     <message>
         <source>Enable coin &amp;control features</source>
-        <translation>Activar característica coin control</translation>
+        <translation>Activar característica coin &amp;control</translation>
     </message>
     <message>
         <source>&amp;Spend unconfirmed change</source>
-        <translation>Gastar cambio no confirmado</translation>
+        <translation>&amp;Gastar cambio no confirmado</translation>
     </message>
     <message>
         <source>&amp;Network</source>
-        <translation>Red</translation>
+        <translation>&amp;Red</translation>
     </message>
     <message>
         <source>Map port using &amp;UPnP</source>
-        <translation>Mapear puerto usando UPnP</translation>
+        <translation>Mapear puerto usando &amp;UPnP</translation>
     </message>
     <message>
         <source>Proxy &amp;IP:</source>
-        <translation>Dirección IP del proxy:</translation>
+        <translation>Dirección &amp;IP del proxy:</translation>
     </message>
     <message>
         <source>IP address of the proxy (e.g. IPv4: 127.0.0.1 / IPv6: ::1)</source>
@@ -1470,7 +1395,7 @@
     </message>
     <message>
         <source>&amp;Port:</source>
-        <translation>Puerto:</translation>
+        <translation>&amp;Puerto:</translation>
     </message>
     <message>
         <source>Port of the proxy (e.g. 9050)</source>
@@ -1506,11 +1431,11 @@
     </message>
     <message>
         <source>&amp;Window</source>
-        <translation>Ventana</translation>
+        <translation>&amp;Ventana</translation>
     </message>
     <message>
         <source>&amp;Hide the icon from the system tray.</source>
-        <translation>Ocultar el icono de la bandeja del sistema.</translation>
+        <translation>&amp;Ocultar el icono de la bandeja del sistema.</translation>
     </message>
     <message>
         <source>Hide tray icon</source>
@@ -1522,19 +1447,19 @@
     </message>
     <message>
         <source>&amp;Minimize to the tray instead of the taskbar</source>
-        <translation>Minimizar en la bandeja en vez de en la barra de tareas</translation>
+        <translation>&amp;Minimizar en la bandeja en vez de en la barra de tareas</translation>
     </message>
     <message>
         <source>M&amp;inimize on close</source>
-        <translation>Minimizar al cerrar</translation>
+        <translation>M&amp;inimizar al cerrar</translation>
     </message>
     <message>
         <source>&amp;Display</source>
-        <translation>Interfaz</translation>
+        <translation>&amp;Interfaz</translation>
     </message>
     <message>
         <source>User Interface &amp;language:</source>
-        <translation>Idioma de la interfaz de usuario</translation>
+        <translation>&amp;Idioma de la interfaz de usuario</translation>
     </message>
     <message>
         <source>The user interface language can be set here. This setting will take effect after restarting %1.</source>
@@ -1552,7 +1477,7 @@ https://www.transifex.com/projects/p/dash/</translation>
     </message>
     <message>
         <source>&amp;Unit to show amounts in:</source>
-        <translation>Unidad para mostrar cantidades:</translation>
+        <translation>&amp;Unidad para mostrar cantidades:</translation>
     </message>
     <message>
         <source>Choose the default subdivision unit to show in the interface and when sending coins.</source>
@@ -1576,15 +1501,15 @@ https://www.transifex.com/projects/p/dash/</translation>
     </message>
     <message>
         <source>&amp;Reset Options</source>
-        <translation>Restablecer opciones</translation>
+        <translation>&amp;Restablecer opciones</translation>
     </message>
     <message>
         <source>&amp;OK</source>
-        <translation>Aceptar</translation>
+        <translation>&amp;Aceptar</translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
-        <translation>Cancelar</translation>
+        <translation>&amp;Cancelar</translation>
     </message>
     <message>
         <source>default</source>
@@ -1623,7 +1548,7 @@ https://www.transifex.com/projects/p/dash/</translation>
     </message>
     <message>
         <source>The displayed information may be out of date. Your wallet automatically synchronizes with the Dash network after a connection is established, but this process has not completed yet.</source>
-        <translation>La información mostrada puede estar desactualizada. Su monedero se sincroniza automáticamente con la red Dash después de que se haya establecido una conexión, pero este proceso aún no se ha completado.</translation>
+        <translation>La información mostrada puede estar desactualizada. Su billetera se sincroniza automáticamente con la red Dash después de que se haya establecido una conexión, pero este proceso aún no se ha completado.</translation>
     </message>
     <message>
         <source>Available:</source>
@@ -1829,10 +1754,6 @@ https://www.transifex.com/projects/p/dash/</translation>
         <source>We are about to create a new automatic backup for you, however &lt;span style='color:red;'&gt; you should always make sure you have backups saved in some safe place&lt;/span&gt;!</source>
         <translation>Estamos a punto de crear una nueva copia de seguridad automática para usted, sin embargo, &lt;span style='color:red;'&gt;¡Siempre debe asegurarse de tener copias de seguridad guardadas en un lugar seguro&lt;/span&gt;!</translation>
     </message>
-    <message>
-        <source>Note: You can turn this message off in options.</source>
-        <translation>Nota: desactiva este mensaje en las opciones.</translation>
-    </message>
     <message>
         <source>WARNING! Something went wrong on automatic backup</source>
         <translation>¡ADVERTENCIA! Algo salió mal en la copia de seguridad automática</translation>
@@ -1843,7 +1764,7 @@ https://www.transifex.com/projects/p/dash/</translation>
     </message>
     <message>
         <source>Mixing is disabled, please close your wallet and fix the issue!</source>
-        <translation>El Mezclado está deshabilitado, ¡por favor, cierre su monedero y solucione el problema!</translation>
+        <translation>El Mezclado está deshabilitado, ¡por favor, cierre su billetera y solucione el problema!</translation>
     </message>
     <message>
         <source>Enabled</source>
@@ -1855,7 +1776,7 @@ https://www.transifex.com/projects/p/dash/</translation>
     </message>
     <message>
         <source>WARNING! Failed to replenish keypool, please unlock your wallet to do so.</source>
-        <translation>¡ADVERTENCIA! Falla al reponer keypool, para hacerlo, por favor desbloquee su monedero.</translation>
+        <translation>¡ADVERTENCIA! Falla al reponer keypool, para hacerlo, por favor desbloquee su billetera.</translation>
     </message>
     <message>
         <source>Last PrivateSend message:
@@ -1881,7 +1802,7 @@ https://www.transifex.com/projects/p/dash/</translation>
     </message>
     <message>
         <source>Wallet is locked and user declined to unlock. Disabling PrivateSend.</source>
-        <translation>El monedero está bloqueado y el usuario se negó a desbloquearlo. Desactivando PrivateSend.</translation>
+        <translation>La billetera está bloqueado y el usuario se negó a desbloquearlo. Desactivando PrivateSend.</translation>
     </message>
 </context>
 <context>
@@ -2104,7 +2025,7 @@ https://www.transifex.com/projects/p/dash/</translation>
     </message>
     <message>
         <source>&amp;Save Image...</source>
-        <translation>Guardar Imagen...</translation>
+        <translation>&amp;Guardar Imagen...</translation>
     </message>
     <message>
         <source>Error creating QR Code.</source>
@@ -2115,11 +2036,11 @@ https://www.transifex.com/projects/p/dash/</translation>
     <name>QRGeneralImageWidget</name>
     <message>
         <source>&amp;Save Image...</source>
-        <translation>Guardar Imagen...</translation>
+        <translation>&amp;Guardar Imagen...</translation>
     </message>
     <message>
         <source>&amp;Copy Image</source>
-        <translation>Copiar imagen</translation>
+        <translation>&amp;Copiar imagen</translation>
     </message>
     <message>
         <source>Save QR Code</source>
@@ -2134,11 +2055,11 @@ https://www.transifex.com/projects/p/dash/</translation>
     <name>QRImageWidget</name>
     <message>
         <source>&amp;Save Image...</source>
-        <translation>Guardar Imagen...</translation>
+        <translation>&amp;Guardar Imagen...</translation>
     </message>
     <message>
         <source>&amp;Copy Image</source>
-        <translation>Copiar imagen</translation>
+        <translation>&amp;Copiar imagen</translation>
     </message>
     <message>
         <source>Save QR Code</source>
@@ -2157,7 +2078,7 @@ https://www.transifex.com/projects/p/dash/</translation>
     </message>
     <message>
         <source>&amp;Information</source>
-        <translation>Información</translation>
+        <translation>&amp;Información</translation>
     </message>
     <message>
         <source>General</source>
@@ -2177,7 +2098,7 @@ https://www.transifex.com/projects/p/dash/</translation>
     </message>
     <message>
         <source>&amp;Open</source>
-        <translation>Abrir</translation>
+        <translation>&amp;Abrir</translation>
     </message>
     <message>
         <source>Startup time</source>
@@ -2229,7 +2150,7 @@ https://www.transifex.com/projects/p/dash/</translation>
     </message>
     <message>
         <source>&amp;Console</source>
-        <translation>Consola</translation>
+        <translation>&amp;Consola</translation>
     </message>
     <message>
         <source>Clear console</source>
@@ -2237,11 +2158,11 @@ https://www.transifex.com/projects/p/dash/</translation>
     </message>
     <message>
         <source>&amp;Network Traffic</source>
-        <translation>Tráfico de Red</translation>
+        <translation>&amp;Tráfico de Red</translation>
     </message>
     <message>
         <source>&amp;Clear</source>
-        <translation>Limpiar</translation>
+        <translation>&amp;Limpiar</translation>
     </message>
     <message>
         <source>Totals</source>
@@ -2257,7 +2178,7 @@ https://www.transifex.com/projects/p/dash/</translation>
     </message>
     <message>
         <source>&amp;Peers</source>
-        <translation>Pares</translation>
+        <translation>&amp;Pares</translation>
     </message>
     <message>
         <source>Banned peers</source>
@@ -2293,7 +2214,7 @@ https://www.transifex.com/projects/p/dash/</translation>
     </message>
     <message>
         <source>Wallet Path</source>
-        <translation>Ruta del Monedero</translation>
+        <translation>Ruta de la billetera</translation>
     </message>
     <message>
         <source>User Agent</source>
@@ -2357,11 +2278,11 @@ https://www.transifex.com/projects/p/dash/</translation>
     </message>
     <message>
         <source>&amp;Wallet Repair</source>
-        <translation>Reparar Monedero</translation>
+        <translation>&amp;Reparar Billetera</translation>
     </message>
     <message>
         <source>Salvage wallet</source>
-        <translation>Rescatar monedero</translation>
+        <translation>Rescatar billetera</translation>
     </message>
     <message>
         <source>Rescan blockchain files</source>
@@ -2377,11 +2298,11 @@ https://www.transifex.com/projects/p/dash/</translation>
     </message>
     <message>
         <source>Upgrade wallet format</source>
-        <translation>Actualizar formato del monedero</translation>
+        <translation>Actualizar formato de la billetera</translation>
     </message>
     <message>
         <source>The buttons below will restart the wallet with command-line options to repair the wallet, fix issues with corrupt blockhain files or missing/obsolete transactions.</source>
-        <translation>Los botones de abajo reiniciarán el monedero con las opciones de la línea de comandos para reparar el monedero, arreglar problemas con archivos corruptos de la cadena de bloques o transacciones perdidas/obsoletas.</translation>
+        <translation>Los botones de abajo reiniciarán la billetera con las opciones de la línea de comandos para reparar la billetera, arreglar problemas con archivos corruptos de la cadena de bloques o transacciones perdidas/obsoletas.</translation>
     </message>
     <message>
         <source>-salvagewallet: Attempt to recover private keys from a corrupt wallet.dat.</source>
@@ -2389,7 +2310,7 @@ https://www.transifex.com/projects/p/dash/</translation>
     </message>
     <message>
         <source>-rescan: Rescan the block chain for missing wallet transactions.</source>
-        <translation>-rescan: Volver a examinar la cadena de bloques en busca de transacciones perdidas.</translation>
+        <translation>-rescan: Volver a examinar la cadena de bloques en busca de transacciones perdidas en la billetera.</translation>
     </message>
     <message>
         <source>-zapwallettxes=1: Recover transactions from blockchain (keep meta-data, e.g. account owner).</source>
@@ -2401,11 +2322,11 @@ https://www.transifex.com/projects/p/dash/</translation>
     </message>
     <message>
         <source>-upgradewallet: Upgrade wallet to latest format on startup. (Note: this is NOT an update of the wallet itself!)</source>
-        <translation>-upgradewallet: Actualizar el monedero al último formato al iniciar. (Nota: ¡esto NO es una actualización del propio monedero!)</translation>
+        <translation>-upgradewallet: Actualizar la billetera al último formato al iniciar. (Nota: ¡esto NO es una actualización de la propia billetera!)</translation>
     </message>
     <message>
         <source>Wallet repair options.</source>
-        <translation>Opciones de reparación del monedero.</translation>
+        <translation>Opciones de reparación de la billetera</translation>
     </message>
     <message>
         <source>Rebuild index</source>
@@ -2417,7 +2338,7 @@ https://www.transifex.com/projects/p/dash/</translation>
     </message>
     <message>
         <source>&amp;Disconnect</source>
-        <translation>Desconectar</translation>
+        <translation>&amp;Desconectar</translation>
     </message>
     <message>
         <source>Ban for</source>
@@ -2425,23 +2346,23 @@ https://www.transifex.com/projects/p/dash/</translation>
     </message>
     <message>
         <source>1 &amp;hour</source>
-        <translation>1 hora</translation>
+        <translation>1 &amp;hora</translation>
     </message>
     <message>
         <source>1 &amp;day</source>
-        <translation>1 día</translation>
+        <translation>1 &amp;día</translation>
     </message>
     <message>
         <source>1 &amp;week</source>
-        <translation>1 semana</translation>
+        <translation>1 &amp;semana</translation>
     </message>
     <message>
         <source>1 &amp;year</source>
-        <translation>1 año</translation>
+        <translation>1 &amp;año</translation>
     </message>
     <message>
         <source>&amp;Unban</source>
-        <translation>Levantar prohibición</translation>
+        <translation>&amp;Levantar prohibición</translation>
     </message>
     <message>
         <source>Welcome to the %1 RPC console.</source>
@@ -2457,7 +2378,7 @@ https://www.transifex.com/projects/p/dash/</translation>
     </message>
     <message>
         <source>WARNING: Scammers have been active, telling users to type commands here, stealing their wallet contents. Do not use this console without fully understanding the ramification of a command.</source>
-        <translation>ADVERTENCIA: Estafadores han estado activos, diciendo a los usuarios que escriban comandos aquí, robando el contenido de sus monederos. No use esta consola sin un completo entendimiento de la ramificación de un comando.</translation>
+        <translation>ADVERTENCIA: Estafadores han estado activos, diciendo a los usuarios que escriban comandos aquí, robando el contenido de su billetera. No use esta consola sin un completo entendimiento de la ramificación de un comando.</translation>
     </message>
     <message>
         <source>In:</source>
@@ -2528,7 +2449,7 @@ https://www.transifex.com/projects/p/dash/</translation>
     </message>
     <message>
         <source>R&amp;euse an existing receiving address (not recommended)</source>
-        <translation>Reutilizar una dirección receptora existente (no recomendado)</translation>
+        <translation>R&amp;eutilizar una dirección receptora existente (no recomendado)</translation>
     </message>
     <message>
         <source>An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Dash network.</source>
@@ -2536,7 +2457,7 @@ https://www.transifex.com/projects/p/dash/</translation>
     </message>
     <message>
         <source>&amp;Message:</source>
-        <translation>Mensaje:</translation>
+        <translation>&amp;Mensaje:</translation>
     </message>
     <message>
         <source>An optional label to associate with the new receiving address.</source>
@@ -2552,7 +2473,7 @@ https://www.transifex.com/projects/p/dash/</translation>
     </message>
     <message>
         <source>&amp;Label:</source>
-        <translation>Etiqueta:</translation>
+        <translation>&amp;Etiqueta:</translation>
     </message>
     <message>
         <source>An optional amount to request. Leave this empty or zero to not request a specific amount.</source>
@@ -2560,11 +2481,11 @@ https://www.transifex.com/projects/p/dash/</translation>
     </message>
     <message>
         <source>&amp;Amount:</source>
-        <translation>Cantidad:</translation>
+        <translation>&amp;Cantidad:</translation>
     </message>
     <message>
         <source>&amp;Request payment</source>
-        <translation>Solicitar pago</translation>
+        <translation>&amp;Solicitar pago</translation>
     </message>
     <message>
         <source>Clear all fields of the form.</source>
@@ -2623,15 +2544,15 @@ https://www.transifex.com/projects/p/dash/</translation>
     </message>
     <message>
         <source>Copy &amp;URI</source>
-        <translation>Copiar URI</translation>
+        <translation>Copiar &amp;URI</translation>
     </message>
     <message>
         <source>Copy &amp;Address</source>
-        <translation>Copiar Dirección</translation>
+        <translation>Copiar &amp;Dirección</translation>
     </message>
     <message>
         <source>&amp;Save Image...</source>
-        <translation>Guardar Imagen...</translation>
+        <translation>&amp;Guardar Imagen...</translation>
     </message>
     <message>
         <source>Request payment to %1</source>
@@ -2857,7 +2778,7 @@ https://www.transifex.com/projects/p/dash/</translation>
     </message>
     <message>
         <source>S&amp;end</source>
-        <translation>Enviar</translation>
+        <translation>E&amp;nviar</translation>
     </message>
     <message>
         <source>Clear all fields of the form.</source>
@@ -2865,7 +2786,7 @@ https://www.transifex.com/projects/p/dash/</translation>
     </message>
     <message>
         <source>Clear &amp;All</source>
-        <translation>Limpiar Todo</translation>
+        <translation>Limpiar &amp;Todo</translation>
     </message>
     <message>
         <source>Send to multiple recipients at once</source>
@@ -2873,7 +2794,7 @@ https://www.transifex.com/projects/p/dash/</translation>
     </message>
     <message>
         <source>Add &amp;Recipient</source>
-        <translation>Añadir Destinatario</translation>
+        <translation>Añadir &amp;Destinatario</translation>
     </message>
     <message>
         <source>Balance:</source>
@@ -3013,7 +2934,7 @@ https://www.transifex.com/projects/p/dash/</translation>
     </message>
     <message>
         <source>The address you selected for change is not part of this wallet. Any or all funds in your wallet may be sent to this address. Are you sure?</source>
-        <translation>La dirección que ha seleccionado para cambiar no es parte de este monedero. Ninguno o todos los fondos en su monedero pueden ser enviados a esta dirección. ¿Está seguro?</translation>
+        <translation>La dirección que ha seleccionado para cambiar no es parte de esta billetera. Ninguno o todos los fondos en su billetera pueden ser enviados a esta dirección. ¿Está seguro?</translation>
     </message>
     <message>
         <source>(no label)</source>
@@ -3028,7 +2949,7 @@ https://www.transifex.com/projects/p/dash/</translation>
     </message>
     <message>
         <source>Pay &amp;To:</source>
-        <translation>Pagar a:</translation>
+        <translation>Pagar &amp;a:</translation>
     </message>
     <message>
         <source>The Dash address to send the payment to</source>
@@ -3056,7 +2977,7 @@ https://www.transifex.com/projects/p/dash/</translation>
     </message>
     <message>
         <source>&amp;Label:</source>
-        <translation>Etiqueta:</translation>
+        <translation>&amp;Etiqueta:</translation>
     </message>
     <message>
         <source>Enter a label for this address to add it to the list of used addresses</source>
@@ -3064,7 +2985,7 @@ https://www.transifex.com/projects/p/dash/</translation>
     </message>
     <message>
         <source>A&amp;mount:</source>
-        <translation>Cantidad:</translation>
+        <translation>C&amp;antidad:</translation>
     </message>
     <message>
         <source>The fee will be deducted from the amount being sent. The recipient will receive a lower amount of Dash than you enter in the amount field. If multiple recipients are selected, the fee is split equally.</source>
@@ -3072,7 +2993,7 @@ https://www.transifex.com/projects/p/dash/</translation>
     </message>
     <message>
         <source>S&amp;ubtract fee from amount</source>
-        <translation>Extraer comisión de la cantidad</translation>
+        <translation>E&amp;xtraer comisión de la cantidad</translation>
     </message>
     <message>
         <source>Message:</source>
@@ -3129,7 +3050,7 @@ https://www.transifex.com/projects/p/dash/</translation>
     </message>
     <message>
         <source>&amp;Sign Message</source>
-        <translation>Firmar Mensaje</translation>
+        <translation>&amp;Firmar Mensaje</translation>
     </message>
     <message>
         <source>You can sign messages/agreements with your addresses to prove you can receive Dash sent to them. Be careful not to sign anything vague or random, as phishing attacks may try to trick you into signing your identity over to them. Only sign fully-detailed statements you agree to.</source>
@@ -3173,7 +3094,7 @@ https://www.transifex.com/projects/p/dash/</translation>
     </message>
     <message>
         <source>Sign &amp;Message</source>
-        <translation>Firmar Mensaje</translation>
+        <translation>Firmar &amp;Mensaje</translation>
     </message>
     <message>
         <source>Reset all sign message fields</source>
@@ -3181,11 +3102,11 @@ https://www.transifex.com/projects/p/dash/</translation>
     </message>
     <message>
         <source>Clear &amp;All</source>
-        <translation>Limpiar Todo</translation>
+        <translation>Limpiar &amp;Todo</translation>
     </message>
     <message>
         <source>&amp;Verify Message</source>
-        <translation>Verificar Mensaje</translation>
+        <translation>&amp;Verificar Mensaje</translation>
     </message>
     <message>
         <source>Enter the receiver's address, message (ensure you copy line breaks, spaces, tabs, etc. exactly) and signature below to verify the message. Be careful not to read more into the signature than what is in the signed message itself, to avoid being tricked by a man-in-the-middle attack. Note that this only proves the signing party receives with the address, it cannot prove sendership of any transaction!</source>
@@ -3201,7 +3122,7 @@ https://www.transifex.com/projects/p/dash/</translation>
     </message>
     <message>
         <source>Verify &amp;Message</source>
-        <translation>Verificar Mensaje</translation>
+        <translation>Verificar &amp;Mensaje</translation>
     </message>
     <message>
         <source>Reset all verify message fields</source>
@@ -3225,7 +3146,7 @@ https://www.transifex.com/projects/p/dash/</translation>
     </message>
     <message>
         <source>Wallet unlock was cancelled.</source>
-        <translation>Se ha cancelado el desbloqueo del monedero. </translation>
+        <translation>Se ha cancelado el desbloqueo de la billetera.</translation>
     </message>
     <message>
         <source>Private key for the entered address is not available.</source>
@@ -3805,7 +3726,7 @@ https://www.transifex.com/projects/p/dash/</translation>
     <name>WalletFrame</name>
     <message>
         <source>No wallet has been loaded.</source>
-        <translation>No se ha cargado ningún monedero.</translation>
+        <translation>No se ha cargado ninguna billetera.</translation>
     </message>
 </context>
 <context>
@@ -3827,7 +3748,7 @@ https://www.transifex.com/projects/p/dash/</translation>
     <name>WalletView</name>
     <message>
         <source>&amp;Export</source>
-        <translation>Exportar</translation>
+        <translation>&amp;Exportar</translation>
     </message>
     <message>
         <source>Export the data in the current tab to a file</source>
@@ -3839,11 +3760,11 @@ https://www.transifex.com/projects/p/dash/</translation>
     </message>
     <message>
         <source>Backup Wallet</source>
-        <translation>Copia de Seguridad del Monedero</translation>
+        <translation>Copia de Seguridad de la billetera</translation>
     </message>
     <message>
         <source>Wallet Data (*.dat)</source>
-        <translation>Datos del Monedero (*.dat)</translation>
+        <translation>Datos de la billetera (*.dat)</translation>
     </message>
     <message>
         <source>Backup Failed</source>
@@ -3851,7 +3772,7 @@ https://www.transifex.com/projects/p/dash/</translation>
     </message>
     <message>
         <source>There was an error trying to save the wallet data to %1.</source>
-        <translation>Ha habido un error al intentar guardar los datos del monedero en %1.</translation>
+        <translation>Ha habido un error al intentar guardar los datos de la billetera en %1.</translation>
     </message>
     <message>
         <source>Backup Successful</source>
@@ -3859,7 +3780,7 @@ https://www.transifex.com/projects/p/dash/</translation>
     </message>
     <message>
         <source>The wallet data was successfully saved to %1.</source>
-        <translation>Los datos del monedero se han guardado con éxito en %1.</translation>
+        <translation>Los datos de la billetera se han guardado con éxito en %1.</translation>
     </message>
 </context>
 <context>
@@ -3878,7 +3799,7 @@ https://www.transifex.com/projects/p/dash/</translation>
     </message>
     <message>
         <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source>
-        <translation>Ejecutar comando cuando una transacción del monedero cambie (%s en cmd es reemplazado por TxID)</translation>
+        <translation>Ejecutar comando cuando una transacción de la billetera cambie (%s en cmd es reemplazado por TxID)</translation>
     </message>
     <message>
         <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source>
@@ -3886,7 +3807,7 @@ https://www.transifex.com/projects/p/dash/</translation>
     </message>
     <message>
         <source>Name to construct url for KeePass entry that stores the wallet passphrase</source>
-        <translation>Nombre para construir la url para la entrada de KeePass que almacena la contraseña del monedero</translation>
+        <translation>Nombre para construir la url para la entrada de KeePass que almacena la contraseña de la billetera</translation>
     </message>
     <message>
         <source>Set maximum size of high-priority/low-fee transactions in bytes (default: %d)</source>
@@ -3934,7 +3855,7 @@ https://www.transifex.com/projects/p/dash/</translation>
     </message>
     <message>
         <source>Cannot downgrade wallet</source>
-        <translation>No se puede regresar a una versión anterior del monedero</translation>
+        <translation>No se puede regresar a una versión anterior de la billetera</translation>
     </message>
     <message>
         <source>Cannot write default address</source>
@@ -3962,7 +3883,7 @@ https://www.transifex.com/projects/p/dash/</translation>
     </message>
     <message>
         <source>Do not load the wallet and disable wallet RPC calls</source>
-        <translation>No cargue el monedero y desactive las llamadas RPC</translation>
+        <translation>No cargue la billetera y desactive las llamadas RPC</translation>
     </message>
     <message>
         <source>Do you want to rebuild the block database now?</source>
@@ -3982,7 +3903,7 @@ https://www.transifex.com/projects/p/dash/</translation>
     </message>
     <message>
         <source>Error initializing wallet database environment %s!</source>
-        <translation>Error al inicializar el entorno de la base de datos del monedero  %s</translation>
+        <translation>Error al inicializar el entorno de la base de datos de la billetera  %s</translation>
     </message>
     <message>
         <source>Error loading block database</source>
@@ -4038,15 +3959,15 @@ https://www.transifex.com/projects/p/dash/</translation>
     </message>
     <message>
         <source>Create new files with system default permissions, instead of umask 077 (only effective with disabled wallet functionality)</source>
-        <translation>Crear archivos nuevos con los permisos por defecto del sistema, en lugar de umask 077 (sólo será efectivo con la funcionalidad del monedero desactivada)</translation>
+        <translation>Crear archivos nuevos con los permisos por defecto del sistema, en lugar de umask 077 (sólo será efectivo con la funcionalidad de la billetera desactivada)</translation>
     </message>
     <message>
         <source>Delete all wallet transactions and only recover those parts of the blockchain through -rescan on startup</source>
-        <translation>Borrar todas las transacciones del monedero y recuperar únicamente aquellas partes de la cadena de bloques a través de -rescan al iniciar</translation>
+        <translation>Borrar todas las transacciones de la billetera y recuperar únicamente aquellas partes de la cadena de bloques a través de -rescan al iniciar</translation>
     </message>
     <message>
         <source>Error loading %s: You can't enable HD on a already existing non-HD wallet</source>
-        <translation>Error cargando %s: No puede habilitar HD  en un monedero non-HD existente.</translation>
+        <translation>Error cargando %s: No puede habilitar HD  en una billetera non-HD existente.</translation>
     </message>
     <message>
         <source>Found unconfirmed denominated outputs, will wait till they confirm to continue.</source>
@@ -4074,7 +3995,7 @@ https://www.transifex.com/projects/p/dash/</translation>
     </message>
     <message>
         <source>Make sure to encrypt your wallet and delete all non-encrypted backups after you verified that wallet works!</source>
-        <translation>¡Asegúrese de encriptar su monedero y borrar todas las copias de seguridad no encriptadas después de verificar que su monedero funciona!</translation>
+        <translation>¡Asegúrese de encriptar su billetera y borrar todas las copias de seguridad no encriptadas después de verificar que su billetera funciona!</translation>
     </message>
     <message>
         <source>Maximum size of data in data carrier transactions we relay and mine (default: %u)</source>
@@ -4094,11 +4015,11 @@ https://www.transifex.com/projects/p/dash/</translation>
     </message>
     <message>
         <source>User defined mnemonic for HD wallet (bip39). Only has effect during wallet creation/first start (default: randomly generated)</source>
-        <translation>Mnemonic definida por el usuario para monedero HD (bip39). Solo tomara efecto durante la creación/primer inicio de su monedero (predeterminado: generado aleatoriamente)</translation>
+        <translation>Mnemonic definida por el usuario para la billetera HD (bip39). Solo tomara efecto durante la creación/primer inicio de su billetera (predeterminado: generado aleatoriamente)</translation>
     </message>
     <message>
         <source>User defined seed for HD wallet (should be in hex). Only has effect during wallet creation/first start (default: randomly generated)</source>
-        <translation>Semilla definida por el usuario para monedero HD (debe estar en hexadecimal). Solo tomara efecto durante la creación/primer inicio de su monedero (predeterminado: generado aleatoriamente)</translation>
+        <translation>Semilla definida por el usuario para la billetera HD (debe estar en hexadecimal). Solo tomara efecto durante la creación/primer inicio de su billetera (predeterminado: generado aleatoriamente)</translation>
     </message>
     <message>
         <source>Whitelisted peers cannot be DoS banned and their transactions are always relayed, even if they are already in the mempool, useful e.g. for a gateway</source>
@@ -4146,7 +4067,7 @@ https://www.transifex.com/projects/p/dash/</translation>
     </message>
     <message>
         <source>Error loading %s: You can't disable HD on a already existing HD wallet</source>
-        <translation>Error cargando %s: No puede deshabilitar HD en un monedero HD existente</translation>
+        <translation>Error cargando %s: No puede deshabilitar HD en una billetera HD existente</translation>
     </message>
     <message>
         <source>Failed to load fulfilled requests cache from</source>
@@ -4414,7 +4335,7 @@ https://www.transifex.com/projects/p/dash/</translation>
     </message>
     <message>
         <source>Upgrade wallet to latest format on startup</source>
-        <translation>Actualizar el monedero al último formato al iniciar</translation>
+        <translation>Actualizar la billetera al último formato al iniciar</translation>
     </message>
     <message>
         <source>Use KeePass 2 integration using KeePassHttp plugin (default: %u)</source>
@@ -4498,15 +4419,15 @@ https://www.transifex.com/projects/p/dash/</translation>
     </message>
     <message>
         <source>Enable use of automated PrivateSend for funds stored in this wallet (0-1, default: %u)</source>
-        <translation>Habilitar uso de PrivateSend automatizado para almacenar fundos en este monedero (0-1, predeterminado: %u)</translation>
+        <translation>Habilitar uso de PrivateSend automatizado para almacenar fundos en esta billetera (0-1, predeterminado: %u)</translation>
     </message>
     <message>
         <source>Execute command when a wallet InstantSend transaction is successfully locked (%s in cmd is replaced by TxID)</source>
-        <translation>Ejecutar comando en el monedero cuando la transacción InstantSend este totalmente bloqueada (%s en cmd es reemplazada por TxID)</translation>
+        <translation>Ejecutar comando en la billetera cuando la transacción InstantSend este totalmente bloqueada (%s en cmd es reemplazada por TxID)</translation>
     </message>
     <message>
         <source>Failed to create backup, file already exists! This could happen if you restarted wallet in less than 60 seconds. You can continue if you are ok with this.</source>
-        <translation>¡Error al crear copia de seguridad, el archivo ya existe! Esto puede ocurrir si reinicio el monedero en menos de 60 segundos. Puede continuar si esta de acuerdo con esto.</translation>
+        <translation>¡Error al crear copia de seguridad, el archivo ya existe! Esto puede ocurrir si reinicio la billetera en menos de 60 segundos. Puede continuar si esta de acuerdo con esto.</translation>
     </message>
     <message>
         <source>Fees (in %s/kB) smaller than this are considered zero fee for relaying, mining and transaction creation (default: %s)</source>
@@ -4554,7 +4475,7 @@ https://www.transifex.com/projects/p/dash/</translation>
     </message>
     <message>
         <source>Prune: last wallet synchronisation goes beyond pruned data. You need to -reindex (download the whole blockchain again in case of pruned node)</source>
-        <translation>Poda: la ultima sincronizacion del monedero sobrepasa los datos podados. Necesitas reindexar con -reindex (o descargar la cadena de bloques de nuevo en el caso de un nodo podado)</translation>
+        <translation>Poda: la ultima sincronizacion de la billetera sobrepasa los datos podados. Necesitas reindexar con -reindex (o descargar la cadena de bloques de nuevo en el caso de un nodo podado)</translation>
     </message>
     <message>
         <source>Randomize credentials for every proxy connection. This enables Tor stream isolation (default: %u)</source>
@@ -4566,7 +4487,7 @@ https://www.transifex.com/projects/p/dash/</translation>
     </message>
     <message>
         <source>Specify full path to directory for automatic wallet backups (must exist)</source>
-        <translation>Especificar ruta completa del directorio para copias de seguridad completas del monedero (debe existir)</translation>
+        <translation>Especificar ruta completa del directorio para copias de seguridad completas de la billetera (debe existir)</translation>
     </message>
     <message>
         <source>Support filtering of blocks and transaction with bloom filters (default: %u)</source>
@@ -4606,11 +4527,11 @@ https://www.transifex.com/projects/p/dash/</translation>
     </message>
     <message>
         <source>WARNING! Failed to replenish keypool, please unlock your wallet to do so.</source>
-        <translation>¡ADVERTENCIA! Error al reponer la keypool, por favor desbloquee su monedero para hacerlo.</translation>
+        <translation>¡ADVERTENCIA! Error al reponer la keypool, por favor desbloquee su billetera para hacerlo.</translation>
     </message>
     <message>
         <source>Wallet is locked, can't replenish keypool! Automatic backups and mixing are disabled, please unlock your wallet to replenish keypool.</source>
-        <translation>¡El monedero esta bloqueado, no se puede reponer keypool! Copias de seguridad automáticas y mezclado están deshabilitados, por favor desbloquee su monedero para reponer keypool.</translation>
+        <translation>¡La billetera esta bloqueado, no se puede reponer keypool! Copias de seguridad automáticas y mezclado están deshabilitados, por favor desbloquee su billetera para reponer keypool.</translation>
     </message>
     <message>
         <source>Warning: Unknown block versions being mined! It's possible unknown rules are in effect</source>
@@ -4750,11 +4671,11 @@ https://www.transifex.com/projects/p/dash/</translation>
     </message>
     <message>
         <source>Loading wallet... (%3.2f %%)</source>
-        <translation>Cargando monedero... (%3.2f %%)</translation>
+        <translation>Cargando billetera... (%3.2f %%)</translation>
     </message>
     <message>
         <source>Loading wallet...</source>
-        <translation>Cargando monedero...</translation>
+        <translation>Cargando billetera...</translation>
     </message>
     <message>
         <source>Location of the auth cookie (default: data dir)</source>
@@ -4762,7 +4683,7 @@ https://www.transifex.com/projects/p/dash/</translation>
     </message>
     <message>
         <source>Make the wallet broadcast transactions</source>
-        <translation>Realiza las operaciones de difusión del monedero</translation>
+        <translation>Realiza las operaciones de difusión de la billetera</translation>
     </message>
     <message>
         <source>Masternode cache is empty, skipping payments and governance cache...</source>
@@ -4818,7 +4739,7 @@ https://www.transifex.com/projects/p/dash/</translation>
     </message>
     <message>
         <source>Number of automatic wallet backups (default: %u)</source>
-        <translation>Numero de copias de seguridad automáticas del monedero (predeterminado: %u)</translation>
+        <translation>Numero de copias de seguridad automáticas de la billetera (predeterminado: %u)</translation>
     </message>
     <message>
         <source>Options:</source>
@@ -4862,11 +4783,11 @@ https://www.transifex.com/projects/p/dash/</translation>
     </message>
     <message>
         <source>Rescan the block chain for missing wallet transactions on startup</source>
-        <translation>Reescanear la cadena de bloques para buscar transacciones perdidas en el monedero al iniciar</translation>
+        <translation>Reescanear la cadena de bloques para buscar transacciones perdidas en la billetera al iniciar</translation>
     </message>
     <message>
         <source>The wallet will avoid paying less than the minimum relay fee.</source>
-        <translation>El monedero evitará pagar menos que la comisión mínima de transmisión.</translation>
+        <translation>La billetera evitará pagar menos que la comisión mínima de transmisión.</translation>
     </message>
     <message>
         <source>This is the minimum transaction fee you pay on every transaction.</source>
@@ -4906,11 +4827,11 @@ https://www.transifex.com/projects/p/dash/</translation>
     </message>
     <message>
         <source>Wallet debugging/testing options:</source>
-        <translation>Opciones de depuración/pruebas de monedero:</translation>
+        <translation>Opciones de depuración/pruebas de billetera:</translation>
     </message>
     <message>
         <source>Wallet needed to be rewritten: restart %s to complete</source>
-        <translation>Es necesario reescribir el monedero: reiniciar %s para completar</translation>
+        <translation>Es necesario reescribir la billetera: reiniciar %s para completar</translation>
     </message>
     <message>
         <source>Warning: unknown new rules activated (versionbit %i)</source>
@@ -4918,7 +4839,7 @@ https://www.transifex.com/projects/p/dash/</translation>
     </message>
     <message>
         <source>Wasn't able to create wallet backup folder %s!</source>
-        <translation>¡No es posible crear carpeta de copia de seguridad del monedero %s!</translation>
+        <translation>¡No es posible crear carpeta de copia de seguridad de la billetera %s!</translation>
     </message>
     <message>
         <source>Whether to operate in a blocks only mode (default: %u)</source>
@@ -4982,7 +4903,7 @@ https://www.transifex.com/projects/p/dash/</translation>
     </message>
     <message>
         <source>Maximum total fees (in %s) to use in a single wallet transaction or raw transaction; setting this too low may abort large transactions (default: %s)</source>
-        <translation>Máximas comisiones totales (en %s) para utilizar en una sola transacción del monedero o transacciones sin procesar; establecer esto demasiado bajo puede abortar grandes transacciones (predeterminado: %s)</translation>
+        <translation>Máximas comisiones totales (en %s) para utilizar en una sola transacción de la billetera o transacciones sin procesar; establecer esto demasiado bajo puede abortar grandes transacciones (predeterminado: %s)</translation>
     </message>
     <message>
         <source>Override spork address. Only useful for regtest and devnet. Using this on mainnet or testnet will ban you.</source>
@@ -5012,10 +4933,6 @@ https://www.transifex.com/projects/p/dash/</translation>
         <source>Set lowest fee rate (in %s/kB) for transactions to be included in block creation. (default: %s)</source>
         <translation>Establecer la tasa más baja (en %s/kB) por transacciones para incluirse en la creación de bloque. (predeterminado: %s)</translation>
     </message>
-    <message>
-        <source>Show N confirmations for a successfully locked transaction (%u-%u, default: %u)</source>
-        <translation>Mostrar N confirmaciones para un bloqueo de transacciones (%u-%u, predeterminado: %u)</translation>
-    </message>
     <message>
         <source>This is the transaction fee you may pay when fee estimates are not available.</source>
         <translation>Esta es la tarifa de cuota que debe pagar cuando las estimaciones de tarifas no estén disponibles.</translation>
@@ -5034,11 +4951,11 @@ https://www.transifex.com/projects/p/dash/</translation>
     </message>
     <message>
         <source>Use hierarchical deterministic key generation (HD) after BIP39/BIP44. Only has effect during wallet creation/first start</source>
-        <translation>Usar generación de llave jerárquica determinista (HD) después de BIP39/BIP44. Solo tomara efecto durante la creación/primer inicio del monedero</translation>
+        <translation>Usar generación de llave jerárquica determinista (HD) después de BIP39/BIP44. Solo tomara efecto durante la creación/primer inicio de la billetera</translation>
     </message>
     <message>
         <source>User defined mnemonic passphrase for HD wallet (BIP39). Only has effect during wallet creation/first start (default: empty string)</source>
-        <translation>Contraseña mnemonic definida por el usuario para monedero HD (BIP39). Solo tomara efecto durante la creación/primer inicio del monedero (predeterminado: linea vacía)</translation>
+        <translation>Contraseña mnemonic definida por el usuario para la billetera HD (BIP39). Solo tomara efecto durante la creación/primer inicio de la billetera (predeterminado: linea vacía)</translation>
     </message>
     <message>
         <source>Username and hashed password for JSON-RPC connections. The field &lt;userpw&gt; comes in the format: &lt;USERNAME&gt;:&lt;SALT&gt;$&lt;HASH&gt;. A canonical python script is included in share/rpcuser. The client then connects normally using the rpcuser=&lt;USERNAME&gt;/rpcpassword=&lt;PASSWORD&gt; pair of arguments. This option can be specified multiple times</source>
@@ -5046,7 +4963,7 @@ https://www.transifex.com/projects/p/dash/</translation>
     </message>
     <message>
         <source>Wallet will not create transactions that violate mempool chain limits (default: %u)</source>
-        <translation>El monedero no creará transacciones que violen los límites de la cadena mempool (predeterminado: %u)</translation>
+        <translation>La billetera no creará transacciones que violen los límites de la cadena mempool (predeterminado: %u)</translation>
     </message>
     <message>
         <source>Warning: At least %d of %d masternodes are running on a newer software version. Please check latest releases, you might need to update too.</source>
@@ -5058,7 +4975,7 @@ https://www.transifex.com/projects/p/dash/</translation>
     </message>
     <message>
         <source>Warning: Wallet file corrupt, data salvaged! Original %s saved as %s in %s; if your balance or transactions are incorrect you should restore from a backup.</source>
-        <translation>Advertencia: archivo monedero esta corrupto, datos recuperados! Original %s guardado como %s en %s; si su balance o transacciones es incorrecto, debe restaurar desde una copia de seguridad.</translation>
+        <translation>Advertencia: archivo Billetera esta corrupto, datos recuperados! Original %s guardado como %s en %s; si su balance o transacciones es incorrecto, debe restaurar desde una copia de seguridad.</translation>
     </message>
     <message>
         <source>Whitelist peers connecting from the given IP address (e.g. 1.2.3.4) or CIDR notated network (e.g. 1.2.3.0/24). Can be specified multiple times.</source>
@@ -5098,7 +5015,7 @@ https://www.transifex.com/projects/p/dash/</translation>
     </message>
     <message>
         <source>Attempt to recover private keys from a corrupt wallet on startup</source>
-        <translation>Intentar recuperar llaves privadas de un monedero corrupto al iniciar</translation>
+        <translation>Intentar recuperar llaves privadas de una billetera corrupta al iniciar</translation>
     </message>
     <message>
         <source>Cannot resolve -%s address: '%s'</source>
@@ -5118,11 +5035,11 @@ https://www.transifex.com/projects/p/dash/</translation>
     </message>
     <message>
         <source>Error loading %s: Wallet corrupted</source>
-        <translation>Error cargando %s: Monedero corrupto</translation>
+        <translation>Error cargando %s: Billetera corrupta</translation>
     </message>
     <message>
         <source>Error loading %s: Wallet requires newer version of %s</source>
-        <translation>Error cargando %s: Monedero requiere una versión mas reciente de %s</translation>
+        <translation>Error cargando %s: La billetera requiere una versión mas reciente de %s</translation>
     </message>
     <message>
         <source>Error upgrading chainstate database</source>
@@ -5222,7 +5139,7 @@ https://www.transifex.com/projects/p/dash/</translation>
     </message>
     <message>
         <source>Specify wallet file (within data directory)</source>
-        <translation>Especificar archivo de monedero (dentro del directorio de datos)</translation>
+        <translation>Especificar archivo de billetera (dentro del directorio de datos)</translation>
     </message>
     <message>
         <source>Specify your own public address</source>
@@ -5302,7 +5219,7 @@ https://www.transifex.com/projects/p/dash/</translation>
     </message>
     <message>
         <source>Verifying wallet...</source>
-        <translation>Verificando monedero...</translation>
+        <translation>Verificando billetera...</translation>
     </message>
     <message>
         <source>Very low number of keys left: %d</source>
@@ -5310,19 +5227,19 @@ https://www.transifex.com/projects/p/dash/</translation>
     </message>
     <message>
         <source>Wallet %s resides outside data directory %s</source>
-        <translation>El monedero %s se encuentra fuera del directorio de datos %s</translation>
+        <translation>La billetera %s se encuentra fuera del directorio de datos %s</translation>
     </message>
     <message>
         <source>Wallet is locked.</source>
-        <translation>El monedero está bloqueado.</translation>
+        <translation>La billetera está bloqueada.</translation>
     </message>
     <message>
         <source>Wallet options:</source>
-        <translation>Opciones de monedero:</translation>
+        <translation>Opciones de billetera:</translation>
     </message>
     <message>
         <source>Wallet window title</source>
-        <translation>Título de la ventana del monedero</translation>
+        <translation>Título de la ventana de la billetera</translation>
     </message>
     <message>
         <source>Warning</source>
@@ -5338,7 +5255,7 @@ https://www.transifex.com/projects/p/dash/</translation>
     </message>
     <message>
         <source>Zapping all transactions from wallet...</source>
-        <translation>Eliminando todas las transacciones del monedero...</translation>
+        <translation>Eliminando todas las transacciones de la billetera...</translation>
     </message>
 </context>
 </TS>
\ No newline at end of file
diff --git a/src/qt/locale/dash_fi.ts b/src/qt/locale/dash_fi.ts
index 4a0f43e4ef13..1feee3abce4e 100644
--- a/src/qt/locale/dash_fi.ts
+++ b/src/qt/locale/dash_fi.ts
@@ -793,10 +793,6 @@
         <source>Please switch to "List mode" to use this function.</source>
         <translation>Vaihda "Lista tilaan" käyttääksesi tätä toimintoa.</translation>
     </message>
-    <message>
-        <source>Non-anonymized input selected. &lt;b&gt;PrivateSend will be disabled.&lt;/b&gt;&lt;br&gt;&lt;br&gt;If you still want to use PrivateSend, please deselect all non-nonymized inputs first and then check PrivateSend checkbox again.</source>
-        <translation>Ei anonyymeja syötteitä valittu. &lt;b&gt;PrivateSend poistetaan käytöstä.&lt;/b&gt;&lt;br&gt;&lt;br&gt;Jos silti haluat käyttää PrivateSend:iä, poista ei anonyymit valinnat ensin ja valitse uudelleen PrivateSend optio.</translation>
-    </message>
     <message>
         <source>(%1 locked)</source>
         <translation>(%1 lukittu)</translation>
@@ -834,73 +830,6 @@
         <translation>e/s</translation>
     </message>
 </context>
-<context>
-    <name>DarksendConfig</name>
-    <message>
-        <source>Configure PrivateSend</source>
-        <translation>PrivateSend Asetukset</translation>
-    </message>
-    <message>
-        <source>Basic Privacy</source>
-        <translation>Perustason Yksityisyys</translation>
-    </message>
-    <message>
-        <source>High Privacy</source>
-        <translation>Korkean tason Yksityisyys</translation>
-    </message>
-    <message>
-        <source>Maximum Privacy</source>
-        <translation>Maksimaalinen Yksityisyys</translation>
-    </message>
-    <message>
-        <source>Please select a privacy level.</source>
-        <translation>Valitse yksityisyyden taso.</translation>
-    </message>
-    <message>
-        <source>Use 2 separate masternodes to mix funds up to 1000 DASH</source>
-        <translation>Käytä 2 erillistä masternodea sekoittaaksesi varoja</translation>
-    </message>
-    <message>
-        <source>Use 8 separate masternodes to mix funds up to 1000 DASH</source>
-        <translation>Käytä 8 erillistä masternodea sekoittaaksesi varoja</translation>
-    </message>
-    <message>
-        <source>Use 16 separate masternodes</source>
-        <translation>Käytä 16 erillistä masternodea</translation>
-    </message>
-    <message>
-        <source>This option is the quickest and will cost about ~0.025 DASH to anonymize 1000 DASH</source>
-        <translation>Tämä vaihtoehto on nopein ja maksaa noin ~0.025 DASH kun anonymisoidaan 1000 DASH</translation>
-    </message>
-    <message>
-        <source>This option is moderately fast and will cost about 0.05 DASH to anonymize 1000 DASH</source>
-        <translation>Tämä vaihtoehto on keskinopea ja maksaa noin ~0.05 DASH kun anonymisoidaan 1000 DASH</translation>
-    </message>
-    <message>
-        <source>0.1 DASH per 1000 DASH you anonymize.</source>
-        <translation>0.1 DASH maksu per 1000 DASH jonka anonymisoit.</translation>
-    </message>
-    <message>
-        <source>This is the slowest and most secure option. Using maximum anonymity will cost</source>
-        <translation>Tämä vaihtoehto on hitain ja kaikkein anonyymi. Suurimman yksityisyyden käyttö maksaa</translation>
-    </message>
-    <message>
-        <source>PrivateSend Configuration</source>
-        <translation>PrivateSend Asetukset</translation>
-    </message>
-    <message>
-        <source>PrivateSend was successfully set to basic (%1 and 2 rounds). You can change this at any time by opening Dash's configuration screen.</source>
-        <translation>PrivateSend on asetettu perusasetuksiin (%1 and 2 kierrosta). Voit muuttaa asetuksia milloin vain Dash asetuksista.</translation>
-    </message>
-    <message>
-        <source>PrivateSend was successfully set to high (%1 and 8 rounds). You can change this at any time by opening Dash's configuration screen.</source>
-        <translation>PrivateSend on asetettu korkean tason asetuksiin (%1 and 8 kierrosta). Voit muuttaa asetuksia milloin vain Dash asetuksista.</translation>
-    </message>
-    <message>
-        <source>PrivateSend was successfully set to maximum (%1 and 16 rounds). You can change this at any time by opening Dash's configuration screen.</source>
-        <translation>PrivateSend on asetettu maksimitason asetuksiin (%1 and 16 kierrosta). Voit muuttaa asetuksia milloin vain Dash asetuksista.</translation>
-    </message>
-</context>
 <context>
     <name>EditAddressDialog</name>
     <message>
@@ -1037,11 +966,7 @@
         <source>PrivateSend information</source>
         <translation>PrivateSend tietoja</translation>
     </message>
-    <message>
-        <source>&lt;h3&gt;PrivateSend Basics&lt;/h3&gt; PrivateSend gives you true financial privacy by obscuring the origins of your funds. All the Dash in your wallet is comprised of different "inputs" which you can think of as separate, discrete coins.&lt;br&gt; PrivateSend uses an innovative process to mix your inputs with the inputs of two other people, without having your coins ever leave your wallet. You retain control of your money at all times.&lt;hr&gt; &lt;b&gt;The PrivateSend process works like this:&lt;/b&gt;&lt;ol type="1"&gt; &lt;li&gt;PrivateSend begins by breaking your transaction inputs down into standard denominations. These denominations are 0.01 DASH, 0.1 DASH, 1 DASH and 10 DASH -- sort of like the paper money you use every day.&lt;/li&gt; &lt;li&gt;Your wallet then sends requests to specially configured software nodes on the network, called "masternodes." These masternodes are informed then that you are interested in mixing a certain denomination. No identifiable information is sent to the masternodes, so they never know "who" you are.&lt;/li&gt; &lt;li&gt;When two other people send similar messages, indicating that they wish to mix the same denomination, a mixing session begins. The masternode mixes up the inputs and instructs all three users' wallets to pay the now-transformed input back to themselves. Your wallet pays that denomination directly to itself, but in a different address (called a change address).&lt;/li&gt; &lt;li&gt;In order to fully obscure your funds, your wallet must repeat this process a number of times with each denomination. Each time the process is completed, it's called a "round." Each round of PrivateSend makes it exponentially more difficult to determine where your funds originated.&lt;/li&gt; &lt;li&gt;This mixing process happens in the background without any intervention on your part. When you wish to make a transaction, your funds will already be anonymized. No additional waiting is required.&lt;/li&gt; &lt;/ol&gt; &lt;hr&gt;&lt;b&gt;IMPORTANT:&lt;/b&gt; Your wallet only contains 1000 of these "change addresses." Every time a mixing event happens, up to 9 of your addresses are used up. This means those 1000 addresses last for about 100 mixing events. When 900 of them are used, your wallet must create more addresses. It can only do this, however, if you have automatic backups enabled.&lt;br&gt; Consequently, users who have backups disabled will also have PrivateSend disabled. &lt;hr&gt;For more info see &lt;a href="https://dashpay.atlassian.net/wiki/display/DOC/PrivateSend"&gt;https://dashpay.atlassian.net/wiki/display/DOC/PrivateSend&lt;/a&gt;         </source>
-        <translation>&lt;h3&gt;PrivateSend perusteet&lt;/h3&gt; PrivateSend tarjoaa yksityisyyden hämärtämällä varojesi alkuperäisen osoitteen. Kaikki Dash:it lompakossasi muodostuvat erillisistä "syötteistä", joita voit ajatella erillisinä kolikkoina.&lt;br&gt; PrivateSend käyttää innovatiivista prosessia sekoittaakseen lompakkosi syötteet kahden muun ihmisen syötteisiin, siirtämättä varoja pois lompakostasi. Varojesi kontrolli pysyy aina sinulla.&lt;hr&gt; &lt;b&gt; PrivateSend prosessi toimii seuraavasti:&lt;/b&gt;&lt;ol type="1"&gt; &lt;li&gt;PrivateSend aloittaa pilkkomalla siirtotapahtumiesi syötteet pienemmiksi standardi arvoiksi. Nämä arvot ovat 0.01 DASH, 0.1 DASH, 1 DASH ja 10 DASH.&lt;/li&gt; &lt;li&gt;Sitten lompakkosi lähettää pyynnön verkon palvelimille, joita kutsutaan "masternode:iksi". Masternodet saavat tiedon että haluat sekoittaa pilkottuja standardi arvoja. Mitään tunnistetietoja ei lähetetä masternode:ille, ne eivät koskaan tiedä "kuka" olet.&lt;/li&gt; &lt;li&gt;Kun 2 muuta käyttäjää ilmoittaa että he haluavat myös sekoittaa varoja, alkaa sekoitus-sessio. Masternodet sekoittavat standardi arvot ja ilmoittavat kaikille 3:lle käyttäjän lompakoille että maksavat sekoitetut arvot takaisin itselleen. Lompakkosi maksaa nuo sekoitetut arvot suoraan itselleen, mutta eri osoitteeseen (vaihto-osoite).&lt;/li&gt; &lt;li&gt;Jotta varojesi alkuperäinen lähde hämärretään, lompakkosi suorittaa tämän prosessin useita kertoja kaikilla standardi arvoilla. Aina kun prosessi on valmis, sitä kutsutaan "kierrokseksi". Jokainen PrivateSend kierros tekee eksponentiaalisesti vaikeammaksi löytää varojesi alkuperäisen osoitteen.&lt;/li&gt; &lt;li&gt;Tämä sekoitusprosessi tapahtuu taustalla ilman käyttäjän toimenpiteitä. Kun haluat myöhemmin tehdä anonyymin varojen siirron, on varasi valmiiksi sekoitettu (anonymisoitu). Erillistä sekoitusta/odotusta ei tarvita.&lt;/li&gt; &lt;/ol&gt; &lt;hr&gt;&lt;b&gt;TÄRKEÄÄ:&lt;/b&gt; Lompakkosi sisältää vain 1000 "vaihto-osoitetta". Aina kun sekoitustapahtuma tehdään, max 9 osoitetta käytetään. Tämä tarkoittaa sitä että nuo 1000 osoitetta kestää noin 100 sekoitustapahtumaa. Kun 900 osoitetta on käytetty, lompakkosi täytyy tehdä lisää osoitteita. Se voi tehdä niitä vain jos automaattinen varmistus on käytössä.&lt;br&gt; Tästä seuraa että jos varmistus ei ole käytössä, myös PrivateSend on pois käytöstä. &lt;hr&gt;Lisätietoja &lt;a href="https://dashpay.atlassian.net/wiki/display/DOC/PrivateSend"&gt;https://dashpay.atlassian.net/wiki/display/DOC/PrivateSend&lt;/a&gt; </translation>
-    </message>
-</context>
+    </context>
 <context>
     <name>Intro</name>
     <message>
@@ -1829,10 +1754,6 @@ https://www.transifex.com/projects/p/dash/</translation>
         <source>We are about to create a new automatic backup for you, however &lt;span style='color:red;'&gt; you should always make sure you have backups saved in some safe place&lt;/span&gt;!</source>
         <translation>Olemme tekemässä uutta automaattista varmistusta sinulle, mutta&lt;span style='color:red;'&gt; varmista aina että olet tallettanut varmistuksen turvalliseen paikkaan&lt;/span&gt;!</translation>
     </message>
-    <message>
-        <source>Note: You can turn this message off in options.</source>
-        <translation>Huom: Voit kytkeä tämän viestin pois asetuksissa.</translation>
-    </message>
     <message>
         <source>WARNING! Something went wrong on automatic backup</source>
         <translation>VAROITUS! Jotain meni vikaan automaattisessa varmistuksessa</translation>
@@ -5017,10 +4938,6 @@ Vähennä uakommenttien määrää tai kokoa.</translation>
         <source>Set lowest fee rate (in %s/kB) for transactions to be included in block creation. (default: %s)</source>
         <translation>Aseta lohkon luonnissa lisättävien siirtojen vähimmäispalkkion suhde (%s/kt) (oletus: %s)</translation>
     </message>
-    <message>
-        <source>Show N confirmations for a successfully locked transaction (%u-%u, default: %u)</source>
-        <translation>Näytä N vahvistusta onnistuneesti lukitulle siirtotapahtumalle (%u-%u, oletus: %u)</translation>
-    </message>
     <message>
         <source>This is the transaction fee you may pay when fee estimates are not available.</source>
         <translation>Tämä on siirtomaksu jonka saatat maksaa jos siirtomaksun arviota ei ole mahdollista saada.</translation>
diff --git a/src/qt/locale/dash_fr.ts b/src/qt/locale/dash_fr.ts
index 4ba090283468..f5def6a97e4f 100644
--- a/src/qt/locale/dash_fr.ts
+++ b/src/qt/locale/dash_fr.ts
@@ -793,10 +793,6 @@
         <source>Please switch to "List mode" to use this function.</source>
         <translation>Veuillez passer en “mode liste” pour utiliser cette fonction.</translation>
     </message>
-    <message>
-        <source>Non-anonymized input selected. &lt;b&gt;PrivateSend will be disabled.&lt;/b&gt;&lt;br&gt;&lt;br&gt;If you still want to use PrivateSend, please deselect all non-nonymized inputs first and then check PrivateSend checkbox again.</source>
-        <translation>Éléments non-anonymisés sélectionnés. &lt;b&gt;PrivateSend sera désactivé.&lt;/b&gt;&lt;br&gt;&lt;br&gt;Si vous voulez quand même utiliser PrivateSend, veuillez d'abord désélectionner tous les éléments non-anonymisés, puis recochez la case PrivateSend.</translation>
-    </message>
     <message>
         <source>(%1 locked)</source>
         <translation>(%1 verrouillés)</translation>
@@ -834,73 +830,6 @@
         <translation>n/a</translation>
     </message>
 </context>
-<context>
-    <name>DarksendConfig</name>
-    <message>
-        <source>Configure PrivateSend</source>
-        <translation>Configurer PrivateSend</translation>
-    </message>
-    <message>
-        <source>Basic Privacy</source>
-        <translation>Confidentialité normale</translation>
-    </message>
-    <message>
-        <source>High Privacy</source>
-        <translation>Confidentialité élevée</translation>
-    </message>
-    <message>
-        <source>Maximum Privacy</source>
-        <translation>Confidentialité maximale</translation>
-    </message>
-    <message>
-        <source>Please select a privacy level.</source>
-        <translation>Veuillez choisir un niveau de confidentialité.</translation>
-    </message>
-    <message>
-        <source>Use 2 separate masternodes to mix funds up to 1000 DASH</source>
-        <translation>Utiliser 2 masternodes distincts pour mélanger jusqu'à 1000 DASH</translation>
-    </message>
-    <message>
-        <source>Use 8 separate masternodes to mix funds up to 1000 DASH</source>
-        <translation>Utiliser 8 masternodes distincts pour mélanger jusqu'à 1000 DASH</translation>
-    </message>
-    <message>
-        <source>Use 16 separate masternodes</source>
-        <translation>Utiliser 16 masternodes distincts</translation>
-    </message>
-    <message>
-        <source>This option is the quickest and will cost about ~0.025 DASH to anonymize 1000 DASH</source>
-        <translation>Cette option est la plus rapide et coûtera environ 0,025 DASH pour anonymiser 1000 DASH</translation>
-    </message>
-    <message>
-        <source>This option is moderately fast and will cost about 0.05 DASH to anonymize 1000 DASH</source>
-        <translation>Cette option est un peu moins rapide et coûtera environ 0,05 DASH pour anonymiser 1000 DASH</translation>
-    </message>
-    <message>
-        <source>0.1 DASH per 1000 DASH you anonymize.</source>
-        <translation>0,1 DASH par 1000 DASH anonymisés.</translation>
-    </message>
-    <message>
-        <source>This is the slowest and most secure option. Using maximum anonymity will cost</source>
-        <translation>Cette option est le plus lente et la plus sécurisée. Utiliser l'anonymisation maximale coûtera</translation>
-    </message>
-    <message>
-        <source>PrivateSend Configuration</source>
-        <translation>Configuration PrivateSend</translation>
-    </message>
-    <message>
-        <source>PrivateSend was successfully set to basic (%1 and 2 rounds). You can change this at any time by opening Dash's configuration screen.</source>
-        <translation>PrivateSend a bien été réglé sur “normale” (%1 et 2 cycles). Vous pouvez modifier cela à tout moment dans la fenêtre de configuration de Dash.</translation>
-    </message>
-    <message>
-        <source>PrivateSend was successfully set to high (%1 and 8 rounds). You can change this at any time by opening Dash's configuration screen.</source>
-        <translation>PrivateSend a bien été réglé sur “élevée” (%1 et 8 cycles). Vous pouvez modifier cela à tout moment dans la fenêtre de configuration de Dash.</translation>
-    </message>
-    <message>
-        <source>PrivateSend was successfully set to maximum (%1 and 16 rounds). You can change this at any time by opening Dash's configuration screen.</source>
-        <translation>PrivateSend a bien été réglé sur “maximale” (%1 et 16 cycles). Vous pouvez modifier cela à tout moment dans la fenêtre de configuration de Dash.</translation>
-    </message>
-</context>
 <context>
     <name>EditAddressDialog</name>
     <message>
@@ -1037,11 +966,7 @@
         <source>PrivateSend information</source>
         <translation>Information PrivateSend</translation>
     </message>
-    <message>
-        <source>&lt;h3&gt;PrivateSend Basics&lt;/h3&gt; PrivateSend gives you true financial privacy by obscuring the origins of your funds. All the Dash in your wallet is comprised of different "inputs" which you can think of as separate, discrete coins.&lt;br&gt; PrivateSend uses an innovative process to mix your inputs with the inputs of two other people, without having your coins ever leave your wallet. You retain control of your money at all times.&lt;hr&gt; &lt;b&gt;The PrivateSend process works like this:&lt;/b&gt;&lt;ol type="1"&gt; &lt;li&gt;PrivateSend begins by breaking your transaction inputs down into standard denominations. These denominations are 0.01 DASH, 0.1 DASH, 1 DASH and 10 DASH -- sort of like the paper money you use every day.&lt;/li&gt; &lt;li&gt;Your wallet then sends requests to specially configured software nodes on the network, called "masternodes." These masternodes are informed then that you are interested in mixing a certain denomination. No identifiable information is sent to the masternodes, so they never know "who" you are.&lt;/li&gt; &lt;li&gt;When two other people send similar messages, indicating that they wish to mix the same denomination, a mixing session begins. The masternode mixes up the inputs and instructs all three users' wallets to pay the now-transformed input back to themselves. Your wallet pays that denomination directly to itself, but in a different address (called a change address).&lt;/li&gt; &lt;li&gt;In order to fully obscure your funds, your wallet must repeat this process a number of times with each denomination. Each time the process is completed, it's called a "round." Each round of PrivateSend makes it exponentially more difficult to determine where your funds originated.&lt;/li&gt; &lt;li&gt;This mixing process happens in the background without any intervention on your part. When you wish to make a transaction, your funds will already be anonymized. No additional waiting is required.&lt;/li&gt; &lt;/ol&gt; &lt;hr&gt;&lt;b&gt;IMPORTANT:&lt;/b&gt; Your wallet only contains 1000 of these "change addresses." Every time a mixing event happens, up to 9 of your addresses are used up. This means those 1000 addresses last for about 100 mixing events. When 900 of them are used, your wallet must create more addresses. It can only do this, however, if you have automatic backups enabled.&lt;br&gt; Consequently, users who have backups disabled will also have PrivateSend disabled. &lt;hr&gt;For more info see &lt;a href="https://dashpay.atlassian.net/wiki/display/DOC/PrivateSend"&gt;https://dashpay.atlassian.net/wiki/display/DOC/PrivateSend&lt;/a&gt;         </source>
-        <translation>&lt;h3&gt;Ce qu'il faut savoir sur PrivateSend&lt;/h3&gt; PrivateSend vous offre une véritable confidentialité financière en obscurcissant l'origine de vos fonds. Tous les dashs de votre portefeuille sont répartis en différentes "entrées", qu'on peut se représenter comme des pièces distinctes.&lt;br&gt; PrivateSend est un procédé innovant qui mélange vos entrées avec les entrées de deux autres personnes, sans que vos fonds ne quittent jamais votre portefeuille. Vous gardez le contrôle de votre argent à tout moment.&lt;hr&gt; &lt;b&gt;La procédure PrivateSend fonctionne comme ceci :&lt;/b&gt;&lt;ol type="1"&gt; &lt;li&gt;PrivateSend commence par diviser vos entrées de transaction en coupures standard. Ces coupures sont de 0.01 DASH, 0.1 DASH, 1 DASH et 10 DASH -- un peu comme pour les billets de banque que vous utilisez tous les jours.&lt;/li&gt; &lt;li&gt;Votre portefeuille envoie alors des requêtes à des serveurs spécifiques sur le réseau, appelés "masternodes". Ces masternodes sont informés que vous souhaiteriez mélanger certaines coupures. Aucune information permettant de vous identifier n'est envoyée aux masternodes, qui ne savent donc jamais "qui" vous êtes.&lt;/li&gt; &lt;li&gt;Quand deux autres personnes envoient des requêtes similaires, indiquant qu'elles veulent mélanger les mêmes coupures, alors commence une session de mélange. Le masternode mélange les entrées et demande aux portefeuilles des trois utilisateurs de payer l'entrée, désormais transformée, à eux-mêmes. Votre portefeuille paie cette coupure directement à lui-même, mais à une adresse différente (appelée adresse de monnaie rendue).&lt;/li&gt; &lt;li&gt;Afin d'obscurcir complètement vos fonds, votre portefeuille doit répéter cette procédure un certain nombre de fois avec chaque coupure. Une procédure terminée s'appelle un "cycle". Chaque cycle PrivateSend rend exponentiellement plus difficile de savoir d'où viennent vos fonds.&lt;/li&gt; &lt;li&gt;Cette procédure de mélange intervient en arrière-plan, sans aucune intervention de votre part. Quand vous souhaiterez faire une transaction, vos fonds seront déjà anonymisés. Aucune autre attente ne sera nécessaire.&lt;/li&gt; &lt;/ol&gt; &lt;hr&gt;&lt;b&gt;IMPORTANT :&lt;/b&gt; Votre portefeuille ne contient que 1000 de ces "adresses de monnaie rendue". À chaque opération de mélange, jusqu'à 9 de ces adresses sont utilisées. Cela signifie que ces 1000 adresses couvrent environ 100 opérations de mélange. Quand 900 d'entre elles sont utilisées, votre portefeuille doit créer de nouvelles adresses. Cependant il ne peut le faire que si vous avez activé les sauvegardes automatiques.&lt;br&gt; En conséquence, les utilisateurs qui ont désactivé les sauvegardes ont aussi PrivateSend désactivé. &lt;hr&gt;Pour en savoir plus, voir &lt;a href="https://dashpay.atlassian.net/wiki/display/DOC/PrivateSend"&gt;https://dashpay.atlassian.net/wiki/display/DOC/PrivateSend&lt;/a&gt;         </translation>
-    </message>
-</context>
+    </context>
 <context>
     <name>Intro</name>
     <message>
@@ -1346,7 +1271,7 @@
     </message>
     <message>
         <source>Amount of Dash to keep anonymized</source>
-        <translation>Nombre de Dash à conserver anonymisés</translation>
+        <translation>Nombre de dashs à conserver anonymisés</translation>
     </message>
     <message>
         <source>W&amp;allet</source>
@@ -1829,10 +1754,6 @@ https://www.transifex.com/projects/p/dash/</translation>
         <source>We are about to create a new automatic backup for you, however &lt;span style='color:red;'&gt; you should always make sure you have backups saved in some safe place&lt;/span&gt;!</source>
         <translation>Une nouvelle sauvegarde automatique est sur le point d'être créée pour vous, cependant &lt;span style='color:red;'&gt;assurez-vous toujours d'avoir des sauvegardes en lieu sûr&lt;/span&gt; !</translation>
     </message>
-    <message>
-        <source>Note: You can turn this message off in options.</source>
-        <translation>Note : masquez ce message dans Options.</translation>
-    </message>
     <message>
         <source>WARNING! Something went wrong on automatic backup</source>
         <translation>ATTENTION ! Quelque chose a mal tourné lors de la sauvegarde automatique</translation>
@@ -4594,7 +4515,7 @@ https://www.transifex.com/projects/p/dash/</translation>
     </message>
     <message>
         <source>Unsupported argument -socks found. Setting SOCKS version isn't possible anymore, only SOCKS5 proxies are supported.</source>
-        <translation>Paramètre obsolète -socks utilisé. Il n'est plus possible d'indiquer la version SOCKS, seul les proxy SOCKS5 sont supportés.</translation>
+        <translation>Paramètre obsolète -socks utilisé. Il n'est plus possible d'indiquer la version SOCKS, seuls les proxy SOCKS5 sont supportés.</translation>
     </message>
     <message>
         <source>Unsupported argument -whitelistalwaysrelay ignored, use -whitelistrelay and/or -whitelistforcerelay.</source>
@@ -4762,7 +4683,7 @@ https://www.transifex.com/projects/p/dash/</translation>
     </message>
     <message>
         <source>Make the wallet broadcast transactions</source>
-        <translation>Faire transmettre les transactions par le portefeuille</translation>
+        <translation>Diffuser les transactions via le portefeuille</translation>
     </message>
     <message>
         <source>Masternode cache is empty, skipping payments and governance cache...</source>
@@ -4930,7 +4851,7 @@ https://www.transifex.com/projects/p/dash/</translation>
     </message>
     <message>
         <source>no mixing available.</source>
-        <translation>pas de mélangeur disponible.</translation>
+        <translation>pas de mélange disponible.</translation>
     </message>
     <message>
         <source>see debug.log for details.</source>
@@ -5012,10 +4933,6 @@ https://www.transifex.com/projects/p/dash/</translation>
         <source>Set lowest fee rate (in %s/kB) for transactions to be included in block creation. (default: %s)</source>
         <translation>Définir le taux minimal de frais (en %s/Ko) pour les transactions à inclure dans la création de blocs (par défaut : %s)</translation>
     </message>
-    <message>
-        <source>Show N confirmations for a successfully locked transaction (%u-%u, default: %u)</source>
-        <translation>Afficher N confirmations pour une transaction verrouillée avec succès (%u-%u, par défaut : %u)</translation>
-    </message>
     <message>
         <source>This is the transaction fee you may pay when fee estimates are not available.</source>
         <translation>Il s’agit des frais de transaction que vous pourriez payer si aucune estimation de frais n’est proposée.</translation>
@@ -5290,7 +5207,7 @@ https://www.transifex.com/projects/p/dash/</translation>
     </message>
     <message>
         <source>Unknown state: id = %u</source>
-        <translation>État inconnu: id = %u</translation>
+        <translation>État inconnu : id = %u</translation>
     </message>
     <message>
         <source>Username for JSON-RPC connections</source>
diff --git a/src/qt/locale/dash_it.ts b/src/qt/locale/dash_it.ts
index 5bee5e4392e1..0b26b3de7797 100644
--- a/src/qt/locale/dash_it.ts
+++ b/src/qt/locale/dash_it.ts
@@ -794,7 +794,7 @@
         <translation>Passare a "Modalità elenco" per utilizzare questa funzione.</translation>
     </message>
     <message>
-        <source>Non-anonymized input selected. &lt;b&gt;PrivateSend will be disabled.&lt;/b&gt;&lt;br&gt;&lt;br&gt;If you still want to use PrivateSend, please deselect all non-nonymized inputs first and then check PrivateSend checkbox again.</source>
+        <source>Non-anonymized input selected. &lt;b&gt;PrivateSend will be disabled.&lt;/b&gt;&lt;br&gt;&lt;br&gt;If you still want to use PrivateSend, please deselect all non-anonymized inputs first and then check the PrivateSend checkbox again.</source>
         <translation>Selezionato input non anonimo. &lt;b&gt;PrivateSend sarà disabilitato.&lt;/b&gt;&lt;br&gt;&lt;br&gt;Se vuoi ancora utilizzare PrivateSend, deseleziona prima tutti gli input non anonimi e poi controlla nuovamente la checkbox di PrivateSend.</translation>
     </message>
     <message>
@@ -834,73 +834,6 @@
         <translation>n/a</translation>
     </message>
 </context>
-<context>
-    <name>DarksendConfig</name>
-    <message>
-        <source>Configure PrivateSend</source>
-        <translation>Configura il PrivateSend</translation>
-    </message>
-    <message>
-        <source>Basic Privacy</source>
-        <translation>Privacy base</translation>
-    </message>
-    <message>
-        <source>High Privacy</source>
-        <translation>Privacy alta</translation>
-    </message>
-    <message>
-        <source>Maximum Privacy</source>
-        <translation>Privacy massima</translation>
-    </message>
-    <message>
-        <source>Please select a privacy level.</source>
-        <translation>Selezionare il livello di privacy</translation>
-    </message>
-    <message>
-        <source>Use 2 separate masternodes to mix funds up to 1000 DASH</source>
-        <translation>Usa 2 masternode separati  per mixare fino al 1000 DASH</translation>
-    </message>
-    <message>
-        <source>Use 8 separate masternodes to mix funds up to 1000 DASH</source>
-        <translation>Usa 8 masternode separati per mixare fino al 1000 DASH</translation>
-    </message>
-    <message>
-        <source>Use 16 separate masternodes</source>
-        <translation>Usa 16 masternode separati</translation>
-    </message>
-    <message>
-        <source>This option is the quickest and will cost about ~0.025 DASH to anonymize 1000 DASH</source>
-        <translation>Questa opzione è la più veloce e ti costerà ~0.025DASH circa per anonimizzare 1000DASH</translation>
-    </message>
-    <message>
-        <source>This option is moderately fast and will cost about 0.05 DASH to anonymize 1000 DASH</source>
-        <translation>Questa opzione è moderatamente veloce e costerà 0.05DASH circa per anonimizzare 1000DASH</translation>
-    </message>
-    <message>
-        <source>0.1 DASH per 1000 DASH you anonymize.</source>
-        <translation>0.1 DASH ogni 1000 DASH che anonimizzi.</translation>
-    </message>
-    <message>
-        <source>This is the slowest and most secure option. Using maximum anonymity will cost</source>
-        <translation>Questa è l'opzione più lenta ma più sicura . Usare il massimo grado di anonimizzazione costerà</translation>
-    </message>
-    <message>
-        <source>PrivateSend Configuration</source>
-        <translation>Configurazione del PrivateSend</translation>
-    </message>
-    <message>
-        <source>PrivateSend was successfully set to basic (%1 and 2 rounds). You can change this at any time by opening Dash's configuration screen.</source>
-        <translation>PrivateSend è stato impostato correttamente sul basic (%1 e 2 round). Puoi cambiarlo in qualsiasi momento aprendo la schermata di configurazione di Dash.</translation>
-    </message>
-    <message>
-        <source>PrivateSend was successfully set to high (%1 and 8 rounds). You can change this at any time by opening Dash's configuration screen.</source>
-        <translation>PrivateSend è stato impostato correttamente su high (%1 e 8 round). Puoi cambiarlo in qualsiasi momento aprendo la schermata di configurazione di Dash.</translation>
-    </message>
-    <message>
-        <source>PrivateSend was successfully set to maximum (%1 and 16 rounds). You can change this at any time by opening Dash's configuration screen.</source>
-        <translation>PrivateSend è stato impostato correttamente su maximum (%1 e 16 round). Puoi cambiarlo in qualsiasi momento aprendo la schermata di configurazione di Dash.</translation>
-    </message>
-</context>
 <context>
     <name>EditAddressDialog</name>
     <message>
@@ -1038,8 +971,8 @@
         <translation>Informazioni di Private Send</translation>
     </message>
     <message>
-        <source>&lt;h3&gt;PrivateSend Basics&lt;/h3&gt; PrivateSend gives you true financial privacy by obscuring the origins of your funds. All the Dash in your wallet is comprised of different "inputs" which you can think of as separate, discrete coins.&lt;br&gt; PrivateSend uses an innovative process to mix your inputs with the inputs of two other people, without having your coins ever leave your wallet. You retain control of your money at all times.&lt;hr&gt; &lt;b&gt;The PrivateSend process works like this:&lt;/b&gt;&lt;ol type="1"&gt; &lt;li&gt;PrivateSend begins by breaking your transaction inputs down into standard denominations. These denominations are 0.01 DASH, 0.1 DASH, 1 DASH and 10 DASH -- sort of like the paper money you use every day.&lt;/li&gt; &lt;li&gt;Your wallet then sends requests to specially configured software nodes on the network, called "masternodes." These masternodes are informed then that you are interested in mixing a certain denomination. No identifiable information is sent to the masternodes, so they never know "who" you are.&lt;/li&gt; &lt;li&gt;When two other people send similar messages, indicating that they wish to mix the same denomination, a mixing session begins. The masternode mixes up the inputs and instructs all three users' wallets to pay the now-transformed input back to themselves. Your wallet pays that denomination directly to itself, but in a different address (called a change address).&lt;/li&gt; &lt;li&gt;In order to fully obscure your funds, your wallet must repeat this process a number of times with each denomination. Each time the process is completed, it's called a "round." Each round of PrivateSend makes it exponentially more difficult to determine where your funds originated.&lt;/li&gt; &lt;li&gt;This mixing process happens in the background without any intervention on your part. When you wish to make a transaction, your funds will already be anonymized. No additional waiting is required.&lt;/li&gt; &lt;/ol&gt; &lt;hr&gt;&lt;b&gt;IMPORTANT:&lt;/b&gt; Your wallet only contains 1000 of these "change addresses." Every time a mixing event happens, up to 9 of your addresses are used up. This means those 1000 addresses last for about 100 mixing events. When 900 of them are used, your wallet must create more addresses. It can only do this, however, if you have automatic backups enabled.&lt;br&gt; Consequently, users who have backups disabled will also have PrivateSend disabled. &lt;hr&gt;For more info see &lt;a href="https://dashpay.atlassian.net/wiki/display/DOC/PrivateSend"&gt;https://dashpay.atlassian.net/wiki/display/DOC/PrivateSend&lt;/a&gt;         </source>
-        <translation>&lt;h3&gt;Nozioni di base di PrivateSend&lt;/h3&gt; PrivateSend ti offre una vera privacy finanziaria oscurando le origini dei tuoi fondi. Tutti i Dash nel tuo portafoglio sono costituiti da diversi "input" che puoi pensare come monete separate e discrete. &lt;br&gt;PrivateSend utilizza un processo innovativo per mescolare i tuoi input con gli input di due altre persone, senza che le tue monete lascino mai il tuo portafoglio. Si mantiene il controllo del proprio denaro in ogni momento. &lt;hr&gt;&lt;b&gt;Il processo di PrivateSend funziona in questo modo: &lt;/b&gt;&lt;ol type="1"&gt;&lt;li&gt;PrivateSend inizia dividendo gli input della transazioni in denominazioni standard. Queste denominazioni sono 0,01 DASH, 0,1 DASH, 1 DASH e 10 DASH: una specie di carta moneta che utilizzi ogni giorno.&lt;/li&gt;&lt;li&gt; Il tuo portafoglio quindi invia richieste ai nodi software appositamente configurati sulla rete, chiamati "masternode". Questi masternode vengono informati che sei interessato a mescolare una certa denominazione. Nessuna informazione identificabile viene inviata ai masternodes, quindi non sanno mai "chi" tu sia. &lt;/li&gt;&lt;li&gt;Quando altre due persone inviano messaggi simili, indicando che desiderano mescolare la stessa denominazione, inizia una sessione di mixaggio. Il masternode mescola gli input e incarica i portafogli di tutti e tre gli utenti di pagare a loro stessi l'input trasformato. Il tuo portafoglio paga quella denominazione direttamente a se stessa, ma in un indirizzo diverso (chiamato indirizzo di modifica). &lt;/li&gt;&lt;li&gt;Per oscurare completamente i tuoi fondi, il tuo portafoglio deve ripetere questo processo un certo numero di volte con ogni denominazione. Ogni  processo completato, è chiamato "round". Ogni ciclo di PrivateSend rende esponenzialmente più difficile determinare la provenienza dei fondi. &lt;/li&gt;&lt;li&gt;Questo processo di miscelazione avviene in background senza alcun intervento da parte dell'utente. Quando desideri effettuare una transazione, i tuoi fondi saranno già resi anonimi. Non è richiesta alcuna attesa aggiuntiva.&lt;/li&gt;&lt;/ol&gt;&lt;hr&gt;&lt;b&gt; IMPORTANTE: &lt;/b&gt;il tuo portafoglio contiene solo 1000 di questi "indirizzi di modifica". Ogni volta che si verifica un evento di mixaggio, vengono usati fino a 9 dei tuoi indirizzi. Ciò significa che i 1000 indirizzi durano per circa 100 eventi di mixaggio. Quando vengono utilizzati 900 di questi, il tuo portafoglio deve creare altri indirizzi. Può farlo solo se si dispone dei backup automatici abilitati. &lt;br&gt;Di conseguenza, gli utenti che hanno disabilitato i backup avranno anche PrivateSend disabilitato. &lt;hr&gt;Per maggiori informazioni consulta &lt;a href="https://dashpay.atlassian.net/wiki/display/DOC/PrivateSend"&gt;https://dashpay.atlassian.net/wiki/display/DOC/PrivateSend&lt;/a&gt;</translation>
+        <source>&lt;h3&gt;PrivateSend Basics&lt;/h3&gt; PrivateSend gives you true financial privacy by obscuring the origins of your funds. All the Dash in your wallet is comprised of different "inputs" which you can think of as separate, discrete coins.&lt;br&gt; PrivateSend uses an innovative process to mix your inputs with the inputs of two other people, without having your coins ever leave your wallet. You retain control of your money at all times.&lt;hr&gt; &lt;b&gt;The PrivateSend process works like this:&lt;/b&gt;&lt;ol type="1"&gt; &lt;li&gt;PrivateSend begins by breaking your transaction inputs down into standard denominations. These denominations are 0.01 DASH, 0.1 DASH, 1 DASH and 10 DASH -- sort of like the paper money you use every day.&lt;/li&gt; &lt;li&gt;Your wallet then sends requests to specially configured software nodes on the network, called "masternodes." These masternodes are informed then that you are interested in mixing a certain denomination. No identifiable information is sent to the masternodes, so they never know "who" you are.&lt;/li&gt; &lt;li&gt;When two other people send similar messages, indicating that they wish to mix the same denomination, a mixing session begins. The masternode mixes up the inputs and instructs all three users' wallets to pay the now-transformed input back to themselves. Your wallet pays that denomination directly to itself, but in a different address (called a change address).&lt;/li&gt; &lt;li&gt;In order to fully obscure your funds, your wallet must repeat this process a number of times with each denomination. Each time the process is completed, it's called a "round." Each round of PrivateSend makes it exponentially more difficult to determine where your funds originated.&lt;/li&gt; &lt;li&gt;This mixing process happens in the background without any intervention on your part. When you wish to make a transaction, your funds will already be anonymized. No additional waiting is required.&lt;/li&gt; &lt;/ol&gt; &lt;hr&gt;&lt;b&gt;IMPORTANT:&lt;/b&gt; Your wallet only contains 1000 of these "change addresses." Every time a mixing event happens, up to 9 of your addresses are used up. This means those 1000 addresses last for about 100 mixing events. When 900 of them are used, your wallet must create more addresses. It can only do this, however, if you have automatic backups enabled.&lt;br&gt; Consequently, users who have backups disabled will also have PrivateSend disabled. &lt;hr&gt;For more information, see the &lt;a href="https://docs.dash.org/en/latest/wallets/dashcore/privatesend-instantsend.html"&gt;PrivateSend documentation&lt;/a&gt;.         </source>
+        <translation>&lt;h3&gt;Nozioni di base di PrivateSend&lt;/h3&gt; PrivateSend ti offre una vera privacy finanziaria oscurando le origini dei tuoi fondi. Tutti i Dash nel tuo portafoglio sono costituiti da diversi "input" che puoi pensare come monete separate e discrete. &lt;br&gt;PrivateSend utilizza un processo innovativo per mescolare i tuoi input con gli input di due altre persone, senza che le tue monete lascino mai il tuo portafoglio. Si mantiene il controllo del proprio denaro in ogni momento. &lt;hr&gt;&lt;b&gt;Il processo di PrivateSend funziona in questo modo: &lt;/b&gt;&lt;ol type="1"&gt;&lt;li&gt;PrivateSend inizia dividendo gli input della transazioni in denominazioni standard. Queste denominazioni sono 0,01 DASH, 0,1 DASH, 1 DASH e 10 DASH: una specie di carta moneta che utilizzi ogni giorno.&lt;/li&gt;&lt;li&gt; Il tuo portafoglio quindi invia richieste ai nodi software appositamente configurati sulla rete, chiamati "masternode". Questi masternode vengono informati che sei interessato a mescolare una certa denominazione. Nessuna informazione identificabile viene inviata ai masternodes, quindi non sanno mai "chi" tu sia. &lt;/li&gt;&lt;li&gt;Quando altre due persone inviano messaggi simili, indicando che desiderano mescolare la stessa denominazione, inizia una sessione di mixaggio. Il masternode mescola gli input e incarica i portafogli di tutti e tre gli utenti di pagare a loro stessi l'input trasformato. Il tuo portafoglio paga quella denominazione direttamente a se stessa, ma in un indirizzo diverso (chiamato indirizzo di modifica). &lt;/li&gt;&lt;li&gt;Per oscurare completamente i tuoi fondi, il tuo portafoglio deve ripetere questo processo un certo numero di volte con ogni denominazione. Ogni  processo completato, è chiamato "round". Ogni ciclo di PrivateSend rende esponenzialmente più difficile determinare la provenienza dei fondi. &lt;/li&gt;&lt;li&gt;Questo processo di miscelazione avviene in background senza alcun intervento da parte dell'utente. Quando desideri effettuare una transazione, i tuoi fondi saranno già resi anonimi. Non è richiesta alcuna attesa aggiuntiva.&lt;/li&gt;&lt;/ol&gt;&lt;hr&gt;&lt;b&gt; IMPORTANTE: &lt;/b&gt;il tuo portafoglio contiene solo 1000 di questi "indirizzi di modifica". Ogni volta che si verifica un evento di mixaggio, vengono usati fino a 9 dei tuoi indirizzi. Ciò significa che i 1000 indirizzi durano per circa 100 eventi di mixaggio. Quando vengono utilizzati 900 di questi, il tuo portafoglio deve creare altri indirizzi. Può farlo solo se si dispone dei backup automatici abilitati. &lt;br&gt;Di conseguenza, gli utenti che hanno disabilitato i backup avranno anche PrivateSend disabilitato. &lt;hr&gt;Per maggiori informazioni consulta la &lt;a href="https://docs.dash.org/en/latest/wallets/dashcore/privatesend-instantsend.html"&gt;documentazione di PrivateSend&lt;/a&gt;.</translation>
     </message>
 </context>
 <context>
@@ -1831,7 +1764,7 @@ https://www.transifex.com/projects/p/dash/</translation>
     </message>
     <message>
         <source>Note: You can turn this message off in options.</source>
-        <translation>Nota: puoi disattivare questo messaggio nelle opzioni.</translation>
+        <translation>Nota: è possibile disattivare questo messaggio nelle opzioni.</translation>
     </message>
     <message>
         <source>WARNING! Something went wrong on automatic backup</source>
@@ -4480,6 +4413,10 @@ https://www.transifex.com/projects/p/dash/</translation>
         <source>Disable all Dash specific functionality (Masternodes, PrivateSend, InstantSend, Governance) (0-1, default: %u)</source>
         <translation>Disabilitare tutte le funzionalità specifiche di Dash (Masternodes, PrivateSend, InstantSend, Governance) (0-1, default: %u)</translation>
     </message>
+    <message>
+        <source>%s file contains all private keys from this wallet. Do not share it with anyone!</source>
+        <translation>%s il file contiene tutte le chiavi private di questo portafoglio. Non condividerlo con nessuno!</translation>
+    </message>
     <message>
         <source>Discover own IP addresses (default: 1 when listening and no -externalip or -proxy)</source>
         <translation>Scopre i propri indirizzi IP (predefinito: 1 se in ascolto ed -externalip o -proxy non sono specificati)</translation>
@@ -4504,6 +4441,10 @@ https://www.transifex.com/projects/p/dash/</translation>
         <source>Execute command when a wallet InstantSend transaction is successfully locked (%s in cmd is replaced by TxID)</source>
         <translation>Esegui comando quando una transazione InstantSend del portafoglio è bloccata correttamente (%s in cmd è sostituito da TxID)</translation>
     </message>
+    <message>
+        <source>Extra transactions to keep in memory for compact block reconstructions (default: %u)</source>
+        <translation>Transazioni aggiuntive da tenere in memoria per ricostruzioni di blocchi compatti (default: %u)</translation>
+    </message>
     <message>
         <source>Failed to create backup, file already exists! This could happen if you restarted wallet in less than 60 seconds. You can continue if you are ok with this.</source>
         <translation>Impossibile creare il backup, il file esiste già! Questo può accadere quando riavvii il portafoglio in meno di 60 secondi. Se per te va bene puoi continuare.</translation>
@@ -4584,6 +4525,10 @@ https://www.transifex.com/projects/p/dash/</translation>
         <source>Total length of network version string (%i) exceeds maximum length (%i). Reduce the number or size of uacomments.</source>
         <translation>La lunghezza totale della stringa di network version (%i) eccede la lunghezza massima (%i). Ridurre il numero o la dimensione di uacomments.</translation>
     </message>
+    <message>
+        <source>Transaction index can't be disabled in full mode. Either start with -litemode command line switch or enable transaction index.</source>
+        <translation>L'indice di transazione non può essere disabilitato in modalità completa. Iniziare con l'opzione della riga di comando -litemode o abilitare l'indice delle transazioni.</translation>
+    </message>
     <message>
         <source>Tries to keep outbound traffic under the given target (in MiB per 24h), 0 = no limit (default: %d)</source>
         <translation>Cerca di mantenere il traffico in uscita al di sotto della soglia scelta (in MiB ogni 24h), 0 = nessun limite (default: %d)</translation>
@@ -4616,6 +4561,10 @@ https://www.transifex.com/projects/p/dash/</translation>
         <source>Warning: Unknown block versions being mined! It's possible unknown rules are in effect</source>
         <translation>Attenzione: si stanno minando versioni sconocsiute di blocchi! E' possibile che siano attive regole sconosciute</translation>
     </message>
+    <message>
+        <source>You are starting in lite mode, all Dash-specific functionality is disabled.</source>
+        <translation>Stai iniziando in modalità lite, tutte le funzionalità specifiche di Dash sono disabilitate.</translation>
+    </message>
     <message>
         <source>You need to rebuild the database using -reindex to go back to unpruned mode.  This will redownload the entire blockchain</source>
         <translation>Per ritornare alla modalità unpruned sarà necessario ricostruire il database utilizzando l'opzione -reindex. L'intera blockchain sarà riscaricata.</translation>
@@ -4660,6 +4609,14 @@ https://www.transifex.com/projects/p/dash/</translation>
         <source>Enable publish hash block in &lt;address&gt;</source>
         <translation>Abilita pubblicazione hash blocco in &lt;address&gt;</translation>
     </message>
+    <message>
+        <source>Enable publish hash of governance objects (like proposals) in &lt;address&gt;</source>
+        <translation>Abilita l'hash di pubblicazione degli oggetti di governance (come le proposte) in &lt;address&gt;</translation>
+    </message>
+    <message>
+        <source>Enable publish hash of governance votes in &lt;address&gt;</source>
+        <translation>Abilita l'hash di pubblicazione dei voti di governance in &lt;address&gt;</translation>
+    </message>
     <message>
         <source>Enable publish hash transaction (locked via InstantSend) in &lt;address&gt;</source>
         <translation>Abilita la pubblicazione della hash della transazione (bloccata tramite InstantSend) in &lt;address&gt;</translation>
@@ -4700,6 +4657,14 @@ https://www.transifex.com/projects/p/dash/</translation>
         <source>Failed to delete backup, error: %s</source>
         <translation>Impossibile eliminare il backup, errore: %s</translation>
     </message>
+    <message>
+        <source>Failed to load InstantSend data cache from</source>
+        <translation>Impossibile caricare la cache di dati di InstantSend da</translation>
+    </message>
+    <message>
+        <source>Failed to load sporks cache from</source>
+        <translation>Impossibile caricare la cache degli sporks da</translation>
+    </message>
     <message>
         <source>Failed to parse host:port string</source>
         <translation>Impossibile analizzare l'host: port string</translation>
@@ -4720,6 +4685,10 @@ https://www.transifex.com/projects/p/dash/</translation>
         <source>Invalid amount for -fallbackfee=&lt;amount&gt;: '%s'</source>
         <translation>Importo non valido per -fallbackfee=&lt;amount&gt;: '%s'</translation>
     </message>
+    <message>
+        <source>Invalid input count.</source>
+        <translation>Conteggio di input non valido.</translation>
+    </message>
     <message>
         <source>Keep the transaction memory pool below &lt;n&gt; megabytes (default: %u)</source>
         <translation>Mantieni la memory pool delle transazioni al di sotto di &lt;n&gt; megabyte (default: %u)</translation>
@@ -4736,6 +4705,10 @@ https://www.transifex.com/projects/p/dash/</translation>
         <source>Line: %d</source>
         <translation>Riga: %d</translation>
     </message>
+    <message>
+        <source>Loading InstantSend data cache...</source>
+        <translation>Caricamento della cache di dati InstantSend ...</translation>
+    </message>
     <message>
         <source>Loading addresses...</source>
         <translation>Caricamento indirizzi...</translation>
@@ -4748,6 +4721,10 @@ https://www.transifex.com/projects/p/dash/</translation>
         <source>Loading governance cache...</source>
         <translation>Caricamento della cache di governance ...</translation>
     </message>
+    <message>
+        <source>Loading sporks cache...</source>
+        <translation>Caricamento della cache degli sporks ...</translation>
+    </message>
     <message>
         <source>Loading wallet... (%3.2f %%)</source>
         <translation>Caricando portafoglio... (%3.2f %%)</translation>
@@ -4889,6 +4866,10 @@ https://www.transifex.com/projects/p/dash/</translation>
         <source>Transaction must have at least one recipient</source>
         <translation>La transazione deve avere almeno un destinatario</translation>
     </message>
+    <message>
+        <source>Transaction too large</source>
+        <translation>Transazione troppo grande</translation>
+    </message>
     <message>
         <source>Trying to connect...</source>
         <translation>cercando di connettersi ...</translation>
@@ -4909,6 +4890,10 @@ https://www.transifex.com/projects/p/dash/</translation>
         <source>Wallet debugging/testing options:</source>
         <translation>Opzioni di Debug/Test del portafoglio:</translation>
     </message>
+    <message>
+        <source>Wallet is not initialized</source>
+        <translation>Wallet non è stato inizializzato</translation>
+    </message>
     <message>
         <source>Wallet needed to be rewritten: restart %s to complete</source>
         <translation>Il portamonete necessita di essere riscritto: riavviare %s per completare</translation>
@@ -4925,6 +4910,11 @@ https://www.transifex.com/projects/p/dash/</translation>
         <source>Whether to operate in a blocks only mode (default: %u)</source>
         <translation>Imposta se operare in modalità solo blocchi (default: %u)</translation>
     </message>
+    <message>
+        <source>You can not start a masternode in lite mode.</source>
+        <translation>
+Non è possibile avviare un masternode in modalità lite</translation>
+    </message>
     <message>
         <source>ZeroMQ notification options:</source>
         <translation>Opzioni di notifica ZeroMQ</translation>
@@ -5013,10 +5003,6 @@ https://www.transifex.com/projects/p/dash/</translation>
         <source>Set lowest fee rate (in %s/kB) for transactions to be included in block creation. (default: %s)</source>
         <translation>Imposta la tariffa di commissione più bassa (in %s/kB) per transazioni da includere nella creazione del blocco. (default:  %s)</translation>
     </message>
-    <message>
-        <source>Show N confirmations for a successfully locked transaction (%u-%u, default: %u)</source>
-        <translation>Mostra N conferme per una transazione bloccata con successo (%u-%u, default: %u)</translation>
-    </message>
     <message>
         <source>This is the transaction fee you may pay when fee estimates are not available.</source>
         <translation>Questo è il costo di transazione che potresti pagare quando le stime della fee non sono disponibili.</translation>
diff --git a/src/qt/locale/dash_ja.ts b/src/qt/locale/dash_ja.ts
index 1e0d322412a2..375e8e5fee1c 100644
--- a/src/qt/locale/dash_ja.ts
+++ b/src/qt/locale/dash_ja.ts
@@ -1,9 +1,9 @@
-<TS language="ja" version="2.0">
+<TS language="ja" version="2.1">
 <context>
     <name>AddressBookPage</name>
     <message>
         <source>Right-click to edit address or label</source>
-        <translation>右クリックでアドレスまたはラベルを編集します</translation>
+        <translation>右クリックでアドレスまたはラベルを編集</translation>
     </message>
     <message>
         <source>Create a new address</source>
@@ -15,7 +15,7 @@
     </message>
     <message>
         <source>Copy the currently selected address to the system clipboard</source>
-        <translation>現在選択されているアドレスをシステムのクリップボードにコピーする</translation>
+        <translation>現在選択中のアドレスをクリップボードにコピー</translation>
     </message>
     <message>
         <source>&amp;Copy</source>
@@ -23,7 +23,7 @@
     </message>
     <message>
         <source>Delete the currently selected address from the list</source>
-        <translation>選択されたアドレスを一覧から削除する</translation>
+        <translation>選択中のアドレスを一覧から削除</translation>
     </message>
     <message>
         <source>&amp;Delete</source>
@@ -31,7 +31,7 @@
     </message>
     <message>
         <source>Export the data in the current tab to a file</source>
-        <translation>ファイルに現在のタブのデータをエクスポート</translation>
+        <translation>ファイルに現在のタブにあるデータをエクスポート</translation>
     </message>
     <message>
         <source>&amp;Export</source>
@@ -43,23 +43,31 @@
     </message>
     <message>
         <source>Choose the address to send coins to</source>
-        <translation>送信先のアドレスを選択</translation>
+        <translation>送金先のアドレスを選択</translation>
     </message>
     <message>
         <source>Choose the address to receive coins with</source>
-        <translation>支払いを受け取るアドレスを指定する</translation>
+        <translation>受取先のアドレスを選択</translation>
     </message>
     <message>
         <source>C&amp;hoose</source>
-        <translation>選択(&amp;C)</translation>
+        <translation>選択(&amp;H)</translation>
     </message>
     <message>
         <source>Sending addresses</source>
-        <translation>アドレス送信中</translation>
+        <translation>送金アドレス</translation>
     </message>
     <message>
         <source>Receiving addresses</source>
-        <translation>アドレス受信中</translation>
+        <translation>受取アドレス</translation>
+    </message>
+    <message>
+        <source>These are your Dash addresses for sending payments. Always check the amount and the receiving address before sending coins.</source>
+        <translation>これらは送金するためのあなたの Dash アドレスです。送金する前に常に金額と受取アドレスを確認してください。</translation>
+    </message>
+    <message>
+        <source>These are your Dash addresses for receiving payments. It is recommended to use a new receiving address for each transaction.</source>
+        <translation>これらは送金を受取用のあなたのDashアドレスです。トランザクションごとに新しい受け取り用アドレスの作成を推奨します。</translation>
     </message>
     <message>
         <source>&amp;Copy Address</source>
@@ -75,7 +83,7 @@
     </message>
     <message>
         <source>Export Address List</source>
-        <translation>アドレス帳をエクスポート</translation>
+        <translation>アドレスのリストをエクスポート</translation>
     </message>
     <message>
         <source>Comma separated file (*.csv)</source>
@@ -87,7 +95,7 @@
     </message>
     <message>
         <source>There was an error trying to save the address list to %1. Please try again.</source>
-        <translation>トランザクション履歴を %1 へ保存する際にエラーが発生しました。再試行してください。</translation>
+        <translation>アドレスのリストを %1 へ保存する際にエラーが発生しました。再試行してください。</translation>
     </message>
 </context>
 <context>
@@ -109,7 +117,7 @@
     <name>AskPassphraseDialog</name>
     <message>
         <source>Passphrase Dialog</source>
-        <translation>パスフレーズ ダイアログ</translation>
+        <translation>パスフレーズのダイアログ</translation>
     </message>
     <message>
         <source>Enter passphrase</source>
@@ -121,39 +129,51 @@
     </message>
     <message>
         <source>Repeat new passphrase</source>
-        <translation>新しいパスフレーズをもう一度</translation>
+        <translation>新しいパスフレーズを再入力</translation>
     </message>
     <message>
         <source>Enter the new passphrase to the wallet.&lt;br/&gt;Please use a passphrase of &lt;b&gt;ten or more random characters&lt;/b&gt;, or &lt;b&gt;eight or more words&lt;/b&gt;.</source>
-        <translation>ウォレットの新しいパスフレーズを入力してください。&lt;br/&gt;&lt;b&gt;10文字以上のランダムな文字&lt;/b&gt;で構成されたものか、&lt;b&gt;8単語以上の単語&lt;/b&gt;で構成されたパスフレーズを使用してください。</translation>
+        <translation>ウォレット用の新しいパスフレーズを入力してください。&lt;br/&gt;&lt;b&gt;10文字以上のランダムな文字&lt;/b&gt;か、または&lt;b&gt;8単語以上&lt;/b&gt;で構成されたパスフレーズを使用してください。</translation>
     </message>
     <message>
         <source>Encrypt wallet</source>
-        <translation>ウォレットを暗号化する</translation>
+        <translation>ウォレットを暗号化</translation>
     </message>
     <message>
         <source>This operation needs your wallet passphrase to unlock the wallet.</source>
-        <translation>この操作はウォレットをアンロックするためにパスフレーズが必要です。</translation>
+        <translation>この操作にはウォレットをアンロックするためのパスフレーズが必要です。</translation>
+    </message>
+    <message>
+        <source>Unlock wallet for mixing only</source>
+        <translation>ミキシングのためだけにウォレットをアンロック</translation>
     </message>
     <message>
         <source>Unlock wallet</source>
-        <translation>ウォレットをアンロックする</translation>
+        <translation>ウォレットをアンロック</translation>
     </message>
     <message>
         <source>This operation needs your wallet passphrase to decrypt the wallet.</source>
-        <translation>この操作はウォレットの暗号化解除のためにパスフレーズが必要です。</translation>
+        <translation>この操作にはウォレットの暗号化解除のためのパスフレーズが必要です。</translation>
     </message>
     <message>
         <source>Decrypt wallet</source>
-        <translation>ウォレットの暗号化を解除する</translation>
+        <translation>ウォレットの暗号化を解除</translation>
     </message>
     <message>
         <source>Change passphrase</source>
         <translation>パスフレーズの変更</translation>
     </message>
+    <message>
+        <source>Enter the old passphrase and new passphrase to the wallet.</source>
+        <translation>ウォレットの古いパスフレーズと新しいパスフレーズを入力してください。</translation>
+    </message>
     <message>
         <source>Confirm wallet encryption</source>
-        <translation>ウォレットの暗号化を確認する</translation>
+        <translation>ウォレットの暗号化を確認</translation>
+    </message>
+    <message>
+        <source>Warning: If you encrypt your wallet and lose your passphrase, you will &lt;b&gt;LOSE ALL OF YOUR DASH&lt;/b&gt;!</source>
+        <translation>警告: ウォレットを暗号化しパスフレーズを紛失した場合、あなたは &lt;b&gt;すべてのDash&lt;/b&gt;を失います!</translation>
     </message>
     <message>
         <source>Are you sure you wish to encrypt your wallet?</source>
@@ -163,9 +183,17 @@
         <source>Wallet encrypted</source>
         <translation>ウォレットは暗号化されました</translation>
     </message>
+    <message>
+        <source>%1 will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your funds from being stolen by malware infecting your computer.</source>
+        <translation>%1 は暗号化プロセスを終了するために閉じます。ウォレットの暗号化だけでは充分ではなく、使用しているコンピューターがマルウェアに感染して盗難される可能性があります。 </translation>
+    </message>
+    <message>
+        <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. Previous backups of the unencrypted wallet file contain the same HD seed and still have full access to all your funds just like the new, encrypted wallet.</source>
+        <translation>重要： 過去のウォレットファイルのバックアップは、暗号化された新しいウォレットファイルに取り替える必要があります。暗号化されていないウォレットファイルの過去のバックアップは同じHDウォレットのシードを含むので、新しい暗号化ウォレットと同様にすべての資産にアクセスできます。</translation>
+    </message>
     <message>
         <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</source>
-        <translation>重要： 過去のウォレット ファイルのバックアップは、暗号化された新しいウォレット ファイルに取り替える必要があります。セキュリティ上の理由により、暗号化された新しいウォレットを使い始めると、暗号化されていないウォレット ファイルのバックアップはすぐに使えなくなります。</translation>
+        <translation>重要： 過去のウォレットファイルのバックアップは、暗号化された新しいウォレットファイルに取り替える必要があります。セキュリティ上の理由により、暗号化された新しいウォレットを使い始めると、暗号化されていないウォレットファイルのバックアップはすぐに使えなくなります。</translation>
     </message>
     <message>
         <source>Wallet encryption failed</source>
@@ -173,35 +201,54 @@
     </message>
     <message>
         <source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source>
-        <translation>内部エラーによりウォレットの暗号化が失敗しました。ウォレットは暗号化されませんでした。</translation>
+        <translation>内部エラーによりウォレットの暗号化が失敗しました。ウォレットは暗号化されていません。</translation>
     </message>
     <message>
         <source>The supplied passphrases do not match.</source>
-        <translation>パスフレーズが同じではありません。</translation>
+        <translation>入力したパスフレーズが正しくありません。</translation>
     </message>
     <message>
         <source>Wallet unlock failed</source>
-        <translation>ウォレットのアンロックに失敗しました</translation>
+        <translation>ウォレットのアンロックに失敗しました。</translation>
     </message>
     <message>
         <source>The passphrase entered for the wallet decryption was incorrect.</source>
-        <translation>ウォレットの暗号化解除のパスフレーズが正しくありません。</translation>
+        <translation>入力されたウォレットの暗号化解除のパスフレーズが正しくありません。</translation>
     </message>
     <message>
         <source>Wallet decryption failed</source>
-        <translation>ウォレットの暗号化解除に失敗しました</translation>
+        <translation>ウォレットの暗号化解除に失敗しました。</translation>
     </message>
     <message>
         <source>Wallet passphrase was successfully changed.</source>
-        <translation>ウォレットのパスフレーズの変更が成功しました。</translation>
+        <translation>ウォレットのパスフレーズが変更されました。</translation>
     </message>
     <message>
         <source>Warning: The Caps Lock key is on!</source>
-        <translation>警告： キャプスロック・キーがオンになっています!</translation>
+        <translation>警告：Caps Lockキーがオンになっています!</translation>
+    </message>
+</context>
+<context>
+    <name>BanTableModel</name>
+    <message>
+        <source>IP/Netmask</source>
+        <translation>IPアドレス/ネットマスク</translation>
+    </message>
+    <message>
+        <source>Banned Until</source>
+        <translation>以下の時間までbanする:</translation>
     </message>
 </context>
 <context>
     <name>BitcoinGUI</name>
+    <message>
+        <source>A fatal error occurred. Dash Core can no longer continue safely and will quit.</source>
+        <translation>重大なエラーが発生しました。 Dash Coreは安全に続行できなくなり終了します。</translation>
+    </message>
+    <message>
+        <source>Dash Core</source>
+        <translation>Dash Core</translation>
+    </message>
     <message>
         <source>Wallet</source>
         <translation>ウォレット</translation>
@@ -216,51 +263,79 @@
     </message>
     <message>
         <source>Show general overview of wallet</source>
-        <translation>ウォレットの概要を見る</translation>
+        <translation>ウォレットの概要を表示</translation>
     </message>
     <message>
         <source>&amp;Send</source>
-        <translation>送る (&amp;S)</translation>
+        <translation>送金 (&amp;S)</translation>
+    </message>
+    <message>
+        <source>Send coins to a Dash address</source>
+        <translation>Dash アドレスに送金</translation>
     </message>
     <message>
         <source>&amp;Receive</source>
-        <translation>受信 (&amp;R)</translation>
+        <translation>受取 (&amp;R)</translation>
+    </message>
+    <message>
+        <source>Request payments (generates QR codes and dash: URIs)</source>
+        <translation>送金を要求 (QRコードとdash:URIを生成)</translation>
     </message>
     <message>
         <source>&amp;Transactions</source>
-        <translation>取引(&amp;T)</translation>
+        <translation>トランザクション(&amp;T)</translation>
     </message>
     <message>
         <source>Browse transaction history</source>
-        <translation>取引履歴を閲覧</translation>
+        <translation>トランザクション履歴を閲覧</translation>
+    </message>
+    <message>
+        <source>&amp;Masternodes</source>
+        <translation>マスターノード(&amp;M)</translation>
+    </message>
+    <message>
+        <source>Browse masternodes</source>
+        <translation>マスターノードを閲覧</translation>
     </message>
     <message>
         <source>E&amp;xit</source>
-        <translation>終了(&amp;E)</translation>
+        <translation>終了(&amp;X)</translation>
     </message>
     <message>
         <source>Quit application</source>
         <translation>アプリケーションを終了</translation>
     </message>
+    <message>
+        <source>Show information about Dash Core</source>
+        <translation>Dash Coreについての情報を表示</translation>
+    </message>
     <message>
         <source>About &amp;Qt</source>
-        <translation>Qt について(&amp;Q)</translation>
+        <translation>Qtについて(&amp;Q)</translation>
     </message>
     <message>
         <source>Show information about Qt</source>
-        <translation>Qt の情報を表示</translation>
+        <translation>Qt についての情報を表示</translation>
     </message>
     <message>
         <source>&amp;Options...</source>
         <translation>オプション… (&amp;O)</translation>
     </message>
+    <message>
+        <source>&amp;About %1</source>
+        <translation>%1 について (&amp;A)</translation>
+    </message>
+    <message>
+        <source>Modify configuration options for %1</source>
+        <translation>%1 の設定を変更</translation>
+    </message>
     <message>
         <source>&amp;Show / Hide</source>
-        <translation>見る/隠す (&amp;S)</translation>
+        <translation>表示/非表示 (&amp;S)</translation>
     </message>
     <message>
         <source>Show or hide the main Window</source>
-        <translation>メイン ウインドウを表示または非表示</translation>
+        <translation>メインウインドウを表示または非表示</translation>
     </message>
     <message>
         <source>&amp;Encrypt Wallet...</source>
@@ -268,7 +343,7 @@
     </message>
     <message>
         <source>Encrypt the private keys that belong to your wallet</source>
-        <translation>あなたのウォレットの秘密鍵を暗号化します</translation>
+        <translation>あなたのウォレットの秘密鍵を暗号化</translation>
     </message>
     <message>
         <source>&amp;Backup Wallet...</source>
@@ -284,48 +359,144 @@
     </message>
     <message>
         <source>Change the passphrase used for wallet encryption</source>
-        <translation>ウォレット暗号化用パスフレーズの変更</translation>
+        <translation>ウォレット暗号化のためのパスフレーズを変更</translation>
+    </message>
+    <message>
+        <source>&amp;Unlock Wallet...</source>
+        <translation>ウォレットをアンロック...(&amp;U)</translation>
     </message>
     <message>
         <source>Unlock wallet</source>
-        <translation>ウォレットをアンロックする</translation>
+        <translation>ウォレットをアンロック</translation>
+    </message>
+    <message>
+        <source>&amp;Lock Wallet</source>
+        <translation>ウォレットをロック(&amp;L)</translation>
     </message>
     <message>
         <source>Sign &amp;message...</source>
-        <translation>メッセージの署名… (&amp;m)</translation>
+        <translation>メッセージの署名… (&amp;M)</translation>
+    </message>
+    <message>
+        <source>Sign messages with your Dash addresses to prove you own them</source>
+        <translation>あなたがDash アドレスを所有していることを証明するために、あなたのDashアドレスでメッセージに署名してください。</translation>
     </message>
     <message>
         <source>&amp;Verify message...</source>
         <translation>メッセージの検証… (&amp;V)</translation>
     </message>
+    <message>
+        <source>Verify messages to ensure they were signed with specified Dash addresses</source>
+        <translation>指定されたDashアドレスで署名されたことを確認するためにメッセージを検証してください。</translation>
+    </message>
     <message>
         <source>&amp;Information</source>
         <translation>情報 (&amp;I)</translation>
     </message>
+    <message>
+        <source>Show diagnostic information</source>
+        <translation>診断情報を表示</translation>
+    </message>
+    <message>
+        <source>&amp;Debug console</source>
+        <translation>デバッグコンソール(&amp;D)</translation>
+    </message>
+    <message>
+        <source>Open debugging console</source>
+        <translation>デバッグコンソールを開く</translation>
+    </message>
+    <message>
+        <source>&amp;Network Monitor</source>
+        <translation>ネットワークモニタ(&amp;N)</translation>
+    </message>
+    <message>
+        <source>Show network monitor</source>
+        <translation>ネットワークモニタを表示</translation>
+    </message>
+    <message>
+        <source>&amp;Peers list</source>
+        <translation>ネットワークのピアのリスト(&amp;P)</translation>
+    </message>
+    <message>
+        <source>Show peers info</source>
+        <translation>接続しているピアの情報を表示</translation>
+    </message>
+    <message>
+        <source>Wallet &amp;Repair</source>
+        <translation>ウォレットの修復(&amp;R)</translation>
+    </message>
+    <message>
+        <source>Show wallet repair options</source>
+        <translation>ウォレットの修復オプションを表示</translation>
+    </message>
+    <message>
+        <source>Open Wallet &amp;Configuration File</source>
+        <translation>ウォレット設定ファイルを開く(&amp;C)</translation>
+    </message>
+    <message>
+        <source>Open configuration file</source>
+        <translation>設定ファイルを開く</translation>
+    </message>
+    <message>
+        <source>Open &amp;Masternode Configuration File</source>
+        <translation>マスターノード設定ファイルを開く(&amp;M)</translation>
+    </message>
+    <message>
+        <source>Open Masternode configuration file</source>
+        <translation>マスターノード設定ファイルを開く</translation>
+    </message>
+    <message>
+        <source>Show Automatic &amp;Backups</source>
+        <translation>自動バックアップを表示(&amp;B)</translation>
+    </message>
+    <message>
+        <source>Show automatically created wallet backups</source>
+        <translation>自動で生成されたウォレットのバックアップを表示</translation>
+    </message>
     <message>
         <source>&amp;Sending addresses...</source>
-        <translation>送金先アドレス一覧… (&amp;S)</translation>
+        <translation>送金先アドレス… (&amp;S)</translation>
     </message>
     <message>
         <source>Show the list of used sending addresses and labels</source>
-        <translation>使用済みの送金用アドレスとラベルの一覧を表示する</translation>
+        <translation>過去に使用した送金先アドレスとラベルの一覧を表示</translation>
     </message>
     <message>
         <source>&amp;Receiving addresses...</source>
-        <translation>受け取り用アドレス一覧… (&amp;R)</translation>
+        <translation>受取用アドレス… (&amp;R)</translation>
     </message>
     <message>
         <source>Show the list of used receiving addresses and labels</source>
-        <translation>支払いを受け取るアドレスとラベルのリストを表示する</translation>
+        <translation>過去に使用した受取先アドレスとラベルの一覧を表示</translation>
     </message>
     <message>
         <source>Open &amp;URI...</source>
-        <translation>URI を開く… (&amp;U)</translation>
+        <translation>URIを開く… (&amp;U)</translation>
+    </message>
+    <message>
+        <source>Open a dash: URI or payment request</source>
+        <translation>dash: URIまたは送金リクエストを開く</translation>
     </message>
     <message>
         <source>&amp;Command-line options</source>
         <translation>コマンドラインオプション (&amp;C)</translation>
     </message>
+    <message>
+        <source>Show the %1 help message to get a list with possible Dash command-line options</source>
+        <translation>有効なDashのコマンドラインオプションのリストを見るために %1 のヘルプメッセージを表示</translation>
+    </message>
+    <message>
+        <source>%1 client</source>
+        <translation>%1 クライアント</translation>
+    </message>
+    <message>
+        <source>&amp;PrivateSend information</source>
+        <translation>プライベートセンドの情報(&amp;P)</translation>
+    </message>
+    <message>
+        <source>Show the PrivateSend basic information</source>
+        <translation>プライベートセンドの基本的な情報を表示</translation>
+    </message>
     <message>
         <source>&amp;File</source>
         <translation>ファイル(&amp;F)</translation>
@@ -334,6 +505,10 @@
         <source>&amp;Settings</source>
         <translation>設定(&amp;S)</translation>
     </message>
+    <message>
+        <source>&amp;Tools</source>
+        <translation>ツール(&amp;T)</translation>
+    </message>
     <message>
         <source>&amp;Help</source>
         <translation>ヘルプ(&amp;H)</translation>
@@ -342,45 +517,41 @@
         <source>Tabs toolbar</source>
         <translation>タブツールバー</translation>
     </message>
-    <message>
-        <source>Synchronizing with network...</source>
-        <translation>ネットワークに同期中…</translation>
+    <message numerus="yes">
+        <source>%n active connection(s) to Dash network</source>
+        <translation><numerusform>%n アクティブコネクション</numerusform></translation>
     </message>
     <message>
-        <source>Importing blocks from disk...</source>
-        <translation>ディスクからブロックをインポートしています…</translation>
+        <source>Network activity disabled</source>
+        <translation>ネットワークアクティビティは無効化されました</translation>
     </message>
     <message>
-        <source>Reindexing blocks on disk...</source>
-        <translation>ディスク上のブロックのインデックスを再作成中…</translation>
+        <source>Syncing Headers (%1%)...</source>
+        <translation>ヘッダーを同期しています (%1%)...</translation>
     </message>
     <message>
-        <source>No block source available...</source>
-        <translation>利用可能なブロックがありません…</translation>
+        <source>Synchronizing with network...</source>
+        <translation>ネットワークに同期中…</translation>
     </message>
     <message>
-        <source>Up to date</source>
-        <translation>バージョンは最新です</translation>
-    </message>
-    <message numerus="yes">
-        <source>%n hour(s)</source>
-        <translation><numerusform>%n 時間</numerusform></translation>
+        <source>Indexing blocks on disk...</source>
+        <translation>ディスク上のブロックのインデックスを作成中...</translation>
     </message>
-    <message numerus="yes">
-        <source>%n day(s)</source>
-        <translation><numerusform>%n 日</numerusform></translation>
+    <message>
+        <source>Processing blocks on disk...</source>
+        <translation>ディスク上のブロックを処理中...</translation>
     </message>
-    <message numerus="yes">
-        <source>%n week(s)</source>
-        <translation><numerusform>%n 週間</numerusform></translation>
+    <message>
+        <source>Reindexing blocks on disk...</source>
+        <translation>ディスク上のブロックのインデックスを再作成中…</translation>
     </message>
     <message>
-        <source>%1 and %2</source>
-        <translation>%1 と %2</translation>
+        <source>Connecting to peers...</source>
+        <translation>ピアに接続中...</translation>
     </message>
     <message numerus="yes">
-        <source>%n year(s)</source>
-        <translation><numerusform>%n 年</numerusform></translation>
+        <source>Processed %n block(s) of transaction history.</source>
+        <translation><numerusform>%n ブロックのトランザクション履歴を処理</numerusform></translation>
     </message>
     <message>
         <source>%1 behind</source>
@@ -392,11 +563,19 @@
     </message>
     <message>
         <source>Last received block was generated %1 ago.</source>
-        <translation>最後に受信されたブロックは %1 前に生成されました。</translation>
+        <translation>最後に受信したブロックは %1 前に生成されました。</translation>
     </message>
     <message>
         <source>Transactions after this will not yet be visible.</source>
-        <translation>この後の取引はまだ表示されません。</translation>
+        <translation>この後のトランザクションはまだ表示されません。</translation>
+    </message>
+    <message>
+        <source>Up to date</source>
+        <translation>バージョンは最新です</translation>
+    </message>
+    <message>
+        <source>Synchronizing additional data: %p%</source>
+        <translation>追加データを同期中: %p%</translation>
     </message>
     <message>
         <source>Error</source>
@@ -410,25 +589,71 @@
         <source>Information</source>
         <translation>情報</translation>
     </message>
+    <message>
+        <source>Date: %1
+</source>
+        <translation>日付: %1
+</translation>
+    </message>
+    <message>
+        <source>Amount: %1
+</source>
+        <translation>金額: %1
+</translation>
+    </message>
+    <message>
+        <source>Type: %1
+</source>
+        <translation>タイプ: %1
+</translation>
+    </message>
+    <message>
+        <source>Label: %1
+</source>
+        <translation>ラベル: %1
+</translation>
+    </message>
+    <message>
+        <source>Address: %1
+</source>
+        <translation>アドレス: %1
+</translation>
+    </message>
     <message>
         <source>Sent transaction</source>
-        <translation>送金取引</translation>
+        <translation>送金トランザクション</translation>
     </message>
     <message>
         <source>Incoming transaction</source>
-        <translation>着金取引</translation>
+        <translation>入金トランザクション</translation>
+    </message>
+    <message>
+        <source>HD key generation is &lt;b&gt;enabled&lt;/b&gt;</source>
+        <translation>HDウォレット鍵生成は&lt;b&gt;有効&lt;/b&gt;です。</translation>
+    </message>
+    <message>
+        <source>HD key generation is &lt;b&gt;disabled&lt;/b&gt;</source>
+        <translation>HDウォレット鍵生成は&lt;b&gt;無効&lt;/b&gt;です。</translation>
     </message>
     <message>
         <source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;unlocked&lt;/b&gt;</source>
-        <translation>ウォレットは&lt;b&gt;暗号化されて、アンロックされています&lt;/b&gt;</translation>
+        <translation>ウォレットは &lt;b&gt;暗号化&lt;/b&gt;され、現在&lt;b&gt;アンロック&lt;/b&gt;されています。</translation>
+    </message>
+    <message>
+        <source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;unlocked&lt;/b&gt; for mixing only</source>
+        <translation>ウォレットは &lt;b&gt;暗号化&lt;/b&gt;され、現在ミキシングのために&lt;b&gt;アンロック&lt;/b&gt;されています。</translation>
     </message>
     <message>
         <source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;locked&lt;/b&gt;</source>
-        <translation>ウォレットは&lt;b&gt;暗号化されて、ロックされています&lt;/b&gt;</translation>
+        <translation>ウォレットは&lt;b&gt;暗号化&lt;/b&gt;され、現在 &lt;b&gt;ロック&lt;/b&gt;されています。</translation>
     </message>
 </context>
 <context>
     <name>ClientModel</name>
+    <message>
+        <source>Total: %1 (PS compatible: %2 / Enabled: %3)</source>
+        <translation>合計: %1 (PS 互換: %2 / 有効: %3)</translation>
+    </message>
     <message>
         <source>Network Alert</source>
         <translation>ネットワーク警告</translation>
@@ -448,10 +673,6 @@
         <source>Amount:</source>
         <translation>総額：</translation>
     </message>
-    <message>
-        <source>Priority:</source>
-        <translation>優先度：</translation>
-    </message>
     <message>
         <source>Fee:</source>
         <translation>手数料：</translation>
@@ -470,12 +691,16 @@
     </message>
     <message>
         <source>Change:</source>
-        <translation>釣り銭：</translation>
+        <translation>チェンジアドレス：</translation>
     </message>
     <message>
         <source>(un)select all</source>
         <translation>すべて選択/選択解除</translation>
     </message>
+    <message>
+        <source>toggle lock state</source>
+        <translation>トグルロック状態</translation>
+    </message>
     <message>
         <source>Tree mode</source>
         <translation>ツリーモード</translation>
@@ -484,9 +709,13 @@
         <source>List mode</source>
         <translation>リストモード</translation>
     </message>
+    <message>
+        <source>(1 locked)</source>
+        <translation>(1 ロック中)</translation>
+    </message>
     <message>
         <source>Amount</source>
-        <translation>総額</translation>
+        <translation>金額</translation>
     </message>
     <message>
         <source>Received with label</source>
@@ -496,6 +725,10 @@
         <source>Received with address</source>
         <translation>アドレスに対する入金一覧</translation>
     </message>
+    <message>
+        <source>PS Rounds</source>
+        <translation>PSラウンド</translation>
+    </message>
     <message>
         <source>Date</source>
         <translation>日付</translation>
@@ -508,21 +741,17 @@
         <source>Confirmed</source>
         <translation>検証済み</translation>
     </message>
-    <message>
-        <source>Priority</source>
-        <translation>優先度</translation>
-    </message>
     <message>
         <source>Copy address</source>
-        <translation>アドレスをコピーする</translation>
+        <translation>アドレスをコピー</translation>
     </message>
     <message>
         <source>Copy label</source>
-        <translation>ラベルをコピーする</translation>
+        <translation>ラベルをコピー</translation>
     </message>
     <message>
         <source>Copy amount</source>
-        <translation>総額のコピー</translation>
+        <translation>金額をコピー</translation>
     </message>
     <message>
         <source>Copy transaction ID</source>
@@ -530,83 +759,47 @@
     </message>
     <message>
         <source>Lock unspent</source>
-        <translation>未使用トランザクションをロックする</translation>
+        <translation>未送金トランザクションをロック</translation>
     </message>
     <message>
         <source>Unlock unspent</source>
-        <translation>未使用トランザクションをアンロックする</translation>
+        <translation>未送金トランザクションをアンロック</translation>
     </message>
     <message>
         <source>Copy quantity</source>
-        <translation>数量をコピーする</translation>
+        <translation>数量をコピー</translation>
     </message>
     <message>
         <source>Copy fee</source>
-        <translation>手数料をコピーする</translation>
+        <translation>手数料をコピー</translation>
     </message>
     <message>
         <source>Copy after fee</source>
-        <translation>手数料差引後の値をコピーする</translation>
+        <translation>手数料差引後の金額をコピー</translation>
     </message>
     <message>
         <source>Copy bytes</source>
-        <translation>バイト数をコピーする</translation>
-    </message>
-    <message>
-        <source>Copy priority</source>
-        <translation>優先度をコピーする</translation>
+        <translation>バイト数をコピー</translation>
     </message>
     <message>
         <source>Copy dust</source>
-        <translation>ダストをコピーする</translation>
+        <translation>ダストをコピー</translation>
     </message>
     <message>
         <source>Copy change</source>
-        <translation>釣り銭をコピー</translation>
+        <translation>チェンジアドレスをコピー</translation>
     </message>
     <message>
-        <source>highest</source>
-        <translation>最高</translation>
+        <source>Please switch to "List mode" to use this function.</source>
+        <translation>この機能を使うにはリストモードにスイッチしてください。</translation>
     </message>
     <message>
-        <source>higher</source>
-        <translation>非常に高</translation>
-    </message>
-    <message>
-        <source>high</source>
-        <translation>高</translation>
-    </message>
-    <message>
-        <source>medium-high</source>
-        <translation>中〜高</translation>
-    </message>
-    <message>
-        <source>medium</source>
-        <translation>中</translation>
-    </message>
-    <message>
-        <source>low-medium</source>
-        <translation>低〜中</translation>
-    </message>
-    <message>
-        <source>low</source>
-        <translation>低</translation>
-    </message>
-    <message>
-        <source>lower</source>
-        <translation>非常に低</translation>
-    </message>
-    <message>
-        <source>lowest</source>
-        <translation>最低</translation>
+        <source>Non-anonymized input selected. &lt;b&gt;PrivateSend will be disabled.&lt;/b&gt;&lt;br&gt;&lt;br&gt;If you still want to use PrivateSend, please deselect all non-anonymized inputs first and then check the PrivateSend checkbox again.</source>
+        <translation>匿名化されてないインプットが選択されました。 &lt;b&gt;プライベートセンドは無効になります。&lt;/b&gt;&lt;br&gt;&lt;br&gt;プライベートセンドを使用したい場合は、すべての匿名化されてないインプットの選択を解除して、プライベートセンドのチェックボックスを再びチェックしてください。</translation>
     </message>
     <message>
         <source>(%1 locked)</source>
-        <translation>(%1 がロック済み)</translation>
-    </message>
-    <message>
-        <source>none</source>
-        <translation>なし</translation>
+        <translation>(%1 がロック中)</translation>
     </message>
     <message>
         <source>yes</source>
@@ -617,16 +810,12 @@
         <translation>いいえ</translation>
     </message>
     <message>
-        <source>This means a fee of at least %1 per kB is required.</source>
-        <translation>これは少なくとも1kBあたり %1 の手数料が必要であることを意味します。</translation>
-    </message>
-    <message>
-        <source>Can vary +/- 1 byte per input.</source>
-        <translation>ひとつの入力につき1バイト程度ずれることがあります。</translation>
+        <source>This label turns red if any recipient receives an amount smaller than the current dust threshold.</source>
+        <translation>受取額が現在のダスト閾値を下回る場合にはこのラベルは赤くなります。</translation>
     </message>
     <message>
-        <source>Transactions with higher priority are more likely to get included into a block.</source>
-        <translation>より高い優先度を持つトランザクションの方がブロックに取り込まれやすくなります。</translation>
+        <source>Can vary +/- %1 duff(s) per input.</source>
+        <translation>インプットごとに +/- %1 duff(s) が変更可能 </translation>
     </message>
     <message>
         <source>(no label)</source>
@@ -634,16 +823,17 @@
     </message>
     <message>
         <source>change from %1 (%2)</source>
-        <translation>%1 (%2) からのおつり</translation>
+        <translation>%1 (%2) からの変更</translation>
     </message>
     <message>
         <source>(change)</source>
-        <translation>(おつり)</translation>
+        <translation>(チェンジ)</translation>
+    </message>
+    <message>
+        <source>n/a</source>
+        <translation>n/a</translation>
     </message>
 </context>
-<context>
-    <name>DarksendConfig</name>
-    </context>
 <context>
     <name>EditAddressDialog</name>
     <message>
@@ -656,31 +846,35 @@
     </message>
     <message>
         <source>The label associated with this address list entry</source>
-        <translation>このアドレス帳項目に結びつけられているラベル</translation>
+        <translation>このアドレスに関連しているラベル</translation>
     </message>
     <message>
         <source>&amp;Address</source>
-        <translation>アドレス帳 (&amp;A)</translation>
+        <translation>アドレス (&amp;A)</translation>
     </message>
     <message>
         <source>The address associated with this address list entry. This can only be modified for sending addresses.</source>
-        <translation>このアドレス帳項目に結びつけられているアドレス。この項目は送金用アドレスの場合のみ編集することができます。</translation>
+        <translation>このアドレスに関連しているアドレス。これは送金アドレス用にのみ変更できます。</translation>
     </message>
     <message>
         <source>New receiving address</source>
-        <translation>新しい受信アドレス</translation>
+        <translation>新しい入金アドレス</translation>
     </message>
     <message>
         <source>New sending address</source>
-        <translation>新しい送信アドレス</translation>
+        <translation>新しい送金アドレス</translation>
     </message>
     <message>
         <source>Edit receiving address</source>
-        <translation>受信アドレスを編集</translation>
+        <translation>入金アドレスを編集</translation>
     </message>
     <message>
         <source>Edit sending address</source>
-        <translation>送信アドレスを編集</translation>
+        <translation>送金アドレスを編集</translation>
+    </message>
+    <message>
+        <source>The entered address "%1" is not a valid Dash address.</source>
+        <translation>入力されたアドレス "%1" は有効なDashアドレスではありません。</translation>
     </message>
     <message>
         <source>The entered address "%1" is already in the address book.</source>
@@ -703,19 +897,19 @@
     </message>
     <message>
         <source>name</source>
-        <translation>name</translation>
+        <translation>名前</translation>
     </message>
     <message>
         <source>Directory already exists. Add %1 if you intend to create a new directory here.</source>
-        <translation>ディレクトリがもうあります。 新しいのディレクトリを作るつもりなら%1を書いてください。</translation>
+        <translation>ディレクトリがすでに存在します。 新しいディレクトリを作成する場合%1を追加してください。</translation>
     </message>
     <message>
         <source>Path already exists, and is not a directory.</source>
-        <translation>パスが存在しますがディレクトリではありません。</translation>
+        <translation>パスが存在します。ディレクトリではありません。</translation>
     </message>
     <message>
         <source>Cannot create data directory here.</source>
-        <translation>ここにデータ ディレクトリを作成することはできません。</translation>
+        <translation>ここにデータディレクトリを作成することはできません。</translation>
     </message>
 </context>
 <context>
@@ -726,11 +920,15 @@
     </message>
     <message>
         <source>(%1-bit)</source>
-        <translation>(%1ビット)</translation>
+        <translation>(%1-ビット)</translation>
+    </message>
+    <message>
+        <source>About %1</source>
+        <translation>%1 について</translation>
     </message>
     <message>
         <source>Command-line options</source>
-        <translation>コマンドライン オプション</translation>
+        <translation>コマンドラインオプション</translation>
     </message>
     <message>
         <source>Usage:</source>
@@ -738,31 +936,43 @@
     </message>
     <message>
         <source>command-line options</source>
-        <translation>コマンドライン オプション</translation>
+        <translation>コマンドラインオプション</translation>
     </message>
     <message>
-        <source>UI options</source>
-        <translation>ユーザインターフェイスオプション</translation>
+        <source>UI Options:</source>
+        <translation>UIオプション:</translation>
     </message>
     <message>
-        <source>Choose data directory on startup (default: 0)</source>
-        <translation>起動時にデータ ディレクトリを選ぶ ( デフォルト設定：0)</translation>
+        <source>Choose data directory on startup (default: %u)</source>
+        <translation>起動時にデータディレクトリを選ぶ (初期設定: %u)</translation>
     </message>
     <message>
         <source>Set language, for example "de_DE" (default: system locale)</source>
-        <translation>言語設定 例： "de_DE" (デフォルト設定： システムの言語)</translation>
+        <translation>言語を設定 例： "de_DE" (デフォルト設定： システムの言語)</translation>
     </message>
     <message>
         <source>Start minimized</source>
-        <translation>最小化された状態で起動する</translation>
+        <translation>最小化された状態で起動</translation>
     </message>
     <message>
         <source>Set SSL root certificates for payment request (default: -system-)</source>
-        <translation>支払いリクエスト用にSSLルート証明書を設定する（デフォルト設定：-system-）</translation>
+        <translation>送金リクエスト用にSSLルート証明書を設定（初期設定：-system-）</translation>
+    </message>
+    <message>
+        <source>Show splash screen on startup (default: %u)</source>
+        <translation>起動時にスプラッシュ画面を表示 (初期設定: %u)</translation>
+    </message>
+    <message>
+        <source>Reset all settings changed in the GUI</source>
+        <translation>GUI で行われた設定の変更を全てリセット</translation>
     </message>
     <message>
-        <source>Show splash screen on startup (default: 1)</source>
-        <translation>起動時にスプラッシュ画面を表示する (デフォルト設定： 1)</translation>
+        <source>PrivateSend information</source>
+        <translation>プライベートセンドの情報</translation>
+    </message>
+    <message>
+        <source>&lt;h3&gt;PrivateSend Basics&lt;/h3&gt; PrivateSend gives you true financial privacy by obscuring the origins of your funds. All the Dash in your wallet is comprised of different "inputs" which you can think of as separate, discrete coins.&lt;br&gt; PrivateSend uses an innovative process to mix your inputs with the inputs of two other people, without having your coins ever leave your wallet. You retain control of your money at all times.&lt;hr&gt; &lt;b&gt;The PrivateSend process works like this:&lt;/b&gt;&lt;ol type="1"&gt; &lt;li&gt;PrivateSend begins by breaking your transaction inputs down into standard denominations. These denominations are 0.01 DASH, 0.1 DASH, 1 DASH and 10 DASH -- sort of like the paper money you use every day.&lt;/li&gt; &lt;li&gt;Your wallet then sends requests to specially configured software nodes on the network, called "masternodes." These masternodes are informed then that you are interested in mixing a certain denomination. No identifiable information is sent to the masternodes, so they never know "who" you are.&lt;/li&gt; &lt;li&gt;When two other people send similar messages, indicating that they wish to mix the same denomination, a mixing session begins. The masternode mixes up the inputs and instructs all three users' wallets to pay the now-transformed input back to themselves. Your wallet pays that denomination directly to itself, but in a different address (called a change address).&lt;/li&gt; &lt;li&gt;In order to fully obscure your funds, your wallet must repeat this process a number of times with each denomination. Each time the process is completed, it's called a "round." Each round of PrivateSend makes it exponentially more difficult to determine where your funds originated.&lt;/li&gt; &lt;li&gt;This mixing process happens in the background without any intervention on your part. When you wish to make a transaction, your funds will already be anonymized. No additional waiting is required.&lt;/li&gt; &lt;/ol&gt; &lt;hr&gt;&lt;b&gt;IMPORTANT:&lt;/b&gt; Your wallet only contains 1000 of these "change addresses." Every time a mixing event happens, up to 9 of your addresses are used up. This means those 1000 addresses last for about 100 mixing events. When 900 of them are used, your wallet must create more addresses. It can only do this, however, if you have automatic backups enabled.&lt;br&gt; Consequently, users who have backups disabled will also have PrivateSend disabled. &lt;hr&gt;For more information, see the &lt;a href="https://docs.dash.org/en/latest/wallets/dashcore/privatesend-instantsend.html"&gt;PrivateSend documentation&lt;/a&gt;.         </source>
+        <translation>&lt;h3&gt;プライベートセンドの基本&lt;/h3&gt; プライベートセンドはあなたのファンドの起源を不明瞭にすることによって真のファイナンシャルプライバシーを提供します。あなたのウォレットにあるDashは別々の異なるコインとして考えられる”インプット”から構成されています。&lt;br&gt; プライベートセンドは画期的なプロセスを使用し、ウォレットからあなたのコインが移動させられることなく、他の二人の人々のインプットとあなたのインプットをミックスします。あなたは常にあなたのファンドをコントロールしています。&lt;hr&gt; &lt;b&gt;プライベートセンドのプロセスは以下のように機能します:&lt;/b&gt;&lt;ol type="1"&gt; &lt;li&gt;プライベートセンドは、あなたのトランザクションインプットをスタンダードな通貨単位に分割します。これらの通貨単位は0.01 DASH, 0.1 DASH, 1 DASH そして 10 DASH -- 日常的に使われる紙幣のようなものです。&lt;/li&gt; &lt;li&gt;あなたのウォレットは次に、 "マスターノード"と呼ばれるネットワーク上に特別に設定されたソフトウェアノードにリクエストを送信します。これらのマスターノードは、特定の通貨単位をミキシングしたいというあなたの要望を知らされます。送信者を特定できる情報は送信されないので、マスターノードはあなたが誰かわかりません。 &lt;/li&gt; &lt;li&gt;二人の別の人たちが同じようなメッセージを送信して、同じ通貨単位をミキシングしたいという要望を伝え、ミキシングセッションが開始されます。マスターノードはインプットをミックスし、すべての三人のユーザーのウォレットに命じて変更されたインプットをもとのウォレットに戻させます。あなたのウォレットはその通貨単位を直接もとのウォレットに支払いますが、アドレスは異なっています（チェンジアドレスといいます）&lt;/li&gt; &lt;li&gt;完全にあなたのファンドを匿名化するには、あなたのウォレットはこのプロセスをそれぞれの通貨単位で何回もリピートする必要があります。このプロセスは "ラウンド"と呼びます。プライベートセンドのラウンドが進めば、あなたのファンドの起源を遡ることは指数関数的に困難になっていきます。&lt;/li&gt; &lt;li&gt;このミキシングのプロセスはあなたになにも干渉することなくバックグラウンドで実行されます。あなたがトランザクションを実行したいとき、あなたのファンドはすでに匿名化されています。追加の待ち時間は必要ありません。&lt;/li&gt; &lt;/ol&gt; &lt;hr&gt;&lt;b&gt;重要:&lt;/b&gt; あなたのウォレットは、 1000個の "チェンジアドレス"しか保有できません。ミキシングが実行されるたびに、9個のアドレスが使用されます。これは1000個のアドレスを使い切るまでに約100回のミキシングがきることを意味します。900個のアドレスが使用されると、あなたのウォレットは追加のアドレスを生成しなくてはなりません。しかし、あなたが自動バックアップを有効にしていれば可能です。&lt;br&gt; つまりバックアップが無効なユーザーはプライベートセンドが無効になります。 &lt;hr&gt;詳細は &lt;a href="https://docs.dash.org/en/latest/wallets/dashcore/privatesend-instantsend.html"&gt;プライベートセンドドキュメンテーション&lt;/a&gt;参照.         </translation>
     </message>
 </context>
 <context>
@@ -772,13 +982,25 @@
         <translation>ようこそ！
 </translation>
     </message>
+    <message>
+        <source>Welcome to %1.</source>
+        <translation>%1 へようこそ。</translation>
+    </message>
+    <message>
+        <source>As this is the first time the program is launched, you can choose where %1 will store its data.</source>
+        <translation>これは本プログラムの最初の起動です。%1 がデータを保存する場所を選択して下さい。</translation>
+    </message>
+    <message>
+        <source>%1 will download and store a copy of the Dash block chain. At least %2GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</source>
+        <translation>%1はDashブロックチェーンのデータのコピーをダウンロードして保存します。 少なくとも%2GBのデータがこのディレクトリに保存され、時間の経過とともに容量が増加します。 ウォレットもこのディレクトリに保存されます。</translation>
+    </message>
     <message>
         <source>Use the default data directory</source>
-        <translation>初期値のデータ ディレクトリを使用</translation>
+        <translation>初期設定のデータディレクトリを使用</translation>
     </message>
     <message>
         <source>Use a custom data directory:</source>
-        <translation>任意のデータ ディレクトリを使用：</translation>
+        <translation>任意のデータディレクトリを使用：</translation>
     </message>
     <message>
         <source>Error: Specified data directory "%1" cannot be created.</source>
@@ -790,2218 +1012,4151 @@
     </message>
     <message>
         <source>%1 GB of free space available</source>
-        <translation>使用可能な空き領域の%1ギガバイト</translation>
+        <translation>使用可能な空き領域の%1 GB</translation>
     </message>
-    </context>
+    <message>
+        <source>(of %1 GB needed)</source>
+        <translation>(%1 GB 必要)</translation>
+    </message>
+</context>
 <context>
-    <name>OpenURIDialog</name>
+    <name>MasternodeList</name>
     <message>
-        <source>Open URI</source>
-        <translation>URI を開く</translation>
+        <source>Form</source>
+        <translation>フォーム</translation>
     </message>
     <message>
-        <source>Open payment request from URI or file</source>
-        <translation>URI またはファイルから支払いリクエストを開く</translation>
+        <source>My Masternodes</source>
+        <translation>私のマスターノード</translation>
     </message>
     <message>
-        <source>URI:</source>
-        <translation>URI：</translation>
+        <source>Note: Status of your masternodes in local wallet can potentially be slightly incorrect.&lt;br /&gt;Always wait for wallet to sync additional data and then double check from another node&lt;br /&gt;if your masternode should be running but you still do not see "ENABLED" in "Status" field.</source>
+        <translation>注：ローカルウォレットのマスターノードのステータスは、若干正しくない可能性があります。&lt;br /&gt;ウォレットが新しいデータを同期するのを常に待って、他のノードからダブルチェックを行います。&lt;br /&gt;あなたのマスターノードが動作していても、"ステータス"フィールドに "ENABLED"が表示されていない場合があります。</translation>
     </message>
     <message>
-        <source>Select payment request file</source>
-        <translation>支払いリクエストファイルを選択してください</translation>
+        <source>Alias</source>
+        <translation>エイリアス</translation>
     </message>
     <message>
-        <source>Select payment request file to open</source>
-        <translation>開きたい支払いリクエストファイルを選択してください</translation>
+        <source>Address</source>
+        <translation>アドレス</translation>
     </message>
-</context>
-<context>
-    <name>OptionsDialog</name>
     <message>
-        <source>Options</source>
-        <translation>設定</translation>
+        <source>Protocol</source>
+        <translation>プロトコル</translation>
     </message>
     <message>
-        <source>&amp;Main</source>
-        <translation>メイン (&amp;M)</translation>
+        <source>Status</source>
+        <translation>ステータス</translation>
     </message>
     <message>
-        <source>Size of &amp;database cache</source>
-        <translation>データベースキャッシュのサイズ (&amp;D)</translation>
+        <source>Active</source>
+        <translation>アクティブ</translation>
     </message>
     <message>
-        <source>MB</source>
-        <translation>MB</translation>
+        <source>Last Seen</source>
+        <translation>最終更新</translation>
     </message>
     <message>
-        <source>Number of script &amp;verification threads</source>
-        <translation>スクリプト検証用スレッド数 (&amp;V)</translation>
+        <source>Payee</source>
+        <translation>受取人</translation>
     </message>
     <message>
-        <source>(0 = auto, &lt;0 = leave that many cores free)</source>
-        <translation>(0 = 自動、0以上 = 指定した数のコアをフリーにする)</translation>
+        <source>S&amp;tart alias</source>
+        <translation>エイリアスの開始(&amp;T)</translation>
     </message>
     <message>
-        <source>W&amp;allet</source>
-        <translation>ウォレット (&amp;A)</translation>
+        <source>Start &amp;all</source>
+        <translation>すべて開始(&amp;A)</translation>
     </message>
     <message>
-        <source>Accept connections from outside</source>
-        <translation>外部からの接続を許可する</translation>
+        <source>Start &amp;MISSING</source>
+        <translation>ミッシングマスターノードの開始(&amp;M)</translation>
     </message>
     <message>
-        <source>Allow incoming connections</source>
-        <translation>外部からの接続を許可する</translation>
+        <source>&amp;Update status</source>
+        <translation>ステータスアップデート(&amp;U)</translation>
     </message>
     <message>
-        <source>&amp;Connect through SOCKS5 proxy (default proxy):</source>
-        <translation>SOCKS5 プロキシ経由で接続する (デフォルトプロキシ)： (&amp;C)</translation>
+        <source>Show additional Masternode information</source>
+        <translation>追加のマスターノード情報を表示</translation>
     </message>
     <message>
-        <source>Expert</source>
-        <translation>エクスポート</translation>
+        <source>Show &amp;Info...</source>
+        <translation>情報の表示(&amp;I)</translation>
     </message>
     <message>
-        <source>Whether to show coin control features or not.</source>
-        <translation>コインコントロール機能を表示するかどうか。</translation>
+        <source>Status will be updated automatically in (sec):</source>
+        <translation>ステータスは自動でアップデートされます(秒):</translation>
     </message>
     <message>
-        <source>Enable coin &amp;control features</source>
-        <translation>コインコントロール機能を有効化する (&amp;C)</translation>
+        <source>0</source>
+        <translation>0</translation>
     </message>
     <message>
-        <source>&amp;Spend unconfirmed change</source>
-        <translation>未検証のおつりを使用する (&amp;S)</translation>
+        <source>All Masternodes</source>
+        <translation>すべてのマスターノード</translation>
     </message>
     <message>
-        <source>&amp;Network</source>
-        <translation>ネットワーク (&amp;N)</translation>
+        <source>Filter List:</source>
+        <translation>フィルターリスト:</translation>
     </message>
     <message>
-        <source>Map port using &amp;UPnP</source>
-        <translation>UPnP を使ってポートを割り当てる (&amp;U)</translation>
+        <source>Filter masternode list</source>
+        <translation>マスターノードのリストをフィルター</translation>
     </message>
     <message>
-        <source>Proxy &amp;IP:</source>
-        <translation>プロキシの IP (&amp;I) ：</translation>
+        <source>Node Count:</source>
+        <translation>ノード数:</translation>
     </message>
     <message>
-        <source>IP address of the proxy (e.g. IPv4: 127.0.0.1 / IPv6: ::1)</source>
-        <translation>プロキシのIPアドレス (例えば IPv4： 127.0.0.1 / IPv6： ::1)</translation>
+        <source>Start alias</source>
+        <translation>エイリアス開始</translation>
     </message>
     <message>
-        <source>&amp;Port:</source>
-        <translation>ポート (&amp;P)：</translation>
+        <source>Confirm masternode start</source>
+        <translation>マスターノードの開始を確認</translation>
     </message>
     <message>
-        <source>Port of the proxy (e.g. 9050)</source>
-        <translation>プロキシのポート番号 (例 9050)</translation>
+        <source>Are you sure you want to start masternode %1?</source>
+        <translation>本当にマスターノード %1 を開始したいですか?</translation>
     </message>
     <message>
-        <source>&amp;Window</source>
-        <translation>ウインドウ (&amp;W)</translation>
+        <source>Confirm all masternodes start</source>
+        <translation>すべてのマスターノードの開始を確認</translation>
     </message>
     <message>
-        <source>Show only a tray icon after minimizing the window.</source>
-        <translation>ウインドウを最小化したあとトレイ アイコンだけを表示する。</translation>
+        <source>Are you sure you want to start ALL masternodes?</source>
+        <translation>本当にすべてのマスターノードを開始したいですか?</translation>
     </message>
     <message>
-        <source>&amp;Minimize to the tray instead of the taskbar</source>
-        <translation>タスクバーの代わりにトレイに最小化 (&amp;M)</translation>
+        <source>Command is not available right now</source>
+        <translation>コマンドは現在利用できません。</translation>
     </message>
     <message>
-        <source>M&amp;inimize on close</source>
-        <translation>閉じる時に最小化 (&amp;i)</translation>
+        <source>You can't use this command until masternode list is synced</source>
+        <translation>このコマンドはマスターノードのリストが同期されるまで使用できません。</translation>
     </message>
     <message>
-        <source>&amp;Display</source>
-        <translation>表示 (&amp;D)</translation>
+        <source>Confirm missing masternodes start</source>
+        <translation>ミッシングマスターノードの開始を確認</translation>
     </message>
     <message>
-        <source>User Interface &amp;language:</source>
-        <translation>ユーザインターフェースの言語 (&amp;l)：</translation>
+        <source>Are you sure you want to start MISSING masternodes?</source>
+        <translation>本当に不明なマスターノードを開始したいですか?</translation>
     </message>
     <message>
-        <source>&amp;Unit to show amounts in:</source>
-        <translation>額を表示する単位 (&amp;U)：</translation>
+        <source>Additional information for Masternode %1</source>
+        <translation>マスターノード %1 の追加情報</translation>
     </message>
     <message>
-        <source>Choose the default subdivision unit to show in the interface and when sending coins.</source>
-        <translation>インターフェース上の表示とコインの送信で使用する単位を選択します。</translation>
+        <source>Masternode Private Key</source>
+        <translation>マスターノードプライベートキー</translation>
     </message>
     <message>
-        <source>Third party URLs (e.g. a block explorer) that appear in the transactions tab as context menu items. %s in the URL is replaced by transaction hash. Multiple URLs are separated by vertical bar |.</source>
-        <translation>トランザクションタブのコンテキストメニュー項目に表示する、サードパーティURL (例えばブロックエクスプローラ)。URL中の%sはトランザクションのハッシュ値に置き換えられます。垂直バー | で区切ることで、複数のURLを指定できます。</translation>
+        <source>Private Key</source>
+        <translation>プライベートキー</translation>
     </message>
     <message>
-        <source>Third party transaction URLs</source>
-        <translation>サードパーティのトランザクションURL</translation>
+        <source>Collateral</source>
+        <translation>コラテラル</translation>
     </message>
     <message>
-        <source>Active command-line options that override above options:</source>
-        <translation>上のオプションを置き換えることのできる、有効なコマンドラインオプションの一覧：</translation>
+        <source>IP</source>
+        <translation>IPアドレス</translation>
     </message>
     <message>
-        <source>Reset all client options to default.</source>
-        <translation>すべてのオプションを初期値に戻します。</translation>
+        <source>Version</source>
+        <translation>バージョン</translation>
     </message>
     <message>
-        <source>&amp;Reset Options</source>
-        <translation>オプションをリセット (&amp;R)</translation>
+        <source>Unknown</source>
+        <translation>不明</translation>
     </message>
     <message>
-        <source>&amp;OK</source>
-        <translation>&amp;OK</translation>
+        <source>Sentinel</source>
+        <translation>センチネル</translation>
     </message>
+</context>
+<context>
+    <name>ModalOverlay</name>
     <message>
-        <source>&amp;Cancel</source>
-        <translation>キャンセル (&amp;C)</translation>
+        <source>Form</source>
+        <translation>フォーム</translation>
     </message>
     <message>
-        <source>default</source>
-        <translation>デフォルト設定</translation>
+        <source>Recent transactions may not yet be visible, and therefore your wallet's balance might be incorrect. This information will be correct once your wallet has finished synchronizing with the Dash network, as detailed below.</source>
+        <translation>確認できない最新のトランザクションがあるかもしれません。これによりウォレットの残高は不正確なものである可能性があります。この情報はウォレットが一度Dashのネットワークへの同期が完了すると正確なものとなります。詳細は下記を参照してください。</translation>
     </message>
     <message>
-        <source>none</source>
-        <translation>なし</translation>
+        <source>Attempting to spend Dash that are affected by not-yet-displayed transactions will not be accepted by the network.</source>
+        <translation>表示されてないトランザクションに影響を受けたDashを使用しようとするとネットワークに承認されません。</translation>
     </message>
     <message>
-        <source>Confirm options reset</source>
-        <translation>オプションのリセットの確認</translation>
+        <source>Number of blocks left</source>
+        <translation>残りのブロック数</translation>
     </message>
     <message>
-        <source>Client restart required to activate changes.</source>
-        <translation>変更を有効化するにはクライアントを再起動する必要があります。</translation>
+        <source>Unknown...</source>
+        <translation>不明...</translation>
     </message>
     <message>
-        <source>This change would require a client restart.</source>
-        <translation>この変更はクライアントの再起動が必要です。</translation>
+        <source>Last block time</source>
+        <translation>最終ブロックの日時</translation>
     </message>
     <message>
-        <source>The supplied proxy address is invalid.</source>
-        <translation>プロキシアドレスが無効です。</translation>
+        <source>Progress</source>
+        <translation>進捗</translation>
     </message>
-</context>
-<context>
-    <name>OverviewPage</name>
     <message>
-        <source>Form</source>
-        <translation>フォーム</translation>
+        <source>Progress increase per hour</source>
+        <translation>一時間毎の進捗の変化</translation>
     </message>
     <message>
-        <source>Available:</source>
-        <translation>利用可能：</translation>
+        <source>calculating...</source>
+        <translation>計算中...</translation>
     </message>
     <message>
-        <source>Your current spendable balance</source>
-        <translation>あなたの利用可能残高</translation>
+        <source>Estimated time left until synced</source>
+        <translation>同期が完了するまでの推定残り時間</translation>
     </message>
     <message>
-        <source>Pending:</source>
-        <translation>検証待ち：</translation>
+        <source>Hide</source>
+        <translation>非表示</translation>
     </message>
     <message>
-        <source>Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance</source>
-        <translation>未検証の取引で利用可能残高に反映されていない数</translation>
+        <source>Unknown. Syncing Headers (%1)...</source>
+        <translation>不明。ヘッダーを同期中 (%1)...</translation>
     </message>
+</context>
+<context>
+    <name>OpenURIDialog</name>
     <message>
-        <source>Immature:</source>
-        <translation>未完成：</translation>
+        <source>Open URI</source>
+        <translation>URI を開く</translation>
     </message>
     <message>
-        <source>Mined balance that has not yet matured</source>
-        <translation>完成していない採掘された残高</translation>
+        <source>Open payment request from URI or file</source>
+        <translation>URI またはファイルから送金リクエストを開く</translation>
     </message>
     <message>
-        <source>Balances</source>
-        <translation>残高</translation>
+        <source>URI:</source>
+        <translation>URI:</translation>
     </message>
     <message>
-        <source>Unconfirmed transactions to watch-only addresses</source>
-        <translation>監視限定アドレスに対する未検証のトランザクション</translation>
+        <source>Select payment request file</source>
+        <translation>送金リクエストファイルを選択してください</translation>
     </message>
     <message>
-        <source>Mined balance in watch-only addresses that has not yet matured</source>
-        <translation>ウォッチオンリーアドレスの採掘された残高のうち、成熟していないもの</translation>
+        <source>Select payment request file to open</source>
+        <translation>開きたい送金リクエストファイルを選択してください</translation>
     </message>
+</context>
+<context>
+    <name>OptionsDialog</name>
     <message>
-        <source>Total:</source>
-        <translation>合計：</translation>
+        <source>Options</source>
+        <translation>オプション</translation>
     </message>
     <message>
-        <source>Your current total balance</source>
-        <translation>あなたの現在の残高</translation>
+        <source>&amp;Main</source>
+        <translation>メイン (&amp;M)</translation>
     </message>
     <message>
-        <source>Current total balance in watch-only addresses</source>
-        <translation>監視限定アドレス内の現在の全残高</translation>
+        <source>Size of &amp;database cache</source>
+        <translation>データベースキャッシュのサイズ (&amp;D)</translation>
     </message>
     <message>
-        <source>Watch-only:</source>
-        <translation>監視限定：</translation>
+        <source>MB</source>
+        <translation>MB</translation>
     </message>
     <message>
-        <source>Your current balance in watch-only addresses</source>
-        <translation>監視限定アドレス内の現在の残高</translation>
+        <source>Number of script &amp;verification threads</source>
+        <translation>スクリプト検証用スレッド数 (&amp;V)</translation>
     </message>
     <message>
-        <source>Spendable:</source>
-        <translation>使用可能：</translation>
+        <source>(0 = auto, &lt;0 = leave that many cores free)</source>
+        <translation>(0 = 自動、0以上 = 指定した数のコアをフリーにする)</translation>
     </message>
     <message>
-        <source>Status:</source>
-        <translation>状態：</translation>
+        <source>Amount of Dash to keep anonymized</source>
+        <translation>匿名化されたDashの総額</translation>
     </message>
     <message>
-        <source>Recent transactions</source>
-        <translation>最近のトランザクション</translation>
+        <source>W&amp;allet</source>
+        <translation>ウォレット (&amp;A)</translation>
     </message>
     <message>
-        <source>N/A</source>
-        <translation>N/A</translation>
+        <source>Show additional tab listing all your masternodes in first sub-tab&lt;br/&gt;and all masternodes on the network in second sub-tab.</source>
+        <translation>あなたのすべてのマスターノードをリストしている追加のタブを最初のサブタブに表示し&lt;br/&gt;すべてのマスターノードを次のサブタブに表示</translation>
     </message>
-    </context>
-<context>
-    <name>PaymentServer</name>
     <message>
-        <source>Payment request error</source>
-        <translation>支払いのリクエストのエラーです</translation>
+        <source>Show Masternodes Tab</source>
+        <translation>マスターノードタブを表示する</translation>
     </message>
     <message>
-        <source>URI handling</source>
-        <translation>URI の操作</translation>
+        <source>Show additional information and buttons for PrivateSend on overview screen.</source>
+        <translation>プライベートセンドの追加の情報とボタンを概要に表示</translation>
     </message>
     <message>
-        <source>Payment request fetch URL is invalid: %1</source>
-        <translation>支払い要求の取得先URLが無効です： %1</translation>
+        <source>Enable advanced PrivateSend interface</source>
+        <translation>高度なプライベートセンドのインターフェイスを有効にする</translation>
     </message>
     <message>
-        <source>Payment request file handling</source>
-        <translation>支払いリクエストファイルを処理しています</translation>
+        <source>Show warning dialog when PrivateSend detects that wallet has very low number of keys left.</source>
+        <translation>プライベートセンドがウォレットに非常に少ないキーしか残されてないことを検知したとき警告を表示</translation>
     </message>
     <message>
-        <source>Invalid payment address %1</source>
-        <translation>支払いのアドレス「%1」は無効です</translation>
+        <source>Warn if PrivateSend is running out of keys</source>
+        <translation>プライベートセンドがキーを使い果たしているとき警告する</translation>
     </message>
     <message>
-        <source>Payment request file cannot be read! This can be caused by an invalid payment request file.</source>
-        <translation>支払いリクエストファイルを読み込めませんでした！無効な支払いリクエストファイルにより引き起こされた可能性があります。</translation>
+        <source>Whether to use experimental PrivateSend mode with multiple mixing sessions per block.&lt;br/&gt;Note: You must use this feature carefully.&lt;br/&gt;Make sure you always have recent wallet (auto)backup in a safe place!</source>
+        <translation>プライベートセンドモードを１ブロックあたり複数のミキシングセッションで実験的に使用する場合&lt;br/&gt;注意: この機能を十分に注意して使用してください。&lt;br/&gt;常に最新のウォレットバックアップを安全な場所に保管してください。</translation>
     </message>
     <message>
-        <source>Payment request rejected</source>
-        <translation>支払い要求は拒否されました</translation>
+        <source>Enable PrivateSend &amp;multi-session</source>
+        <translation>プライベートセンドとマルチセッションを有効にする(&amp;M)</translation>
     </message>
     <message>
-        <source>Payment request network doesn't match client network.</source>
-        <translation>支払いリクエストのネットワークは現在のクライアントのネットワークに一致しません。</translation>
+        <source>If you disable the spending of unconfirmed change, the change from a transaction&lt;br/&gt;cannot be used until that transaction has at least one confirmation.&lt;br/&gt;This also affects how your balance is computed.</source>
+        <translation>もし未確認のチェンジを使用することを無効にする場合&lt;br/&gt;トランザクションから生じたチェンジはそのトランザクションが少なくとも一回コンファメーションがないと使用できません。&lt;br/&gt;これはまたあなたのウォレットの残高の計算にも影響を与えます。</translation>
     </message>
     <message>
-        <source>Payment request is not initialized.</source>
-        <translation>支払いリクエストは開始されていません。</translation>
+        <source>PrivateSend rounds to use</source>
+        <translation>プライベートセンドのラウンドを使用</translation>
     </message>
     <message>
-        <source>Unverified payment requests to custom payment scripts are unsupported.</source>
-        <translation>カスタム支払いスクリプトに対する、検証されていない支払いリクエストはサポートされていません。</translation>
+        <source>This amount acts as a threshold to turn off PrivateSend once it's reached.</source>
+        <translation>この設定は閾値として機能し、この量に達するとプライベートセンドが無効になります。</translation>
     </message>
     <message>
-        <source>Requested payment amount of %1 is too small (considered dust).</source>
-        <translation>要求された支払額 %1 は少なすぎます (ダストとみなされてしまいます)。</translation>
+        <source>Automatically open the Dash Core client port on the router. This only works when your router supports UPnP and it is enabled.</source>
+        <translation>自動的にルーターのDash Core クライアントポートを開放します。これはルーターがUPnP機能をサポートしておりUPnP機能が有効な場合にのみ機能します。</translation>
     </message>
     <message>
-        <source>Refund from %1</source>
-        <translation>%1 からの返金</translation>
+        <source>Accept connections from outside</source>
+        <translation>外部からの接続を許可</translation>
     </message>
     <message>
-        <source>Payment request %1 is too large (%2 bytes, allowed %3 bytes).</source>
-        <translation>支払リクエスト %1 は大きすぎます（%2バイトですが、%3バイトまでが許されています）。</translation>
+        <source>Allow incoming connections</source>
+        <translation>受信中の接続を許可</translation>
     </message>
     <message>
-        <source>Payment request DoS protection</source>
-        <translation>支払リクエストDoS保護</translation>
+        <source>Connect to the Dash network through a SOCKS5 proxy.</source>
+        <translation>SOCKS5プロキシ経由でDashネットワークに接続</translation>
     </message>
     <message>
-        <source>Error communicating with %1: %2</source>
-        <translation>%1: %2とコミュニケーション・エラーです</translation>
+        <source>&amp;Connect through SOCKS5 proxy (default proxy):</source>
+        <translation>SOCKS5プロキシ経由で接続 (デフォルトプロキシ)： (&amp;C)</translation>
     </message>
     <message>
-        <source>Payment request cannot be parsed!</source>
-        <translation>支払リクエストを読み込めませんでした！</translation>
+        <source>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Exit in the menu.</source>
+        <translation>ウィンドウを閉じる際にアプリケーションを終了するのではなく最小化します。このオプションが有効の場合、メニューから終了を選択した場合にのみアプリケーションは閉じられます。</translation>
     </message>
     <message>
-        <source>Bad response from server %1</source>
-        <translation>サーバーの返事は無効 %1</translation>
+        <source>Third party URLs (e.g. a block explorer) that appear in the transactions tab as context menu items.&lt;br/&gt;%s in the URL is replaced by transaction hash. Multiple URLs are separated by vertical bar |.</source>
+        <translation>メニューアイテムとしてトランザクションタブに表示されるサードパーティのURL (例 ブロックエクスプローラー) :&lt;br/&gt;%s はトランザクションハッシュに置き換えられます。複数のURLは"|"によって区切られます。</translation>
     </message>
     <message>
-        <source>Network request error</source>
-        <translation>ネットワーク・リクエストのエラーです</translation>
+        <source>Expert</source>
+        <translation>エキスパート</translation>
     </message>
     <message>
-        <source>Payment acknowledged</source>
-        <translation>支払いは確認しました</translation>
+        <source>This setting determines the amount of individual masternodes that an input will be anonymized through.&lt;br/&gt;More rounds of anonymization gives a higher degree of privacy, but also costs more in fees.</source>
+        <translation>この設定はインプットが匿名化される個々のマスターノードの数を決めます。匿名化のラウンドが多ければ多いほどプライバシーのレベルが高くなりますがコストもかかるようになります。</translation>
     </message>
-</context>
-<context>
-    <name>PeerTableModel</name>
     <message>
-        <source>Address/Hostname</source>
-        <translation>アドレス / ホスト名</translation>
+        <source>Whether to show coin control features or not.</source>
+        <translation>コインコントロール機能の表示／非表示</translation>
     </message>
     <message>
-        <source>User Agent</source>
-        <translation>ユーザエージェント</translation>
+        <source>Automatically start %1 after logging in to the system.</source>
+        <translation>システムにログインすると自動的に %1 を起動</translation>
     </message>
     <message>
-        <source>Ping Time</source>
-        <translation>Ping時間</translation>
+        <source>&amp;Start %1 on system login</source>
+        <translation>システムログイン時に %1 を起動 (&amp;S)</translation>
     </message>
-</context>
-<context>
-    <name>QObject</name>
     <message>
-        <source>Amount</source>
-        <translation>総額</translation>
+        <source>Enable coin &amp;control features</source>
+        <translation>コインコントロール機能を有効化 (&amp;C)</translation>
     </message>
     <message>
-        <source>%1 d</source>
-        <translation>%1日</translation>
+        <source>&amp;Spend unconfirmed change</source>
+        <translation>未検証のチェンジを使用 (&amp;S)</translation>
     </message>
     <message>
-        <source>%1 h</source>
-        <translation>%1 h</translation>
+        <source>&amp;Network</source>
+        <translation>ネットワーク (&amp;N)</translation>
     </message>
     <message>
-        <source>%1 m</source>
-        <translation>%1 m</translation>
+        <source>Map port using &amp;UPnP</source>
+        <translation>UPnPを使ってポートを割り当て (&amp;U)</translation>
     </message>
     <message>
-        <source>%1 s</source>
-        <translation>%1秒</translation>
+        <source>Proxy &amp;IP:</source>
+        <translation>プロキシの IP：(&amp;I) </translation>
     </message>
     <message>
-        <source>None</source>
-        <translation>なし</translation>
+        <source>IP address of the proxy (e.g. IPv4: 127.0.0.1 / IPv6: ::1)</source>
+        <translation>プロキシのIPアドレス (例 IPv4： 127.0.0.1 / IPv6： ::1)</translation>
     </message>
     <message>
-        <source>N/A</source>
-        <translation>N/A</translation>
+        <source>&amp;Port:</source>
+        <translation>ポート ：(&amp;P)</translation>
     </message>
     <message>
-        <source>%1 ms</source>
-        <translation>%1ミリ秒</translation>
+        <source>Port of the proxy (e.g. 9050)</source>
+        <translation>プロキシのポート番号 (例 9050)</translation>
     </message>
-</context>
-<context>
-    <name>QRImageWidget</name>
     <message>
-        <source>&amp;Save Image...</source>
-        <translation>画像を保存… (&amp;S)</translation>
+        <source>Used for reaching peers via:</source>
+        <translation>ピアへ到達するために使われた方法:</translation>
     </message>
     <message>
-        <source>&amp;Copy Image</source>
-        <translation>画像をコピー(&amp;C)</translation>
+        <source>Shows, if the supplied default SOCKS5 proxy is used to reach peers via this network type.</source>
+        <translation>デフォルトのSOCKS5プロキシがこのネットワークタイプでピアに到達するのに使用された場合表示 </translation>
     </message>
     <message>
-        <source>Save QR Code</source>
-        <translation>QR コードの保存</translation>
+        <source>IPv4</source>
+        <translation>IPv4</translation>
     </message>
     <message>
-        <source>PNG Image (*.png)</source>
-        <translation>PNG画像ファイル(*.png)</translation>
+        <source>IPv6</source>
+        <translation>IPv6</translation>
     </message>
-</context>
-<context>
-    <name>RPCConsole</name>
     <message>
-        <source>&amp;Information</source>
-        <translation>情報 (&amp;I)</translation>
+        <source>Tor</source>
+        <translation>Tor</translation>
     </message>
     <message>
-        <source>General</source>
-        <translation>一般</translation>
+        <source>Connect to the Dash network through a separate SOCKS5 proxy for Tor hidden services.</source>
+        <translation>Tor秘匿サービスを利用するため独立なSOCKS5プロキシ経由でDashネットワークに接続</translation>
     </message>
     <message>
-        <source>Name</source>
-        <translation>名前</translation>
+        <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services:</source>
+        <translation>独立なSOCKS5プロキシを使用してTor秘匿サービス経由でピアに到達</translation>
     </message>
     <message>
-        <source>Client name</source>
-        <translation>クライアント名</translation>
+        <source>&amp;Window</source>
+        <translation>ウインドウ (&amp;W)</translation>
     </message>
     <message>
-        <source>N/A</source>
-        <translation>N/A</translation>
+        <source>&amp;Hide the icon from the system tray.</source>
+        <translation>システムトレイからアイコンを非表示(&amp;W)</translation>
     </message>
     <message>
-        <source>Number of connections</source>
-        <translation>接続数</translation>
+        <source>Hide tray icon</source>
+        <translation>トレイアイコンを非表示</translation>
     </message>
     <message>
-        <source>&amp;Open</source>
-        <translation>開く (&amp;O)</translation>
+        <source>Show only a tray icon after minimizing the window.</source>
+        <translation>ウインドウを最小化したあとトレイアイコンだけを表示</translation>
     </message>
     <message>
-        <source>Startup time</source>
-        <translation>起動した日時</translation>
+        <source>&amp;Minimize to the tray instead of the taskbar</source>
+        <translation>タスクバーの代わりにトレイに最小化 (&amp;M)</translation>
     </message>
     <message>
-        <source>Network</source>
-        <translation>ネットワーク</translation>
+        <source>M&amp;inimize on close</source>
+        <translation>閉じる時に最小化 (&amp;I)</translation>
     </message>
     <message>
-        <source>Last block time</source>
-        <translation>最終ブロックの日時</translation>
+        <source>&amp;Display</source>
+        <translation>表示 (&amp;D)</translation>
     </message>
     <message>
-        <source>Debug log file</source>
-        <translation>デバッグ用ログファイル</translation>
+        <source>User Interface &amp;language:</source>
+        <translation>ユーザインターフェースの言語 ：(&amp;L)</translation>
     </message>
     <message>
-        <source>Using OpenSSL version</source>
-        <translation>使用中の OpenSSL のバージョン</translation>
+        <source>The user interface language can be set here. This setting will take effect after restarting %1.</source>
+        <translation>ここでユーザーインターフェースの言語を設定できます。設定を反映するには %1 を再起動します。</translation>
     </message>
     <message>
-        <source>Build date</source>
-        <translation>ビルドの日付</translation>
+        <source>Language missing or translation incomplete? Help contributing translations here:
+https://www.transifex.com/projects/p/dash/</source>
+        <translation>希望の言語がない場合または翻訳に問題がある場合はこちらで翻訳にご協力ください。:
+https://www.transifex.com/projects/p/dash/</translation>
     </message>
     <message>
-        <source>Current number of blocks</source>
-        <translation>現在のブロック数</translation>
+        <source>User Interface Theme:</source>
+        <translation>ユーザーインターフェイスのテーマ:</translation>
     </message>
     <message>
-        <source>Client version</source>
-        <translation>クライアントのバージョン</translation>
+        <source>&amp;Unit to show amounts in:</source>
+        <translation>表示する単位 ：(&amp;U)</translation>
     </message>
     <message>
-        <source>Using BerkeleyDB version</source>
-        <translation>使用中のBerkleyDBバージョン</translation>
+        <source>Choose the default subdivision unit to show in the interface and when sending coins.</source>
+        <translation>インターフェース上の表示とコインの送金で使用するデフォルトの単位を選択</translation>
     </message>
     <message>
-        <source>Block chain</source>
-        <translation>ブロック チェーン</translation>
+        <source>Decimal digits</source>
+        <translation>10進数</translation>
     </message>
     <message>
-        <source>&amp;Console</source>
-        <translation>コンソール (&amp;C)</translation>
+        <source>Third party transaction URLs</source>
+        <translation>サードパーティのトランザクションURL</translation>
     </message>
     <message>
-        <source>Clear console</source>
-        <translation>コンソールをクリア</translation>
+        <source>Active command-line options that override above options:</source>
+        <translation>上のオプションを置き換えることのできる有効なコマンドラインオプションの一覧：</translation>
     </message>
     <message>
-        <source>&amp;Network Traffic</source>
-        <translation>ネットワーク (&amp;N)</translation>
+        <source>Reset all client options to default.</source>
+        <translation>すべてのオプションを初期値に戻します。</translation>
     </message>
     <message>
-        <source>&amp;Clear</source>
-        <translation>クリア(&amp;C)</translation>
+        <source>&amp;Reset Options</source>
+        <translation>オプションのリセット (&amp;R)</translation>
     </message>
     <message>
-        <source>Totals</source>
-        <translation>合計</translation>
+        <source>&amp;OK</source>
+        <translation>OK(&amp;O)</translation>
     </message>
     <message>
-        <source>Received</source>
-        <translation>受取</translation>
+        <source>&amp;Cancel</source>
+        <translation>キャンセル (&amp;C)</translation>
     </message>
     <message>
-        <source>Sent</source>
-        <translation>送金</translation>
+        <source>default</source>
+        <translation>デフォルト設定</translation>
     </message>
     <message>
-        <source>&amp;Peers</source>
-        <translation>ピア (&amp;P)</translation>
+        <source>none</source>
+        <translation>なし</translation>
     </message>
     <message>
-        <source>Select a peer to view detailed information.</source>
-        <translation>詳しい情報を見たいピアを選択してください。</translation>
+        <source>Confirm options reset</source>
+        <translation>オプションのリセットの確認</translation>
     </message>
     <message>
-        <source>Direction</source>
-        <translation>方向</translation>
+        <source>Client restart required to activate changes.</source>
+        <translation>変更を有効にするにはクライアントを再起動する必要があります。</translation>
     </message>
     <message>
-        <source>Version</source>
-        <translation>バージョン</translation>
+        <source>Client will be shut down. Do you want to proceed?</source>
+        <translation>クライアントを終了します。続行してもよろしいですか？</translation>
     </message>
     <message>
-        <source>User Agent</source>
-        <translation>ユーザエージェント</translation>
+        <source>This change would require a client restart.</source>
+        <translation>この変更はクライアントの再起動が必要です。</translation>
     </message>
     <message>
-        <source>Services</source>
-        <translation>サービス</translation>
+        <source>The supplied proxy address is invalid.</source>
+        <translation>プロキシアドレスが無効です。</translation>
     </message>
+</context>
+<context>
+    <name>OverviewPage</name>
     <message>
-        <source>Starting Height</source>
-        <translation>開始時のブロック高</translation>
+        <source>Form</source>
+        <translation>フォーム</translation>
     </message>
     <message>
-        <source>Sync Height</source>
-        <translation>同期済みブロック高</translation>
+        <source>The displayed information may be out of date. Your wallet automatically synchronizes with the Dash network after a connection is established, but this process has not completed yet.</source>
+        <translation>表示された情報は古いかもしれません。接続が確立されればあなたのウォレットは Dashネットワークと自動的に同期しますが、このプロセスはまだ完了していません。</translation>
     </message>
     <message>
-        <source>Ban Score</source>
-        <translation>Banスコア</translation>
+        <source>Available:</source>
+        <translation>利用可能：</translation>
     </message>
     <message>
-        <source>Connection Time</source>
-        <translation>接続時間</translation>
+        <source>Your current spendable balance</source>
+        <translation>あなたの利用可能な残高</translation>
     </message>
     <message>
-        <source>Last Send</source>
-        <translation>最終送信</translation>
+        <source>Pending:</source>
+        <translation>検証待ち：</translation>
     </message>
     <message>
-        <source>Last Receive</source>
-        <translation>最終受信</translation>
+        <source>Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance</source>
+        <translation>未検証で利用可能残高に反映されていないトランザクション数</translation>
     </message>
     <message>
-        <source>Bytes Sent</source>
-        <translation>送信済バイト数</translation>
+        <source>Immature:</source>
+        <translation>未完成：</translation>
     </message>
     <message>
-        <source>Bytes Received</source>
-        <translation>受信済バイト数</translation>
+        <source>Mined balance that has not yet matured</source>
+        <translation>不完全な状態の残高</translation>
     </message>
     <message>
-        <source>Ping Time</source>
-        <translation>Ping時間</translation>
+        <source>Balances</source>
+        <translation>残高</translation>
     </message>
     <message>
-        <source>In:</source>
-        <translation>入力：</translation>
+        <source>Unconfirmed transactions to watch-only addresses</source>
+        <translation>監視限定のアドレスへの未検証トランザクション</translation>
     </message>
     <message>
-        <source>Out:</source>
-        <translation>出力：</translation>
+        <source>Mined balance in watch-only addresses that has not yet matured</source>
+        <translation>不完全な状態の監視限定のアドレスの残高</translation>
     </message>
     <message>
-        <source>Use up and down arrows to navigate history, and &lt;b&gt;Ctrl-L&lt;/b&gt; to clear screen.</source>
-        <translation>上下の矢印で履歴をたどれます。 &lt;b&gt;Ctrl-L&lt;/b&gt; でスクリーンを消去できます。</translation>
+        <source>Total:</source>
+        <translation>合計：</translation>
     </message>
     <message>
-        <source>Type &lt;b&gt;help&lt;/b&gt; for an overview of available commands.</source>
-        <translation>使用可能なコマンドを見るには &lt;b&gt;help&lt;/b&gt; と入力します。</translation>
+        <source>Your current total balance</source>
+        <translation>あなたの現在の残高の合計</translation>
     </message>
     <message>
-        <source>%1 B</source>
-        <translation>%1 B</translation>
+        <source>Current total balance in watch-only addresses</source>
+        <translation>監視限定アドレスの現在の残高の合計</translation>
     </message>
     <message>
-        <source>%1 KB</source>
-        <translation>%1 KB</translation>
+        <source>Watch-only:</source>
+        <translation>ウォッチオンリー：</translation>
     </message>
     <message>
-        <source>%1 MB</source>
-        <translation>%1 MB</translation>
+        <source>Your current balance in watch-only addresses</source>
+        <translation>あなたのウォッチオンリーのアドレスの現在の残高の合計</translation>
     </message>
     <message>
-        <source>%1 GB</source>
-        <translation>%1 GB</translation>
+        <source>Spendable:</source>
+        <translation>使用可能：</translation>
     </message>
     <message>
-        <source>via %1</source>
-        <translation>%1経由</translation>
+        <source>PrivateSend</source>
+        <translation>プライベートセンド</translation>
     </message>
     <message>
-        <source>never</source>
-        <translation>一度もなし</translation>
+        <source>Status:</source>
+        <translation>ステータス：</translation>
     </message>
     <message>
-        <source>Inbound</source>
-        <translation>内向き</translation>
+        <source>Enabled/Disabled</source>
+        <translation>有効/無効</translation>
     </message>
     <message>
-        <source>Outbound</source>
-        <translation>外向き</translation>
+        <source>Completion:</source>
+        <translation>完了:</translation>
     </message>
     <message>
-        <source>Unknown</source>
-        <translation>未知</translation>
+        <source>Try to manually submit a PrivateSend request.</source>
+        <translation>手動でプライベートセンドのリクエストを送信</translation>
     </message>
     <message>
-        <source>Fetching...</source>
-        <translation>取得中…</translation>
+        <source>Reset the current status of PrivateSend (can interrupt PrivateSend if it's in the process of Mixing, which can cost you money!)</source>
+        <translation>プライベートセンドの現在のステータスをリセット (これはミキシングの途中であればプライベートセンドを中止し、コストがかかります!)</translation>
     </message>
-</context>
-<context>
-    <name>ReceiveCoinsDialog</name>
     <message>
-        <source>R&amp;euse an existing receiving address (not recommended)</source>
-        <translation>既存の受取用アドレスを再利用する (非推奨) (&amp;E)</translation>
+        <source>Information about PrivateSend and Mixing</source>
+        <translation>プライベートセンドとミキシングの情報</translation>
     </message>
     <message>
-        <source>&amp;Message:</source>
-        <translation>メッセージ (&amp;M)：</translation>
+        <source>Info</source>
+        <translation>情報</translation>
     </message>
     <message>
-        <source>An optional label to associate with the new receiving address.</source>
-        <translation>受取用アドレスに紐づく任意のラベル。</translation>
+        <source>Amount and Rounds:</source>
+        <translation>金額とラウンド</translation>
     </message>
     <message>
-        <source>Use this form to request payments. All fields are &lt;b&gt;optional&lt;/b&gt;.</source>
-        <translation>このフォームを使用して支払のリクエストを行いましょう。すべての項目は&lt;b&gt;任意入力&lt;/b&gt;です。</translation>
+        <source>0 DASH / 0 Rounds</source>
+        <translation>0 DASH / 0 ラウンド</translation>
     </message>
     <message>
-        <source>&amp;Label:</source>
-        <translation>ラベル (&amp;L)：</translation>
+        <source>Submitted Denom:</source>
+        <translation>通貨単位:</translation>
     </message>
     <message>
-        <source>An optional amount to request. Leave this empty or zero to not request a specific amount.</source>
-        <translation>リクエストする任意の金額。特定の金額をリクエストするのでない場合には、この欄は空白のままかゼロにしてください。</translation>
+        <source>n/a</source>
+        <translation>N/A</translation>
     </message>
     <message>
-        <source>&amp;Amount:</source>
-        <translation>総額 (&amp;A)：</translation>
+        <source>Recent transactions</source>
+        <translation>直近のトランザクション</translation>
     </message>
     <message>
-        <source>&amp;Request payment</source>
-        <translation>支払をリクエストする (&amp;R)</translation>
+        <source>Start/Stop Mixing</source>
+        <translation>ミキシング開始/停止 </translation>
     </message>
     <message>
-        <source>Clear all fields of the form.</source>
-        <translation>全ての入力項目をクリア</translation>
+        <source>PrivateSend Balance:</source>
+        <translation>プライベートセンド残高:</translation>
     </message>
     <message>
-        <source>Clear</source>
-        <translation>クリア</translation>
+        <source>The denominations you submitted to the Masternode.&lt;br&gt;To mix, other users must submit the exact same denominations.</source>
+        <translation>マスターノードに送った通貨単位&lt;br&gt;ミキシングをするには他のユーザーが正確に同じ通貨単位を送る必要があります。</translation>
     </message>
     <message>
-        <source>Requested payments history</source>
-        <translation>支払リクエスト履歴</translation>
+        <source>(Last Message)</source>
+        <translation>(最新メッセージ)</translation>
     </message>
     <message>
-        <source>Show the selected request (does the same as double clicking an entry)</source>
-        <translation>選択されたリクエストを表示する（項目をダブルクリックすることでも表示できます）</translation>
+        <source>Try Mix</source>
+        <translation>ミキシング開始</translation>
     </message>
     <message>
-        <source>Show</source>
-        <translation>表示</translation>
+        <source>Reset</source>
+        <translation>リセット</translation>
     </message>
     <message>
-        <source>Remove the selected entries from the list</source>
-        <translation>リストから選択項目を削除</translation>
+        <source>out of sync</source>
+        <translation>未同期</translation>
     </message>
     <message>
-        <source>Remove</source>
-        <translation>削除</translation>
+        <source>Automatic backups are disabled, no mixing available!</source>
+        <translation>自動バックアップが無効でミキシングは利用不可能です！</translation>
     </message>
     <message>
-        <source>Copy label</source>
-        <translation>ラベルをコピーする</translation>
+        <source>Start Mixing</source>
+        <translation>ミキシング開始</translation>
     </message>
     <message>
-        <source>Copy message</source>
-        <translation>メッセージをコピーする</translation>
+        <source>Stop Mixing</source>
+        <translation>ミキシング停止</translation>
     </message>
     <message>
-        <source>Copy amount</source>
-        <translation>総額のコピー</translation>
+        <source>No inputs detected</source>
+        <translation>インプットが検知できません</translation>
+    </message>
+    <message numerus="yes">
+        <source>%n Rounds</source>
+        <translation><numerusform>%n ラウンド</numerusform></translation>
     </message>
-</context>
-<context>
-    <name>ReceiveRequestDialog</name>
     <message>
-        <source>QR Code</source>
-        <translation>QR コード</translation>
+        <source>Found enough compatible inputs to anonymize %1</source>
+        <translation> %1 を匿名化するのに十分なインプットを検知しました。</translation>
     </message>
     <message>
-        <source>Copy &amp;URI</source>
-        <translation>URI をコピーする (&amp;U)</translation>
+        <source>Not enough compatible inputs to anonymize &lt;span style='color:red;'&gt;%1&lt;/span&gt;,&lt;br&gt;will anonymize &lt;span style='color:red;'&gt;%2&lt;/span&gt; instead</source>
+        <translation> &lt;span style='color:red;'&gt;%1&lt;/span&gt;を匿名化するのに十分なインプットがありません、&lt;br&gt; &lt;span style='color:red;'&gt;%2&lt;/span&gt; を代わりに匿名化します。</translation>
     </message>
     <message>
-        <source>Copy &amp;Address</source>
-        <translation>アドレスをコピーする (&amp;A)</translation>
+        <source>Overall progress</source>
+        <translation>すべての進捗</translation>
     </message>
     <message>
-        <source>&amp;Save Image...</source>
-        <translation>画像を保存… (&amp;S)</translation>
+        <source>Denominated</source>
+        <translation>ミキシング準備完了</translation>
     </message>
     <message>
-        <source>Request payment to %1</source>
-        <translation>%1 への支払いリクエストを行う</translation>
+        <source>Mixed</source>
+        <translation>ミキシング完了</translation>
     </message>
     <message>
-        <source>Payment information</source>
-        <translation>支払い情報</translation>
+        <source>Anonymized</source>
+        <translation>匿名化完了</translation>
+    </message>
+    <message numerus="yes">
+        <source>Denominated inputs have %5 of %n rounds on average</source>
+        <translation><numerusform>分割されるインプットは平均的に %5 ／ %n ラウンド です。</numerusform></translation>
     </message>
     <message>
-        <source>URI</source>
-        <translation>URI</translation>
+        <source>keys left: %1</source>
+        <translation>残されたキー: %1</translation>
     </message>
     <message>
-        <source>Address</source>
-        <translation>アドレス</translation>
+        <source>Disabled</source>
+        <translation>無効</translation>
     </message>
     <message>
-        <source>Amount</source>
-        <translation>総額</translation>
+        <source>Very low number of keys left since last automatic backup!</source>
+        <translation>前回の自動バックアップから残されたキーの数がほとんどありません！</translation>
     </message>
     <message>
-        <source>Label</source>
-        <translation>ラベル</translation>
+        <source>We are about to create a new automatic backup for you, however &lt;span style='color:red;'&gt; you should always make sure you have backups saved in some safe place&lt;/span&gt;!</source>
+        <translation>新しい自動バックアップを作成しますが、 &lt;span style='color:red;'&gt; 常にバックアップを安全な場所に作成してください&lt;/span&gt;!</translation>
     </message>
     <message>
-        <source>Message</source>
-        <translation>メッセージ</translation>
+        <source>Note: You can turn this message off in options.</source>
+        <translation>注記: このメッセージはオプションで非表示にできます。</translation>
     </message>
     <message>
-        <source>Resulting URI too long, try to reduce the text for label / message.</source>
-        <translation>URI が長くなり過ぎます。ラベルやメッセージのテキストを短くしてください。</translation>
+        <source>WARNING! Something went wrong on automatic backup</source>
+        <translation>警告! 自動バックアップに異常が生じています。</translation>
     </message>
     <message>
-        <source>Error encoding URI into QR Code.</source>
-        <translation>QR コード用の URI エンコードでエラー。</translation>
+        <source>ERROR! Failed to create automatic backup</source>
+        <translation>エラー! 自動バックアップ作成に失敗しました。</translation>
     </message>
-</context>
-<context>
-    <name>RecentRequestsTableModel</name>
     <message>
-        <source>Date</source>
-        <translation>日付</translation>
+        <source>Mixing is disabled, please close your wallet and fix the issue!</source>
+        <translation>ミキシングは無効です。ウォレットを閉じて問題を解決してください。</translation>
     </message>
     <message>
-        <source>Label</source>
-        <translation>ラベル</translation>
+        <source>Enabled</source>
+        <translation>有効</translation>
     </message>
     <message>
-        <source>Message</source>
-        <translation>メッセージ</translation>
+        <source>see debug.log for details.</source>
+        <translation>詳細を debug.log で確認</translation>
     </message>
     <message>
-        <source>Amount</source>
-        <translation>総額</translation>
+        <source>WARNING! Failed to replenish keypool, please unlock your wallet to do so.</source>
+        <translation>警告! キープールの補充に失敗しました。ウォレットをアンロックしてキープールを補充してください</translation>
     </message>
     <message>
-        <source>(no label)</source>
-        <translation>（ラベル無し）</translation>
+        <source>Last PrivateSend message:
+</source>
+        <translation>最後のプライベートセンドのメッセージ:
+</translation>
     </message>
     <message>
-        <source>(no message)</source>
-        <translation>（メッセージなし）</translation>
+        <source>N/A</source>
+        <translation>N/A</translation>
     </message>
     <message>
-        <source>(no amount)</source>
-        <translation>（金額なし）</translation>
+        <source>PrivateSend was successfully reset.</source>
+        <translation>プライベートセンドのリセットに成功しました。</translation>
     </message>
-</context>
-<context>
-    <name>SendCoinsDialog</name>
     <message>
-        <source>Send Coins</source>
-        <translation>コインを送る</translation>
+        <source>If you don't want to see internal PrivateSend fees/transactions select "Most Common" as Type on the "Transactions" tab.</source>
+        <translation>プライベートセンドのトランザクションや手数料を非表示にしたい場合はトランザクションタブ上で”通常”をタイプとして選択してください。</translation>
     </message>
     <message>
-        <source>Coin Control Features</source>
-        <translation>コインコントロール機能</translation>
+        <source>PrivateSend requires at least %1 to use.</source>
+        <translation>プライベートセンドは最低 %1 使用します。</translation>
     </message>
     <message>
-        <source>Inputs...</source>
-        <translation>入力…</translation>
+        <source>Wallet is locked and user declined to unlock. Disabling PrivateSend.</source>
+        <translation>ウォレットはロックされ、ユーザーはアンロックを拒否しました。プライベートセンドを無効にします。</translation>
     </message>
+</context>
+<context>
+    <name>PaymentServer</name>
     <message>
-        <source>automatically selected</source>
-        <translation>自動選択</translation>
+        <source>Payment request error</source>
+        <translation>支払いリクエストのエラー</translation>
     </message>
     <message>
-        <source>Insufficient funds!</source>
-        <translation>残高不足です！</translation>
+        <source>Cannot start dash: click-to-pay handler</source>
+        <translation>Dash を起動できません: click-to-pay ハンドラー</translation>
     </message>
     <message>
-        <source>Quantity:</source>
-        <translation>数量：</translation>
+        <source>URI handling</source>
+        <translation>URI のハンドリング</translation>
     </message>
     <message>
-        <source>Bytes:</source>
-        <translation>バイト：</translation>
+        <source>Payment request fetch URL is invalid: %1</source>
+        <translation>支払いリクエストの取得先URLが無効です： %1</translation>
     </message>
     <message>
-        <source>Amount:</source>
-        <translation>総額：</translation>
+        <source>Invalid payment address %1</source>
+        <translation>支払いのアドレス　%1　は無効です</translation>
     </message>
     <message>
-        <source>Priority:</source>
-        <translation>優先度：</translation>
+        <source>URI cannot be parsed! This can be caused by an invalid Dash address or malformed URI parameters.</source>
+        <translation>URI を解析できません! これは無効な Dash アドレスあるいは不正な形式の URI パラメーターによって引き起こされた可能性があります。</translation>
     </message>
     <message>
-        <source>medium</source>
-        <translation>中</translation>
+        <source>Payment request file handling</source>
+        <translation>支払いリクエストファイルを処理しています</translation>
     </message>
     <message>
-        <source>Fee:</source>
-        <translation>手数料：</translation>
+        <source>Payment request file cannot be read! This can be caused by an invalid payment request file.</source>
+        <translation>支払いリクエストファイルを読み込めませんでした！無効な支払いリクエストファイルが原因である可能性があります。</translation>
     </message>
     <message>
-        <source>Dust:</source>
-        <translation>ダスト：</translation>
+        <source>Payment request rejected</source>
+        <translation>支払い要求は拒否されました</translation>
     </message>
     <message>
-        <source>no</source>
-        <translation>いいえ</translation>
+        <source>Payment request network doesn't match client network.</source>
+        <translation>支払いリクエストのネットワークは現在のクライアントのネットワークに一致しません。</translation>
     </message>
     <message>
-        <source>After Fee:</source>
-        <translation>手数料差引後：</translation>
+        <source>Payment request expired.</source>
+        <translation>支払いリクエストの期限が切れました。</translation>
     </message>
     <message>
-        <source>Change:</source>
-        <translation>釣り銭：</translation>
+        <source>Payment request is not initialized.</source>
+        <translation>支払いリクエストは開始されていません。</translation>
     </message>
     <message>
-        <source>If this is activated, but the change address is empty or invalid, change will be sent to a newly generated address.</source>
-        <translation>これが有効にもかかわらずおつりアドレスが空欄であったり無効であった場合には、おつりは新しく生成されたアドレスへ送金されます。</translation>
+        <source>Unverified payment requests to custom payment scripts are unsupported.</source>
+        <translation>カスタム支払いスクリプトに対する未検証の支払いリクエストはサポートされていません。</translation>
     </message>
     <message>
-        <source>Custom change address</source>
-        <translation>カスタムおつりアドレス</translation>
+        <source>Invalid payment request.</source>
+        <translation>無効な支払いリクエスト。</translation>
     </message>
     <message>
-        <source>Transaction Fee:</source>
-        <translation>トランザクション手数料：</translation>
+        <source>Requested payment amount of %1 is too small (considered dust).</source>
+        <translation>リクエストされた支払い額 %1 は少なすぎます (ダストとみなされます)。</translation>
     </message>
     <message>
-        <source>Choose...</source>
-        <translation>選択…</translation>
+        <source>Refund from %1</source>
+        <translation>%1 からのリファンド</translation>
     </message>
     <message>
-        <source>collapse fee-settings</source>
-        <translation>手数料設定を折りたたむ</translation>
+        <source>Payment request %1 is too large (%2 bytes, allowed %3 bytes).</source>
+        <translation>支払リクエスト %1 は大きすぎます（%2bytesですが、上限%3bytesまで許されます）。</translation>
     </message>
     <message>
-        <source>per kilobyte</source>
-        <translation>1キロバイトあたり手数料</translation>
+        <source>Error communicating with %1: %2</source>
+        <translation>%1: %2とコミュニケーションエラー</translation>
     </message>
     <message>
-        <source>total at least</source>
-        <translation>最小手数料</translation>
+        <source>Payment request cannot be parsed!</source>
+        <translation>支払いリクエストを読み込めませんでした！</translation>
     </message>
     <message>
-        <source>(read the tooltip)</source>
-        <translation>（ツールチップをお読みください）</translation>
+        <source>Bad response from server %1</source>
+        <translation>サーバー %1のレスポンスは無効</translation>
     </message>
     <message>
-        <source>Recommended:</source>
-        <translation>推奨：</translation>
+        <source>Network request error</source>
+        <translation>ネットワークリクエストのエラー</translation>
     </message>
     <message>
-        <source>Custom:</source>
-        <translation>カスタム：</translation>
+        <source>Payment acknowledged</source>
+        <translation>支払いを確認しました</translation>
     </message>
+</context>
+<context>
+    <name>PeerTableModel</name>
     <message>
-        <source>(Smart fee not initialized yet. This usually takes a few blocks...)</source>
-        <translation>（スマート手数料はまだ初期化されていません。これにはおおよそ数ブロックほどかかります…）</translation>
+        <source>NodeId</source>
+        <translation>ノードID</translation>
     </message>
     <message>
-        <source>Confirmation time:</source>
-        <translation>検証時間：</translation>
+        <source>Node/Service</source>
+        <translation>ノード/サービス</translation>
     </message>
     <message>
-        <source>normal</source>
-        <translation>普通</translation>
+        <source>User Agent</source>
+        <translation>ユーザーエージェント</translation>
     </message>
     <message>
-        <source>fast</source>
-        <translation>高速</translation>
+        <source>Ping</source>
+        <translation>Ping</translation>
     </message>
+</context>
+<context>
+    <name>QObject</name>
     <message>
-        <source>Send as zero-fee transaction if possible</source>
-        <translation>可能な場合には手数料ゼロのトランザクションとして送金する</translation>
+        <source>Dash Core</source>
+        <translation>Dashコア</translation>
     </message>
     <message>
-        <source>(confirmation may take longer)</source>
-        <translation>（検証に長い時間がかかる可能性があります）</translation>
+        <source>%1 didn't yet exit safely...</source>
+        <translation>%1 はまだ安全に終了していません</translation>
     </message>
     <message>
-        <source>Confirm the send action</source>
-        <translation>送る操作を確認する</translation>
+        <source>Error reading masternode configuration file: %1</source>
+        <translation>マスターノード設定ファイルの読み込みエラー: %1</translation>
     </message>
     <message>
-        <source>S&amp;end</source>
-        <translation>送る (&amp;e)</translation>
+        <source>Amount</source>
+        <translation>総額</translation>
     </message>
     <message>
-        <source>Clear all fields of the form.</source>
-        <translation>全ての入力項目をクリア</translation>
+        <source>Enter a Dash address (e.g. %1)</source>
+        <translation>Dashアドレスを入力してください (例 %1)</translation>
     </message>
     <message>
-        <source>Clear &amp;All</source>
-        <translation>すべてクリア (&amp;A)</translation>
+        <source>%1 d</source>
+        <translation>%1日</translation>
     </message>
     <message>
-        <source>Send to multiple recipients at once</source>
-        <translation>一度に複数の人に送る</translation>
+        <source>%1 h</source>
+        <translation>%1時</translation>
     </message>
     <message>
-        <source>Add &amp;Recipient</source>
-        <translation>受取人を追加 (&amp;R)</translation>
+        <source>%1 m</source>
+        <translation>%1分</translation>
     </message>
     <message>
-        <source>Balance:</source>
-        <translation>残高：</translation>
+        <source>%1 s</source>
+        <translation>%1秒</translation>
     </message>
     <message>
-        <source>Copy quantity</source>
-        <translation>数量をコピーする</translation>
+        <source>None</source>
+        <translation>なし</translation>
     </message>
     <message>
-        <source>Copy amount</source>
-        <translation>総額のコピー</translation>
+        <source>N/A</source>
+        <translation>N/A</translation>
     </message>
     <message>
-        <source>Copy fee</source>
-        <translation>手数料をコピーする</translation>
+        <source>%1 ms</source>
+        <translation>%1ミリ秒</translation>
+    </message>
+    <message numerus="yes">
+        <source>%n second(s)</source>
+        <translation><numerusform>%n 秒</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>%n minute(s)</source>
+        <translation><numerusform>%n 分</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>%n hour(s)</source>
+        <translation><numerusform>%n 時間</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>%n day(s)</source>
+        <translation><numerusform>%n 日</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>%n week(s)</source>
+        <translation><numerusform>%n 週</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>%n year(s)</source>
+        <translation><numerusform>%n 年</numerusform></translation>
     </message>
     <message>
-        <source>Copy after fee</source>
-        <translation>手数料差引後の値をコピーする</translation>
+        <source>%1 and %2</source>
+        <translation>%1 と %2</translation>
     </message>
     <message>
-        <source>Copy bytes</source>
-        <translation>バイト数をコピーする</translation>
+        <source>unknown</source>
+        <translation>未確認</translation>
     </message>
+</context>
+<context>
+    <name>QObject::QObject</name>
     <message>
-        <source>Copy priority</source>
-        <translation>優先度をコピーする</translation>
+        <source>Error: Specified data directory "%1" does not exist.</source>
+        <translation>エラー: 指定のデータディレクトリ "%1" は存在しません</translation>
     </message>
     <message>
-        <source>Copy dust</source>
-        <translation>ダストをコピーする</translation>
+        <source>Error: Cannot parse configuration file: %1. Only use key=value syntax.</source>
+        <translation>エラー: 設定ファイル: %1をパースできません。key=value という記法のみを利用してください。</translation>
+    </message>
+    <message>
+        <source>Error: %1</source>
+        <translation>エラー: %1</translation>
+    </message>
+</context>
+<context>
+    <name>QRDialog</name>
+    <message>
+        <source>QR-Code Title</source>
+        <translation>QRコードタイトル</translation>
+    </message>
+    <message>
+        <source>QR Code</source>
+        <translation>QRコード</translation>
+    </message>
+    <message>
+        <source>&amp;Save Image...</source>
+        <translation>画像を保存...(&amp;S)</translation>
+    </message>
+    <message>
+        <source>Error creating QR Code.</source>
+        <translation>QRコード生成エラー</translation>
+    </message>
+</context>
+<context>
+    <name>QRGeneralImageWidget</name>
+    <message>
+        <source>&amp;Save Image...</source>
+        <translation>画像を保存...(&amp;S)</translation>
+    </message>
+    <message>
+        <source>&amp;Copy Image</source>
+        <translation>画像をコピー(&amp;C)</translation>
+    </message>
+    <message>
+        <source>Save QR Code</source>
+        <translation>QR コードの保存</translation>
+    </message>
+    <message>
+        <source>PNG Image (*.png)</source>
+        <translation>PNG画像ファイル(*.png)</translation>
+    </message>
+</context>
+<context>
+    <name>QRImageWidget</name>
+    <message>
+        <source>&amp;Save Image...</source>
+        <translation>画像を保存… (&amp;S)</translation>
+    </message>
+    <message>
+        <source>&amp;Copy Image</source>
+        <translation>画像をコピー(&amp;C)</translation>
+    </message>
+    <message>
+        <source>Save QR Code</source>
+        <translation>QR コードの保存</translation>
+    </message>
+    <message>
+        <source>PNG Image (*.png)</source>
+        <translation>PNG画像ファイル(*.png)</translation>
+    </message>
+</context>
+<context>
+    <name>RPCConsole</name>
+    <message>
+        <source>Tools window</source>
+        <translation>ツールウィンドウ</translation>
+    </message>
+    <message>
+        <source>&amp;Information</source>
+        <translation>インフォメーション (&amp;I)</translation>
+    </message>
+    <message>
+        <source>General</source>
+        <translation>一般</translation>
+    </message>
+    <message>
+        <source>Name</source>
+        <translation>名前</translation>
+    </message>
+    <message>
+        <source>N/A</source>
+        <translation>N/A</translation>
+    </message>
+    <message>
+        <source>Number of connections</source>
+        <translation>接続数</translation>
+    </message>
+    <message>
+        <source>&amp;Open</source>
+        <translation>開く (&amp;O)</translation>
+    </message>
+    <message>
+        <source>Startup time</source>
+        <translation>起動した日時</translation>
+    </message>
+    <message>
+        <source>Network</source>
+        <translation>ネットワーク</translation>
+    </message>
+    <message>
+        <source>Last block time</source>
+        <translation>最終ブロックの日時</translation>
+    </message>
+    <message>
+        <source>Debug log file</source>
+        <translation>デバッグ用ログファイル</translation>
+    </message>
+    <message>
+        <source>Current number of blocks</source>
+        <translation>現在のブロック数</translation>
+    </message>
+    <message>
+        <source>Client version</source>
+        <translation>クライアントのバージョン</translation>
+    </message>
+    <message>
+        <source>Using BerkeleyDB version</source>
+        <translation>使用中のBerkleyDBバージョン</translation>
+    </message>
+    <message>
+        <source>Block chain</source>
+        <translation>ブロックチェーン</translation>
+    </message>
+    <message>
+        <source>Number of Masternodes</source>
+        <translation>マスターノードの数</translation>
+    </message>
+    <message>
+        <source>Memory Pool</source>
+        <translation>メモリープール</translation>
+    </message>
+    <message>
+        <source>Current number of transactions</source>
+        <translation>現在のトランザクション数</translation>
+    </message>
+    <message>
+        <source>Memory usage</source>
+        <translation>メモリ使用量</translation>
+    </message>
+    <message>
+        <source>&amp;Console</source>
+        <translation>コンソール (&amp;C)</translation>
+    </message>
+    <message>
+        <source>Clear console</source>
+        <translation>コンソールをクリア</translation>
+    </message>
+    <message>
+        <source>&amp;Network Traffic</source>
+        <translation>ネットワークトラフィック (&amp;N)</translation>
+    </message>
+    <message>
+        <source>&amp;Clear</source>
+        <translation>クリア(&amp;C)</translation>
+    </message>
+    <message>
+        <source>Totals</source>
+        <translation>合計</translation>
+    </message>
+    <message>
+        <source>Received</source>
+        <translation>受取完了</translation>
+    </message>
+    <message>
+        <source>Sent</source>
+        <translation>送金完了</translation>
+    </message>
+    <message>
+        <source>&amp;Peers</source>
+        <translation>ピア (&amp;P)</translation>
+    </message>
+    <message>
+        <source>Banned peers</source>
+        <translation>Banされたピア</translation>
+    </message>
+    <message>
+        <source>Select a peer to view detailed information.</source>
+        <translation>詳細を確認したいピアを選択してください。</translation>
+    </message>
+    <message>
+        <source>Whitelisted</source>
+        <translation>ホワイトリスト</translation>
+    </message>
+    <message>
+        <source>Direction</source>
+        <translation>ディレクション</translation>
+    </message>
+    <message>
+        <source>Version</source>
+        <translation>バージョン</translation>
+    </message>
+    <message>
+        <source>Starting Block</source>
+        <translation>開始ブロック</translation>
+    </message>
+    <message>
+        <source>Synced Headers</source>
+        <translation>同期済みヘッダ</translation>
+    </message>
+    <message>
+        <source>Synced Blocks</source>
+        <translation>同期済みブロック</translation>
+    </message>
+    <message>
+        <source>Wallet Path</source>
+        <translation>ウォレットパス</translation>
+    </message>
+    <message>
+        <source>User Agent</source>
+        <translation>ユーザーエージェント</translation>
+    </message>
+    <message>
+        <source>Datadir</source>
+        <translation>データディレクトリ</translation>
+    </message>
+    <message>
+        <source>Open the %1 debug log file from the current data directory. This can take a few seconds for large log files.</source>
+        <translation>現在のデータディレクトリから %1 デバッグ用ログファイルを開きます。ログファイルが巨大な場合数秒かかることがあります。</translation>
+    </message>
+    <message>
+        <source>Decrease font size</source>
+        <translation>文字サイズを縮小</translation>
+    </message>
+    <message>
+        <source>Increase font size</source>
+        <translation>文字サイズを拡大</translation>
+    </message>
+    <message>
+        <source>Services</source>
+        <translation>サービス</translation>
+    </message>
+    <message>
+        <source>Ban Score</source>
+        <translation>Banスコア</translation>
+    </message>
+    <message>
+        <source>Connection Time</source>
+        <translation>接続時間</translation>
+    </message>
+    <message>
+        <source>Last Send</source>
+        <translation>最終送信</translation>
+    </message>
+    <message>
+        <source>Last Receive</source>
+        <translation>最終受信</translation>
+    </message>
+    <message>
+        <source>Ping Time</source>
+        <translation>Ping時間</translation>
+    </message>
+    <message>
+        <source>The duration of a currently outstanding ping.</source>
+        <translation>現在実行中のpingにかかっている時間</translation>
+    </message>
+    <message>
+        <source>Ping Wait</source>
+        <translation>Ping待ち</translation>
+    </message>
+    <message>
+        <source>Min Ping</source>
+        <translation>最小Ping</translation>
+    </message>
+    <message>
+        <source>Time Offset</source>
+        <translation>時間オフセット</translation>
+    </message>
+    <message>
+        <source>&amp;Wallet Repair</source>
+        <translation>ウォレット修復（&amp;W)</translation>
+    </message>
+    <message>
+        <source>Salvage wallet</source>
+        <translation>ウォレットの救出</translation>
+    </message>
+    <message>
+        <source>Rescan blockchain files</source>
+        <translation>ブロックチェーンファイルの再スキャン</translation>
+    </message>
+    <message>
+        <source>Recover transactions 1</source>
+        <translation>トランザクション1のリカバー</translation>
+    </message>
+    <message>
+        <source>Recover transactions 2</source>
+        <translation>トランザクション2のリカバー</translation>
+    </message>
+    <message>
+        <source>Upgrade wallet format</source>
+        <translation>ウォレットフォーマットのアップグレード</translation>
+    </message>
+    <message>
+        <source>The buttons below will restart the wallet with command-line options to repair the wallet, fix issues with corrupt blockhain files or missing/obsolete transactions.</source>
+        <translation>このボタンは、過去の不明なトランザクションや問題のあるブロックチェーンファイルによるバグを修復するためコマンドラインオプションを使用してウォレットをリスタートします。</translation>
+    </message>
+    <message>
+        <source>-salvagewallet: Attempt to recover private keys from a corrupt wallet.dat.</source>
+        <translation>-salvagewallet: 問題のある wallet.dat からプライベートキーをリカバーします</translation>
+    </message>
+    <message>
+        <source>-rescan: Rescan the block chain for missing wallet transactions.</source>
+        <translation>-rescan: 不明なウォレットトランザクションがあるためブロックチェーンを再スキャンします</translation>
+    </message>
+    <message>
+        <source>-zapwallettxes=1: Recover transactions from blockchain (keep meta-data, e.g. account owner).</source>
+        <translation>-zapwallettxes=1: ブロックチェーンからトランザクションをリカバーします(メタデータは保持します　例　アカウントオーナー)</translation>
+    </message>
+    <message>
+        <source>-zapwallettxes=2: Recover transactions from blockchain (drop meta-data).</source>
+        <translation>-zapwallettxes=2: ブロックチェーンからトランザクションをリカバーします (メタデータは保持しません)</translation>
+    </message>
+    <message>
+        <source>-upgradewallet: Upgrade wallet to latest format on startup. (Note: this is NOT an update of the wallet itself!)</source>
+        <translation>-upgradewallet: 起動時にウォレットを最新のフォーマットにアップグレードします(注意: これはウォレット自体のアップグレードではありません！)</translation>
+    </message>
+    <message>
+        <source>Wallet repair options.</source>
+        <translation>ウォレット修復オプション</translation>
+    </message>
+    <message>
+        <source>Rebuild index</source>
+        <translation>インデックスのリビルド</translation>
+    </message>
+    <message>
+        <source>-reindex: Rebuild block chain index from current blk000??.dat files.</source>
+        <translation>-reindex: 現在の blk000??.dat ファイルからブロックチェーンインデックスをリビルドします</translation>
+    </message>
+    <message>
+        <source>&amp;Disconnect</source>
+        <translation>切断 (&amp;D)</translation>
+    </message>
+    <message>
+        <source>Ban for</source>
+        <translation>Banする:</translation>
+    </message>
+    <message>
+        <source>1 &amp;hour</source>
+        <translation>1時間 (&amp;H)</translation>
+    </message>
+    <message>
+        <source>1 &amp;day</source>
+        <translation>1日 (&amp;D)</translation>
+    </message>
+    <message>
+        <source>1 &amp;week</source>
+        <translation>1週間 (&amp;W)</translation>
+    </message>
+    <message>
+        <source>1 &amp;year</source>
+        <translation>1年 (&amp;Y)</translation>
+    </message>
+    <message>
+        <source>&amp;Unban</source>
+        <translation>Banを解除する (&amp;U)</translation>
+    </message>
+    <message>
+        <source>Welcome to the %1 RPC console.</source>
+        <translation>%1 RPCコンソールへようこそ。</translation>
+    </message>
+    <message>
+        <source>Use up and down arrows to navigate history, and &lt;b&gt;Ctrl-L&lt;/b&gt; to clear screen.</source>
+        <translation>上下の矢印で履歴をたどれます。 &lt;b&gt;Ctrl-L&lt;/b&gt; でスクリーンをクリアにします。</translation>
+    </message>
+    <message>
+        <source>Type &lt;b&gt;help&lt;/b&gt; for an overview of available commands.</source>
+        <translation>使用可能なコマンドを見るには &lt;b&gt;help&lt;/b&gt; と入力してください</translation>
+    </message>
+    <message>
+        <source>WARNING: Scammers have been active, telling users to type commands here, stealing their wallet contents. Do not use this console without fully understanding the ramification of a command.</source>
+        <translation>警告: スキャマーがユーザーにコマンドをタイプさせウォレットを盗もうとすることがあります。コマンドを充分に理解しないでコンソールを使わないでください。</translation>
+    </message>
+    <message>
+        <source>In:</source>
+        <translation>入力：</translation>
+    </message>
+    <message>
+        <source>Out:</source>
+        <translation>出力：</translation>
+    </message>
+    <message>
+        <source>Network activity disabled</source>
+        <translation>ネットワーク活動は無効化されました</translation>
+    </message>
+    <message>
+        <source>%1 B</source>
+        <translation>%1 B</translation>
+    </message>
+    <message>
+        <source>%1 KB</source>
+        <translation>%1 KB</translation>
+    </message>
+    <message>
+        <source>%1 MB</source>
+        <translation>%1 MB</translation>
+    </message>
+    <message>
+        <source>%1 GB</source>
+        <translation>%1 GB</translation>
+    </message>
+    <message>
+        <source>(node id: %1)</source>
+        <translation>(ノードID: %1)</translation>
+    </message>
+    <message>
+        <source>via %1</source>
+        <translation>%1経由</translation>
+    </message>
+    <message>
+        <source>never</source>
+        <translation>一度もなし</translation>
+    </message>
+    <message>
+        <source>Inbound</source>
+        <translation>インバウンド</translation>
+    </message>
+    <message>
+        <source>Outbound</source>
+        <translation>アウトバウンド</translation>
+    </message>
+    <message>
+        <source>Yes</source>
+        <translation>はい</translation>
+    </message>
+    <message>
+        <source>No</source>
+        <translation>いいえ</translation>
+    </message>
+    <message>
+        <source>Unknown</source>
+        <translation>未知</translation>
+    </message>
+</context>
+<context>
+    <name>ReceiveCoinsDialog</name>
+    <message>
+        <source>Reuse one of the previously used receiving addresses.&lt;br&gt;Reusing addresses has security and privacy issues.&lt;br&gt;Do not use this unless re-generating a payment request made before.</source>
+        <translation>過去に使用した受け取り用アドレスを再使用します。&lt;br&gt;アドレスの再使用はセキュリティーとプライバシー保護に問題があります。&lt;br&gt;過去の支払いリクエストの再生成をしない限りこれを使用しないでください。</translation>
+    </message>
+    <message>
+        <source>R&amp;euse an existing receiving address (not recommended)</source>
+        <translation>既存の受け取り用アドレスを再使用する (非推奨) (&amp;E)</translation>
+    </message>
+    <message>
+        <source>An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Dash network.</source>
+        <translation>支払いリクエストが開始された時に表示される、支払いリクエストに添付される任意のメッセージです。注意：このメッセージはDashネットワークを通じて支払いと共に送信されるわけではありません。</translation>
+    </message>
+    <message>
+        <source>&amp;Message:</source>
+        <translation>メッセージ: (&amp;M)</translation>
+    </message>
+    <message>
+        <source>An optional label to associate with the new receiving address.</source>
+        <translation>新しい受け取り用アドレスに紐づく任意のラベル。</translation>
+    </message>
+    <message>
+        <source>An optional message to attach to the payment request, which will be displayed when the request is opened.&lt;br&gt;Note: The message will not be sent with the payment over the Dash network.</source>
+        <translation>支払いリクエストが開始された時に表示される、支払いリクエストに添付される任意のメッセージです。注意：このメッセージはDashネットワークを通じて支払いと共に送信されるわけではありません。</translation>
+    </message>
+    <message>
+        <source>Use this form to request payments. All fields are &lt;b&gt;optional&lt;/b&gt;.</source>
+        <translation>このフォームを使用して支払いのリクエストを行いましょう。すべての項目は&lt;b&gt;任意入力&lt;/b&gt;です。</translation>
+    </message>
+    <message>
+        <source>&amp;Label:</source>
+        <translation>ラベル (&amp;L)</translation>
+    </message>
+    <message>
+        <source>An optional amount to request. Leave this empty or zero to not request a specific amount.</source>
+        <translation>リクエストする任意の金額。特定の金額をリクエストしない場合にはこの欄は空白のままかゼロにしてください。</translation>
+    </message>
+    <message>
+        <source>&amp;Amount:</source>
+        <translation>総額 (&amp;A)</translation>
+    </message>
+    <message>
+        <source>&amp;Request payment</source>
+        <translation>支払いをリクエストする (&amp;R)</translation>
+    </message>
+    <message>
+        <source>Clear all fields of the form.</source>
+        <translation>このフォームの全ての入力項目をクリア</translation>
+    </message>
+    <message>
+        <source>Clear</source>
+        <translation>クリア</translation>
+    </message>
+    <message>
+        <source>Request InstantSend</source>
+        <translation>インスタントセンドのリクエスト</translation>
+    </message>
+    <message>
+        <source>Requested payments history</source>
+        <translation>支払いリクエスト履歴</translation>
+    </message>
+    <message>
+        <source>Show the selected request (does the same as double clicking an entry)</source>
+        <translation>選択されたリクエストを表示（項目をダブルクリックでも表示）</translation>
+    </message>
+    <message>
+        <source>Show</source>
+        <translation>表示</translation>
+    </message>
+    <message>
+        <source>Remove the selected entries from the list</source>
+        <translation>リストから選択項目を削除</translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation>削除</translation>
+    </message>
+    <message>
+        <source>Copy URI</source>
+        <translation>URI をコピー</translation>
+    </message>
+    <message>
+        <source>Copy label</source>
+        <translation>ラベルをコピーする</translation>
+    </message>
+    <message>
+        <source>Copy message</source>
+        <translation>メッセージをコピー</translation>
+    </message>
+    <message>
+        <source>Copy amount</source>
+        <translation>総額のコピー</translation>
+    </message>
+</context>
+<context>
+    <name>ReceiveRequestDialog</name>
+    <message>
+        <source>QR Code</source>
+        <translation>QRコード</translation>
+    </message>
+    <message>
+        <source>Copy &amp;URI</source>
+        <translation>URI をコピー (&amp;U)</translation>
+    </message>
+    <message>
+        <source>Copy &amp;Address</source>
+        <translation>アドレスをコピー(&amp;A)</translation>
+    </message>
+    <message>
+        <source>&amp;Save Image...</source>
+        <translation>画像を保存… (&amp;S)</translation>
+    </message>
+    <message>
+        <source>Request payment to %1</source>
+        <translation>%1 へ支払いリクエストを行う</translation>
+    </message>
+    <message>
+        <source>Payment information</source>
+        <translation>支払い情報</translation>
+    </message>
+    <message>
+        <source>URI</source>
+        <translation>URI</translation>
+    </message>
+    <message>
+        <source>Address</source>
+        <translation>アドレス</translation>
+    </message>
+    <message>
+        <source>Amount</source>
+        <translation>総額</translation>
+    </message>
+    <message>
+        <source>Label</source>
+        <translation>ラベル</translation>
+    </message>
+    <message>
+        <source>Message</source>
+        <translation>メッセージ</translation>
+    </message>
+    <message>
+        <source>InstantSend</source>
+        <translation>インスタントセンド</translation>
+    </message>
+    <message>
+        <source>Yes</source>
+        <translation>はい</translation>
+    </message>
+    <message>
+        <source>No</source>
+        <translation>いいえ</translation>
+    </message>
+    <message>
+        <source>Resulting URI too long, try to reduce the text for label / message.</source>
+        <translation>URI が長過ぎます。ラベルやメッセージのテキストを短くしてください。</translation>
+    </message>
+    <message>
+        <source>Error encoding URI into QR Code.</source>
+        <translation>QRコード用のURIエンコードエラー</translation>
+    </message>
+</context>
+<context>
+    <name>RecentRequestsTableModel</name>
+    <message>
+        <source>Date</source>
+        <translation>日付</translation>
+    </message>
+    <message>
+        <source>Label</source>
+        <translation>ラベル</translation>
+    </message>
+    <message>
+        <source>Message</source>
+        <translation>メッセージ</translation>
+    </message>
+    <message>
+        <source>(no label)</source>
+        <translation>（ラベル無し）</translation>
+    </message>
+    <message>
+        <source>(no message)</source>
+        <translation>（メッセージなし）</translation>
+    </message>
+    <message>
+        <source>(no amount requested)</source>
+        <translation>(金額指定なし)</translation>
+    </message>
+    <message>
+        <source>Requested</source>
+        <translation>リクエスト完了</translation>
+    </message>
+</context>
+<context>
+    <name>SendCoinsDialog</name>
+    <message>
+        <source>Send Coins</source>
+        <translation>送金</translation>
+    </message>
+    <message>
+        <source>Coin Control Features</source>
+        <translation>コインコントロール機能</translation>
+    </message>
+    <message>
+        <source>Inputs...</source>
+        <translation>インプット…</translation>
+    </message>
+    <message>
+        <source>automatically selected</source>
+        <translation>自動選択</translation>
+    </message>
+    <message>
+        <source>Insufficient funds!</source>
+        <translation>残高不足です！</translation>
+    </message>
+    <message>
+        <source>Quantity:</source>
+        <translation>数量：</translation>
+    </message>
+    <message>
+        <source>Bytes:</source>
+        <translation>バイト：</translation>
+    </message>
+    <message>
+        <source>Amount:</source>
+        <translation>総額：</translation>
+    </message>
+    <message>
+        <source>Fee:</source>
+        <translation>手数料：</translation>
+    </message>
+    <message>
+        <source>Dust:</source>
+        <translation>ダスト：</translation>
+    </message>
+    <message>
+        <source>After Fee:</source>
+        <translation>手数料差引後：</translation>
+    </message>
+    <message>
+        <source>Change:</source>
+        <translation>チェンジ：</translation>
+    </message>
+    <message>
+        <source>If this is activated, but the change address is empty or invalid, change will be sent to a newly generated address.</source>
+        <translation>これが有効にもかかわらずチェンジアドレスが空欄であったり無効な場合には、チェンジは新しく生成されたアドレスへ送金されます。</translation>
+    </message>
+    <message>
+        <source>Custom change address</source>
+        <translation>カスタマイズされたチェンジアドレス</translation>
+    </message>
+    <message>
+        <source>Transaction Fee:</source>
+        <translation>トランザクション手数料：</translation>
+    </message>
+    <message>
+        <source>Choose...</source>
+        <translation>選択…</translation>
+    </message>
+    <message>
+        <source>Using the fallbackfee can result in sending a transaction that will take several hours or days (or never) to confirm. Consider choosing your fee manually or wait until your have validated the complete chain.</source>
+        <translation>フォールバックフィー（fallbackfee）を使用するとトランザクションを送信するのに数時間から数日以上(または永久的に) 時間がかかります。手数料を手動で設定するか完全なブロックチェーンをバリデートするまで待ってください。</translation>
+    </message>
+    <message>
+        <source>Warning: Fee estimation is currently not possible.</source>
+        <translation>警告: トランザクション手数料を推定する機能は現在利用できません。</translation>
+    </message>
+    <message>
+        <source>collapse fee-settings</source>
+        <translation>手数料設定を非表示</translation>
+    </message>
+    <message>
+        <source>Confirmation time target:</source>
+        <translation>検証時間ターゲット:</translation>
+    </message>
+    <message>
+        <source>PrivateSend</source>
+        <translation>プライベートセンド</translation>
+    </message>
+    <message>
+        <source>InstantSend</source>
+        <translation>インスタントセンド</translation>
+    </message>
+    <message>
+        <source>If the custom fee is set to 1000 duffs and the transaction is only 250 bytes, then "per kilobyte" only pays 250 duffs in fee,&lt;br /&gt;while "at least" pays 1000 duffs. For transactions bigger than a kilobyte both pay by kilobyte.</source>
+        <translation>カスタマイズされた手数料が1000duffsに設定され、トランザクションが250 bytesしかなかった場合、キロバイトあたりでは250 duffsしか手数料を支払いませんが&lt;br /&gt;最低でも1000 duffs支払います。1キロバイト以上のトランザクションに対しては、1キロバイトあたり1000duffs支払います。</translation>
+    </message>
+    <message>
+        <source>If the custom fee is set to 1000 duffs and the transaction is only 250 bytes, then "per kilobyte" only pays 250 duffs in fee,&lt;br /&gt;while "total at least" pays 1000 duffs. For transactions bigger than a kilobyte both pay by kilobyte.</source>
+        <translation>カスタマイズされた手数料が1000duffsに設定され、トランザクションが250 bytesしかなかった場合、キロバイトあたりでは250 duffsしか手数料を支払いませんが&lt;br /&gt;最低でも合計1000 duffs支払います。1キロバイト以上のトランザクションに対しては、1キロバイトあたり1000duffs支払います。</translation>
+    </message>
+    <message>
+        <source>Paying only the minimum fee is just fine as long as there is less transaction volume than space in the blocks.&lt;br /&gt;But be aware that this can end up in a never confirming transaction once there is more demand for dash transactions than the network can process.</source>
+        <translation>最低限の手数料しか支払わなくても、トランザクション量以上のスペースが対象ブロックにあれば問題ありません。&lt;br /&gt;しかし、ネットワークが処理できる以上のDashのトランザクション需要があれば、処理されないトランザクションになり得ることに注意してください。</translation>
+    </message>
+    <message>
+        <source>per kilobyte</source>
+        <translation>1キロバイトあたり手数料</translation>
+    </message>
+    <message>
+        <source>Hide</source>
+        <translation>非表示</translation>
+    </message>
+    <message>
+        <source>total at least</source>
+        <translation>合計最小手数料</translation>
+    </message>
+    <message>
+        <source>(read the tooltip)</source>
+        <translation>（ツールチップをお読みください）</translation>
+    </message>
+    <message>
+        <source>Recommended:</source>
+        <translation>推奨：</translation>
+    </message>
+    <message>
+        <source>Custom:</source>
+        <translation>カスタム：</translation>
+    </message>
+    <message>
+        <source>(Smart fee not initialized yet. This usually takes a few blocks...)</source>
+        <translation>（スマート手数料はまだ初期化されていません。これには約数ブロックほどかかります…）</translation>
+    </message>
+    <message>
+        <source>normal</source>
+        <translation>ノーマル</translation>
+    </message>
+    <message>
+        <source>fast</source>
+        <translation>高速</translation>
+    </message>
+    <message>
+        <source>Confirm the send action</source>
+        <translation>送金確認</translation>
+    </message>
+    <message>
+        <source>S&amp;end</source>
+        <translation>送金 (&amp;E)</translation>
+    </message>
+    <message>
+        <source>Clear all fields of the form.</source>
+        <translation>全ての入力項目をクリア</translation>
+    </message>
+    <message>
+        <source>Clear &amp;All</source>
+        <translation>すべてクリア (&amp;A)</translation>
+    </message>
+    <message>
+        <source>Send to multiple recipients at once</source>
+        <translation>一度に複数のアドレスに送金</translation>
+    </message>
+    <message>
+        <source>Add &amp;Recipient</source>
+        <translation>受取人を追加 (&amp;R)</translation>
+    </message>
+    <message>
+        <source>Balance:</source>
+        <translation>残高：</translation>
+    </message>
+    <message>
+        <source>Copy quantity</source>
+        <translation>数量をコピー</translation>
+    </message>
+    <message>
+        <source>Copy amount</source>
+        <translation>総額のコピー</translation>
+    </message>
+    <message>
+        <source>Copy fee</source>
+        <translation>手数料をコピーす</translation>
+    </message>
+    <message>
+        <source>Copy after fee</source>
+        <translation>手数料差引後の金額をコピー</translation>
+    </message>
+    <message>
+        <source>Copy bytes</source>
+        <translation>バイト数をコピー</translation>
+    </message>
+    <message>
+        <source>Copy dust</source>
+        <translation>ダストをコピー</translation>
     </message>
     <message>
         <source>Copy change</source>
-        <translation>釣り銭をコピー</translation>
+        <translation>チェンジをコピー</translation>
+    </message>
+    <message>
+        <source>using</source>
+        <translation>使用中</translation>
+    </message>
+    <message>
+        <source>anonymous funds</source>
+        <translation>匿名化されたファンド</translation>
+    </message>
+    <message>
+        <source>(privatesend requires this amount to be rounded up to the nearest %1).</source>
+        <translation>(プライベートセンドはこの数値を %1までラウンドアップすることを要求します)</translation>
+    </message>
+    <message>
+        <source>any available funds (not anonymous)</source>
+        <translation>利用可能なファンド (匿名化されてない)</translation>
+    </message>
+    <message>
+        <source>and InstantSend</source>
+        <translation>／インスタントセンド</translation>
+    </message>
+    <message>
+        <source>%1 to %2</source>
+        <translation>%1 から %2</translation>
+    </message>
+    <message>
+        <source>Are you sure you want to send?</source>
+        <translation>送ってよろしいですか？</translation>
+    </message>
+    <message>
+        <source>are added as transaction fee</source>
+        <translation>：トランザクション手数料として追加されます</translation>
+    </message>
+    <message>
+        <source>Total Amount = &lt;b&gt;%1&lt;/b&gt;&lt;br /&gt;= %2</source>
+        <translation>トータルの金額 = &lt;b&gt;%1&lt;/b&gt;&lt;br /&gt;= %2</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;(%1 of %2 entries displayed)&lt;/b&gt;</source>
+        <translation>&lt;b&gt;(%1 ／%2 項目を表示)&lt;/b&gt;</translation>
+    </message>
+    <message>
+        <source>Confirm send coins</source>
+        <translation>送金確認</translation>
+    </message>
+    <message>
+        <source>The recipient address is not valid. Please recheck.</source>
+        <translation>受取アドレスが正しくありません。再チェックしてください。</translation>
+    </message>
+    <message>
+        <source>The amount to pay must be larger than 0.</source>
+        <translation>支払い額は0より大きくないといけません。</translation>
+    </message>
+    <message>
+        <source>The amount exceeds your balance.</source>
+        <translation>総額が残高を超えています。</translation>
+    </message>
+    <message>
+        <source>The total exceeds your balance when the %1 transaction fee is included.</source>
+        <translation>%1 の取引手数料を含めると総額が残高を超えています。</translation>
+    </message>
+    <message>
+        <source>Duplicate address found: addresses should only be used once each.</source>
+        <translation>重複したアドレスが見つかりました: アドレスは一度のみ使用することができます。</translation>
+    </message>
+    <message>
+        <source>Transaction creation failed!</source>
+        <translation>トラザクションの作成に失敗しました!</translation>
+    </message>
+    <message>
+        <source>The transaction was rejected with the following reason: %1</source>
+        <translation>トランザクションは以下の理由によりリジェクトされました: %1</translation>
+    </message>
+    <message>
+        <source>A fee higher than %1 is considered an absurdly high fee.</source>
+        <translation>%1 よりも高い手数料の場合手数料が異常に高すぎると判断されます。</translation>
+    </message>
+    <message>
+        <source>Payment request expired.</source>
+        <translation>支払いリクエストの期限が切れました。</translation>
+    </message>
+    <message numerus="yes">
+        <source>%n block(s)</source>
+        <translation><numerusform>%n ブロック</numerusform></translation>
+    </message>
+    <message>
+        <source>Pay only the required fee of %1</source>
+        <translation>リクエストされた手数料 %1 のみを支払う</translation>
+    </message>
+    <message numerus="yes">
+        <source>Estimated to begin confirmation within %n block(s).</source>
+        <translation><numerusform>%n ブロック以内に検証が開始されると予想されます</numerusform></translation>
+    </message>
+    <message>
+        <source>Warning: Invalid Dash address</source>
+        <translation>警告：Dashアドレスが無効です</translation>
+    </message>
+    <message>
+        <source>Warning: Unknown change address</source>
+        <translation>警告：未知のチェンジアドレスです</translation>
+    </message>
+    <message>
+        <source>Confirm custom change address</source>
+        <translation>カスタムチェンジアドレスを確認</translation>
+    </message>
+    <message>
+        <source>The address you selected for change is not part of this wallet. Any or all funds in your wallet may be sent to this address. Are you sure?</source>
+        <translation>チェンジとして指定されたアドレスはこのウォレットに属していません。このウォレットの一部またはすべてのファンドがこのアドレスへ送金されます。よろしいですか？</translation>
+    </message>
+    <message>
+        <source>(no label)</source>
+        <translation>（ラベル無し）</translation>
+    </message>
+</context>
+<context>
+    <name>SendCoinsEntry</name>
+    <message>
+        <source>This is a normal payment.</source>
+        <translation>これは通常の支払いです。</translation>
+    </message>
+    <message>
+        <source>Pay &amp;To:</source>
+        <translation>送り先: (&amp;T)</translation>
+    </message>
+    <message>
+        <source>The Dash address to send the payment to</source>
+        <translation>送金先Dashアドレス</translation>
+    </message>
+    <message>
+        <source>Choose previously used address</source>
+        <translation>以前に使用したアドレスを選択</translation>
+    </message>
+    <message>
+        <source>Alt+A</source>
+        <translation>Alt+A</translation>
+    </message>
+    <message>
+        <source>Paste address from clipboard</source>
+        <translation>クリップボードからアドレスをペースト</translation>
+    </message>
+    <message>
+        <source>Alt+P</source>
+        <translation>Alt+P</translation>
+    </message>
+    <message>
+        <source>Remove this entry</source>
+        <translation>この項目を削除</translation>
+    </message>
+    <message>
+        <source>&amp;Label:</source>
+        <translation>ラベル (&amp;L)</translation>
+    </message>
+    <message>
+        <source>Enter a label for this address to add it to the list of used addresses</source>
+        <translation>このアドレスに対するラベルを入力することで使用済みアドレスの一覧に追加することができます</translation>
+    </message>
+    <message>
+        <source>A&amp;mount:</source>
+        <translation>金額： (&amp;M)</translation>
+    </message>
+    <message>
+        <source>The fee will be deducted from the amount being sent. The recipient will receive a lower amount of Dash than you enter in the amount field. If multiple recipients are selected, the fee is split equally.</source>
+        <translation>手数料は総額から差し引かれます。受取人は入力した金額より少ないDashを受け取ります。複数の受取人を選択した場合、手数料は等しく分割されます。</translation>
+    </message>
+    <message>
+        <source>S&amp;ubtract fee from amount</source>
+        <translation>総額から手数料を差し引いて送金(&amp;U)</translation>
+    </message>
+    <message>
+        <source>Message:</source>
+        <translation>メッセージ：</translation>
+    </message>
+    <message>
+        <source>A message that was attached to the dash: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Dash network.</source>
+        <translation>Dash: URIに添付されていたメッセージです。これは参照用としてトランザクションとともに保存されます。注意：このメッセージはDashネットワークを経由して送信されるわけではありません。</translation>
+    </message>
+    <message>
+        <source>This is an unauthenticated payment request.</source>
+        <translation>これは未認証の支払いリクエストです。</translation>
+    </message>
+    <message>
+        <source>This is an authenticated payment request.</source>
+        <translation>これは認証済みの支払いリクエストです。</translation>
+    </message>
+    <message>
+        <source>Pay To:</source>
+        <translation>支払い先：</translation>
+    </message>
+    <message>
+        <source>Memo:</source>
+        <translation>メモ：</translation>
+    </message>
+    <message>
+        <source>Enter a label for this address to add it to your address book</source>
+        <translation>アドレス帳に追加するにはこのアドレスのラベルを入力します</translation>
+    </message>
+</context>
+<context>
+    <name>SendConfirmationDialog</name>
+    <message>
+        <source>Yes</source>
+        <translation>はい</translation>
+    </message>
+</context>
+<context>
+    <name>ShutdownWindow</name>
+    <message>
+        <source>%1 is shutting down...</source>
+        <translation>%1 をシャットダウンしています...</translation>
+    </message>
+    <message>
+        <source>Do not shut down the computer until this window disappears.</source>
+        <translation>このウィンドウが消えるまでコンピュータをシャットダウンしないで下さい。</translation>
+    </message>
+</context>
+<context>
+    <name>SignVerifyMessageDialog</name>
+    <message>
+        <source>Signatures - Sign / Verify a Message</source>
+        <translation>署名 - メッセージの署名/検証</translation>
+    </message>
+    <message>
+        <source>&amp;Sign Message</source>
+        <translation>メッセージの署名 (&amp;S)</translation>
+    </message>
+    <message>
+        <source>You can sign messages/agreements with your addresses to prove you can receive Dash sent to them. Be careful not to sign anything vague or random, as phishing attacks may try to trick you into signing your identity over to them. Only sign fully-detailed statements you agree to.</source>
+        <translation>あなたのアドレスを使用してあなたがDashを受け取ることができるようにメッセージやアグリーメントに署名できます。充分に詳細が判明していてあなたが確認しているものだけに署名してください。フィッシングによってあなたの署名を読み取られないように注意してください。</translation>
+    </message>
+    <message>
+        <source>The Dash address to sign the message with</source>
+        <translation>メッセージを署名する際に使用するDashアドレス</translation>
+    </message>
+    <message>
+        <source>Choose previously used address</source>
+        <translation>前に使用したアドレスを選ぶ</translation>
+    </message>
+    <message>
+        <source>Alt+A</source>
+        <translation>Alt+A</translation>
+    </message>
+    <message>
+        <source>Paste address from clipboard</source>
+        <translation>クリップボードからアドレスをペースト</translation>
+    </message>
+    <message>
+        <source>Alt+P</source>
+        <translation>Alt+P</translation>
+    </message>
+    <message>
+        <source>Enter the message you want to sign here</source>
+        <translation>ここにあなたが署名するメッセージを入力</translation>
+    </message>
+    <message>
+        <source>Signature</source>
+        <translation>署名</translation>
+    </message>
+    <message>
+        <source>Copy the current signature to the system clipboard</source>
+        <translation>現在の署名をシステムのクリップボードにコピー</translation>
+    </message>
+    <message>
+        <source>Sign the message to prove you own this Dash address</source>
+        <translation>この Dash アドレスを所有していることを証明するためにメッセージに署名</translation>
+    </message>
+    <message>
+        <source>Sign &amp;Message</source>
+        <translation>メッセージの署名 (&amp;M)</translation>
+    </message>
+    <message>
+        <source>Reset all sign message fields</source>
+        <translation>入力項目の内容をすべて消去</translation>
+    </message>
+    <message>
+        <source>Clear &amp;All</source>
+        <translation>すべてクリア (&amp;A)</translation>
+    </message>
+    <message>
+        <source>&amp;Verify Message</source>
+        <translation>メッセージの検証 (&amp;V)</translation>
+    </message>
+    <message>
+        <source>Enter the receiver's address, message (ensure you copy line breaks, spaces, tabs, etc. exactly) and signature below to verify the message. Be careful not to read more into the signature than what is in the signed message itself, to avoid being tricked by a man-in-the-middle attack. Note that this only proves the signing party receives with the address, it cannot prove sendership of any transaction!</source>
+        <translation>受取人のアドレスとメッセージ（改行やスペース、タブなども完全に一致するよう注意してください）および署名を以下に入力し、メッセージを検証してください。中間者攻撃により騙されるのを防ぐため、署名対象のメッセージに書かれていること以上の意味を署名から読み取ろうとしないよう注意してください。これは署名作成者がこのアドレスで受け取ることを証明するだけであり、トランザクションの送信者を証明するものではないことに注意してください！</translation>
+    </message>
+    <message>
+        <source>The Dash address the message was signed with</source>
+        <translation>メッセージの署名に使用されたDashアドレス</translation>
+    </message>
+    <message>
+        <source>Verify the message to ensure it was signed with the specified Dash address</source>
+        <translation>指定されたDashアドレスで署名されたことを確認するためメッセージを検証</translation>
+    </message>
+    <message>
+        <source>Verify &amp;Message</source>
+        <translation>メッセージの検証 (&amp;M)</translation>
+    </message>
+    <message>
+        <source>Reset all verify message fields</source>
+        <translation>入力項目の内容をすべて消去</translation>
+    </message>
+    <message>
+        <source>Click "Sign Message" to generate signature</source>
+        <translation>署名を作成するには"メッセージの署名"をクリックしてください</translation>
+    </message>
+    <message>
+        <source>The entered address is invalid.</source>
+        <translation>無効なアドレスが入力されました。</translation>
+    </message>
+    <message>
+        <source>Please check the address and try again.</source>
+        <translation>アドレスを確かめてからもう一度試してください。</translation>
+    </message>
+    <message>
+        <source>The entered address does not refer to a key.</source>
+        <translation>入力されたアドレスに関連するキーがありません。</translation>
+    </message>
+    <message>
+        <source>Wallet unlock was cancelled.</source>
+        <translation>ウォレットのアンロックはキャンセルされました。</translation>
+    </message>
+    <message>
+        <source>Private key for the entered address is not available.</source>
+        <translation>入力されたアドレスのプライベートキーは利用できません。</translation>
+    </message>
+    <message>
+        <source>Message signing failed.</source>
+        <translation>メッセージの署名に失敗しました。</translation>
+    </message>
+    <message>
+        <source>Message signed.</source>
+        <translation>メッセージに署名しました。</translation>
+    </message>
+    <message>
+        <source>The signature could not be decoded.</source>
+        <translation>署名はデコードできません。</translation>
+    </message>
+    <message>
+        <source>Please check the signature and try again.</source>
+        <translation>署名を確認してからもう一度試してください。</translation>
+    </message>
+    <message>
+        <source>The signature did not match the message digest.</source>
+        <translation>署名はメッセージダイジェストと一致しませんでした。</translation>
+    </message>
+    <message>
+        <source>Message verification failed.</source>
+        <translation>メッセージの検証に失敗しました。</translation>
+    </message>
+    <message>
+        <source>Message verified.</source>
+        <translation>メッセージは検証されました。</translation>
+    </message>
+</context>
+<context>
+    <name>SplashScreen</name>
+    <message>
+        <source>[testnet]</source>
+        <translation>[testnet]</translation>
+    </message>
+    <message>
+        <source>Version %1</source>
+        <translation>バージョン %1</translation>
+    </message>
+</context>
+<context>
+    <name>TrafficGraphWidget</name>
+    <message>
+        <source>KB/s</source>
+        <translation>KB/s</translation>
+    </message>
+</context>
+<context>
+    <name>TransactionDesc</name>
+    <message numerus="yes">
+        <source>Open for %n more block(s)</source>
+        <translation><numerusform>%n 以上のブロックをオープン</numerusform></translation>
+    </message>
+    <message>
+        <source>Open until %1</source>
+        <translation> %1 までオープン</translation>
+    </message>
+    <message>
+        <source>conflicted</source>
+        <translation>コンフリクト発生</translation>
+    </message>
+    <message>
+        <source>%1/offline</source>
+        <translation>%1/オフライン</translation>
+    </message>
+    <message>
+        <source>0/unconfirmed, %1</source>
+        <translation>0/未検証, %1</translation>
+    </message>
+    <message>
+        <source>in memory pool</source>
+        <translation>メモリプール内</translation>
+    </message>
+    <message>
+        <source>not in memory pool</source>
+        <translation>メモリプール外</translation>
+    </message>
+    <message>
+        <source>abandoned</source>
+        <translation>中止</translation>
+    </message>
+    <message>
+        <source>%1/unconfirmed</source>
+        <translation>%1/未検証</translation>
+    </message>
+    <message>
+        <source>%1 confirmations</source>
+        <translation>%1 確認</translation>
+    </message>
+    <message>
+        <source>verified via InstantSend</source>
+        <translation>インスタントセンド経由で検証済み</translation>
+    </message>
+    <message>
+        <source>InstantSend verification in progress - %1 of %2 signatures</source>
+        <translation>インスタントセンドによる検証の進捗 - %1 ／%2 署名</translation>
+    </message>
+    <message>
+        <source>InstantSend verification failed</source>
+        <translation>インスタントセンドによる検証失敗</translation>
+    </message>
+    <message>
+        <source>Status</source>
+        <translation>ステータス</translation>
+    </message>
+    <message>
+        <source>, has not been successfully broadcast yet</source>
+        <translation>ブロードキャストがまだ成功していません</translation>
+    </message>
+    <message numerus="yes">
+        <source>, broadcast through %n node(s)</source>
+        <translation><numerusform>%n ノードにブロードキャスト</numerusform></translation>
+    </message>
+    <message>
+        <source>Date</source>
+        <translation>日付</translation>
+    </message>
+    <message>
+        <source>Source</source>
+        <translation>ソース</translation>
+    </message>
+    <message>
+        <source>Generated</source>
+        <translation>生成済</translation>
+    </message>
+    <message>
+        <source>From</source>
+        <translation>送信元</translation>
+    </message>
+    <message>
+        <source>unknown</source>
+        <translation>未確認</translation>
+    </message>
+    <message>
+        <source>To</source>
+        <translation>送信先</translation>
+    </message>
+    <message>
+        <source>own address</source>
+        <translation>自分のアドレス</translation>
+    </message>
+    <message>
+        <source>watch-only</source>
+        <translation>監視のみ</translation>
+    </message>
+    <message>
+        <source>label</source>
+        <translation>ラベル</translation>
+    </message>
+    <message>
+        <source>Credit</source>
+        <translation>クレジット</translation>
+    </message>
+    <message numerus="yes">
+        <source>matures in %n more block(s)</source>
+        <translation><numerusform>%n 以上のブロックがマチュア</numerusform></translation>
+    </message>
+    <message>
+        <source>not accepted</source>
+        <translation>未承認</translation>
+    </message>
+    <message>
+        <source>Debit</source>
+        <translation>引き落とし額</translation>
+    </message>
+    <message>
+        <source>Total debit</source>
+        <translation>総出金額</translation>
+    </message>
+    <message>
+        <source>Total credit</source>
+        <translation>総入金額</translation>
+    </message>
+    <message>
+        <source>Transaction fee</source>
+        <translation>トランザクション手数料</translation>
+    </message>
+    <message>
+        <source>Net amount</source>
+        <translation>正味金額</translation>
+    </message>
+    <message>
+        <source>Message</source>
+        <translation>メッセージ</translation>
+    </message>
+    <message>
+        <source>Comment</source>
+        <translation>コメント</translation>
+    </message>
+    <message>
+        <source>Transaction ID</source>
+        <translation>トランザクションID</translation>
+    </message>
+    <message>
+        <source>Output index</source>
+        <translation>出力インデックス</translation>
+    </message>
+    <message>
+        <source>Transaction total size</source>
+        <translation>トランザクションの全体サイズ</translation>
+    </message>
+    <message>
+        <source>Merchant</source>
+        <translation>マーチャント</translation>
+    </message>
+    <message>
+        <source>Generated coins must mature %1 blocks before they can be spent. When you generated this block, it was broadcast to the network to be added to the block chain. If it fails to get into the chain, its state will change to "not accepted" and it won't be spendable. This may occasionally happen if another node generates a block within a few seconds of yours.</source>
+        <translation>生成されたコインは使う前に%1のブロックを完成させる必要があります。あなたがこのブロックを生成した時、このブロックはブロックチェーンに追加されるためにネットワークにブロードキャストされました。ブロックチェーンの追加に失敗した場合、状態が"不承認"に変更されて生成されたコインは使えなくなります。これは別のノードがあなたの数秒前にブロックを生成する場合に時々起こります。</translation>
+    </message>
+    <message>
+        <source>Debug information</source>
+        <translation>デバッグ情報</translation>
+    </message>
+    <message>
+        <source>Transaction</source>
+        <translation>トランザクション</translation>
+    </message>
+    <message>
+        <source>Inputs</source>
+        <translation>インプット</translation>
+    </message>
+    <message>
+        <source>Amount</source>
+        <translation>総額</translation>
+    </message>
+    <message>
+        <source>true</source>
+        <translation>正しい</translation>
+    </message>
+    <message>
+        <source>false</source>
+        <translation>正しくない</translation>
+    </message>
+</context>
+<context>
+    <name>TransactionDescDialog</name>
+    <message>
+        <source>This pane shows a detailed description of the transaction</source>
+        <translation>ここではトランザクションの詳細を表示しています</translation>
+    </message>
+    <message>
+        <source>Details for %1</source>
+        <translation>%1 の詳細</translation>
+    </message>
+</context>
+<context>
+    <name>TransactionTableModel</name>
+    <message>
+        <source>Date</source>
+        <translation>日付</translation>
+    </message>
+    <message>
+        <source>Type</source>
+        <translation>タイプ</translation>
+    </message>
+    <message>
+        <source>Address / Label</source>
+        <translation>アドレス / ラベル</translation>
+    </message>
+    <message numerus="yes">
+        <source>Open for %n more block(s)</source>
+        <translation><numerusform>%n 以上のブロックをオープン</numerusform></translation>
+    </message>
+    <message>
+        <source>Open until %1</source>
+        <translation> %1 までオープン</translation>
+    </message>
+    <message>
+        <source>Offline</source>
+        <translation>オフライン</translation>
+    </message>
+    <message>
+        <source>Unconfirmed</source>
+        <translation>未検証</translation>
+    </message>
+    <message>
+        <source>Abandoned</source>
+        <translation>中止</translation>
+    </message>
+    <message>
+        <source>Confirming (%1 of %2 recommended confirmations)</source>
+        <translation>検証中（%2の推奨検証数のうち、%1検証が完了）</translation>
+    </message>
+    <message>
+        <source>Confirmed (%1 confirmations)</source>
+        <translation>検証されました (%1 検証済み)</translation>
+    </message>
+    <message>
+        <source>Conflicted</source>
+        <translation>コンフリクト発生</translation>
+    </message>
+    <message>
+        <source>Immature (%1 confirmations, will be available after %2)</source>
+        <translation>マチュアでない状態（%1検証。%2検証完了後に使用可能となります）</translation>
+    </message>
+    <message>
+        <source>This block was not received by any other nodes and will probably not be accepted!</source>
+        <translation>このブロックは他のどのノードにも受け取られてないで、今後も受け取られないでしょう！</translation>
+    </message>
+    <message>
+        <source>Generated but not accepted</source>
+        <translation>生成されましたが承認されませんでした</translation>
+    </message>
+    <message>
+        <source>Received with</source>
+        <translation>受信元</translation>
+    </message>
+    <message>
+        <source>Received from</source>
+        <translation>送信元</translation>
+    </message>
+    <message>
+        <source>Received via PrivateSend</source>
+        <translation>プライベートセンド経由で受け取り</translation>
+    </message>
+    <message>
+        <source>Sent to</source>
+        <translation>送金先</translation>
+    </message>
+    <message>
+        <source>Payment to yourself</source>
+        <translation>自分自身への支払い</translation>
+    </message>
+    <message>
+        <source>Mined</source>
+        <translation>発掘済</translation>
+    </message>
+    <message>
+        <source>PrivateSend Denominate</source>
+        <translation>プライベートセンド：分割開始</translation>
+    </message>
+    <message>
+        <source>PrivateSend Collateral Payment</source>
+        <translation>プライベートセンド：コラテラル支払い</translation>
+    </message>
+    <message>
+        <source>PrivateSend Make Collateral Inputs</source>
+        <translation>プライベートセンド：コラテラル入力</translation>
+    </message>
+    <message>
+        <source>PrivateSend Create Denominations</source>
+        <translation>プライベートセンド：デノミネーション生成</translation>
+    </message>
+    <message>
+        <source>PrivateSend</source>
+        <translation>プライベートセンド</translation>
+    </message>
+    <message>
+        <source>watch-only</source>
+        <translation>ウォッチオンリー</translation>
+    </message>
+    <message>
+        <source>(n/a)</source>
+        <translation>(n/a)</translation>
+    </message>
+    <message>
+        <source>(no label)</source>
+        <translation>（ラベル無し）</translation>
+    </message>
+    <message>
+        <source>Transaction status. Hover over this field to show number of confirmations.</source>
+        <translation>トランザクションステータス。このフィールドの上にカーソルを置くと検証数を表示します。</translation>
+    </message>
+    <message>
+        <source>Date and time that the transaction was received.</source>
+        <translation>トランザクションを受信した日時</translation>
+    </message>
+    <message>
+        <source>Type of transaction.</source>
+        <translation>トランザクションの種類</translation>
+    </message>
+    <message>
+        <source>Whether or not a watch-only address is involved in this transaction.</source>
+        <translation>ウォッチオンリーのアドレスがこのトランザクションに含まれているかどうか</translation>
+    </message>
+    <message>
+        <source>User-defined intent/purpose of the transaction.</source>
+        <translation>ユーザー定義のトランザクションの意図／目的</translation>
+    </message>
+    <message>
+        <source>Amount removed from or added to balance.</source>
+        <translation>残高に追加または削除された総額</translation>
+    </message>
+</context>
+<context>
+    <name>TransactionView</name>
+    <message>
+        <source>All</source>
+        <translation>すべて</translation>
+    </message>
+    <message>
+        <source>Today</source>
+        <translation>今日</translation>
+    </message>
+    <message>
+        <source>This week</source>
+        <translation>今週</translation>
+    </message>
+    <message>
+        <source>This month</source>
+        <translation>今月</translation>
+    </message>
+    <message>
+        <source>Last month</source>
+        <translation>先月</translation>
+    </message>
+    <message>
+        <source>This year</source>
+        <translation>今年</translation>
+    </message>
+    <message>
+        <source>Range...</source>
+        <translation>期間…</translation>
+    </message>
+    <message>
+        <source>Most Common</source>
+        <translation>通常</translation>
+    </message>
+    <message>
+        <source>Received with</source>
+        <translation>受信元</translation>
+    </message>
+    <message>
+        <source>Sent to</source>
+        <translation>送金先</translation>
+    </message>
+    <message>
+        <source>PrivateSend</source>
+        <translation>プライベートセンド</translation>
+    </message>
+    <message>
+        <source>PrivateSend Make Collateral Inputs</source>
+        <translation>プライベートセンド：コラテラル入力</translation>
+    </message>
+    <message>
+        <source>PrivateSend Create Denominations</source>
+        <translation>プライベートセンド：デノミネーション作成</translation>
+    </message>
+    <message>
+        <source>PrivateSend Denominate</source>
+        <translation>プライベートセンド：分割開始</translation>
+    </message>
+    <message>
+        <source>PrivateSend Collateral Payment</source>
+        <translation>プライベートセンド：コラテラル支払い</translation>
+    </message>
+    <message>
+        <source>To yourself</source>
+        <translation>自分自身へ</translation>
+    </message>
+    <message>
+        <source>Mined</source>
+        <translation>採掘済</translation>
+    </message>
+    <message>
+        <source>Other</source>
+        <translation>その他</translation>
+    </message>
+    <message>
+        <source>Enter address or label to search</source>
+        <translation>検索するアドレスまたはラベルを入力</translation>
+    </message>
+    <message>
+        <source>Min amount</source>
+        <translation>最小の額</translation>
+    </message>
+    <message>
+        <source>Abandon transaction</source>
+        <translation>トランザクション中止</translation>
+    </message>
+    <message>
+        <source>Copy address</source>
+        <translation>アドレスをコピー</translation>
+    </message>
+    <message>
+        <source>Copy label</source>
+        <translation>ラベルをコピー</translation>
+    </message>
+    <message>
+        <source>Copy amount</source>
+        <translation>総額のコピー</translation>
+    </message>
+    <message>
+        <source>Copy transaction ID</source>
+        <translation>トランザクションIDをコピー</translation>
+    </message>
+    <message>
+        <source>Copy raw transaction</source>
+        <translation>原トランザクションをコピー</translation>
+    </message>
+    <message>
+        <source>Copy full transaction details</source>
+        <translation>トランザクションの詳細すべてをコピー</translation>
+    </message>
+    <message>
+        <source>Edit label</source>
+        <translation>ラベルの編集</translation>
+    </message>
+    <message>
+        <source>Show transaction details</source>
+        <translation>トランザクションの詳細を表示</translation>
+    </message>
+    <message>
+        <source>Export Transaction History</source>
+        <translation>トランザクション履歴をエクスポート</translation>
+    </message>
+    <message>
+        <source>Comma separated file (*.csv)</source>
+        <translation>CSVファイル (*.csv)</translation>
+    </message>
+    <message>
+        <source>Confirmed</source>
+        <translation>検証済</translation>
+    </message>
+    <message>
+        <source>Watch-only</source>
+        <translation>ウォッチオンリー</translation>
+    </message>
+    <message>
+        <source>Date</source>
+        <translation>日付</translation>
+    </message>
+    <message>
+        <source>Type</source>
+        <translation>タイプ</translation>
+    </message>
+    <message>
+        <source>Label</source>
+        <translation>ラベル</translation>
     </message>
     <message>
-        <source>%1 to %2</source>
-        <translation>%1 から %2</translation>
+        <source>Address</source>
+        <translation>アドレス</translation>
     </message>
     <message>
-        <source>Are you sure you want to send?</source>
-        <translation>送ってよろしいですか？</translation>
+        <source>ID</source>
+        <translation>ID</translation>
     </message>
     <message>
-        <source>Confirm send coins</source>
-        <translation>コインを送る確認</translation>
+        <source>Exporting Failed</source>
+        <translation>エクスポート失敗</translation>
     </message>
-    <message numerus="yes">
-        <source>Estimated to begin confirmation within %n block(s).</source>
-        <translation><numerusform>%n ブロック以内に検証が開始されると予想されます。</numerusform></translation>
+    <message>
+        <source>There was an error trying to save the transaction history to %1.</source>
+        <translation>トランザクション履歴を %1 へ保存する際にエラーが発生しました</translation>
     </message>
     <message>
-        <source>The amount to pay must be larger than 0.</source>
-        <translation>支払額は0より大きくないといけません。</translation>
+        <source>Exporting Successful</source>
+        <translation>エクスポート成功</translation>
     </message>
     <message>
-        <source>The amount exceeds your balance.</source>
-        <translation>額が残高を超えています。</translation>
+        <source>The transaction history was successfully saved to %1.</source>
+        <translation>トランザクション履歴は正常に%1に保存されました</translation>
     </message>
     <message>
-        <source>The total exceeds your balance when the %1 transaction fee is included.</source>
-        <translation>%1 の取引手数料を含めると額が残高を超えています。</translation>
+        <source>Range:</source>
+        <translation>期間：</translation>
     </message>
     <message>
-        <source>Transaction creation failed!</source>
-        <translation>トラザクションの作成に失敗しました!</translation>
+        <source>to</source>
+        <translation>から</translation>
+    </message>
+</context>
+<context>
+    <name>UnitDisplayStatusBarControl</name>
+    <message>
+        <source>Unit to show amounts in. Click to select another unit.</source>
+        <translation>金額を表示する際の単位。クリックすることで他の単位を選択します。</translation>
     </message>
+</context>
+<context>
+    <name>WalletFrame</name>
     <message>
-        <source>The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source>
-        <translation>トランザクションは拒否されました。wallet.dat のコピーを使い、そしてコピーしたウォレットからコインを使用したことがマークされなかったときなど、ウォレットのいくつかのコインがすでに使用されている場合に、このエラーは起こるかもしれません。</translation>
+        <source>No wallet has been loaded.</source>
+        <translation>ウォレットがロードされていません</translation>
     </message>
+</context>
+<context>
+    <name>WalletModel</name>
     <message>
-        <source>Pay only the minimum fee of %1</source>
-        <translation>最小手数料 %1 のみを支払う</translation>
+        <source>Send Coins</source>
+        <translation>送金</translation>
     </message>
     <message>
-        <source>Warning: Unknown change address</source>
-        <translation>警告：未知のおつりアドレスです</translation>
+        <source>InstantSend doesn't support sending values that high yet. Transactions are currently limited to %1 DASH.</source>
+        <translation>インスタントセンドには現在送金できる上限があり、トランザクションは %1 DASHに限定されています。</translation>
     </message>
     <message>
-        <source>(no label)</source>
-        <translation>（ラベル無し）</translation>
+        <source>Used way too many inputs (&gt;%1) for this InstantSend transaction, fees could be huge.</source>
+        <translation>このインスタントセンドに非常に多くのインプット (&gt;%1)を使用しているため、手数料が高額になる可能性があります。</translation>
     </message>
 </context>
 <context>
-    <name>SendCoinsEntry</name>
+    <name>WalletView</name>
     <message>
-        <source>This is a normal payment.</source>
-        <translation>これは通常の支払です。</translation>
+        <source>&amp;Export</source>
+        <translation>エクスポート (&amp;E)</translation>
     </message>
     <message>
-        <source>Pay &amp;To:</source>
-        <translation>送り先 (&amp;T)：</translation>
+        <source>Export the data in the current tab to a file</source>
+        <translation>ファイルに現在のタブのデータをエクスポート</translation>
     </message>
     <message>
-        <source>Choose previously used address</source>
-        <translation>前に使用したアドレスを選ぶ</translation>
+        <source>Selected amount:</source>
+        <translation>選択した額:</translation>
+    </message>
+    <message>
+        <source>Backup Wallet</source>
+        <translation>ウォレットのバックアップ</translation>
+    </message>
+    <message>
+        <source>Wallet Data (*.dat)</source>
+        <translation>ウォレットデータ (*.dat)</translation>
+    </message>
+    <message>
+        <source>Backup Failed</source>
+        <translation>バックアップ失敗</translation>
+    </message>
+    <message>
+        <source>There was an error trying to save the wallet data to %1.</source>
+        <translation>ウォレットデータを%1へ保存する際にエラーが発生しました</translation>
+    </message>
+    <message>
+        <source>Backup Successful</source>
+        <translation>バックアップ成功</translation>
+    </message>
+    <message>
+        <source>The wallet data was successfully saved to %1.</source>
+        <translation>ウォレットデータは正常に%1に保存されました</translation>
+    </message>
+</context>
+<context>
+    <name>dash-core</name>
+    <message>
+        <source>Bind to given address and always listen on it. Use [host]:port notation for IPv6</source>
+        <translation>指定のアドレスへバインドし、その上で常にリッスンします。IPv6 は [host]:port 番号と表記します</translation>
+    </message>
+    <message>
+        <source>Error: Listening for incoming connections failed (listen returned error %s)</source>
+        <translation>エラー： 受信中の接続をリッスンするのに失敗しました (エラー %s )</translation>
+    </message>
+    <message>
+        <source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source>
+        <translation>関連のアラートを受け取るか非常に長いのフォークを確認した場合コマンドを実行 (コマンド中の%sはメッセージに置換される)</translation>
+    </message>
+    <message>
+        <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source>
+        <translation>ウォレットのトランザクションを変更する際にコマンドを実行 (cmd の %s は TxID に置換される)</translation>
+    </message>
+    <message>
+        <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source>
+        <translation>最良のブロックが変更する際にコマンドを実行 (cmd の %s はブロックハッシュに置換される)</translation>
+    </message>
+    <message>
+        <source>Name to construct url for KeePass entry that stores the wallet passphrase</source>
+        <translation>ウォレットのパスフレーズを保管するKeePass入力のurlを作成</translation>
+    </message>
+    <message>
+        <source>Set maximum size of high-priority/low-fee transactions in bytes (default: %d)</source>
+        <translation>最優先/最低トランザクション手数料の最大サイズをバイトで指定 (初期設定： %d)</translation>
+    </message>
+    <message>
+        <source>Set the number of script verification threads (%u to %d, 0 = auto, &lt;0 = leave that many cores free, default: %d)</source>
+        <translation>スクリプト検証スレッドを設定 (%uから%dの間, 0 = 自動, &lt;0 = たくさんのコアを自由にしておく, 初期設定： %d)</translation>
+    </message>
+    <message>
+        <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source>
+        <translation>これはリリース前のテストビルドです - 各自の責任で利用すること - 採掘や商取引に使用しないでください</translation>
+    </message>
+    <message>
+        <source>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</source>
+        <translation>警告： ネットワークは完全に同意しないようです。マイナーは何らかの問題を経験しているようです。</translation>
+    </message>
+    <message>
+        <source>Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.</source>
+        <translation>警告： ピアと完全に同意しないようです！あなたはアップグレードする必要があるかもしれません。または他のノードがアップグレードする必要があるかもしれません。</translation>
+    </message>
+    <message>
+        <source>You must specify a masternodeprivkey in the configuration. Please see documentation for help.</source>
+        <translation> masternodeprivkeyを設定で指定する必要があります。ドキュメントを参照してください。</translation>
+    </message>
+    <message>
+        <source>Accept command line and JSON-RPC commands</source>
+        <translation>コマンドラインと JSON-RPC コマンドを許可</translation>
+    </message>
+    <message>
+        <source>Add a node to connect to and attempt to keep the connection open</source>
+        <translation>接続するノードを追加し接続を持続させます</translation>
+    </message>
+    <message>
+        <source>Allow DNS lookups for -addnode, -seednode and -connect</source>
+        <translation>-addnode, -seednode と -connect で DNS ルックアップを許可</translation>
+    </message>
+    <message>
+        <source>Already have that input.</source>
+        <translation>常時そのインプットを保持</translation>
+    </message>
+    <message>
+        <source>Block creation options:</source>
+        <translation>ブロック作成オプション：</translation>
+    </message>
+    <message>
+        <source>Cannot downgrade wallet</source>
+        <translation>ウォレットのダウングレードはできません</translation>
+    </message>
+    <message>
+        <source>Cannot write default address</source>
+        <translation>初期値のアドレスを書き込むことができません</translation>
+    </message>
+    <message>
+        <source>Collateral not valid.</source>
+        <translation>コラテラルが無効です</translation>
+    </message>
+    <message>
+        <source>Connect to a node to retrieve peer addresses, and disconnect</source>
+        <translation>ピアアドレスを取得するためにノードに接続し、そして切断します</translation>
+    </message>
+    <message>
+        <source>Connection options:</source>
+        <translation>接続オプション：</translation>
+    </message>
+    <message>
+        <source>Corrupted block database detected</source>
+        <translation>破損したブロックデータベースが検知されました</translation>
+    </message>
+    <message>
+        <source>Debugging/Testing options:</source>
+        <translation>デバッグ／テスト用オプション：</translation>
+    </message>
+    <message>
+        <source>Do not load the wallet and disable wallet RPC calls</source>
+        <translation>ウォレットは読み込まず、ウォレットRPCコールを無効化する</translation>
+    </message>
+    <message>
+        <source>Do you want to rebuild the block database now?</source>
+        <translation>ブロックデータベースを今すぐ再構築しますか?</translation>
+    </message>
+    <message>
+        <source>Done loading</source>
+        <translation>読み込み完了</translation>
+    </message>
+    <message>
+        <source>Entries are full.</source>
+        <translation>エントリーがいっぱいです</translation>
+    </message>
+    <message>
+        <source>Error initializing block database</source>
+        <translation>ブロックデータベースの初期化中にエラー</translation>
+    </message>
+    <message>
+        <source>Error initializing wallet database environment %s!</source>
+        <translation>ウォレットのデータベース環境 %s 初期化エラー!</translation>
+    </message>
+    <message>
+        <source>Error loading block database</source>
+        <translation>ブロックデータベースの読み込みエラー</translation>
+    </message>
+    <message>
+        <source>Error opening block database</source>
+        <translation>ブロックデータベースの開始エラー</translation>
+    </message>
+    <message>
+        <source>Error reading from database, shutting down.</source>
+        <translation>データベースの読み込みエラー。シャットダウンします。</translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation>エラー</translation>
+    </message>
+    <message>
+        <source>Error: Disk space is low!</source>
+        <translation>エラー： ディスク容量不足!</translation>
+    </message>
+    <message>
+        <source>Failed to listen on any port. Use -listen=0 if you want this.</source>
+        <translation>ポートのリッスンに失敗しました。必要であれば -listen=0 を使用してください。</translation>
+    </message>
+    <message>
+        <source>(1 = keep tx meta data e.g. account owner and payment request information, 2 = drop tx meta data)</source>
+        <translation>(1 = トランザクションのメタデータ、例えばアカウントの所有者や支払いリクエストの内容を保持する, 2 = トランザクションのメタデータを破棄する)</translation>
+    </message>
+    <message>
+        <source>-maxtxfee is set very high! Fees this large could be paid on a single transaction.</source>
+        <translation>-maxtxfee が非常に高く設定されています！ひとつのトランザクションでこの量の手数料が支払われてしまうことがあります。</translation>
+    </message>
+    <message>
+        <source>A fee rate (in %s/kB) that will be used when fee estimation has insufficient data (default: %s)</source>
+        <translation>十分なデータが蓄積されていない場合に手数料推定機能が利用する手数料レート (%s/kB) (初期設定: %s)</translation>
+    </message>
+    <message>
+        <source>Accept relayed transactions received from whitelisted peers even when not relaying transactions (default: %d)</source>
+        <translation>トランザクションの中継を行っていない場合でも、ホワイトリストのピアから受け取った中継トランザクションは受け取るようにする (初期設定: %d)</translation>
+    </message>
+    <message>
+        <source>Allow JSON-RPC connections from specified source. Valid for &lt;ip&gt; are a single IP (e.g. 1.2.3.4), a network/netmask (e.g. 1.2.3.4/255.255.255.0) or a network/CIDR (e.g. 1.2.3.4/24). This option can be specified multiple times</source>
+        <translation>指定したアクセス元からのJSON-RPC接続を許可する。有効な&lt;ip&gt;は、単一のIP (例　1.2.3.4)、ネットワーク/ネットマスク (例　1.2.3.4/255.255.255.0)、またはネットワーク/CIDR (例　1.2.3.4/24)です。このオプションは複数回指定できます。</translation>
+    </message>
+    <message>
+        <source>Bind to given address and whitelist peers connecting to it. Use [host]:port notation for IPv6</source>
+        <translation>指定されたアドレスおよび、そこに接続を行ってきたホワイトリストのピアに対してバインドを行います。IPv6の場合には [host]:port 表記を使用してください</translation>
+    </message>
+    <message>
+        <source>Bind to given address to listen for JSON-RPC connections. Use [host]:port notation for IPv6. This option can be specified multiple times (default: bind to all interfaces)</source>
+        <translation>指定されたアドレスに対して JSON-RPC 接続をリッスンしするようバインドします。IPv6の場合には [host]:port 表記を使用してください。このオプションは複数回指定することが可能です (初期設定：すべてのインターフェースに対してバインドする)</translation>
+    </message>
+    <message>
+        <source>Create new files with system default permissions, instead of umask 077 (only effective with disabled wallet functionality)</source>
+        <translation>umask 077 ではなく、システムのデフォルトパーミッションで新規ファイルを作成する (ウォレット機能が無効化されていた場合にのみ有効)</translation>
+    </message>
+    <message>
+        <source>Delete all wallet transactions and only recover those parts of the blockchain through -rescan on startup</source>
+        <translation>ウォレットの全トランザクションを削除し、これらを-rescanオプションを用いることで起動時にブロックチェインのデータのみからリカバリします。</translation>
+    </message>
+    <message>
+        <source>Error loading %s: You can't enable HD on a already existing non-HD wallet</source>
+        <translation>%s読み込みエラー:  既存の非HDウォレット上でHDを有効化できません</translation>
+    </message>
+    <message>
+        <source>Found unconfirmed denominated outputs, will wait till they confirm to continue.</source>
+        <translation>未確認の分割されたアウトプットを検出しました。継続を確認するまで待機します。</translation>
+    </message>
+    <message>
+        <source>How thorough the block verification of -checkblocks is (0-4, default: %u)</source>
+        <translation>-checkblocks のブロックの検証レベル (0-4, 初期設定： %u)</translation>
+    </message>
+    <message>
+        <source>If paytxfee is not set, include enough fee so transactions begin confirmation on average within n blocks (default: %u)</source>
+        <translation>paytxfee が設定されていなかった場合、平均して n ブロック以内にトランザクションが検証され始めるのに十分な手数料を含める (初期設定： %u)</translation>
+    </message>
+    <message>
+        <source>If this block is in the chain assume that it and its ancestors are valid and potentially skip their script verification (0 to verify all, default: %s, testnet: %s)</source>
+        <translation>このブロックがブロックチェーン内に含まれていた場合には、このブロックおよびそれ以前のすべてのブロックを有効であるとみなし、スクリプトの検証を省略する (0ならすべてを検証、初期設定: %s、テストネット: %s)</translation>
+    </message>
+    <message>
+        <source>Invalid amount for -maxtxfee=&lt;amount&gt;: '%s' (must be at least the minrelay fee of %s to prevent stuck transactions)</source>
+        <translation>-maxtxfee=&lt;amount&gt; の数量の指定が無効です: '%s' (トランザクションが詰まってしまうのを防ぐため、少なくとも %s の最小中継手数料を指定しなければいけません)</translation>
+    </message>
+    <message>
+        <source>Maintain a full transaction index, used by the getrawtransaction rpc call (default: %u)</source>
+        <translation>getrawtransaction rpc 呼び出し時に用いる、完全なトランザクションインデックスを保持する (初期設定： %u)</translation>
+    </message>
+    <message>
+        <source>Make sure to encrypt your wallet and delete all non-encrypted backups after you verified that wallet works!</source>
+        <translation>ウォレットが機能することを検証したら、あなたのウォレットを暗号化しすべての非暗号化バックアップを削除してください。</translation>
+    </message>
+    <message>
+        <source>Maximum size of data in data carrier transactions we relay and mine (default: %u)</source>
+        <translation>中継およびマイニングを行う際の、データ運送トランザクションの中のデータの最大サイズ (初期設定： %u)</translation>
+    </message>
+    <message>
+        <source>Number of seconds to keep misbehaving peers from reconnecting (default: %u)</source>
+        <translation>不正なピアを再接続するまでの秒数 (初期設定： %u)</translation>
+    </message>
+    <message>
+        <source>Output debugging information (default: %u, supplying &lt;category&gt; is optional)</source>
+        <translation>デバッグ情報を出力する (初期設定： %u, &lt;category&gt; の指定は任意です)</translation>
+    </message>
+    <message>
+        <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: %s)</source>
+        <translation>Tor 秘匿サービスを経由して別々の SOCKS5 プロキシを用いることでピアに到達する (初期設定： %s)</translation>
     </message>
     <message>
-        <source>Alt+A</source>
-        <translation>Alt+A</translation>
+        <source>User defined mnemonic for HD wallet (bip39). Only has effect during wallet creation/first start (default: randomly generated)</source>
+        <translation>HDウォレット用のユーザー定義ニーモニック。ウォレット生成時にしか有効でない（初期設定：ランダムに生成）</translation>
     </message>
     <message>
-        <source>Paste address from clipboard</source>
-        <translation>クリップボードからアドレスを貼付ける</translation>
+        <source>User defined seed for HD wallet (should be in hex). Only has effect during wallet creation/first start (default: randomly generated)</source>
+        <translation>HDウォレット用のユーザー定義シード。ウォレット生成時にしか有効でない（初期設定：ランダムに生成）</translation>
     </message>
     <message>
-        <source>Alt+P</source>
-        <translation>Alt+P</translation>
+        <source>Whitelisted peers cannot be DoS banned and their transactions are always relayed, even if they are already in the mempool, useful e.g. for a gateway</source>
+        <translation>ホワイトリストのピアはDoSによるアクセス禁止処理が無効化され、トランザクションは例えmempool内に既に存在していたとしても常にリレーされます。これは例えばゲートウェイに対して有用です</translation>
     </message>
     <message>
-        <source>Remove this entry</source>
-        <translation>この項目を削除する</translation>
+        <source>You need to rebuild the database using -reindex-chainstate to change -txindex</source>
+        <translation>-txindexを変更するために -reindex-chainstate を使用してデータベースをリビルドする必要があります。</translation>
     </message>
     <message>
-        <source>&amp;Label:</source>
-        <translation>ラベル (&amp;L)：</translation>
+        <source>(default: %s)</source>
+        <translation>(初期設定： %s)</translation>
     </message>
     <message>
-        <source>Enter a label for this address to add it to the list of used addresses</source>
-        <translation>このアドレスに対するラベルを入力することで、使用済みアドレスの一覧に追加することができます</translation>
+        <source>Accept public REST requests (default: %u)</source>
+        <translation>公開 REST リクエストを許可する (初期設定： %u)</translation>
     </message>
     <message>
-        <source>A&amp;mount:</source>
-        <translation>金額 (&amp;A)：</translation>
+        <source>Always query for peer addresses via DNS lookup (default: %u)</source>
+        <translation>DNS ルックアップを通してピアアドレスを常に問い合わせる (初期設定： %u)</translation>
     </message>
     <message>
-        <source>Message:</source>
-        <translation>メッセージ：</translation>
+        <source>Can't mix: no compatible inputs found!</source>
+        <translation>ミキシング不可: 互換性のあるインプットが見つかりません</translation>
     </message>
     <message>
-        <source>Pay To:</source>
-        <translation>支払先：</translation>
+        <source>Chain selection options:</source>
+        <translation>チェーン選択オプション:</translation>
     </message>
     <message>
-        <source>Memo:</source>
-        <translation>メモ：</translation>
+        <source>Connect through SOCKS5 proxy</source>
+        <translation>SOCKS5 プロキシ経由で接続</translation>
     </message>
     <message>
-        <source>Enter a label for this address to add it to your address book</source>
-        <translation>アドレス帳に追加するには、このアドレスのラベルを入力します</translation>
+        <source>Connect to KeePassHttp on port &lt;port&gt; (default: %u)</source>
+        <translation>Connect to KeePassHttp に接続：ポート &lt;port&gt; (初期設定: %u)</translation>
     </message>
-</context>
-<context>
-    <name>ShutdownWindow</name>
     <message>
-        <source>Do not shut down the computer until this window disappears.</source>
-        <translation>このウィンドウが消えるまでコンピュータをシャットダウンしないで下さい。</translation>
+        <source>Enable the client to act as a masternode (0-1, default: %u)</source>
+        <translation>クライアントに対してマスターノードとしての機能を有効化する (0-1, 初期設定: %u)</translation>
     </message>
-</context>
-<context>
-    <name>SignVerifyMessageDialog</name>
     <message>
-        <source>Signatures - Sign / Verify a Message</source>
-        <translation>署名 - メッセージの署名/検証</translation>
+        <source>Entry exceeds maximum size.</source>
+        <translation>エントリーが最大サイズを超えました。</translation>
     </message>
     <message>
-        <source>&amp;Sign Message</source>
-        <translation>メッセージの署名 (&amp;S)</translation>
+        <source>Error loading %s: You can't disable HD on a already existing HD wallet</source>
+        <translation>%s読み込みエラー: 既存のHDウォレット上のHDを無効化できません</translation>
     </message>
     <message>
-        <source>Choose previously used address</source>
-        <translation>前に使用したアドレスを選ぶ</translation>
+        <source>Failed to load fulfilled requests cache from</source>
+        <translation>リクエストキャッシュの読み込み失敗：</translation>
     </message>
     <message>
-        <source>Alt+A</source>
-        <translation>Alt+A</translation>
+        <source>Failed to load governance cache from</source>
+        <translation>ガバナンスキャッシュの読み込み失敗：</translation>
     </message>
     <message>
-        <source>Paste address from clipboard</source>
-        <translation>クリップボードからアドレスを貼付ける</translation>
+        <source>Failed to load masternode cache from</source>
+        <translation>マスターノードキャッシュの読み込み失敗：</translation>
     </message>
     <message>
-        <source>Alt+P</source>
-        <translation>Alt+P</translation>
+        <source>Failed to load masternode payments cache from</source>
+        <translation>マスターノードペイメントキャッシュの読み込み失敗：</translation>
     </message>
     <message>
-        <source>Enter the message you want to sign here</source>
-        <translation>ここにあなたが署名するメッセージを入力します</translation>
+        <source>Found enough users, signing ( waiting %s )</source>
+        <translation>充分なユーザーを発見しました、サインしています ( 待機中 %s )</translation>
     </message>
     <message>
-        <source>Signature</source>
-        <translation>署名</translation>
+        <source>Found enough users, signing ...</source>
+        <translation>充分なユーザーを発見しました、サインしています </translation>
     </message>
     <message>
-        <source>Copy the current signature to the system clipboard</source>
-        <translation>現在の署名をシステムのクリップボードにコピーする</translation>
+        <source>How many blocks to check at startup (default: %u, 0 = all)</source>
+        <translation>起動時に点検するブロック数 (初期設定： %u, 0=すべて)</translation>
     </message>
     <message>
-        <source>Sign &amp;Message</source>
-        <translation>メッセージの署名 (&amp;M)</translation>
+        <source>Importing...</source>
+        <translation>インポートしています…</translation>
     </message>
     <message>
-        <source>Reset all sign message fields</source>
-        <translation>入力項目の内容をすべて消去します</translation>
+        <source>Include IP addresses in debug output (default: %u)</source>
+        <translation>デバッグ出力にIPアドレスを含める (初期設定： %u)</translation>
     </message>
     <message>
-        <source>Clear &amp;All</source>
-        <translation>すべてクリア (&amp;A)</translation>
+        <source>Incompatible mode.</source>
+        <translation>非互換性モード</translation>
     </message>
     <message>
-        <source>&amp;Verify Message</source>
-        <translation>メッセージの検証 (&amp;V)</translation>
+        <source>Incompatible version.</source>
+        <translation>非互換性バージョン</translation>
     </message>
     <message>
-        <source>Verify &amp;Message</source>
-        <translation>メッセージの検証 (&amp;M)</translation>
+        <source>Incorrect or no genesis block found. Wrong datadir for network?</source>
+        <translation>不正なブロックが発見されたか、またはジェネシスブロックが発見されませんでした。ネットワークの datadir が間違っていませんか?</translation>
     </message>
     <message>
-        <source>Reset all verify message fields</source>
-        <translation>入力項目の内容をすべて消去します</translation>
+        <source>Information</source>
+        <translation>インフォメーション</translation>
     </message>
     <message>
-        <source>Click "Sign Message" to generate signature</source>
-        <translation>署名を作成するには"メッセージの署名"をクリック</translation>
+        <source>Input is not valid.</source>
+        <translation>インプットが無効です</translation>
     </message>
     <message>
-        <source>The entered address is invalid.</source>
-        <translation>不正なアドレスが入力されました。</translation>
+        <source>Insufficient funds.</source>
+        <translation>残高が不足しています</translation>
     </message>
     <message>
-        <source>Please check the address and try again.</source>
-        <translation>アドレスを確かめてからもう一度試してください。</translation>
+        <source>Invalid -onion address: '%s'</source>
+        <translation>無効な -onion アドレス：'%s'</translation>
     </message>
     <message>
-        <source>The entered address does not refer to a key.</source>
-        <translation>入力されたアドレスに関連するキーがありません。</translation>
+        <source>Invalid -proxy address: '%s'</source>
+        <translation>無効な -proxy アドレス： '%s'</translation>
     </message>
     <message>
-        <source>Wallet unlock was cancelled.</source>
-        <translation>ウォレットのアンロックはキャンセルされました。</translation>
+        <source>Invalid amount for -paytxfee=&lt;amount&gt;: '%s' (must be at least %s)</source>
+        <translation>-paytxfee=&lt;amount&gt; に対する無効な数量です： '%s' (少なくとも %s でなければいけません)</translation>
     </message>
     <message>
-        <source>Private key for the entered address is not available.</source>
-        <translation>入力されたアドレスのプライベート キーが無効です。</translation>
+        <source>Keypool ran out, please call keypoolrefill first</source>
+        <translation>キープールが枯渇しました。まずはじめに keypoolrefill を呼び出してください。</translation>
     </message>
     <message>
-        <source>Message signing failed.</source>
-        <translation>メッセージの署名に失敗しました。</translation>
+        <source>Listen for JSON-RPC connections on &lt;port&gt; (default: %u or testnet: %u)</source>
+        <translation>&lt;port&gt; で JSON-RPC 接続をリッスン (初期設定： %u、テストネット： %u)</translation>
     </message>
     <message>
-        <source>Message signed.</source>
-        <translation>メッセージに署名しました。</translation>
+        <source>Listen for connections on &lt;port&gt; (default: %u or testnet: %u)</source>
+        <translation>接続のリッスンを &lt;port&gt; で行う (初期設定： %u、テストネット: %u)</translation>
     </message>
     <message>
-        <source>The signature could not be decoded.</source>
-        <translation>署名がデコードできません。</translation>
+        <source>Loading banlist...</source>
+        <translation>banリストを読み込んでいます...</translation>
     </message>
     <message>
-        <source>Please check the signature and try again.</source>
-        <translation>署名を確認してからもう一度試してください。</translation>
+        <source>Loading fulfilled requests cache...</source>
+        <translation>承認されたリクエストキャッシュを読み込んでいます...</translation>
     </message>
     <message>
-        <source>The signature did not match the message digest.</source>
-        <translation>署名はメッセージ ダイジェストと一致しませんでした。</translation>
+        <source>Loading masternode cache...</source>
+        <translation>マスターノードキャッシュを読み込んでいます...</translation>
     </message>
     <message>
-        <source>Message verification failed.</source>
-        <translation>メッセージの検証に失敗しました。</translation>
+        <source>Loading masternode payment cache...</source>
+        <translation>マスターノードペイメントキャッシュを読み込んでいます...</translation>
     </message>
     <message>
-        <source>Message verified.</source>
-        <translation>メッセージは検証されました。</translation>
+        <source>Lock is already in place.</source>
+        <translation>すでにロックされています</translation>
     </message>
-</context>
-<context>
-    <name>SplashScreen</name>
     <message>
-        <source>The Bitcoin Core developers</source>
-        <translation>ビットコインコアの開発者</translation>
+        <source>Lock masternodes from masternode configuration file (default: %u)</source>
+        <translation>マスターノード設定ファイルからマスターノードをロック(初期設定: %u)</translation>
     </message>
     <message>
-        <source>[testnet]</source>
-        <translation>[testnet]</translation>
+        <source>Maximum per-connection receive buffer, &lt;n&gt;*1000 bytes (default: %u)</source>
+        <translation>接続毎の最大受信バッファ &lt;n&gt;*1000 バイト (初期設定： %u)</translation>
     </message>
-</context>
-<context>
-    <name>TrafficGraphWidget</name>
     <message>
-        <source>KB/s</source>
-        <translation>KB/s</translation>
+        <source>Maximum per-connection send buffer, &lt;n&gt;*1000 bytes (default: %u)</source>
+        <translation>接続毎の最大送信バッファ &lt;n&gt;*1000 バイト (初期設定： %u)</translation>
     </message>
-</context>
-<context>
-    <name>TransactionDesc</name>
-    <message numerus="yes">
-        <source>Open for %n more block(s)</source>
-        <translation><numerusform>%n 以上のブロックを開く</numerusform></translation>
+    <message>
+        <source>Mixing in progress...</source>
+        <translation>ミキシング中...</translation>
     </message>
     <message>
-        <source>Open until %1</source>
-        <translation>ユニット %1 を開く</translation>
+        <source>Mnemonic passphrase is too long, must be at most 256 characters</source>
+        <translation>ニーモニックパスフレーズが長すぎます。最長で256文字です。</translation>
     </message>
     <message>
-        <source>conflicted</source>
-        <translation>衝突</translation>
+        <source>Need to specify a port with -whitebind: '%s'</source>
+        <translation>-whitebind を用いてポートを指定する必要があります： '%s'</translation>
     </message>
     <message>
-        <source>%1/offline</source>
-        <translation>%1/オフライン</translation>
+        <source>No Masternodes detected.</source>
+        <translation>マスターノードが検出されません</translation>
     </message>
     <message>
-        <source>%1/unconfirmed</source>
-        <translation>%1/未検証</translation>
+        <source>No compatible Masternode found.</source>
+        <translation>互換性のあるマスターノードが検出されません</translation>
     </message>
     <message>
-        <source>%1 confirmations</source>
-        <translation>%1 確認</translation>
+        <source>Not in the Masternode list.</source>
+        <translation>マスターノードリストにありません</translation>
     </message>
     <message>
-        <source>Status</source>
-        <translation>ステータス</translation>
+        <source>Only connect to nodes in network &lt;net&gt; (ipv4, ipv6 or onion)</source>
+        <translation>&lt;net&gt; (ipv4, ipv6 または onion) ネットワーク内のノードだけに接続する</translation>
     </message>
     <message>
-        <source>, has not been successfully broadcast yet</source>
-        <translation>まだブロードキャストが成功していません</translation>
+        <source>Port: %d</source>
+        <translation>ポート: %d</translation>
     </message>
-    <message numerus="yes">
-        <source>, broadcast through %n node(s)</source>
-        <translation><numerusform>%n ノードにブロードキャスト</numerusform></translation>
+    <message>
+        <source>Prepend debug output with timestamp (default: %u)</source>
+        <translation>デバッグ出力にタイムスタンプを付ける (初期設定： %u)</translation>
     </message>
     <message>
-        <source>Date</source>
-        <translation>日付</translation>
+        <source>Rebuild chain state and block index from the blk*.dat files on disk</source>
+        <translation>チェーン状態およびブロックインデックスをディスク上の blk*.dat ファイルから再構築する</translation>
     </message>
     <message>
-        <source>Source</source>
-        <translation>ソース</translation>
+        <source>Rebuild chain state from the currently indexed blocks</source>
+        <translation>既にインデックスされたブロックからチェイン状態を再構築する</translation>
     </message>
     <message>
-        <source>Generated</source>
-        <translation>生成された</translation>
+        <source>Send trace/debug info to debug.log file (default: %u)</source>
+        <translation>トレース/デバッグ情報を debug.logファイルに送信 (初期設定: %u)</translation>
     </message>
     <message>
-        <source>From</source>
-        <translation>送信</translation>
+        <source>Send transactions as zero-fee transactions if possible (default: %u)</source>
+        <translation>可能な場合には手数料ゼロのトランザクションとしてトランザクションを送信する (初期設定： %u)</translation>
     </message>
     <message>
-        <source>unknown</source>
-        <translation>未確認</translation>
+        <source>Set key pool size to &lt;n&gt; (default: %u)</source>
+        <translation>key pool のサイズを &lt;n&gt; (初期設定： %u) にセット</translation>
     </message>
     <message>
-        <source>To</source>
-        <translation>宛先</translation>
+        <source>Set the number of threads to service RPC calls (default: %d)</source>
+        <translation>RPC 呼び出しのスレッド数を設定 (初期設定： %d)</translation>
     </message>
     <message>
-        <source>own address</source>
-        <translation>自分のアドレス</translation>
+        <source>Specify configuration file (default: %s)</source>
+        <translation>設定ファイルの指定 (初期設定： %s)</translation>
     </message>
     <message>
-        <source>watch-only</source>
-        <translation>監視限定</translation>
+        <source>Specify connection timeout in milliseconds (minimum: 1, default: %d)</source>
+        <translation>接続のタイムアウトをミリ秒単位で指定 (最小値： 1, 初期設定：: %d)</translation>
     </message>
     <message>
-        <source>label</source>
-        <translation>ラベル</translation>
+        <source>Specify masternode configuration file (default: %s)</source>
+        <translation>マスターノード設定ファイルを指定 (初期設定: %s)</translation>
     </message>
     <message>
-        <source>Credit</source>
-        <translation>クレジット</translation>
+        <source>Specify pid file (default: %s)</source>
+        <translation>pid ファイルの指定 (初期設定： %s)</translation>
     </message>
-    <message numerus="yes">
-        <source>matures in %n more block(s)</source>
-        <translation><numerusform>%n 以上のブロックが満期</numerusform></translation>
+    <message>
+        <source>Spend unconfirmed change when sending transactions (default: %u)</source>
+        <translation>トランザクション送信時に未検証のチェンジを使用する (初期設定： %u)</translation>
     </message>
     <message>
-        <source>not accepted</source>
-        <translation>承認されなかった</translation>
+        <source>Submitted following entries to masternode: %u / %d</source>
+        <translation>以下のエントリーをマスターノードにサブミット: %u / %d</translation>
     </message>
     <message>
-        <source>Debit</source>
-        <translation>引き落とし額</translation>
+        <source>Submitted to masternode, waiting for more entries ( %u / %d ) %s</source>
+        <translation>マスターノードにサブミット完了、追加のエントリーのために待機中 ( %u / %d ) %s</translation>
     </message>
     <message>
-        <source>Total debit</source>
-        <translation>総出金額</translation>
+        <source>Submitted to masternode, waiting in queue %s</source>
+        <translation>マスターノードにサブミット、待機中 %s</translation>
     </message>
     <message>
-        <source>Total credit</source>
-        <translation>総入金額</translation>
+        <source>Synchroning blockchain...</source>
+        <translation>ブロックに同期中...</translation>
     </message>
     <message>
-        <source>Transaction fee</source>
-        <translation>取引手数料</translation>
+        <source>Synchronization failed</source>
+        <translation>同期失敗</translation>
     </message>
     <message>
-        <source>Net amount</source>
-        <translation>正味金額</translation>
+        <source>Synchronization finished</source>
+        <translation>同期完了</translation>
     </message>
     <message>
-        <source>Message</source>
-        <translation>メッセージ</translation>
+        <source>Synchronizing masternodes...</source>
+        <translation>マスターノード同期中...</translation>
     </message>
     <message>
-        <source>Comment</source>
-        <translation>コメント</translation>
+        <source>This is not a Masternode.</source>
+        <translation>これはマスターノードではありません</translation>
     </message>
     <message>
-        <source>Transaction ID</source>
-        <translation>取引 ID</translation>
+        <source>Threshold for disconnecting misbehaving peers (default: %u)</source>
+        <translation>不正なピアを切断するためのしきい値 (初期設定： %u)</translation>
     </message>
     <message>
-        <source>Merchant</source>
-        <translation>商人</translation>
+        <source>Too many %f denominations, removing.</source>
+        <translation>異常に多くの %f デノミネーション、削除中</translation>
     </message>
     <message>
-        <source>Generated coins must mature %1 blocks before they can be spent. When you generated this block, it was broadcast to the network to be added to the block chain. If it fails to get into the chain, its state will change to "not accepted" and it won't be spendable. This may occasionally happen if another node generates a block within a few seconds of yours.</source>
-        <translation>生成されたコインは使う前に%1のブロックを完成させる必要があります。あなたが生成した時、このブロックはブロック チェーンに追加されるネットワークにブロードキャストされました。チェーンに追加されるのが失敗した場合、状態が"不承認"に変更されて使えなくなるでしょう。これは、別のノードがあなたの数秒前にブロックを生成する場合に時々起こるかもしれません。</translation>
+        <source>Tor control port password (default: empty)</source>
+        <translation>Tor管理ポートのパスワード (初期値: 空文字)</translation>
     </message>
     <message>
-        <source>Debug information</source>
-        <translation>デバッグ情報</translation>
+        <source>Tor control port to use if onion listening enabled (default: %s)</source>
+        <translation>Onion のリッスンが有効になっている場合に使用するTor管理ポート (初期値: %s)</translation>
     </message>
     <message>
-        <source>Transaction</source>
-        <translation>取引</translation>
+        <source>Unable to start HTTP server. See debug log for details.</source>
+        <translation>HTTPサーバを開始できませんでした。詳細はデバッグログをご確認ください。</translation>
     </message>
     <message>
-        <source>Inputs</source>
-        <translation>入力</translation>
+        <source>Unknown response.</source>
+        <translation>不明なレスポンス</translation>
     </message>
     <message>
-        <source>Amount</source>
-        <translation>総額</translation>
+        <source>Unsupported argument -benchmark ignored, use -debug=bench.</source>
+        <translation>サポートされていない引数 -benchmark は無視されました。-debug=bench を使用してください。</translation>
     </message>
     <message>
-        <source>true</source>
-        <translation>正しい</translation>
+        <source>Unsupported argument -debugnet ignored, use -debug=net.</source>
+        <translation>サポートされていない引数 -debugnet は無視されました。-debug=net を使用してください。</translation>
     </message>
     <message>
-        <source>false</source>
-        <translation>正しくない</translation>
+        <source>Unsupported argument -tor found, use -onion.</source>
+        <translation>サポートされていない引数 -tor が見つかりました。-onion を使用してください。</translation>
     </message>
-</context>
-<context>
-    <name>TransactionDescDialog</name>
     <message>
-        <source>Transaction details</source>
-        <translation>取引の詳細</translation>
+        <source>Upgrade wallet to latest format on startup</source>
+        <translation>起動時にウォレットを最新のフォーマットにアップグレード</translation>
     </message>
     <message>
-        <source>This pane shows a detailed description of the transaction</source>
-        <translation>ここでは取引の詳細を表示しています</translation>
+        <source>Use KeePass 2 integration using KeePassHttp plugin (default: %u)</source>
+        <translation>KeePassHttp プラグインを使用してKeePass 2 インテグレーションを使用 (初期設定: %u)</translation>
     </message>
-</context>
-<context>
-    <name>TransactionTableModel</name>
     <message>
-        <source>Date</source>
-        <translation>日付</translation>
+        <source>Use UPnP to map the listening port (default: %u)</source>
+        <translation>リッスンポートの割当に UPnP を使用 (初期設定： %u)</translation>
     </message>
     <message>
-        <source>Type</source>
-        <translation>タイプ</translation>
+        <source>Use the test chain</source>
+        <translation>テストチェーンを使用</translation>
     </message>
     <message>
-        <source>Address</source>
-        <translation>アドレス</translation>
+        <source>User Agent comment (%s) contains unsafe characters.</source>
+        <translation>ユーザーエージェントのコメント (%s) には安全でない文字が含まれています。</translation>
     </message>
-    <message numerus="yes">
-        <source>Open for %n more block(s)</source>
-        <translation><numerusform>%n 以上のブロックを開く</numerusform></translation>
+    <message>
+        <source>Will retry...</source>
+        <translation>再試行...</translation>
     </message>
     <message>
-        <source>Open until %1</source>
-        <translation>ユニット %1 を開く</translation>
+        <source>Invalid masternodeprivkey. Please see documenation.</source>
+        <translation>無効な masternodeprivkey、ドキュメントを参照してください。</translation>
     </message>
     <message>
-        <source>Offline</source>
-        <translation>オフライン</translation>
+        <source>Can't find random Masternode.</source>
+        <translation>ランダムなマスターノードを発見できません</translation>
     </message>
     <message>
-        <source>Unconfirmed</source>
-        <translation>未検証</translation>
+        <source>Can't mix while sync in progress.</source>
+        <translation>同期中はミキシングできません</translation>
     </message>
     <message>
-        <source>Confirming (%1 of %2 recommended confirmations)</source>
-        <translation>検証中（%2の推奨検証数のうち、%1検証が完了）</translation>
+        <source>Could not parse masternode.conf</source>
+        <translation>masternode.confをパースできません</translation>
     </message>
     <message>
-        <source>Confirmed (%1 confirmations)</source>
-        <translation>検証されました (%1 検証済み)</translation>
+        <source>Invalid netmask specified in -whitelist: '%s'</source>
+        <translation>-whitelist で指定された無効なネットマスク： '%s'</translation>
     </message>
     <message>
-        <source>Conflicted</source>
-        <translation>衝突</translation>
+        <source>Invalid port detected in masternode.conf</source>
+        <translation>無効なポートがmasternode.confで検出されました</translation>
     </message>
     <message>
-        <source>Immature (%1 confirmations, will be available after %2)</source>
-        <translation>未成熟（%1検証。%2検証完了後に使用可能となります）</translation>
+        <source>Invalid script detected.</source>
+        <translation>無効なスクリプトが検出されました</translation>
     </message>
     <message>
-        <source>This block was not received by any other nodes and will probably not be accepted!</source>
-        <translation>このブロックは他のどのノードによっても受け取られないで、多分受け入れられないでしょう！</translation>
+        <source>KeePassHttp id for the established association</source>
+        <translation>確立された接続用のKeePassHttp ID </translation>
     </message>
     <message>
-        <source>Generated but not accepted</source>
-        <translation>生成されましたが承認されませんでした</translation>
+        <source>KeePassHttp key for AES encrypted communication with KeePass</source>
+        <translation>KeePassとの AES 暗号化接続用のKeePassHttp キー </translation>
     </message>
     <message>
-        <source>Received with</source>
-        <translation>受信元</translation>
+        <source>Keep at most &lt;n&gt; unconnectable transactions in memory (default: %u)</source>
+        <translation>最大で &lt;n&gt; 個の孤立したトランザクションをメモリの中に保持する (初期設定： %u)</translation>
     </message>
     <message>
-        <source>Received from</source>
-        <translation>送り主</translation>
+        <source>Disable all Dash specific functionality (Masternodes, PrivateSend, InstantSend, Governance) (0-1, default: %u)</source>
+        <translation>Dashに固有の機能(マスターノード, プライベートセンド, インスタントセンド, ガバナンス) を無効化(0-1, 初期設定: %u)</translation>
     </message>
     <message>
-        <source>Sent to</source>
-        <translation>送り先</translation>
+        <source>%s file contains all private keys from this wallet. Do not share it with anyone!</source>
+        <translation>%s ファイルはこのウォレットのプライベートキーをすべて保有しています。誰ともシェアしないでください。</translation>
     </message>
     <message>
-        <source>Payment to yourself</source>
-        <translation>自分自身への支払い</translation>
+        <source>Discover own IP addresses (default: 1 when listening and no -externalip or -proxy)</source>
+        <translation>自分のIPアドレスを解決する (初期値: リッスンをしており、-externalipまたは-proxyオプションが指定されていない場合は1)</translation>
     </message>
     <message>
-        <source>Mined</source>
-        <translation>発掘した</translation>
+        <source>Do not keep transactions in the mempool longer than &lt;n&gt; hours (default: %u)</source>
+        <translation>mempool内でトランザクションを &lt;n&gt; 時間以上保持しない (初期値: %u)</translation>
     </message>
     <message>
-        <source>watch-only</source>
-        <translation>監視限定</translation>
+        <source>Enable InstantSend, show confirmations for locked transactions (0-1, default: %u)</source>
+        <translation>インスタントセンドを有効化しロックされたトランザクションのコンファメーションを表示 (0-1, 初期設定: %u)</translation>
     </message>
     <message>
-        <source>(n/a)</source>
-        <translation>(n/a)</translation>
+        <source>Enable multiple PrivateSend mixing sessions per block, experimental (0-1, default: %u)</source>
+        <translation>ブロック毎に複数のミキシングセッションを有効化する、実験的 (0-1, 初期値: %u)</translation>
     </message>
     <message>
-        <source>Transaction status. Hover over this field to show number of confirmations.</source>
-        <translation>取引の状況。このフィールドの上にカーソルを置くと検証の数を表示します。</translation>
+        <source>Enable use of automated PrivateSend for funds stored in this wallet (0-1, default: %u)</source>
+        <translation>このウォレットにあるファンドに対して自動的なプライベートセンドの使用を有効化 (0-1, 初期設定: %u)</translation>
     </message>
     <message>
-        <source>Date and time that the transaction was received.</source>
-        <translation>取引を受信した日時。</translation>
+        <source>Execute command when a wallet InstantSend transaction is successfully locked (%s in cmd is replaced by TxID)</source>
+        <translation>インスタントセンドのトランザクションのロックに成功したとき、コマンドを実行 (コマンドの%sは TxIDに置換)</translation>
     </message>
     <message>
-        <source>Type of transaction.</source>
-        <translation>取引の種類。</translation>
+        <source>Extra transactions to keep in memory for compact block reconstructions (default: %u)</source>
+        <translation>コンパクトなブロック再構築のために追加のトランザクションをメモリーに保管 (初期設定: %u)</translation>
     </message>
     <message>
-        <source>Whether or not a watch-only address is involved in this transaction.</source>
-        <translation>監視限定アドレスがこのトランザクションに含まれているかどうか</translation>
+        <source>Failed to create backup, file already exists! This could happen if you restarted wallet in less than 60 seconds. You can continue if you are ok with this.</source>
+        <translation>バックアップ作成失敗、ファイルは既に存在します！これはウォレットを60秒以内にリスタートしたときに発生することがあります。これで問題なければ先に進むことができます。</translation>
     </message>
     <message>
-        <source>Amount removed from or added to balance.</source>
-        <translation>残高に追加または削除された総額。</translation>
+        <source>Fees (in %s/kB) smaller than this are considered zero fee for relaying, mining and transaction creation (default: %s)</source>
+        <translation>トランザクションの中継、採掘および作成の際には、この値未満の手数料 (%s/kB単位) はゼロであるとみなす (初期設定: %s)</translation>
     </message>
-</context>
-<context>
-    <name>TransactionView</name>
     <message>
-        <source>All</source>
-        <translation>すべて</translation>
+        <source>Fees (in %s/kB) smaller than this are considered zero fee for transaction creation (default: %s)</source>
+        <translation>トランザクション作成の際、この値未満の手数料 (%s/kB単位) はゼロであるとみなす (デフォルト: %s)</translation>
     </message>
     <message>
-        <source>Today</source>
-        <translation>今日</translation>
+        <source>If &lt;category&gt; is not supplied or if &lt;category&gt; = 1, output all debugging information.</source>
+        <translation>&lt;category&gt; が与えられなかった場合や &lt;category&gt; = 1 の場合には、すべてのデバッグ情報が出力されます。</translation>
     </message>
     <message>
-        <source>This week</source>
-        <translation>今週</translation>
+        <source>InstantSend doesn't support sending values that high yet. Transactions are currently limited to %1 DASH.</source>
+        <translation>インスタントセンドはこのような高額の送金をサポートしていません。トランザクションは現在%1 DASHに限定されています。</translation>
     </message>
     <message>
-        <source>This month</source>
-        <translation>今月</translation>
+        <source>InstantSend requires inputs with at least %d confirmations, you might need to wait a few minutes and try again.</source>
+        <translation>インスタントセンドは最低%d コンファメーションのインプットを必要とします。数分間待ってから再試行する必要があるかもしれません</translation>
     </message>
     <message>
-        <source>Last month</source>
-        <translation>先月</translation>
+        <source>Maintain a full address index, used to query for the balance, txids and unspent outputs for addresses (default: %u)</source>
+        <translation>残高、txids、未使用のアウトプットへの問い合わせに使用される、フルアドレスインデックスを保持 (初期設定: %u)</translation>
     </message>
     <message>
-        <source>This year</source>
-        <translation>今年</translation>
+        <source>Maintain a full spent index, used to query the spending txid and input index for an outpoint (default: %u)</source>
+        <translation>txidとインプットインデックスの問い合わせに使用される、フルスペントインデックス (初期設定: %u)</translation>
     </message>
     <message>
-        <source>Range...</source>
-        <translation>期間…</translation>
+        <source>Maintain a timestamp index for block hashes, used to query blocks hashes by a range of timestamps (default: %u)</source>
+        <translation>ブロックハッシュの問い合わせに使用される、ブロックハッシュ用のタイムスタンプインデックスを保持(初期設定: %u)</translation>
     </message>
     <message>
-        <source>Received with</source>
-        <translation>受信元</translation>
+        <source>Maintain at most &lt;n&gt; connections to peers (temporary service connections excluded) (default: %u)</source>
+        <translation>最大 &lt;n&gt; 接続を保持 (一時的な接続を除外) (初期設定: %u)</translation>
     </message>
     <message>
-        <source>Sent to</source>
-        <translation>送り先</translation>
+        <source>PrivateSend uses exact denominated amounts to send funds, you might simply need to anonymize some more coins.</source>
+        <translation>プライベートセンドは正確に分割された額を使用して送金します。あなたはさらに匿名化する必要があるかもしれません。</translation>
     </message>
     <message>
-        <source>To yourself</source>
-        <translation>自分自身</translation>
+        <source>Prune configured below the minimum of %d MiB.  Please use a higher number.</source>
+        <translation>剪定が最小値の %d MiB以下に設定されています。もっと大きな値を使用してください。</translation>
     </message>
     <message>
-        <source>Mined</source>
-        <translation>発掘した</translation>
+        <source>Prune: last wallet synchronisation goes beyond pruned data. You need to -reindex (download the whole blockchain again in case of pruned node)</source>
+        <translation>剪定: 最後のウォレット同期ポイントは、剪定されたデータよりも過去のものとなっています。-reindexをする必要があります (剪定されたノードの場合、ブロックチェイン全体をダウンロードしてください)</translation>
     </message>
     <message>
-        <source>Other</source>
-        <translation>その他</translation>
+        <source>Randomize credentials for every proxy connection. This enables Tor stream isolation (default: %u)</source>
+        <translation>認証情報をプロキシー接続ごとにランダム化する。これによりTorストリーム分離をすることができます (初期設定: %u)</translation>
     </message>
     <message>
-        <source>Enter address or label to search</source>
-        <translation>検索するアドレスまたはラベルを入力</translation>
+        <source>Rescans are not possible in pruned mode. You will need to use -reindex which will download the whole blockchain again.</source>
+        <translation>剪定モードでは再スキャンを行うことはできません。-reindexを使用し、ブロックチェーン全体を再ダウンロードする必要があります。</translation>
+    </message>
+    <message>
+        <source>Specify full path to directory for automatic wallet backups (must exist)</source>
+        <translation>自動ウォレットバックアップ用のディレクトリへのフルパスを指定してください</translation>
     </message>
     <message>
-        <source>Min amount</source>
-        <translation>最小の額</translation>
+        <source>Support filtering of blocks and transaction with bloom filters (default: %u)</source>
+        <translation>Bloomフィルタによる、ブロックおよびトランザクションのフィルタリングをサポート (初期値: %u)</translation>
     </message>
     <message>
-        <source>Copy address</source>
-        <translation>アドレスをコピーする</translation>
+        <source>The block database contains a block which appears to be from the future. This may be due to your computer's date and time being set incorrectly. Only rebuild the block database if you are sure that your computer's date and time are correct</source>
+        <translation>ブロックのデータベースに未来の時刻のブロックが含まれています。これはおそらくお使いのコンピュータに設定されている日時が間違っていることを示しています。お使いのコンピュータの日時が本当に正しい場合にのみ、ブロックのデータベースの再構築を行ってください。</translation>
     </message>
     <message>
-        <source>Copy label</source>
-        <translation>ラベルをコピーする</translation>
+        <source>The transaction amount is too small to send after the fee has been deducted</source>
+        <translation>手数料差引後のトランザクションの金額が小さすぎるため、送金できません。</translation>
     </message>
     <message>
-        <source>Copy amount</source>
-        <translation>総額のコピー</translation>
+        <source>Total length of network version string (%i) exceeds maximum length (%i). Reduce the number or size of uacomments.</source>
+        <translation>ネットワークバージョン文字 (%i) の長さが最大の長さ (%i) を超えています。UAコメントの数や長さを削減してください。</translation>
     </message>
     <message>
-        <source>Copy transaction ID</source>
-        <translation>取引 ID をコピー</translation>
+        <source>Transaction index can't be disabled in full mode. Either start with -litemode command line switch or enable transaction index.</source>
+        <translation>トランザクションインデックスはフルモードでは無効化できません。  -litemodeコマンドラインスイッチでスタートするかトランザクションインデックスを有効にしてください。</translation>
     </message>
     <message>
-        <source>Edit label</source>
-        <translation>ラベルの編集</translation>
+        <source>Tries to keep outbound traffic under the given target (in MiB per 24h), 0 = no limit (default: %d)</source>
+        <translation>送信転送量を与えられた目標値以下に維持するようにする (24時間あたり何MiBかで指定)。0 の場合は無制限 (初期値: %d)</translation>
     </message>
     <message>
-        <source>Show transaction details</source>
-        <translation>取引の詳細を表示</translation>
+        <source>Unable to locate enough PrivateSend denominated funds for this transaction.</source>
+        <translation>このトランザクションのためのプライベートセンド用の分割された充分なファンドが見つかりません。</translation>
     </message>
     <message>
-        <source>Export Transaction History</source>
-        <translation>トランザクション履歴をエクスポートする</translation>
+        <source>Unsupported argument -socks found. Setting SOCKS version isn't possible anymore, only SOCKS5 proxies are supported.</source>
+        <translation>サポートされていない引数 -socks が見つかりました。SOCKSバージョンの設定はできないようになりました。SOCKS5プロキシのみがサポートされています。</translation>
     </message>
     <message>
-        <source>Comma separated file (*.csv)</source>
-        <translation>CSVファイル (*.csv)</translation>
+        <source>Unsupported argument -whitelistalwaysrelay ignored, use -whitelistrelay and/or -whitelistforcerelay.</source>
+        <translation>サポートされていない引数 -whitelistalwaysrelay は無視されました。-whitelistrelay または -whitelistforcerelay を利用してください</translation>
     </message>
     <message>
-        <source>Confirmed</source>
-        <translation>検証済み</translation>
+        <source>Use UPnP to map the listening port (default: 1 when listening and no -proxy)</source>
+        <translation>リッスン ポートの割当に UPnP を使用 (初期値: リッスン中および-proxy が指定されていない場合は1)</translation>
     </message>
     <message>
-        <source>Watch-only</source>
-        <translation>監視限定</translation>
+        <source>WARNING! Failed to replenish keypool, please unlock your wallet to do so.</source>
+        <translation>警告! キープールの補充に失敗しました、ウォレットをアンロックしてキープールを補充してください</translation>
     </message>
     <message>
-        <source>Date</source>
-        <translation>日付</translation>
+        <source>Wallet is locked, can't replenish keypool! Automatic backups and mixing are disabled, please unlock your wallet to replenish keypool.</source>
+        <translation>ウォレットがロックされているのでキープールを補充できません!自動バックアップとミキシングが無効なので、ウォレットをアンロックしてキープールを補充してください。</translation>
     </message>
     <message>
-        <source>Type</source>
-        <translation>タイプ</translation>
+        <source>Warning: Unknown block versions being mined! It's possible unknown rules are in effect</source>
+        <translation>警告: 未知のバージョンのブロックが採掘されました。未知のルールが導入された可能性があります。</translation>
     </message>
     <message>
-        <source>Label</source>
-        <translation>ラベル</translation>
+        <source>You are starting in lite mode, all Dash-specific functionality is disabled.</source>
+        <translation>ライトモードでスタートしたため、Dash固有の機能はすべて無効です。</translation>
     </message>
     <message>
-        <source>Address</source>
-        <translation>アドレス</translation>
+        <source>You need to rebuild the database using -reindex to go back to unpruned mode.  This will redownload the entire blockchain</source>
+        <translation>非剪定モードに戻るためには-reindexオプションを使用してデータベースを再構築する必要があります。これによりブロックチェーン全体の再ダウンロードが行われます。</translation>
     </message>
     <message>
-        <source>ID</source>
-        <translation>ID</translation>
+        <source>(%d could be used only on mainnet)</source>
+        <translation>(%d はメインネットのみで使用が可能です)</translation>
     </message>
     <message>
-        <source>Exporting Failed</source>
-        <translation>エクスポート失敗</translation>
+        <source>(default: %u)</source>
+        <translation>(初期値: %u)</translation>
     </message>
     <message>
-        <source>There was an error trying to save the transaction history to %1.</source>
-        <translation>トランザクション履歴を %1 へ保存する際にエラーが発生しました。</translation>
+        <source>(must be %d for mainnet)</source>
+        <translation>(メインネット用に常時 %d )</translation>
     </message>
     <message>
-        <source>Exporting Successful</source>
-        <translation>エクスポートに成功しました</translation>
+        <source>-maxmempool must be at least %d MB</source>
+        <translation>-maxmempoolは最低でも %d MB必要です</translation>
     </message>
     <message>
-        <source>The transaction history was successfully saved to %1.</source>
-        <translation>トランザクション履歴は正常に%1に保存されました。</translation>
+        <source>&lt;category&gt; can be:</source>
+        <translation>&lt;category&gt;は以下の値を指定できます：</translation>
     </message>
     <message>
-        <source>Range:</source>
-        <translation>期間：</translation>
+        <source>Append comment to the user agent string</source>
+        <translation>ユーザエージェント文字列にコメントを追加</translation>
     </message>
     <message>
-        <source>to</source>
-        <translation>から</translation>
+        <source>Automatic backups disabled</source>
+        <translation>自動バックアップ無効</translation>
     </message>
-</context>
-<context>
-    <name>UnitDisplayStatusBarControl</name>
     <message>
-        <source>Unit to show amounts in. Click to select another unit.</source>
-        <translation>金額を表示する際の単位。クリックすることで他の単位を選択します。</translation>
+        <source>Automatically create Tor hidden service (default: %d)</source>
+        <translation>Tor秘匿サービスを自動的に作成する (初期値: %d)</translation>
     </message>
-</context>
-<context>
-    <name>WalletFrame</name>
     <message>
-        <source>No wallet has been loaded.</source>
-        <translation>ウォレットがロードされていません</translation>
+        <source>ERROR! Failed to create automatic backup</source>
+        <translation>エラー! 自動バックアップ作成失敗</translation>
     </message>
-</context>
-<context>
-    <name>WalletModel</name>
     <message>
-        <source>Send Coins</source>
-        <translation>コインを送る</translation>
+        <source>Enable publish hash block in &lt;address&gt;</source>
+        <translation>&lt;address&gt;に対し、ハッシュブロックの公開を有効にする</translation>
     </message>
-    </context>
-<context>
-    <name>WalletView</name>
     <message>
-        <source>&amp;Export</source>
-        <translation>エクスポート (&amp;E)</translation>
+        <source>Enable publish hash of governance objects (like proposals) in &lt;address&gt;</source>
+        <translation> &lt;address&gt;に対し、ガバナンスオブジェクトのハッシュの公開を有効にする (プロポーザル等)</translation>
     </message>
     <message>
-        <source>Export the data in the current tab to a file</source>
-        <translation>ファイルに現在のタブのデータをエクスポート</translation>
+        <source>Enable publish hash of governance votes in &lt;address&gt;</source>
+        <translation> &lt;address&gt;に対し、ガバナンスの投票のハッシュの公開を有効にする</translation>
     </message>
     <message>
-        <source>Backup Wallet</source>
-        <translation>ウォレットのバックアップ</translation>
+        <source>Enable publish hash transaction (locked via InstantSend) in &lt;address&gt;</source>
+        <translation>&lt;address&gt;に対し、ハッシュトランザクションの公開を有効にする (インスタントセンド経由でロック済)</translation>
     </message>
     <message>
-        <source>Wallet Data (*.dat)</source>
-        <translation>ウォレット データ (*.dat)</translation>
+        <source>Enable publish hash transaction in &lt;address&gt;</source>
+        <translation>&lt;address&gt; に対し、ハッシュトランザクションの公開を有効にする</translation>
     </message>
     <message>
-        <source>Backup Failed</source>
-        <translation>バックアップに失敗しました</translation>
+        <source>Enable publish raw block in &lt;address&gt;</source>
+        <translation>&lt;address&gt; に対し、原ブロックの公開を有効にする</translation>
     </message>
     <message>
-        <source>There was an error trying to save the wallet data to %1.</source>
-        <translation>ウォレットデータを%1へ保存する際にエラーが発生しました。</translation>
+        <source>Enable publish raw transaction (locked via InstantSend) in &lt;address&gt;</source>
+        <translation>&lt;address&gt;に対し、原トランザクションの公開を有効にする (インスタントセンド経由でロック済)</translation>
     </message>
     <message>
-        <source>Backup Successful</source>
-        <translation>バックアップ成功</translation>
+        <source>Enable publish raw transaction in &lt;address&gt;</source>
+        <translation>&lt;address&gt; に対し、原トランザクションの公開を有効にする</translation>
     </message>
     <message>
-        <source>The wallet data was successfully saved to %1.</source>
-        <translation>ウォレット データは正常に%1に保存されました。</translation>
+        <source>Enable transaction replacement in the memory pool (default: %u)</source>
+        <translation>メモリプール内のトランザクションの置換を有効化する (初期設定: %u)</translation>
     </message>
-</context>
-<context>
-    <name>dash-core</name>
     <message>
-        <source>Bind to given address and always listen on it. Use [host]:port notation for IPv6</source>
-        <translation>指定のアドレスへバインドし、その上で常にリスンします。IPv6 は [host]:port 番号 と表記します</translation>
+        <source>Error: A fatal internal error occurred, see debug.log for details</source>
+        <translation>エラー：致命的な内部エラーが発生しました。詳細はdebug.logを参照してください</translation>
     </message>
     <message>
-        <source>Error: Listening for incoming connections failed (listen returned error %s)</source>
-        <translation>エラー： 内向きの接続をリッスンするのに失敗しました (エラー %s が返却されました)</translation>
+        <source>Failed to create backup %s!</source>
+        <translation>バックアップ作成 %s失敗!</translation>
     </message>
     <message>
-        <source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source>
-        <translation>関連のアラートをもらってもすごく長いのフォークを見てもコマンドを実行 (コマンドの中にあるの%sはメッセージから置き換えさせる)</translation>
+        <source>Failed to create backup, error: %s</source>
+        <translation>バックアップ作成失敗、エラー: %s</translation>
     </message>
     <message>
-        <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source>
-        <translation>ウォレットの取引を変更する際にコマンドを実行 (cmd の %s は TxID に置換される)</translation>
+        <source>Failed to delete backup, error: %s</source>
+        <translation>バックアップ削除失敗、エラー: %s</translation>
     </message>
     <message>
-        <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source>
-        <translation>最良のブロックに変更する際にコマンドを実行 (cmd の %s はブロック ハッシュに置換される)</translation>
+        <source>Failed to load InstantSend data cache from</source>
+        <translation>インスタントセンドデータキャッシュの読み込み失敗：</translation>
     </message>
     <message>
-        <source>Query for peer addresses via DNS lookup, if low on addresses (default: 1 unless -connect)</source>
-        <translation>保有するピアアドレスが少ない場合、DNS ルックアップによりピアアドレスを問い合わせる (-connect を使っていない場合のデフォルト設定： 1)</translation>
+        <source>Failed to load sporks cache from</source>
+        <translation>スポークキャッシュの読み込み失敗：</translation>
     </message>
     <message>
-        <source>Set maximum size of high-priority/low-fee transactions in bytes (default: %d)</source>
-        <translation>最優先/最低手数料の最大サイズをバイトで指定 (デフォルト設定： %d)</translation>
+        <source>Failed to parse host:port string</source>
+        <translation>host:port 文字列のパース失敗</translation>
     </message>
     <message>
-        <source>Set the number of script verification threads (%u to %d, 0 = auto, &lt;0 = leave that many cores free, default: %d)</source>
-        <translation>スクリプト検証スレッドを設定 (%uから%dの間, 0 = 自動, &lt;0 = たくさんのコアを自由にしておく, デフォルト設定： %d)</translation>
+        <source>Fee (in %s/kB) to add to transactions you send (default: %s)</source>
+        <translation>送信するトランザクションに付加する手数料 (%s/kB単位) (初期値: %s)</translation>
     </message>
     <message>
-        <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source>
-        <translation>これはリリース前のテストビルドです - 各自の責任で利用すること - 採掘や商取引に使用しないでください</translation>
+        <source>Imports blocks from external blk000??.dat file on startup</source>
+        <translation>起動時に外部の blk000??.dat ファイルからブロックをインポート</translation>
     </message>
     <message>
-        <source>Warning: -paytxfee is set very high! This is the transaction fee you will pay if you send a transaction.</source>
-        <translation>警告： -paytxfee が非常に高く設定されています! これは取引を送信する場合に支払う取引手数料です。</translation>
+        <source>InstantSend options:</source>
+        <translation>インスタントセンドオプション:</translation>
     </message>
     <message>
-        <source>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</source>
-        <translation>警告： ネットワークは完全に同意しないみたいです。マイナーは何かの問題を経験してるみたいなんです。</translation>
+        <source>Invalid amount for -fallbackfee=&lt;amount&gt;: '%s'</source>
+        <translation>無効な額 -fallbackfee=&lt;amount&gt;: '%s'</translation>
     </message>
     <message>
-        <source>Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.</source>
-        <translation>警告： ピアーと完全に同意しないみたいです！アップグレードは必要かもしれません、それとも他のノードはアップグレードは必要かもしれません。</translation>
+        <source>Invalid input count.</source>
+        <translation>無効なインプットカウント</translation>
     </message>
     <message>
-        <source>Warning: error reading wallet.dat! All keys read correctly, but transaction data or address book entries might be missing or incorrect.</source>
-        <translation>警告： wallet.dat の読み込みエラー! すべてのキーは正しく読み取れますが、取引データやアドレス帳のエントリが失われたか、正しくない可能性があります。</translation>
+        <source>Keep the transaction memory pool below &lt;n&gt; megabytes (default: %u)</source>
+        <translation>トランザクションのメモリープールの総量を &lt;n&gt; メガバイト以下に維持する (初期値: %u)</translation>
     </message>
     <message>
-        <source>Warning: wallet.dat corrupt, data salvaged! Original wallet.dat saved as wallet.{timestamp}.bak in %s; if your balance or transactions are incorrect you should restore from a backup.</source>
-        <translation>警告： wallet.dat が壊れたのでデータを復旧しました! オリジナルの wallet.dat は wallet.{timestamp}.bak として %s に保存されました; もしもあなたの残高や取引が正しくないならバックアップから復元してください。</translation>
+        <source>Last PrivateSend was too recent.</source>
+        <translation>最後のプライベートセンドを実行してから充分な時間が経っていません。</translation>
     </message>
     <message>
-        <source>(default: 1)</source>
-        <translation>(デフォルト設定： 1)</translation>
+        <source>Last successful PrivateSend action was too recent.</source>
+        <translation>最後の成功したプライベートセンドを実行してから充分な時間が経っていません。</translation>
     </message>
     <message>
-        <source>Accept command line and JSON-RPC commands</source>
-        <translation>コマンドラインと JSON-RPC コマンドを許可</translation>
+        <source>Line: %d</source>
+        <translation>ライン: %d</translation>
     </message>
     <message>
-        <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
-        <translation>外部からの接続を許可 (デフォルト設定： -proxy または -connect を使用していない場合は1)</translation>
+        <source>Loading InstantSend data cache...</source>
+        <translation>インスタントセンドデータキャッシュを読み込み中...</translation>
     </message>
     <message>
-        <source>Add a node to connect to and attempt to keep the connection open</source>
-        <translation>接続するノードを追加し接続を持続するように試します</translation>
+        <source>Loading addresses...</source>
+        <translation>アドレスを読み込んでいます…</translation>
     </message>
     <message>
-        <source>Allow DNS lookups for -addnode, -seednode and -connect</source>
-        <translation>-addnode, -seednode と -connect で DNS ルックアップを許可する</translation>
+        <source>Loading block index...</source>
+        <translation>ブロックインデックスを読み込んでいます…</translation>
     </message>
     <message>
-        <source>Attempt to recover private keys from a corrupt wallet.dat</source>
-        <translation>壊れた wallet.dat から秘密鍵を復旧することを試す</translation>
+        <source>Loading governance cache...</source>
+        <translation>ガバナンスキャッシュを読み込み中...</translation>
     </message>
     <message>
-        <source>Block creation options:</source>
-        <translation>ブロック作成オプション：</translation>
+        <source>Loading sporks cache...</source>
+        <translation>スポークキャッシュを読み込み中...</translation>
     </message>
     <message>
-        <source>Cannot downgrade wallet</source>
-        <translation>ウォレットのダウングレードはできません</translation>
+        <source>Loading wallet... (%3.2f %%)</source>
+        <translation>ウォレットを読み込んでいます… (%3.2f %%)</translation>
     </message>
     <message>
-        <source>Cannot resolve -bind address: '%s'</source>
-        <translation>-bind のアドレス '%s' を解決できません</translation>
+        <source>Loading wallet...</source>
+        <translation>ウォレットを読み込んでいます…</translation>
     </message>
     <message>
-        <source>Cannot resolve -externalip address: '%s'</source>
-        <translation>-externalip のアドレス '%s' を解決できません</translation>
+        <source>Location of the auth cookie (default: data dir)</source>
+        <translation>認証クッキーの場所 (初期設定: データディレクトリ)</translation>
     </message>
     <message>
-        <source>Cannot write default address</source>
-        <translation>初期値のアドレスを書き込むことができません</translation>
+        <source>Make the wallet broadcast transactions</source>
+        <translation>ウォレットにトランザクションをブロードキャストさせる</translation>
     </message>
     <message>
-        <source>Connect only to the specified node(s)</source>
-        <translation>指定したノードだけに接続</translation>
+        <source>Masternode cache is empty, skipping payments and governance cache...</source>
+        <translation>マスターノードキャッシュが空です、ペイメントとガバナンスキャッシュをスキップしています...</translation>
     </message>
     <message>
-        <source>Connect to a node to retrieve peer addresses, and disconnect</source>
-        <translation>ピア アドレスを取得するためにノードに接続し、そして切断します</translation>
+        <source>Masternode options:</source>
+        <translation>マスターノードオプション:</translation>
     </message>
     <message>
-        <source>Connection options:</source>
-        <translation>接続オプション：</translation>
+        <source>Masternode queue is full.</source>
+        <translation>マスターノードキューがいっぱいです</translation>
     </message>
     <message>
-        <source>Corrupted block database detected</source>
-        <translation>破損したブロック データベースが見つかりました
-</translation>
+        <source>Masternode:</source>
+        <translation>マスターノード:</translation>
     </message>
     <message>
-        <source>Debugging/Testing options:</source>
-        <translation>デバッグ／テスト用オプション：</translation>
+        <source>Minimum bytes per sigop in transactions we relay and mine (default: %u)</source>
+        <translation>中継またはマイニングするトランザクションのsigop毎の最小バイト (初期設定: %u)</translation>
     </message>
     <message>
-        <source>Do not load the wallet and disable wallet RPC calls</source>
-        <translation>ウォレットは読み込まず、ウォレットRPCコールを無効化する</translation>
+        <source>Missing input transaction information.</source>
+        <translation>不明なインプットトランザクション情報</translation>
     </message>
     <message>
-        <source>Do you want to rebuild the block database now?</source>
-        <translation>ブロック データベースを今すぐ再構築しますか?</translation>
+        <source>No errors detected.</source>
+        <translation>エラーは検出されていません。</translation>
     </message>
     <message>
-        <source>Done loading</source>
-        <translation>読み込み完了</translation>
+        <source>No matching denominations found for mixing.</source>
+        <translation>ミキシング用の分割がマッチしていません。</translation>
     </message>
     <message>
-        <source>Error initializing block database</source>
-        <translation>ブロック データベースの初期化中にエラー</translation>
+        <source>Node relay options:</source>
+        <translation>ノード中継オプション：</translation>
     </message>
     <message>
-        <source>Error initializing wallet database environment %s!</source>
-        <translation>ウォレットのデータベース環境 %s 初期化エラー!</translation>
+        <source>Non-standard public key detected.</source>
+        <translation>スタンダードでないパブリックキーが検出されました</translation>
     </message>
     <message>
-        <source>Error loading block database</source>
-        <translation>ブロック データベースの読み込みエラー</translation>
+        <source>Not compatible with existing transactions.</source>
+        <translation>既存のトランザクションと互換性がありません。</translation>
     </message>
     <message>
-        <source>Error loading wallet.dat</source>
-        <translation>wallet.dat 読み込みエラー</translation>
+        <source>Not enough file descriptors available.</source>
+        <translation>使用可能なファイルディスクリプタが不足しています。</translation>
     </message>
     <message>
-        <source>Error loading wallet.dat: Wallet corrupted</source>
-        <translation>wallet.dat 読み込みエラー： ウォレットが壊れました</translation>
+        <source>Not enough funds to anonymize.</source>
+        <translation>匿名化のための資金が不足しています。</translation>
     </message>
     <message>
-        <source>Error opening block database</source>
-        <translation>ブロック データベースの開始エラー</translation>
+        <source>Number of automatic wallet backups (default: %u)</source>
+        <translation>自動ウォレットバックアップの数 (初期設定: %u)</translation>
     </message>
     <message>
-        <source>Error reading from database, shutting down.</source>
-        <translation>データベースの読み込みエラー。シャットダウンします。</translation>
+        <source>Options:</source>
+        <translation>オプション：</translation>
     </message>
     <message>
-        <source>Error</source>
-        <translation>エラー</translation>
+        <source>Password for JSON-RPC connections</source>
+        <translation>JSON-RPC 接続のパスワード</translation>
     </message>
     <message>
-        <source>Error: Disk space is low!</source>
-        <translation>エラー： ディスク容量不足!</translation>
+        <source>Print version and exit</source>
+        <translation>バージョンを表示し終了</translation>
     </message>
     <message>
-        <source>Failed to listen on any port. Use -listen=0 if you want this.</source>
-        <translation>ポートのリスンに失敗しました。必要であれば -listen=0 を使用してください。</translation>
+        <source>PrivateSend is idle.</source>
+        <translation>プライベートセンドはアイドル状態です。</translation>
     </message>
     <message>
-        <source>If &lt;category&gt; is not supplied, output all debugging information.</source>
-        <translation>&lt;category&gt; が与えられなかった場合には、すべてのデバッグ情報が出力されます。</translation>
+        <source>PrivateSend options:</source>
+        <translation>プライベートセンドオプション:</translation>
     </message>
     <message>
-        <source>(1 = keep tx meta data e.g. account owner and payment request information, 2 = drop tx meta data)</source>
-        <translation>(1 = トランザクションのメタデータ、例えばアカウントの所有者や支払リクエストの内容を保持する, 2 = トランザクションのメタデータを破棄する)</translation>
+        <source>PrivateSend request complete:</source>
+        <translation>プライベートセンドリクエスト完了:</translation>
     </message>
     <message>
-        <source>Allow JSON-RPC connections from specified source. Valid for &lt;ip&gt; are a single IP (e.g. 1.2.3.4), a network/netmask (e.g. 1.2.3.4/255.255.255.0) or a network/CIDR (e.g. 1.2.3.4/24). This option can be specified multiple times</source>
-        <translation>指定したアクセス元からのJSON-RPC接続を許可する。有効な&lt;ip&gt;は、単一のIP (例 1.2.3.4)、ネットワーク/ネットマスク (1.2.3.4/255.255.255.0)、またはネットワーク/CIDR (1.2.3.4/24)です。このオプションは複数回指定できます。</translation>
+        <source>PrivateSend request incomplete:</source>
+        <translation>プライベートセンドリクエスト未完了:</translation>
     </message>
     <message>
-        <source>An error occurred while setting up the RPC address %s port %u for listening: %s</source>
-        <translation>リッスンする RPC アドレス %s、ポート %u の設定中にエラーが発生しました： %s</translation>
+        <source>Prune cannot be configured with a negative value.</source>
+        <translation>剪定値は負の値に設定できません。</translation>
     </message>
     <message>
-        <source>Bind to given address and whitelist peers connecting to it. Use [host]:port notation for IPv6</source>
-        <translation>指定されたアドレスおよび、そこに接続を行ってきたホワイトリストのピアに対してバインドを行います。IPv6の場合には [host]:port 表記を使用してください</translation>
+        <source>Prune mode is incompatible with -txindex.</source>
+        <translation>剪定モードは-txindexと互換性がありません。</translation>
     </message>
     <message>
-        <source>Bind to given address to listen for JSON-RPC connections. Use [host]:port notation for IPv6. This option can be specified multiple times (default: bind to all interfaces)</source>
-        <translation>指定されたアドレスに対して JSON-RPC 接続をリッスンしするようバインドします。IPv6の場合には [host]:port 表記を使用してください。このオプションは複数回指定することが可能です (デフォルト設定：すべてのインターフェースに対してバインドする)</translation>
+        <source>Pruning blockstore...</source>
+        <translation>ブロックストアを剪定しています…</translation>
     </message>
     <message>
-        <source>Create new files with system default permissions, instead of umask 077 (only effective with disabled wallet functionality)</source>
-        <translation>umask 077 ではなく、システムのデフォルトパーミッションで新規ファイルを作成する (ウォレット機能が無効化されていた場合にのみ有効)</translation>
+        <source>Rescan the block chain for missing wallet transactions on startup</source>
+        <translation>起動時に失ったウォレットのトランザクションのブロックチェーンを再スキャン</translation>
     </message>
     <message>
-        <source>Delete all wallet transactions and only recover those parts of the blockchain through -rescan on startup</source>
-        <translation>ウォレットの全トランザクションを削除し、これらを-rescanオプションを用いることで起動時にブロックチェインのデータのみからリカバリします。</translation>
+        <source>The wallet will avoid paying less than the minimum relay fee.</source>
+        <translation>ウォレットは最小中継手数料を下回る額の支払を拒否します。</translation>
     </message>
     <message>
-        <source>Distributed under the MIT software license, see the accompanying file COPYING or &lt;http://www.opensource.org/licenses/mit-license.php&gt;.</source>
-        <translation>MITソフトウェアライセンスのもとで配布されています。付属のCOPYINGファイルまたは&lt;http://www.opensource.org/licenses/mit-license.php&gt;を参照してください。</translation>
+        <source>This is the minimum transaction fee you pay on every transaction.</source>
+        <translation>これはすべてのトランザクションに対して最低限支払うべき手数料です。</translation>
     </message>
     <message>
-        <source>Error: Unsupported argument -socks found. Setting SOCKS version isn't possible anymore, only SOCKS5 proxies are supported.</source>
-        <translation>エラー：サポートされていない引数 -socks が見つかりました。SOCKSバージョンの設定はできないようになりました。SOCKS5プロキシのみがサポートされています。</translation>
+        <source>This is the transaction fee you will pay if you send a transaction.</source>
+        <translation>これは取引を送信する場合に支払う取引手数料です。</translation>
     </message>
     <message>
-        <source>How thorough the block verification of -checkblocks is (0-4, default: %u)</source>
-        <translation>-checkblocks のブロックの検証レベル (0-4, デフォルト設定： %u)</translation>
+        <source>Transaction amounts must not be negative</source>
+        <translation>トランザクションの総額はマイナスではあってはいけません。。</translation>
     </message>
     <message>
-        <source>If paytxfee is not set, include enough fee so transactions begin confirmation on average within n blocks (default: %u)</source>
-        <translation>paytxfee が設定されていなかった場合、平均して n ブロック以内にトランザクションが検証され始めるのに十分な手数料を含める (デフォルト設定： %u)</translation>
+        <source>Transaction has too long of a mempool chain</source>
+        <translation>トランザクションのmempoolチェーンが長過ぎます。</translation>
     </message>
     <message>
-        <source>Invalid amount for -maxtxfee=&lt;amount&gt;: '%s' (must be at least the minrelay fee of %s to prevent stuck transactions)</source>
-        <translation>-maxtxfee=&lt;amount&gt; の数量の指定が不正です: '%s' (トランザクションが詰まってしまうのを防ぐため、少なくとも %s の最小中継手数料を指定しなければいけません)</translation>
+        <source>Transaction must have at least one recipient</source>
+        <translation>トランザクションは最低ひとつの受取先が必要です。</translation>
     </message>
     <message>
-        <source>Maintain a full transaction index, used by the getrawtransaction rpc call (default: %u)</source>
-        <translation>getrawtransaction rpc 呼び出し時に用いる、完全なトランザクションインデックスを保持する (デフォルト設定： %u)</translation>
+        <source>Transaction too large</source>
+        <translation>トランザクション量が大きすぎます。</translation>
     </message>
     <message>
-        <source>Maximum size of data in data carrier transactions we relay and mine (default: %u)</source>
-        <translation>中継および採掘を行う際の、データ運送トランザクションの中のデータの最大サイズ (デフォルト設定： %u)</translation>
+        <source>Trying to connect...</source>
+        <translation>接続中です...</translation>
     </message>
     <message>
-        <source>Number of seconds to keep misbehaving peers from reconnecting (default: %u)</source>
-        <translation>不正なピアを再接続するまでの秒数 (デフォルト設定： %u)</translation>
+        <source>Unable to bind to %s on this computer. %s is probably already running.</source>
+        <translation>このコンピュータの %s にバインドすることができません。おそらく %s は既に実行されています。</translation>
     </message>
     <message>
-        <source>Output debugging information (default: %u, supplying &lt;category&gt; is optional)</source>
-        <translation>デバッグ情報を出力する (デフォルト設定： %u, &lt;category&gt; の指定は任意です)</translation>
+        <source>Upgrading UTXO database</source>
+        <translation>UTXOデータベースを更新しています</translation>
     </message>
     <message>
-        <source>Set the number of threads for coin generation if enabled (-1 = all cores, default: %d)</source>
-        <translation>コイン生成が有効になっていた場合の利用スレッド数を設定する (-1 = すべてのコア, デフォルト設定： %d)</translation>
+        <source>Use devnet chain with provided name</source>
+        <translation>devnet チェーンを与えられた名前とともに使用します。</translation>
     </message>
     <message>
-        <source>This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit &lt;https://www.openssl.org/&gt; and cryptographic software written by Eric Young and UPnP software written by Thomas Bernard.</source>
-        <translation>この製品はOpenSSLプロジェクトにより開発されたソフトウェアをOpenSSLツールキットとして利用しています &lt;https://www.openssl.org/&gt;。また、Eric Young氏により開発された暗号ソフトウェア、Thomas Bernard氏により書かれたUPnPソフトウェアを用いています。</translation>
+        <source>Wallet debugging/testing options:</source>
+        <translation>ウォレットのデバッグ／テスト用オプション:</translation>
     </message>
     <message>
-        <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: %s)</source>
-        <translation>Tor 秘匿サービスを通し、別々の SOCKS5 プロキシを用いることでピアに到達する (デフォルト設定： %s)</translation>
+        <source>Wallet is not initialized</source>
+        <translation>ウォレットが初期化されていません</translation>
     </message>
     <message>
-        <source>Warning: -maxtxfee is set very high! Fees this large could be paid on a single transaction.</source>
-        <translation>警告： -maxtxfee が非常に高く設定されています！ひとつのトランザクションでこの量の手数料が支払われてしまうことがあります。</translation>
+        <source>Wallet needed to be rewritten: restart %s to complete</source>
+        <translation>ウォレットが書き直される必要がありました: 完了するために %s を再起動します</translation>
     </message>
     <message>
-        <source>Whitelist peers connecting from the given netmask or IP address. Can be specified multiple times.</source>
-        <translation>与えられたネットマスクやIPアドレスから接続を行う、ホワイトリストのピア。複数回指定できます。</translation>
+        <source>Warning: unknown new rules activated (versionbit %i)</source>
+        <translation>警告: 未知の新しいルールがアクティベートされました (バージョンビット %i)</translation>
     </message>
     <message>
-        <source>Whitelisted peers cannot be DoS banned and their transactions are always relayed, even if they are already in the mempool, useful e.g. for a gateway</source>
-        <translation>ホワイトリストのピアはDoSによるアクセス禁止処理が無効化され、トランザクションは例えmempool内に既に存在していたとしても常にリレーされます。これは例えばゲートウェイに対して有用です</translation>
+        <source>Wasn't able to create wallet backup folder %s!</source>
+        <translation>ウォレットバックアップフォルダー作成不可 %s!</translation>
     </message>
     <message>
-        <source>(default: %s)</source>
-        <translation>(デフォルト設定： %s)</translation>
+        <source>Whether to operate in a blocks only mode (default: %u)</source>
+        <translation>ブロック限定モードにおいて動作を行うかどうか (初期値: %u)</translation>
     </message>
     <message>
-        <source>Accept public REST requests (default: %u)</source>
-        <translation>公開 REST リクエストを許可する (デフォルト設定： %u)</translation>
+        <source>You can not start a masternode in lite mode.</source>
+        <translation>ライトモードではマスターノードをスタートできません。</translation>
     </message>
     <message>
-        <source>Acceptable ciphers (default: %s)</source>
-        <translation>受付可能な暗号化方式 (デフォルト設定： %s)</translation>
+        <source>ZeroMQ notification options:</source>
+        <translation>ZeroMQ通知オプション:</translation>
     </message>
     <message>
-        <source>Always query for peer addresses via DNS lookup (default: %u)</source>
-        <translation>DNS ルックアップを通してピアアドレスを常に問い合わせる (デフォルト設定： %u)</translation>
+        <source>no mixing available.</source>
+        <translation>ミキシングは利用できません。</translation>
     </message>
     <message>
-        <source>Cannot resolve -whitebind address: '%s'</source>
-        <translation>-whitebind アドレス '%s' を解決できません</translation>
+        <source>see debug.log for details.</source>
+        <translation>詳細はdebug.logを参照してください。</translation>
     </message>
     <message>
-        <source>Connect through SOCKS5 proxy</source>
-        <translation>SOCKS5 プロキシ経由で接続する</translation>
+        <source>RPC server options:</source>
+        <translation>RPCサーバのオプション：</translation>
     </message>
     <message>
-        <source>Copyright (C) 2009-%i The Bitcoin Core Developers</source>
-        <translation>Copyright (C) 2009-%i Bitcoin Core 開発者</translation>
+        <source>Dash Core</source>
+        <translation>Dashコア</translation>
     </message>
     <message>
-        <source>Could not parse -rpcbind value %s as network address</source>
-        <translation>-rpcbind の値 %s をネットワークアドレスとして解釈できませんでした</translation>
+        <source>The %s developers</source>
+        <translation>%s の開発者</translation>
     </message>
     <message>
-        <source>Error: A fatal internal error occured, see debug.log for details</source>
-        <translation>エラー：致命的な内部エラーが発生しました。詳細はdebug.logを参照してください</translation>
+        <source>Accept connections from outside (default: 1 if no -proxy or -connect/-noconnect)</source>
+        <translation>外部からの接続を許可(初期設定: 1  -proxy または -connect/-noconnectの場合)</translation>
     </message>
     <message>
-        <source>Error: Unsupported argument -tor found, use -onion.</source>
-        <translation>エラー： サポートされていない引数 -tor が見つかりました。-onion を使用してください。</translation>
+        <source>Cannot obtain a lock on data directory %s. %s is probably already running.</source>
+        <translation>データディレクトリ %s のロックを取得することができません。おそらく %s は実行中です。</translation>
     </message>
     <message>
-        <source>Generate coins (default: %u)</source>
-        <translation>コインを生成 (デフォルト設定： %u)</translation>
+        <source>Connect only to the specified node(s); -noconnect or -connect=0 alone to disable automatic connections</source>
+        <translation>特定のノードのみに接続; -noconnect または -connect=0 の場合においてのみ自動接続を無効化</translation>
     </message>
     <message>
-        <source>How many blocks to check at startup (default: %u, 0 = all)</source>
-        <translation>起動時に点検するブロック数 (デフォルト設定： %u, 0=すべて)</translation>
+        <source>Distributed under the MIT software license, see the accompanying file %s or %s</source>
+        <translation>MITソフトウェアライセンスのもとで配布されています。付属のファイル %s または %s を参照してください</translation>
     </message>
     <message>
-        <source>Importing...</source>
-        <translation>インポートしています…</translation>
+        <source>Error reading %s! All keys read correctly, but transaction data or address book entries might be missing or incorrect.</source>
+        <translation>%s の読み込みエラー! すべてのキーは正しく読み取れますが、トランザクションデータやアドレス帳のエントリが失われたか、正しくない可能性があります。</translation>
     </message>
     <message>
-        <source>Imports blocks from external blk000??.dat file</source>
-        <translation>外部の blk000??.dat ファイルからブロックをインポート</translation>
+        <source>Force relay of transactions from whitelisted peers even if they violate local relay policy (default: %d)</source>
+        <translation>ホワイトリストのピアから受け取ったトランザクションに関しては、たとえローカルの中継ポリシーに違反しているとしても中継を行うようにする (初期設定: %d)</translation>
     </message>
     <message>
-        <source>Include IP addresses in debug output (default: %u)</source>
-        <translation>デバッグ出力にIPアドレスを含める (デフォルト設定： %u)</translation>
+        <source>Incorrect or no devnet genesis block found. Wrong datadir for devnet specified?</source>
+        <translation>無効なdevnetジェネシスブロックが発見されたか、またはdevnetジェネシスブロックが発見されません。 特定のdevnet用のデータディレクトリが間違ってませんか?</translation>
     </message>
     <message>
-        <source>Incorrect or no genesis block found. Wrong datadir for network?</source>
-        <translation>不正なブロックあるいは、生成されていないブロックが見つかりました。ネットワークの datadir が間違っていませんか?</translation>
+        <source>Maximum allowed median peer time offset adjustment. Local perspective of time may be influenced by peers forward or backward by this amount. (default: %u seconds)</source>
+        <translation>時間オフセット調整値のピア中央値に対する最大の許容値。ローカル時間の見込み値は、接続するピアにより前方ないし後方へ影響されます。(初期値: %u 秒)</translation>
     </message>
     <message>
-        <source>Information</source>
-        <translation>情報</translation>
+        <source>Maximum total fees (in %s) to use in a single wallet transaction or raw transaction; setting this too low may abort large transactions (default: %s)</source>
+        <translation>ひとつのウォレットトランザクションまたは原トランザクションで使用する合計手数料の最大値 (%s 単位)。低すぎる値を指定すると巨大なトランザクションの作成ができなくなります (初期設定: %s)</translation>
     </message>
     <message>
-        <source>Invalid -onion address: '%s'</source>
-        <translation>無効な -onion アドレス：'%s'</translation>
+        <source>Override spork address. Only useful for regtest and devnet. Using this on mainnet or testnet will ban you.</source>
+        <translation>スポークアドレスを上書きします。regtest または devnetでのみ有効です。mainnet または testnet で使用した場合Banされます。</translation>
     </message>
     <message>
-        <source>Invalid -proxy address: '%s'</source>
-        <translation>無効な -proxy アドレス： '%s'</translation>
+        <source>Please check that your computer's date and time are correct! If your clock is wrong, %s will not work properly.</source>
+        <translation>あなたのPCの日付と時刻が正しいことを確認して下さい！ もしあなたの時計が正しくなければ %s が正確に動作しません。</translation>
     </message>
     <message>
-        <source>Invalid amount for -maxtxfee=&lt;amount&gt;: '%s'</source>
-        <translation>-maxtxfee=&lt;amount&gt; に対する無効な数量です： '%s'</translation>
+        <source>Please contribute if you find %s useful. Visit %s for further information about the software.</source>
+        <translation>%s が有用だと感じられた方はぜひプロジェクトへの貢献をお願いします。ソフトウェアのより詳細な情報については %s をご覧ください。</translation>
     </message>
     <message>
-        <source>Invalid amount for -minrelaytxfee=&lt;amount&gt;: '%s'</source>
-        <translation>不正な額 -minrelaytxfee=&lt;amount&gt;： '%s'</translation>
+        <source>Provide liquidity to PrivateSend by infrequently mixing coins on a continual basis (%u-%u, default: %u, 1=very frequent, high fees, %u=very infrequent, low fees)</source>
+        <translation>継続的にミキシングしてプライベートセンドに流動性を提供します (%u-%u, 初期設定: %u, 1=非常に活発, 高額手数料, %u=ほとんどなし, 低額手数料)</translation>
     </message>
     <message>
-        <source>Invalid amount for -mintxfee=&lt;amount&gt;: '%s'</source>
-        <translation>不正な額 -minrelaytxfee=&lt;amount&gt;： '%s'</translation>
+        <source>Query for peer addresses via DNS lookup, if low on addresses (default: 1 unless -connect/-noconnect)</source>
+        <translation>必要な場合DNS ルックアップを経由してピアアドレスに問い合わせ (初期設定: 1  -connect/-noconnectでない場合)</translation>
     </message>
     <message>
-        <source>Invalid amount for -paytxfee=&lt;amount&gt;: '%s' (must be at least %s)</source>
-        <translation>-paytxfee=&lt;amount&gt; に対する無効な数量です： '%s' (少なくとも %s でなければいけません)</translation>
+        <source>Reduce storage requirements by enabling pruning (deleting) of old blocks. This allows the pruneblockchain RPC to be called to delete specific blocks, and enables automatic pruning of old blocks if a target size in MiB is provided. This mode is incompatible with -txindex and -rescan. Warning: Reverting this setting requires re-downloading the entire blockchain. (default: 0 = disable pruning blocks, 1 = allow manual pruning via RPC, &gt;%u = automatically prune block files to stay under the specified target size in MiB)</source>
+        <translation>古いブロックの剪定 (削除) を有効にすることでストレージの必要量を削減します。これにより pruneblockchain RPC を呼び出すことで指定されたブロックを削除することができます。またターゲットサイズが MiB 単位で指定された場合には古いブロックの自動剪定が有効となります。このモードは -txindex および -rescan オプションと互換性がありません。警告: この設定を再有効化するにはすべてのブロックチェーンの再ダウンロードが必要となります。(初期設定: 0 = ブロックの剪定を無効化する, 1 = RPC 経由での手動剪定を許可する, &gt;%u = MiB 単位で指定されたターゲットサイズを常に下回るようにブロックファイルを自動的に剪定する)</translation>
     </message>
     <message>
-        <source>Invalid amount for -paytxfee=&lt;amount&gt;: '%s'</source>
-        <translation>-paytxfee=&lt;amount&gt; の額 '%s' が無効です</translation>
+        <source>Set lowest fee rate (in %s/kB) for transactions to be included in block creation. (default: %s)</source>
+        <translation>ブロック生成時に取り込まれるトランザクションの最低手数料率 (%s/kB 単位)。(初期設定: %s)</translation>
     </message>
     <message>
-        <source>Listen for JSON-RPC connections on &lt;port&gt; (default: %u or testnet: %u)</source>
-        <translation>&lt;port&gt; で JSON-RPC 接続をリスン (デフォルト設定： %u、testnet は %u)</translation>
+        <source>This is the transaction fee you may pay when fee estimates are not available.</source>
+        <translation>これは手数料の推定機能が利用できない場合に支払うトランザクション手数料です。</translation>
     </message>
     <message>
-        <source>Listen for connections on &lt;port&gt; (default: %u or testnet: %u)</source>
-        <translation>接続のリッスンを &lt;port&gt; で行う (デフォルト設定： %u、testnet: %u)</translation>
+        <source>This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit %s and cryptographic software written by Eric Young and UPnP software written by Thomas Bernard.</source>
+        <translation>この製品はOpenSSLプロジェクトにより開発されたソフトウェアをOpenSSLツールキット %s として利用しています &lt;https://www.openssl.org/&gt;。また、Eric Young氏により開発された暗号ソフトウェア、Thomas Bernard氏により書かれたUPnPソフトウェアを用いています。</translation>
     </message>
     <message>
-        <source>Maintain at most &lt;n&gt; connections to peers (default: %u)</source>
-        <translation>ピアの接続数を最大でも &lt;n&gt; 個に維持する (デフォルト設定： %u)</translation>
+        <source>Unable to locate enough PrivateSend non-denominated funds for this transaction.</source>
+        <translation>このトランザクションに対してプライベートセンド用の分割されてない充分なファンドが検出できません。</translation>
     </message>
     <message>
-        <source>Maximum per-connection receive buffer, &lt;n&gt;*1000 bytes (default: %u)</source>
-        <translation>接続毎の最大受信バッファ &lt;n&gt;*1000 バイト (デフォルト設定： %u)</translation>
+        <source>Use N separate masternodes for each denominated input to mix funds (%u-%u, default: %u)</source>
+        <translation>それぞれの分割されたインプットに対してN 個の別々のマスターノードを使用してファンドをミキシングします。(%u-%u, 初期設定: %u)</translation>
     </message>
     <message>
-        <source>Maximum per-connection send buffer, &lt;n&gt;*1000 bytes (default: %u)</source>
-        <translation>接続毎の最大送信バッファ &lt;n&gt;*1000 バイト (デフォルト設定： %u)</translation>
+        <source>Use hierarchical deterministic key generation (HD) after BIP39/BIP44. Only has effect during wallet creation/first start</source>
+        <translation>BIP39/BIP44のあとにHDキー生成を使用します。ウォレット作成時にのみ有効です。</translation>
     </message>
     <message>
-        <source>Need to specify a port with -whitebind: '%s'</source>
-        <translation>-whitebind を用いてポートを指定する必要があります： '%s'</translation>
+        <source>User defined mnemonic passphrase for HD wallet (BIP39). Only has effect during wallet creation/first start (default: empty string)</source>
+        <translation>ユーザー定義ニーモニックパスフレーズをHDウォレットに使用します (BIP39)。ウォレット作成時にのみ有効です。(初期設定: 空文字)</translation>
     </message>
     <message>
-        <source>Only connect to nodes in network &lt;net&gt; (ipv4, ipv6 or onion)</source>
-        <translation>&lt;net&gt; (ipv4, ipv6 または onion) ネットワーク内のノードだけに接続する</translation>
+        <source>Username and hashed password for JSON-RPC connections. The field &lt;userpw&gt; comes in the format: &lt;USERNAME&gt;:&lt;SALT&gt;$&lt;HASH&gt;. A canonical python script is included in share/rpcuser. The client then connects normally using the rpcuser=&lt;USERNAME&gt;/rpcpassword=&lt;PASSWORD&gt; pair of arguments. This option can be specified multiple times</source>
+        <translation>JSON-RPC 接続時のユーザ名とハッシュ化されたパスワード。&lt;userpw&gt; フィールドのフォーマットは &lt;USERNAME&gt;:&lt;SALT&gt;$&lt;HASH&gt;。標準的な Python スクリプトが share/rpcuser 内に含まれています。クライアントは通常の場合には rpcuser=&lt;USERNAME&gt;/rpcpassword=&lt;PASSWORD&gt; を利用して接続を行います。このオプションは複数回指定できます。</translation>
     </message>
     <message>
-        <source>Prepend debug output with timestamp (default: %u)</source>
-        <translation>デバッグ出力にタイムスタンプを付ける (デフォルト設定： %u)</translation>
+        <source>Wallet will not create transactions that violate mempool chain limits (default: %u)</source>
+        <translation>ウォレットがmempoolチェーン制限数を超えてトランザクションを作らないようにする (初期値: %u)</translation>
     </message>
     <message>
-        <source>Send transactions as zero-fee transactions if possible (default: %u)</source>
-        <translation>可能な場合には手数料ゼロのトランザクションとしてトランザクションを送信する (デフォルト設定： %u)</translation>
+        <source>Warning: At least %d of %d masternodes are running on a newer software version. Please check latest releases, you might need to update too.</source>
+        <translation>警告:少なくとも%d ／ %d マスターノードは最新のソフトウェアを運用しています。最新のリリースをチェックしてください。アップデートが必要になるかもしれません。</translation>
     </message>
     <message>
-        <source>Server certificate file (default: %s)</source>
-        <translation>サーバ証明書ファイル (デフォルト設定： %s)</translation>
+        <source>Warning: Every masternode (out of %d known ones) is running on a newer software version. Please check latest releases, it's very likely that you missed a major/critical update.</source>
+        <translation>警告: すべてのマスターノード (%dのうち ) 最新のバージョンのソフトウェアを運用しています。最新のリリースをチェックしてください。重要なアップデートを見落とした可能性があります。</translation>
     </message>
     <message>
-        <source>Server private key (default: %s)</source>
-        <translation>サーバの秘密鍵 (デフォルト設定： %s)</translation>
+        <source>Warning: Wallet file corrupt, data salvaged! Original %s saved as %s in %s; if your balance or transactions are incorrect you should restore from a backup.</source>
+        <translation>警告: ウォレットファイルが破損していましたのでデータを復旧しました！元の %s は %s として %s に保存されました; 残高やトランザクションが正しくない場合にはバックアップから復元してください。</translation>
     </message>
     <message>
-        <source>Set key pool size to &lt;n&gt; (default: %u)</source>
-        <translation>key pool のサイズを &lt;n&gt; (デフォルト設定： %u) にセット</translation>
+        <source>Whitelist peers connecting from the given IP address (e.g. 1.2.3.4) or CIDR notated network (e.g. 1.2.3.0/24). Can be specified multiple times.</source>
+        <translation>ホワイトリストとして登録するピア、接続元の IP アドレス (例: 1.2.3.4) または CIDR 表現のネットワーク (例: 1.2.3.0/24)。複数回指定することも可能。</translation>
     </message>
     <message>
-        <source>Set minimum block size in bytes (default: %u)</source>
-        <translation>最小ブロックサイズをバイトで設定 (デフォルト設定： %u)</translation>
+        <source>%s corrupt, salvage failed</source>
+        <translation>%s が壊れています。復旧にも失敗しました</translation>
     </message>
     <message>
-        <source>Set the number of threads to service RPC calls (default: %d)</source>
-        <translation>RPC サービスのスレッド数を設定 (デフォルト設定： %d)</translation>
+        <source>%s is not a valid backup folder!</source>
+        <translation>%s は無効なバックアップフォルダーです!</translation>
     </message>
     <message>
-        <source>Specify configuration file (default: %s)</source>
-        <translation>設定ファイルの指定 (デフォルト設定： %s)</translation>
+        <source>%s is set very high!</source>
+        <translation>%s の設定値は高すぎます！</translation>
     </message>
     <message>
-        <source>Specify connection timeout in milliseconds (minimum: 1, default: %d)</source>
-        <translation>接続のタイムアウトをミリセコンドで指定 (最小値： 1, デフォルト設定：: %d)</translation>
+        <source>(press q to shutdown and continue later)</source>
+        <translation>( qを押してシャットダウンし、あとで再開してください)</translation>
     </message>
     <message>
-        <source>Specify pid file (default: %s)</source>
-        <translation>pid ファイルの指定 (デフォルト設定： %s)</translation>
+        <source>-devnet can only be specified once</source>
+        <translation>-devnet は一度だけ指定できます</translation>
     </message>
     <message>
-        <source>Spend unconfirmed change when sending transactions (default: %u)</source>
-        <translation>トランザクション送信時に未検証のおつりを使用する (デフォルト設定： %u)</translation>
+        <source>-port must be specified when -devnet and -listen are specified</source>
+        <translation>-port は、 -devnet と -listen が指定されたときに指定しなければなりません。</translation>
     </message>
     <message>
-        <source>Threshold for disconnecting misbehaving peers (default: %u)</source>
-        <translation>不正なピアを切断するためのしきい値 (デフォルト設定： %u)</translation>
+        <source>-rpcport must be specified when -devnet and -server are specified</source>
+        <translation>-rpcport は、 -devnet と -server が指定されたとき指定しなければなりません。</translation>
     </message>
     <message>
-        <source>Use UPnP to map the listening port (default: %u)</source>
-        <translation>リッスンポートの割当に UPnP を使用 (デフォルト設定： %u)</translation>
+        <source>Allow RFC1918 addresses to be relayed and connected to (default: %u)</source>
+        <translation>RFC1918 アドレスが中継され接続されるのを許可 (初期設定: %u)</translation>
     </message>
     <message>
-        <source>Warning: Unsupported argument -benchmark ignored, use -debug=bench.</source>
-        <translation>警告： サポートされていない引数 -benchmark は無視されました。-debug=bench を使用してください。</translation>
+        <source>Attempt to recover private keys from a corrupt wallet on startup</source>
+        <translation>起動時に壊れたウォレットから秘密鍵を復旧することを試す</translation>
     </message>
     <message>
-        <source>Warning: Unsupported argument -debugnet ignored, use -debug=net.</source>
-        <translation>警告： サポートされていない引数 -debugnet は無視されました。-debug=net を使用してください。</translation>
+        <source>Cannot resolve -%s address: '%s'</source>
+        <translation>-%s アドレス '%s' を解決できません</translation>
     </message>
     <message>
-        <source>Invalid netmask specified in -whitelist: '%s'</source>
-        <translation>-whitelist に対する無効なネットマスクです： '%s'</translation>
+        <source>Change index out of range</source>
+        <translation>チェンジインデックスが範囲外です</translation>
     </message>
     <message>
-        <source>Keep at most &lt;n&gt; unconnectable transactions in memory (default: %u)</source>
-        <translation>最大で &lt;n&gt; 個の孤立したトランザクションをメモリの中に保持する (デフォルト設定： %u)</translation>
+        <source>Copyright (C)</source>
+        <translation>Copyright (C)</translation>
     </message>
     <message>
-        <source>Loading addresses...</source>
-        <translation>アドレスを読み込んでいます…</translation>
+        <source>Error loading %s</source>
+        <translation>%s 読み込みエラー</translation>
     </message>
     <message>
-        <source>Loading block index...</source>
-        <translation>ブロック インデックスを読み込んでいます…</translation>
+        <source>Error loading %s: Wallet corrupted</source>
+        <translation>%s 読み込みエラー: ウォレットが壊れました</translation>
     </message>
     <message>
-        <source>Loading wallet... (%3.2f %%)</source>
-        <translation>ウォレットを読み込んでいます… (%3.2f %%)</translation>
+        <source>Error loading %s: Wallet requires newer version of %s</source>
+        <translation>%s の読み込みに失敗しました: ウォレットにはより新しいバージョンの %s が必要です。</translation>
     </message>
     <message>
-        <source>Loading wallet...</source>
-        <translation>ウォレットを読み込んでいます…</translation>
+        <source>Error upgrading chainstate database</source>
+        <translation>チェーンステートデータベースのアップグレードエラー</translation>
     </message>
     <message>
-        <source>Node relay options:</source>
-        <translation>ノード中継オプション：</translation>
+        <source>Failed to find mixing queue to join</source>
+        <translation>ミキシングキューの検出に失敗</translation>
     </message>
     <message>
-        <source>Not enough file descriptors available.</source>
-        <translation>使用可能なファイルディスクリプタが不足しています。</translation>
+        <source>Failed to start a new mixing queue</source>
+        <translation>新しいミキシングキューの開始に失敗</translation>
     </message>
     <message>
-        <source>Options:</source>
-        <translation>オプション：</translation>
+        <source>Initialization sanity check failed. %s is shutting down.</source>
+        <translation>初期化時の健全性チェックに失敗しました。%s を終了します。</translation>
     </message>
     <message>
-        <source>Password for JSON-RPC connections</source>
-        <translation>JSON-RPC 接続のパスワード</translation>
+        <source>Invalid amount for -%s=&lt;amount&gt;: '%s'</source>
+        <translation>無効な額 -%s=&lt;amount&gt;: '%s'</translation>
     </message>
     <message>
-        <source>RPC SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source>
-        <translation>RPC SSL オプション： (SSLのセットアップ手順はビットコインWikiを参照してください)</translation>
+        <source>Invalid spork address specified with -sporkaddr</source>
+        <translation>-sporkaddrに指定された無効なスポークアドレスI</translation>
     </message>
     <message>
-        <source>RPC server options:</source>
-        <translation>RPCサーバのオプション：</translation>
+        <source>Keep N DASH anonymized (%u-%u, default: %u)</source>
+        <translation>匿名化された N DASH を保持 (%u-%u, 初期設定: %u)</translation>
     </message>
     <message>
-        <source>RPC support for HTTP persistent connections (default: %d)</source>
-        <translation>RPCにおけるHTTPの持続的接続のサポート (デフォルト設定：%d)</translation>
+        <source>Print this help message and exit</source>
+        <translation>このヘルプメッセージを表示し終了する</translation>
     </message>
     <message>
         <source>Receive and display P2P network alerts (default: %u)</source>
-        <translation>P2Pネットワークのアラートの受け取りと表示を行う (デフォルト設定： %u)</translation>
+        <translation>P2Pネットワークのアラートの受け取りと表示を行う (初期設定： %u)</translation>
     </message>
     <message>
-        <source>Relay and mine data carrier transactions (default: %u)</source>
-        <translation>データ運送トランザクションのリレーおよび採掘を行う (デフォルト設定： %u)</translation>
+        <source>Reducing -maxconnections from %d to %d, because of system limitations.</source>
+        <translation>システム上の制約から、-maxconnections を %d から %d に削減します。</translation>
     </message>
     <message>
-        <source>Relay non-P2SH multisig (default: %u)</source>
-        <translation>P2SHでないマルチシグトランザクションをリレーする (デフォルト設定： %u)</translation>
+        <source>Relay and mine data carrier transactions (default: %u)</source>
+        <translation>データ運送トランザクションのリレーおよび採掘を行う (初期設定： %u)</translation>
     </message>
     <message>
-        <source>Rescan the block chain for missing wallet transactions</source>
-        <translation>失ったウォレットの取引のブロック チェーンを再スキャン</translation>
+        <source>Relay non-P2SH multisig (default: %u)</source>
+        <translation>P2SHでないマルチシグトランザクションをリレーする (初期設定： %u)</translation>
     </message>
     <message>
         <source>Rescanning...</source>
@@ -3011,13 +5166,29 @@
         <source>Run in the background as a daemon and accept commands</source>
         <translation>デーモンとしてバックグランドで実行しコマンドを許可</translation>
     </message>
+    <message>
+        <source>Send trace/debug info to console instead of debug.log file</source>
+        <translation>トレース/デバッグ情報を debug.log ファイルの代わりにコンソールへ送る</translation>
+    </message>
+    <message>
+        <source>Session not complete!</source>
+        <translation>セッション未完了！</translation>
+    </message>
+    <message>
+        <source>Session timed out.</source>
+        <translation>セッションタイムアウト</translation>
+    </message>
     <message>
         <source>Set database cache size in megabytes (%d to %d, default: %d)</source>
-        <translation>データベースのキャッシュサイズをメガバイトで設定 (%d から %d。デフォルト設定： %d)</translation>
+        <translation>データベースのキャッシュサイズをメガバイトで設定 (%d から %d。初期設定： %d)</translation>
     </message>
     <message>
         <source>Set maximum block size in bytes (default: %d)</source>
-        <translation>最大ブロックサイズをバイトで設定 (デフォルト設定： %d)</translation>
+        <translation>最大ブロックサイズをバイトで設定 (初期設定： %d)</translation>
+    </message>
+    <message>
+        <source>Set the masternode private key</source>
+        <translation>マスターノードプライベートセンドキーを設定</translation>
     </message>
     <message>
         <source>Show all debugging options (usage: --help -help-debug)</source>
@@ -3025,11 +5196,11 @@
     </message>
     <message>
         <source>Shrink debug.log file on client startup (default: 1 when no -debug)</source>
-        <translation>クライアント起動時に debug.log ファイルを縮小 (デフォルト設定： -debug オプションを指定しない場合は1)</translation>
+        <translation>クライアント起動時に debug.log ファイルを縮小 (初期設定：1 -debug オプションを指定しない場合)</translation>
     </message>
     <message>
         <source>Signing transaction failed</source>
-        <translation>取引の署名に失敗しました</translation>
+        <translation>トランザクションの署名に失敗</translation>
     </message>
     <message>
         <source>Specify data directory</source>
@@ -3037,15 +5208,35 @@
     </message>
     <message>
         <source>Specify wallet file (within data directory)</source>
-        <translation>ウォレットのファイルを指定　(データ・ディレクトリの中に)</translation>
+        <translation>ウォレットのファイルを指定　(データディレクトリの中で)</translation>
     </message>
     <message>
         <source>Specify your own public address</source>
         <translation>あなた自身のパブリックなアドレスを指定</translation>
     </message>
     <message>
-        <source>This help message</source>
-        <translation>このヘルプ メッセージ</translation>
+        <source>Starting network threads...</source>
+        <translation>ネットワークのスレッドを起動しています...</translation>
+    </message>
+    <message>
+        <source>Synchronization pending...</source>
+        <translation>同期保留中...</translation>
+    </message>
+    <message>
+        <source>Synchronizing governance objects...</source>
+        <translation>ガバナンスオブジェクトを同期中...</translation>
+    </message>
+    <message>
+        <source>Synchronizing masternode payments...</source>
+        <translation>マスターノードペイメント同期中...</translation>
+    </message>
+    <message>
+        <source>The source code is available from %s.</source>
+        <translation>ソースコードは %s より入手可能です。</translation>
+    </message>
+    <message>
+        <source>The transaction amount is too small to pay the fee</source>
+        <translation>トランザクションの金額が小さすぎて手数料を支払えません</translation>
     </message>
     <message>
         <source>This is experimental software.</source>
@@ -3053,43 +5244,39 @@
     </message>
     <message>
         <source>Transaction amount too small</source>
-        <translation>取引の額が小さ過ぎます</translation>
-    </message>
-    <message>
-        <source>Transaction amounts must be positive</source>
-        <translation>取引の額は0より大きくしてください</translation>
+        <translation>トランザクションの額が少な過ぎます</translation>
     </message>
     <message>
-        <source>Transaction too large for fee policy</source>
-        <translation>手数料ポリシーに対してトランザクションが大きすぎます</translation>
+        <source>Transaction created successfully.</source>
+        <translation>トランザクション作成に成功</translation>
     </message>
     <message>
-        <source>Transaction too large</source>
-        <translation>取引が大き過ぎます</translation>
+        <source>Transaction fees are too high.</source>
+        <translation>トランザクション手数料が高すぎます</translation>
     </message>
     <message>
-        <source>Unable to bind to %s on this computer (bind returned error %s)</source>
-        <translation>このコンピュータの %s にバインドすることができません (バインドが返したエラーは %s)</translation>
+        <source>Transaction not valid.</source>
+        <translation>トランザクションが無効です</translation>
     </message>
     <message>
-        <source>Unknown network specified in -onlynet: '%s'</source>
-        <translation>-onlynet で指定された '%s' は未知のネットワークです</translation>
+        <source>Transaction too large for fee policy</source>
+        <translation>手数料ポリシーに対してトランザクションが大きすぎます</translation>
     </message>
     <message>
-        <source>Upgrade wallet to latest format</source>
-        <translation>ウォレットを最新のフォーマットにアップグレード</translation>
+        <source>Unable to bind to %s on this computer (bind returned error %s)</source>
+        <translation>このコンピュータの %s にバインドすることができません (バインドが返したエラーは %s)</translation>
     </message>
     <message>
-        <source>Use OpenSSL (https) for JSON-RPC connections</source>
-        <translation>JSON-RPC 接続に OpenSSL (https) を使用</translation>
+        <source>Unable to sign spork message, wrong key?</source>
+        <translation>スポークメッセージに署名できません、キーが間違ってませんか?</translation>
     </message>
     <message>
-        <source>Use UPnP to map the listening port (default: 1 when listening)</source>
-        <translation>リスン ポートの割当に UPnP を使用 (デフォルト設定： リスン中は1)</translation>
+        <source>Unknown network specified in -onlynet: '%s'</source>
+        <translation>-onlynet で指定された '%s' は未知のネットワークです</translation>
     </message>
     <message>
-        <source>Use the test network</source>
-        <translation>テストのためのネットワークを使用</translation>
+        <source>Unknown state: id = %u</source>
+        <translation>未知の状態: id = %u</translation>
     </message>
     <message>
         <source>Username for JSON-RPC connections</source>
@@ -3103,33 +5290,41 @@
         <source>Verifying wallet...</source>
         <translation>ウォレットの検証中…</translation>
     </message>
+    <message>
+        <source>Very low number of keys left: %d</source>
+        <translation>非常に少ない数のキー: %d</translation>
+    </message>
     <message>
         <source>Wallet %s resides outside data directory %s</source>
-        <translation>財布 %s はデータ・ディレクトリ%sの外にあります</translation>
+        <translation>ウォレット %s はデータディレクトリ%sの外にあります。</translation>
+    </message>
+    <message>
+        <source>Wallet is locked.</source>
+        <translation>ウォレットはロックされています。</translation>
     </message>
     <message>
         <source>Wallet options:</source>
         <translation>ウォレットオプション：</translation>
     </message>
     <message>
-        <source>Warning</source>
-        <translation>警告</translation>
+        <source>Wallet window title</source>
+        <translation>ウォレットウィンドウタイトル</translation>
     </message>
     <message>
-        <source>You need to rebuild the database using -reindex to change -txindex</source>
-        <translation>-txindex を変更するには -reindex を使用してデータベースを再構築する必要があります</translation>
+        <source>Warning</source>
+        <translation>警告</translation>
     </message>
     <message>
-        <source>Zapping all transactions from wallet...</source>
-        <translation>ウォレットからすべてのトランザクションを消去しています…</translation>
+        <source>Your entries added successfully.</source>
+        <translation>あなたの追加エントリーは成功しました。</translation>
     </message>
     <message>
-        <source>on startup</source>
-        <translation>起動時</translation>
+        <source>Your transaction was accepted into the pool!</source>
+        <translation>あなたのトランザクションはプールにアクセプトされました。</translation>
     </message>
     <message>
-        <source>wallet.dat corrupt, salvage failed</source>
-        <translation>wallet.dat が壊れ、復旧に失敗しました</translation>
+        <source>Zapping all transactions from wallet...</source>
+        <translation>ウォレットからすべてのトランザクションを消去しています…</translation>
     </message>
 </context>
 </TS>
\ No newline at end of file
diff --git a/src/qt/locale/dash_ko.ts b/src/qt/locale/dash_ko.ts
new file mode 100644
index 000000000000..33e376abc021
--- /dev/null
+++ b/src/qt/locale/dash_ko.ts
@@ -0,0 +1,5329 @@
+<TS language="ko" version="2.1">
+<context>
+    <name>AddressBookPage</name>
+    <message>
+        <source>Right-click to edit address or label</source>
+        <translation>오른쪽 마우스를 클릭하여 주소와 라벨 편집</translation>
+    </message>
+    <message>
+        <source>Create a new address</source>
+        <translation>새로운 주소를 생성합니다.</translation>
+    </message>
+    <message>
+        <source>&amp;New</source>
+        <translation>생성(&amp;N)</translation>
+    </message>
+    <message>
+        <source>Copy the currently selected address to the system clipboard</source>
+        <translation>현재 선택된 주소를 시스템 클립보드로 복사합니다.</translation>
+    </message>
+    <message>
+        <source>&amp;Copy</source>
+        <translation>복사(&amp;C)</translation>
+    </message>
+    <message>
+        <source>Delete the currently selected address from the list</source>
+        <translation>현재 선택된 주소를 목록에서 제거합니다.</translation>
+    </message>
+    <message>
+        <source>&amp;Delete</source>
+        <translation>삭제(&amp;D)</translation>
+    </message>
+    <message>
+        <source>Export the data in the current tab to a file</source>
+        <translation>현재 탭의 데이터를 파일로 추출합니다.</translation>
+    </message>
+    <message>
+        <source>&amp;Export</source>
+        <translation>추출(&amp;E)</translation>
+    </message>
+    <message>
+        <source>C&amp;lose</source>
+        <translation>닫기(&amp;L)</translation>
+    </message>
+    <message>
+        <source>Choose the address to send coins to</source>
+        <translation>코인을 보내실 주소를 선택하세요.</translation>
+    </message>
+    <message>
+        <source>Choose the address to receive coins with</source>
+        <translation>코인을 받으실 주소를 선택하세요.</translation>
+    </message>
+    <message>
+        <source>C&amp;hoose</source>
+        <translation>선택 (&amp;H)</translation>
+    </message>
+    <message>
+        <source>Sending addresses</source>
+        <translation>보내기 주소</translation>
+    </message>
+    <message>
+        <source>Receiving addresses</source>
+        <translation>받기 주소</translation>
+    </message>
+    <message>
+        <source>These are your Dash addresses for sending payments. Always check the amount and the receiving address before sending coins.</source>
+        <translation>송금을 위한 대시 주소입니다. 코인을 보내기 전에 항상 금액과 받는 주소를 확인하세요.</translation>
+    </message>
+    <message>
+        <source>These are your Dash addresses for receiving payments. It is recommended to use a new receiving address for each transaction.</source>
+        <translation>대시를 송금 받기 위한 주소입니다. 매 거래시 새로운 주소를 사용할 것을 권장합니다.</translation>
+    </message>
+    <message>
+        <source>&amp;Copy Address</source>
+        <translation>주소 복사(&amp;C)</translation>
+    </message>
+    <message>
+        <source>Copy &amp;Label</source>
+        <translation>라벨 복사(&amp;L)</translation>
+    </message>
+    <message>
+        <source>&amp;Edit</source>
+        <translation>편집(&amp;E)</translation>
+    </message>
+    <message>
+        <source>Export Address List</source>
+        <translation>주소 목록 추출</translation>
+    </message>
+    <message>
+        <source>Comma separated file (*.csv)</source>
+        <translation>쉼표로 구분된 파일 (*.csv)</translation>
+    </message>
+    <message>
+        <source>Exporting Failed</source>
+        <translation>추출에 실패하였습니다.</translation>
+    </message>
+    <message>
+        <source>There was an error trying to save the address list to %1. Please try again.</source>
+        <translation>%1에 주소 리스트를 저장하는 동안 오류가 발생했습니다. 다시 시도해주세요.</translation>
+    </message>
+</context>
+<context>
+    <name>AddressTableModel</name>
+    <message>
+        <source>Label</source>
+        <translation>라벨</translation>
+    </message>
+    <message>
+        <source>Address</source>
+        <translation>주소</translation>
+    </message>
+    <message>
+        <source>(no label)</source>
+        <translation>(라벨 없음)</translation>
+    </message>
+</context>
+<context>
+    <name>AskPassphraseDialog</name>
+    <message>
+        <source>Passphrase Dialog</source>
+        <translation>암호문 대화상자</translation>
+    </message>
+    <message>
+        <source>Enter passphrase</source>
+        <translation>암호문 입력</translation>
+    </message>
+    <message>
+        <source>New passphrase</source>
+        <translation>새로운 암호</translation>
+    </message>
+    <message>
+        <source>Repeat new passphrase</source>
+        <translation>새로운 암호문 확인</translation>
+    </message>
+    <message>
+        <source>Enter the new passphrase to the wallet.&lt;br/&gt;Please use a passphrase of &lt;b&gt;ten or more random characters&lt;/b&gt;, or &lt;b&gt;eight or more words&lt;/b&gt;.</source>
+        <translation>지갑에 새로운 암호문을 입력하세요.&lt;br/&gt;다음의 요건을 충족하는 암호문을 지정하세요.&lt;b&gt;열 개 이상의 무작위 글자&lt;/b&gt;, 혹은 &lt;b&gt;여덟 개 이상의 무작위 단어 &lt;/b&gt;.</translation>
+    </message>
+    <message>
+        <source>Encrypt wallet</source>
+        <translation>지갑 암호화</translation>
+    </message>
+    <message>
+        <source>This operation needs your wallet passphrase to unlock the wallet.</source>
+        <translation>이 작업을 실행하려면 사용자 지갑의 암호문이 필요합니다.</translation>
+    </message>
+    <message>
+        <source>Unlock wallet for mixing only</source>
+        <translation>믹싱만을 위해 지갑 잠금 해제</translation>
+    </message>
+    <message>
+        <source>Unlock wallet</source>
+        <translation>지갑 잠금 해제</translation>
+    </message>
+    <message>
+        <source>This operation needs your wallet passphrase to decrypt the wallet.</source>
+        <translation>지갑을 해독하기 위한 작업에는 사용자 지갑의 암호문이 필요합니다.</translation>
+    </message>
+    <message>
+        <source>Decrypt wallet</source>
+        <translation>지갑 해독</translation>
+    </message>
+    <message>
+        <source>Change passphrase</source>
+        <translation>암호문 변경</translation>
+    </message>
+    <message>
+        <source>Enter the old passphrase and new passphrase to the wallet.</source>
+        <translation>지갑의 기존 암호문과 새로운 암호문을 입력하세요.</translation>
+    </message>
+    <message>
+        <source>Confirm wallet encryption</source>
+        <translation>지갑 암호화 승인</translation>
+    </message>
+    <message>
+        <source>Warning: If you encrypt your wallet and lose your passphrase, you will &lt;b&gt;LOSE ALL OF YOUR DASH&lt;/b&gt;!</source>
+        <translation>경고: 지갑을 암호화하고 암호문을 잃어버리는 경우 당신은 &lt;b&gt;모든 대시를 잃게 됩니다&lt;/b&gt;!</translation>
+    </message>
+    <message>
+        <source>Are you sure you wish to encrypt your wallet?</source>
+        <translation>지갑 암호화를 진행하시겠습니까?</translation>
+    </message>
+    <message>
+        <source>Wallet encrypted</source>
+        <translation>지갑 암호화 완료</translation>
+    </message>
+    <message>
+        <source>%1 will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your funds from being stolen by malware infecting your computer.</source>
+        <translation>암호화 진행을 완료하기 위하여 %1 이/가 종료됩니다. 사용자 지갑 암호화를 진행한다고 하더라도 컴퓨터에 영향을 끼치는 맬웨어로부터 자금을 완전히 보호하지 못한다는 점을 기억하세요. </translation>
+    </message>
+    <message>
+        <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. Previous backups of the unencrypted wallet file contain the same HD seed and still have full access to all your funds just like the new, encrypted wallet.</source>
+        <translation>중요: 당신의 지갑 파일에서 생성된 이전 백업은 새로 생성된 암호화 지갑 파일로 교체되어야 합니다.암호화되지 않은 이전 지갑 파일의 백업은 동일한 HD 시드를 가지며, 새로운 암호화 지갑과 마찬가지로 당신의 자금에 완전한 접근성을 제공합니다.</translation>
+    </message>
+    <message>
+        <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</source>
+        <translation>중요: 귀하의 지갑 파일에서 만든 예전 백업이 새로 생성한 암호화된 지갑 파일로 교체되어야 합니다.  새롭게 암호화된 지갑을 사용하는 경우, 보안상 이유로 인하여 암호화되지 않은 이전 지갑의 백업 파일은 사용할 수 없게 됩니다.</translation>
+    </message>
+    <message>
+        <source>Wallet encryption failed</source>
+        <translation>지갑 암호화 실패</translation>
+    </message>
+    <message>
+        <source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source>
+        <translation>내부 에러로 인해 지갑 암호화에 실패했습니다.  당신의 지갑은 암호화 되지 않았습니다.</translation>
+    </message>
+    <message>
+        <source>The supplied passphrases do not match.</source>
+        <translation>입력한 암호문이 일치하지 않습니다.</translation>
+    </message>
+    <message>
+        <source>Wallet unlock failed</source>
+        <translation>지갑 잠금 해제 실패</translation>
+    </message>
+    <message>
+        <source>The passphrase entered for the wallet decryption was incorrect.</source>
+        <translation>지갑 해독을 위해 입력한 암호문이 틀립니다.</translation>
+    </message>
+    <message>
+        <source>Wallet decryption failed</source>
+        <translation>지갑 해독 실패</translation>
+    </message>
+    <message>
+        <source>Wallet passphrase was successfully changed.</source>
+        <translation>지갑 암호문이 성공적으로 변경되었습니다.</translation>
+    </message>
+    <message>
+        <source>Warning: The Caps Lock key is on!</source>
+        <translation>경고: Caps Lock키가 켜져있습니다!</translation>
+    </message>
+</context>
+<context>
+    <name>BanTableModel</name>
+    <message>
+        <source>IP/Netmask</source>
+        <translation>IP주소/넷마스크</translation>
+    </message>
+    <message>
+        <source>Banned Until</source>
+        <translation>다음의 일시까지 정지되었습니다:</translation>
+    </message>
+</context>
+<context>
+    <name>BitcoinGUI</name>
+    <message>
+        <source>A fatal error occurred. Dash Core can no longer continue safely and will quit.</source>
+        <translation>치명적인 오류가 발생하였습니다. 더 이상 대시 코어가 안전하지 않을 가능성이 있으며 대시 코어는 곧 종료될 예정입니다.</translation>
+    </message>
+    <message>
+        <source>Dash Core</source>
+        <translation>대시 코어</translation>
+    </message>
+    <message>
+        <source>Wallet</source>
+        <translation>지갑</translation>
+    </message>
+    <message>
+        <source>Node</source>
+        <translation>노드</translation>
+    </message>
+    <message>
+        <source>&amp;Overview</source>
+        <translation>개요(&amp;O)</translation>
+    </message>
+    <message>
+        <source>Show general overview of wallet</source>
+        <translation>지갑의 일반적 개요를 보여줍니다.</translation>
+    </message>
+    <message>
+        <source>&amp;Send</source>
+        <translation>보내기(&amp;S)</translation>
+    </message>
+    <message>
+        <source>Send coins to a Dash address</source>
+        <translation>대시 주소로 코인 전송</translation>
+    </message>
+    <message>
+        <source>&amp;Receive</source>
+        <translation>받기(&amp;R)</translation>
+    </message>
+    <message>
+        <source>Request payments (generates QR codes and dash: URIs)</source>
+        <translation>지불 요청하기 (QR코드와 대시 URI가 생성됩니다.)</translation>
+    </message>
+    <message>
+        <source>&amp;Transactions</source>
+        <translation>거래(&amp;T)</translation>
+    </message>
+    <message>
+        <source>Browse transaction history</source>
+        <translation>거래내역을 검색합니다.</translation>
+    </message>
+    <message>
+        <source>&amp;Masternodes</source>
+        <translation>마스터노드(&amp;M)</translation>
+    </message>
+    <message>
+        <source>Browse masternodes</source>
+        <translation>마스터노드 보기</translation>
+    </message>
+    <message>
+        <source>E&amp;xit</source>
+        <translation>나가기(&amp;X)</translation>
+    </message>
+    <message>
+        <source>Quit application</source>
+        <translation>어플리케이션 종료</translation>
+    </message>
+    <message>
+        <source>Show information about Dash Core</source>
+        <translation>대시 코어에 관한 정보를 표시합니다.</translation>
+    </message>
+    <message>
+        <source>About &amp;Qt</source>
+        <translation>&amp;Qt 에 관하여</translation>
+    </message>
+    <message>
+        <source>Show information about Qt</source>
+        <translation>Qt 정보를 표시합니다</translation>
+    </message>
+    <message>
+        <source>&amp;Options...</source>
+        <translation>옵션(&amp;O)</translation>
+    </message>
+    <message>
+        <source>&amp;About %1</source>
+        <translation>%1 정보(&amp;A)</translation>
+    </message>
+    <message>
+        <source>Modify configuration options for %1</source>
+        <translation>%1 설정 옵션 수정</translation>
+    </message>
+    <message>
+        <source>&amp;Show / Hide</source>
+        <translation>보이기 / 숨기기(&amp;S)</translation>
+    </message>
+    <message>
+        <source>Show or hide the main Window</source>
+        <translation>메인창 보이기 또는 숨기기</translation>
+    </message>
+    <message>
+        <source>&amp;Encrypt Wallet...</source>
+        <translation>지갑 암호화(&amp;E)...</translation>
+    </message>
+    <message>
+        <source>Encrypt the private keys that belong to your wallet</source>
+        <translation>지갑에 해당하는 개인 키 암호화하기</translation>
+    </message>
+    <message>
+        <source>&amp;Backup Wallet...</source>
+        <translation>지갑 백업(&amp;B)...</translation>
+    </message>
+    <message>
+        <source>Backup wallet to another location</source>
+        <translation>지갑을 다른 장소에 백업</translation>
+    </message>
+    <message>
+        <source>&amp;Change Passphrase...</source>
+        <translation>암호문 변경(&amp;C)...</translation>
+    </message>
+    <message>
+        <source>Change the passphrase used for wallet encryption</source>
+        <translation>지갑 암호화에 사용되는 암호문을 변경합니다</translation>
+    </message>
+    <message>
+        <source>&amp;Unlock Wallet...</source>
+        <translation>지갑 잠금해제 (&amp;U)</translation>
+    </message>
+    <message>
+        <source>Unlock wallet</source>
+        <translation>지갑 잠금해제</translation>
+    </message>
+    <message>
+        <source>&amp;Lock Wallet</source>
+        <translation>지갑 잠금(&amp;L)</translation>
+    </message>
+    <message>
+        <source>Sign &amp;message...</source>
+        <translation>메시지 서명...(&amp;M)</translation>
+    </message>
+    <message>
+        <source>Sign messages with your Dash addresses to prove you own them</source>
+        <translation>본인의 대시 주소임을 증명하기 위하여 메시지에 서명합니다.</translation>
+    </message>
+    <message>
+        <source>&amp;Verify message...</source>
+        <translation>메시지 검증...(&amp;V)</translation>
+    </message>
+    <message>
+        <source>Verify messages to ensure they were signed with specified Dash addresses</source>
+        <translation>특정 대시 주소에 서명된 것인지 확인하기 위하여 메시지를 검증합니다.</translation>
+    </message>
+    <message>
+        <source>&amp;Information</source>
+        <translation>정보(&amp;I)</translation>
+    </message>
+    <message>
+        <source>Show diagnostic information</source>
+        <translation>진단 정보를 표시합니다.</translation>
+    </message>
+    <message>
+        <source>&amp;Debug console</source>
+        <translation>디버그 콘솔(&amp;D)</translation>
+    </message>
+    <message>
+        <source>Open debugging console</source>
+        <translation>디버깅 콘솔을 엽니다.</translation>
+    </message>
+    <message>
+        <source>&amp;Network Monitor</source>
+        <translation>네트워크 모니터(&amp;N)</translation>
+    </message>
+    <message>
+        <source>Show network monitor</source>
+        <translation>네트워크 모니터를 표시합니다.</translation>
+    </message>
+    <message>
+        <source>&amp;Peers list</source>
+        <translation>피어 리스트(&amp;P)</translation>
+    </message>
+    <message>
+        <source>Show peers info</source>
+        <translation>피어 정보를 표시합니다.</translation>
+    </message>
+    <message>
+        <source>Wallet &amp;Repair</source>
+        <translation>지갑 복구(&amp;R)</translation>
+    </message>
+    <message>
+        <source>Show wallet repair options</source>
+        <translation>지갑 복구 옵션을 표시합니다.</translation>
+    </message>
+    <message>
+        <source>Open Wallet &amp;Configuration File</source>
+        <translation>지갑 설정 파일 열기(&amp;C)</translation>
+    </message>
+    <message>
+        <source>Open configuration file</source>
+        <translation>설정 파일을 엽니다.</translation>
+    </message>
+    <message>
+        <source>Open &amp;Masternode Configuration File</source>
+        <translation>마스터노드 설정 파일 열기(&amp;M)</translation>
+    </message>
+    <message>
+        <source>Open Masternode configuration file</source>
+        <translation>마스터노드 설정 파일을 엽니다.</translation>
+    </message>
+    <message>
+        <source>Show Automatic &amp;Backups</source>
+        <translation>자동 백업 표시(&amp;B)</translation>
+    </message>
+    <message>
+        <source>Show automatically created wallet backups</source>
+        <translation>자동으로 생성된 지갑 백업을 보여줍니다.</translation>
+    </message>
+    <message>
+        <source>&amp;Sending addresses...</source>
+        <translation>보내기 주소...(&amp;S)</translation>
+    </message>
+    <message>
+        <source>Show the list of used sending addresses and labels</source>
+        <translation>사용한 보내기 주소와 라벨을 보여줍니다.</translation>
+    </message>
+    <message>
+        <source>&amp;Receiving addresses...</source>
+        <translation>받기 주소...(&amp;R)</translation>
+    </message>
+    <message>
+        <source>Show the list of used receiving addresses and labels</source>
+        <translation>사용한 받기 주소와 라벨을 표시합니다.</translation>
+    </message>
+    <message>
+        <source>Open &amp;URI...</source>
+        <translation>URI 열기(&amp;U)...</translation>
+    </message>
+    <message>
+        <source>Open a dash: URI or payment request</source>
+        <translation>Dash: URI 또는 지불 요청을 엽니다.</translation>
+    </message>
+    <message>
+        <source>&amp;Command-line options</source>
+        <translation>명령줄 옵션(&amp;C)</translation>
+    </message>
+    <message>
+        <source>Show the %1 help message to get a list with possible Dash command-line options</source>
+        <translation>사용 가능한 대시 명령줄 옵션 목록을 가져오기 위해 %1 도움말 메시지를 표시합니다.</translation>
+    </message>
+    <message>
+        <source>%1 client</source>
+        <translation>%1 클라이언트</translation>
+    </message>
+    <message>
+        <source>&amp;PrivateSend information</source>
+        <translation>프라이빗샌드 정보(&amp;P)</translation>
+    </message>
+    <message>
+        <source>Show the PrivateSend basic information</source>
+        <translation>프라이빗샌드에 대한 기본적인 정보를 보여줍니다.</translation>
+    </message>
+    <message>
+        <source>&amp;File</source>
+        <translation>파일(&amp;F)</translation>
+    </message>
+    <message>
+        <source>&amp;Settings</source>
+        <translation>설정(&amp;S)</translation>
+    </message>
+    <message>
+        <source>&amp;Tools</source>
+        <translation>도구(&amp;T)</translation>
+    </message>
+    <message>
+        <source>&amp;Help</source>
+        <translation>도움말(&amp;H)</translation>
+    </message>
+    <message>
+        <source>Tabs toolbar</source>
+        <translation>도구 모음 탭</translation>
+    </message>
+    <message numerus="yes">
+        <source>%n active connection(s) to Dash network</source>
+        <translation><numerusform>대시 네트워크의 활성 연결 수는 %n 입니다.</numerusform></translation>
+    </message>
+    <message>
+        <source>Network activity disabled</source>
+        <translation>네트워크 활동 정지</translation>
+    </message>
+    <message>
+        <source>Syncing Headers (%1%)...</source>
+        <translation>헤더 동기화중 (%1%)...</translation>
+    </message>
+    <message>
+        <source>Synchronizing with network...</source>
+        <translation>네트워크와 동기화중...</translation>
+    </message>
+    <message>
+        <source>Indexing blocks on disk...</source>
+        <translation>디스크에서 블록 색인중...</translation>
+    </message>
+    <message>
+        <source>Processing blocks on disk...</source>
+        <translation>디스크에서 블록 처리중...</translation>
+    </message>
+    <message>
+        <source>Reindexing blocks on disk...</source>
+        <translation>디스크에서 블록 다시 색인중...</translation>
+    </message>
+    <message>
+        <source>Connecting to peers...</source>
+        <translation>피어에 연결중...</translation>
+    </message>
+    <message numerus="yes">
+        <source>Processed %n block(s) of transaction history.</source>
+        <translation><numerusform>거래 히스토리의 %n 블록을 처리하였습니다.</numerusform></translation>
+    </message>
+    <message>
+        <source>%1 behind</source>
+        <translation>%1 전의 정보 처리 중</translation>
+    </message>
+    <message>
+        <source>Catching up...</source>
+        <translation>블록 따라잡기...</translation>
+    </message>
+    <message>
+        <source>Last received block was generated %1 ago.</source>
+        <translation>최근에 받은 블록은 %1 전에 생성되었습니다.</translation>
+    </message>
+    <message>
+        <source>Transactions after this will not yet be visible.</source>
+        <translation>이 이후의 거래는 아직 보이지 않습니다.</translation>
+    </message>
+    <message>
+        <source>Up to date</source>
+        <translation>최신</translation>
+    </message>
+    <message>
+        <source>Synchronizing additional data: %p%</source>
+        <translation>추가 정보를 동기화 중: %p%</translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation>에러</translation>
+    </message>
+    <message>
+        <source>Warning</source>
+        <translation>경고</translation>
+    </message>
+    <message>
+        <source>Information</source>
+        <translation>정보</translation>
+    </message>
+    <message>
+        <source>Date: %1
+</source>
+        <translation>날짜: %1
+</translation>
+    </message>
+    <message>
+        <source>Amount: %1
+</source>
+        <translation>수량: %1
+</translation>
+    </message>
+    <message>
+        <source>Type: %1
+</source>
+        <translation>종류: %1
+</translation>
+    </message>
+    <message>
+        <source>Label: %1
+</source>
+        <translation>라벨: %1
+</translation>
+    </message>
+    <message>
+        <source>Address: %1
+</source>
+        <translation>주소: %1
+</translation>
+    </message>
+    <message>
+        <source>Sent transaction</source>
+        <translation>전송된 거래</translation>
+    </message>
+    <message>
+        <source>Incoming transaction</source>
+        <translation>진행 중인 거래</translation>
+    </message>
+    <message>
+        <source>HD key generation is &lt;b&gt;enabled&lt;/b&gt;</source>
+        <translation>HD 키 생성이 &lt;b&gt;활성화되었습니다&lt;/b&gt;</translation>
+    </message>
+    <message>
+        <source>HD key generation is &lt;b&gt;disabled&lt;/b&gt;</source>
+        <translation>HD 키 생성이 &lt;b&gt;비활성화되었습니다&lt;/b&gt;</translation>
+    </message>
+    <message>
+        <source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;unlocked&lt;/b&gt;</source>
+        <translation>지갑이 &lt;b&gt;암호화&lt;/b&gt;되어 있으며, 현재 &lt;b&gt;잠금 해제&lt;/b&gt; 상태입니다.</translation>
+    </message>
+    <message>
+        <source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;unlocked&lt;/b&gt; for mixing only</source>
+        <translation>지갑이 &lt;b&gt;암호화&lt;/b&gt;되어 있으며, 현재 믹싱만을 위하여&lt;b&gt;잠금 해제&lt;/b&gt; 되어 있습니다.</translation>
+    </message>
+    <message>
+        <source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;locked&lt;/b&gt;</source>
+        <translation>지갑이 &lt;b&gt;암호화&lt;/b&gt; 되었고 현재 &lt;b&gt;잠겨져&lt;/b&gt; 있습니다</translation>
+    </message>
+</context>
+<context>
+    <name>ClientModel</name>
+    <message>
+        <source>Total: %1 (PS compatible: %2 / Enabled: %3)</source>
+        <translation>전체: %1 (PS 호환: %2 / 가능: %3)</translation>
+    </message>
+    <message>
+        <source>Network Alert</source>
+        <translation>네트워크 경고</translation>
+    </message>
+</context>
+<context>
+    <name>CoinControlDialog</name>
+    <message>
+        <source>Quantity:</source>
+        <translation>수량:</translation>
+    </message>
+    <message>
+        <source>Bytes:</source>
+        <translation>바이트:</translation>
+    </message>
+    <message>
+        <source>Amount:</source>
+        <translation>거래액:</translation>
+    </message>
+    <message>
+        <source>Fee:</source>
+        <translation>수수료:</translation>
+    </message>
+    <message>
+        <source>Coin Selection</source>
+        <translation>코인 선택</translation>
+    </message>
+    <message>
+        <source>Dust:</source>
+        <translation>더스트:</translation>
+    </message>
+    <message>
+        <source>After Fee:</source>
+        <translation>수수료 이후:</translation>
+    </message>
+    <message>
+        <source>Change:</source>
+        <translation>잔돈:</translation>
+    </message>
+    <message>
+        <source>(un)select all</source>
+        <translation>모두 선택(취소)</translation>
+    </message>
+    <message>
+        <source>toggle lock state</source>
+        <translation>토글 잠금 상태</translation>
+    </message>
+    <message>
+        <source>Tree mode</source>
+        <translation>트리 모드</translation>
+    </message>
+    <message>
+        <source>List mode</source>
+        <translation>리스트 모드</translation>
+    </message>
+    <message>
+        <source>(1 locked)</source>
+        <translation>(1 잠금)</translation>
+    </message>
+    <message>
+        <source>Amount</source>
+        <translation>거래액</translation>
+    </message>
+    <message>
+        <source>Received with label</source>
+        <translation>함께 수신된 라벨</translation>
+    </message>
+    <message>
+        <source>Received with address</source>
+        <translation>함께 수신된 주소</translation>
+    </message>
+    <message>
+        <source>PS Rounds</source>
+        <translation>PS 라운드</translation>
+    </message>
+    <message>
+        <source>Date</source>
+        <translation>날짜</translation>
+    </message>
+    <message>
+        <source>Confirmations</source>
+        <translation>확인</translation>
+    </message>
+    <message>
+        <source>Confirmed</source>
+        <translation>확인됨</translation>
+    </message>
+    <message>
+        <source>Copy address</source>
+        <translation>주소 복사</translation>
+    </message>
+    <message>
+        <source>Copy label</source>
+        <translation>라벨 복사</translation>
+    </message>
+    <message>
+        <source>Copy amount</source>
+        <translation>거래액 복사</translation>
+    </message>
+    <message>
+        <source>Copy transaction ID</source>
+        <translation>거래 아이디 복사</translation>
+    </message>
+    <message>
+        <source>Lock unspent</source>
+        <translation>사용되지 않은 주소 잠금</translation>
+    </message>
+    <message>
+        <source>Unlock unspent</source>
+        <translation>사용되지 않은 주소 잠금 해제</translation>
+    </message>
+    <message>
+        <source>Copy quantity</source>
+        <translation>수량 복사</translation>
+    </message>
+    <message>
+        <source>Copy fee</source>
+        <translation>수수료 복사</translation>
+    </message>
+    <message>
+        <source>Copy after fee</source>
+        <translation>수수료 이후 복사</translation>
+    </message>
+    <message>
+        <source>Copy bytes</source>
+        <translation>바이트 복사</translation>
+    </message>
+    <message>
+        <source>Copy dust</source>
+        <translation>더스트 복사</translation>
+    </message>
+    <message>
+        <source>Copy change</source>
+        <translation>잔돈 복사</translation>
+    </message>
+    <message>
+        <source>Please switch to "List mode" to use this function.</source>
+        <translation>이 기능을 사용하기 위해서는 '리스트 모드'를 켜주세요.</translation>
+    </message>
+    <message>
+        <source>Non-anonymized input selected. &lt;b&gt;PrivateSend will be disabled.&lt;/b&gt;&lt;br&gt;&lt;br&gt;If you still want to use PrivateSend, please deselect all non-anonymized inputs first and then check the PrivateSend checkbox again.</source>
+        <translation>익명화 되지 않은 입력이 선택되었습니다. &lt;b&gt;프라이빗샌드 기능이 비활성화됩니다. &lt;/b&gt;&lt;br&gt;&lt;br&gt;계속해서 프라이빗샌드 기능을 사용하고자 하신다면 모든 익명화되지 않은 입력 선택을 취소하시고 프라이빗샌드 체크박스를 다시 선택해주세요. </translation>
+    </message>
+    <message>
+        <source>(%1 locked)</source>
+        <translation>(%1 잠금)</translation>
+    </message>
+    <message>
+        <source>yes</source>
+        <translation>예</translation>
+    </message>
+    <message>
+        <source>no</source>
+        <translation>아니오</translation>
+    </message>
+    <message>
+        <source>This label turns red if any recipient receives an amount smaller than the current dust threshold.</source>
+        <translation>수령인이 현재 더스트 임계값보다 작은 양을 수신하면 이 라벨이 빨간색으로 변합니다.</translation>
+    </message>
+    <message>
+        <source>Can vary +/- %1 duff(s) per input.</source>
+        <translation>입력당 +/- %1 더프가 달라질 수 있습니다.</translation>
+    </message>
+    <message>
+        <source>(no label)</source>
+        <translation>(라벨 없음)</translation>
+    </message>
+    <message>
+        <source>change from %1 (%2)</source>
+        <translation>%1 로부터 잔돈 (%2)</translation>
+    </message>
+    <message>
+        <source>(change)</source>
+        <translation>(잔돈)</translation>
+    </message>
+    <message>
+        <source>n/a</source>
+        <translation>없음</translation>
+    </message>
+</context>
+<context>
+    <name>EditAddressDialog</name>
+    <message>
+        <source>Edit Address</source>
+        <translation>주소 편집</translation>
+    </message>
+    <message>
+        <source>&amp;Label</source>
+        <translation>라벨(&amp;L)</translation>
+    </message>
+    <message>
+        <source>The label associated with this address list entry</source>
+        <translation>이 주소 목록에 입력된 주소와 연결된 라벨</translation>
+    </message>
+    <message>
+        <source>&amp;Address</source>
+        <translation>주소(&amp;A)</translation>
+    </message>
+    <message>
+        <source>The address associated with this address list entry. This can only be modified for sending addresses.</source>
+        <translation>이 주소 목록에 입력된 주소와 연결된 주소. 이 경우 보내기 주소만 변경이 가능합니다.</translation>
+    </message>
+    <message>
+        <source>New receiving address</source>
+        <translation>새로운 받기 주소</translation>
+    </message>
+    <message>
+        <source>New sending address</source>
+        <translation>새로운 보내기 주소</translation>
+    </message>
+    <message>
+        <source>Edit receiving address</source>
+        <translation>받기 주소 편집</translation>
+    </message>
+    <message>
+        <source>Edit sending address</source>
+        <translation>보내기 주소 편집</translation>
+    </message>
+    <message>
+        <source>The entered address "%1" is not a valid Dash address.</source>
+        <translation>입력한 주소 "%1" 는 올바른 대시 주소가 아닙니다.</translation>
+    </message>
+    <message>
+        <source>The entered address "%1" is already in the address book.</source>
+        <translation>입력된 주소 "%1" 는 이미 주소록에 있습니다.</translation>
+    </message>
+    <message>
+        <source>Could not unlock wallet.</source>
+        <translation>지갑을 잠금 해제 할 수 없습니다.</translation>
+    </message>
+    <message>
+        <source>New key generation failed.</source>
+        <translation>새로운 키 생성에 실패하였습니다.</translation>
+    </message>
+</context>
+<context>
+    <name>FreespaceChecker</name>
+    <message>
+        <source>A new data directory will be created.</source>
+        <translation>새로운 데이터 디렉토리가 생성됩니다.</translation>
+    </message>
+    <message>
+        <source>name</source>
+        <translation>이름</translation>
+    </message>
+    <message>
+        <source>Directory already exists. Add %1 if you intend to create a new directory here.</source>
+        <translation>디렉토리가 이미 존재합니다. 새로운 디렉토리 생성을 원하시면 %1 을/를 추가하세요. </translation>
+    </message>
+    <message>
+        <source>Path already exists, and is not a directory.</source>
+        <translation>경로가 이미 존재합니다. 또한 디렉토리가 아닙니다.</translation>
+    </message>
+    <message>
+        <source>Cannot create data directory here.</source>
+        <translation>이곳에 데이터 디렉토리를 생성할 수 없습니다.</translation>
+    </message>
+</context>
+<context>
+    <name>HelpMessageDialog</name>
+    <message>
+        <source>version</source>
+        <translation>버전</translation>
+    </message>
+    <message>
+        <source>(%1-bit)</source>
+        <translation>(%1-비트)</translation>
+    </message>
+    <message>
+        <source>About %1</source>
+        <translation>%1에 관하여</translation>
+    </message>
+    <message>
+        <source>Command-line options</source>
+        <translation>명령줄 옵션</translation>
+    </message>
+    <message>
+        <source>Usage:</source>
+        <translation>사용법:</translation>
+    </message>
+    <message>
+        <source>command-line options</source>
+        <translation>명령줄 옵션</translation>
+    </message>
+    <message>
+        <source>UI Options:</source>
+        <translation>UI 옵션:</translation>
+    </message>
+    <message>
+        <source>Choose data directory on startup (default: %u)</source>
+        <translation>실행시 데이터 디렉토리 선택하기 (기본값: %u)</translation>
+    </message>
+    <message>
+        <source>Set language, for example "de_DE" (default: system locale)</source>
+        <translation>언어를 설정하십시오. 예: "kr_KR" (기본값: 시스템 로케일)</translation>
+    </message>
+    <message>
+        <source>Start minimized</source>
+        <translation>최소화된 상태에서 시작</translation>
+    </message>
+    <message>
+        <source>Set SSL root certificates for payment request (default: -system-)</source>
+        <translation>지불 요청을 위한 SSL 루트 인증서 설정 (기본값: -system-)</translation>
+    </message>
+    <message>
+        <source>Show splash screen on startup (default: %u)</source>
+        <translation>실행시 시작 화면 보기 (기본값: %u)</translation>
+    </message>
+    <message>
+        <source>Reset all settings changed in the GUI</source>
+        <translation>GUI를 통해 수정된 모든 설정을 초기화</translation>
+    </message>
+    <message>
+        <source>PrivateSend information</source>
+        <translation>프라이빗샌드 정보</translation>
+    </message>
+    <message>
+        <source>&lt;h3&gt;PrivateSend Basics&lt;/h3&gt; PrivateSend gives you true financial privacy by obscuring the origins of your funds. All the Dash in your wallet is comprised of different "inputs" which you can think of as separate, discrete coins.&lt;br&gt; PrivateSend uses an innovative process to mix your inputs with the inputs of two other people, without having your coins ever leave your wallet. You retain control of your money at all times.&lt;hr&gt; &lt;b&gt;The PrivateSend process works like this:&lt;/b&gt;&lt;ol type="1"&gt; &lt;li&gt;PrivateSend begins by breaking your transaction inputs down into standard denominations. These denominations are 0.01 DASH, 0.1 DASH, 1 DASH and 10 DASH -- sort of like the paper money you use every day.&lt;/li&gt; &lt;li&gt;Your wallet then sends requests to specially configured software nodes on the network, called "masternodes." These masternodes are informed then that you are interested in mixing a certain denomination. No identifiable information is sent to the masternodes, so they never know "who" you are.&lt;/li&gt; &lt;li&gt;When two other people send similar messages, indicating that they wish to mix the same denomination, a mixing session begins. The masternode mixes up the inputs and instructs all three users' wallets to pay the now-transformed input back to themselves. Your wallet pays that denomination directly to itself, but in a different address (called a change address).&lt;/li&gt; &lt;li&gt;In order to fully obscure your funds, your wallet must repeat this process a number of times with each denomination. Each time the process is completed, it's called a "round." Each round of PrivateSend makes it exponentially more difficult to determine where your funds originated.&lt;/li&gt; &lt;li&gt;This mixing process happens in the background without any intervention on your part. When you wish to make a transaction, your funds will already be anonymized. No additional waiting is required.&lt;/li&gt; &lt;/ol&gt; &lt;hr&gt;&lt;b&gt;IMPORTANT:&lt;/b&gt; Your wallet only contains 1000 of these "change addresses." Every time a mixing event happens, up to 9 of your addresses are used up. This means those 1000 addresses last for about 100 mixing events. When 900 of them are used, your wallet must create more addresses. It can only do this, however, if you have automatic backups enabled.&lt;br&gt; Consequently, users who have backups disabled will also have PrivateSend disabled. &lt;hr&gt;For more information, see the &lt;a href="https://docs.dash.org/en/latest/wallets/dashcore/privatesend-instantsend.html"&gt;PrivateSend documentation&lt;/a&gt;.         </source>
+        <translation>&lt;h3&gt;프라이빗샌드에 관한 기본 정보&lt;/h3&gt; 프라이빗 샌드는 당신의 자금 출처를 가려 진정한 재정적 프라이버시를 보장합니다. 당신의 지갑에 보관된 모든 대시는 각기 다른 ‘입력값’으로 구성되어 있습니다. 쉽게 생각하면 별도의 분리된 동전으로 구성되어 있다고 볼 수 있습니다.&lt;br&gt; 프라이빗샌드는 당신의 코인이 지갑을 떠나지 않고도 그 입력값을 다른 두 사람의 입력값과 섞는 혁신적인 방식을 사용합니다. 이로써 당신의 자금은 언제나 당신의 통제 하에 있습니다.&lt;hr&gt;&lt;b&gt; 프라이빗샌드는 다음과 같은 방식으로 작동합니다.&lt;/b&gt;&lt;ol type="1"&gt;&lt;li&gt; 프라이빗샌드는 당신의 거래 입력값을 표준 단위로 쪼개는 것으로 시작합니다. 이렇게 분할하는 단위는 0.01대시, 0.1대시, 1대시 혹은 10대시 입니다 - 귀하가 일상적으로 사용하는 지폐와 비슷하다고 생각하셔도 좋습니다. &lt;/li&gt;&lt;li&gt;이후 당신의 지갑은 ‘마스터노드’라고 불리는 네트워크의 특수 구성 소프트웨어 노드에 요청을 전송합니다. 이로써 이들 마스터노드는 당신이 특정 금액을 믹싱하고자 한다는 정보를 수신합니다. 마스터노드에는 당신의 개인 정보를 식별할 수 있는 어떤 내용도 전송되지 않습니다. 즉 당신이 ‘누구’인지 알 수 있는 방법은 없습니다.&lt;/li&gt;&lt;li&gt; 두 명의 다른 사람이 비슷한 메시지를 보내어 그들 역시 같은 단위의 금액을 믹싱하고 싶다는 정보를 표시하면 믹싱 세션이 시작됩니다. 마스터노드는 이들 입력값을 믹싱하여 세 사용자의 지갑에 변환된 입력을 지불하도록 지시합니다. 당신의 지갑은 해당 입력값을 지불하지만, 지불되는 주소는 '변경 주소'라고 불리는 다른 주소로 보내집니다.&lt;/li&gt;&lt;li&gt; 당신의 자금을 완전히 가리기 위해서, 당신의 지갑은 이 과정을 각 대시 분할 단위만큼 여러번 반복합니다. 이러한 반복을 ‘라운드’라고 부릅니다. 프라이빗샌드의 각 라운드가 진행됨에 따라 당신이 송금하고자 하는 자금의 출처는 기하급수적으로 높은 수준으로 가려집니다.&lt;/li&gt;&lt;li&gt; 이 믹싱 과정은 당신이 개입할 필요 없이 백그라운드에서 진행됩니다. 당신이 거래를 원하시는 경우, 당신의 자금은 이미 익명화가 진행되는 중입니다. 추가적으로 대기할 필요 역시 없습니다. &lt;/li&gt;&lt;/ol&gt;&lt;hr&gt;&lt;b&gt;중요:&lt;/b&gt; 당신의 지갑은 1,000개의 ‘변경 주소’만을 가지고 있습니다. 믹싱을 실행할 때마다 최대 9개의 주소가 사용됩니다. 이는 곧 이들 1000개의 주소가 약 100개의 믹싱 작업을 위해 사용될 수 있다는 것을 의미합니다. 전체 1,000개의 주소 중 900개가 사용된 경우 당신의 지갑은 더 많은 주소를 만들어야 합니다. 그러나 이 작업은 당신이 자동 백업을 설정한 경우에만 수행됩니다. &lt;br&gt;따라서 백업이 비활성화된 사용자는 프라이빗샌드 역시 비활성화 됩니다. &lt;hr&gt;더 많은 정보를 위해서는 다음을 참조하세요 &lt;a href="https://docs.dash.org/en/latest/wallets/dashcore/privatesend-instantsend.html"&gt;프라이빗샌드 설명서&lt;/a&gt;. </translation>
+    </message>
+</context>
+<context>
+    <name>Intro</name>
+    <message>
+        <source>Welcome</source>
+        <translation>환영합니다</translation>
+    </message>
+    <message>
+        <source>Welcome to %1.</source>
+        <translation>%1에 오신것을 환영합니다.</translation>
+    </message>
+    <message>
+        <source>As this is the first time the program is launched, you can choose where %1 will store its data.</source>
+        <translation>프로그램을 처음으로 실행합니다. 어디에 %1 데이터를 저장 할 지 선택할 수 있습니다. </translation>
+    </message>
+    <message>
+        <source>%1 will download and store a copy of the Dash block chain. At least %2GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</source>
+        <translation>%1이/가 다운로드 되며 사본이 대시 블록체인 상에 저장됩니다. 이 디렉토리에 최소 %2GB의 데이터가 저장되며, 저장되는 데이터의 양은 시간이 지남에 따라 증가합니다. 지갑 역시 이 디렉토리에 저장될 예정입니다.</translation>
+    </message>
+    <message>
+        <source>Use the default data directory</source>
+        <translation>기본 데이터 디렉토리 사용하기</translation>
+    </message>
+    <message>
+        <source>Use a custom data directory:</source>
+        <translation>사용자 설정 데이터 디렉토리 사용하기</translation>
+    </message>
+    <message>
+        <source>Error: Specified data directory "%1" cannot be created.</source>
+        <translation>오류: 지정한 데이터 디렉토리 "%1" 를 생성할 수 없습니다.</translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation>오류</translation>
+    </message>
+    <message>
+        <source>%1 GB of free space available</source>
+        <translation>저장 공간이 %1 GB 남았습니다.</translation>
+    </message>
+    <message>
+        <source>(of %1 GB needed)</source>
+        <translation>(필요한 %1 GB 중)</translation>
+    </message>
+</context>
+<context>
+    <name>MasternodeList</name>
+    <message>
+        <source>Form</source>
+        <translation>유형</translation>
+    </message>
+    <message>
+        <source>My Masternodes</source>
+        <translation>나의 마스터노드</translation>
+    </message>
+    <message>
+        <source>Note: Status of your masternodes in local wallet can potentially be slightly incorrect.&lt;br /&gt;Always wait for wallet to sync additional data and then double check from another node&lt;br /&gt;if your masternode should be running but you still do not see "ENABLED" in "Status" field.</source>
+        <translation>주의: 로컬 지갑의 마스터노드 상태가 약간 다를 수 있습니다. 만일 당신의 마스터노드가 작동하고 있으나 여전히 '상태' 란에서 '활성화'가 표시되지 않은 경우 &lt;br /&gt;지갑이 추가적인 데이터와 동기화를 마치도록 기다리고 다른 노드로부터 이중 검증하세요.&lt;br /&gt;</translation>
+    </message>
+    <message>
+        <source>Alias</source>
+        <translation>에일리어스</translation>
+    </message>
+    <message>
+        <source>Address</source>
+        <translation>주소</translation>
+    </message>
+    <message>
+        <source>Protocol</source>
+        <translation>프로토콜</translation>
+    </message>
+    <message>
+        <source>Status</source>
+        <translation>상태</translation>
+    </message>
+    <message>
+        <source>Active</source>
+        <translation>활동 중</translation>
+    </message>
+    <message>
+        <source>Last Seen</source>
+        <translation>마지막 확인</translation>
+    </message>
+    <message>
+        <source>Payee</source>
+        <translation>수취인</translation>
+    </message>
+    <message>
+        <source>S&amp;tart alias</source>
+        <translation>에일리어스 시작(&amp;S)</translation>
+    </message>
+    <message>
+        <source>Start &amp;all</source>
+        <translation>모두 시작(&amp;A)</translation>
+    </message>
+    <message>
+        <source>Start &amp;MISSING</source>
+        <translation>미싱 시작(&amp;M)</translation>
+    </message>
+    <message>
+        <source>&amp;Update status</source>
+        <translation>업데이트 상태(&amp;U)</translation>
+    </message>
+    <message>
+        <source>Show additional Masternode information</source>
+        <translation>마스터노드 추가 정보를 보여줍니다.</translation>
+    </message>
+    <message>
+        <source>Show &amp;Info...</source>
+        <translation>정보 보기...(&amp;I)</translation>
+    </message>
+    <message>
+        <source>Status will be updated automatically in (sec):</source>
+        <translation>상태가 (초)안에 자동으로 업데이트 됩니다:</translation>
+    </message>
+    <message>
+        <source>0</source>
+        <translation>0</translation>
+    </message>
+    <message>
+        <source>All Masternodes</source>
+        <translation>모든 마스터노드</translation>
+    </message>
+    <message>
+        <source>Filter List:</source>
+        <translation>필터 목록:</translation>
+    </message>
+    <message>
+        <source>Filter masternode list</source>
+        <translation>마스터노드 목록 필터</translation>
+    </message>
+    <message>
+        <source>Node Count:</source>
+        <translation>노드 개수:</translation>
+    </message>
+    <message>
+        <source>Start alias</source>
+        <translation>에일리어스 시작</translation>
+    </message>
+    <message>
+        <source>Confirm masternode start</source>
+        <translation>마스터노드 실행 확인</translation>
+    </message>
+    <message>
+        <source>Are you sure you want to start masternode %1?</source>
+        <translation>정말로 마스터노드 %1를 실행하시겠습니까?</translation>
+    </message>
+    <message>
+        <source>Confirm all masternodes start</source>
+        <translation>모든 마스터노드 실행 확인</translation>
+    </message>
+    <message>
+        <source>Are you sure you want to start ALL masternodes?</source>
+        <translation>정말로 모든 마스터노드를 실행하시겠습니까?</translation>
+    </message>
+    <message>
+        <source>Command is not available right now</source>
+        <translation>현재 이 명령을 실행할 수 없습니다.</translation>
+    </message>
+    <message>
+        <source>You can't use this command until masternode list is synced</source>
+        <translation>마스터노드 리스트가 동기화 될 때까지 이 명령을 실행할 수 없습니다.</translation>
+    </message>
+    <message>
+        <source>Confirm missing masternodes start</source>
+        <translation>미싱 마스터노드 시작 확인</translation>
+    </message>
+    <message>
+        <source>Are you sure you want to start MISSING masternodes?</source>
+        <translation>정말로 미싱 마스터노드를 시작하시겠습니까?</translation>
+    </message>
+    <message>
+        <source>Additional information for Masternode %1</source>
+        <translation>마스터노드 %1에 대한 추가 정보</translation>
+    </message>
+    <message>
+        <source>Masternode Private Key</source>
+        <translation>마스터노드 개인 키</translation>
+    </message>
+    <message>
+        <source>Private Key</source>
+        <translation>개인 키</translation>
+    </message>
+    <message>
+        <source>Collateral</source>
+        <translation>콜래트럴</translation>
+    </message>
+    <message>
+        <source>IP</source>
+        <translation>IP</translation>
+    </message>
+    <message>
+        <source>Version</source>
+        <translation>버전</translation>
+    </message>
+    <message>
+        <source>Unknown</source>
+        <translation>알 수 없음</translation>
+    </message>
+    <message>
+        <source>Sentinel</source>
+        <translation>센티넬</translation>
+    </message>
+</context>
+<context>
+    <name>ModalOverlay</name>
+    <message>
+        <source>Form</source>
+        <translation>유형</translation>
+    </message>
+    <message>
+        <source>Recent transactions may not yet be visible, and therefore your wallet's balance might be incorrect. This information will be correct once your wallet has finished synchronizing with the Dash network, as detailed below.</source>
+        <translation>최근 거래는 아직 표시되지 않을 수 있으며, 따라서 당신 지갑의 잔고 역시 실제와 다를 수 있습니다. 이는 당신의 지갑이 대시 네트워크와 동기화를 마치는대로 아래의 세부 내용과 같이 정확히 표시될 예정입니다.</translation>
+    </message>
+    <message>
+        <source>Attempting to spend Dash that are affected by not-yet-displayed transactions will not be accepted by the network.</source>
+        <translation>'아직 표시 되지 않은 거래'의 영향을 받는 대시를 사용하시려는 경우, 네트워크에 의해 승인되지 않습니다.</translation>
+    </message>
+    <message>
+        <source>Number of blocks left</source>
+        <translation>남은 블록의 수</translation>
+    </message>
+    <message>
+        <source>Unknown...</source>
+        <translation>알 수 없음...</translation>
+    </message>
+    <message>
+        <source>Last block time</source>
+        <translation>최종 블록 시각</translation>
+    </message>
+    <message>
+        <source>Progress</source>
+        <translation>진행</translation>
+    </message>
+    <message>
+        <source>Progress increase per hour</source>
+        <translation>시간당 진행 증가율</translation>
+    </message>
+    <message>
+        <source>calculating...</source>
+        <translation>계산 중...</translation>
+    </message>
+    <message>
+        <source>Estimated time left until synced</source>
+        <translation>동기화 완료까지 예상 시간</translation>
+    </message>
+    <message>
+        <source>Hide</source>
+        <translation>숨기기</translation>
+    </message>
+    <message>
+        <source>Unknown. Syncing Headers (%1)...</source>
+        <translation>알 수 없음. 헤더 동기화중 (%1)...</translation>
+    </message>
+</context>
+<context>
+    <name>OpenURIDialog</name>
+    <message>
+        <source>Open URI</source>
+        <translation>URI 열기</translation>
+    </message>
+    <message>
+        <source>Open payment request from URI or file</source>
+        <translation>지급 요청 URI 또는 파일 열기</translation>
+    </message>
+    <message>
+        <source>URI:</source>
+        <translation>URI:</translation>
+    </message>
+    <message>
+        <source>Select payment request file</source>
+        <translation>지불 요청 파일을 선택하세요.</translation>
+    </message>
+    <message>
+        <source>Select payment request file to open</source>
+        <translation>열려는 지불 요청 파일을 선택하세요.</translation>
+    </message>
+</context>
+<context>
+    <name>OptionsDialog</name>
+    <message>
+        <source>Options</source>
+        <translation>옵션</translation>
+    </message>
+    <message>
+        <source>&amp;Main</source>
+        <translation>메인(&amp;M)</translation>
+    </message>
+    <message>
+        <source>Size of &amp;database cache</source>
+        <translation>데이터베이스 캐시 크기(&amp;d)</translation>
+    </message>
+    <message>
+        <source>MB</source>
+        <translation>MB</translation>
+    </message>
+    <message>
+        <source>Number of script &amp;verification threads</source>
+        <translation>스크립트 인증 스레드의 개수(&amp;v)</translation>
+    </message>
+    <message>
+        <source>(0 = auto, &lt;0 = leave that many cores free)</source>
+        <translation>(0 = 자동, &lt;0 = 지정된 코어 개수만큼 사용 안함)</translation>
+    </message>
+    <message>
+        <source>Amount of Dash to keep anonymized</source>
+        <translation>익명을 유지할 대시의 개수</translation>
+    </message>
+    <message>
+        <source>W&amp;allet</source>
+        <translation>지갑(&amp;a)</translation>
+    </message>
+    <message>
+        <source>Show additional tab listing all your masternodes in first sub-tab&lt;br/&gt;and all masternodes on the network in second sub-tab.</source>
+        <translation>추가적인 탭 목록을 보여줍니다. 당신의 모든 마스터노드는 첫 번째 서브 탭에 표시되고,&lt;br/&gt; 네트워크상의 전체 마스터노드는 두 번째 서브 탭에 표시됩니다.</translation>
+    </message>
+    <message>
+        <source>Show Masternodes Tab</source>
+        <translation>마스터노드 탭을 보여줍니다.</translation>
+    </message>
+    <message>
+        <source>Show additional information and buttons for PrivateSend on overview screen.</source>
+        <translation>추가적인 정보와 프라이빗샌드를 위한 버튼을 개요에 나타냅니다.</translation>
+    </message>
+    <message>
+        <source>Enable advanced PrivateSend interface</source>
+        <translation>향상된 프라이빗샌드 인터페이스 사용하기</translation>
+    </message>
+    <message>
+        <source>Show warning dialog when PrivateSend detects that wallet has very low number of keys left.</source>
+        <translation>프라이빗샌드가 지갑에 남은 키의 숫자가 적은 것을 감지하는 경우 대화 상자에 오류를 나타냅니다.</translation>
+    </message>
+    <message>
+        <source>Warn if PrivateSend is running out of keys</source>
+        <translation>프라이빗샌드에 사용할 키가 없는 경우 경고문을 표시합니다.</translation>
+    </message>
+    <message>
+        <source>Whether to use experimental PrivateSend mode with multiple mixing sessions per block.&lt;br/&gt;Note: You must use this feature carefully.&lt;br/&gt;Make sure you always have recent wallet (auto)backup in a safe place!</source>
+        <translation>블록당 다수의 믹싱 세션을 이용하는 실험적 프라이빗샌드 모드를 사용할 지 여부를 결정합니다. &lt;br/&gt;주의: 이 기능을 사용하기 위해서는 특별히 주의를 기울여야 합니다.&lt;br/&gt;언제나 안전한 장소에 최신의 지갑 (자동)백업이 되고 있는지 확인하세요! </translation>
+    </message>
+    <message>
+        <source>Enable PrivateSend &amp;multi-session</source>
+        <translation>프라이빗샌드 멀티 세션 활성화(&amp;m)</translation>
+    </message>
+    <message>
+        <source>If you disable the spending of unconfirmed change, the change from a transaction&lt;br/&gt;cannot be used until that transaction has at least one confirmation.&lt;br/&gt;This also affects how your balance is computed.</source>
+        <translation>확인되지 않은 잔액 사용을 중지하는 경우, 거래로부터 발생하는 잔액은 &lt;br/&gt;최소 한 번의 거래 확인이 발생할 때 까지 사용할 수 없습니다.&lt;br/&gt;이는 또한 당신의 잔고가 계산되는 방식에 영향을 미칠 수 있습니다.</translation>
+    </message>
+    <message>
+        <source>PrivateSend rounds to use</source>
+        <translation>프라이빗샌드 라운드 사용</translation>
+    </message>
+    <message>
+        <source>This amount acts as a threshold to turn off PrivateSend once it's reached.</source>
+        <translation>이 금액에 도달하는 경우 프라이빗샌드를 끄기 위한 한계점으로 작동합니다.</translation>
+    </message>
+    <message>
+        <source>Automatically open the Dash Core client port on the router. This only works when your router supports UPnP and it is enabled.</source>
+        <translation>라우터에서 대시 코어 클라이언트를 자동으로 엽니다. 이 기능은 당신의 라우터가 UPnP를 지원하고 해당 기능이 작동하는 경우에만 가능합니다.</translation>
+    </message>
+    <message>
+        <source>Accept connections from outside</source>
+        <translation>외부로부터의 연결 허용</translation>
+    </message>
+    <message>
+        <source>Allow incoming connections</source>
+        <translation>수신 연결 허용</translation>
+    </message>
+    <message>
+        <source>Connect to the Dash network through a SOCKS5 proxy.</source>
+        <translation>SOCKS5 프록시를 통해 대시 네트워크 연결</translation>
+    </message>
+    <message>
+        <source>&amp;Connect through SOCKS5 proxy (default proxy):</source>
+        <translation>SOCKS5 프록시를 거쳐 연결합니다(&amp;C) (기본 프록시):</translation>
+    </message>
+    <message>
+        <source>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Exit in the menu.</source>
+        <translation>창이 닫히는 경우 종료하지 않고 축소합니다. 이 옵션을 활성화하면 메뉴에서 종료를 선택하는 경우에만 어플리케이션이 종료됩니다.</translation>
+    </message>
+    <message>
+        <source>Third party URLs (e.g. a block explorer) that appear in the transactions tab as context menu items.&lt;br/&gt;%s in the URL is replaced by transaction hash. Multiple URLs are separated by vertical bar |.</source>
+        <translation>거래 탭에 강조 표시된 메뉴 항목으로 나타나는 제3자 URL(예: 블록 탐색기). &lt;br/&gt;해당 URL의 %s 는 거래 해시에 의해 대체됩니다. 다중 URL은 수직 바 | 에 의해 분리됩니다.</translation>
+    </message>
+    <message>
+        <source>Expert</source>
+        <translation>전문가</translation>
+    </message>
+    <message>
+        <source>This setting determines the amount of individual masternodes that an input will be anonymized through.&lt;br/&gt;More rounds of anonymization gives a higher degree of privacy, but also costs more in fees.</source>
+        <translation>이 설정은 얼마나 많은 개별 마스터노드를 거쳐 익명화를 진행할 지를 결정합니다.&lt;br/&gt;익명화를 위해 보다 많은 라운드를 거치는 것은 향상된 개인 정보 보호 수준을 제공하지만 더 많은 수수료가 발생합니다.</translation>
+    </message>
+    <message>
+        <source>Whether to show coin control features or not.</source>
+        <translation>코인 제어 기능을 표시할 지 여부를 선택합니다.</translation>
+    </message>
+    <message>
+        <source>Automatically start %1 after logging in to the system.</source>
+        <translation>시스템 로그인 후 %1을 자동으로 시작합니다.</translation>
+    </message>
+    <message>
+        <source>&amp;Start %1 on system login</source>
+        <translation>시스템 로그인 시 %1 시작(&amp;S)</translation>
+    </message>
+    <message>
+        <source>Enable coin &amp;control features</source>
+        <translation>코인 제어 기능 활성화(&amp;C)</translation>
+    </message>
+    <message>
+        <source>&amp;Spend unconfirmed change</source>
+        <translation>검증되지 않은 잔돈 쓰기 (&amp;S)</translation>
+    </message>
+    <message>
+        <source>&amp;Network</source>
+        <translation>네트워크(&amp;N)</translation>
+    </message>
+    <message>
+        <source>Map port using &amp;UPnP</source>
+        <translation>UPnP를 사용하는 맵 포트(&amp;U)</translation>
+    </message>
+    <message>
+        <source>Proxy &amp;IP:</source>
+        <translation>프록시 IP:(&amp;i)</translation>
+    </message>
+    <message>
+        <source>IP address of the proxy (e.g. IPv4: 127.0.0.1 / IPv6: ::1)</source>
+        <translation>프록시 아이피 주소 (예. IPv4:127.0.0.1 / IPv6: ::1)</translation>
+    </message>
+    <message>
+        <source>&amp;Port:</source>
+        <translation>포트:(&amp;P)</translation>
+    </message>
+    <message>
+        <source>Port of the proxy (e.g. 9050)</source>
+        <translation>프록시 포트 번호 (예: 9050)</translation>
+    </message>
+    <message>
+        <source>Used for reaching peers via:</source>
+        <translation>피어에 연결하기 위해 사용된 방법:</translation>
+    </message>
+    <message>
+        <source>Shows, if the supplied default SOCKS5 proxy is used to reach peers via this network type.</source>
+        <translation>선택된 기본 SOCKS5 프록시가 이 네트워크 유형을 통해 피어에 연결하는 경우에 보여주기</translation>
+    </message>
+    <message>
+        <source>IPv4</source>
+        <translation>IPv4</translation>
+    </message>
+    <message>
+        <source>IPv6</source>
+        <translation>IPv6</translation>
+    </message>
+    <message>
+        <source>Tor</source>
+        <translation>Tor</translation>
+    </message>
+    <message>
+        <source>Connect to the Dash network through a separate SOCKS5 proxy for Tor hidden services.</source>
+        <translation>Tor 숨김 서비스를 위한 별도의 SOCKS5 프록시를 사용하여 대시 네트워크에 연결</translation>
+    </message>
+    <message>
+        <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services:</source>
+        <translation>Tor 숨김 서비스로 피어에 접속하기 위해 별도의 SOCKS5 프록시 사용</translation>
+    </message>
+    <message>
+        <source>&amp;Window</source>
+        <translation>창(&amp;W)</translation>
+    </message>
+    <message>
+        <source>&amp;Hide the icon from the system tray.</source>
+        <translation>시스템 트레이에서 아이콘 숨기기(&amp;H)</translation>
+    </message>
+    <message>
+        <source>Hide tray icon</source>
+        <translation>트레이 아이콘을 숨깁니다.</translation>
+    </message>
+    <message>
+        <source>Show only a tray icon after minimizing the window.</source>
+        <translation>창을 최소화한 후 트레이 아이콘만 표시합니다.</translation>
+    </message>
+    <message>
+        <source>&amp;Minimize to the tray instead of the taskbar</source>
+        <translation>작업 표시줄 대신 트레이로 최소화(&amp;M)</translation>
+    </message>
+    <message>
+        <source>M&amp;inimize on close</source>
+        <translation>종료 시 최소화(&amp;i)</translation>
+    </message>
+    <message>
+        <source>&amp;Display</source>
+        <translation>디스플레이(&amp;D)</translation>
+    </message>
+    <message>
+        <source>User Interface &amp;language:</source>
+        <translation>사용자 인터페이스 언어:(&amp;l)</translation>
+    </message>
+    <message>
+        <source>The user interface language can be set here. This setting will take effect after restarting %1.</source>
+        <translation>이곳에서 사용자 인터페이스 언어를 설정 할 수 있습니다. 이 설정은 %1을/를 다시 시작할 때 적용됩니다.</translation>
+    </message>
+    <message>
+        <source>Language missing or translation incomplete? Help contributing translations here:
+https://www.transifex.com/projects/p/dash/</source>
+        <translation>지정하려는 언어가 목록에 없거나 번역이 완성되지 않았다면? 다음의 주소에서 번역을 도와주세요:
+https://www.transifex.com/projects/p/dash/</translation>
+    </message>
+    <message>
+        <source>User Interface Theme:</source>
+        <translation>사용자 인터페이스 테마:</translation>
+    </message>
+    <message>
+        <source>&amp;Unit to show amounts in:</source>
+        <translation>거래액을 표시할 단위(&amp;U):</translation>
+    </message>
+    <message>
+        <source>Choose the default subdivision unit to show in the interface and when sending coins.</source>
+        <translation>인터페이스에 표시하고 코인을 보낼 때 사용하는 기본 최소화 단위를 선택하십시오.</translation>
+    </message>
+    <message>
+        <source>Decimal digits</source>
+        <translation>십진수</translation>
+    </message>
+    <message>
+        <source>Third party transaction URLs</source>
+        <translation>제3자 거래 URL</translation>
+    </message>
+    <message>
+        <source>Active command-line options that override above options:</source>
+        <translation>위 옵션에 우선하여 명령줄 옵션을 활성화합니다.</translation>
+    </message>
+    <message>
+        <source>Reset all client options to default.</source>
+        <translation>모든 클라이언트 옵션을 기본값으로 재설정</translation>
+    </message>
+    <message>
+        <source>&amp;Reset Options</source>
+        <translation>옵션 초기화(&amp;R)</translation>
+    </message>
+    <message>
+        <source>&amp;OK</source>
+        <translation>확인(&amp;O)</translation>
+    </message>
+    <message>
+        <source>&amp;Cancel</source>
+        <translation>취소(&amp;C)</translation>
+    </message>
+    <message>
+        <source>default</source>
+        <translation>기본값</translation>
+    </message>
+    <message>
+        <source>none</source>
+        <translation>없음</translation>
+    </message>
+    <message>
+        <source>Confirm options reset</source>
+        <translation>옵션 초기화 확인</translation>
+    </message>
+    <message>
+        <source>Client restart required to activate changes.</source>
+        <translation>변경 사항을 적용하기 위해서는 프로그램 종료 후 재시작 하여야 합니다.</translation>
+    </message>
+    <message>
+        <source>Client will be shut down. Do you want to proceed?</source>
+        <translation>클라이언트가 종료됩니다, 계속 진행하시겠습니까?</translation>
+    </message>
+    <message>
+        <source>This change would require a client restart.</source>
+        <translation>이 변경 사항을 적용하기 위해서는 프로그램을 재시작하여야 합니다.</translation>
+    </message>
+    <message>
+        <source>The supplied proxy address is invalid.</source>
+        <translation>입력한 프록시 주소를 인식할 수 없습니다.</translation>
+    </message>
+</context>
+<context>
+    <name>OverviewPage</name>
+    <message>
+        <source>Form</source>
+        <translation>유형</translation>
+    </message>
+    <message>
+        <source>The displayed information may be out of date. Your wallet automatically synchronizes with the Dash network after a connection is established, but this process has not completed yet.</source>
+        <translation>표시된 정보가 오래된 것으로 보입니다. 당신의 지갑은 대시 네트워크에 연결되는 대로 동기화 될 예정입니다. 이 과정은 아직 종료되지 않았습니다.</translation>
+    </message>
+    <message>
+        <source>Available:</source>
+        <translation>사용 가능:</translation>
+    </message>
+    <message>
+        <source>Your current spendable balance</source>
+        <translation>현재 사용할 수 있는 잔고</translation>
+    </message>
+    <message>
+        <source>Pending:</source>
+        <translation>진행 중:</translation>
+    </message>
+    <message>
+        <source>Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance</source>
+        <translation>전체 거래가 아직 확인 되지 않은 관계로, 아직 사용 가능한 잔고에 반영되지 않았습니다.</translation>
+    </message>
+    <message>
+        <source>Immature:</source>
+        <translation>미성숙 잔고:</translation>
+    </message>
+    <message>
+        <source>Mined balance that has not yet matured</source>
+        <translation>아직 사용할 수 없는 채굴된 잔고</translation>
+    </message>
+    <message>
+        <source>Balances</source>
+        <translation>잔고</translation>
+    </message>
+    <message>
+        <source>Unconfirmed transactions to watch-only addresses</source>
+        <translation>조회 전용 주소의 검증되지 않은 거래</translation>
+    </message>
+    <message>
+        <source>Mined balance in watch-only addresses that has not yet matured</source>
+        <translation>조회 전용 주소의 채굴된 잔액 중 사용할 수 있는 잔고로 발전되지 않은 미발전 잔고</translation>
+    </message>
+    <message>
+        <source>Total:</source>
+        <translation>총액:</translation>
+    </message>
+    <message>
+        <source>Your current total balance</source>
+        <translation>당신의 현재 총 잔고</translation>
+    </message>
+    <message>
+        <source>Current total balance in watch-only addresses</source>
+        <translation>조회 전용 주소의 현재 잔고</translation>
+    </message>
+    <message>
+        <source>Watch-only:</source>
+        <translation>조회 전용:</translation>
+    </message>
+    <message>
+        <source>Your current balance in watch-only addresses</source>
+        <translation>조회 전용 주소의 현재 잔고</translation>
+    </message>
+    <message>
+        <source>Spendable:</source>
+        <translation>사용 가능한 잔고:</translation>
+    </message>
+    <message>
+        <source>PrivateSend</source>
+        <translation>프라이빗샌드</translation>
+    </message>
+    <message>
+        <source>Status:</source>
+        <translation>상태:</translation>
+    </message>
+    <message>
+        <source>Enabled/Disabled</source>
+        <translation>활성화/비활성화</translation>
+    </message>
+    <message>
+        <source>Completion:</source>
+        <translation>완료:</translation>
+    </message>
+    <message>
+        <source>Try to manually submit a PrivateSend request.</source>
+        <translation>프라이빗샌드 요청을 수동으로 제출합니다.</translation>
+    </message>
+    <message>
+        <source>Reset the current status of PrivateSend (can interrupt PrivateSend if it's in the process of Mixing, which can cost you money!)</source>
+        <translation>프라이빗샌드의 현재 상태를 재설정합니다. (프라이빗샌드가 믹싱 단계에 있다면 이를 방해할 수도 있습니다. 이 경우에 수수료가 발생할 수 있습니다!)</translation>
+    </message>
+    <message>
+        <source>Information about PrivateSend and Mixing</source>
+        <translation>프라이빗샌드와 믹싱에 관한 정보</translation>
+    </message>
+    <message>
+        <source>Info</source>
+        <translation>정보</translation>
+    </message>
+    <message>
+        <source>Amount and Rounds:</source>
+        <translation>금액과 라운드:</translation>
+    </message>
+    <message>
+        <source>0 DASH / 0 Rounds</source>
+        <translation>0 대시 / 0 라운드</translation>
+    </message>
+    <message>
+        <source>Submitted Denom:</source>
+        <translation>제출한 분할 단위:</translation>
+    </message>
+    <message>
+        <source>n/a</source>
+        <translation>해당 사항 없음</translation>
+    </message>
+    <message>
+        <source>Recent transactions</source>
+        <translation>최근 거래</translation>
+    </message>
+    <message>
+        <source>Start/Stop Mixing</source>
+        <translation>믹싱 시작/정지</translation>
+    </message>
+    <message>
+        <source>PrivateSend Balance:</source>
+        <translation>프라이빗샌드 잔고</translation>
+    </message>
+    <message>
+        <source>The denominations you submitted to the Masternode.&lt;br&gt;To mix, other users must submit the exact same denominations.</source>
+        <translation>당신이 마스터노드에 제출한 분할 단위.&lt;br&gt;믹싱을 위해서는 다른 사용자들이 같은 단위를 제출하여야만 합니다.</translation>
+    </message>
+    <message>
+        <source>(Last Message)</source>
+        <translation>(지난 메시지)</translation>
+    </message>
+    <message>
+        <source>Try Mix</source>
+        <translation>믹스하기</translation>
+    </message>
+    <message>
+        <source>Reset</source>
+        <translation>재설정</translation>
+    </message>
+    <message>
+        <source>out of sync</source>
+        <translation>동기화 되지 않음</translation>
+    </message>
+    <message>
+        <source>Automatic backups are disabled, no mixing available!</source>
+        <translation>자동 백업이 비활성화 되어 있어 믹싱이 불가능합니다!</translation>
+    </message>
+    <message>
+        <source>Start Mixing</source>
+        <translation>믹싱을 시작합니다.</translation>
+    </message>
+    <message>
+        <source>Stop Mixing</source>
+        <translation>믹싱을 정지합니다.</translation>
+    </message>
+    <message>
+        <source>No inputs detected</source>
+        <translation>입력이 감지되지 않습니다.</translation>
+    </message>
+    <message numerus="yes">
+        <source>%n Rounds</source>
+        <translation><numerusform>&amp;n 라운드</numerusform></translation>
+    </message>
+    <message>
+        <source>Found enough compatible inputs to anonymize %1</source>
+        <translation>%1 을/를 익명으로 처리하기 위해 충분한 호환 가능 입력을 찾았습니다.</translation>
+    </message>
+    <message>
+        <source>Not enough compatible inputs to anonymize &lt;span style='color:red;'&gt;%1&lt;/span&gt;,&lt;br&gt;will anonymize &lt;span style='color:red;'&gt;%2&lt;/span&gt; instead</source>
+        <translation>&lt;span style='color:red;'&gt;%1&lt;/span&gt;을/를 익명으로 처리하기 위한 호환 가능 입력이 충분하지 않아, 이를 대신 하여 &lt;span style='color:red;'&gt;%2&lt;/span&gt;을/를 &lt;br&gt;익명화 할 예정입니다.</translation>
+    </message>
+    <message>
+        <source>Overall progress</source>
+        <translation>전체 과정</translation>
+    </message>
+    <message>
+        <source>Denominated</source>
+        <translation>단위 분할 완료</translation>
+    </message>
+    <message>
+        <source>Mixed</source>
+        <translation>믹싱 완료</translation>
+    </message>
+    <message>
+        <source>Anonymized</source>
+        <translation>익명화 처리 완료</translation>
+    </message>
+    <message numerus="yes">
+        <source>Denominated inputs have %5 of %n rounds on average</source>
+        <translation><numerusform>분할된 단위 입력값은 평균적으로 %n 라운드 중 %5 라운드를 갖습니다.</numerusform></translation>
+    </message>
+    <message>
+        <source>keys left: %1</source>
+        <translation>남은 키의 수: %1</translation>
+    </message>
+    <message>
+        <source>Disabled</source>
+        <translation>비활성화</translation>
+    </message>
+    <message>
+        <source>Very low number of keys left since last automatic backup!</source>
+        <translation>지난 자동 백업 이후 매우 적은 수의 키가 남아 있습니다!</translation>
+    </message>
+    <message>
+        <source>We are about to create a new automatic backup for you, however &lt;span style='color:red;'&gt; you should always make sure you have backups saved in some safe place&lt;/span&gt;!</source>
+        <translation>당신을 위한 새로운 자동 백업을 생성하고자 합니다. 그러나 &lt;span style='color:red;'&gt;언제나 안전한 장소에 백업 파일을 저장해두어야 한다는 점을 명심하세요&lt;/span&gt;!</translation>
+    </message>
+    <message>
+        <source>Note: You can turn this message off in options.</source>
+        <translation>참고: 옵션에서 이 메시지를 끌 수 있습니다.</translation>
+    </message>
+    <message>
+        <source>WARNING! Something went wrong on automatic backup</source>
+        <translation>경고! 자동 백업에 문제가 발생했습니다.</translation>
+    </message>
+    <message>
+        <source>ERROR! Failed to create automatic backup</source>
+        <translation>에러! 자동 백업 생성에 실패하였습니다.</translation>
+    </message>
+    <message>
+        <source>Mixing is disabled, please close your wallet and fix the issue!</source>
+        <translation>믹싱이 비활성화 되었습니다. 지갑을 종료하고 해당 문제를 해결해야 합니다!</translation>
+    </message>
+    <message>
+        <source>Enabled</source>
+        <translation>비활성화 됨</translation>
+    </message>
+    <message>
+        <source>see debug.log for details.</source>
+        <translation>세부 사항을 위해서는 debug.log 를 확인하세요.</translation>
+    </message>
+    <message>
+        <source>WARNING! Failed to replenish keypool, please unlock your wallet to do so.</source>
+        <translation>경고! 키풀 보충에 실패하였습니다. 키풀 보충을 위해서는 지갑을 잠금 해제 하세요.</translation>
+    </message>
+    <message>
+        <source>Last PrivateSend message:
+</source>
+        <translation>지난 프라이빗샌드 메시지:
+</translation>
+    </message>
+    <message>
+        <source>N/A</source>
+        <translation>없음</translation>
+    </message>
+    <message>
+        <source>PrivateSend was successfully reset.</source>
+        <translation>프라이빗샌드가 성공적으로 재설정 되었습니다.</translation>
+    </message>
+    <message>
+        <source>If you don't want to see internal PrivateSend fees/transactions select "Most Common" as Type on the "Transactions" tab.</source>
+        <translation>프라이빗샌드 수수료/거래의 내부 사항을 보고 싶지 않으면 '거래' 탭에서 유형을 클릭하고  '자주 사용된 항목'을 선택하세요.</translation>
+    </message>
+    <message>
+        <source>PrivateSend requires at least %1 to use.</source>
+        <translation>프라이빗샌드를 사용하기 위해서는 최소한 %1이/가 필요합니다.</translation>
+    </message>
+    <message>
+        <source>Wallet is locked and user declined to unlock. Disabling PrivateSend.</source>
+        <translation>지갑이 잠겨있으며 사용자가 잠금 해제를 거부하였습니다. 프라이빗샌드를 비활성화 합니다.</translation>
+    </message>
+</context>
+<context>
+    <name>PaymentServer</name>
+    <message>
+        <source>Payment request error</source>
+        <translation>지불 요청 오류</translation>
+    </message>
+    <message>
+        <source>Cannot start dash: click-to-pay handler</source>
+        <translation>대시를 시작할 수 없습니다: 원클릭 지불 핸들러</translation>
+    </message>
+    <message>
+        <source>URI handling</source>
+        <translation>URI 처리</translation>
+    </message>
+    <message>
+        <source>Payment request fetch URL is invalid: %1</source>
+        <translation>지불 요청을 위해 불러온 URL이 유효하지 않습니다: %1</translation>
+    </message>
+    <message>
+        <source>Invalid payment address %1</source>
+        <translation>유효하지 않은 지불 주소 %1</translation>
+    </message>
+    <message>
+        <source>URI cannot be parsed! This can be caused by an invalid Dash address or malformed URI parameters.</source>
+        <translation>URI를 분석할 수 없습니다! 대시 주소가 유효하지 않거나 URI 파라미터 구성에 오류가 존재할 수 있습니다.</translation>
+    </message>
+    <message>
+        <source>Payment request file handling</source>
+        <translation>지불 요청 파일 처리</translation>
+    </message>
+    <message>
+        <source>Payment request file cannot be read! This can be caused by an invalid payment request file.</source>
+        <translation>지불 요청 파일을 읽을 수 없습니다! 잘못된 지불 요청 파일에 의해 발생하는 오류일 수 있습니다.</translation>
+    </message>
+    <message>
+        <source>Payment request rejected</source>
+        <translation>지불 요청이 거부됨</translation>
+    </message>
+    <message>
+        <source>Payment request network doesn't match client network.</source>
+        <translation>지급 요청 네트워크가 클라이언트 네트워크와 일치하지 않습니다.</translation>
+    </message>
+    <message>
+        <source>Payment request expired.</source>
+        <translation>지불 요청이 만료됨</translation>
+    </message>
+    <message>
+        <source>Payment request is not initialized.</source>
+        <translation>지불 요청이 초기화 되지 않았습니다.</translation>
+    </message>
+    <message>
+        <source>Unverified payment requests to custom payment scripts are unsupported.</source>
+        <translation>임의로 변경한 결제 스크립트 기반의 지불 요청 양식은 검증되기 전까지는 지원되지 않습니다.</translation>
+    </message>
+    <message>
+        <source>Invalid payment request.</source>
+        <translation>잘못된 지불 요청입니다.</translation>
+    </message>
+    <message>
+        <source>Requested payment amount of %1 is too small (considered dust).</source>
+        <translation>(더스트를 고려할 때) 요청한 금액 %1의 양이 너무 적습니다. </translation>
+    </message>
+    <message>
+        <source>Refund from %1</source>
+        <translation>%1 으로부터 환불</translation>
+    </message>
+    <message>
+        <source>Payment request %1 is too large (%2 bytes, allowed %3 bytes).</source>
+        <translation>지불 요청 금액인 %1은/는 너무 큽니다 (%2 바이트, %3 바이트까지 허용).</translation>
+    </message>
+    <message>
+        <source>Error communicating with %1: %2</source>
+        <translation>%1과의 소통 에러: %2</translation>
+    </message>
+    <message>
+        <source>Payment request cannot be parsed!</source>
+        <translation>지불 요청을 분석 할 수 없습니다!</translation>
+    </message>
+    <message>
+        <source>Bad response from server %1</source>
+        <translation>%1 서버로부터 잘못된 응답을 받았습니다.</translation>
+    </message>
+    <message>
+        <source>Network request error</source>
+        <translation>네트워크 요청 에러</translation>
+    </message>
+    <message>
+        <source>Payment acknowledged</source>
+        <translation>지불이 진행 중입니다.</translation>
+    </message>
+</context>
+<context>
+    <name>PeerTableModel</name>
+    <message>
+        <source>NodeId</source>
+        <translation>노드 ID</translation>
+    </message>
+    <message>
+        <source>Node/Service</source>
+        <translation>노드/서비스</translation>
+    </message>
+    <message>
+        <source>User Agent</source>
+        <translation>사용자 에이전트</translation>
+    </message>
+    <message>
+        <source>Ping</source>
+        <translation>Ping</translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Dash Core</source>
+        <translation>대시 코어</translation>
+    </message>
+    <message>
+        <source>%1 didn't yet exit safely...</source>
+        <translation>%1가 아직 안전하게 종료되지 않았습니다...</translation>
+    </message>
+    <message>
+        <source>Error reading masternode configuration file: %1</source>
+        <translation>마스터노드 설정을 읽는 과정에서 에러가 발생하였습니다: %1</translation>
+    </message>
+    <message>
+        <source>Amount</source>
+        <translation>거래액</translation>
+    </message>
+    <message>
+        <source>Enter a Dash address (e.g. %1)</source>
+        <translation>대시 주소 입력 (예: %1)</translation>
+    </message>
+    <message>
+        <source>%1 d</source>
+        <translation>%1 일</translation>
+    </message>
+    <message>
+        <source>%1 h</source>
+        <translation>%1 시간</translation>
+    </message>
+    <message>
+        <source>%1 m</source>
+        <translation>%1 분</translation>
+    </message>
+    <message>
+        <source>%1 s</source>
+        <translation>%1 초</translation>
+    </message>
+    <message>
+        <source>None</source>
+        <translation>없음</translation>
+    </message>
+    <message>
+        <source>N/A</source>
+        <translation>해당 사항 없음</translation>
+    </message>
+    <message>
+        <source>%1 ms</source>
+        <translation>%1 밀리세컨드</translation>
+    </message>
+    <message numerus="yes">
+        <source>%n second(s)</source>
+        <translation><numerusform>%n 초</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>%n minute(s)</source>
+        <translation><numerusform>%n 분</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>%n hour(s)</source>
+        <translation><numerusform>%n 시간</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>%n day(s)</source>
+        <translation><numerusform>%n 일</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>%n week(s)</source>
+        <translation><numerusform>%n 주</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>%n year(s)</source>
+        <translation><numerusform>%n 년</numerusform></translation>
+    </message>
+    <message>
+        <source>%1 and %2</source>
+        <translation>%1 및 %2</translation>
+    </message>
+    <message>
+        <source>unknown</source>
+        <translation>알 수 없음</translation>
+    </message>
+</context>
+<context>
+    <name>QObject::QObject</name>
+    <message>
+        <source>Error: Specified data directory "%1" does not exist.</source>
+        <translation>에러: 지정한 데이터 디렉토리 "%1"은/는 존재하지 않습니다.</translation>
+    </message>
+    <message>
+        <source>Error: Cannot parse configuration file: %1. Only use key=value syntax.</source>
+        <translation>에러: 설정 파일 :%1 을/를 분석 할 수 없습니다. key=value syntax 만 사용 가능합니다.</translation>
+    </message>
+    <message>
+        <source>Error: %1</source>
+        <translation>에러: %1</translation>
+    </message>
+</context>
+<context>
+    <name>QRDialog</name>
+    <message>
+        <source>QR-Code Title</source>
+        <translation>QR 코드 표제</translation>
+    </message>
+    <message>
+        <source>QR Code</source>
+        <translation>QR 코드</translation>
+    </message>
+    <message>
+        <source>&amp;Save Image...</source>
+        <translation>이미지 저장(&amp;S)...</translation>
+    </message>
+    <message>
+        <source>Error creating QR Code.</source>
+        <translation>QR 코드를 생성하는 데 에러가 발생하였습니다.</translation>
+    </message>
+</context>
+<context>
+    <name>QRGeneralImageWidget</name>
+    <message>
+        <source>&amp;Save Image...</source>
+        <translation>이미지 저장(&amp;S)...</translation>
+    </message>
+    <message>
+        <source>&amp;Copy Image</source>
+        <translation>이미지 복사(&amp;C)</translation>
+    </message>
+    <message>
+        <source>Save QR Code</source>
+        <translation>QR 코드 저장</translation>
+    </message>
+    <message>
+        <source>PNG Image (*.png)</source>
+        <translation>PNG 이미지 (*.png)</translation>
+    </message>
+</context>
+<context>
+    <name>QRImageWidget</name>
+    <message>
+        <source>&amp;Save Image...</source>
+        <translation>이미지 저장(&amp;S)...</translation>
+    </message>
+    <message>
+        <source>&amp;Copy Image</source>
+        <translation>이미지 복사(&amp;C)</translation>
+    </message>
+    <message>
+        <source>Save QR Code</source>
+        <translation>QR 코드 저장</translation>
+    </message>
+    <message>
+        <source>PNG Image (*.png)</source>
+        <translation>PNG 이미지 (*.png)</translation>
+    </message>
+</context>
+<context>
+    <name>RPCConsole</name>
+    <message>
+        <source>Tools window</source>
+        <translation>도구 창</translation>
+    </message>
+    <message>
+        <source>&amp;Information</source>
+        <translation>정보(&amp;I)</translation>
+    </message>
+    <message>
+        <source>General</source>
+        <translation>일반</translation>
+    </message>
+    <message>
+        <source>Name</source>
+        <translation>이름</translation>
+    </message>
+    <message>
+        <source>N/A</source>
+        <translation>없음</translation>
+    </message>
+    <message>
+        <source>Number of connections</source>
+        <translation>연결 수</translation>
+    </message>
+    <message>
+        <source>&amp;Open</source>
+        <translation>열기(&amp;O)</translation>
+    </message>
+    <message>
+        <source>Startup time</source>
+        <translation>시작 시간</translation>
+    </message>
+    <message>
+        <source>Network</source>
+        <translation>네트워크</translation>
+    </message>
+    <message>
+        <source>Last block time</source>
+        <translation>최종 블록 시각</translation>
+    </message>
+    <message>
+        <source>Debug log file</source>
+        <translation>로그 파일 디버그</translation>
+    </message>
+    <message>
+        <source>Current number of blocks</source>
+        <translation>현재 블록 수</translation>
+    </message>
+    <message>
+        <source>Client version</source>
+        <translation>클라이언트 버전</translation>
+    </message>
+    <message>
+        <source>Using BerkeleyDB version</source>
+        <translation>사용 중인 BerkeleyDB 버전</translation>
+    </message>
+    <message>
+        <source>Block chain</source>
+        <translation>블록 체인</translation>
+    </message>
+    <message>
+        <source>Number of Masternodes</source>
+        <translation>마스터노드 수</translation>
+    </message>
+    <message>
+        <source>Memory Pool</source>
+        <translation>메모리 풀</translation>
+    </message>
+    <message>
+        <source>Current number of transactions</source>
+        <translation>현재 거래 수</translation>
+    </message>
+    <message>
+        <source>Memory usage</source>
+        <translation>메모리 사용량</translation>
+    </message>
+    <message>
+        <source>&amp;Console</source>
+        <translation>콘솔(&amp;C)</translation>
+    </message>
+    <message>
+        <source>Clear console</source>
+        <translation>콘솔 지우기</translation>
+    </message>
+    <message>
+        <source>&amp;Network Traffic</source>
+        <translation>네트워크 트래픽(&amp;N)</translation>
+    </message>
+    <message>
+        <source>&amp;Clear</source>
+        <translation>지우기(&amp;C)</translation>
+    </message>
+    <message>
+        <source>Totals</source>
+        <translation>총액</translation>
+    </message>
+    <message>
+        <source>Received</source>
+        <translation>받음</translation>
+    </message>
+    <message>
+        <source>Sent</source>
+        <translation>보냄</translation>
+    </message>
+    <message>
+        <source>&amp;Peers</source>
+        <translation>피어(&amp;P)</translation>
+    </message>
+    <message>
+        <source>Banned peers</source>
+        <translation>차단된 피어</translation>
+    </message>
+    <message>
+        <source>Select a peer to view detailed information.</source>
+        <translation>자세한 정보를 보려면 피어를 선택하세요.</translation>
+    </message>
+    <message>
+        <source>Whitelisted</source>
+        <translation>화이트리스트에 포함</translation>
+    </message>
+    <message>
+        <source>Direction</source>
+        <translation>방향</translation>
+    </message>
+    <message>
+        <source>Version</source>
+        <translation>버전</translation>
+    </message>
+    <message>
+        <source>Starting Block</source>
+        <translation>블록 시작</translation>
+    </message>
+    <message>
+        <source>Synced Headers</source>
+        <translation>동기화 된 헤더</translation>
+    </message>
+    <message>
+        <source>Synced Blocks</source>
+        <translation>동기화 된 블록</translation>
+    </message>
+    <message>
+        <source>Wallet Path</source>
+        <translation>지갑 경로</translation>
+    </message>
+    <message>
+        <source>User Agent</source>
+        <translation>유저 에이전트</translation>
+    </message>
+    <message>
+        <source>Datadir</source>
+        <translation>데이터 폴더</translation>
+    </message>
+    <message>
+        <source>Open the %1 debug log file from the current data directory. This can take a few seconds for large log files.</source>
+        <translation>현재 데이터 디렉토리에서 %1 디버그 로그 파일을 엽니다. 용량이 큰 로그 파일들은 여는 데 수 초가 걸릴 수 있습니다.</translation>
+    </message>
+    <message>
+        <source>Decrease font size</source>
+        <translation>글자 크기 축소</translation>
+    </message>
+    <message>
+        <source>Increase font size</source>
+        <translation>글자 크기 확대</translation>
+    </message>
+    <message>
+        <source>Services</source>
+        <translation>서비스</translation>
+    </message>
+    <message>
+        <source>Ban Score</source>
+        <translation>밴 스코어</translation>
+    </message>
+    <message>
+        <source>Connection Time</source>
+        <translation>접속 시간</translation>
+    </message>
+    <message>
+        <source>Last Send</source>
+        <translation>마지막으로 보낸 시간</translation>
+    </message>
+    <message>
+        <source>Last Receive</source>
+        <translation>마지막으로 받은 시간</translation>
+    </message>
+    <message>
+        <source>Ping Time</source>
+        <translation>Ping 시간</translation>
+    </message>
+    <message>
+        <source>The duration of a currently outstanding ping.</source>
+        <translation>현재 Ping 지속 시간</translation>
+    </message>
+    <message>
+        <source>Ping Wait</source>
+        <translation>Ping 대기</translation>
+    </message>
+    <message>
+        <source>Min Ping</source>
+        <translation>최소 Ping</translation>
+    </message>
+    <message>
+        <source>Time Offset</source>
+        <translation>시간 오프셋</translation>
+    </message>
+    <message>
+        <source>&amp;Wallet Repair</source>
+        <translation>지갑 복구(&amp;W)</translation>
+    </message>
+    <message>
+        <source>Salvage wallet</source>
+        <translation>지갑 복원</translation>
+    </message>
+    <message>
+        <source>Rescan blockchain files</source>
+        <translation>블록체인 파일을 다시 스캔</translation>
+    </message>
+    <message>
+        <source>Recover transactions 1</source>
+        <translation>거래 1 복구</translation>
+    </message>
+    <message>
+        <source>Recover transactions 2</source>
+        <translation>거래 2 복구</translation>
+    </message>
+    <message>
+        <source>Upgrade wallet format</source>
+        <translation>지갑 포맷 업그레이드</translation>
+    </message>
+    <message>
+        <source>The buttons below will restart the wallet with command-line options to repair the wallet, fix issues with corrupt blockhain files or missing/obsolete transactions.</source>
+        <translation>하단의 버튼은 지갑을 복구하고, 손상된 블록체인 파일 및 누락/오래된 거래로 인한 문제를 해결하기 위하여 명령줄 옵션을 통해 지갑을 재시작합니다.</translation>
+    </message>
+    <message>
+        <source>-salvagewallet: Attempt to recover private keys from a corrupt wallet.dat.</source>
+        <translation>-salvagewallet: 손상된 wallet.dat에서 개인 키 복원을 시도합니다.</translation>
+    </message>
+    <message>
+        <source>-rescan: Rescan the block chain for missing wallet transactions.</source>
+        <translation>-rescan: 누락된 지갑 거래를 위해 블록체인을 다시 검색합니다.</translation>
+    </message>
+    <message>
+        <source>-zapwallettxes=1: Recover transactions from blockchain (keep meta-data, e.g. account owner).</source>
+        <translation>-zapwallettxes=1: 블록체인에서 거래를 복원합니다 (메타 데이터는 유지, 예: 계정 소유자).</translation>
+    </message>
+    <message>
+        <source>-zapwallettxes=2: Recover transactions from blockchain (drop meta-data).</source>
+        <translation>-zapwallettxes=2: 블록체인에서 거래를 복원합니다 (메타 데이터 유지하지 않음).</translation>
+    </message>
+    <message>
+        <source>-upgradewallet: Upgrade wallet to latest format on startup. (Note: this is NOT an update of the wallet itself!)</source>
+        <translation>-upgradewallet: 시작 시 지갑을 최신 포맷으로 업그레이드합니다 (주의: 이 옵션은 지갑 자체의 업그레이드가 아닙니다!)</translation>
+    </message>
+    <message>
+        <source>Wallet repair options.</source>
+        <translation>지갑 복구 옵션</translation>
+    </message>
+    <message>
+        <source>Rebuild index</source>
+        <translation>인덱스를 재구성합니다.</translation>
+    </message>
+    <message>
+        <source>-reindex: Rebuild block chain index from current blk000??.dat files.</source>
+        <translation>-reindex: 현재의 blk000??.dat 파일로부터 블록체인 인덱스를 재구성합니다.</translation>
+    </message>
+    <message>
+        <source>&amp;Disconnect</source>
+        <translation>접속 끊기(&amp;D)</translation>
+    </message>
+    <message>
+        <source>Ban for</source>
+        <translation>추방</translation>
+    </message>
+    <message>
+        <source>1 &amp;hour</source>
+        <translation>1시간(&amp;h)</translation>
+    </message>
+    <message>
+        <source>1 &amp;day</source>
+        <translation>1일(&amp;d)</translation>
+    </message>
+    <message>
+        <source>1 &amp;week</source>
+        <translation>1주(&amp;w)</translation>
+    </message>
+    <message>
+        <source>1 &amp;year</source>
+        <translation>1년(&amp;y)</translation>
+    </message>
+    <message>
+        <source>&amp;Unban</source>
+        <translation>추방 취소(&amp;U)</translation>
+    </message>
+    <message>
+        <source>Welcome to the %1 RPC console.</source>
+        <translation>%1 RPC 콘솔에 오신걸 환영합니다</translation>
+    </message>
+    <message>
+        <source>Use up and down arrows to navigate history, and &lt;b&gt;Ctrl-L&lt;/b&gt; to clear screen.</source>
+        <translation>기록을 찾아보려면 위 아래 화살표 키를, 화면을 지우려면 &lt;b&gt;Ctrl-L&lt;/b&gt;키를 사용하십시오.</translation>
+    </message>
+    <message>
+        <source>Type &lt;b&gt;help&lt;/b&gt; for an overview of available commands.</source>
+        <translation>사용 가능한 명령을 둘러보려면 &lt;b&gt;help&lt;/b&gt;를 입력하십시오.</translation>
+    </message>
+    <message>
+        <source>WARNING: Scammers have been active, telling users to type commands here, stealing their wallet contents. Do not use this console without fully understanding the ramification of a command.</source>
+        <translation>주의: 사기범들이 사용자들에게 이곳에 명령을 입력하도록 유도하면서 지갑의 내용물을 탈취할 수 있습니다. 명령의 결과에 관해 충분히 숙지하기 전에는 이 콘솔을 사용하지 마십시오.</translation>
+    </message>
+    <message>
+        <source>In:</source>
+        <translation>In:</translation>
+    </message>
+    <message>
+        <source>Out:</source>
+        <translation>Out:</translation>
+    </message>
+    <message>
+        <source>Network activity disabled</source>
+        <translation>네트워크 활동 비활성화</translation>
+    </message>
+    <message>
+        <source>%1 B</source>
+        <translation>%1 B</translation>
+    </message>
+    <message>
+        <source>%1 KB</source>
+        <translation>%1 KB</translation>
+    </message>
+    <message>
+        <source>%1 MB</source>
+        <translation>%1 MB</translation>
+    </message>
+    <message>
+        <source>%1 GB</source>
+        <translation>%1 GB</translation>
+    </message>
+    <message>
+        <source>(node id: %1)</source>
+        <translation>(노드 ID: %1)</translation>
+    </message>
+    <message>
+        <source>via %1</source>
+        <translation>%1 경유</translation>
+    </message>
+    <message>
+        <source>never</source>
+        <translation>없음</translation>
+    </message>
+    <message>
+        <source>Inbound</source>
+        <translation>인바운드</translation>
+    </message>
+    <message>
+        <source>Outbound</source>
+        <translation>아웃바운드</translation>
+    </message>
+    <message>
+        <source>Yes</source>
+        <translation>예</translation>
+    </message>
+    <message>
+        <source>No</source>
+        <translation>아니오</translation>
+    </message>
+    <message>
+        <source>Unknown</source>
+        <translation>알 수 없음</translation>
+    </message>
+</context>
+<context>
+    <name>ReceiveCoinsDialog</name>
+    <message>
+        <source>Reuse one of the previously used receiving addresses.&lt;br&gt;Reusing addresses has security and privacy issues.&lt;br&gt;Do not use this unless re-generating a payment request made before.</source>
+        <translation>이전에 사용한 적 있는 받기 주소를 다시 사용합니다. &lt;br&gt;주소를 다시 사용하는 것은 보안 및 프라이버시 문제에 연결됩니다. &lt;br&gt;이전에 이루어진 지불 요청을 다시 생성하는 것이 아니면 해당 주소를 사용하지 마십시오.</translation>
+    </message>
+    <message>
+        <source>R&amp;euse an existing receiving address (not recommended)</source>
+        <translation>이미 존재하는 받기 주소를 다시 사용하기(권장하지 않음) (&amp;R)</translation>
+    </message>
+    <message>
+        <source>An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Dash network.</source>
+        <translation>지불 요청에 메시지를 첨부할 지 선택할 수 있습니다. 해당 메세지는 지불 요청이 열릴 때 표시될 것 입니다. 메모: 이 메시지는 대시 네트워크로 전송되지 않습니다.</translation>
+    </message>
+    <message>
+        <source>&amp;Message:</source>
+        <translation>메시지:(&amp;M)</translation>
+    </message>
+    <message>
+        <source>An optional label to associate with the new receiving address.</source>
+        <translation>새로운 받기 주소와 결합하는 임의의 라벨</translation>
+    </message>
+    <message>
+        <source>An optional message to attach to the payment request, which will be displayed when the request is opened.&lt;br&gt;Note: The message will not be sent with the payment over the Dash network.</source>
+        <translation>지불 요청에 메시지를 첨부할 지 선택할 수 있습니다. 해당 메세지는 지불 요청이 열릴 때 표시될 것 입니다. 메모: 이 메시지는 대시 네트워크로 전송되지 않습니다.</translation>
+    </message>
+    <message>
+        <source>Use this form to request payments. All fields are &lt;b&gt;optional&lt;/b&gt;.</source>
+        <translation>지급을 요청하기 위해 아래 형식을 사용하세요. 모든입력 값은 &lt;b&gt;선택 사항&lt;/b&gt; 입니다.</translation>
+    </message>
+    <message>
+        <source>&amp;Label:</source>
+        <translation>라벨:(&amp;L)</translation>
+    </message>
+    <message>
+        <source>An optional amount to request. Leave this empty or zero to not request a specific amount.</source>
+        <translation>요청할 금액 입력칸은 선택 사항 입니다. 특정한 금액이 필요하지 않은 경우 빈 칸으로 두거나 0을 입력하세요.</translation>
+    </message>
+    <message>
+        <source>&amp;Amount:</source>
+        <translation>거래액:(&amp;A)</translation>
+    </message>
+    <message>
+        <source>&amp;Request payment</source>
+        <translation>지불 요청(&amp;R)</translation>
+    </message>
+    <message>
+        <source>Clear all fields of the form.</source>
+        <translation>양식의 모든 필드를 지웁니다</translation>
+    </message>
+    <message>
+        <source>Clear</source>
+        <translation>지우기</translation>
+    </message>
+    <message>
+        <source>Request InstantSend</source>
+        <translation>인스턴트샌드 요청</translation>
+    </message>
+    <message>
+        <source>Requested payments history</source>
+        <translation>지불 요청 히스토리</translation>
+    </message>
+    <message>
+        <source>Show the selected request (does the same as double clicking an entry)</source>
+        <translation>선택된 요청을 표시합니다(더블 클릭으로 항목을 표시할 수 있습니다).</translation>
+    </message>
+    <message>
+        <source>Show</source>
+        <translation>보기</translation>
+    </message>
+    <message>
+        <source>Remove the selected entries from the list</source>
+        <translation>목록에서 선택한 항목을 삭제합니다.</translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation>삭제</translation>
+    </message>
+    <message>
+        <source>Copy URI</source>
+        <translation>URI 복사</translation>
+    </message>
+    <message>
+        <source>Copy label</source>
+        <translation>라벨 복사</translation>
+    </message>
+    <message>
+        <source>Copy message</source>
+        <translation>메시지 복사</translation>
+    </message>
+    <message>
+        <source>Copy amount</source>
+        <translation>거래액 복사</translation>
+    </message>
+</context>
+<context>
+    <name>ReceiveRequestDialog</name>
+    <message>
+        <source>QR Code</source>
+        <translation>QR 코드</translation>
+    </message>
+    <message>
+        <source>Copy &amp;URI</source>
+        <translation>URI 복사(&amp;U)</translation>
+    </message>
+    <message>
+        <source>Copy &amp;Address</source>
+        <translation>주소 복사(&amp;A)</translation>
+    </message>
+    <message>
+        <source>&amp;Save Image...</source>
+        <translation>이미지 저장(&amp;S)...</translation>
+    </message>
+    <message>
+        <source>Request payment to %1</source>
+        <translation>%1에 지불을 요청했습니다</translation>
+    </message>
+    <message>
+        <source>Payment information</source>
+        <translation>지불 정보</translation>
+    </message>
+    <message>
+        <source>URI</source>
+        <translation>URI</translation>
+    </message>
+    <message>
+        <source>Address</source>
+        <translation>주소</translation>
+    </message>
+    <message>
+        <source>Amount</source>
+        <translation>거래액</translation>
+    </message>
+    <message>
+        <source>Label</source>
+        <translation>라벨</translation>
+    </message>
+    <message>
+        <source>Message</source>
+        <translation>메시지</translation>
+    </message>
+    <message>
+        <source>InstantSend</source>
+        <translation>인스턴트샌드</translation>
+    </message>
+    <message>
+        <source>Yes</source>
+        <translation>예</translation>
+    </message>
+    <message>
+        <source>No</source>
+        <translation>아니요</translation>
+    </message>
+    <message>
+        <source>Resulting URI too long, try to reduce the text for label / message.</source>
+        <translation>URI 결과가 너무 깁니다. 라벨/메세지의 글을 줄이세요.</translation>
+    </message>
+    <message>
+        <source>Error encoding URI into QR Code.</source>
+        <translation>URI를 QR 코드로 인코딩하는 중 오류가 발생했습니다.</translation>
+    </message>
+</context>
+<context>
+    <name>RecentRequestsTableModel</name>
+    <message>
+        <source>Date</source>
+        <translation>날짜</translation>
+    </message>
+    <message>
+        <source>Label</source>
+        <translation>라벨</translation>
+    </message>
+    <message>
+        <source>Message</source>
+        <translation>메시지</translation>
+    </message>
+    <message>
+        <source>(no label)</source>
+        <translation>(라벨 없음)</translation>
+    </message>
+    <message>
+        <source>(no message)</source>
+        <translation>(메세지가 없습니다)</translation>
+    </message>
+    <message>
+        <source>(no amount requested)</source>
+        <translation>(요청한 거래액 없음)</translation>
+    </message>
+    <message>
+        <source>Requested</source>
+        <translation>요청됨</translation>
+    </message>
+</context>
+<context>
+    <name>SendCoinsDialog</name>
+    <message>
+        <source>Send Coins</source>
+        <translation>코인들 보내기</translation>
+    </message>
+    <message>
+        <source>Coin Control Features</source>
+        <translation>코인 컨트롤 기능</translation>
+    </message>
+    <message>
+        <source>Inputs...</source>
+        <translation>입력...</translation>
+    </message>
+    <message>
+        <source>automatically selected</source>
+        <translation>자동 선택</translation>
+    </message>
+    <message>
+        <source>Insufficient funds!</source>
+        <translation>자금이 부족합니다!</translation>
+    </message>
+    <message>
+        <source>Quantity:</source>
+        <translation>수량:</translation>
+    </message>
+    <message>
+        <source>Bytes:</source>
+        <translation>바이트:</translation>
+    </message>
+    <message>
+        <source>Amount:</source>
+        <translation>금액:</translation>
+    </message>
+    <message>
+        <source>Fee:</source>
+        <translation>수수료:</translation>
+    </message>
+    <message>
+        <source>Dust:</source>
+        <translation>더스트:</translation>
+    </message>
+    <message>
+        <source>After Fee:</source>
+        <translation>수수료 이후:</translation>
+    </message>
+    <message>
+        <source>Change:</source>
+        <translation>잔돈:</translation>
+    </message>
+    <message>
+        <source>If this is activated, but the change address is empty or invalid, change will be sent to a newly generated address.</source>
+        <translation>이 기능이 활성화되면, 잔돈 주소가 공란이거나 무효인 경우 해당 잔돈은 새롭게 생성된 주소로 송금됩니다.</translation>
+    </message>
+    <message>
+        <source>Custom change address</source>
+        <translation>사용자 지정 변경 주소</translation>
+    </message>
+    <message>
+        <source>Transaction Fee:</source>
+        <translation>거래 수수료:</translation>
+    </message>
+    <message>
+        <source>Choose...</source>
+        <translation>선택...</translation>
+    </message>
+    <message>
+        <source>Using the fallbackfee can result in sending a transaction that will take several hours or days (or never) to confirm. Consider choosing your fee manually or wait until your have validated the complete chain.</source>
+        <translation>폴백수수료(fallbackfee)를 사용하는 경우 거래를 전송하는 데 수 시간, 수 일이 소요되거나 거래가 전송되지 않을 수 있습니다. 수수료를 수동으로 선택하시거나 완전한 블록체인에 승인할 때 까지 기다리실 것을 권장합니다.</translation>
+    </message>
+    <message>
+        <source>Warning: Fee estimation is currently not possible.</source>
+        <translation>경고: 지금은 수수료 예측이 불가능합니다.</translation>
+    </message>
+    <message>
+        <source>collapse fee-settings</source>
+        <translation>수수료 설정 접기</translation>
+    </message>
+    <message>
+        <source>Confirmation time target:</source>
+        <translation>승인 시간 목표:</translation>
+    </message>
+    <message>
+        <source>PrivateSend</source>
+        <translation>프라이빗샌드</translation>
+    </message>
+    <message>
+        <source>InstantSend</source>
+        <translation>인스턴트샌드</translation>
+    </message>
+    <message>
+        <source>If the custom fee is set to 1000 duffs and the transaction is only 250 bytes, then "per kilobyte" only pays 250 duffs in fee,&lt;br /&gt;while "at least" pays 1000 duffs. For transactions bigger than a kilobyte both pay by kilobyte.</source>
+        <translation>만일 사용자 지정 수수료가 1000 더프로 설정되어 있으나 거래는 250바이트에 불과한 경우, 'KB 당'은 오직 250 더프를 수수료로 지불하는 한편 &lt;br /&gt;'최소'는 1000더프를 지불합니다. 1 KB보다 큰 거래를 진행하는 경우 두 옵션 모두 KB 당으로 지불합니다.</translation>
+    </message>
+    <message>
+        <source>If the custom fee is set to 1000 duffs and the transaction is only 250 bytes, then "per kilobyte" only pays 250 duffs in fee,&lt;br /&gt;while "total at least" pays 1000 duffs. For transactions bigger than a kilobyte both pay by kilobyte.</source>
+        <translation>만일 사용자 지정 수수료가 1000 더프로 설정되어 있으나 거래는 250바이트에 불과한 경우, 'KB 당'은 250 더프를 수수료로 지불하는 한편, &lt;br /&gt;'전체 최소'는 1000더프를 지불합니다. 1 KB보다 큰 거래를 진행하는 경우 두 옵션 모두 KB 당으로 지불합니다.</translation>
+    </message>
+    <message>
+        <source>Paying only the minimum fee is just fine as long as there is less transaction volume than space in the blocks.&lt;br /&gt;But be aware that this can end up in a never confirming transaction once there is more demand for dash transactions than the network can process.</source>
+        <translation>최소한의 수수료만 지불하기는 블록체인 내의 공간보다 적은 거래가 진행 중인 경우에만 제대로 작동합니다.&lt;br /&gt;이 옵션을 선택하면 대시 네트워크가 처리할 수 있는 것 보다 많은 거래가 진행되는 경우 거래 확인이 이루어지지 않을 수도 있다는 점을 주의하세요.</translation>
+    </message>
+    <message>
+        <source>per kilobyte</source>
+        <translation>킬로바이트 당</translation>
+    </message>
+    <message>
+        <source>Hide</source>
+        <translation>숨기기</translation>
+    </message>
+    <message>
+        <source>total at least</source>
+        <translation>최소 총액</translation>
+    </message>
+    <message>
+        <source>(read the tooltip)</source>
+        <translation>(도구 팁을 읽어보세요)</translation>
+    </message>
+    <message>
+        <source>Recommended:</source>
+        <translation>권장:</translation>
+    </message>
+    <message>
+        <source>Custom:</source>
+        <translation>사용자 정의:</translation>
+    </message>
+    <message>
+        <source>(Smart fee not initialized yet. This usually takes a few blocks...)</source>
+        <translation>(Smart fee가 아직 초기화 되지 않았습니다. 이 과정에는 수 블록이 소요됩니다...)</translation>
+    </message>
+    <message>
+        <source>normal</source>
+        <translation>일반</translation>
+    </message>
+    <message>
+        <source>fast</source>
+        <translation>빠름</translation>
+    </message>
+    <message>
+        <source>Confirm the send action</source>
+        <translation>보낸 내용 확인 </translation>
+    </message>
+    <message>
+        <source>S&amp;end</source>
+        <translation>보내기(&amp;e)</translation>
+    </message>
+    <message>
+        <source>Clear all fields of the form.</source>
+        <translation>양식의 모든 필드를 지웁니다</translation>
+    </message>
+    <message>
+        <source>Clear &amp;All</source>
+        <translation>모두 지우기(&amp;A)</translation>
+    </message>
+    <message>
+        <source>Send to multiple recipients at once</source>
+        <translation>다수의 수령인에게 한번에 보내기</translation>
+    </message>
+    <message>
+        <source>Add &amp;Recipient</source>
+        <translation>수령인 추가하기(&amp;R)</translation>
+    </message>
+    <message>
+        <source>Balance:</source>
+        <translation>잔고:</translation>
+    </message>
+    <message>
+        <source>Copy quantity</source>
+        <translation>수량 복사</translation>
+    </message>
+    <message>
+        <source>Copy amount</source>
+        <translation>금액 복사</translation>
+    </message>
+    <message>
+        <source>Copy fee</source>
+        <translation>수수료 복사</translation>
+    </message>
+    <message>
+        <source>Copy after fee</source>
+        <translation>수수료 이후 복사</translation>
+    </message>
+    <message>
+        <source>Copy bytes</source>
+        <translation>bytes 복사</translation>
+    </message>
+    <message>
+        <source>Copy dust</source>
+        <translation>더스트 복사</translation>
+    </message>
+    <message>
+        <source>Copy change</source>
+        <translation>잔돈 복사</translation>
+    </message>
+    <message>
+        <source>using</source>
+        <translation>사용 중</translation>
+    </message>
+    <message>
+        <source>anonymous funds</source>
+        <translation>익명 처리된 자금</translation>
+    </message>
+    <message>
+        <source>(privatesend requires this amount to be rounded up to the nearest %1).</source>
+        <translation>(프라이빗샌드는 %1 가까이 라운드를 진행하기 위해서 이 금액을 필요로 합니다).</translation>
+    </message>
+    <message>
+        <source>any available funds (not anonymous)</source>
+        <translation>이용 가능한 모든 자금(비익명 포함)</translation>
+    </message>
+    <message>
+        <source>and InstantSend</source>
+        <translation>및 인스턴트샌드</translation>
+    </message>
+    <message>
+        <source>%1 to %2</source>
+        <translation>%1을(를) %2(으)로</translation>
+    </message>
+    <message>
+        <source>Are you sure you want to send?</source>
+        <translation>정말로 보내시겠습니까?</translation>
+    </message>
+    <message>
+        <source>are added as transaction fee</source>
+        <translation>이/가 수수료로 추가되었습니다.</translation>
+    </message>
+    <message>
+        <source>Total Amount = &lt;b&gt;%1&lt;/b&gt;&lt;br /&gt;= %2</source>
+        <translation>총 금액 = &lt;b&gt;%1&lt;/b&gt;&lt;br /&gt; = %2</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;(%1 of %2 entries displayed)&lt;/b&gt;</source>
+        <translation>&lt;b&gt;(%2 중 %1 입력값 표시됨)&lt;/b&gt;</translation>
+    </message>
+    <message>
+        <source>Confirm send coins</source>
+        <translation>코인 전송 확인</translation>
+    </message>
+    <message>
+        <source>The recipient address is not valid. Please recheck.</source>
+        <translation>수령인의 주소가 정확하지 않습니다. 다시 확인하세요.</translation>
+    </message>
+    <message>
+        <source>The amount to pay must be larger than 0.</source>
+        <translation>지불하는 금액은 0보다 커야 합니다.</translation>
+    </message>
+    <message>
+        <source>The amount exceeds your balance.</source>
+        <translation>잔고를 초과하였습니다.</translation>
+    </message>
+    <message>
+        <source>The total exceeds your balance when the %1 transaction fee is included.</source>
+        <translation>%1 의 거래 수수료가 추가되는 경우 총 금액이 잔고를 초과합니다.</translation>
+    </message>
+    <message>
+        <source>Duplicate address found: addresses should only be used once each.</source>
+        <translation>중복된 주소 발견: 주소는 한 번만 사용할 수 있습니다.</translation>
+    </message>
+    <message>
+        <source>Transaction creation failed!</source>
+        <translation>거래 생성에 실패하였습니다!</translation>
+    </message>
+    <message>
+        <source>The transaction was rejected with the following reason: %1</source>
+        <translation>거래가 다음과 같은 이유로 거절 되었습니다: %1</translation>
+    </message>
+    <message>
+        <source>A fee higher than %1 is considered an absurdly high fee.</source>
+        <translation>%1 보다 높은 수수료는 너무 높은 수수료 입니다.</translation>
+    </message>
+    <message>
+        <source>Payment request expired.</source>
+        <translation>지불 요청이 만료 되었습니다.</translation>
+    </message>
+    <message numerus="yes">
+        <source>%n block(s)</source>
+        <translation><numerusform>%n 블록</numerusform></translation>
+    </message>
+    <message>
+        <source>Pay only the required fee of %1</source>
+        <translation>오직 %1 만의 수수료를 지불하기</translation>
+    </message>
+    <message numerus="yes">
+        <source>Estimated to begin confirmation within %n block(s).</source>
+        <translation><numerusform>%n 블록 내 거래 확인을 시작하기 위해 추정 완료</numerusform></translation>
+    </message>
+    <message>
+        <source>Warning: Invalid Dash address</source>
+        <translation>경고: 잘못된 대시 주소입니다</translation>
+    </message>
+    <message>
+        <source>Warning: Unknown change address</source>
+        <translation>경고: 알 수 없는 변경 주소 입니다.</translation>
+    </message>
+    <message>
+        <source>Confirm custom change address</source>
+        <translation>사용자 지정 변경 주소 확인</translation>
+    </message>
+    <message>
+        <source>The address you selected for change is not part of this wallet. Any or all funds in your wallet may be sent to this address. Are you sure?</source>
+        <translation>변경을 위해 선택한 주소는 이 지갑에 포함되지 않았습니다. 지갑에 있는 일부 또는 모든 금액을 이 주소로 보낼 수 있습니다. 진행하시겠습니까?</translation>
+    </message>
+    <message>
+        <source>(no label)</source>
+        <translation>(라벨 없음)</translation>
+    </message>
+</context>
+<context>
+    <name>SendCoinsEntry</name>
+    <message>
+        <source>This is a normal payment.</source>
+        <translation>이것은 정상적인 지불입니다.</translation>
+    </message>
+    <message>
+        <source>Pay &amp;To:</source>
+        <translation>송금할 대상(&amp;T):</translation>
+    </message>
+    <message>
+        <source>The Dash address to send the payment to</source>
+        <translation>이 대시 주소로 송금합니다.</translation>
+    </message>
+    <message>
+        <source>Choose previously used address</source>
+        <translation>이전에 사용한 주소를 선택하십시오</translation>
+    </message>
+    <message>
+        <source>Alt+A</source>
+        <translation>Alt+A</translation>
+    </message>
+    <message>
+        <source>Paste address from clipboard</source>
+        <translation>클립보드로부터 주소 붙여넣기</translation>
+    </message>
+    <message>
+        <source>Alt+P</source>
+        <translation>Alt+P</translation>
+    </message>
+    <message>
+        <source>Remove this entry</source>
+        <translation>항목을 지웁니다</translation>
+    </message>
+    <message>
+        <source>&amp;Label:</source>
+        <translation>라벨:(&amp;L)</translation>
+    </message>
+    <message>
+        <source>Enter a label for this address to add it to the list of used addresses</source>
+        <translation>사용된 주소 목록에 새 주소를 추가하기 위해 라벨 이름을 입력합니다.</translation>
+    </message>
+    <message>
+        <source>A&amp;mount:</source>
+        <translation>금액:(&amp;m)</translation>
+    </message>
+    <message>
+        <source>The fee will be deducted from the amount being sent. The recipient will receive a lower amount of Dash than you enter in the amount field. If multiple recipients are selected, the fee is split equally.</source>
+        <translation>수수료는 보내는 금액에서 차감됩니다. 수령인은 당신이 수량란에 입력한 것 보다 적은 금액을 받게 됩니다. 만일 다중의 수령인이 선택되었다면 수수료는 수령인간에 동일하게 분할됩니다.</translation>
+    </message>
+    <message>
+        <source>S&amp;ubtract fee from amount</source>
+        <translation>송금액에서 수수료 차감(&amp;u)</translation>
+    </message>
+    <message>
+        <source>Message:</source>
+        <translation>메시지:</translation>
+    </message>
+    <message>
+        <source>A message that was attached to the dash: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Dash network.</source>
+        <translation>대시: URI에 첨부된 메시지는 거래와 함께 참고용으로 저장됩니다. 주의: 이 메시지는 대시 네트워크로 전송되지 않습니다.</translation>
+    </message>
+    <message>
+        <source>This is an unauthenticated payment request.</source>
+        <translation>인증 되지 않은 지급 요청입니다.</translation>
+    </message>
+    <message>
+        <source>This is an authenticated payment request.</source>
+        <translation>인증된 지급 요청 입니다.</translation>
+    </message>
+    <message>
+        <source>Pay To:</source>
+        <translation>송금 대상:</translation>
+    </message>
+    <message>
+        <source>Memo:</source>
+        <translation>메모:</translation>
+    </message>
+    <message>
+        <source>Enter a label for this address to add it to your address book</source>
+        <translation>주소록에 추가하기 위해서는 라벨을 입력하세요.</translation>
+    </message>
+</context>
+<context>
+    <name>SendConfirmationDialog</name>
+    <message>
+        <source>Yes</source>
+        <translation>예</translation>
+    </message>
+</context>
+<context>
+    <name>ShutdownWindow</name>
+    <message>
+        <source>%1 is shutting down...</source>
+        <translation>%1 을/를 종료 중입니다...</translation>
+    </message>
+    <message>
+        <source>Do not shut down the computer until this window disappears.</source>
+        <translation>이 창이 사라지기 전까지 컴퓨터를 끄지 마세요.</translation>
+    </message>
+</context>
+<context>
+    <name>SignVerifyMessageDialog</name>
+    <message>
+        <source>Signatures - Sign / Verify a Message</source>
+        <translation>서명 - 사인 / 메시지 확인</translation>
+    </message>
+    <message>
+        <source>&amp;Sign Message</source>
+        <translation>메시지 서명(&amp;S)</translation>
+    </message>
+    <message>
+        <source>You can sign messages/agreements with your addresses to prove you can receive Dash sent to them. Be careful not to sign anything vague or random, as phishing attacks may try to trick you into signing your identity over to them. Only sign fully-detailed statements you agree to.</source>
+        <translation>당신의 주소로 대시를 받을 수 있다는 점을 증명하기 위하여 메시지/계약서에 서명할 수 있습니다. 내용이 분명하지 않거나 무작위인 경우 서명하지 않도록 주의하세요. 피싱 공격이 당신의 서명을 얻기 위해 유도하는 것일 수 있습니다. 오직 완전한 세부 내용을 갖추고 당신이 동의하는 내용에만 서명하세요.</translation>
+    </message>
+    <message>
+        <source>The Dash address to sign the message with</source>
+        <translation>메시지에 서명하기 위한 대시 주소</translation>
+    </message>
+    <message>
+        <source>Choose previously used address</source>
+        <translation>이전에 사용한 주소를 선택합니다.</translation>
+    </message>
+    <message>
+        <source>Alt+A</source>
+        <translation>Alt+A</translation>
+    </message>
+    <message>
+        <source>Paste address from clipboard</source>
+        <translation>클립보드로부터 주소 붙여넣기</translation>
+    </message>
+    <message>
+        <source>Alt+P</source>
+        <translation>Alt+P</translation>
+    </message>
+    <message>
+        <source>Enter the message you want to sign here</source>
+        <translation>이곳에 서명하려는 메시지를 입력하십시오.</translation>
+    </message>
+    <message>
+        <source>Signature</source>
+        <translation>서명</translation>
+    </message>
+    <message>
+        <source>Copy the current signature to the system clipboard</source>
+        <translation>현재 서명을 시스템 클립보드에 복사</translation>
+    </message>
+    <message>
+        <source>Sign the message to prove you own this Dash address</source>
+        <translation>이 대시 주소가 당신의 소유임을 증명하기 위해 메시지에 서명하세요.</translation>
+    </message>
+    <message>
+        <source>Sign &amp;Message</source>
+        <translation>메시지에 서명(&amp;M)</translation>
+    </message>
+    <message>
+        <source>Reset all sign message fields</source>
+        <translation>메시지 필드의 모든 서명 재설정</translation>
+    </message>
+    <message>
+        <source>Clear &amp;All</source>
+        <translation>모두 지우기(&amp;A)</translation>
+    </message>
+    <message>
+        <source>&amp;Verify Message</source>
+        <translation>메시지 검증(&amp;V)</translation>
+    </message>
+    <message>
+        <source>Enter the receiver's address, message (ensure you copy line breaks, spaces, tabs, etc. exactly) and signature below to verify the message. Be careful not to read more into the signature than what is in the signed message itself, to avoid being tricked by a man-in-the-middle attack. Note that this only proves the signing party receives with the address, it cannot prove sendership of any transaction!</source>
+        <translation>메시지를 검증하기 위하여 아래에 수신인의 주소, 메시지(띄어쓰기, 들여쓰기, 행 나눔 등을 정확히 입력하기 위해 복사하여 입력) 및 서명을 입력하세요. 중간자 공격에 의한 피해를 피하기 위해 서명된 메시지 자체에 필요한 것 보다 많은 정보를 읽어 들이지 않도록 주의하세요. 이 기능은 서명 당사자가 해당 주소로 수신하였다는 점을 증명할 뿐이며, 거래의 발송 정보를 담지 않습니다.</translation>
+    </message>
+    <message>
+        <source>The Dash address the message was signed with</source>
+        <translation>메시지에 서명된 대시 주소</translation>
+    </message>
+    <message>
+        <source>Verify the message to ensure it was signed with the specified Dash address</source>
+        <translation>특정 대시 주소에 서명된 것인지 확인하기 위하여 메시지를 검증합니다.</translation>
+    </message>
+    <message>
+        <source>Verify &amp;Message</source>
+        <translation>메시지 검증(&amp;M)</translation>
+    </message>
+    <message>
+        <source>Reset all verify message fields</source>
+        <translation>모든 검증 메시지 필드 재설정</translation>
+    </message>
+    <message>
+        <source>Click "Sign Message" to generate signature</source>
+        <translation>서명을 생성하려면 "메시지 서명"을 클릭하세요.</translation>
+    </message>
+    <message>
+        <source>The entered address is invalid.</source>
+        <translation>입력한 주소를 인식할 수 없습니다.</translation>
+    </message>
+    <message>
+        <source>Please check the address and try again.</source>
+        <translation>주소를 확인하고 다시 시도하십시오.</translation>
+    </message>
+    <message>
+        <source>The entered address does not refer to a key.</source>
+        <translation>입력한 주소는 키에 적용되지 않습니다.</translation>
+    </message>
+    <message>
+        <source>Wallet unlock was cancelled.</source>
+        <translation>지갑 잠금 해제를 취소했습니다.</translation>
+    </message>
+    <message>
+        <source>Private key for the entered address is not available.</source>
+        <translation>입력한 주소에 대한 개인 키를 사용할 수 없습니다.</translation>
+    </message>
+    <message>
+        <source>Message signing failed.</source>
+        <translation>메시지 서명에 실패했습니다.</translation>
+    </message>
+    <message>
+        <source>Message signed.</source>
+        <translation>메시지에 서명했습니다.</translation>
+    </message>
+    <message>
+        <source>The signature could not be decoded.</source>
+        <translation>서명을 해독할 수 없습니다.</translation>
+    </message>
+    <message>
+        <source>Please check the signature and try again.</source>
+        <translation>서명을 확인하고 다시 시도하십시오.</translation>
+    </message>
+    <message>
+        <source>The signature did not match the message digest.</source>
+        <translation>메시지 다이제스트와 서명이 일치하지 않습니다.</translation>
+    </message>
+    <message>
+        <source>Message verification failed.</source>
+        <translation>메시지 검증에 실패했습니다.</translation>
+    </message>
+    <message>
+        <source>Message verified.</source>
+        <translation>메시지를 검증했습니다.</translation>
+    </message>
+</context>
+<context>
+    <name>SplashScreen</name>
+    <message>
+        <source>[testnet]</source>
+        <translation>[테스트넷]</translation>
+    </message>
+    <message>
+        <source>Version %1</source>
+        <translation>버전 %1</translation>
+    </message>
+</context>
+<context>
+    <name>TrafficGraphWidget</name>
+    <message>
+        <source>KB/s</source>
+        <translation>KB/s</translation>
+    </message>
+</context>
+<context>
+    <name>TransactionDesc</name>
+    <message numerus="yes">
+        <source>Open for %n more block(s)</source>
+        <translation><numerusform>%n 개의 블록을 더 엽니다.</numerusform></translation>
+    </message>
+    <message>
+        <source>Open until %1</source>
+        <translation>%1 까지 열림</translation>
+    </message>
+    <message>
+        <source>conflicted</source>
+        <translation>충돌</translation>
+    </message>
+    <message>
+        <source>%1/offline</source>
+        <translation>%1/오프라인</translation>
+    </message>
+    <message>
+        <source>0/unconfirmed, %1</source>
+        <translation>0/미승인, %1</translation>
+    </message>
+    <message>
+        <source>in memory pool</source>
+        <translation>메모리 풀 안에 있음</translation>
+    </message>
+    <message>
+        <source>not in memory pool</source>
+        <translation>메모리 풀 안에 없음</translation>
+    </message>
+    <message>
+        <source>abandoned</source>
+        <translation>버려진</translation>
+    </message>
+    <message>
+        <source>%1/unconfirmed</source>
+        <translation>%1/미확인</translation>
+    </message>
+    <message>
+        <source>%1 confirmations</source>
+        <translation>%1 확인</translation>
+    </message>
+    <message>
+        <source>verified via InstantSend</source>
+        <translation>인스턴트샌드를 통해 검증됨</translation>
+    </message>
+    <message>
+        <source>InstantSend verification in progress - %1 of %2 signatures</source>
+        <translation>인스턴트샌드 검증이 진행 중입니다 - %2 서명 중 %1</translation>
+    </message>
+    <message>
+        <source>InstantSend verification failed</source>
+        <translation>인스턴트샌드 검증에 실패하였습니다.</translation>
+    </message>
+    <message>
+        <source>Status</source>
+        <translation>상태</translation>
+    </message>
+    <message>
+        <source>, has not been successfully broadcast yet</source>
+        <translation>. 아직 성공적으로 통보되지 않았습니다.</translation>
+    </message>
+    <message numerus="yes">
+        <source>, broadcast through %n node(s)</source>
+        <translation><numerusform>,%n 노드에 통보하였습니다.</numerusform></translation>
+    </message>
+    <message>
+        <source>Date</source>
+        <translation>날짜</translation>
+    </message>
+    <message>
+        <source>Source</source>
+        <translation>소스</translation>
+    </message>
+    <message>
+        <source>Generated</source>
+        <translation>생성됨</translation>
+    </message>
+    <message>
+        <source>From</source>
+        <translation>으로부터</translation>
+    </message>
+    <message>
+        <source>unknown</source>
+        <translation>알 수 없음</translation>
+    </message>
+    <message>
+        <source>To</source>
+        <translation>에게</translation>
+    </message>
+    <message>
+        <source>own address</source>
+        <translation>자신의 주소</translation>
+    </message>
+    <message>
+        <source>watch-only</source>
+        <translation>조회  전용</translation>
+    </message>
+    <message>
+        <source>label</source>
+        <translation>라벨</translation>
+    </message>
+    <message>
+        <source>Credit</source>
+        <translation>입금</translation>
+    </message>
+    <message numerus="yes">
+        <source>matures in %n more block(s)</source>
+        <translation><numerusform>%n 블록 내에 이용 가능합니다.</numerusform></translation>
+    </message>
+    <message>
+        <source>not accepted</source>
+        <translation>허용되지 않음</translation>
+    </message>
+    <message>
+        <source>Debit</source>
+        <translation>출금</translation>
+    </message>
+    <message>
+        <source>Total debit</source>
+        <translation>총 출금</translation>
+    </message>
+    <message>
+        <source>Total credit</source>
+        <translation>총 입금</translation>
+    </message>
+    <message>
+        <source>Transaction fee</source>
+        <translation>거래 수수료</translation>
+    </message>
+    <message>
+        <source>Net amount</source>
+        <translation>순 잔고</translation>
+    </message>
+    <message>
+        <source>Message</source>
+        <translation>메시지</translation>
+    </message>
+    <message>
+        <source>Comment</source>
+        <translation>설명</translation>
+    </message>
+    <message>
+        <source>Transaction ID</source>
+        <translation>거래 ID</translation>
+    </message>
+    <message>
+        <source>Output index</source>
+        <translation>출력 인덱스</translation>
+    </message>
+    <message>
+        <source>Transaction total size</source>
+        <translation>총 거래 크기</translation>
+    </message>
+    <message>
+        <source>Merchant</source>
+        <translation>사업체</translation>
+    </message>
+    <message>
+        <source>Generated coins must mature %1 blocks before they can be spent. When you generated this block, it was broadcast to the network to be added to the block chain. If it fails to get into the chain, its state will change to "not accepted" and it won't be spendable. This may occasionally happen if another node generates a block within a few seconds of yours.</source>
+        <translation>새로이 생성된 코인은 %1 블록을 경과해 성숙하는 경우에만 사용할 수 있습니다. 블록을 생성하면 블록체인에 추가되도록 네트워크에 통보하는 과정을 거치게 됩니다. 만일 블록체인 내에 추가되는 데 실패하면 해당 상태는 '허용되지 않음'으로 변하고 사용할 수 없게 됩니다. 이러한 현상은 다른 노드가 수 초 간격으로 당신과 동시에 블록을 생성하는 경우 드물게 발생할 수 있습니다.</translation>
+    </message>
+    <message>
+        <source>Debug information</source>
+        <translation>디버그 정보</translation>
+    </message>
+    <message>
+        <source>Transaction</source>
+        <translation>거래</translation>
+    </message>
+    <message>
+        <source>Inputs</source>
+        <translation>입력</translation>
+    </message>
+    <message>
+        <source>Amount</source>
+        <translation>거래액</translation>
+    </message>
+    <message>
+        <source>true</source>
+        <translation>참</translation>
+    </message>
+    <message>
+        <source>false</source>
+        <translation>거짓</translation>
+    </message>
+</context>
+<context>
+    <name>TransactionDescDialog</name>
+    <message>
+        <source>This pane shows a detailed description of the transaction</source>
+        <translation>이 창은 거래의 세부 내역을 보여줍니다.</translation>
+    </message>
+    <message>
+        <source>Details for %1</source>
+        <translation>%1에 대한 세부 정보</translation>
+    </message>
+</context>
+<context>
+    <name>TransactionTableModel</name>
+    <message>
+        <source>Date</source>
+        <translation>날짜</translation>
+    </message>
+    <message>
+        <source>Type</source>
+        <translation>형식</translation>
+    </message>
+    <message>
+        <source>Address / Label</source>
+        <translation>주소 / 라벨</translation>
+    </message>
+    <message numerus="yes">
+        <source>Open for %n more block(s)</source>
+        <translation><numerusform>%n 개의 블록을 더 엽니다.</numerusform></translation>
+    </message>
+    <message>
+        <source>Open until %1</source>
+        <translation>%1 까지 열림</translation>
+    </message>
+    <message>
+        <source>Offline</source>
+        <translation>오프라인</translation>
+    </message>
+    <message>
+        <source>Unconfirmed</source>
+        <translation>미확인</translation>
+    </message>
+    <message>
+        <source>Abandoned</source>
+        <translation>버려진</translation>
+    </message>
+    <message>
+        <source>Confirming (%1 of %2 recommended confirmations)</source>
+        <translation>승인 중 (권장되는 승인 회수 %2 중 %1 승인 진행 중)</translation>
+    </message>
+    <message>
+        <source>Confirmed (%1 confirmations)</source>
+        <translation>승인 됨 (%1 승인)</translation>
+    </message>
+    <message>
+        <source>Conflicted</source>
+        <translation>충돌</translation>
+    </message>
+    <message>
+        <source>Immature (%1 confirmations, will be available after %2)</source>
+        <translation>이용 불가능한 상태 (%1 승인, %2 후에 사용 가능합니다)</translation>
+    </message>
+    <message>
+        <source>This block was not received by any other nodes and will probably not be accepted!</source>
+        <translation>이 블록은 다른 노드로부터 전달받지 않은 것으로, 받아들여지지 않을 것입니다!</translation>
+    </message>
+    <message>
+        <source>Generated but not accepted</source>
+        <translation>생성되었으나 받아들여지지 않음</translation>
+    </message>
+    <message>
+        <source>Received with</source>
+        <translation>받은 주소</translation>
+    </message>
+    <message>
+        <source>Received from</source>
+        <translation>보낸 주소</translation>
+    </message>
+    <message>
+        <source>Received via PrivateSend</source>
+        <translation>프라이빗샌드를 통해 받음</translation>
+    </message>
+    <message>
+        <source>Sent to</source>
+        <translation>보낸 주소</translation>
+    </message>
+    <message>
+        <source>Payment to yourself</source>
+        <translation>자신에게 지불</translation>
+    </message>
+    <message>
+        <source>Mined</source>
+        <translation>채굴</translation>
+    </message>
+    <message>
+        <source>PrivateSend Denominate</source>
+        <translation>프라이빗샌드 단위 분할</translation>
+    </message>
+    <message>
+        <source>PrivateSend Collateral Payment</source>
+        <translation>프라이빗샌드 콜래트럴 지불</translation>
+    </message>
+    <message>
+        <source>PrivateSend Make Collateral Inputs</source>
+        <translation>프라이빗샌드 콜래트럴 입력값 생성</translation>
+    </message>
+    <message>
+        <source>PrivateSend Create Denominations</source>
+        <translation>프라이빗샌드 분할 단위 생성</translation>
+    </message>
+    <message>
+        <source>PrivateSend</source>
+        <translation>프라이빗샌드</translation>
+    </message>
+    <message>
+        <source>watch-only</source>
+        <translation>조회 전용</translation>
+    </message>
+    <message>
+        <source>(n/a)</source>
+        <translation>(없음)</translation>
+    </message>
+    <message>
+        <source>(no label)</source>
+        <translation>(라벨 없음)</translation>
+    </message>
+    <message>
+        <source>Transaction status. Hover over this field to show number of confirmations.</source>
+        <translation>거래 상황. 마우스를 올리면 검증 횟수가 표시됩니다.</translation>
+    </message>
+    <message>
+        <source>Date and time that the transaction was received.</source>
+        <translation>거래가 이루어진 날짜와 시각</translation>
+    </message>
+    <message>
+        <source>Type of transaction.</source>
+        <translation>거래의 종류</translation>
+    </message>
+    <message>
+        <source>Whether or not a watch-only address is involved in this transaction.</source>
+        <translation>이 거래에 조회 전용 주소가 포함 되는지의 여부</translation>
+    </message>
+    <message>
+        <source>User-defined intent/purpose of the transaction.</source>
+        <translation>거래의 의도/목적에 대한 사용자 정의</translation>
+    </message>
+    <message>
+        <source>Amount removed from or added to balance.</source>
+        <translation>잔고에서 출금되거나 잔고로 입금된 금액</translation>
+    </message>
+</context>
+<context>
+    <name>TransactionView</name>
+    <message>
+        <source>All</source>
+        <translation>전체</translation>
+    </message>
+    <message>
+        <source>Today</source>
+        <translation>오늘</translation>
+    </message>
+    <message>
+        <source>This week</source>
+        <translation>이번주</translation>
+    </message>
+    <message>
+        <source>This month</source>
+        <translation>이번 달</translation>
+    </message>
+    <message>
+        <source>Last month</source>
+        <translation>지난 달</translation>
+    </message>
+    <message>
+        <source>This year</source>
+        <translation>올 해</translation>
+    </message>
+    <message>
+        <source>Range...</source>
+        <translation>범위...</translation>
+    </message>
+    <message>
+        <source>Most Common</source>
+        <translation>자주 사용된 항목</translation>
+    </message>
+    <message>
+        <source>Received with</source>
+        <translation>받은 주소</translation>
+    </message>
+    <message>
+        <source>Sent to</source>
+        <translation>보낸 주소</translation>
+    </message>
+    <message>
+        <source>PrivateSend</source>
+        <translation>프라이빗샌드</translation>
+    </message>
+    <message>
+        <source>PrivateSend Make Collateral Inputs</source>
+        <translation>프라이빗샌드 콜래트럴 입력값 생성</translation>
+    </message>
+    <message>
+        <source>PrivateSend Create Denominations</source>
+        <translation>프라이빗샌드 분할 단위 생성</translation>
+    </message>
+    <message>
+        <source>PrivateSend Denominate</source>
+        <translation>프라이빗샌드 단위 분할</translation>
+    </message>
+    <message>
+        <source>PrivateSend Collateral Payment</source>
+        <translation>프라이빗샌드 콜래트럴 지불</translation>
+    </message>
+    <message>
+        <source>To yourself</source>
+        <translation>나에게</translation>
+    </message>
+    <message>
+        <source>Mined</source>
+        <translation>채굴</translation>
+    </message>
+    <message>
+        <source>Other</source>
+        <translation>기타</translation>
+    </message>
+    <message>
+        <source>Enter address or label to search</source>
+        <translation>검색을 위해 주소 또는 라벨을 입력하세요.</translation>
+    </message>
+    <message>
+        <source>Min amount</source>
+        <translation>최소 거래액</translation>
+    </message>
+    <message>
+        <source>Abandon transaction</source>
+        <translation>중단된 거래</translation>
+    </message>
+    <message>
+        <source>Copy address</source>
+        <translation>주소 복사</translation>
+    </message>
+    <message>
+        <source>Copy label</source>
+        <translation>라벨 복사</translation>
+    </message>
+    <message>
+        <source>Copy amount</source>
+        <translation>거래액 복사</translation>
+    </message>
+    <message>
+        <source>Copy transaction ID</source>
+        <translation>거래 아이디 복사</translation>
+    </message>
+    <message>
+        <source>Copy raw transaction</source>
+        <translation>원 거래 복사</translation>
+    </message>
+    <message>
+        <source>Copy full transaction details</source>
+        <translation>거래 세부 내역 복사</translation>
+    </message>
+    <message>
+        <source>Edit label</source>
+        <translation>라벨 수정</translation>
+    </message>
+    <message>
+        <source>Show transaction details</source>
+        <translation>거래 세부 내역 보기</translation>
+    </message>
+    <message>
+        <source>Export Transaction History</source>
+        <translation>거래 기록 내보내기</translation>
+    </message>
+    <message>
+        <source>Comma separated file (*.csv)</source>
+        <translation>쉼표로 구분된 파일 (*.csv)</translation>
+    </message>
+    <message>
+        <source>Confirmed</source>
+        <translation>확인 완료</translation>
+    </message>
+    <message>
+        <source>Watch-only</source>
+        <translation>조회 전용</translation>
+    </message>
+    <message>
+        <source>Date</source>
+        <translation>날짜</translation>
+    </message>
+    <message>
+        <source>Type</source>
+        <translation>형식</translation>
+    </message>
+    <message>
+        <source>Label</source>
+        <translation>라벨</translation>
+    </message>
+    <message>
+        <source>Address</source>
+        <translation>주소</translation>
+    </message>
+    <message>
+        <source>ID</source>
+        <translation>아이디</translation>
+    </message>
+    <message>
+        <source>Exporting Failed</source>
+        <translation>내보내기 실패</translation>
+    </message>
+    <message>
+        <source>There was an error trying to save the transaction history to %1.</source>
+        <translation>%1에 거래 기록을 저장하는데 에러가 발생하였습니다.</translation>
+    </message>
+    <message>
+        <source>Exporting Successful</source>
+        <translation>내보내기 성공</translation>
+    </message>
+    <message>
+        <source>The transaction history was successfully saved to %1.</source>
+        <translation>거래 기록이 성공적으로 %1에 저장되었습니다.</translation>
+    </message>
+    <message>
+        <source>Range:</source>
+        <translation>범위:</translation>
+    </message>
+    <message>
+        <source>to</source>
+        <translation>에게</translation>
+    </message>
+</context>
+<context>
+    <name>UnitDisplayStatusBarControl</name>
+    <message>
+        <source>Unit to show amounts in. Click to select another unit.</source>
+        <translation>거래액을 표시하는 단위. 클릭하면 다른 단위를 선택할 수 있습니다.</translation>
+    </message>
+</context>
+<context>
+    <name>WalletFrame</name>
+    <message>
+        <source>No wallet has been loaded.</source>
+        <translation>불러올 지갑이 없습니다.</translation>
+    </message>
+</context>
+<context>
+    <name>WalletModel</name>
+    <message>
+        <source>Send Coins</source>
+        <translation>코인 보내기</translation>
+    </message>
+    <message>
+        <source>InstantSend doesn't support sending values that high yet. Transactions are currently limited to %1 DASH.</source>
+        <translation>인스턴트샌드는 이와 같은 고액 송금 기능을 아직 지원하지 않습니다. 현재 인스턴트샌드로 보낼 수 있는 최대한의 금액은 %1 DASH로 제한되어 있습니다.</translation>
+    </message>
+    <message>
+        <source>Used way too many inputs (&gt;%1) for this InstantSend transaction, fees could be huge.</source>
+        <translation>인스턴트샌드 거래를 위해서 지나치게 큰 입력값입니다(&gt;%1). 높은 수수료가 발생할 수 있습니다.</translation>
+    </message>
+</context>
+<context>
+    <name>WalletView</name>
+    <message>
+        <source>&amp;Export</source>
+        <translation>내보내기(&amp;E)</translation>
+    </message>
+    <message>
+        <source>Export the data in the current tab to a file</source>
+        <translation>현재 탭에 있는 데이터를 파일로 내보내기</translation>
+    </message>
+    <message>
+        <source>Selected amount:</source>
+        <translation>선택된 금액:</translation>
+    </message>
+    <message>
+        <source>Backup Wallet</source>
+        <translation>지갑 백업</translation>
+    </message>
+    <message>
+        <source>Wallet Data (*.dat)</source>
+        <translation>지갑 데이터 (*.dat)</translation>
+    </message>
+    <message>
+        <source>Backup Failed</source>
+        <translation>백업 실패</translation>
+    </message>
+    <message>
+        <source>There was an error trying to save the wallet data to %1.</source>
+        <translation>지갑 데이터를 %1 폴더에 저장하는 동안 오류가 발생했습니다. </translation>
+    </message>
+    <message>
+        <source>Backup Successful</source>
+        <translation>백업 성공</translation>
+    </message>
+    <message>
+        <source>The wallet data was successfully saved to %1.</source>
+        <translation>지갑 정보가 %1에 성공적으로 저장되었습니다.</translation>
+    </message>
+</context>
+<context>
+    <name>dash-core</name>
+    <message>
+        <source>Bind to given address and always listen on it. Use [host]:port notation for IPv6</source>
+        <translation>선택한 주소에 바인드하고 언제나 수신합니다. IPv6인 경우 [host]:port 명령어 표기법을 사용합니다.</translation>
+    </message>
+    <message>
+        <source>Error: Listening for incoming connections failed (listen returned error %s)</source>
+        <translation>오류: 들어오는 연결을 수신하는 데 실패했습니다 (수신 반환 오류 %s)</translation>
+    </message>
+    <message>
+        <source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source>
+        <translation>관련 경고를 받거나 매우 긴 포크를 감지하는 경우 명령을 실행합니다 (cmd의 %s이/가 메시지로 변경됩니다).</translation>
+    </message>
+    <message>
+        <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source>
+        <translation>지갑 거래가 변경되면 명령을 실행합니다(cmd의 %s이/가 TxID로 변경됩니다).</translation>
+    </message>
+    <message>
+        <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source>
+        <translation>베스트 블록이 변경되면 명령을 실행합니다(cmd에 있는 %s은/는 블록 해시로 변경됩니다).</translation>
+    </message>
+    <message>
+        <source>Name to construct url for KeePass entry that stores the wallet passphrase</source>
+        <translation>지갑 암호문을 저장하는 KeePass에서 사용할 URL을 구성하기 위한 이름 </translation>
+    </message>
+    <message>
+        <source>Set maximum size of high-priority/low-fee transactions in bytes (default: %d)</source>
+        <translation>우선 순위/적은 수수료 거래 크기의 최대치를 바이트로 설정하세요(디폴트: %d).</translation>
+    </message>
+    <message>
+        <source>Set the number of script verification threads (%u to %d, 0 = auto, &lt;0 = leave that many cores free, default: %d)</source>
+        <translation>스크립트 인증 스레드의 갯수 설정 (%u-%d, 0 = 자동, &lt;0 = 지정된 코어 개수만큼 사용 안함, 기본값: %d)</translation>
+    </message>
+    <message>
+        <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source>
+        <translation>출시 전의 테스트 빌드 입니다 - 스스로의 책임하에 사용하십시오 - 채굴이나 상업적 프로그램으로 사용하지 마십시오</translation>
+    </message>
+    <message>
+        <source>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</source>
+        <translation>경고 : 모든 네트워크가 완전히 일치하지 않은 것으로 보입니다! 일부 채굴자들이 문제를 겪고 있을 수 있습니다.</translation>
+    </message>
+    <message>
+        <source>Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.</source>
+        <translation>경고: 피어와 완전히 일치하지 않는 것으로 보입니다! 당신 혹은 다른 노드들의 업그레이드가 필요합니다.</translation>
+    </message>
+    <message>
+        <source>You must specify a masternodeprivkey in the configuration. Please see documentation for help.</source>
+        <translation>마스터노드 설정에서 마스터노드 개인 키를 지정하십시오. 도움이 필요하신 경우 문서를 확인하십시오.</translation>
+    </message>
+    <message>
+        <source>Accept command line and JSON-RPC commands</source>
+        <translation>명령줄과 JSON-RPC 명령 수락</translation>
+    </message>
+    <message>
+        <source>Add a node to connect to and attempt to keep the connection open</source>
+        <translation>연결을 위해 노드를 추가하고 연결을 유지합니다.</translation>
+    </message>
+    <message>
+        <source>Allow DNS lookups for -addnode, -seednode and -connect</source>
+        <translation>-addnode, -seednode, -connect 에 대해 DNS 탐색 허용</translation>
+    </message>
+    <message>
+        <source>Already have that input.</source>
+        <translation>이미 입력된 값입니다.</translation>
+    </message>
+    <message>
+        <source>Block creation options:</source>
+        <translation>블록 생성 옵션:</translation>
+    </message>
+    <message>
+        <source>Cannot downgrade wallet</source>
+        <translation>지갑을 다운그레이드 할 수 없습니다.</translation>
+    </message>
+    <message>
+        <source>Cannot write default address</source>
+        <translation>기본 주소에 기록할 수 없습니다.</translation>
+    </message>
+    <message>
+        <source>Collateral not valid.</source>
+        <translation>유효하지 않은 콜래트럴입니다.</translation>
+    </message>
+    <message>
+        <source>Connect to a node to retrieve peer addresses, and disconnect</source>
+        <translation>피어 주소를 검색하기 위해 노드에 연결하고 검색이 끝나면 연결을 해제합니다.</translation>
+    </message>
+    <message>
+        <source>Connection options:</source>
+        <translation>연결 설정 : </translation>
+    </message>
+    <message>
+        <source>Corrupted block database detected</source>
+        <translation>손상된 블록 데이터베이스가 감지되었습니다</translation>
+    </message>
+    <message>
+        <source>Debugging/Testing options:</source>
+        <translation>디버깅 및 테스팅 옵션:</translation>
+    </message>
+    <message>
+        <source>Do not load the wallet and disable wallet RPC calls</source>
+        <translation>지갑을 로딩하지 마십시오. 또한 지갑 RPC 연결을 비활성화 하십시오.</translation>
+    </message>
+    <message>
+        <source>Do you want to rebuild the block database now?</source>
+        <translation>블록 데이터베이스를 지금 다시 구축하시겠습니까?</translation>
+    </message>
+    <message>
+        <source>Done loading</source>
+        <translation>로딩 완료</translation>
+    </message>
+    <message>
+        <source>Entries are full.</source>
+        <translation>항목이 가득 찼습니다.</translation>
+    </message>
+    <message>
+        <source>Error initializing block database</source>
+        <translation>블록 데이터베이스를 초기화하는데 오류가 발생하였습니다.</translation>
+    </message>
+    <message>
+        <source>Error initializing wallet database environment %s!</source>
+        <translation>지갑 데이터베이스 환경을 초기화하는데 오류가 발생하였습니다 %s!</translation>
+    </message>
+    <message>
+        <source>Error loading block database</source>
+        <translation>블록 데이터베이스를 로딩하는 데 오류가 발생하였습니다.</translation>
+    </message>
+    <message>
+        <source>Error opening block database</source>
+        <translation>블록 데이터베이스를 여는 데 오류가 발생하였습니다.</translation>
+    </message>
+    <message>
+        <source>Error reading from database, shutting down.</source>
+        <translation>데이터베이스를 불러오는 데 오류가 발생하였습니다. 곧 종료됩니다.</translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation>에러</translation>
+    </message>
+    <message>
+        <source>Error: Disk space is low!</source>
+        <translation>에러: 디스크 공간이 부족합니다!</translation>
+    </message>
+    <message>
+        <source>Failed to listen on any port. Use -listen=0 if you want this.</source>
+        <translation>포트를 감지하는 데 실패하였습니다. 이를 진행하시려면 -listen=0 을 사용하세요.</translation>
+    </message>
+    <message>
+        <source>(1 = keep tx meta data e.g. account owner and payment request information, 2 = drop tx meta data)</source>
+        <translation>(1 = 거래 메타 데이터를 유지함 예. 계정 소유주와 지불 요청 정보, 2 = 거래 메타 데이터 파기)</translation>
+    </message>
+    <message>
+        <source>-maxtxfee is set very high! Fees this large could be paid on a single transaction.</source>
+        <translation>-maxtxfee 값이 너무 크게 설정 되었습니다!  이 거래에 너무 큰 수수료가 지불 됩니다.</translation>
+    </message>
+    <message>
+        <source>A fee rate (in %s/kB) that will be used when fee estimation has insufficient data (default: %s)</source>
+        <translation>수수료 추정 기능이 충분한 데이터를 축적하지 않은 상태에서 사용 될 수수료 비율(%s/kB) (디폴트: %s)</translation>
+    </message>
+    <message>
+        <source>Accept relayed transactions received from whitelisted peers even when not relaying transactions (default: %d)</source>
+        <translation>거래를 중계하지 않은 상태라도 화이트리스트에 포함된 피어에서 수신된 거래 중계를 받습니다. (디폴트:%d)</translation>
+    </message>
+    <message>
+        <source>Allow JSON-RPC connections from specified source. Valid for &lt;ip&gt; are a single IP (e.g. 1.2.3.4), a network/netmask (e.g. 1.2.3.4/255.255.255.0) or a network/CIDR (e.g. 1.2.3.4/24). This option can be specified multiple times</source>
+        <translation>특정 소스에서의 JSON-RPC 연결을 허용합니다. 이 설정은 다음에 유효합니다. &lt;ip&gt; 하나의 IP주소 (예 1.2.3.4), 네트워크/넷마스크 (예 1.2.3.4/255.255.255.0) 혹은 네트워크/CIDR (예 1.2.3.4/24). 이 옵션은 복수로 설정 할 수 있습니다.</translation>
+    </message>
+    <message>
+        <source>Bind to given address and whitelist peers connecting to it. Use [host]:port notation for IPv6</source>
+        <translation>선택한 주소와 이에 연결된 화이트리스트 피어를 바인드 합니다. IPv6인 경우 [host]:port 명령어 표기법을 사용합니다.</translation>
+    </message>
+    <message>
+        <source>Bind to given address to listen for JSON-RPC connections. Use [host]:port notation for IPv6. This option can be specified multiple times (default: bind to all interfaces)</source>
+        <translation>JSON-RPC 연결을 수신하기 위해 선택한 주소를 바인드 합니다. IPv6인 경우 [host]:port 명령어 표기법을 사용합니다. 이 옵션은 복수로 설정할 수 있습니다. (디폴트: 모든 인터페이스를 바인드)</translation>
+    </message>
+    <message>
+        <source>Create new files with system default permissions, instead of umask 077 (only effective with disabled wallet functionality)</source>
+        <translation>umask 077 를 대신하여 시스템 기본 권한으로 새 파일을 만듭니다. (지갑 기능이 비활성화 상태에서만 유효합니다)</translation>
+    </message>
+    <message>
+        <source>Delete all wallet transactions and only recover those parts of the blockchain through -rescan on startup</source>
+        <translation>시작 시 모든 지갑 거래를 삭제하고 -rescan을 통해 블록체인의 특정 부분만을 복구합니다.</translation>
+    </message>
+    <message>
+        <source>Error loading %s: You can't enable HD on a already existing non-HD wallet</source>
+        <translation>%s 로딩 에러: HD 지갑이 아닌 경우 HD를 활성화 할 수 없습니다.</translation>
+    </message>
+    <message>
+        <source>Found unconfirmed denominated outputs, will wait till they confirm to continue.</source>
+        <translation>확인 되지 않은 분할 단위 출력을 찾았습니다. 계속하기 위해 확인될 때까지 기다립니다.</translation>
+    </message>
+    <message>
+        <source>How thorough the block verification of -checkblocks is (0-4, default: %u)</source>
+        <translation>-checkblocks을 통한 철저한 블록 점검 (0-4, 디폴트: %u)</translation>
+    </message>
+    <message>
+        <source>If paytxfee is not set, include enough fee so transactions begin confirmation on average within n blocks (default: %u)</source>
+        <translation>paytxfee가 설정되어 있지 않다면 평균 n 블록 내에 승인이 이루어지도록 충분한 수수료를 포함해 주세요. (디폴트: %u)</translation>
+    </message>
+    <message>
+        <source>If this block is in the chain assume that it and its ancestors are valid and potentially skip their script verification (0 to verify all, default: %s, testnet: %s)</source>
+        <translation>이 블록이 체인에 있으면 해당 블록과 그 조상이 유효하며, 스크립트 확인을 건너 뛸 수 있습니다. (0은 모두 확인, 기본값: %s, 테스트넷: %s)</translation>
+    </message>
+    <message>
+        <source>Invalid amount for -maxtxfee=&lt;amount&gt;: '%s' (must be at least the minrelay fee of %s to prevent stuck transactions)</source>
+        <translation>다음을 위한 금액이 유효하지 않습니다 -maxtxfee=&lt;amount&gt;: '%s' (거래가 막히는 상황을 방지하게 위해 적어도 %s 의 최소 중계 수수료를 지정해야 합니다)</translation>
+    </message>
+    <message>
+        <source>Maintain a full transaction index, used by the getrawtransaction rpc call (default: %u)</source>
+        <translation>getrawtransaction를 RPC CALL를 통해 완전한 거래 인덱스 유지 (기본값: %u)</translation>
+    </message>
+    <message>
+        <source>Make sure to encrypt your wallet and delete all non-encrypted backups after you verified that wallet works!</source>
+        <translation>해당 지갑이 작동하는 지 여부를 확인한 이후에는 당신의 지갑을 암호화하고, 암호화하지 않은 지갑 백업은 지워야 한다는 점을 주의하세요!</translation>
+    </message>
+    <message>
+        <source>Maximum size of data in data carrier transactions we relay and mine (default: %u)</source>
+        <translation>중계 및 채굴 시 데이터 운송 거래에서 데이터의 최대 크기 (디폴트: %u)</translation>
+    </message>
+    <message>
+        <source>Number of seconds to keep misbehaving peers from reconnecting (default: %u)</source>
+        <translation>이상 행동을 하는 피어를 다시 연결시키는데 걸리는 시간 (디폴트: %u)</translation>
+    </message>
+    <message>
+        <source>Output debugging information (default: %u, supplying &lt;category&gt; is optional)</source>
+        <translation>디버그 정보 출력 (디폴트: %u, &lt;category&gt; 제공 선택 가능)</translation>
+    </message>
+    <message>
+        <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: %s)</source>
+        <translation>Tor 숨김 서비스로 피어에 접속하기 위해 별도의 SOCKS5 프록시를 사용하기 (디폴트: %s)</translation>
+    </message>
+    <message>
+        <source>User defined mnemonic for HD wallet (bip39). Only has effect during wallet creation/first start (default: randomly generated)</source>
+        <translation>HD 지갑을 위해 사용자가 지정한 연상 기호 암호문(bip39)은 지갑 생성/첫 시작에만 효력이 있습니다. (디폴트: 무작위 생성)</translation>
+    </message>
+    <message>
+        <source>User defined seed for HD wallet (should be in hex). Only has effect during wallet creation/first start (default: randomly generated)</source>
+        <translation>HD 지갑을 위해 사용자가 지정한 시드(hex여야 함)은 지갑 생성/첫 시작시에만 효력이 있습니다. (디폴트: 무작위 생성)</translation>
+    </message>
+    <message>
+        <source>Whitelisted peers cannot be DoS banned and their transactions are always relayed, even if they are already in the mempool, useful e.g. for a gateway</source>
+        <translation>화이트리스트에 포함된 피어는 이미 멤풀에 포함되어 있다고 하더라도 DoS 추방이 되지 않으며, 이들의 거래는 항상 중계됩니다. 이는 예컨대 게이트웨이에서 유용합니다.</translation>
+    </message>
+    <message>
+        <source>You need to rebuild the database using -reindex-chainstate to change -txindex</source>
+        <translation>-txindex를 변경하기 위해서는 -reindex- 체인 상태를 사용하여 데이터를 재구성해야 합니다.</translation>
+    </message>
+    <message>
+        <source>(default: %s)</source>
+        <translation>(디폴트: %s)</translation>
+    </message>
+    <message>
+        <source>Accept public REST requests (default: %u)</source>
+        <translation>공개 REST 요청을 허가 (디폴트: %u)</translation>
+    </message>
+    <message>
+        <source>Always query for peer addresses via DNS lookup (default: %u)</source>
+        <translation>DNS lookup을 통해 항상 피어주소에 대한 쿼리 보내기 (디폴트: %u)</translation>
+    </message>
+    <message>
+        <source>Can't mix: no compatible inputs found!</source>
+        <translation>믹스할 수 없습니다: 호환 가능한 입력값을 찾을 수 없습니다!</translation>
+    </message>
+    <message>
+        <source>Chain selection options:</source>
+        <translation>체인 선택 옵션:</translation>
+    </message>
+    <message>
+        <source>Connect through SOCKS5 proxy</source>
+        <translation>SOCK5 프록시를 통해 연결</translation>
+    </message>
+    <message>
+        <source>Connect to KeePassHttp on port &lt;port&gt; (default: %u)</source>
+        <translation>포트 &lt;port&gt;로 KeePassHttp에 접속합니다. (디폴트: %u)</translation>
+    </message>
+    <message>
+        <source>Enable the client to act as a masternode (0-1, default: %u)</source>
+        <translation>클라이언트가 마스터노드로 활동하도록 활성화 합니다. (0-1, 디폴트: %u)</translation>
+    </message>
+    <message>
+        <source>Entry exceeds maximum size.</source>
+        <translation>입력값이 최대치를 초과하였습니다.</translation>
+    </message>
+    <message>
+        <source>Error loading %s: You can't disable HD on a already existing HD wallet</source>
+        <translation>%s 로딩 에러: 이미 존재하는 HD 지갑에서 HD를 비활성화 할 수 없습니다.</translation>
+    </message>
+    <message>
+        <source>Failed to load fulfilled requests cache from</source>
+        <translation>다음으로부터 수행된 요청 캐시를 불러오는 데 실패하였습니다.</translation>
+    </message>
+    <message>
+        <source>Failed to load governance cache from</source>
+        <translation>다음으로부터 거버넌스 캐시를 불러오는 데 실패하였습니다.</translation>
+    </message>
+    <message>
+        <source>Failed to load masternode cache from</source>
+        <translation>다음으로부터 마스터노드 캐시를 불러오는 데 실패하였습니다.</translation>
+    </message>
+    <message>
+        <source>Failed to load masternode payments cache from</source>
+        <translation>다음으로부터 마스터노드 지불 캐시를 불러오는 데 실패하였습니다.</translation>
+    </message>
+    <message>
+        <source>Found enough users, signing ( waiting %s )</source>
+        <translation>충분한 사용자를 감지하였습니다. 신호를 보내는 중입니다. ( %s 기다리기 )</translation>
+    </message>
+    <message>
+        <source>Found enough users, signing ...</source>
+        <translation>충분한 사용자를 감지하였습니다. 신호를 보내는 중입니다...</translation>
+    </message>
+    <message>
+        <source>How many blocks to check at startup (default: %u, 0 = all)</source>
+        <translation>시작 시 점검할 블록 갯수 (기본값: %u, 0 = 모두)</translation>
+    </message>
+    <message>
+        <source>Importing...</source>
+        <translation>가져오는 중...</translation>
+    </message>
+    <message>
+        <source>Include IP addresses in debug output (default: %u)</source>
+        <translation>디버그 출력에 IP주소 포함하기 (기본값: %u)</translation>
+    </message>
+    <message>
+        <source>Incompatible mode.</source>
+        <translation>호환 불가 모드</translation>
+    </message>
+    <message>
+        <source>Incompatible version.</source>
+        <translation>호환 불가 버전</translation>
+    </message>
+    <message>
+        <source>Incorrect or no genesis block found. Wrong datadir for network?</source>
+        <translation>올바르지 않거나 생성된 블록을 찾을 수 없습니다. 네트워크 데이터 디렉토리가 잘못된 것일 수 있습니다.</translation>
+    </message>
+    <message>
+        <source>Information</source>
+        <translation>정보</translation>
+    </message>
+    <message>
+        <source>Input is not valid.</source>
+        <translation>유효하지 않은 입력입니다.</translation>
+    </message>
+    <message>
+        <source>Insufficient funds.</source>
+        <translation>잔고가 충분하지 않습니다.</translation>
+    </message>
+    <message>
+        <source>Invalid -onion address: '%s'</source>
+        <translation>잘못된 -onion 주소입니다: '%s'</translation>
+    </message>
+    <message>
+        <source>Invalid -proxy address: '%s'</source>
+        <translation>잘못된 -proxy 주소입니다: '%s'</translation>
+    </message>
+    <message>
+        <source>Invalid amount for -paytxfee=&lt;amount&gt;: '%s' (must be at least %s)</source>
+        <translation>유효하지 않은 금액입니다. -paytxfee=&lt;amount&gt;: '%s' (최소 %s 이상이어야 합니다)</translation>
+    </message>
+    <message>
+        <source>Keypool ran out, please call keypoolrefill first</source>
+        <translation>Keypool을 모두 사용하였습니다. 우선 keypoolrefill을 호출하십시오.</translation>
+    </message>
+    <message>
+        <source>Listen for JSON-RPC connections on &lt;port&gt; (default: %u or testnet: %u)</source>
+        <translation>JSON-RPC 연결을 수신합니다. &lt;port&gt; (기본값: %u 혹은 테스트넷: %u)</translation>
+    </message>
+    <message>
+        <source>Listen for connections on &lt;port&gt; (default: %u or testnet: %u)</source>
+        <translation>연결을 수신합니다. &lt;port&gt;(디폴트: %u 혹은 테스트넷: %u)</translation>
+    </message>
+    <message>
+        <source>Loading banlist...</source>
+        <translation>추방 리스트를 불러오는 중...</translation>
+    </message>
+    <message>
+        <source>Loading fulfilled requests cache...</source>
+        <translation>수행된 요청 캐시를 불러오는 중...</translation>
+    </message>
+    <message>
+        <source>Loading masternode cache...</source>
+        <translation>마스터노드 캐시를 불러오는 중...</translation>
+    </message>
+    <message>
+        <source>Loading masternode payment cache...</source>
+        <translation>마스터노드 지불 캐시를 불러오는 중...</translation>
+    </message>
+    <message>
+        <source>Lock is already in place.</source>
+        <translation>이미 잠금 상태입니다.</translation>
+    </message>
+    <message>
+        <source>Lock masternodes from masternode configuration file (default: %u)</source>
+        <translation>마스터노드 설정 파일로부터 마스터노드를 잠급니다. (디폴트: %u)</translation>
+    </message>
+    <message>
+        <source>Maximum per-connection receive buffer, &lt;n&gt;*1000 bytes (default: %u)</source>
+        <translation>접속 당 최대 수신 버퍼, &lt;n&gt;*1000 bytes (디폴트: %u)</translation>
+    </message>
+    <message>
+        <source>Maximum per-connection send buffer, &lt;n&gt;*1000 bytes (default: %u)</source>
+        <translation>접속 당 최대 전송 버퍼, &lt;n&gt;*1000 bytes (디폴트: %u)</translation>
+    </message>
+    <message>
+        <source>Mixing in progress...</source>
+        <translation>믹싱이 진행 중입니다...</translation>
+    </message>
+    <message>
+        <source>Mnemonic passphrase is too long, must be at most 256 characters</source>
+        <translation>연상 기호 암호문이 너무 깁니다. 최대 256 글자까지 허용됩니다.</translation>
+    </message>
+    <message>
+        <source>Need to specify a port with -whitebind: '%s'</source>
+        <translation>-whitebind를 통해 포트를 지정해야 합니다: '%s'</translation>
+    </message>
+    <message>
+        <source>No Masternodes detected.</source>
+        <translation>마스터노드가 탐지되지 않습니다.</translation>
+    </message>
+    <message>
+        <source>No compatible Masternode found.</source>
+        <translation>호환되는 마스터노드를 찾을 수 없습니다.</translation>
+    </message>
+    <message>
+        <source>Not in the Masternode list.</source>
+        <translation>마스터노드 리스트에 없습니다.</translation>
+    </message>
+    <message>
+        <source>Only connect to nodes in network &lt;net&gt; (ipv4, ipv6 or onion)</source>
+        <translation>오직 네트워크에서만 노드에 접속합니다. &lt;net&gt;(ipv4, ipv6 혹은 onion)</translation>
+    </message>
+    <message>
+        <source>Port: %d</source>
+        <translation>포트: %d</translation>
+    </message>
+    <message>
+        <source>Prepend debug output with timestamp (default: %u)</source>
+        <translation>디버그 출력 앞에 타임 스탬프를 추가합니다. (기본값: %u)</translation>
+    </message>
+    <message>
+        <source>Rebuild chain state and block index from the blk*.dat files on disk</source>
+        <translation>디스크상의 blk*.dat 파일로부터 블록체인 상태와 색인을 재구성합니다.</translation>
+    </message>
+    <message>
+        <source>Rebuild chain state from the currently indexed blocks</source>
+        <translation>현재 색인된 블록으로부터 테인 상태를 재구성합니다.</translation>
+    </message>
+    <message>
+        <source>Send trace/debug info to debug.log file (default: %u)</source>
+        <translation>추적/디버그 정보를 debug.log 파일로 보냅니다. (디폴트: %u)</translation>
+    </message>
+    <message>
+        <source>Send transactions as zero-fee transactions if possible (default: %u)</source>
+        <translation>가능한 경우 수수료 제로 방식으로 거래합니다. (디폴트: %u)</translation>
+    </message>
+    <message>
+        <source>Set key pool size to &lt;n&gt; (default: %u)</source>
+        <translation>키풀 크기를 &lt;n&gt; 로 설정합니다. (기본값: %u)</translation>
+    </message>
+    <message>
+        <source>Set the number of threads to service RPC calls (default: %d)</source>
+        <translation>RPC 호출 서비스를 위한 스레드의 개수 설정 (기본값: %d)</translation>
+    </message>
+    <message>
+        <source>Specify configuration file (default: %s)</source>
+        <translation>설정 파일을 지정합니다. (기본값: %s)</translation>
+    </message>
+    <message>
+        <source>Specify connection timeout in milliseconds (minimum: 1, default: %d)</source>
+        <translation>밀리세컨드 단위로 연결 제한 시간을 설정합니다. (최소값: 1, 기본값: %d)</translation>
+    </message>
+    <message>
+        <source>Specify masternode configuration file (default: %s)</source>
+        <translation>마스터노드 설정 파일을 지정합니다. (디폴트: %s)</translation>
+    </message>
+    <message>
+        <source>Specify pid file (default: %s)</source>
+        <translation>pid 파일을 지정합니다. (기본값: %s)</translation>
+    </message>
+    <message>
+        <source>Spend unconfirmed change when sending transactions (default: %u)</source>
+        <translation>거래를 보낼 때 검증되지 않은 잔돈 쓰기 (기본값: %u)</translation>
+    </message>
+    <message>
+        <source>Submitted following entries to masternode: %u / %d</source>
+        <translation>다음의 입력값을 마스터노드에 제출하기: %u / %d</translation>
+    </message>
+    <message>
+        <source>Submitted to masternode, waiting for more entries ( %u / %d ) %s</source>
+        <translation>마스터노드에 제출, 더 많은 입력값을 기다리는 중 (%u / %d ) %s</translation>
+    </message>
+    <message>
+        <source>Submitted to masternode, waiting in queue %s</source>
+        <translation>마스터노드에 제출, 대기열에서 기다리는 중 %s</translation>
+    </message>
+    <message>
+        <source>Synchroning blockchain...</source>
+        <translation>블록체인 동기화 중...</translation>
+    </message>
+    <message>
+        <source>Synchronization failed</source>
+        <translation>동기화에 실패하였습니다.</translation>
+    </message>
+    <message>
+        <source>Synchronization finished</source>
+        <translation>동기화가 끝났습니다.</translation>
+    </message>
+    <message>
+        <source>Synchronizing masternodes...</source>
+        <translation>마스터노드 동기화 중...</translation>
+    </message>
+    <message>
+        <source>This is not a Masternode.</source>
+        <translation>이는 마스터노드가 아닙니다.</translation>
+    </message>
+    <message>
+        <source>Threshold for disconnecting misbehaving peers (default: %u)</source>
+        <translation>비정상적인 피어의 연결을 차단시키기 위한 임계값 (기본값: %u)</translation>
+    </message>
+    <message>
+        <source>Too many %f denominations, removing.</source>
+        <translation>%f 분할 단위가 너무 많습니다. 삭제합니다.</translation>
+    </message>
+    <message>
+        <source>Tor control port password (default: empty)</source>
+        <translation>Tor 관리 포트 암호 (기본값: 공란)</translation>
+    </message>
+    <message>
+        <source>Tor control port to use if onion listening enabled (default: %s)</source>
+        <translation>onion 열림이 활성화시 Tor 관리 포트 사용 (기본값: %s)</translation>
+    </message>
+    <message>
+        <source>Unable to start HTTP server. See debug log for details.</source>
+        <translation>HTTP 서버를 시작할 수 없습니다. 자세한 사항은 디버그 로그를 확인 하세요.</translation>
+    </message>
+    <message>
+        <source>Unknown response.</source>
+        <translation>알 수 없는 반응.</translation>
+    </message>
+    <message>
+        <source>Unsupported argument -benchmark ignored, use -debug=bench.</source>
+        <translation>지원하지 않는 인수 -benchmark 은 무시됩니다, -debug=bench 형태로 사용하세요.</translation>
+    </message>
+    <message>
+        <source>Unsupported argument -debugnet ignored, use -debug=net.</source>
+        <translation>지원하지 않는 인수 -debugnet 은 무시됩니다, -debug=net 형태로 사용하세요.</translation>
+    </message>
+    <message>
+        <source>Unsupported argument -tor found, use -onion.</source>
+        <translation>지원하지 않는 인수 -tor를 찾았습니다. -onion를 사용해주세요.</translation>
+    </message>
+    <message>
+        <source>Upgrade wallet to latest format on startup</source>
+        <translation>시작 시 지갑 포맷을 최신으로 업그레이드 합니다</translation>
+    </message>
+    <message>
+        <source>Use KeePass 2 integration using KeePassHttp plugin (default: %u)</source>
+        <translation>KeePassHttp 플러그인을 사용하여 KeePass 2 통합을 사용합니다. (디폴트: %u)</translation>
+    </message>
+    <message>
+        <source>Use UPnP to map the listening port (default: %u)</source>
+        <translation>수신 포트를 맵핑하기 위해 UPnP 사용 (디폴트: %u)</translation>
+    </message>
+    <message>
+        <source>Use the test chain</source>
+        <translation>테스트 체인 사용</translation>
+    </message>
+    <message>
+        <source>User Agent comment (%s) contains unsafe characters.</source>
+        <translation>사용자 정의 코멘트 (%s)에 안전하지 못한 글자가 포함되어 있습니다.</translation>
+    </message>
+    <message>
+        <source>Will retry...</source>
+        <translation>다시 시도할 예정입니다...</translation>
+    </message>
+    <message>
+        <source>Invalid masternodeprivkey. Please see documenation.</source>
+        <translation>유효하지 않은 masternodeprivkey 입니다. 문서를 확인하세요.</translation>
+    </message>
+    <message>
+        <source>Can't find random Masternode.</source>
+        <translation>임의의 마스터노드를 찾을 수 없습니다.</translation>
+    </message>
+    <message>
+        <source>Can't mix while sync in progress.</source>
+        <translation>동기화가 진행되는 동안 믹싱할 수 없습니다.</translation>
+    </message>
+    <message>
+        <source>Could not parse masternode.conf</source>
+        <translation>masternode.conf 를 분석할 수 없습니다.</translation>
+    </message>
+    <message>
+        <source>Invalid netmask specified in -whitelist: '%s'</source>
+        <translation>-whitelist: '%s'로 지정된 넷마스크가 유효하지 않습니다. </translation>
+    </message>
+    <message>
+        <source>Invalid port detected in masternode.conf</source>
+        <translation>masternode.conf 에서 유효하지 않은 포트가 감지되었습니다.</translation>
+    </message>
+    <message>
+        <source>Invalid script detected.</source>
+        <translation>유효하지 않은 스크립트가 감지되었습니다.</translation>
+    </message>
+    <message>
+        <source>KeePassHttp id for the established association</source>
+        <translation>설립된 단체를 위한 KeePassHttp 아이디</translation>
+    </message>
+    <message>
+        <source>KeePassHttp key for AES encrypted communication with KeePass</source>
+        <translation>KeePass를 통해 AES 암호화된 의사 소통을 위한 KeePassHttp 키</translation>
+    </message>
+    <message>
+        <source>Keep at most &lt;n&gt; unconnectable transactions in memory (default: %u)</source>
+        <translation>최대 &lt;n&gt;개의 연결할 수 없는 거래를 메모리에 저장 (기본값: %u)</translation>
+    </message>
+    <message>
+        <source>Disable all Dash specific functionality (Masternodes, PrivateSend, InstantSend, Governance) (0-1, default: %u)</source>
+        <translation>모든 대시만의 기능(마스터노드, 프라이빗샌드, 인스턴트샌드, 거버넌스)을 비활성화 (0-1, 디폴트: %u)</translation>
+    </message>
+    <message>
+        <source>%s file contains all private keys from this wallet. Do not share it with anyone!</source>
+        <translation>%s 파일에는이 지갑의 모든 프라이빗키가 들어 있습니다. 절대 공유하지 마십시오!</translation>
+    </message>
+    <message>
+        <source>Discover own IP addresses (default: 1 when listening and no -externalip or -proxy)</source>
+        <translation>자신의 IP 주소를 탐색 (디폴트: 수신하는 경우 및 -externalip 또는 -proxy 가 없는 경우 1)</translation>
+    </message>
+    <message>
+        <source>Do not keep transactions in the mempool longer than &lt;n&gt; hours (default: %u)</source>
+        <translation>멤풀에 있는 거래 기록을 &lt;n&gt;시간 후 부터는 유지하지 않기 (디폴트: %u)</translation>
+    </message>
+    <message>
+        <source>Enable InstantSend, show confirmations for locked transactions (0-1, default: %u)</source>
+        <translation>인스턴트샌드를 활성화하고 잠긴 거래를 위한 거래 확인을 보여줍니다. (0-1, 디폴트: %u)</translation>
+    </message>
+    <message>
+        <source>Enable multiple PrivateSend mixing sessions per block, experimental (0-1, default: %u)</source>
+        <translation>실험적으로 블록당 다수의 프라이빗샌드 믹싱 세션을 활성화합니다. (0-1, 디폴트: %u)</translation>
+    </message>
+    <message>
+        <source>Enable use of automated PrivateSend for funds stored in this wallet (0-1, default: %u)</source>
+        <translation>이 지갑에 보관된 자금을 위해 자동화된 프라이빗샌드를 활성화 합니다. (0-1. 디폴트: %u)</translation>
+    </message>
+    <message>
+        <source>Execute command when a wallet InstantSend transaction is successfully locked (%s in cmd is replaced by TxID)</source>
+        <translation>지갑의 인스턴트샌드 거래가 성공적으로 잠기면 명령을 실행합니다. (cmd의 %s가 TxID로 대체됩니다)</translation>
+    </message>
+    <message>
+        <source>Extra transactions to keep in memory for compact block reconstructions (default: %u)</source>
+        <translation>컴팩트 블록 재구성을 위해 메모리에 보관해야 하는 추가 트랜잭션 (default: %u)</translation>
+    </message>
+    <message>
+        <source>Failed to create backup, file already exists! This could happen if you restarted wallet in less than 60 seconds. You can continue if you are ok with this.</source>
+        <translation>백업 생성에 실패하였습니다. 파일이 이미 존재합니다! 이는 당신이 60초 내에 지갑을 재시작 하는 경우 발생할 수 있습니다. 이러한 내용을 확인하시고 진행해 주세요. </translation>
+    </message>
+    <message>
+        <source>Fees (in %s/kB) smaller than this are considered zero fee for relaying, mining and transaction creation (default: %s)</source>
+        <translation>해당 금액(%s/kB) 보다 적은 수수료는 중계, 채굴, 거래 생성에서 수수료 면제로 간주됩니다 (기본값: %s)</translation>
+    </message>
+    <message>
+        <source>Fees (in %s/kB) smaller than this are considered zero fee for transaction creation (default: %s)</source>
+        <translation>해당 금액(%s/kB) 보다 적은 수수료는 수수료 면제로 간주됩니다.(기본값: %s)</translation>
+    </message>
+    <message>
+        <source>If &lt;category&gt; is not supplied or if &lt;category&gt; = 1, output all debugging information.</source>
+        <translation>&lt;category&gt;가 제공되지 않거나 &lt;category&gt; = 1 인 경우, 모든 디버깅 정보를 출력</translation>
+    </message>
+    <message>
+        <source>InstantSend doesn't support sending values that high yet. Transactions are currently limited to %1 DASH.</source>
+        <translation>인스턴트샌드는 이와 같은 고액 송금 기능을 아직 지원하지 않습니다. 현재 인스턴트샌드로 보낼 수 있는 최대한의 금액은 %1 DASH로 제한되어 있습니다.</translation>
+    </message>
+    <message>
+        <source>InstantSend requires inputs with at least %d confirmations, you might need to wait a few minutes and try again.</source>
+        <translation>인스턴트샌드는 최소 %d의 확인을 거친 입력값을 필요로 합니다. 몇 분 더 기다리신 후 다시 시도하세요.</translation>
+    </message>
+    <message>
+        <source>Maintain a full address index, used to query for the balance, txids and unspent outputs for addresses (default: %u)</source>
+        <translation>전체 주소 인덱스를 유지, 잔고를 위해 쿼리를 사용, 주소를 위한 txid와 사용되지 않은 출력 (디폴트: %u)</translation>
+    </message>
+    <message>
+        <source>Maintain a full spent index, used to query the spending txid and input index for an outpoint (default: %u)</source>
+        <translation>전체 이용한 인덱스를 유지합니다. 이는 아웃포인트를 위한 이용 txid와 입력 인덱스를 쿼리하는 데 사용됩니다. (디폴트: %u)</translation>
+    </message>
+    <message>
+        <source>Maintain a timestamp index for block hashes, used to query blocks hashes by a range of timestamps (default: %u)</source>
+        <translation>블록 해시를 위한 타임스탬프 인덱스를 유지합니다. 이는 범위 내의 타임스탬프로 블록 해시를 쿼리하는 데 사용됩니다. (디폴트: %u)</translation>
+    </message>
+    <message>
+        <source>Maintain at most &lt;n&gt; connections to peers (temporary service connections excluded) (default: %u)</source>
+        <translation>최대한 &lt;n&gt;개의 피어 연결을 유지합니다. (일시적인 서비스 연결은 제외) (디폴트: %u)</translation>
+    </message>
+    <message>
+        <source>PrivateSend uses exact denominated amounts to send funds, you might simply need to anonymize some more coins.</source>
+        <translation>프라이빗샌드는 송금을 위하여 정확한 분할 단위 금액을 사용합니다. 단순히 더 많은 코인을 익명화함으로써 문제를 해결할 수 있을 지도 모릅니다.</translation>
+    </message>
+    <message>
+        <source>Prune configured below the minimum of %d MiB.  Please use a higher number.</source>
+        <translation>축소 환경이 최소치인 %d MiB 이하로 설정되어 있습니다. 더 높은 값을 사용하십시오.</translation>
+    </message>
+    <message>
+        <source>Prune: last wallet synchronisation goes beyond pruned data. You need to -reindex (download the whole blockchain again in case of pruned node)</source>
+        <translation>블록 축소: 마지막 지갑 동기화가 축소된 데이터보다 오래 되었습니다. -reindex가 필요합니다. (축소된 노드의 경우 모든 블록체인을 재다운로드 하십시오)</translation>
+    </message>
+    <message>
+        <source>Randomize credentials for every proxy connection. This enables Tor stream isolation (default: %u)</source>
+        <translation>매 프록시 연결시 인증 정보를 무작위화 합니다. 이는 Tor 스트림 아이솔레이션 기능을 활성화시킵니다. (디폴트: %u)</translation>
+    </message>
+    <message>
+        <source>Rescans are not possible in pruned mode. You will need to use -reindex which will download the whole blockchain again.</source>
+        <translation>블록 축소 모드에서는 재검색이 불가능 합니다. -reindex 명령을 사용해서 모든 블록체인을 다시 다운로드 해야 합니다.</translation>
+    </message>
+    <message>
+        <source>Specify full path to directory for automatic wallet backups (must exist)</source>
+        <translation>자동 지갑 백업을 위한 디렉토리의 전체 경로를 지정하십시오. (꼭 존재하야 합니다)</translation>
+    </message>
+    <message>
+        <source>Support filtering of blocks and transaction with bloom filters (default: %u)</source>
+        <translation>블룸 필터를 통해 블록과 거래의 필터링을 지원합니다. (기본값: %u)</translation>
+    </message>
+    <message>
+        <source>The block database contains a block which appears to be from the future. This may be due to your computer's date and time being set incorrectly. Only rebuild the block database if you are sure that your computer's date and time are correct</source>
+        <translation>블록 데이터베이스에 미래로부터 출연한 블록이 포함되어 있습니다. 이는 사용자의 컴퓨터의 날짜와 시간이 올바르게 설정되어 있지 않기 때문일 수 있습니다. 사용자 컴퓨터의 날짜와 시간이 올바르게 설정되어있는 경우에만 블록 데이터베이스를 재구성하십시오.</translation>
+    </message>
+    <message>
+        <source>The transaction amount is too small to send after the fee has been deducted</source>
+        <translation>수수료를 지불하기에는 거래액이 너무 적습니다.</translation>
+    </message>
+    <message>
+        <source>Total length of network version string (%i) exceeds maximum length (%i). Reduce the number or size of uacomments.</source>
+        <translation>네트워크 버전의 총 문자 길이(%i)가 최대 길이(%i)를 초과합니다. UA코멘트의 갯수나 길이를 줄이십시오.</translation>
+    </message>
+    <message>
+        <source>Transaction index can't be disabled in full mode. Either start with -litemode command line switch or enable transaction index.</source>
+        <translation>전체 모드에서는 트랜잭션 색인을 비활성화 할 수 없습니다. -litemode 명령 행 스위치로 시작하거나 트랜잭션 색인을 사용 가능하게 하십시오.</translation>
+    </message>
+    <message>
+        <source>Tries to keep outbound traffic under the given target (in MiB per 24h), 0 = no limit (default: %d)</source>
+        <translation>아웃바운드 트래픽을 설정된 목표치 이하로 유지하기 (24시간당 MiB기준), 0 = 무제한 (기본값: %d)</translation>
+    </message>
+    <message>
+        <source>Unable to locate enough PrivateSend denominated funds for this transaction.</source>
+        <translation>이 거래를 위해 필요한 충분한 프라이빗샌드 분할 단위 자금을 위치할 수 없습니다.</translation>
+    </message>
+    <message>
+        <source>Unsupported argument -socks found. Setting SOCKS version isn't possible anymore, only SOCKS5 proxies are supported.</source>
+        <translation>지원하지 않는 인수 -socks를 찾았습니다. 설정된 SOCKS의 버전은 더이상 사용할 수 없으며, SOCK5 프록시만을 지원합니다.</translation>
+    </message>
+    <message>
+        <source>Unsupported argument -whitelistalwaysrelay ignored, use -whitelistrelay and/or -whitelistforcerelay.</source>
+        <translation>지원하지 않는 인수 -whitelistalwaysrelay 는 무시됩니다,  -whitelistrelay 나 -whitelistforcerelay 를 사용해 주세요.</translation>
+    </message>
+    <message>
+        <source>Use UPnP to map the listening port (default: 1 when listening and no -proxy)</source>
+        <translation>수신 포트를 맵핑하기 위해 UPnP 사용 (기본값: 수신하는 경우 및 -proxy가 없는 경우 1)</translation>
+    </message>
+    <message>
+        <source>WARNING! Failed to replenish keypool, please unlock your wallet to do so.</source>
+        <translation>경고! 키풀을 보충하는 데 실패하였습니다. 키풀 보충을 위해서는 지갑을 잠금 해제 하세요.</translation>
+    </message>
+    <message>
+        <source>Wallet is locked, can't replenish keypool! Automatic backups and mixing are disabled, please unlock your wallet to replenish keypool.</source>
+        <translation>지갑이 잠금 상태 입니다. 키풀을 보충할 수 없습니다! 자동 백업과 믹싱이 비활성화 됩니다. 키풀 보충을 위해서는 지갑을 잠금 해제 하세요.</translation>
+    </message>
+    <message>
+        <source>Warning: Unknown block versions being mined! It's possible unknown rules are in effect</source>
+        <translation>경고: 알려지지 않은 버전의 블록이 채굴되었습니다! 알려지지 않은 규칙이 적용되었을 가능성이 있습니다.</translation>
+    </message>
+    <message>
+        <source>You are starting in lite mode, all Dash-specific functionality is disabled.</source>
+        <translation>라이트 모드로 시작하면 모든 대시 관련 기능이 비활성화됩니다.</translation>
+    </message>
+    <message>
+        <source>You need to rebuild the database using -reindex to go back to unpruned mode.  This will redownload the entire blockchain</source>
+        <translation>축소 모드를 해제하고 데이터베이스를 재구성 하기 위해 -reindex를 사용해야 합니다. 이 명령은 모든 블록체인을 다시 다운로드 할 것 입니다.</translation>
+    </message>
+    <message>
+        <source>(%d could be used only on mainnet)</source>
+        <translation>(%d 은/는 오직 메인넷에서만 이용할 수 있습니다)</translation>
+    </message>
+    <message>
+        <source>(default: %u)</source>
+        <translation>(기본값: %u)</translation>
+    </message>
+    <message>
+        <source>(must be %d for mainnet)</source>
+        <translation>(메인넷을 위해서는 %d여야 합니다)</translation>
+    </message>
+    <message>
+        <source>-maxmempool must be at least %d MB</source>
+        <translation>-maxmempool은 최소한 %d MB가 필요합니다</translation>
+    </message>
+    <message>
+        <source>&lt;category&gt; can be:</source>
+        <translation>&lt;category&gt; 지정 가능:</translation>
+    </message>
+    <message>
+        <source>Append comment to the user agent string</source>
+        <translation>사용자 에이전트 문자열에 코멘트 첨부</translation>
+    </message>
+    <message>
+        <source>Automatic backups disabled</source>
+        <translation>자동 백업 해제</translation>
+    </message>
+    <message>
+        <source>Automatically create Tor hidden service (default: %d)</source>
+        <translation>Tor 숨김 서비스를 자동적으로 생성 (기본값: %d)</translation>
+    </message>
+    <message>
+        <source>ERROR! Failed to create automatic backup</source>
+        <translation>오류! 자동 백업 생성에 실패하였습니다.</translation>
+    </message>
+    <message>
+        <source>Enable publish hash block in &lt;address&gt;</source>
+        <translation>&lt;address&gt;에 대한 해시 블록 공개 활성화</translation>
+    </message>
+    <message>
+        <source>Enable publish hash of governance objects (like proposals) in &lt;address&gt;</source>
+        <translation>&lt;address&gt; 에서 거버넌스 객체(예: 제안서)의 해시 게시 사용</translation>
+    </message>
+    <message>
+        <source>Enable publish hash of governance votes in &lt;address&gt;</source>
+        <translation>&lt;address&gt; 에서 거버넌스 투표의 공개 해시 게시 사용 </translation>
+    </message>
+    <message>
+        <source>Enable publish hash transaction (locked via InstantSend) in &lt;address&gt;</source>
+        <translation>&lt;address&gt;의 공개 해시 거래를 활성화합니다 (인스턴트샌드를 통해 잠김)</translation>
+    </message>
+    <message>
+        <source>Enable publish hash transaction in &lt;address&gt;</source>
+        <translation>&lt;address&gt;의 공개 해시 거래를 활성화합니다.</translation>
+    </message>
+    <message>
+        <source>Enable publish raw block in &lt;address&gt;</source>
+        <translation>&lt;address&gt;의 공개 원시 블록을 활성화합니다.</translation>
+    </message>
+    <message>
+        <source>Enable publish raw transaction (locked via InstantSend) in &lt;address&gt;</source>
+        <translation>&lt;address&gt;의 공개 원시 거래를 활성화합니다. (인스턴트샌드를 통해 잠김)</translation>
+    </message>
+    <message>
+        <source>Enable publish raw transaction in &lt;address&gt;</source>
+        <translation>&lt;address&gt;에 대한 원시 거래 공개 활성화</translation>
+    </message>
+    <message>
+        <source>Enable transaction replacement in the memory pool (default: %u)</source>
+        <translation>메모리 풀 내의 거래 대체를 활성화합니다. (기본값: %u)</translation>
+    </message>
+    <message>
+        <source>Error: A fatal internal error occurred, see debug.log for details</source>
+        <translation>에러: 치명적인 내부 오류가 발생했습니다, 자세한 내용은 debug.log 를 확인해주세요.</translation>
+    </message>
+    <message>
+        <source>Failed to create backup %s!</source>
+        <translation>%s 백업 생성에 실패하였습니다! </translation>
+    </message>
+    <message>
+        <source>Failed to create backup, error: %s</source>
+        <translation>백업 생성에 실패하였습니다. 에러: %s</translation>
+    </message>
+    <message>
+        <source>Failed to delete backup, error: %s</source>
+        <translation>백업 삭제에 실패하였습니다. 에러: %s</translation>
+    </message>
+    <message>
+        <source>Failed to load InstantSend data cache from</source>
+        <translation>인스턴트샌드 데이터 캐시 로딩 실패</translation>
+    </message>
+    <message>
+        <source>Failed to load sporks cache from</source>
+        <translation>스포크 캐시 로딩 실패</translation>
+    </message>
+    <message>
+        <source>Failed to parse host:port string</source>
+        <translation>host:post 문자열을 분석하는 데 실패하였습니다.</translation>
+    </message>
+    <message>
+        <source>Fee (in %s/kB) to add to transactions you send (default: %s)</source>
+        <translation>송금 시 추가되는 수수료 (%s/kB) (기본값: %s)</translation>
+    </message>
+    <message>
+        <source>Imports blocks from external blk000??.dat file on startup</source>
+        <translation>시작 시 외부 blk000??.dat 파일에서 블록을 가져옵니다.</translation>
+    </message>
+    <message>
+        <source>InstantSend options:</source>
+        <translation>인스턴트샌드 옵션:</translation>
+    </message>
+    <message>
+        <source>Invalid amount for -fallbackfee=&lt;amount&gt;: '%s'</source>
+        <translation>유효하지 않은 금액 -fallbackfee=&lt;amount&gt;: '%s'</translation>
+    </message>
+    <message>
+        <source>Invalid input count.</source>
+        <translation>잘못된 입력 횟수입니다.</translation>
+    </message>
+    <message>
+        <source>Keep the transaction memory pool below &lt;n&gt; megabytes (default: %u)</source>
+        <translation>거래 메모리 풀의 용량을 &lt;n&gt;메가바이트 아래로 유지하기 (기본값: %u)</translation>
+    </message>
+    <message>
+        <source>Last PrivateSend was too recent.</source>
+        <translation>지난 프라이빗샌드가 너무 최신입니다.</translation>
+    </message>
+    <message>
+        <source>Last successful PrivateSend action was too recent.</source>
+        <translation>지난 성공적 프라이빗샌드 활동이 너무 최신입니다.</translation>
+    </message>
+    <message>
+        <source>Line: %d</source>
+        <translation>라인: %d</translation>
+    </message>
+    <message>
+        <source>Loading InstantSend data cache...</source>
+        <translation>인스턴트샌드 데이터 캐시로드 중...</translation>
+    </message>
+    <message>
+        <source>Loading addresses...</source>
+        <translation>주소를 불러오는 중...</translation>
+    </message>
+    <message>
+        <source>Loading block index...</source>
+        <translation>블록 인덱스를 불러오는 중...</translation>
+    </message>
+    <message>
+        <source>Loading governance cache...</source>
+        <translation>거버넌스 캐시를 불러오는 중...</translation>
+    </message>
+    <message>
+        <source>Loading sporks cache...</source>
+        <translation>스포크 캐시 로딩중...</translation>
+    </message>
+    <message>
+        <source>Loading wallet... (%3.2f %%)</source>
+        <translation>지갑을 불러오는 중... (%3.2f %%)</translation>
+    </message>
+    <message>
+        <source>Loading wallet...</source>
+        <translation>지갑을 불러오는 중...</translation>
+    </message>
+    <message>
+        <source>Location of the auth cookie (default: data dir)</source>
+        <translation>인증 쿠키의 위치 (기본값: data dir)</translation>
+    </message>
+    <message>
+        <source>Make the wallet broadcast transactions</source>
+        <translation>지갑 브로드캐스트 거래 생성</translation>
+    </message>
+    <message>
+        <source>Masternode cache is empty, skipping payments and governance cache...</source>
+        <translation>마스터노드 캐시가 비어 있습니다. 지불 및 거버넌스 캐시를 건너뜁니다...</translation>
+    </message>
+    <message>
+        <source>Masternode options:</source>
+        <translation>마스터노드 옵션:</translation>
+    </message>
+    <message>
+        <source>Masternode queue is full.</source>
+        <translation>마스터노드 대기열이 가득 찼습니다.</translation>
+    </message>
+    <message>
+        <source>Masternode:</source>
+        <translation>마스터노드:</translation>
+    </message>
+    <message>
+        <source>Minimum bytes per sigop in transactions we relay and mine (default: %u)</source>
+        <translation>중계 및 채굴 시 거래의 Sigop 당 최소 바이트 (디폴트: %u)</translation>
+    </message>
+    <message>
+        <source>Missing input transaction information.</source>
+        <translation>누락된 입력값 거래 정보</translation>
+    </message>
+    <message>
+        <source>No errors detected.</source>
+        <translation>에러가 감지되지 않았습니다.</translation>
+    </message>
+    <message>
+        <source>No matching denominations found for mixing.</source>
+        <translation>믹싱을 위해 필요한 분할 단위를 찾을 수 없습니다.</translation>
+    </message>
+    <message>
+        <source>Node relay options:</source>
+        <translation>노드 중계 옵션:</translation>
+    </message>
+    <message>
+        <source>Non-standard public key detected.</source>
+        <translation>규격 외의 공개 키가 감지되었습니다.</translation>
+    </message>
+    <message>
+        <source>Not compatible with existing transactions.</source>
+        <translation>기존의 거래와 호환 할 수 없습니다.</translation>
+    </message>
+    <message>
+        <source>Not enough file descriptors available.</source>
+        <translation>사용 가능한 파일 설명자가 부족합니다.</translation>
+    </message>
+    <message>
+        <source>Not enough funds to anonymize.</source>
+        <translation>익명화를 진행하기에 잔고가 충분하지 않습니다.</translation>
+    </message>
+    <message>
+        <source>Number of automatic wallet backups (default: %u)</source>
+        <translation>자동 지갑 백업의 수 (디폴트: %u)</translation>
+    </message>
+    <message>
+        <source>Options:</source>
+        <translation>옵션:</translation>
+    </message>
+    <message>
+        <source>Password for JSON-RPC connections</source>
+        <translation>JSON-RPC 연결에 사용할 암호</translation>
+    </message>
+    <message>
+        <source>Print version and exit</source>
+        <translation>버전 출력 후 종료</translation>
+    </message>
+    <message>
+        <source>PrivateSend is idle.</source>
+        <translation>프라이빗샌드가 가동되지 않았습니다.</translation>
+    </message>
+    <message>
+        <source>PrivateSend options:</source>
+        <translation>프라이빗샌드 옵션:</translation>
+    </message>
+    <message>
+        <source>PrivateSend request complete:</source>
+        <translation>프라이빗샌드 요청이 완료되었습니다: </translation>
+    </message>
+    <message>
+        <source>PrivateSend request incomplete:</source>
+        <translation>프라이빗샌드 요청이 완료되지 않았습니다:</translation>
+    </message>
+    <message>
+        <source>Prune cannot be configured with a negative value.</source>
+        <translation>블록 축소는 음수로 설정할 수 없습니다.</translation>
+    </message>
+    <message>
+        <source>Prune mode is incompatible with -txindex.</source>
+        <translation>블록 축소 모드는 -txindex와 호환되지 않습니다.</translation>
+    </message>
+    <message>
+        <source>Pruning blockstore...</source>
+        <translation>블록 데이터를 축소 중입니다..</translation>
+    </message>
+    <message>
+        <source>Rescan the block chain for missing wallet transactions on startup</source>
+        <translation>시작할 때 블록체인에서 누락된 지갑 거래를 다시 검색합니다. </translation>
+    </message>
+    <message>
+        <source>The wallet will avoid paying less than the minimum relay fee.</source>
+        <translation>이 지갑은 최소 중계 수수료보다 적은 수수료를 지불하지 않을 것입니다.</translation>
+    </message>
+    <message>
+        <source>This is the minimum transaction fee you pay on every transaction.</source>
+        <translation>모든 거래를 수행하는 데 필요한 최소 거래 수수료입니다.</translation>
+    </message>
+    <message>
+        <source>This is the transaction fee you will pay if you send a transaction.</source>
+        <translation>당신의 거래를 처리하는 데 필요한 거래 수수료입니다.</translation>
+    </message>
+    <message>
+        <source>Transaction amounts must not be negative</source>
+        <translation>거래 금액은 반드시 정수여야 합니다.</translation>
+    </message>
+    <message>
+        <source>Transaction has too long of a mempool chain</source>
+        <translation>거래의 멤풀 체인이 너무 깁니다.</translation>
+    </message>
+    <message>
+        <source>Transaction must have at least one recipient</source>
+        <translation>거래에는 최소 한 명의 수령인이 필요합니다.</translation>
+    </message>
+    <message>
+        <source>Transaction too large</source>
+        <translation>거래액이 너무 큽니다</translation>
+    </message>
+    <message>
+        <source>Trying to connect...</source>
+        <translation>연결 시도 중...</translation>
+    </message>
+    <message>
+        <source>Unable to bind to %s on this computer. %s is probably already running.</source>
+        <translation>이 컴퓨터의 %s에 바인딩 할 수 없습니다. %s이 이미 실행 중인 것으로 보입니다.</translation>
+    </message>
+    <message>
+        <source>Upgrading UTXO database</source>
+        <translation>UTXO 데이터베이스 업그레이드</translation>
+    </message>
+    <message>
+        <source>Use devnet chain with provided name</source>
+        <translation>제공된 이름으로 개발 네트워크 체인을 사용</translation>
+    </message>
+    <message>
+        <source>Wallet debugging/testing options:</source>
+        <translation>지갑 디버깅/테스트 옵션:</translation>
+    </message>
+    <message>
+        <source>Wallet is not initialized</source>
+        <translation>지갑이 초기화되지 않았습니다.</translation>
+    </message>
+    <message>
+        <source>Wallet needed to be rewritten: restart %s to complete</source>
+        <translation>지갑을 새로 써야 합니다:  완성을 위해 %s을/를 다시 시작하십시오.</translation>
+    </message>
+    <message>
+        <source>Warning: unknown new rules activated (versionbit %i)</source>
+        <translation>경고: 알려지지 않은 새로운 규칙이 활성화되었습니다. (versionbit %i)</translation>
+    </message>
+    <message>
+        <source>Wasn't able to create wallet backup folder %s!</source>
+        <translation>지갑 백업 폴더 %s 를 생성할 수 없었습니다!</translation>
+    </message>
+    <message>
+        <source>Whether to operate in a blocks only mode (default: %u)</source>
+        <translation>블록 전용 모드로 동작할 지 여부를 결정합니다. (기본값: %u)</translation>
+    </message>
+    <message>
+        <source>You can not start a masternode in lite mode.</source>
+        <translation>라이트 모드에서는 마스터 노드를 시작할 수 없습니다.</translation>
+    </message>
+    <message>
+        <source>ZeroMQ notification options:</source>
+        <translation>ZeroMQ 알림 옵션:</translation>
+    </message>
+    <message>
+        <source>no mixing available.</source>
+        <translation>믹싱을 할 수 없습니다.</translation>
+    </message>
+    <message>
+        <source>see debug.log for details.</source>
+        <translation>세부 사항을 확인하시려면 debug.log를 참조하세요.</translation>
+    </message>
+    <message>
+        <source>RPC server options:</source>
+        <translation>RPC 서버 설정</translation>
+    </message>
+    <message>
+        <source>Dash Core</source>
+        <translation>대시 코어</translation>
+    </message>
+    <message>
+        <source>The %s developers</source>
+        <translation>%s 개발자</translation>
+    </message>
+    <message>
+        <source>Accept connections from outside (default: 1 if no -proxy or -connect/-noconnect)</source>
+        <translation>외부로부터의 연결을 허용합니다. (-proxy 가 없는 경우 혹은 -connect/-noconnect 인 경우 디폴트: 1)</translation>
+    </message>
+    <message>
+        <source>Cannot obtain a lock on data directory %s. %s is probably already running.</source>
+        <translation>%s 데이터 디렉토리에 잠금을 설정 할 수 없습니다. %s가 이미 실행 중인 것으로 보입니다.</translation>
+    </message>
+    <message>
+        <source>Connect only to the specified node(s); -noconnect or -connect=0 alone to disable automatic connections</source>
+        <translation>지정된 노드(들)에만 연결합니다: 자동 연결을 해제하기 위하여 -noconnect 혹은 -connect=0 만을 사용합니다.</translation>
+    </message>
+    <message>
+        <source>Distributed under the MIT software license, see the accompanying file %s or %s</source>
+        <translation>MIT 소프트웨어 라이센스에 따라 배포 되었습니다. 첨부 파일 %s 또는 %s을 참조하십시오.</translation>
+    </message>
+    <message>
+        <source>Error reading %s! All keys read correctly, but transaction data or address book entries might be missing or incorrect.</source>
+        <translation>%s 불러오기 오류 입니다.  주소 키는 모두 정확하게 읽혔으나 거래 데이터 혹은 주소록에서 누락이나 오류가 존재할 수 있습니다.</translation>
+    </message>
+    <message>
+        <source>Force relay of transactions from whitelisted peers even if they violate local relay policy (default: %d)</source>
+        <translation>피어들이 로컬 중계 정책을 위반하더라도 화이트 리스트에 포함된 피어인경우 강제로 중계하기 (기본값: %d)</translation>
+    </message>
+    <message>
+        <source>Incorrect or no devnet genesis block found. Wrong datadir for devnet specified?</source>
+        <translation>올바르지 않거나 개발 네트워크 생성 블록을 찾을 수 없습니다. 개발 네트워크에 지정된 데이터 디렉토리가 잘못된 것일 수 있습니다.</translation>
+    </message>
+    <message>
+        <source>Maximum allowed median peer time offset adjustment. Local perspective of time may be influenced by peers forward or backward by this amount. (default: %u seconds)</source>
+        <translation>허용 된 최대 중간 피어 시간 오프셋 조정. 시간에 대한 지역적 전망치는 전방 또는 후방의 피어에 의해 영향을 받을 수 있습니다. (디폴트: %u 초)</translation>
+    </message>
+    <message>
+        <source>Maximum total fees (in %s) to use in a single wallet transaction or raw transaction; setting this too low may abort large transactions (default: %s)</source>
+        <translation>단일 지갑 거래 또는 원시 거래에서 사용할 최대 총 수수료(단위 %s). 이 값을 너무 낮게 설정하면 크기가 큰 거래를 중단시킬 수 있습니다. (기본값: %s)</translation>
+    </message>
+    <message>
+        <source>Override spork address. Only useful for regtest and devnet. Using this on mainnet or testnet will ban you.</source>
+        <translation>스포크 주소를 무시합니다. 이 기능은 오직 회귀 테스트와 개발 네트워크에서 유용합니다. 메인넷이나 테스트넷에서 사용하는 경우에는 금지당할 수 있습니다.</translation>
+    </message>
+    <message>
+        <source>Please check that your computer's date and time are correct! If your clock is wrong, %s will not work properly.</source>
+        <translation>컴퓨터의 날짜와 시간이 올바른지 확인하십시오! 시간이 잘못되면 %s은 제대로 동작하지 않습니다.</translation>
+    </message>
+    <message>
+        <source>Please contribute if you find %s useful. Visit %s for further information about the software.</source>
+        <translation>%s이/가 유용하다고 생각한다면 프로젝트에 공헌해주세요. 이 소프트웨어에 대한 보다 자세한 정보는 %s를 방문해주십시오.</translation>
+    </message>
+    <message>
+        <source>Provide liquidity to PrivateSend by infrequently mixing coins on a continual basis (%u-%u, default: %u, 1=very frequent, high fees, %u=very infrequent, low fees)</source>
+        <translation>코인 믹싱을 자주 반복하지 않음으로써 프라이빗샌드에 유동성 제공 (%u-%u, 디폴트: %u, 1=매우 빈번, 높은 수수료, %u=매우 드뭄, 적은 수수료)</translation>
+    </message>
+    <message>
+        <source>Query for peer addresses via DNS lookup, if low on addresses (default: 1 unless -connect/-noconnect)</source>
+        <translation>주소가 부족한 경우 DNS 검색을 통해 피어 주소를 요청합니다. (디폴트: -connect/-noconnect가 아닌 한 1) </translation>
+    </message>
+    <message>
+        <source>Reduce storage requirements by enabling pruning (deleting) of old blocks. This allows the pruneblockchain RPC to be called to delete specific blocks, and enables automatic pruning of old blocks if a target size in MiB is provided. This mode is incompatible with -txindex and -rescan. Warning: Reverting this setting requires re-downloading the entire blockchain. (default: 0 = disable pruning blocks, 1 = allow manual pruning via RPC, &gt;%u = automatically prune block files to stay under the specified target size in MiB)</source>
+        <translation>오래된 블록을 정리(삭제) 함으로써 스토리지 용량 요구 사항을 줄입니다. 이로써 pruneblockchain RPC를 호출하여 특정 블록을 삭제하고, MiB로 목표 사이즈를 설정하는 경우 오래된 블록을 자동으로 정리합니다. 이 모드는 -txindex와 -rescan과 호환되지 않습니다. 경고: 이 설정을 되돌리기 위해서는 전체 블록체인을 다시 다운로드 해야 합니다. (디폴트: 0 = 블록 정리 기능 해제, 1 = RPC를 통한 수동 블록 정리 허용, &gt;%u = 자동으로 블록 파일을 정리하여 MiB로 지정된 목표 사이즈로 유지)</translation>
+    </message>
+    <message>
+        <source>Set lowest fee rate (in %s/kB) for transactions to be included in block creation. (default: %s)</source>
+        <translation>블록 생성에 포함되기 위한 거래의 최저 수수료 비율(%s/kB)을 설정하십시오. (기본값: %s)</translation>
+    </message>
+    <message>
+        <source>This is the transaction fee you may pay when fee estimates are not available.</source>
+        <translation>이것은 수수료 견적을 이용할 수 없는 경우 당신이 지불 하게 될 것으로 예상되는 거래 수수료입니다.</translation>
+    </message>
+    <message>
+        <source>This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit %s and cryptographic software written by Eric Young and UPnP software written by Thomas Bernard.</source>
+        <translation>이 제품에는 OpenSSL Project에 의해 penSSL Toolkit %s용으로 사용하기 위해 개발된 소프트웨어, Eric Young이 작성한 암호화 소프트웨어 및 Thomas Bernard가 작성한 UPnP 소프트웨어가 포함되어 있습니다.</translation>
+    </message>
+    <message>
+        <source>Unable to locate enough PrivateSend non-denominated funds for this transaction.</source>
+        <translation>이 거래를 수행하는 데 필요한 충분한 프라이빗샌드 단위 분할 금액을 찾을 수 없습니다.  </translation>
+    </message>
+    <message>
+        <source>Use N separate masternodes for each denominated input to mix funds (%u-%u, default: %u)</source>
+        <translation>N개의 마스터노드를 사용하여 분할한 각 입력값을 섞습니다. (%u-%u, 디폴트: %u)</translation>
+    </message>
+    <message>
+        <source>Use hierarchical deterministic key generation (HD) after BIP39/BIP44. Only has effect during wallet creation/first start</source>
+        <translation>BIP39/BIP44 이후 HD 키 생성을 사용하십시오. 지갑 생성/첫 시작에만 시행됩니다.</translation>
+    </message>
+    <message>
+        <source>User defined mnemonic passphrase for HD wallet (BIP39). Only has effect during wallet creation/first start (default: empty string)</source>
+        <translation>HD 지갑을 위해 사용자가 지정한 연상 기호 암호문(BIP39)은 지갑 생성/첫 시작에만 효력이 있습니다. (디폴트: 빈 문자열)</translation>
+    </message>
+    <message>
+        <source>Username and hashed password for JSON-RPC connections. The field &lt;userpw&gt; comes in the format: &lt;USERNAME&gt;:&lt;SALT&gt;$&lt;HASH&gt;. A canonical python script is included in share/rpcuser. The client then connects normally using the rpcuser=&lt;USERNAME&gt;/rpcpassword=&lt;PASSWORD&gt; pair of arguments. This option can be specified multiple times</source>
+        <translation>클라이언트JSON-RPC 연결에 필요한 사용자 이름과 해시화된 암호문.  해당 필드는 &lt;userpw&gt; 다음과 같은 필드로 구성되어 있습니다: &lt;USERNAME&gt;:&lt;SALT&gt;$&lt;HASH&gt;. share/rpcuser에는 표준 파이톤 스크립트가 포함됩니다. 이후 클라이언트는 rpcuser=&lt;USERNAME&gt;/ rpcpassword=&lt;PASSWORD&gt; 쌍의 매개 변수를 이용하여 정상적으로 연결합니다. 이 옵션은 복수로 지정할 수 있습니다.</translation>
+    </message>
+    <message>
+        <source>Wallet will not create transactions that violate mempool chain limits (default: %u)</source>
+        <translation>지갑은 멤풀 체인 한계값(기본값: %u)을 넘는 거래를 생성하지 않습니다.</translation>
+    </message>
+    <message>
+        <source>Warning: At least %d of %d masternodes are running on a newer software version. Please check latest releases, you might need to update too.</source>
+        <translation>경고: %d개의 마스터노드 중 최소 %d 개가 새로운 버전의 소프트웨어에서 구동 중입니다. 최신 버전을 확인하세요. 업데이트가 필요할 수 있습니다.</translation>
+    </message>
+    <message>
+        <source>Warning: Every masternode (out of %d known ones) is running on a newer software version. Please check latest releases, it's very likely that you missed a major/critical update.</source>
+        <translation>경고: (알려진 %d 중) 모든 마스터노드가 새로운 버전의 소프트웨어에서 구동 중입니다. 최신의 버전을 확인하세요. 중요한 업데이트가 실행되지 않은 것으로 보입니다.</translation>
+    </message>
+    <message>
+        <source>Warning: Wallet file corrupt, data salvaged! Original %s saved as %s in %s; if your balance or transactions are incorrect you should restore from a backup.</source>
+        <translation>경고: 지갑 파일이 손상, 데이터가 복구되었습니다! 기존의 %s 파일은 %s에 %s라는 이름으로 저장됩니다. 잔액과 거래 내역이 정확하지 않다면 백업 파일로 복원해야 합니다. </translation>
+    </message>
+    <message>
+        <source>Whitelist peers connecting from the given IP address (e.g. 1.2.3.4) or CIDR notated network (e.g. 1.2.3.0/24). Can be specified multiple times.</source>
+        <translation>지정된 IP주소 (예 1.2.3.4) 혹은 CIDR로 작성된 네트워크 (예 1.2.3.0/24)로 화이트리스트 피어에 접속합니다. 이는 복수로 지정 할 수 있습니다.</translation>
+    </message>
+    <message>
+        <source>%s corrupt, salvage failed</source>
+        <translation>%s 손상, 복구에 실패하였습니다.</translation>
+    </message>
+    <message>
+        <source>%s is not a valid backup folder!</source>
+        <translation>%s는 올바른 백업 폴더가 아닙니다!</translation>
+    </message>
+    <message>
+        <source>%s is set very high!</source>
+        <translation>%s가 매우 높게 설정되었습니다!</translation>
+    </message>
+    <message>
+        <source>(press q to shutdown and continue later)</source>
+        <translation>(q를 눌러 종료하고 나중에 계속하기)</translation>
+    </message>
+    <message>
+        <source>-devnet can only be specified once</source>
+        <translation>-devnet은 한 번만 지정할 수 있습니다.</translation>
+    </message>
+    <message>
+        <source>-port must be specified when -devnet and -listen are specified</source>
+        <translation>-devnet과 -listen이 지정될 때에는 -port도 지정되어야 합니다.</translation>
+    </message>
+    <message>
+        <source>-rpcport must be specified when -devnet and -server are specified</source>
+        <translation>-devnet과 -server가 지정될 때에는 -rpcport도 지정되어야 합니다.</translation>
+    </message>
+    <message>
+        <source>Allow RFC1918 addresses to be relayed and connected to (default: %u)</source>
+        <translation>RFC1918 주소가 릴레이되고 (default: %u)에 연결되는 것을 허용합니다.</translation>
+    </message>
+    <message>
+        <source>Attempt to recover private keys from a corrupt wallet on startup</source>
+        <translation>시작 시 오류가 있는 지갑에서 개인 키 복원을 시도합니다.</translation>
+    </message>
+    <message>
+        <source>Cannot resolve -%s address: '%s'</source>
+        <translation>%s주소: '%s'를 확인할 수 없습니다.</translation>
+    </message>
+    <message>
+        <source>Change index out of range</source>
+        <translation>범위 밖의 인덱스 변경</translation>
+    </message>
+    <message>
+        <source>Copyright (C)</source>
+        <translation>Copyright (C)</translation>
+    </message>
+    <message>
+        <source>Error loading %s</source>
+        <translation>%s 불러오기 오류</translation>
+    </message>
+    <message>
+        <source>Error loading %s: Wallet corrupted</source>
+        <translation>%s 불러오기 오류: 지갑에 오류가 있습니다.</translation>
+    </message>
+    <message>
+        <source>Error loading %s: Wallet requires newer version of %s</source>
+        <translation>%s 불러오기 에러: 지갑에 새 버전의 %s이/가 필요합니다</translation>
+    </message>
+    <message>
+        <source>Error upgrading chainstate database</source>
+        <translation>체인 상태 데이터베이스 업그레이드 중 오류가 발생했습니다.</translation>
+    </message>
+    <message>
+        <source>Failed to find mixing queue to join</source>
+        <translation>참여할 수 있는 믹싱 대기열을 찾는 데 실패하였습니다.</translation>
+    </message>
+    <message>
+        <source>Failed to start a new mixing queue</source>
+        <translation>새로운 믹싱 대기열을 시작하는 데 실패하였습니다.</translation>
+    </message>
+    <message>
+        <source>Initialization sanity check failed. %s is shutting down.</source>
+        <translation>초기치 설정 정상 여부 검사에 실패하였습니다. %s가 종료됩니다.</translation>
+    </message>
+    <message>
+        <source>Invalid amount for -%s=&lt;amount&gt;: '%s'</source>
+        <translation>유효하지 않은 금액 -%s=&lt;amount&gt;: '%s'</translation>
+    </message>
+    <message>
+        <source>Invalid spork address specified with -sporkaddr</source>
+        <translation>-sporkaddr로 지정된 스포크 주소가 유효하지 않습니다.</translation>
+    </message>
+    <message>
+        <source>Keep N DASH anonymized (%u-%u, default: %u)</source>
+        <translation>N 대시를 익명으로 유지합니다(%u-%u, 디폴트: %u).</translation>
+    </message>
+    <message>
+        <source>Print this help message and exit</source>
+        <translation>이 도움말 메시지를 출력 후 종료</translation>
+    </message>
+    <message>
+        <source>Receive and display P2P network alerts (default: %u)</source>
+        <translation>P2P 네트워크 경고를 받고 표시합니다(디폴트: %u).</translation>
+    </message>
+    <message>
+        <source>Reducing -maxconnections from %d to %d, because of system limitations.</source>
+        <translation>시스템 상 한계로 인하여 -maxconnections를 %d 에서 %d로 줄였습니다.</translation>
+    </message>
+    <message>
+        <source>Relay and mine data carrier transactions (default: %u)</source>
+        <translation>데이터 캐리어 거래를 릴레이하고 채굴 합니다. (기본값: %u)</translation>
+    </message>
+    <message>
+        <source>Relay non-P2SH multisig (default: %u)</source>
+        <translation>비-P2SH 다중 서명을 릴레이 (기본값: %u)</translation>
+    </message>
+    <message>
+        <source>Rescanning...</source>
+        <translation>다시 스캔 중...</translation>
+    </message>
+    <message>
+        <source>Run in the background as a daemon and accept commands</source>
+        <translation>데몬으로 백그라운드에서 실행하고 명령을 허용</translation>
+    </message>
+    <message>
+        <source>Send trace/debug info to console instead of debug.log file</source>
+        <translation>추적/디버그 정보를 degug.log 파일 대신 콘솔로 보내기</translation>
+    </message>
+    <message>
+        <source>Session not complete!</source>
+        <translation>세션이 완료되지 않았습니다!</translation>
+    </message>
+    <message>
+        <source>Session timed out.</source>
+        <translation>세션이 만료되었습니다.</translation>
+    </message>
+    <message>
+        <source>Set database cache size in megabytes (%d to %d, default: %d)</source>
+        <translation>데이터베이스 케시 크기를 메가바이트로 설정(%d 부터 %d, 기본값: %d)</translation>
+    </message>
+    <message>
+        <source>Set maximum block size in bytes (default: %d)</source>
+        <translation>최대 블록 사이즈를 바이트로 설정합니다(디폴트: %d).</translation>
+    </message>
+    <message>
+        <source>Set the masternode private key</source>
+        <translation>마스터노드 개인 키를 설정합니다.</translation>
+    </message>
+    <message>
+        <source>Show all debugging options (usage: --help -help-debug)</source>
+        <translation>모든 디버그 설정 보기(설정: --help -help-debug)</translation>
+    </message>
+    <message>
+        <source>Shrink debug.log file on client startup (default: 1 when no -debug)</source>
+        <translation>클라이언트 시작 시 debug.log 파일 축소 (기본값: -debug 아닌 경우 1)</translation>
+    </message>
+    <message>
+        <source>Signing transaction failed</source>
+        <translation>거래에 서명하는 데 실패하였습니다.</translation>
+    </message>
+    <message>
+        <source>Specify data directory</source>
+        <translation>데이터 디렉토리를 지정하십시오.</translation>
+    </message>
+    <message>
+        <source>Specify wallet file (within data directory)</source>
+        <translation>(데이터 디렉토리 내의) 지갑 파일을 지정하십시오.</translation>
+    </message>
+    <message>
+        <source>Specify your own public address</source>
+        <translation>공개 주소를 지정하십시오.</translation>
+    </message>
+    <message>
+        <source>Starting network threads...</source>
+        <translation>네트워크 스레드 시작중...</translation>
+    </message>
+    <message>
+        <source>Synchronization pending...</source>
+        <translation>처리 중인 데이터 동기화중...</translation>
+    </message>
+    <message>
+        <source>Synchronizing governance objects...</source>
+        <translation>거버넌스 객체 동기화중...</translation>
+    </message>
+    <message>
+        <source>Synchronizing masternode payments...</source>
+        <translation>마스터노드 지불 동기화중...</translation>
+    </message>
+    <message>
+        <source>The source code is available from %s.</source>
+        <translation>소스 코드는 %s 에서 확인하실 수 있습니다.</translation>
+    </message>
+    <message>
+        <source>The transaction amount is too small to pay the fee</source>
+        <translation>수수료를 지불하기에 거래 금액이 너무 작습니다.</translation>
+    </message>
+    <message>
+        <source>This is experimental software.</source>
+        <translation>이 소프트웨어는 실험적으로 운영되고 있습니다.</translation>
+    </message>
+    <message>
+        <source>Transaction amount too small</source>
+        <translation>거래 금액이 너무 적습니다</translation>
+    </message>
+    <message>
+        <source>Transaction created successfully.</source>
+        <translation>거래가 성공적으로 생성되었습니다.</translation>
+    </message>
+    <message>
+        <source>Transaction fees are too high.</source>
+        <translation>거래 수수료가 너무 높습니다.</translation>
+    </message>
+    <message>
+        <source>Transaction not valid.</source>
+        <translation>거래가 유효하지 않습니다.</translation>
+    </message>
+    <message>
+        <source>Transaction too large for fee policy</source>
+        <translation>수수료 정책에 비해 거래 액수가 너무 큽니다</translation>
+    </message>
+    <message>
+        <source>Unable to bind to %s on this computer (bind returned error %s)</source>
+        <translation>이 컴퓨터의 %s에 바인딩할 수 없습니다 (바인딩 과정에 %s 오류 발생)</translation>
+    </message>
+    <message>
+        <source>Unable to sign spork message, wrong key?</source>
+        <translation>스포크 메시지에 사인할 수 없습니다. 키가 잘못된 것일 수 있습니다.</translation>
+    </message>
+    <message>
+        <source>Unknown network specified in -onlynet: '%s'</source>
+        <translation>-onlynet에 지정한 네트워크를 알 수 없습니다: '%s'</translation>
+    </message>
+    <message>
+        <source>Unknown state: id = %u</source>
+        <translation>알 수 없는 상태: id = %u</translation>
+    </message>
+    <message>
+        <source>Username for JSON-RPC connections</source>
+        <translation>JSON-RPC 연결에 사용할 사용자 이름</translation>
+    </message>
+    <message>
+        <source>Verifying blocks...</source>
+        <translation>블록 검증 중...</translation>
+    </message>
+    <message>
+        <source>Verifying wallet...</source>
+        <translation>지갑 검증 중...</translation>
+    </message>
+    <message>
+        <source>Very low number of keys left: %d</source>
+        <translation>매우 적은 숫자의 키가 남았습니다: %d</translation>
+    </message>
+    <message>
+        <source>Wallet %s resides outside data directory %s</source>
+        <translation>지갑 %s 이 데이터 디렉토리 외부에 위치합니다 %s.</translation>
+    </message>
+    <message>
+        <source>Wallet is locked.</source>
+        <translation>지갑이 잠금 상태입니다.</translation>
+    </message>
+    <message>
+        <source>Wallet options:</source>
+        <translation>지갑 옵션:</translation>
+    </message>
+    <message>
+        <source>Wallet window title</source>
+        <translation>지갑 창 제목</translation>
+    </message>
+    <message>
+        <source>Warning</source>
+        <translation>경고</translation>
+    </message>
+    <message>
+        <source>Your entries added successfully.</source>
+        <translation>당신의 입력이 성공적으로 추가되었습니다.</translation>
+    </message>
+    <message>
+        <source>Your transaction was accepted into the pool!</source>
+        <translation>당신의 거래가 성공적으로 풀에 반영되었습니다!</translation>
+    </message>
+    <message>
+        <source>Zapping all transactions from wallet...</source>
+        <translation>지갑의 모든 거래 내역 건너뛰는 중...</translation>
+    </message>
+</context>
+</TS>
\ No newline at end of file
diff --git a/src/qt/locale/dash_nl.ts b/src/qt/locale/dash_nl.ts
index 18e9a1cecdd1..30a73a558617 100644
--- a/src/qt/locale/dash_nl.ts
+++ b/src/qt/locale/dash_nl.ts
@@ -794,8 +794,8 @@
         <translation>Schakel over naar "Lijst mode" om deze functie te gebruiken.</translation>
     </message>
     <message>
-        <source>Non-anonymized input selected. &lt;b&gt;PrivateSend will be disabled.&lt;/b&gt;&lt;br&gt;&lt;br&gt;If you still want to use PrivateSend, please deselect all non-nonymized inputs first and then check PrivateSend checkbox again.</source>
-        <translation>Niet-anoniem invoer geselecteerd. &lt;b&gt;PrivateSend wordt afgesloten. &lt;/b&gt;&lt;br&gt;&lt;br&gt; Indien u toch PrivateSend wenst te gebruiken, deselecteer dan eerst alle niet-anonieme invoer. Vink daarna PrivateSend opnieuw aan.</translation>
+        <source>Non-anonymized input selected. &lt;b&gt;PrivateSend will be disabled.&lt;/b&gt;&lt;br&gt;&lt;br&gt;If you still want to use PrivateSend, please deselect all non-anonymized inputs first and then check the PrivateSend checkbox again.</source>
+        <translation>Niet-anonieme invoer geselecteerd. &lt;b&gt;PrivateSend wordt uitgeschakeld. &lt;/b&gt;&lt;br&gt;&lt;br&gt; Indien je toch PrivateSend wenst te gebruiken, deselecteer dan eerst alle niet-anonieme invoer. Vink daarna PrivateSend opnieuw aan.</translation>
     </message>
     <message>
         <source>(%1 locked)</source>
@@ -834,73 +834,6 @@
         <translation>N.v.t.</translation>
     </message>
 </context>
-<context>
-    <name>DarksendConfig</name>
-    <message>
-        <source>Configure PrivateSend</source>
-        <translation>Configureer PrivateSend</translation>
-    </message>
-    <message>
-        <source>Basic Privacy</source>
-        <translation>Eenvoudige Privacy</translation>
-    </message>
-    <message>
-        <source>High Privacy</source>
-        <translation>Hoge Privacy</translation>
-    </message>
-    <message>
-        <source>Maximum Privacy</source>
-        <translation>Maximum Privacy</translation>
-    </message>
-    <message>
-        <source>Please select a privacy level.</source>
-        <translation>Kies een privacyniveau</translation>
-    </message>
-    <message>
-        <source>Use 2 separate masternodes to mix funds up to 1000 DASH</source>
-        <translation>Gebruik 2 verschillende masternodes om tot en met  100 Dash te mixen</translation>
-    </message>
-    <message>
-        <source>Use 8 separate masternodes to mix funds up to 1000 DASH</source>
-        <translation>Gebruik 8 verschillende masternodes om tot en met  1000 Dash te mixen</translation>
-    </message>
-    <message>
-        <source>Use 16 separate masternodes</source>
-        <translation>Gebruik 16 verschillende masternodes</translation>
-    </message>
-    <message>
-        <source>This option is the quickest and will cost about ~0.025 DASH to anonymize 1000 DASH</source>
-        <translation>Deze optie is het snelst en kost ongeveer ~0.025 D om 1000 D te anonimiseren</translation>
-    </message>
-    <message>
-        <source>This option is moderately fast and will cost about 0.05 DASH to anonymize 1000 DASH</source>
-        <translation>Deze optie is relatief snel en zal ongeveer 0.05 DASH kosten om 1000 DASH te anonimiseren </translation>
-    </message>
-    <message>
-        <source>0.1 DASH per 1000 DASH you anonymize.</source>
-        <translation>0.1 DASH per 1000 DASH die je anonimiseert.</translation>
-    </message>
-    <message>
-        <source>This is the slowest and most secure option. Using maximum anonymity will cost</source>
-        <translation>Deze optie is het langzaamst en meest veilig. Maximimum anonimiteit kost</translation>
-    </message>
-    <message>
-        <source>PrivateSend Configuration</source>
-        <translation>PrivateSend configuratie</translation>
-    </message>
-    <message>
-        <source>PrivateSend was successfully set to basic (%1 and 2 rounds). You can change this at any time by opening Dash's configuration screen.</source>
-        <translation>PrivateSend is succesvol ingesteld op basis (%1 en 2 rondes). U kunt dit op elk gewenst moment wijzigen door het Dash configuratiescherm te openen.</translation>
-    </message>
-    <message>
-        <source>PrivateSend was successfully set to high (%1 and 8 rounds). You can change this at any time by opening Dash's configuration screen.</source>
-        <translation>PrivateSend is succesvol ingesteld op hoog (%1 en 8 rondes). U kunt dit op elk gewenst moment wijzigen door het Dash configuratiescherm te openen.</translation>
-    </message>
-    <message>
-        <source>PrivateSend was successfully set to maximum (%1 and 16 rounds). You can change this at any time by opening Dash's configuration screen.</source>
-        <translation>PrivateSend is succesvol ingesteld op maximaal (%1 en 16 rondes). U kunt dit op elk gewenst moment wijzigen door het Dash configuratiescherm te openen.</translation>
-    </message>
-</context>
 <context>
     <name>EditAddressDialog</name>
     <message>
@@ -1038,8 +971,8 @@
         <translation>PrivateSend informatie</translation>
     </message>
     <message>
-        <source>&lt;h3&gt;PrivateSend Basics&lt;/h3&gt; PrivateSend gives you true financial privacy by obscuring the origins of your funds. All the Dash in your wallet is comprised of different "inputs" which you can think of as separate, discrete coins.&lt;br&gt; PrivateSend uses an innovative process to mix your inputs with the inputs of two other people, without having your coins ever leave your wallet. You retain control of your money at all times.&lt;hr&gt; &lt;b&gt;The PrivateSend process works like this:&lt;/b&gt;&lt;ol type="1"&gt; &lt;li&gt;PrivateSend begins by breaking your transaction inputs down into standard denominations. These denominations are 0.01 DASH, 0.1 DASH, 1 DASH and 10 DASH -- sort of like the paper money you use every day.&lt;/li&gt; &lt;li&gt;Your wallet then sends requests to specially configured software nodes on the network, called "masternodes." These masternodes are informed then that you are interested in mixing a certain denomination. No identifiable information is sent to the masternodes, so they never know "who" you are.&lt;/li&gt; &lt;li&gt;When two other people send similar messages, indicating that they wish to mix the same denomination, a mixing session begins. The masternode mixes up the inputs and instructs all three users' wallets to pay the now-transformed input back to themselves. Your wallet pays that denomination directly to itself, but in a different address (called a change address).&lt;/li&gt; &lt;li&gt;In order to fully obscure your funds, your wallet must repeat this process a number of times with each denomination. Each time the process is completed, it's called a "round." Each round of PrivateSend makes it exponentially more difficult to determine where your funds originated.&lt;/li&gt; &lt;li&gt;This mixing process happens in the background without any intervention on your part. When you wish to make a transaction, your funds will already be anonymized. No additional waiting is required.&lt;/li&gt; &lt;/ol&gt; &lt;hr&gt;&lt;b&gt;IMPORTANT:&lt;/b&gt; Your wallet only contains 1000 of these "change addresses." Every time a mixing event happens, up to 9 of your addresses are used up. This means those 1000 addresses last for about 100 mixing events. When 900 of them are used, your wallet must create more addresses. It can only do this, however, if you have automatic backups enabled.&lt;br&gt; Consequently, users who have backups disabled will also have PrivateSend disabled. &lt;hr&gt;For more info see &lt;a href="https://dashpay.atlassian.net/wiki/display/DOC/PrivateSend"&gt;https://dashpay.atlassian.net/wiki/display/DOC/PrivateSend&lt;/a&gt;         </source>
-        <translation>&lt;h3&gt;Basics van PrivateSend&lt;/h3&gt; PrivateSend geeft u echte financiële privacy door de oorsprong van uw geld te verbergen. Alle Dash in uw wallet bestaat uit verschillende "inputs" die u kunt beschouwen als afzonderlijke, discrete munten.&lt;br&gt; PrivateSend maakt gebruik van een innovatief proces om uw input te mengen met de input van twee andere mensen, zonder dat uw munten ooit uw wallet verlaten . U behoudt te alle tijden de controle over uw geld. &lt;hr&gt; &lt;b&gt;Het PrivateSend-proces werkt als volgt: &lt;/b&gt;&lt;ol type="1"&gt; &lt;li&gt;PrivateSend begint door uw transactie-inputs in standaard denominaties op te breken. Deze denominaties zijn 0,01 DASH, 0,1 DASH, 1 DASH en 10 DASH - eigenlijk net zoals de muntstukken van contant geld dat u elke dag gebruikt.&lt;/li&gt; Uw wallet stuurt daarna verzoeken naar speciaal geconfigureerde softwarenodes op het netwerk, zogenaamde "masternodes." Deze masternodes worden daarmee op de hoogte gesteld dat u geïnteresseerd bent in het mixen van een bepaalde denominatie. Er wordt geen identificeerbare informatie naar de masternodes gestuurd, ze kunnen dus niet weten wie u bent.&lt;/li&gt; &lt;li&gt;Wanneer twee andere mensen vergelijkbare berichten sturen, waarin ze aangeven dat ze dezelfde denominaties willen mixen, begint een mixsessie. De masternode mixt alle invoeren en instrueert de wallets van alle drie de gebruikers om de nu getransformeerde input aan zichzelf terug te betalen. Uw wallet betaalt die denominaties rechtstreeks naar zichzelf, maar met een ander adres (een wisselgeldadres genoemd).&lt;/li&gt; &lt;li&gt;Om uw geld volledig te verbergen, moet uw portemonnee dit proces een aantal keer herhalen voor elke denominatie. Iedere keer dat het proces wordt voltooid, wordt een 'ronde' genoemd. Elke ronde van PrivateSend maakt het exponentieel moeilijker om de herkomst van uw geld te bepalen.&lt;/li&gt; &lt;li&gt;Dit mixproces gebeurt op de achtergrond zonder enige tussenkomst van uw kant. Wanneer u een transactie wenst uit te voeren, zijn uw fondsen al geanonimiseerd. Er is geen extra wachttijd nodig.&lt;/li&gt; &lt;/ol&gt; &lt;hr&gt;&lt;b&gt;BELANGRIJK:&lt;/b&gt; Uw wallet bevat slechts 1000 van deze "wisselgeldadressen". Elke keer dat er een mixsessie plaatsvindt, worden maximaal 9 van uw adressen opgebruikt. Dit betekent dat deze 1000 adressen volstaan voor ongeveer 100 mixsessies. Wanneer er 900 adressen zijn opgebruikt, moet uw wallet nieuwe adressen aanmaken. Dit kan alleen maar als u automatische back-ups hebt ingeschakeld.&lt;br&gt; Daarom is voor gebruikers die back-ups hebben uitgeschakeld, ook PrivateSend uitgeschakeld. &lt;hr&gt;Voor meer informatie kijk op&lt;a href="https://dashpay.atlassian.net/wiki/display/DOC/PrivateSend"&gt;https: //dashpay.atlassian.net/wiki/display/DOC/PrivateSend&lt;/a&gt;</translation>
+        <source>&lt;h3&gt;PrivateSend Basics&lt;/h3&gt; PrivateSend gives you true financial privacy by obscuring the origins of your funds. All the Dash in your wallet is comprised of different "inputs" which you can think of as separate, discrete coins.&lt;br&gt; PrivateSend uses an innovative process to mix your inputs with the inputs of two other people, without having your coins ever leave your wallet. You retain control of your money at all times.&lt;hr&gt; &lt;b&gt;The PrivateSend process works like this:&lt;/b&gt;&lt;ol type="1"&gt; &lt;li&gt;PrivateSend begins by breaking your transaction inputs down into standard denominations. These denominations are 0.01 DASH, 0.1 DASH, 1 DASH and 10 DASH -- sort of like the paper money you use every day.&lt;/li&gt; &lt;li&gt;Your wallet then sends requests to specially configured software nodes on the network, called "masternodes." These masternodes are informed then that you are interested in mixing a certain denomination. No identifiable information is sent to the masternodes, so they never know "who" you are.&lt;/li&gt; &lt;li&gt;When two other people send similar messages, indicating that they wish to mix the same denomination, a mixing session begins. The masternode mixes up the inputs and instructs all three users' wallets to pay the now-transformed input back to themselves. Your wallet pays that denomination directly to itself, but in a different address (called a change address).&lt;/li&gt; &lt;li&gt;In order to fully obscure your funds, your wallet must repeat this process a number of times with each denomination. Each time the process is completed, it's called a "round." Each round of PrivateSend makes it exponentially more difficult to determine where your funds originated.&lt;/li&gt; &lt;li&gt;This mixing process happens in the background without any intervention on your part. When you wish to make a transaction, your funds will already be anonymized. No additional waiting is required.&lt;/li&gt; &lt;/ol&gt; &lt;hr&gt;&lt;b&gt;IMPORTANT:&lt;/b&gt; Your wallet only contains 1000 of these "change addresses." Every time a mixing event happens, up to 9 of your addresses are used up. This means those 1000 addresses last for about 100 mixing events. When 900 of them are used, your wallet must create more addresses. It can only do this, however, if you have automatic backups enabled.&lt;br&gt; Consequently, users who have backups disabled will also have PrivateSend disabled. &lt;hr&gt;For more information, see the &lt;a href="https://docs.dash.org/en/latest/wallets/dashcore/privatesend-instantsend.html"&gt;PrivateSend documentation&lt;/a&gt;.         </source>
+        <translation>&lt;h3&gt;PrivateSend Basics&lt;/h3&gt; PrivateSend geeft u een echte financiële privacy door de oorsprong van uw geld te verschuilen. Alle Dash in uw portefeuille bestaat uit verschillende "inputs" die u kunt beschouwen als afzonderlijke, discrete munten.&lt;br&gt; PrivateSend maakt gebruik van een innovatief proces om uw invoer te mengen met de invoer van twee andere mensen, zonder dat uw munten ooit uw portemonnee verlaten . U behoudt de controle over uw geld te allen tijde. &lt;hr&gt; &lt;b&gt;Het PrivateSend-proces werkt als volgt: &lt;/b&gt;&lt;ol type="1"&gt; &lt;li&gt;PrivateSend begint door uw transactie-inputs in de standaard denominaties te breken. Deze denominaties zijn 0,01 DASH, 0,1 DASH, 1 DASH en 10 DASH - zoals de papiergeld dat u elke dag gebruikt.&lt;/li&gt; &lt;li&gt;Jouw portemonnee stuurt dan verzoeken naar speciaal geconfigureerde software nodes op het netwerk, genaamd "masternodes." Deze masternodes worden dan op de hoogte gesteld dat u geïnteresseerd bent in het mengen van een bepaalde denominaties. Er wordt geen identificeerbare informatie naar de masternodes gestuurd, zodat ze nooit weten wie je bent.&lt;/li&gt; &lt;li&gt;Wanneer twee andere mensen dezelfde berichten sturen, die aanduiden dat ze dezelfde denominaties willen vermengen, begint een mengsessie. De masternode mengt alle invoeren en instrueert de portefeuilles van alle drie de gebruikers om de nu getransformeerde invoer aan zichzelf terug te betalen. Jouw portemonnee betaalt die denominaties rechtstreeks naar zichzelf, maar met een ander adres (een wijziging adres genoemd).&lt;/li&gt; &lt;li&gt;Om uw geld volledig te verschuilen, moet uw portemonnee dit proces een aantal keren herhalen voor elke denominaties. Elke keer dat het proces wordt voltooid, dit heet een 'ronde'. Elke ronde van PrivateSend maakt het exponentieel moeilijker om te bepalen waar uw geld van afkomstig is.&lt;/li&gt; &lt;li&gt;Dit mengproces gebeurt op de achtergrond zonder enige interventie van uw kant. Wanneer u een transactie wenst uit te voeren, zijn uw fondsen al geanonimiseerd. Er is geen extra wachttijd nodig.&lt;/li&gt; &lt;/ol&gt; &lt;hr&gt;&lt;b&gt;BELANGRIJK:&lt;/b&gt; Je portemonnee bevat slechts 1000 van deze "wijzigingsadressen". Elke keer dat er een mengsessie plaatsvindt, worden maximaal 9 van uw adressen opgebruikt. Dit betekent dat deze 1000 adressen voor ongeveer 100 mengsessies volstaat. Wanneer er 900 werden gebruikt, moet je portemonnee meer adressen aanmaken. Dit kan alleen maar als u automatische back-ups hebt ingeschakeld.&lt;br&gt; Bijgevolg hebben gebruikers die back-ups hebben uitgeschakeld, ook PrivateSend uitgeschakeld. &lt;hr&gt;Voor meer informatie zie de &lt;a href="https://docs.dash.org/en/latest/wallets/dashcore/privatesend-instantsend.html"&gt;PrivateSend documentatie&lt;/a&gt;.</translation>
     </message>
 </context>
 <context>
@@ -1834,7 +1767,7 @@ Om te mixen moeten andere gebruikers exact dezelfde denominaties inbrengen.</tra
     </message>
     <message>
         <source>Note: You can turn this message off in options.</source>
-        <translation>Opmerking: Dit bericht kan kan worden uitgeschakeld in de instellingen</translation>
+        <translation>Opmerking: Dit bericht kan kan worden uitgeschakeld in de instellingen.</translation>
     </message>
     <message>
         <source>WARNING! Something went wrong on automatic backup</source>
@@ -4486,6 +4419,10 @@ Nota: Het bericht zal niet verzonden worden met de betaling over het Dash netwer
         <source>Disable all Dash specific functionality (Masternodes, PrivateSend, InstantSend, Governance) (0-1, default: %u)</source>
         <translation>Uitschakelen van alle Dash specifieke functies (Masternodes, PrivateSend, InstantSend, Governance) (0-1, standaard: %u)</translation>
     </message>
+    <message>
+        <source>%s file contains all private keys from this wallet. Do not share it with anyone!</source>
+        <translation>%s bestand bevat alle persoonlijke sleutel van deze portemonnee. Deel deze met niemand!</translation>
+    </message>
     <message>
         <source>Discover own IP addresses (default: 1 when listening and no -externalip or -proxy)</source>
         <translation>Ontdek eigen IP-adressen (standaard: 1 voor luisteren en geen -externalip of -proxy)</translation>
@@ -4510,6 +4447,10 @@ Nota: Het bericht zal niet verzonden worden met de betaling over het Dash netwer
         <source>Execute command when a wallet InstantSend transaction is successfully locked (%s in cmd is replaced by TxID)</source>
         <translation>Voer opdracht uit zodra een wallettransactie succesvol vastgezet is (%s in cmd wordt vervangen door TxID)</translation>
     </message>
+    <message>
+        <source>Extra transactions to keep in memory for compact block reconstructions (default: %u)</source>
+        <translation>Extra transactie om in het geheugen te houden voor de reconstructie van compacte blokken (standaard: %u)</translation>
+    </message>
     <message>
         <source>Failed to create backup, file already exists! This could happen if you restarted wallet in less than 60 seconds. You can continue if you are ok with this.</source>
         <translation>Backup maken is mislukt, het bestand bestaat al! Dit kan gebeuren als u de wallet herstart binnen 60 seconden. U kunt verder gaan als u hier ok mee bent.</translation>
@@ -4590,6 +4531,10 @@ Nota: Het bericht zal niet verzonden worden met de betaling over het Dash netwer
         <source>Total length of network version string (%i) exceeds maximum length (%i). Reduce the number or size of uacomments.</source>
         <translation>Totale lengte van netwerkversiestring (%i) overschrijdt maximale lengte (%i). Verminder het aantal of grootte van uacomments.</translation>
     </message>
+    <message>
+        <source>Transaction index can't be disabled in full mode. Either start with -litemode command line switch or enable transaction index.</source>
+        <translation>Transactie index kan niet uitgeschakeld worden in volledige modus. Start met -litemode commando-optie, of activeer transactie index.</translation>
+    </message>
     <message>
         <source>Tries to keep outbound traffic under the given target (in MiB per 24h), 0 = no limit (default: %d)</source>
         <translation>Pogingen om uitgaand verkeer onder een bepaald doel te houden (in MiB per 24u), 0 = geen limiet (standaard: %d)</translation>
@@ -4622,6 +4567,10 @@ Nota: Het bericht zal niet verzonden worden met de betaling over het Dash netwer
         <source>Warning: Unknown block versions being mined! It's possible unknown rules are in effect</source>
         <translation>Waarschuwing: Onbekende blok versies worden gemined! Er zijn mogelijk onbekende regels in werking getreden</translation>
     </message>
+    <message>
+        <source>You are starting in lite mode, all Dash-specific functionality is disabled.</source>
+        <translation>Je start in lite modus. Alle Dash specifieke functionaliteit is uitgeschakeld.</translation>
+    </message>
     <message>
         <source>You need to rebuild the database using -reindex to go back to unpruned mode.  This will redownload the entire blockchain</source>
         <translation>U moet de database herbouwen met -reindex om terug te gaan naar de niet-prune modus. Dit zal de gehele blockchain opnieuw downloaden.</translation>
@@ -4666,6 +4615,14 @@ Nota: Het bericht zal niet verzonden worden met de betaling over het Dash netwer
         <source>Enable publish hash block in &lt;address&gt;</source>
         <translation>Sta toe om hashblok te publiceren in &lt;adres&gt;</translation>
     </message>
+    <message>
+        <source>Enable publish hash of governance objects (like proposals) in &lt;address&gt;</source>
+        <translation>Inschakelen van hash van governance objecten (zoals voorstellen) in &lt;address&gt;</translation>
+    </message>
+    <message>
+        <source>Enable publish hash of governance votes in &lt;address&gt;</source>
+        <translation>Inschakelen van publiceren van governance stemmen in &lt;address&gt;</translation>
+    </message>
     <message>
         <source>Enable publish hash transaction (locked via InstantSend) in &lt;address&gt;</source>
         <translation>Inschakelen publiceren van de hashtransactie (vastgezet met InstantSend) in &lt;address&gt;</translation>
@@ -4706,6 +4663,14 @@ Nota: Het bericht zal niet verzonden worden met de betaling over het Dash netwer
         <source>Failed to delete backup, error: %s</source>
         <translation>Verwijderen van de back-up is mislukt, foutmelding: %s</translation>
     </message>
+    <message>
+        <source>Failed to load InstantSend data cache from</source>
+        <translation>Fout bij het laden van InstandSend data cache uit</translation>
+    </message>
+    <message>
+        <source>Failed to load sporks cache from</source>
+        <translation>Fout bij het inladen van de sporks cache uit</translation>
+    </message>
     <message>
         <source>Failed to parse host:port string</source>
         <translation>Inlezen van de host:poort string is mislukt</translation>
@@ -4726,6 +4691,10 @@ Nota: Het bericht zal niet verzonden worden met de betaling over het Dash netwer
         <source>Invalid amount for -fallbackfee=&lt;amount&gt;: '%s'</source>
         <translation>Ongeldig bedrag voor -fallbackfee=&lt;bedrag&gt;: '%s'</translation>
     </message>
+    <message>
+        <source>Invalid input count.</source>
+        <translation>Ongeldig invoer aantal.</translation>
+    </message>
     <message>
         <source>Keep the transaction memory pool below &lt;n&gt; megabytes (default: %u)</source>
         <translation>De transactiegeheugenpool moet onder de &lt;n&gt; megabytes blijven (standaard: %u)</translation>
@@ -4742,6 +4711,10 @@ Nota: Het bericht zal niet verzonden worden met de betaling over het Dash netwer
         <source>Line: %d</source>
         <translation>Lijn: %d</translation>
     </message>
+    <message>
+        <source>Loading InstantSend data cache...</source>
+        <translation>Laden van InstantSend data cache...</translation>
+    </message>
     <message>
         <source>Loading addresses...</source>
         <translation>Laden adresen...</translation>
@@ -4754,6 +4727,10 @@ Nota: Het bericht zal niet verzonden worden met de betaling over het Dash netwer
         <source>Loading governance cache...</source>
         <translation>Laden governance cache...</translation>
     </message>
+    <message>
+        <source>Loading sporks cache...</source>
+        <translation>Laden sporks cache...</translation>
+    </message>
     <message>
         <source>Loading wallet... (%3.2f %%)</source>
         <translation>Laden portemonnee... (%3.2f %%)</translation>
@@ -4894,6 +4871,10 @@ Nota: Het bericht zal niet verzonden worden met de betaling over het Dash netwer
         <source>Transaction must have at least one recipient</source>
         <translation>Transactie moet ten minste één ontvanger hebben</translation>
     </message>
+    <message>
+        <source>Transaction too large</source>
+        <translation>Transactie te groot</translation>
+    </message>
     <message>
         <source>Trying to connect...</source>
         <translation>Proberen te verbinden...</translation>
@@ -4914,6 +4895,10 @@ Nota: Het bericht zal niet verzonden worden met de betaling over het Dash netwer
         <source>Wallet debugging/testing options:</source>
         <translation>Portemonee debugging/testing opties:</translation>
     </message>
+    <message>
+        <source>Wallet is not initialized</source>
+        <translation>Portemonnee is niet geïnitialiseerd</translation>
+    </message>
     <message>
         <source>Wallet needed to be rewritten: restart %s to complete</source>
         <translation>Portemonnee moest herschreven worden: Herstart %s om te voltooien</translation>
@@ -4930,6 +4915,10 @@ Nota: Het bericht zal niet verzonden worden met de betaling over het Dash netwer
         <source>Whether to operate in a blocks only mode (default: %u)</source>
         <translation>Om in alleen een blokmodus te opereren (standaard: %u)</translation>
     </message>
+    <message>
+        <source>You can not start a masternode in lite mode.</source>
+        <translation>Je kan geen masternode starten in lite modus.</translation>
+    </message>
     <message>
         <source>ZeroMQ notification options:</source>
         <translation>ZeroMQ notificatieopties:</translation>
@@ -5018,10 +5007,6 @@ Nota: Het bericht zal niet verzonden worden met de betaling over het Dash netwer
         <source>Set lowest fee rate (in %s/kB) for transactions to be included in block creation. (default: %s)</source>
         <translation>Specificeer het laagste tarief (in %s/kB) voor transacties die bij het maken van een blok moeten worden in rekening worden gebracht (standaard: %s)</translation>
     </message>
-    <message>
-        <source>Show N confirmations for a successfully locked transaction (%u-%u, default: %u)</source>
-        <translation>Toon N bevestigingen voor een succesvol vergrendelde transactie (%u-%u, standaard: %u)</translation>
-    </message>
     <message>
         <source>This is the transaction fee you may pay when fee estimates are not available.</source>
         <translation>Dit is de transactievergoeding die je mogelijk betaalt indien geschatte tarief niet beschikbaar is</translation>
diff --git a/src/qt/locale/dash_pl.ts b/src/qt/locale/dash_pl.ts
index 3b87c0031c93..90564883c895 100644
--- a/src/qt/locale/dash_pl.ts
+++ b/src/qt/locale/dash_pl.ts
@@ -794,7 +794,7 @@
         <translation>W celu użycia tej funkcji, przełącz na "Tryb Listy"</translation>
     </message>
     <message>
-        <source>Non-anonymized input selected. &lt;b&gt;PrivateSend will be disabled.&lt;/b&gt;&lt;br&gt;&lt;br&gt;If you still want to use PrivateSend, please deselect all non-nonymized inputs first and then check PrivateSend checkbox again.</source>
+        <source>Non-anonymized input selected. &lt;b&gt;PrivateSend will be disabled.&lt;/b&gt;&lt;br&gt;&lt;br&gt;If you still want to use PrivateSend, please deselect all non-anonymized inputs first and then check the PrivateSend checkbox again.</source>
         <translation>Wybrano niezanonimizowane środki. &lt;b&gt; PrivateSend  zostanie wyłączony.&lt;/b&gt;&lt;br&gt;&lt;br&gt;Jeśli nadal chcesz użyć PrivateSend, cofnij wybór niezanonimizowanych środków, a następnie zaznacz pole wyboru PrivateSend.</translation>
     </message>
     <message>
@@ -834,73 +834,6 @@
         <translation>nie dotyczy</translation>
     </message>
 </context>
-<context>
-    <name>DarksendConfig</name>
-    <message>
-        <source>Configure PrivateSend</source>
-        <translation>Skonfiguruj PrivateSend</translation>
-    </message>
-    <message>
-        <source>Basic Privacy</source>
-        <translation>Podstawowa prywatność</translation>
-    </message>
-    <message>
-        <source>High Privacy</source>
-        <translation>Wysoka prywatność</translation>
-    </message>
-    <message>
-        <source>Maximum Privacy</source>
-        <translation>Maksymalna prywatność</translation>
-    </message>
-    <message>
-        <source>Please select a privacy level.</source>
-        <translation>Proszę wybrać poziom prywatności.</translation>
-    </message>
-    <message>
-        <source>Use 2 separate masternodes to mix funds up to 1000 DASH</source>
-        <translation>Użyj 2 oddzielnych masternodów, aby wymieszać środki max. do 1000 DASH</translation>
-    </message>
-    <message>
-        <source>Use 8 separate masternodes to mix funds up to 1000 DASH</source>
-        <translation>Użyj 8 oddzielnych masternodów, aby wymieszać środki max. do 1000 DASH</translation>
-    </message>
-    <message>
-        <source>Use 16 separate masternodes</source>
-        <translation>Użyj 16 oddzielnych masternodów</translation>
-    </message>
-    <message>
-        <source>This option is the quickest and will cost about ~0.025 DASH to anonymize 1000 DASH</source>
-        <translation>Ta opcja jest najszybsza i kosztuje około 0.025 DASH za zanonimizowanie 1000 DASH</translation>
-    </message>
-    <message>
-        <source>This option is moderately fast and will cost about 0.05 DASH to anonymize 1000 DASH</source>
-        <translation>Ta opcja jest w miarę szybka i kosztuje około 0.05 DASH za zanonimizowanie 1000 DASH</translation>
-    </message>
-    <message>
-        <source>0.1 DASH per 1000 DASH you anonymize.</source>
-        <translation>0.1 DASH za każde 1000 DASH, które zanonimizujesz.</translation>
-    </message>
-    <message>
-        <source>This is the slowest and most secure option. Using maximum anonymity will cost</source>
-        <translation>Jest to najwolniejsza, lecz najbardziej bezpieczna opcja. Maksymalny poziom zanonimizowania będzie kosztować</translation>
-    </message>
-    <message>
-        <source>PrivateSend Configuration</source>
-        <translation>Konfiguracja PrivateSend</translation>
-    </message>
-    <message>
-        <source>PrivateSend was successfully set to basic (%1 and 2 rounds). You can change this at any time by opening Dash's configuration screen.</source>
-        <translation>PrivateSend pomyślnie ustawiono na poziom podstawowy (%1 oraz 2 rundy). Możesz to zmienić w każdej chwili, otwierając ekran konfiguracji Dash.</translation>
-    </message>
-    <message>
-        <source>PrivateSend was successfully set to high (%1 and 8 rounds). You can change this at any time by opening Dash's configuration screen.</source>
-        <translation>PrivateSend pomyślnie ustawiono na poziom wysoki (%1 oraz 8 rund). Możesz to zmienić w każdej chwili, otwierając ekran konfiguracji Dash.</translation>
-    </message>
-    <message>
-        <source>PrivateSend was successfully set to maximum (%1 and 16 rounds). You can change this at any time by opening Dash's configuration screen.</source>
-        <translation>PrivateSend pomyślnie ustawiono na poziom najwyższy (%1 oraz 16 rund). Możesz to zmienić w każdej chwili, otwierając ekran konfiguracji Dash.</translation>
-    </message>
-</context>
 <context>
     <name>EditAddressDialog</name>
     <message>
@@ -1038,8 +971,8 @@
         <translation>Informacje o PrivateSend</translation>
     </message>
     <message>
-        <source>&lt;h3&gt;PrivateSend Basics&lt;/h3&gt; PrivateSend gives you true financial privacy by obscuring the origins of your funds. All the Dash in your wallet is comprised of different "inputs" which you can think of as separate, discrete coins.&lt;br&gt; PrivateSend uses an innovative process to mix your inputs with the inputs of two other people, without having your coins ever leave your wallet. You retain control of your money at all times.&lt;hr&gt; &lt;b&gt;The PrivateSend process works like this:&lt;/b&gt;&lt;ol type="1"&gt; &lt;li&gt;PrivateSend begins by breaking your transaction inputs down into standard denominations. These denominations are 0.01 DASH, 0.1 DASH, 1 DASH and 10 DASH -- sort of like the paper money you use every day.&lt;/li&gt; &lt;li&gt;Your wallet then sends requests to specially configured software nodes on the network, called "masternodes." These masternodes are informed then that you are interested in mixing a certain denomination. No identifiable information is sent to the masternodes, so they never know "who" you are.&lt;/li&gt; &lt;li&gt;When two other people send similar messages, indicating that they wish to mix the same denomination, a mixing session begins. The masternode mixes up the inputs and instructs all three users' wallets to pay the now-transformed input back to themselves. Your wallet pays that denomination directly to itself, but in a different address (called a change address).&lt;/li&gt; &lt;li&gt;In order to fully obscure your funds, your wallet must repeat this process a number of times with each denomination. Each time the process is completed, it's called a "round." Each round of PrivateSend makes it exponentially more difficult to determine where your funds originated.&lt;/li&gt; &lt;li&gt;This mixing process happens in the background without any intervention on your part. When you wish to make a transaction, your funds will already be anonymized. No additional waiting is required.&lt;/li&gt; &lt;/ol&gt; &lt;hr&gt;&lt;b&gt;IMPORTANT:&lt;/b&gt; Your wallet only contains 1000 of these "change addresses." Every time a mixing event happens, up to 9 of your addresses are used up. This means those 1000 addresses last for about 100 mixing events. When 900 of them are used, your wallet must create more addresses. It can only do this, however, if you have automatic backups enabled.&lt;br&gt; Consequently, users who have backups disabled will also have PrivateSend disabled. &lt;hr&gt;For more info see &lt;a href="https://dashpay.atlassian.net/wiki/display/DOC/PrivateSend"&gt;https://dashpay.atlassian.net/wiki/display/DOC/PrivateSend&lt;/a&gt;         </source>
-        <translation>&lt;h3&gt;Podstawy PrivateSend&lt;/h3&gt; PrivateSend zapewnia prawdziwą prywatność poprzez ukrycie pochodzenia środków. Wszystkie dashe w twoim portfelu składają się z różnych "kwot wejściowych", które można traktować jako oddzielne, indywidualne monety.&lt;br&gt; PrivateSend wykorzystuje rewolucyjny proces mieszania twoich "kwot wejściowych" z "kwotami wejściowymi" dwóch innych  użytkowników, przy czym twoje środki nigdy nie opuszczają twojego portfela. W każdej chwili zachowujesz nad nimi pełną kontrolę.&lt;hr&gt; &lt;b&gt;Proces PrivateSend przebiega w następujący sposób:&lt;/b&gt;&lt;ol type="1"&gt; &lt;li&gt;Najpierw PrivateSend dzieli twoje kwoty wejściowe twoich transakcji na standardowe nominały. Są kwoty 0.01 DASH, 0.1 DASH, 1 DASH oraz 10 DASH – mniej  więcej jak banknoty, których codziennie używasz.&lt;/li&gt; &lt;li&gt;Następnie twój portfel wysyła żądania do specjalnie skonfigurowanych węzłów sieci, zwanych "masternodami." Masternody otrzymują komunikat, że jesteś zainteresowany wymieszaniem określonego nominału. Masternody nie otrzymują żadnych informacji pozwalających na identyfikację, w związku z tym nigdy nie wiedzą "kim" jesteś.&lt;/li&gt; &lt;li&gt;Kiedy dwaj inni użytkownicy wyślą podobne komunikaty, z żądanie wymieszanie takiego samego nominału, rozpocznie się sesja mieszania. Masternod wymiesza kwoty wejściowe i nakaże portfelom takich trzech użytkowników wypłacić sobie samemu przetworzone kwoty wejściowe. Twój portfel wpłaci dany nominał do siebie samego, jednak na inny adres (tzw. adres reszty).&lt;/li&gt; &lt;li&gt;W celu pełnego zaciemnienia pochodzenia środków, twój portfel musi powtórzyć te czynności dla każdego nominału określoną ilość razy.  Każde wykonanie tego procesu określamy mianem "rundy." Każda runda procesu PrivateSend wykładniczo zwiększa trudność ustalenia pochodzenia twoich środków.&lt;/li&gt; &lt;li&gt;Proces mieszania odbywa się w tle, bez dodatkowego zaangażowania z twojej strony. Kiedy zechcesz wykonać transakcję, twoje środki będą już zanonimizowane. Nie będzie konieczne dodatkowe oczekiwanie.&lt;/li&gt; &lt;/ol&gt; &lt;hr&gt;&lt;b&gt;UWAGA:&lt;/b&gt; Portfel zawiera tylko 1000 "adresów reszty." Każde mieszanie zużywa do 9 adresów. Oznacza to, że po 100 mieszaniach zużyjesz ok. 1000 adresów. Po wykorzystaniu 900 adresów, portfel musi wygenerować nowe adresy. Może not nastąpić jedynie, jeżeli włączone jest automatyczne tworzenie kopii zapasowych.&lt;br&gt; Dlatego też, PrivateSend jest wyłączone, jeżeli użytkownik wyłączył automatyczne tworzenie kopii zapasowych. &lt;hr&gt;Więcej informacji znajdziesz na stronie &lt;a href="https://dashpay.atlassian.net/wiki/display/DOC/PrivateSend"&gt;https://dashpay.atlassian.net/wiki/display/DOC/PrivateSend&lt;/a&gt;         </translation>
+        <source>&lt;h3&gt;PrivateSend Basics&lt;/h3&gt; PrivateSend gives you true financial privacy by obscuring the origins of your funds. All the Dash in your wallet is comprised of different "inputs" which you can think of as separate, discrete coins.&lt;br&gt; PrivateSend uses an innovative process to mix your inputs with the inputs of two other people, without having your coins ever leave your wallet. You retain control of your money at all times.&lt;hr&gt; &lt;b&gt;The PrivateSend process works like this:&lt;/b&gt;&lt;ol type="1"&gt; &lt;li&gt;PrivateSend begins by breaking your transaction inputs down into standard denominations. These denominations are 0.01 DASH, 0.1 DASH, 1 DASH and 10 DASH -- sort of like the paper money you use every day.&lt;/li&gt; &lt;li&gt;Your wallet then sends requests to specially configured software nodes on the network, called "masternodes." These masternodes are informed then that you are interested in mixing a certain denomination. No identifiable information is sent to the masternodes, so they never know "who" you are.&lt;/li&gt; &lt;li&gt;When two other people send similar messages, indicating that they wish to mix the same denomination, a mixing session begins. The masternode mixes up the inputs and instructs all three users' wallets to pay the now-transformed input back to themselves. Your wallet pays that denomination directly to itself, but in a different address (called a change address).&lt;/li&gt; &lt;li&gt;In order to fully obscure your funds, your wallet must repeat this process a number of times with each denomination. Each time the process is completed, it's called a "round." Each round of PrivateSend makes it exponentially more difficult to determine where your funds originated.&lt;/li&gt; &lt;li&gt;This mixing process happens in the background without any intervention on your part. When you wish to make a transaction, your funds will already be anonymized. No additional waiting is required.&lt;/li&gt; &lt;/ol&gt; &lt;hr&gt;&lt;b&gt;IMPORTANT:&lt;/b&gt; Your wallet only contains 1000 of these "change addresses." Every time a mixing event happens, up to 9 of your addresses are used up. This means those 1000 addresses last for about 100 mixing events. When 900 of them are used, your wallet must create more addresses. It can only do this, however, if you have automatic backups enabled.&lt;br&gt; Consequently, users who have backups disabled will also have PrivateSend disabled. &lt;hr&gt;For more information, see the &lt;a href="https://docs.dash.org/en/latest/wallets/dashcore/privatesend-instantsend.html"&gt;PrivateSend documentation&lt;/a&gt;.         </source>
+        <translation>&lt;h3&gt;Podstawy PrivateSend&lt;/h3&gt; PrivateSend zapewnia prawdziwą prywatność poprzez ukrycie pochodzenia środków. Wszystkie dashe w twoim portfelu składają się z różnych "kwot wejściowych", które można traktować jako oddzielne, indywidualne monety.&lt;br&gt; PrivateSend wykorzystuje rewolucyjny proces mieszania twoich "kwot wejściowych" z "kwotami wejściowymi" dwóch innych  użytkowników, przy czym twoje środki nigdy nie opuszczają twojego portfela. W każdej chwili zachowujesz nad nimi pełną kontrolę.&lt;hr&gt; &lt;b&gt;Proces PrivateSend przebiega w następujący sposób:&lt;/b&gt;&lt;ol type="1"&gt; &lt;li&gt;Najpierw PrivateSend dzieli twoje kwoty wejściowe twoich transakcji na standardowe nominały. Są kwoty 0.01 DASH, 0.1 DASH, 1 DASH oraz 10 DASH – mniej  więcej jak banknoty, których codziennie używasz.&lt;/li&gt; &lt;li&gt;Następnie twój portfel wysyła żądania do specjalnie skonfigurowanych węzłów sieci, zwanych "masternodami." Masternody otrzymują komunikat, że jesteś zainteresowany wymieszaniem określonego nominału. Masternody nie otrzymują żadnych informacji pozwalających na identyfikację, w związku z tym nigdy nie wiedzą "kim" jesteś.&lt;/li&gt; &lt;li&gt;Kiedy dwaj inni użytkownicy wyślą podobne komunikaty, z żądanie wymieszanie takiego samego nominału, rozpocznie się sesja mieszania. Masternod wymiesza kwoty wejściowe i nakaże portfelom takich trzech użytkowników wypłacić sobie samemu przetworzone kwoty wejściowe. Twój portfel wpłaci dany nominał do siebie samego, jednak na inny adres (tzw. adres reszty).&lt;/li&gt; &lt;li&gt;W celu pełnego zaciemnienia pochodzenia środków, twój portfel musi powtórzyć te czynności dla każdego nominału określoną ilość razy.  Każde wykonanie tego procesu określamy mianem "rundy." Każda runda procesu PrivateSend wykładniczo zwiększa trudność ustalenia pochodzenia twoich środków.&lt;/li&gt; &lt;li&gt;Proces mieszania odbywa się w tle, bez dodatkowego zaangażowania z twojej strony. Kiedy zechcesz wykonać transakcję, twoje środki będą już zanonimizowane. Nie będzie konieczne dodatkowe oczekiwanie.&lt;/li&gt; &lt;/ol&gt; &lt;hr&gt;&lt;b&gt;UWAGA:&lt;/b&gt; Portfel zawiera tylko 1000 "adresów reszty." Każde mieszanie zużywa do 9 adresów. Oznacza to, że po 100 mieszaniach zużyjesz ok. 1000 adresów. Po wykorzystaniu 900 adresów, portfel musi wygenerować nowe adresy. Może not nastąpić jedynie, jeżeli włączone jest automatyczne tworzenie kopii zapasowych.&lt;br&gt; Dlatego też, PrivateSend jest wyłączone, jeżeli użytkownik wyłączył automatyczne tworzenie kopii zapasowych. &lt;hr&gt;Więcej informacji na temat PrivateSend&lt;a href="https://docs.dash.org/en/latest/wallets/dashcore/privatesend-instantsend.html"&gt; można znaleźć w dokumentacji technicznej&lt;/a&gt;. </translation>
     </message>
 </context>
 <context>
@@ -4094,7 +4027,7 @@ https://www.transifex.com/projects/p/dash/</translation>
     </message>
     <message>
         <source>User defined mnemonic for HD wallet (bip39). Only has effect during wallet creation/first start (default: randomly generated)</source>
-        <translation>Lista słów dla porfela HD stworzona przez użytkownika (bip39). Tyczy się jedynie kiedy tworzysz nowy porfel (domyślnie: tworozne losowo)</translation>
+        <translation>Lista słów dla portfela HD stworzona przez użytkownika (bip39). Tyczy się jedynie kiedy tworzysz nowy portfel (domyślnie: tworzone losowo)</translation>
     </message>
     <message>
         <source>User defined seed for HD wallet (should be in hex). Only has effect during wallet creation/first start (default: randomly generated)</source>
@@ -4480,6 +4413,10 @@ https://www.transifex.com/projects/p/dash/</translation>
         <source>Disable all Dash specific functionality (Masternodes, PrivateSend, InstantSend, Governance) (0-1, default: %u)</source>
         <translation>Wyłącz wszystkie funkcjonalności charakterystyczne dla Dash (Masternody, PrivateSend, InstantSend, Governance) (0-1, domyślnie: %u)</translation>
     </message>
+    <message>
+        <source>%s file contains all private keys from this wallet. Do not share it with anyone!</source>
+        <translation>%s plik zawiera wszystkie klucze prywatne przechowywane w tym portfelu. Nie dawaj nikomu dostępu do tego pliku. </translation>
+    </message>
     <message>
         <source>Discover own IP addresses (default: 1 when listening and no -externalip or -proxy)</source>
         <translation>Wykryj własny adres IP (domyślnie: 1 kiedy nasłuchuje, bez stosowania -externalip lub -proxy)</translation>
@@ -4504,6 +4441,10 @@ https://www.transifex.com/projects/p/dash/</translation>
         <source>Execute command when a wallet InstantSend transaction is successfully locked (%s in cmd is replaced by TxID)</source>
         <translation>Wykonaj komendę, kiedy się transakcja InstantSend  portfela zostanie pomyślnie zamknięta (%s w konsoli jest zastąpione przez TxID)</translation>
     </message>
+    <message>
+        <source>Extra transactions to keep in memory for compact block reconstructions (default: %u)</source>
+        <translation>Dodatkowe transakcje trzymane w pamięci aby móc zrekonstruować kompaktowe bloki (domyślnie: %u)</translation>
+    </message>
     <message>
         <source>Failed to create backup, file already exists! This could happen if you restarted wallet in less than 60 seconds. You can continue if you are ok with this.</source>
         <translation>Tworzenie kopii zapasowej nieudane, plik już istnieje! Taka sytuacja może wystąpić, jeżeli minęło mniej niż 60 od ostatniego zamknięcia portfela. Jeżeli Ci to nie przeszkadza, możesz kontynuować.</translation>
@@ -4584,6 +4525,10 @@ https://www.transifex.com/projects/p/dash/</translation>
         <source>Total length of network version string (%i) exceeds maximum length (%i). Reduce the number or size of uacomments.</source>
         <translation>Całkowita długość sieciowej wersji struny (%i) przekracza maksymalną długość (%i). Zredukuj liczbę lub rozmiar uacomments.</translation>
     </message>
+    <message>
+        <source>Transaction index can't be disabled in full mode. Either start with -litemode command line switch or enable transaction index.</source>
+        <translation>Indeks tranaskcji nie może zostać wyłączony w pełnym trybe. Albo uruchom z komendy -lighmode lub włącz indeksowanie transakcji.</translation>
+    </message>
     <message>
         <source>Tries to keep outbound traffic under the given target (in MiB per 24h), 0 = no limit (default: %d)</source>
         <translation>Próbuje utrzymać wychodzący ruch sieciowy poniżej podanej wartości (MiB/24 h), 0 = bez ograniczeń (domyślnie: %d)</translation>
@@ -4616,6 +4561,10 @@ https://www.transifex.com/projects/p/dash/</translation>
         <source>Warning: Unknown block versions being mined! It's possible unknown rules are in effect</source>
         <translation>Uwaga: Wykopywane są bloki o nieznanej wersji! Możliwe, że zostały aktywowane inne zasady na których opiera się sieć.</translation>
     </message>
+    <message>
+        <source>You are starting in lite mode, all Dash-specific functionality is disabled.</source>
+        <translation>Uruchamiasz porfel w trybie lite, wszystkie dodatkowe funkcje Dasha zostaną wyłączone. </translation>
+    </message>
     <message>
         <source>You need to rebuild the database using -reindex to go back to unpruned mode.  This will redownload the entire blockchain</source>
         <translation>Aby wrócić do trybu bez bez obcinki, musisz odtworzyć bazę danych za pomocą komendy -reindex. Cały blockchain zostanie ponownie ściągnięty.</translation>
@@ -4660,6 +4609,14 @@ https://www.transifex.com/projects/p/dash/</translation>
         <source>Enable publish hash block in &lt;address&gt;</source>
         <translation>Pozwól na publikację hash bloku w &lt;address&gt;</translation>
     </message>
+    <message>
+        <source>Enable publish hash of governance objects (like proposals) in &lt;address&gt;</source>
+        <translation>Pozwól na publikację hash obiektu zarządzania (np. propozycji) w &lt;address&gt;</translation>
+    </message>
+    <message>
+        <source>Enable publish hash of governance votes in &lt;address&gt;</source>
+        <translation>Pozwól na publikację hash głosów w &lt;address&gt;</translation>
+    </message>
     <message>
         <source>Enable publish hash transaction (locked via InstantSend) in &lt;address&gt;</source>
         <translation>Pozwól na publikację hash transakcji (zabezpiecznona przez InstantSend) w &lt;address&gt;</translation>
@@ -4700,6 +4657,14 @@ https://www.transifex.com/projects/p/dash/</translation>
         <source>Failed to delete backup, error: %s</source>
         <translation>Skasowanie kopii zapasowej nie powiodło się, błąd: %s</translation>
     </message>
+    <message>
+        <source>Failed to load InstantSend data cache from</source>
+        <translation>Nie powiodło się ładowanie bufora InstantSend z</translation>
+    </message>
+    <message>
+        <source>Failed to load sporks cache from</source>
+        <translation>Nie powiodło się ładowanie bufora sporków z</translation>
+    </message>
     <message>
         <source>Failed to parse host:port string</source>
         <translation>Nieudane analizowanie hosta:port string</translation>
@@ -4720,6 +4685,10 @@ https://www.transifex.com/projects/p/dash/</translation>
         <source>Invalid amount for -fallbackfee=&lt;amount&gt;: '%s'</source>
         <translation>Błędna ilość -fallbackfee=&lt;amount&gt;: '%s'</translation>
     </message>
+    <message>
+        <source>Invalid input count.</source>
+        <translation>Niewłaściwa ilość transakcji wejściowych. </translation>
+    </message>
     <message>
         <source>Keep the transaction memory pool below &lt;n&gt; megabytes (default: %u)</source>
         <translation>Utrzymuj rozmiar memory pool poniżej &lt;n&gt; megabajtów (domyślnie: %u)</translation>
@@ -4736,6 +4705,10 @@ https://www.transifex.com/projects/p/dash/</translation>
         <source>Line: %d</source>
         <translation>Linia: %d</translation>
     </message>
+    <message>
+        <source>Loading InstantSend data cache...</source>
+        <translation>Ładowanie bufora danych InstandSend...</translation>
+    </message>
     <message>
         <source>Loading addresses...</source>
         <translation>Wczytuję adresy...</translation>
@@ -4748,6 +4721,10 @@ https://www.transifex.com/projects/p/dash/</translation>
         <source>Loading governance cache...</source>
         <translation>Wczytuję bufor governance</translation>
     </message>
+    <message>
+        <source>Loading sporks cache...</source>
+        <translation>Ładowanie bufora sporków....</translation>
+    </message>
     <message>
         <source>Loading wallet... (%3.2f %%)</source>
         <translation>Ładuję portfel... (%3.2f %%)</translation>
@@ -4888,6 +4865,10 @@ https://www.transifex.com/projects/p/dash/</translation>
         <source>Transaction must have at least one recipient</source>
         <translation>Transakcja wymaga co najmniej jednego odbiorcy</translation>
     </message>
+    <message>
+        <source>Transaction too large</source>
+        <translation>Za duża transakcja</translation>
+    </message>
     <message>
         <source>Trying to connect...</source>
         <translation>Staram się połączyć</translation>
@@ -4908,6 +4889,10 @@ https://www.transifex.com/projects/p/dash/</translation>
         <source>Wallet debugging/testing options:</source>
         <translation>Opcje debugowania/testowania portfela:</translation>
     </message>
+    <message>
+        <source>Wallet is not initialized</source>
+        <translation>Portfel nie został uruchomiony</translation>
+    </message>
     <message>
         <source>Wallet needed to be rewritten: restart %s to complete</source>
         <translation>Portfel wymaga przepisania: zrestartuj %s aby ukończyć</translation>
@@ -4924,6 +4909,10 @@ https://www.transifex.com/projects/p/dash/</translation>
         <source>Whether to operate in a blocks only mode (default: %u)</source>
         <translation>Czy operować jedynie w trybie bloków (domyślnie: %u)</translation>
     </message>
+    <message>
+        <source>You can not start a masternode in lite mode.</source>
+        <translation>Nie możesz uruchomić masternoda w trybie lite. </translation>
+    </message>
     <message>
         <source>ZeroMQ notification options:</source>
         <translation>ZeroMQ opcje powiadomień:</translation>
@@ -5012,10 +5001,6 @@ https://www.transifex.com/projects/p/dash/</translation>
         <source>Set lowest fee rate (in %s/kB) for transactions to be included in block creation. (default: %s)</source>
         <translation>Ustaw najnższą opłatę (in %s/kB) za transakcje aby została ona włączona do bloku. (domyślnie: %s)</translation>
     </message>
-    <message>
-        <source>Show N confirmations for a successfully locked transaction (%u-%u, default: %u)</source>
-        <translation>Pokaż N potwierdzeń dla skutecznie zamkniętej transakcji (%u-%u, domyślnie: %u)</translation>
-    </message>
     <message>
         <source>This is the transaction fee you may pay when fee estimates are not available.</source>
         <translation>To jest prawdopodobny koszt transakcj jeśli szacunki opłat są niedostępne. </translation>
diff --git a/src/qt/locale/dash_pt.ts b/src/qt/locale/dash_pt.ts
index 0815cbce3b68..eb99ef649b4f 100644
--- a/src/qt/locale/dash_pt.ts
+++ b/src/qt/locale/dash_pt.ts
@@ -1,4 +1,4 @@
-<TS language="pt" version="2.0">
+<TS language="pt" version="2.1">
 <context>
     <name>AddressBookPage</name>
     <message>
@@ -7,7 +7,7 @@
     </message>
     <message>
         <source>Create a new address</source>
-        <translation>Criar novo endereço</translation>
+        <translation>Criar um novo endereço</translation>
     </message>
     <message>
         <source>&amp;New</source>
@@ -15,7 +15,7 @@
     </message>
     <message>
         <source>Copy the currently selected address to the system clipboard</source>
-        <translation>Copiar o endereço seleccionado para a área de transferência</translation>
+        <translation>Copiar o endereço selecionado para a área de transferência do sistema</translation>
     </message>
     <message>
         <source>&amp;Copy</source>
@@ -23,15 +23,15 @@
     </message>
     <message>
         <source>Delete the currently selected address from the list</source>
-        <translation>Apagar o endereço seleccionado</translation>
+        <translation>Excluir os endereços selecionados da lista</translation>
     </message>
     <message>
         <source>&amp;Delete</source>
-        <translation>&amp;Apagar</translation>
+        <translation>E&amp;xcluir</translation>
     </message>
     <message>
         <source>Export the data in the current tab to a file</source>
-        <translation>Exportar os dados do separador actual para um ficheiro</translation>
+        <translation>Exportar os dados na aba atual para um arquivo</translation>
     </message>
     <message>
         <source>&amp;Export</source>
@@ -43,11 +43,11 @@
     </message>
     <message>
         <source>Choose the address to send coins to</source>
-        <translation>Escolha o endereço para onde enviar as moedas</translation>
+        <translation>Escolha o endereço no qual receberá as moedas</translation>
     </message>
     <message>
         <source>Choose the address to receive coins with</source>
-        <translation>Escolha o endereço onde deseja receber as moedas</translation>
+        <translation>Escolha o endereço para receber moedas com ele</translation>
     </message>
     <message>
         <source>C&amp;hoose</source>
@@ -55,19 +55,19 @@
     </message>
     <message>
         <source>Sending addresses</source>
-        <translation>Endereços para envio</translation>
+        <translation>Endereços de envio</translation>
     </message>
     <message>
         <source>Receiving addresses</source>
-        <translation>Endereços para recepção</translation>
+        <translation>Endereços de recebimento</translation>
     </message>
     <message>
         <source>These are your Dash addresses for sending payments. Always check the amount and the receiving address before sending coins.</source>
-        <translation>Estes são os endereços Dash para envio de pagamentos. Confirme sempre a quantia e o endereço antes de enviar as moedas.</translation>
+        <translation>Esses são os seus endereços para enviar pagamentos. Sempre cheque a quantia e o endereço de recebimento antes de enviar moedas,</translation>
     </message>
     <message>
         <source>These are your Dash addresses for receiving payments. It is recommended to use a new receiving address for each transaction.</source>
-        <translation>Estes são os seus endereços Dash para receber pagamentos. É recomendado que seja usado um novo endereço para cada transacção.</translation>
+        <translation>Estes são os seus endereços para receber pagamentos. É recomendado usar um novo para cada transação.</translation>
     </message>
     <message>
         <source>&amp;Copy Address</source>
@@ -83,19 +83,19 @@
     </message>
     <message>
         <source>Export Address List</source>
-        <translation>Exportar lista de endereços</translation>
+        <translation>Exportar lista de endereço</translation>
     </message>
     <message>
         <source>Comma separated file (*.csv)</source>
-        <translation>Ficheiro separado por vírgulas (*.csv)</translation>
+        <translation>Arquivo separado por vírgulas (*. csv)</translation>
     </message>
     <message>
         <source>Exporting Failed</source>
-        <translation>A exportação falhou</translation>
+        <translation>Falha ao exportar</translation>
     </message>
     <message>
         <source>There was an error trying to save the address list to %1. Please try again.</source>
-        <translation>Ocorreu um erro ao tentar gravar a lista de endereços para %1. Por favor, tente de novo.</translation>
+        <translation>Houve um erro ao tentar salvar a lista de endereços em %1. Por favor tente novamente.</translation>
     </message>
 </context>
 <context>
@@ -117,39 +117,35 @@
     <name>AskPassphraseDialog</name>
     <message>
         <source>Passphrase Dialog</source>
-        <translation>Diálogo de Palavra Passe</translation>
+        <translation>Janela da Frase de Segurança</translation>
     </message>
     <message>
         <source>Enter passphrase</source>
-        <translation>Palavra Passe Actual</translation>
+        <translation>Digite a frase de segurança</translation>
     </message>
     <message>
         <source>New passphrase</source>
-        <translation>Nova Palavra Passe</translation>
+        <translation>Nova frase de segurança</translation>
     </message>
     <message>
         <source>Repeat new passphrase</source>
-        <translation>Repita a Nova Palavra Passe</translation>
-    </message>
-    <message>
-        <source>Serves to disable the trivial sendmoney when OS account compromised. Provides no real security.</source>
-        <translation>Serve para desactivar o envio de dinheiro quando a conta do SO for comprometida. Não oferece segurança real.</translation>
-    </message>
-    <message>
-        <source>For anonymization only</source>
-        <translation>Apenas para anonimização</translation>
+        <translation>Repita a nova frase de segurança</translation>
     </message>
     <message>
         <source>Enter the new passphrase to the wallet.&lt;br/&gt;Please use a passphrase of &lt;b&gt;ten or more random characters&lt;/b&gt;, or &lt;b&gt;eight or more words&lt;/b&gt;.</source>
-        <translation>Insira a nova palavra-passe para a carteira.&lt;br/&gt;Por favor use uma palavra-chave com &lt;b&gt;10 ou mais caracteres aleatórios&lt;/b&gt;, ou &lt;b&gt;8 ou mais palavras&lt;/b&gt;.</translation>
+        <translation>Insira a nova senha para a carteira.&lt;br/&gt;Favor usar uma senha com &lt;b&gt;dez ou mais caracteres aleatórios&lt;/b&gt;, ou &lt;b&gt;oito ou mais palavras&lt;/b&gt;.</translation>
     </message>
     <message>
         <source>Encrypt wallet</source>
-        <translation>Cifrar carteira</translation>
+        <translation>Criptografar carteira</translation>
     </message>
     <message>
         <source>This operation needs your wallet passphrase to unlock the wallet.</source>
-        <translation>Esta operação necessita da sua palavra-passe para desbloquear a carteira.</translation>
+        <translation>Esta operação precisa da sua senha para desbloquear a carteira.</translation>
+    </message>
+    <message>
+        <source>Unlock wallet for mixing only</source>
+        <translation>Desbloquear carteira appenas para misturar</translation>
     </message>
     <message>
         <source>Unlock wallet</source>
@@ -157,55 +153,59 @@
     </message>
     <message>
         <source>This operation needs your wallet passphrase to decrypt the wallet.</source>
-        <translation>Esta operação necessita da sua palavra-passe para decifrar a carteira.</translation>
+        <translation>Esta operação precisa da sua senha para descriptografar a carteira</translation>
     </message>
     <message>
         <source>Decrypt wallet</source>
-        <translation>Decifrar carteira</translation>
+        <translation>Descriptografar carteira</translation>
     </message>
     <message>
         <source>Change passphrase</source>
-        <translation>Mudar palavra-passe</translation>
+        <translation>Alterar frase de segurança</translation>
     </message>
     <message>
-        <source>Enter the old and new passphrase to the wallet.</source>
-        <translation>Insira a antiga e a nova palavra-passe para a carteira.</translation>
+        <source>Enter the old passphrase and new passphrase to the wallet.</source>
+        <translation>Insira a senha antiga e a nova para a carteira.</translation>
     </message>
     <message>
         <source>Confirm wallet encryption</source>
-        <translation>Confirme cifra da carteira</translation>
+        <translation>Confirmar criptografia da carteira</translation>
     </message>
     <message>
         <source>Warning: If you encrypt your wallet and lose your passphrase, you will &lt;b&gt;LOSE ALL OF YOUR DASH&lt;/b&gt;!</source>
-        <translation>Atenção: Se cifrar a carteira e perder a palavra-passe, irá &lt;b&gt;PERDER TODAS AS SUAS MOEDAS DASH&lt;/b&gt;!</translation>
+        <translation>Aviso: Se você encriptar sua wallet e perder sua senha, você vai &lt;b&gt;PERDER TODAS AS SUAS DASH&lt;/b&gt;!</translation>
     </message>
     <message>
         <source>Are you sure you wish to encrypt your wallet?</source>
-        <translation>Tem a certeza que quer cifrar a carteira?</translation>
+        <translation>Tem certeza de que deseja criptografar sua carteira?</translation>
     </message>
     <message>
         <source>Wallet encrypted</source>
-        <translation>Carteira cifrada</translation>
+        <translation>Carteira criptografada</translation>
+    </message>
+    <message>
+        <source>%1 will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your funds from being stolen by malware infecting your computer.</source>
+        <translation>A %1 irá fechar agora para terminar o processo de encriptação. Lembre-se que encriptar sua carteira não fará com que seus Dash estejam totalmente a salvo de serem roubados por malwares que infectem seu computador.</translation>
     </message>
     <message>
-        <source>Dash will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your dashs from being stolen by malware infecting your computer.</source>
-        <translation>O cliente Dash irá fechar para finalizar o processo de cifra. Lembre-se que cifrar a sua carteira não consegue proteger totalmente as suas dashs contra roubos feitos por malware presente no seu computador.</translation>
+        <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. Previous backups of the unencrypted wallet file contain the same HD seed and still have full access to all your funds just like the new, encrypted wallet.</source>
+        <translation>IMPORTANTE: Todos os backups anteriores feitos do seu arquivo de carteira devem ser substituídos pelo arquivo de carteira criptografado recém-gerado. Os backups anteriores do arquivo de carteira não criptografada contêm a mesma semente HD e ainda têm acesso total a todos os seus fundos, assim como a nova carteira criptografada.</translation>
     </message>
     <message>
         <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</source>
-        <translation>IMPORTANTE: Quaisquer copias de segurança feitas anteriormente à sua carteira, devem ser substituídas pelo novo ficheiro cifrado. Por razões de segurança, as copias de segurança anteriores não cifradas ficarão obsoletas assim que comece a usar a nova carteira cifrada,</translation>
+        <translation>IMPORTANTE: Qualquer backup prévio que você tenha feito da sua carteira deve ser substituído pelo novo e encriptado arquivo gerado. Por razões de segurança, qualquer backup do arquivo não criptografado se tornará inútil assim que você começar a usar uma nova carteira criptografada.</translation>
     </message>
     <message>
         <source>Wallet encryption failed</source>
-        <translation>Cifra da carteira falhou</translation>
+        <translation>A criptografia da carteira falhou</translation>
     </message>
     <message>
         <source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source>
-        <translation>A cifra da carteira falhou devido a um erro interno. A sua carteira não foi cifrada.</translation>
+        <translation>Falha na criptografia devido a um erro inerno. Sua carteira não foi criptografada.</translation>
     </message>
     <message>
         <source>The supplied passphrases do not match.</source>
-        <translation>As palavras-passe fornecidas não coincidem.</translation>
+        <translation>A frase de segurança fornecida não confere.</translation>
     </message>
     <message>
         <source>Wallet unlock failed</source>
@@ -213,23 +213,38 @@
     </message>
     <message>
         <source>The passphrase entered for the wallet decryption was incorrect.</source>
-        <translation>A palavra-passe fornecida para decifrar a carteira está incorrecta.</translation>
+        <translation>A senha inserida para descriptografar a carteira está incorreta.</translation>
     </message>
     <message>
         <source>Wallet decryption failed</source>
-        <translation>Decifra da carteira falhou</translation>
+        <translation>A descriptografia da carteira falhou</translation>
     </message>
     <message>
         <source>Wallet passphrase was successfully changed.</source>
-        <translation>A palavra-passe foi alterada com sucesso.</translation>
+        <translation>A frase de segurança da carteira foi alterada com êxito.</translation>
     </message>
     <message>
         <source>Warning: The Caps Lock key is on!</source>
-        <translation>Atenção: O Caps Lock está activo!</translation>
+        <translation>Atenção: A tecla Caps Lock está ligada!</translation>
+    </message>
+</context>
+<context>
+    <name>BanTableModel</name>
+    <message>
+        <source>IP/Netmask</source>
+        <translation>IP/Máscara de rede</translation>
+    </message>
+    <message>
+        <source>Banned Until</source>
+        <translation>Banido até</translation>
     </message>
 </context>
 <context>
     <name>BitcoinGUI</name>
+    <message>
+        <source>A fatal error occurred. Dash Core can no longer continue safely and will quit.</source>
+        <translation>Ocorreu um erro fatal. A Dash não pode mais continuar de forma segura, e irá fechar</translation>
+    </message>
     <message>
         <source>Dash Core</source>
         <translation>Dash Core</translation>
@@ -244,11 +259,11 @@
     </message>
     <message>
         <source>&amp;Overview</source>
-        <translation>&amp;Global</translation>
+        <translation>&amp;Visão geral</translation>
     </message>
     <message>
         <source>Show general overview of wallet</source>
-        <translation>Mostrar visão global da carteira</translation>
+        <translation>Mostrar visão geral da carteira</translation>
     </message>
     <message>
         <source>&amp;Send</source>
@@ -256,7 +271,7 @@
     </message>
     <message>
         <source>Send coins to a Dash address</source>
-        <translation>Enviar moedas para um endereço Dash</translation>
+        <translation>Envie moedas para um endereço Dash</translation>
     </message>
     <message>
         <source>&amp;Receive</source>
@@ -264,83 +279,91 @@
     </message>
     <message>
         <source>Request payments (generates QR codes and dash: URIs)</source>
-        <translation>Solicitar pagamentos (gera códigos QR e dash: URIs)</translation>
+        <translation>Solicitações de pagamentos (gera códigos QR e Dash: URIs)</translation>
     </message>
     <message>
         <source>&amp;Transactions</source>
-        <translation>&amp;Transacções</translation>
+        <translation>&amp;Transações</translation>
     </message>
     <message>
         <source>Browse transaction history</source>
-        <translation>Visualiza histórico de transacções</translation>
+        <translation>Navegar pelo histórico de transações</translation>
+    </message>
+    <message>
+        <source>&amp;Masternodes</source>
+        <translation>&amp;Masternodes</translation>
+    </message>
+    <message>
+        <source>Browse masternodes</source>
+        <translation>Exibir masternodes</translation>
     </message>
     <message>
         <source>E&amp;xit</source>
-        <translation>&amp;Sair</translation>
+        <translation>S&amp;air</translation>
     </message>
     <message>
         <source>Quit application</source>
         <translation>Sair da aplicação</translation>
     </message>
-    <message>
-        <source>&amp;About Dash Core</source>
-        <translation>&amp;Acerca do Dash Core</translation>
-    </message>
     <message>
         <source>Show information about Dash Core</source>
-        <translation>Mostra informação acerca do Dash Core</translation>
+        <translation>Exibe informações sobre Dash Core</translation>
     </message>
     <message>
         <source>About &amp;Qt</source>
-        <translation>Acerca do &amp;Qt</translation>
+        <translation>Sobre &amp;Qt</translation>
     </message>
     <message>
         <source>Show information about Qt</source>
-        <translation>Mostra informação acerca do Qt</translation>
+        <translation>Exibe informações sobre Qt</translation>
     </message>
     <message>
         <source>&amp;Options...</source>
         <translation>&amp;Opções...</translation>
     </message>
     <message>
-        <source>Modify configuration options for Dash</source>
-        <translation>Modificar opções de configuração do Dash</translation>
+        <source>&amp;About %1</source>
+        <translation>&amp;Sobre %1</translation>
+    </message>
+    <message>
+        <source>Modify configuration options for %1</source>
+        <translation>Modificar opções de configuração para o %1</translation>
     </message>
     <message>
         <source>&amp;Show / Hide</source>
-        <translation>&amp;Mostar / Esconder</translation>
+        <translation>&amp;Exibir/Ocultar</translation>
     </message>
     <message>
         <source>Show or hide the main Window</source>
-        <translation>Mostrar ou esconder a Janela principal</translation>
+        <translation>Mostrar ou esconder a Janela Principal.</translation>
     </message>
     <message>
         <source>&amp;Encrypt Wallet...</source>
-        <translation>&amp;Cifrar Carteira</translation>
+        <translation>&amp;Criptografar Carteira...</translation>
     </message>
     <message>
         <source>Encrypt the private keys that belong to your wallet</source>
-        <translation>Cifra as chaves privadas que pertencem à sua carteira</translation>
+        <translation>Criptografar as chaves privadas que pertencem à sua carteira</translation>
     </message>
     <message>
         <source>&amp;Backup Wallet...</source>
-        <translation>Copia de &amp;Segurança</translation>
+        <translation>Fazer &amp;Backup da Carteira...</translation>
     </message>
     <message>
         <source>Backup wallet to another location</source>
-        <translation>Criar copia de segurança da carteira noutra localização</translation>
+        <translation>Faça o Backup da carteira para outro local</translation>
     </message>
     <message>
         <source>&amp;Change Passphrase...</source>
-        <translation>&amp;Mudar Palavra-passe</translation>
+        <translation>Alterar frase de segurança</translation>
     </message>
     <message>
         <source>Change the passphrase used for wallet encryption</source>
-        <translation>Mudar a palavra-passe usada na cifra da carteira</translation>
+        <translation>Mudar a frase de segurança utilizada na criptografia da carteira</translation>
     </message>
     <message>
         <source>&amp;Unlock Wallet...</source>
-        <translation>&amp;Desbloquear Carteira</translation>
+        <translation>&amp;Desbloquear carteira...</translation>
     </message>
     <message>
         <source>Unlock wallet</source>
@@ -348,23 +371,23 @@
     </message>
     <message>
         <source>&amp;Lock Wallet</source>
-        <translation>&amp;Bloquear Carteira</translation>
+        <translation>Bloquear carteira</translation>
     </message>
     <message>
         <source>Sign &amp;message...</source>
-        <translation>&amp;Assinar Mensagem</translation>
+        <translation>Assinar &amp;Mensagem...</translation>
     </message>
     <message>
         <source>Sign messages with your Dash addresses to prove you own them</source>
-        <translation>Assine mensagens com os seus endereços Dash para provar que são seus</translation>
+        <translation>Assine mensagens com seus endereços Dash para provar que você é dono delas</translation>
     </message>
     <message>
         <source>&amp;Verify message...</source>
-        <translation>&amp;Verificar Mensagem</translation>
+        <translation>&amp;Verificar mensagem...</translation>
     </message>
     <message>
         <source>Verify messages to ensure they were signed with specified Dash addresses</source>
-        <translation>Verifica mensagens para garantir que foram assinadas com um endereço Dash específico</translation>
+        <translation>Verifique as mensagens para ter certeza de que elas foram assinadas com o endereço da Dash especificado</translation>
     </message>
     <message>
         <source>&amp;Information</source>
@@ -372,71 +395,79 @@
     </message>
     <message>
         <source>Show diagnostic information</source>
-        <translation>Mostra informação de diagnóstico</translation>
+        <translation>Mostrar informação de diagnóstico</translation>
     </message>
     <message>
         <source>&amp;Debug console</source>
-        <translation>Consola de &amp;Depuração</translation>
+        <translation>&amp;Console de depuração</translation>
     </message>
     <message>
         <source>Open debugging console</source>
-        <translation>Abrir consola de depuração</translation>
+        <translation>Abrir o console de depuração</translation>
     </message>
     <message>
         <source>&amp;Network Monitor</source>
-        <translation>Monitor de &amp;Rede</translation>
+        <translation>&amp;Monitor de Rede</translation>
     </message>
     <message>
         <source>Show network monitor</source>
-        <translation>Mostrar monitor de rede</translation>
+        <translation>Exibe o monitor de rede</translation>
     </message>
     <message>
         <source>&amp;Peers list</source>
-        <translation>Lista de &amp;Nós</translation>
+        <translation>&amp;Peers</translation>
     </message>
     <message>
         <source>Show peers info</source>
-        <translation>Mostrar informação dos nós</translation>
+        <translation>mostrar informações dos peers</translation>
     </message>
     <message>
         <source>Wallet &amp;Repair</source>
-        <translation>&amp;Reparar Carteira</translation>
+        <translation>&amp;Reparar carteira</translation>
     </message>
     <message>
         <source>Show wallet repair options</source>
-        <translation>Mostra as opções de reparação da carteira</translation>
+        <translation>Mostrar opções de reparação da carteira</translation>
     </message>
     <message>
-        <source>Open &amp;Configuration File</source>
-        <translation>Abrir Ficheiro de &amp;Configuração</translation>
+        <source>Open Wallet &amp;Configuration File</source>
+        <translation>Abrir arquivo de &amp;Configuração da carteira</translation>
     </message>
     <message>
         <source>Open configuration file</source>
-        <translation>Abrir ficheiro de configuração</translation>
+        <translation>Abrir arquivo de configuração</translation>
+    </message>
+    <message>
+        <source>Open &amp;Masternode Configuration File</source>
+        <translation>Abrir arquivo de configuração do &amp;Masternode</translation>
+    </message>
+    <message>
+        <source>Open Masternode configuration file</source>
+        <translation>Abrir arquivo de configuração de Masternode</translation>
     </message>
     <message>
         <source>Show Automatic &amp;Backups</source>
-        <translation>Mostrar &amp;Cópias Automáticas</translation>
+        <translation>Mostrar &amp;backups automáticos</translation>
     </message>
     <message>
         <source>Show automatically created wallet backups</source>
-        <translation>Mostra as cópias automáticas da carteira</translation>
+        <translation>Mostrar backups da carteira criados automaticamente </translation>
     </message>
     <message>
         <source>&amp;Sending addresses...</source>
-        <translation>&amp;Endereços de envio...</translation>
+        <translation>Endereço&amp;s de envio...</translation>
     </message>
     <message>
         <source>Show the list of used sending addresses and labels</source>
-        <translation>Mostra a lista de endereços de envio e respectivos rótulos</translation>
+        <translation>Mostrar a lista de endereços de envio e rótulos usados</translation>
     </message>
     <message>
         <source>&amp;Receiving addresses...</source>
-        <translation>Endereços de &amp;Recepção...</translation>
+        <translation>Endereços de &amp;recebimento...</translation>
     </message>
     <message>
         <source>Show the list of used receiving addresses and labels</source>
-        <translation>Mostra a lista de endereços de recepção e respectivos rótulos</translation>
+        <translation>Mostrar a lista de endereços de recebimento usados ​​e rótulos</translation>
     </message>
     <message>
         <source>Open &amp;URI...</source>
@@ -444,31 +475,35 @@
     </message>
     <message>
         <source>Open a dash: URI or payment request</source>
-        <translation>Abre um dash: URI ou solicitação de pagamento</translation>
+        <translation>Abrir um Dash: URI ou cobrança</translation>
     </message>
     <message>
         <source>&amp;Command-line options</source>
-        <translation>Opções de linha de &amp;comandos</translation>
+        <translation>Opções de linha de &amp;comando</translation>
     </message>
     <message>
-        <source>Dash Core client</source>
-        <translation>Cliente Dash Core</translation>
+        <source>Show the %1 help message to get a list with possible Dash command-line options</source>
+        <translation>Mostrar a mensagem de ajuda do %1 para obter uma lista com possíveis opções de linha de comando Dash</translation>
     </message>
-    <message numerus="yes">
-        <source>Processed %n blocks of transaction history.</source>
-        <translation><numerusform>%n bloco do histórico de transacções processado.</numerusform><numerusform>%n blocos do histórico de transacções processados.</numerusform></translation>
+    <message>
+        <source>%1 client</source>
+        <translation>%1 cliente</translation>
     </message>
     <message>
-        <source>Show the Dash Core help message to get a list with possible Dash command-line options</source>
-        <translation>Mostra a mensagem de ajuda do Dash Core para obter a lista com as possíveis opções de linha de comandos</translation>
+        <source>&amp;PrivateSend information</source>
+        <translation>Informação de Envio&amp;Privado</translation>
+    </message>
+    <message>
+        <source>Show the PrivateSend basic information</source>
+        <translation>Mostra informações básicas de EnvioPrivado</translation>
     </message>
     <message>
         <source>&amp;File</source>
-        <translation>&amp;Ficheiro</translation>
+        <translation>&amp;Arquivo</translation>
     </message>
     <message>
         <source>&amp;Settings</source>
-        <translation>&amp;Definições</translation>
+        <translation>&amp;Configurações</translation>
     </message>
     <message>
         <source>&amp;Tools</source>
@@ -484,63 +519,63 @@
     </message>
     <message numerus="yes">
         <source>%n active connection(s) to Dash network</source>
-        <translation><numerusform>%n ligação activa à rede Dash</numerusform><numerusform>%n ligações activas à rede Dash</numerusform></translation>
+        <translation><numerusform>%n conexões ativas com a rede Dash</numerusform><numerusform>%n conexões ativas com a rede Dash</numerusform></translation>
     </message>
     <message>
-        <source>Synchronizing with network...</source>
-        <translation>A sincronizar com a rede...</translation>
+        <source>Network activity disabled</source>
+        <translation>Atividade da rede disativada</translation>
     </message>
     <message>
-        <source>Importing blocks from disk...</source>
-        <translation>A carregar blocos do disco...</translation>
+        <source>Syncing Headers (%1%)...</source>
+        <translation>Sincronizando cabeçahos (%1%)...</translation>
     </message>
     <message>
-        <source>Reindexing blocks on disk...</source>
-        <translation>A indexar blocos no disco...</translation>
+        <source>Synchronizing with network...</source>
+        <translation>Sincronizando com a rede...</translation>
     </message>
     <message>
-        <source>No block source available...</source>
-        <translation>Nenhuma fonte de blocos disponível...</translation>
+        <source>Indexing blocks on disk...</source>
+        <translation>Indexando blocos no disco...</translation>
     </message>
     <message>
-        <source>Up to date</source>
-        <translation>Actualizado</translation>
-    </message>
-    <message numerus="yes">
-        <source>%n hour(s)</source>
-        <translation><numerusform>%n hora</numerusform><numerusform>%n horas</numerusform></translation>
-    </message>
-    <message numerus="yes">
-        <source>%n day(s)</source>
-        <translation><numerusform>%n dia</numerusform><numerusform>%n dias</numerusform></translation>
+        <source>Processing blocks on disk...</source>
+        <translation>Processando blocos no disco...</translation>
     </message>
-    <message numerus="yes">
-        <source>%n week(s)</source>
-        <translation><numerusform>%n semana</numerusform><numerusform>%n semanas</numerusform></translation>
+    <message>
+        <source>Reindexing blocks on disk...</source>
+        <translation>Reindexando blocos no disco...</translation>
     </message>
     <message>
-        <source>%1 and %2</source>
-        <translation>%1 e %2</translation>
+        <source>Connecting to peers...</source>
+        <translation>Conectando...</translation>
     </message>
     <message numerus="yes">
-        <source>%n year(s)</source>
-        <translation><numerusform>%n ano</numerusform><numerusform>%n anos</numerusform></translation>
+        <source>Processed %n block(s) of transaction history.</source>
+        <translation><numerusform>Processados %n blocos do histórico de transações.</numerusform><numerusform>Processados %n blocos do histórico de transações.</numerusform></translation>
     </message>
     <message>
         <source>%1 behind</source>
-        <translation>%1 de atraso</translation>
+        <translation>%1 atrás</translation>
     </message>
     <message>
         <source>Catching up...</source>
-        <translation>A alcançar</translation>
+        <translation>Recuperando o atraso ...</translation>
     </message>
     <message>
         <source>Last received block was generated %1 ago.</source>
-        <translation>O último bloco recebido foi gerado à %1.</translation>
+        <translation>Último bloco recebido foi gerado %1 atrás.</translation>
     </message>
     <message>
         <source>Transactions after this will not yet be visible.</source>
-        <translation>Transacções posteriores ainda não serão visíveis.</translation>
+        <translation>Transações após isso ainda não estão visíveis.</translation>
+    </message>
+    <message>
+        <source>Up to date</source>
+        <translation>Atualizado</translation>
+    </message>
+    <message>
+        <source>Synchronizing additional data: %p%</source>
+        <translation>Sincronizando dados adicionais: %p%</translation>
     </message>
     <message>
         <source>Error</source>
@@ -548,54 +583,80 @@
     </message>
     <message>
         <source>Warning</source>
-        <translation>Aviso</translation>
+        <translation>Atenção</translation>
     </message>
     <message>
         <source>Information</source>
         <translation>Informação</translation>
     </message>
     <message>
-        <source>Sent transaction</source>
-        <translation>Transacção enviada</translation>
+        <source>Date: %1
+</source>
+        <translation>Data: %1
+</translation>
     </message>
     <message>
-        <source>Incoming transaction</source>
-        <translation>Transacção recebida</translation>
+        <source>Amount: %1
+</source>
+        <translation>Quantia: %1
+</translation>
     </message>
     <message>
-        <source>Date: %1
-Amount: %2
-Type: %3
-Address: %4
+        <source>Type: %1
 </source>
-        <translation>Data: %1
-Quantia: %2
-Tipo: %3
-Endereço: %4
+        <translation>Tipo: %1
+</translation>
+    </message>
+    <message>
+        <source>Label: %1
+</source>
+        <translation>Rótulo: %1
+</translation>
+    </message>
+    <message>
+        <source>Address: %1
+</source>
+        <translation>Endereço: %1
 </translation>
     </message>
+    <message>
+        <source>Sent transaction</source>
+        <translation>Transação enviada</translation>
+    </message>
+    <message>
+        <source>Incoming transaction</source>
+        <translation>Transação recebida</translation>
+    </message>
+    <message>
+        <source>HD key generation is &lt;b&gt;enabled&lt;/b&gt;</source>
+        <translation>Geração de chave HD está &lt;b&gt;ativada&lt;/b&gt;</translation>
+    </message>
+    <message>
+        <source>HD key generation is &lt;b&gt;disabled&lt;/b&gt;</source>
+        <translation>Geração de chave HD está &lt;b&gt;desativada&lt;/b&gt;</translation>
+    </message>
     <message>
         <source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;unlocked&lt;/b&gt;</source>
-        <translation>A carteira encontra-se &lt;b&gt;cifrada&lt;/b&gt; e actualmente &lt;b&gt;desbloqueada&lt;/b&gt;</translation>
+        <translation>Carteira está &lt;b&gt;criptografada&lt;/b&gt; e atualmente &lt;b&gt;desbloqueada&lt;/b&gt;</translation>
     </message>
     <message>
-        <source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;unlocked&lt;/b&gt; for anonimization only</source>
-        <translation>A carteira encontra-se &lt;b&gt;cifrada&lt;/b&gt; e actualmente &lt;b&gt;desbloqueada&lt;/b&gt; somente para anonimização</translation>
+        <source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;unlocked&lt;/b&gt; for mixing only</source>
+        <translation>A carteira está &lt;b&gt;encriptada&lt;/b&gt; e atualmente &lt;b&gt;desbloqueada&lt;/b&gt; apenas para anonimização</translation>
     </message>
     <message>
         <source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;locked&lt;/b&gt;</source>
-        <translation>A carteira encontra-se &lt;b&gt;cifrada&lt;/b&gt; e actualmente &lt;b&gt;bloqueada&lt;/b&gt;</translation>
+        <translation>Carteira está &lt;b&gt;criptografada&lt;/b&gt; e atualmente &lt;b&gt;bloqueada&lt;/b&gt;</translation>
     </message>
 </context>
 <context>
     <name>ClientModel</name>
     <message>
-        <source>Total: %1 (DS compatible: %2 / Enabled: %3)</source>
-        <translation>Total: %1 (Compatível DS: %2 / Ligados: %3)</translation>
+        <source>Total: %1 (PS compatible: %2 / Enabled: %3)</source>
+        <translation>Total: %1 (Compatível c/ EP: %2 / Habilitado: %3)</translation>
     </message>
     <message>
         <source>Network Alert</source>
-        <translation>Alerta de Rede</translation>
+        <translation>Alerta da Rede</translation>
     </message>
 </context>
 <context>
@@ -612,17 +673,13 @@ Endereço: %4
         <source>Amount:</source>
         <translation>Quantia:</translation>
     </message>
-    <message>
-        <source>Priority:</source>
-        <translation>Prioridade:</translation>
-    </message>
     <message>
         <source>Fee:</source>
         <translation>Taxa:</translation>
     </message>
     <message>
         <source>Coin Selection</source>
-        <translation>Selecção de Moedas</translation>
+        <translation>Seleção da Moeda</translation>
     </message>
     <message>
         <source>Dust:</source>
@@ -630,31 +687,35 @@ Endereço: %4
     </message>
     <message>
         <source>After Fee:</source>
-        <translation>Com taxa:</translation>
+        <translation>Depois da taxa:</translation>
     </message>
     <message>
         <source>Change:</source>
-        <translation>Troco:</translation>
+        <translation>trocar</translation>
     </message>
     <message>
         <source>(un)select all</source>
-        <translation>(des)seleccionar todos</translation>
+        <translation>(de)selecionar tudo</translation>
+    </message>
+    <message>
+        <source>toggle lock state</source>
+        <translation>alternar estado de bloqueio</translation>
     </message>
     <message>
         <source>Tree mode</source>
-        <translation>Vista em árvore</translation>
+        <translation>Modo árvore</translation>
     </message>
     <message>
         <source>List mode</source>
-        <translation>Vista em lista</translation>
+        <translation>Modo lista</translation>
     </message>
     <message>
         <source>(1 locked)</source>
-        <translation>(1 bloqueada)</translation>
+        <translation>(1 travado)</translation>
     </message>
     <message>
         <source>Amount</source>
-        <translation>Quantia</translation>
+        <translation>Quantidade</translation>
     </message>
     <message>
         <source>Received with label</source>
@@ -665,8 +726,8 @@ Endereço: %4
         <translation>Recebido com endereço</translation>
     </message>
     <message>
-        <source>DS Rounds</source>
-        <translation>Rondas DS</translation>
+        <source>PS Rounds</source>
+        <translation>Rounds de EP</translation>
     </message>
     <message>
         <source>Date</source>
@@ -678,15 +739,11 @@ Endereço: %4
     </message>
     <message>
         <source>Confirmed</source>
-        <translation>Confirmada</translation>
-    </message>
-    <message>
-        <source>Priority</source>
-        <translation>Prioridade</translation>
+        <translation>Confirmado</translation>
     </message>
     <message>
         <source>Copy address</source>
-        <translation>Copiar endereço</translation>
+        <translation>Copie endereço</translation>
     </message>
     <message>
         <source>Copy label</source>
@@ -694,11 +751,11 @@ Endereço: %4
     </message>
     <message>
         <source>Copy amount</source>
-        <translation>Copiar quantia</translation>
+        <translation>Copie quantia</translation>
     </message>
     <message>
         <source>Copy transaction ID</source>
-        <translation>Copiar ID de transacção</translation>
+        <translation>Copie ID da transação</translation>
     </message>
     <message>
         <source>Lock unspent</source>
@@ -714,20 +771,16 @@ Endereço: %4
     </message>
     <message>
         <source>Copy fee</source>
-        <translation>Copiar taxa</translation>
+        <translation>Copie taxa</translation>
     </message>
     <message>
         <source>Copy after fee</source>
-        <translation>Copiar depois da taxa</translation>
+        <translation>Copiar pós taxa</translation>
     </message>
     <message>
         <source>Copy bytes</source>
         <translation>Copiar bytes</translation>
     </message>
-    <message>
-        <source>Copy priority</source>
-        <translation>Copiar prioridade</translation>
-    </message>
     <message>
         <source>Copy dust</source>
         <translation>Copiar poeira</translation>
@@ -737,61 +790,13 @@ Endereço: %4
         <translation>Copiar troco</translation>
     </message>
     <message>
-        <source>Non-anonymized input selected. &lt;b&gt;Darksend will be disabled.&lt;/b&gt;&lt;br&gt;&lt;br&gt;If you still want to use Darksend, please deselect all non-nonymized inputs first and then check Darksend checkbox again.</source>
-        <translation>Entrada não anonimizada seleccionada. &lt;b&gt;O Darksend será desactivado.&lt;/b&gt;&lt;br&gt;&lt;br&gt;Se deseja usar o Darksend, por favor desseleccione primeiro todas as entradas não anonimizadas e em seguida volte a marcar a opção Darksend.</translation>
-    </message>
-    <message>
-        <source>highest</source>
-        <translation>a-mais-alta</translation>
-    </message>
-    <message>
-        <source>higher</source>
-        <translation>mais-alta</translation>
-    </message>
-    <message>
-        <source>high</source>
-        <translation>alta</translation>
-    </message>
-    <message>
-        <source>medium-high</source>
-        <translation>média-alta</translation>
-    </message>
-    <message>
-        <source>Can vary +/- %1 duff(s) per input.</source>
-        <translation>Pode variar +/- %1 duff(s) por input</translation>
-    </message>
-    <message>
-        <source>n/a</source>
-        <translation>n/d</translation>
-    </message>
-    <message>
-        <source>medium</source>
-        <translation>média</translation>
-    </message>
-    <message>
-        <source>low-medium</source>
-        <translation>média-baixa</translation>
-    </message>
-    <message>
-        <source>low</source>
-        <translation>baixa</translation>
-    </message>
-    <message>
-        <source>lower</source>
-        <translation>mais-baixa</translation>
-    </message>
-    <message>
-        <source>lowest</source>
-        <translation>a-mais-baixa</translation>
+        <source>Please switch to "List mode" to use this function.</source>
+        <translation>Por favor alterne para "Modo lista" para usar essa função.</translation>
     </message>
     <message>
         <source>(%1 locked)</source>
         <translation>(%1 bloqueado)</translation>
     </message>
-    <message>
-        <source>none</source>
-        <translation>nenhuma</translation>
-    </message>
     <message>
         <source>yes</source>
         <translation>sim</translation>
@@ -801,28 +806,12 @@ Endereço: %4
         <translation>não</translation>
     </message>
     <message>
-        <source>This label turns red, if the transaction size is greater than 1000 bytes.</source>
-        <translation>Este rótulo fica vermelho se o tamanho da transacção exceder 1000 bytes.</translation>
-    </message>
-    <message>
-        <source>This means a fee of at least %1 per kB is required.</source>
-        <translation>Isto significa que é necessária uma taxa de pelo menos %1 por kB.</translation>
-    </message>
-    <message>
-        <source>Can vary +/- 1 byte per input.</source>
-        <translation>Pode variar +/- 1 byte por entrada.</translation>
+        <source>This label turns red if any recipient receives an amount smaller than the current dust threshold.</source>
+        <translation>Este texto fica vermelho se qualquer destinatário receber uma quantidade menor que que o dust.</translation>
     </message>
     <message>
-        <source>Transactions with higher priority are more likely to get included into a block.</source>
-        <translation>Transacções com prioridade mais alta tem uma maior probabilidade de ser incluídas num bloco.</translation>
-    </message>
-    <message>
-        <source>This label turns red, if the priority is smaller than "medium".</source>
-        <translation>Este rótulo fica vermelho se a prioridade for inferior a "média".</translation>
-    </message>
-    <message>
-        <source>This label turns red, if any recipient receives an amount smaller than %1.</source>
-        <translation>Este rótulo fica vermelho se algum destinatário receber uma quantia inferior a %1.</translation>
+        <source>Can vary +/- %1 duff(s) per input.</source>
+        <translation>Pode variar +/- %1 duff(s) por entrada.</translation>
     </message>
     <message>
         <source>(no label)</source>
@@ -836,72 +825,9 @@ Endereço: %4
         <source>(change)</source>
         <translation>(troco)</translation>
     </message>
-</context>
-<context>
-    <name>DarksendConfig</name>
-    <message>
-        <source>Configure Darksend</source>
-        <translation>Configurar Darksend</translation>
-    </message>
-    <message>
-        <source>Basic Privacy</source>
-        <translation>Privacidade Básica</translation>
-    </message>
-    <message>
-        <source>High Privacy</source>
-        <translation>Privacidade Alta</translation>
-    </message>
-    <message>
-        <source>Maximum Privacy</source>
-        <translation>Privacidade Máxima</translation>
-    </message>
-    <message>
-        <source>Please select a privacy level.</source>
-        <translation>Por favor seleccione um nível de privacidade.</translation>
-    </message>
-    <message>
-        <source>Use 2 separate masternodes to mix funds up to 1000 DASH</source>
-        <translation>Usar 2 masternodes distintos para misturar os fundos até 1000DRK</translation>
-    </message>
-    <message>
-        <source>Use 8 separate masternodes to mix funds up to 1000 DASH</source>
-        <translation>Usar 8 masternodes distintos para misturar os fundos até 1000DRK</translation>
-    </message>
-    <message>
-        <source>Use 16 separate masternodes</source>
-        <translation>Usar 16 masternodes</translation>
-    </message>
-    <message>
-        <source>This option is the quickest and will cost about ~0.025 DASH to anonymize 1000 DASH</source>
-        <translation>Esta opção é a mais rápida e irá custar cerca de ~0.025 DASH para anonimizar 1000 DASH</translation>
-    </message>
-    <message>
-        <source>This option is moderately fast and will cost about 0.05 DASH to anonymize 1000 DASH</source>
-        <translation>Esta opção é relativamente rápida e irá custar cerca de ~0.05 DASH para anonimizar 1000 DASH</translation>
-    </message>
-    <message>
-        <source>0.1 DASH per 1000 DASH you anonymize.</source>
-        <translation>0.1 DASH por cada 1000 DASH a anonimizar.</translation>
-    </message>
-    <message>
-        <source>This is the slowest and most secure option. Using maximum anonymity will cost</source>
-        <translation>Esta é a opção mais lenta e mais segura. Usando anonimização máxima irá custar</translation>
-    </message>
-    <message>
-        <source>Darksend Configuration</source>
-        <translation>Configuração Darksend</translation>
-    </message>
-    <message>
-        <source>Darksend was successfully set to basic (%1 and 2 rounds). You can change this at any time by opening Dash's configuration screen.</source>
-        <translation>Darksend foi colocado com sucesso no modo básico (%1 e 2 voltas). Pode mudar esta definição em qualquer altura abrindo o ecrã de configuração Dash.</translation>
-    </message>
-    <message>
-        <source>Darksend was successfully set to high (%1 and 8 rounds). You can change this at any time by opening Dash's configuration screen.</source>
-        <translation>Darksend foi colocado com sucesso no modo alto (%1 e 8 voltas). Pode mudar esta definição em qualquer altura abrindo o ecrã de configuração Dash.</translation>
-    </message>
     <message>
-        <source>Darksend was successfully set to maximum (%1 and 16 rounds). You can change this at any time by opening Dash's configuration screen.</source>
-        <translation>Darksend foi colocado com sucesso no modo máximo (%1 e 16 voltas). Pode mudar esta definição em qualquer altura abrindo o ecrã de configuração Dash.</translation>
+        <source>n/a</source>
+        <translation>n/d</translation>
     </message>
 </context>
 <context>
@@ -916,7 +842,7 @@ Endereço: %4
     </message>
     <message>
         <source>The label associated with this address list entry</source>
-        <translation>Rótulo associado com este item da lista de endereços</translation>
+        <translation>O rótulo associado a esta entrada na lista de endereços</translation>
     </message>
     <message>
         <source>&amp;Address</source>
@@ -924,11 +850,11 @@ Endereço: %4
     </message>
     <message>
         <source>The address associated with this address list entry. This can only be modified for sending addresses.</source>
-        <translation>O endereço associado com este item da lista. Isto só pode ser modificado para endereços de envio.</translation>
+        <translation>O endereço associado a esta lista de endereços de entrada. Isso só pode ser modificado para o envio de endereços.</translation>
     </message>
     <message>
         <source>New receiving address</source>
-        <translation>Novo endereço de recepção</translation>
+        <translation>Novo endereço de recebimento</translation>
     </message>
     <message>
         <source>New sending address</source>
@@ -936,7 +862,7 @@ Endereço: %4
     </message>
     <message>
         <source>Edit receiving address</source>
-        <translation>Editar endereço de recepção</translation>
+        <translation>Editar endereço de recebimento</translation>
     </message>
     <message>
         <source>Edit sending address</source>
@@ -944,26 +870,26 @@ Endereço: %4
     </message>
     <message>
         <source>The entered address "%1" is not a valid Dash address.</source>
-        <translation>O endereço introduzido "%1" não é um endereço Dash válido.</translation>
+        <translation>O endereço digitado "%1" não é um endereço válido.</translation>
     </message>
     <message>
         <source>The entered address "%1" is already in the address book.</source>
-        <translation>O endereço introduzido "%1" já se encontra no livro de endereços.</translation>
+        <translation>O endereço digitado "%1" já se encontra no catálogo de endereços.</translation>
     </message>
     <message>
         <source>Could not unlock wallet.</source>
-        <translation>Não foi possível desbloquear carteira.</translation>
+        <translation>Não foi possível desbloquear a carteira.</translation>
     </message>
     <message>
         <source>New key generation failed.</source>
-        <translation>Falhou a geração de nova chave.</translation>
+        <translation>Falha na geração de nova chave.</translation>
     </message>
 </context>
 <context>
     <name>FreespaceChecker</name>
     <message>
         <source>A new data directory will be created.</source>
-        <translation>Será criada uma nova pasta de dados.</translation>
+        <translation>Um novo diretório de dados será criado.</translation>
     </message>
     <message>
         <source>name</source>
@@ -971,23 +897,19 @@ Endereço: %4
     </message>
     <message>
         <source>Directory already exists. Add %1 if you intend to create a new directory here.</source>
-        <translation>A pasta já existe. Adicione %1 se desejar criar uma nova pasta aqui.</translation>
+        <translation>O diretório já existe. Adicione %1 se você pretende criar um novo diretório aqui.</translation>
     </message>
     <message>
         <source>Path already exists, and is not a directory.</source>
-        <translation>O caminho já existe e não é uma pasta.</translation>
+        <translation>Esta pasta já existe, e não é um diretório.</translation>
     </message>
     <message>
         <source>Cannot create data directory here.</source>
-        <translation>Não é possível criar a pasta de dados aqui.</translation>
+        <translation>Não é possível criar um diretório de dados aqui</translation>
     </message>
 </context>
 <context>
     <name>HelpMessageDialog</name>
-    <message>
-        <source>Dash Core</source>
-        <translation>Dash Core</translation>
-    </message>
     <message>
         <source>version</source>
         <translation>versão</translation>
@@ -997,46 +919,54 @@ Endereço: %4
         <translation>(%1-bit)</translation>
     </message>
     <message>
-        <source>About Dash Core</source>
-        <translation>Acerca do Dash Core</translation>
+        <source>About %1</source>
+        <translation>Sobre %1</translation>
     </message>
     <message>
         <source>Command-line options</source>
-        <translation>Opções de linha de comandos</translation>
+        <translation>opções da linha de comando</translation>
     </message>
     <message>
         <source>Usage:</source>
-        <translation>Utilização:</translation>
+        <translation>Uso:</translation>
     </message>
     <message>
         <source>command-line options</source>
-        <translation>opções de linha de comandos</translation>
+        <translation>opções da linha de comando</translation>
     </message>
     <message>
-        <source>UI options</source>
-        <translation>Opções do interface</translation>
+        <source>UI Options:</source>
+        <translation>opções da UI</translation>
     </message>
     <message>
-        <source>Choose data directory on startup (default: 0)</source>
-        <translation>Escolher pasta de dados no arranque (omissão: 0)</translation>
+        <source>Choose data directory on startup (default: %u)</source>
+        <translation>Escolher diretório de dados na inicialização (padrão: %u)</translation>
     </message>
     <message>
         <source>Set language, for example "de_DE" (default: system locale)</source>
-        <translation>Defina a linguagem, por exemplo "pt-PT" (omissão: linguagem do sistema)</translation>
+        <translation>Definir idioma, por exemplo "de_DE" (padrão: idioma do sistema)</translation>
     </message>
     <message>
         <source>Start minimized</source>
-        <translation>Arrancar minimizado</translation>
+        <translation>Iniciar minimizado</translation>
     </message>
     <message>
         <source>Set SSL root certificates for payment request (default: -system-)</source>
-        <translation>Definir certificados de raiz SSL para solicitações de pagamento (omissão: -sistema-)</translation>
+        <translation>Definir certificados de root SSL para requisições de pagamento (padrão: -sistema-)</translation>
     </message>
     <message>
-        <source>Show splash screen on startup (default: 1)</source>
-        <translation>Mostrar ecrã de boas vindas no arranque (omissão: 1)</translation>
+        <source>Show splash screen on startup (default: %u)</source>
+        <translation>Exibir tela de abertura na inicialização (padrão: %u)</translation>
     </message>
-</context>
+    <message>
+        <source>Reset all settings changed in the GUI</source>
+        <translation>Resetar todas as configuraçãoes do GUI</translation>
+    </message>
+    <message>
+        <source>PrivateSend information</source>
+        <translation>Informação de Envio&amp;Privado</translation>
+    </message>
+    </context>
 <context>
     <name>Intro</name>
     <message>
@@ -1044,32 +974,28 @@ Endereço: %4
         <translation>Bem-vindo</translation>
     </message>
     <message>
-        <source>Welcome to Dash Core.</source>
-        <translation>Bem-vindo ao Dash Core.</translation>
+        <source>Welcome to %1.</source>
+        <translation>Bem vindo ao %1</translation>
     </message>
     <message>
-        <source>As this is the first time the program is launched, you can choose where Dash Core will store its data.</source>
-        <translation>Como esta é a primeira vez que o programa é executado, pode escolher onde o cliente Dash Core irá guardar os seus dados.</translation>
+        <source>As this is the first time the program is launched, you can choose where %1 will store its data.</source>
+        <translation>Como essa é a primeira vez que o programa é executado, você pode escolher onde %1 armazenará seus dados.</translation>
     </message>
     <message>
-        <source>Dash Core will download and store a copy of the Dash block chain. At least %1GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</source>
-        <translation>O cliente Dash Core irá descarregar e guardar uma copia da cadeia de blocos Dash. Pelo menos %1GB de dados serão guardados nesta pasta e irá aumentar com o tempo. A carteira também ficará guardada nesta pasta.</translation>
+        <source>%1 will download and store a copy of the Dash block chain. At least %2GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</source>
+        <translation>%1 fará o download e armazenará uma cópia da cadeia de blocos do Dash. Pelo menos %2GB de dados serão armazenados neste diretório e crescerão com o tempo. A carteira também será armazenada neste diretório.</translation>
     </message>
     <message>
         <source>Use the default data directory</source>
-        <translation>Usar a pasta de dados por omissão</translation>
+        <translation>Use o diretório de dados padrão</translation>
     </message>
     <message>
         <source>Use a custom data directory:</source>
-        <translation>Usar uma pasta de dados personalizada</translation>
-    </message>
-    <message>
-        <source>Dash Core</source>
-        <translation>Dash Core</translation>
+        <translation>Use um diretório de dados personalizado:</translation>
     </message>
     <message>
         <source>Error: Specified data directory "%1" cannot be created.</source>
-        <translation>Erro: A pasta especificada "%1" não pode ser criada.</translation>
+        <translation>Erro: Diretório de dados "%1" não pode ser criado.</translation>
     </message>
     <message>
         <source>Error</source>
@@ -1077,228 +1003,506 @@ Endereço: %4
     </message>
     <message>
         <source>%1 GB of free space available</source>
-        <translation>%1 GB de espaço livre disponível</translation>
+        <translation>%1 GB de espaço livre disponível </translation>
     </message>
     <message>
         <source>(of %1 GB needed)</source>
-        <translation>(de %1 GB necessários)</translation>
+        <translation>(Mais de %1GB necessário)</translation>
     </message>
 </context>
 <context>
-    <name>OpenURIDialog</name>
+    <name>MasternodeList</name>
     <message>
-        <source>Open URI</source>
-        <translation>Abrir URI</translation>
+        <source>Form</source>
+        <translation>Formulário</translation>
     </message>
     <message>
-        <source>Open payment request from URI or file</source>
-        <translation>Abrir solicitação de pagamento a partir de um URI ou ficheiro</translation>
+        <source>My Masternodes</source>
+        <translation>Meus Masternodes</translation>
     </message>
     <message>
-        <source>URI:</source>
-        <translation>URI:</translation>
+        <source>Note: Status of your masternodes in local wallet can potentially be slightly incorrect.&lt;br /&gt;Always wait for wallet to sync additional data and then double check from another node&lt;br /&gt;if your masternode should be running but you still do not see "ENABLED" in "Status" field.</source>
+        <translation>Nota: O status de seus masternodes na carteira local pode potencialmente ser ligeiramente incorreto. &lt;br /&gt;Sempre espere que a carteira sincronize dados adicionais e depois cheque novamente de outro nó &lt;br /&gt;, se o seu masternode estiver em execução, mas você ainda não vê "ATIVADO" no campo "Status".</translation>
     </message>
     <message>
-        <source>Select payment request file</source>
-        <translation>Seleccionar ficheiro de solicitação de pagamento</translation>
+        <source>Alias</source>
+        <translation>Apelido</translation>
     </message>
     <message>
-        <source>Select payment request file to open</source>
-        <translation>Seleccionar ficheiro de solicitação de pagamento para abrir</translation>
+        <source>Address</source>
+        <translation>Endereço</translation>
     </message>
-</context>
-<context>
-    <name>OptionsDialog</name>
     <message>
-        <source>Options</source>
-        <translation>Opções</translation>
+        <source>Protocol</source>
+        <translation>Protocolo</translation>
     </message>
     <message>
-        <source>&amp;Main</source>
-        <translation>&amp;Geral</translation>
+        <source>Status</source>
+        <translation>Status</translation>
     </message>
     <message>
-        <source>Automatically start Dash after logging in to the system.</source>
-        <translation>Executar automaticamente o cliente Dash quando entrar no sistema.</translation>
+        <source>Active</source>
+        <translation>Ativo</translation>
     </message>
     <message>
-        <source>&amp;Start Dash on system login</source>
-        <translation>&amp;Iniciar o cliente Dash ao entrar no sistema</translation>
+        <source>Last Seen</source>
+        <translation>visto pela última vez</translation>
     </message>
     <message>
-        <source>Size of &amp;database cache</source>
-        <translation>Tamanho da &amp;cache de dados</translation>
+        <source>Payee</source>
+        <translation>Payee</translation>
     </message>
     <message>
-        <source>MB</source>
-        <translation>MB</translation>
+        <source>S&amp;tart alias</source>
+        <translation>Iniciar Apelido</translation>
     </message>
     <message>
-        <source>Number of script &amp;verification threads</source>
-        <translation>Número de processos de &amp;verificação de scripts</translation>
+        <source>Start &amp;all</source>
+        <translation>Iniciar tudo</translation>
     </message>
     <message>
-        <source>(0 = auto, &lt;0 = leave that many cores free)</source>
-        <translation>(0 = auto, &lt;0 = deixar este número de cores livres)</translation>
+        <source>Start &amp;MISSING</source>
+        <translation>Iniciar &amp;FALTANTES</translation>
     </message>
     <message>
-        <source>Darksend rounds to use</source>
-        <translation>Número de voltas Darksend a usar</translation>
+        <source>&amp;Update status</source>
+        <translation>&amp;Update status</translation>
     </message>
     <message>
-        <source>This amount acts as a threshold to turn off Darksend once it's reached.</source>
-        <translation>Esta quantia actua como um limite, a partir do qual o Darksend é desligado.</translation>
+        <source>Show additional Masternode information</source>
+        <translation>Mostrar informações adicionais do Masternode</translation>
     </message>
     <message>
-        <source>Amount of Dash to keep anonymized</source>
-        <translation>Quantia de Dash a manter anonimizada</translation>
+        <source>Show &amp;Info...</source>
+        <translation>Mostrar &amp;Info...</translation>
     </message>
     <message>
-        <source>W&amp;allet</source>
-        <translation>C&amp;arteira</translation>
+        <source>Status will be updated automatically in (sec):</source>
+        <translation>O estado será atualizado automaticamente em (seg):</translation>
     </message>
     <message>
-        <source>If you disable the spending of unconfirmed change, the change from a transaction&lt;br/&gt;cannot be used until that transaction has at least one confirmation.&lt;br/&gt;This also affects how your balance is computed.</source>
-        <translation>Se desabilitar a funcionalidade de gastar o troco não confirmado, este troco &lt;br/&gt; não poderá ser usado até que a transacção tenha pelo menos uma confirmação. &lt;br/&gt; Isto também afecta a maneira como o seu saldo é calculado.</translation>
+        <source>0</source>
+        <translation>0</translation>
     </message>
     <message>
-        <source>Accept connections from outside</source>
-        <translation>Aceitar ligações do exterior</translation>
+        <source>All Masternodes</source>
+        <translation>Todos os Masternodes</translation>
     </message>
     <message>
-        <source>Allow incoming connections</source>
-        <translation>Aceitar ligações de entrada</translation>
+        <source>Filter List:</source>
+        <translation>Filtrar Lista:</translation>
     </message>
     <message>
-        <source>Connect to the Dash network through a SOCKS5 proxy.</source>
-        <translation>Efectuar a ligação à rede Dash através de um proxy SOCKS5.</translation>
+        <source>Filter masternode list</source>
+        <translation>Filtrar lista de masternodes</translation>
     </message>
     <message>
-        <source>&amp;Connect through SOCKS5 proxy (default proxy):</source>
-        <translation>&amp;Ligar através de um proxy SOCKS5 (proxy por omissão)</translation>
+        <source>Node Count:</source>
+        <translation>Contagem de Masternodes</translation>
     </message>
     <message>
-        <source>Expert</source>
-        <translation>Avançado</translation>
+        <source>Start alias</source>
+        <translation>Iniciar apelido</translation>
     </message>
     <message>
-        <source>This setting determines the amount of individual masternodes that an input will be anonymized through.&lt;br/&gt;More rounds of anonymization gives a higher degree of privacy, but also costs more in fees.</source>
-        <translation>Esta opção determina o número de masternodes pelos quais uma entrada será anonimizada. &lt;br/&gt; Mais rondas de anonimização fornecem um maior grau de privacidade, mas também tem um custo mais elevado em taxas.</translation>
+        <source>Confirm masternode start</source>
+        <translation>Confirmar início de masternode</translation>
     </message>
     <message>
-        <source>Whether to show coin control features or not.</source>
-        <translation>Se deve mostrar as opções de coin control.</translation>
+        <source>Are you sure you want to start masternode %1?</source>
+        <translation>Tem certeza de que deseja iniciar o masternode %1?</translation>
     </message>
     <message>
-        <source>Enable coin &amp;control features</source>
-        <translation>Activar opções coin &amp;control</translation>
+        <source>Confirm all masternodes start</source>
+        <translation>Confirmar inicialização de todos masternodes</translation>
     </message>
     <message>
-        <source>&amp;Spend unconfirmed change</source>
-        <translation>&amp;Gastar troco não confirmado</translation>
+        <source>Are you sure you want to start ALL masternodes?</source>
+        <translation>Tem certeza que quer inicializar TODOS os masternodes?</translation>
     </message>
     <message>
-        <source>&amp;Network</source>
-        <translation>&amp;Rede</translation>
+        <source>Command is not available right now</source>
+        <translation>Esse comando não está disponível nesse momento</translation>
     </message>
     <message>
-        <source>Automatically open the Dash client port on the router. This only works when your router supports UPnP and it is enabled.</source>
-        <translation>Abrir automaticamente a porta do cliente Dash no router. Isto só funciona quando o seu router suporta UPnP e este está activo.</translation>
+        <source>You can't use this command until masternode list is synced</source>
+        <translation>Você não pode usar este comando até que a lista do masternode seja sincronizada</translation>
     </message>
     <message>
-        <source>Map port using &amp;UPnP</source>
-        <translation>Mapear porta usando &amp;UPnP</translation>
+        <source>Confirm missing masternodes start</source>
+        <translation>Confirmar inicialização dos masternodes faltantes</translation>
     </message>
     <message>
-        <source>Proxy &amp;IP:</source>
-        <translation>IP do proxy</translation>
+        <source>Are you sure you want to start MISSING masternodes?</source>
+        <translation>Tem certeza que quer inicializar os masternodes FALTANTES?</translation>
     </message>
     <message>
-        <source>IP address of the proxy (e.g. IPv4: 127.0.0.1 / IPv6: ::1)</source>
-        <translation>Endereço IP do proxy (ex. IPv4: 127.0.0.1 / IPv6: ::1)</translation>
+        <source>Additional information for Masternode %1</source>
+        <translation>Informações adicionais para o Masternode %1</translation>
     </message>
     <message>
-        <source>&amp;Port:</source>
-        <translation>&amp;Porta:</translation>
+        <source>Masternode Private Key</source>
+        <translation>Chave Privada Masternode</translation>
     </message>
     <message>
-        <source>Port of the proxy (e.g. 9050)</source>
-        <translation>Porta do servidor proxy (ex. 9050)</translation>
+        <source>Private Key</source>
+        <translation>Chave Privada</translation>
     </message>
     <message>
-        <source>&amp;Window</source>
-        <translation>&amp;Janela</translation>
+        <source>Collateral</source>
+        <translation>Garantia</translation>
     </message>
     <message>
-        <source>Show only a tray icon after minimizing the window.</source>
-        <translation>Somente mostrar o ícone no tabuleiro após minimizar aplicação</translation>
+        <source>IP</source>
+        <translation>IP</translation>
     </message>
     <message>
-        <source>&amp;Minimize to the tray instead of the taskbar</source>
-        <translation>&amp;Minimizar para o tabuleiro, em vez da barra de tarefas</translation>
+        <source>Version</source>
+        <translation>Versão</translation>
     </message>
     <message>
-        <source>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Quit in the menu.</source>
-        <translation>Minimizar em vez de fechar ao sair da aplicação. Quando esta opção está activada, a aplicação só será fechada quando seleccionar Sair no menu. </translation>
+        <source>Unknown</source>
+        <translation>Desconhecido</translation>
     </message>
     <message>
-        <source>M&amp;inimize on close</source>
-        <translation>M&amp;inimizar ao fechar</translation>
+        <source>Sentinel</source>
+        <translation>Sentinel</translation>
     </message>
+</context>
+<context>
+    <name>ModalOverlay</name>
     <message>
-        <source>&amp;Display</source>
-        <translation>&amp;Interface</translation>
+        <source>Form</source>
+        <translation>Forma</translation>
     </message>
     <message>
-        <source>User Interface &amp;language:</source>
-        <translation>&amp;Linguagem do interface:</translation>
+        <source>Recent transactions may not yet be visible, and therefore your wallet's balance might be incorrect. This information will be correct once your wallet has finished synchronizing with the Dash network, as detailed below.</source>
+        <translation>Transações recentes podem não estar visíveis ainda, portanto o seu saldo pode estar incorreto. Esta informação será corrigida assim que sua carteira for sincronizada com a rede, como detalhado abaixo.</translation>
     </message>
     <message>
-        <source>The user interface language can be set here. This setting will take effect after restarting Dash.</source>
-        <translation>A linguagem do interface pode ser definida aqui. Esta definição terá efeito depois de reiniciar a aplicação.</translation>
+        <source>Attempting to spend Dash that are affected by not-yet-displayed transactions will not be accepted by the network.</source>
+        <translation>A tentativa de gastar o Dash que é afetado por transações ainda não exibidas não será aceita pela rede.</translation>
     </message>
     <message>
-        <source>Language missing or translation incomplete? Help contributing translations here:
-https://www.transifex.com/projects/p/dash/</source>
-        <translation>Linguagem não encontrada ou tradução incompleta? Ajude a traduzir aqui:
-https://www.transifex.com/projects/p/dash/</translation>
+        <source>Number of blocks left</source>
+        <translation>Número de blocos que faltam</translation>
     </message>
     <message>
-        <source>User Interface Theme:</source>
-        <translation>Tema do interface:</translation>
+        <source>Unknown...</source>
+        <translation>Desconhecido...</translation>
     </message>
     <message>
-        <source>&amp;Unit to show amounts in:</source>
-        <translation>&amp;Unidade por omissão usada para mostrar as quantias:</translation>
+        <source>Last block time</source>
+        <translation>Hora do último bloco</translation>
     </message>
     <message>
-        <source>Choose the default subdivision unit to show in the interface and when sending coins.</source>
-        <translation>Escolha a unidade subdivisão por omissão para mostrar na interface e no envio de moedas.</translation>
+        <source>Progress</source>
+        <translation>Progresso</translation>
     </message>
     <message>
-        <source>Decimal digits</source>
-        <translation>Dígitos decimais</translation>
+        <source>Progress increase per hour</source>
+        <translation>Aumento do progresso por hora</translation>
     </message>
     <message>
-        <source>Third party URLs (e.g. a block explorer) that appear in the transactions tab as context menu items. %s in the URL is replaced by transaction hash. Multiple URLs are separated by vertical bar |.</source>
-        <translation>URLs de terceiros (ex. explorador de blocos) que aparecem no separador de transacções como itens do menu de contexto. %s no URL é substituído pelo hash da transacção. URLs múltiplos são separados pela barra vertical |.</translation>
+        <source>calculating...</source>
+        <translation>calculando</translation>
     </message>
     <message>
-        <source>Third party transaction URLs</source>
-        <translation>URLs de transacções de terceiros</translation>
+        <source>Estimated time left until synced</source>
+        <translation>Tempo estimado para sincronizar</translation>
     </message>
     <message>
-        <source>Active command-line options that override above options:</source>
-        <translation>Opções activas de linha de comandos que sobrescrevem as opções acima:</translation>
+        <source>Hide</source>
+        <translation>Esconder</translation>
     </message>
     <message>
-        <source>Reset all client options to default.</source>
-        <translation>Reiniciar todas as opções do cliente para os valores por omissão.</translation>
+        <source>Unknown. Syncing Headers (%1)...</source>
+        <translation>Desconhecido. Sincronizando cabeçalhos (%1)...</translation>
     </message>
+</context>
+<context>
+    <name>OpenURIDialog</name>
     <message>
-        <source>&amp;Reset Options</source>
-        <translation>&amp;Reiniciar Opções</translation>
-    </message>
+        <source>Open URI</source>
+        <translation>Abrir URI</translation>
+    </message>
+    <message>
+        <source>Open payment request from URI or file</source>
+        <translation>Cobrança aberta de URI ou arquivo</translation>
+    </message>
+    <message>
+        <source>URI:</source>
+        <translation>URI:</translation>
+    </message>
+    <message>
+        <source>Select payment request file</source>
+        <translation>Selecione o arquivo de cobrança</translation>
+    </message>
+    <message>
+        <source>Select payment request file to open</source>
+        <translation>Selecione o arquivo de cobrança para ser aberto</translation>
+    </message>
+</context>
+<context>
+    <name>OptionsDialog</name>
+    <message>
+        <source>Options</source>
+        <translation>Opções</translation>
+    </message>
+    <message>
+        <source>&amp;Main</source>
+        <translation>Principal</translation>
+    </message>
+    <message>
+        <source>Size of &amp;database cache</source>
+        <translation>Tamanho do banco de &amp;dados do cache</translation>
+    </message>
+    <message>
+        <source>MB</source>
+        <translation>MB</translation>
+    </message>
+    <message>
+        <source>Number of script &amp;verification threads</source>
+        <translation>Número de threads do script de &amp;verificação</translation>
+    </message>
+    <message>
+        <source>(0 = auto, &lt;0 = leave that many cores free)</source>
+        <translation>(0 = automático, &lt;0 = número de cores deixados livres)</translation>
+    </message>
+    <message>
+        <source>Amount of Dash to keep anonymized</source>
+        <translation>Quantidade de dashs para manter anonimizado</translation>
+    </message>
+    <message>
+        <source>W&amp;allet</source>
+        <translation>C&amp;arteira</translation>
+    </message>
+    <message>
+        <source>Show additional tab listing all your masternodes in first sub-tab&lt;br/&gt;and all masternodes on the network in second sub-tab.</source>
+        <translation>Mostre uma guia adicional listando todos os seus masternodes na primeira subposição &lt;br/&gt; e todos os masternodes na rede na segunda sub-guia.</translation>
+    </message>
+    <message>
+        <source>Show Masternodes Tab</source>
+        <translation>Mostrar a aba Masternodes</translation>
+    </message>
+    <message>
+        <source>Show additional information and buttons for PrivateSend on overview screen.</source>
+        <translation>Mostre informações adicionais e botões para PrivateSend na tela.</translation>
+    </message>
+    <message>
+        <source>Enable advanced PrivateSend interface</source>
+        <translation>Ativar interface avançada PrivateSend</translation>
+    </message>
+    <message>
+        <source>Show warning dialog when PrivateSend detects that wallet has very low number of keys left.</source>
+        <translation>Mostrar mensagem de aviso quando o PrivateSend detectar que a carteira tem um número muito baixo de chaves restantes.</translation>
+    </message>
+    <message>
+        <source>Warn if PrivateSend is running out of keys</source>
+        <translation>Avisar se o PrivateSend estiver sem as chaves</translation>
+    </message>
+    <message>
+        <source>Whether to use experimental PrivateSend mode with multiple mixing sessions per block.&lt;br/&gt;Note: You must use this feature carefully.&lt;br/&gt;Make sure you always have recent wallet (auto)backup in a safe place!</source>
+        <translation>Se você deseja usar o modo PrivateSend com várias sessões de mixagem por bloco. &lt;br/&gt; Nota: Você deve usar este recurso com cuidado. &lt;br/&gt; Certifique-se de ter sempre um backup  recente de sua  carteira em um local seguro.</translation>
+    </message>
+    <message>
+        <source>Enable PrivateSend &amp;multi-session</source>
+        <translation>Ativar PrivateSend &amp;multi-sessão</translation>
+    </message>
+    <message>
+        <source>If you disable the spending of unconfirmed change, the change from a transaction&lt;br/&gt;cannot be used until that transaction has at least one confirmation.&lt;br/&gt;This also affects how your balance is computed.</source>
+        <translation>Se você desabilitar o gasto de um troco não confirmado, o troco da transação&lt;br/&gt;não poderá ser utilizado até a transação ter pelo menos uma confirmação.&lt;br/&gt;Isso também afeta seu saldo computado.</translation>
+    </message>
+    <message>
+        <source>PrivateSend rounds to use</source>
+        <translation>PrivateSend rodadas para usar</translation>
+    </message>
+    <message>
+        <source>This amount acts as a threshold to turn off PrivateSend once it's reached.</source>
+        <translation>Esse valor atua como um limite para desativar o PrivateSend assim que ele for atingido.</translation>
+    </message>
+    <message>
+        <source>Automatically open the Dash Core client port on the router. This only works when your router supports UPnP and it is enabled.</source>
+        <translation>Abre automaticamente a porta para o cliente Dash Core no roteador. Essa função apenas funciona se o seu roteador oferece suporte a UPnP e a opção estiver habilitada.</translation>
+    </message>
+    <message>
+        <source>Accept connections from outside</source>
+        <translation>Aceitar conexões externas</translation>
+    </message>
+    <message>
+        <source>Allow incoming connections</source>
+        <translation>Permitir conexões de entrada</translation>
+    </message>
+    <message>
+        <source>Connect to the Dash network through a SOCKS5 proxy.</source>
+        <translation>Conecta à rede Dash através de um proxy SOCKS5.</translation>
+    </message>
+    <message>
+        <source>&amp;Connect through SOCKS5 proxy (default proxy):</source>
+        <translation>&amp;Conectar via proxy SOCKS5 (proxy padrão):</translation>
+    </message>
+    <message>
+        <source>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Exit in the menu.</source>
+        <translation>Minimizar em vez de sair do aplicativo quando a janela for fechada. Quando esta opção está ativada, o aplicativo só será fechado selecionando Sair no menu.</translation>
+    </message>
+    <message>
+        <source>Third party URLs (e.g. a block explorer) that appear in the transactions tab as context menu items.&lt;br/&gt;%s in the URL is replaced by transaction hash. Multiple URLs are separated by vertical bar |.</source>
+        <translation>As URLs de terceiros (por exemplo, um explorador de blocos) que aparecem na guia de transações como itens de menu de contexto. &lt;br/&gt;%s na URL são substituídos por hash de transação. Vários URLs são separados pela barra vertical |.</translation>
+    </message>
+    <message>
+        <source>Expert</source>
+        <translation>Avançado</translation>
+    </message>
+    <message>
+        <source>This setting determines the amount of individual masternodes that an input will be anonymized through.&lt;br/&gt;More rounds of anonymization gives a higher degree of privacy, but also costs more in fees.</source>
+        <translation>Esta configuração determina a quantidade de Masternodes individuais através dos quais um input será anonimizado. &lt;br/&gt;Mais rodadas de anonimização garantem um maior grau de privacidade, mas também custarão mais em fees.</translation>
+    </message>
+    <message>
+        <source>Whether to show coin control features or not.</source>
+        <translation>Mostrar ou não opções de controle da moeda.</translation>
+    </message>
+    <message>
+        <source>Automatically start %1 after logging in to the system.</source>
+        <translation>Executar o %1 automaticamente ao iniciar o sistema.</translation>
+    </message>
+    <message>
+        <source>&amp;Start %1 on system login</source>
+        <translation>&amp;Iniciar %1 ao fazer login no sistema</translation>
+    </message>
+    <message>
+        <source>Enable coin &amp;control features</source>
+        <translation>Habilitar opções de &amp;controle de moedas</translation>
+    </message>
+    <message>
+        <source>&amp;Spend unconfirmed change</source>
+        <translation>Ga&amp;star mudança não confirmada</translation>
+    </message>
+    <message>
+        <source>&amp;Network</source>
+        <translation>Rede</translation>
+    </message>
+    <message>
+        <source>Map port using &amp;UPnP</source>
+        <translation>Mapear porta usando &amp;UPnP</translation>
+    </message>
+    <message>
+        <source>Proxy &amp;IP:</source>
+        <translation>&amp;IP do proxy:</translation>
+    </message>
+    <message>
+        <source>IP address of the proxy (e.g. IPv4: 127.0.0.1 / IPv6: ::1)</source>
+        <translation>Endereço de IP do proxy (e.g. IPv4: 127.0.0.1 / IPv6: ::1)</translation>
+    </message>
+    <message>
+        <source>&amp;Port:</source>
+        <translation>&amp;Porta:</translation>
+    </message>
+    <message>
+        <source>Port of the proxy (e.g. 9050)</source>
+        <translation>Porta do serviço de proxy (ex. 9050)</translation>
+    </message>
+    <message>
+        <source>Used for reaching peers via:</source>
+        <translation>Usado para alcançar peers através de:</translation>
+    </message>
+    <message>
+        <source>Shows, if the supplied default SOCKS5 proxy is used to reach peers via this network type.</source>
+        <translation>Mostra, se o proxy SOCKS5 padrão fornecido for usado para alcançar pares através deste tipo de rede.</translation>
+    </message>
+    <message>
+        <source>IPv4</source>
+        <translation>IPv4</translation>
+    </message>
+    <message>
+        <source>IPv6</source>
+        <translation>IPv6</translation>
+    </message>
+    <message>
+        <source>Tor</source>
+        <translation>Tor</translation>
+    </message>
+    <message>
+        <source>Connect to the Dash network through a separate SOCKS5 proxy for Tor hidden services.</source>
+        <translation>Conecte-se à rede Dash através de um proxy SOCKS5 separado para serviços ocultos Tor</translation>
+    </message>
+    <message>
+        <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services:</source>
+        <translation>Usar proxy SOCKS5 separado para alcançar pares via serviços ocultos Tor:</translation>
+    </message>
+    <message>
+        <source>&amp;Window</source>
+        <translation>&amp;Janela</translation>
+    </message>
+    <message>
+        <source>&amp;Hide the icon from the system tray.</source>
+        <translation>&amp;Ocultar o ícone da bandeja do sistema.</translation>
+    </message>
+    <message>
+        <source>Hide tray icon</source>
+        <translation>Ocultar ícone da bandeja</translation>
+    </message>
+    <message>
+        <source>Show only a tray icon after minimizing the window.</source>
+        <translation>Mostrar apenas um ícone na bandeja ao minimizar a janela.</translation>
+    </message>
+    <message>
+        <source>&amp;Minimize to the tray instead of the taskbar</source>
+        <translation>&amp;Minimizar para a bandeja em vez da barra de tarefas.</translation>
+    </message>
+    <message>
+        <source>M&amp;inimize on close</source>
+        <translation>M&amp;inimizar ao sair</translation>
+    </message>
+    <message>
+        <source>&amp;Display</source>
+        <translation>&amp;Mostrar</translation>
+    </message>
+    <message>
+        <source>User Interface &amp;language:</source>
+        <translation>&amp;Língua da interface com usuário:</translation>
+    </message>
+    <message>
+        <source>The user interface language can be set here. This setting will take effect after restarting %1.</source>
+        <translation>O idioma da interface pode ser definido aqui. Essa configuração terá efeito após reiniciar o %1.</translation>
+    </message>
+    <message>
+        <source>Language missing or translation incomplete? Help contributing translations here:
+https://www.transifex.com/projects/p/dash/</source>
+        <translation>Idioma inexistente ou tradução incompleta? Contribua com a tradução aqui:
+https://www.transifex.com/projects/p/dash/</translation>
+    </message>
+    <message>
+        <source>User Interface Theme:</source>
+        <translation>Tema da Interface do usuário:</translation>
+    </message>
+    <message>
+        <source>&amp;Unit to show amounts in:</source>
+        <translation>&amp;Unidade usada para mostrar quantidades:</translation>
+    </message>
+    <message>
+        <source>Choose the default subdivision unit to show in the interface and when sending coins.</source>
+        <translation>Escolha a unidade padrão de subdivisão para interface mostrar quando enviar bitcoins.</translation>
+    </message>
+    <message>
+        <source>Decimal digits</source>
+        <translation>Dígitos decimais</translation>
+    </message>
+    <message>
+        <source>Third party transaction URLs</source>
+        <translation>URLs da transação de terceiros</translation>
+    </message>
+    <message>
+        <source>Active command-line options that override above options:</source>
+        <translation>Ativa as opções de linha de comando que sobrescreve as opções acima:</translation>
+    </message>
+    <message>
+        <source>Reset all client options to default.</source>
+        <translation>Redefinir todas as opções do cliente para opções padrão.</translation>
+    </message>
+    <message>
+        <source>&amp;Reset Options</source>
+        <translation>&amp;Redefinir opções</translation>
+    </message>
     <message>
         <source>&amp;OK</source>
         <translation>&amp;OK</translation>
@@ -1309,27 +1513,27 @@ https://www.transifex.com/projects/p/dash/</translation>
     </message>
     <message>
         <source>default</source>
-        <translation>omissão</translation>
+        <translation>padrão</translation>
     </message>
     <message>
         <source>none</source>
-        <translation>nenhum</translation>
+        <translation>Nenhum</translation>
     </message>
     <message>
         <source>Confirm options reset</source>
-        <translation>Confirme reinicialização das opções</translation>
+        <translation>Confirmar redefinição de opções</translation>
     </message>
     <message>
         <source>Client restart required to activate changes.</source>
-        <translation>Para activar as alterações é necessário reiniciar o cliente.</translation>
+        <translation>Reinicialização do aplicativo necessária para efetivar alterações.</translation>
     </message>
     <message>
-        <source>Client will be shutdown, do you want to proceed?</source>
-        <translation>O cliente será fechado, deseja continuar?</translation>
+        <source>Client will be shut down. Do you want to proceed?</source>
+        <translation>O programa será encerrado. Deseja continuar?</translation>
     </message>
     <message>
         <source>This change would require a client restart.</source>
-        <translation>Esta alteração necessita que o cliente seja reiniciado.</translation>
+        <translation>Essa mudança requer uma reinicialização do aplicativo.</translation>
     </message>
     <message>
         <source>The supplied proxy address is invalid.</source>
@@ -1340,11 +1544,11 @@ https://www.transifex.com/projects/p/dash/</translation>
     <name>OverviewPage</name>
     <message>
         <source>Form</source>
-        <translation>De</translation>
+        <translation>Formulário</translation>
     </message>
     <message>
         <source>The displayed information may be out of date. Your wallet automatically synchronizes with the Dash network after a connection is established, but this process has not completed yet.</source>
-        <translation>A informação mostrada pode estar desactualizada. A sua carteira sincroniza automaticamente com a rede Dash assim que for estabelecida uma ligação, mas este processo ainda não terminou.</translation>
+        <translation>A informação exibida pode estar desatualizada. Sua wallet é sincronizada automaticamente com a rede Dash tão logo uma conexão se estabeleça, entrtanto esse processo ainda não está completo.</translation>
     </message>
     <message>
         <source>Available:</source>
@@ -1352,7 +1556,7 @@ https://www.transifex.com/projects/p/dash/</translation>
     </message>
     <message>
         <source>Your current spendable balance</source>
-        <translation>O seu saldo disponível</translation>
+        <translation>Seu saldo atual spendable</translation>
     </message>
     <message>
         <source>Pending:</source>
@@ -1360,7 +1564,7 @@ https://www.transifex.com/projects/p/dash/</translation>
     </message>
     <message>
         <source>Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance</source>
-        <translation>Total de transacções que ainda não foram confirmadas e não contam para o saldo disponível</translation>
+        <translation>Total de transações que ainda têm de ser confirmados, e ainda não contam para o equilíbrio spendable</translation>
     </message>
     <message>
         <source>Immature:</source>
@@ -1368,7 +1572,7 @@ https://www.transifex.com/projects/p/dash/</translation>
     </message>
     <message>
         <source>Mined balance that has not yet matured</source>
-        <translation>Saldo minado que ainda não atingiu a maturidade</translation>
+        <translation>Saldo minerado que ainda não maturou</translation>
     </message>
     <message>
         <source>Balances</source>
@@ -1376,11 +1580,11 @@ https://www.transifex.com/projects/p/dash/</translation>
     </message>
     <message>
         <source>Unconfirmed transactions to watch-only addresses</source>
-        <translation>Transações não confirmadas para endereços somente de visualização</translation>
+        <translation>Transações não confirmadas para endereços apenas para exibição</translation>
     </message>
     <message>
         <source>Mined balance in watch-only addresses that has not yet matured</source>
-        <translation>Saldo minado que ainda não atingiu a maturidade em endereços somente de visualização</translation>
+        <translation>Saldo minerado em endereços somente para observação que ainda não maturou</translation>
     </message>
     <message>
         <source>Total:</source>
@@ -1388,107 +1592,115 @@ https://www.transifex.com/projects/p/dash/</translation>
     </message>
     <message>
         <source>Your current total balance</source>
-        <translation>O seu saldo total</translation>
+        <translation>Seu saldo total atual</translation>
     </message>
     <message>
         <source>Current total balance in watch-only addresses</source>
-        <translation>Saldo total em endereços somente de visualização</translation>
+        <translation>Saldo total atual em endereços de monitoração</translation>
     </message>
     <message>
         <source>Watch-only:</source>
-        <translation>Somente de visualização:</translation>
+        <translation>Observar apenas:</translation>
     </message>
     <message>
         <source>Your current balance in watch-only addresses</source>
-        <translation>O seu saldo actual em endereços somente de visualização</translation>
+        <translation>Seu saldo atual em endereços somente de monitoração</translation>
     </message>
     <message>
         <source>Spendable:</source>
-        <translation>Disponível:</translation>
+        <translation>Saldo disponível:</translation>
+    </message>
+    <message>
+        <source>PrivateSend</source>
+        <translation>PrivateSend</translation>
     </message>
     <message>
         <source>Status:</source>
-        <translation>Estado:</translation>
+        <translation>Status:</translation>
     </message>
     <message>
         <source>Enabled/Disabled</source>
-        <translation>Activado/Desactivado</translation>
+        <translation>Ativado/Desativado</translation>
     </message>
     <message>
         <source>Completion:</source>
-        <translation>Progresso:</translation>
+        <translation>Conclusão:</translation>
+    </message>
+    <message>
+        <source>Try to manually submit a PrivateSend request.</source>
+        <translation>Tente enviar manualmente uma solicitação PrivateSend.</translation>
+    </message>
+    <message>
+        <source>Reset the current status of PrivateSend (can interrupt PrivateSend if it's in the process of Mixing, which can cost you money!)</source>
+        <translation>Reseta o estado atual do PrivateSend (pode interromper o PrivateSend se este estiver em processo de Mixing, isso pode te custar dinheiro!)</translation>
+    </message>
+    <message>
+        <source>Information about PrivateSend and Mixing</source>
+        <translation>Informações sobre PrivateSend e Mixing</translation>
     </message>
     <message>
-        <source>Darksend Balance:</source>
-        <translation>Saldo Darksend:</translation>
+        <source>Info</source>
+        <translation>Info</translation>
     </message>
     <message>
         <source>Amount and Rounds:</source>
-        <translation>Quantia e Voltas:</translation>
+        <translation>Quantia e Rodadas:</translation>
     </message>
     <message>
         <source>0 DASH / 0 Rounds</source>
-        <translation>0 DASH / 0 Voltas</translation>
+        <translation>0 DASH / 0 Rodadas</translation>
     </message>
     <message>
         <source>Submitted Denom:</source>
-        <translation>Denominação submetida:</translation>
+        <translation>Denom Submetido:</translation>
     </message>
     <message>
         <source>n/a</source>
-        <translation>n/d</translation>
-    </message>
-    <message>
-        <source>Darksend</source>
-        <translation>Darksend</translation>
+        <translation>n/a</translation>
     </message>
     <message>
         <source>Recent transactions</source>
-        <translation>Transacções recentes</translation>
+        <translation>Transações recentes</translation>
     </message>
     <message>
         <source>Start/Stop Mixing</source>
-        <translation>Iniciar/Parar Mistura</translation>
+        <translation>Iniciar/Interronper o Mixing</translation>
+    </message>
+    <message>
+        <source>PrivateSend Balance:</source>
+        <translation>Saldo PrivateSend</translation>
     </message>
     <message>
         <source>The denominations you submitted to the Masternode.&lt;br&gt;To mix, other users must submit the exact same denominations.</source>
-        <translation>As denominações que foram submetidas para o Masternode.&lt;br&gt;Para misturar, outros utilizadores terão que submeter denominações iguais.</translation>
+        <translation>As denominações submetidas por você ao Masternode.&lt;br/&gt;Para a realização do mixing, outros usuários precisam submeter exatamente as mesmas denominações.</translation>
     </message>
     <message>
         <source>(Last Message)</source>
         <translation>(Última Mensagem)</translation>
     </message>
-    <message>
-        <source>Try to manually submit a Darksend request.</source>
-        <translation>Tentar submeter um pedido Darksend manualmente.</translation>
-    </message>
     <message>
         <source>Try Mix</source>
-        <translation>Tentar Mistura</translation>
-    </message>
-    <message>
-        <source>Reset the current status of Darksend (can interrupt Darksend if it's in the process of Mixing, which can cost you money!)</source>
-        <translation>Reinicia o estado actual Darksend (pode interromper o Darksend mesmo quando em processo de Mistura, o que pode ter custos!)</translation>
+        <translation>Tentar o Mixing</translation>
     </message>
     <message>
         <source>Reset</source>
-        <translation>Reiniciar</translation>
+        <translation>Resetar</translation>
     </message>
     <message>
         <source>out of sync</source>
-        <translation>fora de sincronia</translation>
+        <translation>Sem sincronia</translation>
     </message>
     <message>
-        <source>Disabled</source>
-        <translation>Desactivado</translation>
+        <source>Automatic backups are disabled, no mixing available!</source>
+        <translation>Backups automáticos estão desabilitados, Mixing não disponível!</translation>
     </message>
     <message>
-        <source>Start Darksend Mixing</source>
-        <translation>Iniciar Mistura Darksend</translation>
+        <source>Start Mixing</source>
+        <translation>Iniciar o Mixing</translation>
     </message>
     <message>
-        <source>Stop Darksend Mixing</source>
-        <translation>Parar Mistura Darksend</translation>
+        <source>Stop Mixing</source>
+        <translation>Interromper o Mixing</translation>
     </message>
     <message>
         <source>No inputs detected</source>
@@ -1496,76 +1708,112 @@ https://www.transifex.com/projects/p/dash/</translation>
     </message>
     <message numerus="yes">
         <source>%n Rounds</source>
-        <translation><numerusform>%n volta</numerusform><numerusform>%n voltas</numerusform></translation>
+        <translation><numerusform>%n Rodadas</numerusform><numerusform>%n Rodadas</numerusform></translation>
+    </message>
+    <message>
+        <source>Found enough compatible inputs to anonymize %1</source>
+        <translation>Encontrou entradas compatíveis para anonimizar %1</translation>
     </message>
     <message>
         <source>Not enough compatible inputs to anonymize &lt;span style='color:red;'&gt;%1&lt;/span&gt;,&lt;br&gt;will anonymize &lt;span style='color:red;'&gt;%2&lt;/span&gt; instead</source>
-        <translation>Número insuficiente de entradas para anonimizar &lt;span style='color:red;'&gt;%1&lt;/span&gt;,&lt;br/&gt;a anonimizar &lt;span style='color:red;'&gt;%2&lt;/span&gt; em alternativa</translation>
+        <translation>Não há entradas compatíveis suficientes para anonimizar &lt;span style='color:red;'&gt;%1&lt;/span&gt;,&lt;br&gt; vamos anonimizar &lt;span style='color:red;'&gt;%2&lt;/span&gt; em vez disso</translation>
     </message>
     <message>
         <source>Overall progress</source>
-        <translation>Progresso Geral</translation>
+        <translation>Progresso geral</translation>
     </message>
     <message>
         <source>Denominated</source>
         <translation>Denominado</translation>
     </message>
+    <message>
+        <source>Mixed</source>
+        <translation>Misturado</translation>
+    </message>
     <message>
         <source>Anonymized</source>
         <translation>Anonimizado</translation>
     </message>
     <message numerus="yes">
         <source>Denominated inputs have %5 of %n rounds on average</source>
-        <translation><numerusform>Entradas denominadas tem %5 de %n volta em média</numerusform><numerusform>Entradas denominadas tem %5 de %n voltas em média</numerusform></translation>
+        <translation><numerusform>Os insumos denominados têm %5 de %n rodadas em média</numerusform><numerusform>Os insumos denominados têm %5 de %n rodadas em média</numerusform></translation>
     </message>
     <message>
-        <source>Found enough compatible inputs to anonymize %1</source>
-        <translation>Encontradas entradas suficientes para anonimizar %1</translation>
+        <source>keys left: %1</source>
+        <translation>Chaves restantes: %1</translation>
     </message>
     <message>
-        <source>Mixed</source>
-        <translation>Misturado</translation>
+        <source>Disabled</source>
+        <translation>Desativado</translation>
+    </message>
+    <message>
+        <source>Very low number of keys left since last automatic backup!</source>
+        <translation>Número muito baixo de chaves deixadas desde o último backup automático!</translation>
+    </message>
+    <message>
+        <source>We are about to create a new automatic backup for you, however &lt;span style='color:red;'&gt; you should always make sure you have backups saved in some safe place&lt;/span&gt;!</source>
+        <translation>Estamos prestes a criar um novo backup automático para você, no entanto&lt;span style='color:red;'&gt;, você deve sempre garantir que você tenha backups salvos em algum lugar seguro&lt;/span&gt;!</translation>
+    </message>
+    <message>
+        <source>WARNING! Something went wrong on automatic backup</source>
+        <translation>ALERTA! Algo de errado ocorreu com o backup automático</translation>
+    </message>
+    <message>
+        <source>ERROR! Failed to create automatic backup</source>
+        <translation>ERRO! Falha ao criar o backup automático</translation>
+    </message>
+    <message>
+        <source>Mixing is disabled, please close your wallet and fix the issue!</source>
+        <translation>Mixing está desabilitado, por favor feche sua carteira e corrija o problema!</translation>
     </message>
     <message>
         <source>Enabled</source>
-        <translation>Activado</translation>
+        <translation>Ativado</translation>
+    </message>
+    <message>
+        <source>see debug.log for details.</source>
+        <translation>Consulte debug.log para obter detalhes.</translation>
+    </message>
+    <message>
+        <source>WARNING! Failed to replenish keypool, please unlock your wallet to do so.</source>
+        <translation>ATENÇÃO! Falha ao repor o keypool, desbloqueie sua carteira para fazer isso.</translation>
     </message>
     <message>
-        <source>Last Darksend message:
+        <source>Last PrivateSend message:
 </source>
-        <translation>Última mensagem Darksend:
+        <translation>Última mensagem do PrivateSend:
 </translation>
     </message>
     <message>
         <source>N/A</source>
-        <translation>N/D</translation>
+        <translation>N/A</translation>
     </message>
     <message>
-        <source>Darksend was successfully reset.</source>
-        <translation>Darksend foi reposto com sucesso.</translation>
+        <source>PrivateSend was successfully reset.</source>
+        <translation>PrivateSend foi reiniciado com sucesso.</translation>
     </message>
     <message>
-        <source>If you don't want to see internal Darksend fees/transactions select "Most Common" as Type on the "Transactions" tab.</source>
-        <translation>Se não deseja visualizar as taxas/transacções internas Darksend seleccione "Mais Comuns" como Tipo no separador "Transacções"</translation>
+        <source>If you don't want to see internal PrivateSend fees/transactions select "Most Common" as Type on the "Transactions" tab.</source>
+        <translation>Se você não quiser ver as taxas / transações internas do PrivateSend selecione "Mais comum" como Tipo na guia "Transações".</translation>
     </message>
     <message>
-        <source>Darksend requires at least %1 to use.</source>
-        <translation>Darksend necessita de pelo menos %1 para ser usado.</translation>
+        <source>PrivateSend requires at least %1 to use.</source>
+        <translation>PrivateSend requer pelo menos %1 para usar.</translation>
     </message>
     <message>
-        <source>Wallet is locked and user declined to unlock. Disabling Darksend.</source>
-        <translation>A carteira está bloqueada e o utilizador recusou o desbloqueamento. A desactivar Darksend.</translation>
+        <source>Wallet is locked and user declined to unlock. Disabling PrivateSend.</source>
+        <translation>A Carteira está bloqueada e o usuário recusou a desbloquear. Desativando o PrivateSend.</translation>
     </message>
 </context>
 <context>
     <name>PaymentServer</name>
     <message>
         <source>Payment request error</source>
-        <translation>Erro na solicitação de pagamento</translation>
+        <translation>Erro no pedido de pagamento</translation>
     </message>
     <message>
         <source>Cannot start dash: click-to-pay handler</source>
-        <translation>Não é possível iniciar o dash: click-to-pay handler</translation>
+        <translation>Não foi possível iniciar Dash: manipulador click-to-pay</translation>
     </message>
     <message>
         <source>URI handling</source>
@@ -1573,11 +1821,7 @@ https://www.transifex.com/projects/p/dash/</translation>
     </message>
     <message>
         <source>Payment request fetch URL is invalid: %1</source>
-        <translation>URL de solicitação de pagamento é inválido: %1</translation>
-    </message>
-    <message>
-        <source>Payment request file handling</source>
-        <translation>Manipulação de ficheiros de solicitação de pagamento</translation>
+        <translation>URL de cobrança é inválida: %1</translation>
     </message>
     <message>
         <source>Invalid payment address %1</source>
@@ -1585,93 +1829,113 @@ https://www.transifex.com/projects/p/dash/</translation>
     </message>
     <message>
         <source>URI cannot be parsed! This can be caused by an invalid Dash address or malformed URI parameters.</source>
-        <translation>O URI não pode ser carregado! Isto pode ser causado por um endereço Dash inválido ou parâmetros do URI incorrectos.</translation>
+        <translation>A URI não pode ser analisada! Isto pode ser causado por um endereço inválido ou um parâmetro URI malformado.</translation>
+    </message>
+    <message>
+        <source>Payment request file handling</source>
+        <translation>Manipulação de arquivo de cobrança</translation>
     </message>
     <message>
         <source>Payment request file cannot be read! This can be caused by an invalid payment request file.</source>
-        <translation>O ficheiro de solicitação de pagamento não pode ser aberto ou processado! Isto pode ser causado por um ficheiro de solicitação de pagamento inválido.</translation>
+        <translation>Arquivo de pedido de pagamento não pode ser lido! Isto pode ser causado por uma requisição de pagamento inválida.</translation>
     </message>
     <message>
         <source>Payment request rejected</source>
-        <translation>Solicitação de pagamento rejeitada</translation>
+        <translation>Pedido de pagamento rejeitado</translation>
     </message>
     <message>
         <source>Payment request network doesn't match client network.</source>
-        <translation>A rede da solicitação de pagamento não corresponde à rede do cliente.</translation>
+        <translation>Rede do pedido de pagamento não corresponde rede do cliente.</translation>
     </message>
     <message>
-        <source>Payment request has expired.</source>
-        <translation>A solicitação de pagamento expirou.</translation>
+        <source>Payment request expired.</source>
+        <translation>Pedido de pagamento expirado.</translation>
     </message>
     <message>
         <source>Payment request is not initialized.</source>
-        <translation>A solicitação de pagamento não está inicializada.</translation>
+        <translation>A requisição do pagamento não foi inicializada.</translation>
     </message>
     <message>
         <source>Unverified payment requests to custom payment scripts are unsupported.</source>
-        <translation>Solicitações de pagamento não verificadas para scripts de pagamento personalizados não são suportadas.</translation>
+        <translation>Pedidos de pagamento não verificados para scripts de pagamento personalizados não são suportados.</translation>
+    </message>
+    <message>
+        <source>Invalid payment request.</source>
+        <translation>Pedido de pagamento inválido</translation>
     </message>
     <message>
         <source>Requested payment amount of %1 is too small (considered dust).</source>
-        <translation>A quantia %1 para solicitação de pagamento é demasiado pequena (considerada poeira)</translation>
+        <translation>Valor do pagamento solicitado de %1 é muito pequeno (Considerado poeira).</translation>
     </message>
     <message>
         <source>Refund from %1</source>
-        <translation>Devolução de %1</translation>
+        <translation>Reembolso de %1</translation>
     </message>
     <message>
         <source>Payment request %1 is too large (%2 bytes, allowed %3 bytes).</source>
-        <translation>A solicitação de pagamento %1 é demasiado grande (%2 bytes, permitido %3 bytes).</translation>
-    </message>
-    <message>
-        <source>Payment request DoS protection</source>
-        <translation>Protecção DoS à solicitação de pagamento</translation>
+        <translation>Pedido de pagamento %1 é muito grande (%2 bytes, permitido %3 bytes).</translation>
     </message>
     <message>
         <source>Error communicating with %1: %2</source>
-        <translation>Erro de comunicação com %1: %2</translation>
+        <translation>Erro na comunicação com %1: %2</translation>
     </message>
     <message>
         <source>Payment request cannot be parsed!</source>
-        <translation>A solicitação de pagamento não pode ser carregada!</translation>
+        <translation>Pedido de pagamento não pode ser analisado!</translation>
     </message>
     <message>
         <source>Bad response from server %1</source>
-        <translation>Resposta inválida do servidor %1</translation>
+        <translation>Má resposta do servidor %1</translation>
     </message>
     <message>
         <source>Network request error</source>
-        <translation>Erro no pedido à rede</translation>
+        <translation>Erro de solicitação de rede</translation>
     </message>
     <message>
         <source>Payment acknowledged</source>
-        <translation>Pagamento confirmado</translation>
+        <translation>Pagamento reconhecido</translation>
     </message>
 </context>
 <context>
     <name>PeerTableModel</name>
     <message>
-        <source>Address/Hostname</source>
-        <translation>Endereço/Servidor</translation>
+        <source>NodeId</source>
+        <translation>ID do nó</translation>
+    </message>
+    <message>
+        <source>Node/Service</source>
+        <translation>Nó/Serviço</translation>
     </message>
     <message>
         <source>User Agent</source>
-        <translation>Agente de Usuário</translation>
+        <translation>User Agent</translation>
     </message>
     <message>
-        <source>Ping Time</source>
-        <translation>Tempo de Ping</translation>
+        <source>Ping</source>
+        <translation>Ping</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
+    <message>
+        <source>Dash Core</source>
+        <translation>Dash Core</translation>
+    </message>
+    <message>
+        <source>%1 didn't yet exit safely...</source>
+        <translation>%1 ainda não terminou com segurança...</translation>
+    </message>
+    <message>
+        <source>Error reading masternode configuration file: %1</source>
+        <translation>Erro ao ler o arquivo de configuração do masternode: %1</translation>
+    </message>
     <message>
         <source>Amount</source>
         <translation>Quantia</translation>
     </message>
     <message>
         <source>Enter a Dash address (e.g. %1)</source>
-        <translation>Insira um endereço Dash (ex. %1)</translation>
+        <translation>Informe um endereço Dash (ex: %1)</translation>
     </message>
     <message>
         <source>%1 d</source>
@@ -1689,26 +1953,103 @@ https://www.transifex.com/projects/p/dash/</translation>
         <source>%1 s</source>
         <translation>%1 s</translation>
     </message>
-    <message>
-        <source>NETWORK</source>
-        <translation>REDE</translation>
-    </message>
-    <message>
-        <source>UNKNOWN</source>
-        <translation>DESCONHECIDO</translation>
-    </message>
     <message>
         <source>None</source>
         <translation>Nenhum</translation>
     </message>
     <message>
         <source>N/A</source>
-        <translation>N/D</translation>
+        <translation>N/A</translation>
     </message>
     <message>
         <source>%1 ms</source>
         <translation>%1 ms</translation>
     </message>
+    <message numerus="yes">
+        <source>%n second(s)</source>
+        <translation><numerusform>%n segundos</numerusform><numerusform>%n segundos</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>%n minute(s)</source>
+        <translation><numerusform>%n minutos</numerusform><numerusform>%n minutos</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>%n hour(s)</source>
+        <translation><numerusform>%n horas</numerusform><numerusform>%n horas</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>%n day(s)</source>
+        <translation><numerusform>%n dias</numerusform><numerusform>%n dias</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>%n week(s)</source>
+        <translation><numerusform>%n semanas</numerusform><numerusform>%n semanas</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>%n year(s)</source>
+        <translation><numerusform>%n anos</numerusform><numerusform>%n anos</numerusform></translation>
+    </message>
+    <message>
+        <source>%1 and %2</source>
+        <translation>%1 e %2</translation>
+    </message>
+    <message>
+        <source>unknown</source>
+        <translation>desconhecido</translation>
+    </message>
+</context>
+<context>
+    <name>QObject::QObject</name>
+    <message>
+        <source>Error: Specified data directory "%1" does not exist.</source>
+        <translation>Erro: Diretório de dados especificado "%1" não existe.</translation>
+    </message>
+    <message>
+        <source>Error: Cannot parse configuration file: %1. Only use key=value syntax.</source>
+        <translation>Erro: Não foi possível interpretar arquivo de configuração: %1. Utilize apenas a sintaxe chave=valor.</translation>
+    </message>
+    <message>
+        <source>Error: %1</source>
+        <translation>Erro: %1</translation>
+    </message>
+</context>
+<context>
+    <name>QRDialog</name>
+    <message>
+        <source>QR-Code Title</source>
+        <translation>QR-Code Titulo</translation>
+    </message>
+    <message>
+        <source>QR Code</source>
+        <translation>Código QR</translation>
+    </message>
+    <message>
+        <source>&amp;Save Image...</source>
+        <translation>&amp;Salvar Imagem...</translation>
+    </message>
+    <message>
+        <source>Error creating QR Code.</source>
+        <translation>Erro ao criar o QR Code.</translation>
+    </message>
+</context>
+<context>
+    <name>QRGeneralImageWidget</name>
+    <message>
+        <source>&amp;Save Image...</source>
+        <translation>&amp;Salvar Imagem...</translation>
+    </message>
+    <message>
+        <source>&amp;Copy Image</source>
+        <translation>&amp;Copiar imagem</translation>
+    </message>
+    <message>
+        <source>Save QR Code</source>
+        <translation>Salvar código QR</translation>
+    </message>
+    <message>
+        <source>PNG Image (*.png)</source>
+        <translation>Imagem PNG (*.png)</translation>
+    </message>
 </context>
 <context>
     <name>QRImageWidget</name>
@@ -1718,11 +2059,11 @@ https://www.transifex.com/projects/p/dash/</translation>
     </message>
     <message>
         <source>&amp;Copy Image</source>
-        <translation>&amp;Copiar Imagem</translation>
+        <translation>&amp;Copiar imagem</translation>
     </message>
     <message>
         <source>Save QR Code</source>
-        <translation>Guardar código QR</translation>
+        <translation>Salvar código QR</translation>
     </message>
     <message>
         <source>PNG Image (*.png)</source>
@@ -1737,7 +2078,7 @@ https://www.transifex.com/projects/p/dash/</translation>
     </message>
     <message>
         <source>&amp;Information</source>
-        <translation>&amp;Information</translation>
+        <translation>&amp;Informação</translation>
     </message>
     <message>
         <source>General</source>
@@ -1747,21 +2088,13 @@ https://www.transifex.com/projects/p/dash/</translation>
         <source>Name</source>
         <translation>Nome</translation>
     </message>
-    <message>
-        <source>Client name</source>
-        <translation>Nome do Cliente</translation>
-    </message>
     <message>
         <source>N/A</source>
-        <translation>N/D</translation>
+        <translation>N/A</translation>
     </message>
     <message>
         <source>Number of connections</source>
-        <translation>Número de ligações</translation>
-    </message>
-    <message>
-        <source>Open the Dash debug log file from the current data directory. This can take a few seconds for large log files.</source>
-        <translation>Abrir o ficheiro de registo de depuração Dash a partir da pasta de dados actual. Para grandes ficheiros de registo pode demorar alguns segundos.</translation>
+        <translation>Número de conexões</translation>
     </message>
     <message>
         <source>&amp;Open</source>
@@ -1769,7 +2102,7 @@ https://www.transifex.com/projects/p/dash/</translation>
     </message>
     <message>
         <source>Startup time</source>
-        <translation>Hora de inicialização</translation>
+        <translation>Horário de inicialização</translation>
     </message>
     <message>
         <source>Network</source>
@@ -1777,51 +2110,55 @@ https://www.transifex.com/projects/p/dash/</translation>
     </message>
     <message>
         <source>Last block time</source>
-        <translation>Data do último bloco</translation>
+        <translation>Horário do último bloco</translation>
     </message>
     <message>
         <source>Debug log file</source>
-        <translation>Ficheiro de registo de depuração</translation>
-    </message>
-    <message>
-        <source>Using OpenSSL version</source>
-        <translation>A usar versão do OpenSSL</translation>
-    </message>
-    <message>
-        <source>Build date</source>
-        <translation>Data de compilação</translation>
+        <translation>Arquivo de log de Depuração</translation>
     </message>
     <message>
         <source>Current number of blocks</source>
-        <translation>Número actual de blocos</translation>
+        <translation>Quantidade atual de blocos</translation>
     </message>
     <message>
         <source>Client version</source>
-        <translation>Versão do Cliente</translation>
+        <translation>Versão do cliente</translation>
     </message>
     <message>
         <source>Using BerkeleyDB version</source>
-        <translation>A usar a versão do BerkeleyDB</translation>
+        <translation>Usando BerkeleyDB versão</translation>
     </message>
     <message>
         <source>Block chain</source>
-        <translation>Cadeia de blocos</translation>
+        <translation>Corrente de blocos</translation>
     </message>
     <message>
         <source>Number of Masternodes</source>
         <translation>Número de Masternodes</translation>
     </message>
+    <message>
+        <source>Memory Pool</source>
+        <translation>Pool de memória</translation>
+    </message>
+    <message>
+        <source>Current number of transactions</source>
+        <translation>Número atual de transações</translation>
+    </message>
+    <message>
+        <source>Memory usage</source>
+        <translation>Uso de memória</translation>
+    </message>
     <message>
         <source>&amp;Console</source>
-        <translation>&amp;Consola</translation>
+        <translation>&amp;Console</translation>
     </message>
     <message>
         <source>Clear console</source>
-        <translation>Limpar consola</translation>
+        <translation>Limpar console</translation>
     </message>
     <message>
         <source>&amp;Network Traffic</source>
-        <translation>&amp;Tráfego de Rede</translation>
+        <translation>Tráfico de Rede</translation>
     </message>
     <message>
         <source>&amp;Clear</source>
@@ -1841,111 +2178,151 @@ https://www.transifex.com/projects/p/dash/</translation>
     </message>
     <message>
         <source>&amp;Peers</source>
-        <translation>&amp;Nós</translation>
+        <translation>&amp;Peers</translation>
+    </message>
+    <message>
+        <source>Banned peers</source>
+        <translation>Nós banidos</translation>
     </message>
     <message>
         <source>Select a peer to view detailed information.</source>
-        <translation>Seleccione um nó para visualizar informação detalhada.</translation>
+        <translation>Selecione um ponto para ver informações detalhadas.</translation>
+    </message>
+    <message>
+        <source>Whitelisted</source>
+        <translation>Lista branca</translation>
     </message>
     <message>
         <source>Direction</source>
-        <translation>Direcção</translation>
+        <translation>Direção</translation>
     </message>
     <message>
         <source>Version</source>
         <translation>Versão</translation>
     </message>
+    <message>
+        <source>Starting Block</source>
+        <translation>Bloco inicial</translation>
+    </message>
+    <message>
+        <source>Synced Headers</source>
+        <translation>Cabeçalhos Sincronizados</translation>
+    </message>
+    <message>
+        <source>Synced Blocks</source>
+        <translation>Blocos Sincronizados</translation>
+    </message>
+    <message>
+        <source>Wallet Path</source>
+        <translation>Caminho da carteira</translation>
+    </message>
     <message>
         <source>User Agent</source>
-        <translation>Agente de Usuário</translation>
+        <translation>Agente de Usuário </translation>
     </message>
     <message>
-        <source>Services</source>
-        <translation>Serviços</translation>
+        <source>Datadir</source>
+        <translation>Datadir</translation>
+    </message>
+    <message>
+        <source>Open the %1 debug log file from the current data directory. This can take a few seconds for large log files.</source>
+        <translation>Abrir o arquivo de log de depuração do %1 localizado no diretório atual de dados. Isso pode levar alguns segundos para arquivos de log grandes.</translation>
+    </message>
+    <message>
+        <source>Decrease font size</source>
+        <translation>Diminuir o tamanho da fonte</translation>
     </message>
     <message>
-        <source>Starting Height</source>
-        <translation>Altura Inicial</translation>
+        <source>Increase font size</source>
+        <translation>Aumentar o tamanho da fonte</translation>
     </message>
     <message>
-        <source>Sync Height</source>
-        <translation>Altura de Sincronização</translation>
+        <source>Services</source>
+        <translation>Serviços</translation>
     </message>
     <message>
         <source>Ban Score</source>
-        <translation>Pontuação para Banir</translation>
+        <translation>Banir pontuação</translation>
     </message>
     <message>
         <source>Connection Time</source>
-        <translation>Tempo de Ligação</translation>
+        <translation>Tempo de conexão</translation>
     </message>
     <message>
         <source>Last Send</source>
-        <translation>Última Enviado</translation>
+        <translation>Último envio</translation>
     </message>
     <message>
         <source>Last Receive</source>
-        <translation>Último Recebido</translation>
+        <translation>Último recebido</translation>
     </message>
     <message>
-        <source>Bytes Sent</source>
-        <translation>Bytes Enviados</translation>
+        <source>Ping Time</source>
+        <translation>Tempo de Ping</translation>
     </message>
     <message>
-        <source>Bytes Received</source>
-        <translation>Bytes Recebidos</translation>
+        <source>The duration of a currently outstanding ping.</source>
+        <translation>A duração de um ping excepcional no momento.</translation>
     </message>
     <message>
-        <source>Ping Time</source>
-        <translation>Tempo de Ping</translation>
+        <source>Ping Wait</source>
+        <translation>Espera de ping</translation>
+    </message>
+    <message>
+        <source>Min Ping</source>
+        <translation>Ping min</translation>
+    </message>
+    <message>
+        <source>Time Offset</source>
+        <translation>Offset de tempo</translation>
     </message>
     <message>
         <source>&amp;Wallet Repair</source>
-        <translation>&amp;Reparar Carteira</translation>
+        <translation>&amp;Reparar carteira</translation>
     </message>
     <message>
         <source>Salvage wallet</source>
-        <translation>Recuperar Carteira</translation>
+        <translation>Salvar wallet</translation>
     </message>
     <message>
         <source>Rescan blockchain files</source>
-        <translation>Reprocessar ficheiros da cadeia de blocos</translation>
+        <translation>reescanear o blockchain</translation>
     </message>
     <message>
         <source>Recover transactions 1</source>
-        <translation>Recuperar transacções 1</translation>
+        <translation>Recuperar transações 1</translation>
     </message>
     <message>
         <source>Recover transactions 2</source>
-        <translation>Recuperar transacções 2</translation>
+        <translation>Recuperar transações 2</translation>
     </message>
     <message>
         <source>Upgrade wallet format</source>
-        <translation>Actualizar o formato da carteira</translation>
+        <translation>Atualizar formato da carteira</translation>
     </message>
     <message>
         <source>The buttons below will restart the wallet with command-line options to repair the wallet, fix issues with corrupt blockhain files or missing/obsolete transactions.</source>
-        <translation>Os botões abaixo irão reiniciar a carteira passando parâmetros da linha de comandos para reparar a carteira, corrigir problemas com a cadeia de blocos ou com transacções em falta ou obsoletas.</translation>
+        <translation>Os botões abaixo reiniciarão a carteira com opções de linha de comando para reparar a carteira, corrigir problemas com arquivos blockhain corrompidos ou transações ausentes/obsoletas.</translation>
     </message>
     <message>
         <source>-salvagewallet: Attempt to recover private keys from a corrupt wallet.dat.</source>
-        <translation>-salvagewallet: Tenta recuperar as chaves privadas a partir de um ficheiro wallet.dat corrompido.</translation>
+        <translation>-salvagewallet: tenta recuperar chaves privadas de um wallet.dat corrompido.</translation>
     </message>
     <message>
         <source>-rescan: Rescan the block chain for missing wallet transactions.</source>
-        <translation>-rescan: Examina novamente a cadeia de blocos para encontrar transacções inexistentes na carteira</translation>
+        <translation>-rescan: Reinicia a cadeia de bloco para transações de carteira ausentes.</translation>
     </message>
     <message>
         <source>-zapwallettxes=1: Recover transactions from blockchain (keep meta-data, e.g. account owner).</source>
-        <translation>-zapwallettxes=1: Recupera transacções da cadeia de blocos (mantendo os meta-dados, ex. dono da conta)</translation>
+        <translation>-zapwallettxes = 1: Recupere as transações do blockchain (mantenha metadados, por exemplo, proprietário da conta).</translation>
     </message>
     <message>
         <source>-zapwallettxes=2: Recover transactions from blockchain (drop meta-data).</source>
-        <translation>-zapwallettxes=2: Recupera transacções da cadeia de blocos (apagando os meta-dados)</translation>
+        <translation>-zapwallettxes = 2: Recupere as transações do blockchain (elimine metadados).</translation>
     </message>
     <message>
         <source>-upgradewallet: Upgrade wallet to latest format on startup. (Note: this is NOT an update of the wallet itself!)</source>
-        <translation>-upgradewallet: Actualiza a carteira para o formato mais recente quando arranca. (Nota: Isto NÃO é uma actualização da carteira em si!)</translation>
+        <translation>-upgradewallet: Atualize a carteira para o formato mais recente na inicialização. (Nota: esta não é uma atualização da carteira em si!)</translation>
     </message>
     <message>
         <source>Wallet repair options.</source>
@@ -1953,31 +2330,67 @@ https://www.transifex.com/projects/p/dash/</translation>
     </message>
     <message>
         <source>Rebuild index</source>
-        <translation>Reconstruir indexação</translation>
+        <translation> Reconstrução de Índice</translation>
     </message>
     <message>
         <source>-reindex: Rebuild block chain index from current blk000??.dat files.</source>
-        <translation>-reindex: Reconstroi o índice da cadeia de blocos a partir dos ficheiros actuais blk000??.dat.</translation>
+        <translation>-reindex: Reconstrói o índice de cadeia de blocos a partir dos arquivos atuais de dados blk000??.dat .</translation>
     </message>
     <message>
-        <source>In:</source>
-        <translation>Entrada:</translation>
+        <source>&amp;Disconnect</source>
+        <translation>&amp;Desconectar</translation>
     </message>
     <message>
-        <source>Out:</source>
-        <translation>Saída:</translation>
+        <source>Ban for</source>
+        <translation>Banir por</translation>
+    </message>
+    <message>
+        <source>1 &amp;hour</source>
+        <translation>1 &amp;hora</translation>
+    </message>
+    <message>
+        <source>1 &amp;day</source>
+        <translation>1 &amp;dia</translation>
+    </message>
+    <message>
+        <source>1 &amp;week</source>
+        <translation>1 &amp;semana</translation>
+    </message>
+    <message>
+        <source>1 &amp;year</source>
+        <translation>1 &amp;ano</translation>
+    </message>
+    <message>
+        <source>&amp;Unban</source>
+        <translation>&amp;Desbanir</translation>
     </message>
     <message>
-        <source>Welcome to the Dash RPC console.</source>
-        <translation>Bem-vindo à consola RPC Dash</translation>
+        <source>Welcome to the %1 RPC console.</source>
+        <translation>Bem-vindo ao console RPC do %1.</translation>
     </message>
     <message>
         <source>Use up and down arrows to navigate history, and &lt;b&gt;Ctrl-L&lt;/b&gt; to clear screen.</source>
-        <translation>Use as setas para cima / baixo para navegar no histórico, e &lt;b&gt;Ctrl-L&lt;/b&gt; para limpar o ecran.</translation>
+        <translation>Use as setas para cima e para baixo para navegar pelo histórico, e &lt;b&gt;Ctrl-L&lt;/b&gt; para limpar a tela.</translation>
     </message>
     <message>
         <source>Type &lt;b&gt;help&lt;/b&gt; for an overview of available commands.</source>
-        <translation>Digite &lt;b&gt;help&lt;/b&gt; para ter uma visão global dos comandos disponíveis.</translation>
+        <translation>Digite &lt;b&gt;help&lt;/b&gt; para uma visão geral dos comandos disponíveis.</translation>
+    </message>
+    <message>
+        <source>WARNING: Scammers have been active, telling users to type commands here, stealing their wallet contents. Do not use this console without fully understanding the ramification of a command.</source>
+        <translation>AVISO: Os golpistas estão ativos, dizendo aos usuários para digitar comandos aqui, roubando o conteúdo da carteira. Não use este console sem compreender totalmente o contexto de um comando.</translation>
+    </message>
+    <message>
+        <source>In:</source>
+        <translation>Entrada:</translation>
+    </message>
+    <message>
+        <source>Out:</source>
+        <translation>Saída:</translation>
+    </message>
+    <message>
+        <source>Network activity disabled</source>
+        <translation>Atividade da rede disativada</translation>
     </message>
     <message>
         <source>%1 B</source>
@@ -1995,9 +2408,13 @@ https://www.transifex.com/projects/p/dash/</translation>
         <source>%1 GB</source>
         <translation>%1 GB</translation>
     </message>
+    <message>
+        <source>(node id: %1)</source>
+        <translation>(id do nó: %1)</translation>
+    </message>
     <message>
         <source>via %1</source>
-        <translation>via %1</translation>
+        <translation>por %1</translation>
     </message>
     <message>
         <source>never</source>
@@ -2012,43 +2429,47 @@ https://www.transifex.com/projects/p/dash/</translation>
         <translation>Saída</translation>
     </message>
     <message>
-        <source>Unknown</source>
-        <translation>Desconhecido</translation>
+        <source>Yes</source>
+        <translation>sim</translation>
     </message>
     <message>
-        <source>Fetching...</source>
-        <translation>Carregando...</translation>
+        <source>No</source>
+        <translation>não</translation>
+    </message>
+    <message>
+        <source>Unknown</source>
+        <translation>Desconhecido</translation>
     </message>
 </context>
 <context>
     <name>ReceiveCoinsDialog</name>
     <message>
         <source>Reuse one of the previously used receiving addresses.&lt;br&gt;Reusing addresses has security and privacy issues.&lt;br&gt;Do not use this unless re-generating a payment request made before.</source>
-        <translation>Reutilizar um dos endereços de recebimento usados anteriormente. &lt;br&gt; Reutilizar endereços tem problemas de segurança e privacidade. &lt;br&gt;Não use isto a menos que se trate de uma reutilização de um pedido de pagamento feito anteriormente.</translation>
+        <translation>Reutilize um dos endereços de recebimento usados anteriormente.&lt;br&gt; Os endereços que estão sendo usados têm problemas de segurança e privacidade. &lt;br&gt;Não use isso, a menos que você gere novamente uma solicitação de pagamento feita anteriormente.</translation>
     </message>
     <message>
         <source>R&amp;euse an existing receiving address (not recommended)</source>
-        <translation>R&amp;eutilizar um endereço de recebimento existente (não recomendado)</translation>
+        <translation>R&amp;eutilize um endereço de recebimento (não recomendado)</translation>
     </message>
     <message>
         <source>An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Dash network.</source>
-        <translation>Mensagem opcional para anexar à solicitação de pagamento, que será mostrada quando a solicitação for aberta. Nota: A mensagem não será enviada com o pagamento através da rede Dash.</translation>
+        <translation>Uma mensagem opcional que será anexada na cobrança e será mostrada quando ela for aberta. Nota: A mensagem não será enviada com o pagamento pela rede Dash.</translation>
     </message>
     <message>
         <source>&amp;Message:</source>
-        <translation>&amp;Mensagem:</translation>
+        <translation>&amp;Mensagem</translation>
     </message>
     <message>
         <source>An optional label to associate with the new receiving address.</source>
-        <translation>Rótulo opcional para associar com o novo endereço de recebimento.</translation>
+        <translation>Um marcador opcional para associar ao novo endereço de recebimento.</translation>
     </message>
     <message>
         <source>An optional message to attach to the payment request, which will be displayed when the request is opened.&lt;br&gt;Note: The message will not be sent with the payment over the Dash network.</source>
-        <translation>Mensagem opcional para anexar à solicitação de pagamento, que será mostrada quando a solicitação for aberta. &lt;br&gt;Nota: A mensagem não será enviada com o pagamento através da rede Dash.</translation>
+        <translation>Uma mensagem opcional para anexar à solicitação de pagamento, que será exibida quando a solicitação for aberta. &lt;br&gt;Observação: a mensagem não será enviada com o pagamento pela rede do Dash.</translation>
     </message>
     <message>
         <source>Use this form to request payments. All fields are &lt;b&gt;optional&lt;/b&gt;.</source>
-        <translation>Utilize este formulário para solicitar pagamentos. Todos os campos são &lt;b&gt;opcionais&lt;/b&gt;.</translation>
+        <translation>Use esse formulário para fazer cobranças. Todos os campos são &lt;b&gt;opcionais&lt;/b&gt;.</translation>
     </message>
     <message>
         <source>&amp;Label:</source>
@@ -2056,31 +2477,35 @@ https://www.transifex.com/projects/p/dash/</translation>
     </message>
     <message>
         <source>An optional amount to request. Leave this empty or zero to not request a specific amount.</source>
-        <translation>Quantia opcional a solicitar. Deixar vazio ou zero para não solicitar uma quantia específica.</translation>
+        <translation>Uma quantia opcional para cobrar. Deixe vazio ou em branco se o pagador puder especificar a quantia.</translation>
     </message>
     <message>
         <source>&amp;Amount:</source>
-        <translation>&amp;Quantia</translation>
+        <translation>Qu&amp;antia:</translation>
     </message>
     <message>
         <source>&amp;Request payment</source>
-        <translation>&amp;Pedir pagamento</translation>
+        <translation>&amp;Requisitar Pagamento</translation>
     </message>
     <message>
         <source>Clear all fields of the form.</source>
-        <translation>Limpar todos os campos do formulário.</translation>
+        <translation>Limpa todos os campos do formulário.</translation>
     </message>
     <message>
         <source>Clear</source>
         <translation>Limpar</translation>
     </message>
+    <message>
+        <source>Request InstantSend</source>
+        <translation>Solicitar o InstantSend</translation>
+    </message>
     <message>
         <source>Requested payments history</source>
-        <translation>Histórico de solicitações de pagamento</translation>
+        <translation>Histórico de cobranças</translation>
     </message>
     <message>
         <source>Show the selected request (does the same as double clicking an entry)</source>
-        <translation>Mostrar a solicitação seleccionada (igual a clicar duas vezes)</translation>
+        <translation>Mostra a cobrança selecionada (o mesmo que clicar duas vezes em um registro)</translation>
     </message>
     <message>
         <source>Show</source>
@@ -2088,12 +2513,16 @@ https://www.transifex.com/projects/p/dash/</translation>
     </message>
     <message>
         <source>Remove the selected entries from the list</source>
-        <translation>Remover as entradas seleccionadas da lista</translation>
+        <translation>Remove o registro selecionado da lista</translation>
     </message>
     <message>
         <source>Remove</source>
         <translation>Remover</translation>
     </message>
+    <message>
+        <source>Copy URI</source>
+        <translation>Copiar URI</translation>
+    </message>
     <message>
         <source>Copy label</source>
         <translation>Copiar rótulo</translation>
@@ -2111,7 +2540,7 @@ https://www.transifex.com/projects/p/dash/</translation>
     <name>ReceiveRequestDialog</name>
     <message>
         <source>QR Code</source>
-        <translation>QR Code</translation>
+        <translation>Código QR</translation>
     </message>
     <message>
         <source>Copy &amp;URI</source>
@@ -2119,7 +2548,7 @@ https://www.transifex.com/projects/p/dash/</translation>
     </message>
     <message>
         <source>Copy &amp;Address</source>
-        <translation>Copiar &amp;Endereço</translation>
+        <translation>&amp;Copiar Endereço</translation>
     </message>
     <message>
         <source>&amp;Save Image...</source>
@@ -2127,11 +2556,11 @@ https://www.transifex.com/projects/p/dash/</translation>
     </message>
     <message>
         <source>Request payment to %1</source>
-        <translation>Solicitar pagamento a %1</translation>
+        <translation>Pedido de pagamento para %1</translation>
     </message>
     <message>
         <source>Payment information</source>
-        <translation>Informação de pagamento</translation>
+        <translation>Informação do pagamento</translation>
     </message>
     <message>
         <source>URI</source>
@@ -2151,15 +2580,27 @@ https://www.transifex.com/projects/p/dash/</translation>
     </message>
     <message>
         <source>Message</source>
-        <translation>Mensagem</translation>
+        <translation>mensagem</translation>
+    </message>
+    <message>
+        <source>InstantSend</source>
+        <translation>EnvioInstantâneo</translation>
+    </message>
+    <message>
+        <source>Yes</source>
+        <translation>Sim</translation>
+    </message>
+    <message>
+        <source>No</source>
+        <translation>Não</translation>
     </message>
     <message>
         <source>Resulting URI too long, try to reduce the text for label / message.</source>
-        <translation>O URI resultante é demasiado longo, tente reduzir o texto do rótulo ou da mensagem.</translation>
+        <translation>URI resultante muito longa. Tente reduzir o texto do rótulo ou da mensagem.</translation>
     </message>
     <message>
         <source>Error encoding URI into QR Code.</source>
-        <translation>Erro ao codificar o URI para código QR.</translation>
+        <translation>Erro ao codigicar o URI em código QR</translation>
     </message>
 </context>
 <context>
@@ -2176,10 +2617,6 @@ https://www.transifex.com/projects/p/dash/</translation>
         <source>Message</source>
         <translation>Mensagem</translation>
     </message>
-    <message>
-        <source>Amount</source>
-        <translation>Quantia</translation>
-    </message>
     <message>
         <source>(no label)</source>
         <translation>(sem rótulo)</translation>
@@ -2189,19 +2626,23 @@ https://www.transifex.com/projects/p/dash/</translation>
         <translation>(sem mensagem)</translation>
     </message>
     <message>
-        <source>(no amount)</source>
-        <translation>(sem quantia)</translation>
+        <source>(no amount requested)</source>
+        <translation>(nenhuma quantia solicitada)</translation>
+    </message>
+    <message>
+        <source>Requested</source>
+        <translation>Solicitado</translation>
     </message>
 </context>
 <context>
     <name>SendCoinsDialog</name>
     <message>
         <source>Send Coins</source>
-        <translation>Enviar Moedas</translation>
+        <translation>Enviar dinheiro</translation>
     </message>
     <message>
         <source>Coin Control Features</source>
-        <translation>Funcionalidades de Coin Control</translation>
+        <translation>Opções de Controle da Moeda</translation>
     </message>
     <message>
         <source>Inputs...</source>
@@ -2209,11 +2650,11 @@ https://www.transifex.com/projects/p/dash/</translation>
     </message>
     <message>
         <source>automatically selected</source>
-        <translation>seleccionadas automáticamente</translation>
+        <translation>automaticamente selecionado</translation>
     </message>
     <message>
         <source>Insufficient funds!</source>
-        <translation>Fundos insuficientes!</translation>
+        <translation>Saldo insuficiente!</translation>
     </message>
     <message>
         <source>Quantity:</source>
@@ -2227,14 +2668,6 @@ https://www.transifex.com/projects/p/dash/</translation>
         <source>Amount:</source>
         <translation>Quantia:</translation>
     </message>
-    <message>
-        <source>Priority:</source>
-        <translation>Prioridade:</translation>
-    </message>
-    <message>
-        <source>medium</source>
-        <translation>média</translation>
-    </message>
     <message>
         <source>Fee:</source>
         <translation>Taxa:</translation>
@@ -2243,57 +2676,85 @@ https://www.transifex.com/projects/p/dash/</translation>
         <source>Dust:</source>
         <translation>Poeira:</translation>
     </message>
-    <message>
-        <source>no</source>
-        <translation>não</translation>
-    </message>
     <message>
         <source>After Fee:</source>
-        <translation>Com taxa:</translation>
+        <translation>Depois da taxa:</translation>
     </message>
     <message>
         <source>Change:</source>
-        <translation>Troco:</translation>
+        <translation>trocar</translation>
     </message>
     <message>
         <source>If this is activated, but the change address is empty or invalid, change will be sent to a newly generated address.</source>
-        <translation>Se isto for activado e o endereço de troco se encontrar vazio, o troco será enviado para um novo endereço gerado.</translation>
+        <translation>Se isso estiver ativo e o endereço de troco estiver vazio ou inválido, o troco será enviado a um novo endereço gerado na hora.</translation>
     </message>
     <message>
         <source>Custom change address</source>
-        <translation>Endereço de troco personalizado</translation>
+        <translation>Endereço específico de troco</translation>
     </message>
     <message>
         <source>Transaction Fee:</source>
-        <translation>Taxa de Transacção:</translation>
+        <translation>Taxa de transação</translation>
     </message>
     <message>
         <source>Choose...</source>
         <translation>Escolha...</translation>
     </message>
+    <message>
+        <source>Using the fallbackfee can result in sending a transaction that will take several hours or days (or never) to confirm. Consider choosing your fee manually or wait until your have validated the complete chain.</source>
+        <translation>Usar o fallbackfee pode resultar no envio de uma transação que levará várias horas ou dias (ou nunca) para confirmação. Considere escolher sua taxa manualmente ou espere até que você tenha validado a cadeia completa.</translation>
+    </message>
+    <message>
+        <source>Warning: Fee estimation is currently not possible.</source>
+        <translation>Atenção: Estimativa de taxa não disponível no momento</translation>
+    </message>
     <message>
         <source>collapse fee-settings</source>
-        <translation>fechar opções de taxa</translation>
+        <translation>Ocultar painel</translation>
+    </message>
+    <message>
+        <source>Confirmation time target:</source>
+        <translation>Tempo alvo de confirmação:</translation>
+    </message>
+    <message>
+        <source>PrivateSend</source>
+        <translation>EnvioPrivado</translation>
+    </message>
+    <message>
+        <source>InstantSend</source>
+        <translation>EnvioInstantâneo</translation>
+    </message>
+    <message>
+        <source>If the custom fee is set to 1000 duffs and the transaction is only 250 bytes, then "per kilobyte" only pays 250 duffs in fee,&lt;br /&gt;while "at least" pays 1000 duffs. For transactions bigger than a kilobyte both pay by kilobyte.</source>
+        <translation>Se a taxa por defeito está definida em 1000 duffs e a transação é apenas 250 bytes, então "per kilobyte" paga apenas 250 duffs de taxa,&lt;br /&gt;enquanto "no mínimo" paga 1000 duffs. Para transações maiores que um kilobyte, ambas pagam por kilobyte.</translation>
     </message>
     <message>
-        <source>Minimize</source>
-        <translation>Minimizar</translation>
+        <source>If the custom fee is set to 1000 duffs and the transaction is only 250 bytes, then "per kilobyte" only pays 250 duffs in fee,&lt;br /&gt;while "total at least" pays 1000 duffs. For transactions bigger than a kilobyte both pay by kilobyte.</source>
+        <translation>Se a taxa por defeito está definida em 1000 duffs e a transação é apenas 250 bytes, então "per kilobyte" paga apenas 250 duffs de taxa,&lt;br /&gt;enquanto "no total pelo menos" paga 1000 duffs. Para transações maiores que um kilobyte, ambas pagam por kilobyte.</translation>
+    </message>
+    <message>
+        <source>Paying only the minimum fee is just fine as long as there is less transaction volume than space in the blocks.&lt;br /&gt;But be aware that this can end up in a never confirming transaction once there is more demand for dash transactions than the network can process.</source>
+        <translation>Não há problema em pagar apenas a taxa mínima desde que exista um volume transacional inferior ao espaço nos blocos.&lt;br /&gt;Mas tenha em conta que pode ocorrer uma transação que nunca será confirmada devido a existir uma maior procura para transações em dash, do que a rede tem capacidade para processar.</translation>
     </message>
     <message>
         <source>per kilobyte</source>
         <translation>por kilobyte</translation>
     </message>
+    <message>
+        <source>Hide</source>
+        <translation>Esconder</translation>
+    </message>
     <message>
         <source>total at least</source>
-        <translation>pelo menos total</translation>
+        <translation>total pelo menos</translation>
     </message>
     <message>
         <source>(read the tooltip)</source>
-        <translation>(leia a tooltip)</translation>
+        <translation>(Leia o popup)</translation>
     </message>
     <message>
         <source>Recommended:</source>
-        <translation>Recomendado:</translation>
+        <translation>Recomendado</translation>
     </message>
     <message>
         <source>Custom:</source>
@@ -2301,11 +2762,7 @@ https://www.transifex.com/projects/p/dash/</translation>
     </message>
     <message>
         <source>(Smart fee not initialized yet. This usually takes a few blocks...)</source>
-        <translation>(A taxa inteligente ainda não foi inicializada. Normalmente demora alguns blocos...)</translation>
-    </message>
-    <message>
-        <source>Confirmation time:</source>
-        <translation>Tempo de confirmação:</translation>
+        <translation>(Smart fee não iniciado. Isso requer alguns blocos...)</translation>
     </message>
     <message>
         <source>normal</source>
@@ -2315,21 +2772,13 @@ https://www.transifex.com/projects/p/dash/</translation>
         <source>fast</source>
         <translation>rápido</translation>
     </message>
-    <message>
-        <source>Send as zero-fee transaction if possible</source>
-        <translation>Enviar com taxa-zero se possível</translation>
-    </message>
-    <message>
-        <source>(confirmation may take longer)</source>
-        <translation>(a confirmação pode demorar mais)</translation>
-    </message>
     <message>
         <source>Confirm the send action</source>
-        <translation>Confirmar envio</translation>
+        <translation>Confirmar o envio</translation>
     </message>
     <message>
         <source>S&amp;end</source>
-        <translation>&amp;Enviar</translation>
+        <translation>Enviar</translation>
     </message>
     <message>
         <source>Clear all fields of the form.</source>
@@ -2337,23 +2786,15 @@ https://www.transifex.com/projects/p/dash/</translation>
     </message>
     <message>
         <source>Clear &amp;All</source>
-        <translation>Limpar &amp;Tudo</translation>
+        <translation>Limpar Tudo</translation>
     </message>
     <message>
         <source>Send to multiple recipients at once</source>
-        <translation>Enviar para múltiplos destinatários de uma vez</translation>
+        <translation>Enviar para vários destinatários de uma só vez</translation>
     </message>
     <message>
         <source>Add &amp;Recipient</source>
-        <translation>Adicionar &amp;Destinatário</translation>
-    </message>
-    <message>
-        <source>Darksend</source>
-        <translation>Darksend</translation>
-    </message>
-    <message>
-        <source>InstantX</source>
-        <translation>InstantX</translation>
+        <translation>Adicionar destinatário</translation>
     </message>
     <message>
         <source>Balance:</source>
@@ -2373,19 +2814,15 @@ https://www.transifex.com/projects/p/dash/</translation>
     </message>
     <message>
         <source>Copy after fee</source>
-        <translation>Copiar depois da taxa</translation>
+        <translation>Copiar pós taxa</translation>
     </message>
     <message>
         <source>Copy bytes</source>
         <translation>Copiar bytes</translation>
     </message>
-    <message>
-        <source>Copy priority</source>
-        <translation>Copiar prioridade</translation>
-    </message>
     <message>
         <source>Copy dust</source>
-        <translation>Copiar pó</translation>
+        <translation>Copiar poeira</translation>
     </message>
     <message>
         <source>Copy change</source>
@@ -2393,23 +2830,23 @@ https://www.transifex.com/projects/p/dash/</translation>
     </message>
     <message>
         <source>using</source>
-        <translation>a usar</translation>
+        <translation>usando</translation>
     </message>
     <message>
         <source>anonymous funds</source>
-        <translation>fundos anónimos</translation>
+        <translation>fundos anônimos </translation>
     </message>
     <message>
-        <source>(darksend requires this amount to be rounded up to the nearest %1).</source>
-        <translation>(o darksend requer que esta quantia seja arredondada até ao %1 mais próximo).</translation>
+        <source>(privatesend requires this amount to be rounded up to the nearest %1).</source>
+        <translation>(O privatesend exige que esse valor seja arredondado para o próximo %1).</translation>
     </message>
     <message>
-        <source>any available funds (not recommended)</source>
-        <translation>quaisquer fundos disponíveis (não recomendado)</translation>
+        <source>any available funds (not anonymous)</source>
+        <translation>quaisquer fundos disponíveis (não anônimos)</translation>
     </message>
     <message>
-        <source>and InstantX</source>
-        <translation>e InstantX</translation>
+        <source>and InstantSend</source>
+        <translation>e EnvioInstantâneo</translation>
     </message>
     <message>
         <source>%1 to %2</source>
@@ -2417,67 +2854,71 @@ https://www.transifex.com/projects/p/dash/</translation>
     </message>
     <message>
         <source>Are you sure you want to send?</source>
-        <translation>Tem a certeza que quer enviar?</translation>
+        <translation>Você tem certeza que deseja enviar?</translation>
     </message>
     <message>
         <source>are added as transaction fee</source>
-        <translation>são adicionadas como taxa de transacção</translation>
+        <translation>são adicionadas como taxas de transação</translation>
     </message>
     <message>
         <source>Total Amount = &lt;b&gt;%1&lt;/b&gt;&lt;br /&gt;= %2</source>
         <translation>Quantidade Total = &lt;b&gt;%1&lt;/b&gt;&lt;br /&gt;= %2</translation>
     </message>
     <message>
-        <source>Confirm send coins</source>
-        <translation>Confirmar envio de moedas</translation>
-    </message>
-    <message>
-        <source>A fee %1 times higher than %2 per kB is considered an insanely high fee.</source>
-        <translation>Uma taxa %1 vezes mais alta do que %2 por kB é considerada demasiado alta.</translation>
-    </message>
-    <message numerus="yes">
-        <source>Estimated to begin confirmation within %n block(s).</source>
-        <translation><numerusform>Inicio de confirmação estimado dentro de %n bloco.</numerusform><numerusform>Inicio de confirmação estimado dentro de %n blocos.</numerusform></translation>
+        <source>&lt;b&gt;(%1 of %2 entries displayed)&lt;/b&gt;</source>
+        <translation>&lt;b&gt;(%1 de %2 entradas exibidas)&lt;/b&gt;</translation>
     </message>
     <message>
-        <source>The recipient address is not valid, please recheck.</source>
-        <translation>O endereço do destinatário é inválido, por favor verifique.</translation>
+        <source>Confirm send coins</source>
+        <translation>Confirme o envio de moedas</translation>
     </message>
     <message>
-        <source>&lt;b&gt;(%1 of %2 entries displayed)&lt;/b&gt;</source>
-        <translation>&lt;b&gt;(%1 de %2 entradas mostradas)&lt;/b&gt;</translation>
+        <source>The recipient address is not valid. Please recheck.</source>
+        <translation>Endereço de envio inváido. Favor checar.</translation>
     </message>
     <message>
         <source>The amount to pay must be larger than 0.</source>
-        <translation>A quantia a pagar tem que ser maior que 0.</translation>
+        <translation>A quantia à pagar deve ser maior que 0</translation>
     </message>
     <message>
         <source>The amount exceeds your balance.</source>
-        <translation>A quantia excede o seu saldo.</translation>
+        <translation>A quantia excede o seu saldo</translation>
     </message>
     <message>
         <source>The total exceeds your balance when the %1 transaction fee is included.</source>
-        <translation>O total excede o seu saldo quando é incluído o valor %1 relativo a taxas de transacção.</translation>
+        <translation>O total excede o seu saldo quando a taxa da transação %1 é incluída</translation>
     </message>
     <message>
-        <source>Duplicate address found, can only send to each address once per send operation.</source>
-        <translation>Endereço duplicado encontrado, só pode enviar para um endereço uma vez por cada operação de envio.</translation>
+        <source>Duplicate address found: addresses should only be used once each.</source>
+        <translation>Encontrado endereço duplicado: os endereços deveriam ser usados apenas uma vez cada</translation>
     </message>
     <message>
         <source>Transaction creation failed!</source>
-        <translation>Falha ao criar transacção!</translation>
+        <translation>Criação de transação falha</translation>
+    </message>
+    <message>
+        <source>The transaction was rejected with the following reason: %1</source>
+        <translation>A transação foi rejeitada com a seguinte razão: %1</translation>
     </message>
     <message>
-        <source>The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source>
-        <translation>A transacção foi rejeitada! Isto pode acontecer se algumas das moedas da sua carteira tiverem sido gastas, tal como se usou uma copia do ficheiro wallet.dat e moedas tiverem sido gastas nessa cópia mas não aqui.</translation>
+        <source>A fee higher than %1 is considered an absurdly high fee.</source>
+        <translation>Uma taxa maior que %1 é considerada uma taxa absurdamente alta.</translation>
     </message>
     <message>
-        <source>Error: The wallet was unlocked only to anonymize coins.</source>
-        <translation>Erro: A carteira foi somente desbloqueada para anonimização de moedas.</translation>
+        <source>Payment request expired.</source>
+        <translation>Pedido de pagamento expirado</translation>
+    </message>
+    <message numerus="yes">
+        <source>%n block(s)</source>
+        <translation><numerusform>%n blocos</numerusform><numerusform>%n blocos</numerusform></translation>
     </message>
     <message>
-        <source>Pay only the minimum fee of %1</source>
-        <translation>Pagar somente a taxa mínima de %1</translation>
+        <source>Pay only the required fee of %1</source>
+        <translation>Pagar somente a taxa requerida de %1</translation>
+    </message>
+    <message numerus="yes">
+        <source>Estimated to begin confirmation within %n block(s).</source>
+        <translation><numerusform>Estimativa para iniciar a confirmação em %n blocos.</numerusform><numerusform>Estimativa para iniciar a confirmação em %n blocos.</numerusform></translation>
     </message>
     <message>
         <source>Warning: Invalid Dash address</source>
@@ -2485,7 +2926,15 @@ https://www.transifex.com/projects/p/dash/</translation>
     </message>
     <message>
         <source>Warning: Unknown change address</source>
-        <translation>Aviso: Endereço de troco desconhecido</translation>
+        <translation>Aviso: Endereço de troco inválido</translation>
+    </message>
+    <message>
+        <source>Confirm custom change address</source>
+        <translation>Confirmar endereço de troco personalizado</translation>
+    </message>
+    <message>
+        <source>The address you selected for change is not part of this wallet. Any or all funds in your wallet may be sent to this address. Are you sure?</source>
+        <translation>O endereço selecionado para o troco não pertence a esta carteira. Alguns ou todos os fundos da sua carteira modem ser mandados para esse endereço. Tem certeza?</translation>
     </message>
     <message>
         <source>(no label)</source>
@@ -2500,15 +2949,15 @@ https://www.transifex.com/projects/p/dash/</translation>
     </message>
     <message>
         <source>Pay &amp;To:</source>
-        <translation>&amp;Pagar a:</translation>
+        <translation>Pagar &amp;Para:</translation>
     </message>
     <message>
         <source>The Dash address to send the payment to</source>
-        <translation>O endereço Dash para onde enviar o pagamento</translation>
+        <translation>O endereço Dash para enviar o pagamento a</translation>
     </message>
     <message>
         <source>Choose previously used address</source>
-        <translation>Escolher endereço usado previamente</translation>
+        <translation>Escolher endereço usado anteriormente</translation>
     </message>
     <message>
         <source>Alt+A</source>
@@ -2516,7 +2965,7 @@ https://www.transifex.com/projects/p/dash/</translation>
     </message>
     <message>
         <source>Paste address from clipboard</source>
-        <translation>Colar endereço da área de transferência</translation>
+        <translation>Colar o endereço da área de transferência</translation>
     </message>
     <message>
         <source>Alt+P</source>
@@ -2532,11 +2981,19 @@ https://www.transifex.com/projects/p/dash/</translation>
     </message>
     <message>
         <source>Enter a label for this address to add it to the list of used addresses</source>
-        <translation>Digite um rótulo para este endereço para adicioná-lo à lista de endereços usados</translation>
+        <translation>Digite um rótulo para este endereço para adicioná-lo no catálogo</translation>
     </message>
     <message>
         <source>A&amp;mount:</source>
-        <translation>&amp;Quantidade</translation>
+        <translation>Q&amp;uantidade:</translation>
+    </message>
+    <message>
+        <source>The fee will be deducted from the amount being sent. The recipient will receive a lower amount of Dash than you enter in the amount field. If multiple recipients are selected, the fee is split equally.</source>
+        <translation>A taxa será deduzida do valor enviado. O destinatário receberá uma quantidade menor de Dash do que você insere no campo de valor. Se vários destinatários forem selecionados, a taxa será dividida igualmente.</translation>
+    </message>
+    <message>
+        <source>S&amp;ubtract fee from amount</source>
+        <translation>&amp;Retirar taxa da quantia</translation>
     </message>
     <message>
         <source>Message:</source>
@@ -2544,61 +3001,68 @@ https://www.transifex.com/projects/p/dash/</translation>
     </message>
     <message>
         <source>A message that was attached to the dash: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Dash network.</source>
-        <translation>Mensagem que foi anexada ao dash: URI e que será guardada com a transacção para sua referência. Nota: Esta mensagem não será enviada para a rede Dash.</translation>
+        <translation>A mensagem que foi anexada ao Dash: URI na qual será gravada na transação para sua referência. Nota: Essa mensagem não será gravada publicamente na rede Dash.</translation>
+    </message>
+    <message>
+        <source>This is an unauthenticated payment request.</source>
+        <translation>Esta é uma cobrança não autenticada.</translation>
     </message>
     <message>
-        <source>This is an unverified payment request.</source>
-        <translation>Este é um pedido de pagamento não verificado.</translation>
+        <source>This is an authenticated payment request.</source>
+        <translation>Esta é uma cobrança autenticada.</translation>
     </message>
     <message>
         <source>Pay To:</source>
-        <translation>Pagar a:</translation>
+        <translation>Pague Para:</translation>
     </message>
     <message>
         <source>Memo:</source>
-        <translation>Rótulo:</translation>
+        <translation>Memorizar:</translation>
     </message>
     <message>
-        <source>This is a verified payment request.</source>
-        <translation>Este é um pedido de pagamento verificado.</translation>
+        <source>Enter a label for this address to add it to your address book</source>
+        <translation>Digite um rótulo para este endereço para adicioná-lo ao catálogo de endereços</translation>
     </message>
+</context>
+<context>
+    <name>SendConfirmationDialog</name>
     <message>
-        <source>Enter a label for this address to add it to your address book</source>
-        <translation>Introduza um rótulo para este endereço para adicionar ao livro de endereços</translation>
+        <source>Yes</source>
+        <translation>Sim</translation>
     </message>
 </context>
 <context>
     <name>ShutdownWindow</name>
     <message>
-        <source>Dash Core is shutting down...</source>
-        <translation>O Dash Core está a desligar...</translation>
+        <source>%1 is shutting down...</source>
+        <translation>%1 está desligando...</translation>
     </message>
     <message>
         <source>Do not shut down the computer until this window disappears.</source>
-        <translation>Não desligue o computador enquanto está janela estiver visível.</translation>
+        <translation>Não desligue o computador até essa janela desaparecer.</translation>
     </message>
 </context>
 <context>
     <name>SignVerifyMessageDialog</name>
     <message>
         <source>Signatures - Sign / Verify a Message</source>
-        <translation>Assinaturas - Assinar / Verificar uma Mensagem</translation>
+        <translation>Assinaturas - Assinar / Verificar uma mensagem</translation>
     </message>
     <message>
         <source>&amp;Sign Message</source>
         <translation>&amp;Assinar Mensagem</translation>
     </message>
     <message>
-        <source>You can sign messages with your addresses to prove you own them. Be careful not to sign anything vague, as phishing attacks may try to trick you into signing your identity over to them. Only sign fully-detailed statements you agree to.</source>
-        <translation>Pode assinar mensagens com os seus endereços para provar que são seus. Tenha atenção para não assinar mensagens vagas, já que, ataques de phishing podem levá-lo a assinar a sua própria identidade para os atacantes. Apenas assine declarações detalhadas com as quais concorde.</translation>
+        <source>You can sign messages/agreements with your addresses to prove you can receive Dash sent to them. Be careful not to sign anything vague or random, as phishing attacks may try to trick you into signing your identity over to them. Only sign fully-detailed statements you agree to.</source>
+        <translation>Você pode assinar mensagens/acordos com seus endereços para provar que pode receber o Dash enviado para eles. Tenha cuidado para não assinar nada vago ou aleatório, pois os ataques de phishing podem tentar convencê-lo a assinar sua identidade para eles. Assine apenas declarações totalmente detalhadas com as quais você concorda.</translation>
     </message>
     <message>
         <source>The Dash address to sign the message with</source>
-        <translation>Endereço Dash com o qual deseja assinar a mensagem</translation>
+        <translation>O endereço Dash que assinará a mensagem</translation>
     </message>
     <message>
         <source>Choose previously used address</source>
-        <translation>Escolher endereço usado previamente</translation>
+        <translation>Escolha um endereço usado anteriormente</translation>
     </message>
     <message>
         <source>Alt+A</source>
@@ -2606,7 +3070,7 @@ https://www.transifex.com/projects/p/dash/</translation>
     </message>
     <message>
         <source>Paste address from clipboard</source>
-        <translation>Colar endereço da área de transferência</translation>
+        <translation>Colar o endereço da área de transferência</translation>
     </message>
     <message>
         <source>Alt+P</source>
@@ -2614,7 +3078,7 @@ https://www.transifex.com/projects/p/dash/</translation>
     </message>
     <message>
         <source>Enter the message you want to sign here</source>
-        <translation>Escreva aqui a mensagem que deseja assinar</translation>
+        <translation>Entre a mensagem que você quer assinar aqui</translation>
     </message>
     <message>
         <source>Signature</source>
@@ -2622,11 +3086,11 @@ https://www.transifex.com/projects/p/dash/</translation>
     </message>
     <message>
         <source>Copy the current signature to the system clipboard</source>
-        <translation>Copiar a assinatura actual para a área de transferência</translation>
+        <translation>Copiar a assinatura para a área de transferência do sistema</translation>
     </message>
     <message>
         <source>Sign the message to prove you own this Dash address</source>
-        <translation>Assinar a mensagem para provar que é o proprietário deste endereço Dash</translation>
+        <translation>Assinar mensagem para provar que você é dono deste endereço Dash</translation>
     </message>
     <message>
         <source>Sign &amp;Message</source>
@@ -2634,27 +3098,27 @@ https://www.transifex.com/projects/p/dash/</translation>
     </message>
     <message>
         <source>Reset all sign message fields</source>
-        <translation>Repor todos os campos de assinatura de mensagem</translation>
+        <translation>Limpar todos os campos de assinatura da mensagem</translation>
     </message>
     <message>
         <source>Clear &amp;All</source>
-        <translation>Limpar &amp;Tudo</translation>
+        <translation>Limpar Tudo</translation>
     </message>
     <message>
         <source>&amp;Verify Message</source>
         <translation>&amp;Verificar Mensagem</translation>
     </message>
     <message>
-        <source>Enter the signing address, message (ensure you copy line breaks, spaces, tabs, etc. exactly) and signature below to verify the message. Be careful not to read more into the signature than what is in the signed message itself, to avoid being tricked by a man-in-the-middle attack.</source>
-        <translation>Introduza o endereço de assinatura, mensagem (assegure-se que copia exactamente as quebras de linha, espaços, tabulações, etc) e assinatura abaixo para verificar a mensagem. Tenha atenção para não ler mais na assinatura do que o que estiver na mensagem assinada, para evitar ser enganado por um atacante que se encontre entre si e quem assinou a mensagem.</translation>
+        <source>Enter the receiver's address, message (ensure you copy line breaks, spaces, tabs, etc. exactly) and signature below to verify the message. Be careful not to read more into the signature than what is in the signed message itself, to avoid being tricked by a man-in-the-middle attack. Note that this only proves the signing party receives with the address, it cannot prove sendership of any transaction!</source>
+        <translation>Coloque o endereço do autor, a mensagem (certifique-se de copiar toda a mensagem, incluindo quebras de linha, espaços, tabulações, etc.) e a assinatura embaixo para verificar a mensagem. Cuidado para não ler mais da assinatura do que está assinado na mensagem, para evitar ser enganado pelo ataque man-in-the-middle. Note que isso somente prova a propriedade de um endereço, e não o remetende de qualquer transação.</translation>
     </message>
     <message>
         <source>The Dash address the message was signed with</source>
-        <translation>Endereço Dash com o qual a mensagem foi assinada</translation>
+        <translation>O endereço Dash que foi usado para assinar a mensagem</translation>
     </message>
     <message>
         <source>Verify the message to ensure it was signed with the specified Dash address</source>
-        <translation>Verificar a mensagem de forma a garantir que foi assinada com o endereço Dash especificado</translation>
+        <translation>Verifique a mensagem para se assegurar de que foi assinada pelo endereço Dash específicado</translation>
     </message>
     <message>
         <source>Verify &amp;Message</source>
@@ -2662,35 +3126,35 @@ https://www.transifex.com/projects/p/dash/</translation>
     </message>
     <message>
         <source>Reset all verify message fields</source>
-        <translation>Repor todos os campos de verificação de mensagem</translation>
+        <translation>Limpar todos os campos de assinatura da mensagem</translation>
     </message>
     <message>
         <source>Click "Sign Message" to generate signature</source>
-        <translation>Prima "Assinar Mensagem" para gerar a assinatura</translation>
+        <translation>Clique em "Assinar mensagem" para gerar a assinatura</translation>
     </message>
     <message>
         <source>The entered address is invalid.</source>
-        <translation>O endereço inserido é inválido.</translation>
+        <translation>O endereço digitado é inválido</translation>
     </message>
     <message>
         <source>Please check the address and try again.</source>
-        <translation>Por favor verifique o endereço e tente de novo.</translation>
+        <translation>Favor checar o endereço e tente novamente</translation>
     </message>
     <message>
         <source>The entered address does not refer to a key.</source>
-        <translation>O endereço introduzido não corresponde a uma chave.</translation>
+        <translation>O endereço fornecido não se refere a uma chave.</translation>
     </message>
     <message>
         <source>Wallet unlock was cancelled.</source>
-        <translation>O desbloqueamento da carteira foi cancelado.</translation>
+        <translation>O desbloqueio da carteira foi cancelado</translation>
     </message>
     <message>
         <source>Private key for the entered address is not available.</source>
-        <translation>A chave privada correspondente ao endereço introduzido não está disponível.</translation>
+        <translation>A chave privada para o endereço disponibilizado não está disponível.</translation>
     </message>
     <message>
         <source>Message signing failed.</source>
-        <translation>A assinatura da mensagem falhou.</translation>
+        <translation>Assinatura da mensagem falhou.</translation>
     </message>
     <message>
         <source>Message signed.</source>
@@ -2698,47 +3162,35 @@ https://www.transifex.com/projects/p/dash/</translation>
     </message>
     <message>
         <source>The signature could not be decoded.</source>
-        <translation>A assinatura não pode ser descodificada.</translation>
+        <translation>A assinatura não pôde ser decodificada.</translation>
     </message>
     <message>
         <source>Please check the signature and try again.</source>
-        <translation>Por favor verifique a assinatura e tente de novo.</translation>
+        <translation>Por favor, cheque a assinatura e tente novamente.</translation>
     </message>
     <message>
         <source>The signature did not match the message digest.</source>
-        <translation>A assinatura não corresponde à compilação da mensagem.</translation>
+        <translation>A assinatura não corresponde a mensagem</translation>
     </message>
     <message>
         <source>Message verification failed.</source>
-        <translation>A verificação da mensagem falhou.</translation>
+        <translation>Falha na verificação da mensagem</translation>
     </message>
     <message>
         <source>Message verified.</source>
-        <translation>Mensagem verificada.</translation>
+        <translation>Mensagem verificada</translation>
     </message>
 </context>
 <context>
     <name>SplashScreen</name>
     <message>
-        <source>Dash Core</source>
-        <translation>Dash Core</translation>
+        <source>[testnet]</source>
+        <translation>[testnet]</translation>
     </message>
     <message>
         <source>Version %1</source>
         <translation>Versão %1</translation>
     </message>
-    <message>
-        <source>The Bitcoin Core developers</source>
-        <translation>Os programadores Bitcoin Core</translation>
-    </message>
-    <message>
-        <source>The Dash Core developers</source>
-        <translation>Os programadores Dash Core</translation>
-    </message>
-    <message>
-        <source>[testnet]</source>
-        <translation>[rede de testes]</translation>
-    </message>
 </context>
 <context>
     <name>TrafficGraphWidget</name>
@@ -2751,71 +3203,67 @@ https://www.transifex.com/projects/p/dash/</translation>
     <name>TransactionDesc</name>
     <message numerus="yes">
         <source>Open for %n more block(s)</source>
-        <translation><numerusform>Aberta durante mais %n bloco</numerusform><numerusform>Aberta durante mais %n blocos</numerusform></translation>
+        <translation><numerusform>Aberto para %n mais blocos</numerusform><numerusform>Aberto para %n mais blocos</numerusform></translation>
     </message>
     <message>
         <source>Open until %1</source>
-        <translation>Aberta até %1</translation>
+        <translation>Aberto até %1</translation>
     </message>
     <message>
         <source>conflicted</source>
-        <translation>conflituosa</translation>
+        <translation>Conflitado</translation>
     </message>
     <message>
-        <source>%1/offline (verified via instantx)</source>
-        <translation>%1/desligado (verificado através de instantx)</translation>
+        <source>%1/offline</source>
+        <translation>%1/offline</translation>
     </message>
     <message>
-        <source>%1/confirmed (verified via instantx)</source>
-        <translation>%1/confirmado (verificado através de instantx)</translation>
+        <source>0/unconfirmed, %1</source>
+        <translation>0/não confirmado, %1</translation>
     </message>
     <message>
-        <source>%1 confirmations (verified via instantx)</source>
-        <translation>%1 confirmações (verificado através de instantx)</translation>
+        <source>in memory pool</source>
+        <translation>na memória</translation>
     </message>
     <message>
-        <source>%1/offline</source>
-        <translation>%1/desligada</translation>
+        <source>not in memory pool</source>
+        <translation>não na memóra</translation>
+    </message>
+    <message>
+        <source>abandoned</source>
+        <translation>abandonado</translation>
     </message>
     <message>
         <source>%1/unconfirmed</source>
-        <translation>%1/não confirmada</translation>
+        <translation>%1/não confirmado</translation>
     </message>
     <message>
         <source>%1 confirmations</source>
         <translation>%1 confirmações</translation>
     </message>
     <message>
-        <source>%1/offline (InstantX verification in progress - %2 of %3 signatures)</source>
-        <translation>%1/desligado (verificação InstantX em progresso - %2 de %3 assinaturas)</translation>
+        <source>verified via InstantSend</source>
+        <translation>verificado via InstantSend</translation>
     </message>
     <message>
-        <source>%1/confirmed (InstantX verification in progress - %2 of %3 signatures )</source>
-        <translation>%1/confirmada (verificação InstantX em progresso - %2 de %3 assinaturas)</translation>
+        <source>InstantSend verification in progress - %1 of %2 signatures</source>
+        <translation>Confirmação InstantSend em andamento - %1 de  %2 assinaturas</translation>
     </message>
     <message>
-        <source>%1 confirmations (InstantX verification in progress - %2 of %3 signatures)</source>
-        <translation>%1 confirmações (verificação InstantX em progresso - %2 de %3 assinaturas)</translation>
+        <source>InstantSend verification failed</source>
+        <translation>A confirmação do InstantSend falhou</translation>
     </message>
     <message>
-        <source>%1/offline (InstantX verification failed)</source>
-        <translation>%1/desligado (a verificação InstantX falhou)</translation>
+        <source>Status</source>
+        <translation>Status</translation>
     </message>
     <message>
-        <source>%1/confirmed (InstantX verification failed)</source>
-        <translation>%1/confirmada (a verificação InstantX falhou)</translation>
-    </message>
-    <message>
-        <source>Status</source>
-        <translation>Estado</translation>
-    </message>
-    <message>
-        <source>, has not been successfully broadcast yet</source>
-        <translation>, ainda não foi transmitida com sucesso</translation>
+        <source>, has not been successfully broadcast yet</source>
+        <translation>, ainda não foi propagada na rede com êxito.</translation>
     </message>
     <message numerus="yes">
         <source>, broadcast through %n node(s)</source>
-        <translation><numerusform>, transmitida através de %n nó</numerusform><numerusform>, transmitida através de %n nós</numerusform></translation>
+        <translation><numerusform>, transmissão por %n nós</numerusform><numerusform>, transmissão por %n nós</numerusform></translation>
     </message>
     <message>
         <source>Date</source>
@@ -2823,11 +3271,11 @@ https://www.transifex.com/projects/p/dash/</translation>
     </message>
     <message>
         <source>Source</source>
-        <translation>Origem</translation>
+        <translation>Fonte</translation>
     </message>
     <message>
         <source>Generated</source>
-        <translation>Gerada</translation>
+        <translation>Gerado</translation>
     </message>
     <message>
         <source>From</source>
@@ -2847,23 +3295,23 @@ https://www.transifex.com/projects/p/dash/</translation>
     </message>
     <message>
         <source>watch-only</source>
-        <translation>somente de visualização</translation>
+        <translation>Monitorado</translation>
     </message>
     <message>
         <source>label</source>
-        <translation>rótulo</translation>
+        <translation>Rótulo</translation>
     </message>
     <message>
         <source>Credit</source>
-        <translation>Credito</translation>
+        <translation>Crédito</translation>
     </message>
     <message numerus="yes">
         <source>matures in %n more block(s)</source>
-        <translation><numerusform>maturidade em %n bloco</numerusform><numerusform>maturidade em %n blocos</numerusform></translation>
+        <translation><numerusform>Maduro em %n blocos</numerusform><numerusform>Maduro em %n blocos</numerusform></translation>
     </message>
     <message>
         <source>not accepted</source>
-        <translation>rejeitada</translation>
+        <translation>não aceito</translation>
     </message>
     <message>
         <source>Debit</source>
@@ -2875,11 +3323,11 @@ https://www.transifex.com/projects/p/dash/</translation>
     </message>
     <message>
         <source>Total credit</source>
-        <translation>Credito total</translation>
+        <translation>Crédito total</translation>
     </message>
     <message>
         <source>Transaction fee</source>
-        <translation>Taxa de transacção</translation>
+        <translation>Taxa da transação</translation>
     </message>
     <message>
         <source>Net amount</source>
@@ -2895,23 +3343,31 @@ https://www.transifex.com/projects/p/dash/</translation>
     </message>
     <message>
         <source>Transaction ID</source>
-        <translation>ID de transacção</translation>
+        <translation>ID da transação</translation>
+    </message>
+    <message>
+        <source>Output index</source>
+        <translation>Index da saída</translation>
+    </message>
+    <message>
+        <source>Transaction total size</source>
+        <translation>Tamanho transacional total</translation>
     </message>
     <message>
         <source>Merchant</source>
-        <translation>Comerciante</translation>
+        <translation>Mercador</translation>
     </message>
     <message>
         <source>Generated coins must mature %1 blocks before they can be spent. When you generated this block, it was broadcast to the network to be added to the block chain. If it fails to get into the chain, its state will change to "not accepted" and it won't be spendable. This may occasionally happen if another node generates a block within a few seconds of yours.</source>
-        <translation>As moedas geradas tem que amadurecer %1 blocos antes de poderem ser gastas. Quando gerou este bloco, este foi propagado para a rede de modo a ser incluído na cadeia de blocos. Se não foi incluído na cadeia, o seu estado será alterado para "rejeitado" e não será possível gastar as moedas. Isto pode acontecer ocasionalmente quando outro nó gera um bloco a poucos segundos do seu.</translation>
+        <translation>Moedas recém minerados precisam aguardar %1 blocos antes de serem gastos. Quando o bloco foi gerado, ele foi disseminado pela rede para ser adicionado à blockchain. Se ele falhar em ser inserido na cadeia, seu estado será modificado para "não aceito" e ele não poderá ser gasto. Isso pode acontecer eventualmente quando blocos são gerados quase que simultaneamente.</translation>
     </message>
     <message>
         <source>Debug information</source>
-        <translation>Informação de depuração</translation>
+        <translation>Depurar informação</translation>
     </message>
     <message>
         <source>Transaction</source>
-        <translation>Transacção</translation>
+        <translation>Transação</translation>
     </message>
     <message>
         <source>Inputs</source>
@@ -2933,12 +3389,12 @@ https://www.transifex.com/projects/p/dash/</translation>
 <context>
     <name>TransactionDescDialog</name>
     <message>
-        <source>Transaction details</source>
-        <translation>Detalhes da transação</translation>
+        <source>This pane shows a detailed description of the transaction</source>
+        <translation>Este painel mostra uma descrição detalhada da transação</translation>
     </message>
     <message>
-        <source>This pane shows a detailed description of the transaction</source>
-        <translation>Esta janela mostra uma descrição detalhada da transação</translation>
+        <source>Details for %1</source>
+        <translation>Detalhes para %1</translation>
     </message>
 </context>
 <context>
@@ -2952,131 +3408,139 @@ https://www.transifex.com/projects/p/dash/</translation>
         <translation>Tipo</translation>
     </message>
     <message>
-        <source>Address</source>
-        <translation>Endereço</translation>
+        <source>Address / Label</source>
+        <translation>Endereço / Etiqueta</translation>
     </message>
     <message numerus="yes">
         <source>Open for %n more block(s)</source>
-        <translation><numerusform>Aberta durante mais %n bloco</numerusform><numerusform>Aberta durante mais %n blocos</numerusform></translation>
+        <translation><numerusform>Aberto para %n mais blocos</numerusform><numerusform>Aberto para %n mais blocos</numerusform></translation>
     </message>
     <message>
         <source>Open until %1</source>
-        <translation>Aberta até %1</translation>
+        <translation>Aberto até %1</translation>
     </message>
     <message>
         <source>Offline</source>
-        <translation>Desligado</translation>
+        <translation>Offline</translation>
     </message>
     <message>
         <source>Unconfirmed</source>
         <translation>Não confirmado</translation>
     </message>
+    <message>
+        <source>Abandoned</source>
+        <translation>Abandonado</translation>
+    </message>
     <message>
         <source>Confirming (%1 of %2 recommended confirmations)</source>
-        <translation>A confirmar (%1 de %2 confirmações recomendadas)</translation>
+        <translation>Confirmando (%1 de %2 confirmações recomendadas)</translation>
     </message>
     <message>
         <source>Confirmed (%1 confirmations)</source>
-        <translation>Confirmada (%1 confirmações)</translation>
+        <translation>Confirmado (%1 confirmações)</translation>
     </message>
     <message>
         <source>Conflicted</source>
-        <translation>Conflituosa</translation>
+        <translation>Conflitante</translation>
     </message>
     <message>
         <source>Immature (%1 confirmations, will be available after %2)</source>
-        <translation>Imatura (%1 confirmações, estará disponível após %2)</translation>
+        <translation>Recém-criado (%1 confirmações, disponível somente após %2)</translation>
     </message>
     <message>
         <source>This block was not received by any other nodes and will probably not be accepted!</source>
-        <translation>Este bloco não foi recebido por nenhum outro nó e provavelmente será rejeitado!</translation>
+        <translation>Este bloco não foi recebido por nenhum outro participante da rede e provavelmente não será aceito!</translation>
     </message>
     <message>
         <source>Generated but not accepted</source>
-        <translation>Gerado mas rejeitado</translation>
+        <translation>Gerado mas não aceito</translation>
     </message>
     <message>
         <source>Received with</source>
-        <translation>Recebido com</translation>
+        <translation>Recebido</translation>
     </message>
     <message>
         <source>Received from</source>
-        <translation>Recebido de</translation>
+        <translation>Recebido</translation>
     </message>
     <message>
-        <source>Received via Darksend</source>
-        <translation>Recebido via Darksend</translation>
+        <source>Received via PrivateSend</source>
+        <translation>Recebido via EnvioPrivado</translation>
     </message>
     <message>
         <source>Sent to</source>
-        <translation>Enviado para</translation>
+        <translation>Enviado</translation>
     </message>
     <message>
         <source>Payment to yourself</source>
-        <translation>Pagamento ao próprio</translation>
+        <translation>Pagamento a si mesmo</translation>
     </message>
     <message>
         <source>Mined</source>
-        <translation>Minado</translation>
+        <translation>Minerado</translation>
     </message>
     <message>
-        <source>Darksend Denominate</source>
-        <translation>Denominação Darksend</translation>
+        <source>PrivateSend Denominate</source>
+        <translation>PrivateSend Denominate</translation>
     </message>
     <message>
-        <source>Darksend Collateral Payment</source>
-        <translation>Pagamento Colateral Darksend</translation>
+        <source>PrivateSend Collateral Payment</source>
+        <translation>PrivateSend Pagamento de Garantia</translation>
     </message>
     <message>
-        <source>Darksend Make Collateral Inputs</source>
-        <translation>Darksend Fazer Entradas Colaterais</translation>
+        <source>PrivateSend Make Collateral Inputs</source>
+        <translation>PrivateSend fazer insumos colaterais</translation>
     </message>
     <message>
-        <source>Darksend Create Denominations</source>
-        <translation>Darksend Criar Denominações</translation>
+        <source>PrivateSend Create Denominations</source>
+        <translation>PrivateSend Criar Denominações</translation>
     </message>
     <message>
-        <source>Darksent</source>
-        <translation>Darksent</translation>
+        <source>PrivateSend</source>
+        <translation>EnvioPrivado</translation>
     </message>
     <message>
         <source>watch-only</source>
-        <translation>somente de visualização</translation>
+        <translation>Monitorado</translation>
     </message>
     <message>
         <source>(n/a)</source>
-        <translation>(n/d)</translation>
+        <translation>(n/a)</translation>
+    </message>
+    <message>
+        <source>(no label)</source>
+        <translation>(sem rótulo)</translation>
     </message>
     <message>
         <source>Transaction status. Hover over this field to show number of confirmations.</source>
-        <translation>Estado da transacção. Passe o ponteiro do rato sobre este campo para mostrar o número de confirmações.</translation>
+        <translation>Status da transação. Passe o mouse sobre este campo para mostrar o número de confirmações.</translation>
     </message>
     <message>
         <source>Date and time that the transaction was received.</source>
-        <translation>Data e hora à qual a transacção foi recebida.</translation>
+        <translation>Data e hora que a transação foi recebida.</translation>
     </message>
     <message>
         <source>Type of transaction.</source>
-        <translation>Tipo de transacção.</translation>
+        <translation>Tipo de transação.</translation>
     </message>
     <message>
         <source>Whether or not a watch-only address is involved in this transaction.</source>
-        <translation>Se existe algum endereço somente de visualização envolvido nesta transacção.</translation>
+        <translation>Mostrar ou não endereços monitorados na lista de transações.</translation>
     </message>
     <message>
-        <source>Destination address of transaction.</source>
-        <translation>Endereço de destino da transacção.</translation>
+        <source>User-defined intent/purpose of the transaction.</source>
+        <translation>Intenção/Propósito definido pelo usuário para a transação</translation>
     </message>
     <message>
         <source>Amount removed from or added to balance.</source>
-        <translation>Quantia removida ou adicionada ao saldo.</translation>
+        <translation>Quantidade debitada ou creditada ao saldo.</translation>
     </message>
 </context>
 <context>
     <name>TransactionView</name>
     <message>
         <source>All</source>
-        <translation>Todas</translation>
+        <translation>Todos</translation>
     </message>
     <message>
         <source>Today</source>
@@ -3084,19 +3548,19 @@ https://www.transifex.com/projects/p/dash/</translation>
     </message>
     <message>
         <source>This week</source>
-        <translation>Esta semana</translation>
+        <translation>Essa semana</translation>
     </message>
     <message>
         <source>This month</source>
-        <translation>Este mês</translation>
+        <translation>Esse mês</translation>
     </message>
     <message>
         <source>Last month</source>
-        <translation>Mês anterior</translation>
+        <translation>Último mês</translation>
     </message>
     <message>
         <source>This year</source>
-        <translation>Este ano</translation>
+        <translation>Esse ano</translation>
     </message>
     <message>
         <source>Range...</source>
@@ -3104,7 +3568,7 @@ https://www.transifex.com/projects/p/dash/</translation>
     </message>
     <message>
         <source>Most Common</source>
-        <translation>Mais Comum</translation>
+        <translation>Mais comum</translation>
     </message>
     <message>
         <source>Received with</source>
@@ -3115,45 +3579,49 @@ https://www.transifex.com/projects/p/dash/</translation>
         <translation>Enviado para</translation>
     </message>
     <message>
-        <source>Darksent</source>
-        <translation>Darksent</translation>
+        <source>PrivateSend</source>
+        <translation>EnvioPrivado</translation>
     </message>
     <message>
-        <source>Darksend Make Collateral Inputs</source>
-        <translation>Darksend Fazer Entradas Colaterais</translation>
+        <source>PrivateSend Make Collateral Inputs</source>
+        <translation>PrivateSend fazer insumos colaterais</translation>
     </message>
     <message>
-        <source>Darksend Create Denominations</source>
-        <translation>Darksend Criar Denominações</translation>
+        <source>PrivateSend Create Denominations</source>
+        <translation>PrivateSend Criar Denominações</translation>
     </message>
     <message>
-        <source>Darksend Denominate</source>
-        <translation>Denominação Darksend</translation>
+        <source>PrivateSend Denominate</source>
+        <translation>PrivateSend Denominate</translation>
     </message>
     <message>
-        <source>Darksend Collateral Payment</source>
-        <translation>Pagamento Colateral Darksend</translation>
+        <source>PrivateSend Collateral Payment</source>
+        <translation>PrivateSend Pagamento de Garantia</translation>
     </message>
     <message>
         <source>To yourself</source>
-        <translation>Ao próprio</translation>
+        <translation>Para você mesmo</translation>
     </message>
     <message>
         <source>Mined</source>
-        <translation>Minado</translation>
+        <translation>Minerado</translation>
     </message>
     <message>
         <source>Other</source>
-        <translation>Outra</translation>
+        <translation>Outro</translation>
     </message>
     <message>
         <source>Enter address or label to search</source>
-        <translation>Introduza endereço ou rótulo a pesquisar</translation>
+        <translation>Procure um endereço ou etiqueta</translation>
     </message>
     <message>
         <source>Min amount</source>
         <translation>Quantia mínima</translation>
     </message>
+    <message>
+        <source>Abandon transaction</source>
+        <translation>Abandonar transação</translation>
+    </message>
     <message>
         <source>Copy address</source>
         <translation>Copiar endereço</translation>
@@ -3164,11 +3632,19 @@ https://www.transifex.com/projects/p/dash/</translation>
     </message>
     <message>
         <source>Copy amount</source>
-        <translation>Copiar quantia</translation>
+        <translation>Copias quantia</translation>
     </message>
     <message>
         <source>Copy transaction ID</source>
-        <translation>Copiar ID de transacção</translation>
+        <translation>Copiar ID da transação</translation>
+    </message>
+    <message>
+        <source>Copy raw transaction</source>
+        <translation>Copiar o raw da transação</translation>
+    </message>
+    <message>
+        <source>Copy full transaction details</source>
+        <translation>Copiar dados completos da transação</translation>
     </message>
     <message>
         <source>Edit label</source>
@@ -3176,23 +3652,23 @@ https://www.transifex.com/projects/p/dash/</translation>
     </message>
     <message>
         <source>Show transaction details</source>
-        <translation>Mostrar detalhes da transacção</translation>
+        <translation>Mostrar detalhes da transação</translation>
     </message>
     <message>
         <source>Export Transaction History</source>
-        <translation>Exportar histórico de transacções</translation>
+        <translation>Exportar histórico de transações</translation>
     </message>
     <message>
         <source>Comma separated file (*.csv)</source>
-        <translation>Ficheiro separado por vírgulas (*.csv)</translation>
+        <translation>Comma separated file (*.csv)</translation>
     </message>
     <message>
         <source>Confirmed</source>
-        <translation>Confirmada</translation>
+        <translation>Confirmado</translation>
     </message>
     <message>
         <source>Watch-only</source>
-        <translation>Somente de visualização</translation>
+        <translation>Monitorado</translation>
     </message>
     <message>
         <source>Date</source>
@@ -3216,23 +3692,23 @@ https://www.transifex.com/projects/p/dash/</translation>
     </message>
     <message>
         <source>Exporting Failed</source>
-        <translation>A exportação falhou</translation>
+        <translation>Falha na exportação</translation>
     </message>
     <message>
         <source>There was an error trying to save the transaction history to %1.</source>
-        <translation>Ocorreu um erro ao tentar gravar o histórico de transacções para %1.</translation>
+        <translation>Ocorreu um erro ao tentar salvar o histórico de transações em %1.</translation>
     </message>
     <message>
         <source>Exporting Successful</source>
-        <translation>Exportação Concluída com Sucesso</translation>
+        <translation>Exportação feita com êxito</translation>
     </message>
     <message>
         <source>The transaction history was successfully saved to %1.</source>
-        <translation>O histórico de transacções foi gravado com sucesso para %1.</translation>
+        <translation>O histórico de transação foi gravado com êxito em %1.</translation>
     </message>
     <message>
         <source>Range:</source>
-        <translation>Intervalo:</translation>
+        <translation>Intervalo: </translation>
     </message>
     <message>
         <source>to</source>
@@ -3243,7 +3719,7 @@ https://www.transifex.com/projects/p/dash/</translation>
     <name>UnitDisplayStatusBarControl</name>
     <message>
         <source>Unit to show amounts in. Click to select another unit.</source>
-        <translation>Unidade das quantias. Clique para seleccionar outra unidade.</translation>
+        <translation>Unidade para mostrar. Clique para selecionar outra unidade.</translation>
     </message>
 </context>
 <context>
@@ -3257,11 +3733,15 @@ https://www.transifex.com/projects/p/dash/</translation>
     <name>WalletModel</name>
     <message>
         <source>Send Coins</source>
-        <translation>Enviar Moedas</translation>
+        <translation>Enviar moedas</translation>
+    </message>
+    <message>
+        <source>InstantSend doesn't support sending values that high yet. Transactions are currently limited to %1 DASH.</source>
+        <translation>EnvioInstantâneo não suporta o envio de valores tão altos ainda. As transações são limitadas a %1 DASH.</translation>
     </message>
     <message>
-        <source>InstantX doesn't support sending values that high yet. Transactions are currently limited to %1 DASH.</source>
-        <translation>O InstantX não suporta valores tão elevados neste momento. As transacções estão limitadas a %1 DASH.</translation>
+        <source>Used way too many inputs (&gt;%1) for this InstantSend transaction, fees could be huge.</source>
+        <translation>Usado demais entradas (&gt;%1) para esta transação do InstantSend, as taxas podem ser enormes.</translation>
     </message>
 </context>
 <context>
@@ -3272,1112 +3752,1486 @@ https://www.transifex.com/projects/p/dash/</translation>
     </message>
     <message>
         <source>Export the data in the current tab to a file</source>
-        <translation>Exportar os dados do separador actual para um ficheiro</translation>
+        <translation>Exportar os dados da guia atual para um arquivo</translation>
     </message>
     <message>
         <source>Selected amount:</source>
-        <translation>Quantia seleccionada: </translation>
+        <translation>Quantidade selecionada:</translation>
     </message>
     <message>
         <source>Backup Wallet</source>
-        <translation>Criar Cópia de Segurança da Carteira</translation>
+        <translation>Backup da carteira</translation>
     </message>
     <message>
         <source>Wallet Data (*.dat)</source>
-        <translation>Dados da Carteira (*.dat)</translation>
+        <translation>Dados da carteira (*.dat)</translation>
     </message>
     <message>
         <source>Backup Failed</source>
-        <translation>A Cópia de Segurança Falhou</translation>
+        <translation>Falha no backup</translation>
     </message>
     <message>
         <source>There was an error trying to save the wallet data to %1.</source>
-        <translation>Ocorreu um erro ao tentar criar cópia de segurança da carteira para %1.</translation>
+        <translation>Ocorreu um erro ao tentar salvar os dados da carteira em %1.</translation>
     </message>
     <message>
         <source>Backup Successful</source>
-        <translation>Cópia de Segurança Criada com Sucesso</translation>
+        <translation>Backup bem sucedido</translation>
     </message>
     <message>
         <source>The wallet data was successfully saved to %1.</source>
-        <translation>Os dados da carteira foram gravados com sucesso em %1.</translation>
+        <translation>Os dados da carteira foram salvos com êxito em %1.</translation>
     </message>
 </context>
 <context>
     <name>dash-core</name>
     <message>
         <source>Bind to given address and always listen on it. Use [host]:port notation for IPv6</source>
-        <translation>Vincular a um determinado endereço e ouvir sempre aí. Use a notação [endereço]:porta para IPv6</translation>
+        <translation>Vincular ao endereço fornecido e sempre escutar nele. Use a notação [host]:port para IPv6</translation>
+    </message>
+    <message>
+        <source>Error: Listening for incoming connections failed (listen returned error %s)</source>
+        <translation>Erro: Aceitar conexões de entrada falhou (retornou erro %s)</translation>
+    </message>
+    <message>
+        <source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source>
+        <translation>Executa um comando quando um alerta relevante é recebido ou vemos uma longa segregação (%s é substituída pela mensagem)</translation>
+    </message>
+    <message>
+        <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source>
+        <translation>Executa um comando quando uma transação da carteira mudar (%s no comando será substituído por TxID)</translation>
+    </message>
+    <message>
+        <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source>
+        <translation>Executa um comando quando o melhor bloco mudar (%s no comando será substituído pelo hash do bloco)</translation>
+    </message>
+    <message>
+        <source>Name to construct url for KeePass entry that stores the wallet passphrase</source>
+        <translation>Nome para construir url para a entrada do KeePass que armazena a senha da carteira</translation>
+    </message>
+    <message>
+        <source>Set maximum size of high-priority/low-fee transactions in bytes (default: %d)</source>
+        <translation>Definir tamanho máximo de transações de alta prioridade/baixa taxa em bytes (padrão: %d)</translation>
+    </message>
+    <message>
+        <source>Set the number of script verification threads (%u to %d, 0 = auto, &lt;0 = leave that many cores free, default: %d)</source>
+        <translation>Define o número de threads de verificação de script (%u a %d, 0 = automático, &lt;0 = número de cores deixados livres, padrão: %d)</translation>
+    </message>
+    <message>
+        <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source>
+        <translation>Este é um build de teste pré-lançamento - use por sua conta e risco - não use para mineração ou comércio.</translation>
+    </message>
+    <message>
+        <source>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</source>
+        <translation>Atenção: A rede não parecem concordar plenamente! Alguns mineiros parecem estar enfrentando problemas.</translation>
+    </message>
+    <message>
+        <source>Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.</source>
+        <translation>Atenção: Nós não parecemos concordar plenamente com nossos nós! Você pode precisar atualizar ou outros nós podem precisar atualizar.</translation>
+    </message>
+    <message>
+        <source>You must specify a masternodeprivkey in the configuration. Please see documentation for help.</source>
+        <translation>Você deve especificar um masternodeprivkey na configuração. Por favor, consulte a documentação para obter ajuda.</translation>
+    </message>
+    <message>
+        <source>Accept command line and JSON-RPC commands</source>
+        <translation>Aceitar linha de comando e comandos JSON-RPC</translation>
+    </message>
+    <message>
+        <source>Add a node to connect to and attempt to keep the connection open</source>
+        <translation>Adicionar um nó com o qual se conectar e tentar manter a conexão ativa</translation>
+    </message>
+    <message>
+        <source>Allow DNS lookups for -addnode, -seednode and -connect</source>
+        <translation>Permitir consultas DNS para -addnode, -seednode e -connect</translation>
+    </message>
+    <message>
+        <source>Already have that input.</source>
+        <translation>Já tem essa entrada.</translation>
+    </message>
+    <message>
+        <source>Block creation options:</source>
+        <translation>Opções de criação de bloco:</translation>
+    </message>
+    <message>
+        <source>Cannot downgrade wallet</source>
+        <translation>Não é possível fazer downgrade da carteira</translation>
+    </message>
+    <message>
+        <source>Cannot write default address</source>
+        <translation>Não foi possível escrever no endereço padrão</translation>
+    </message>
+    <message>
+        <source>Collateral not valid.</source>
+        <translation>Colateral inválido.</translation>
+    </message>
+    <message>
+        <source>Connect to a node to retrieve peer addresses, and disconnect</source>
+        <translation>Conectar a um nó para receber endereços de participantes, e desconectar.</translation>
+    </message>
+    <message>
+        <source>Connection options:</source>
+        <translation>Opções de conexão:</translation>
+    </message>
+    <message>
+        <source>Corrupted block database detected</source>
+        <translation>Detectada database de bloco corrompida</translation>
+    </message>
+    <message>
+        <source>Debugging/Testing options:</source>
+        <translation>Opções de depuração/teste:</translation>
+    </message>
+    <message>
+        <source>Do not load the wallet and disable wallet RPC calls</source>
+        <translation>Não carrega a carteira e desabilita as chamadas RPC para a carteira</translation>
+    </message>
+    <message>
+        <source>Do you want to rebuild the block database now?</source>
+        <translation>Você quer reconstruir o banco de dados de blocos agora?</translation>
+    </message>
+    <message>
+        <source>Done loading</source>
+        <translation>Carregamento completo</translation>
+    </message>
+    <message>
+        <source>Entries are full.</source>
+        <translation>Entradas estão cheias.</translation>
+    </message>
+    <message>
+        <source>Error initializing block database</source>
+        <translation>Erro ao inicializar a database do bloco</translation>
+    </message>
+    <message>
+        <source>Error initializing wallet database environment %s!</source>
+        <translation>Erro ao inicializar ambiente de banco de dados de carteira %s!</translation>
+    </message>
+    <message>
+        <source>Error loading block database</source>
+        <translation>Erro ao carregar banco de dados de blocos</translation>
+    </message>
+    <message>
+        <source>Error opening block database</source>
+        <translation>Erro ao abrir banco de dados de blocos</translation>
+    </message>
+    <message>
+        <source>Error reading from database, shutting down.</source>
+        <translation>Erro ao ler o banco de dados. Finalizando.</translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation>Erro</translation>
+    </message>
+    <message>
+        <source>Error: Disk space is low!</source>
+        <translation>Erro: Pouco espaço em disco!</translation>
+    </message>
+    <message>
+        <source>Failed to listen on any port. Use -listen=0 if you want this.</source>
+        <translation>Falha ao escutar em qualquer porta. Use -listen=0 se você quiser isso.</translation>
+    </message>
+    <message>
+        <source>(1 = keep tx meta data e.g. account owner and payment request information, 2 = drop tx meta data)</source>
+        <translation>(1 = manter metadados tx e.g. informação do dono da conta e requisição de pagamente, 2 = descartar metadados tx)</translation>
+    </message>
+    <message>
+        <source>-maxtxfee is set very high! Fees this large could be paid on a single transaction.</source>
+        <translation>-maxtxfee é muito alto! Essa quantia poderia ser paga em uma única transação.</translation>
+    </message>
+    <message>
+        <source>A fee rate (in %s/kB) that will be used when fee estimation has insufficient data (default: %s)</source>
+        <translation>A variação da taxa (em %s/kB) que será usada quando não houver dados suficientes para se estimar a taxa (default: %s)</translation>
+    </message>
+    <message>
+        <source>Accept relayed transactions received from whitelisted peers even when not relaying transactions (default: %d)</source>
+        <translation>Aceita transações retransmitidas advindas de pares em lista branca, mesmo quando não estiver retransmitindo transações (padrão: %d)</translation>
+    </message>
+    <message>
+        <source>Allow JSON-RPC connections from specified source. Valid for &lt;ip&gt; are a single IP (e.g. 1.2.3.4), a network/netmask (e.g. 1.2.3.4/255.255.255.0) or a network/CIDR (e.g. 1.2.3.4/24). This option can be specified multiple times</source>
+        <translation>Permitir conexões JSON-RPC de uma fonte específica. Válido para um único ip (ex. 1.2.3.4), até uma rede/máscara (ex. 1.2.3.4/255.255.255.0) ou uma rede/CIDR (ex. 1.2.3.4/24). Esta opção pode ser usada múltiplas vezes</translation>
+    </message>
+    <message>
+        <source>Bind to given address and whitelist peers connecting to it. Use [host]:port notation for IPv6</source>
+        <translation>Vincular ao endereço fornecido e sempre escutar nele. Use a notação [host]:port para IPv6</translation>
+    </message>
+    <message>
+        <source>Bind to given address to listen for JSON-RPC connections. Use [host]:port notation for IPv6. This option can be specified multiple times (default: bind to all interfaces)</source>
+        <translation>Vincular a determinado endereço para atender as ligações JSON-RPC. Use [host]: Notação de porta para IPv6. Esta opção pode ser especificada várias vezes (padrão: ligam-se a todas as interfaces)</translation>
+    </message>
+    <message>
+        <source>Create new files with system default permissions, instead of umask 077 (only effective with disabled wallet functionality)</source>
+        <translation>Criar novos arquivos com permissões padrão do sistema, em vez de umask 077 (apenas efetivo com funcionalidade de carteira desabilitada)</translation>
+    </message>
+    <message>
+        <source>Delete all wallet transactions and only recover those parts of the blockchain through -rescan on startup</source>
+        <translation>Apaga todas as transações da carteira e somente recupera essas partes da blockchain usando o comando -rescan na inicialização</translation>
+    </message>
+    <message>
+        <source>Error loading %s: You can't enable HD on a already existing non-HD wallet</source>
+        <translation>Erro ao carregar %s: você não pode ativar o HD em uma carteira não HD já existente</translation>
+    </message>
+    <message>
+        <source>Found unconfirmed denominated outputs, will wait till they confirm to continue.</source>
+        <translation>Encontrado saídas não confirmadas, esperará até que confirme para continuar.</translation>
+    </message>
+    <message>
+        <source>How thorough the block verification of -checkblocks is (0-4, default: %u)</source>
+        <translation>Quão completa a verificação de blocos do -checkblocks é (0-4, padrão: %u)</translation>
+    </message>
+    <message>
+        <source>If paytxfee is not set, include enough fee so transactions begin confirmation on average within n blocks (default: %u)</source>
+        <translation>Se paytxfee não estiver definida, incluir comissão suficiente para que as transações comecem a ter confirmações em média dentro de N blocos (padrão %u)</translation>
+    </message>
+    <message>
+        <source>If this block is in the chain assume that it and its ancestors are valid and potentially skip their script verification (0 to verify all, default: %s, testnet: %s)</source>
+        <translation>Se este bloco está no blockchain, assume-se que ele e seus ancestrais são válidos e podem ignorar a verificação de scripts (0 para verificar todos, padrão: %s, testnet: %s)</translation>
+    </message>
+    <message>
+        <source>Invalid amount for -maxtxfee=&lt;amount&gt;: '%s' (must be at least the minrelay fee of %s to prevent stuck transactions)</source>
+        <translation>Valor inválido para -maxtxfee=&lt;valor&gt;: '%s' (precisa ser pelo menos a taxa mínima de %s para prevenir que a transação nunca seja confirmada)</translation>
+    </message>
+    <message>
+        <source>Maintain a full transaction index, used by the getrawtransaction rpc call (default: %u)</source>
+        <translation>Mantém um índice completo de transações, usado pela chamada rpc getrawtransaction (padrão: %u)</translation>
+    </message>
+    <message>
+        <source>Make sure to encrypt your wallet and delete all non-encrypted backups after you verified that wallet works!</source>
+        <translation>Certifique-se de criptografar sua carteira e excluir todos os backups não criptografados depois de verificar se a carteira funciona!</translation>
+    </message>
+    <message>
+        <source>Maximum size of data in data carrier transactions we relay and mine (default: %u)</source>
+        <translation>Tamanho máximo de dados em transações de dados de operadora (padrão %u)</translation>
+    </message>
+    <message>
+        <source>Number of seconds to keep misbehaving peers from reconnecting (default: %u)</source>
+        <translation>Número de segundos para impedir que peers mal comportados reconectem (padrão %u)</translation>
+    </message>
+    <message>
+        <source>Output debugging information (default: %u, supplying &lt;category&gt; is optional)</source>
+        <translation>Informação de saída de debug (padrão: %u, definir &lt;category&gt; é opcional)</translation>
+    </message>
+    <message>
+        <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: %s)</source>
+        <translation>Use um proxy SOCKS5 separado para alcançar participantes da rede via serviços ocultos Tor (padrão: %s)</translation>
+    </message>
+    <message>
+        <source>User defined mnemonic for HD wallet (bip39). Only has effect during wallet creation/first start (default: randomly generated)</source>
+        <translation>Usuário definido mnemonic para carteira HD (bip39). Somente tem efeito durante a criação/primeiro começa da carteira (padrão: gerado aleatoriamente)</translation>
+    </message>
+    <message>
+        <source>User defined seed for HD wallet (should be in hex). Only has effect during wallet creation/first start (default: randomly generated)</source>
+        <translation>Semente definida pelo usuário para carteira HD (deve estar em hex). Só tem efeito durante a criação / início da carteira (padrão: gerado aleatoriamente)</translation>
+    </message>
+    <message>
+        <source>Whitelisted peers cannot be DoS banned and their transactions are always relayed, even if they are already in the mempool, useful e.g. for a gateway</source>
+        <translation>Peers permitidos não podem ser banidos do DoS e suas transações sempre são transmitidas, até mesmo se eles já estão no pool de memória, útil, por exemplo, para um gateway</translation>
+    </message>
+    <message>
+        <source>You need to rebuild the database using -reindex-chainstate to change -txindex</source>
+        <translation>Você precisa reconstruir o banco de dados usando -reindex-chainstate para alterar -txindex</translation>
+    </message>
+    <message>
+        <source>(default: %s)</source>
+        <translation>(padão: %s)</translation>
+    </message>
+    <message>
+        <source>Accept public REST requests (default: %u)</source>
+        <translation>Aceitar pedidos restantes públicas (padrão: %u)</translation>
+    </message>
+    <message>
+        <source>Always query for peer addresses via DNS lookup (default: %u)</source>
+        <translation>Sempre pergunte pelo endereço de peer via pesquisa DNS (padrão: %u)</translation>
+    </message>
+    <message>
+        <source>Can't mix: no compatible inputs found!</source>
+        <translation>Não é possível misturar: não foram encontradas entradas compatíveis!</translation>
+    </message>
+    <message>
+        <source>Chain selection options:</source>
+        <translation>Opções de seleção de cadeia:</translation>
+    </message>
+    <message>
+        <source>Connect through SOCKS5 proxy</source>
+        <translation>Conecte através do proxy SOCKS5</translation>
+    </message>
+    <message>
+        <source>Connect to KeePassHttp on port &lt;port&gt; (default: %u)</source>
+        <translation>Conecte-se ao KeePassHttp na porta&lt;port&gt; (padrão: %u) </translation>
+    </message>
+    <message>
+        <source>Enable the client to act as a masternode (0-1, default: %u)</source>
+        <translation>Ative o cliente para atuar como um masternode (0-1, padrão: %u)</translation>
+    </message>
+    <message>
+        <source>Entry exceeds maximum size.</source>
+        <translation>Entrada excede o tamanho máximo.</translation>
+    </message>
+    <message>
+        <source>Error loading %s: You can't disable HD on a already existing HD wallet</source>
+        <translation>Erro ao carregar %s: você não pode desativar o HD em uma carteira HD já existente</translation>
+    </message>
+    <message>
+        <source>Failed to load fulfilled requests cache from</source>
+        <translation>Falha ao carregar o cache de solicitações preenchidas de</translation>
+    </message>
+    <message>
+        <source>Failed to load governance cache from</source>
+        <translation>Falha ao carregar o cache de governança de</translation>
+    </message>
+    <message>
+        <source>Failed to load masternode cache from</source>
+        <translation>Falha ao carregar o cache masternode de</translation>
+    </message>
+    <message>
+        <source>Failed to load masternode payments cache from</source>
+        <translation>Falha ao carregar o cache de pagamentos do masternode</translation>
+    </message>
+    <message>
+        <source>Found enough users, signing ( waiting %s )</source>
+        <translation>Encontrou usuários suficientes, assinando ( esperando %s )</translation>
+    </message>
+    <message>
+        <source>Found enough users, signing ...</source>
+        <translation>Encontrou usuários suficientes, assinando ...</translation>
+    </message>
+    <message>
+        <source>How many blocks to check at startup (default: %u, 0 = all)</source>
+        <translation>Quantos blocos devem ser checados ao iniciar (padrão: %u, 0 = todos)</translation>
+    </message>
+    <message>
+        <source>Importing...</source>
+        <translation>Importando...</translation>
+    </message>
+    <message>
+        <source>Include IP addresses in debug output (default: %u)</source>
+        <translation>Incluir endereço IP na saída de depuração (padrão: %u)</translation>
+    </message>
+    <message>
+        <source>Incompatible mode.</source>
+        <translation>Modo incompatível.</translation>
+    </message>
+    <message>
+        <source>Incompatible version.</source>
+        <translation>Versão incompatível. </translation>
+    </message>
+    <message>
+        <source>Incorrect or no genesis block found. Wrong datadir for network?</source>
+        <translation>Bloco gênese incorreto ou não encontrado. Datadir errado para a rede?</translation>
+    </message>
+    <message>
+        <source>Information</source>
+        <translation>Informação</translation>
+    </message>
+    <message>
+        <source>Input is not valid.</source>
+        <translation>A entrada não é válida.</translation>
+    </message>
+    <message>
+        <source>Insufficient funds.</source>
+        <translation>Saldo insuficiente. </translation>
+    </message>
+    <message>
+        <source>Invalid -onion address: '%s'</source>
+        <translation>Endereço -onion inválido: '%s'</translation>
+    </message>
+    <message>
+        <source>Invalid -proxy address: '%s'</source>
+        <translation>Endereço - proxy inválido: '%s'</translation>
+    </message>
+    <message>
+        <source>Invalid amount for -paytxfee=&lt;amount&gt;: '%s' (must be at least %s)</source>
+        <translation>Valor inválido para -paytxfee=&lt;amount&gt;: '%s' (precisa ser no mínimo %s)</translation>
+    </message>
+    <message>
+        <source>Keypool ran out, please call keypoolrefill first</source>
+        <translation>Erro na Keypool, favor executar keypoolrefill primeiro</translation>
+    </message>
+    <message>
+        <source>Listen for JSON-RPC connections on &lt;port&gt; (default: %u or testnet: %u)</source>
+        <translation>Escutar por conexões JSON-RPC na porta &lt;port&gt; (padrão: %u ou testnet: %u)</translation>
+    </message>
+    <message>
+        <source>Listen for connections on &lt;port&gt; (default: %u or testnet: %u)</source>
+        <translation>Aguardar por conexões na porta &lt;port&gt; (padrão: %u ou testnet: %u)</translation>
+    </message>
+    <message>
+        <source>Loading banlist...</source>
+        <translation>Carregando lista de banidos...</translation>
+    </message>
+    <message>
+        <source>Loading fulfilled requests cache...</source>
+        <translation>Carregando o cache de solicitações atendidas ...</translation>
+    </message>
+    <message>
+        <source>Loading masternode cache...</source>
+        <translation>Carregando o cache do masternode ...</translation>
+    </message>
+    <message>
+        <source>Loading masternode payment cache...</source>
+        <translation>Carregando o cache de pagamento do masternode ...</translation>
+    </message>
+    <message>
+        <source>Lock is already in place.</source>
+        <translation>Bloqueio já está no lugar.</translation>
+    </message>
+    <message>
+        <source>Lock masternodes from masternode configuration file (default: %u)</source>
+        <translation>Bloquear masternodes do arquivo de configuração do masternode (padrão: %u)</translation>
     </message>
     <message>
-        <source>Cannot obtain a lock on data directory %s. Dash Core is probably already running.</source>
-        <translation>Não foi possível obter acesso exclusivo à pasta de dados %s. Possivelmente o Dash Core já se encontra em execução.</translation>
+        <source>Maximum per-connection receive buffer, &lt;n&gt;*1000 bytes (default: %u)</source>
+        <translation>Buffer máximo de recebimento por conexão, &lt;n&gt;*1000 bytes (padrão: %u)</translation>
     </message>
     <message>
-        <source>Darksend uses exact denominated amounts to send funds, you might simply need to anonymize some more coins.</source>
-        <translation>O Darksend usa denominações exactas para enviar fundos, pode necessitar simplesmente de anonimizar mais algumas moedas.</translation>
+        <source>Maximum per-connection send buffer, &lt;n&gt;*1000 bytes (default: %u)</source>
+        <translation>Buffer máximo de envio por conexão, &lt;n&gt;*1000 bytes (padrão: %u)</translation>
     </message>
     <message>
-        <source>Enter regression test mode, which uses a special chain in which blocks can be solved instantly.</source>
-        <translation>Entrar no modo de testes de regressão, que usa uma cadeia de blocos especial onde cada bloco é resolvido instantaneamente.</translation>
+        <source>Mixing in progress...</source>
+        <translation>Mixing em progresso...</translation>
     </message>
     <message>
-        <source>Error: Listening for incoming connections failed (listen returned error %s)</source>
-        <translation>Erro: A escuta por ligações de entrada falhou (a escuta devolveu o erro %s)</translation>
+        <source>Mnemonic passphrase is too long, must be at most 256 characters</source>
+        <translation>Frase mnemotica é muito grande, deve ter ao máximo 256 caracteres</translation>
     </message>
     <message>
-        <source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source>
-        <translation>Executar comando quando é recebido um alerta ou vemos uma longa bifurcação na cadeia de blocos (%s no comando é substituído pela mensagem)</translation>
+        <source>Need to specify a port with -whitebind: '%s'</source>
+        <translation>Necessário informar uma porta com -whitebind: '%s'</translation>
     </message>
     <message>
-        <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source>
-        <translation>Executar comando quando muda uma transacção na carteira (%s no comando é substituído pelo TxID)</translation>
+        <source>No Masternodes detected.</source>
+        <translation>Nenhum Masternode detectado.</translation>
     </message>
     <message>
-        <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source>
-        <translation>Executar comando quando o melhor bloco muda (%s no comando é substituído pela hash do bloco)</translation>
+        <source>No compatible Masternode found.</source>
+        <translation>Nenhum Masternode compatível encontrado.</translation>
     </message>
     <message>
-        <source>In this mode -genproclimit controls how many blocks are generated immediately.</source>
-        <translation>Neste modo o -genproclimit controla quantos blocos são gerados imediatamente.</translation>
+        <source>Not in the Masternode list.</source>
+        <translation>Não está na lista de Masternode.</translation>
     </message>
     <message>
-        <source>InstantX requires inputs with at least 6 confirmations, you might need to wait a few minutes and try again.</source>
-        <translation>O InstantX necessita de entradas com pelo menos 6 confirmações, pode ser necessário aguardar mais uns minutos e tentar de novo.</translation>
+        <source>Only connect to nodes in network &lt;net&gt; (ipv4, ipv6 or onion)</source>
+        <translation>Somente conectar a clientes na rede &lt;net&gt; (ipv4, ipv6 ou onion)</translation>
     </message>
     <message>
-        <source>Name to construct url for KeePass entry that stores the wallet passphrase</source>
-        <translation>Nome para construir o url para a entrada KeePass que guarda a palavra-passe da carteira</translation>
+        <source>Port: %d</source>
+        <translation>Porta: %d</translation>
     </message>
     <message>
-        <source>Query for peer addresses via DNS lookup, if low on addresses (default: 1 unless -connect)</source>
-        <translation>Questionar por endereços dos nós através de pesquisas DNS caso tenha poucos endereços (omissão: 1 excepto -connect)</translation>
+        <source>Prepend debug output with timestamp (default: %u)</source>
+        <translation>Adiciona timestamp como prefixo no debug (padrão: %u)</translation>
     </message>
     <message>
-        <source>Set maximum size of high-priority/low-fee transactions in bytes (default: %d)</source>
-        <translation>Definir tamanho máximo de transacções com alta-prioridade/taxa-reduzida em bytes (omissão: %d)</translation>
+        <source>Rebuild chain state and block index from the blk*.dat files on disk</source>
+        <translation>Reconstruir índice de cadeia de bloco a partir dos arquivos blk*.dat no disco</translation>
     </message>
     <message>
-        <source>Set the number of script verification threads (%u to %d, 0 = auto, &lt;0 = leave that many cores free, default: %d)</source>
-        <translation>Definir número de processos de verificação de scripts (%u a %d, 0 = auto, &lt;0 = deixar este número de cores livres, omissão: %d)</translation>
+        <source>Rebuild chain state from the currently indexed blocks</source>
+        <translation>Reconstruir estado a partir dos blocos indexados</translation>
     </message>
     <message>
-        <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source>
-        <translation>Esta é uma compilação prévia de teste - use por sua conta e risco - não use para minar nem em aplicações comerciais</translation>
+        <source>Send trace/debug info to debug.log file (default: %u)</source>
+        <translation>Enviar informação de execução/depuração para o ficheiro debug.log (omissão: %u)</translation>
     </message>
     <message>
-        <source>Unable to bind to %s on this computer. Dash Core is probably already running.</source>
-        <translation>Não foi possível vincular a %s neste computador. Provavelmente o Dash Core já está a ser executado.</translation>
+        <source>Send transactions as zero-fee transactions if possible (default: %u)</source>
+        <translation>Enviar com taxa-zero se possível (omissão: %u)</translation>
     </message>
     <message>
-        <source>Unable to locate enough Darksend denominated funds for this transaction.</source>
-        <translation>Não foi possível localizar fundos Darksend denominados suficientes para esta transacção.</translation>
+        <source>Set key pool size to &lt;n&gt; (default: %u)</source>
+        <translation>Defina o tamanho da chave para piscina&lt;n&gt; (padrão: %u)</translation>
     </message>
     <message>
-        <source>Unable to locate enough Darksend non-denominated funds for this transaction that are not equal 1000 DASH.</source>
-        <translation>Não foi possível localizar fundos Darksend não denominados suficientes para esta transacção que não sejam igual a 1000DRK.</translation>
+        <source>Set the number of threads to service RPC calls (default: %d)</source>
+        <translation>Defina o número de threads para chamadas do serviço RPC (padrão: %d)</translation>
     </message>
     <message>
-        <source>Warning: -paytxfee is set very high! This is the transaction fee you will pay if you send a transaction.</source>
-        <translation>Aviso: -paytxfee tem um valor muito elevado! Esta é a taxa de transacção que será paga se enviar uma transacção.</translation>
+        <source>Specify configuration file (default: %s)</source>
+        <translation>Especificar arquivo de configuração (padrão: %s)</translation>
     </message>
     <message>
-        <source>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</source>
-        <translation>Aviso: A rede não parece estar concordar! Parece haver alguns mineiros com problemas.</translation>
+        <source>Specify connection timeout in milliseconds (minimum: 1, default: %d)</source>
+        <translation>Especificar tempo para desistência de conexões, em mili segundos (mínimo: 1, padrão: %d)</translation>
     </message>
     <message>
-        <source>Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.</source>
-        <translation>Aviso: Parece que não estamos de acordo com outros nós! Talvez necessite actualizar a aplicação ou os outros nós necessitem actualizar.</translation>
+        <source>Specify masternode configuration file (default: %s)</source>
+        <translation>Especificar ficheiro de configuração masternode (omissão: %s)</translation>
     </message>
     <message>
-        <source>Warning: error reading wallet.dat! All keys read correctly, but transaction data or address book entries might be missing or incorrect.</source>
-        <translation>Aviso: erro ao carregar wallet.dat! Todas as chaves estão correctas mas os dados das transacções ou as entradas do livro de endereços podem estar ausentes ou incorrectas.</translation>
+        <source>Specify pid file (default: %s)</source>
+        <translation>Especificar arquivo pid (padrão: %s)</translation>
     </message>
     <message>
-        <source>Warning: wallet.dat corrupt, data salvaged! Original wallet.dat saved as wallet.{timestamp}.bak in %s; if your balance or transactions are incorrect you should restore from a backup.</source>
-        <translation>Aviso: wallet.dar corrompido mas os dados foram recuperados! A carteira original foi gravada como wallet{data/hora}.bak in %s; se o seu saldo ou transacções forem incorrectos deverá recuperar a partir de uma cópia de segurança.</translation>
+        <source>Spend unconfirmed change when sending transactions (default: %u)</source>
+        <translation>Gastar troco não confirmado quando enviar transações (padrão: %u)</translation>
     </message>
     <message>
-        <source>You must specify a masternodeprivkey in the configuration. Please see documentation for help.</source>
-        <translation>Tem que especificar uma masternodeprivkey na configuração. Por favor verifique a documentação para ajuda.</translation>
+        <source>Submitted following entries to masternode: %u / %d</source>
+        <translation>Apresentadas as seguintes entradas ao masternode: %u / %d </translation>
     </message>
     <message>
-        <source>(default: 1)</source>
-        <translation>(omissão: 1)</translation>
+        <source>Submitted to masternode, waiting for more entries ( %u / %d ) %s</source>
+        <translation>Apresentado ao masternode, esperando por mais entradas ( %u / %d ) %s</translation>
     </message>
     <message>
-        <source>Accept command line and JSON-RPC commands</source>
-        <translation>Aceitar comandos da linha de comandos e JSON-RPC</translation>
+        <source>Submitted to masternode, waiting in queue %s</source>
+        <translation>Enviado para o masternode, esperando na fila %s</translation>
     </message>
     <message>
-        <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
-        <translation>Aceitar ligações do exterior (omissão: 1 se não tiver usado -proxy ou -connect)</translation>
+        <source>Synchroning blockchain...</source>
+        <translation>Sincronizando blockchain...</translation>
     </message>
     <message>
-        <source>Add a node to connect to and attempt to keep the connection open</source>
-        <translation>Adicionar um nó ao qual efectuar ligação e tentar manter a ligação aberta</translation>
+        <source>Synchronization failed</source>
+        <translation>Sincronização falhou</translation>
     </message>
     <message>
-        <source>Allow DNS lookups for -addnode, -seednode and -connect</source>
-        <translation>Permitir pesquisas de DNS para -addnode, -deednode e -connect</translation>
+        <source>Synchronization finished</source>
+        <translation>Sincronização finalizada</translation>
     </message>
     <message>
-        <source>Already have that input.</source>
-        <translation>Entrada existente.</translation>
+        <source>Synchronizing masternodes...</source>
+        <translation>Sincronizando masternodes...</translation>
     </message>
     <message>
-        <source>Attempt to recover private keys from a corrupt wallet.dat</source>
-        <translation>Tentar recuperar as chaves privadas a partir de um ficheiro wallet.dat corrompido</translation>
+        <source>This is not a Masternode.</source>
+        <translation>Este não é um Masternode.</translation>
     </message>
     <message>
-        <source>Block creation options:</source>
-        <translation>Opções de criação de blocos:</translation>
+        <source>Threshold for disconnecting misbehaving peers (default: %u)</source>
+        <translation>Limite para desconectar peers mal comportados (padrão: %u)</translation>
     </message>
     <message>
-        <source>Can't denominate: no compatible inputs left.</source>
-        <translation>Não é possível denominar: não existem mais entradas compatíveis.</translation>
+        <source>Too many %f denominations, removing.</source>
+        <translation>Muitas %f denominações, removendo.</translation>
     </message>
     <message>
-        <source>Cannot downgrade wallet</source>
-        <translation>Não é possível reverter para uma versão anterior da carteira</translation>
+        <source>Tor control port password (default: empty)</source>
+        <translation>Senha da porta de controle do Tor (padrão: vazio)</translation>
     </message>
     <message>
-        <source>Cannot resolve -bind address: '%s'</source>
-        <translation>Não foi possível resolver endereço de vínculo: '%s'</translation>
+        <source>Tor control port to use if onion listening enabled (default: %s)</source>
+        <translation>Porta de controle a ser usada se o monitoramento onion estiver habilitado (padrão: %s)</translation>
     </message>
     <message>
-        <source>Cannot resolve -externalip address: '%s'</source>
-        <translation>Não foi possível resolver endereço -externalip: '%s'</translation>
+        <source>Unable to start HTTP server. See debug log for details.</source>
+        <translation>Não foi possível iniciar o servidor HTTP. Veja o log de debug para detalhes.</translation>
     </message>
     <message>
-        <source>Cannot write default address</source>
-        <translation>Não foi possível escrever endereço por omissão</translation>
+        <source>Unknown response.</source>
+        <translation>Resposta desconhecida.</translation>
     </message>
     <message>
-        <source>Collateral not valid.</source>
-        <translation>Colateral inválido.</translation>
+        <source>Unsupported argument -benchmark ignored, use -debug=bench.</source>
+        <translation>Argument -benchmark não suportado e ignorado, use -debug=bench.</translation>
     </message>
     <message>
-        <source>Connect only to the specified node(s)</source>
-        <translation>Ligar apenas ao(s) nó(s) especificados</translation>
+        <source>Unsupported argument -debugnet ignored, use -debug=net.</source>
+        <translation>Argument -debugnet não suportado e ignorado, use -debug=net.</translation>
     </message>
     <message>
-        <source>Connect to a node to retrieve peer addresses, and disconnect</source>
-        <translation>Efectuar ligação a um nó para obter os endereços de outros clientes e desligar</translation>
+        <source>Unsupported argument -tor found, use -onion.</source>
+        <translation>O argumento -tor não é suportado, use -onion.</translation>
     </message>
     <message>
-        <source>Connection options:</source>
-        <translation>Opções de ligação:</translation>
+        <source>Upgrade wallet to latest format on startup</source>
+        <translation>Atualizar carteira para o formato mais recente ao iniciar</translation>
     </message>
     <message>
-        <source>Corrupted block database detected</source>
-        <translation>Detectada corrupção na base de dados dos blocos</translation>
+        <source>Use KeePass 2 integration using KeePassHttp plugin (default: %u)</source>
+        <translation>Utilize integração KeePass 2 usando plugin KeePassHttp (default: %u)</translation>
     </message>
     <message>
-        <source>Darksend options:</source>
-        <translation>Opções Darksend:</translation>
+        <source>Use UPnP to map the listening port (default: %u)</source>
+        <translation>Usar UPnP para mapear a porta de entrada (padrão: %u)</translation>
     </message>
     <message>
-        <source>Debugging/Testing options:</source>
-        <translation>Opções de Depuração/Teste</translation>
+        <source>Use the test chain</source>
+        <translation>Use a cadeia de teste</translation>
     </message>
     <message>
-        <source>Discover own IP address (default: 1 when listening and no -externalip)</source>
-        <translation>Descobrir endereço de IP próprio (omissão: 1 quando em escuta e -externalip não definido)</translation>
+        <source>User Agent comment (%s) contains unsafe characters.</source>
+        <translation>Comentário User Agent (%s) contém caracteres inseguros.</translation>
     </message>
     <message>
-        <source>Do not load the wallet and disable wallet RPC calls</source>
-        <translation>Não carregar a carteira e desabilitar as chamadas RPC</translation>
+        <source>Will retry...</source>
+        <translation>Será feita nova tentativa...</translation>
     </message>
     <message>
-        <source>Do you want to rebuild the block database now?</source>
-        <translation>Quer reconstruir agora a base de dados dos blocos?</translation>
+        <source>Invalid masternodeprivkey. Please see documenation.</source>
+        <translation>masternodeprivkey inválida. Por favor, consulte a documentação.</translation>
     </message>
     <message>
-        <source>Done loading</source>
-        <translation>Carregamento completo</translation>
+        <source>Can't find random Masternode.</source>
+        <translation>Não é possível encontrar o Masternode aleatório.</translation>
     </message>
     <message>
-        <source>Entries are full.</source>
-        <translation>Entradas completas.</translation>
+        <source>Can't mix while sync in progress.</source>
+        <translation>Não é possível misturar enquanto a sincronização está em progresso.</translation>
     </message>
     <message>
-        <source>Error initializing block database</source>
-        <translation>Erro ao inicializar a base de dados dos blocos</translation>
+        <source>Could not parse masternode.conf</source>
+        <translation>Impossível avaliar masternode.conf</translation>
     </message>
     <message>
-        <source>Error initializing wallet database environment %s!</source>
-        <translation>Erro ao inicializar o ambiente de base de dados da carteira %s!</translation>
+        <source>Invalid netmask specified in -whitelist: '%s'</source>
+        <translation>Máscara de rede inválida detectada em -whitelist: '%s'</translation>
     </message>
     <message>
-        <source>Error loading block database</source>
-        <translation>Erro ao carregar base de dados de blocos</translation>
+        <source>Invalid port detected in masternode.conf</source>
+        <translation>Porta inválida detectada em masternode.conf</translation>
     </message>
     <message>
-        <source>Error loading wallet.dat</source>
-        <translation>Erro ao carregar wallet.dat</translation>
+        <source>Invalid script detected.</source>
+        <translation>Detectado script inválido.</translation>
     </message>
     <message>
-        <source>Error loading wallet.dat: Wallet corrupted</source>
-        <translation>Erro ao carregar wallet.dat: A carteira está corrompida</translation>
+        <source>KeePassHttp id for the established association</source>
+        <translation>KeePassHttp id para a associação estabelecida</translation>
     </message>
     <message>
-        <source>Error opening block database</source>
-        <translation>Erro ao abrir base de dados de blocos</translation>
+        <source>KeePassHttp key for AES encrypted communication with KeePass</source>
+        <translation>Chave KeePassHttp para usar na comunicação cifrada AES com o KeePass</translation>
     </message>
     <message>
-        <source>Error reading from database, shutting down.</source>
-        <translation>Erro ao ler da base de dados, a encerrar.</translation>
+        <source>Keep at most &lt;n&gt; unconnectable transactions in memory (default: %u)</source>
+        <translation>Manter ao máximo &lt;n&gt; transações inconectáveis na memória (padrão: %u)</translation>
     </message>
     <message>
-        <source>Error recovering public key.</source>
-        <translation>Erro ao recuperar chave pública.</translation>
+        <source>Disable all Dash specific functionality (Masternodes, PrivateSend, InstantSend, Governance) (0-1, default: %u)</source>
+        <translation>Desabilitar todas as funcionalidades específicas da Dash (Masternodes, EnvioPrivado, EnvioInstantâneo, Governança) (0-1, default: %u)</translation>
     </message>
     <message>
-        <source>Error</source>
-        <translation>Erro</translation>
+        <source>Discover own IP addresses (default: 1 when listening and no -externalip or -proxy)</source>
+        <translation>Descobrir o próprio IP (padrão: 1 enquanto aguardando conexões e sem -externalip ou -proxy)</translation>
     </message>
     <message>
-        <source>Error: Disk space is low!</source>
-        <translation>Erro: Pouco espaço em disco!</translation>
+        <source>Do not keep transactions in the mempool longer than &lt;n&gt; hours (default: %u)</source>
+        <translation>Não manter transações na mempool por mais que &lt;n&gt; horas (padrão: %u)</translation>
     </message>
     <message>
-        <source>Error: Wallet locked, unable to create transaction!</source>
-        <translation>Erro: Carteira bloqueada, não foi possível criar a transacção!</translation>
+        <source>Enable InstantSend, show confirmations for locked transactions (0-1, default: %u)</source>
+        <translation>Activar InstantSend, mostrar confirmações para transacções bloqueadas (0-1, omissão: %u)</translation>
     </message>
     <message>
-        <source>Error: You already have pending entries in the Darksend pool</source>
-        <translation>Erro: Já tem entradas pendentes no conjunto Darksend</translation>
+        <source>Enable multiple PrivateSend mixing sessions per block, experimental (0-1, default: %u)</source>
+        <translation>Habalitar múltiplas sessões de mistura para EnvioPrivado por bloco, experimental (0-1, padrão: %u)</translation>
     </message>
     <message>
-        <source>Failed to listen on any port. Use -listen=0 if you want this.</source>
-        <translation>Falhou a escuta em qualquer porta. Use -listen=0 se é isto que deseja.</translation>
+        <source>Enable use of automated PrivateSend for funds stored in this wallet (0-1, default: %u)</source>
+        <translation>Activar o uso de PrivateSend automatizado para os fundos guardados nesta carteira (0-1, omissão: %u)</translation>
     </message>
     <message>
-        <source>Failed to read block</source>
-        <translation>Falha ao ler bloco</translation>
+        <source>Execute command when a wallet InstantSend transaction is successfully locked (%s in cmd is replaced by TxID)</source>
+        <translation>Execute comando quando uma transação EnvioInstantâneo numa carteira é fechada com sucesso (%s no cmd  é substituído por TxID)</translation>
     </message>
     <message>
-        <source>If &lt;category&gt; is not supplied, output all debugging information.</source>
-        <translation>Se a &lt;category&gt; não for fornecida, mostrar toda a informação de depuração.</translation>
+        <source>Failed to create backup, file already exists! This could happen if you restarted wallet in less than 60 seconds. You can continue if you are ok with this.</source>
+        <translation>Falha em criar o backup, o arquivo já existe! Isso pode ter acontecido se você resetou sua carteira em menos de 60 segundos. Você pode continuar se está ok com isso.</translation>
     </message>
     <message>
-        <source>(1 = keep tx meta data e.g. account owner and payment request information, 2 = drop tx meta data)</source>
-        <translation>(1 = mantem meta dados das transacções ex. dono da conta e informação das solicitações de pagamento, 2 = elimina os meta dados das transacções)</translation>
+        <source>Fees (in %s/kB) smaller than this are considered zero fee for relaying, mining and transaction creation (default: %s)</source>
+        <translation>Comissões (em %s/kB) menores serão consideradas como zero para relaying, mineração e criação de transação (padrão %s)</translation>
     </message>
     <message>
-        <source>An error occurred while setting up the RPC address %s port %u for listening: %s</source>
-        <translation>Ocorreu um erro ao configurar o endereço RPC %s na porta %u para escutar: %s</translation>
+        <source>Fees (in %s/kB) smaller than this are considered zero fee for transaction creation (default: %s)</source>
+        <translation>Comissões (em %s/kB) menores serão consideradas como zero para criação de transação (padrão %s)</translation>
     </message>
     <message>
-        <source>Bind to given address and whitelist peers connecting to it. Use [host]:port notation for IPv6</source>
-        <translation>Vincular a um determinado endereço e ouvir sempre aí. Use a notação [host]:porta para IPv6</translation>
+        <source>If &lt;category&gt; is not supplied or if &lt;category&gt; = 1, output all debugging information.</source>
+        <translation>Se &lt;category&gt; não for suprida ou se &lt;category&gt; = 1, mostrar toda informação de depuração.</translation>
     </message>
     <message>
-        <source>Continuously rate-limit free transactions to &lt;n&gt;*1000 bytes per minute (default:%u)</source>
-        <translation>Continuamente limitar o número de transacções gratuitas por minuto a &lt;n&gt;*1000 bytes (default:%u)</translation>
+        <source>InstantSend doesn't support sending values that high yet. Transactions are currently limited to %1 DASH.</source>
+        <translation>EnvioInstantâneo não suporta o envio de valores tão altos ainda. As transações são limitadas a %1 DASH.</translation>
     </message>
     <message>
-        <source>Delete all wallet transactions and only recover those parts of the blockchain through -rescan on startup</source>
-        <translation>Apaga todas as transacções da carteira e só recupera essas partes da cadeia de blocos com -rescan no arranque</translation>
+        <source>InstantSend requires inputs with at least %d confirmations, you might need to wait a few minutes and try again.</source>
+        <translation>O InstantSend necessita de entradas com pelo menos %d confirmações, pode ser necessário aguardar mais uns minutos e tentar de novo.</translation>
     </message>
     <message>
-        <source>Enable instantx, show confirmations for locked transactions (bool, default: %s)</source>
-        <translation>Activar instantx, mostrar confirmações para transacções bloqueadas (bool, default: %s)</translation>
+        <source>Maintain a full address index, used to query for the balance, txids and unspent outputs for addresses (default: %u)</source>
+        <translation>Mantenha um index completo de endereços, usados para inquirir sobre o saldo, txids e outpus não gastos para endereços (padrão: %u)</translation>
     </message>
     <message>
-        <source>Enable use of automated darksend for funds stored in this wallet (0-1, default: %u)</source>
-        <translation>Activar o uso de darksend automatizado para os fundos guardados nesta carteira (0-1, default: %u)</translation>
+        <source>Maintain a full spent index, used to query the spending txid and input index for an outpoint (default: %u)</source>
+        <translation>Mantenha um index completo de gastos, usados para inquirir a txid de gastos e index de input para um outpoint (padrão: %u)</translation>
     </message>
     <message>
-        <source>Fees (in DASH/Kb) smaller than this are considered zero fee for relaying (default: %s)</source>
-        <translation>Taxas (em DASH/Kb) inferiores a esta serão consideradas zero para retransmissão (default: %s)</translation>
+        <source>Maintain a timestamp index for block hashes, used to query blocks hashes by a range of timestamps (default: %u)</source>
+        <translation>Mantenha um index de marcadores de tempo para hashes de bloco, usados para inquirir hashes de blocos por alcance de marcadores de tempo (padrão: %u)</translation>
     </message>
     <message>
-        <source>Flush database activity from memory pool to disk log every &lt;n&gt; megabytes (default: %u)</source>
-        <translation>Consolidar a actividade de dados de memoria para disco a cada &lt;n&gt; megabytes (omissão: %u)</translation>
+        <source>Maintain at most &lt;n&gt; connections to peers (temporary service connections excluded) (default: %u)</source>
+        <translation>Mantenha no máximo&lt;n&gt;conexões a pares (conexões de serviço temporário excluídas) (padrão: %u)</translation>
     </message>
     <message>
-        <source>Found unconfirmed denominated outputs, will wait till they confirm to continue.</source>
-        <translation>Foram encontradas saídas denominadas não confirmadas, a aguardar pela confirmação para prosseguir.</translation>
+        <source>PrivateSend uses exact denominated amounts to send funds, you might simply need to anonymize some more coins.</source>
+        <translation>O PrivateSend usa denominações exactas para enviar fundos, pode necessitar simplesmente de anonimizar mais algumas moedas.</translation>
     </message>
     <message>
-        <source>How thorough the block verification of -checkblocks is (0-4, default: %u)</source>
-        <translation>Quão minuciosa é a verificação dos blocos do -checkblocks (0-4, omissão: %u)</translation>
+        <source>Prune configured below the minimum of %d MiB.  Please use a higher number.</source>
+        <translation>Prune configurado abaixo do mínimo de %d MiB. Por favor use um número mais alto.</translation>
     </message>
     <message>
-        <source>Log transaction priority and fee per kB when mining blocks (default: %u)</source>
-        <translation>Salvar prioridade e taxa da transacção por kB quando minar blocos (omissão: %u)</translation>
+        <source>Prune: last wallet synchronisation goes beyond pruned data. You need to -reindex (download the whole blockchain again in case of pruned node)</source>
+        <translation>Prune: A ultima sincronização da carteira foi além do dado comprimido. Você precisa reindexar (fazer o download de toda a blockchain novamente)</translation>
     </message>
     <message>
-        <source>Number of seconds to keep misbehaving peers from reconnecting (default: %u)</source>
-        <translation>Número de segundos a não permitir ligações de nós com comportamento inadequado (omissão: %u)</translation>
+        <source>Randomize credentials for every proxy connection. This enables Tor stream isolation (default: %u)</source>
+        <translation>Gerar credenciais aleatórias para cada conexão por proxy. Isto habilita o isolamento de stream do Tor (padrão: %u)</translation>
     </message>
     <message>
-        <source>Output debugging information (default: %u, supplying &lt;category&gt; is optional)</source>
-        <translation>Informação de depuração de saída (omissão: %u, fornecer &lt;category&gt; é opcional)</translation>
+        <source>Rescans are not possible in pruned mode. You will need to use -reindex which will download the whole blockchain again.</source>
+        <translation>Rescans não são possíveis no modo prune. Você precisa usar -reindex, que irá fazer o download de toda a blockchain novamente.</translation>
     </message>
     <message>
-        <source>Provide liquidity to Darksend by infrequently mixing coins on a continual basis (0-100, default: %u, 1=very frequent, high fees, 100=very infrequent, low fees)</source>
-        <translation>Providenciar liquidez para o Darksend misturando moedas continuamente com baixa frequência (0-100, omissão: %u, 1=muito frequente taxas elevadas, 100=pouco frequente, taxas reduzidas)</translation>
+        <source>Specify full path to directory for automatic wallet backups (must exist)</source>
+        <translation>Especifique o caminho completo para o diretório de backups automáticos da carteira (deve existir)</translation>
     </message>
     <message>
-        <source>Send trace/debug info to console instead of debug.log file (default: %u)</source>
-        <translation>Enviar informação de execução/depuração para a consola em vez de enviar para o ficheiro debug.log (omissão: %u)</translation>
+        <source>Support filtering of blocks and transaction with bloom filters (default: %u)</source>
+        <translation>Suportar filtragem de blocos e transações com filtros bloom (padrão: %u)</translation>
     </message>
     <message>
-        <source>Set the number of threads for coin generation if enabled (-1 = all cores, default: %d)</source>
-        <translation>Definir o limite de processadores quando a geração está activa (-1 = todos, omissão: %d)</translation>
+        <source>The block database contains a block which appears to be from the future. This may be due to your computer's date and time being set incorrectly. Only rebuild the block database if you are sure that your computer's date and time are correct</source>
+        <translation>O banco de dados de blocos contém um bloco que parece ser do futuro. Isso pode ser devido à data e hora do seu computador estarem configuradas incorretamente. Apenas reconstrua o banco de dados de blocos se você estiver certo de que a data e hora de seu computador estão corretas.</translation>
     </message>
     <message>
-        <source>Show N confirmations for a successfully locked transaction (0-9999, default: %u)</source>
-        <translation>Mostrar N confirmações para uma transacção bloqueada com sucesso (0-9999, omissão: %u)</translation>
+        <source>The transaction amount is too small to send after the fee has been deducted</source>
+        <translation>O valor da transação é muito pequeno para ser enviado depois que a taxa foi deduzida</translation>
     </message>
     <message>
-        <source>This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit &lt;https://www.openssl.org/&gt; and cryptographic software written by Eric Young and UPnP software written by Thomas Bernard.</source>
-        <translation>Este produto inclui software desenvolvido pelo Projecto OpenSSL para uso no OpenSSL Toolkit &lt;https://www.openssl.org/&gt;, software criptográfico escrito por Eric Young e software UPnP escrito por Thomas Bernard.</translation>
+        <source>Total length of network version string (%i) exceeds maximum length (%i). Reduce the number or size of uacomments.</source>
+        <translation>O tamanho total da string de versão da rede (%i) excede o tamanho máximo (%i). Reduza o numero ou tamanho de uacomments.</translation>
     </message>
     <message>
-        <source>Unable to locate enough funds for this transaction that are not equal 1000 DASH.</source>
-        <translation>Não foi possível localizar fundos suficientes para esta transacção que não sejam igual a 1000DRK.</translation>
+        <source>Tries to keep outbound traffic under the given target (in MiB per 24h), 0 = no limit (default: %d)</source>
+        <translation>Tenta manter tráfego fora dos limites dentro do alvo especificado (em MiB por 24h), 0 = sem limite (padrão: %d)</translation>
     </message>
     <message>
-        <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: %s)</source>
-        <translation>Usar um proxy SOCKS5 diferente para ligar aos nós através dos serviços escondidos Tor (omissão: %s)</translation>
+        <source>Unable to locate enough PrivateSend denominated funds for this transaction.</source>
+        <translation>Não é possível localizar fundos denominados do PrivateSend suficientes para essa transação.</translation>
     </message>
     <message>
-        <source>Warning: -maxtxfee is set very high! Fees this large could be paid on a single transaction.</source>
-        <translation>Aviso: -maxtxfee é demasiado alta! Taxas deste tamanho podem ser pagas em apenas uma transacção.</translation>
+        <source>Unsupported argument -socks found. Setting SOCKS version isn't possible anymore, only SOCKS5 proxies are supported.</source>
+        <translation>Argumento inválido -socks encontrado. Definir a versão do SOCKS não é mais possível, somente proxys SOCK5 são suportados.</translation>
     </message>
     <message>
-        <source>Warning: Please check that your computer's date and time are correct! If your clock is wrong Dash Core will not work properly.</source>
-        <translation>Aviso: Por favor verifique que a data e a hora do computador está correcta! Se o relógio estiver errado o Dash Core não vai funcionar correctamente.</translation>
+        <source>Unsupported argument -whitelistalwaysrelay ignored, use -whitelistrelay and/or -whitelistforcerelay.</source>
+        <translation>Argumento não suportado -whitelistalwaysrelay foi ignorado, utilize -whitelistrelay e/ou -whitelistforcerelay.</translation>
     </message>
     <message>
-        <source>(9999 could be used only on mainnet)</source>
-        <translation>(9999 apenas pode ser usado para mainnet)</translation>
+        <source>Use UPnP to map the listening port (default: 1 when listening and no -proxy)</source>
+        <translation>Usar UPnP para mapear a porta de entrada (padrão: 1 quando listening e no -proxy)</translation>
     </message>
     <message>
-        <source>(default: %s)</source>
-        <translation>(default: %s)</translation>
+        <source>WARNING! Failed to replenish keypool, please unlock your wallet to do so.</source>
+        <translation>ATENÇÃO! Falha ao repor o keypool, desbloqueie sua carteira para fazer isso.</translation>
     </message>
     <message>
-        <source>&lt;category&gt; can be:
-</source>
-        <translation>&lt;category&gt; pode ser:
-</translation>
+        <source>Wallet is locked, can't replenish keypool! Automatic backups and mixing are disabled, please unlock your wallet to replenish keypool.</source>
+        <translation>Carteira travada, impossível reabastecer o keypool. Backups e misturas automáticas estão desabilitadas, por favor, destrave sua carteira para reabastecer o keypool. </translation>
     </message>
     <message>
-        <source>Accept public REST requests (default: %u)</source>
-        <translation>Aceitar REST requests (default: %u) públicos</translation>
+        <source>Warning: Unknown block versions being mined! It's possible unknown rules are in effect</source>
+        <translation>Alerta: Versões de blocos desconhecidas mineradas! É possível que regras desconhecidas estejam ativas</translation>
     </message>
     <message>
-        <source>Acceptable ciphers (default: %s)</source>
-        <translation>Cifras aceitáveis (default: %s)</translation>
+        <source>You need to rebuild the database using -reindex to go back to unpruned mode.  This will redownload the entire blockchain</source>
+        <translation>Você precisa reconstruir o banco de dados usando -reindex para sair do modo prune. Isso irá rebaixar todo o blockchain.</translation>
     </message>
     <message>
-        <source>Always query for peer addresses via DNS lookup (default: %u)</source>
-        <translation>Perguntar sempre por endereços de pares via DNS lookup (default: %u)</translation>
+        <source>(%d could be used only on mainnet)</source>
+        <translation>(%d poderia ser usado somente na mainnet)</translation>
     </message>
     <message>
-        <source>Cannot resolve -whitebind address: '%s'</source>
-        <translation>Incapaz de resolver -whitebind address: '%s'</translation>
+        <source>(default: %u)</source>
+        <translation>(padrão: %u)</translation>
     </message>
     <message>
-        <source>Connect through SOCKS5 proxy</source>
-        <translation>Conectar através de SOCKS5 proxy</translation>
+        <source>(must be %d for mainnet)</source>
+        <translation>(precisa ser %d para mainnet)</translation>
     </message>
     <message>
-        <source>Connect to KeePassHttp on port &lt;port&gt; (default: %u)</source>
-        <translation>Conectar a KeePassHttp na porta &lt;port&gt; (default: %u)</translation>
+        <source>-maxmempool must be at least %d MB</source>
+        <translation>-maxmempool deve ser pelo menos %d MB</translation>
     </message>
     <message>
-        <source>Copyright (C) 2009-%i The Bitcoin Core Developers</source>
-        <translation>Copyright (C) 2009-%i The Bitcoin Core Developers</translation>
+        <source>&lt;category&gt; can be:</source>
+        <translation>&lt;category&gt; pode ser:</translation>
     </message>
     <message>
-        <source>Copyright (C) 2014-%i The Dash Core Developers</source>
-        <translation>Copyright (C) 2014-%i Dash Core Developers</translation>
+        <source>Append comment to the user agent string</source>
+        <translation>Adicionar comentário à string user agent</translation>
     </message>
     <message>
-        <source>Could not parse -rpcbind value %s as network address</source>
-        <translation>Incapaz de analizar -rpcbind value %s como endereço de rede</translation>
+        <source>Automatic backups disabled</source>
+        <translation>Backup automáticos desabilitados.</translation>
     </message>
     <message>
-        <source>Darksend is idle.</source>
-        <translation>Darksend está inactivo.</translation>
+        <source>Automatically create Tor hidden service (default: %d)</source>
+        <translation>Criar automaticamente serviços ocultos do Tor (padrão: %d)</translation>
     </message>
     <message>
-        <source>Darksend request complete:</source>
-        <translation>Pedido Darksend completo:</translation>
+        <source>ERROR! Failed to create automatic backup</source>
+        <translation>ERRO! Falha ao criar o backup automático</translation>
     </message>
     <message>
-        <source>Darksend request incomplete:</source>
-        <translation>Pedido Darksend incompleto:</translation>
+        <source>Enable publish hash block in &lt;address&gt;</source>
+        <translation>Abilitar a publicação da hash do block em &lt;endereço&gt;</translation>
     </message>
     <message>
-        <source>Disable safemode, override a real safe mode event (default: %u)</source>
-        <translation>Desactivar safemode, ultrapassar o evento de modo de segurança real (default: %u)</translation>
+        <source>Enable publish hash transaction (locked via InstantSend) in &lt;address&gt;</source>
+        <translation>Ative a transação de hash de publicação (bloqueada via InstantSend) em&lt;address&gt;</translation>
     </message>
     <message>
-        <source>Enable the client to act as a masternode (0-1, default: %u)</source>
-        <translation>Permitir ao cliente actuar como um masternode (0-1, omissão: %u)</translation>
+        <source>Enable publish hash transaction in &lt;address&gt;</source>
+        <translation>Abilitar a publicação da hash da transação em &lt;endereço&gt;</translation>
     </message>
     <message>
-        <source>Error connecting to Masternode.</source>
-        <translation>Erro conectando ao Masternode</translation>
+        <source>Enable publish raw block in &lt;address&gt;</source>
+        <translation>Abilitar a publicação dos dados brutos do block em &lt;endereço&gt;</translation>
     </message>
     <message>
-        <source>Error loading wallet.dat: Wallet requires newer version of Dash Core</source>
-        <translation>Erro carregando wallet.dat Carteira precisa de nova versão do Dash Core</translation>
+        <source>Enable publish raw transaction (locked via InstantSend) in &lt;address&gt;</source>
+        <translation>Ativar publicação de transação bruta (bloqueada via InstantSend) em&lt;address&gt;</translation>
     </message>
     <message>
-        <source>Error: A fatal internal error occured, see debug.log for details</source>
-        <translation>Erro: Um erro fatal interno ocorreu, veja debug.log para mais detalhes</translation>
+        <source>Enable publish raw transaction in &lt;address&gt;</source>
+        <translation>Abilitar a publicação dos dados brutos da transação em &lt;endereço&gt;</translation>
     </message>
     <message>
-        <source>Error: Can't select current denominated inputs</source>
-        <translation>Erro: Incapaz de seleccionar inputs denominados correntes</translation>
+        <source>Enable transaction replacement in the memory pool (default: %u)</source>
+        <translation>Habilita substituição de transação em memória (padrão: %u)</translation>
     </message>
     <message>
-        <source>Error: Unsupported argument -tor found, use -onion.</source>
-        <translation>Erro: Argument não suportado -tor encontrado, utilize -onion</translation>
+        <source>Error: A fatal internal error occurred, see debug.log for details</source>
+        <translation>Erro: Um erro interno fatal ocorreu, veja debug.log para detalhes</translation>
     </message>
     <message>
-        <source>Fee (in DASH/kB) to add to transactions you send (default: %s)</source>
-        <translation>Taxas (em DASH/Kb) a adicionar às transacções que envia (omissão: %s)</translation>
+        <source>Failed to create backup %s!</source>
+        <translation>Falhou ao criar backup %s!</translation>
     </message>
     <message>
-        <source>Finalizing transaction.</source>
-        <translation>Finalizando transacção.</translation>
+        <source>Failed to create backup, error: %s</source>
+        <translation>Falha ao criar backup, erro: %s</translation>
     </message>
     <message>
-        <source>Force safe mode (default: %u)</source>
-        <translation>Forçar safe mode (default: %u)</translation>
+        <source>Failed to delete backup, error: %s</source>
+        <translation>Falha ao apagar backup, erro: %s</translation>
     </message>
     <message>
-        <source>Found enough users, signing ( waiting %s )</source>
-        <translation>Encontrados utilizadores suficientes, assinando ( waiting %s )</translation>
+        <source>Failed to parse host:port string</source>
+        <translation>Falha ao avaliar a string host:port</translation>
     </message>
     <message>
-        <source>Found enough users, signing ...</source>
-        <translation>Encontrados utilizadores suficientes, assinando ...</translation>
+        <source>Fee (in %s/kB) to add to transactions you send (default: %s)</source>
+        <translation>Taxa (em %s/kB) a ser adicionada às transações que você mandar (padrão: %s)</translation>
     </message>
     <message>
-        <source>Generate coins (default: %u)</source>
-        <translation>Gerar moedas (default: %u)</translation>
+        <source>Imports blocks from external blk000??.dat file on startup</source>
+        <translation>Importar blocos a partir de arquivo externo blk000??.dat durante a inicialização</translation>
     </message>
     <message>
-        <source>How many blocks to check at startup (default: %u, 0 = all)</source>
-        <translation>Quanto blocos deve verificar no arranque (omissão: %u, 0 = all)</translation>
+        <source>InstantSend options:</source>
+        <translation>Opções de EnvioInstantâneo: </translation>
     </message>
     <message>
-        <source>Importing...</source>
-        <translation>A importar...</translation>
+        <source>Invalid amount for -fallbackfee=&lt;amount&gt;: '%s'</source>
+        <translation>Valor inválido para -fallbackfee=&lt;amount&gt;: '%s'</translation>
     </message>
     <message>
-        <source>Imports blocks from external blk000??.dat file</source>
-        <translation>Importa blocos a partir de ficheiros blk000??.dat externos</translation>
+        <source>Keep the transaction memory pool below &lt;n&gt; megabytes (default: %u)</source>
+        <translation>Mantenha a mempool de transações abaixo de &lt;n&gt; megabytes (padrão: %u)</translation>
     </message>
     <message>
-        <source>Include IP addresses in debug output (default: %u)</source>
-        <translation>Incluir endereços IP no output do debug (default: %u)</translation>
+        <source>Last PrivateSend was too recent.</source>
+        <translation>O último PrivateSend foi muito recente.</translation>
     </message>
     <message>
-        <source>Incompatible mode.</source>
-        <translation>Modo incompatível.</translation>
+        <source>Last successful PrivateSend action was too recent.</source>
+        <translation>A última ação PrivateSend com sucesso foi muito recente.</translation>
     </message>
     <message>
-        <source>Incompatible version.</source>
-        <translation>Versão incompatível.</translation>
+        <source>Line: %d</source>
+        <translation>Linha: %d</translation>
     </message>
     <message>
-        <source>Incorrect or no genesis block found. Wrong datadir for network?</source>
-        <translation>Bloco original não encontrado ou incorrecto. Pasta de dados errada para esta rede?</translation>
+        <source>Loading addresses...</source>
+        <translation>Carregando endereços...</translation>
     </message>
     <message>
-        <source>Information</source>
-        <translation>Informação</translation>
+        <source>Loading block index...</source>
+        <translation>Carregando índice de blocos...</translation>
     </message>
     <message>
-        <source>Initialization sanity check failed. Dash Core is shutting down.</source>
-        <translation>A verificação de consistência no arranque falhou. O Dash Core está a encerrar.</translation>
+        <source>Loading governance cache...</source>
+        <translation>Sincronizando cache de governança ....</translation>
     </message>
     <message>
-        <source>Input is not valid.</source>
-        <translation>A entrada não é válida.</translation>
+        <source>Loading wallet... (%3.2f %%)</source>
+        <translation>Carregando carteira... (%3.2f %%)</translation>
     </message>
     <message>
-        <source>InstantX options:</source>
-        <translation>Opções InstantX</translation>
+        <source>Loading wallet...</source>
+        <translation>Carregando carteira...</translation>
     </message>
     <message>
-        <source>Insufficient funds.</source>
-        <translation>Fundos insuficientes.</translation>
+        <source>Location of the auth cookie (default: data dir)</source>
+        <translation>Localização do cookie de autenticação (padrão: diretório de dados)</translation>
     </message>
     <message>
-        <source>Invalid -onion address: '%s'</source>
-        <translation>Endereço -onion inválido: '%s'</translation>
+        <source>Make the wallet broadcast transactions</source>
+        <translation>Criar transações de transmissão de carteira</translation>
     </message>
     <message>
-        <source>Invalid -proxy address: '%s'</source>
-        <translation>Endereço -proxy inválido: '%s'</translation>
+        <source>Masternode cache is empty, skipping payments and governance cache...</source>
+        <translation>A  cache masternode está vazia, pulando cache de pagamentos e governança...</translation>
     </message>
     <message>
-        <source>Invalid amount for -maxtxfee=&lt;amount&gt;: '%s'</source>
-        <translation>Quantidade inválida para -maxtxfee=&lt;amount&gt;: '%s'</translation>
+        <source>Masternode options:</source>
+        <translation>Opções do Masternode:</translation>
     </message>
     <message>
-        <source>Invalid amount for -minrelaytxfee=&lt;amount&gt;: '%s'</source>
-        <translation>Quantia inválida para -minrelaytxfee=&lt;amount&gt;: '%s'</translation>
+        <source>Masternode queue is full.</source>
+        <translation>A fila do masternode está cheia.</translation>
     </message>
     <message>
-        <source>Invalid amount for -mintxfee=&lt;amount&gt;: '%s'</source>
-        <translation>Quantia inválida para -mintxfee=&lt;amount&gt;: '%s'</translation>
+        <source>Masternode:</source>
+        <translation>Masternode:</translation>
     </message>
     <message>
-        <source>Invalid amount for -paytxfee=&lt;amount&gt;: '%s' (must be at least %s)</source>
-        <translation>Quantia inválida para -paytxfee=&lt;amount&gt;: '%s' (must be at least %s)</translation>
+        <source>Minimum bytes per sigop in transactions we relay and mine (default: %u)</source>
+        <translation>Mínimo de bytes por sigop nas transações que retransmitimos e mineramos (padrão: %u)</translation>
     </message>
     <message>
-        <source>Invalid amount for -paytxfee=&lt;amount&gt;: '%s'</source>
-        <translation>Quantia inválida para -paytxfee=&lt;amount&gt;: '%s'</translation>
+        <source>Missing input transaction information.</source>
+        <translation>Falta informação da transação de entrada.</translation>
     </message>
     <message>
-        <source>Last successful Darksend action was too recent.</source>
-        <translation>Ultima acção Darksend com sucesso é demasiado recente.</translation>
+        <source>No errors detected.</source>
+        <translation>Nenhum erro detectado.</translation>
     </message>
     <message>
-        <source>Limit size of signature cache to &lt;n&gt; entries (default: %u)</source>
-        <translation>Limitar o tamanho da cache de assinaturas a &lt;n&gt; elementos (default: %u)</translation>
+        <source>No matching denominations found for mixing.</source>
+        <translation>Nenhuma denominação correspondente encontrada para misturar.</translation>
     </message>
     <message>
-        <source>Listen for JSON-RPC connections on &lt;port&gt; (default: %u or testnet: %u)</source>
-        <translation>Escutar por ligações JSON-RPC na porta &lt;port&gt; (default: %u or testnet: %u)</translation>
+        <source>Node relay options:</source>
+        <translation>Opções de relé nó :</translation>
     </message>
     <message>
-        <source>Listen for connections on &lt;port&gt; (default: %u or testnet: %u)</source>
-        <translation>Escutar ligações na &lt;port&gt; (default: %u or testnet: %u)</translation>
+        <source>Non-standard public key detected.</source>
+        <translation>Nenhuma chave pública fora do padrão detectada.</translation>
     </message>
     <message>
-        <source>Loading budget cache...</source>
-        <translation>Carregando cache de orçamentos...</translation>
+        <source>Not compatible with existing transactions.</source>
+        <translation>Não é compatível com as transações existentes.</translation>
     </message>
     <message>
-        <source>Loading masternode cache...</source>
-        <translation>A carregar a cache de masternodes...</translation>
+        <source>Not enough file descriptors available.</source>
+        <translation>Não há descritores de arquivos disponíveis.</translation>
     </message>
     <message>
-        <source>Loading masternode payment cache...</source>
-        <translation>Carregando cache de pagamento de maternodes...</translation>
+        <source>Not enough funds to anonymize.</source>
+        <translation>Não há fundos suficientes para anonimo.</translation>
     </message>
     <message>
-        <source>Lock is already in place.</source>
-        <translation>Bloqueio já efectuado.</translation>
+        <source>Number of automatic wallet backups (default: %u)</source>
+        <translation>Número de backups automáticos da carteira (padrão: %u)</translation>
     </message>
     <message>
-        <source>Lock masternodes from masternode configuration file (default: %u)</source>
-        <translation>Bloquear masternode presentes no ficheiro de configuração (omissão: %u)</translation>
+        <source>Options:</source>
+        <translation>Opções:</translation>
     </message>
     <message>
-        <source>Maintain at most &lt;n&gt; connections to peers (default: %u)</source>
-        <translation>Manter no máximo &lt;n&gt; ligações a outros nós (omissão: %u)</translation>
+        <source>Password for JSON-RPC connections</source>
+        <translation>Senha para conexões JSON-RPC</translation>
     </message>
     <message>
-        <source>Maximum per-connection receive buffer, &lt;n&gt;*1000 bytes (default: %u)</source>
-        <translation>Tamanho máximo da memória intermédia de recepção por ligação, &lt;n&gt;*1000 bytes (omissão: %u)</translation>
+        <source>Print version and exit</source>
+        <translation>Versão de impressão e sair</translation>
     </message>
     <message>
-        <source>Maximum per-connection send buffer, &lt;n&gt;*1000 bytes (default: %u)</source>
-        <translation>Tamanho máximo da memória intermédia de envio por ligação, &lt;n&gt;*1000 bytes (omissão: %u)</translation>
+        <source>PrivateSend is idle.</source>
+        <translation>PrivateSend está inativo.</translation>
     </message>
     <message>
-        <source>Mixing in progress...</source>
-        <translation>Mistura em progresso...</translation>
+        <source>PrivateSend options:</source>
+        <translation>Opções do PrivateSend:</translation>
     </message>
     <message>
-        <source>Need to specify a port with -whitebind: '%s'</source>
-        <translation>Necessita especificar a porta com -whitebind: '%s'</translation>
+        <source>PrivateSend request complete:</source>
+        <translation>PrivateSend solicitação completa:</translation>
     </message>
     <message>
-        <source>No Masternodes detected.</source>
-        <translation>Nenhum Masternode detectado.</translation>
+        <source>PrivateSend request incomplete:</source>
+        <translation>PrivateSend solicitação incompleta:</translation>
     </message>
     <message>
-        <source>No compatible Masternode found.</source>
-        <translation>Nenhum Masternode compatível encontrado.</translation>
+        <source>Prune cannot be configured with a negative value.</source>
+        <translation>O modo prune não pode ser configurado com um valor negativo.</translation>
     </message>
     <message>
-        <source>Not in the Masternode list.</source>
-        <translation>Não está na lista de Masternodes.</translation>
+        <source>Prune mode is incompatible with -txindex.</source>
+        <translation>O modo prune é incompatível com -txindex.</translation>
     </message>
     <message>
-        <source>Number of automatic wallet backups (default: 10)</source>
-        <translation>Número de backups automáticos da carteira (omissão: 10)</translation>
+        <source>Pruning blockstore...</source>
+        <translation>Prunando os blocos existentes...</translation>
     </message>
     <message>
-        <source>Only accept block chain matching built-in checkpoints (default: %u)</source>
-        <translation>Somente aceitar pontos de inspecção apropriados presentes na cadeia de blocos (omissão: %u)</translation>
+        <source>Rescan the block chain for missing wallet transactions on startup</source>
+        <translation>Analise novamente o blockchain para ver se há transações da carteira em falta na inicialização</translation>
     </message>
     <message>
-        <source>Only connect to nodes in network &lt;net&gt; (ipv4, ipv6 or onion)</source>
-        <translation>Somente ligar a nós na rede &lt;net&gt; (IPv4, IPv6 ou onion)</translation>
+        <source>The wallet will avoid paying less than the minimum relay fee.</source>
+        <translation>A carteira irá evitar pagar menos que a taxa mínima de retransmissão.</translation>
     </message>
     <message>
-        <source>Prepend debug output with timestamp (default: %u)</source>
-        <translation>Adicionar data/hora à informação de depuração (omissão: %u)</translation>
+        <source>This is the minimum transaction fee you pay on every transaction.</source>
+        <translation>Esta é a taxa mínima que você paga em todas as transação.</translation>
     </message>
     <message>
-        <source>Run a thread to flush wallet periodically (default: %u)</source>
-        <translation>Executar periodicamente um processo para consolidar a carteira (omissão: %u)</translation>
+        <source>This is the transaction fee you will pay if you send a transaction.</source>
+        <translation>Esta é a taxa que você irá pagar se enviar uma transação.</translation>
     </message>
     <message>
-        <source>Send trace/debug info to debug.log file (default: %u)</source>
-        <translation>Enviar informação de execução/depuração para o ficheiro debug.log (omissão: %u)</translation>
+        <source>Transaction amounts must not be negative</source>
+        <translation>As quantidades nas transações não podem ser negativas.</translation>
     </message>
     <message>
-        <source>Send transactions as zero-fee transactions if possible (default: %u)</source>
-        <translation>Enviar com taxa-zero se possível (ex: %u)</translation>
+        <source>Transaction has too long of a mempool chain</source>
+        <translation>A transação demorou muito na memória</translation>
     </message>
     <message>
-        <source>Server certificate file (default: %s)</source>
-        <translation>Ficheiro de certificado do servidor (omissão: %s)</translation>
+        <source>Transaction must have at least one recipient</source>
+        <translation>A transação deve ter ao menos um destinatário</translation>
     </message>
     <message>
-        <source>Server private key (default: %s)</source>
-        <translation>Chave privada do servidor (default: %s)</translation>
+        <source>Trying to connect...</source>
+        <translation>Tentando se conectar...</translation>
     </message>
     <message>
-        <source>Set external address:port to get to this masternode (example: %s)</source>
-        <translation>Definir endereço:porta externo para ligação a este masternode (ex: %s)</translation>
+        <source>Unable to bind to %s on this computer. %s is probably already running.</source>
+        <translation>Impossível vincular a %s neste computador. O %s provavelmente já está rodando.</translation>
     </message>
     <message>
-        <source>Set key pool size to &lt;n&gt; (default: %u)</source>
-        <translation>Define o tamanho do conjunto de chaves para &lt;n&gt; (omissão: %u)</translation>
+        <source>Upgrading UTXO database</source>
+        <translation>Atualizando banco de dados UTXO</translation>
     </message>
     <message>
-        <source>Set minimum block size in bytes (default: %u)</source>
-        <translation>Define o tamanho máximo do bloco em bytes (omissão %u)</translation>
+        <source>Use devnet chain with provided name</source>
+        <translation>Use a cadeia devnet com o nome fornecido</translation>
     </message>
     <message>
-        <source>Set the number of threads to service RPC calls (default: %d)</source>
-        <translation>Define o número de threads que processam os pedidos RPC (omissão: %d)</translation>
+        <source>Wallet debugging/testing options:</source>
+        <translation>Opções de depuração/teste da Carteira</translation>
     </message>
     <message>
-        <source>Sets the DB_PRIVATE flag in the wallet db environment (default: %u)</source>
-        <translation>Definir a flag DB_PRIVATE no ambiente db da carteira (default: %u)</translation>
+        <source>Wallet needed to be rewritten: restart %s to complete</source>
+        <translation>A Carteira precisa ser reescrita: reinicie o %s para completar</translation>
     </message>
     <message>
-        <source>Signing timed out.</source>
-        <translation>Assinatura fora do tempo.</translation>
+        <source>Warning: unknown new rules activated (versionbit %i)</source>
+        <translation>Alerta: regras novas desconhecidas ativadas (versionbit %i)</translation>
     </message>
     <message>
-        <source>Specify configuration file (default: %s)</source>
-        <translation>Especificar ficheiro de configuração (default: %s)</translation>
+        <source>Wasn't able to create wallet backup folder %s!</source>
+        <translation>Não foi possível criar a pasta para backup da carteira %s!</translation>
     </message>
     <message>
-        <source>Specify connection timeout in milliseconds (minimum: 1, default: %d)</source>
-        <translation>Especificar timeout da conexão em milisegundos  (minimum: 1, default: %d)</translation>
+        <source>Whether to operate in a blocks only mode (default: %u)</source>
+        <translation>Se é para operar em modo somente blocos (padrão: %u)</translation>
     </message>
     <message>
-        <source>Specify masternode configuration file (default: %s)</source>
-        <translation>Especificar ficheiro de configuração masternode (default: %s)</translation>
+        <source>ZeroMQ notification options:</source>
+        <translation>ZeroMQ notificação opções </translation>
     </message>
     <message>
-        <source>Specify pid file (default: %s)</source>
-        <translation>Especificar ficheiro pid (default: %s)</translation>
+        <source>no mixing available.</source>
+        <translation>mixing não disponível.</translation>
     </message>
     <message>
-        <source>Spend unconfirmed change when sending transactions (default: %u)</source>
-        <translation>Gastar troco não confirmado quando enviando transacções (default: %u)</translation>
+        <source>see debug.log for details.</source>
+        <translation>Consulte debug.log para obter detalhes.</translation>
     </message>
     <message>
-        <source>Stop running after importing blocks from disk (default: %u)</source>
-        <translation>Para de correr após importação de blocos do disco (default: %u)</translation>
+        <source>RPC server options:</source>
+        <translation>Opções do servidor RPC:</translation>
     </message>
     <message>
-        <source>Submitted following entries to masternode: %u / %d</source>
-        <translation>Apresentadas as seguintes entradas ao masternode:  %u / %d </translation>
+        <source>Dash Core</source>
+        <translation>Dash Core</translation>
     </message>
     <message>
-        <source>Submitted to masternode, waiting for more entries ( %u / %d ) %s</source>
-        <translation>Apresentado ao masternode, esperando por mais entradas ( %u / %d ) %s</translation>
+        <source>The %s developers</source>
+        <translation>Desenvolvedores do %s</translation>
     </message>
     <message>
-        <source>Submitted to masternode, waiting in queue %s</source>
-        <translation>Apresentado ao masternode, esperando na fila %s </translation>
+        <source>Accept connections from outside (default: 1 if no -proxy or -connect/-noconnect)</source>
+        <translation>Aceite conexões de fora (padrão: 1 senão -proxy ou -connect/-noconnect)</translation>
     </message>
     <message>
-        <source>Synchronizing budgets...</source>
-        <translation>A sincronizar orçamentos...</translation>
+        <source>Cannot obtain a lock on data directory %s. %s is probably already running.</source>
+        <translation>Não foi possível obter exclusividade de escrita no endereço %s. O %s provavelmente já está sendo executado.</translation>
     </message>
     <message>
-        <source>Synchronizing masternode winners...</source>
-        <translation>A sincronizar masternodes vencedores...</translation>
+        <source>Connect only to the specified node(s); -noconnect or -connect=0 alone to disable automatic connections</source>
+        <translation>Conecte apenas a nó(s) especificados; -noconnect ou -connect=0 somente para desabilitar conexões automáticas</translation>
     </message>
     <message>
-        <source>Synchronizing masternodes...</source>
-        <translation>A sincronizar masternodes...</translation>
+        <source>Distributed under the MIT software license, see the accompanying file %s or %s</source>
+        <translation>Distribuído sob a licença de software MIT, veja o arquivo %s ou %s</translation>
     </message>
     <message>
-        <source>Synchronizing sporks...</source>
-        <translation>A sincronizar sporks...</translation>
+        <source>Error reading %s! All keys read correctly, but transaction data or address book entries might be missing or incorrect.</source>
+        <translation>Erro ao ler arquivo %s! Todas as chaves privadas foram lidas corretamente, mas os dados de transação ou o livro de endereços podem estar faltando ou incorretos.</translation>
     </message>
     <message>
-        <source>This is not a Masternode.</source>
-        <translation>Este não é um Masternode</translation>
+        <source>Force relay of transactions from whitelisted peers even if they violate local relay policy (default: %d)</source>
+        <translation>Força a retransmissão de transações de pares da lista branca, mesmo quando violam a política local de retransmissão (default: %d)</translation>
     </message>
     <message>
-        <source>Threshold for disconnecting misbehaving peers (default: %u)</source>
-        <translation>Limiar para desconectar pares mal comportados (default: %u)</translation>
+        <source>Incorrect or no devnet genesis block found. Wrong datadir for devnet specified?</source>
+        <translation>Bloco gênese incorreto ou não encontrado. Datadir errado para a devnet rede?</translation>
     </message>
     <message>
-        <source>Use KeePass 2 integration using KeePassHttp plugin (default: %u)</source>
-        <translation>Utilize integração KeePass 2 usando plugin KeePassHttp (default: %u)</translation>
+        <source>Maximum allowed median peer time offset adjustment. Local perspective of time may be influenced by peers forward or backward by this amount. (default: %u seconds)</source>
+        <translation>Ajuste da média máxima permitida do time offset para um par. A perspectiva local de horário pode ser influenciada por pares à frente ou atrás neste montante. (padrão: %u segundos)</translation>
     </message>
     <message>
-        <source>Use N separate masternodes to anonymize funds  (2-8, default: %u)</source>
-        <translation>Utilize N masternode distintos para anonimizar fundos (2-8, default: %u)</translation>
+        <source>Maximum total fees (in %s) to use in a single wallet transaction or raw transaction; setting this too low may abort large transactions (default: %s)</source>
+        <translation>Total máximo de taxas (em %s) para usar em uma única transação de carteira ou transação crua; especificar um valor muito baixo pode abortar grandes transações (padrão: %s)</translation>
     </message>
     <message>
-        <source>Use UPnP to map the listening port (default: %u)</source>
-        <translation>Utilize UPNP para mapear porta de escuta (default: %u)</translation>
+        <source>Override spork address. Only useful for regtest and devnet. Using this on mainnet or testnet will ban you.</source>
+        <translation>Substituir endereço de spork. Útil apenas para regtest e devnet. Usando isto na mainnet ou testnet irá banir você.</translation>
     </message>
     <message>
-        <source>Wallet needed to be rewritten: restart Dash Core to complete</source>
-        <translation>Carteira necessita de ser re-escrita: reinicie Dash Core para completar</translation>
+        <source>Please check that your computer's date and time are correct! If your clock is wrong, %s will not work properly.</source>
+        <translation>Por favor verifique se a data e o horário de seu computador estão corretos. Se o relógio de seu computador estiver incorreto, %s não funcionará corretamente.</translation>
     </message>
     <message>
-        <source>Warning: Unsupported argument -benchmark ignored, use -debug=bench.</source>
-        <translation>Aviso: Argumento não suportado -benchmark ignorado, use -debug=bench.</translation>
+        <source>Please contribute if you find %s useful. Visit %s for further information about the software.</source>
+        <translation>Por favor contribua se você entender que %s é útil. Visite %s para mais informações sobre o software.</translation>
     </message>
     <message>
-        <source>Warning: Unsupported argument -debugnet ignored, use -debug=net.</source>
-        <translation>Aviso: Argumento não suportado debugnet ignorado, use -debug=net.</translation>
+        <source>Provide liquidity to PrivateSend by infrequently mixing coins on a continual basis (%u-%u, default: %u, 1=very frequent, high fees, %u=very infrequent, low fees)</source>
+        <translation>Providencia liquidez ao EnvioPrivado através da mistura não frequente de moedas em uma base contínua (%u-%u, padrão: %u, 1=muito frequente, altas taxas, %u=muito infrequente, taxas baixas)</translation>
     </message>
     <message>
-        <source>Will retry...</source>
-        <translation>Tentar de novo...</translation>
+        <source>Query for peer addresses via DNS lookup, if low on addresses (default: 1 unless -connect/-noconnect)</source>
+        <translation>Consulta por endereços de pares via pesquisa de DNS, se baixa nos endereços (default: 1 unless -connect/-noconnect)</translation>
     </message>
     <message>
-        <source>Invalid masternodeprivkey. Please see documenation.</source>
-        <translation>masternodeprivkey inválida. Por favor reveja a documentação.</translation>
+        <source>Reduce storage requirements by enabling pruning (deleting) of old blocks. This allows the pruneblockchain RPC to be called to delete specific blocks, and enables automatic pruning of old blocks if a target size in MiB is provided. This mode is incompatible with -txindex and -rescan. Warning: Reverting this setting requires re-downloading the entire blockchain. (default: 0 = disable pruning blocks, 1 = allow manual pruning via RPC, &gt;%u = automatically prune block files to stay under the specified target size in MiB)</source>
+        <translation>Reduz o requerimente de espaço habiitando a poda (apagando) de blocos antigos. Isso permite chamar o comando pruneblockchain via RPC para apagar blocos específicos, e habiita o poda automático de blocos antigos se o tamanho em MiB for atingido. Esse modo é incompatível com -txindex e -rescan. Aviso: Reverter essa configuração requer baixar novamente o blockchain inteiro. (padrão: 0 = desabilitado, 1 = permite a poda manual via RPC, &gt;%u = poda os blocos para ficar abaixo do especificado, em MiB)</translation>
     </message>
     <message>
-        <source>(must be 9999 for mainnet)</source>
-        <translation>(deve ser 9999 para mainnet)</translation>
+        <source>Set lowest fee rate (in %s/kB) for transactions to be included in block creation. (default: %s)</source>
+        <translation>Especificar a taxa miníma (em %s/KiB) para transações para ser incluída na criação de blocos. (padrão: %s)</translation>
     </message>
     <message>
-        <source>Can't find random Masternode.</source>
-        <translation>Incapaz de encontrar Masternode aleatório.</translation>
+        <source>This is the transaction fee you may pay when fee estimates are not available.</source>
+        <translation>Esta é a taxa que você deve pagar quando a taxa estimada não está disponível.</translation>
     </message>
     <message>
-        <source>Can't mix while sync in progress.</source>
-        <translation>Incapaz de misturar enquanto sincronização está a decorrer.</translation>
+        <source>This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit %s and cryptographic software written by Eric Young and UPnP software written by Thomas Bernard.</source>
+        <translation>Esse produto inclui um software desenvolvido pelo OpenSSL Project para uso na OpenSSL Toolkit %s e software criptográfico escrito por Eric Young e software UPnP escrito por Thomas Bernard. </translation>
     </message>
     <message>
-        <source>Could not parse masternode.conf</source>
-        <translation>Incapaz de analizar masternode.conf</translation>
+        <source>Unable to locate enough PrivateSend non-denominated funds for this transaction.</source>
+        <translation>Não é possível localizar fundos não-expressos do PrivateSend suficientes para essa transação.</translation>
     </message>
     <message>
-        <source>Invalid netmask specified in -whitelist: '%s'</source>
-        <translation>Netmask especificado invalido na -whitelist: '%s'</translation>
+        <source>Use N separate masternodes for each denominated input to mix funds (%u-%u, default: %u)</source>
+        <translation>Use N masternodes separados para cada entrada denominada para misturar fundos (%u-%u, padrão: %u)</translation>
     </message>
     <message>
-        <source>Invalid port detected in masternode.conf</source>
-        <translation>Port inválido detectado em masternode.conf</translation>
+        <source>Use hierarchical deterministic key generation (HD) after BIP39/BIP44. Only has effect during wallet creation/first start</source>
+        <translation>Use a geração hierárquica de chaves determinísticas (HD) após o BIP39 / BIP44. Só tem efeito durante a criação / início da carteira</translation>
     </message>
     <message>
-        <source>Invalid private key.</source>
-        <translation>Chave privada inválida.</translation>
+        <source>User defined mnemonic passphrase for HD wallet (BIP39). Only has effect during wallet creation/first start (default: empty string)</source>
+        <translation>Senha mnemônica definida pelo usuário para carteira HD (BIP39). Só tem efeito durante a criação da carteira / primeira inicialização (padrão: string vazia)</translation>
     </message>
     <message>
-        <source>Invalid script detected.</source>
-        <translation>Script inválido detectado.</translation>
+        <source>Username and hashed password for JSON-RPC connections. The field &lt;userpw&gt; comes in the format: &lt;USERNAME&gt;:&lt;SALT&gt;$&lt;HASH&gt;. A canonical python script is included in share/rpcuser. The client then connects normally using the rpcuser=&lt;USERNAME&gt;/rpcpassword=&lt;PASSWORD&gt; pair of arguments. This option can be specified multiple times</source>
+        <translation>Nome de usuário e hash da senha para conexões JSON-RPC. O campo &lt;userpw&gt; vem com o formato: &lt;USERNAME&gt;:&lt;SALT&gt;$&lt;HASH&gt;. Um script python canônico é incluído em share/rpcuser. O cliente pode conectar normalmente usando o rpcuser=&lt;USERNAME&gt;/rpcpassword=&lt;PASSWORD&gt;. Esta opção pode ser especificado multiplas vezes</translation>
     </message>
     <message>
-        <source>KeePassHttp id for the established association</source>
-        <translation>Identificador KeePassHttp para a associação estabelecida</translation>
+        <source>Wallet will not create transactions that violate mempool chain limits (default: %u)</source>
+        <translation>A carteira não irá criar transações que violem o limite da mempool chain (padrão: %u)</translation>
     </message>
     <message>
-        <source>KeePassHttp key for AES encrypted communication with KeePass</source>
-        <translation>Chave KeePassHttp para usar na comunicação cifrada AES com o KeePass</translation>
+        <source>Warning: At least %d of %d masternodes are running on a newer software version. Please check latest releases, you might need to update too.</source>
+        <translation>Aviso: Pelo menos %d de %d masternodes estão sendo executados em uma versão de software mais recente. Por favor, verifique os últimos lançamentos, talvez você precise atualizar também.</translation>
     </message>
     <message>
-        <source>Keep N DASH anonymized (default: %u)</source>
-        <translation>Manter N DASH anonimizados (default: %u)</translation>
+        <source>Warning: Every masternode (out of %d known ones) is running on a newer software version. Please check latest releases, it's very likely that you missed a major/critical update.</source>
+        <translation>Aviso: Cada masternode (fora de %d conhecidos) está sendo executado em uma versão de software mais recente. Por favor, verifique os últimos lançamentos, é muito provável que você tenha perdido uma atualização importante / crítica.</translation>
     </message>
     <message>
-        <source>Keep at most &lt;n&gt; unconnectable transactions in memory (default: %u)</source>
-        <translation>Manter no máximo &lt;n&gt; transacções não conectáveis em memória (omissão: %u)</translation>
+        <source>Warning: Wallet file corrupt, data salvaged! Original %s saved as %s in %s; if your balance or transactions are incorrect you should restore from a backup.</source>
+        <translation>Atenção: Arquivo da carteira corrompido, dados recuperados! Original %s salvo como %s em %s; se seu saldo ou transações estiverem incorretos, você deve restaurar o backup.</translation>
     </message>
     <message>
-        <source>Last Darksend was too recent.</source>
-        <translation>O último Darksend é muito recente.</translation>
+        <source>Whitelist peers connecting from the given IP address (e.g. 1.2.3.4) or CIDR notated network (e.g. 1.2.3.0/24). Can be specified multiple times.</source>
+        <translation>Inclui na lista branca pares conectando do dado endereço IP (ex: 1.2.3.4) ou rede em notação CIDR (ex: 1.2.3.0/24). Pode ser especificado várias vezes.</translation>
     </message>
     <message>
-        <source>Line: %d</source>
-        <translation>Linha: %d</translation>
+        <source>%s corrupt, salvage failed</source>
+        <translation>%s corrompido, recuperação falhou</translation>
     </message>
     <message>
-        <source>Loading addresses...</source>
-        <translation>A carregar endereços...</translation>
+        <source>%s is not a valid backup folder!</source>
+        <translation>%s não é uma pasta de backup válida!</translation>
     </message>
     <message>
-        <source>Loading block index...</source>
-        <translation>A carregar índice de blocos...</translation>
+        <source>%s is set very high!</source>
+        <translation>%s está muito alto!</translation>
     </message>
     <message>
-        <source>Loading wallet... (%3.2f %%)</source>
-        <translation>A carregar carteira... (%3.2f %%)</translation>
+        <source>(press q to shutdown and continue later)</source>
+        <translation>(pressione q para desligar e continuar depois)</translation>
     </message>
     <message>
-        <source>Loading wallet...</source>
-        <translation>A carregar carteira...</translation>
+        <source>-devnet can only be specified once</source>
+        <translation>-devnet só pode ser especificado uma vez</translation>
     </message>
     <message>
-        <source>Masternode options:</source>
-        <translation>Opções de masternode:</translation>
+        <source>-port must be specified when -devnet and -listen are specified</source>
+        <translation>-rpcport deve ser especificado quando -devnet e -server são especificados</translation>
     </message>
     <message>
-        <source>Masternode queue is full.</source>
-        <translation>A fila do masternode está cheia.</translation>
+        <source>-rpcport must be specified when -devnet and -server are specified</source>
+        <translation>-rpcport deve ser especificado quando -devnet e -server são especificados</translation>
     </message>
     <message>
-        <source>Masternode:</source>
-        <translation>Masternode:</translation>
+        <source>Allow RFC1918 addresses to be relayed and connected to (default: %u)</source>
+        <translation>Permitir que os endereços RFC1918 sejam retransmitidos e conectados a (padrão: %u)</translation>
     </message>
     <message>
-        <source>Missing input transaction information.</source>
-        <translation>A informação da transacção de entrada não foi encontrada.</translation>
+        <source>Attempt to recover private keys from a corrupt wallet on startup</source>
+        <translation>Tenta recuperar as chaves privadas de uma carteira corrompida ao inicializar</translation>
     </message>
     <message>
-        <source>No funds detected in need of denominating.</source>
-        <translation>Não foram detectados fundos a necessitar de denominação.</translation>
+        <source>Cannot resolve -%s address: '%s'</source>
+        <translation>Não foi possível encontrar o endereço de -%s: '%s'</translation>
     </message>
     <message>
-        <source>No matching denominations found for mixing.</source>
-        <translation>Não foram encontradas denominações correspondentes para misturar.</translation>
+        <source>Change index out of range</source>
+        <translation>Índice de mudança fora do intervalo</translation>
     </message>
     <message>
-        <source>Node relay options:</source>
-        <translation>Opções de relé do nódulo:</translation>
+        <source>Copyright (C)</source>
+        <translation>Copyright</translation>
     </message>
     <message>
-        <source>Non-standard public key detected.</source>
-        <translation>Detectada chave pública fora do padrão.</translation>
+        <source>Error loading %s</source>
+        <translation>Erro ao carregar %s</translation>
     </message>
     <message>
-        <source>Not compatible with existing transactions.</source>
-        <translation>Não é compatível com as transacções existentes.</translation>
+        <source>Error loading %s: Wallet corrupted</source>
+        <translation>Erro ao carregar %s Carteira corrompida</translation>
     </message>
     <message>
-        <source>Not enough file descriptors available.</source>
-        <translation>Número insuficiente de descritores de ficheiros disponíveis.</translation>
+        <source>Error loading %s: Wallet requires newer version of %s</source>
+        <translation>Erro ao carregar %s A carteira requer a versão mais nova do %s</translation>
     </message>
     <message>
-        <source>Options:</source>
-        <translation>Opções:</translation>
+        <source>Error upgrading chainstate database</source>
+        <translation>Erro ao atualizar banco de dados do chainstate</translation>
     </message>
     <message>
-        <source>Password for JSON-RPC connections</source>
-        <translation>Palavra-passe para as ligações JSON-RPC</translation>
+        <source>Failed to find mixing queue to join</source>
+        <translation>Não foi possível encontrar a fila de mistura para participar</translation>
     </message>
     <message>
-        <source>RPC SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source>
-        <translation>Opções RPC SSL: (para instruções de configuração SSL dirija-se à Dash Wiki)</translation>
+        <source>Failed to start a new mixing queue</source>
+        <translation>Falha ao iniciar uma nova fila de mistura</translation>
     </message>
     <message>
-        <source>RPC server options:</source>
-        <translation>Opções do servidor RPC:</translation>
+        <source>Initialization sanity check failed. %s is shutting down.</source>
+        <translation>O teste de integridade de inicialização falhou. O %s está sendo desligado.</translation>
     </message>
     <message>
-        <source>RPC support for HTTP persistent connections (default: %d)</source>
-        <translation>Suporte RPC para conexões persistentes HTTP (default: %d)</translation>
+        <source>Invalid amount for -%s=&lt;amount&gt;: '%s'</source>
+        <translation>Quantidade inválida para -%s=&lt;amount&gt;: '%s'</translation>
     </message>
     <message>
-        <source>Randomly drop 1 of every &lt;n&gt; network messages</source>
-        <translation>Ignorar aleatoriamente 1 de cada &lt;n&gt; mensagens da rede</translation>
+        <source>Invalid spork address specified with -sporkaddr</source>
+        <translation>Endereço de spork inválido especificado com -sporkaddr</translation>
     </message>
     <message>
-        <source>Randomly fuzz 1 of every &lt;n&gt; network messages</source>
-        <translation>Esfiapar aleatoriamente 1 de cada &lt;n&gt; mensagens da rede</translation>
+        <source>Keep N DASH anonymized (%u-%u, default: %u)</source>
+        <translation>Mantenha o N DASH anônimo (%u-%u, padrão: %u)</translation>
     </message>
     <message>
-        <source>Rebuild block chain index from current blk000??.dat files</source>
-        <translation>Reconstruir o índice da cadeia de blocos a partir dos ficheiros actuais blk000??.dat</translation>
+        <source>Print this help message and exit</source>
+        <translation>Mostra essa mensagem de ajuda e sai</translation>
     </message>
     <message>
         <source>Receive and display P2P network alerts (default: %u)</source>
-        <translation>Receber e apresentar alertas da rede P2P (default: %u)</translation>
+        <translation>Receba e exiba alertas de rede P2P (default: %u)</translation>
     </message>
     <message>
-        <source>Relay and mine data carrier transactions (default: %u)</source>
-        <translation>Relé e mine data de transacções de suporte (default: %u)</translation>
+        <source>Reducing -maxconnections from %d to %d, because of system limitations.</source>
+        <translation>Reduzindo -maxconnections de %d para %d, devido à limitações do sistema.</translation>
     </message>
     <message>
-        <source>Relay non-P2SH multisig (default: %u)</source>
-        <translation>Relé não-P2SH multisig (default: %u)</translation>
+        <source>Relay and mine data carrier transactions (default: %u)</source>
+        <translation>Transações de dados de operadora (padrão: %u)</translation>
     </message>
     <message>
-        <source>Rescan the block chain for missing wallet transactions</source>
-        <translation>Examinar novamente a cadeia de blocos para encontrar transacções inexistentes na carteira</translation>
+        <source>Relay non-P2SH multisig (default: %u)</source>
+        <translation>Retransmitir P2SH não multisig (padrão: %u)</translation>
     </message>
     <message>
         <source>Rescanning...</source>
-        <translation>A examinar novamente...</translation>
+        <translation>Escaneando...</translation>
     </message>
     <message>
         <source>Run in the background as a daemon and accept commands</source>
-        <translation>Executar em segundo plano como um serviço e aceitar comandos</translation>
+        <translation>Executar em segundo plano como um daemon e aceitar comandos</translation>
+    </message>
+    <message>
+        <source>Send trace/debug info to console instead of debug.log file</source>
+        <translation>Envia informação de trace/debug para o console e não para o arquivo debug.log</translation>
     </message>
     <message>
         <source>Session not complete!</source>
-        <translation>Sessão incompleta!</translation>
+        <translation>Sessão não completa!</translation>
     </message>
     <message>
         <source>Session timed out.</source>
-        <translation>Esgotado o tempo de sessão.</translation>
+        <translation>A sessão expirou.</translation>
     </message>
     <message>
         <source>Set database cache size in megabytes (%d to %d, default: %d)</source>
-        <translation>Define o tamanho máximo da cache de dados em megabytes (%d até %d, omissão %d)</translation>
+        <translation>Define o tamanho da cache em megabytes (%d a %d, padrão: %d)</translation>
     </message>
     <message>
         <source>Set maximum block size in bytes (default: %d)</source>
-        <translation>Define o tamanho máximo do bloco em bytes (omissão %d)</translation>
+        <translation>Definir tamanho máximo do bloco em bytes (padrão: %d)</translation>
     </message>
     <message>
         <source>Set the masternode private key</source>
-        <translation>Define a chave privada do masternode</translation>
+        <translation>Definir a chave privada do masternode</translation>
     </message>
     <message>
         <source>Show all debugging options (usage: --help -help-debug)</source>
-        <translation>Mostrar todas as opções de depuração (uso: --help -help-debug)</translation>
+        <translation>Exibe todas as opçoes de debug (uso: --help -help-debug)</translation>
     </message>
     <message>
         <source>Shrink debug.log file on client startup (default: 1 when no -debug)</source>
-        <translation>Diminuir o ficheiro debug.log ao iniciar o cliente (omissão: 1 quando não usa opção -debug)</translation>
-    </message>
-    <message>
-        <source>Signing failed.</source>
-        <translation>A assinatura falhou.</translation>
+        <translation>Compactar arquivo debug.log ao executar o cliente (padrão: 1 sem -debug)</translation>
     </message>
     <message>
         <source>Signing transaction failed</source>
-        <translation>A assinatura da transacção falhou</translation>
+        <translation>A transação assinada falhou</translation>
     </message>
     <message>
         <source>Specify data directory</source>
-        <translation>Especificar a pasta de dados</translation>
+        <translation>Especificar diretório de dados</translation>
     </message>
     <message>
         <source>Specify wallet file (within data directory)</source>
-        <translation>Especificar o ficheiro da carteira (dentro da pasta de dados)</translation>
+        <translation>Especifique o arquivo da carteira (dentro do diretório de dados)</translation>
     </message>
     <message>
         <source>Specify your own public address</source>
-        <translation>Especificar o seu endereço público</translation>
+        <translation>Especificar seu próprio endereço público</translation>
     </message>
     <message>
-        <source>This help message</source>
-        <translation>Esta mensagem de ajuda</translation>
+        <source>Starting network threads...</source>
+        <translation>Iniciando threads de rede...</translation>
     </message>
     <message>
-        <source>This is experimental software.</source>
-        <translation>Este é um software experimental.</translation>
+        <source>Synchronization pending...</source>
+        <translation>Sincronização pendente</translation>
     </message>
     <message>
-        <source>This is intended for regression testing tools and app development.</source>
-        <translation>Esta opção destina-se a ferramentas de testes de regressão e desenvolvimento de aplicativos.</translation>
+        <source>Synchronizing governance objects...</source>
+        <translation>Sincronizando objetos de governança ....</translation>
     </message>
     <message>
-        <source>Transaction amount too small</source>
-        <translation>Quantia da transacção demasiado pequena</translation>
+        <source>Synchronizing masternode payments...</source>
+        <translation>Sincronizando pagamentos do masternode...</translation>
     </message>
     <message>
-        <source>Transaction amounts must be positive</source>
-        <translation>As quantias da transacção tem que ser positivas</translation>
+        <source>The source code is available from %s.</source>
+        <translation>O código fonte está disponível pelo %s.</translation>
     </message>
     <message>
-        <source>Transaction created successfully.</source>
-        <translation>Transacção criada com sucesso.</translation>
+        <source>The transaction amount is too small to pay the fee</source>
+        <translation>O valor da transação é muito pequeno para pagar a taxa</translation>
     </message>
     <message>
-        <source>Transaction fees are too high.</source>
-        <translation>As taxas da transacção são demasiado elevadas.</translation>
+        <source>This is experimental software.</source>
+        <translation>Este é um software experimental.</translation>
     </message>
     <message>
-        <source>Transaction not valid.</source>
-        <translation>A transacção não é válida.</translation>
+        <source>Transaction amount too small</source>
+        <translation>Quantia da transação muito pequena</translation>
     </message>
     <message>
-        <source>Transaction too large for fee policy</source>
-        <translation>Transacção demasiado grande para a política de taxas</translation>
+        <source>Transaction created successfully.</source>
+        <translation>Transação criada com sucesso.</translation>
+    </message>
+    <message>
+        <source>Transaction fees are too high.</source>
+        <translation>Taxa de transação muito alta.</translation>
     </message>
     <message>
-        <source>Transaction too large</source>
-        <translation>Transacção demasiado grande</translation>
+        <source>Transaction not valid.</source>
+        <translation>Transação inválida.</translation>
     </message>
     <message>
-        <source>Transmitting final transaction.</source>
-        <translation>Transmitindo transacção final</translation>
+        <source>Transaction too large for fee policy</source>
+        <translation>Transação muito grande para a política de tarifas</translation>
     </message>
     <message>
         <source>Unable to bind to %s on this computer (bind returned error %s)</source>
-        <translation>Não foi possível vincular a %s neste computador (o vínculo retornou o erro %s)</translation>
+        <translation>Impossível abrir %s neste computador (bind retornou o erro %s)</translation>
     </message>
     <message>
         <source>Unable to sign spork message, wrong key?</source>
-        <translation>Não foi possível assinar a mensagem spork, chave incorrecta?</translation>
+        <translation>Impossível assinar mensagem spork, chave incorreta?</translation>
     </message>
     <message>
         <source>Unknown network specified in -onlynet: '%s'</source>
-        <translation>Rede especificada desconhecida em -onlynet: '%s'</translation>
+        <translation>Rede desconhecida fornecida em -onlynet: '%s'</translation>
     </message>
     <message>
         <source>Unknown state: id = %u</source>
         <translation>Estado desconhecido: id = %u</translation>
     </message>
-    <message>
-        <source>Upgrade wallet to latest format</source>
-        <translation>Actualizar carteira para o formato mais recente</translation>
-    </message>
-    <message>
-        <source>Use OpenSSL (https) for JSON-RPC connections</source>
-        <translation>Usar OpenSSl (https) para as ligações JSON-RPC</translation>
-    </message>
-    <message>
-        <source>Use UPnP to map the listening port (default: 1 when listening)</source>
-        <translation>Usar UPnP para mapear a porta de entrada (omissão: 1 quando em escuta)</translation>
-    </message>
-    <message>
-        <source>Use the test network</source>
-        <translation>Usar a rede de testes</translation>
-    </message>
     <message>
         <source>Username for JSON-RPC connections</source>
-        <translation>Utilizador para as ligações JSON-RPC</translation>
-    </message>
-    <message>
-        <source>Value more than Darksend pool maximum allows.</source>
-        <translation>Valor mais elevado do que o máximo permitido pelo Darksend.</translation>
+        <translation>Nome de usuario para conexão JSON-RPC</translation>
     </message>
     <message>
         <source>Verifying blocks...</source>
-        <translation>A verificar blocos...</translation>
+        <translation>Verificando blocos...</translation>
     </message>
     <message>
         <source>Verifying wallet...</source>
-        <translation>A verificar carteira...</translation>
+        <translation>Verificando carteira...</translation>
+    </message>
+    <message>
+        <source>Very low number of keys left: %d</source>
+        <translation>Número muito baixo de chaves restantes: %d</translation>
     </message>
     <message>
         <source>Wallet %s resides outside data directory %s</source>
-        <translation>A carteira %s encontra-se fora da pasta de dados %s</translation>
+        <translation>Carteira %s está fora do diretório de dados %s</translation>
     </message>
     <message>
         <source>Wallet is locked.</source>
-        <translation>A carteira encontra-se bloqueada.</translation>
+        <translation>Carteira está bloqueada.</translation>
     </message>
     <message>
         <source>Wallet options:</source>
@@ -4385,39 +5239,23 @@ https://www.transifex.com/projects/p/dash/</translation>
     </message>
     <message>
         <source>Wallet window title</source>
-        <translation>Título da janela</translation>
+        <translation>Título da janela da carteira</translation>
     </message>
     <message>
         <source>Warning</source>
-        <translation>Aviso</translation>
-    </message>
-    <message>
-        <source>Warning: This version is obsolete, upgrade required!</source>
-        <translation>Aviso: Esta versão é obsoleta, actualização necessária!</translation>
-    </message>
-    <message>
-        <source>You need to rebuild the database using -reindex to change -txindex</source>
-        <translation>Necessita reconstruir a base de dados usando -reindex para alterar -txindex</translation>
+        <translation>Atenção</translation>
     </message>
     <message>
         <source>Your entries added successfully.</source>
-        <translation>Suas entradas adicionadas com sucesso.</translation>
+        <translation>Suas entradas foram adicionadas com êxito.</translation>
     </message>
     <message>
         <source>Your transaction was accepted into the pool!</source>
-        <translation>A sua transacção foi aceite na pool!</translation>
+        <translation>Sua transação foi aceita na pool!</translation>
     </message>
     <message>
         <source>Zapping all transactions from wallet...</source>
-        <translation>A apagar todas as transacções da carteira...</translation>
-    </message>
-    <message>
-        <source>on startup</source>
-        <translation>no arranque</translation>
-    </message>
-    <message>
-        <source>wallet.dat corrupt, salvage failed</source>
-        <translation>wallet.dat corrompido, recuperação falhou</translation>
+        <translation>Fazendo o Zapping de todas as transações da wallet...</translation>
     </message>
 </context>
 </TS>
\ No newline at end of file
diff --git a/src/qt/locale/dash_ru.ts b/src/qt/locale/dash_ru.ts
index 61dad82d9d1b..120b9e299ebd 100644
--- a/src/qt/locale/dash_ru.ts
+++ b/src/qt/locale/dash_ru.ts
@@ -383,7 +383,7 @@
     </message>
     <message>
         <source>&amp;Verify message...</source>
-        <translation>П&amp;роверить сообщение...</translation>
+        <translation>&amp;Проверить сообщение...</translation>
     </message>
     <message>
         <source>Verify messages to ensure they were signed with specified Dash addresses</source>
@@ -794,8 +794,8 @@
         <translation>Пожалуйста, переключитесь в режим списка для использования этой функции.</translation>
     </message>
     <message>
-        <source>Non-anonymized input selected. &lt;b&gt;PrivateSend will be disabled.&lt;/b&gt;&lt;br&gt;&lt;br&gt;If you still want to use PrivateSend, please deselect all non-nonymized inputs first and then check PrivateSend checkbox again.</source>
-        <translation>Выбраны неанонимизированные средства. &lt;b&gt;PrivateSend будет отключен.&lt;/b&gt;&lt;br&gt;&lt;br&gt;Если Вы все-таки хотите использовать PrivateSend, пожалуйста, снимите выделение с со всех неанонимизированных средств и заново поставьте галочку напротив PrivateSend.</translation>
+        <source>Non-anonymized input selected. &lt;b&gt;PrivateSend will be disabled.&lt;/b&gt;&lt;br&gt;&lt;br&gt;If you still want to use PrivateSend, please deselect all non-anonymized inputs first and then check the PrivateSend checkbox again.</source>
+        <translation>Выбраны неанонимизированные средства. &lt;b&gt;PrivateSend будет отключен.&lt;/b&gt;&lt;br&gt;&lt;br&gt;Если Вы все-таки хотите использовать PrivateSend, пожалуйста, снимите выделение со всех неанонимизированных средств и заново поставьте галочку напротив PrivateSend.</translation>
     </message>
     <message>
         <source>(%1 locked)</source>
@@ -834,73 +834,6 @@
         <translation>н/д</translation>
     </message>
 </context>
-<context>
-    <name>DarksendConfig</name>
-    <message>
-        <source>Configure PrivateSend</source>
-        <translation>Настройте PrivateSend</translation>
-    </message>
-    <message>
-        <source>Basic Privacy</source>
-        <translation>Обычная приватность</translation>
-    </message>
-    <message>
-        <source>High Privacy</source>
-        <translation>Высокая приватность</translation>
-    </message>
-    <message>
-        <source>Maximum Privacy</source>
-        <translation>Максимальная приватность</translation>
-    </message>
-    <message>
-        <source>Please select a privacy level.</source>
-        <translation>Пожалуйста, выберите уровень приватности.</translation>
-    </message>
-    <message>
-        <source>Use 2 separate masternodes to mix funds up to 1000 DASH</source>
-        <translation>Использовать 2 отдельные мастерноды для перемешивания до 1000 DASH</translation>
-    </message>
-    <message>
-        <source>Use 8 separate masternodes to mix funds up to 1000 DASH</source>
-        <translation>Использовать 8 отдельных мастернод для перемешивания до 1000 DASH</translation>
-    </message>
-    <message>
-        <source>Use 16 separate masternodes</source>
-        <translation>Использовать 16 отдельных мастернод</translation>
-    </message>
-    <message>
-        <source>This option is the quickest and will cost about ~0.025 DASH to anonymize 1000 DASH</source>
-        <translation>Это самый быстрый вариант, анонимизация 1000 DASH будет стоить вам примерно 0.025 DASH</translation>
-    </message>
-    <message>
-        <source>This option is moderately fast and will cost about 0.05 DASH to anonymize 1000 DASH</source>
-        <translation>Это относительно быстрый вариант, анонимизация 1000 DASH будет стоить вам примерно 0.05 DASH</translation>
-    </message>
-    <message>
-        <source>0.1 DASH per 1000 DASH you anonymize.</source>
-        <translation>0.1 DASH за каждые анонимизированные 1000 DASH.</translation>
-    </message>
-    <message>
-        <source>This is the slowest and most secure option. Using maximum anonymity will cost</source>
-        <translation>Этот самый медленный и безопасный вариант. Анонимизация будет стоить</translation>
-    </message>
-    <message>
-        <source>PrivateSend Configuration</source>
-        <translation>Настройки PrivateSend</translation>
-    </message>
-    <message>
-        <source>PrivateSend was successfully set to basic (%1 and 2 rounds). You can change this at any time by opening Dash's configuration screen.</source>
-        <translation>PrivateSend успешно установлен в режим базовой приватности (%1 и 2 раунда). Вы можете изменить это в любое время, используя окно настроек.</translation>
-    </message>
-    <message>
-        <source>PrivateSend was successfully set to high (%1 and 8 rounds). You can change this at any time by opening Dash's configuration screen.</source>
-        <translation>PrivateSend успешно установлен в режим высокой приватности (%1 и 8 раундов). Вы можете изменить это в любое время, используя окно настроек.</translation>
-    </message>
-    <message>
-        <source>PrivateSend was successfully set to maximum (%1 and 16 rounds). You can change this at any time by opening Dash's configuration screen.</source>
-        <translation>PrivateSend успешно установлен в режим максимальной приватности (%1 и 16 раундов). Вы можете изменить это в любое время, используя окно настроек.</translation>
-    </message>
-</context>
 <context>
     <name>EditAddressDialog</name>
     <message>
@@ -1038,8 +971,8 @@
         <translation>Информация о PrivateSend</translation>
     </message>
     <message>
-        <source>&lt;h3&gt;PrivateSend Basics&lt;/h3&gt; PrivateSend gives you true financial privacy by obscuring the origins of your funds. All the Dash in your wallet is comprised of different "inputs" which you can think of as separate, discrete coins.&lt;br&gt; PrivateSend uses an innovative process to mix your inputs with the inputs of two other people, without having your coins ever leave your wallet. You retain control of your money at all times.&lt;hr&gt; &lt;b&gt;The PrivateSend process works like this:&lt;/b&gt;&lt;ol type="1"&gt; &lt;li&gt;PrivateSend begins by breaking your transaction inputs down into standard denominations. These denominations are 0.01 DASH, 0.1 DASH, 1 DASH and 10 DASH -- sort of like the paper money you use every day.&lt;/li&gt; &lt;li&gt;Your wallet then sends requests to specially configured software nodes on the network, called "masternodes." These masternodes are informed then that you are interested in mixing a certain denomination. No identifiable information is sent to the masternodes, so they never know "who" you are.&lt;/li&gt; &lt;li&gt;When two other people send similar messages, indicating that they wish to mix the same denomination, a mixing session begins. The masternode mixes up the inputs and instructs all three users' wallets to pay the now-transformed input back to themselves. Your wallet pays that denomination directly to itself, but in a different address (called a change address).&lt;/li&gt; &lt;li&gt;In order to fully obscure your funds, your wallet must repeat this process a number of times with each denomination. Each time the process is completed, it's called a "round." Each round of PrivateSend makes it exponentially more difficult to determine where your funds originated.&lt;/li&gt; &lt;li&gt;This mixing process happens in the background without any intervention on your part. When you wish to make a transaction, your funds will already be anonymized. No additional waiting is required.&lt;/li&gt; &lt;/ol&gt; &lt;hr&gt;&lt;b&gt;IMPORTANT:&lt;/b&gt; Your wallet only contains 1000 of these "change addresses." Every time a mixing event happens, up to 9 of your addresses are used up. This means those 1000 addresses last for about 100 mixing events. When 900 of them are used, your wallet must create more addresses. It can only do this, however, if you have automatic backups enabled.&lt;br&gt; Consequently, users who have backups disabled will also have PrivateSend disabled. &lt;hr&gt;For more info see &lt;a href="https://dashpay.atlassian.net/wiki/display/DOC/PrivateSend"&gt;https://dashpay.atlassian.net/wiki/display/DOC/PrivateSend&lt;/a&gt;         </source>
-        <translation>&lt;h3&gt;Основы PrivateSend&lt;/h3&gt;PrivateSend позволяет Вам получить настоящую финансовую конфиденциальность за счет скрытия источников Ваших средств. Все Dash в  Вашем кошельке состоят из различных ""входов", Вы можете думать о них как об отдельных монетах.&lt;br&gt;PrivateSend использует инновационный процесс для перемешивания Ваших входов со входами еще двоих человек, но при этом Ваши монеты никогда не покидают Ваш кошелек. Вы сохраняете контроль над Вашими деньгами на протяжении всего времени.&lt;hr&gt; &lt;b&gt;PrivateSend работает так:&lt;/b&gt;&lt;ol type="1"&gt; &lt;li&gt;PrivateSend начинается с разбиения Ваших входов транзакций на стандартные номиналы. Такими номиналами являются 0.01 DASH, 0.1 DASH, 1 DASH и 10 DASH -- что-то вроде купюр, которыми вы пользуетесь каждый день.&lt;/li&gt; &lt;li&gt;Ваш кошелек затем отправляет запросы к особым образом настроенным сетевым узлам, называемым "мастернодами". Эти мастерноды знают только то, что Вы хотите перемешать определенные номиналы. Никакой идентифицирующей информации мастернодам не отправляется, так что они не знают "кто" Вы конкретно.&lt;/li&gt; &lt;li&gt;Сессия перемешивания начинается тогда, когда еще двое человек отправляют схожее сообщение, подтверждающее, что они хотят перемешать точно такой же номинал. Мастернода перемешивает входы и просит кошельки всех пользователей осуществить платежи по ним. Ваш кошелек осуществляет выплату самому себе, но на другой адрес (тоже из вашего кошелька).&lt;/li&gt; &lt;li&gt;Для скрытия Ваших средств кошелек должен повторить этот процесс несколько раз с каждым номиналом. Каждый раз, когда такой процесс завершается, называется "раундом". С каждым раундом PrivateSend становится экспоненциально сложнее определить откуда поступили средства.&lt;/li&gt; &lt;li&gt;Процесс перемешивания выполняется в фоне, без участия пользователя. Когда Вы захотите провести транзакцию, средства уже будут анонимизированы. Дополнительно ждать не требуется.&lt;/li&gt; &lt;/ol&gt; &lt;hr&gt;&lt;b&gt;ВАЖНО:&lt;/b&gt; Ваш кошелек содержит 1000 адресов. Каждое перемешивание использует до 9 из этих адресов. Это означает, что 1000 адресов хватит примерно на 100 перемешиваний. Когда 900 адресов будут уже использованы, Ваш кошелек должен создать новые адреса. Однако, он может сделать это, только если у Вас включены автоматические резервные копии.&lt;br&gt;Соответственно, пользователям с отключенным резервным копированием PrivateSend не доступен. &lt;hr&gt;Дополнительная информация доступна по ссылке &lt;a href="https://dashpay.atlassian.net/wiki/display/DOC/PrivateSend"&gt;https://dashpay.atlassian.net/wiki/display/DOC/PrivateSend&lt;/a&gt;         </translation>
+        <source>&lt;h3&gt;PrivateSend Basics&lt;/h3&gt; PrivateSend gives you true financial privacy by obscuring the origins of your funds. All the Dash in your wallet is comprised of different "inputs" which you can think of as separate, discrete coins.&lt;br&gt; PrivateSend uses an innovative process to mix your inputs with the inputs of two other people, without having your coins ever leave your wallet. You retain control of your money at all times.&lt;hr&gt; &lt;b&gt;The PrivateSend process works like this:&lt;/b&gt;&lt;ol type="1"&gt; &lt;li&gt;PrivateSend begins by breaking your transaction inputs down into standard denominations. These denominations are 0.01 DASH, 0.1 DASH, 1 DASH and 10 DASH -- sort of like the paper money you use every day.&lt;/li&gt; &lt;li&gt;Your wallet then sends requests to specially configured software nodes on the network, called "masternodes." These masternodes are informed then that you are interested in mixing a certain denomination. No identifiable information is sent to the masternodes, so they never know "who" you are.&lt;/li&gt; &lt;li&gt;When two other people send similar messages, indicating that they wish to mix the same denomination, a mixing session begins. The masternode mixes up the inputs and instructs all three users' wallets to pay the now-transformed input back to themselves. Your wallet pays that denomination directly to itself, but in a different address (called a change address).&lt;/li&gt; &lt;li&gt;In order to fully obscure your funds, your wallet must repeat this process a number of times with each denomination. Each time the process is completed, it's called a "round." Each round of PrivateSend makes it exponentially more difficult to determine where your funds originated.&lt;/li&gt; &lt;li&gt;This mixing process happens in the background without any intervention on your part. When you wish to make a transaction, your funds will already be anonymized. No additional waiting is required.&lt;/li&gt; &lt;/ol&gt; &lt;hr&gt;&lt;b&gt;IMPORTANT:&lt;/b&gt; Your wallet only contains 1000 of these "change addresses." Every time a mixing event happens, up to 9 of your addresses are used up. This means those 1000 addresses last for about 100 mixing events. When 900 of them are used, your wallet must create more addresses. It can only do this, however, if you have automatic backups enabled.&lt;br&gt; Consequently, users who have backups disabled will also have PrivateSend disabled. &lt;hr&gt;For more information, see the &lt;a href="https://docs.dash.org/en/latest/wallets/dashcore/privatesend-instantsend.html"&gt;PrivateSend documentation&lt;/a&gt;.         </source>
+        <translation>&lt;h3&gt;Основы PrivateSend&lt;/h3&gt;PrivateSend позволяет Вам получить настоящую финансовую конфиденциальность за счет скрытия источников Ваших средств. Все Dash в  Вашем кошельке состоят из различных "входов", Вы можете думать о них как об отдельных монетах.&lt;br&gt;PrivateSend использует инновационный процесс для перемешивания Ваших входов со входами еще двоих человек, но при этом Ваши монеты никогда не покидают Ваш кошелек. Вы сохраняете контроль над Вашими деньгами на протяжении всего времени.&lt;hr&gt; &lt;b&gt;PrivateSend работает так:&lt;/b&gt;&lt;ol type="1"&gt; &lt;li&gt;PrivateSend начинается с разбиения Ваших входов транзакций на стандартные номиналы. Такими номиналами являются 0.01 DASH, 0.1 DASH, 1 DASH и 10 DASH -- что-то вроде купюр, которыми вы пользуетесь каждый день.&lt;/li&gt; &lt;li&gt;Ваш кошелек затем отправляет запросы к особым образом настроенным сетевым узлам, называемым "мастернодами". Эти мастерноды знают только то, что Вы хотите перемешать определенные номиналы. Никакой идентифицирующей информации мастернодам не отправляется, так что они не знают "кто" Вы конкретно.&lt;/li&gt; &lt;li&gt;Сессия перемешивания начинается тогда, когда еще двое человек отправляют схожее сообщение, подтверждающее, что они хотят перемешать точно такой же номинал. Мастернода перемешивает входы и просит кошельки всех пользователей осуществить платежи по ним. Ваш кошелек осуществляет выплату самому себе, но на другой адрес (тоже из вашего кошелька).&lt;/li&gt; &lt;li&gt;Для скрытия Ваших средств кошелек должен повторить этот процесс несколько раз с каждым номиналом. Каждый раз, когда такой процесс завершается, называется "раундом". С каждым раундом PrivateSend становится экспоненциально сложнее определить откуда поступили средства.&lt;/li&gt; &lt;li&gt;Процесс перемешивания выполняется в фоне, без участия пользователя. Когда Вы захотите провести транзакцию, средства уже будут анонимизированы. Дополнительно ждать не требуется.&lt;/li&gt; &lt;/ol&gt; &lt;hr&gt;&lt;b&gt;ВАЖНО:&lt;/b&gt; Ваш кошелек содержит 1000 адресов. Каждое перемешивание использует до 9 из этих адресов. Это означает, что 1000 адресов хватит примерно на 100 перемешиваний. Когда 900 адресов будут уже использованы, Ваш кошелек должен создать новые адреса. Однако, он может сделать это, только если у Вас включены автоматические резервные копии.&lt;br&gt;Соответственно, пользователям с отключенным резервным копированием PrivateSend не доступен. &lt;hr&gt;Дополнительная информация доступна в &lt;a href="https://dashpay.atlassian.net/wiki/display/DOC/PrivateSend"&gt;документации по PrivateSend&lt;/a&gt;         </translation>
     </message>
 </context>
 <context>
@@ -1097,7 +1030,7 @@
     </message>
     <message>
         <source>Note: Status of your masternodes in local wallet can potentially be slightly incorrect.&lt;br /&gt;Always wait for wallet to sync additional data and then double check from another node&lt;br /&gt;if your masternode should be running but you still do not see "ENABLED" in "Status" field.</source>
-        <translation>Примечание: Статус Ваших мастернод в локальном кошельке может быть не совсем корректным.&lt;br /&gt;Всегда дожидайтесь окончания синхронизации дополнительных данных и перепроверяйте с другой ноды,&lt;br /&gt;если Ваша ьастернода должна быть активна, но Вы ее статус все равно не отображается как "ENABLED".</translation>
+        <translation>Примечание: Статус Ваших мастернод в локальном кошельке может быть не совсем корректным.&lt;br /&gt;Всегда дожидайтесь окончания синхронизации дополнительных данных и перепроверяйте с другой ноды,&lt;br /&gt;если Ваша мастернода должна быть активна, но ее статус все равно не отображается как "ENABLED".</translation>
     </message>
     <message>
         <source>Alias</source>
@@ -4158,11 +4091,11 @@ https://www.transifex.com/projects/p/dash/</translation>
     </message>
     <message>
         <source>Failed to load masternode cache from</source>
-        <translation>Ошибка загрузка кэша мастернод из</translation>
+        <translation>Ошибка загрузки кэша мастернод из</translation>
     </message>
     <message>
         <source>Failed to load masternode payments cache from</source>
-        <translation>Ошибка загрузка кэша выплат мастернодам из</translation>
+        <translation>Ошибка загрузки кэша выплат мастернодам из</translation>
     </message>
     <message>
         <source>Found enough users, signing ( waiting %s )</source>
@@ -4480,6 +4413,10 @@ https://www.transifex.com/projects/p/dash/</translation>
         <source>Disable all Dash specific functionality (Masternodes, PrivateSend, InstantSend, Governance) (0-1, default: %u)</source>
         <translation>Отключить всю функциональность, относящуюся к Dash (Мастерноды, PrivateSend, InstantSend, Governance) (0-1, по умолчанию: %u)</translation>
     </message>
+    <message>
+        <source>%s file contains all private keys from this wallet. Do not share it with anyone!</source>
+        <translation>%s файл содержит в себе все закрытые ключи для этого кошелька. Никому его не показывайте!</translation>
+    </message>
     <message>
         <source>Discover own IP addresses (default: 1 when listening and no -externalip or -proxy)</source>
         <translation>Определить свой IP (по умолчанию: 1 при прослушивании и если не используется -externalip или -proxy)</translation>
@@ -4504,6 +4441,10 @@ https://www.transifex.com/projects/p/dash/</translation>
         <source>Execute command when a wallet InstantSend transaction is successfully locked (%s in cmd is replaced by TxID)</source>
         <translation>Выполнить команду, когда транзакция InstantSend успешно заблокирована (%s в команде заменяется на TxID)</translation>
     </message>
+    <message>
+        <source>Extra transactions to keep in memory for compact block reconstructions (default: %u)</source>
+        <translation>Количество дополнительных транзакций, которые нужно держать в памяти для реконструкции компактных блоков (по умолчанию: %u)</translation>
+    </message>
     <message>
         <source>Failed to create backup, file already exists! This could happen if you restarted wallet in less than 60 seconds. You can continue if you are ok with this.</source>
         <translation>Не удалось создать резервную копию, т.к. файл уже существует! Такое могло случится, если вы перезапустили кошелек менее чем через 60 секунд после предыдущего запуска. Вы можете продолжить, если это допустимо.</translation>
@@ -4584,6 +4525,10 @@ https://www.transifex.com/projects/p/dash/</translation>
         <source>Total length of network version string (%i) exceeds maximum length (%i). Reduce the number or size of uacomments.</source>
         <translation>Длина строки сетевой версии (%i) превышает максимально допустимую (%i). Уменьшите количество или размер строк uacomment.</translation>
     </message>
+    <message>
+        <source>Transaction index can't be disabled in full mode. Either start with -litemode command line switch or enable transaction index.</source>
+        <translation>Индексирование транзакций нельзя отключить в полном режиме. Либо запустите кошелек с опцией -litemode, либо включите индексирование транзакций.</translation>
+    </message>
     <message>
         <source>Tries to keep outbound traffic under the given target (in MiB per 24h), 0 = no limit (default: %d)</source>
         <translation>Пытаться ограничить исходящий трафик в пределах установленного лимита (в МБ за 24ч), 0 = не ограничивать (по умолчанию: %d)</translation>
@@ -4616,6 +4561,10 @@ https://www.transifex.com/projects/p/dash/</translation>
         <source>Warning: Unknown block versions being mined! It's possible unknown rules are in effect</source>
         <translation>Внимание: создаются блоки неизвестной версии! Возможно активированы неизвестные правила</translation>
     </message>
+    <message>
+        <source>You are starting in lite mode, all Dash-specific functionality is disabled.</source>
+        <translation>Вы запускаете кошелек в облегченном режиме, все специфичные для Dash функции отключены.</translation>
+    </message>
     <message>
         <source>You need to rebuild the database using -reindex to go back to unpruned mode.  This will redownload the entire blockchain</source>
         <translation>Вам необходимо пересоздать базы данных, запустив клиент с ключом -reindex, чтобы вернуться в полный режим. Это приведет к повторному скачиванию всей цепи блоков.</translation>
@@ -4660,6 +4609,14 @@ https://www.transifex.com/projects/p/dash/</translation>
         <source>Enable publish hash block in &lt;address&gt;</source>
         <translation>Включить публикацию хэша блока на &lt;address&gt;</translation>
     </message>
+    <message>
+        <source>Enable publish hash of governance objects (like proposals) in &lt;address&gt;</source>
+        <translation>Включить публикацию хэша объектов управления (таких как бюджетные предложения) на &lt;address&gt;</translation>
+    </message>
+    <message>
+        <source>Enable publish hash of governance votes in &lt;address&gt;</source>
+        <translation>Включить публикацию хэша голосов за объекты управления на &lt;address&gt;</translation>
+    </message>
     <message>
         <source>Enable publish hash transaction (locked via InstantSend) in &lt;address&gt;</source>
         <translation>Включить публикацию хэша транзакции (заблокированной через InstantSend) на &lt;address&gt;</translation>
@@ -4700,6 +4657,14 @@ https://www.transifex.com/projects/p/dash/</translation>
         <source>Failed to delete backup, error: %s</source>
         <translation>Не удалось удалить резервную копию, ошибка: %s</translation>
     </message>
+    <message>
+        <source>Failed to load InstantSend data cache from</source>
+        <translation>Ошибка загрузки кэша InstantSend из</translation>
+    </message>
+    <message>
+        <source>Failed to load sporks cache from</source>
+        <translation>Ошибка загрузки кэша спорков из</translation>
+    </message>
     <message>
         <source>Failed to parse host:port string</source>
         <translation>Не удалось разбить строку host:port</translation>
@@ -4720,6 +4685,10 @@ https://www.transifex.com/projects/p/dash/</translation>
         <source>Invalid amount for -fallbackfee=&lt;amount&gt;: '%s'</source>
         <translation>Неверная сумма в параметре -fallbackfee=&lt;amount&gt;: '%s'</translation>
     </message>
+    <message>
+        <source>Invalid input count.</source>
+        <translation>Неверная количество входов.</translation>
+    </message>
     <message>
         <source>Keep the transaction memory pool below &lt;n&gt; megabytes (default: %u)</source>
         <translation>Держать размер пула памяти транзакций ниже &lt;n&gt; мегабайт (по умолчанию: %u)</translation>
@@ -4736,6 +4705,10 @@ https://www.transifex.com/projects/p/dash/</translation>
         <source>Line: %d</source>
         <translation>Строка: %d</translation>
     </message>
+    <message>
+        <source>Loading InstantSend data cache...</source>
+        <translation>Загрузка кэша InstantSend...</translation>
+    </message>
     <message>
         <source>Loading addresses...</source>
         <translation>Загрузка адресов...</translation>
@@ -4748,6 +4721,10 @@ https://www.transifex.com/projects/p/dash/</translation>
         <source>Loading governance cache...</source>
         <translation>Загрузка кэша управления...</translation>
     </message>
+    <message>
+        <source>Loading sporks cache...</source>
+        <translation>Загрузка кэша спорков...</translation>
+    </message>
     <message>
         <source>Loading wallet... (%3.2f %%)</source>
         <translation>Загрузка кошелька... (%3.2f %%)</translation>
@@ -4888,6 +4865,10 @@ https://www.transifex.com/projects/p/dash/</translation>
         <source>Transaction must have at least one recipient</source>
         <translation>У транзакции должен быть хотя бы один получатель</translation>
     </message>
+    <message>
+        <source>Transaction too large</source>
+        <translation>Транзакция слишком большая</translation>
+    </message>
     <message>
         <source>Trying to connect...</source>
         <translation>Попытка соединения...</translation>
@@ -4908,6 +4889,10 @@ https://www.transifex.com/projects/p/dash/</translation>
         <source>Wallet debugging/testing options:</source>
         <translation>Параметры отладки/тестирования кошелька:</translation>
     </message>
+    <message>
+        <source>Wallet is not initialized</source>
+        <translation>Кошелек не инициализирован</translation>
+    </message>
     <message>
         <source>Wallet needed to be rewritten: restart %s to complete</source>
         <translation>Необходимо перезаписать кошелёк: перезапустите %s для завершения операции</translation>
@@ -4924,6 +4909,10 @@ https://www.transifex.com/projects/p/dash/</translation>
         <source>Whether to operate in a blocks only mode (default: %u)</source>
         <translation>Работать в режиме обработки только блоков (по умолчанию: %u)</translation>
     </message>
+    <message>
+        <source>You can not start a masternode in lite mode.</source>
+        <translation>Вы не можете запустить мастерноду в облегченном режиме.</translation>
+    </message>
     <message>
         <source>ZeroMQ notification options:</source>
         <translation>Параметры оповещения ZeroMQ:</translation>
@@ -5012,10 +5001,6 @@ https://www.transifex.com/projects/p/dash/</translation>
         <source>Set lowest fee rate (in %s/kB) for transactions to be included in block creation. (default: %s)</source>
         <translation>Установить минимальную комиссию (в %s/kB) для добавления транзакций в блок (по умолчанию: %s)</translation>
     </message>
-    <message>
-        <source>Show N confirmations for a successfully locked transaction (%u-%u, default: %u)</source>
-        <translation>Показывать N подтверждений для успешно заблокированной транзакции (%u-%u, по умолчанию: %u)</translation>
-    </message>
     <message>
         <source>This is the transaction fee you may pay when fee estimates are not available.</source>
         <translation>Это комиссия, которую Вы заплатите при отправке транзакции, если расчет комиссии не доступен.</translation>
diff --git a/src/qt/locale/dash_sk.ts b/src/qt/locale/dash_sk.ts
index 91066589f143..942af40b7aed 100644
--- a/src/qt/locale/dash_sk.ts
+++ b/src/qt/locale/dash_sk.ts
@@ -519,7 +519,7 @@
     </message>
     <message numerus="yes">
         <source>%n active connection(s) to Dash network</source>
-        <translation><numerusform>%n aktívne spojenie so sieťou Dash</numerusform><numerusform>%n aktívne spojenia so sieťou Dash</numerusform><numerusform>%n aktívnych spojení so sieťou Dash</numerusform></translation>
+        <translation><numerusform>%n aktívne spojenie so sieťou Dash</numerusform><numerusform>%n aktívne spojenia so sieťou Dash</numerusform><numerusform>%n aktívnych spojení so sieťou Dash</numerusform><numerusform>%n aktívnych spojení so sieťou Dash</numerusform></translation>
     </message>
     <message>
         <source>Network activity disabled</source>
@@ -551,7 +551,7 @@
     </message>
     <message numerus="yes">
         <source>Processed %n block(s) of transaction history.</source>
-        <translation><numerusform>Spracovaný jeden blok transakčnej histórie.</numerusform><numerusform>Spracované %n bloky transakčnej histórie.</numerusform><numerusform>Spracovaných %n blokov transakčnej histórie.</numerusform></translation>
+        <translation><numerusform>Spracovaný jeden blok transakčnej histórie.</numerusform><numerusform>Spracované %n bloky transakčnej histórie.</numerusform><numerusform>Spracovaných %n blokov transakčnej histórie.</numerusform><numerusform>Spracovaných %n blokov transakčnej histórie.</numerusform></translation>
     </message>
     <message>
         <source>%1 behind</source>
@@ -793,10 +793,6 @@
         <source>Please switch to "List mode" to use this function.</source>
         <translation>Pre použitie tejto funkcie prepnite na "Zoznamový mód".</translation>
     </message>
-    <message>
-        <source>Non-anonymized input selected. &lt;b&gt;PrivateSend will be disabled.&lt;/b&gt;&lt;br&gt;&lt;br&gt;If you still want to use PrivateSend, please deselect all non-nonymized inputs first and then check PrivateSend checkbox again.</source>
-        <translation>Vybratý ne-anonymizovaný vstup. &lt;b&gt;PrivateSend bude vypnutý.&lt;/b&gt;&lt;br&gt;&lt;br&gt;Ak si stále želáte použiť PrivateSend, najskôr odznačte všetky ne-anonymizované vstupy a potom znova zaškrtnite PrivateSend políčko.</translation>
-    </message>
     <message>
         <source>(%1 locked)</source>
         <translation>(%1 zamknutých)</translation>
@@ -834,73 +830,6 @@
         <translation>nie je k dispozícii</translation>
     </message>
 </context>
-<context>
-    <name>DarksendConfig</name>
-    <message>
-        <source>Configure PrivateSend</source>
-        <translation>Nastaviť PrivateSend</translation>
-    </message>
-    <message>
-        <source>Basic Privacy</source>
-        <translation>Základné súkromie</translation>
-    </message>
-    <message>
-        <source>High Privacy</source>
-        <translation>Vysoké súkromie</translation>
-    </message>
-    <message>
-        <source>Maximum Privacy</source>
-        <translation>Maximálne súkromie</translation>
-    </message>
-    <message>
-        <source>Please select a privacy level.</source>
-        <translation>Prosím vyberte úroveň súkromia.</translation>
-    </message>
-    <message>
-        <source>Use 2 separate masternodes to mix funds up to 1000 DASH</source>
-        <translation>Použiť 2 rozdielne masternode pre fixovanie prostriedkov až do 1000 DASH</translation>
-    </message>
-    <message>
-        <source>Use 8 separate masternodes to mix funds up to 1000 DASH</source>
-        <translation>Použiť 8 rozdielnych masternode pre fixovanie prostriedkov až do 1000 DASH</translation>
-    </message>
-    <message>
-        <source>Use 16 separate masternodes</source>
-        <translation>Použiť 16 rozdielnych masternode</translation>
-    </message>
-    <message>
-        <source>This option is the quickest and will cost about ~0.025 DASH to anonymize 1000 DASH</source>
-        <translation>Táto možnosť je najrýchlejšia a bude stáť približne 0.025 DASH pre anonimizáciu 1000 DASH</translation>
-    </message>
-    <message>
-        <source>This option is moderately fast and will cost about 0.05 DASH to anonymize 1000 DASH</source>
-        <translation>Táto možnosť je stredne rýchla bude stáť približne 0.05 DASH pre anonimizáciu 1000 DASH</translation>
-    </message>
-    <message>
-        <source>0.1 DASH per 1000 DASH you anonymize.</source>
-        <translation>0.1 DASH za 1000 DASH ktoré spravíte anonymnými.</translation>
-    </message>
-    <message>
-        <source>This is the slowest and most secure option. Using maximum anonymity will cost</source>
-        <translation>Toto je najpomalšia a najviac bezpečná možnosť. Použitie maximálnej anonymity bude stáť</translation>
-    </message>
-    <message>
-        <source>PrivateSend Configuration</source>
-        <translation>Nastavenie PrivateSend</translation>
-    </message>
-    <message>
-        <source>PrivateSend was successfully set to basic (%1 and 2 rounds). You can change this at any time by opening Dash's configuration screen.</source>
-        <translation>Darksend bol úspešne nastavený na základnú hodnotu (%1 a 2 kolá). Toto nastavenie môžete kedykoľvek zmeniť otvorením konfiguračnej obrazovky Dash.</translation>
-    </message>
-    <message>
-        <source>PrivateSend was successfully set to high (%1 and 8 rounds). You can change this at any time by opening Dash's configuration screen.</source>
-        <translation>PrivateSend bol úspešne nastavený na základnú hodnotu (%1 a 8 kôl). Toto nastavenie môžete kedykoľvek zmeniť otvorením konfiguračnej obrazovky Dash.</translation>
-    </message>
-    <message>
-        <source>PrivateSend was successfully set to maximum (%1 and 16 rounds). You can change this at any time by opening Dash's configuration screen.</source>
-        <translation>PrivateSend bol úspešne nastavený na maximálnu hodnotu (%1 a 16 kôl). Toto nastavenie môžete kedykoľvek zmeniť otvorením konfiguračnej obrazovky Dash.</translation>
-    </message>
-</context>
 <context>
     <name>EditAddressDialog</name>
     <message>
@@ -1037,11 +966,7 @@
         <source>PrivateSend information</source>
         <translation>Informácie o PrivateSend</translation>
     </message>
-    <message>
-        <source>&lt;h3&gt;PrivateSend Basics&lt;/h3&gt; PrivateSend gives you true financial privacy by obscuring the origins of your funds. All the Dash in your wallet is comprised of different "inputs" which you can think of as separate, discrete coins.&lt;br&gt; PrivateSend uses an innovative process to mix your inputs with the inputs of two other people, without having your coins ever leave your wallet. You retain control of your money at all times.&lt;hr&gt; &lt;b&gt;The PrivateSend process works like this:&lt;/b&gt;&lt;ol type="1"&gt; &lt;li&gt;PrivateSend begins by breaking your transaction inputs down into standard denominations. These denominations are 0.01 DASH, 0.1 DASH, 1 DASH and 10 DASH -- sort of like the paper money you use every day.&lt;/li&gt; &lt;li&gt;Your wallet then sends requests to specially configured software nodes on the network, called "masternodes." These masternodes are informed then that you are interested in mixing a certain denomination. No identifiable information is sent to the masternodes, so they never know "who" you are.&lt;/li&gt; &lt;li&gt;When two other people send similar messages, indicating that they wish to mix the same denomination, a mixing session begins. The masternode mixes up the inputs and instructs all three users' wallets to pay the now-transformed input back to themselves. Your wallet pays that denomination directly to itself, but in a different address (called a change address).&lt;/li&gt; &lt;li&gt;In order to fully obscure your funds, your wallet must repeat this process a number of times with each denomination. Each time the process is completed, it's called a "round." Each round of PrivateSend makes it exponentially more difficult to determine where your funds originated.&lt;/li&gt; &lt;li&gt;This mixing process happens in the background without any intervention on your part. When you wish to make a transaction, your funds will already be anonymized. No additional waiting is required.&lt;/li&gt; &lt;/ol&gt; &lt;hr&gt;&lt;b&gt;IMPORTANT:&lt;/b&gt; Your wallet only contains 1000 of these "change addresses." Every time a mixing event happens, up to 9 of your addresses are used up. This means those 1000 addresses last for about 100 mixing events. When 900 of them are used, your wallet must create more addresses. It can only do this, however, if you have automatic backups enabled.&lt;br&gt; Consequently, users who have backups disabled will also have PrivateSend disabled. &lt;hr&gt;For more info see &lt;a href="https://dashpay.atlassian.net/wiki/display/DOC/PrivateSend"&gt;https://dashpay.atlassian.net/wiki/display/DOC/PrivateSend&lt;/a&gt;         </source>
-        <translation>&lt;h3&gt;Základy PrivateSend&lt;/h3&gt; PrivateSend Vám poskytuje skutočné finančné súkromie skrývaním pôvodu Vašich zdrojov. Všetky Dash vo vašej peňaženke pozostávajú z rôznych "vstupov", ktoré si môžete predstaviť ako rozdelené, which you can think of as separate, diskrétne mince.&lt;br&gt; PrivateSend používa zdokonalený proces pre miešanie Vašich vstupov so vstupmi iných ľudí bez toho. aby Vaše mince museli opustiť Vašu peňaženku. Počas cele doby máte kontrolu nad Vašimi peniazmi.&lt;hr&gt; &lt;b&gt;Proces PrivateSend funguje nasledovne:&lt;/b&gt;&lt;ol type="1"&gt; &lt;li&gt;PrivateSend začne rozdelením Vašich transakčných vstupov na štandardné časti, takzvané denominácie. Tieto denominácie sú 0.01 DASH, 0.1 DASH, 1 DASH a 10 DASH -- v podstate niečo ako papierové peniaze, ktoré používate každý deň.&lt;/li&gt; &lt;li&gt;Vaša peňaženka potom pošle požiadavok špeciálne nastavenému softvérovému uzlu nazvaného "Masternode". Tieto Masternode sú potom informované, že máte záujem miešať určité denominácie. Masternode neobdrží žiadne informácie ktoré by Vás identifikovali, takže niekdy nevedia kto ste.&lt;/li&gt; &lt;li&gt;Keď ďalší dvaja ľudia pošlú podobnú správu hovoriacu o tom že chcú miešať rovnakú denomináciu, začne sa samotné miešanie. Masternode zamieša vstupy a povie peňaženkám všetkých troch používateľov, aby zaplatili teraz už zmiešané vstupy sami sebe. Vaša peňaženka zaplatí tieto denominácie priamo sebe, ale už na inú adresu (nazývanú "meniaca adresa").&lt;/li&gt; &lt;li&gt;Aby boli Vaše zdroje plne zakryté, Vaša peňaženka musí zopakovať tento proces niekoľko krát s každou denomináciou.  Vždy keď je tento proces dokončený, je nazvaný "kolo". Každé kolo PrivateSend exponenciálne sťažuje určiť odkiaľ pochádzajú Vaše zdroje.&lt;/li&gt; &lt;li&gt;Toto miešanie sa deje na pozadí bez nutnosti zásahov z Vašej strany. Keď si prajete uskutočniť transakciu, Vaše zdroje budú už anonýmne. Nie je nutné na nič čakať.&lt;/li&gt; &lt;/ol&gt; DÔLEŽITÉ:&lt;/b&gt; Vaša peňaženka obsahuje iba 1000 týchto "meniacich adries". Vždy keď prebehne miešanie, použije sa maximálne až 9 Vašich adries. To znamená, že týchto 1000 adries vystačí zhruba na 100 miešaní. Keď sa použije 900 adries, Vaša peňaženka musí vytvoriť viac adries. Toto je však možné iba vtedy, keď máte zapnuté automatické zálohovanie.&lt;br&gt; V dôsledku toho, používatelia ktorí majú zálohovanie vypnuté, budú mať vypnutý aj PrivateSend. &lt;hr&gt;Viac informácií nájdete na &lt;a href="https://dashpay.atlassian.net/wiki/display/DOC/PrivateSend"&gt;https://dashpay.atlassian.net/wiki/display/DOC/PrivateSend&lt;/a&gt;         </translation>
-    </message>
-</context>
+    </context>
 <context>
     <name>Intro</name>
     <message>
@@ -1783,7 +1708,7 @@ https://www.transifex.com/projects/p/dash/</translation>
     </message>
     <message numerus="yes">
         <source>%n Rounds</source>
-        <translation><numerusform>%n kolo</numerusform><numerusform>%n kolá</numerusform><numerusform>%n kôl</numerusform></translation>
+        <translation><numerusform>%n kolo</numerusform><numerusform>%n kolá</numerusform><numerusform>%n kôl</numerusform><numerusform>%n kôl</numerusform></translation>
     </message>
     <message>
         <source>Found enough compatible inputs to anonymize %1</source>
@@ -1811,7 +1736,7 @@ https://www.transifex.com/projects/p/dash/</translation>
     </message>
     <message numerus="yes">
         <source>Denominated inputs have %5 of %n rounds on average</source>
-        <translation><numerusform>Denominované vstup má v priemere %5 z %n kôl</numerusform><numerusform>Denominované vstupy majú v priemere %5 z %n kôl</numerusform><numerusform>Denominované vstupy majú v priemere %5 z %n kôl</numerusform></translation>
+        <translation><numerusform>Denominované vstup má v priemere %5 z %n kôl</numerusform><numerusform>Denominované vstupy majú v priemere %5 z %n kôl</numerusform><numerusform>Denominované vstupy majú v priemere %5 z %n kôl</numerusform><numerusform>Denominované vstupy majú v priemere %5 z %n kôl</numerusform></translation>
     </message>
     <message>
         <source>keys left: %1</source>
@@ -1829,10 +1754,6 @@ https://www.transifex.com/projects/p/dash/</translation>
         <source>We are about to create a new automatic backup for you, however &lt;span style='color:red;'&gt; you should always make sure you have backups saved in some safe place&lt;/span&gt;!</source>
         <translation>Chystáme sa pre Vás vytvoriť automatickú zálohu, avšak &lt;span style='color:red;'&gt;mali by ste sa uistiť, že máte zálohy uložené na bezpečnom mieste&lt;/span&gt;!</translation>
     </message>
-    <message>
-        <source>Note: You can turn this message off in options.</source>
-        <translation>Poznámka: Túto správu môžete vypnúť v nastaveniach.</translation>
-    </message>
     <message>
         <source>WARNING! Something went wrong on automatic backup</source>
         <translation>UPOZORNENIE: S automatickými zálohami nie je niečo v poriadku</translation>
@@ -2047,27 +1968,27 @@ https://www.transifex.com/projects/p/dash/</translation>
     </message>
     <message numerus="yes">
         <source>%n second(s)</source>
-        <translation><numerusform>%n sekunda</numerusform><numerusform>%n sekundy</numerusform><numerusform>%n sekúnd</numerusform></translation>
+        <translation><numerusform>%n sekunda</numerusform><numerusform>%n sekundy</numerusform><numerusform>%n sekúnd</numerusform><numerusform>%n sekúnd</numerusform></translation>
     </message>
     <message numerus="yes">
         <source>%n minute(s)</source>
-        <translation><numerusform>%n minúta</numerusform><numerusform>%n minúty</numerusform><numerusform>%n minút</numerusform></translation>
+        <translation><numerusform>%n minúta</numerusform><numerusform>%n minúty</numerusform><numerusform>%n minút</numerusform><numerusform>%n minút</numerusform></translation>
     </message>
     <message numerus="yes">
         <source>%n hour(s)</source>
-        <translation><numerusform>%n hodina</numerusform><numerusform>%n hodiny</numerusform><numerusform>%n hodín</numerusform></translation>
+        <translation><numerusform>%n hodina</numerusform><numerusform>%n hodiny</numerusform><numerusform>%n hodín</numerusform><numerusform>%n hodín</numerusform></translation>
     </message>
     <message numerus="yes">
         <source>%n day(s)</source>
-        <translation><numerusform>%n deň</numerusform><numerusform>%n dni</numerusform><numerusform>%n dní</numerusform></translation>
+        <translation><numerusform>%n deň</numerusform><numerusform>%n dni</numerusform><numerusform>%n dní</numerusform><numerusform>%n dní</numerusform></translation>
     </message>
     <message numerus="yes">
         <source>%n week(s)</source>
-        <translation><numerusform>%n týždeň</numerusform><numerusform>%n týždne</numerusform><numerusform>%n týždňov</numerusform></translation>
+        <translation><numerusform>%n týždeň</numerusform><numerusform>%n týždne</numerusform><numerusform>%n týždňov</numerusform><numerusform>%n týždňov</numerusform></translation>
     </message>
     <message numerus="yes">
         <source>%n year(s)</source>
-        <translation><numerusform>%n rok</numerusform><numerusform>%n roky</numerusform><numerusform>%n rokov</numerusform></translation>
+        <translation><numerusform>%n rok</numerusform><numerusform>%n roky</numerusform><numerusform>%n rokov</numerusform><numerusform>%n rokov</numerusform></translation>
     </message>
     <message>
         <source>%1 and %2</source>
@@ -2366,7 +2287,7 @@ https://www.transifex.com/projects/p/dash/</translation>
     </message>
     <message>
         <source>Rescan blockchain files</source>
-        <translation>Znova prehľadať reťazec blokov</translation>
+        <translation>Znova prehľadať blockchain</translation>
     </message>
     <message>
         <source>Recover transactions 1</source>
@@ -2394,11 +2315,11 @@ https://www.transifex.com/projects/p/dash/</translation>
     </message>
     <message>
         <source>-zapwallettxes=1: Recover transactions from blockchain (keep meta-data, e.g. account owner).</source>
-        <translation>-zapwallettxes=1: Obnoviť transakcie z reťazca blokov (zachovať metaúdaje, napr. vlastníka účtu).</translation>
+        <translation>-zapwallettxes=1: Obnoviť transakcie z blockchainu (zachovať metaúdaje, napr. vlastníka účtu).</translation>
     </message>
     <message>
         <source>-zapwallettxes=2: Recover transactions from blockchain (drop meta-data).</source>
-        <translation>-zapwallettxes=2: Obnoviť transakcie z reťazca blokov (zahodiť metaúdaje).</translation>
+        <translation>-zapwallettxes=2: Obnoviť transakcie z blockchainu (zahodiť metaúdaje).</translation>
     </message>
     <message>
         <source>-upgradewallet: Upgrade wallet to latest format on startup. (Note: this is NOT an update of the wallet itself!)</source>
@@ -2990,7 +2911,7 @@ https://www.transifex.com/projects/p/dash/</translation>
     </message>
     <message numerus="yes">
         <source>%n block(s)</source>
-        <translation><numerusform>%n blok</numerusform><numerusform>%n bloky</numerusform><numerusform>%n blokov</numerusform></translation>
+        <translation><numerusform>%n blok</numerusform><numerusform>%n bloky</numerusform><numerusform>%n blokov</numerusform><numerusform>%n blokov</numerusform></translation>
     </message>
     <message>
         <source>Pay only the required fee of %1</source>
@@ -2998,7 +2919,7 @@ https://www.transifex.com/projects/p/dash/</translation>
     </message>
     <message numerus="yes">
         <source>Estimated to begin confirmation within %n block(s).</source>
-        <translation><numerusform>Odhad pre začiatok potvrdzovania je %n blok.</numerusform><numerusform>Odhad pre začiatok potvrdzovania sú %n bloky.</numerusform><numerusform>Odhad pre začiatok potvrdzovania je %n blokov.</numerusform></translation>
+        <translation><numerusform>Odhad pre začiatok potvrdzovania je %n blok.</numerusform><numerusform>Odhad pre začiatok potvrdzovania sú %n bloky.</numerusform><numerusform>Odhad pre začiatok potvrdzovania je %n blokov.</numerusform><numerusform>Odhad pre začiatok potvrdzovania je %n blokov.</numerusform></translation>
     </message>
     <message>
         <source>Warning: Invalid Dash address</source>
@@ -3283,7 +3204,7 @@ https://www.transifex.com/projects/p/dash/</translation>
     <name>TransactionDesc</name>
     <message numerus="yes">
         <source>Open for %n more block(s)</source>
-        <translation><numerusform>Otvoriť pre %n ďalší blok</numerusform><numerusform>Otvoriť pre %n ďalšie bloky</numerusform><numerusform>Otvoriť pre %n ďalších blokov</numerusform></translation>
+        <translation><numerusform>Otvoriť pre %n ďalší blok</numerusform><numerusform>Otvoriť pre %n ďalšie bloky</numerusform><numerusform>Otvoriť pre %n ďalších blokov</numerusform><numerusform>Otvoriť pre %n ďalších blokov</numerusform></translation>
     </message>
     <message>
         <source>Open until %1</source>
@@ -3343,7 +3264,7 @@ https://www.transifex.com/projects/p/dash/</translation>
     </message>
     <message numerus="yes">
         <source>, broadcast through %n node(s)</source>
-        <translation><numerusform>, vysielaný cez %n uzol</numerusform><numerusform>, vysielaný cez %n uzle</numerusform><numerusform>, vysielaný cez %n uzlov</numerusform></translation>
+        <translation><numerusform>, vysielaný cez %n uzol</numerusform><numerusform>, vysielaný cez %n uzle</numerusform><numerusform>, vysielaný cez %n uzlov</numerusform><numerusform>, vysielaný cez %n uzlov</numerusform></translation>
     </message>
     <message>
         <source>Date</source>
@@ -3387,7 +3308,7 @@ https://www.transifex.com/projects/p/dash/</translation>
     </message>
     <message numerus="yes">
         <source>matures in %n more block(s)</source>
-        <translation><numerusform>dozreje za %n ďalší blok</numerusform><numerusform>dozreje za %n ďalšie bloky</numerusform><numerusform>dozreje za %n ďalších blokov</numerusform></translation>
+        <translation><numerusform>dozreje za %n ďalší blok</numerusform><numerusform>dozreje za %n ďalšie bloky</numerusform><numerusform>dozreje za %n ďalších blokov</numerusform><numerusform>dozreje za %n ďalších blokov</numerusform></translation>
     </message>
     <message>
         <source>not accepted</source>
@@ -3493,7 +3414,7 @@ https://www.transifex.com/projects/p/dash/</translation>
     </message>
     <message numerus="yes">
         <source>Open for %n more block(s)</source>
-        <translation><numerusform>Otvoriť pre %n ďalší blok</numerusform><numerusform>Otvoriť pre %n ďalšie bloky</numerusform><numerusform>Otvoriť pre %n ďalších blokov</numerusform></translation>
+        <translation><numerusform>Otvoriť pre %n ďalší blok</numerusform><numerusform>Otvoriť pre %n ďalšie bloky</numerusform><numerusform>Otvoriť pre %n ďalších blokov</numerusform><numerusform>Otvoriť pre %n ďalších blokov</numerusform></translation>
     </message>
     <message>
         <source>Open until %1</source>
@@ -4043,7 +3964,7 @@ https://www.transifex.com/projects/p/dash/</translation>
     </message>
     <message>
         <source>Delete all wallet transactions and only recover those parts of the blockchain through -rescan on startup</source>
-        <translation>Vymazať všetky transakcie z peňaženky a pri spustení znova získať z reťazca blokov iba tie získané pomocou -rescan</translation>
+        <translation>Vymazať všetky transakcie z peňaženky a pri spustení znova získať z blockchainu iba tie získané pomocou -rescan</translation>
     </message>
     <message>
         <source>Error loading %s: You can't enable HD on a already existing non-HD wallet</source>
@@ -4155,7 +4076,7 @@ https://www.transifex.com/projects/p/dash/</translation>
     </message>
     <message>
         <source>Failed to load governance cache from</source>
-        <translation>Chyba pri načítaní vyrovnávajúcej pamäti dozoru z</translation>
+        <translation>Chyba pri načítaní vyrovnávajúcej pamäti správy z</translation>
     </message>
     <message>
         <source>Failed to load masternode cache from</source>
@@ -4359,7 +4280,7 @@ https://www.transifex.com/projects/p/dash/</translation>
     </message>
     <message>
         <source>Synchroning blockchain...</source>
-        <translation>Synchronizuje sa reťazec blokov...</translation>
+        <translation>Synchronizuje sa blockchain...</translation>
     </message>
     <message>
         <source>Synchronization failed</source>
@@ -4551,11 +4472,11 @@ https://www.transifex.com/projects/p/dash/</translation>
     </message>
     <message>
         <source>Prune configured below the minimum of %d MiB.  Please use a higher number.</source>
-        <translation>Redukcia nastavená pod minimálnu hodnotu %d MiB. Prosím použite vyššiu hodnotu.</translation>
+        <translation>Orezanie nastavené pod minimálnu hodnotu %d MiB. Prosím použite vyššiu hodnotu.</translation>
     </message>
     <message>
         <source>Prune: last wallet synchronisation goes beyond pruned data. You need to -reindex (download the whole blockchain again in case of pruned node)</source>
-        <translation>Prerezávanie: posledná synchronizácia peňaženky prebehla pred už prerezanými dátami. Je treba previesť -reindex (v prípade prerezávacieho režimu stiahne znovu celý reťazec blokov)</translation>
+        <translation>Orezávanie: posledná synchronizácia peňaženky prebehla už pred orezanými dátami. Je treba spustiť -reindex (stiahne znovu celý blockchain v prípade orezaného uzlu)</translation>
     </message>
     <message>
         <source>Randomize credentials for every proxy connection. This enables Tor stream isolation (default: %u)</source>
@@ -4563,7 +4484,7 @@ https://www.transifex.com/projects/p/dash/</translation>
     </message>
     <message>
         <source>Rescans are not possible in pruned mode. You will need to use -reindex which will download the whole blockchain again.</source>
-        <translation>V prerezávaciom režime nie je možné reťazec blokov preskenovať. Musíte vykonať -reindex, čo znova stiahne celý reťaec blokov.</translation>
+        <translation>V orezanom režime nie je možné reťazec blokov pre-skenovať. Musíte vykonať -reindex, čo znova stiahne celý blockchain.</translation>
     </message>
     <message>
         <source>Specify full path to directory for automatic wallet backups (must exist)</source>
@@ -4619,7 +4540,7 @@ https://www.transifex.com/projects/p/dash/</translation>
     </message>
     <message>
         <source>You need to rebuild the database using -reindex to go back to unpruned mode.  This will redownload the entire blockchain</source>
-        <translation>K návratu k neprerezávaciemu režimu je treba prestavať databázu použitím -reindex. Tiež sa znova stiahne celý reťazec blokov</translation>
+        <translation>K návratu k neorezanému režimu je treba prestavať databázu použitím -reindex. Tiež sa znova stiahne celý blockchain</translation>
     </message>
     <message>
         <source>(%d could be used only on mainnet)</source>
@@ -4747,7 +4668,7 @@ https://www.transifex.com/projects/p/dash/</translation>
     </message>
     <message>
         <source>Loading governance cache...</source>
-        <translation>Načíta sa vyrovnávacia pamäť dozoru...</translation>
+        <translation>Načíta sa vyrovnávacia pamäť správy...</translation>
     </message>
     <message>
         <source>Loading wallet... (%3.2f %%)</source>
@@ -4767,7 +4688,7 @@ https://www.transifex.com/projects/p/dash/</translation>
     </message>
     <message>
         <source>Masternode cache is empty, skipping payments and governance cache...</source>
-        <translation>Vyrovnávacia pamäť Masternode je prázdna, vynechávajú sa platby a vyrovnávacia pamäť dozoru...</translation>
+        <translation>Vyrovnávacia pamäť Masternode je prázdna, vynechávajú sa platby a vyrovnávacia pamäť správy...</translation>
     </message>
     <message>
         <source>Masternode options:</source>
@@ -4851,11 +4772,11 @@ https://www.transifex.com/projects/p/dash/</translation>
     </message>
     <message>
         <source>Prune cannot be configured with a negative value.</source>
-        <translation>Redukovanie nemôže byť nastavené na zápornú hodnotu.</translation>
+        <translation>Orezanie nemôže byť nastavené na zápornú hodnotu.</translation>
     </message>
     <message>
         <source>Prune mode is incompatible with -txindex.</source>
-        <translation>Redukovanie je nekompatibilné s -txindex.</translation>
+        <translation>Orezávanie nie je kompatibilné s -txindex.</translation>
     </message>
     <message>
         <source>Pruning blockstore...</source>
@@ -5007,16 +4928,12 @@ https://www.transifex.com/projects/p/dash/</translation>
     </message>
     <message>
         <source>Reduce storage requirements by enabling pruning (deleting) of old blocks. This allows the pruneblockchain RPC to be called to delete specific blocks, and enables automatic pruning of old blocks if a target size in MiB is provided. This mode is incompatible with -txindex and -rescan. Warning: Reverting this setting requires re-downloading the entire blockchain. (default: 0 = disable pruning blocks, 1 = allow manual pruning via RPC, &gt;%u = automatically prune block files to stay under the specified target size in MiB)</source>
-        <translation>Obmedziť nároky na úložný priestor prerezáváním (mazaním) starých blokov. Táto volba tiež umožní použiť RPC volanie pruneblockchain na zmazanie konkrétnych blokov a ďalej automatické prerezávanie starých blokov, ak je zadána cieľová velikosť súborov z blokmi v MiB. Tento režim nie je zlúčiteľný s -txindex ani -rescan. Upozornenie: opätovná zmena tohoto nastavenia bude vyžadovať nové stiahnutie celého reťazca blokov. (predvolené: 0 = bloky neprerezávať, 1 = povoliť ručné prerezávanie cez RPC, &gt;%u = automatické prerezávanie blokov tak, aby bola udržaná cieľová velikosť súborov s blokmi v MiB)</translation>
+        <translation>Obmedziť nároky na úložný priestor orezávaním (mazaním) starých blokov. Táto voľba tiež umožní použiť RPC volanie pruneblockchain na zmazanie konkrétnych blokov a ďalej automatické orezávanie starých blokov, ak je zadaná cieľová veľkosť súborov z blokmi v MiB. Tento režim nie je zlúčiteľný s -txindex ani -rescan. Upozornenie: opätovná zmena tohoto nastavenia bude vyžadovať nové stiahnutie celého blockchainu . (predvolené: 0 = bloky neorezávať, 1 = povoliť ručné orezávanie cez RPC, &gt;%u = automatické orezávanie blokov tak, aby bola udržaná cieľová veľkosť súborov s blokmi v MiB)</translation>
     </message>
     <message>
         <source>Set lowest fee rate (in %s/kB) for transactions to be included in block creation. (default: %s)</source>
         <translation>Nastaviť nejnižší akceptovateľný poplatok (v %s/kB) pre transakcie, ktoré majú byť zahrnutý do nových blokov. (predvolené: %s)</translation>
     </message>
-    <message>
-        <source>Show N confirmations for a successfully locked transaction (%u-%u, default: %u)</source>
-        <translation>Zobraziť N potvrdení pre úspešne uzamknuté transakcie (%u-%u, predvolené: %u)</translation>
-    </message>
     <message>
         <source>This is the transaction fee you may pay when fee estimates are not available.</source>
         <translation>Toto je poplatok za transakciu keď odhad poplatkov ešte nie je k dispozícii.</translation>
diff --git a/src/qt/locale/dash_th.ts b/src/qt/locale/dash_th.ts
new file mode 100644
index 000000000000..9cf7194e319d
--- /dev/null
+++ b/src/qt/locale/dash_th.ts
@@ -0,0 +1,5329 @@
+<TS language="th" version="2.1">
+<context>
+    <name>AddressBookPage</name>
+    <message>
+        <source>Right-click to edit address or label</source>
+        <translation>คลิกขวาเพื่อแก้ไขที่อยู่ หรือป้ายชื่อ</translation>
+    </message>
+    <message>
+        <source>Create a new address</source>
+        <translation>สร้างที่อยู่ใหม่</translation>
+    </message>
+    <message>
+        <source>&amp;New</source>
+        <translation>&amp;สร้างใหม่</translation>
+    </message>
+    <message>
+        <source>Copy the currently selected address to the system clipboard</source>
+        <translation>คัดลอกที่อยู่ที่ถูกเลือกไปยัง คลิปบอร์ดของระบบ</translation>
+    </message>
+    <message>
+        <source>&amp;Copy</source>
+        <translation>&amp;คัดลอก</translation>
+    </message>
+    <message>
+        <source>Delete the currently selected address from the list</source>
+        <translation>ลบที่อยู่ที่เลือกไว้ในขณะนี้จากรายการ</translation>
+    </message>
+    <message>
+        <source>&amp;Delete</source>
+        <translation>&amp;ลบ</translation>
+    </message>
+    <message>
+        <source>Export the data in the current tab to a file</source>
+        <translation>ส่งออกข้อมูลที่อยู่ในแท็บไปที่ไฟล์</translation>
+    </message>
+    <message>
+        <source>&amp;Export</source>
+        <translation>&amp;ส่งออก</translation>
+    </message>
+    <message>
+        <source>C&amp;lose</source>
+        <translation>&amp;ปิด</translation>
+    </message>
+    <message>
+        <source>Choose the address to send coins to</source>
+        <translation>เลือกที่อยู่เพื่อส่งเหรียญไปไว้</translation>
+    </message>
+    <message>
+        <source>Choose the address to receive coins with</source>
+        <translation>เลือกที่อยู่เพื่อส่งเหรียญไปไว้</translation>
+    </message>
+    <message>
+        <source>C&amp;hoose</source>
+        <translation>เลือก</translation>
+    </message>
+    <message>
+        <source>Sending addresses</source>
+        <translation>ส่งที่อยู่</translation>
+    </message>
+    <message>
+        <source>Receiving addresses</source>
+        <translation>ที่อยู่ผู้รับ</translation>
+    </message>
+    <message>
+        <source>These are your Dash addresses for sending payments. Always check the amount and the receiving address before sending coins.</source>
+        <translation>นี่คือที่อยู่ Dash ของคุณสำหรับการส่งการชำระเงิน โปรดตรวจสอบจำนวนเงินและที่อยู่ผู้รับก่อนที่จะส่งเหรียญ</translation>
+    </message>
+    <message>
+        <source>These are your Dash addresses for receiving payments. It is recommended to use a new receiving address for each transaction.</source>
+        <translation>นี่เป็นที่อยู่ Dash ของคุณสำหรับการรับการชำระเงิน แนะนำให้ใช้ที่อยู่รับใหม่สำหรับแต่ละธุรกรรม</translation>
+    </message>
+    <message>
+        <source>&amp;Copy Address</source>
+        <translation>คัดลอกที่อยู่</translation>
+    </message>
+    <message>
+        <source>Copy &amp;Label</source>
+        <translation>คัดลอกป้ายชื่อ</translation>
+    </message>
+    <message>
+        <source>&amp;Edit</source>
+        <translation>แก้ไข</translation>
+    </message>
+    <message>
+        <source>Export Address List</source>
+        <translation>ส่งออกรายการที่อยู่</translation>
+    </message>
+    <message>
+        <source>Comma separated file (*.csv)</source>
+        <translation>Comma separated file (*.csv)</translation>
+    </message>
+    <message>
+        <source>Exporting Failed</source>
+        <translation>การส่งออกล้มเหลว</translation>
+    </message>
+    <message>
+        <source>There was an error trying to save the address list to %1. Please try again.</source>
+        <translation>เกิดข้อผิดพลาดขณะพยายามบันทึกรายการที่อยู่ไปยัง %1  กรุณาลองอีกครั้ง</translation>
+    </message>
+</context>
+<context>
+    <name>AddressTableModel</name>
+    <message>
+        <source>Label</source>
+        <translation>ชื่อ</translation>
+    </message>
+    <message>
+        <source>Address</source>
+        <translation>ที่อยู่</translation>
+    </message>
+    <message>
+        <source>(no label)</source>
+        <translation>(ไม่มีชื่อ)</translation>
+    </message>
+</context>
+<context>
+    <name>AskPassphraseDialog</name>
+    <message>
+        <source>Passphrase Dialog</source>
+        <translation>ช่องสำหรับ รหัสผ่าน</translation>
+    </message>
+    <message>
+        <source>Enter passphrase</source>
+        <translation>ใส่รหัสผ่าน</translation>
+    </message>
+    <message>
+        <source>New passphrase</source>
+        <translation>รหัสผา่นใหม่</translation>
+    </message>
+    <message>
+        <source>Repeat new passphrase</source>
+        <translation>กรุณากรอกรหัสผ่านใหม่อีกครั้งหนึ่ง</translation>
+    </message>
+    <message>
+        <source>Enter the new passphrase to the wallet.&lt;br/&gt;Please use a passphrase of &lt;b&gt;ten or more random characters&lt;/b&gt;, or &lt;b&gt;eight or more words&lt;/b&gt;.</source>
+        <translation>ใส่วลีรหัสผ่านใหม่ลงใน Wallet &lt;br/&gt; โปรดใช้วลีรหัสผ่านที่มี&lt;b&gt;อักขระสุ่ม 10 ตัวขึ้นไป&lt;/b&gt;, หรือ&lt;b&gt;มากกว่าหรือมากกว่า 8 คำ&lt;/b&gt;</translation>
+    </message>
+    <message>
+        <source>Encrypt wallet</source>
+        <translation>กระเป๋าสตางค์ที่เข้ารหัส</translation>
+    </message>
+    <message>
+        <source>This operation needs your wallet passphrase to unlock the wallet.</source>
+        <translation>การดำเนินการนี้ต้องการรหัสวลีของคุณเพื่อปลดล็อค Wallet ของคุณ</translation>
+    </message>
+    <message>
+        <source>Unlock wallet for mixing only</source>
+        <translation>ปลดล็อค Wallet สำหรับการผสมเท่านั้น</translation>
+    </message>
+    <message>
+        <source>Unlock wallet</source>
+        <translation>ปลดล็อค Wallet</translation>
+    </message>
+    <message>
+        <source>This operation needs your wallet passphrase to decrypt the wallet.</source>
+        <translation>การดำเนินการนี้ต้องการรหัสวลีของคุณเพื่อถอดรหัส wallet </translation>
+    </message>
+    <message>
+        <source>Decrypt wallet</source>
+        <translation>ถอดรหัส Wallet</translation>
+    </message>
+    <message>
+        <source>Change passphrase</source>
+        <translation>เปลี่ยนรหัสผ่าน</translation>
+    </message>
+    <message>
+        <source>Enter the old passphrase and new passphrase to the wallet.</source>
+        <translation>ใส่รหัสผ่านเก่าและรหัสวลีใหม่ไปยัง wallet </translation>
+    </message>
+    <message>
+        <source>Confirm wallet encryption</source>
+        <translation>ยืนยันการเข้ารหัสกระเป๋าสตางค์</translation>
+    </message>
+    <message>
+        <source>Warning: If you encrypt your wallet and lose your passphrase, you will &lt;b&gt;LOSE ALL OF YOUR DASH&lt;/b&gt;!</source>
+        <translation>คำเตือน : ถ้าคุณเข้ารหัส Wallet ของคุณแล้วทำรหัสวลีหาย คุณจะ&lt;b&gt;สูญเสีย Dash ของคุณทั้งหมด&lt;/b&gt;!</translation>
+    </message>
+    <message>
+        <source>Are you sure you wish to encrypt your wallet?</source>
+        <translation>คุณแน่ใจหรือไม่ว่าต้องการเข้ารหัสข้อมูล Wallet ของคุณ?</translation>
+    </message>
+    <message>
+        <source>Wallet encrypted</source>
+        <translation>Wallet ถูกเข้ารหัสเรียบร้อยแล้ว</translation>
+    </message>
+    <message>
+        <source>%1 will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your funds from being stolen by malware infecting your computer.</source>
+        <translation>%1 จะปิดตอนนี้เพื่อสิ้นสุดขั้นตอนการเข้ารหัส โปรดทราบว่าการเข้ารหัสข้อมูล Wallet ของคุณไม่สามารถป้องกันเงินจากการถูกโจรกรรมจากคอมพิวเตอร์ของคุณได้อย่างเต็มที่</translation>
+    </message>
+    <message>
+        <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. Previous backups of the unencrypted wallet file contain the same HD seed and still have full access to all your funds just like the new, encrypted wallet.</source>
+        <translation>ข้อมูลสำคัญ: การสำรองข้อมูลใดๆที่คุณได้สำรองจากไฟล์ Wallet จะถูกแทนที่ด้วยไฟล์ Wallet ที่เข้ารหัสที่สร้างใหม่ การสำรองข้อมูลก่อนหน้าของไฟล์ Wallet ที่ไม่ได้เข้ารหัสมี HD Seed เดียวกันและยังคงสามารถเข้าถึงกองทุนของคุณได้อย่างเต็มที่เช่นเดียวกับ Wallet ใหม่ที่มีการเข้ารหัส</translation>
+    </message>
+    <message>
+        <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</source>
+        <translation>ข้อมูลสำคัญ: การสำรองข้อมูลก่อนหน้าใด ๆ ที่คุณทำจากกระเป๋าสตางค์ของคุณควรถูกแทนที่โดยใช้ไฟล์กระเป๋าสตางค์ที่เข้ารหัสลับใหม่ที่สร้างขึ้น เพื่อความปลอดภัยการสำรองข้อมูลก่อนหน้าของไฟล์ Wallet ที่ไม่ได้เข้ารหัสจะใช้งานไม่ได้เมื่อคุณเริ่มใช้ Wallet ที่เข้ารหัสใหม่</translation>
+    </message>
+    <message>
+        <source>Wallet encryption failed</source>
+        <translation>การเข้ารหัสกระเป๋าสตางค์ผิดพลาด</translation>
+    </message>
+    <message>
+        <source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source>
+        <translation>การเข้ารหัส Wallet ล้มเหลวเนื่องจากข้อผิดพลาดภายใน Wallet ของคุณไม่ได้รับการเข้ารหัส</translation>
+    </message>
+    <message>
+        <source>The supplied passphrases do not match.</source>
+        <translation>รหัสผ่านที่คุณกรอกไม่ตรงกัน</translation>
+    </message>
+    <message>
+        <source>Wallet unlock failed</source>
+        <translation>ปลดล็อค Wallet ล้มเหลว</translation>
+    </message>
+    <message>
+        <source>The passphrase entered for the wallet decryption was incorrect.</source>
+        <translation>รหัสผ่านวลีสำหรับเข้าถึง Wallet ไม่ถูกต้อง </translation>
+    </message>
+    <message>
+        <source>Wallet decryption failed</source>
+        <translation>การเข้าถึง Wallet ล้มเหลว</translation>
+    </message>
+    <message>
+        <source>Wallet passphrase was successfully changed.</source>
+        <translation>เปลี่ยนรหัสผ่านวลีเรียบร้อยแล้ว</translation>
+    </message>
+    <message>
+        <source>Warning: The Caps Lock key is on!</source>
+        <translation>คำเตือน: ปุ่ม Caps Lock เปิดอยู่</translation>
+    </message>
+</context>
+<context>
+    <name>BanTableModel</name>
+    <message>
+        <source>IP/Netmask</source>
+        <translation>IP/Netmask (ตัวกรอง IP)</translation>
+    </message>
+    <message>
+        <source>Banned Until</source>
+        <translation>ห้ามใช้จนกว่า</translation>
+    </message>
+</context>
+<context>
+    <name>BitcoinGUI</name>
+    <message>
+        <source>A fatal error occurred. Dash Core can no longer continue safely and will quit.</source>
+        <translation>เกิดข้อผิดพลาดร้ายแรงขึ้น Dash Core ไม่สามารถดำเนินการต่อได้อย่างปลอดภัยและจะออกจากระบบ</translation>
+    </message>
+    <message>
+        <source>Dash Core</source>
+        <translation>Dash Core</translation>
+    </message>
+    <message>
+        <source>Wallet</source>
+        <translation>Wallet </translation>
+    </message>
+    <message>
+        <source>Node</source>
+        <translation>Node/โหนด</translation>
+    </message>
+    <message>
+        <source>&amp;Overview</source>
+        <translation>&amp;ภาพรวม</translation>
+    </message>
+    <message>
+        <source>Show general overview of wallet</source>
+        <translation>แสดงภาพรวมทั่วไปของกระเป๋าเงิน</translation>
+    </message>
+    <message>
+        <source>&amp;Send</source>
+        <translation>&amp;ส่ง</translation>
+    </message>
+    <message>
+        <source>Send coins to a Dash address</source>
+        <translation>ส่ง เหรียญ ไปยัง ที่อยู่ Dash</translation>
+    </message>
+    <message>
+        <source>&amp;Receive</source>
+        <translation>&amp;รับ</translation>
+    </message>
+    <message>
+        <source>Request payments (generates QR codes and dash: URIs)</source>
+        <translation>เรียกเก็บ การชำระเงิน (สร้าง QR codes และ Dash: URIs)</translation>
+    </message>
+    <message>
+        <source>&amp;Transactions</source>
+        <translation>การทำธุรกรรม</translation>
+    </message>
+    <message>
+        <source>Browse transaction history</source>
+        <translation>เรียกดูประวัติการทำธุรกรรม</translation>
+    </message>
+    <message>
+        <source>&amp;Masternodes</source>
+        <translation>Masternodes</translation>
+    </message>
+    <message>
+        <source>Browse masternodes</source>
+        <translation>Browse masternodes</translation>
+    </message>
+    <message>
+        <source>E&amp;xit</source>
+        <translation>&amp;ออก</translation>
+    </message>
+    <message>
+        <source>Quit application</source>
+        <translation>ออกจากโปรแกรม</translation>
+    </message>
+    <message>
+        <source>Show information about Dash Core</source>
+        <translation>แสดงข้อมูลเกี่ยวกับ Dash Core</translation>
+    </message>
+    <message>
+        <source>About &amp;Qt</source>
+        <translation>เกี่ยวกับ &amp;Qt</translation>
+    </message>
+    <message>
+        <source>Show information about Qt</source>
+        <translation>แสดงข้อมูล เกี่ยวกับ Qt</translation>
+    </message>
+    <message>
+        <source>&amp;Options...</source>
+        <translation>&amp;ตัวเลือก...</translation>
+    </message>
+    <message>
+        <source>&amp;About %1</source>
+        <translation>&amp;เกี่ยวกับ %1</translation>
+    </message>
+    <message>
+        <source>Modify configuration options for %1</source>
+        <translation>ปรับปรุง ข้อมูลการตั้งค่าตัวเลือก สำหรับ %1</translation>
+    </message>
+    <message>
+        <source>&amp;Show / Hide</source>
+        <translation>&amp;แสดง / ซ่อน</translation>
+    </message>
+    <message>
+        <source>Show or hide the main Window</source>
+        <translation>แสดง หรือ ซ่อน หน้าหลัก</translation>
+    </message>
+    <message>
+        <source>&amp;Encrypt Wallet...</source>
+        <translation>เข้ารหัส  Wallet </translation>
+    </message>
+    <message>
+        <source>Encrypt the private keys that belong to your wallet</source>
+        <translation>เข้ารหัส private keys สำหรับ Wallet ของท่าน</translation>
+    </message>
+    <message>
+        <source>&amp;Backup Wallet...</source>
+        <translation>&amp;สำรอง Wallet ...</translation>
+    </message>
+    <message>
+        <source>Backup wallet to another location</source>
+        <translation>สำรอง กระเป๋าเงินไปยัง ที่เก็บอื่น</translation>
+    </message>
+    <message>
+        <source>&amp;Change Passphrase...</source>
+        <translation>&amp;เปลี่ยนรหัสผ่าน...</translation>
+    </message>
+    <message>
+        <source>Change the passphrase used for wallet encryption</source>
+        <translation>เปลี่ยนรหัสผ่านที่ใช้สำหรับการเข้ารหัสกระเป๋าเงิน</translation>
+    </message>
+    <message>
+        <source>&amp;Unlock Wallet...</source>
+        <translation>ปลดล็อค Wallet</translation>
+    </message>
+    <message>
+        <source>Unlock wallet</source>
+        <translation>ปลดล็อค Wallet </translation>
+    </message>
+    <message>
+        <source>&amp;Lock Wallet</source>
+        <translation>ล็อค Wallet</translation>
+    </message>
+    <message>
+        <source>Sign &amp;message...</source>
+        <translation>เซ็นต์ชื่อด้วย &amp;ข้อความ...</translation>
+    </message>
+    <message>
+        <source>Sign messages with your Dash addresses to prove you own them</source>
+        <translation>เซ็นชื่อด้วยข้อความ ที่เก็บ Dash เพื่อแสดงว่าท่านเป็นเจ้าของ Dash นี้จริง</translation>
+    </message>
+    <message>
+        <source>&amp;Verify message...</source>
+        <translation>&amp;ยืนยันข้อความ...</translation>
+    </message>
+    <message>
+        <source>Verify messages to ensure they were signed with specified Dash addresses</source>
+        <translation>ตรวจสอบ ข้อความ เพื่อให้แน่ใจว่า การเซ็นต์ชื่อ ด้วยที่เก็บ Dash แล้ว</translation>
+    </message>
+    <message>
+        <source>&amp;Information</source>
+        <translation>ข้อมูล</translation>
+    </message>
+    <message>
+        <source>Show diagnostic information</source>
+        <translation>แสดงข้อมูลการวินิจฉัย</translation>
+    </message>
+    <message>
+        <source>&amp;Debug console</source>
+        <translation>คอนโซลการแก้ไขจุดบกพร่อง</translation>
+    </message>
+    <message>
+        <source>Open debugging console</source>
+        <translation>เปิดคอนโซลการแก้ไขจุดบกพร่อง</translation>
+    </message>
+    <message>
+        <source>&amp;Network Monitor</source>
+        <translation>ตัวตรวจสอบเครือข่าย</translation>
+    </message>
+    <message>
+        <source>Show network monitor</source>
+        <translation>แสดงตัวตรวจสอบเครือข่าย</translation>
+    </message>
+    <message>
+        <source>&amp;Peers list</source>
+        <translation>รายชื่อ Peers</translation>
+    </message>
+    <message>
+        <source>Show peers info</source>
+        <translation>แสดงข้อมูล Peers</translation>
+    </message>
+    <message>
+        <source>Wallet &amp;Repair</source>
+        <translation>ซ่อมแซม Wallet</translation>
+    </message>
+    <message>
+        <source>Show wallet repair options</source>
+        <translation>แสดงตัวเลือกการซ่อมแซม Wallet </translation>
+    </message>
+    <message>
+        <source>Open Wallet &amp;Configuration File</source>
+        <translation>เปิดไฟล์การกำหนดค่า Wallet </translation>
+    </message>
+    <message>
+        <source>Open configuration file</source>
+        <translation>เปิดไฟล์การกำหนดค่า</translation>
+    </message>
+    <message>
+        <source>Open &amp;Masternode Configuration File</source>
+        <translation>เปิดไฟล์การกำหนดค่า Masternode</translation>
+    </message>
+    <message>
+        <source>Open Masternode configuration file</source>
+        <translation>เปิดไฟล์การกำหนดค่า Masternode</translation>
+    </message>
+    <message>
+        <source>Show Automatic &amp;Backups</source>
+        <translation>แสดงการสำรองข้อมูลอัตโนมัติ</translation>
+    </message>
+    <message>
+        <source>Show automatically created wallet backups</source>
+        <translation>แสดงการสำรองข้อมูล Wallet ที่สร้างขึ้นโดยอัตโนมัติ</translation>
+    </message>
+    <message>
+        <source>&amp;Sending addresses...</source>
+        <translation>&amp;ที่เก็บเงิน ที่จะส่ง bitcoin</translation>
+    </message>
+    <message>
+        <source>Show the list of used sending addresses and labels</source>
+        <translation>แสดงรายการ ที่เก็บเงินที่จะส่ง bitcoin ออก และป้ายชื่อ ที่ใช้ไปแล้ว</translation>
+    </message>
+    <message>
+        <source>&amp;Receiving addresses...</source>
+        <translation>ที่อยู่ผู้รับ</translation>
+    </message>
+    <message>
+        <source>Show the list of used receiving addresses and labels</source>
+        <translation>แสดงรายการที่อยู่ผู้รับและป้ายชื่อที่ใช้ไปแล้ว</translation>
+    </message>
+    <message>
+        <source>Open &amp;URI...</source>
+        <translation>เปิด URI</translation>
+    </message>
+    <message>
+        <source>Open a dash: URI or payment request</source>
+        <translation>เปิด Dash: URI หรือคำขอการชำระเงิน</translation>
+    </message>
+    <message>
+        <source>&amp;Command-line options</source>
+        <translation>ตัวเลือก Command-line</translation>
+    </message>
+    <message>
+        <source>Show the %1 help message to get a list with possible Dash command-line options</source>
+        <translation>แสดง %1 ข้อความช่วยเหลือ เพื่อแสดงรายการ ตัวเลือกที่เป็นไปได้สำหรับ Dash command-line</translation>
+    </message>
+    <message>
+        <source>%1 client</source>
+        <translation>%1 ไคลเอนต์</translation>
+    </message>
+    <message>
+        <source>&amp;PrivateSend information</source>
+        <translation>ข้อมูล PrivateSend</translation>
+    </message>
+    <message>
+        <source>Show the PrivateSend basic information</source>
+        <translation>แสดงข้อมูลพื้นฐานของ PrivateSend</translation>
+    </message>
+    <message>
+        <source>&amp;File</source>
+        <translation>ไฟล์</translation>
+    </message>
+    <message>
+        <source>&amp;Settings</source>
+        <translation>การตั้งค่า</translation>
+    </message>
+    <message>
+        <source>&amp;Tools</source>
+        <translation>เครื่องมือ</translation>
+    </message>
+    <message>
+        <source>&amp;Help</source>
+        <translation>ช่วยเหลือ</translation>
+    </message>
+    <message>
+        <source>Tabs toolbar</source>
+        <translation>แถบเครื่องมือ</translation>
+    </message>
+    <message numerus="yes">
+        <source>%n active connection(s) to Dash network</source>
+        <translation><numerusform>%n เชื่อมต่อใช้งานกับเครือข่าย Dash</numerusform></translation>
+    </message>
+    <message>
+        <source>Network activity disabled</source>
+        <translation>ปิดการใช้งานเครือข่ายแล้ว</translation>
+    </message>
+    <message>
+        <source>Syncing Headers (%1%)...</source>
+        <translation>กำลังซิงค์ส่วนหัว (%1%) ...</translation>
+    </message>
+    <message>
+        <source>Synchronizing with network...</source>
+        <translation>กำลังซิงค์กับเครือข่าย ...</translation>
+    </message>
+    <message>
+        <source>Indexing blocks on disk...</source>
+        <translation>การกำลังสร้างดัชนีของบล็อก ในดิสก์...</translation>
+    </message>
+    <message>
+        <source>Processing blocks on disk...</source>
+        <translation>กำลังดำเนินการกับบล็อกในดิสก์...</translation>
+    </message>
+    <message>
+        <source>Reindexing blocks on disk...</source>
+        <translation>กำลังทำดัชนี ที่เก็บบล็อก ใหม่ ในดิสก์...</translation>
+    </message>
+    <message>
+        <source>Connecting to peers...</source>
+        <translation>เชื่อมต่อกับ Peers</translation>
+    </message>
+    <message numerus="yes">
+        <source>Processed %n block(s) of transaction history.</source>
+        <translation><numerusform>ประมวลผล %n บล็อคของประวัติการทำธุรกรรม</numerusform></translation>
+    </message>
+    <message>
+        <source>%1 behind</source>
+        <translation>%1 ตามหลัง</translation>
+    </message>
+    <message>
+        <source>Catching up...</source>
+        <translation>กำลังอัพเดต</translation>
+    </message>
+    <message>
+        <source>Last received block was generated %1 ago.</source>
+        <translation>บล็อกสุดท้ายที่ได้รับ สร้างขึ้นเมื่อ %1 มาแล้ว</translation>
+    </message>
+    <message>
+        <source>Transactions after this will not yet be visible.</source>
+        <translation>รายการหลังจากนี้ จะไม่แสดงให้เห็น</translation>
+    </message>
+    <message>
+        <source>Up to date</source>
+        <translation>ปัจจุบัน</translation>
+    </message>
+    <message>
+        <source>Synchronizing additional data: %p%</source>
+        <translation>กำลังซิงค์ข้อมูลเพิ่มเติม: %p%</translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation>ข้อผิดพลาด</translation>
+    </message>
+    <message>
+        <source>Warning</source>
+        <translation>คำเตือน</translation>
+    </message>
+    <message>
+        <source>Information</source>
+        <translation>ข้อมูล</translation>
+    </message>
+    <message>
+        <source>Date: %1
+</source>
+        <translation>วันที่: %1
+</translation>
+    </message>
+    <message>
+        <source>Amount: %1
+</source>
+        <translation>จำนวน: %1
+</translation>
+    </message>
+    <message>
+        <source>Type: %1
+</source>
+        <translation>รูปแบบ: %1
+</translation>
+    </message>
+    <message>
+        <source>Label: %1
+</source>
+        <translation>ป้ายชื่อ: %1
+</translation>
+    </message>
+    <message>
+        <source>Address: %1
+</source>
+        <translation>ที่อยู่: %1
+</translation>
+    </message>
+    <message>
+        <source>Sent transaction</source>
+        <translation>รายการที่ส่ง</translation>
+    </message>
+    <message>
+        <source>Incoming transaction</source>
+        <translation>การทำรายการขาเข้า</translation>
+    </message>
+    <message>
+        <source>HD key generation is &lt;b&gt;enabled&lt;/b&gt;</source>
+        <translation>&lt;b&gt;เปิดใช้งาน&lt;/b&gt;การสร้างคีย์ HD แล้ว</translation>
+    </message>
+    <message>
+        <source>HD key generation is &lt;b&gt;disabled&lt;/b&gt;</source>
+        <translation>การสร้างคีย์ HD ถูก&lt;b&gt;ปิดใช้งาน&lt;/b&gt;</translation>
+    </message>
+    <message>
+        <source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;unlocked&lt;/b&gt;</source>
+        <translation>ระเป๋าเงินถูก &lt;b&gt;เข้ารหัส&lt;/b&gt; และในขณะนี้ &lt;b&gt;ปลดล็อคแล้ว&lt;/b&gt;</translation>
+    </message>
+    <message>
+        <source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;unlocked&lt;/b&gt; for mixing only</source>
+        <translation>Wallet &lt;b&gt;เข้ารหัสแล้ว&lt;/b&gt;และขณะนี้&lt;b&gt;ปลดล็อก&lt;/b&gt;สำหรับการผสมเท่านั้น</translation>
+    </message>
+    <message>
+        <source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;locked&lt;/b&gt;</source>
+        <translation>กระเป๋าเงินถูก &lt;b&gt;เข้ารหัส&lt;/b&gt; และในปัจจุบัน &lt;b&gt;ล็อค &lt;/b&gt;</translation>
+    </message>
+</context>
+<context>
+    <name>ClientModel</name>
+    <message>
+        <source>Total: %1 (PS compatible: %2 / Enabled: %3)</source>
+        <translation>ทั้งหมด: %1 (รองรับ PS: %2 / เปิดใช้งาน: %3)</translation>
+    </message>
+    <message>
+        <source>Network Alert</source>
+        <translation>การแจ้งเตือนเครือข่าย</translation>
+    </message>
+</context>
+<context>
+    <name>CoinControlDialog</name>
+    <message>
+        <source>Quantity:</source>
+        <translation>จำนวน:</translation>
+    </message>
+    <message>
+        <source>Bytes:</source>
+        <translation>ไบต์:</translation>
+    </message>
+    <message>
+        <source>Amount:</source>
+        <translation>จำนวน:</translation>
+    </message>
+    <message>
+        <source>Fee:</source>
+        <translation>ค่าธรรมเนียม:</translation>
+    </message>
+    <message>
+        <source>Coin Selection</source>
+        <translation>การเลือก Coin</translation>
+    </message>
+    <message>
+        <source>Dust:</source>
+        <translation>เศษ:</translation>
+    </message>
+    <message>
+        <source>After Fee:</source>
+        <translation>ส่วนที่เหลือจากค่าธรรมเนียม:</translation>
+    </message>
+    <message>
+        <source>Change:</source>
+        <translation>เงินทอน:</translation>
+    </message>
+    <message>
+        <source>(un)select all</source>
+        <translation>(ไม่)เลือกทั้งหมด</translation>
+    </message>
+    <message>
+        <source>toggle lock state</source>
+        <translation>สลับสถานะล็อค</translation>
+    </message>
+    <message>
+        <source>Tree mode</source>
+        <translation>โหมดแบบต้นไม้</translation>
+    </message>
+    <message>
+        <source>List mode</source>
+        <translation>โหมดแบบรายการ</translation>
+    </message>
+    <message>
+        <source>(1 locked)</source>
+        <translation>(1 ล็อค)</translation>
+    </message>
+    <message>
+        <source>Amount</source>
+        <translation>จำนวน</translation>
+    </message>
+    <message>
+        <source>Received with label</source>
+        <translation>รับโดยป้ายชื่อ (label)</translation>
+    </message>
+    <message>
+        <source>Received with address</source>
+        <translation>รับโดยที่เก็บ</translation>
+    </message>
+    <message>
+        <source>PS Rounds</source>
+        <translation>PS รอบ</translation>
+    </message>
+    <message>
+        <source>Date</source>
+        <translation>วันที่</translation>
+    </message>
+    <message>
+        <source>Confirmations</source>
+        <translation>การยืนยัน</translation>
+    </message>
+    <message>
+        <source>Confirmed</source>
+        <translation>ยืนยันแล้ว</translation>
+    </message>
+    <message>
+        <source>Copy address</source>
+        <translation>คัดลอกที่อยู่</translation>
+    </message>
+    <message>
+        <source>Copy label</source>
+        <translation>คัดลอกป้ายชื่อ</translation>
+    </message>
+    <message>
+        <source>Copy amount</source>
+        <translation>คัดลอกจำนวน</translation>
+    </message>
+    <message>
+        <source>Copy transaction ID</source>
+        <translation>คัดลอก ID ธุรกรรม</translation>
+    </message>
+    <message>
+        <source>Lock unspent</source>
+        <translation>Lock unspent</translation>
+    </message>
+    <message>
+        <source>Unlock unspent</source>
+        <translation>Unlock unspent</translation>
+    </message>
+    <message>
+        <source>Copy quantity</source>
+        <translation>ปริมาณการคัดลอก</translation>
+    </message>
+    <message>
+        <source>Copy fee</source>
+        <translation>ค่าธรรมเนียมการคัดลอก</translation>
+    </message>
+    <message>
+        <source>Copy after fee</source>
+        <translation>ค่าธรรมเนียมหลังการคัดลอก</translation>
+    </message>
+    <message>
+        <source>Copy bytes</source>
+        <translation>คัดลอกไบต์</translation>
+    </message>
+    <message>
+        <source>Copy dust</source>
+        <translation>คัดลอก dust </translation>
+    </message>
+    <message>
+        <source>Copy change</source>
+        <translation>คัดลอกการเปลี่ยนแปลง</translation>
+    </message>
+    <message>
+        <source>Please switch to "List mode" to use this function.</source>
+        <translation>โปรดเปลี่ยนเป็น List mode เพื่อใช้ฟังก์ชั่นนี้</translation>
+    </message>
+    <message>
+        <source>Non-anonymized input selected. &lt;b&gt;PrivateSend will be disabled.&lt;/b&gt;&lt;br&gt;&lt;br&gt;If you still want to use PrivateSend, please deselect all non-anonymized inputs first and then check the PrivateSend checkbox again.</source>
+        <translation>อินพุตแบบไม่ระบุตัวตนอินที่ถูกเลือก &lt;b&gt; PrivateSend จะถูกปิดการใช้งาน &lt;/b&gt;&lt;br&gt;&lt;br&gt; หากคุณยังต้องการใช้ PrivateSend โปรดยกเลิกการเลือกอินพุตที่ไม่ระบุตัวตนทั้งหมดก่อนแล้วจึงเช็คในช่อง PrivateSend อีกครั้ง</translation>
+    </message>
+    <message>
+        <source>(%1 locked)</source>
+        <translation>(%1 ล็อค)</translation>
+    </message>
+    <message>
+        <source>yes</source>
+        <translation>ใช่</translation>
+    </message>
+    <message>
+        <source>no</source>
+        <translation>ไม่</translation>
+    </message>
+    <message>
+        <source>This label turns red if any recipient receives an amount smaller than the current dust threshold.</source>
+        <translation>ป้ายนี้จะเปลี่ยนเป็นสีแดงถ้าตัวรับใด ๆ ได้รับจำนวนเงินน้อยกว่าขั้นต่ำในปัจจุบัน</translation>
+    </message>
+    <message>
+        <source>Can vary +/- %1 duff(s) per input.</source>
+        <translation>สามารถเปลี่ยนแปลงได้ + / - %1 duff (s) ต่อรายการ</translation>
+    </message>
+    <message>
+        <source>(no label)</source>
+        <translation>(ไม่มีชื่อ)</translation>
+    </message>
+    <message>
+        <source>change from %1 (%2)</source>
+        <translation>เปลี่ยนจาก %1 (%2)</translation>
+    </message>
+    <message>
+        <source>(change)</source>
+        <translation>(เปลี่ยน)</translation>
+    </message>
+    <message>
+        <source>n/a</source>
+        <translation>n/a</translation>
+    </message>
+</context>
+<context>
+    <name>EditAddressDialog</name>
+    <message>
+        <source>Edit Address</source>
+        <translation>แก้ไขที่อยู่</translation>
+    </message>
+    <message>
+        <source>&amp;Label</source>
+        <translation>&amp;ป้ายชื่อ</translation>
+    </message>
+    <message>
+        <source>The label associated with this address list entry</source>
+        <translation>รายการแสดง ป้ายชื่อที่เกี่ยวข้องกับที่เก็บนี้</translation>
+    </message>
+    <message>
+        <source>&amp;Address</source>
+        <translation>&amp;ที่เก็บ</translation>
+    </message>
+    <message>
+        <source>The address associated with this address list entry. This can only be modified for sending addresses.</source>
+        <translation>ที่เก็บที่เกี่ยวข้องกับ ที่เก็บที่แสดงรายการนี้ การปรับปรุงนี้ทำได้สำหรับ ที่เก็บเงินที่จะใช่ส่งเงิน เท่านั้น</translation>
+    </message>
+    <message>
+        <source>New receiving address</source>
+        <translation>ที่อยู่ผู้รับใหม่</translation>
+    </message>
+    <message>
+        <source>New sending address</source>
+        <translation>ที่อยู่ผู้ส่งใหม่</translation>
+    </message>
+    <message>
+        <source>Edit receiving address</source>
+        <translation>แก้ไขที่อยู่ผู้รับ</translation>
+    </message>
+    <message>
+        <source>Edit sending address</source>
+        <translation>แก้ไขที่อยู่ผู้ส่ง</translation>
+    </message>
+    <message>
+        <source>The entered address "%1" is not a valid Dash address.</source>
+        <translation>ที่อยู่ที่ป้อน "%1" ไม่ใช่ที่อยู่ Dash ที่ถูกต้อง</translation>
+    </message>
+    <message>
+        <source>The entered address "%1" is already in the address book.</source>
+        <translation>ที่อยู่ที่ป้อน "%1" อยู่ในสมุดที่อยู่แล้ว</translation>
+    </message>
+    <message>
+        <source>Could not unlock wallet.</source>
+        <translation>ไม่สามารถปลดล็อค Wallet  ได้</translation>
+    </message>
+    <message>
+        <source>New key generation failed.</source>
+        <translation>สร้างคีย์ใหม่ไม่สำเร็จ</translation>
+    </message>
+</context>
+<context>
+    <name>FreespaceChecker</name>
+    <message>
+        <source>A new data directory will be created.</source>
+        <translation>ไดเร็กทอรี่ใหม่ที่ใช้เก็บข้อมูลจะถูกสร้างขึ้นมา</translation>
+    </message>
+    <message>
+        <source>name</source>
+        <translation>ชื่อ</translation>
+    </message>
+    <message>
+        <source>Directory already exists. Add %1 if you intend to create a new directory here.</source>
+        <translation>ไดเร็กทอรี่มีอยู่แล้ว ใส่เพิ่ม %1 หากท่านต้องการสร้างไดเร็กทอรี่ใหม่ที่นี่</translation>
+    </message>
+    <message>
+        <source>Path already exists, and is not a directory.</source>
+        <translation>พาธ มีอยู่แล้ว พาธนี่ไม่ใช่ไดเร็กทอรี่</translation>
+    </message>
+    <message>
+        <source>Cannot create data directory here.</source>
+        <translation>ไม่สามารถสร้างไดเร็กทอรี่ข้อมูลที่นี่</translation>
+    </message>
+</context>
+<context>
+    <name>HelpMessageDialog</name>
+    <message>
+        <source>version</source>
+        <translation>เวอร์ชั่น</translation>
+    </message>
+    <message>
+        <source>(%1-bit)</source>
+        <translation>(%1-บิท)</translation>
+    </message>
+    <message>
+        <source>About %1</source>
+        <translation>เกี่ยวกับ %1</translation>
+    </message>
+    <message>
+        <source>Command-line options</source>
+        <translation>ตัวเลือก Command-line</translation>
+    </message>
+    <message>
+        <source>Usage:</source>
+        <translation>วิธีใช้งาน:</translation>
+    </message>
+    <message>
+        <source>command-line options</source>
+        <translation>ตัวเลือก Command-line</translation>
+    </message>
+    <message>
+        <source>UI Options:</source>
+        <translation>ตัวเลือก UI:</translation>
+    </message>
+    <message>
+        <source>Choose data directory on startup (default: %u)</source>
+        <translation>เลือกไดเร็กทอรี่ข้อมูลตั้งแต่เริ่มต้นสตาร์ทอัพ (ค่าเริ่มต้น: %u)</translation>
+    </message>
+    <message>
+        <source>Set language, for example "de_DE" (default: system locale)</source>
+        <translation>ตั้งค่าภาษา ยกตัวอย่าง "de_DE" (ค่าเริ่มต้น: ภาษาท้องถิ่นของระบบ)</translation>
+    </message>
+    <message>
+        <source>Start minimized</source>
+        <translation>เริ่มต้นมินิไมซ์</translation>
+    </message>
+    <message>
+        <source>Set SSL root certificates for payment request (default: -system-)</source>
+        <translation>ตั้งค่า SSL root certificates สำหรับเรียกการชำระเงิน (ค่าเริ่มต้น: -system-)</translation>
+    </message>
+    <message>
+        <source>Show splash screen on startup (default: %u)</source>
+        <translation>แสดง splash screen ตอนเริ่มต้น (ค่าเริ่มต้น: %u)</translation>
+    </message>
+    <message>
+        <source>Reset all settings changed in the GUI</source>
+        <translation>รีเซตการเปลี่ยนการตั้งค่าทั้งหมดใน GUI</translation>
+    </message>
+    <message>
+        <source>PrivateSend information</source>
+        <translation>ข้อมูล PrivateSend</translation>
+    </message>
+    <message>
+        <source>&lt;h3&gt;PrivateSend Basics&lt;/h3&gt; PrivateSend gives you true financial privacy by obscuring the origins of your funds. All the Dash in your wallet is comprised of different "inputs" which you can think of as separate, discrete coins.&lt;br&gt; PrivateSend uses an innovative process to mix your inputs with the inputs of two other people, without having your coins ever leave your wallet. You retain control of your money at all times.&lt;hr&gt; &lt;b&gt;The PrivateSend process works like this:&lt;/b&gt;&lt;ol type="1"&gt; &lt;li&gt;PrivateSend begins by breaking your transaction inputs down into standard denominations. These denominations are 0.01 DASH, 0.1 DASH, 1 DASH and 10 DASH -- sort of like the paper money you use every day.&lt;/li&gt; &lt;li&gt;Your wallet then sends requests to specially configured software nodes on the network, called "masternodes." These masternodes are informed then that you are interested in mixing a certain denomination. No identifiable information is sent to the masternodes, so they never know "who" you are.&lt;/li&gt; &lt;li&gt;When two other people send similar messages, indicating that they wish to mix the same denomination, a mixing session begins. The masternode mixes up the inputs and instructs all three users' wallets to pay the now-transformed input back to themselves. Your wallet pays that denomination directly to itself, but in a different address (called a change address).&lt;/li&gt; &lt;li&gt;In order to fully obscure your funds, your wallet must repeat this process a number of times with each denomination. Each time the process is completed, it's called a "round." Each round of PrivateSend makes it exponentially more difficult to determine where your funds originated.&lt;/li&gt; &lt;li&gt;This mixing process happens in the background without any intervention on your part. When you wish to make a transaction, your funds will already be anonymized. No additional waiting is required.&lt;/li&gt; &lt;/ol&gt; &lt;hr&gt;&lt;b&gt;IMPORTANT:&lt;/b&gt; Your wallet only contains 1000 of these "change addresses." Every time a mixing event happens, up to 9 of your addresses are used up. This means those 1000 addresses last for about 100 mixing events. When 900 of them are used, your wallet must create more addresses. It can only do this, however, if you have automatic backups enabled.&lt;br&gt; Consequently, users who have backups disabled will also have PrivateSend disabled. &lt;hr&gt;For more information, see the &lt;a href="https://docs.dash.org/en/latest/wallets/dashcore/privatesend-instantsend.html"&gt;PrivateSend documentation&lt;/a&gt;.         </source>
+        <translation>&lt;h3&gt;ข้อมูลพื้นฐานเกี่ยวกับ PrivateSend PrivateSend ช่วยให้คุณมีความเป็นส่วนตัวทางการเงินอย่างแท้จริงโดยปิดบังแหล่งที่มาของเงินทุนของคุณ  Dash ทั้งหมดใน wallet ของคุณประกอบด้วย "อินพุต" ที่แตกต่างกันซึ่งคุณสามารถแยกเหรียญกันได้ &lt;br&gt;  PrivateSend ใช้กระบวนการใหม่ในการผสมผสานอินพุตของคุณเข้ากับอินพุตของคนอื่นอีกสองคนโดยไม่ต้องมีเหรียญออกจาก wallet  คุณสามารถควบคุมเงินได้ตลอดเวลา&lt;hr&gt;&lt;b&gt;กระบวนการ PrivateSend ทำงานได้ดังนี้:&lt;/b&gt;&lt;ol type="1"&gt;&lt;li&gt;PrivateSend เริ่มต้นด้วยการทำลายอินพุตการทำธุรกรรมของคุณลงไปเป็นหน่วยเงินมาตรฐาน หน่วยเงินเหล่านี้คือ 0.01 DASH, 0.1 DASH, 1 DASH และ 10 DASH - เหมือนกับเงินกระดาษที่คุณใช้ทุกวัน&lt;/li&gt;&lt;li&gt; Wallet ของคุณจะส่งคำขอไปยังโหนดซอฟต์แวร์ที่กำหนดค่าไว้เป็นพิเศษในเครือข่ายที่ เรียกว่า "masternodes"  โดย masternodes เหล่านี้จะแจ้งให้ทราบแล้วว่าคุณสนใจที่จะผสมหน่วยเงินนั้นๆ  ไม่มีข้อมูลที่สามารถระบุตัวได้ถูกส่งไปยัง masternodes ดังนั้นพวกเขาจึงไม่เคยรู้จักว่าคุณเป็นใคร &lt;/li&gt;&lt;li&gt;เมื่อมีคนอีกสองคนส่งข้อความที่คล้ายกันแสดงว่าพวกเขาต้องการที่จะผสมผสานหน่วยเงินเดียวกันเซสชันการผสมจะเริ่มขึ้น  Masternode จะผสมผสานอินพุตเข้าด้วยกันและสั่งให้ wallet ของผู้ใช้ทั้ง 3 รายชำระค่าป้อนข้อมูลที่เปลี่ยนไปแล้วกลับคืนสู่ตัวเอง Wallet ของคุณจ่ายเงินให้กับตัวเองโดยตรง แต่ในที่อยู่อื่น (เรียกว่าที่อยู่เปลี่ยน)&lt;/li&gt;&lt;li&gt;เพื่อเป็นการปิดบังเงินทุนของคุณ   wallet ของคุณจะต้องทำซ้ำขั้นตอนนี้ซ้ำหลายครั้งโดยใช้แต่ละหน่วยเงิน ทุกครั้งที่ดำเนินการเสร็จสิ้นระบบจะเรียกว่า "รอบ ๆ "  รอบ PrivateSend ในแต่ละครั้งทำให้การระบุแหล่งเงินทุนของคุณเกิดขึ้นยากขึ้นอย่างมาก&lt;/li&gt;&lt;li&gt;กระบวนการผสมนี้เกิดขึ้นโดยไม่มีการก้าวก่ายในส่วนของคุณ  เมื่อคุณต้องการทำธุรกรรม เงินของคุณจะถูกซ่อนไว้  ไม่ต้องการเพิ่มเติม &lt;/li&gt;&lt;/ol&gt;&lt;hr&gt;&lt;b&gt;สำคัญ:&lt;/b&gt;Wallet ของคุณมีเพียง 1,000 ที่อยู่ในการเปลี่ยนแปลงเท่านั้น ทุกครั้งที่เกิดเหตุการณ์ผสมเกิดขึ้น 9 ที่อยู่ของคุณจะถูกนำมาใช้  ซึ่งหมายความว่า 1000 ที่อยู่ล่าสุดสำหรับการผสมประมาณ 100 เหตุการณ์ เมื่อมีการใช้ 900 ราย Wallet ของคุณต้องสร้างที่อยู่เพิ่มเติม  สามารถทำเช่นนี้ได้หากคุณเปิดใช้งานการสำรองข้อมูลอัตโนมัติไว้&lt;br&gt;ดังนั้นผู้ใช้ที่มีการสำรองข้อมูลถูกปิดใช้งานจะมีการปิดใช้ PrivateSend &lt;hr&gt;สำหรับข้อมูลเพิ่มเติม&lt;a href="https://docs.dash.org/en/latest/wallets/dashcore/privatesend-instantsend.html"&gt;โปรดดูที่เอกสาร PrivateSend &lt;/a&gt;</translation>
+    </message>
+</context>
+<context>
+    <name>Intro</name>
+    <message>
+        <source>Welcome</source>
+        <translation>ยินดีต้อนรับ</translation>
+    </message>
+    <message>
+        <source>Welcome to %1.</source>
+        <translation>ยินดีต้องรับสู่ %1</translation>
+    </message>
+    <message>
+        <source>As this is the first time the program is launched, you can choose where %1 will store its data.</source>
+        <translation>นี่เป็นการรันโปรแกรมครั้งแรก ท่านสามารถเลือก ว่าจะเก็บข้อมูลไว้ที่ %1</translation>
+    </message>
+    <message>
+        <source>%1 will download and store a copy of the Dash block chain. At least %2GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</source>
+        <translation>%1 จะดาวน์โหลดและเก็บสำเนาของ Dash block chain อย่างน้อย %2GB ของข้อมูลจะถูกเก็บไว้ในไดเรกทอรีนี้และจะเติบโตขึ้นเมื่อเวลาผ่านไป  Wallet จะถูกจัดเก็บไว้ในไดเรกทอรีนี้ </translation>
+    </message>
+    <message>
+        <source>Use the default data directory</source>
+        <translation>ใช้ไดเร็กทอรี่ข้อมูล ที่เป็นค่าเริ่มต้น</translation>
+    </message>
+    <message>
+        <source>Use a custom data directory:</source>
+        <translation>ใช้ไดเร็กทอรี่ข้อมูลที่ตั้งค่าเอง:</translation>
+    </message>
+    <message>
+        <source>Error: Specified data directory "%1" cannot be created.</source>
+        <translation>ข้อผิดพลาด: ไดเร็กทอรี่ข้อมูลที่ต้องการ "%1" ไม่สามารถสร้างได้</translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation>ข้อผิดพลาด</translation>
+    </message>
+    <message>
+        <source>%1 GB of free space available</source>
+        <translation>%1 GB พื้นที่ว่าง</translation>
+    </message>
+    <message>
+        <source>(of %1 GB needed)</source>
+        <translation>(ต้องใช้ %1 GB)</translation>
+    </message>
+</context>
+<context>
+    <name>MasternodeList</name>
+    <message>
+        <source>Form</source>
+        <translation>รูป</translation>
+    </message>
+    <message>
+        <source>My Masternodes</source>
+        <translation>Masternodes ของฉัน</translation>
+    </message>
+    <message>
+        <source>Note: Status of your masternodes in local wallet can potentially be slightly incorrect.&lt;br /&gt;Always wait for wallet to sync additional data and then double check from another node&lt;br /&gt;if your masternode should be running but you still do not see "ENABLED" in "Status" field.</source>
+        <translation>หมายเหตุ: สถานะของ Masternodes ของคุณใน Wallet ภายในประเทศอาจไม่ถูกต้องเล็กน้อย&lt;br /&gt;ต้องรอทุกครั้งให้ Wallet ซิงค์ข้อมูลเพิ่มเติมจากนั้นตรวจสอบอีกครั้งจากโหนดอื่น &lt;br /&gt; คุณจะเห็น Masternode ของคุณควรทำงานอยู่ แต่คุณยังไม่เห็น "เปิดการใช้งาน" ใน"สถานะ"</translation>
+    </message>
+    <message>
+        <source>Alias</source>
+        <translation>นามแฝง</translation>
+    </message>
+    <message>
+        <source>Address</source>
+        <translation>ที่อยู่</translation>
+    </message>
+    <message>
+        <source>Protocol</source>
+        <translation>โปรโตคอล</translation>
+    </message>
+    <message>
+        <source>Status</source>
+        <translation>สถานะ</translation>
+    </message>
+    <message>
+        <source>Active</source>
+        <translation>กำลังใช้งาน</translation>
+    </message>
+    <message>
+        <source>Last Seen</source>
+        <translation>เห็นครั้งสุดท้าย</translation>
+    </message>
+    <message>
+        <source>Payee</source>
+        <translation>ผู้รับเงิน</translation>
+    </message>
+    <message>
+        <source>S&amp;tart alias</source>
+        <translation>เริ่มนามแฝง</translation>
+    </message>
+    <message>
+        <source>Start &amp;all</source>
+        <translation>เริ่มต้นทั้งหมด</translation>
+    </message>
+    <message>
+        <source>Start &amp;MISSING</source>
+        <translation>เริ่มต้น MISSING</translation>
+    </message>
+    <message>
+        <source>&amp;Update status</source>
+        <translation>อัพเดตสถานะ</translation>
+    </message>
+    <message>
+        <source>Show additional Masternode information</source>
+        <translation>แสดงข้อมูล Masternode เพิ่มเติม</translation>
+    </message>
+    <message>
+        <source>Show &amp;Info...</source>
+        <translation>แสดงข้อมูล</translation>
+    </message>
+    <message>
+        <source>Status will be updated automatically in (sec):</source>
+        <translation>สถานะจะอัพเดตอัตโนมัติภายใน (วินาที) :</translation>
+    </message>
+    <message>
+        <source>0</source>
+        <translation>0</translation>
+    </message>
+    <message>
+        <source>All Masternodes</source>
+        <translation>Masternodes ทั้งหมด</translation>
+    </message>
+    <message>
+        <source>Filter List:</source>
+        <translation>Filter List:</translation>
+    </message>
+    <message>
+        <source>Filter masternode list</source>
+        <translation>Filter masternode list</translation>
+    </message>
+    <message>
+        <source>Node Count:</source>
+        <translation>จำนวนโหนด:</translation>
+    </message>
+    <message>
+        <source>Start alias</source>
+        <translation>เริ่มนามแฝง</translation>
+    </message>
+    <message>
+        <source>Confirm masternode start</source>
+        <translation>ยืนยันว่า Masternodes เริ่มทำงาน</translation>
+    </message>
+    <message>
+        <source>Are you sure you want to start masternode %1?</source>
+        <translation>คุณแน่ใจหรือไม่ว่าต้องการให้ masternode %1 เริ่มทำงาน?</translation>
+    </message>
+    <message>
+        <source>Confirm all masternodes start</source>
+        <translation>ยืนยันว่า Masternodes ทั้งหมดเริ่มทำงาน</translation>
+    </message>
+    <message>
+        <source>Are you sure you want to start ALL masternodes?</source>
+        <translation>คุณแน่ใจหรือไม่ว่าต้องการให้ masternode ทั้งหมดเริ่มทำงาน?</translation>
+    </message>
+    <message>
+        <source>Command is not available right now</source>
+        <translation>คำสั่งไม่พร้อมใช้งานในขณะนี้</translation>
+    </message>
+    <message>
+        <source>You can't use this command until masternode list is synced</source>
+        <translation>คุณไม่สามารถใช้คำสั่งนี้ได้จนกว่าจะมีการซิงค์รายการ masternode</translation>
+    </message>
+    <message>
+        <source>Confirm missing masternodes start</source>
+        <translation>ยืนยันการเริ่มต้น masternodes ที่หายไป</translation>
+    </message>
+    <message>
+        <source>Are you sure you want to start MISSING masternodes?</source>
+        <translation>คุณแน่ใจหรือไม่ว่าต้องการเริ่มต้น masternodes ที่หายไป?</translation>
+    </message>
+    <message>
+        <source>Additional information for Masternode %1</source>
+        <translation>ข้อมูลเพิ่มเติมสำหรับ Masternode %1</translation>
+    </message>
+    <message>
+        <source>Masternode Private Key</source>
+        <translation>Masternode Private Key</translation>
+    </message>
+    <message>
+        <source>Private Key</source>
+        <translation>Private Key</translation>
+    </message>
+    <message>
+        <source>Collateral</source>
+        <translation>ประกอบ</translation>
+    </message>
+    <message>
+        <source>IP</source>
+        <translation>IP</translation>
+    </message>
+    <message>
+        <source>Version</source>
+        <translation>เวอร์ชั่น</translation>
+    </message>
+    <message>
+        <source>Unknown</source>
+        <translation>ไม่ทราบ</translation>
+    </message>
+    <message>
+        <source>Sentinel</source>
+        <translation>Sentinel</translation>
+    </message>
+</context>
+<context>
+    <name>ModalOverlay</name>
+    <message>
+        <source>Form</source>
+        <translation>รูป</translation>
+    </message>
+    <message>
+        <source>Recent transactions may not yet be visible, and therefore your wallet's balance might be incorrect. This information will be correct once your wallet has finished synchronizing with the Dash network, as detailed below.</source>
+        <translation>การทำธุรกรรมล่าสุดอาจยังไม่สามารถเห็นได้และทำให้ยอดคงเหลือของ wallet ของคุณไม่ถูกต้อง ข้อมูลนี้จะถูกต้องก่อนที่ Wallet ของคุณจะเสร็จสิ้นการซิงค์กับเครือข่าย Dash ตามรายละเอียดด้านล่างนี้</translation>
+    </message>
+    <message>
+        <source>Attempting to spend Dash that are affected by not-yet-displayed transactions will not be accepted by the network.</source>
+        <translation>เครือข่ายจะไม่ยอมรับความพยายามที่จะใช้ Dash ที่ได้รับผลกระทบจากการทำธุรกรรมที่ยังไม่ได้แสดงผล</translation>
+    </message>
+    <message>
+        <source>Number of blocks left</source>
+        <translation>จำนวนบล็อกที่เหลือ</translation>
+    </message>
+    <message>
+        <source>Unknown...</source>
+        <translation>ไม่ทราบ...</translation>
+    </message>
+    <message>
+        <source>Last block time</source>
+        <translation>เวลาบล็อคล่าสุด</translation>
+    </message>
+    <message>
+        <source>Progress</source>
+        <translation>ความคืบหน้า</translation>
+    </message>
+    <message>
+        <source>Progress increase per hour</source>
+        <translation>เพิ่มความคืบหน้าต่อชั่วโมง</translation>
+    </message>
+    <message>
+        <source>calculating...</source>
+        <translation>กำลังคำนวณ...</translation>
+    </message>
+    <message>
+        <source>Estimated time left until synced</source>
+        <translation>เวลาโดยประมาณที่เหลือจนกว่าจะซิงค์</translation>
+    </message>
+    <message>
+        <source>Hide</source>
+        <translation>ซ่อน</translation>
+    </message>
+    <message>
+        <source>Unknown. Syncing Headers (%1)...</source>
+        <translation>ไม่ทราบ กำลังซิงค์ส่วนหัว (%1) ...</translation>
+    </message>
+</context>
+<context>
+    <name>OpenURIDialog</name>
+    <message>
+        <source>Open URI</source>
+        <translation>เปิด URI</translation>
+    </message>
+    <message>
+        <source>Open payment request from URI or file</source>
+        <translation>เปิด การเรียกการชำระเงิน จาก URI หรือ ไฟล์</translation>
+    </message>
+    <message>
+        <source>URI:</source>
+        <translation>URI:</translation>
+    </message>
+    <message>
+        <source>Select payment request file</source>
+        <translation>เลือก ไฟล์คำขอการชำระเงิน</translation>
+    </message>
+    <message>
+        <source>Select payment request file to open</source>
+        <translation>เลือกไฟล์คำขอชำระเงินเพื่อเปิด</translation>
+    </message>
+</context>
+<context>
+    <name>OptionsDialog</name>
+    <message>
+        <source>Options</source>
+        <translation>ตัวเลือก</translation>
+    </message>
+    <message>
+        <source>&amp;Main</source>
+        <translation>&amp;หลัก</translation>
+    </message>
+    <message>
+        <source>Size of &amp;database cache</source>
+        <translation>ขนาดของ &amp;database cache</translation>
+    </message>
+    <message>
+        <source>MB</source>
+        <translation>MB</translation>
+    </message>
+    <message>
+        <source>Number of script &amp;verification threads</source>
+        <translation>จำนวนของสคริปท์ &amp;verification threads</translation>
+    </message>
+    <message>
+        <source>(0 = auto, &lt;0 = leave that many cores free)</source>
+        <translation>(0 = อัตโนมัติ, &lt;0 = ปล่อย คอร์ อิสระ)</translation>
+    </message>
+    <message>
+        <source>Amount of Dash to keep anonymized</source>
+        <translation>จำนวน Dash เพื่อไม่ระบุชื่อ</translation>
+    </message>
+    <message>
+        <source>W&amp;allet</source>
+        <translation>Wallet</translation>
+    </message>
+    <message>
+        <source>Show additional tab listing all your masternodes in first sub-tab&lt;br/&gt;and all masternodes on the network in second sub-tab.</source>
+        <translation>แสดงแท็บเพิ่มเติมแสดง masternodes ทั้งหมดของคุณในแท็บย่อยแรก &lt;br/&gt;และ masternodes ทั้งหมดบนเครือข่ายในแท็บย่อยที่สอง</translation>
+    </message>
+    <message>
+        <source>Show Masternodes Tab</source>
+        <translation>แสดงแถบ Masternodes</translation>
+    </message>
+    <message>
+        <source>Show additional information and buttons for PrivateSend on overview screen.</source>
+        <translation>แสดงข้อมูลเพิ่มเติมและปุ่มสำหรับ PrivateSend บนหน้าจอ</translation>
+    </message>
+    <message>
+        <source>Enable advanced PrivateSend interface</source>
+        <translation>เปิดใช้งานอินเทอร์เฟซขั้นสูงของ PrivateSend</translation>
+    </message>
+    <message>
+        <source>Show warning dialog when PrivateSend detects that wallet has very low number of keys left.</source>
+        <translation>แสดงข้อความแจ้งเตือนเมื่อ PrivateSend ตรวจพบว่า Wallet มีจำนวนคีย์ที่เหลืออยู่ต่ำมาก</translation>
+    </message>
+    <message>
+        <source>Warn if PrivateSend is running out of keys</source>
+        <translation>แจ้งเตือนหากคีย์ PrivateSend กำลังจะหมด</translation>
+    </message>
+    <message>
+        <source>Whether to use experimental PrivateSend mode with multiple mixing sessions per block.&lt;br/&gt;Note: You must use this feature carefully.&lt;br/&gt;Make sure you always have recent wallet (auto)backup in a safe place!</source>
+        <translation>ไม่ว่าจะใช้โหมด PrivateSend แบบทดลองกับการผสมหลายเซสชันต่อบล็อกหรือไม่&lt;br/&gt;หมายเหตุ: คุณต้องใช้คุณลักษณะนี้อย่างระมัดระวัง&lt;br/&gt;ตรวจสอบให้แน่ใจว่าคุณได้สำรองข้อมูล wallet (อัตโนมัติ) ไว้ในที่ปลอดภัยทุกครั้ง!</translation>
+    </message>
+    <message>
+        <source>Enable PrivateSend &amp;multi-session</source>
+        <translation>เปิดใช้งาน PrivateSend และหลายเซสชัน</translation>
+    </message>
+    <message>
+        <source>If you disable the spending of unconfirmed change, the change from a transaction&lt;br/&gt;cannot be used until that transaction has at least one confirmation.&lt;br/&gt;This also affects how your balance is computed.</source>
+        <translation>ถ้าหากคุณปิดการใช้จ่ายในการเปลี่ยนแปลงที่ไม่ได้รับการยืนยัน การเปลี่ยนแปลงจากธุรกรรม&lt;br/&gt;จะไม่สามารถใช้ได้จนกว่ารายการดังกล่าวจะมีการยืนยันอย่างน้อยหนึ่งรายการ&lt;br/&gt;นอกจากนี้ยังมีผลต่อการคำนวณยอดคงเหลือของคุณอีกด้วย</translation>
+    </message>
+    <message>
+        <source>PrivateSend rounds to use</source>
+        <translation>จำนวนรอบ PrivateSend ที่ใช้</translation>
+    </message>
+    <message>
+        <source>This amount acts as a threshold to turn off PrivateSend once it's reached.</source>
+        <translation>จำนวนนี้ทำหน้าที่เป็นเกณฑ์เพื่อปิดการใช้งาน PrivateSend เมื่อถึงขีดจำกัดแล้ว</translation>
+    </message>
+    <message>
+        <source>Automatically open the Dash Core client port on the router. This only works when your router supports UPnP and it is enabled.</source>
+        <translation>เปิดพอร์ต Dash Core client บนเราเตอร์โดยอัตโนมัติ การทำงานนี้ใช้ได้เฉพาะเมื่อเราเตอร์ของคุณรองรับ UPnP และเปิดใช้งานแล้ว</translation>
+    </message>
+    <message>
+        <source>Accept connections from outside</source>
+        <translation>ยอมรับการเชื่อมต่อจากภายนอก</translation>
+    </message>
+    <message>
+        <source>Allow incoming connections</source>
+        <translation>อนุญาตการเชื่อมต่อขาเข้า</translation>
+    </message>
+    <message>
+        <source>Connect to the Dash network through a SOCKS5 proxy.</source>
+        <translation>เชื่อมต่อกับเครือข่าย Dash ผ่านพร็อกซี่แบบ SOCKS5</translation>
+    </message>
+    <message>
+        <source>&amp;Connect through SOCKS5 proxy (default proxy):</source>
+        <translation>&amp;เชื่อมต่อผ่าน พร็อกซี่ SOCKS5 (พร็อกซี่เริ่มต้น):</translation>
+    </message>
+    <message>
+        <source>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Exit in the menu.</source>
+        <translation>มินิไมซ์แอพ แทนการออกจากแอพพลิเคชั่น เมื่อวินโดว์ได้รับการปิด เมื่อเลือกตัวเลือกนี้ แอพพลิเคชั่น จะถูกปิด ก็ต่อเมื่อ มีการเลือกเมนู Exit/ออกจากระบบ เท่านั้น</translation>
+    </message>
+    <message>
+        <source>Third party URLs (e.g. a block explorer) that appear in the transactions tab as context menu items.&lt;br/&gt;%s in the URL is replaced by transaction hash. Multiple URLs are separated by vertical bar |.</source>
+        <translation>URL ของบุคคลที่สาม (เช่น explorer บล็อก) ที่ปรากฏในแท็บธุรกรรมเป็นรายการในเมนู&lt;br/&gt; %s ใน URL ถูกแทนที่ด้วย hash การทำธุรกรรม หลาย URL ถูกแยกด้วยแถบแนวตั้ง </translation>
+    </message>
+    <message>
+        <source>Expert</source>
+        <translation>ผู้เชี่ยวชาญ</translation>
+    </message>
+    <message>
+        <source>This setting determines the amount of individual masternodes that an input will be anonymized through.&lt;br/&gt;More rounds of anonymization gives a higher degree of privacy, but also costs more in fees.</source>
+        <translation>การกำหนดค่านี้จะกำหนดจำนวนของ masternodes แต่ละตัวที่จะสามารถระบุได้โดยไม่ระบุตัวตน.&lt;br/&gt;การเก็บข้อมูลแบบไม่ระบุตัวตนทำให้มีระดับความเป็นส่วนตัวสูงขึ้น แต่ยังมีค่าใช้จ่ายเพิ่มขึ้นด้วย </translation>
+    </message>
+    <message>
+        <source>Whether to show coin control features or not.</source>
+        <translation>ไม่ว่าจะแสดงคุณสมบัติการควบคุมหยอดเหรียญหรือไม่</translation>
+    </message>
+    <message>
+        <source>Automatically start %1 after logging in to the system.</source>
+        <translation>เริ่มต้น %1 โดยอัตโนมัติหลังจากเข้าสู่ระบบ</translation>
+    </message>
+    <message>
+        <source>&amp;Start %1 on system login</source>
+        <translation>&amp;เริ่ม %1 ในการล็อกอินระบบ</translation>
+    </message>
+    <message>
+        <source>Enable coin &amp;control features</source>
+        <translation>เปิดใช้ coin &amp; รูปแบบการควบคุม</translation>
+    </message>
+    <message>
+        <source>&amp;Spend unconfirmed change</source>
+        <translation>&amp;ใช้เงินทอนที่ยังไม่ยืนยัน</translation>
+    </message>
+    <message>
+        <source>&amp;Network</source>
+        <translation>&amp;เน็ตเวิร์ก</translation>
+    </message>
+    <message>
+        <source>Map port using &amp;UPnP</source>
+        <translation>จองพอร์ต โดยใช้ &amp;UPnP</translation>
+    </message>
+    <message>
+        <source>Proxy &amp;IP:</source>
+        <translation>พร็อกซี่ &amp;IP:</translation>
+    </message>
+    <message>
+        <source>IP address of the proxy (e.g. IPv4: 127.0.0.1 / IPv6: ::1)</source>
+        <translation>IP แอดเดส ของ proxy (เช่น IPv4: 127.0.0.1 / IPv6: ::1)</translation>
+    </message>
+    <message>
+        <source>&amp;Port:</source>
+        <translation>&amp;พอร์ต</translation>
+    </message>
+    <message>
+        <source>Port of the proxy (e.g. 9050)</source>
+        <translation>พอร์ตของพร็อกซี่ (ตัวอย่าง 9050)</translation>
+    </message>
+    <message>
+        <source>Used for reaching peers via:</source>
+        <translation>ใช้ในการเข้าถึงอีกฝ่ายหนึ่ง peer โดย:</translation>
+    </message>
+    <message>
+        <source>Shows, if the supplied default SOCKS5 proxy is used to reach peers via this network type.</source>
+        <translation>แสดง หากพร็อกซี SOCKS5 เป็นค่าเริ่มต้นที่ใช้เพื่อเข้าถึง Peers ผ่านเครือข่ายประเภทนี้</translation>
+    </message>
+    <message>
+        <source>IPv4</source>
+        <translation>IPv4</translation>
+    </message>
+    <message>
+        <source>IPv6</source>
+        <translation>IPv6</translation>
+    </message>
+    <message>
+        <source>Tor</source>
+        <translation>Tor</translation>
+    </message>
+    <message>
+        <source>Connect to the Dash network through a separate SOCKS5 proxy for Tor hidden services.</source>
+        <translation>เชื่อมต่อกับ เครือข่าย Dash ผ่านทาง พร้อกซี่ SOCKS5 แยกต่างหาก สำหรับ Tor เซอร์วิส</translation>
+    </message>
+    <message>
+        <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services:</source>
+        <translation>ใช้พร็อกซี SOCKS5 แยกเพื่อเข้าถึงเพื่อนร่วมทางผ่านบริการที่ซ่อนไว้ของ Tor:</translation>
+    </message>
+    <message>
+        <source>&amp;Window</source>
+        <translation>&amp;วันโดว์</translation>
+    </message>
+    <message>
+        <source>&amp;Hide the icon from the system tray.</source>
+        <translation>ซ่อนไอคอนจาก  System tray</translation>
+    </message>
+    <message>
+        <source>Hide tray icon</source>
+        <translation>ซ่อนไอคอน tray </translation>
+    </message>
+    <message>
+        <source>Show only a tray icon after minimizing the window.</source>
+        <translation>แสดงเทรย์ไอคอน หลังมืนิไมส์วินโดว์ เท่านั้น</translation>
+    </message>
+    <message>
+        <source>&amp;Minimize to the tray instead of the taskbar</source>
+        <translation>ลดขนาด Tray ลงไปยังแถบ taskbar</translation>
+    </message>
+    <message>
+        <source>M&amp;inimize on close</source>
+        <translation>ปิดหน้าต่าง</translation>
+    </message>
+    <message>
+        <source>&amp;Display</source>
+        <translation>แสดง</translation>
+    </message>
+    <message>
+        <source>User Interface &amp;language:</source>
+        <translation>User Interface language</translation>
+    </message>
+    <message>
+        <source>The user interface language can be set here. This setting will take effect after restarting %1.</source>
+        <translation>สามารถตั้งค่า User interface language ได้ที่นี่ การตั้งค่านี้จะมีผลหลังจากรีสตาร์ท %1</translation>
+    </message>
+    <message>
+        <source>Language missing or translation incomplete? Help contributing translations here:
+https://www.transifex.com/projects/p/dash/</source>
+        <translation>ภาษาขาดหายไปหรือการแปลไม่สมบูรณ์ใช่หรือไม่?  สามารถช่วยแปลเพิ่มเติมได้ที่นี่:   
+https://www.transifex.com/projects/p/dash/</translation>
+    </message>
+    <message>
+        <source>User Interface Theme:</source>
+        <translation>User Interface Theme: </translation>
+    </message>
+    <message>
+        <source>&amp;Unit to show amounts in:</source>
+        <translation>หน่วยที่จะแสดงจำนวนเงิน:</translation>
+    </message>
+    <message>
+        <source>Choose the default subdivision unit to show in the interface and when sending coins.</source>
+        <translation>เลือกรายละเอียดค่าเริ่มต้นสำหรับจำนวนเงินที่แสดงในอินเทอร์เฟซและเมื่อส่งเหรียญ</translation>
+    </message>
+    <message>
+        <source>Decimal digits</source>
+        <translation>ตัวเลขทศนิยม</translation>
+    </message>
+    <message>
+        <source>Third party transaction URLs</source>
+        <translation>URL ธุรกรรมของบุคคลที่สาม</translation>
+    </message>
+    <message>
+        <source>Active command-line options that override above options:</source>
+        <translation>ตัวเลือก command-line แอกทีฟอยู่นี้ จะแทนที่ ตัวเลือกด้านบนนี้:</translation>
+    </message>
+    <message>
+        <source>Reset all client options to default.</source>
+        <translation>รีเซต ไคลเอ็นออพชั่น กลับไปเป็นค่าเริ่มต้น</translation>
+    </message>
+    <message>
+        <source>&amp;Reset Options</source>
+        <translation>&amp;รีเซต ออพชั่น</translation>
+    </message>
+    <message>
+        <source>&amp;OK</source>
+        <translation>โอเค</translation>
+    </message>
+    <message>
+        <source>&amp;Cancel</source>
+        <translation>ยกเลิก</translation>
+    </message>
+    <message>
+        <source>default</source>
+        <translation>ค่าเริ่มต้น</translation>
+    </message>
+    <message>
+        <source>none</source>
+        <translation>ไม่มี</translation>
+    </message>
+    <message>
+        <source>Confirm options reset</source>
+        <translation>ยืนยันการรีเซ็ตตัวเลือก</translation>
+    </message>
+    <message>
+        <source>Client restart required to activate changes.</source>
+        <translation>รีสตาร์ทเครื่องไคลเอ็นต์เพื่อเปิดใช้งานการเปลี่ยนแปลง</translation>
+    </message>
+    <message>
+        <source>Client will be shut down. Do you want to proceed?</source>
+        <translation>ไคลเอนต์จะถูกปิด คุณต้องการดำเนินการต่อหรือไม่?</translation>
+    </message>
+    <message>
+        <source>This change would require a client restart.</source>
+        <translation>การเปลี่ยนแปลงนี้จะทำให้ไคลเอนต์รีสตาร์ท</translation>
+    </message>
+    <message>
+        <source>The supplied proxy address is invalid.</source>
+        <translation>ที่อยู่พร็อกซีที่ระบุไม่ถูกต้อง</translation>
+    </message>
+</context>
+<context>
+    <name>OverviewPage</name>
+    <message>
+        <source>Form</source>
+        <translation>รูป</translation>
+    </message>
+    <message>
+        <source>The displayed information may be out of date. Your wallet automatically synchronizes with the Dash network after a connection is established, but this process has not completed yet.</source>
+        <translation>ข้อมูลที่แสดงอาจล้าสมัย  Wallet ของคุณจะทำข้อมูลให้ตรงกับเครือข่าย Dash โดยอัตโนมัติหลังจากที่มีการเชื่อมต่อแล้ว แต่กระบวนการนี้ยังไม่เสร็จสมบูรณ์</translation>
+    </message>
+    <message>
+        <source>Available:</source>
+        <translation>ที่สามารถใช้ได้: </translation>
+    </message>
+    <message>
+        <source>Your current spendable balance</source>
+        <translation>ยอดคงเหลือที่สามารถชำระได้ในปัจจุบันของคุณ</translation>
+    </message>
+    <message>
+        <source>Pending:</source>
+        <translation>รอดำเนินการ: </translation>
+    </message>
+    <message>
+        <source>Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance</source>
+        <translation>ยอดรวมของธุรกรรมที่ยังไม่ได้รับการยืนยันและยังไม่นับรวมยอดที่สามารถใช้จ่ายได้</translation>
+    </message>
+    <message>
+        <source>Immature:</source>
+        <translation>ไม่สามารถใช้ได้:</translation>
+    </message>
+    <message>
+        <source>Mined balance that has not yet matured</source>
+        <translation>ยอดดุลที่ขุดยังไม่ครบ</translation>
+    </message>
+    <message>
+        <source>Balances</source>
+        <translation>ยอดคงเหลือ</translation>
+    </message>
+    <message>
+        <source>Unconfirmed transactions to watch-only addresses</source>
+        <translation>การทำธุรกรรมที่ไม่ได้รับการยืนยันใช้สำหรับดูที่อยู่เท่านั้น</translation>
+    </message>
+    <message>
+        <source>Mined balance in watch-only addresses that has not yet matured</source>
+        <translation>ยอดคงเหลือที่ขุดในที่อยู่สำหรับดูอย่างเดียวที่ยังไม่สามารถใช้งานได้</translation>
+    </message>
+    <message>
+        <source>Total:</source>
+        <translation>ยอดรวม: </translation>
+    </message>
+    <message>
+        <source>Your current total balance</source>
+        <translation>ยอดรวมปัจจุบันของคุณ</translation>
+    </message>
+    <message>
+        <source>Current total balance in watch-only addresses</source>
+        <translation>จำนวนยอดรวมปัจจุบันในที่อยู่สำหรับดูอย่างเดียว</translation>
+    </message>
+    <message>
+        <source>Watch-only:</source>
+        <translation>สำหรับดูอย่างเดียว</translation>
+    </message>
+    <message>
+        <source>Your current balance in watch-only addresses</source>
+        <translation>ยอดเงินปัจจุบันของคุณในที่อยู่สำหรับดูอย่างเดียว</translation>
+    </message>
+    <message>
+        <source>Spendable:</source>
+        <translation>ที่สามารถใช้ได้: </translation>
+    </message>
+    <message>
+        <source>PrivateSend</source>
+        <translation>PrivateSend</translation>
+    </message>
+    <message>
+        <source>Status:</source>
+        <translation>สถานะ :</translation>
+    </message>
+    <message>
+        <source>Enabled/Disabled</source>
+        <translation>เปิด / ปิด</translation>
+    </message>
+    <message>
+        <source>Completion:</source>
+        <translation>เสร็จสิ้น:</translation>
+    </message>
+    <message>
+        <source>Try to manually submit a PrivateSend request.</source>
+        <translation>พยายามส่งคำขอ PrivateSend ด้วยตนเอง</translation>
+    </message>
+    <message>
+        <source>Reset the current status of PrivateSend (can interrupt PrivateSend if it's in the process of Mixing, which can cost you money!)</source>
+        <translation>รีเซ็ตสถานะปัจจุบันของ PrivateSend (สามารถขัดจังหวะการทำงานของ PrivateSend หากอยู่ในระหว่างการผสม ซึ่งสามารถทำให้คุณเสียเงินได้!)</translation>
+    </message>
+    <message>
+        <source>Information about PrivateSend and Mixing</source>
+        <translation>ข้อมูลเกี่ยวกับ PrivateSend และการผสม</translation>
+    </message>
+    <message>
+        <source>Info</source>
+        <translation>ข้อมูล</translation>
+    </message>
+    <message>
+        <source>Amount and Rounds:</source>
+        <translation>จำนวนและรอบ:</translation>
+    </message>
+    <message>
+        <source>0 DASH / 0 Rounds</source>
+        <translation>0 DASH / 0 รอบ</translation>
+    </message>
+    <message>
+        <source>Submitted Denom:</source>
+        <translation>ส่งหน่วยเงิน:</translation>
+    </message>
+    <message>
+        <source>n/a</source>
+        <translation>n / a</translation>
+    </message>
+    <message>
+        <source>Recent transactions</source>
+        <translation>ธุรกรรมล่าสุด</translation>
+    </message>
+    <message>
+        <source>Start/Stop Mixing</source>
+        <translation>เริ่ม / หยุดการผสม</translation>
+    </message>
+    <message>
+        <source>PrivateSend Balance:</source>
+        <translation>PrivateSend ยอดคงเหลือ : </translation>
+    </message>
+    <message>
+        <source>The denominations you submitted to the Masternode.&lt;br&gt;To mix, other users must submit the exact same denominations.</source>
+        <translation> หน่วยเงินที่คุณส่งไปยัง Masternode. &lt;br&gt; ในการผสมนั้นผู้ใช้อื่นจะต้องส่งหน่วยเงินที่เหมือนกัน</translation>
+    </message>
+    <message>
+        <source>(Last Message)</source>
+        <translation>(ข้อความล่าสุด)</translation>
+    </message>
+    <message>
+        <source>Try Mix</source>
+        <translation>ลอง Mix</translation>
+    </message>
+    <message>
+        <source>Reset</source>
+        <translation>รีเซ็ต</translation>
+    </message>
+    <message>
+        <source>out of sync</source>
+        <translation>ออกจากซิงค์</translation>
+    </message>
+    <message>
+        <source>Automatic backups are disabled, no mixing available!</source>
+        <translation>การสำรองข้อมูลอัตโนมัติถูกปิดใช้งานโดยไม่มีการผสม!</translation>
+    </message>
+    <message>
+        <source>Start Mixing</source>
+        <translation>เริ่มต้นการผสม</translation>
+    </message>
+    <message>
+        <source>Stop Mixing</source>
+        <translation>หยุดการผสม</translation>
+    </message>
+    <message>
+        <source>No inputs detected</source>
+        <translation>ไม่พบข้อมูล</translation>
+    </message>
+    <message numerus="yes">
+        <source>%n Rounds</source>
+        <translation><numerusform>%n รอบ</numerusform></translation>
+    </message>
+    <message>
+        <source>Found enough compatible inputs to anonymize %1</source>
+        <translation>พบข้อมูลที่เข้ากันได้มากพอที่จะไม่ระบุชื่อ %1</translation>
+    </message>
+    <message>
+        <source>Not enough compatible inputs to anonymize &lt;span style='color:red;'&gt;%1&lt;/span&gt;,&lt;br&gt;will anonymize &lt;span style='color:red;'&gt;%2&lt;/span&gt; instead</source>
+        <translation>ข้อมูลไม่เพียงพอที่จะไม่ระบุชื่อ &lt;span style='color:red;'&gt;%1&lt;/span&gt; &lt;br&gt;จะไม่ระบุชื่อ&lt;span style='color:red;'&gt;%2&lt;/span&gt; แทน</translation>
+    </message>
+    <message>
+        <source>Overall progress</source>
+        <translation>ความคืบหน้าโดยรวม</translation>
+    </message>
+    <message>
+        <source>Denominated</source>
+        <translation>สกุลเงิน</translation>
+    </message>
+    <message>
+        <source>Mixed</source>
+        <translation>ผสม</translation>
+    </message>
+    <message>
+        <source>Anonymized</source>
+        <translation>ไม่ระบุชื่อ</translation>
+    </message>
+    <message numerus="yes">
+        <source>Denominated inputs have %5 of %n rounds on average</source>
+        <translation><numerusform>อินพุตที่เป็นสกุลเงินมีค่าเฉลี่ย %5 ของรอบ %n</numerusform></translation>
+    </message>
+    <message>
+        <source>keys left: %1</source>
+        <translation>คีย์เหลืออยู่: %1</translation>
+    </message>
+    <message>
+        <source>Disabled</source>
+        <translation>ปิดการใช้งาน</translation>
+    </message>
+    <message>
+        <source>Very low number of keys left since last automatic backup!</source>
+        <translation>จำนวนคีย์ที่เหลือต่ำมากตั้งแต่การสำรองข้อมูลอัตโนมัติครั้งล่าสุด!</translation>
+    </message>
+    <message>
+        <source>We are about to create a new automatic backup for you, however &lt;span style='color:red;'&gt; you should always make sure you have backups saved in some safe place&lt;/span&gt;!</source>
+        <translation>เรากำลังจะสร้างการสำรองข้อมูลอัตโนมัติใหม่ให้กับคุณ แต่อย่างไรก็ตาม&lt;span style='color:red;'&gt;คุณควรตรวจสอบให้แน่ใจเสมอว่าคุณได้สำรองข้อมูลไว้ในที่ปลอดภัยแล้ว&lt;/span&gt;!</translation>
+    </message>
+    <message>
+        <source>Note: You can turn this message off in options.</source>
+        <translation>หมายเหตุ: คุณสามารถปิดข้อความนี้ได้</translation>
+    </message>
+    <message>
+        <source>WARNING! Something went wrong on automatic backup</source>
+        <translation>คำเตือน! เกิดข้อผิดพลาดในการสำรองข้อมูลอัตโนมัติ</translation>
+    </message>
+    <message>
+        <source>ERROR! Failed to create automatic backup</source>
+        <translation>ข้อผิดพลาด! ไม่สามารถสร้างการสำรองข้อมูลอัตโนมัติ</translation>
+    </message>
+    <message>
+        <source>Mixing is disabled, please close your wallet and fix the issue!</source>
+        <translation>ปิดใช้งานการผสม โปรดปิด Wallet ของคุณและแก้ไขปัญหา!</translation>
+    </message>
+    <message>
+        <source>Enabled</source>
+        <translation>เปิดการใช้งาน</translation>
+    </message>
+    <message>
+        <source>see debug.log for details.</source>
+        <translation>ดูรายละเอียดใน debug.log</translation>
+    </message>
+    <message>
+        <source>WARNING! Failed to replenish keypool, please unlock your wallet to do so.</source>
+        <translation>คำเตือน! ไม่สามารถเติม keypool ได้ โปรดปลดล็อก Wallet ของคุณ</translation>
+    </message>
+    <message>
+        <source>Last PrivateSend message:
+</source>
+        <translation>ข้อความ PrivateSend ล่าสุด:
+</translation>
+    </message>
+    <message>
+        <source>N/A</source>
+        <translation>N/A</translation>
+    </message>
+    <message>
+        <source>PrivateSend was successfully reset.</source>
+        <translation>รีเซ็ต PrivateSend สำเร็จแล้ว</translation>
+    </message>
+    <message>
+        <source>If you don't want to see internal PrivateSend fees/transactions select "Most Common" as Type on the "Transactions" tab.</source>
+        <translation>หากคุณไม่ต้องการเห็นค่าธรรมเนียม PrivateSend / ธุรกรรม  ให้เลือก "Most Common" เป็นประเภท "Transactions"</translation>
+    </message>
+    <message>
+        <source>PrivateSend requires at least %1 to use.</source>
+        <translation>PrivateSend ต้องการอย่างน้อย %1 เพื่อใช้งาน</translation>
+    </message>
+    <message>
+        <source>Wallet is locked and user declined to unlock. Disabling PrivateSend.</source>
+        <translation>Wallet ถูกล็อกและผู้ใช้ปฏิเสธที่จะปลดล็อก กำลังปิดใช้งาน PrivateSend</translation>
+    </message>
+</context>
+<context>
+    <name>PaymentServer</name>
+    <message>
+        <source>Payment request error</source>
+        <translation>คำขอการชำระเงินผิดพลาด</translation>
+    </message>
+    <message>
+        <source>Cannot start dash: click-to-pay handler</source>
+        <translation>ไม่สามารถเริ่มต้น Dash: คลิกเพื่อจ่ายเงิน</translation>
+    </message>
+    <message>
+        <source>URI handling</source>
+        <translation>การจัดการ URI</translation>
+    </message>
+    <message>
+        <source>Payment request fetch URL is invalid: %1</source>
+        <translation>URL การเรียกร้องขอการชำระเงินไม่ถูกต้อง: %1</translation>
+    </message>
+    <message>
+        <source>Invalid payment address %1</source>
+        <translation>ที่อยู่การชำระเงินไม่ถูกต้อง %1</translation>
+    </message>
+    <message>
+        <source>URI cannot be parsed! This can be caused by an invalid Dash address or malformed URI parameters.</source>
+        <translation>ไม่สามารถประมวลผล URI ได้สำเร็จ ! ซึ่งอาจเกิดจากที่อยู่ Dash ไม่ถูกต้องหรือพารามิเตอร์ URI ที่มีรูปแบบไม่ถูกต้อง</translation>
+    </message>
+    <message>
+        <source>Payment request file handling</source>
+        <translation>การจัดการไฟล์คำขอชำระเงิน</translation>
+    </message>
+    <message>
+        <source>Payment request file cannot be read! This can be caused by an invalid payment request file.</source>
+        <translation>ไม่สามารถอ่านไฟล์คำขอชำระเงิน!  ซึ่งอาจเกิดจากไฟล์คำขอชำระเงินที่ไม่ถูกต้อง</translation>
+    </message>
+    <message>
+        <source>Payment request rejected</source>
+        <translation>คำขอชำระเงินถูกปฏิเสธ</translation>
+    </message>
+    <message>
+        <source>Payment request network doesn't match client network.</source>
+        <translation>เครือข่ายคำขอการชำระเงินไม่ตรงกับไคลเอนต์เครือข่าย</translation>
+    </message>
+    <message>
+        <source>Payment request expired.</source>
+        <translation>คำขอชำระเงินหมดอายุแล้ว</translation>
+    </message>
+    <message>
+        <source>Payment request is not initialized.</source>
+        <translation>ไม่ได้เริ่มต้นการร้องขอการชำระเงิน</translation>
+    </message>
+    <message>
+        <source>Unverified payment requests to custom payment scripts are unsupported.</source>
+        <translation>ไม่สนับสนุนคำขอการชำระเงินที่ไม่ได้ชำระเงินไปยังสคริปต์การชำระเงินที่กำหนดเอง</translation>
+    </message>
+    <message>
+        <source>Invalid payment request.</source>
+        <translation>คำขอการชำระเงินไม่ถูกต้อง</translation>
+    </message>
+    <message>
+        <source>Requested payment amount of %1 is too small (considered dust).</source>
+        <translation>จำนวนเงินที่เรียกร้องของ %1 น้อยเกินไป (ถือว่าเป็น dust)</translation>
+    </message>
+    <message>
+        <source>Refund from %1</source>
+        <translation>การคืนเงินจาก %1</translation>
+    </message>
+    <message>
+        <source>Payment request %1 is too large (%2 bytes, allowed %3 bytes).</source>
+        <translation>คำขอชำระเงิน %1 ใหญ่เกินไป (%2 ไบต์ อนุญาต %3 ไบต์)</translation>
+    </message>
+    <message>
+        <source>Error communicating with %1: %2</source>
+        <translation>เกิดข้อผิดพลาดในการสื่อสารกับ %1: %2</translation>
+    </message>
+    <message>
+        <source>Payment request cannot be parsed!</source>
+        <translation>คำขอชำระเงินไม่สามารถประมวลผลได้!</translation>
+    </message>
+    <message>
+        <source>Bad response from server %1</source>
+        <translation>การตอบสนองที่ไม่ถูกต้องจากเซิร์ฟเวอร์ %1</translation>
+    </message>
+    <message>
+        <source>Network request error</source>
+        <translation>คำขอเครือข่ายผิดพลาด</translation>
+    </message>
+    <message>
+        <source>Payment acknowledged</source>
+        <translation>ยอมรับการชำระเงินแล้ว</translation>
+    </message>
+</context>
+<context>
+    <name>PeerTableModel</name>
+    <message>
+        <source>NodeId</source>
+        <translation>โหนด Id</translation>
+    </message>
+    <message>
+        <source>Node/Service</source>
+        <translation>โหนด / บริการ</translation>
+    </message>
+    <message>
+        <source>User Agent</source>
+        <translation>ตัวแทนผู้ใช้</translation>
+    </message>
+    <message>
+        <source>Ping</source>
+        <translation>Ping</translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Dash Core</source>
+        <translation>Dash Core</translation>
+    </message>
+    <message>
+        <source>%1 didn't yet exit safely...</source>
+        <translation>%1 ยังไม่สามารถออกจากระบบได้อย่างปลอดภัย ...</translation>
+    </message>
+    <message>
+        <source>Error reading masternode configuration file: %1</source>
+        <translation>เกิดข้อผิดพลาดในการอ่านไฟล์การกำหนดค่า masternode: %1</translation>
+    </message>
+    <message>
+        <source>Amount</source>
+        <translation>จำนวน</translation>
+    </message>
+    <message>
+        <source>Enter a Dash address (e.g. %1)</source>
+        <translation>ป้อนที่อยู่ Dash (เช่น %1)</translation>
+    </message>
+    <message>
+        <source>%1 d</source>
+        <translation>%1 d</translation>
+    </message>
+    <message>
+        <source>%1 h</source>
+        <translation>%1 h</translation>
+    </message>
+    <message>
+        <source>%1 m</source>
+        <translation>%1 m</translation>
+    </message>
+    <message>
+        <source>%1 s</source>
+        <translation>%1 s</translation>
+    </message>
+    <message>
+        <source>None</source>
+        <translation>ไม่มี</translation>
+    </message>
+    <message>
+        <source>N/A</source>
+        <translation>N/A</translation>
+    </message>
+    <message>
+        <source>%1 ms</source>
+        <translation>%1 ms</translation>
+    </message>
+    <message numerus="yes">
+        <source>%n second(s)</source>
+        <translation><numerusform>%n วินาที</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>%n minute(s)</source>
+        <translation><numerusform>%n นาที</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>%n hour(s)</source>
+        <translation><numerusform>%n ชั่วโมง</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>%n day(s)</source>
+        <translation><numerusform>%n วัน</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>%n week(s)</source>
+        <translation><numerusform>%n สัปดาห์</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>%n year(s)</source>
+        <translation><numerusform>%n ปี</numerusform></translation>
+    </message>
+    <message>
+        <source>%1 and %2</source>
+        <translation>%1 และ %2</translation>
+    </message>
+    <message>
+        <source>unknown</source>
+        <translation>ไม่ทราบ</translation>
+    </message>
+</context>
+<context>
+    <name>QObject::QObject</name>
+    <message>
+        <source>Error: Specified data directory "%1" does not exist.</source>
+        <translation>ข้อผิดพลาด: ไม่มีไดเรกทอรีข้อมูลพิเศษ "%1" ที่ระบุ</translation>
+    </message>
+    <message>
+        <source>Error: Cannot parse configuration file: %1. Only use key=value syntax.</source>
+        <translation>ข้อผิดพลาด: ไม่สามารถวิเคราะห์แยกไฟล์ได้: %1 ใช้คีย์เท่านั้น = value syntax</translation>
+    </message>
+    <message>
+        <source>Error: %1</source>
+        <translation>ข้อผิดพลาด: %1</translation>
+    </message>
+</context>
+<context>
+    <name>QRDialog</name>
+    <message>
+        <source>QR-Code Title</source>
+        <translation>ชื่อโค้ด QR</translation>
+    </message>
+    <message>
+        <source>QR Code</source>
+        <translation>โค้ด QR</translation>
+    </message>
+    <message>
+        <source>&amp;Save Image...</source>
+        <translation>บันทึกรูปภาพ</translation>
+    </message>
+    <message>
+        <source>Error creating QR Code.</source>
+        <translation>เกิดข้อผิดพลาดในการสร้าง QR Code</translation>
+    </message>
+</context>
+<context>
+    <name>QRGeneralImageWidget</name>
+    <message>
+        <source>&amp;Save Image...</source>
+        <translation>บันทึกรูปภาพ</translation>
+    </message>
+    <message>
+        <source>&amp;Copy Image</source>
+        <translation>คัดลอกรูปภาพ</translation>
+    </message>
+    <message>
+        <source>Save QR Code</source>
+        <translation>บันทึกโค้ด QR</translation>
+    </message>
+    <message>
+        <source>PNG Image (*.png)</source>
+        <translation>PNG Image (*.png)</translation>
+    </message>
+</context>
+<context>
+    <name>QRImageWidget</name>
+    <message>
+        <source>&amp;Save Image...</source>
+        <translation>บันทึกรูปภาพ</translation>
+    </message>
+    <message>
+        <source>&amp;Copy Image</source>
+        <translation>คัดลอกรูปภาพ</translation>
+    </message>
+    <message>
+        <source>Save QR Code</source>
+        <translation>บันทึกโค้ด QR</translation>
+    </message>
+    <message>
+        <source>PNG Image (*.png)</source>
+        <translation>PNG Image (*.png)</translation>
+    </message>
+</context>
+<context>
+    <name>RPCConsole</name>
+    <message>
+        <source>Tools window</source>
+        <translation>หน้าต่างเครื่องมือ</translation>
+    </message>
+    <message>
+        <source>&amp;Information</source>
+        <translation>ข้อมูล</translation>
+    </message>
+    <message>
+        <source>General</source>
+        <translation>ทั่วไป</translation>
+    </message>
+    <message>
+        <source>Name</source>
+        <translation>ชื่อ</translation>
+    </message>
+    <message>
+        <source>N/A</source>
+        <translation>N/A</translation>
+    </message>
+    <message>
+        <source>Number of connections</source>
+        <translation>จำนวนการเชื่อมต่อ</translation>
+    </message>
+    <message>
+        <source>&amp;Open</source>
+        <translation>เปิด</translation>
+    </message>
+    <message>
+        <source>Startup time</source>
+        <translation>เวลาเริ่มต้น</translation>
+    </message>
+    <message>
+        <source>Network</source>
+        <translation>เครือข่าย</translation>
+    </message>
+    <message>
+        <source>Last block time</source>
+        <translation>เวลาบล็อคล่าสุด</translation>
+    </message>
+    <message>
+        <source>Debug log file</source>
+        <translation>ไฟล์บันทึกข้อผิดพลาด</translation>
+    </message>
+    <message>
+        <source>Current number of blocks</source>
+        <translation>จำนวนบล็อคปัจจุบัน</translation>
+    </message>
+    <message>
+        <source>Client version</source>
+        <translation>ไคลเอนต์เวอร์ชั่น</translation>
+    </message>
+    <message>
+        <source>Using BerkeleyDB version</source>
+        <translation>ใช้ BerkeleyDB เวอร์ชัน</translation>
+    </message>
+    <message>
+        <source>Block chain</source>
+        <translation>Block chain</translation>
+    </message>
+    <message>
+        <source>Number of Masternodes</source>
+        <translation>จำนวน Masternodes</translation>
+    </message>
+    <message>
+        <source>Memory Pool</source>
+        <translation>หน่วยความจำ Pool</translation>
+    </message>
+    <message>
+        <source>Current number of transactions</source>
+        <translation>จำนวนธุรกรรมปัจจุบัน</translation>
+    </message>
+    <message>
+        <source>Memory usage</source>
+        <translation>การใช้ความจำ</translation>
+    </message>
+    <message>
+        <source>&amp;Console</source>
+        <translation>คอนโซล</translation>
+    </message>
+    <message>
+        <source>Clear console</source>
+        <translation>ล้างคอนโซล</translation>
+    </message>
+    <message>
+        <source>&amp;Network Traffic</source>
+        <translation>&amp;Network Traffic</translation>
+    </message>
+    <message>
+        <source>&amp;Clear</source>
+        <translation>ลบล้าง</translation>
+    </message>
+    <message>
+        <source>Totals</source>
+        <translation>ทั้งหมด</translation>
+    </message>
+    <message>
+        <source>Received</source>
+        <translation>ได้รับ</translation>
+    </message>
+    <message>
+        <source>Sent</source>
+        <translation>ส่ง</translation>
+    </message>
+    <message>
+        <source>&amp;Peers</source>
+        <translation>Peers</translation>
+    </message>
+    <message>
+        <source>Banned peers</source>
+        <translation>peers ที่ต้องห้าม</translation>
+    </message>
+    <message>
+        <source>Select a peer to view detailed information.</source>
+        <translation>เลือก Peer เพื่อดูรายละเอียด</translation>
+    </message>
+    <message>
+        <source>Whitelisted</source>
+        <translation>รายการที่อนุญาต</translation>
+    </message>
+    <message>
+        <source>Direction</source>
+        <translation>ทิศทาง</translation>
+    </message>
+    <message>
+        <source>Version</source>
+        <translation>เวอร์ชั่น</translation>
+    </message>
+    <message>
+        <source>Starting Block</source>
+        <translation>เริ่มต้นบล็อค</translation>
+    </message>
+    <message>
+        <source>Synced Headers</source>
+        <translation>ส่วนหัวที่ซิงโครไนซ์</translation>
+    </message>
+    <message>
+        <source>Synced Blocks</source>
+        <translation>บล็อคที่ซิงโครไนซ์</translation>
+    </message>
+    <message>
+        <source>Wallet Path</source>
+        <translation>เส้นทาง wallet</translation>
+    </message>
+    <message>
+        <source>User Agent</source>
+        <translation>ตัวแทนผู้ใช้</translation>
+    </message>
+    <message>
+        <source>Datadir</source>
+        <translation>Datadir</translation>
+    </message>
+    <message>
+        <source>Open the %1 debug log file from the current data directory. This can take a few seconds for large log files.</source>
+        <translation>เปิดแฟ้มบันทึกข้อผิดพลาด %1 จากไดเร็กทอรีข้อมูลปัจจุบัน อาจใช้เวลาสักครู่สำหรับไฟล์บันทึกขนาดใหญ่</translation>
+    </message>
+    <message>
+        <source>Decrease font size</source>
+        <translation>ลดขนาดตัวอักษร</translation>
+    </message>
+    <message>
+        <source>Increase font size</source>
+        <translation>เพิ่มขนาดตัวอักษร</translation>
+    </message>
+    <message>
+        <source>Services</source>
+        <translation>บริการ</translation>
+    </message>
+    <message>
+        <source>Ban Score</source>
+        <translation>Ban Score</translation>
+    </message>
+    <message>
+        <source>Connection Time</source>
+        <translation>เวลาในการเชื่อมต่อ</translation>
+    </message>
+    <message>
+        <source>Last Send</source>
+        <translation>ส่งล่าสุด</translation>
+    </message>
+    <message>
+        <source>Last Receive</source>
+        <translation>ได้รับล่าสุด</translation>
+    </message>
+    <message>
+        <source>Ping Time</source>
+        <translation>สัญญาณ Ping </translation>
+    </message>
+    <message>
+        <source>The duration of a currently outstanding ping.</source>
+        <translation>ระยะเวลาของ ping ที่โดดเด่นในปัจจุบัน</translation>
+    </message>
+    <message>
+        <source>Ping Wait</source>
+        <translation>รอ Ping</translation>
+    </message>
+    <message>
+        <source>Min Ping</source>
+        <translation>Min Ping</translation>
+    </message>
+    <message>
+        <source>Time Offset</source>
+        <translation>เวลาชดเชย</translation>
+    </message>
+    <message>
+        <source>&amp;Wallet Repair</source>
+        <translation>ซ่อม Wallet</translation>
+    </message>
+    <message>
+        <source>Salvage wallet</source>
+        <translation>กู้คืน Wallet</translation>
+    </message>
+    <message>
+        <source>Rescan blockchain files</source>
+        <translation>สแกน blockchain ไฟล์ใหม่</translation>
+    </message>
+    <message>
+        <source>Recover transactions 1</source>
+        <translation>กู้คืนการทำธุรกรรม 1</translation>
+    </message>
+    <message>
+        <source>Recover transactions 2</source>
+        <translation>กู้คืนการทำธุรกรรม 2</translation>
+    </message>
+    <message>
+        <source>Upgrade wallet format</source>
+        <translation>อัพเกรดรูปแบบ wallet</translation>
+    </message>
+    <message>
+        <source>The buttons below will restart the wallet with command-line options to repair the wallet, fix issues with corrupt blockhain files or missing/obsolete transactions.</source>
+        <translation>ปุ่มด้านล่างจะเริ่มต้น wallet ด้วยตัวเลือก command-line เพื่อซ่อมแซม wallet และแก้ไขปัญหาเกี่ยวกับไฟล์ blockhain ที่เสียหายหรือการทำธุรกรรมที่ขาดหายไป / ล้าสมัย</translation>
+    </message>
+    <message>
+        <source>-salvagewallet: Attempt to recover private keys from a corrupt wallet.dat.</source>
+        <translation>-salvagewallet: พยายามกู้คืนคีย์ส่วนตัวของ wallet.dat ที่เสียหาย</translation>
+    </message>
+    <message>
+        <source>-rescan: Rescan the block chain for missing wallet transactions.</source>
+        <translation>-rescan: สแกน blockchain ใหม่ สำหรับธุรกรรม wallet ที่ขาดหายไป</translation>
+    </message>
+    <message>
+        <source>-zapwallettxes=1: Recover transactions from blockchain (keep meta-data, e.g. account owner).</source>
+        <translation>-zapwallettxes=1: กู้คืนธุรกรรมจาก blockchain (เก็บ meta-data เช่น เจ้าของบัญชี)</translation>
+    </message>
+    <message>
+        <source>-zapwallettxes=2: Recover transactions from blockchain (drop meta-data).</source>
+        <translation>-zapwallettxes=2: กู้คืนธุรกรรมจาก blockchain (ทิ้ง meta-data)</translation>
+    </message>
+    <message>
+        <source>-upgradewallet: Upgrade wallet to latest format on startup. (Note: this is NOT an update of the wallet itself!)</source>
+        <translation>-upgradewallet: อัปเดต wallet เป็นรูปแบบสุดท้ายเมื่อเริ่มต้น (หมายเหตุ: นี่ไม่ใช่การปรับปรุงตัว wallet เอง!)</translation>
+    </message>
+    <message>
+        <source>Wallet repair options.</source>
+        <translation>ตัวเลือกการซ่อมแซม Wallet</translation>
+    </message>
+    <message>
+        <source>Rebuild index</source>
+        <translation>สร้างดัชนีใหม่</translation>
+    </message>
+    <message>
+        <source>-reindex: Rebuild block chain index from current blk000??.dat files.</source>
+        <translation>-reindex: สร้างดัชนี blockchain ใหม่จากไฟล์ blk000??.dat ปัจจุบัน</translation>
+    </message>
+    <message>
+        <source>&amp;Disconnect</source>
+        <translation>ยกเลิกการเชื่อมต่อ</translation>
+    </message>
+    <message>
+        <source>Ban for</source>
+        <translation>Ban สำหรับ</translation>
+    </message>
+    <message>
+        <source>1 &amp;hour</source>
+        <translation>1 &amp; ชั่วโมง</translation>
+    </message>
+    <message>
+        <source>1 &amp;day</source>
+        <translation>1 &amp; วัน</translation>
+    </message>
+    <message>
+        <source>1 &amp;week</source>
+        <translation>1 &amp;สัปดาห์</translation>
+    </message>
+    <message>
+        <source>1 &amp;year</source>
+        <translation>1 &amp; ปี</translation>
+    </message>
+    <message>
+        <source>&amp;Unban</source>
+        <translation>&amp;Unban</translation>
+    </message>
+    <message>
+        <source>Welcome to the %1 RPC console.</source>
+        <translation>ยินดีต้อนรับสู่คอนโซล %1 RPC</translation>
+    </message>
+    <message>
+        <source>Use up and down arrows to navigate history, and &lt;b&gt;Ctrl-L&lt;/b&gt; to clear screen.</source>
+        <translation>ใช้ลูกศรขึ้นและลงเพื่อเลื่อนดูประวัติ, และ &lt;b&gt;Ctrl-L&lt;/b&gt;เพื่อเคลียร์หน้าจอ</translation>
+    </message>
+    <message>
+        <source>Type &lt;b&gt;help&lt;/b&gt; for an overview of available commands.</source>
+        <translation>พิมพ์ &lt;b&gt;help&lt;/b&gt;สำหรับภาพรวมของคำสั่งที่พร้อมใช้งาน </translation>
+    </message>
+    <message>
+        <source>WARNING: Scammers have been active, telling users to type commands here, stealing their wallet contents. Do not use this console without fully understanding the ramification of a command.</source>
+        <translation>คำเตือน: สแกมเมอร์กำลังใช้งานอยู่, กำลังบอกให้ผู้ใช้พิมพ์คำสั่งที่นี่, ขโมยเนื้อหาใน wallet ได้  ห้ามใช้คอนโซลนี้โดยไม่เข้าใจส่วนย่อยของคำสั่ง</translation>
+    </message>
+    <message>
+        <source>In:</source>
+        <translation>ใน:</translation>
+    </message>
+    <message>
+        <source>Out:</source>
+        <translation>นอก​:</translation>
+    </message>
+    <message>
+        <source>Network activity disabled</source>
+        <translation>ปิดการใช้งานเครือข่ายแล้ว</translation>
+    </message>
+    <message>
+        <source>%1 B</source>
+        <translation>%1 B</translation>
+    </message>
+    <message>
+        <source>%1 KB</source>
+        <translation>%1 KB</translation>
+    </message>
+    <message>
+        <source>%1 MB</source>
+        <translation>%1 MB</translation>
+    </message>
+    <message>
+        <source>%1 GB</source>
+        <translation>%1 GB</translation>
+    </message>
+    <message>
+        <source>(node id: %1)</source>
+        <translation>(node id: %1)</translation>
+    </message>
+    <message>
+        <source>via %1</source>
+        <translation>via %1</translation>
+    </message>
+    <message>
+        <source>never</source>
+        <translation>ไม่เคย</translation>
+    </message>
+    <message>
+        <source>Inbound</source>
+        <translation>ขาเข้า</translation>
+    </message>
+    <message>
+        <source>Outbound</source>
+        <translation>ขาออก</translation>
+    </message>
+    <message>
+        <source>Yes</source>
+        <translation>ใช่</translation>
+    </message>
+    <message>
+        <source>No</source>
+        <translation>ไม่</translation>
+    </message>
+    <message>
+        <source>Unknown</source>
+        <translation>ไม่ทราบ</translation>
+    </message>
+</context>
+<context>
+    <name>ReceiveCoinsDialog</name>
+    <message>
+        <source>Reuse one of the previously used receiving addresses.&lt;br&gt;Reusing addresses has security and privacy issues.&lt;br&gt;Do not use this unless re-generating a payment request made before.</source>
+        <translation>ใช้ที่อยู่ที่ได้รับก่อนหน้านี้อีกครั้งนึง&lt;br&gt; การใช้ที่อยู่ซ้ำมีปัญหาด้านความปลอดภัยและความเป็นส่วนตัว&lt;br&gt;อย่าใช้ข้อมูลนี้เว้นแต่สร้างคำขอชำระเงินที่ทำขึ้นมาใหม่มาก่อน</translation>
+    </message>
+    <message>
+        <source>R&amp;euse an existing receiving address (not recommended)</source>
+        <translation>ใช้ที่อยู่รับที่มีอยู่ (ไม่แนะนำ)</translation>
+    </message>
+    <message>
+        <source>An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Dash network.</source>
+        <translation>ข้อความเสริมที่จะแนบไปกับคำขอการชำระเงินซึ่งจะแสดงขึ้นเมื่อมีการเปิดคำขอ หมายเหตุ: ข้อความจะไม่ถูกส่งพร้อมกับการชำระเงินผ่านเครือข่าย Dash</translation>
+    </message>
+    <message>
+        <source>&amp;Message:</source>
+        <translation>ข้อความ:</translation>
+    </message>
+    <message>
+        <source>An optional label to associate with the new receiving address.</source>
+        <translation>ป้ายกำกับเพิ่มเติมสำหรับเชื่อมโยงกับที่อยู่รับใหม่</translation>
+    </message>
+    <message>
+        <source>An optional message to attach to the payment request, which will be displayed when the request is opened.&lt;br&gt;Note: The message will not be sent with the payment over the Dash network.</source>
+        <translation>ข้อความเสริมที่จะแนบไปกับคำขอการชำระเงินซึ่งจะแสดงขึ้นเมื่อมีการเปิดคำขอ&lt;br&gt; หมายเหตุ: ข้อความจะไม่ถูกส่งพร้อมกับการชำระเงินผ่านเครือข่าย Dash</translation>
+    </message>
+    <message>
+        <source>Use this form to request payments. All fields are &lt;b&gt;optional&lt;/b&gt;.</source>
+        <translation>ใช้แบบฟอร์มนี้เพื่อขอการชำระเงิน ฟิลด์ทั้งหมดเป็นตัวเลือกเพิ่มเติม</translation>
+    </message>
+    <message>
+        <source>&amp;Label:</source>
+        <translation>&amp;ชื่อ:</translation>
+    </message>
+    <message>
+        <source>An optional amount to request. Leave this empty or zero to not request a specific amount.</source>
+        <translation>จำนวนขอเพิ่มเติม เว้นว่างไว้หรือศูนย์เพื่อไม่ให้มีการร้องขอจำนวนเงินที่ระบุ</translation>
+    </message>
+    <message>
+        <source>&amp;Amount:</source>
+        <translation>จำนวน:</translation>
+    </message>
+    <message>
+        <source>&amp;Request payment</source>
+        <translation>ขอชำระเงิน</translation>
+    </message>
+    <message>
+        <source>Clear all fields of the form.</source>
+        <translation>ล้างข้อมูลทั้งหมดของฟอร์ม</translation>
+    </message>
+    <message>
+        <source>Clear</source>
+        <translation>ลบล้าง</translation>
+    </message>
+    <message>
+        <source>Request InstantSend</source>
+        <translation>ขอ InstantSend</translation>
+    </message>
+    <message>
+        <source>Requested payments history</source>
+        <translation>ประวัติการชำระเงินที่ขอ</translation>
+    </message>
+    <message>
+        <source>Show the selected request (does the same as double clicking an entry)</source>
+        <translation>แสดงคำขอที่เลือก (ไม่เหมือนกับการดับเบิลคลิกรายการ)</translation>
+    </message>
+    <message>
+        <source>Show</source>
+        <translation>แสดง</translation>
+    </message>
+    <message>
+        <source>Remove the selected entries from the list</source>
+        <translation>ลบรายการที่เลือกออก</translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation>ลบออก</translation>
+    </message>
+    <message>
+        <source>Copy URI</source>
+        <translation>คัดลอก URI</translation>
+    </message>
+    <message>
+        <source>Copy label</source>
+        <translation>คัดลอกป้ายชื่อ</translation>
+    </message>
+    <message>
+        <source>Copy message</source>
+        <translation>คัดลอกข้อความ</translation>
+    </message>
+    <message>
+        <source>Copy amount</source>
+        <translation>คัดลอกจำนวน</translation>
+    </message>
+</context>
+<context>
+    <name>ReceiveRequestDialog</name>
+    <message>
+        <source>QR Code</source>
+        <translation>โค้ด QR</translation>
+    </message>
+    <message>
+        <source>Copy &amp;URI</source>
+        <translation>คัดลอก URI</translation>
+    </message>
+    <message>
+        <source>Copy &amp;Address</source>
+        <translation>คัดลอกที่อยู่</translation>
+    </message>
+    <message>
+        <source>&amp;Save Image...</source>
+        <translation>บันทึกรูปภาพ</translation>
+    </message>
+    <message>
+        <source>Request payment to %1</source>
+        <translation>ขอชำระเงินถึง %1</translation>
+    </message>
+    <message>
+        <source>Payment information</source>
+        <translation>ข้อมูลการชำระเงิน</translation>
+    </message>
+    <message>
+        <source>URI</source>
+        <translation>URI</translation>
+    </message>
+    <message>
+        <source>Address</source>
+        <translation>ที่อยู่</translation>
+    </message>
+    <message>
+        <source>Amount</source>
+        <translation>จำนวน</translation>
+    </message>
+    <message>
+        <source>Label</source>
+        <translation>ชื่อ</translation>
+    </message>
+    <message>
+        <source>Message</source>
+        <translation>ข้อความ</translation>
+    </message>
+    <message>
+        <source>InstantSend</source>
+        <translation>InstantSend</translation>
+    </message>
+    <message>
+        <source>Yes</source>
+        <translation>ใช่</translation>
+    </message>
+    <message>
+        <source>No</source>
+        <translation>ไม่</translation>
+    </message>
+    <message>
+        <source>Resulting URI too long, try to reduce the text for label / message.</source>
+        <translation>ผลลัพธ์ URI ยาวเกินไปพยายามลดข้อความสำหรับป้ายกำกับ / ข้อความ</translation>
+    </message>
+    <message>
+        <source>Error encoding URI into QR Code.</source>
+        <translation>เกิดข้อผิดพลาดในการเข้ารหัส URI ไปยัง QR Code</translation>
+    </message>
+</context>
+<context>
+    <name>RecentRequestsTableModel</name>
+    <message>
+        <source>Date</source>
+        <translation>วันที่</translation>
+    </message>
+    <message>
+        <source>Label</source>
+        <translation>ชื่อ</translation>
+    </message>
+    <message>
+        <source>Message</source>
+        <translation>ข้อความ</translation>
+    </message>
+    <message>
+        <source>(no label)</source>
+        <translation>(ไม่มีชื่อ)</translation>
+    </message>
+    <message>
+        <source>(no message)</source>
+        <translation>(ไม่มีข้อความ)</translation>
+    </message>
+    <message>
+        <source>(no amount requested)</source>
+        <translation>(ไม่ต้องขอวงเงิน)</translation>
+    </message>
+    <message>
+        <source>Requested</source>
+        <translation>ร้องขอ</translation>
+    </message>
+</context>
+<context>
+    <name>SendCoinsDialog</name>
+    <message>
+        <source>Send Coins</source>
+        <translation>ส่งเหรียญ</translation>
+    </message>
+    <message>
+        <source>Coin Control Features</source>
+        <translation>คุณสมบัติการควบคุมเหรียญ</translation>
+    </message>
+    <message>
+        <source>Inputs...</source>
+        <translation>ปัจจัยการผลิต...</translation>
+    </message>
+    <message>
+        <source>automatically selected</source>
+        <translation>เลือกโดยอัตโนมัติ</translation>
+    </message>
+    <message>
+        <source>Insufficient funds!</source>
+        <translation>เงินทุนไม่เพียงพอ</translation>
+    </message>
+    <message>
+        <source>Quantity:</source>
+        <translation>จำนวน:</translation>
+    </message>
+    <message>
+        <source>Bytes:</source>
+        <translation>ไบต์:</translation>
+    </message>
+    <message>
+        <source>Amount:</source>
+        <translation>จำนวน:</translation>
+    </message>
+    <message>
+        <source>Fee:</source>
+        <translation>ค่าธรรมเนียม:</translation>
+    </message>
+    <message>
+        <source>Dust:</source>
+        <translation>เศษ:</translation>
+    </message>
+    <message>
+        <source>After Fee:</source>
+        <translation>ส่วนที่เหลือจากค่าธรรมเนียม:</translation>
+    </message>
+    <message>
+        <source>Change:</source>
+        <translation>เงินทอน:</translation>
+    </message>
+    <message>
+        <source>If this is activated, but the change address is empty or invalid, change will be sent to a newly generated address.</source>
+        <translation>หากมีการเปิดใช้งาน แต่การเปลี่ยนแปลงที่อยู่ว่างเปล่าหรือไม่ถูกต้องการเปลี่ยนแปลงจะถูกส่งไปยังที่อยู่ที่สร้างใหม่</translation>
+    </message>
+    <message>
+        <source>Custom change address</source>
+        <translation>กำหนดการเปลี่ยนที่อยู่เอง</translation>
+    </message>
+    <message>
+        <source>Transaction Fee:</source>
+        <translation>ค่าธรรมเนียมการทำธุรกรรม:</translation>
+    </message>
+    <message>
+        <source>Choose...</source>
+        <translation>เลือก...</translation>
+    </message>
+    <message>
+        <source>Using the fallbackfee can result in sending a transaction that will take several hours or days (or never) to confirm. Consider choosing your fee manually or wait until your have validated the complete chain.</source>
+        <translation>การใช้ fallbackfee อาจส่งผลให้การส่งธุรกรรมที่ต้องใช้เวลาหลายชั่วโมงหรือหลายวัน (หรือไม่) เพื่อยืนยัน  พิจารณาเลือกค่าธรรมเนียมด้วยตนเองหรือรอจนกว่าคุณจะได้ตรวจสอบความสมบูรณ์ของสายโซ่</translation>
+    </message>
+    <message>
+        <source>Warning: Fee estimation is currently not possible.</source>
+        <translation>คำเตือน: ปัจจุบันการประมาณค่าใช้จ่ายไม่สามารถทำได้</translation>
+    </message>
+    <message>
+        <source>collapse fee-settings</source>
+        <translation>ยุบค่าธรรมเนียมการตั้งค่า</translation>
+    </message>
+    <message>
+        <source>Confirmation time target:</source>
+        <translation>การยืนยันเวลาเป้าหมาย</translation>
+    </message>
+    <message>
+        <source>PrivateSend</source>
+        <translation>PrivateSend</translation>
+    </message>
+    <message>
+        <source>InstantSend</source>
+        <translation>InstantSend</translation>
+    </message>
+    <message>
+        <source>If the custom fee is set to 1000 duffs and the transaction is only 250 bytes, then "per kilobyte" only pays 250 duffs in fee,&lt;br /&gt;while "at least" pays 1000 duffs. For transactions bigger than a kilobyte both pay by kilobyte.</source>
+        <translation>หากค่าธรรมเนียมที่กำหนดเองถูกตั้งค่าเป็น 1000 duffs และการทำธุรกรรมนี้มีเพียง 250 ไบต์   ซึ่ง "ต่อกิโลไบต์" จะจ่ายเพียง 250 duffs ในขณะที่ "อย่างน้อย" จ่าย 1000 duffs สำหรับธุรกรรมที่มีขนาดใหญ่กว่ากิโลไบต์จะต้องจ่ายเป็นกิโลไบต์</translation>
+    </message>
+    <message>
+        <source>If the custom fee is set to 1000 duffs and the transaction is only 250 bytes, then "per kilobyte" only pays 250 duffs in fee,&lt;br /&gt;while "total at least" pays 1000 duffs. For transactions bigger than a kilobyte both pay by kilobyte.</source>
+        <translation>หากค่าธรรมเนียมที่กำหนดเองถูกตั้งค่าเป็น 1000 duffs และการทำธุรกรรมนี้มีเพียง 250 ไบต์ ซึ่ง "ต่อกิโลไบต์" จะจ่ายเพียง 250 duffs ในขณะที่ "อย่างน้อยทั้งหมด" จ่าย 1000 duffs สำหรับธุรกรรมที่มีขนาดใหญ่กว่ากิโลไบต์จะต้องจ่ายเป็นกิโลไบต์</translation>
+    </message>
+    <message>
+        <source>Paying only the minimum fee is just fine as long as there is less transaction volume than space in the blocks.&lt;br /&gt;But be aware that this can end up in a never confirming transaction once there is more demand for dash transactions than the network can process.</source>
+        <translation>การจ่ายเงินเพียงค่าขั้นต่ำก็ทำได้ดีตราบเท่าที่ปริมาณธุรกรรมมีน้อยกว่าพื้นที่ในบล็อก&lt;br /&gt; แต่โปรดทราบว่าการจ่ายนี้จะสิ้นสุดลงในธุรกรรมที่ไม่เคยมีการยืนยัน ความต้องการใช้การทำธุรกรรมแบบ Dash มีมากกว่าที่เครือข่ายสามารถดำเนินการได้</translation>
+    </message>
+    <message>
+        <source>per kilobyte</source>
+        <translation>ต่อกิโลไบต์</translation>
+    </message>
+    <message>
+        <source>Hide</source>
+        <translation>ซ่อน</translation>
+    </message>
+    <message>
+        <source>total at least</source>
+        <translation>รวมอย่างน้อย</translation>
+    </message>
+    <message>
+        <source>(read the tooltip)</source>
+        <translation>(อ่านคำแนะนำ)</translation>
+    </message>
+    <message>
+        <source>Recommended:</source>
+        <translation>แนะนำ:</translation>
+    </message>
+    <message>
+        <source>Custom:</source>
+        <translation>กำหนดเอง:</translation>
+    </message>
+    <message>
+        <source>(Smart fee not initialized yet. This usually takes a few blocks...)</source>
+        <translation>(ค่าธรรมเนียมยังไม่ถูกเก็บ โดยปกติจะใช้สองสามบล็อค ... )</translation>
+    </message>
+    <message>
+        <source>normal</source>
+        <translation>ปกติ</translation>
+    </message>
+    <message>
+        <source>fast</source>
+        <translation>เร็ว</translation>
+    </message>
+    <message>
+        <source>Confirm the send action</source>
+        <translation>ยืนยันการส่ง</translation>
+    </message>
+    <message>
+        <source>S&amp;end</source>
+        <translation>ส่ง</translation>
+    </message>
+    <message>
+        <source>Clear all fields of the form.</source>
+        <translation>ล้างข้อมูลทั้งหมดของฟอร์ม</translation>
+    </message>
+    <message>
+        <source>Clear &amp;All</source>
+        <translation>ล้างทั้งหมด</translation>
+    </message>
+    <message>
+        <source>Send to multiple recipients at once</source>
+        <translation>ส่งไปยังผู้รับหลายรายพร้อมกัน</translation>
+    </message>
+    <message>
+        <source>Add &amp;Recipient</source>
+        <translation>เพิ่มผู้รับ</translation>
+    </message>
+    <message>
+        <source>Balance:</source>
+        <translation>ยอดคงเหลือ:</translation>
+    </message>
+    <message>
+        <source>Copy quantity</source>
+        <translation>คัดลอกปริมาณ</translation>
+    </message>
+    <message>
+        <source>Copy amount</source>
+        <translation>คัดลอกจำนวน</translation>
+    </message>
+    <message>
+        <source>Copy fee</source>
+        <translation>คัดลอกค่าธรรมเนียม</translation>
+    </message>
+    <message>
+        <source>Copy after fee</source>
+        <translation>คัดลอกหลังหักค่าธรรมเนียม</translation>
+    </message>
+    <message>
+        <source>Copy bytes</source>
+        <translation>คัดลอกไบต์</translation>
+    </message>
+    <message>
+        <source>Copy dust</source>
+        <translation>คัดลอก dust</translation>
+    </message>
+    <message>
+        <source>Copy change</source>
+        <translation>คัดลอกการเปลี่ยนแปลง</translation>
+    </message>
+    <message>
+        <source>using</source>
+        <translation>การใช้</translation>
+    </message>
+    <message>
+        <source>anonymous funds</source>
+        <translation>กองทุนที่ไม่ระบุตัวตน</translation>
+    </message>
+    <message>
+        <source>(privatesend requires this amount to be rounded up to the nearest %1).</source>
+        <translation>(privatesend ต้องใช้จำนวนเงินนี้เพื่อปัดเศษขึ้นให้อยู่ใกล้ที่สุด %1)</translation>
+    </message>
+    <message>
+        <source>any available funds (not anonymous)</source>
+        <translation>เงินทุนที่มีอยู่ (ไม่ระบุชื่อ)</translation>
+    </message>
+    <message>
+        <source>and InstantSend</source>
+        <translation>และ InstantSend</translation>
+    </message>
+    <message>
+        <source>%1 to %2</source>
+        <translation>%1 ถึง %2</translation>
+    </message>
+    <message>
+        <source>Are you sure you want to send?</source>
+        <translation>คุณแน่ใจว่าคุณต้องการส่งใช่หรือไม่?</translation>
+    </message>
+    <message>
+        <source>are added as transaction fee</source>
+        <translation>จะถูกเพิ่มเป็นค่าธรรมเนียมการทำธุรกรรม</translation>
+    </message>
+    <message>
+        <source>Total Amount = &lt;b&gt;%1&lt;/b&gt;&lt;br /&gt;= %2</source>
+        <translation>จำนวนเงินทั้งหมด = &lt;b&gt;%1&lt;/b&gt;  &lt;br /&gt;= %2</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;(%1 of %2 entries displayed)&lt;/b&gt;</source>
+        <translation>&lt;b&gt;(%1 of %2 รายการที่แสดง)&lt;/b&gt;</translation>
+    </message>
+    <message>
+        <source>Confirm send coins</source>
+        <translation>ยืนยันการส่งเหรียญ</translation>
+    </message>
+    <message>
+        <source>The recipient address is not valid. Please recheck.</source>
+        <translation>ที่อยู่ผู้รับไม่ถูกต้อง โปรดตรวจสอบอีกครั้ง</translation>
+    </message>
+    <message>
+        <source>The amount to pay must be larger than 0.</source>
+        <translation>จำนวนเงินที่จ่ายต้องมีมากกว่า 0</translation>
+    </message>
+    <message>
+        <source>The amount exceeds your balance.</source>
+        <translation>จำนวนเงินเกินยอดดุลของคุณ</translation>
+    </message>
+    <message>
+        <source>The total exceeds your balance when the %1 transaction fee is included.</source>
+        <translation>ยอดทั้งหมดเกินกว่ายอดรวมของคุณเมื่อรวมกับค่าธรรมเนียมธุรรมกรรม %1</translation>
+    </message>
+    <message>
+        <source>Duplicate address found: addresses should only be used once each.</source>
+        <translation>พบที่อยู่ซ้ำ: ควรใช้ที่อยู่เพียงครั้งเดียวเท่านั้น</translation>
+    </message>
+    <message>
+        <source>Transaction creation failed!</source>
+        <translation>การสร้างธุรกรรมล้มเหลว!</translation>
+    </message>
+    <message>
+        <source>The transaction was rejected with the following reason: %1</source>
+        <translation>การทำธุรกรรมถูกปฏิเสธด้วยเหตุผลดังต่อไปนี้: %1</translation>
+    </message>
+    <message>
+        <source>A fee higher than %1 is considered an absurdly high fee.</source>
+        <translation>ค่าธรรมเนียมสูงกว่า %1 ถือว่าเป็นค่าธรรมเนียมสูงอย่างไร้เหตุผล</translation>
+    </message>
+    <message>
+        <source>Payment request expired.</source>
+        <translation>คำขอชำระเงินหมดอายุแล้ว</translation>
+    </message>
+    <message numerus="yes">
+        <source>%n block(s)</source>
+        <translation><numerusform>%n  บล็อค</numerusform></translation>
+    </message>
+    <message>
+        <source>Pay only the required fee of %1</source>
+        <translation>จ่ายเฉพาะค่าธรรมเนียมที่ต้องการจาก %1</translation>
+    </message>
+    <message numerus="yes">
+        <source>Estimated to begin confirmation within %n block(s).</source>
+        <translation><numerusform>คาดว่าจะเริ่มการยืนยันภายใน %n บล็อค</numerusform></translation>
+    </message>
+    <message>
+        <source>Warning: Invalid Dash address</source>
+        <translation>คำเตือน: ที่อยู่ Dash ไม่ถูกต้อง</translation>
+    </message>
+    <message>
+        <source>Warning: Unknown change address</source>
+        <translation>คำเตือน: ที่อยู่ที่ไม่รู้จัก</translation>
+    </message>
+    <message>
+        <source>Confirm custom change address</source>
+        <translation>ยืนยันที่อยู่เปลี่ยนแบบกำหนดเอง</translation>
+    </message>
+    <message>
+        <source>The address you selected for change is not part of this wallet. Any or all funds in your wallet may be sent to this address. Are you sure?</source>
+        <translation>ที่อยู่ที่คุณเลือกสำหรับการเปลี่ยนแปลงไม่ใช่ส่วนหนึ่งของ wallet  เงินบางส่วนหรือทั้งหมดใน wallet ของคุณอาจจะถูกส่งไปยังที่อยู่นี้  คุณแน่ใจหรือไม่?</translation>
+    </message>
+    <message>
+        <source>(no label)</source>
+        <translation>(ไม่มีชื่อ)</translation>
+    </message>
+</context>
+<context>
+    <name>SendCoinsEntry</name>
+    <message>
+        <source>This is a normal payment.</source>
+        <translation>นี่เป็นการชำระเงินปกติ</translation>
+    </message>
+    <message>
+        <source>Pay &amp;To:</source>
+        <translation>จ่ายไปยัง:</translation>
+    </message>
+    <message>
+        <source>The Dash address to send the payment to</source>
+        <translation>ที่อยู่ Dash เพื่อส่งการชำระเงินไปที่</translation>
+    </message>
+    <message>
+        <source>Choose previously used address</source>
+        <translation>เลือกที่อยู่ที่ใช้ก่อนหน้านี้</translation>
+    </message>
+    <message>
+        <source>Alt+A</source>
+        <translation>Alt+A</translation>
+    </message>
+    <message>
+        <source>Paste address from clipboard</source>
+        <translation>วางที่อยู่จากคลิปบอร์ด</translation>
+    </message>
+    <message>
+        <source>Alt+P</source>
+        <translation>Alt+P</translation>
+    </message>
+    <message>
+        <source>Remove this entry</source>
+        <translation>นำรายการนี้ออก</translation>
+    </message>
+    <message>
+        <source>&amp;Label:</source>
+        <translation>&amp;ชื่อ:</translation>
+    </message>
+    <message>
+        <source>Enter a label for this address to add it to the list of used addresses</source>
+        <translation>ใส่ป้ายกำกับสำหรับที่อยู่นี้เพื่อเพิ่มลงในรายการที่อยู่ที่ใช้</translation>
+    </message>
+    <message>
+        <source>A&amp;mount:</source>
+        <translation>จำนวน:</translation>
+    </message>
+    <message>
+        <source>The fee will be deducted from the amount being sent. The recipient will receive a lower amount of Dash than you enter in the amount field. If multiple recipients are selected, the fee is split equally.</source>
+        <translation>ค่าธรรมเนียมจะถูกหักออกจากจำนวนเงินที่ส่ง ผู้รับจะได้รับ Dash น้อยกว่าที่คุณป้อนในฟิลด์ หากมีการเลือกผู้รับหลายรายค่าธรรมเนียมจะแบ่งเท่า ๆ กัน</translation>
+    </message>
+    <message>
+        <source>S&amp;ubtract fee from amount</source>
+        <translation>หักค่าบริการจากจำนวนเงิน</translation>
+    </message>
+    <message>
+        <source>Message:</source>
+        <translation>ข้อความ: </translation>
+    </message>
+    <message>
+        <source>A message that was attached to the dash: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Dash network.</source>
+        <translation>ข้อความที่แนบมาไปยัง Dash: URI ซึ่งจะถูกเก็บไว้กับธุรกรรมเพื่อเป็นข้อมูลอ้างอิงของคุณ  หมายเหตุ: ข้อความนี้จะถูกส่งไปยังเครือข่าย Dash </translation>
+    </message>
+    <message>
+        <source>This is an unauthenticated payment request.</source>
+        <translation>นี่คือคำขอชำระเงินที่ไม่ได้รับการพิสูจน์ตัวตน</translation>
+    </message>
+    <message>
+        <source>This is an authenticated payment request.</source>
+        <translation>นี่คือคำขอชำระเงินที่ได้รับการพิสูจน์ตัวตน</translation>
+    </message>
+    <message>
+        <source>Pay To:</source>
+        <translation>จ่ายไปยัง: </translation>
+    </message>
+    <message>
+        <source>Memo:</source>
+        <translation>Memo:</translation>
+    </message>
+    <message>
+        <source>Enter a label for this address to add it to your address book</source>
+        <translation>ป้อนป้ายกำกับสำหรับที่อยู่นี้เพื่อเพิ่มลงในสมุดที่อยู่ของคุณ</translation>
+    </message>
+</context>
+<context>
+    <name>SendConfirmationDialog</name>
+    <message>
+        <source>Yes</source>
+        <translation>ใช่</translation>
+    </message>
+</context>
+<context>
+    <name>ShutdownWindow</name>
+    <message>
+        <source>%1 is shutting down...</source>
+        <translation>%1 กำลังปิด...</translation>
+    </message>
+    <message>
+        <source>Do not shut down the computer until this window disappears.</source>
+        <translation>อย่าปิดคอมพิวเตอร์จนกว่าหน้าต่างนี้จะหายไป</translation>
+    </message>
+</context>
+<context>
+    <name>SignVerifyMessageDialog</name>
+    <message>
+        <source>Signatures - Sign / Verify a Message</source>
+        <translation>ลายเซ็น - ลงชื่อ / ยืนยันข้อความ</translation>
+    </message>
+    <message>
+        <source>&amp;Sign Message</source>
+        <translation>ลงนามข้อความ</translation>
+    </message>
+    <message>
+        <source>You can sign messages/agreements with your addresses to prove you can receive Dash sent to them. Be careful not to sign anything vague or random, as phishing attacks may try to trick you into signing your identity over to them. Only sign fully-detailed statements you agree to.</source>
+        <translation>คุณสามารถลงนามในข้อความ / ข้อตกลงกับที่อยู่ของคุณเพื่อพิสูจน์ว่าคุณสามารถรับ Dash ส่งถึงพวกเขาได้  ระวังอย่าเซ็นชื่ออะไรที่กำกวม เนื่องจากการโจมตีแบบฟิชชิ่งอาจพยายามหลอกล่อให้คุณเซ็นชื่อตัวคุณเอง เพียงลงนามในคำชี้แจงอย่างละเอียดที่คุณเห็นด้วยเท่านั้น</translation>
+    </message>
+    <message>
+        <source>The Dash address to sign the message with</source>
+        <translation>ที่อยู่ Dash เพื่อเซ็นชื่อ</translation>
+    </message>
+    <message>
+        <source>Choose previously used address</source>
+        <translation>เลือกที่อยู่ที่ใช้ก่อนหน้านี้</translation>
+    </message>
+    <message>
+        <source>Alt+A</source>
+        <translation>Alt+A</translation>
+    </message>
+    <message>
+        <source>Paste address from clipboard</source>
+        <translation>วางที่อยู่จากคลิปบอร์ด</translation>
+    </message>
+    <message>
+        <source>Alt+P</source>
+        <translation>Alt+P</translation>
+    </message>
+    <message>
+        <source>Enter the message you want to sign here</source>
+        <translation>ป้อนข้อความที่คุณต้องการลงชื่อเข้าใช้ที่นี่</translation>
+    </message>
+    <message>
+        <source>Signature</source>
+        <translation>ลายเซ็น</translation>
+    </message>
+    <message>
+        <source>Copy the current signature to the system clipboard</source>
+        <translation>คัดลอกลายเซ็นปัจจุบันไปยังคลิปบอร์ดของระบบ</translation>
+    </message>
+    <message>
+        <source>Sign the message to prove you own this Dash address</source>
+        <translation>ลงนามข้อความเพื่อพิสูจน์ว่าคุณเป็นเจ้าของที่อยู่ Dash นี้</translation>
+    </message>
+    <message>
+        <source>Sign &amp;Message</source>
+        <translation>ลงนามข้อความ</translation>
+    </message>
+    <message>
+        <source>Reset all sign message fields</source>
+        <translation>รีเซ็ตช่องข้อความทั้งหมด</translation>
+    </message>
+    <message>
+        <source>Clear &amp;All</source>
+        <translation>ลบทั้งหมด</translation>
+    </message>
+    <message>
+        <source>&amp;Verify Message</source>
+        <translation>ยืนยันข้อความ</translation>
+    </message>
+    <message>
+        <source>Enter the receiver's address, message (ensure you copy line breaks, spaces, tabs, etc. exactly) and signature below to verify the message. Be careful not to read more into the signature than what is in the signed message itself, to avoid being tricked by a man-in-the-middle attack. Note that this only proves the signing party receives with the address, it cannot prove sendership of any transaction!</source>
+        <translation>ป้อนที่อยู่ของผู้รับข้อความ (ตรวจสอบให้แน่ใจว่าคุณได้คัดลอกเว้นวรรค ช่องว่าง ย่อหน้า ฯลฯ ) และลายเซ็นด้านล่างเพื่อยืนยันข้อความ โปรดระวังอย่าใช้ข้อมูลมากกว่าข้อความที่เซ็นชื่อไว้เพื่อหลีกเลี่ยงการฉ้อโกงโดยอาศัยการโจมตีแบบ man-in-the-middle โปรดทราบว่าสิ่งนี้พิสูจน์ให้เห็นว่าบุคคลที่ลงนามได้รับพร้อมกับที่อยู่แล้วไม่สามารถพิสูจน์ว่ามีผู้ส่งรายการใด ๆ !</translation>
+    </message>
+    <message>
+        <source>The Dash address the message was signed with</source>
+        <translation>ข้อความที่อยู่ Dash ถูกเซ็นชื่อด้วย</translation>
+    </message>
+    <message>
+        <source>Verify the message to ensure it was signed with the specified Dash address</source>
+        <translation>ยืนยันข้อความเพื่อให้แน่ใจว่าข้อความถูกเซ็นชื่อด้วยที่อยู่ Dash ที่ระบุ</translation>
+    </message>
+    <message>
+        <source>Verify &amp;Message</source>
+        <translation>ยืนยันข้อความ</translation>
+    </message>
+    <message>
+        <source>Reset all verify message fields</source>
+        <translation>รีเซ็ตข้อความยืนยันทั้งหมด</translation>
+    </message>
+    <message>
+        <source>Click "Sign Message" to generate signature</source>
+        <translation>คลิก "ลงนามข้อความ" เพื่อสร้างลายเซ็น</translation>
+    </message>
+    <message>
+        <source>The entered address is invalid.</source>
+        <translation>ที่อยู่ที่ป้อนไม่ถูกต้อง</translation>
+    </message>
+    <message>
+        <source>Please check the address and try again.</source>
+        <translation>โปรดตรวจสอบที่อยู่และลองอีกครั้ง</translation>
+    </message>
+    <message>
+        <source>The entered address does not refer to a key.</source>
+        <translation>ที่อยู่ที่ป้อนไม่ตรงกับคีย์</translation>
+    </message>
+    <message>
+        <source>Wallet unlock was cancelled.</source>
+        <translation>ยกเลิกการปลดล็อก Wallet แล้ว</translation>
+    </message>
+    <message>
+        <source>Private key for the entered address is not available.</source>
+        <translation>คีย์ส่วนตัวสำหรับที่อยู่ที่ป้อนไปไม่สามารถใช้งานได้</translation>
+    </message>
+    <message>
+        <source>Message signing failed.</source>
+        <translation>การลงชื่อข้อความล้มเหลว</translation>
+    </message>
+    <message>
+        <source>Message signed.</source>
+        <translation>ข้อความที่ลงชื่อแล้ว</translation>
+    </message>
+    <message>
+        <source>The signature could not be decoded.</source>
+        <translation>ลายเซ็นไม่สามารถอ่านได้</translation>
+    </message>
+    <message>
+        <source>Please check the signature and try again.</source>
+        <translation>โปรดตรวจสอบลายเซ็นและลองอีกครั้ง</translation>
+    </message>
+    <message>
+        <source>The signature did not match the message digest.</source>
+        <translation>ลายเซ็นไม่ตรงกับข้อความ</translation>
+    </message>
+    <message>
+        <source>Message verification failed.</source>
+        <translation>การยืนยันข้อความล้มเหลว</translation>
+    </message>
+    <message>
+        <source>Message verified.</source>
+        <translation>ข้อความได้รับการยืนยัน</translation>
+    </message>
+</context>
+<context>
+    <name>SplashScreen</name>
+    <message>
+        <source>[testnet]</source>
+        <translation>[testnet]</translation>
+    </message>
+    <message>
+        <source>Version %1</source>
+        <translation>เวอร์ชั่น %1</translation>
+    </message>
+</context>
+<context>
+    <name>TrafficGraphWidget</name>
+    <message>
+        <source>KB/s</source>
+        <translation>KB/s</translation>
+    </message>
+</context>
+<context>
+    <name>TransactionDesc</name>
+    <message numerus="yes">
+        <source>Open for %n more block(s)</source>
+        <translation><numerusform>เปิดสำหรับ  %n บล็อกเพิ่มเติม</numerusform></translation>
+    </message>
+    <message>
+        <source>Open until %1</source>
+        <translation>เปิดจนถึง %1</translation>
+    </message>
+    <message>
+        <source>conflicted</source>
+        <translation>ขัดแย้ง</translation>
+    </message>
+    <message>
+        <source>%1/offline</source>
+        <translation>%1 / ออฟไลน์</translation>
+    </message>
+    <message>
+        <source>0/unconfirmed, %1</source>
+        <translation>0 / ยังไม่ได้ยืนยัน %1</translation>
+    </message>
+    <message>
+        <source>in memory pool</source>
+        <translation>ในหน่วยความจำ pool</translation>
+    </message>
+    <message>
+        <source>not in memory pool</source>
+        <translation>ไม่อยู่ในหน่วยความจำ pool</translation>
+    </message>
+    <message>
+        <source>abandoned</source>
+        <translation>ถูกละทิ้ง</translation>
+    </message>
+    <message>
+        <source>%1/unconfirmed</source>
+        <translation>%1 / ยังไม่ได้ยืนยัน</translation>
+    </message>
+    <message>
+        <source>%1 confirmations</source>
+        <translation>%1 ยืนยัน</translation>
+    </message>
+    <message>
+        <source>verified via InstantSend</source>
+        <translation>ยืนยันผ่าน InstantSend</translation>
+    </message>
+    <message>
+        <source>InstantSend verification in progress - %1 of %2 signatures</source>
+        <translation>การยืนยันของ InstantSend อยู่ระหว่างดำเนินการ - ลายเซ็น %1 ของ %2</translation>
+    </message>
+    <message>
+        <source>InstantSend verification failed</source>
+        <translation>การยืนยัน InstantSend ล้มเหลว</translation>
+    </message>
+    <message>
+        <source>Status</source>
+        <translation>สถานะ</translation>
+    </message>
+    <message>
+        <source>, has not been successfully broadcast yet</source>
+        <translation>ยังถ่ายทอดไม่สำเร็จ</translation>
+    </message>
+    <message numerus="yes">
+        <source>, broadcast through %n node(s)</source>
+        <translation><numerusform>, ถ่ายทอดผ่าน %n โหนด</numerusform></translation>
+    </message>
+    <message>
+        <source>Date</source>
+        <translation>วันที่</translation>
+    </message>
+    <message>
+        <source>Source</source>
+        <translation>ซอร์ส</translation>
+    </message>
+    <message>
+        <source>Generated</source>
+        <translation>สร้าง</translation>
+    </message>
+    <message>
+        <source>From</source>
+        <translation>จาก</translation>
+    </message>
+    <message>
+        <source>unknown</source>
+        <translation>ไม่ทราบ</translation>
+    </message>
+    <message>
+        <source>To</source>
+        <translation>ถึง</translation>
+    </message>
+    <message>
+        <source>own address</source>
+        <translation>ที่อยู่ของตัวเอง</translation>
+    </message>
+    <message>
+        <source>watch-only</source>
+        <translation>ดูเท่านั้น</translation>
+    </message>
+    <message>
+        <source>label</source>
+        <translation>ชื่อ</translation>
+    </message>
+    <message>
+        <source>Credit</source>
+        <translation>เครดิต</translation>
+    </message>
+    <message numerus="yes">
+        <source>matures in %n more block(s)</source>
+        <translation><numerusform>ครบกำหนดในอีก %n บล็อค</numerusform></translation>
+    </message>
+    <message>
+        <source>not accepted</source>
+        <translation>ไม่ยอมรับ</translation>
+    </message>
+    <message>
+        <source>Debit</source>
+        <translation>เดบิต</translation>
+    </message>
+    <message>
+        <source>Total debit</source>
+        <translation>เดบิตทั้งหมด</translation>
+    </message>
+    <message>
+        <source>Total credit</source>
+        <translation>เครดิตทั้งหมด</translation>
+    </message>
+    <message>
+        <source>Transaction fee</source>
+        <translation>ค่าธรรมเนียมการทำธุรกรรม</translation>
+    </message>
+    <message>
+        <source>Net amount</source>
+        <translation>ปริมาณสุทธิ</translation>
+    </message>
+    <message>
+        <source>Message</source>
+        <translation>ข้อความ</translation>
+    </message>
+    <message>
+        <source>Comment</source>
+        <translation>ความคิดเห็น</translation>
+    </message>
+    <message>
+        <source>Transaction ID</source>
+        <translation>ไอดีธุรกรรม</translation>
+    </message>
+    <message>
+        <source>Output index</source>
+        <translation>ดัชนีผลผลิต</translation>
+    </message>
+    <message>
+        <source>Transaction total size</source>
+        <translation>ขนาดธุรกรรมทั้งหมด</translation>
+    </message>
+    <message>
+        <source>Merchant</source>
+        <translation>ร้านค้า</translation>
+    </message>
+    <message>
+        <source>Generated coins must mature %1 blocks before they can be spent. When you generated this block, it was broadcast to the network to be added to the block chain. If it fails to get into the chain, its state will change to "not accepted" and it won't be spendable. This may occasionally happen if another node generates a block within a few seconds of yours.</source>
+        <translation>เหรียญที่สร้างต้องครบกำหนด %1 ของบล็อกก่อนที่จะสามารถใช้จ่ายได้ เมื่อสร้างบล็อคนี้จะถูกส่งไปยังเครือข่ายเพื่อเพิ่มเข้าไปในบล็อก หากคุณไม่สามารถเข้าสู่สถานะนี้ มันจะเปลี่ยนเป็น "ไม่ยอมรับ" และไม่สามารถใช้จ่ายได้อีกต่อไป กรณีนี้อาจเกิดขึ้นเป็นครั้งคราวหากโหนดอื่นสร้างบล็อกไม่กี่วินาที</translation>
+    </message>
+    <message>
+        <source>Debug information</source>
+        <translation>ข้อมูล Debug</translation>
+    </message>
+    <message>
+        <source>Transaction</source>
+        <translation>ธุรกรรม</translation>
+    </message>
+    <message>
+        <source>Inputs</source>
+        <translation>อินพุต</translation>
+    </message>
+    <message>
+        <source>Amount</source>
+        <translation>จำนวน</translation>
+    </message>
+    <message>
+        <source>true</source>
+        <translation>จริง</translation>
+    </message>
+    <message>
+        <source>false</source>
+        <translation>เท็จ</translation>
+    </message>
+</context>
+<context>
+    <name>TransactionDescDialog</name>
+    <message>
+        <source>This pane shows a detailed description of the transaction</source>
+        <translation>หน้าต่างนี้จะแสดงข้อมูลโดยละเอียดเกี่ยวกับการทำธุรกรรม</translation>
+    </message>
+    <message>
+        <source>Details for %1</source>
+        <translation>รายละเอียดสำหรับ %1</translation>
+    </message>
+</context>
+<context>
+    <name>TransactionTableModel</name>
+    <message>
+        <source>Date</source>
+        <translation>วันที่</translation>
+    </message>
+    <message>
+        <source>Type</source>
+        <translation>ประเภท</translation>
+    </message>
+    <message>
+        <source>Address / Label</source>
+        <translation>ที่อยู่ / ป้ายชื่อ</translation>
+    </message>
+    <message numerus="yes">
+        <source>Open for %n more block(s)</source>
+        <translation><numerusform>เปิดอีก %n  บล็อค</numerusform></translation>
+    </message>
+    <message>
+        <source>Open until %1</source>
+        <translation>เปิดจนถึง %1</translation>
+    </message>
+    <message>
+        <source>Offline</source>
+        <translation>ออฟไลน์</translation>
+    </message>
+    <message>
+        <source>Unconfirmed</source>
+        <translation>ไม่มีการยืนยัน</translation>
+    </message>
+    <message>
+        <source>Abandoned</source>
+        <translation>ละทิ้ง</translation>
+    </message>
+    <message>
+        <source>Confirming (%1 of %2 recommended confirmations)</source>
+        <translation>ยืนยัน (%1 จาก %2 แนะนำการยืนยัน)</translation>
+    </message>
+    <message>
+        <source>Confirmed (%1 confirmations)</source>
+        <translation>ยืนยันแล้ว (ยืนยัน %1)</translation>
+    </message>
+    <message>
+        <source>Conflicted</source>
+        <translation>ขัดแย้ง</translation>
+    </message>
+    <message>
+        <source>Immature (%1 confirmations, will be available after %2)</source>
+        <translation>ยังไม่สมบูรณ์ (การยืนยัน %1 จะพร้อมใช้งานหลังจาก %2)</translation>
+    </message>
+    <message>
+        <source>This block was not received by any other nodes and will probably not be accepted!</source>
+        <translation>บล็อกนี้ไม่ได้รับโดยโหนดอื่น ๆ และอาจจะไม่ได้รับการยอมรับ!</translation>
+    </message>
+    <message>
+        <source>Generated but not accepted</source>
+        <translation>สร้างแล้ว แต่ไม่ยอมรับ</translation>
+    </message>
+    <message>
+        <source>Received with</source>
+        <translation>ได้รับด้วย</translation>
+    </message>
+    <message>
+        <source>Received from</source>
+        <translation>ได้รับจาก</translation>
+    </message>
+    <message>
+        <source>Received via PrivateSend</source>
+        <translation>ได้รับผ่าน PrivateSend</translation>
+    </message>
+    <message>
+        <source>Sent to</source>
+        <translation>ส่งถึง</translation>
+    </message>
+    <message>
+        <source>Payment to yourself</source>
+        <translation>ชำระเงินด้วยตัวคุณเอง</translation>
+    </message>
+    <message>
+        <source>Mined</source>
+        <translation>Mined</translation>
+    </message>
+    <message>
+        <source>PrivateSend Denominate</source>
+        <translation>PrivateSend Denominate</translation>
+    </message>
+    <message>
+        <source>PrivateSend Collateral Payment</source>
+        <translation>หลักประกันการชำระเงิน PrivateSend </translation>
+    </message>
+    <message>
+        <source>PrivateSend Make Collateral Inputs</source>
+        <translation>PrivateSend สร้างการป้อนข้อมูลหลักประกัน</translation>
+    </message>
+    <message>
+        <source>PrivateSend Create Denominations</source>
+        <translation>PrivateSend สร้างหน่วยเงิน</translation>
+    </message>
+    <message>
+        <source>PrivateSend</source>
+        <translation>PrivateSend</translation>
+    </message>
+    <message>
+        <source>watch-only</source>
+        <translation>ดูเท่านั้น</translation>
+    </message>
+    <message>
+        <source>(n/a)</source>
+        <translation>(n/a)</translation>
+    </message>
+    <message>
+        <source>(no label)</source>
+        <translation>(ไม่มีชื่อ)</translation>
+    </message>
+    <message>
+        <source>Transaction status. Hover over this field to show number of confirmations.</source>
+        <translation>สถานะของธุรกรรม เลื่อนเมาส์ไปที่ฟิลด์นี้เพื่อดูจำนวนการยืนยัน</translation>
+    </message>
+    <message>
+        <source>Date and time that the transaction was received.</source>
+        <translation>วันที่และเวลาที่ได้รับธุรกรรม</translation>
+    </message>
+    <message>
+        <source>Type of transaction.</source>
+        <translation>ประเภทของธุรกรรม</translation>
+    </message>
+    <message>
+        <source>Whether or not a watch-only address is involved in this transaction.</source>
+        <translation>ไม่ว่าจะเป็นที่อยู่สำหรับดูอย่างเดียวหรือไม่ก็ตามก็เกี่ยวข้องกับธุรกรรมนี้</translation>
+    </message>
+    <message>
+        <source>User-defined intent/purpose of the transaction.</source>
+        <translation>เจตนา / วัตถุประสงค์ที่กำหนดโดยผู้ใช้ของธุรกรรม</translation>
+    </message>
+    <message>
+        <source>Amount removed from or added to balance.</source>
+        <translation>จำนวนเงินที่ลบออกจากยอดคงเหลือหรือเพิ่มลงในยอดคงเหลือ</translation>
+    </message>
+</context>
+<context>
+    <name>TransactionView</name>
+    <message>
+        <source>All</source>
+        <translation>ทั้งหมด</translation>
+    </message>
+    <message>
+        <source>Today</source>
+        <translation>วันนี้</translation>
+    </message>
+    <message>
+        <source>This week</source>
+        <translation>สัปดาห์นี้</translation>
+    </message>
+    <message>
+        <source>This month</source>
+        <translation>เดือนนี้</translation>
+    </message>
+    <message>
+        <source>Last month</source>
+        <translation>เดือนที่แล้ว</translation>
+    </message>
+    <message>
+        <source>This year</source>
+        <translation>ปีนี้</translation>
+    </message>
+    <message>
+        <source>Range...</source>
+        <translation>ช่วง...</translation>
+    </message>
+    <message>
+        <source>Most Common</source>
+        <translation>ใช้บ่อยที่สุด</translation>
+    </message>
+    <message>
+        <source>Received with</source>
+        <translation>ได้รับด้วย</translation>
+    </message>
+    <message>
+        <source>Sent to</source>
+        <translation>ส่งถึง</translation>
+    </message>
+    <message>
+        <source>PrivateSend</source>
+        <translation>PrivateSend</translation>
+    </message>
+    <message>
+        <source>PrivateSend Make Collateral Inputs</source>
+        <translation>PrivateSend สร้างการป้อนข้อมูลหลักประกัน</translation>
+    </message>
+    <message>
+        <source>PrivateSend Create Denominations</source>
+        <translation>PrivateSend สร้างหน่วยเงิน</translation>
+    </message>
+    <message>
+        <source>PrivateSend Denominate</source>
+        <translation>PrivateSend Denominate</translation>
+    </message>
+    <message>
+        <source>PrivateSend Collateral Payment</source>
+        <translation>PrivateSend หลักประกันการชำระเงิน</translation>
+    </message>
+    <message>
+        <source>To yourself</source>
+        <translation>ถึงของคุณ</translation>
+    </message>
+    <message>
+        <source>Mined</source>
+        <translation>ขุด</translation>
+    </message>
+    <message>
+        <source>Other</source>
+        <translation>อื่นๆ</translation>
+    </message>
+    <message>
+        <source>Enter address or label to search</source>
+        <translation>ป้อนที่อยู่หรือป้ายชื่อที่ต้องการค้นหา</translation>
+    </message>
+    <message>
+        <source>Min amount</source>
+        <translation>จำนวนเงินขั้นต่ำ</translation>
+    </message>
+    <message>
+        <source>Abandon transaction</source>
+        <translation>ยกเลิกรายการ</translation>
+    </message>
+    <message>
+        <source>Copy address</source>
+        <translation>คัดลอกที่อยู่</translation>
+    </message>
+    <message>
+        <source>Copy label</source>
+        <translation>คัดลอกป้ายชื่อ</translation>
+    </message>
+    <message>
+        <source>Copy amount</source>
+        <translation>คัดลอกจำนวน</translation>
+    </message>
+    <message>
+        <source>Copy transaction ID</source>
+        <translation>คัดลอก ID ธุรกรรม</translation>
+    </message>
+    <message>
+        <source>Copy raw transaction</source>
+        <translation>คัดลอกธุรกรรมดิบ</translation>
+    </message>
+    <message>
+        <source>Copy full transaction details</source>
+        <translation>คัดลอกรายละเอียดธุรกรรมทั้งหมด</translation>
+    </message>
+    <message>
+        <source>Edit label</source>
+        <translation>แก้ไขป้ายชื่อ</translation>
+    </message>
+    <message>
+        <source>Show transaction details</source>
+        <translation>แสดงรายละเอียดธุรกรรม</translation>
+    </message>
+    <message>
+        <source>Export Transaction History</source>
+        <translation>ส่งออกประวัติการทำธุรกรรม</translation>
+    </message>
+    <message>
+        <source>Comma separated file (*.csv)</source>
+        <translation>ไฟล์ที่คั่นด้วยจุลภาค (* .csv)</translation>
+    </message>
+    <message>
+        <source>Confirmed</source>
+        <translation>ยืนยันแล้ว</translation>
+    </message>
+    <message>
+        <source>Watch-only</source>
+        <translation>ดูเท่านั้น</translation>
+    </message>
+    <message>
+        <source>Date</source>
+        <translation>วันที่</translation>
+    </message>
+    <message>
+        <source>Type</source>
+        <translation>รูปแบบ</translation>
+    </message>
+    <message>
+        <source>Label</source>
+        <translation>ชื่อ</translation>
+    </message>
+    <message>
+        <source>Address</source>
+        <translation>ที่อยู่</translation>
+    </message>
+    <message>
+        <source>ID</source>
+        <translation>ID</translation>
+    </message>
+    <message>
+        <source>Exporting Failed</source>
+        <translation>การส่งออกล้มเหลว</translation>
+    </message>
+    <message>
+        <source>There was an error trying to save the transaction history to %1.</source>
+        <translation>เกิดข้อผิดพลาดขณะพยายามบันทึกประวัติการทำธุรกรรมเป็น %1</translation>
+    </message>
+    <message>
+        <source>Exporting Successful</source>
+        <translation>การส่งออกสำเร็จ</translation>
+    </message>
+    <message>
+        <source>The transaction history was successfully saved to %1.</source>
+        <translation>บันทึกประวัติการทำธุรกรรมสำเร็จแล้วที่ %1</translation>
+    </message>
+    <message>
+        <source>Range:</source>
+        <translation>ช่วง: </translation>
+    </message>
+    <message>
+        <source>to</source>
+        <translation>ถึง</translation>
+    </message>
+</context>
+<context>
+    <name>UnitDisplayStatusBarControl</name>
+    <message>
+        <source>Unit to show amounts in. Click to select another unit.</source>
+        <translation>หน่วยเพื่อแสดงจำนวนเงิน คลิกเพื่อเลือกหน่วยอื่น</translation>
+    </message>
+</context>
+<context>
+    <name>WalletFrame</name>
+    <message>
+        <source>No wallet has been loaded.</source>
+        <translation>ไม่ได้มีการโหลด wallet </translation>
+    </message>
+</context>
+<context>
+    <name>WalletModel</name>
+    <message>
+        <source>Send Coins</source>
+        <translation>ส่งเหรียญ</translation>
+    </message>
+    <message>
+        <source>InstantSend doesn't support sending values that high yet. Transactions are currently limited to %1 DASH.</source>
+        <translation>InstantSend ไม่สนับสนุนการส่งค่าที่สูงเกินไป  ธุรกรรมปัจจุบันถูก จำกัด ไว้ที่ %1 DASH</translation>
+    </message>
+    <message>
+        <source>Used way too many inputs (&gt;%1) for this InstantSend transaction, fees could be huge.</source>
+        <translation>จำนวนอินพุทที่ใช้มากเกินไป (&gt;%1) สำหรับการทำธุรกรรม InstantSend นี้ ค่าธรรมเนียมค่อนข้างสูง</translation>
+    </message>
+</context>
+<context>
+    <name>WalletView</name>
+    <message>
+        <source>&amp;Export</source>
+        <translation>&amp;ส่งออก</translation>
+    </message>
+    <message>
+        <source>Export the data in the current tab to a file</source>
+        <translation>ส่งออกข้อมูลที่อยู่ในแท็บไปที่ไฟล์</translation>
+    </message>
+    <message>
+        <source>Selected amount:</source>
+        <translation>จำนวนที่เลือก:</translation>
+    </message>
+    <message>
+        <source>Backup Wallet</source>
+        <translation>สำรอง Wallet </translation>
+    </message>
+    <message>
+        <source>Wallet Data (*.dat)</source>
+        <translation>Wallet Data (*.dat)</translation>
+    </message>
+    <message>
+        <source>Backup Failed</source>
+        <translation>สำรองข้อมูลล้มเหลว </translation>
+    </message>
+    <message>
+        <source>There was an error trying to save the wallet data to %1.</source>
+        <translation>เกิดข้อผิดพลาดขณะพยายามบันทึกข้อมูล wallet ไปที่ %1</translation>
+    </message>
+    <message>
+        <source>Backup Successful</source>
+        <translation>สำรองข้อมูลสำเร็จ</translation>
+    </message>
+    <message>
+        <source>The wallet data was successfully saved to %1.</source>
+        <translation>บันทึกข้อมูล wallet สำเร็จแล้วที่ %1</translation>
+    </message>
+</context>
+<context>
+    <name>dash-core</name>
+    <message>
+        <source>Bind to given address and always listen on it. Use [host]:port notation for IPv6</source>
+        <translation>เชื่อมโยงไปยังที่อยู่ที่กำหนดและฟังเสมอ โปรดใช้รูปแบบ  [host]:port สำหรับ IPv6</translation>
+    </message>
+    <message>
+        <source>Error: Listening for incoming connections failed (listen returned error %s)</source>
+        <translation>ข้อผิดพลาด: ฟังการเชื่อมต่อขาเข้าล้มเหลว (ฟังข้อผิดพลาด %s)</translation>
+    </message>
+    <message>
+        <source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source>
+        <translation>ดำเนินการคำสั่งเมื่อได้รับการแจ้งเตือนที่เกี่ยวข้องหรือเราเห็น fork ที่ยาวมาก (%s ในคำสั่งจะถูกแทนที่ด้วยข้อความ)</translation>
+    </message>
+    <message>
+        <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source>
+        <translation>ดำเนินการคำสั่งเมื่อมีการเปลี่ยนแปลงธุรกรรม wallet  (%s ใน cmd จะถูกแทนที่ด้วย TxID)</translation>
+    </message>
+    <message>
+        <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source>
+        <translation>ดำเนินการคำสั่งเมื่อมีการเปลี่ยนแปลงที่ดีที่สุดของบล็อก (%s ใน cmd ถูกแทนที่ด้วย block hash)</translation>
+    </message>
+    <message>
+        <source>Name to construct url for KeePass entry that stores the wallet passphrase</source>
+        <translation>ตั้งชื่อเพื่อสร้าง URL สำหรับเข้า KeePass ที่จัดเก็บวลีรหัสผ่าน wallet</translation>
+    </message>
+    <message>
+        <source>Set maximum size of high-priority/low-fee transactions in bytes (default: %d)</source>
+        <translation>ตั้งค่าขนาดสูงสุดของธุรกรรมที่มีความสำคัญสูง / ค่าธรรมเนียมต่ำเป็นไบต์ (ค่าเริ่มต้น: %d)</translation>
+    </message>
+    <message>
+        <source>Set the number of script verification threads (%u to %d, 0 = auto, &lt;0 = leave that many cores free, default: %d)</source>
+        <translation>กำหนดจำนวนของเธรดสคริปต์การตรวจสอบ (%u ถึง %d, 0 = อัตโนมัติ, &lt;0 = ปล่อยให้คอร์อิสระ , ค่าเริ่มต้น: %d)</translation>
+    </message>
+    <message>
+        <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source>
+        <translation>นี่คือการสร้างการทดสอบก่อนวางจำหน่าย - ใช้ได้แต่ต้องรับผิดชอบความเสี่ยงด้วยตัวเอง-  ไม่ใช้แอพลิเคชั่นสำหรับการทำขุดหรือร้านค้า</translation>
+    </message>
+    <message>
+        <source>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</source>
+        <translation>คำเตือน: เครือข่ายไม่ปรากฏ! ไมเนอร์บางคนกำลังประสบปัญหา</translation>
+    </message>
+    <message>
+        <source>Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.</source>
+        <translation>คำเตือน: เราไม่ปรากฎกับ peer ของเรา! คุณอาจต้องอัพเกรดหรือโหนดอื่น ๆ อาจต้องอัพเกรด</translation>
+    </message>
+    <message>
+        <source>You must specify a masternodeprivkey in the configuration. Please see documentation for help.</source>
+        <translation>คุณต้องระบุ masternodeprivkey ในการกำหนดค่า โปรดดูเอกสารประกอบการช่วยเหลือ</translation>
+    </message>
+    <message>
+        <source>Accept command line and JSON-RPC commands</source>
+        <translation>ยอมรับ command line และคำสั่ง JSON-RPC</translation>
+    </message>
+    <message>
+        <source>Add a node to connect to and attempt to keep the connection open</source>
+        <translation>เพิ่มโหนดเพื่อเชื่อมต่อและพยายามทำให้เปิดการเชื่อมต่อ</translation>
+    </message>
+    <message>
+        <source>Allow DNS lookups for -addnode, -seednode and -connect</source>
+        <translation>อนุญาต DNS ค้นหาสำหรับ -addnode, -seednode และ -connect</translation>
+    </message>
+    <message>
+        <source>Already have that input.</source>
+        <translation>มีข้อมูลดังกล่าวแล้ว</translation>
+    </message>
+    <message>
+        <source>Block creation options:</source>
+        <translation>ตัวเลือกการสร้างบล็อก:</translation>
+    </message>
+    <message>
+        <source>Cannot downgrade wallet</source>
+        <translation>ไม่สามารถลดระดับ wallet ได้</translation>
+    </message>
+    <message>
+        <source>Cannot write default address</source>
+        <translation>ไม่สามารถเขียนที่อยู่เริ่มต้นได้</translation>
+    </message>
+    <message>
+        <source>Collateral not valid.</source>
+        <translation>หลักประกันไม่ถูกต้อง</translation>
+    </message>
+    <message>
+        <source>Connect to a node to retrieve peer addresses, and disconnect</source>
+        <translation>เชื่อมต่อกับโหนดเพื่อดึงข้อมูลที่อยู่ของ peer และยกเลิกการเชื่อมต่อ</translation>
+    </message>
+    <message>
+        <source>Connection options:</source>
+        <translation>ตัวเลือกการเชื่อมต่อ: </translation>
+    </message>
+    <message>
+        <source>Corrupted block database detected</source>
+        <translation>ตรวจพบฐานข้อมูลบล็อกที่เสียหาย</translation>
+    </message>
+    <message>
+        <source>Debugging/Testing options:</source>
+        <translation>การแก้จุดบกพร่อง / ตัวเลือกการทดสอบ:</translation>
+    </message>
+    <message>
+        <source>Do not load the wallet and disable wallet RPC calls</source>
+        <translation>ห้ามโหลด wallet และปิดการใช้งาน wallet RPC</translation>
+    </message>
+    <message>
+        <source>Do you want to rebuild the block database now?</source>
+        <translation>คุณต้องการสร้างฐานข้อมูลบล็อกใหม่หรือไม่?</translation>
+    </message>
+    <message>
+        <source>Done loading</source>
+        <translation>โหลดเรียบร้อยแล้ว</translation>
+    </message>
+    <message>
+        <source>Entries are full.</source>
+        <translation>รายการเต็ม</translation>
+    </message>
+    <message>
+        <source>Error initializing block database</source>
+        <translation>เกิดข้อผิดพลาดในการเริ่มต้นฐานข้อมูลบล็อก</translation>
+    </message>
+    <message>
+        <source>Error initializing wallet database environment %s!</source>
+        <translation>เริ่มต้นข้อผิดพลาดด้านสภาพแวดล้อมของฐานข้อมูล Wallet %s!</translation>
+    </message>
+    <message>
+        <source>Error loading block database</source>
+        <translation>เกิดข้อผิดพลาดในการโหลดฐานข้อมูลบล็อก</translation>
+    </message>
+    <message>
+        <source>Error opening block database</source>
+        <translation>เกิดข้อผิดพลาดในการเปิดฐานข้อมูลบล็อก</translation>
+    </message>
+    <message>
+        <source>Error reading from database, shutting down.</source>
+        <translation>เกิดข้อผิดพลาดในการอ่านจากฐานข้อมูล, กำลังปิดเครื่อง</translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation>ข้อผิดพลาด</translation>
+    </message>
+    <message>
+        <source>Error: Disk space is low!</source>
+        <translation>ข้อผิดพลาด: พื้นที่ดิสก์ต่ำ!</translation>
+    </message>
+    <message>
+        <source>Failed to listen on any port. Use -listen=0 if you want this.</source>
+        <translation>เกิดข้อผิดพลาดในการฟังพอร์ตใด ๆ ใช้ -listen = 0 ถ้าต้องการ</translation>
+    </message>
+    <message>
+        <source>(1 = keep tx meta data e.g. account owner and payment request information, 2 = drop tx meta data)</source>
+        <translation>(1 = เก็บ tx meta data เช่น ชื่อเจ้าของบัญชีและข้อมูลการชำระเงิน,  2 = ทิ้ง tx meta data)</translation>
+    </message>
+    <message>
+        <source>-maxtxfee is set very high! Fees this large could be paid on a single transaction.</source>
+        <translation>-maxtxfee ตั้งค่าไว้สูงมาก! ค่าธรรมเนียมที่มีขนาดใหญ่นี้สามารถจ่ายได้เมื่อทำธุรกรรมครั้งเดียว</translation>
+    </message>
+    <message>
+        <source>A fee rate (in %s/kB) that will be used when fee estimation has insufficient data (default: %s)</source>
+        <translation>อัตราค่าธรรมเนียม (%s / kB) ที่จะใช้เมื่อการประมาณค่าใช้จ่ายมีข้อมูลไม่เพียงพอ (ค่าเริ่มต้น: %s)</translation>
+    </message>
+    <message>
+        <source>Accept relayed transactions received from whitelisted peers even when not relaying transactions (default: %d)</source>
+        <translation>ยอมรับการถ่ายทอดธุรกรรมที่ได้รับจาก whitelisted peers แม้ว่าจะไม่ได้ทำธุรกรรมแบบเดิมก็ตาม (ค่าเริ่มต้น: %d)</translation>
+    </message>
+    <message>
+        <source>Allow JSON-RPC connections from specified source. Valid for &lt;ip&gt; are a single IP (e.g. 1.2.3.4), a network/netmask (e.g. 1.2.3.4/255.255.255.0) or a network/CIDR (e.g. 1.2.3.4/24). This option can be specified multiple times</source>
+        <translation>อนุญาตให้ JSON-RPC เชื่อมต่อจากแหล่งที่ระบุ สามารถใช้ได้สำหรับ &lt;ip&gt; คือ IP เดียว (เช่น 1.2.3.4)  network / netmask (เช่น 1.2.3.4/255.255.255.0) หรือ network / CIDR (เช่น 1.2.3.4/24) สามารถระบุตัวเลือกนี้ได้หลายครั้ง</translation>
+    </message>
+    <message>
+        <source>Bind to given address and whitelist peers connecting to it. Use [host]:port notation for IPv6</source>
+        <translation>เชื่อมโยงไปยังที่อยู่ที่กำหนดและ whitelist peers ที่เชื่อมต่ออยู่  ใช้ [โฮสต์]: สัญลักษณ์พอร์ตสำหรับ IPv6</translation>
+    </message>
+    <message>
+        <source>Bind to given address to listen for JSON-RPC connections. Use [host]:port notation for IPv6. This option can be specified multiple times (default: bind to all interfaces)</source>
+        <translation>เชื่อมโยงไปยังที่อยู่ที่กำหนดเพื่อรับฟังการเชื่อมต่อ JSON-RPC  ใช้  [host]:port  พอร์ตสำหรับ IPv6 ตัวเลือกนี้สามารถระบุได้หลายครั้ง (ค่าดีฟอลต์: ผูกกับอินเทอร์เฟซทั้งหมด)</translation>
+    </message>
+    <message>
+        <source>Create new files with system default permissions, instead of umask 077 (only effective with disabled wallet functionality)</source>
+        <translation>สร้างไฟล์ใหม่ด้วยระบบสิทธิ์ดีฟอลต์แทนที่จะเป็น umask 077 (มีผลกับการทำงานของกระเป๋าสตางค์เท่านั้น)</translation>
+    </message>
+    <message>
+        <source>Delete all wallet transactions and only recover those parts of the blockchain through -rescan on startup</source>
+        <translation>ลบการทำธุรกรรมทั้งหมดของ wallet และกู้เฉพาะส่วนของ blockchain ผ่านการสแกนใหม่เมื่อเริ่มต้น</translation>
+    </message>
+    <message>
+        <source>Error loading %s: You can't enable HD on a already existing non-HD wallet</source>
+        <translation>เกิดข้อผิดพลาดในการโหลด %s: คุณไม่สามารถเปิดใช้งาน HD บน wallet ที่ไม่ใช่ของ HD ที่มีอยู่แล้ว</translation>
+    </message>
+    <message>
+        <source>Found unconfirmed denominated outputs, will wait till they confirm to continue.</source>
+        <translation>พบเอาท์พุตที่เป็นสกุลเงินที่ไม่ได้รับการยืนยัน จะรอจนกว่าพวกเขาจะยืนยันเพื่อดำเนินการต่อ</translation>
+    </message>
+    <message>
+        <source>How thorough the block verification of -checkblocks is (0-4, default: %u)</source>
+        <translation>การตรวจสอบบล็อกอย่างละเอียดด้วย -checkblocks (0-4 ค่าดีฟอลต์: %u)</translation>
+    </message>
+    <message>
+        <source>If paytxfee is not set, include enough fee so transactions begin confirmation on average within n blocks (default: %u)</source>
+        <translation>หากไม่ได้ตั้งค่า paytxfee ให้รวมค่าคอมมิชชั่นสำหรับการทำธุรกรรมเพื่อเริ่มต้นการยืนยันโดยเฉลี่ยในบล็อก n (ค่าเริ่มต้น: %u)</translation>
+    </message>
+    <message>
+        <source>If this block is in the chain assume that it and its ancestors are valid and potentially skip their script verification (0 to verify all, default: %s, testnet: %s)</source>
+        <translation>ถ้าบล็อกนี้อยู่ในสายโซ่ สมมติว่าสายโซ่และรุ่นก่อนนี้ถูกต้องและเป็นไปได้ที่จะข้ามการตรวจสอบความถูกต้องของสคริปต์ (0 เพื่อยืนยันทุกอย่าง, เริ่มต้น: %s, testnet: %s)</translation>
+    </message>
+    <message>
+        <source>Invalid amount for -maxtxfee=&lt;amount&gt;: '%s' (must be at least the minrelay fee of %s to prevent stuck transactions)</source>
+        <translation>จำนวนเงินไม่ถูกต้องสำหรับ -maxtxfee = &lt;amount&gt;'%s' (ต้องมีอย่างน้อยค่าธรรมเนียงการส่งของ %s เพื่อป้องกันธุรกรรมที่ติดค้าง)</translation>
+    </message>
+    <message>
+        <source>Maintain a full transaction index, used by the getrawtransaction rpc call (default: %u)</source>
+        <translation>รักษาดัชนีการทำรายการทั้งหมดโดยใช้การเรียก gettransaction rpc (ค่าเริ่มต้น: %u)</translation>
+    </message>
+    <message>
+        <source>Make sure to encrypt your wallet and delete all non-encrypted backups after you verified that wallet works!</source>
+        <translation>ตรวจสอบให้แน่ใจว่าได้เข้ารหัส wallet ของคุณและลบสำเนาสำรองที่ไม่ได้เข้ารหัสทั้งหมดหลังจากยืนยันว่า wallet ของคุณทำงานได้!  </translation>
+    </message>
+    <message>
+        <source>Maximum size of data in data carrier transactions we relay and mine (default: %u)</source>
+        <translation>ขนาดสูงสุดของข้อมูลในการทำธุรกรรมผู้ให้บริการข้อมูลที่เราโอนและขุด (ค่าเริ่มต้น: %u)</translation>
+    </message>
+    <message>
+        <source>Number of seconds to keep misbehaving peers from reconnecting (default: %u)</source>
+        <translation>จำนวนวินาทีที่  peer ทำงานไม่ถูกต้องจากการเชื่อมต่อใหม่ (ค่าเริ่มต้น: %u)</translation>
+    </message>
+    <message>
+        <source>Output debugging information (default: %u, supplying &lt;category&gt; is optional)</source>
+        <translation>ข้อมูลการแก้ไขจุดบกพร่องของ Output (ค่าดีฟอลต์: %u &lt;category&gt; เป็นตัวเลือกเพิ่มเติม)</translation>
+    </message>
+    <message>
+        <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: %s)</source>
+        <translation>ใช้พร็อกซี SOCKS5 แยกเพื่อเข้าถึงเพื่อนร่วมทางผ่านบริการที่ซ่อนไว้ของ Tor (ค่าดีฟอลต์: %s)</translation>
+    </message>
+    <message>
+        <source>User defined mnemonic for HD wallet (bip39). Only has effect during wallet creation/first start (default: randomly generated)</source>
+        <translation>ผู้ใช้กำหนดเทคนิคช่วยจำสำหรับ wallet HD (bip39) จะมีผลเฉพาะระหว่างการสร้าง wallet / การเริ่มครั้งแรก (ค่าเริ่มต้น: สร้างแบบสุ่ม)</translation>
+    </message>
+    <message>
+        <source>User defined seed for HD wallet (should be in hex). Only has effect during wallet creation/first start (default: randomly generated)</source>
+        <translation>ผู้ใช้กำหนด seed สำหรับ wallet  HD (ควรเป็นเลขฐายสิบหก) มีผลเฉพาะระหว่างการสร้างกระเป๋าสตางค์ / การเริ่มครั้งแรก (ค่าเริ่มต้น: สร้างแบบสุ่ม)</translation>
+    </message>
+    <message>
+        <source>Whitelisted peers cannot be DoS banned and their transactions are always relayed, even if they are already in the mempool, useful e.g. for a gateway</source>
+        <translation>Whitelisted peers ไม่สามารถถูกห้ามโดย DoS และการทำธุรกรรมของพวกเขาจะถูกส่งถึงแม้ว่าจะมีอยู่ในกลุ่ม mempool แล้วก็ตามเช่น สำหรับเกตเวย์</translation>
+    </message>
+    <message>
+        <source>You need to rebuild the database using -reindex-chainstate to change -txindex</source>
+        <translation>คุณจำเป็นต้องสร้างฐานข้อมูลโดยใช้ -reindex-chainstate เพื่อเปลี่ยน -txindex</translation>
+    </message>
+    <message>
+        <source>(default: %s)</source>
+        <translation>(ค่าดีฟอลต์: %s)</translation>
+    </message>
+    <message>
+        <source>Accept public REST requests (default: %u)</source>
+        <translation>ยอมรับคำขอ REST สาธารณะ (ค่าเริ่มต้น: %u)</translation>
+    </message>
+    <message>
+        <source>Always query for peer addresses via DNS lookup (default: %u)</source>
+        <translation>ค้นหา peer address ผ่านการค้นหา DNS เสมอ (ค่าดีฟอลต์: %u)</translation>
+    </message>
+    <message>
+        <source>Can't mix: no compatible inputs found!</source>
+        <translation>ไม่สามารถผสมได้: ไม่พบอินพุตที่เข้ากันได้!</translation>
+    </message>
+    <message>
+        <source>Chain selection options:</source>
+        <translation>ตัวเลือกการเลือก Chain:</translation>
+    </message>
+    <message>
+        <source>Connect through SOCKS5 proxy</source>
+        <translation>เชื่อมต่อผ่าน SOCKS5 proxy</translation>
+    </message>
+    <message>
+        <source>Connect to KeePassHttp on port &lt;port&gt; (default: %u)</source>
+        <translation>เชื่อมต่อกับ KeePassHttp บนพอร์ต  &lt;port&gt; (ค่าเริ่มต้น: %u)</translation>
+    </message>
+    <message>
+        <source>Enable the client to act as a masternode (0-1, default: %u)</source>
+        <translation>เปิดใช้งานไคลเอ็นต์เพื่อทำหน้าที่เป็น masternode (0-1 ค่าดีฟอลต์: %u)</translation>
+    </message>
+    <message>
+        <source>Entry exceeds maximum size.</source>
+        <translation>รายการมีขนาดสูงเกินไป</translation>
+    </message>
+    <message>
+        <source>Error loading %s: You can't disable HD on a already existing HD wallet</source>
+        <translation>เกิดข้อผิดพลาดในการโหลด %s: คุณไม่สามารถปิดใช้งาน HD ใน wallet HD ที่มีอยู่แล้ว</translation>
+    </message>
+    <message>
+        <source>Failed to load fulfilled requests cache from</source>
+        <translation>โหลดคำขอแคชล้มเหลว</translation>
+    </message>
+    <message>
+        <source>Failed to load governance cache from</source>
+        <translation>ไม่สามารถโหลดแคชกำกับดูแลจาก</translation>
+    </message>
+    <message>
+        <source>Failed to load masternode cache from</source>
+        <translation>ไม่สามารถโหลดแคช masternode ได้</translation>
+    </message>
+    <message>
+        <source>Failed to load masternode payments cache from</source>
+        <translation>ไม่สามารถโหลดแคชการชำระเงิน masternode ได้จาก</translation>
+    </message>
+    <message>
+        <source>Found enough users, signing ( waiting %s )</source>
+        <translation>พบผู้ใช้เพียงพอ, กำลังลงนาม...  ( กำลังรอ %s )</translation>
+    </message>
+    <message>
+        <source>Found enough users, signing ...</source>
+        <translation>พบผู้ใช้เพียงพอ, กำลังลงนาม...</translation>
+    </message>
+    <message>
+        <source>How many blocks to check at startup (default: %u, 0 = all)</source>
+        <translation>จำนวนบล็อกที่ถูกตรวจสอบเมื่อเริ่มต้น (ค่าเริ่มต้น: %u, 0 = ทั้งหมด)</translation>
+    </message>
+    <message>
+        <source>Importing...</source>
+        <translation>กำลังนำเข้า...</translation>
+    </message>
+    <message>
+        <source>Include IP addresses in debug output (default: %u)</source>
+        <translation>รวมทั้งที่อยู่ IP ในผลลัพธ์การแก้ปัญหา (ค่าดีฟอลต์: %u)</translation>
+    </message>
+    <message>
+        <source>Incompatible mode.</source>
+        <translation>โหมดที่เข้ากันไม่ได้</translation>
+    </message>
+    <message>
+        <source>Incompatible version.</source>
+        <translation>รุ่นที่เข้ากันไม่ได้</translation>
+    </message>
+    <message>
+        <source>Incorrect or no genesis block found. Wrong datadir for network?</source>
+        <translation>ไม่ถูกต้องหรือไม่พบต้นกำเนิดบล็อค  Datadir สำหรับเครือข่ายผิดหรือไม่?</translation>
+    </message>
+    <message>
+        <source>Information</source>
+        <translation>ข้อมูล</translation>
+    </message>
+    <message>
+        <source>Input is not valid.</source>
+        <translation>ข้อมูลไม่ถูกต้อง</translation>
+    </message>
+    <message>
+        <source>Insufficient funds.</source>
+        <translation>เงินทุนไม่เพียงพอ</translation>
+    </message>
+    <message>
+        <source>Invalid -onion address: '%s'</source>
+        <translation>ที่อยู่ - onion ไม่ถูกต้อง: '%s'</translation>
+    </message>
+    <message>
+        <source>Invalid -proxy address: '%s'</source>
+        <translation>ที่อยู่ - proxy ไม่ถูกต้อง: '%s'</translation>
+    </message>
+    <message>
+        <source>Invalid amount for -paytxfee=&lt;amount&gt;: '%s' (must be at least %s)</source>
+        <translation>จำนวนที่ไม่ถูกต้องสำหรับ -paytxfee = &lt;amount&gt;: '%s' (ต้องมีอย่างน้อย %s)</translation>
+    </message>
+    <message>
+        <source>Keypool ran out, please call keypoolrefill first</source>
+        <translation>Keypool หมดแล้ว โปรดเติม Keypool ก่อน</translation>
+    </message>
+    <message>
+        <source>Listen for JSON-RPC connections on &lt;port&gt; (default: %u or testnet: %u)</source>
+        <translation>ฟังเพื่อการเชื่อมต่อ JSON-RPC  &lt;port&gt; (ค่าเริ่มต้น: %u หรือ testnet: %u)</translation>
+    </message>
+    <message>
+        <source>Listen for connections on &lt;port&gt; (default: %u or testnet: %u)</source>
+        <translation>ฟังเพื่อการเชื่อมต่อ &lt;port&gt; (ค่าเริ่มต้น: %u หรือ testnet: %u)</translation>
+    </message>
+    <message>
+        <source>Loading banlist...</source>
+        <translation>กำลังโหลดรายการต้องห้าม</translation>
+    </message>
+    <message>
+        <source>Loading fulfilled requests cache...</source>
+        <translation>กำลังโหลดแคชของคำขอ...</translation>
+    </message>
+    <message>
+        <source>Loading masternode cache...</source>
+        <translation>กำลังโหลดแคช masternode ...</translation>
+    </message>
+    <message>
+        <source>Loading masternode payment cache...</source>
+        <translation>กำลังโหลดแคชการชำระเงิน masternode ...</translation>
+    </message>
+    <message>
+        <source>Lock is already in place.</source>
+        <translation>ล็อกอยู่ในตำแหน่งแล้ว</translation>
+    </message>
+    <message>
+        <source>Lock masternodes from masternode configuration file (default: %u)</source>
+        <translation>ล็อค masternodes จากไฟล์การกำหนดค่า masternode (ค่าดีฟอลต์: %u)</translation>
+    </message>
+    <message>
+        <source>Maximum per-connection receive buffer, &lt;n&gt;*1000 bytes (default: %u)</source>
+        <translation>สูงสุดต่อการเชื่อมต่อได้รับบัฟเฟอร์   &lt;n&gt; * 1000 ไบต์  (ค่าเริ่มต้น: %u)</translation>
+    </message>
+    <message>
+        <source>Maximum per-connection send buffer, &lt;n&gt;*1000 bytes (default: %u)</source>
+        <translation>สูงสุดบัฟเฟอร์ต่อการส่งต่อ &lt;n&gt; * 1000 ไบต์ (ค่าดีฟอลต์: %u)</translation>
+    </message>
+    <message>
+        <source>Mixing in progress...</source>
+        <translation>อยู่ระหว่างการผสม...</translation>
+    </message>
+    <message>
+        <source>Mnemonic passphrase is too long, must be at most 256 characters</source>
+        <translation>รหัสผ่านของ Mnemonic ยาวเกินไป จะต้องมีไม่เกิน 256 ตัว</translation>
+    </message>
+    <message>
+        <source>Need to specify a port with -whitebind: '%s'</source>
+        <translation>จำเป็นต้องระบุพอร์ตด้วย  -whitebind: '%s'  </translation>
+    </message>
+    <message>
+        <source>No Masternodes detected.</source>
+        <translation>ไม่พบ Masternodes</translation>
+    </message>
+    <message>
+        <source>No compatible Masternode found.</source>
+        <translation>ไม่พบ Masternode ที่เข้ากันได้</translation>
+    </message>
+    <message>
+        <source>Not in the Masternode list.</source>
+        <translation>ไม่อยู่ในรายการ Masternode</translation>
+    </message>
+    <message>
+        <source>Only connect to nodes in network &lt;net&gt; (ipv4, ipv6 or onion)</source>
+        <translation>เชื่อมต่อกับโหนดในเครือข่ายเท่านั้น &lt;net&gt; (ipv4, ipv6 หรือ onion)</translation>
+    </message>
+    <message>
+        <source>Port: %d</source>
+        <translation>พอร์ต: %d</translation>
+    </message>
+    <message>
+        <source>Prepend debug output with timestamp (default: %u)</source>
+        <translation>แสดงผลลัพธ์ดีบักด้วย timestamp (ค่าดีฟอลต์: %u) </translation>
+    </message>
+    <message>
+        <source>Rebuild chain state and block index from the blk*.dat files on disk</source>
+        <translation>สร้างสถานะ chain และ block index จากไฟล์ blk * .dat บนดิสก์</translation>
+    </message>
+    <message>
+        <source>Rebuild chain state from the currently indexed blocks</source>
+        <translation>สร้างสถานะ chain จากบล็อกที่จัดทำดัชนีไว้ในขณะนี้</translation>
+    </message>
+    <message>
+        <source>Send trace/debug info to debug.log file (default: %u)</source>
+        <translation>ส่งข้อมูล trace / debug ไปยังไฟล์ debug.log (ค่าดีฟอลต์: %u)</translation>
+    </message>
+    <message>
+        <source>Send transactions as zero-fee transactions if possible (default: %u)</source>
+        <translation>ถ้าเป็นไปได้ส่งรายการเป็นธุรกรรมที่เป็น zero-fee  (ค่าเริ่มต้น: %u)</translation>
+    </message>
+    <message>
+        <source>Set key pool size to &lt;n&gt; (default: %u)</source>
+        <translation>ตั้งค่าขนาด key pool เป็น &lt;n&gt; (ค่าเริ่มต้น: %u)</translation>
+    </message>
+    <message>
+        <source>Set the number of threads to service RPC calls (default: %d)</source>
+        <translation>กำหนดจำนวน threads เพื่อให้บริการการโทร RPC (ค่าเริ่มต้น: %d)</translation>
+    </message>
+    <message>
+        <source>Specify configuration file (default: %s)</source>
+        <translation>ระบุไฟล์การกำหนดค่า (ค่าดีฟอลต์: %s)</translation>
+    </message>
+    <message>
+        <source>Specify connection timeout in milliseconds (minimum: 1, default: %d)</source>
+        <translation>ระบุระยะหมดเวลาการเชื่อมต่อเป็นมิลลิวินาที (ต่ำสุด: 1 ค่าเริ่มต้น: %d)</translation>
+    </message>
+    <message>
+        <source>Specify masternode configuration file (default: %s)</source>
+        <translation>ระบุไฟล์การกำหนดค่า Masternode (ค่าดีฟอลต์: %s)</translation>
+    </message>
+    <message>
+        <source>Specify pid file (default: %s)</source>
+        <translation>ระบุไฟล์ pid (ค่าดีฟอลต์: %s)</translation>
+    </message>
+    <message>
+        <source>Spend unconfirmed change when sending transactions (default: %u)</source>
+        <translation>ใช้การเปลี่ยนแปลงยกเลิกการยืนยันเมื่อกำลังส่งธุรกรรม (ค่าเริ่มต้น: %u)</translation>
+    </message>
+    <message>
+        <source>Submitted following entries to masternode: %u / %d</source>
+        <translation>ส่งรายการต่อไปนี้ไปยัง masternode: %u / %d</translation>
+    </message>
+    <message>
+        <source>Submitted to masternode, waiting for more entries ( %u / %d ) %s</source>
+        <translation>ส่งไปยัง Masternode รอรายการเพิ่มเติม (%u / %d) %s</translation>
+    </message>
+    <message>
+        <source>Submitted to masternode, waiting in queue %s</source>
+        <translation>ส่งไปยัง masternode กำลังรอคิว %s</translation>
+    </message>
+    <message>
+        <source>Synchroning blockchain...</source>
+        <translation>กำลังซิงโครไนซ์ Blockchain...</translation>
+    </message>
+    <message>
+        <source>Synchronization failed</source>
+        <translation>การซิงโครไนซ์ล้มเหลว</translation>
+    </message>
+    <message>
+        <source>Synchronization finished</source>
+        <translation>การซิงโครไนซ์สิ้นเสร็จ</translation>
+    </message>
+    <message>
+        <source>Synchronizing masternodes...</source>
+        <translation>กำลังซิงโครไนซ์  Masternodes...</translation>
+    </message>
+    <message>
+        <source>This is not a Masternode.</source>
+        <translation>นี่ไม่ใช่ Masternodes</translation>
+    </message>
+    <message>
+        <source>Threshold for disconnecting misbehaving peers (default: %u)</source>
+        <translation>เกณฑ์สำหรับการยกเลิกการเชื่อมต่อ peer ที่ทำงานผิดปกติ (ค่าเริ่มต้น: %u)</translation>
+    </message>
+    <message>
+        <source>Too many %f denominations, removing.</source>
+        <translation>จำนวนเงิน %f มากเกินไป, กำลังลบออก</translation>
+    </message>
+    <message>
+        <source>Tor control port password (default: empty)</source>
+        <translation>รหัสผ่านพอร์ตควบคุม Tor (ค่าเริ่มต้น: ว่าง)</translation>
+    </message>
+    <message>
+        <source>Tor control port to use if onion listening enabled (default: %s)</source>
+        <translation>เปิดพอร์ตควบคุม Tor เมื่อฟังการเชื่อมต่อ onion (ค่าดีฟอลต์: %s)</translation>
+    </message>
+    <message>
+        <source>Unable to start HTTP server. See debug log for details.</source>
+        <translation>ไม่สามารถเริ่มต้นเซิร์ฟเวอร์ HTTPได้  ดูบันทึกดีบักเพื่อดูรายละเอียด</translation>
+    </message>
+    <message>
+        <source>Unknown response.</source>
+        <translation>การตอบสนองที่ไม่รู้จัก</translation>
+    </message>
+    <message>
+        <source>Unsupported argument -benchmark ignored, use -debug=bench.</source>
+        <translation>อาร์กิวเมนต์ที่ไม่ได้รับการสนับสนุน -benchmark ถูกละเว้นใช้ -debug = bench</translation>
+    </message>
+    <message>
+        <source>Unsupported argument -debugnet ignored, use -debug=net.</source>
+        <translation>อาร์กิวเมนต์ที่ไม่ได้รับการสนับสนุน -debugnet ถูกละเว้นใช้ -debug = net</translation>
+    </message>
+    <message>
+        <source>Unsupported argument -tor found, use -onion.</source>
+        <translation>อาร์กิวเมนต์ที่ไม่ได้รับการสนับสนุน พบ -tor  , ใช้ -onion.</translation>
+    </message>
+    <message>
+        <source>Upgrade wallet to latest format on startup</source>
+        <translation>อัปเดต wallet เป็นรูปแบบล่าสุดเมื่อเริ่มต้น</translation>
+    </message>
+    <message>
+        <source>Use KeePass 2 integration using KeePassHttp plugin (default: %u)</source>
+        <translation>ใช้การรวม KeePass 2 โดยใช้ปลั๊กอิน KeePassHttp (ค่าเริ่มต้น: %u)</translation>
+    </message>
+    <message>
+        <source>Use UPnP to map the listening port (default: %u)</source>
+        <translation>ใช้ UPnP เพื่อวางแผนพอร์ตการฟัง (ค่าเริ่มต้น: %u)</translation>
+    </message>
+    <message>
+        <source>Use the test chain</source>
+        <translation>ใช้สายโซ่ทดสอบ</translation>
+    </message>
+    <message>
+        <source>User Agent comment (%s) contains unsafe characters.</source>
+        <translation>ตัวแทนผู้ใช้แสดงความคิดเห็น (%s) มีอักขระที่ไม่ปลอดภัย</translation>
+    </message>
+    <message>
+        <source>Will retry...</source>
+        <translation>จะลองใหม่ ...</translation>
+    </message>
+    <message>
+        <source>Invalid masternodeprivkey. Please see documenation.</source>
+        <translation>masternodeprivkey ไม่ถูกต้อง โปรดดูเอกสารประกอบ</translation>
+    </message>
+    <message>
+        <source>Can't find random Masternode.</source>
+        <translation>ไม่พบ Masternode </translation>
+    </message>
+    <message>
+        <source>Can't mix while sync in progress.</source>
+        <translation>ไม่สามารถผสมระหว่างอยู่ในดำเนินการซิงค์ได้</translation>
+    </message>
+    <message>
+        <source>Could not parse masternode.conf</source>
+        <translation>ไม่สามารถวิเคราะห์ masternode.conf</translation>
+    </message>
+    <message>
+        <source>Invalid netmask specified in -whitelist: '%s'</source>
+        <translation>netmask ไม่ถูกต้องที่ระบุใน -whitelist: '%s'</translation>
+    </message>
+    <message>
+        <source>Invalid port detected in masternode.conf</source>
+        <translation>ตรวจพบพอร์ตที่ไม่ถูกต้องใน masternode.conf</translation>
+    </message>
+    <message>
+        <source>Invalid script detected.</source>
+        <translation>ตรวจพบสคริปต์ที่ไม่ถูกต้อง</translation>
+    </message>
+    <message>
+        <source>KeePassHttp id for the established association</source>
+        <translation>รหัส KeePassHttp สำหรับสมาคมที่จัดตั้งขึ้น</translation>
+    </message>
+    <message>
+        <source>KeePassHttp key for AES encrypted communication with KeePass</source>
+        <translation>คีย์ KeePassHttp สำหรับการสื่อสารที่เข้ารหัสด้วย AES กับ KeePass</translation>
+    </message>
+    <message>
+        <source>Keep at most &lt;n&gt; unconnectable transactions in memory (default: %u)</source>
+        <translation>เก็บให้ได้มากที่สุด&lt;n&gt;รายการที่ไม่สามารถยกเลิกการทำธุรกรรมในหน่วยความจำ (ค่าเริ่มต้น: %u)</translation>
+    </message>
+    <message>
+        <source>Disable all Dash specific functionality (Masternodes, PrivateSend, InstantSend, Governance) (0-1, default: %u)</source>
+        <translation>ปิดใช้ฟังก์ชันการทำงานเฉพาะ Dash ทั้งหมด  (Masternodes, PrivateSend, InstantSend, Governance) (0-1, ค่าดีฟอลต์: %u)</translation>
+    </message>
+    <message>
+        <source>%s file contains all private keys from this wallet. Do not share it with anyone!</source>
+        <translation>ไฟล์ %s มี private keys ทั้งหมดจาก wallet นี้  ห้ามเผยแพร่กับคนอื่น</translation>
+    </message>
+    <message>
+        <source>Discover own IP addresses (default: 1 when listening and no -externalip or -proxy)</source>
+        <translation>ค้นพบที่อยู่ IP ของตัวเอง (ค่าเริ่มต้น: 1 เมื่อฟังและไม่มี -externalip หรือ -proxy)</translation>
+    </message>
+    <message>
+        <source>Do not keep transactions in the mempool longer than &lt;n&gt; hours (default: %u)</source>
+        <translation>อย่าเก็บธุรกรรมไว้ใน mempool นานกว่า &lt;n&gt; ชั่วโมง (ค่าเริ่มต้น: %u)</translation>
+    </message>
+    <message>
+        <source>Enable InstantSend, show confirmations for locked transactions (0-1, default: %u)</source>
+        <translation>เปิดใช้งาน InstantSend แสดงการยืนยันสำหรับธุรกรรมที่ล็อกไว้ (0-1 ค่าดีฟอลต์: %u)</translation>
+    </message>
+    <message>
+        <source>Enable multiple PrivateSend mixing sessions per block, experimental (0-1, default: %u)</source>
+        <translation>เปิดใช้งานเซสชันการผสม PrivateSend ต่อบล็อค (0-1 ค่าดีฟอลต์: %u)</translation>
+    </message>
+    <message>
+        <source>Enable use of automated PrivateSend for funds stored in this wallet (0-1, default: %u)</source>
+        <translation>เปิดใช้งาน PrivateSend โดยอัตโนมัติสำหรับเก็บเงินไว้ใน wallet นี้ (0-1 ค่าเริ่มต้น: %u)</translation>
+    </message>
+    <message>
+        <source>Execute command when a wallet InstantSend transaction is successfully locked (%s in cmd is replaced by TxID)</source>
+        <translation>ดำเนินการคำสั่งเมื่อทำธุรกรรมแบบ InstantSend  ล็อคเรียบร้อยแล้ว (%s ใน cmd จะถูกแทนที่ด้วย TxID)</translation>
+    </message>
+    <message>
+        <source>Extra transactions to keep in memory for compact block reconstructions (default: %u)</source>
+        <translation>การทำธุรกรรมพิเศษเพื่อเก็บไว้ในหน่วยความจำสำหรับการสร้างบล็อคใหม่ทำที่มีขนาดกะทัดรัด (ค่าดีฟอลต์: %u)</translation>
+    </message>
+    <message>
+        <source>Failed to create backup, file already exists! This could happen if you restarted wallet in less than 60 seconds. You can continue if you are ok with this.</source>
+        <translation>ไม่สามารถสร้างไฟล์สำรองข้อมูลได้แล้ว! กรณีนี้อาจเกิดขึ้นหากคุณรีสตาร์ท wallet ภายในเวลาไม่ถึง 60 วินาที คุณสามารถดำเนินการต่อได้หากคุณต้องการ</translation>
+    </message>
+    <message>
+        <source>Fees (in %s/kB) smaller than this are considered zero fee for relaying, mining and transaction creation (default: %s)</source>
+        <translation>ค่าธรรมเนียม (ใน %s / kB) เล็กกว่านี้ถือว่าเป็นศูนย์สำหรับการโอนย้าย การขุดและการทำธุรกรรม (ค่าดีฟอลต์: %s)</translation>
+    </message>
+    <message>
+        <source>Fees (in %s/kB) smaller than this are considered zero fee for transaction creation (default: %s)</source>
+        <translation>ค่าธรรมเนียม (ใน %s / kB) เล็กกว่านี้ถือว่าเป็นศูนย์สำหรับการทำธุรกรรม (ค่าดีฟอลต์: %s)</translation>
+    </message>
+    <message>
+        <source>If &lt;category&gt; is not supplied or if &lt;category&gt; = 1, output all debugging information.</source>
+        <translation>ถ้าไม่มี &lt;category&gt;หรือถ้า &lt;category&gt;= 1  , ผลลัพธ์ก็จะเกิดจากข้อมูลการดีบักทั้งหมด</translation>
+    </message>
+    <message>
+        <source>InstantSend doesn't support sending values that high yet. Transactions are currently limited to %1 DASH.</source>
+        <translation>InstantSend ยังไม่สนับสนุนการส่งค่าที่สูงเกินไป ธุรกรรมปัจจุบันถูกจำกัดไว้ที่ %1 DASH</translation>
+    </message>
+    <message>
+        <source>InstantSend requires inputs with at least %d confirmations, you might need to wait a few minutes and try again.</source>
+        <translation>InstantSend ต้องการอินพุตที่มีการยืนยันอย่างน้อย %d คุณอาจต้องรออีกสักครู่แล้วลองอีกครั้ง</translation>
+    </message>
+    <message>
+        <source>Maintain a full address index, used to query for the balance, txids and unspent outputs for addresses (default: %u)</source>
+        <translation>รักษาดัชนีที่อยู่แบบเต็มใช้ในการค้นหายอดคงเหลือ, txids และผลลัพธ์ที่ไม่ได้ระบุสำหรับที่อยู่ (ค่าดีฟอลต์: %u)</translation>
+    </message>
+    <message>
+        <source>Maintain a full spent index, used to query the spending txid and input index for an outpoint (default: %u)</source>
+        <translation>รักษาดัชนีที่ใช้เต็มรูปแบบ  ใช้เพื่อสอบถามค่าใช้จ่าย txid และดัชนีการป้อนข้อมูลสำหรับ outpoint (ค่าเริ่มต้น: %u)</translation>
+    </message>
+    <message>
+        <source>Maintain a timestamp index for block hashes, used to query blocks hashes by a range of timestamps (default: %u)</source>
+        <translation>รักษาดัชนี timestamps สำหรับแฮชบล็อค  ใช้ในการค้นหาแฮชบล็อคโดยใช้ช่วงของ timestamps (default: %u)</translation>
+    </message>
+    <message>
+        <source>Maintain at most &lt;n&gt; connections to peers (temporary service connections excluded) (default: %u)</source>
+        <translation>รักษาบริการเชื่อมต่อแบบ peer อย่างน้อย &lt;n&gt;  (ไม่รวมบริการเชื่อมต่อชั่วคราว) (ค่าเริ่มต้น: %u)</translation>
+    </message>
+    <message>
+        <source>PrivateSend uses exact denominated amounts to send funds, you might simply need to anonymize some more coins.</source>
+        <translation>PrivateSend ใช้จำนวนเงินตามสกุลเงินที่แน่นอนในการส่งเงิน คุณอาจเพียงต้องการระบุชื่อเหรียญเพิ่มเติม</translation>
+    </message>
+    <message>
+        <source>Prune configured below the minimum of %d MiB.  Please use a higher number.</source>
+        <translation>Prune มีการกำหนดค่าขั้นต่ำ %d MiB   โปรดใช้หมายเลขที่สูงกว่า</translation>
+    </message>
+    <message>
+        <source>Prune: last wallet synchronisation goes beyond pruned data. You need to -reindex (download the whole blockchain again in case of pruned node)</source>
+        <translation>การซิงโครไนซ์ wallet ครั้งล่าสุดเหนือกว่าข้อมูล pruned คุณต้อง -reindex (ดาวน์โหลด blockchain ทั้งหมดอีกครั้งในกรณีของ pruned โหนด)</translation>
+    </message>
+    <message>
+        <source>Randomize credentials for every proxy connection. This enables Tor stream isolation (default: %u)</source>
+        <translation>สุ่มข้อมูลตัวอย่างรับรองสำหรับการเชื่อมต่อพร็อกซีทุกครั้ง ซึ่งจะช่วยให้การแยก Tor สตรีม (ค่าเริ่มต้น: %u)</translation>
+    </message>
+    <message>
+        <source>Rescans are not possible in pruned mode. You will need to use -reindex which will download the whole blockchain again.</source>
+        <translation>Rescans ไม่สามารถทำได้ในโหมด pruned คุณจะต้องใช้ -reindex ซึ่งจะดาวน์โหลด blockchain ทั้งหมดอีกครั้ง</translation>
+    </message>
+    <message>
+        <source>Specify full path to directory for automatic wallet backups (must exist)</source>
+        <translation>ระบุแพทเต็มรูปแบบไปยังไดเรกทอรีสำหรับการสำรองข้อมูล wallet อัตโนมัติ (ต้องมีอยู่)</translation>
+    </message>
+    <message>
+        <source>Support filtering of blocks and transaction with bloom filters (default: %u)</source>
+        <translation>สนับสนุนการกรองบล็อคและการทำธุรกรรมด้วยตัวกรองของบลูม หรือ  bloom filters  (ค่าดีฟอลต์: %u)</translation>
+    </message>
+    <message>
+        <source>The block database contains a block which appears to be from the future. This may be due to your computer's date and time being set incorrectly. Only rebuild the block database if you are sure that your computer's date and time are correct</source>
+        <translation>ฐานข้อมูลบล็อกประกอบด้วยบล็อกที่เหมือนจะมาจากอนาคต  อาจเป็นเพราะวันที่และเวลาของคอมพิวเตอร์ของคุณไม่ถูกต้อง  สร้างฐานข้อมูลบล็อกใหม่เท่านั้น ถ้าคุณแน่ใจว่าวันที่และเวลาของคอมพิวเตอร์ถูกต้อง</translation>
+    </message>
+    <message>
+        <source>The transaction amount is too small to send after the fee has been deducted</source>
+        <translation>จำนวนเงินที่ทำธุรกรรมน้อยเกินเกินไปที่จะส่ง หลังจากหักค่าธรรมเนียมแล้ว</translation>
+    </message>
+    <message>
+        <source>Total length of network version string (%i) exceeds maximum length (%i). Reduce the number or size of uacomments.</source>
+        <translation>ความยาวทั้งหมดของสตริงเวอร์ชันเครือข่าย (%i) เกินความยาวสูงสุด (%i)  ลดจำนวนหรือขนาดของ uacomments</translation>
+    </message>
+    <message>
+        <source>Transaction index can't be disabled in full mode. Either start with -litemode command line switch or enable transaction index.</source>
+        <translation>ไม่สามารถปิดใช้ดัชนีรายการในโหมดเต็มได้ นอกจากจะเริ่มต้นด้วยสวิตช์คำสั่ง - litemode หรือเปิดใช้งานรายการดัชนี</translation>
+    </message>
+    <message>
+        <source>Tries to keep outbound traffic under the given target (in MiB per 24h), 0 = no limit (default: %d)</source>
+        <translation>พยายามให้การรับส่งข้อมูลขาออกตามเป้าหมายที่กำหนด (ใน MiB ต่อ 24 ชั่วโมง), 0 = ไม่มีขีด จำกัด (ค่าเริ่มต้น: %d)</translation>
+    </message>
+    <message>
+        <source>Unable to locate enough PrivateSend denominated funds for this transaction.</source>
+        <translation>ไม่สามารถหาเงินได้เพียงพอสำหรับ PrivateSend สำหรับธุรกรรมนี้</translation>
+    </message>
+    <message>
+        <source>Unsupported argument -socks found. Setting SOCKS version isn't possible anymore, only SOCKS5 proxies are supported.</source>
+        <translation>พบอาร์กิวเมนต์ที่ไม่สนับสนุน -socks  การตั้งค่าเวอร์ชัน BB ไม่สามารถทำได้อีกต่อไป สนับสนุนพร็อกซี SOCKS5 เท่านั้น</translation>
+    </message>
+    <message>
+        <source>Unsupported argument -whitelistalwaysrelay ignored, use -whitelistrelay and/or -whitelistforcerelay.</source>
+        <translation>เพิกเฉยอาร์กิวเมนต์ที่ไม่สนับสนุน - whitelistalwaysrelay   ใช้ -whitelistrelay และ/หรือ -whitelistforcerelay.</translation>
+    </message>
+    <message>
+        <source>Use UPnP to map the listening port (default: 1 when listening and no -proxy)</source>
+        <translation>ใช้ UPnP เพื่อวางแผนพอร์ตการฟัง (ค่าเริ่มต้น: 1 เมื่อกำลังฟังและไม่มี -proxy)</translation>
+    </message>
+    <message>
+        <source>WARNING! Failed to replenish keypool, please unlock your wallet to do so.</source>
+        <translation>คำเตือน! ไม่สามารถเติม keypool ได้  โปรดปลดล็อก wallet ของคุณเพื่อทำเช่นนั้น</translation>
+    </message>
+    <message>
+        <source>Wallet is locked, can't replenish keypool! Automatic backups and mixing are disabled, please unlock your wallet to replenish keypool.</source>
+        <translation>Wallet ถูกล็อคไม่สามารถเติม keypool! ปิดใช้งานการสำรองข้อมูลและการผสมข้อมูลอัตโนมัติ โปรดปลดล็อกเพื่อใส่พวง keypool</translation>
+    </message>
+    <message>
+        <source>Warning: Unknown block versions being mined! It's possible unknown rules are in effect</source>
+        <translation>คำเตือน: ไม่สามารถหาเงิน PrivateSend ที่ระบุได้เพียงพอสำหรับธุรกรรมนี้</translation>
+    </message>
+    <message>
+        <source>You are starting in lite mode, all Dash-specific functionality is disabled.</source>
+        <translation>คุณกำลังเริ่มต้นใน Lite Mode  ฟังก์ชันการทำงานเฉพาะ Dash ทั้งหมดจะถูกปิดใช้งาน</translation>
+    </message>
+    <message>
+        <source>You need to rebuild the database using -reindex to go back to unpruned mode.  This will redownload the entire blockchain</source>
+        <translation>คุณจำเป็นต้องสร้างฐานข้อมูลโดยใช้ -reindex ที่จะกลับไปที่โหมด unpruned  และนี่จะดาวน์โหลด blockchain  ที่เหลือใหม่ทั้งหมด</translation>
+    </message>
+    <message>
+        <source>(%d could be used only on mainnet)</source>
+        <translation>(%d สามารถใช้ได้เฉพาะกับ mainnet)</translation>
+    </message>
+    <message>
+        <source>(default: %u)</source>
+        <translation>(ค่าเริ่มต้น: %u)</translation>
+    </message>
+    <message>
+        <source>(must be %d for mainnet)</source>
+        <translation>(ต้องเป็น %d สำหรับ mainnet)</translation>
+    </message>
+    <message>
+        <source>-maxmempool must be at least %d MB</source>
+        <translation>-maxmempool ต้องมีอย่างน้อย %d MB</translation>
+    </message>
+    <message>
+        <source>&lt;category&gt; can be:</source>
+        <translation>&lt;category&gt;เป็นไปได้: </translation>
+    </message>
+    <message>
+        <source>Append comment to the user agent string</source>
+        <translation>เพิ่มความคิดเห็นไปยังสตริงตัวแทนผู้ใช้</translation>
+    </message>
+    <message>
+        <source>Automatic backups disabled</source>
+        <translation>ปิดการสำรองข้อมูลอัตโนมัติแล้ว</translation>
+    </message>
+    <message>
+        <source>Automatically create Tor hidden service (default: %d)</source>
+        <translation>สร้างบริการ Tor ที่ซ่อนไว้โดยอัตโนมัติ (ค่าเริ่มต้น: %d)</translation>
+    </message>
+    <message>
+        <source>ERROR! Failed to create automatic backup</source>
+        <translation>ข้อผิดพลาด! ไม่สามารถสร้างการสำรองข้อมูลอัตโนมัติ</translation>
+    </message>
+    <message>
+        <source>Enable publish hash block in &lt;address&gt;</source>
+        <translation>เปิดใช้งานบล็อคแฮชใน &lt;address&gt;</translation>
+    </message>
+    <message>
+        <source>Enable publish hash of governance objects (like proposals) in &lt;address&gt;</source>
+        <translation>เปิดใช้งานแฮชการเผยแพร่เนื้อหาการกำกับดูแล (เช่น ข้อเสนอ) ใน &lt;address&gt;</translation>
+    </message>
+    <message>
+        <source>Enable publish hash of governance votes in &lt;address&gt;</source>
+        <translation>เปิดใช้งานแฮชการโหวตเกี่ยวกับการกำกับดูแลใน &lt;address&gt;</translation>
+    </message>
+    <message>
+        <source>Enable publish hash transaction (locked via InstantSend) in &lt;address&gt;</source>
+        <translation>เปิดใช้งานการทำธุรกรรมแฮช (ล็อกผ่าน InstantSend) ใน&lt;address&gt;</translation>
+    </message>
+    <message>
+        <source>Enable publish hash transaction in &lt;address&gt;</source>
+        <translation>เปิดใช้งานการธุรกรรมแฮชใน&lt;address&gt;</translation>
+    </message>
+    <message>
+        <source>Enable publish raw block in &lt;address&gt;</source>
+        <translation>เปิดใช้งานบล็อกแบบดิบใน&lt;address&gt;</translation>
+    </message>
+    <message>
+        <source>Enable publish raw transaction (locked via InstantSend) in &lt;address&gt;</source>
+        <translation>เปิดใช้งานการทำธุรกรรมดิบ (ล็อกผ่าน InstantSend) ใน&lt;address&gt;</translation>
+    </message>
+    <message>
+        <source>Enable publish raw transaction in &lt;address&gt;</source>
+        <translation>เปิดใช้งานการทำธุรกรรมดิบใหม่ใน &lt;address&gt;</translation>
+    </message>
+    <message>
+        <source>Enable transaction replacement in the memory pool (default: %u)</source>
+        <translation>เปิดใช้การแทนที่ธุรกรรมในหน่วยความจำ pool  (ค่าดีฟอลต์: %u)</translation>
+    </message>
+    <message>
+        <source>Error: A fatal internal error occurred, see debug.log for details</source>
+        <translation>ข้อผิดพลาด: มีข้อผิดพลาดร้ายแรงภายในเกิดขึ้น โปรดดูที่ debug.log เพื่อดูรายละเอียด</translation>
+    </message>
+    <message>
+        <source>Failed to create backup %s!</source>
+        <translation>ไม่สามารถสร้างการสำรองข้อมูลได้ %s!</translation>
+    </message>
+    <message>
+        <source>Failed to create backup, error: %s</source>
+        <translation>ไม่สามารถสร้างข้อมูลสำรอง  ผิดพลาด: %s</translation>
+    </message>
+    <message>
+        <source>Failed to delete backup, error: %s</source>
+        <translation>ไม่สามารถลบข้อมูลสำรอง  ผิดพลาด: %s</translation>
+    </message>
+    <message>
+        <source>Failed to load InstantSend data cache from</source>
+        <translation>โหลดแคชข้อมูล InstantSend  ล้มเหลว</translation>
+    </message>
+    <message>
+        <source>Failed to load sporks cache from</source>
+        <translation>โหลดแคช sporks ล้มเหลว</translation>
+    </message>
+    <message>
+        <source>Failed to parse host:port string</source>
+        <translation>แยกวิเคราะห์ host:port  ล้มเหลว</translation>
+    </message>
+    <message>
+        <source>Fee (in %s/kB) to add to transactions you send (default: %s)</source>
+        <translation>ค่าธรรมเนียม (ใน %s / kB) เพื่อเพิ่มธุรกรรมที่คุณส่ง (ค่าเริ่มต้น: %s)</translation>
+    </message>
+    <message>
+        <source>Imports blocks from external blk000??.dat file on startup</source>
+        <translation>นำเข้าบล็อคจากภายนอก blk000 ??.dat ไฟล์เมื่อเริ่มต้น</translation>
+    </message>
+    <message>
+        <source>InstantSend options:</source>
+        <translation>ตัวเลือก InstantSend : </translation>
+    </message>
+    <message>
+        <source>Invalid amount for -fallbackfee=&lt;amount&gt;: '%s'</source>
+        <translation>จำนวนเงินที่ไม่ถูกต้องสำหรับ -fallbackfee = 1: '%s'</translation>
+    </message>
+    <message>
+        <source>Invalid input count.</source>
+        <translation>จำนวนการป้อนข้อมูลไม่ถูกต้อง</translation>
+    </message>
+    <message>
+        <source>Keep the transaction memory pool below &lt;n&gt; megabytes (default: %u)</source>
+        <translation>เก็บหน่วยความจำธุรกรรมไว้ต่ำกว่า 1 เมกะไบต์ (ค่าเริ่มต้น: %u)</translation>
+    </message>
+    <message>
+        <source>Last PrivateSend was too recent.</source>
+        <translation>PrivateSend ล่าสุดเป็นข้อมูลล่าสุด</translation>
+    </message>
+    <message>
+        <source>Last successful PrivateSend action was too recent.</source>
+        <translation>การกระทำ PrivateSend ที่ประสบความสำเร็จล่าสุดเป็นข้อมูลล่าสุด</translation>
+    </message>
+    <message>
+        <source>Line: %d</source>
+        <translation>Line: %d</translation>
+    </message>
+    <message>
+        <source>Loading InstantSend data cache...</source>
+        <translation>กำลังโหลดแคชข้อมูล InstantSend ...</translation>
+    </message>
+    <message>
+        <source>Loading addresses...</source>
+        <translation>กำลังโหลดที่อยู่ ...</translation>
+    </message>
+    <message>
+        <source>Loading block index...</source>
+        <translation>กำลังโหลดดัชนีบล็อก ...</translation>
+    </message>
+    <message>
+        <source>Loading governance cache...</source>
+        <translation>โหลดแคชกำกับดูแล ...</translation>
+    </message>
+    <message>
+        <source>Loading sporks cache...</source>
+        <translation>กำลังโหลดแคช sporks...</translation>
+    </message>
+    <message>
+        <source>Loading wallet... (%3.2f %%)</source>
+        <translation>กำลังโหลด wallet... (%3.2f %%)</translation>
+    </message>
+    <message>
+        <source>Loading wallet...</source>
+        <translation>กำลังโหลด Wallet ...</translation>
+    </message>
+    <message>
+        <source>Location of the auth cookie (default: data dir)</source>
+        <translation>ตำแหน่งของคุกกี้ที่ได้รับรองความถูกต้อง (ค่าดีฟอลต์: data dir)</translation>
+    </message>
+    <message>
+        <source>Make the wallet broadcast transactions</source>
+        <translation>ดำเนินการในการเผยแพร่ธุรกรรม wallet</translation>
+    </message>
+    <message>
+        <source>Masternode cache is empty, skipping payments and governance cache...</source>
+        <translation>แคช Masternode ว่างเปล่า  ละเว้นการชำระเงินและแคชการจัดการ...</translation>
+    </message>
+    <message>
+        <source>Masternode options:</source>
+        <translation>ตัวเลือก Masternode: </translation>
+    </message>
+    <message>
+        <source>Masternode queue is full.</source>
+        <translation>คิว Masternode เต็ม</translation>
+    </message>
+    <message>
+        <source>Masternode:</source>
+        <translation>Masternode:</translation>
+    </message>
+    <message>
+        <source>Minimum bytes per sigop in transactions we relay and mine (default: %u)</source>
+        <translation>ไบต์ขั้นต่ำต่อ sigop ในธุรกรรมที่เราส่งต่อและขุด  (ค่าเริ่มต้น: %u)</translation>
+    </message>
+    <message>
+        <source>Missing input transaction information.</source>
+        <translation>อินพุตข้อมูลธุรกรรมขาดหายไป</translation>
+    </message>
+    <message>
+        <source>No errors detected.</source>
+        <translation>ไม่พบข้อผิดพลาด</translation>
+    </message>
+    <message>
+        <source>No matching denominations found for mixing.</source>
+        <translation>ไม่พบสกุลเงินที่เหมาะสมสำหรับการผสม</translation>
+    </message>
+    <message>
+        <source>Node relay options:</source>
+        <translation>ตัวเลือกการถ่ายทอดโหนด:</translation>
+    </message>
+    <message>
+        <source>Non-standard public key detected.</source>
+        <translation>ตรวจพบคีย์สาธารณะที่ไม่เป็นไปตามมาตรฐาน</translation>
+    </message>
+    <message>
+        <source>Not compatible with existing transactions.</source>
+        <translation>ไม่สามารถใช้งานร่วมกับธุรกรรมที่มีอยู่ได้</translation>
+    </message>
+    <message>
+        <source>Not enough file descriptors available.</source>
+        <translation>มีคำอธิบายไฟล์เพียงพอ</translation>
+    </message>
+    <message>
+        <source>Not enough funds to anonymize.</source>
+        <translation>เงินไม่เพียงพอที่จะไม่ระบุชื่อ</translation>
+    </message>
+    <message>
+        <source>Number of automatic wallet backups (default: %u)</source>
+        <translation>จำนวนการสำรองข้อมูล Wallet อัตโนมัติ (ค่าเริ่มต้น: %u)</translation>
+    </message>
+    <message>
+        <source>Options:</source>
+        <translation>ตัวเลือก:</translation>
+    </message>
+    <message>
+        <source>Password for JSON-RPC connections</source>
+        <translation>รหัสผ่านสำหรับการเชื่อมต่อ JSON-RPC</translation>
+    </message>
+    <message>
+        <source>Print version and exit</source>
+        <translation>พิมพ์เวอร์ชันแล้วออกโปรแกรม</translation>
+    </message>
+    <message>
+        <source>PrivateSend is idle.</source>
+        <translation>PrivateSend ไม่ได้ใช้งาน</translation>
+    </message>
+    <message>
+        <source>PrivateSend options:</source>
+        <translation>ตัวเลือก PrivateSend:</translation>
+    </message>
+    <message>
+        <source>PrivateSend request complete:</source>
+        <translation>คำขอ PrivateSend สมบูรณ์:</translation>
+    </message>
+    <message>
+        <source>PrivateSend request incomplete:</source>
+        <translation>คำขอ PrivateSend ไม่สมบูรณ์:</translation>
+    </message>
+    <message>
+        <source>Prune cannot be configured with a negative value.</source>
+        <translation>Prune  ไม่สามารถกำหนดค่าได้ด้วยค่าลบ </translation>
+    </message>
+    <message>
+        <source>Prune mode is incompatible with -txindex.</source>
+        <translation>โหมด Prune ไม่สามารถใช้ได้กับ -txtindex ได้</translation>
+    </message>
+    <message>
+        <source>Pruning blockstore...</source>
+        <translation>กำลังตัด blockstore ...</translation>
+    </message>
+    <message>
+        <source>Rescan the block chain for missing wallet transactions on startup</source>
+        <translation>สแกน Block chain ใหม่สำหรับธุรกรรม Wallet ที่หายไปเมื่อเริ่มต้น</translation>
+    </message>
+    <message>
+        <source>The wallet will avoid paying less than the minimum relay fee.</source>
+        <translation>Wallet จะหลีกเลี่ยงการจ่ายเงินน้อยกว่าค่าโอนขั้นต่ำ</translation>
+    </message>
+    <message>
+        <source>This is the minimum transaction fee you pay on every transaction.</source>
+        <translation>นี่คือค่าธรรมเนียมการทำธุรกรรมขั้นต่ำที่คุณต้องจ่ายในทุกรายการ</translation>
+    </message>
+    <message>
+        <source>This is the transaction fee you will pay if you send a transaction.</source>
+        <translation>นี่คือค่าธรรมเนียมการทำธุรกรรมที่คุณจะจ่ายหากคุณส่งธุรกรรม</translation>
+    </message>
+    <message>
+        <source>Transaction amounts must not be negative</source>
+        <translation>ธุรกรรมจะต้องไม่เป็นลบ</translation>
+    </message>
+    <message>
+        <source>Transaction has too long of a mempool chain</source>
+        <translation>ธุรกรรมมี  Mempool chain ที่ยาวเกินไป</translation>
+    </message>
+    <message>
+        <source>Transaction must have at least one recipient</source>
+        <translation>ธุรกรรมต้องมีผู้รับอย่างน้อยหนึ่งราย</translation>
+    </message>
+    <message>
+        <source>Transaction too large</source>
+        <translation>ธุรกรรมมีขนาดใหญ่เกินไป</translation>
+    </message>
+    <message>
+        <source>Trying to connect...</source>
+        <translation>กำลังพยายามเชื่อมต่อ ...</translation>
+    </message>
+    <message>
+        <source>Unable to bind to %s on this computer. %s is probably already running.</source>
+        <translation>ไม่สามารถผูกกับ %s คอมพิวเตอร์เครื่องนี้ได้  %s อาจกำลังทำงานอยู่แล้ว</translation>
+    </message>
+    <message>
+        <source>Upgrading UTXO database</source>
+        <translation>การอัพเกรดฐานข้อมูล UTXO</translation>
+    </message>
+    <message>
+        <source>Use devnet chain with provided name</source>
+        <translation>ใช้ devnet chain พร้อมชื่อที่ระบุ</translation>
+    </message>
+    <message>
+        <source>Wallet debugging/testing options:</source>
+        <translation>การแก้จุดบกพร่อง / ตัวเลือกการทดสอบ Wallet:</translation>
+    </message>
+    <message>
+        <source>Wallet is not initialized</source>
+        <translation>ยังไม่ได้ลงชื่อ wallet </translation>
+    </message>
+    <message>
+        <source>Wallet needed to be rewritten: restart %s to complete</source>
+        <translation>Wallet ต้องการพิมพ์ใหม่: รีสตาร์ท %s ให้เสร็จสมบูรณ์</translation>
+    </message>
+    <message>
+        <source>Warning: unknown new rules activated (versionbit %i)</source>
+        <translation>คำเตือน: กฎใหม่ที่ไม่รู้จักถูกเปิดใช้งาน (เวอร์ชั่นบิท %i)</translation>
+    </message>
+    <message>
+        <source>Wasn't able to create wallet backup folder %s!</source>
+        <translation>ไม่สามารถสร้างโฟลเดอร์สำรอง Wallet ได้ %s!</translation>
+    </message>
+    <message>
+        <source>Whether to operate in a blocks only mode (default: %u)</source>
+        <translation>ใช้งานในโหมดบล็อกเฉพาะ (ค่าเริ่มต้น: %u)</translation>
+    </message>
+    <message>
+        <source>You can not start a masternode in lite mode.</source>
+        <translation>คุณไม่สามารถเริ่มต้น masternode ใน Lite mode</translation>
+    </message>
+    <message>
+        <source>ZeroMQ notification options:</source>
+        <translation>ตัวเลือกการแจ้งเตือน ZeroMQ:</translation>
+    </message>
+    <message>
+        <source>no mixing available.</source>
+        <translation>ไม่มีการผสม</translation>
+    </message>
+    <message>
+        <source>see debug.log for details.</source>
+        <translation>ดูรายละเอียดได้ใน debug.log</translation>
+    </message>
+    <message>
+        <source>RPC server options:</source>
+        <translation>ตัวเลือกเซิร์ฟเวอร์ RPC:</translation>
+    </message>
+    <message>
+        <source>Dash Core</source>
+        <translation>Dash Core</translation>
+    </message>
+    <message>
+        <source>The %s developers</source>
+        <translation>%s นักพัฒนา</translation>
+    </message>
+    <message>
+        <source>Accept connections from outside (default: 1 if no -proxy or -connect/-noconnect)</source>
+        <translation>ยอมรับการเชื่อมต่อจากภายนอก (ค่าเริ่มต้น: 1 ถ้าไม่มี -proxy หรือ - เชื่อมต่อ / -ไม่เชื่อมต่อ)</translation>
+    </message>
+    <message>
+        <source>Cannot obtain a lock on data directory %s. %s is probably already running.</source>
+        <translation>ไม่สามารถรับการล็อกไดเรกทอรีข้อมูล %s ได้ %s มันอาจทำงานอยู่แล้ว</translation>
+    </message>
+    <message>
+        <source>Connect only to the specified node(s); -noconnect or -connect=0 alone to disable automatic connections</source>
+        <translation>เชื่อมต่อกับโหนดที่ระบุเท่านั้น -noconnect หรือ -connect = 0 เพื่อยกเลิกการเชื่อมต่ออัตโนมัติ</translation>
+    </message>
+    <message>
+        <source>Distributed under the MIT software license, see the accompanying file %s or %s</source>
+        <translation>เผยแพร่ภายใต้ใบอนุญาตซอฟต์แวร์ MIT โปรดดูที่ไฟล์ที่แนบมา %s หรือ %s</translation>
+    </message>
+    <message>
+        <source>Error reading %s! All keys read correctly, but transaction data or address book entries might be missing or incorrect.</source>
+        <translation>เกิดข้อผิดพลาดในการอ่าน %s! คีย์ทั้งหมดอ่านได้อย่างถูกต้อง แต่ข้อมูลธุรกรรมหรือรายการสมุดที่อยู่อาจหายไปหรือไม่ถูกต้อง</translation>
+    </message>
+    <message>
+        <source>Force relay of transactions from whitelisted peers even if they violate local relay policy (default: %d)</source>
+        <translation>บังคับให้การถ่ายทอดของธุรกรรมจาก whitelisted peers แม้ว่าจะละเมิดนโยบายการถ่ายทอดข้อมูลท้องถิ่น (ค่าเริ่มต้น: %d)</translation>
+    </message>
+    <message>
+        <source>Incorrect or no devnet genesis block found. Wrong datadir for devnet specified?</source>
+        <translation>ไม่พบหรือไม่พบแหล่งกำเนิด devnet genesis  ระบุข้อมูลที่ผิดสำหรับ devnet  หรือไม่ ?</translation>
+    </message>
+    <message>
+        <source>Maximum allowed median peer time offset adjustment. Local perspective of time may be influenced by peers forward or backward by this amount. (default: %u seconds)</source>
+        <translation>การปรับชดเชยชดเชยเวลาของค่ามัธยฐานได้สูงสุด มุมมองท้องถิ่นของเวลาอาจได้รับอิทธิพลจาก Peer ข้างหน้าหรือข้างหลังด้วยจำนวนนี้ (ค่าเริ่มต้น: %u วินาที)</translation>
+    </message>
+    <message>
+        <source>Maximum total fees (in %s) to use in a single wallet transaction or raw transaction; setting this too low may abort large transactions (default: %s)</source>
+        <translation>ค่าธรรมเนียมรวมสูงสุด (เป็น %s) ที่จะใช้ในธุรกรรม Wallet เดียวหรือธุรกรรมแบบดั้งเดิม การตั้งค่านี้ต่ำเกินไปอาจยกเลิกธุรกรรมที่มีขนาดใหญ่ (ค่าเริ่มต้น: %s)</translation>
+    </message>
+    <message>
+        <source>Override spork address. Only useful for regtest and devnet. Using this on mainnet or testnet will ban you.</source>
+        <translation>ยกเลิกที่อยู่ spork เป็นประโยชน์สำหรับ regtest และ devnet การใช้สิ่งนี้ใน mainnet หรือ testnet จะห้ามคุณไม่ให้ใช้</translation>
+    </message>
+    <message>
+        <source>Please check that your computer's date and time are correct! If your clock is wrong, %s will not work properly.</source>
+        <translation>โปรดตรวจสอบว่าวันที่และเวลาของคอมพิวเตอร์ของคุณถูกต้อง! ถ้านาฬิกาของคุณไม่ตรง %s มันจะทำงานได้ไม่ถูกต้อง</translation>
+    </message>
+    <message>
+        <source>Please contribute if you find %s useful. Visit %s for further information about the software.</source>
+        <translation>โปรดให้การสนับสนุนหากคุณพบ %s ที่เป็นประโยชน์ ไปที่ %s เพื่อดูข้อมูลเพิ่มเติมเกี่ยวกับซอฟต์แวร์</translation>
+    </message>
+    <message>
+        <source>Provide liquidity to PrivateSend by infrequently mixing coins on a continual basis (%u-%u, default: %u, 1=very frequent, high fees, %u=very infrequent, low fees)</source>
+        <translation>ให้สภาพคล่องแก่ PrivateSend โดยการผสมเหรียญเป็นระยะ ๆ อย่างต่อเนื่อง  (%u-%u, ค่าเริ่มต้น: %u,  1 = บ่อยครั้งมากค่าธรรมเนียมสูง,%u = ไม่บ่อยมากค่าธรรมเนียมต่ำ)</translation>
+    </message>
+    <message>
+        <source>Query for peer addresses via DNS lookup, if low on addresses (default: 1 unless -connect/-noconnect)</source>
+        <translation>ข้อสงสัยสำหรับที่อยู่ของ peer ค้นหาได้ทาง DNS หากมีที่อยู่ต่ำ (ค่าเริ่มต้น: 1 เว้นแต่ -connect / -noconnect)</translation>
+    </message>
+    <message>
+        <source>Reduce storage requirements by enabling pruning (deleting) of old blocks. This allows the pruneblockchain RPC to be called to delete specific blocks, and enables automatic pruning of old blocks if a target size in MiB is provided. This mode is incompatible with -txindex and -rescan. Warning: Reverting this setting requires re-downloading the entire blockchain. (default: 0 = disable pruning blocks, 1 = allow manual pruning via RPC, &gt;%u = automatically prune block files to stay under the specified target size in MiB)</source>
+        <translation>ลดข้อกำหนดในการจัดเก็บโดยการตัดแต่ง (การลบ) บล็อกเก่า  ซึ่งจะช่วยให้สามารถเรียกใช้ RPM pruneblockchain เพื่อลบบล็อคที่ต้องการและช่วยให้การตัดบล็อกเก่าโดยอัตโนมัติหากมีการกำหนดขนาดเป้าหมายไว้ใน MiB โหมดนี้ไม่สามารถใช้ได้กับ -txtindex และ -rescan                                                    คำเตือน: การคืนค่าการตั้งค่านี้จะต้องดาวน์โหลดใหม่ทั้งหมด blockchain  (ค่าเริ่มต้น: 0 = ปิดใช้งานการตัดบล็อค, 1 = อนุญาตการตัดด้วยตนเองผ่านทาง RPC, &gt;%u = อัตโนมัติตัดไฟล์บล็อคเพื่อให้อยู่ภายใต้ขนาดเป้าหมายที่ระบุใน MiB)</translation>
+    </message>
+    <message>
+        <source>Set lowest fee rate (in %s/kB) for transactions to be included in block creation. (default: %s)</source>
+        <translation>กำหนดอัตราค่าธรรมเนียมต่ำสุด (%s / kB) สำหรับธุรกรรมที่ถูกรวมในการสร้างบล็อค (ค่าดีฟอลต์: %s)</translation>
+    </message>
+    <message>
+        <source>This is the transaction fee you may pay when fee estimates are not available.</source>
+        <translation>นี่คือค่าธรรมเนียมการทำธุรกรรมที่คุณอาจจะต้องจ่าย เมื่อประมาณการค่าบริการไม่พร้อมใช้งาน</translation>
+    </message>
+    <message>
+        <source>This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit %s and cryptographic software written by Eric Young and UPnP software written by Thomas Bernard.</source>
+        <translation>ผลิตภัณฑ์นี้รวมถึงซอฟต์แวร์ที่พัฒนาโดย OpenSSL Project เพื่อใช้ใน OpenSSL Toolkit %s และซอฟต์แวร์เข้ารหัสที่เขียนขึ้นโดย Eric Young และซอฟต์แวร์ UPnP ที่เขียนโดย Thomas Bernard</translation>
+    </message>
+    <message>
+        <source>Unable to locate enough PrivateSend non-denominated funds for this transaction.</source>
+        <translation>ไม่สามารถหาเงินทุนที่ไม่ใช่สกุลเงินที่ระบุ PrivateSend ได้มากพอสำหรับธุรกรรมนี้</translation>
+    </message>
+    <message>
+        <source>Use N separate masternodes for each denominated input to mix funds (%u-%u, default: %u)</source>
+        <translation>ใช้ N masternodes แยกต่างหากสำหรับแต่ละสกุลเงินที่ป้อนเพื่อผสมเงิน (%u-%u, ค่าเริ่มต้น: %u)</translation>
+    </message>
+    <message>
+        <source>Use hierarchical deterministic key generation (HD) after BIP39/BIP44. Only has effect during wallet creation/first start</source>
+        <translation>ใช้คีย์ที่กำหนดตามลำดับชั้น (HD) หลังจาก BIP39 / BIP44  มีผลเฉพาะระหว่างการสร้าง / การเริ่มต้น wallet ครั้งแรก เท่านั้น</translation>
+    </message>
+    <message>
+        <source>User defined mnemonic passphrase for HD wallet (BIP39). Only has effect during wallet creation/first start (default: empty string)</source>
+        <translation>ผู้ใช้กำหนดรหัสผ่านสำหรับการจดจำรหัสผ่านสำหรับ HD Wallet  (BIP39) มีผลเฉพาะระหว่างการสร้าง Wallet / การเริ่มครั้งแรก (ค่าเริ่มต้น: ว่างเปล่า)</translation>
+    </message>
+    <message>
+        <source>Username and hashed password for JSON-RPC connections. The field &lt;userpw&gt; comes in the format: &lt;USERNAME&gt;:&lt;SALT&gt;$&lt;HASH&gt;. A canonical python script is included in share/rpcuser. The client then connects normally using the rpcuser=&lt;USERNAME&gt;/rpcpassword=&lt;PASSWORD&gt; pair of arguments. This option can be specified multiple times</source>
+        <translation>ชื่อผู้ใช้และ hashed password สำหรับการเชื่อมต่อ JSON-RPC   ฟิลด์&lt;userpw&gt;มาในรูปแบบ:&lt;USERNAME&gt;: &lt;SALT&gt;$&lt;HASH&gt; สคริปต์จะรวมอยู่ใน share / rpcuser ลูกค้าเชื่อมต่อโดยปกติโดยใช้ rpcuser = &lt;USERNAME&gt; / rpcpassword = &lt;PASSWORD&gt; คู่อาร์กิวเมนต์ สามารถระบุตัวเลือกนี้ได้หลายครั้ง</translation>
+    </message>
+    <message>
+        <source>Wallet will not create transactions that violate mempool chain limits (default: %u)</source>
+        <translation>Wallet จะไม่สร้างธุรกรรมที่ละเมิดข้อจำกัดของ Mempool chain (ค่าเริ่มต้น: %u)</translation>
+    </message>
+    <message>
+        <source>Warning: At least %d of %d masternodes are running on a newer software version. Please check latest releases, you might need to update too.</source>
+        <translation>คำเตือน: อย่างน้อย %d จาก %d masternodes กำลังทำงานอยู่ในเวอร์ชันซอฟต์แวร์ใหม่กว่า โปรดตรวจสอบเวอร์ชันล่าสุดคุณอาจต้องอัปเดตด้วย</translation>
+    </message>
+    <message>
+        <source>Warning: Every masternode (out of %d known ones) is running on a newer software version. Please check latest releases, it's very likely that you missed a major/critical update.</source>
+        <translation>คำเตือน: ทุก masternode (จาก %d คนที่รู้จัก) กำลังทำงานในเวอร์ชั่นซอฟต์แวร์ที่ใหม่กว่า โปรดตรวจสอบเวอร์ชันล่าสุด เป็นไปได้ที่คุณพลาดการอัปเดตที่สำคัญ</translation>
+    </message>
+    <message>
+        <source>Warning: Wallet file corrupt, data salvaged! Original %s saved as %s in %s; if your balance or transactions are incorrect you should restore from a backup.</source>
+        <translation>คำเตือน: ไฟล์ Wallet เสียหาย, ข้อมูลได้ถูกกู้! %s จากเดิมถูกบันทึกเป็น %s ใน %s; หากยอดคงเหลือหรือธุรกรรมของคุณไม่ถูกต้องคุณควรเรียกคืนจากสำเนาสำรอง</translation>
+    </message>
+    <message>
+        <source>Whitelist peers connecting from the given IP address (e.g. 1.2.3.4) or CIDR notated network (e.g. 1.2.3.0/24). Can be specified multiple times.</source>
+        <translation>Whitelist peers กำลังเชื่อมต่อจากที่อยู่ IP ที่ระบุ (เช่น 1.2.3.4) หรือเครือข่ายที่ได้รับการจดบันทึก CIDR (เช่น 1.2.3.0/24) สามารถระบุได้หลายครั้ง</translation>
+    </message>
+    <message>
+        <source>%s corrupt, salvage failed</source>
+        <translation>%s เสียหาย, กู้ไม่สำเร็จ</translation>
+    </message>
+    <message>
+        <source>%s is not a valid backup folder!</source>
+        <translation>%s ไม่ใช่โฟลเดอร์สำรองที่ถูกต้อง!</translation>
+    </message>
+    <message>
+        <source>%s is set very high!</source>
+        <translation>%s ถูกตั้งค่าไว้สูงมาก!</translation>
+    </message>
+    <message>
+        <source>(press q to shutdown and continue later)</source>
+        <translation>(กด q เพื่อปิดเครื่องและดำเนินการต่อในภายหลัง)</translation>
+    </message>
+    <message>
+        <source>-devnet can only be specified once</source>
+        <translation>--devnet สามารถระบุได้เพียงครั้งเดียวเท่านั้น</translation>
+    </message>
+    <message>
+        <source>-port must be specified when -devnet and -listen are specified</source>
+        <translation>--port ควรระบุเฉพาะเมื่อระบุ -devnet และ -listen</translation>
+    </message>
+    <message>
+        <source>-rpcport must be specified when -devnet and -server are specified</source>
+        <translation>-rpcport ควรระบุเฉพาะเมื่อระบุ -devnet และ -server</translation>
+    </message>
+    <message>
+        <source>Allow RFC1918 addresses to be relayed and connected to (default: %u)</source>
+        <translation>อนุญาตให้ที่อยู่ RFC1918 ถูกส่งต่อและเชื่อมต่อกับ (ค่าเริ่มต้น: %u)</translation>
+    </message>
+    <message>
+        <source>Attempt to recover private keys from a corrupt wallet on startup</source>
+        <translation>พยายามกู้คืน Privatekeys จาก wallet  ที่เสียหายเมื่อเริ่มต้น</translation>
+    </message>
+    <message>
+        <source>Cannot resolve -%s address: '%s'</source>
+        <translation>ไม่สามารถแก้ไขได้ -%s ที่อยู่: '%s'</translation>
+    </message>
+    <message>
+        <source>Change index out of range</source>
+        <translation>ปรับเปลี่ยนดัชนีนอกช่วง</translation>
+    </message>
+    <message>
+        <source>Copyright (C)</source>
+        <translation>ลิขสิทธิ์ (C)</translation>
+    </message>
+    <message>
+        <source>Error loading %s</source>
+        <translation>เกิดข้อผิดพลาดในการโหลด %s</translation>
+    </message>
+    <message>
+        <source>Error loading %s: Wallet corrupted</source>
+        <translation>เกิดข้อผิดพลาดในการโหลด %s: Wallet เสียหาย</translation>
+    </message>
+    <message>
+        <source>Error loading %s: Wallet requires newer version of %s</source>
+        <translation>เกิดข้อผิดพลาดในการโหลด %s: Wallet ต้องใช้เวอร์ชันที่ใหม่กว่า %s</translation>
+    </message>
+    <message>
+        <source>Error upgrading chainstate database</source>
+        <translation>เกิดข้อผิดพลาดในการอัพเกรดฐานข้อมูล chainstate</translation>
+    </message>
+    <message>
+        <source>Failed to find mixing queue to join</source>
+        <translation>ไม่สามารถหาคิวการผสมที่จะเข้าร่วมได้</translation>
+    </message>
+    <message>
+        <source>Failed to start a new mixing queue</source>
+        <translation>ไม่สามารถเริ่มคิวการผสมใหม่</translation>
+    </message>
+    <message>
+        <source>Initialization sanity check failed. %s is shutting down.</source>
+        <translation>การตรวจสอบความถูกต้องล้มเหลว  %s กำลังจะปิด</translation>
+    </message>
+    <message>
+        <source>Invalid amount for -%s=&lt;amount&gt;: '%s'</source>
+        <translation>จำนวนเงินไม่ถูกต้องสำหรับ -%s = &lt;amount&gt;: '%s'</translation>
+    </message>
+    <message>
+        <source>Invalid spork address specified with -sporkaddr</source>
+        <translation>ที่อยู่ spork ที่ระบุด้วย -sporkaddr ไม่ถูกต้อง</translation>
+    </message>
+    <message>
+        <source>Keep N DASH anonymized (%u-%u, default: %u)</source>
+        <translation>เก็บ N DASH ไว้โดยไม่ระบุชื่อ (%u-%u, ค่าดีฟอลต์: %u)</translation>
+    </message>
+    <message>
+        <source>Print this help message and exit</source>
+        <translation>พิมพ์ข้อความช่วยเหลือนี้และออกจากโปรแกรม</translation>
+    </message>
+    <message>
+        <source>Receive and display P2P network alerts (default: %u)</source>
+        <translation>รับและแสดงการแจ้งเตือนของเครือข่าย P2P (ค่าเริ่มต้น: %u)</translation>
+    </message>
+    <message>
+        <source>Reducing -maxconnections from %d to %d, because of system limitations.</source>
+        <translation>ลดการเชื่อมต่อสูงสุดจาก %d ถึง %d เนื่องจากข้อจำกัดของระบบ</translation>
+    </message>
+    <message>
+        <source>Relay and mine data carrier transactions (default: %u)</source>
+        <translation>ส่งผ่านและขุดธุรกรรมข้อมูลผู้ให้บริการ (ค่าเริ่มต้น: %u)</translation>
+    </message>
+    <message>
+        <source>Relay non-P2SH multisig (default: %u)</source>
+        <translation>ส่งผ่าน non-P2SH multisig (ค่าดีฟอลต์: %u)</translation>
+    </message>
+    <message>
+        <source>Rescanning...</source>
+        <translation>กำลังสแกนใหม่...</translation>
+    </message>
+    <message>
+        <source>Run in the background as a daemon and accept commands</source>
+        <translation>เรียกใช้ในพื้นหลังเป็น daemon และยอมรับคำสั่ง</translation>
+    </message>
+    <message>
+        <source>Send trace/debug info to console instead of debug.log file</source>
+        <translation>ส่งข้อมูล trace / debug ไปยัง console แทนไฟล์ debug.log</translation>
+    </message>
+    <message>
+        <source>Session not complete!</source>
+        <translation>เซสชันไม่สมบูรณ์!</translation>
+    </message>
+    <message>
+        <source>Session timed out.</source>
+        <translation>เซสชันหมดอายุแล้ว</translation>
+    </message>
+    <message>
+        <source>Set database cache size in megabytes (%d to %d, default: %d)</source>
+        <translation>ตั้งค่าขนาดฐานข้อมูลเป็นเมกะไบต์ (%d ถึง %d ค่าเริ่มต้น: %d)</translation>
+    </message>
+    <message>
+        <source>Set maximum block size in bytes (default: %d)</source>
+        <translation>กำหนดขนาดบล็อกสูงสุดเป็นไบต์ (ค่าดีฟอลต์: %d)</translation>
+    </message>
+    <message>
+        <source>Set the masternode private key</source>
+        <translation>ตั้งค่าคีย์ส่วนตัว Masternode</translation>
+    </message>
+    <message>
+        <source>Show all debugging options (usage: --help -help-debug)</source>
+        <translation>แสดงการแก้จุดบกพร่องทั้งหมด (การใช้งาน: --help - help-debug)</translation>
+    </message>
+    <message>
+        <source>Shrink debug.log file on client startup (default: 1 when no -debug)</source>
+        <translation>ลดขนาดไฟล์ debug.log ในการเริ่มต้นของไคลเอ็นต์ (ค่าเริ่มต้น: 1 เมื่อไม่มี debug)</translation>
+    </message>
+    <message>
+        <source>Signing transaction failed</source>
+        <translation>ลงชื่อการทำธุรกรรมล้มเหลว</translation>
+    </message>
+    <message>
+        <source>Specify data directory</source>
+        <translation>ระบุไดเร็กทอรีข้อมูล</translation>
+    </message>
+    <message>
+        <source>Specify wallet file (within data directory)</source>
+        <translation>ระบุไฟล์ wallet (ภายในไดเรกทอรีข้อมูล)</translation>
+    </message>
+    <message>
+        <source>Specify your own public address</source>
+        <translation>กำหนดที่อยู่สาธารณะของคุณเอง</translation>
+    </message>
+    <message>
+        <source>Starting network threads...</source>
+        <translation>เริ่มต้นเธรดเครือข่าย ..</translation>
+    </message>
+    <message>
+        <source>Synchronization pending...</source>
+        <translation>กำลังรอการซิงค์</translation>
+    </message>
+    <message>
+        <source>Synchronizing governance objects...</source>
+        <translation>กำลังปรับเทียบออบเจคการกำกับ ...</translation>
+    </message>
+    <message>
+        <source>Synchronizing masternode payments...</source>
+        <translation>กำลังซิงค์การชำระเงิน Masternode ...</translation>
+    </message>
+    <message>
+        <source>The source code is available from %s.</source>
+        <translation>ซอร์สโค้ดที่ใช้ได้จาก %s</translation>
+    </message>
+    <message>
+        <source>The transaction amount is too small to pay the fee</source>
+        <translation>จำนวนเงินที่ทำธุรกรรมมีน้อยเกินไปที่จะจ่ายค่าธรรมเนียม</translation>
+    </message>
+    <message>
+        <source>This is experimental software.</source>
+        <translation>นี่เป็นซอฟต์แวร์ทดลอง</translation>
+    </message>
+    <message>
+        <source>Transaction amount too small</source>
+        <translation>จำนวนธุรกรรมน้อยเกินไป</translation>
+    </message>
+    <message>
+        <source>Transaction created successfully.</source>
+        <translation>ทำธุรกรรมสำเร็จแล้ว</translation>
+    </message>
+    <message>
+        <source>Transaction fees are too high.</source>
+        <translation>ค่าธรรมเนียมการทำธุรกรรมสูงเกินไป</translation>
+    </message>
+    <message>
+        <source>Transaction not valid.</source>
+        <translation>ธุรกรรมไม่ถูกต้อง</translation>
+    </message>
+    <message>
+        <source>Transaction too large for fee policy</source>
+        <translation>ธุรกรรมมีขนาดใหญ่เกินไปสำหรับนโยบายค่าธรรมเนียม</translation>
+    </message>
+    <message>
+        <source>Unable to bind to %s on this computer (bind returned error %s)</source>
+        <translation>ไม่สามารถ bind กับ %s บนคอมพิวเตอร์เครื่องนี้ได้ (bind ผิดพลาด %s)</translation>
+    </message>
+    <message>
+        <source>Unable to sign spork message, wrong key?</source>
+        <translation>ไม่สามารถลงชื่อเข้าใช้ข้อความ spork ได้  คีย์ผิดหรือไม่?</translation>
+    </message>
+    <message>
+        <source>Unknown network specified in -onlynet: '%s'</source>
+        <translation>ไม่รู้จักเครือข่ายที่ระบุไว้ใน -onlynet: '%s'</translation>
+    </message>
+    <message>
+        <source>Unknown state: id = %u</source>
+        <translation>ไม่ทราบสถานะ : ไอดี = %u</translation>
+    </message>
+    <message>
+        <source>Username for JSON-RPC connections</source>
+        <translation>ชื่อผู้ใช้สำหรับการเชื่อมต่อ JSON-RPC</translation>
+    </message>
+    <message>
+        <source>Verifying blocks...</source>
+        <translation>กำลังตรวจสอบบล็อค ...</translation>
+    </message>
+    <message>
+        <source>Verifying wallet...</source>
+        <translation>กำลังตรวจสอบ Wallet...</translation>
+    </message>
+    <message>
+        <source>Very low number of keys left: %d</source>
+        <translation>จำนวนคีย์ที่เหลืออยู่ต่ำมาก: %d</translation>
+    </message>
+    <message>
+        <source>Wallet %s resides outside data directory %s</source>
+        <translation>Wallet %s อยู่นอกไดเรกทอรีข้อมูล %s</translation>
+    </message>
+    <message>
+        <source>Wallet is locked.</source>
+        <translation>ล็อค Wallet </translation>
+    </message>
+    <message>
+        <source>Wallet options:</source>
+        <translation>ตัวเลือก Wallet :</translation>
+    </message>
+    <message>
+        <source>Wallet window title</source>
+        <translation>ชื่อหน้าต่าง Wallet </translation>
+    </message>
+    <message>
+        <source>Warning</source>
+        <translation>คำเตือน</translation>
+    </message>
+    <message>
+        <source>Your entries added successfully.</source>
+        <translation>เพิ่มรายการของคุณเรียบร้อยแล้ว</translation>
+    </message>
+    <message>
+        <source>Your transaction was accepted into the pool!</source>
+        <translation>การทำธุรกรรมของคุณได้รับการยอมรับเข้าสู่  pool แล้ว</translation>
+    </message>
+    <message>
+        <source>Zapping all transactions from wallet...</source>
+        <translation>กำลังลบการทำธุรกรรมทั้งหมดจาก wallet...</translation>
+    </message>
+</context>
+</TS>
\ No newline at end of file
diff --git a/src/qt/locale/dash_pt_BR.ts b/src/qt/locale/dash_tr.ts
similarity index 51%
rename from src/qt/locale/dash_pt_BR.ts
rename to src/qt/locale/dash_tr.ts
index e525f2994a58..9b7cd22cd699 100644
--- a/src/qt/locale/dash_pt_BR.ts
+++ b/src/qt/locale/dash_tr.ts
@@ -1,249 +1,249 @@
-<TS language="pt_BR" version="2.1">
+<TS language="tr" version="2.1">
 <context>
     <name>AddressBookPage</name>
     <message>
         <source>Right-click to edit address or label</source>
-        <translation>Clique com o botão direito para editar o endereço ou o rótulo</translation>
+        <translation>Adres veya etiketi düzenlemek için sağ tıklayın.</translation>
     </message>
     <message>
         <source>Create a new address</source>
-        <translation>Criar um novo endereço</translation>
+        <translation>Yeni bir adres oluştur</translation>
     </message>
     <message>
         <source>&amp;New</source>
-        <translation>&amp;Novo</translation>
+        <translation>&amp;Yeni</translation>
     </message>
     <message>
         <source>Copy the currently selected address to the system clipboard</source>
-        <translation>Copiar o endereço selecionado para a área de transferência do sistema</translation>
+        <translation>Şu anda seçili olan adresi sistem panosuna kopyala</translation>
     </message>
     <message>
         <source>&amp;Copy</source>
-        <translation>&amp;Copiar</translation>
+        <translation>&amp;Kopyala</translation>
     </message>
     <message>
         <source>Delete the currently selected address from the list</source>
-        <translation>Excluir os endereços selecionados da lista</translation>
+        <translation>Seçili adresi listeden sil</translation>
     </message>
     <message>
         <source>&amp;Delete</source>
-        <translation>E&amp;xcluir</translation>
+        <translation>&amp;Sil</translation>
     </message>
     <message>
         <source>Export the data in the current tab to a file</source>
-        <translation>Exportar os dados na aba atual para um arquivo</translation>
+        <translation>Güncel sekmedeki verileri bir dosyaya aktar</translation>
     </message>
     <message>
         <source>&amp;Export</source>
-        <translation>&amp;Exportar</translation>
+        <translation>&amp;Dışa aktar</translation>
     </message>
     <message>
         <source>C&amp;lose</source>
-        <translation>&amp;Fechar</translation>
+        <translation>K&amp;apat</translation>
     </message>
     <message>
         <source>Choose the address to send coins to</source>
-        <translation>Escolha o endereço no qual receberá as moedas</translation>
+        <translation>Parayı göndermek istediğiniz adresi seçiniz</translation>
     </message>
     <message>
         <source>Choose the address to receive coins with</source>
-        <translation>Escolha o endereço para receber moedas com ele</translation>
+        <translation>Parayı almak istediğiniz adresi seçiniz</translation>
     </message>
     <message>
         <source>C&amp;hoose</source>
-        <translation>E&amp;scolha</translation>
+        <translation>S&amp;eçiniz</translation>
     </message>
     <message>
         <source>Sending addresses</source>
-        <translation>Endereços de envio</translation>
+        <translation>Gönderilen adresler</translation>
     </message>
     <message>
         <source>Receiving addresses</source>
-        <translation>Endereços de recebimento</translation>
+        <translation>Alım adresleri</translation>
     </message>
     <message>
         <source>These are your Dash addresses for sending payments. Always check the amount and the receiving address before sending coins.</source>
-        <translation>Esses são os seus endereços para enviar pagamentos. Sempre cheque a quantia e o endereço de recebimento antes de enviar moedas,</translation>
+        <translation>Bunlar ödemeleri göndermek için kullanacağınız Dash adreslerinizdir. Dash yollamadan önce tutarı ve alıcının alım adresini her zaman kontrol ediniz.</translation>
     </message>
     <message>
         <source>These are your Dash addresses for receiving payments. It is recommended to use a new receiving address for each transaction.</source>
-        <translation>Estes são os seus endereços para receber pagamentos. É recomendado usar um novo para cada transação.</translation>
+        <translation>Bunlar ödemeleri almak için kullanacağınız Dash adreslerinizdir. Her işlem için yeni bir alım adresi kullanmanız tavsiye edilir.</translation>
     </message>
     <message>
         <source>&amp;Copy Address</source>
-        <translation>&amp;Copiar Endereço</translation>
+        <translation>&amp;Adresi Kopyala</translation>
     </message>
     <message>
         <source>Copy &amp;Label</source>
-        <translation>Copiar &amp;Rótulo</translation>
+        <translation>&amp;Etiketi Kopyala</translation>
     </message>
     <message>
         <source>&amp;Edit</source>
-        <translation>&amp;Editar</translation>
+        <translation>&amp;Değiştir</translation>
     </message>
     <message>
         <source>Export Address List</source>
-        <translation>Exportar lista de endereço</translation>
+        <translation>Adres Listesini Dışarı Aktar</translation>
     </message>
     <message>
         <source>Comma separated file (*.csv)</source>
-        <translation>Arquivo separado por vírgulas (*. csv)</translation>
+        <translation>Virgülle ayrılmış değerler dosyası (*.csv)</translation>
     </message>
     <message>
         <source>Exporting Failed</source>
-        <translation>Falha ao exportar</translation>
+        <translation>Dışarı aktarmada hata</translation>
     </message>
     <message>
         <source>There was an error trying to save the address list to %1. Please try again.</source>
-        <translation>Houve um erro ao tentar salvar a lista de endereços em %1. Por favor tente novamente.</translation>
+        <translation>Adres listesinin %1 konumuna kaydedilmesi sırasında bir hata meydana geldi. Lütfen tekrar deneyin.</translation>
     </message>
 </context>
 <context>
     <name>AddressTableModel</name>
     <message>
         <source>Label</source>
-        <translation>Rótulo</translation>
+        <translation>Etiket</translation>
     </message>
     <message>
         <source>Address</source>
-        <translation>Endereço</translation>
+        <translation>Adres</translation>
     </message>
     <message>
         <source>(no label)</source>
-        <translation>(sem rótulo)</translation>
+        <translation>(etiket yok)</translation>
     </message>
 </context>
 <context>
     <name>AskPassphraseDialog</name>
     <message>
         <source>Passphrase Dialog</source>
-        <translation>Janela da Frase de Segurança</translation>
+        <translation>Parola diyaloğu</translation>
     </message>
     <message>
         <source>Enter passphrase</source>
-        <translation>Digite a frase de segurança</translation>
+        <translation>Parolayı giriniz</translation>
     </message>
     <message>
         <source>New passphrase</source>
-        <translation>Nova frase de segurança</translation>
+        <translation>Yeni parola</translation>
     </message>
     <message>
         <source>Repeat new passphrase</source>
-        <translation>Repita a nova frase de segurança</translation>
+        <translation>Yeni parolayı tekrarlayınız</translation>
     </message>
     <message>
         <source>Enter the new passphrase to the wallet.&lt;br/&gt;Please use a passphrase of &lt;b&gt;ten or more random characters&lt;/b&gt;, or &lt;b&gt;eight or more words&lt;/b&gt;.</source>
-        <translation>Insira a nova senha para a carteira.&lt;br/&gt;Favor usar uma senha com &lt;b&gt;dez ou mais caracteres aleatórios&lt;/b&gt;, ou &lt;b&gt;oito ou mais palavras&lt;/b&gt;.</translation>
+        <translation>Cüzdan için yeni parolayı giriniz.&lt;br/&gt;Lütfen &lt;b&gt;on ya da daha fazla rastgele karakter&lt;/b&gt; veya &lt;b&gt;sekiz ya da daha fazla kelime&lt;/b&gt; içeren bir parola kullanınız.</translation>
     </message>
     <message>
         <source>Encrypt wallet</source>
-        <translation>Criptografar carteira</translation>
+        <translation>Cüzdanı şifrele</translation>
     </message>
     <message>
         <source>This operation needs your wallet passphrase to unlock the wallet.</source>
-        <translation>Esta operação precisa da sua senha para desbloquear a carteira.</translation>
+        <translation>Bu eylem cüzdan kilidini açmak için cüzdan parolanızı gerektirir.</translation>
     </message>
     <message>
         <source>Unlock wallet for mixing only</source>
-        <translation>Desbloquear carteira appenas para misturar</translation>
+        <translation>Cüzdanın kilidini sadece karışım için aç</translation>
     </message>
     <message>
         <source>Unlock wallet</source>
-        <translation>Desbloquear carteira</translation>
+        <translation>Cüzdan kilidini kaldır</translation>
     </message>
     <message>
         <source>This operation needs your wallet passphrase to decrypt the wallet.</source>
-        <translation>Esta operação precisa da sua senha para descriptografar a carteira</translation>
+        <translation>Bu eylem, cüzdan şifresini çözmek için cüzdan parolanıza ihtiyaç duyuyor.</translation>
     </message>
     <message>
         <source>Decrypt wallet</source>
-        <translation>Descriptografar carteira</translation>
+        <translation>Cüzdanın şifrelemesini aç</translation>
     </message>
     <message>
         <source>Change passphrase</source>
-        <translation>Alterar frase de segurança</translation>
+        <translation>Parola değiştir</translation>
     </message>
     <message>
         <source>Enter the old passphrase and new passphrase to the wallet.</source>
-        <translation>Insira a senha antiga e a nova para a carteira.</translation>
+        <translation>Eski ve yeni parolanızı cüzdana giriniz.</translation>
     </message>
     <message>
         <source>Confirm wallet encryption</source>
-        <translation>Confirmar criptografia da carteira</translation>
+        <translation>Cüzdan şifrelemesini onayla</translation>
     </message>
     <message>
         <source>Warning: If you encrypt your wallet and lose your passphrase, you will &lt;b&gt;LOSE ALL OF YOUR DASH&lt;/b&gt;!</source>
-        <translation>Aviso: Se você encriptar sua wallet e perder sua senha, você vai &lt;b&gt;PERDER TODAS AS SUAS DASH&lt;/b&gt;!</translation>
+        <translation>Uyarı: Eğer cüzdanınızı şifreler ve parolanızı unutursanız &lt;b&gt;TÜM DASHİNİZİ KAYBEDERSİNİZ&lt;/b&gt;!</translation>
     </message>
     <message>
         <source>Are you sure you wish to encrypt your wallet?</source>
-        <translation>Tem certeza de que deseja criptografar sua carteira?</translation>
+        <translation>Cüzdanınızı şifrelemek istediğinizden emin misiniz?</translation>
     </message>
     <message>
         <source>Wallet encrypted</source>
-        <translation>Carteira criptografada</translation>
+        <translation>Cüzdan şifrelendi</translation>
     </message>
     <message>
         <source>%1 will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your funds from being stolen by malware infecting your computer.</source>
-        <translation>A %1 irá fechar agora para terminar o processo de encriptação. Lembre-se que encriptar sua carteira não fará com que seus Dash estejam totalmente a salvo de serem roubados por malwares que infectem seu computador.</translation>
+        <translation>%1 şimdi şifreleme işlemini bitirmek için kapanacak. Unutmayın, cüzdanınızı şifrelemek sizi bilgisayarınıza bulaşmış olan kötü amaçlı yazılımlar tarafından paranızın çalınmasına karşı tamamen korumaz.</translation>
     </message>
     <message>
         <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. Previous backups of the unencrypted wallet file contain the same HD seed and still have full access to all your funds just like the new, encrypted wallet.</source>
-        <translation>IMPORTANTE: Todos os backups anteriores feitos do seu arquivo de carteira devem ser substituídos pelo arquivo de carteira criptografado recém-gerado. Os backups anteriores do arquivo de carteira não criptografada contêm a mesma semente HD e ainda têm acesso total a todos os seus fundos, assim como a nova carteira criptografada.</translation>
+        <translation>ÖNEMLİ: Cüzdanınızın eskiden yapılmış yedekleri yeni oluşturulmuş, şifreli cüzdan dosyası ile değiştirilmelidir. Şifresiz cüzdan dosyasının önceki yedekleri aynı HD kaynağını içerir ve yeni, şifreli cüzdanınız gibi tüm bakiyenize erişim sağlar.</translation>
     </message>
     <message>
         <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</source>
-        <translation>IMPORTANTE: Qualquer backup prévio que você tenha feito da sua carteira deve ser substituído pelo novo e encriptado arquivo gerado. Por razões de segurança, qualquer backup do arquivo não criptografado se tornará inútil assim que você começar a usar uma nova carteira criptografada.</translation>
+        <translation>ÖNEMLİ: Önceden yapmış olduğunuz cüzdan dosyası yedeklemelerinin yeni oluşturulan şifrelenmiş cüzdan dosyası ile değiştirilmeleri gerekir. Güvenlik nedenleriyle yeni, şifrelenmiş cüzdanı kullanmaya başladığınızda eski şifrelenmemiş cüzdan dosyaları işe yaramaz hale gelecektir.</translation>
     </message>
     <message>
         <source>Wallet encryption failed</source>
-        <translation>A criptografia da carteira falhou</translation>
+        <translation>Cüzdan şifreleme başarısız</translation>
     </message>
     <message>
         <source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source>
-        <translation>Falha na criptografia devido a um erro inerno. Sua carteira não foi criptografada.</translation>
+        <translation>Dahili bir hata yüzünden cüzdan şifrelemesi başarısız oldu. Cüzdanın şifrelenmedi.</translation>
     </message>
     <message>
         <source>The supplied passphrases do not match.</source>
-        <translation>A frase de segurança fornecida não confere.</translation>
+        <translation>Girilen parolalar birbiriyle eşleşmiyor.</translation>
     </message>
     <message>
         <source>Wallet unlock failed</source>
-        <translation>O desbloqueio da carteira falhou</translation>
+        <translation>Cüzdan kilidini kaldırma başarısız oldu</translation>
     </message>
     <message>
         <source>The passphrase entered for the wallet decryption was incorrect.</source>
-        <translation>A senha inserida para descriptografar a carteira está incorreta.</translation>
+        <translation>Cüzdan şifresinin açılması için girilen parola yanlıştı.</translation>
     </message>
     <message>
         <source>Wallet decryption failed</source>
-        <translation>A descriptografia da carteira falhou</translation>
+        <translation>Cüzdan şifresinin açılması başarısız oldu</translation>
     </message>
     <message>
         <source>Wallet passphrase was successfully changed.</source>
-        <translation>A frase de segurança da carteira foi alterada com êxito.</translation>
+        <translation>Cüzdan parolası başarılı bir şekilde değiştirildi.</translation>
     </message>
     <message>
         <source>Warning: The Caps Lock key is on!</source>
-        <translation>Atenção: A tecla Caps Lock está ligada!</translation>
+        <translation>Uyarı: Caps Lock tuşu etkin durumda!</translation>
     </message>
 </context>
 <context>
     <name>BanTableModel</name>
     <message>
         <source>IP/Netmask</source>
-        <translation>IP/Máscara de rede</translation>
+        <translation>IP/Ağ Maskesi</translation>
     </message>
     <message>
         <source>Banned Until</source>
-        <translation>Banido até</translation>
+        <translation>Şu zamana kadar yasaklı:</translation>
     </message>
 </context>
 <context>
     <name>BitcoinGUI</name>
     <message>
         <source>A fatal error occurred. Dash Core can no longer continue safely and will quit.</source>
-        <translation>Ocorreu um erro fatal. A Dash não pode mais continuar de forma segura, e irá fechar</translation>
+        <translation>Kritik bir hata oluştu. Dash Core artık güvenli şekilde devam edemez ve kapanacak.</translation>
     </message>
     <message>
         <source>Dash Core</source>
@@ -251,739 +251,672 @@
     </message>
     <message>
         <source>Wallet</source>
-        <translation>carteira</translation>
+        <translation>Cüzdan</translation>
     </message>
     <message>
         <source>Node</source>
-        <translation>Nó</translation>
+        <translation>Düğüm</translation>
     </message>
     <message>
         <source>&amp;Overview</source>
-        <translation>&amp;Visão geral</translation>
+        <translation>&amp;Genel bakış</translation>
     </message>
     <message>
         <source>Show general overview of wallet</source>
-        <translation>Mostrar visão geral da carteira</translation>
+        <translation>Cüzdana genel bakışı göster</translation>
     </message>
     <message>
         <source>&amp;Send</source>
-        <translation>&amp;Enviar</translation>
+        <translation>&amp;Gönder</translation>
     </message>
     <message>
         <source>Send coins to a Dash address</source>
-        <translation>Envie moedas para um endereço Dash</translation>
+        <translation>Bir Dash adresine coin gönder</translation>
     </message>
     <message>
         <source>&amp;Receive</source>
-        <translation>&amp;Receber</translation>
+        <translation>&amp;Al</translation>
     </message>
     <message>
         <source>Request payments (generates QR codes and dash: URIs)</source>
-        <translation>Solicitações de pagamentos (gera códigos QR e Dash: URIs)</translation>
+        <translation>Ödeme talep et (QR kodu ve Dash URI'si oluşturur)</translation>
     </message>
     <message>
         <source>&amp;Transactions</source>
-        <translation>&amp;Transações</translation>
+        <translation>&amp;İşlemler</translation>
     </message>
     <message>
         <source>Browse transaction history</source>
-        <translation>Navegar pelo histórico de transações</translation>
+        <translation>İşlem geçmişine gözat</translation>
     </message>
     <message>
         <source>&amp;Masternodes</source>
-        <translation>&amp;Masternodes</translation>
+        <translation>&amp;Ana düğümler</translation>
     </message>
     <message>
         <source>Browse masternodes</source>
-        <translation>Exibir masternodes</translation>
+        <translation>Ana düğümlere gözat</translation>
     </message>
     <message>
         <source>E&amp;xit</source>
-        <translation>S&amp;air</translation>
+        <translation>Ç&amp;ık</translation>
     </message>
     <message>
         <source>Quit application</source>
-        <translation>Sair da aplicação</translation>
+        <translation>Uygulamadan çık</translation>
     </message>
     <message>
         <source>Show information about Dash Core</source>
-        <translation>Exibe informações sobre Dash Core</translation>
+        <translation>Dash Core hakkında bilgileri göster</translation>
     </message>
     <message>
         <source>About &amp;Qt</source>
-        <translation>Sobre &amp;Qt</translation>
+        <translation>&amp;Qt Hakkında</translation>
     </message>
     <message>
         <source>Show information about Qt</source>
-        <translation>Exibe informações sobre Qt</translation>
+        <translation>Qt hakkında bilgi göster</translation>
     </message>
     <message>
         <source>&amp;Options...</source>
-        <translation>&amp;Opções...</translation>
+        <translation>&amp;Seçenekler...</translation>
     </message>
     <message>
         <source>&amp;About %1</source>
-        <translation>&amp;Sobre %1</translation>
+        <translation>%1 &amp;Hakkında</translation>
     </message>
     <message>
         <source>Modify configuration options for %1</source>
-        <translation>Modificar opções de configuração para o %1</translation>
+        <translation>%1 için yapılandırma ayarlarını değiştir</translation>
     </message>
     <message>
         <source>&amp;Show / Hide</source>
-        <translation>&amp;Exibir/Ocultar</translation>
+        <translation>&amp;Göster / Gizle</translation>
     </message>
     <message>
         <source>Show or hide the main Window</source>
-        <translation>Mostrar ou esconder a Janela Principal.</translation>
+        <translation>Ana pencereyi göster ya da gizle</translation>
     </message>
     <message>
         <source>&amp;Encrypt Wallet...</source>
-        <translation>&amp;Criptografar Carteira...</translation>
+        <translation>&amp;Cüzdanı Şifrele...</translation>
     </message>
     <message>
         <source>Encrypt the private keys that belong to your wallet</source>
-        <translation>Criptografar as chaves privadas que pertencem à sua carteira</translation>
+        <translation>Cüzdanınıza ait özel anahtarları şifreleyin</translation>
     </message>
     <message>
         <source>&amp;Backup Wallet...</source>
-        <translation>Fazer &amp;Backup da Carteira...</translation>
+        <translation>&amp;Cüzdanı Yedekle...</translation>
     </message>
     <message>
         <source>Backup wallet to another location</source>
-        <translation>Faça o Backup da carteira para outro local</translation>
+        <translation>Cüzdanı diğer bir konumda yedekle</translation>
     </message>
     <message>
         <source>&amp;Change Passphrase...</source>
-        <translation>Alterar frase de segurança</translation>
+        <translation>&amp;Parolayı Değiştir...</translation>
     </message>
     <message>
         <source>Change the passphrase used for wallet encryption</source>
-        <translation>Mudar a frase de segurança utilizada na criptografia da carteira</translation>
+        <translation>Cüzdan şifrelemesi için kullanılan parolayı değiştir</translation>
     </message>
     <message>
         <source>&amp;Unlock Wallet...</source>
-        <translation>&amp;Desbloquear carteira...</translation>
+        <translation>Cüzdanı &amp;Kilitle...</translation>
     </message>
     <message>
         <source>Unlock wallet</source>
-        <translation>Desbloquear carteira</translation>
+        <translation>Cüzdan kilidini kaldır</translation>
     </message>
     <message>
         <source>&amp;Lock Wallet</source>
-        <translation>Bloquear carteira</translation>
+        <translation>Cüzdanı &amp;Kilitle</translation>
     </message>
     <message>
         <source>Sign &amp;message...</source>
-        <translation>Assinar &amp;Mensagem...</translation>
+        <translation>&amp;İleti imzala...</translation>
     </message>
     <message>
         <source>Sign messages with your Dash addresses to prove you own them</source>
-        <translation>Assine mensagens com seus endereços Dash para provar que você é dono delas</translation>
+        <translation>İletileri adreslerin size ait olduğunu ispatlamak için Dash adresleri ile imzala</translation>
     </message>
     <message>
         <source>&amp;Verify message...</source>
-        <translation>&amp;Verificar mensagem...</translation>
+        <translation>İletiyi &amp;kontrol et...</translation>
     </message>
     <message>
         <source>Verify messages to ensure they were signed with specified Dash addresses</source>
-        <translation>Verifique as mensagens para ter certeza de que elas foram assinadas com o endereço da Dash especificado</translation>
+        <translation>Belirtilen Dash adresleri ile imzalandıklarından emin olmak için iletileri kontrol et</translation>
     </message>
     <message>
         <source>&amp;Information</source>
-        <translation>&amp;Informação</translation>
+        <translation>&amp;Bilgi</translation>
     </message>
     <message>
         <source>Show diagnostic information</source>
-        <translation>Mostrar informação de diagnóstico</translation>
+        <translation>Tanı bilgilerini göster</translation>
     </message>
     <message>
         <source>&amp;Debug console</source>
-        <translation>&amp;Console de depuração</translation>
+        <translation>&amp;Debug konsolu</translation>
     </message>
     <message>
         <source>Open debugging console</source>
-        <translation>Abrir o console de depuração</translation>
+        <translation>Debug konsolunu aç</translation>
     </message>
     <message>
         <source>&amp;Network Monitor</source>
-        <translation>&amp;Monitor de Rede</translation>
+        <translation>&amp;Ağ Monitörü</translation>
     </message>
     <message>
         <source>Show network monitor</source>
-        <translation>Exibe o monitor de rede</translation>
+        <translation>Ağ monitörünü göster</translation>
     </message>
     <message>
         <source>&amp;Peers list</source>
-        <translation>&amp;Peers</translation>
+        <translation>&amp;Eş listesi</translation>
     </message>
     <message>
         <source>Show peers info</source>
-        <translation>mostrar informações dos peers</translation>
+        <translation>Eş bilgisini göster</translation>
     </message>
     <message>
         <source>Wallet &amp;Repair</source>
-        <translation>&amp;Reparar carteira</translation>
+        <translation>Cüzdan &amp;Tamir</translation>
     </message>
     <message>
         <source>Show wallet repair options</source>
-        <translation>Mostrar opções de reparação da carteira</translation>
+        <translation>Cüzdan tamir seçeneklerini göster</translation>
     </message>
     <message>
         <source>Open Wallet &amp;Configuration File</source>
-        <translation>Abrir arquivo de &amp;Configuração da carteira</translation>
+        <translation>Cüzdan &amp;Ayar Dosyasını Aç</translation>
     </message>
     <message>
         <source>Open configuration file</source>
-        <translation>Abrir arquivo de configuração</translation>
+        <translation>Yapılandırma Dosyasını Aç</translation>
     </message>
     <message>
         <source>Open &amp;Masternode Configuration File</source>
-        <translation>Abrir arquivo de configuração do &amp;Masternode</translation>
+        <translation>&amp;Ana Düğüm Ayar Dosyasını Aç</translation>
     </message>
     <message>
         <source>Open Masternode configuration file</source>
-        <translation>Abrir arquivo de configuração de Masternode</translation>
+        <translation>Ana düğüm ayar dosyasını aç</translation>
     </message>
     <message>
         <source>Show Automatic &amp;Backups</source>
-        <translation>Mostrar &amp;backups automáticos</translation>
+        <translation>Otomatik &amp;Yedekleri Göster</translation>
     </message>
     <message>
         <source>Show automatically created wallet backups</source>
-        <translation>Mostrar backups da carteira criados automaticamente </translation>
+        <translation>Otomatik oluşturulan cüzdan yedeklerini göster</translation>
     </message>
     <message>
         <source>&amp;Sending addresses...</source>
-        <translation>Endereço&amp;s de envio...</translation>
+        <translation>&amp;Gönderme adresleri...</translation>
     </message>
     <message>
         <source>Show the list of used sending addresses and labels</source>
-        <translation>Mostrar a lista de endereços de envio e rótulos usados</translation>
+        <translation>Kullanılmış gönderme adresleri ve etiketlerin listesini göster</translation>
     </message>
     <message>
         <source>&amp;Receiving addresses...</source>
-        <translation>Endereços de &amp;recebimento...</translation>
+        <translation>&amp;Alma adresleri...</translation>
     </message>
     <message>
         <source>Show the list of used receiving addresses and labels</source>
-        <translation>Mostrar a lista de endereços de recebimento usados ​​e rótulos</translation>
+        <translation>Kullanılmış alım adresleri ve etiketlerin listesini göster</translation>
     </message>
     <message>
         <source>Open &amp;URI...</source>
-        <translation>Abrir &amp;URI...</translation>
+        <translation>&amp;URI Aç...</translation>
     </message>
     <message>
         <source>Open a dash: URI or payment request</source>
-        <translation>Abrir um Dash: URI ou cobrança</translation>
+        <translation>Bir Dash: bağlantısı ya da ödeme talebi aç</translation>
     </message>
     <message>
         <source>&amp;Command-line options</source>
-        <translation>Opções de linha de &amp;comando</translation>
+        <translation>&amp;Komut satırı seçenekleri</translation>
     </message>
     <message>
         <source>Show the %1 help message to get a list with possible Dash command-line options</source>
-        <translation>Mostrar a mensagem de ajuda do %1 para obter uma lista com possíveis opções de linha de comando Dash</translation>
+        <translation>Olası Dash komut satırı seçeneklerinin listesini görmek için %1 yardım mesajını göster</translation>
     </message>
     <message>
         <source>%1 client</source>
-        <translation>%1 cliente</translation>
+        <translation>%1 istemci</translation>
     </message>
     <message>
         <source>&amp;PrivateSend information</source>
-        <translation>Informação de Envio&amp;Privado</translation>
+        <translation>&amp;Özel Gönder bilgisi</translation>
     </message>
     <message>
         <source>Show the PrivateSend basic information</source>
-        <translation>Mostra informações básicas de EnvioPrivado</translation>
+        <translation>Özel Gönder temel bilgilerini göster</translation>
     </message>
     <message>
         <source>&amp;File</source>
-        <translation>&amp;Arquivo</translation>
+        <translation>&amp;Dosya</translation>
     </message>
     <message>
         <source>&amp;Settings</source>
-        <translation>&amp;Configurações</translation>
+        <translation>&amp;Ayarlar</translation>
     </message>
     <message>
         <source>&amp;Tools</source>
-        <translation>&amp;Ferramentas</translation>
+        <translation>&amp;Araçlar</translation>
     </message>
     <message>
         <source>&amp;Help</source>
-        <translation>&amp;Ajuda</translation>
+        <translation>&amp;Yardım</translation>
     </message>
     <message>
         <source>Tabs toolbar</source>
-        <translation>Barra de ferramentas</translation>
+        <translation>Sekme araç çubuğu</translation>
     </message>
     <message numerus="yes">
         <source>%n active connection(s) to Dash network</source>
-        <translation><numerusform>%n conexões ativas com a rede Dash</numerusform><numerusform>%n conexões ativas com a rede Dash</numerusform></translation>
+        <translation><numerusform>Dash ağına %n aktif bağlantı</numerusform><numerusform>Dash ağına %n aktif bağlantı</numerusform></translation>
     </message>
     <message>
         <source>Network activity disabled</source>
-        <translation>Atividade da rede disativada</translation>
+        <translation>Ağ etkinliği devre dışı bırakıldı</translation>
     </message>
     <message>
         <source>Syncing Headers (%1%)...</source>
-        <translation>Sincronizando cabeçahos (%1%)...</translation>
+        <translation>Üstbilgiler Senkronize Ediliyor (%1%)...</translation>
     </message>
     <message>
         <source>Synchronizing with network...</source>
-        <translation>Sincronizando com a rede...</translation>
+        <translation>Ağ ile senkronize ediliyor...</translation>
     </message>
     <message>
         <source>Indexing blocks on disk...</source>
-        <translation>Indexando blocos no disco...</translation>
+        <translation>Bloklar diske indeksleniyor...</translation>
     </message>
     <message>
         <source>Processing blocks on disk...</source>
-        <translation>Processando blocos no disco...</translation>
+        <translation>Bloklar diske işleniyor...</translation>
     </message>
     <message>
         <source>Reindexing blocks on disk...</source>
-        <translation>Reindexando blocos no disco...</translation>
+        <translation>Diskteki bloklar yeniden indeksleniyor...</translation>
     </message>
     <message>
         <source>Connecting to peers...</source>
-        <translation>Conectando...</translation>
+        <translation>Eşlere bağlanılıyor...</translation>
     </message>
     <message numerus="yes">
         <source>Processed %n block(s) of transaction history.</source>
-        <translation><numerusform>Processados %n blocos do histórico de transações.</numerusform><numerusform>Processados %n blocos do histórico de transações.</numerusform></translation>
+        <translation><numerusform>İşlem geçmişindeki %n blok işlendi.</numerusform><numerusform>İşlem geçmişindeki %n blok işlendi.</numerusform></translation>
     </message>
     <message>
         <source>%1 behind</source>
-        <translation>%1 atrás</translation>
+        <translation>%1 geride</translation>
     </message>
     <message>
         <source>Catching up...</source>
-        <translation>Recuperando o atraso ...</translation>
+        <translation>Aralık kapatılıyor...</translation>
     </message>
     <message>
         <source>Last received block was generated %1 ago.</source>
-        <translation>Último bloco recebido foi gerado %1 atrás.</translation>
+        <translation>Son alınan blok %1 önce oluşturulmuştu.</translation>
     </message>
     <message>
         <source>Transactions after this will not yet be visible.</source>
-        <translation>Transações após isso ainda não estão visíveis.</translation>
+        <translation>Bundan sonraki işlemler henüz görüntülenemez.</translation>
     </message>
     <message>
         <source>Up to date</source>
-        <translation>Atualizado</translation>
+        <translation>Güncel</translation>
     </message>
     <message>
         <source>Synchronizing additional data: %p%</source>
-        <translation>Sincronizando dados adicionais: %p%</translation>
+        <translation>Ek veri eşleniyor: %p%</translation>
     </message>
     <message>
         <source>Error</source>
-        <translation>Erro</translation>
+        <translation>Hata</translation>
     </message>
     <message>
         <source>Warning</source>
-        <translation>Atenção</translation>
+        <translation>Uyarı</translation>
     </message>
     <message>
         <source>Information</source>
-        <translation>Informação</translation>
+        <translation>Bilgi</translation>
     </message>
     <message>
         <source>Date: %1
 </source>
-        <translation>Data: %1
+        <translation>Tarih: %1
 </translation>
     </message>
     <message>
         <source>Amount: %1
 </source>
-        <translation>Quantia: %1
+        <translation>Tutar: %1
 </translation>
     </message>
     <message>
         <source>Type: %1
 </source>
-        <translation>Tipo: %1
+        <translation>Tür: %1
 </translation>
     </message>
     <message>
         <source>Label: %1
 </source>
-        <translation>Rótulo: %1
+        <translation>Etiket: %1
 </translation>
     </message>
     <message>
         <source>Address: %1
 </source>
-        <translation>Endereço: %1
+        <translation>Adres: %1
 </translation>
     </message>
     <message>
         <source>Sent transaction</source>
-        <translation>Transação enviada</translation>
+        <translation>İşlem gönderildi</translation>
     </message>
     <message>
         <source>Incoming transaction</source>
-        <translation>Transação recebida</translation>
+        <translation>Gelen işlem</translation>
     </message>
     <message>
         <source>HD key generation is &lt;b&gt;enabled&lt;/b&gt;</source>
-        <translation>Geração de chave HD está &lt;b&gt;ativada&lt;/b&gt;</translation>
+        <translation>HD anahtar oluşturma &lt;b&gt;etkin&lt;/b&gt;</translation>
     </message>
     <message>
         <source>HD key generation is &lt;b&gt;disabled&lt;/b&gt;</source>
-        <translation>Geração de chave HD está &lt;b&gt;desativada&lt;/b&gt;</translation>
+        <translation>HD anahtar oluşturma &lt;b&gt;devre dışı&lt;/b&gt;</translation>
     </message>
     <message>
         <source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;unlocked&lt;/b&gt;</source>
-        <translation>Carteira está &lt;b&gt;criptografada&lt;/b&gt; e atualmente &lt;b&gt;desbloqueada&lt;/b&gt;</translation>
+        <translation>Cüzdan &lt;b&gt;şifrelenmiştir&lt;/b&gt; ve şu anda &lt;b&gt;kilidi açıktır&lt;/b&gt;</translation>
     </message>
     <message>
         <source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;unlocked&lt;/b&gt; for mixing only</source>
-        <translation>A carteira está &lt;b&gt;encriptada&lt;/b&gt; e atualmente &lt;b&gt;desbloqueada&lt;/b&gt; apenas para anonimização</translation>
+        <translation>Cüzdan &lt;b&gt;şifrelenmiştir&lt;/b&gt; ve şu anda kilidi sadece karışım için &lt;b&gt;açıktır&lt;/b&gt;</translation>
     </message>
     <message>
         <source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;locked&lt;/b&gt;</source>
-        <translation>Carteira está &lt;b&gt;criptografada&lt;/b&gt; e atualmente &lt;b&gt;bloqueada&lt;/b&gt;</translation>
+        <translation>Cüzdan &lt;b&gt;şifrelenmiştir&lt;/b&gt; ve şu anda &lt;b&gt;kilitlidir&lt;/b&gt;</translation>
     </message>
 </context>
 <context>
     <name>ClientModel</name>
     <message>
         <source>Total: %1 (PS compatible: %2 / Enabled: %3)</source>
-        <translation>Total: %1 (Compatível c/ EP: %2 / Habilitado: %3)</translation>
+        <translation>Toplam %1 (ÖG uyumlu: %2 / Etkin: %3)</translation>
     </message>
     <message>
         <source>Network Alert</source>
-        <translation>Alerta da Rede</translation>
+        <translation>Ağ Uyarısı</translation>
     </message>
 </context>
 <context>
     <name>CoinControlDialog</name>
     <message>
         <source>Quantity:</source>
-        <translation>Quantidade:</translation>
+        <translation>Miktar:</translation>
     </message>
     <message>
         <source>Bytes:</source>
-        <translation>Bytes:</translation>
+        <translation>Bayt:</translation>
     </message>
     <message>
         <source>Amount:</source>
-        <translation>Quantia:</translation>
+        <translation>Meblağ:</translation>
     </message>
     <message>
         <source>Fee:</source>
-        <translation>Taxa:</translation>
+        <translation>Ücret:</translation>
     </message>
     <message>
         <source>Coin Selection</source>
-        <translation>Seleção da Moeda</translation>
+        <translation>Bitcoin Seçimi</translation>
     </message>
     <message>
         <source>Dust:</source>
-        <translation>Poeira:</translation>
+        <translation>Toz:</translation>
     </message>
     <message>
         <source>After Fee:</source>
-        <translation>Depois da taxa:</translation>
+        <translation>Ücretten sonra:</translation>
     </message>
     <message>
         <source>Change:</source>
-        <translation>trocar</translation>
+        <translation>Para üstü:</translation>
     </message>
     <message>
         <source>(un)select all</source>
-        <translation>(de)selecionar tudo</translation>
+        <translation>tümünü seç(me)</translation>
     </message>
     <message>
         <source>toggle lock state</source>
-        <translation>alternar estado de bloqueio</translation>
+        <translation>kilit durumunu aç/kapa</translation>
     </message>
     <message>
         <source>Tree mode</source>
-        <translation>Modo árvore</translation>
+        <translation>Ağaç kipi</translation>
     </message>
     <message>
         <source>List mode</source>
-        <translation>Modo lista</translation>
+        <translation>Liste kipi</translation>
     </message>
     <message>
         <source>(1 locked)</source>
-        <translation>(1 travado)</translation>
+        <translation>(1 kilitli)</translation>
     </message>
     <message>
         <source>Amount</source>
-        <translation>Quantidade</translation>
+        <translation>Meblağ</translation>
     </message>
     <message>
         <source>Received with label</source>
-        <translation>Recebido com rótulo</translation>
+        <translation>Şu etiketle alındı</translation>
     </message>
     <message>
         <source>Received with address</source>
-        <translation>Recebido com endereço</translation>
+        <translation>Şu adresle alındı</translation>
     </message>
     <message>
         <source>PS Rounds</source>
-        <translation>Rounds de EP</translation>
+        <translation>ÖG Turları</translation>
     </message>
     <message>
         <source>Date</source>
-        <translation>Data</translation>
+        <translation>Tarih</translation>
     </message>
     <message>
         <source>Confirmations</source>
-        <translation>Confirmações</translation>
+        <translation>Doğrulamalar</translation>
     </message>
     <message>
         <source>Confirmed</source>
-        <translation>Confirmado</translation>
+        <translation>Doğrulandı</translation>
     </message>
     <message>
         <source>Copy address</source>
-        <translation>Copie endereço</translation>
+        <translation>Adres kopyala</translation>
     </message>
     <message>
         <source>Copy label</source>
-        <translation>Copiar rótulo</translation>
+        <translation>Etiket kopyala</translation>
     </message>
     <message>
         <source>Copy amount</source>
-        <translation>Copie quantia</translation>
+        <translation>Tutarı kopyala</translation>
     </message>
     <message>
         <source>Copy transaction ID</source>
-        <translation>Copie ID da transação</translation>
+        <translation>İşlem ID'sini kopyala</translation>
     </message>
     <message>
         <source>Lock unspent</source>
-        <translation>Bloquear não gasto</translation>
+        <translation>Harcanmamışı kilitle</translation>
     </message>
     <message>
         <source>Unlock unspent</source>
-        <translation>Desbloquear não gasto</translation>
+        <translation>Harcanmamışın kilidini aç</translation>
     </message>
     <message>
         <source>Copy quantity</source>
-        <translation>Copiar quantidade</translation>
+        <translation>Miktarı kopyala</translation>
     </message>
     <message>
         <source>Copy fee</source>
-        <translation>Copie taxa</translation>
+        <translation>Ücreti kopyala</translation>
     </message>
     <message>
         <source>Copy after fee</source>
-        <translation>Copiar pós taxa</translation>
+        <translation>Ücretten sonrasını kopyala</translation>
     </message>
     <message>
         <source>Copy bytes</source>
-        <translation>Copiar bytes</translation>
+        <translation>Baytları kopyala</translation>
     </message>
     <message>
         <source>Copy dust</source>
-        <translation>Copiar poeira</translation>
+        <translation>Tozu kopyala</translation>
     </message>
     <message>
         <source>Copy change</source>
-        <translation>Copiar troco</translation>
+        <translation>Para üstünü kopyala</translation>
     </message>
     <message>
         <source>Please switch to "List mode" to use this function.</source>
-        <translation>Por favor alterne para "Modo lista" para usar essa função.</translation>
+        <translation>Bu fonksiyonu kullanmak için lütfen "Liste modu"na geçin.</translation>
     </message>
     <message>
-        <source>Non-anonymized input selected. &lt;b&gt;PrivateSend will be disabled.&lt;/b&gt;&lt;br&gt;&lt;br&gt;If you still want to use PrivateSend, please deselect all non-nonymized inputs first and then check PrivateSend checkbox again.</source>
-        <translation>Entrada não anônima selecionada. &lt;b&gt;O PrivateSend será desativado.&lt;/b&gt; &lt;br&gt; &lt;br&gt; Se você ainda quiser usar o PrivateSend, desmarque primeiro todas as entradas não modificadas e marque a caixa de seleção PrivateSend novamente.</translation>
+        <source>Non-anonymized input selected. &lt;b&gt;PrivateSend will be disabled.&lt;/b&gt;&lt;br&gt;&lt;br&gt;If you still want to use PrivateSend, please deselect all non-anonymized inputs first and then check the PrivateSend checkbox again.</source>
+        <translation>Anonim hale getirilmemiş girdi seçildi. &lt;b&gt;Özel Gönder devre dışı olacak&lt;/b&gt;&lt;br&gt;&lt;br&gt;Yine de Özel Gönder kullanmak istiyorsanız, lütfen önce anonim hale getirilmemiş girdilerin seçimini kaldırın sonra Özel Gönder kutusunu işaretleyin.</translation>
     </message>
     <message>
         <source>(%1 locked)</source>
-        <translation>(%1 bloqueado)</translation>
+        <translation>(%1 kilitlendi)</translation>
     </message>
     <message>
         <source>yes</source>
-        <translation>sim</translation>
+        <translation>Evet</translation>
     </message>
     <message>
         <source>no</source>
-        <translation>não</translation>
+        <translation>Hayır</translation>
     </message>
     <message>
         <source>This label turns red if any recipient receives an amount smaller than the current dust threshold.</source>
-        <translation>Este texto fica vermelho se qualquer destinatário receber uma quantidade menor que que o dust.</translation>
+        <translation>Eğer herhangi bir alıcı mevcut toz eşiğinden daha düşük bir tutar alırsa bu etiket kırmızıya dönüşür.</translation>
     </message>
     <message>
         <source>Can vary +/- %1 duff(s) per input.</source>
-        <translation>Pode variar +/- %1 duff(s) por entrada.</translation>
+        <translation>Girdi başına +/- %1 duff değişebilir.</translation>
     </message>
     <message>
         <source>(no label)</source>
-        <translation>(sem rótulo)</translation>
+        <translation>(etiket yok)</translation>
     </message>
     <message>
         <source>change from %1 (%2)</source>
-        <translation>troco de %1 (%2)</translation>
+        <translation>%1 ögesinden para üstü (%2)</translation>
     </message>
     <message>
         <source>(change)</source>
-        <translation>(troco)</translation>
+        <translation>(para üstü)</translation>
     </message>
     <message>
         <source>n/a</source>
-        <translation>n/d</translation>
-    </message>
-</context>
-<context>
-    <name>DarksendConfig</name>
-    <message>
-        <source>Configure PrivateSend</source>
-        <translation>Configurar ProvateSend</translation>
-    </message>
-    <message>
-        <source>Basic Privacy</source>
-        <translation>Privacidade Básica</translation>
-    </message>
-    <message>
-        <source>High Privacy</source>
-        <translation>Alta Privacidade</translation>
-    </message>
-    <message>
-        <source>Maximum Privacy</source>
-        <translation>Privacidade Máxima</translation>
-    </message>
-    <message>
-        <source>Please select a privacy level.</source>
-        <translation>Por favor, escolha um nível de privacidade.</translation>
-    </message>
-    <message>
-        <source>Use 2 separate masternodes to mix funds up to 1000 DASH</source>
-        <translation>Usar 2 Masternodes separados para fazer a mixagem de fundos até 1000 DASH</translation>
-    </message>
-    <message>
-        <source>Use 8 separate masternodes to mix funds up to 1000 DASH</source>
-        <translation>Usar 8 Masternodes separados para fazer a mixagem de fundos até 1000 DASH</translation>
-    </message>
-    <message>
-        <source>Use 16 separate masternodes</source>
-        <translation>Usar 16 Masternodes separados</translation>
-    </message>
-    <message>
-        <source>This option is the quickest and will cost about ~0.025 DASH to anonymize 1000 DASH</source>
-        <translation>Esta é a opção mais rápida e custará em torno de ~0,025 DASH para anonimizar 1000 DASH</translation>
-    </message>
-    <message>
-        <source>This option is moderately fast and will cost about 0.05 DASH to anonymize 1000 DASH</source>
-        <translation>Esta opção é moderadamente rápida e custará em torno de ~0,05 DASH para anonimizar 1000 DASH</translation>
-    </message>
-    <message>
-        <source>0.1 DASH per 1000 DASH you anonymize.</source>
-        <translation>0,1 DASH por cada 1000 DASH que você anonimizar.</translation>
-    </message>
-    <message>
-        <source>This is the slowest and most secure option. Using maximum anonymity will cost</source>
-        <translation>Esta é a opção mais lenta e mais segura. Usar o máximo de anonimidade custará</translation>
-    </message>
-    <message>
-        <source>PrivateSend Configuration</source>
-        <translation>Configuração EnvioPrivado</translation>
-    </message>
-    <message>
-        <source>PrivateSend was successfully set to basic (%1 and 2 rounds). You can change this at any time by opening Dash's configuration screen.</source>
-        <translation>O PrivateSend foi ajustado com sucesso para básico (%1 e 2 rodadas). Você pode alterar esse ajuste a qualquer momento, abrindo a tela de configuração da Dash.</translation>
-    </message>
-    <message>
-        <source>PrivateSend was successfully set to high (%1 and 8 rounds). You can change this at any time by opening Dash's configuration screen.</source>
-        <translation>O PrivateSend foi ajustado com sucesso para alto(%1 e 8 rodadas). Você pode alterar esse ajuste a qualquer momento, abrindo a tela de configuração da Dash.</translation>
-    </message>
-    <message>
-        <source>PrivateSend was successfully set to maximum (%1 and 16 rounds). You can change this at any time by opening Dash's configuration screen.</source>
-        <translation>O PrivateSend foi ajustado com sucesso para máximo (%1 e 16 rodadas). Você pode alterar esse ajuste a qualquer momento, abrindo a tela de configuração da Dash.</translation>
+        <translation>Mevcut değil</translation>
     </message>
 </context>
 <context>
     <name>EditAddressDialog</name>
     <message>
         <source>Edit Address</source>
-        <translation>Editar Endereço</translation>
+        <translation>Adresi düzenle</translation>
     </message>
     <message>
         <source>&amp;Label</source>
-        <translation>&amp;Rótulo</translation>
+        <translation>&amp;Etiket</translation>
     </message>
     <message>
         <source>The label associated with this address list entry</source>
-        <translation>O rótulo associado a esta entrada na lista de endereços</translation>
+        <translation>Bu adres listesi girdisi ile ilişkili etiket</translation>
     </message>
     <message>
         <source>&amp;Address</source>
-        <translation>&amp;Endereço</translation>
+        <translation>&amp;Adres</translation>
     </message>
     <message>
         <source>The address associated with this address list entry. This can only be modified for sending addresses.</source>
-        <translation>O endereço associado a esta lista de endereços de entrada. Isso só pode ser modificado para o envio de endereços.</translation>
+        <translation>Bu adres listesi girdisi ile ilişkili adres. Sadece gönderme adresleri için değiştirilebilir.</translation>
     </message>
     <message>
         <source>New receiving address</source>
-        <translation>Novo endereço de recebimento</translation>
+        <translation>Yeni alım adresi</translation>
     </message>
     <message>
         <source>New sending address</source>
-        <translation>Novo endereço de envio</translation>
+        <translation>Yeni gönderi adresi</translation>
     </message>
     <message>
         <source>Edit receiving address</source>
-        <translation>Editar endereço de recebimento</translation>
+        <translation>Alım adresini düzenle</translation>
     </message>
     <message>
         <source>Edit sending address</source>
-        <translation>Editar endereço de envio</translation>
+        <translation>Gönderi adresini düzenle</translation>
     </message>
     <message>
         <source>The entered address "%1" is not a valid Dash address.</source>
-        <translation>O endereço digitado "%1" não é um endereço válido.</translation>
+        <translation>Girilen %1 adresi, geçerli bir Dash adresi değildir.</translation>
     </message>
     <message>
         <source>The entered address "%1" is already in the address book.</source>
-        <translation>O endereço digitado "%1" já se encontra no catálogo de endereços.</translation>
+        <translation>Girilen "%1" adresi zaten adres defterinde mevcuttur.</translation>
     </message>
     <message>
         <source>Could not unlock wallet.</source>
-        <translation>Não foi possível desbloquear a carteira.</translation>
+        <translation>Cüzdan kilidi açılamadı.</translation>
     </message>
     <message>
         <source>New key generation failed.</source>
-        <translation>Falha na geração de nova chave.</translation>
+        <translation>Yeni anahtar oluşturulması başarısız oldu.</translation>
     </message>
 </context>
 <context>
     <name>FreespaceChecker</name>
     <message>
         <source>A new data directory will be created.</source>
-        <translation>Um novo diretório de dados será criado.</translation>
+        <translation>Yeni bir veri klasörü oluşturulacaktır.</translation>
     </message>
     <message>
         <source>name</source>
-        <translation>nome</translation>
+        <translation>İsim</translation>
     </message>
     <message>
         <source>Directory already exists. Add %1 if you intend to create a new directory here.</source>
-        <translation>O diretório já existe. Adicione %1 se você pretende criar um novo diretório aqui.</translation>
+        <translation>Klasör zaten mevcuttur. Burada yeni bir klasör oluşturmak istiyorsanız, %1 ekleyiniz.</translation>
     </message>
     <message>
         <source>Path already exists, and is not a directory.</source>
-        <translation>Esta pasta já existe, e não é um diretório.</translation>
+        <translation>Erişim yolu zaten mevcuttur ve klasör değildir.</translation>
     </message>
     <message>
         <source>Cannot create data directory here.</source>
-        <translation>Não é possível criar um diretório de dados aqui</translation>
+        <translation>Burada veri klasörü oluşturulamaz.</translation>
     </message>
 </context>
 <context>
     <name>HelpMessageDialog</name>
     <message>
         <source>version</source>
-        <translation>versão</translation>
+        <translation>Sürüm</translation>
     </message>
     <message>
         <source>(%1-bit)</source>
@@ -991,165 +924,169 @@
     </message>
     <message>
         <source>About %1</source>
-        <translation>Sobre %1</translation>
+        <translation>%1 Hakkında</translation>
     </message>
     <message>
         <source>Command-line options</source>
-        <translation>opções da linha de comando</translation>
+        <translation>komut satırı seçenekleri</translation>
     </message>
     <message>
         <source>Usage:</source>
-        <translation>Uso:</translation>
+        <translation>Kullanım:</translation>
     </message>
     <message>
         <source>command-line options</source>
-        <translation>opções da linha de comando</translation>
+        <translation>komut satırı seçenekleri</translation>
     </message>
     <message>
         <source>UI Options:</source>
-        <translation>opções da UI</translation>
+        <translation>Arayüz Seçenekleri:</translation>
     </message>
     <message>
         <source>Choose data directory on startup (default: %u)</source>
-        <translation>Escolher diretório de dados na inicialização (padrão: %u)</translation>
+        <translation>Başlangıçta veri klasörü seç (varsayılan: %u)</translation>
     </message>
     <message>
         <source>Set language, for example "de_DE" (default: system locale)</source>
-        <translation>Definir idioma, por exemplo "de_DE" (padrão: idioma do sistema)</translation>
+        <translation>Lisan belirt, mesela "de_De" (varsayılan: sistem dili)</translation>
     </message>
     <message>
         <source>Start minimized</source>
-        <translation>Iniciar minimizado</translation>
+        <translation>Küçültülmüş olarak başlat</translation>
     </message>
     <message>
         <source>Set SSL root certificates for payment request (default: -system-)</source>
-        <translation>Definir certificados de root SSL para requisições de pagamento (padrão: -sistema-)</translation>
+        <translation>Ödeme talebi için SSL kök sertifikalarını belirle (varsayılan: -system-)</translation>
     </message>
     <message>
         <source>Show splash screen on startup (default: %u)</source>
-        <translation>Exibir tela de abertura na inicialização (padrão: %u)</translation>
+        <translation>Başlatıldığında başlangıç ekranını göster (varsayılan: %u)</translation>
     </message>
     <message>
         <source>Reset all settings changed in the GUI</source>
-        <translation>Resetar todas as configuraçãoes do GUI</translation>
+        <translation>Grafik arayüzde yapılan tüm seçenek değişikliklerini sıfırla</translation>
     </message>
     <message>
         <source>PrivateSend information</source>
-        <translation>Informação de Envio&amp;Privado</translation>
+        <translation>Özel Gönder bilgisi</translation>
+    </message>
+    <message>
+        <source>&lt;h3&gt;PrivateSend Basics&lt;/h3&gt; PrivateSend gives you true financial privacy by obscuring the origins of your funds. All the Dash in your wallet is comprised of different "inputs" which you can think of as separate, discrete coins.&lt;br&gt; PrivateSend uses an innovative process to mix your inputs with the inputs of two other people, without having your coins ever leave your wallet. You retain control of your money at all times.&lt;hr&gt; &lt;b&gt;The PrivateSend process works like this:&lt;/b&gt;&lt;ol type="1"&gt; &lt;li&gt;PrivateSend begins by breaking your transaction inputs down into standard denominations. These denominations are 0.01 DASH, 0.1 DASH, 1 DASH and 10 DASH -- sort of like the paper money you use every day.&lt;/li&gt; &lt;li&gt;Your wallet then sends requests to specially configured software nodes on the network, called "masternodes." These masternodes are informed then that you are interested in mixing a certain denomination. No identifiable information is sent to the masternodes, so they never know "who" you are.&lt;/li&gt; &lt;li&gt;When two other people send similar messages, indicating that they wish to mix the same denomination, a mixing session begins. The masternode mixes up the inputs and instructs all three users' wallets to pay the now-transformed input back to themselves. Your wallet pays that denomination directly to itself, but in a different address (called a change address).&lt;/li&gt; &lt;li&gt;In order to fully obscure your funds, your wallet must repeat this process a number of times with each denomination. Each time the process is completed, it's called a "round." Each round of PrivateSend makes it exponentially more difficult to determine where your funds originated.&lt;/li&gt; &lt;li&gt;This mixing process happens in the background without any intervention on your part. When you wish to make a transaction, your funds will already be anonymized. No additional waiting is required.&lt;/li&gt; &lt;/ol&gt; &lt;hr&gt;&lt;b&gt;IMPORTANT:&lt;/b&gt; Your wallet only contains 1000 of these "change addresses." Every time a mixing event happens, up to 9 of your addresses are used up. This means those 1000 addresses last for about 100 mixing events. When 900 of them are used, your wallet must create more addresses. It can only do this, however, if you have automatic backups enabled.&lt;br&gt; Consequently, users who have backups disabled will also have PrivateSend disabled. &lt;hr&gt;For more information, see the &lt;a href="https://docs.dash.org/en/latest/wallets/dashcore/privatesend-instantsend.html"&gt;PrivateSend documentation&lt;/a&gt;.         </source>
+        <translation>&lt;h3&gt;Özel Gönder Temel Bilgiler&lt;/h3&gt; Özel Gönder size paranızın gerçek kaynağını gizleyerek tam bir gizlilik imkanı sağlar. Cüzdanınızdaki Dash farklı "girdiler"den oluşur, bunu ayrı gizli paralar olarak düşünebilirsiniz.&lt;br&gt; Özel Gönder sizin girdilerinizi başka iki kişinin girdileri ile karıştırmak için yenilikçi bir işlem kullanır ve bu sırada paranın cüzdanınızdan çıkmasına gerek kalmaz. Her an paranızın kontrolü sizdedir.&lt;hr&gt; &lt;b&gt;Özel Gönder işlemi şöyle işler:&lt;/b&gt;&lt;ol type="1"&gt; &lt;li&gt;Özel Gönder işlem girdilerinizi standart birimlere bölerek başlar. Bu birimler 0.01 DASH, 0.1 DASH, 1 DASH ve 10 DASH'dir -- her gün kullandığınız kağıt para gibi düşünebilirsiniz.&lt;/li&gt; &lt;li&gt;Sonra cüzdanınız ağdaki özel ayarlanmış yazılım düğümlerine talepler gönderir, bunşara "ana düğümler" denir. Bu ana düğümlere sizin belli bir miktar birimi karıştırmak istediğiniz bilgisi gider. Ana düğümlere kimliğinizi açık edecek bir bilgi gönderilmez, bu yüzden "kim" olduğunuzu bilmezler.&lt;/li&gt; &lt;li&gt;Aynı birimleri karıştırmak istediğini belirten iki başka kişi daha benzer mesajlar gönderince, karıştırma işlemi başlar. Ana düğüm giridleri karıştırır ve üç kullanıcının da cüzdanına şimdi dönüştürülmüş olan girdiyi kendilerne ödemelerini emreder. Cüzdanınız bu birimleri doğrudan kendisine öder ama farklı bir adres kullanır (buna değişim adresi denir).&lt;/li&gt; &lt;li&gt;Paranızı tamamen gizlemek için cüzdanınız bu işlemi her birim için birkaç defa tekrar etmelidir. Her işlem tamamlandığına buna bir "tur" denir. Her bir Özel Gönder turu paranızın kaynağının bulunmasını üstel olarak zorlaştırır.&lt;/li&gt; &lt;li&gt;Bu karışım işlemi arkaplanda sizin tarafınızdan bir müdahale olmadan gerçekleşir. Bir işlem yapmak istediğinizde bakiyeniz zaten anonimleştirilmiş olacaktır. Ek bir beklemeye gerek kalmaz.&lt;/li&gt; &lt;/ol&gt; &lt;hr&gt;&lt;b&gt;ÖNEMLİ:&lt;/b&gt; Cüzdanınızda bu "değişim adreslerinden" sadece 1000 tane vardır. Her bir karışım işleminde bu adreslerden 9 taneye kadar kullanılır. Bu da 1000 adresin yaklaşık 100 karışım işlemine yeteceği anlamına gelir. 900 tanesi kullanıldığı zaman, cüzdanınızın daha fazla adres oluşturması gerekir. Yalnız bunu ancak otomatik yedekleme etkinse yapabilir.&lt;br&gt; Sonuç olarak yedeklemeyi kapatan kullanıcılar aynı zamanda Özel Gönderi de kapatmış olurlar. &lt;hr&gt;Daha fazla bilgi için lütfen &lt;a href="https://docs.dash.org/en/latest/wallets/dashcore/privatesend-instantsend.html"&gt;Özel Gönder dökümantasyonuna&lt;/a&gt; göz atın.         </translation>
     </message>
-    </context>
+</context>
 <context>
     <name>Intro</name>
     <message>
         <source>Welcome</source>
-        <translation>Bem-vindo</translation>
+        <translation>Hoş geldiniz</translation>
     </message>
     <message>
         <source>Welcome to %1.</source>
-        <translation>Bem vindo ao %1</translation>
+        <translation>%1'a hoş geldiniz.</translation>
     </message>
     <message>
         <source>As this is the first time the program is launched, you can choose where %1 will store its data.</source>
-        <translation>Como essa é a primeira vez que o programa é executado, você pode escolher onde %1 armazenará seus dados.</translation>
+        <translation>Bu programın ilk kez başlatılmasından dolayı %1 yazılımının verilerini nerede saklayacağını seçebilirsiniz.</translation>
     </message>
     <message>
         <source>%1 will download and store a copy of the Dash block chain. At least %2GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</source>
-        <translation>%1 fará o download e armazenará uma cópia da cadeia de blocos do Dash. Pelo menos %2GB de dados serão armazenados neste diretório e crescerão com o tempo. A carteira também será armazenada neste diretório.</translation>
+        <translation>%1 Dash blok zincirinin bir kopyasını indirecek ve depolayacak. En az %2GB veri bu klasörde depolanacak ve zaman içinde büyüyecek. Cüzdan da aynı zamanda bu klasörde depolanacak.</translation>
     </message>
     <message>
         <source>Use the default data directory</source>
-        <translation>Use o diretório de dados padrão</translation>
+        <translation>Varsayılan veri klasörünü kullan</translation>
     </message>
     <message>
         <source>Use a custom data directory:</source>
-        <translation>Use um diretório de dados personalizado:</translation>
+        <translation>Özel bir veri klasörü kullan:</translation>
     </message>
     <message>
         <source>Error: Specified data directory "%1" cannot be created.</source>
-        <translation>Erro: Diretório de dados "%1" não pode ser criado.</translation>
+        <translation>Hata: belirtilen "%1" veri klasörü oluşturulamaz.</translation>
     </message>
     <message>
         <source>Error</source>
-        <translation>Erro</translation>
+        <translation>Hata</translation>
     </message>
     <message>
         <source>%1 GB of free space available</source>
-        <translation>%1 GB de espaço livre disponível </translation>
+        <translation>%1 GB boş alan mevcut</translation>
     </message>
     <message>
         <source>(of %1 GB needed)</source>
-        <translation>(Mais de %1GB necessário)</translation>
+        <translation>(%1 GB gerekli)</translation>
     </message>
 </context>
 <context>
     <name>MasternodeList</name>
     <message>
         <source>Form</source>
-        <translation>Formulário</translation>
+        <translation>Form</translation>
     </message>
     <message>
         <source>My Masternodes</source>
-        <translation>Meus Masternodes</translation>
+        <translation>Ana Düğümlerim</translation>
     </message>
     <message>
         <source>Note: Status of your masternodes in local wallet can potentially be slightly incorrect.&lt;br /&gt;Always wait for wallet to sync additional data and then double check from another node&lt;br /&gt;if your masternode should be running but you still do not see "ENABLED" in "Status" field.</source>
-        <translation>Nota: O status de seus masternodes na carteira local pode potencialmente ser ligeiramente incorreto. &lt;br /&gt;Sempre espere que a carteira sincronize dados adicionais e depois cheque novamente de outro nó &lt;br /&gt;, se o seu masternode estiver em execução, mas você ainda não vê "ATIVADO" no campo "Status".</translation>
+        <translation>Not: Yerel cüzdanınızdaki ana düğüm durumları biraz yanlış olabilir.&lt;br /&gt;Eğer ana düğümünüz çalışıyor durumda olmalı ama "Durum" alanında "ETKİN" olarak görünmüyorsa&lt;br /&gt;her zaman cüzdanın ek bilgiyi eşleştirmesini bekleyip başka bir düğümü kontrol edin.</translation>
     </message>
     <message>
         <source>Alias</source>
-        <translation>Apelido</translation>
+        <translation>Adlar</translation>
     </message>
     <message>
         <source>Address</source>
-        <translation>Endereço</translation>
+        <translation>Adres</translation>
     </message>
     <message>
         <source>Protocol</source>
-        <translation>Protocolo</translation>
+        <translation>Protokol</translation>
     </message>
     <message>
         <source>Status</source>
-        <translation>Status</translation>
+        <translation>Durum</translation>
     </message>
     <message>
         <source>Active</source>
-        <translation>Ativo</translation>
+        <translation>Etkin</translation>
     </message>
     <message>
         <source>Last Seen</source>
-        <translation>visto pela última vez</translation>
+        <translation>Son Görülme</translation>
     </message>
     <message>
         <source>Payee</source>
-        <translation>Payee</translation>
+        <translation>Alacaklı</translation>
     </message>
     <message>
         <source>S&amp;tart alias</source>
-        <translation>Iniciar Apelido</translation>
+        <translation>A&amp;d Başlat</translation>
     </message>
     <message>
         <source>Start &amp;all</source>
-        <translation>Iniciar tudo</translation>
+        <translation>&amp;Hepsini başlat</translation>
     </message>
     <message>
         <source>Start &amp;MISSING</source>
-        <translation>Iniciar &amp;FALTANTES</translation>
+        <translation>&amp;KAYIP başlat</translation>
     </message>
     <message>
         <source>&amp;Update status</source>
-        <translation>&amp;Update status</translation>
+        <translation>&amp;Güncelleme durumu</translation>
     </message>
     <message>
         <source>Show additional Masternode information</source>
-        <translation>Mostrar informações adicionais do Masternode</translation>
+        <translation>Ek Ana düğüm bilgisi göster</translation>
     </message>
     <message>
         <source>Show &amp;Info...</source>
-        <translation>Mostrar &amp;Info...</translation>
+        <translation>&amp;Bilgi göster...</translation>
     </message>
     <message>
         <source>Status will be updated automatically in (sec):</source>
-        <translation>O estado será atualizado automaticamente em (seg):</translation>
+        <translation>Şu kadar (san) içinde durum güncellenecek:</translation>
     </message>
     <message>
         <source>0</source>
@@ -1157,71 +1094,71 @@
     </message>
     <message>
         <source>All Masternodes</source>
-        <translation>Todos os Masternodes</translation>
+        <translation>Tüm Ana Düğümler</translation>
     </message>
     <message>
         <source>Filter List:</source>
-        <translation>Filtrar Lista:</translation>
+        <translation>Filtre Listesi:</translation>
     </message>
     <message>
         <source>Filter masternode list</source>
-        <translation>Filtrar lista de masternodes</translation>
+        <translation>Ana düğüm listesini filtrele</translation>
     </message>
     <message>
         <source>Node Count:</source>
-        <translation>Contagem de Masternodes</translation>
+        <translation>Düğüm Sayısı:</translation>
     </message>
     <message>
         <source>Start alias</source>
-        <translation>Iniciar apelido</translation>
+        <translation>Ad başlat</translation>
     </message>
     <message>
         <source>Confirm masternode start</source>
-        <translation>Confirmar início de masternode</translation>
+        <translation>Ana düğüm başlangıcını onayla</translation>
     </message>
     <message>
         <source>Are you sure you want to start masternode %1?</source>
-        <translation>Tem certeza de que deseja iniciar o masternode %1?</translation>
+        <translation>Ana düğüm %1 başlatmak istediğinize emin misiniz?</translation>
     </message>
     <message>
         <source>Confirm all masternodes start</source>
-        <translation>Confirmar inicialização de todos masternodes</translation>
+        <translation>Tüm ana düğüm başlatmalarını onayla</translation>
     </message>
     <message>
         <source>Are you sure you want to start ALL masternodes?</source>
-        <translation>Tem certeza que quer inicializar TODOS os masternodes?</translation>
+        <translation>TÜM ana düğümleri başlatmak istediğinize emin misiniz?</translation>
     </message>
     <message>
         <source>Command is not available right now</source>
-        <translation>Esse comando não está disponível nesse momento</translation>
+        <translation>Komut şu an mevcut değil</translation>
     </message>
     <message>
         <source>You can't use this command until masternode list is synced</source>
-        <translation>Você não pode usar este comando até que a lista do masternode seja sincronizada</translation>
+        <translation>Ana düğüm listesi eşleşene kadar bu komutu kullanamazsınız</translation>
     </message>
     <message>
         <source>Confirm missing masternodes start</source>
-        <translation>Confirmar inicialização dos masternodes faltantes</translation>
+        <translation>Kayıp ana düğümleri başlatmayı onayla</translation>
     </message>
     <message>
         <source>Are you sure you want to start MISSING masternodes?</source>
-        <translation>Tem certeza que quer inicializar os masternodes FALTANTES?</translation>
+        <translation>KAYIP ana düğümleri başlatmak istediğinize emin misiniz?</translation>
     </message>
     <message>
         <source>Additional information for Masternode %1</source>
-        <translation>Informações adicionais para o Masternode %1</translation>
+        <translation>Ana Düğüm %1 için ek bilgi</translation>
     </message>
     <message>
         <source>Masternode Private Key</source>
-        <translation>Chave Privada Masternode</translation>
+        <translation>Ana  Düğüm Özel Anahtarı</translation>
     </message>
     <message>
         <source>Private Key</source>
-        <translation>Chave Privada</translation>
+        <translation>Özel Anahtar</translation>
     </message>
     <message>
         <source>Collateral</source>
-        <translation>Garantia</translation>
+        <translation>Teminat</translation>
     </message>
     <message>
         <source>IP</source>
@@ -1229,11 +1166,11 @@
     </message>
     <message>
         <source>Version</source>
-        <translation>Versão</translation>
+        <translation>Sürüm</translation>
     </message>
     <message>
         <source>Unknown</source>
-        <translation>Desconhecido</translation>
+        <translation>Bilinmiyor</translation>
     </message>
     <message>
         <source>Sentinel</source>
@@ -1244,62 +1181,62 @@
     <name>ModalOverlay</name>
     <message>
         <source>Form</source>
-        <translation>Forma</translation>
+        <translation>Form</translation>
     </message>
     <message>
         <source>Recent transactions may not yet be visible, and therefore your wallet's balance might be incorrect. This information will be correct once your wallet has finished synchronizing with the Dash network, as detailed below.</source>
-        <translation>Transações recentes podem não estar visíveis ainda, portanto o seu saldo pode estar incorreto. Esta informação será corrigida assim que sua carteira for sincronizada com a rede, como detalhado abaixo.</translation>
+        <translation>Son işlemler henüz görünmeyebilir ve bu nedenle cüzdanınızın bakiyesi yanlış olabilir. Bu bilgiler, aşağıda detaylandırıldığı gibi, cüzdanınız Dash ağı ile senkronizasyonunu tamamladığında doğru olacaktır. </translation>
     </message>
     <message>
         <source>Attempting to spend Dash that are affected by not-yet-displayed transactions will not be accepted by the network.</source>
-        <translation>A tentativa de gastar o Dash que é afetado por transações ainda não exibidas não será aceita pela rede.</translation>
+        <translation>Daha görüntülenmemiş işlemler tarafından etkilenen Dash'i harcama teşebbüsü ağ tarafından kabul edilmez.</translation>
     </message>
     <message>
         <source>Number of blocks left</source>
-        <translation>Número de blocos que faltam</translation>
+        <translation>Kalan blok sayısı</translation>
     </message>
     <message>
         <source>Unknown...</source>
-        <translation>Desconhecido...</translation>
+        <translation>Bilinmiyor...</translation>
     </message>
     <message>
         <source>Last block time</source>
-        <translation>Hora do último bloco</translation>
+        <translation>Son blok zamanı</translation>
     </message>
     <message>
         <source>Progress</source>
-        <translation>Progresso</translation>
+        <translation>İlerleme</translation>
     </message>
     <message>
         <source>Progress increase per hour</source>
-        <translation>Aumento do progresso por hora</translation>
+        <translation>Saat başı ilerleme artışı</translation>
     </message>
     <message>
         <source>calculating...</source>
-        <translation>calculando</translation>
+        <translation>hesaplanıyor...</translation>
     </message>
     <message>
         <source>Estimated time left until synced</source>
-        <translation>Tempo estimado para sincronizar</translation>
+        <translation>Senkronize edilene kadar kalan tahmini süre</translation>
     </message>
     <message>
         <source>Hide</source>
-        <translation>Esconder</translation>
+        <translation>Gizle</translation>
     </message>
     <message>
         <source>Unknown. Syncing Headers (%1)...</source>
-        <translation>Desconhecido. Sincronizando cabeçalhos (%1)...</translation>
+        <translation>Bilinmeyen. Üstbilgiler Senkronize Ediliyor (%1)...</translation>
     </message>
 </context>
 <context>
     <name>OpenURIDialog</name>
     <message>
         <source>Open URI</source>
-        <translation>Abrir URI</translation>
+        <translation>URI aç</translation>
     </message>
     <message>
         <source>Open payment request from URI or file</source>
-        <translation>Cobrança aberta de URI ou arquivo</translation>
+        <translation>Dosyadan veya URI'den ödeme talebi aç</translation>
     </message>
     <message>
         <source>URI:</source>
@@ -1307,26 +1244,26 @@
     </message>
     <message>
         <source>Select payment request file</source>
-        <translation>Selecione o arquivo de cobrança</translation>
+        <translation>Ödeme talebi dosyasını seç</translation>
     </message>
     <message>
         <source>Select payment request file to open</source>
-        <translation>Selecione o arquivo de cobrança para ser aberto</translation>
+        <translation>Açılacak ödeme talebi dosyasını seç</translation>
     </message>
 </context>
 <context>
     <name>OptionsDialog</name>
     <message>
         <source>Options</source>
-        <translation>Opções</translation>
+        <translation>Seçenekler</translation>
     </message>
     <message>
         <source>&amp;Main</source>
-        <translation>Principal</translation>
+        <translation>&amp;Esas ayarlar</translation>
     </message>
     <message>
         <source>Size of &amp;database cache</source>
-        <translation>Tamanho do banco de &amp;dados do cache</translation>
+        <translation>&amp;Veritabanı tamponunun boyutu</translation>
     </message>
     <message>
         <source>MB</source>
@@ -1334,151 +1271,151 @@
     </message>
     <message>
         <source>Number of script &amp;verification threads</source>
-        <translation>Número de threads do script de &amp;verificação</translation>
+        <translation>İş parçacıklarını &amp;denetleme betiği sayısı</translation>
     </message>
     <message>
         <source>(0 = auto, &lt;0 = leave that many cores free)</source>
-        <translation>(0 = automático, &lt;0 = número de cores deixados livres)</translation>
+        <translation>(0 = otomatik, &lt;0 = bu kadar çekirdeği kullanma)</translation>
     </message>
     <message>
         <source>Amount of Dash to keep anonymized</source>
-        <translation>Quantidade de dashs para manter anonimizado</translation>
+        <translation>Anonim tutulacak Dash tutarı</translation>
     </message>
     <message>
         <source>W&amp;allet</source>
-        <translation>C&amp;arteira</translation>
+        <translation>&amp;Cüzdan</translation>
     </message>
     <message>
         <source>Show additional tab listing all your masternodes in first sub-tab&lt;br/&gt;and all masternodes on the network in second sub-tab.</source>
-        <translation>Mostre uma guia adicional listando todos os seus masternodes na primeira subposição &lt;br/&gt; e todos os masternodes na rede na segunda sub-guia.</translation>
+        <translation>İlk alt sekmede tüm ana düğümlerinizi gösteren ve&lt;br/&gt;ikinci alt sekmede tüm ana düğümleri gösteren ek bir sekme göster.</translation>
     </message>
     <message>
         <source>Show Masternodes Tab</source>
-        <translation>Mostrar a aba Masternodes</translation>
+        <translation>Ana Düğümler Sekmesini Göster</translation>
     </message>
     <message>
         <source>Show additional information and buttons for PrivateSend on overview screen.</source>
-        <translation>Mostre informações adicionais e botões para PrivateSend na tela.</translation>
+        <translation>Genel bakış ekranında Özel Gönder için ek bilgi ve düğmeler göster.</translation>
     </message>
     <message>
         <source>Enable advanced PrivateSend interface</source>
-        <translation>Ativar interface avançada PrivateSend</translation>
+        <translation>Gelişmiş Özel Gönder arayüzünü etkinleştir</translation>
     </message>
     <message>
         <source>Show warning dialog when PrivateSend detects that wallet has very low number of keys left.</source>
-        <translation>Mostrar mensagem de aviso quando o PrivateSend detectar que a carteira tem um número muito baixo de chaves restantes.</translation>
+        <translation>Özel Gönder çok az sayıda anahtar kaldığını tespit ettiğinde bir uyarı göster.</translation>
     </message>
     <message>
         <source>Warn if PrivateSend is running out of keys</source>
-        <translation>Avisar se o PrivateSend estiver sem as chaves</translation>
+        <translation>Özel Gönderin anahtarı bitiyorsa uyar</translation>
     </message>
     <message>
         <source>Whether to use experimental PrivateSend mode with multiple mixing sessions per block.&lt;br/&gt;Note: You must use this feature carefully.&lt;br/&gt;Make sure you always have recent wallet (auto)backup in a safe place!</source>
-        <translation>Se você deseja usar o modo PrivateSend com várias sessões de mixagem por bloco. &lt;br/&gt; Nota: Você deve usar este recurso com cuidado. &lt;br/&gt; Certifique-se de ter sempre um backup  recente de sua  carteira em um local seguro.</translation>
+        <translation>Blok başına birden fazla karışım yapmak için deneysel Özel Gönder modunu kullanıp kullanmayacağınızı belirler.&lt;br/&gt;Not: Bu özelliği dikkatli kullanmalısınız.&lt;br/&gt;Cüzdanınızın son (oto)yedeğinin güvenli bir yerde olduğundan her zaman emin olun!</translation>
     </message>
     <message>
         <source>Enable PrivateSend &amp;multi-session</source>
-        <translation>Ativar PrivateSend &amp;multi-sessão</translation>
+        <translation>Özel Gönder &amp;çoklu oturumu etkinleştir</translation>
     </message>
     <message>
         <source>If you disable the spending of unconfirmed change, the change from a transaction&lt;br/&gt;cannot be used until that transaction has at least one confirmation.&lt;br/&gt;This also affects how your balance is computed.</source>
-        <translation>Se você desabilitar o gasto de um troco não confirmado, o troco da transação&lt;br/&gt;não poderá ser utilizado até a transação ter pelo menos uma confirmação.&lt;br/&gt;Isso também afeta seu saldo computado.</translation>
+        <translation>Teyit edilmemiş para üstünü harcamayı devre dışı bırakırsanız&lt;br/&gt;bir işlemin para üstü bu işlem için en az bir teyit olana dek harcanamaz.&lt;br/&gt;Bu, aynı zamanda bakiyenizin nasıl hesaplandığını da etkiler.</translation>
     </message>
     <message>
         <source>PrivateSend rounds to use</source>
-        <translation>PrivateSend rodadas para usar</translation>
+        <translation>Kullanılacak Özel Gönder turları</translation>
     </message>
     <message>
         <source>This amount acts as a threshold to turn off PrivateSend once it's reached.</source>
-        <translation>Esse valor atua como um limite para desativar o PrivateSend assim que ele for atingido.</translation>
+        <translation>Bu tutar ulaşıldığında Özel Gönderi kapatacak bir eşik olarak çalışır.</translation>
     </message>
     <message>
         <source>Automatically open the Dash Core client port on the router. This only works when your router supports UPnP and it is enabled.</source>
-        <translation>Abre automaticamente a porta para o cliente Dash Core no roteador. Essa função apenas funciona se o seu roteador oferece suporte a UPnP e a opção estiver habilitada.</translation>
+        <translation>Router'da otomatik olarak Dash Core istemcisi portu aç. Bu sadece router'ınız UPnP destekliyorsa ve etkinse çalışır.</translation>
     </message>
     <message>
         <source>Accept connections from outside</source>
-        <translation>Aceitar conexões externas</translation>
+        <translation>Dışarıdan bağlantı kabul et</translation>
     </message>
     <message>
         <source>Allow incoming connections</source>
-        <translation>Permitir conexões de entrada</translation>
+        <translation>Gelen bağlantılara izin ver</translation>
     </message>
     <message>
         <source>Connect to the Dash network through a SOCKS5 proxy.</source>
-        <translation>Conecta à rede Dash através de um proxy SOCKS5.</translation>
+        <translation>Dash ağına bir SOCKS5 vekil sunucusu aracılığıyla bağlan.</translation>
     </message>
     <message>
         <source>&amp;Connect through SOCKS5 proxy (default proxy):</source>
-        <translation>&amp;Conectar via proxy SOCKS5 (proxy padrão):</translation>
+        <translation>SOCKS5 vekil sunucusu aracılığıyla &amp;bağlan (varsayılan vekil sunucusu):</translation>
     </message>
     <message>
         <source>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Exit in the menu.</source>
-        <translation>Minimizar em vez de sair do aplicativo quando a janela for fechada. Quando esta opção está ativada, o aplicativo só será fechado selecionando Sair no menu.</translation>
+        <translation>Pencere kapatıldığında uygulamadan çıkmak yerine uygulamayı küçültür. Bu seçenek etkinleştirildiğinde, uygulama sadece menüden çıkış seçildiğinde kapanacaktır.</translation>
     </message>
     <message>
         <source>Third party URLs (e.g. a block explorer) that appear in the transactions tab as context menu items.&lt;br/&gt;%s in the URL is replaced by transaction hash. Multiple URLs are separated by vertical bar |.</source>
-        <translation>As URLs de terceiros (por exemplo, um explorador de blocos) que aparecem na guia de transações como itens de menu de contexto. &lt;br/&gt;%s na URL são substituídos por hash de transação. Vários URLs são separados pela barra vertical |.</translation>
+        <translation>İşlemler sekmesinde bağlam menüsü ögeleri gibi görünen  üçüncü parti URLleri (ör. bir blok tarayıcısı).&lt;br/&gt;URL'deki %s işlem hashi ile değiştirilir. Birden fazla URL dikey çizgi | ile ayrılır.</translation>
     </message>
     <message>
         <source>Expert</source>
-        <translation>Avançado</translation>
+        <translation>Gelişmiş</translation>
     </message>
     <message>
         <source>This setting determines the amount of individual masternodes that an input will be anonymized through.&lt;br/&gt;More rounds of anonymization gives a higher degree of privacy, but also costs more in fees.</source>
-        <translation>Esta configuração determina a quantidade de Masternodes individuais através dos quais um input será anonimizado. &lt;br/&gt;Mais rodadas de anonimização garantem um maior grau de privacidade, mas também custarão mais em fees.</translation>
+        <translation>Bu ayar, bir girdinin anonim hale getirilmesi için kullanılacak ana düğüm sayısını belirler.&lt;br/&gt;Daha çok anonimleştirme turu daha yüksek bir gizlilik sağlar ama daha maliyetli olur.</translation>
     </message>
     <message>
         <source>Whether to show coin control features or not.</source>
-        <translation>Mostrar ou não opções de controle da moeda.</translation>
+        <translation>Para kontrol özelliklerinin gösterilip gösterilmeyeceğini ayarlar.</translation>
     </message>
     <message>
         <source>Automatically start %1 after logging in to the system.</source>
-        <translation>Executar o %1 automaticamente ao iniciar o sistema.</translation>
+        <translation>Sistemde oturum açıldığında %1 programını otomatik olarak başlat.</translation>
     </message>
     <message>
         <source>&amp;Start %1 on system login</source>
-        <translation>&amp;Iniciar %1 ao fazer login no sistema</translation>
+        <translation>&amp;Açılışta %1 açılsın</translation>
     </message>
     <message>
         <source>Enable coin &amp;control features</source>
-        <translation>Habilitar opções de &amp;controle de moedas</translation>
+        <translation>Para &amp;kontrolü özelliklerini etkinleştir</translation>
     </message>
     <message>
         <source>&amp;Spend unconfirmed change</source>
-        <translation>Ga&amp;star mudança não confirmada</translation>
+        <translation>Teyit edilmemiş para üstünü &amp;harca</translation>
     </message>
     <message>
         <source>&amp;Network</source>
-        <translation>Rede</translation>
+        <translation>&amp;Şebeke</translation>
     </message>
     <message>
         <source>Map port using &amp;UPnP</source>
-        <translation>Mapear porta usando &amp;UPnP</translation>
+        <translation>Portları &amp;UPnP kullanarak haritala</translation>
     </message>
     <message>
         <source>Proxy &amp;IP:</source>
-        <translation>&amp;IP do proxy:</translation>
+        <translation>Vekil &amp;İP:</translation>
     </message>
     <message>
         <source>IP address of the proxy (e.g. IPv4: 127.0.0.1 / IPv6: ::1)</source>
-        <translation>Endereço de IP do proxy (e.g. IPv4: 127.0.0.1 / IPv6: ::1)</translation>
+        <translation>Vekil sunucusunun IP adresi (mesela IPv4: 127.0.0.1 / IPv6: ::1)</translation>
     </message>
     <message>
         <source>&amp;Port:</source>
-        <translation>&amp;Porta:</translation>
+        <translation>&amp;Port:</translation>
     </message>
     <message>
         <source>Port of the proxy (e.g. 9050)</source>
-        <translation>Porta do serviço de proxy (ex. 9050)</translation>
+        <translation>Vekil sunucunun portu (mesela 9050)</translation>
     </message>
     <message>
         <source>Used for reaching peers via:</source>
-        <translation>Usado para alcançar peers através de:</translation>
+        <translation>Eşlere ulaşmak için kullanılır, şu üzerinden:</translation>
     </message>
     <message>
         <source>Shows, if the supplied default SOCKS5 proxy is used to reach peers via this network type.</source>
-        <translation>Mostra, se o proxy SOCKS5 padrão fornecido for usado para alcançar pares através deste tipo de rede.</translation>
+        <translation>Bu ağ türünde eşlere ulaşmak için varsayılan SOCKS5 proxy'nin kullanılıp kullanılmadığını gösterir.</translation>
     </message>
     <message>
         <source>IPv4</source>
@@ -1494,496 +1431,496 @@
     </message>
     <message>
         <source>Connect to the Dash network through a separate SOCKS5 proxy for Tor hidden services.</source>
-        <translation>Conecte-se à rede Dash através de um proxy SOCKS5 separado para serviços ocultos Tor</translation>
+        <translation>Dash ağına gizli Tor servisleri için ayrı bir SOCKS5 vekil sunucusu aracılığıyla bağlan.</translation>
     </message>
     <message>
         <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services:</source>
-        <translation>Usar proxy SOCKS5 separado para alcançar pares via serviços ocultos Tor:</translation>
+        <translation>Eşlere Tor gizli servislerini kullanarak ulaşmak için ayrı SOCKS5 vekilleri kullan:</translation>
     </message>
     <message>
         <source>&amp;Window</source>
-        <translation>&amp;Janela</translation>
+        <translation>&amp;Pencere</translation>
     </message>
     <message>
         <source>&amp;Hide the icon from the system tray.</source>
-        <translation>&amp;Ocultar o ícone da bandeja do sistema.</translation>
+        <translation>Simgeyi sistem çubuğunda &amp;gizle.</translation>
     </message>
     <message>
         <source>Hide tray icon</source>
-        <translation>Ocultar ícone da bandeja</translation>
+        <translation>Sistem çubuğu simgesini gizle</translation>
     </message>
     <message>
         <source>Show only a tray icon after minimizing the window.</source>
-        <translation>Mostrar apenas um ícone na bandeja ao minimizar a janela.</translation>
+        <translation>Küçültüldükten sonra sadece çekmece ikonu göster.</translation>
     </message>
     <message>
         <source>&amp;Minimize to the tray instead of the taskbar</source>
-        <translation>&amp;Minimizar para a bandeja em vez da barra de tarefas.</translation>
+        <translation>İşlem çubuğu yerine sistem çekmecesine &amp;küçült</translation>
     </message>
     <message>
         <source>M&amp;inimize on close</source>
-        <translation>M&amp;inimizar ao sair</translation>
+        <translation>Kapatma sırasında k&amp;üçült</translation>
     </message>
     <message>
         <source>&amp;Display</source>
-        <translation>&amp;Mostrar</translation>
+        <translation>&amp;Görünüm</translation>
     </message>
     <message>
         <source>User Interface &amp;language:</source>
-        <translation>&amp;Língua da interface com usuário:</translation>
+        <translation>Kullanıcı arayüzü &amp;lisanı:</translation>
     </message>
     <message>
         <source>The user interface language can be set here. This setting will take effect after restarting %1.</source>
-        <translation>O idioma da interface pode ser definido aqui. Essa configuração terá efeito após reiniciar o %1.</translation>
+        <translation>Kullanıcı arayüzünün dili burada belirtilebilir. Bu ayar %1 tekrar başlatıldığında etkinleşecektir.</translation>
     </message>
     <message>
         <source>Language missing or translation incomplete? Help contributing translations here:
 https://www.transifex.com/projects/p/dash/</source>
-        <translation>Idioma inexistente ou tradução incompleta? Contribua com a tradução aqui:
+        <translation>Diliniz mevcut değil veya çeviri eksik mi? Buradan çevirilere katkıda bulunun:
 https://www.transifex.com/projects/p/dash/</translation>
     </message>
     <message>
         <source>User Interface Theme:</source>
-        <translation>Tema da Interface do usuário:</translation>
+        <translation>Kullanıcı Arayüzü Teması:</translation>
     </message>
     <message>
         <source>&amp;Unit to show amounts in:</source>
-        <translation>&amp;Unidade usada para mostrar quantidades:</translation>
+        <translation>Meblağları göstermek için &amp;birim:</translation>
     </message>
     <message>
         <source>Choose the default subdivision unit to show in the interface and when sending coins.</source>
-        <translation>Escolha a unidade padrão de subdivisão para interface mostrar quando enviar bitcoins.</translation>
+        <translation>Bitcoin gönderildiğinde arayüzde gösterilecek varsayılan alt birimi seçiniz.</translation>
     </message>
     <message>
         <source>Decimal digits</source>
-        <translation>Dígitos decimais</translation>
+        <translation>Ondalık haneler</translation>
     </message>
     <message>
         <source>Third party transaction URLs</source>
-        <translation>URLs da transação de terceiros</translation>
+        <translation>Üçüncü taraf muamele URL'leri</translation>
     </message>
     <message>
         <source>Active command-line options that override above options:</source>
-        <translation>Ativa as opções de linha de comando que sobrescreve as opções acima:</translation>
+        <translation>Yukarıdaki seçeneklerin yerine geçen faal komut satırı seçenekleri:</translation>
     </message>
     <message>
         <source>Reset all client options to default.</source>
-        <translation>Redefinir todas as opções do cliente para opções padrão.</translation>
+        <translation>İstemcinin tüm seçeneklerini varsayılan değerlere geri al.</translation>
     </message>
     <message>
         <source>&amp;Reset Options</source>
-        <translation>&amp;Redefinir opções</translation>
+        <translation>Seçenekleri Sıfı&amp;rla</translation>
     </message>
     <message>
         <source>&amp;OK</source>
-        <translation>&amp;OK</translation>
+        <translation>&amp;Tamam</translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
-        <translation>&amp;Cancelar</translation>
+        <translation>&amp;İptal</translation>
     </message>
     <message>
         <source>default</source>
-        <translation>padrão</translation>
+        <translation>varsayılan</translation>
     </message>
     <message>
         <source>none</source>
-        <translation>Nenhum</translation>
+        <translation>Boş</translation>
     </message>
     <message>
         <source>Confirm options reset</source>
-        <translation>Confirmar redefinição de opções</translation>
+        <translation>Seçeneklerin sıfırlanmasını teyit et</translation>
     </message>
     <message>
         <source>Client restart required to activate changes.</source>
-        <translation>Reinicialização do aplicativo necessária para efetivar alterações.</translation>
+        <translation>Değişikliklerin uygulanması için istemcinin yeniden başlatılması lazımdır.</translation>
     </message>
     <message>
         <source>Client will be shut down. Do you want to proceed?</source>
-        <translation>O programa será encerrado. Deseja continuar?</translation>
+        <translation>İstemci kapanacaktır. Devam etmek istiyor musunuz?</translation>
     </message>
     <message>
         <source>This change would require a client restart.</source>
-        <translation>Essa mudança requer uma reinicialização do aplicativo.</translation>
+        <translation>Bu değişiklik istemcinin tekrar başlatılmasını gerektirir.</translation>
     </message>
     <message>
         <source>The supplied proxy address is invalid.</source>
-        <translation>O endereço proxy fornecido é inválido.</translation>
+        <translation>Girilen vekil sunucu adresi geçersizdir.</translation>
     </message>
 </context>
 <context>
     <name>OverviewPage</name>
     <message>
         <source>Form</source>
-        <translation>Formulário</translation>
+        <translation>Form</translation>
     </message>
     <message>
         <source>The displayed information may be out of date. Your wallet automatically synchronizes with the Dash network after a connection is established, but this process has not completed yet.</source>
-        <translation>A informação exibida pode estar desatualizada. Sua wallet é sincronizada automaticamente com a rede Dash tão logo uma conexão se estabeleça, entrtanto esse processo ainda não está completo.</translation>
+        <translation>Görüntülenen bilgiler güncel olmayabilir. Bağlantı kurulduğunda cüzdanınız otomatik olarak Dash ağı ile senkronize olur ancak bu işlem henüz tamamlanmamıştır.</translation>
     </message>
     <message>
         <source>Available:</source>
-        <translation>Disponível:</translation>
+        <translation>Mevcut:</translation>
     </message>
     <message>
         <source>Your current spendable balance</source>
-        <translation>Seu saldo atual spendable</translation>
+        <translation>Güncel harcanabilir bakiyeniz</translation>
     </message>
     <message>
         <source>Pending:</source>
-        <translation>Pendente:</translation>
+        <translation>Beklemede:</translation>
     </message>
     <message>
         <source>Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance</source>
-        <translation>Total de transações que ainda têm de ser confirmados, e ainda não contam para o equilíbrio spendable</translation>
+        <translation>Henüz teyit edilmemiş ve harcanabilir bakiyeye eklenmemiş muamelelerin toplamı</translation>
     </message>
     <message>
         <source>Immature:</source>
-        <translation>Imaturo:</translation>
+        <translation>Olgunlaşmamış:</translation>
     </message>
     <message>
         <source>Mined balance that has not yet matured</source>
-        <translation>Saldo minerado que ainda não maturou</translation>
+        <translation>Oluşturulan bakiye henüz olgunlaşmamıştır</translation>
     </message>
     <message>
         <source>Balances</source>
-        <translation>Saldos</translation>
+        <translation>Bakiyeler</translation>
     </message>
     <message>
         <source>Unconfirmed transactions to watch-only addresses</source>
-        <translation>Transações não confirmadas para endereços apenas para exibição</translation>
+        <translation>Sadece izlenen adreslere gelen doğrulanmamış işlemler</translation>
     </message>
     <message>
         <source>Mined balance in watch-only addresses that has not yet matured</source>
-        <translation>Saldo minerado em endereços somente para observação que ainda não maturou</translation>
+        <translation>Sadece izlenen adreslerin henüz olgunlaşmamış oluşturulan bakiyeleri</translation>
     </message>
     <message>
         <source>Total:</source>
-        <translation>Total:</translation>
+        <translation>Toplam:</translation>
     </message>
     <message>
         <source>Your current total balance</source>
-        <translation>Seu saldo total atual</translation>
+        <translation>Güncel toplam bakiyeniz</translation>
     </message>
     <message>
         <source>Current total balance in watch-only addresses</source>
-        <translation>Saldo total atual em endereços de monitoração</translation>
+        <translation>Sadece izlenen adreslerdeki güncel toplam bakiye</translation>
     </message>
     <message>
         <source>Watch-only:</source>
-        <translation>Observar apenas:</translation>
+        <translation>Sadece-izlenen:</translation>
     </message>
     <message>
         <source>Your current balance in watch-only addresses</source>
-        <translation>Seu saldo atual em endereços somente de monitoração</translation>
+        <translation>Sadece izlenen adreslerdeki güncel bakiyeniz</translation>
     </message>
     <message>
         <source>Spendable:</source>
-        <translation>Saldo disponível:</translation>
+        <translation>Harcanabilir:</translation>
     </message>
     <message>
         <source>PrivateSend</source>
-        <translation>PrivateSend</translation>
+        <translation>Özel Gönder</translation>
     </message>
     <message>
         <source>Status:</source>
-        <translation>Status:</translation>
+        <translation>Durum:</translation>
     </message>
     <message>
         <source>Enabled/Disabled</source>
-        <translation>Ativado/Desativado</translation>
+        <translation>Açık/Kapalı</translation>
     </message>
     <message>
         <source>Completion:</source>
-        <translation>Conclusão:</translation>
+        <translation>Tamamlanma:</translation>
     </message>
     <message>
         <source>Try to manually submit a PrivateSend request.</source>
-        <translation>Tente enviar manualmente uma solicitação PrivateSend.</translation>
+        <translation>Bir Özel Gönder isteğini elle göndermeyi dene.</translation>
     </message>
     <message>
         <source>Reset the current status of PrivateSend (can interrupt PrivateSend if it's in the process of Mixing, which can cost you money!)</source>
-        <translation>Reseta o estado atual do PrivateSend (pode interromper o PrivateSend se este estiver em processo de Mixing, isso pode te custar dinheiro!)</translation>
+        <translation>Özel Gönderin mevcut durumunu sıfırla (eğer bir Karışım işlemi devam ediyorsa Özel Gönderi yarıda keser, bu da para kaybetmenize neden olabilir!)</translation>
     </message>
     <message>
         <source>Information about PrivateSend and Mixing</source>
-        <translation>Informações sobre PrivateSend e Mixing</translation>
+        <translation>Özel Gönder ve Karışım hakkında bilgi</translation>
     </message>
     <message>
         <source>Info</source>
-        <translation>Info</translation>
+        <translation>Bilgi</translation>
     </message>
     <message>
         <source>Amount and Rounds:</source>
-        <translation>Quantia e Rodadas:</translation>
+        <translation>Tutar ve Turlar:</translation>
     </message>
     <message>
         <source>0 DASH / 0 Rounds</source>
-        <translation>0 DASH / 0 Rodadas</translation>
+        <translation>0 DASH / 0 Tur</translation>
     </message>
     <message>
         <source>Submitted Denom:</source>
-        <translation>Denom Submetido:</translation>
+        <translation>Gönderilen Birim:</translation>
     </message>
     <message>
         <source>n/a</source>
-        <translation>n/a</translation>
+        <translation>Mevcut değil</translation>
     </message>
     <message>
         <source>Recent transactions</source>
-        <translation>Transações recentes</translation>
+        <translation>Son işlemler</translation>
     </message>
     <message>
         <source>Start/Stop Mixing</source>
-        <translation>Iniciar/Interronper o Mixing</translation>
+        <translation>Karışımı Başlat/Durdur</translation>
     </message>
     <message>
         <source>PrivateSend Balance:</source>
-        <translation>Saldo PrivateSend</translation>
+        <translation>Özel Gönder Bakiyesi:</translation>
     </message>
     <message>
         <source>The denominations you submitted to the Masternode.&lt;br&gt;To mix, other users must submit the exact same denominations.</source>
-        <translation>As denominações submetidas por você ao Masternode.&lt;br/&gt;Para a realização do mixing, outros usuários precisam submeter exatamente as mesmas denominações.</translation>
+        <translation>Ana düğüme gönderdiğiniz birimler.&lt;br&gt;Karıştırmak için diğer kullanıcılar da tam olarak aynı birimleri göndermelidir.</translation>
     </message>
     <message>
         <source>(Last Message)</source>
-        <translation>(Última Mensagem)</translation>
+        <translation>(Son Mesaj)</translation>
     </message>
     <message>
         <source>Try Mix</source>
-        <translation>Tentar o Mixing</translation>
+        <translation>Karışım Dene</translation>
     </message>
     <message>
         <source>Reset</source>
-        <translation>Resetar</translation>
+        <translation>Sıfırla</translation>
     </message>
     <message>
         <source>out of sync</source>
-        <translation>Sem sincronia</translation>
+        <translation>eşleşme dışı</translation>
     </message>
     <message>
         <source>Automatic backups are disabled, no mixing available!</source>
-        <translation>Backups automáticos estão desabilitados, Mixing não disponível!</translation>
+        <translation>Otomatik yedekleme kapalı, karışım mevcut değil!</translation>
     </message>
     <message>
         <source>Start Mixing</source>
-        <translation>Iniciar o Mixing</translation>
+        <translation>Karışıma Başla</translation>
     </message>
     <message>
         <source>Stop Mixing</source>
-        <translation>Interromper o Mixing</translation>
+        <translation>Karışımı Durdur</translation>
     </message>
     <message>
         <source>No inputs detected</source>
-        <translation>Nenhuma entrada detectada</translation>
+        <translation>Hiç girdi tespit edilmedi</translation>
     </message>
     <message numerus="yes">
         <source>%n Rounds</source>
-        <translation><numerusform>%n Rodadas</numerusform><numerusform>%n Rodadas</numerusform></translation>
+        <translation><numerusform>%n Tur</numerusform><numerusform>%n Tur</numerusform></translation>
     </message>
     <message>
         <source>Found enough compatible inputs to anonymize %1</source>
-        <translation>Encontrou entradas compatíveis para anonimizar %1</translation>
+        <translation>%1 anonim hale getirmek için yeterli uyumlu girdi bulundu</translation>
     </message>
     <message>
         <source>Not enough compatible inputs to anonymize &lt;span style='color:red;'&gt;%1&lt;/span&gt;,&lt;br&gt;will anonymize &lt;span style='color:red;'&gt;%2&lt;/span&gt; instead</source>
-        <translation>Não há entradas compatíveis suficientes para anonimizar &lt;span style='color:red;'&gt;%1&lt;/span&gt;,&lt;br&gt; vamos anonimizar &lt;span style='color:red;'&gt;%2&lt;/span&gt; em vez disso</translation>
+        <translation>&lt;span style='color:red;'&gt;%1&lt;/span&gt; anonim hale getirmek için yeterli uyumlu girdi yok,&lt;br&gt;onun yerine&lt;span style='color:red;'&gt;%2&lt;/span&gt; anonim hale getirilecek</translation>
     </message>
     <message>
         <source>Overall progress</source>
-        <translation>Progresso geral</translation>
+        <translation>Genel ilerleme</translation>
     </message>
     <message>
         <source>Denominated</source>
-        <translation>Denominado</translation>
+        <translation>Birimlendirildi</translation>
     </message>
     <message>
         <source>Mixed</source>
-        <translation>Misturado</translation>
+        <translation>Karıştırıldı</translation>
     </message>
     <message>
         <source>Anonymized</source>
-        <translation>Anonimizado</translation>
+        <translation>Anonim Yapıldı</translation>
     </message>
     <message numerus="yes">
         <source>Denominated inputs have %5 of %n rounds on average</source>
-        <translation><numerusform>Os insumos denominados têm %5 de %n rodadas em média</numerusform><numerusform>Os insumos denominados têm %5 de %n rodadas em média</numerusform></translation>
+        <translation><numerusform>Birimlendirilmiş girdiler ortalama %5 / %n tura sahip</numerusform><numerusform>Birimlendirilmiş girdiler ortalama %5 / %n tura sahip</numerusform></translation>
     </message>
     <message>
         <source>keys left: %1</source>
-        <translation>Chaves restantes: %1</translation>
+        <translation>kalan anahtarlar: %1</translation>
     </message>
     <message>
         <source>Disabled</source>
-        <translation>Desativado</translation>
+        <translation>Kapalı</translation>
     </message>
     <message>
         <source>Very low number of keys left since last automatic backup!</source>
-        <translation>Número muito baixo de chaves deixadas desde o último backup automático!</translation>
+        <translation>Son otomatik yedekten beri çok az sayıda anahtar kaldı!</translation>
     </message>
     <message>
         <source>We are about to create a new automatic backup for you, however &lt;span style='color:red;'&gt; you should always make sure you have backups saved in some safe place&lt;/span&gt;!</source>
-        <translation>Estamos prestes a criar um novo backup automático para você, no entanto&lt;span style='color:red;'&gt;, você deve sempre garantir que você tenha backups salvos em algum lugar seguro&lt;/span&gt;!</translation>
+        <translation>Sizin için yeni bir otomatik yedek oluşturmak üzereyiz ancak &lt;span style='color:red;'&gt; yedeklerinizin her zaman güvenli bir yerde taşındığından emin olmalısınız&lt;/span&gt;!</translation>
     </message>
     <message>
         <source>Note: You can turn this message off in options.</source>
-        <translation>Nota: Você desliga esta mensagem nas opções.</translation>
+        <translation>Not: Bu mesajı seçeneklerden kapatabilirsiniz.</translation>
     </message>
     <message>
         <source>WARNING! Something went wrong on automatic backup</source>
-        <translation>ALERTA! Algo de errado ocorreu com o backup automático</translation>
+        <translation>UYARI! Otomatik yedeklemede bir sorun çıktı</translation>
     </message>
     <message>
         <source>ERROR! Failed to create automatic backup</source>
-        <translation>ERRO! Falha ao criar o backup automático</translation>
+        <translation>HATA! Otomatik yedek oluşturulamadı</translation>
     </message>
     <message>
         <source>Mixing is disabled, please close your wallet and fix the issue!</source>
-        <translation>Mixing está desabilitado, por favor feche sua carteira e corrija o problema!</translation>
+        <translation>Karışım devredışı, lütfen cüzdanınızı kapatıp sorunu çözün!</translation>
     </message>
     <message>
         <source>Enabled</source>
-        <translation>Ativado</translation>
+        <translation>Açık</translation>
     </message>
     <message>
         <source>see debug.log for details.</source>
-        <translation>Consulte debug.log para obter detalhes.</translation>
+        <translation>ayrıntılar için debug.log dosyasına bakın.</translation>
     </message>
     <message>
         <source>WARNING! Failed to replenish keypool, please unlock your wallet to do so.</source>
-        <translation>ATENÇÃO! Falha ao repor o keypool, desbloqueie sua carteira para fazer isso.</translation>
+        <translation>UYARI! Anahtar havuzu yenilenemedi, lütfen devam etmek için cüzdanınızın kilidini açın.</translation>
     </message>
     <message>
         <source>Last PrivateSend message:
 </source>
-        <translation>Última mensagem do PrivateSend:
+        <translation>Son Özel Gönder mesajı:
 </translation>
     </message>
     <message>
         <source>N/A</source>
-        <translation>N/A</translation>
+        <translation>Mevcut değil</translation>
     </message>
     <message>
         <source>PrivateSend was successfully reset.</source>
-        <translation>PrivateSend foi reiniciado com sucesso.</translation>
+        <translation>Özel Gönder başarıyla sıfırlandı.</translation>
     </message>
     <message>
         <source>If you don't want to see internal PrivateSend fees/transactions select "Most Common" as Type on the "Transactions" tab.</source>
-        <translation>Se você não quiser ver as taxas / transações internas do PrivateSend selecione "Mais comum" como Tipo na guia "Transações".</translation>
+        <translation>Eğer Özel Gönderin iç ücretlerini/işlemlerini görmek istemiyorsanız "İşlemler" sekmesinde Tür olarak "En Sıkı" seçin.</translation>
     </message>
     <message>
         <source>PrivateSend requires at least %1 to use.</source>
-        <translation>PrivateSend requer pelo menos %1 para usar.</translation>
+        <translation>Özel Gönder en az %1 gerektiriyor.</translation>
     </message>
     <message>
         <source>Wallet is locked and user declined to unlock. Disabling PrivateSend.</source>
-        <translation>A Carteira está bloqueada e o usuário recusou a desbloquear. Desativando o PrivateSend.</translation>
+        <translation>Cüzdan kilitli ve kullanıcı kilidi açmadı. Özel Gönder devredışı bırakılıyor.</translation>
     </message>
 </context>
 <context>
     <name>PaymentServer</name>
     <message>
         <source>Payment request error</source>
-        <translation>Erro no pedido de pagamento</translation>
+        <translation>Ödeme talebi hatası</translation>
     </message>
     <message>
         <source>Cannot start dash: click-to-pay handler</source>
-        <translation>Não foi possível iniciar Dash: manipulador click-to-pay</translation>
+        <translation>Dash başlatılamadı: tıkla-ve-öde yöneticisi</translation>
     </message>
     <message>
         <source>URI handling</source>
-        <translation>Manipulação de URI</translation>
+        <translation>URI yönetimi</translation>
     </message>
     <message>
         <source>Payment request fetch URL is invalid: %1</source>
-        <translation>URL de cobrança é inválida: %1</translation>
+        <translation>Ödeme talebini alma URL'i geçersiz: %1</translation>
     </message>
     <message>
         <source>Invalid payment address %1</source>
-        <translation>Endereço de pagamento inválido %1</translation>
+        <translation>%1 ödeme adresi geçersizdir</translation>
     </message>
     <message>
         <source>URI cannot be parsed! This can be caused by an invalid Dash address or malformed URI parameters.</source>
-        <translation>A URI não pode ser analisada! Isto pode ser causado por um endereço inválido ou um parâmetro URI malformado.</translation>
+        <translation>URI ayrıştırılamıyor! Bunun nedeni geçersiz bir Dash adresi veya hatalı biçimlendirilmiş URI değişkenleri olabilir.</translation>
     </message>
     <message>
         <source>Payment request file handling</source>
-        <translation>Manipulação de arquivo de cobrança</translation>
+        <translation>Ödeme talebi dosyası yönetimi</translation>
     </message>
     <message>
         <source>Payment request file cannot be read! This can be caused by an invalid payment request file.</source>
-        <translation>Arquivo de pedido de pagamento não pode ser lido! Isto pode ser causado por uma requisição de pagamento inválida.</translation>
+        <translation>Ödeme talebi dosyası okunamıyor! Bunun nedeni geçersiz bir ödeme talebi dosyası olabilir.</translation>
     </message>
     <message>
         <source>Payment request rejected</source>
-        <translation>Pedido de pagamento rejeitado</translation>
+        <translation>Ödeme talebi reddedildi</translation>
     </message>
     <message>
         <source>Payment request network doesn't match client network.</source>
-        <translation>Rede do pedido de pagamento não corresponde rede do cliente.</translation>
+        <translation>Ödeme talebi ağı, istemci ağıyla eşleşmiyor.</translation>
     </message>
     <message>
         <source>Payment request expired.</source>
-        <translation>Pedido de pagamento expirado.</translation>
+        <translation>Ödeme talebinin geçerlilik süresi bitti.</translation>
     </message>
     <message>
         <source>Payment request is not initialized.</source>
-        <translation>A requisição do pagamento não foi inicializada.</translation>
+        <translation>Ödeme talebi başlatılmadı.</translation>
     </message>
     <message>
         <source>Unverified payment requests to custom payment scripts are unsupported.</source>
-        <translation>Pedidos de pagamento não verificados para scripts de pagamento personalizados não são suportados.</translation>
+        <translation>Özel ödeme betiklerine, doğrulanmamış ödeme talepleri desteklenmez.</translation>
     </message>
     <message>
         <source>Invalid payment request.</source>
-        <translation>Pedido de pagamento inválido</translation>
+        <translation>Geçersiz ödeme talebi.</translation>
     </message>
     <message>
         <source>Requested payment amount of %1 is too small (considered dust).</source>
-        <translation>Valor do pagamento solicitado de %1 é muito pequeno (Considerado poeira).</translation>
+        <translation>Talep edilen %1 ödeme tutarı çok küçüktür (toz olarak kabul edilir).</translation>
     </message>
     <message>
         <source>Refund from %1</source>
-        <translation>Reembolso de %1</translation>
+        <translation>%1 adresinden geri ödeme</translation>
     </message>
     <message>
         <source>Payment request %1 is too large (%2 bytes, allowed %3 bytes).</source>
-        <translation>Pedido de pagamento %1 é muito grande (%2 bytes, permitido %3 bytes).</translation>
+        <translation>%1 ödeme talebi çok büyük (%2 bayt, üst sınır %3 bayt).</translation>
     </message>
     <message>
         <source>Error communicating with %1: %2</source>
-        <translation>Erro na comunicação com %1: %2</translation>
+        <translation>%1 ile iletişimde hata: %2</translation>
     </message>
     <message>
         <source>Payment request cannot be parsed!</source>
-        <translation>Pedido de pagamento não pode ser analisado!</translation>
+        <translation>Ödeme talebi ayrıştırılamaz!</translation>
     </message>
     <message>
         <source>Bad response from server %1</source>
-        <translation>Má resposta do servidor %1</translation>
+        <translation>%1 sunucusundan hatalı yanıt</translation>
     </message>
     <message>
         <source>Network request error</source>
-        <translation>Erro de solicitação de rede</translation>
+        <translation>Ağ talebi hatası</translation>
     </message>
     <message>
         <source>Payment acknowledged</source>
-        <translation>Pagamento reconhecido</translation>
+        <translation>Ödeme kabul edildi</translation>
     </message>
 </context>
 <context>
     <name>PeerTableModel</name>
     <message>
         <source>NodeId</source>
-        <translation>ID do nó</translation>
+        <translation>Düğüm ID'si</translation>
     </message>
     <message>
         <source>Node/Service</source>
-        <translation>Nó/Serviço</translation>
+        <translation>Düğüm/Servis</translation>
     </message>
     <message>
         <source>User Agent</source>
-        <translation>User Agent</translation>
+        <translation>Kullanıcı Yazılımı</translation>
     </message>
     <message>
         <source>Ping</source>
@@ -1998,31 +1935,31 @@ https://www.transifex.com/projects/p/dash/</translation>
     </message>
     <message>
         <source>%1 didn't yet exit safely...</source>
-        <translation>%1 ainda não terminou com segurança...</translation>
+        <translation>%1  henüz güvenli bir şekilde çıkış yapmamıştır...</translation>
     </message>
     <message>
         <source>Error reading masternode configuration file: %1</source>
-        <translation>Erro ao ler o arquivo de configuração do masternode: %1</translation>
+        <translation>Ana düğüm ayar dosyası okuma hatası: %1</translation>
     </message>
     <message>
         <source>Amount</source>
-        <translation>Quantia</translation>
+        <translation>Tutar</translation>
     </message>
     <message>
         <source>Enter a Dash address (e.g. %1)</source>
-        <translation>Informe um endereço Dash (ex: %1)</translation>
+        <translation>Bir Dash adresi giriniz (mesela %1)</translation>
     </message>
     <message>
         <source>%1 d</source>
-        <translation>%1 d</translation>
+        <translation>%1 g</translation>
     </message>
     <message>
         <source>%1 h</source>
-        <translation>%1 h</translation>
+        <translation>%1 s</translation>
     </message>
     <message>
         <source>%1 m</source>
-        <translation>%1 m</translation>
+        <translation>%1 d</translation>
     </message>
     <message>
         <source>%1 s</source>
@@ -2030,11 +1967,11 @@ https://www.transifex.com/projects/p/dash/</translation>
     </message>
     <message>
         <source>None</source>
-        <translation>Nenhum</translation>
+        <translation>Boş</translation>
     </message>
     <message>
         <source>N/A</source>
-        <translation>N/A</translation>
+        <translation>Mevcut değil</translation>
     </message>
     <message>
         <source>%1 ms</source>
@@ -2042,430 +1979,430 @@ https://www.transifex.com/projects/p/dash/</translation>
     </message>
     <message numerus="yes">
         <source>%n second(s)</source>
-        <translation><numerusform>%n segundos</numerusform><numerusform>%n segundos</numerusform></translation>
+        <translation><numerusform>%n saniye</numerusform><numerusform>%n saniye</numerusform></translation>
     </message>
     <message numerus="yes">
         <source>%n minute(s)</source>
-        <translation><numerusform>%n minutos</numerusform><numerusform>%n minutos</numerusform></translation>
+        <translation><numerusform>%n dakika</numerusform><numerusform>%n dakika</numerusform></translation>
     </message>
     <message numerus="yes">
         <source>%n hour(s)</source>
-        <translation><numerusform>%n horas</numerusform><numerusform>%n horas</numerusform></translation>
+        <translation><numerusform>%n saat</numerusform><numerusform>%n saat</numerusform></translation>
     </message>
     <message numerus="yes">
         <source>%n day(s)</source>
-        <translation><numerusform>%n dias</numerusform><numerusform>%n dias</numerusform></translation>
+        <translation><numerusform>%n gün</numerusform><numerusform>%n gün</numerusform></translation>
     </message>
     <message numerus="yes">
         <source>%n week(s)</source>
-        <translation><numerusform>%n semanas</numerusform><numerusform>%n semanas</numerusform></translation>
+        <translation><numerusform>%n hafta</numerusform><numerusform>%n hafta</numerusform></translation>
     </message>
     <message numerus="yes">
         <source>%n year(s)</source>
-        <translation><numerusform>%n anos</numerusform><numerusform>%n anos</numerusform></translation>
+        <translation><numerusform>%n yıl</numerusform><numerusform>%n yıl</numerusform></translation>
     </message>
     <message>
         <source>%1 and %2</source>
-        <translation>%1 e %2</translation>
+        <translation>%1 ve %2</translation>
     </message>
     <message>
         <source>unknown</source>
-        <translation>desconhecido</translation>
+        <translation>bilinmiyor</translation>
     </message>
 </context>
 <context>
     <name>QObject::QObject</name>
     <message>
         <source>Error: Specified data directory "%1" does not exist.</source>
-        <translation>Erro: Diretório de dados especificado "%1" não existe.</translation>
+        <translation>Hata: Belirtilen "%1" veri klasörü yoktur.</translation>
     </message>
     <message>
         <source>Error: Cannot parse configuration file: %1. Only use key=value syntax.</source>
-        <translation>Erro: Não foi possível interpretar arquivo de configuração: %1. Utilize apenas a sintaxe chave=valor.</translation>
+        <translation>Hata: %1 yapılandırma dosyası ayrıştırılamadı. Sadece anahtar=değer dizimini kullanınız.</translation>
     </message>
     <message>
         <source>Error: %1</source>
-        <translation>Erro: %1</translation>
+        <translation>Hata: %1</translation>
     </message>
 </context>
 <context>
     <name>QRDialog</name>
     <message>
         <source>QR-Code Title</source>
-        <translation>QR-Code Titulo</translation>
+        <translation>QR Kod Başlığı</translation>
     </message>
     <message>
         <source>QR Code</source>
-        <translation>Código QR</translation>
+        <translation>QR Kodu</translation>
     </message>
     <message>
         <source>&amp;Save Image...</source>
-        <translation>&amp;Salvar Imagem...</translation>
+        <translation>Resmi ka&amp;ydet...</translation>
     </message>
     <message>
         <source>Error creating QR Code.</source>
-        <translation>Erro ao criar o QR Code.</translation>
+        <translation>QR Kod oluşturma hatası.</translation>
     </message>
 </context>
 <context>
     <name>QRGeneralImageWidget</name>
     <message>
         <source>&amp;Save Image...</source>
-        <translation>&amp;Salvar Imagem...</translation>
+        <translation>Resmi ka&amp;ydet...</translation>
     </message>
     <message>
         <source>&amp;Copy Image</source>
-        <translation>&amp;Copiar imagem</translation>
+        <translation>Resmi &amp;Kopyala</translation>
     </message>
     <message>
         <source>Save QR Code</source>
-        <translation>Salvar código QR</translation>
+        <translation>QR Kodu Kaydet</translation>
     </message>
     <message>
         <source>PNG Image (*.png)</source>
-        <translation>Imagem PNG (*.png)</translation>
+        <translation>PNG Resim (*.png)</translation>
     </message>
 </context>
 <context>
     <name>QRImageWidget</name>
     <message>
         <source>&amp;Save Image...</source>
-        <translation>&amp;Salvar Imagem...</translation>
+        <translation>Resmi ka&amp;ydet...</translation>
     </message>
     <message>
         <source>&amp;Copy Image</source>
-        <translation>&amp;Copiar imagem</translation>
+        <translation>Resmi &amp;Kopyala</translation>
     </message>
     <message>
         <source>Save QR Code</source>
-        <translation>Salvar código QR</translation>
+        <translation>QR Kodu Kaydet</translation>
     </message>
     <message>
         <source>PNG Image (*.png)</source>
-        <translation>Imagem PNG (*.png)</translation>
+        <translation>PNG Resim (*.png)</translation>
     </message>
 </context>
 <context>
     <name>RPCConsole</name>
     <message>
         <source>Tools window</source>
-        <translation>Janela de ferramentas</translation>
+        <translation>Araçlar penceresi</translation>
     </message>
     <message>
         <source>&amp;Information</source>
-        <translation>&amp;Informação</translation>
+        <translation>&amp;Malumat</translation>
     </message>
     <message>
         <source>General</source>
-        <translation>Geral</translation>
+        <translation>Genel</translation>
     </message>
     <message>
         <source>Name</source>
-        <translation>Nome</translation>
+        <translation>İsim</translation>
     </message>
     <message>
         <source>N/A</source>
-        <translation>N/A</translation>
+        <translation>Mevcut değil</translation>
     </message>
     <message>
         <source>Number of connections</source>
-        <translation>Número de conexões</translation>
+        <translation>Bağlantı sayısı</translation>
     </message>
     <message>
         <source>&amp;Open</source>
-        <translation>&amp;Abrir</translation>
+        <translation>&amp;Aç</translation>
     </message>
     <message>
         <source>Startup time</source>
-        <translation>Horário de inicialização</translation>
+        <translation>Başlama zamanı</translation>
     </message>
     <message>
         <source>Network</source>
-        <translation>Rede</translation>
+        <translation>Şebeke</translation>
     </message>
     <message>
         <source>Last block time</source>
-        <translation>Horário do último bloco</translation>
+        <translation>Son blok zamanı</translation>
     </message>
     <message>
         <source>Debug log file</source>
-        <translation>Arquivo de log de Depuração</translation>
+        <translation>Hata ayıklama kütük dosyası</translation>
     </message>
     <message>
         <source>Current number of blocks</source>
-        <translation>Quantidade atual de blocos</translation>
+        <translation>Güncel blok sayısı</translation>
     </message>
     <message>
         <source>Client version</source>
-        <translation>Versão do cliente</translation>
+        <translation>İstemci sürümü</translation>
     </message>
     <message>
         <source>Using BerkeleyDB version</source>
-        <translation>Usando BerkeleyDB versão</translation>
+        <translation>Kullanılan BerkeleyDB sürümü</translation>
     </message>
     <message>
         <source>Block chain</source>
-        <translation>Corrente de blocos</translation>
+        <translation>Blok zinciri</translation>
     </message>
     <message>
         <source>Number of Masternodes</source>
-        <translation>Número de Masternodes</translation>
+        <translation>Ana düğüm sayısı</translation>
     </message>
     <message>
         <source>Memory Pool</source>
-        <translation>Pool de memória</translation>
+        <translation>Bellek Alanı</translation>
     </message>
     <message>
         <source>Current number of transactions</source>
-        <translation>Número atual de transações</translation>
+        <translation>Güncel işlem sayısı</translation>
     </message>
     <message>
         <source>Memory usage</source>
-        <translation>Uso de memória</translation>
+        <translation>Bellek kullanımı</translation>
     </message>
     <message>
         <source>&amp;Console</source>
-        <translation>&amp;Console</translation>
+        <translation>&amp;Konsol</translation>
     </message>
     <message>
         <source>Clear console</source>
-        <translation>Limpar console</translation>
+        <translation>Konsolu temizle</translation>
     </message>
     <message>
         <source>&amp;Network Traffic</source>
-        <translation>Tráfico de Rede</translation>
+        <translation>&amp;Şebeke trafiği</translation>
     </message>
     <message>
         <source>&amp;Clear</source>
-        <translation>&amp;Limpar</translation>
+        <translation>&amp;Temizle</translation>
     </message>
     <message>
         <source>Totals</source>
-        <translation>Totais</translation>
+        <translation>Toplamlar</translation>
     </message>
     <message>
         <source>Received</source>
-        <translation>Recebido</translation>
+        <translation>Alınan</translation>
     </message>
     <message>
         <source>Sent</source>
-        <translation>Enviado</translation>
+        <translation>Yollanan</translation>
     </message>
     <message>
         <source>&amp;Peers</source>
-        <translation>&amp;Peers</translation>
+        <translation>&amp;Eşler</translation>
     </message>
     <message>
         <source>Banned peers</source>
-        <translation>Nós banidos</translation>
+        <translation>Yasaklı eşler</translation>
     </message>
     <message>
         <source>Select a peer to view detailed information.</source>
-        <translation>Selecione um ponto para ver informações detalhadas.</translation>
+        <translation>Ayrıntılı bilgi görmek için bir eş seçin.</translation>
     </message>
     <message>
         <source>Whitelisted</source>
-        <translation>Lista branca</translation>
+        <translation>Beyaz listedekiler</translation>
     </message>
     <message>
         <source>Direction</source>
-        <translation>Direção</translation>
+        <translation>Yön</translation>
     </message>
     <message>
         <source>Version</source>
-        <translation>Versão</translation>
+        <translation>Sürüm</translation>
     </message>
     <message>
         <source>Starting Block</source>
-        <translation>Bloco inicial</translation>
+        <translation>Başlangıç Bloku</translation>
     </message>
     <message>
         <source>Synced Headers</source>
-        <translation>Cabeçalhos Sincronizados</translation>
+        <translation>Eşleşmiş Üstbilgiler</translation>
     </message>
     <message>
         <source>Synced Blocks</source>
-        <translation>Blocos Sincronizados</translation>
+        <translation>Eşleşmiş Bloklar</translation>
     </message>
     <message>
         <source>Wallet Path</source>
-        <translation>Caminho da carteira</translation>
+        <translation>Cüzdan Yolu</translation>
     </message>
     <message>
         <source>User Agent</source>
-        <translation>Agente de Usuário </translation>
+        <translation>Kullanıcı Yazılımı</translation>
     </message>
     <message>
         <source>Datadir</source>
-        <translation>Datadir</translation>
+        <translation>Veri konumu</translation>
     </message>
     <message>
         <source>Open the %1 debug log file from the current data directory. This can take a few seconds for large log files.</source>
-        <translation>Abrir o arquivo de log de depuração do %1 localizado no diretório atual de dados. Isso pode levar alguns segundos para arquivos de log grandes.</translation>
+        <translation>Güncel veri klasöründen %1 hata ayıklama kütük dosyasını açar. Büyük kütük dosyaları için bu birkaç saniye alabilir.</translation>
     </message>
     <message>
         <source>Decrease font size</source>
-        <translation>Diminuir o tamanho da fonte</translation>
+        <translation>Font boyutunu küçült</translation>
     </message>
     <message>
         <source>Increase font size</source>
-        <translation>Aumentar o tamanho da fonte</translation>
+        <translation>Yazıtipi boyutunu büyült</translation>
     </message>
     <message>
         <source>Services</source>
-        <translation>Serviços</translation>
+        <translation>Servisler</translation>
     </message>
     <message>
         <source>Ban Score</source>
-        <translation>Banir pontuação</translation>
+        <translation>Yasaklama Skoru</translation>
     </message>
     <message>
         <source>Connection Time</source>
-        <translation>Tempo de conexão</translation>
+        <translation>Bağlantı Süresi</translation>
     </message>
     <message>
         <source>Last Send</source>
-        <translation>Último envio</translation>
+        <translation>Son Gönderme</translation>
     </message>
     <message>
         <source>Last Receive</source>
-        <translation>Último recebido</translation>
+        <translation>Son Alma</translation>
     </message>
     <message>
         <source>Ping Time</source>
-        <translation>Tempo de Ping</translation>
+        <translation>Ping Süresi</translation>
     </message>
     <message>
         <source>The duration of a currently outstanding ping.</source>
-        <translation>A duração de um ping excepcional no momento.</translation>
+        <translation>Güncel olarak göze çarpan bir ping'in süresi.</translation>
     </message>
     <message>
         <source>Ping Wait</source>
-        <translation>Espera de ping</translation>
+        <translation>Ping Beklemesi</translation>
     </message>
     <message>
         <source>Min Ping</source>
-        <translation>Ping min</translation>
+        <translation>En Düşük Ping</translation>
     </message>
     <message>
         <source>Time Offset</source>
-        <translation>Offset de tempo</translation>
+        <translation>Saat Farkı</translation>
     </message>
     <message>
         <source>&amp;Wallet Repair</source>
-        <translation>&amp;Reparar carteira</translation>
+        <translation>&amp;Cüzdan Tamiri</translation>
     </message>
     <message>
         <source>Salvage wallet</source>
-        <translation>Salvar wallet</translation>
+        <translation>Cüzdanı kurtar</translation>
     </message>
     <message>
         <source>Rescan blockchain files</source>
-        <translation>reescanear o blockchain</translation>
+        <translation>Blok zinciri dosyalarını yeniden tara</translation>
     </message>
     <message>
         <source>Recover transactions 1</source>
-        <translation>Recuperar transações 1</translation>
+        <translation>İşlemleri geri al 1</translation>
     </message>
     <message>
         <source>Recover transactions 2</source>
-        <translation>Recuperar transações 2</translation>
+        <translation>İşlemleri geri al 2</translation>
     </message>
     <message>
         <source>Upgrade wallet format</source>
-        <translation>Atualizar formato da carteira</translation>
+        <translation>Cüzdan biçimini yükselt</translation>
     </message>
     <message>
         <source>The buttons below will restart the wallet with command-line options to repair the wallet, fix issues with corrupt blockhain files or missing/obsolete transactions.</source>
-        <translation>Os botões abaixo reiniciarão a carteira com opções de linha de comando para reparar a carteira, corrigir problemas com arquivos blockhain corrompidos ou transações ausentes/obsoletas.</translation>
+        <translation>Aşağıdaki düğmeler cüzdanı tamir etmek, bozuk blok zinciri dosyalarıyla veya kayıp/geçersiz işlemlerle ilgili sorunları çözmek için cüzdanı komut istemi seçenekleri ile yeniden başlatacak.</translation>
     </message>
     <message>
         <source>-salvagewallet: Attempt to recover private keys from a corrupt wallet.dat.</source>
-        <translation>-salvagewallet: tenta recuperar chaves privadas de um wallet.dat corrompido.</translation>
+        <translation>-salvagewallet: Bozuk bir wallet.dat dosyasında özel anahtarları kurtarma denemesi.</translation>
     </message>
     <message>
         <source>-rescan: Rescan the block chain for missing wallet transactions.</source>
-        <translation>-rescan: Reinicia a cadeia de bloco para transações de carteira ausentes.</translation>
+        <translation>-rescan: Kayıp cüzdan işlemleri için blok zincirini yeniden tarama.</translation>
     </message>
     <message>
         <source>-zapwallettxes=1: Recover transactions from blockchain (keep meta-data, e.g. account owner).</source>
-        <translation>-zapwallettxes = 1: Recupere as transações do blockchain (mantenha metadados, por exemplo, proprietário da conta).</translation>
+        <translation>-zapwallettxes=1: Blok zincirinden işlemleri kurtarma (meta-veri tutulur, ör. hesap sahibi).</translation>
     </message>
     <message>
         <source>-zapwallettxes=2: Recover transactions from blockchain (drop meta-data).</source>
-        <translation>-zapwallettxes = 2: Recupere as transações do blockchain (elimine metadados).</translation>
+        <translation>-zapwallettxes=2: Blok zincirinden işlemleri kurtarma (meta-veri atılır).</translation>
     </message>
     <message>
         <source>-upgradewallet: Upgrade wallet to latest format on startup. (Note: this is NOT an update of the wallet itself!)</source>
-        <translation>-upgradewallet: Atualize a carteira para o formato mais recente na inicialização. (Nota: esta não é uma atualização da carteira em si!)</translation>
+        <translation>-upgradewallet: Açılışta cüzdanı en son biçime yükselt. (Not: Bu cüzdanın kendisinin güncellenmesi DEĞİLDİR!)</translation>
     </message>
     <message>
         <source>Wallet repair options.</source>
-        <translation>Opções de reparação da carteira.</translation>
+        <translation>Cüzdan tamir seçenekleri.</translation>
     </message>
     <message>
         <source>Rebuild index</source>
-        <translation> Reconstrução de Índice</translation>
+        <translation>Dizini yeniden oluştur</translation>
     </message>
     <message>
         <source>-reindex: Rebuild block chain index from current blk000??.dat files.</source>
-        <translation>-reindex: Reconstrói o índice de cadeia de blocos a partir dos arquivos atuais de dados blk000??.dat .</translation>
+        <translation>-reindex: Blok zinciri dizinini mevcut blk000??.dat dosyalarından yeniden oluşturma.</translation>
     </message>
     <message>
         <source>&amp;Disconnect</source>
-        <translation>&amp;Desconectar</translation>
+        <translation>&amp;Bağlantıyı Kes</translation>
     </message>
     <message>
         <source>Ban for</source>
-        <translation>Banir por</translation>
+        <translation>Yasakla</translation>
     </message>
     <message>
         <source>1 &amp;hour</source>
-        <translation>1 &amp;hora</translation>
+        <translation>1 &amp;saat</translation>
     </message>
     <message>
         <source>1 &amp;day</source>
-        <translation>1 &amp;dia</translation>
+        <translation>1 &amp;gün</translation>
     </message>
     <message>
         <source>1 &amp;week</source>
-        <translation>1 &amp;semana</translation>
+        <translation>1 &amp;hafta</translation>
     </message>
     <message>
         <source>1 &amp;year</source>
-        <translation>1 &amp;ano</translation>
+        <translation>1 &amp;yıl</translation>
     </message>
     <message>
         <source>&amp;Unban</source>
-        <translation>&amp;Desbanir</translation>
+        <translation>&amp;Yasaklamayı Kaldır</translation>
     </message>
     <message>
         <source>Welcome to the %1 RPC console.</source>
-        <translation>Bem-vindo ao console RPC do %1.</translation>
+        <translation>%1 RPC konsoluna hoş geldiniz.</translation>
     </message>
     <message>
         <source>Use up and down arrows to navigate history, and &lt;b&gt;Ctrl-L&lt;/b&gt; to clear screen.</source>
-        <translation>Use as setas para cima e para baixo para navegar pelo histórico, e &lt;b&gt;Ctrl-L&lt;/b&gt; para limpar a tela.</translation>
+        <translation>Tarihçede gezinmek için imleç tuşlarını kullanınız, &lt;b&gt;Ctrl-L&lt;/b&gt; ile de ekranı temizleyebilirsiniz.</translation>
     </message>
     <message>
         <source>Type &lt;b&gt;help&lt;/b&gt; for an overview of available commands.</source>
-        <translation>Digite &lt;b&gt;help&lt;/b&gt; para uma visão geral dos comandos disponíveis.</translation>
+        <translation>Mevcut komutların listesi için &lt;b&gt;help&lt;/b&gt; yazınız.</translation>
     </message>
     <message>
         <source>WARNING: Scammers have been active, telling users to type commands here, stealing their wallet contents. Do not use this console without fully understanding the ramification of a command.</source>
-        <translation>AVISO: Os golpistas estão ativos, dizendo aos usuários para digitar comandos aqui, roubando o conteúdo da carteira. Não use este console sem compreender totalmente o contexto de um comando.</translation>
+        <translation>UYARI: Kullanıcıların cüzdan içeriğini çalmak için buraya komut girmenizi söyleyen dolandırıcılar olabilir. Bir komutun ne anlama geldiğini tam olarak bilmiyorsanız bu konsolu kullanmayın.</translation>
     </message>
     <message>
         <source>In:</source>
-        <translation>Entrada:</translation>
+        <translation>İçeri:</translation>
     </message>
     <message>
         <source>Out:</source>
-        <translation>Saída:</translation>
+        <translation>Dışarı:</translation>
     </message>
     <message>
         <source>Network activity disabled</source>
-        <translation>Atividade da rede disativada</translation>
+        <translation>Ağ etkinliği devre dışı bırakıldı</translation>
     </message>
     <message>
         <source>%1 B</source>
@@ -2485,157 +2422,157 @@ https://www.transifex.com/projects/p/dash/</translation>
     </message>
     <message>
         <source>(node id: %1)</source>
-        <translation>(id do nó: %1)</translation>
+        <translation>(düğüm kimliği: %1)</translation>
     </message>
     <message>
         <source>via %1</source>
-        <translation>por %1</translation>
+        <translation>%1 vasıtasıyla</translation>
     </message>
     <message>
         <source>never</source>
-        <translation>nunca</translation>
+        <translation>asla</translation>
     </message>
     <message>
         <source>Inbound</source>
-        <translation>Entrada</translation>
+        <translation>Gelen</translation>
     </message>
     <message>
         <source>Outbound</source>
-        <translation>Saída</translation>
+        <translation>Giden</translation>
     </message>
     <message>
         <source>Yes</source>
-        <translation>sim</translation>
+        <translation>Evet</translation>
     </message>
     <message>
         <source>No</source>
-        <translation>não</translation>
+        <translation>Hayır</translation>
     </message>
     <message>
         <source>Unknown</source>
-        <translation>Desconhecido</translation>
+        <translation>bilinmiyor</translation>
     </message>
 </context>
 <context>
     <name>ReceiveCoinsDialog</name>
     <message>
         <source>Reuse one of the previously used receiving addresses.&lt;br&gt;Reusing addresses has security and privacy issues.&lt;br&gt;Do not use this unless re-generating a payment request made before.</source>
-        <translation>Reutilize um dos endereços de recebimento usados anteriormente.&lt;br&gt; Os endereços que estão sendo usados têm problemas de segurança e privacidade. &lt;br&gt;Não use isso, a menos que você gere novamente uma solicitação de pagamento feita anteriormente.</translation>
+        <translation>Öneden kullanılmış bir alım adresini tekrar kullan.&lt;br&gt;Adresleri tekrar kullanmak güvenlik ve gizlilik sorunlarına neden olur.&lt;br&gt;Eğer daha önce yapılmış bir ödeme talebi tekrar oluşturulmadıysa bunu kullanmayın.</translation>
     </message>
     <message>
         <source>R&amp;euse an existing receiving address (not recommended)</source>
-        <translation>R&amp;eutilize um endereço de recebimento (não recomendado)</translation>
+        <translation>&amp;Hâlihazırda bulunan bir alım adresini kullan (önerilmez)</translation>
     </message>
     <message>
         <source>An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Dash network.</source>
-        <translation>Uma mensagem opcional que será anexada na cobrança e será mostrada quando ela for aberta. Nota: A mensagem não será enviada com o pagamento pela rede Dash.</translation>
+        <translation>Talep açıldığında gösterilecek, isteğinize dayalı, ödeme talebi ile ilişkilendirilecek bir ileti. Not: Bu ileti ödeme ile birlikte Dash ağı üzerinden gönderilmeyecektir.</translation>
     </message>
     <message>
         <source>&amp;Message:</source>
-        <translation>&amp;Mensagem</translation>
+        <translation>Me&amp;saj:</translation>
     </message>
     <message>
         <source>An optional label to associate with the new receiving address.</source>
-        <translation>Um marcador opcional para associar ao novo endereço de recebimento.</translation>
+        <translation>Yeni alım adresi ile ilişkili, seçiminize dayalı etiket.</translation>
     </message>
     <message>
         <source>An optional message to attach to the payment request, which will be displayed when the request is opened.&lt;br&gt;Note: The message will not be sent with the payment over the Dash network.</source>
-        <translation>Uma mensagem opcional para anexar à solicitação de pagamento, que será exibida quando a solicitação for aberta. &lt;br&gt;Observação: a mensagem não será enviada com o pagamento pela rede do Dash.</translation>
+        <translation>Ödeme talebine eklenecek isteğe bağlı bir mesaj, talep açıldığında gösterilecektir.&lt;br&gt;Not: Mesaj ödeme ile birlikte Dash ağı üzerinden gönderilmez.</translation>
     </message>
     <message>
         <source>Use this form to request payments. All fields are &lt;b&gt;optional&lt;/b&gt;.</source>
-        <translation>Use esse formulário para fazer cobranças. Todos os campos são &lt;b&gt;opcionais&lt;/b&gt;.</translation>
+        <translation>Ödeme talep etmek için bu formu kullanın. Tüm alanlar &lt;b&gt;seçime dayalıdır&lt;/b&gt;.</translation>
     </message>
     <message>
         <source>&amp;Label:</source>
-        <translation>&amp;Rótulo:</translation>
+        <translation>&amp;Etiket:</translation>
     </message>
     <message>
         <source>An optional amount to request. Leave this empty or zero to not request a specific amount.</source>
-        <translation>Uma quantia opcional para cobrar. Deixe vazio ou em branco se o pagador puder especificar a quantia.</translation>
+        <translation>Seçiminize dayalı talep edilecek meblağ. Belli bir meblağ talep etmemek için bunu boş bırakın veya sıfır değerini kullanın.</translation>
     </message>
     <message>
         <source>&amp;Amount:</source>
-        <translation>Qu&amp;antia:</translation>
+        <translation>&amp;Meblağ:</translation>
     </message>
     <message>
         <source>&amp;Request payment</source>
-        <translation>&amp;Requisitar Pagamento</translation>
+        <translation>Ödeme &amp;talep et</translation>
     </message>
     <message>
         <source>Clear all fields of the form.</source>
-        <translation>Limpa todos os campos do formulário.</translation>
+        <translation>Formdaki tüm alanları temizle.</translation>
     </message>
     <message>
         <source>Clear</source>
-        <translation>Limpar</translation>
+        <translation>Temizle</translation>
     </message>
     <message>
         <source>Request InstantSend</source>
-        <translation>Solicitar o InstantSend</translation>
+        <translation>Anında Gönder Talep Et</translation>
     </message>
     <message>
         <source>Requested payments history</source>
-        <translation>Histórico de cobranças</translation>
+        <translation>Talep edilen ödemelerin tarihçesi</translation>
     </message>
     <message>
         <source>Show the selected request (does the same as double clicking an entry)</source>
-        <translation>Mostra a cobrança selecionada (o mesmo que clicar duas vezes em um registro)</translation>
+        <translation>Seçilen talebi göster (bir unsura çift tıklamakla aynı anlama gelir)</translation>
     </message>
     <message>
         <source>Show</source>
-        <translation>Mostrar</translation>
+        <translation>Göster</translation>
     </message>
     <message>
         <source>Remove the selected entries from the list</source>
-        <translation>Remove o registro selecionado da lista</translation>
+        <translation>Seçilen unsurları listeden kaldır</translation>
     </message>
     <message>
         <source>Remove</source>
-        <translation>Remover</translation>
+        <translation>Kaldır</translation>
     </message>
     <message>
         <source>Copy URI</source>
-        <translation>Copiar URI</translation>
+        <translation>URI'yi kopyala</translation>
     </message>
     <message>
         <source>Copy label</source>
-        <translation>Copiar rótulo</translation>
+        <translation>Etiket kopyala</translation>
     </message>
     <message>
         <source>Copy message</source>
-        <translation>Copiar mensagem</translation>
+        <translation>İletiyi kopyala</translation>
     </message>
     <message>
         <source>Copy amount</source>
-        <translation>Copiar quantia</translation>
+        <translation>Tutarı kopyala</translation>
     </message>
 </context>
 <context>
     <name>ReceiveRequestDialog</name>
     <message>
         <source>QR Code</source>
-        <translation>Código QR</translation>
+        <translation>QR Kodu</translation>
     </message>
     <message>
         <source>Copy &amp;URI</source>
-        <translation>Copiar &amp;URI</translation>
+        <translation>&amp;URI'yi kopyala</translation>
     </message>
     <message>
         <source>Copy &amp;Address</source>
-        <translation>&amp;Copiar Endereço</translation>
+        <translation>&amp;Adresi kopyala</translation>
     </message>
     <message>
         <source>&amp;Save Image...</source>
-        <translation>&amp;Salvar Imagem...</translation>
+        <translation>Resmi ka&amp;ydet...</translation>
     </message>
     <message>
         <source>Request payment to %1</source>
-        <translation>Pedido de pagamento para %1</translation>
+        <translation>%1 unsuruna ödeme talep et</translation>
     </message>
     <message>
         <source>Payment information</source>
-        <translation>Informação do pagamento</translation>
+        <translation>Ödeme bilgisi</translation>
     </message>
     <message>
         <source>URI</source>
@@ -2643,189 +2580,201 @@ https://www.transifex.com/projects/p/dash/</translation>
     </message>
     <message>
         <source>Address</source>
-        <translation>Endereço</translation>
+        <translation>Adres</translation>
     </message>
     <message>
         <source>Amount</source>
-        <translation>Quantia</translation>
+        <translation>Tutar</translation>
     </message>
     <message>
         <source>Label</source>
-        <translation>Rótulo</translation>
+        <translation>Etiket</translation>
     </message>
     <message>
         <source>Message</source>
-        <translation>mensagem</translation>
+        <translation>İleti</translation>
     </message>
     <message>
         <source>InstantSend</source>
-        <translation>EnvioInstantâneo</translation>
+        <translation>Anında Gönder</translation>
     </message>
     <message>
         <source>Yes</source>
-        <translation>Sim</translation>
+        <translation>Evet</translation>
     </message>
     <message>
         <source>No</source>
-        <translation>Não</translation>
+        <translation>Hayır</translation>
     </message>
     <message>
         <source>Resulting URI too long, try to reduce the text for label / message.</source>
-        <translation>URI resultante muito longa. Tente reduzir o texto do rótulo ou da mensagem.</translation>
+        <translation>Sonuç URI çok uzun, etiket ya da ileti metnini kısaltmayı deneyiniz.</translation>
     </message>
     <message>
         <source>Error encoding URI into QR Code.</source>
-        <translation>Erro ao codigicar o URI em código QR</translation>
+        <translation>URI'nin QR koduna kodlanmasında hata oluştu.</translation>
     </message>
 </context>
 <context>
     <name>RecentRequestsTableModel</name>
     <message>
         <source>Date</source>
-        <translation>Data</translation>
+        <translation>Tarih</translation>
     </message>
     <message>
         <source>Label</source>
-        <translation>Rótulo</translation>
+        <translation>Etiket</translation>
     </message>
     <message>
         <source>Message</source>
-        <translation>Mensagem</translation>
+        <translation>İleti</translation>
     </message>
     <message>
         <source>(no label)</source>
-        <translation>(sem rótulo)</translation>
+        <translation>(etiket yok)</translation>
     </message>
     <message>
         <source>(no message)</source>
-        <translation>(sem mensagem)</translation>
+        <translation>(ileti yok)</translation>
     </message>
     <message>
         <source>(no amount requested)</source>
-        <translation>(nenhuma quantia solicitada)</translation>
+        <translation>(tutar talep edilmedi)</translation>
     </message>
     <message>
         <source>Requested</source>
-        <translation>Solicitado</translation>
+        <translation>Talep edilen</translation>
     </message>
 </context>
 <context>
     <name>SendCoinsDialog</name>
     <message>
         <source>Send Coins</source>
-        <translation>Enviar dinheiro</translation>
+        <translation>Bitcoin yolla</translation>
     </message>
     <message>
         <source>Coin Control Features</source>
-        <translation>Opções de Controle da Moeda</translation>
+        <translation>Para kontrolü özellikleri</translation>
     </message>
     <message>
         <source>Inputs...</source>
-        <translation>Entradas...</translation>
+        <translation>Girdiler...</translation>
     </message>
     <message>
         <source>automatically selected</source>
-        <translation>automaticamente selecionado</translation>
+        <translation>otomatik seçilmiş</translation>
     </message>
     <message>
         <source>Insufficient funds!</source>
-        <translation>Saldo insuficiente!</translation>
+        <translation>Yetersiz fon!</translation>
     </message>
     <message>
         <source>Quantity:</source>
-        <translation>Quantidade:</translation>
+        <translation>Miktar:</translation>
     </message>
     <message>
         <source>Bytes:</source>
-        <translation>Bytes:</translation>
+        <translation>Bayt:</translation>
     </message>
     <message>
         <source>Amount:</source>
-        <translation>Quantia:</translation>
+        <translation>Meblağ:</translation>
     </message>
     <message>
         <source>Fee:</source>
-        <translation>Taxa:</translation>
+        <translation>Ücret:</translation>
     </message>
     <message>
         <source>Dust:</source>
-        <translation>Poeira:</translation>
+        <translation>Toz:</translation>
     </message>
     <message>
         <source>After Fee:</source>
-        <translation>Depois da taxa:</translation>
+        <translation>Ücretten sonra:</translation>
     </message>
     <message>
         <source>Change:</source>
-        <translation>trocar</translation>
+        <translation>Para üstü:</translation>
     </message>
     <message>
         <source>If this is activated, but the change address is empty or invalid, change will be sent to a newly generated address.</source>
-        <translation>Se isso estiver ativo e o endereço de troco estiver vazio ou inválido, o troco será enviado a um novo endereço gerado na hora.</translation>
+        <translation>Bu etkinleştirildiyse fakat para üstü adresi boş ya da geçersizse para üstü yeni oluşturulan bir adrese gönderilecektir.</translation>
     </message>
     <message>
         <source>Custom change address</source>
-        <translation>Endereço específico de troco</translation>
+        <translation>Özel para üstü adresi</translation>
     </message>
     <message>
         <source>Transaction Fee:</source>
-        <translation>Taxa de transação</translation>
+        <translation>İşlem ücreti:</translation>
     </message>
     <message>
         <source>Choose...</source>
-        <translation>Escolha...</translation>
+        <translation>Seç...</translation>
     </message>
     <message>
         <source>Using the fallbackfee can result in sending a transaction that will take several hours or days (or never) to confirm. Consider choosing your fee manually or wait until your have validated the complete chain.</source>
-        <translation>Usar o fallbackfee pode resultar no envio de uma transação que levará várias horas ou dias (ou nunca) para confirmação. Considere escolher sua taxa manualmente ou espere até que você tenha validado a cadeia completa.</translation>
+        <translation>Fallbackfee kullanmak, bir işlemin teyit edilmesinin satler veya günler almasına (ve hiçbir zaman teyit edilememesine) neden olabilir. Ücreti elle seçmeyi veya tüm zincirin onaylanmasını beklemeyi göz önünde bulundurun.</translation>
     </message>
     <message>
         <source>Warning: Fee estimation is currently not possible.</source>
-        <translation>Atenção: Estimativa de taxa não disponível no momento</translation>
+        <translation>Uyarı: Ücret tahmini şu anda mümkün değildir.</translation>
     </message>
     <message>
         <source>collapse fee-settings</source>
-        <translation>Ocultar painel</translation>
+        <translation>ücret-ayarlarını-küçült</translation>
     </message>
     <message>
         <source>Confirmation time target:</source>
-        <translation>Tempo alvo de confirmação:</translation>
+        <translation>Doğrulama süresi hedefi:</translation>
     </message>
     <message>
         <source>PrivateSend</source>
-        <translation>EnvioPrivado</translation>
+        <translation>Özel Gönder</translation>
     </message>
     <message>
         <source>InstantSend</source>
-        <translation>EnvioInstantâneo</translation>
+        <translation>Anında Gönder</translation>
+    </message>
+    <message>
+        <source>If the custom fee is set to 1000 duffs and the transaction is only 250 bytes, then "per kilobyte" only pays 250 duffs in fee,&lt;br /&gt;while "at least" pays 1000 duffs. For transactions bigger than a kilobyte both pay by kilobyte.</source>
+        <translation>Eğer özel ücret 1000 duff olarak belirlendiyse ve işlem sadece 250 bayt ise "kilobayt başına" ücret olarak sadece 250 duff ödersiniz,&lt;br /&gt;bu da "en az" 1000 duff öder. Bir kilobayttan büyük işlemler için ikisi de kilobayt başına ödeme yapar.</translation>
+    </message>
+    <message>
+        <source>If the custom fee is set to 1000 duffs and the transaction is only 250 bytes, then "per kilobyte" only pays 250 duffs in fee,&lt;br /&gt;while "total at least" pays 1000 duffs. For transactions bigger than a kilobyte both pay by kilobyte.</source>
+        <translation>Eğer özel ücret 1000 duff olarak belirlendiyse ve işlem sadece 250 bayt ise "kilobayt başına" ücret olarak sadece 250 duff ödersiniz,&lt;br /&gt;bu da "toplam en az" 1000 duff öder. Bir kilobayttan büyük işlemler için ikisi de kilobayt başına ödeme yapar.</translation>
+    </message>
+    <message>
+        <source>Paying only the minimum fee is just fine as long as there is less transaction volume than space in the blocks.&lt;br /&gt;But be aware that this can end up in a never confirming transaction once there is more demand for dash transactions than the network can process.</source>
+        <translation>Bloklardaki alandan daha düşük işlem hacmi var olduğu sürece sadece minimum ücreti ödemek yeterli olur.&lt;br /&gt;Ama ağın işleyebileceğinden daha fazla dash işlemi talebi olursa, bunun işlemlerin asla teyit edilememesi gibi bir sonucu olabileceğini unutmayın.</translation>
     </message>
     <message>
         <source>per kilobyte</source>
-        <translation>por kilobyte</translation>
+        <translation>kilobayt başı</translation>
     </message>
     <message>
         <source>Hide</source>
-        <translation>Esconder</translation>
+        <translation>Gizle</translation>
     </message>
     <message>
         <source>total at least</source>
-        <translation>total pelo menos</translation>
+        <translation>toplam en az</translation>
     </message>
     <message>
         <source>(read the tooltip)</source>
-        <translation>(Leia o popup)</translation>
+        <translation>(bilgi balonunu oku)</translation>
     </message>
     <message>
         <source>Recommended:</source>
-        <translation>Recomendado</translation>
+        <translation>Tavsiye edilen:</translation>
     </message>
     <message>
         <source>Custom:</source>
-        <translation>Personalizado:</translation>
+        <translation>Özel:</translation>
     </message>
     <message>
         <source>(Smart fee not initialized yet. This usually takes a few blocks...)</source>
-        <translation>(Smart fee não iniciado. Isso requer alguns blocos...)</translation>
+        <translation>(Zeki ücret henüz başlatılmadı. Bu genelde birkaç blok alır...)</translation>
     </message>
     <message>
         <source>normal</source>
@@ -2833,194 +2782,194 @@ https://www.transifex.com/projects/p/dash/</translation>
     </message>
     <message>
         <source>fast</source>
-        <translation>rápido</translation>
+        <translation>hızlı</translation>
     </message>
     <message>
         <source>Confirm the send action</source>
-        <translation>Confirmar o envio</translation>
+        <translation>Yollama etkinliğini teyit ediniz</translation>
     </message>
     <message>
         <source>S&amp;end</source>
-        <translation>Enviar</translation>
+        <translation>G&amp;önder</translation>
     </message>
     <message>
         <source>Clear all fields of the form.</source>
-        <translation>Limpar todos os campos do formulário.</translation>
+        <translation>Formdaki tüm alanları temizle.</translation>
     </message>
     <message>
         <source>Clear &amp;All</source>
-        <translation>Limpar Tudo</translation>
+        <translation>Tümünü &amp;temizle</translation>
     </message>
     <message>
         <source>Send to multiple recipients at once</source>
-        <translation>Enviar para vários destinatários de uma só vez</translation>
+        <translation>Birçok alıcıya aynı anda gönder</translation>
     </message>
     <message>
         <source>Add &amp;Recipient</source>
-        <translation>Adicionar destinatário</translation>
+        <translation>&amp;Alıcı ekle</translation>
     </message>
     <message>
         <source>Balance:</source>
-        <translation>Saldo:</translation>
+        <translation>Bakiye:</translation>
     </message>
     <message>
         <source>Copy quantity</source>
-        <translation>Copiar quantidade</translation>
+        <translation>Miktarı kopyala</translation>
     </message>
     <message>
         <source>Copy amount</source>
-        <translation>Copiar quantia</translation>
+        <translation>Tutarı kopyala</translation>
     </message>
     <message>
         <source>Copy fee</source>
-        <translation>Copiar taxa</translation>
+        <translation>Ücreti kopyala</translation>
     </message>
     <message>
         <source>Copy after fee</source>
-        <translation>Copiar pós taxa</translation>
+        <translation>Ücretten sonrasını kopyala</translation>
     </message>
     <message>
         <source>Copy bytes</source>
-        <translation>Copiar bytes</translation>
+        <translation>Baytları kopyala</translation>
     </message>
     <message>
         <source>Copy dust</source>
-        <translation>Copiar poeira</translation>
+        <translation>Tozu kopyala</translation>
     </message>
     <message>
         <source>Copy change</source>
-        <translation>Copiar troco</translation>
+        <translation>Para üstünü kopyala</translation>
     </message>
     <message>
         <source>using</source>
-        <translation>usando</translation>
+        <translation>bunu kullanarak:</translation>
     </message>
     <message>
         <source>anonymous funds</source>
-        <translation>fundos anônimos </translation>
+        <translation>anonim bakiye</translation>
     </message>
     <message>
         <source>(privatesend requires this amount to be rounded up to the nearest %1).</source>
-        <translation>(O privatesend exige que esse valor seja arredondado para o próximo %1).</translation>
+        <translation>(özel gönder için bu tutarın en yakın %1 tutarına yuvarlanması gerekiyor).</translation>
     </message>
     <message>
         <source>any available funds (not anonymous)</source>
-        <translation>quaisquer fundos disponíveis (não anônimos)</translation>
+        <translation>tüm mevcut bakiye (anonim değil)</translation>
     </message>
     <message>
         <source>and InstantSend</source>
-        <translation>e EnvioInstantâneo</translation>
+        <translation>ve Anında Gönder</translation>
     </message>
     <message>
         <source>%1 to %2</source>
-        <translation>%1 a %2</translation>
+        <translation>%1 ögesinden %2 unsuruna</translation>
     </message>
     <message>
         <source>Are you sure you want to send?</source>
-        <translation>Você tem certeza que deseja enviar?</translation>
+        <translation>Göndermek istediğinizden emin misiniz?</translation>
     </message>
     <message>
         <source>are added as transaction fee</source>
-        <translation>são adicionadas como taxas de transação</translation>
+        <translation>işlem ücreti olarak eklendi</translation>
     </message>
     <message>
         <source>Total Amount = &lt;b&gt;%1&lt;/b&gt;&lt;br /&gt;= %2</source>
-        <translation>Quantidade Total = &lt;b&gt;%1&lt;/b&gt;&lt;br /&gt;= %2</translation>
+        <translation>Toplam Tutar = &lt;b&gt;%1&lt;/b&gt;&lt;br /&gt;= %2</translation>
     </message>
     <message>
         <source>&lt;b&gt;(%1 of %2 entries displayed)&lt;/b&gt;</source>
-        <translation>&lt;b&gt;(%1 de %2 entradas exibidas)&lt;/b&gt;</translation>
+        <translation>&lt;b&gt;(%1 / %2 girdi gösteriliyor)&lt;/b&gt;</translation>
     </message>
     <message>
         <source>Confirm send coins</source>
-        <translation>Confirme o envio de moedas</translation>
+        <translation>Bitcoin gönderimini onaylayın</translation>
     </message>
     <message>
         <source>The recipient address is not valid. Please recheck.</source>
-        <translation>Endereço de envio inváido. Favor checar.</translation>
+        <translation>Alıcı adresi geçerli değildir. Lütfen tekrar kontrol ediniz.</translation>
     </message>
     <message>
         <source>The amount to pay must be larger than 0.</source>
-        <translation>A quantia à pagar deve ser maior que 0</translation>
+        <translation>Ödeyeceğiniz tutarın 0'dan yüksek olması gerekir.</translation>
     </message>
     <message>
         <source>The amount exceeds your balance.</source>
-        <translation>A quantia excede o seu saldo</translation>
+        <translation>Tutar bakiyenizden yüksektir.</translation>
     </message>
     <message>
         <source>The total exceeds your balance when the %1 transaction fee is included.</source>
-        <translation>O total excede o seu saldo quando a taxa da transação %1 é incluída</translation>
+        <translation>Toplam, %1 işlem ücreti eklendiğinde bakiyenizi geçmektedir.</translation>
     </message>
     <message>
         <source>Duplicate address found: addresses should only be used once each.</source>
-        <translation>Encontrado endereço duplicado: os endereços deveriam ser usados apenas uma vez cada</translation>
+        <translation>Tekrarlayan adres bulundu: adresler sadece bir kez kullanılmalıdır.</translation>
     </message>
     <message>
         <source>Transaction creation failed!</source>
-        <translation>Criação de transação falha</translation>
+        <translation>İşlem oluşturma başarısız!</translation>
     </message>
     <message>
         <source>The transaction was rejected with the following reason: %1</source>
-        <translation>A transação foi rejeitada com a seguinte razão: %1</translation>
+        <translation>İşlem şu nedenden dolayı reddedildi: %1</translation>
     </message>
     <message>
         <source>A fee higher than %1 is considered an absurdly high fee.</source>
-        <translation>Uma taxa maior que %1 é considerada uma taxa absurdamente alta.</translation>
+        <translation>%1 tutarından yüksek bir ücret saçma derecede yüksek bir ücret olarak kabul edilir.</translation>
     </message>
     <message>
         <source>Payment request expired.</source>
-        <translation>Pedido de pagamento expirado</translation>
+        <translation>Ödeme talebinin geçerlilik süresi bitti.</translation>
     </message>
     <message numerus="yes">
         <source>%n block(s)</source>
-        <translation><numerusform>%n blocos</numerusform><numerusform>%n blocos</numerusform></translation>
+        <translation><numerusform>%n blok</numerusform><numerusform>%n blok</numerusform></translation>
     </message>
     <message>
         <source>Pay only the required fee of %1</source>
-        <translation>Pagar somente a taxa requerida de %1</translation>
+        <translation>Sadece asgari ücret olan %1 tutarını öde</translation>
     </message>
     <message numerus="yes">
         <source>Estimated to begin confirmation within %n block(s).</source>
-        <translation><numerusform>Estimativa para iniciar a confirmação em %n blocos.</numerusform><numerusform>Estimativa para iniciar a confirmação em %n blocos.</numerusform></translation>
+        <translation><numerusform>%n blok içinde onaylamanın başlayacağı tahmin ediliyor.</numerusform><numerusform>%n blok içinde onaylamanın başlayacağı tahmin ediliyor.</numerusform></translation>
     </message>
     <message>
         <source>Warning: Invalid Dash address</source>
-        <translation>Aviso: Endereço Dash inválido</translation>
+        <translation>UYARI: Geçersiz Dash adresi</translation>
     </message>
     <message>
         <source>Warning: Unknown change address</source>
-        <translation>Aviso: Endereço de troco inválido</translation>
+        <translation>Uyarı: Bilinmeyen para üstü adresi</translation>
     </message>
     <message>
         <source>Confirm custom change address</source>
-        <translation>Confirmar endereço de troco personalizado</translation>
+        <translation>Özel para üstü adresini onayla</translation>
     </message>
     <message>
         <source>The address you selected for change is not part of this wallet. Any or all funds in your wallet may be sent to this address. Are you sure?</source>
-        <translation>O endereço selecionado para o troco não pertence a esta carteira. Alguns ou todos os fundos da sua carteira modem ser mandados para esse endereço. Tem certeza?</translation>
+        <translation>Para üstü için seçtiğiniz adres bu cüzdanın bir parçası değil. Cüzdanınızdaki bir miktar veya tüm para bu adrese gönderilebilir. Emin misiniz?</translation>
     </message>
     <message>
         <source>(no label)</source>
-        <translation>(sem rótulo)</translation>
+        <translation>(etiket yok)</translation>
     </message>
 </context>
 <context>
     <name>SendCoinsEntry</name>
     <message>
         <source>This is a normal payment.</source>
-        <translation>Este é um pagamento normal.</translation>
+        <translation>Bu, normal bir ödemedir.</translation>
     </message>
     <message>
         <source>Pay &amp;To:</source>
-        <translation>Pagar &amp;Para:</translation>
+        <translation>&amp;Şu adrese öde:</translation>
     </message>
     <message>
         <source>The Dash address to send the payment to</source>
-        <translation>O endereço Dash para enviar o pagamento a</translation>
+        <translation>Ödemenin yollanacağı Dash adresi</translation>
     </message>
     <message>
         <source>Choose previously used address</source>
-        <translation>Escolher endereço usado anteriormente</translation>
+        <translation>Önceden kullanılmış adres seç</translation>
     </message>
     <message>
         <source>Alt+A</source>
@@ -3028,7 +2977,7 @@ https://www.transifex.com/projects/p/dash/</translation>
     </message>
     <message>
         <source>Paste address from clipboard</source>
-        <translation>Colar o endereço da área de transferência</translation>
+        <translation>Panodan adres yapıştır</translation>
     </message>
     <message>
         <source>Alt+P</source>
@@ -3036,96 +2985,96 @@ https://www.transifex.com/projects/p/dash/</translation>
     </message>
     <message>
         <source>Remove this entry</source>
-        <translation>Remover esta entrada</translation>
+        <translation>Bu unsuru kaldır</translation>
     </message>
     <message>
         <source>&amp;Label:</source>
-        <translation>&amp;Rótulo:</translation>
+        <translation>&amp;Etiket:</translation>
     </message>
     <message>
         <source>Enter a label for this address to add it to the list of used addresses</source>
-        <translation>Digite um rótulo para este endereço para adicioná-lo no catálogo</translation>
+        <translation>Kullanılmış adres listesine eklemek için bu adrese bir etiket girin</translation>
     </message>
     <message>
         <source>A&amp;mount:</source>
-        <translation>Q&amp;uantidade:</translation>
+        <translation>Mebla&amp;ğ:</translation>
     </message>
     <message>
         <source>The fee will be deducted from the amount being sent. The recipient will receive a lower amount of Dash than you enter in the amount field. If multiple recipients are selected, the fee is split equally.</source>
-        <translation>A taxa será deduzida do valor enviado. O destinatário receberá uma quantidade menor de Dash do que você insere no campo de valor. Se vários destinatários forem selecionados, a taxa será dividida igualmente.</translation>
+        <translation>Ücret gönderilen tutardan düşülecek. Alıcı sizin tutar alanına girdiğinizden daha düşük miktarda Dash alacak. Eğer birden fazla alıcı seçilirse, ücret eşit bölünür.</translation>
     </message>
     <message>
         <source>S&amp;ubtract fee from amount</source>
-        <translation>&amp;Retirar taxa da quantia</translation>
+        <translation>Ücreti tutardan düş</translation>
     </message>
     <message>
         <source>Message:</source>
-        <translation>Mensagem:</translation>
+        <translation>Mesaj:</translation>
     </message>
     <message>
         <source>A message that was attached to the dash: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Dash network.</source>
-        <translation>A mensagem que foi anexada ao Dash: URI na qual será gravada na transação para sua referência. Nota: Essa mensagem não será gravada publicamente na rede Dash.</translation>
+        <translation>Referans için Dash: URI'siyle iliştirilmiş işlemle birlikte depolanacak bir ileti. Not: Bu mesaj Dash ağı üzerinden gönderilmeyecektir.</translation>
     </message>
     <message>
         <source>This is an unauthenticated payment request.</source>
-        <translation>Esta é uma cobrança não autenticada.</translation>
+        <translation>Bu, kimliği doğrulanmamış bir ödeme talebidir.</translation>
     </message>
     <message>
         <source>This is an authenticated payment request.</source>
-        <translation>Esta é uma cobrança autenticada.</translation>
+        <translation>Bu, kimliği doğrulanmış bir ödeme talebidir.</translation>
     </message>
     <message>
         <source>Pay To:</source>
-        <translation>Pague Para:</translation>
+        <translation>Şu adrese öde:</translation>
     </message>
     <message>
         <source>Memo:</source>
-        <translation>Memorizar:</translation>
+        <translation>Not:</translation>
     </message>
     <message>
         <source>Enter a label for this address to add it to your address book</source>
-        <translation>Digite um rótulo para este endereço para adicioná-lo ao catálogo de endereços</translation>
+        <translation>Adres defterinize eklemek için bu adrese bir etiket giriniz</translation>
     </message>
 </context>
 <context>
     <name>SendConfirmationDialog</name>
     <message>
         <source>Yes</source>
-        <translation>Sim</translation>
+        <translation>Evet</translation>
     </message>
 </context>
 <context>
     <name>ShutdownWindow</name>
     <message>
         <source>%1 is shutting down...</source>
-        <translation>%1 está desligando...</translation>
+        <translation>%1 kapanıyor...</translation>
     </message>
     <message>
         <source>Do not shut down the computer until this window disappears.</source>
-        <translation>Não desligue o computador até essa janela desaparecer.</translation>
+        <translation>Bu pencere kalkıncaya dek bilgisayarı kapatmayınız.</translation>
     </message>
 </context>
 <context>
     <name>SignVerifyMessageDialog</name>
     <message>
         <source>Signatures - Sign / Verify a Message</source>
-        <translation>Assinaturas - Assinar / Verificar uma mensagem</translation>
+        <translation>İmzalar - Mesaj İmzala / Kontrol et</translation>
     </message>
     <message>
         <source>&amp;Sign Message</source>
-        <translation>&amp;Assinar Mensagem</translation>
+        <translation>Mesaj &amp;imzala</translation>
     </message>
     <message>
         <source>You can sign messages/agreements with your addresses to prove you can receive Dash sent to them. Be careful not to sign anything vague or random, as phishing attacks may try to trick you into signing your identity over to them. Only sign fully-detailed statements you agree to.</source>
-        <translation>Você pode assinar mensagens/acordos com seus endereços para provar que pode receber o Dash enviado para eles. Tenha cuidado para não assinar nada vago ou aleatório, pois os ataques de phishing podem tentar convencê-lo a assinar sua identidade para eles. Assine apenas declarações totalmente detalhadas com as quais você concorda.</translation>
+        <translation>Onlara gönderilen Dash'i alabildiğinizi ispatlamak için mesajları/anlaşmaları adresleriniz ile imzalayabilirsiniz. Muallak ya da rastgele bir şeyi imzalamamaya dikkat edin çünkü kimlik avı saldırıları ile sizi kimliğinizi açık etmek için dolandırabilirler. Sadece anlaştığınız tam ayrıntılı beyanları imzalayın.</translation>
     </message>
     <message>
         <source>The Dash address to sign the message with</source>
-        <translation>O endereço Dash que assinará a mensagem</translation>
+        <translation>İletinin imzalanmasında kullanılacak Dash adresi</translation>
     </message>
     <message>
         <source>Choose previously used address</source>
-        <translation>Escolha um endereço usado anteriormente</translation>
+        <translation>Önceden kullanılmış adres seç</translation>
     </message>
     <message>
         <source>Alt+A</source>
@@ -3133,7 +3082,7 @@ https://www.transifex.com/projects/p/dash/</translation>
     </message>
     <message>
         <source>Paste address from clipboard</source>
-        <translation>Colar o endereço da área de transferência</translation>
+        <translation>Panodan adres yapıştır</translation>
     </message>
     <message>
         <source>Alt+P</source>
@@ -3141,107 +3090,107 @@ https://www.transifex.com/projects/p/dash/</translation>
     </message>
     <message>
         <source>Enter the message you want to sign here</source>
-        <translation>Entre a mensagem que você quer assinar aqui</translation>
+        <translation>İmzalamak istediğiniz mesajı burada giriniz</translation>
     </message>
     <message>
         <source>Signature</source>
-        <translation>Assinatura</translation>
+        <translation>İmza</translation>
     </message>
     <message>
         <source>Copy the current signature to the system clipboard</source>
-        <translation>Copiar a assinatura para a área de transferência do sistema</translation>
+        <translation>Güncel imzayı sistem panosuna kopyala</translation>
     </message>
     <message>
         <source>Sign the message to prove you own this Dash address</source>
-        <translation>Assinar mensagem para provar que você é dono deste endereço Dash</translation>
+        <translation>Bu Dash adresine sahip olduğunuzu ispatlamak için mesajı imzala</translation>
     </message>
     <message>
         <source>Sign &amp;Message</source>
-        <translation>Assinar &amp;Mensagem</translation>
+        <translation>&amp;Mesajı imzala</translation>
     </message>
     <message>
         <source>Reset all sign message fields</source>
-        <translation>Limpar todos os campos de assinatura da mensagem</translation>
+        <translation>Tüm mesaj alanlarını sıfırla</translation>
     </message>
     <message>
         <source>Clear &amp;All</source>
-        <translation>Limpar Tudo</translation>
+        <translation>Tümünü &amp;temizle</translation>
     </message>
     <message>
         <source>&amp;Verify Message</source>
-        <translation>&amp;Verificar Mensagem</translation>
+        <translation>Mesaj &amp;kontrol et</translation>
     </message>
     <message>
         <source>Enter the receiver's address, message (ensure you copy line breaks, spaces, tabs, etc. exactly) and signature below to verify the message. Be careful not to read more into the signature than what is in the signed message itself, to avoid being tricked by a man-in-the-middle attack. Note that this only proves the signing party receives with the address, it cannot prove sendership of any transaction!</source>
-        <translation>Coloque o endereço do autor, a mensagem (certifique-se de copiar toda a mensagem, incluindo quebras de linha, espaços, tabulações, etc.) e a assinatura embaixo para verificar a mensagem. Cuidado para não ler mais da assinatura do que está assinado na mensagem, para evitar ser enganado pelo ataque man-in-the-middle. Note que isso somente prova a propriedade de um endereço, e não o remetende de qualquer transação.</translation>
+        <translation>Alıcının adresini, iletiyi (satır sonları, boşluklar, sekmeler vs. karakterleri tam olarak kopyaladığınızdan emin olunuz) ve imzayı aşağıya giriniz. Bir ortadaki adam saldırısı tarafından kandırılmaya engel olmak için imzadan, imzalı iletinin içeriğini aşan bir anlam çıkarmamaya dikkat ediniz. Bunun sadece imzalayan tarafın adres ile alım yapabildiğini ispatladığını ve herhangi bir işlemin gönderi tarafını kanıtlayamayacağını unutmayınız!</translation>
     </message>
     <message>
         <source>The Dash address the message was signed with</source>
-        <translation>O endereço Dash que foi usado para assinar a mensagem</translation>
+        <translation>İletinin imzalanmasında kullanılan Dash adresi</translation>
     </message>
     <message>
         <source>Verify the message to ensure it was signed with the specified Dash address</source>
-        <translation>Verifique a mensagem para se assegurar de que foi assinada pelo endereço Dash específicado</translation>
+        <translation>Belirtilen Dash adresi ile imzalandığını doğrulamak için iletiyi kontrol et</translation>
     </message>
     <message>
         <source>Verify &amp;Message</source>
-        <translation>Verificar &amp;Mensagem</translation>
+        <translation>&amp;Mesaj kontrol et</translation>
     </message>
     <message>
         <source>Reset all verify message fields</source>
-        <translation>Limpar todos os campos de assinatura da mensagem</translation>
+        <translation>Tüm mesaj kontrolü alanlarını sıfırla</translation>
     </message>
     <message>
         <source>Click "Sign Message" to generate signature</source>
-        <translation>Clique em "Assinar mensagem" para gerar a assinatura</translation>
+        <translation>İmzayı oluşturmak için "İletiyi İmzala"ya tıklayın</translation>
     </message>
     <message>
         <source>The entered address is invalid.</source>
-        <translation>O endereço digitado é inválido</translation>
+        <translation>Girilen adres geçersizdir.</translation>
     </message>
     <message>
         <source>Please check the address and try again.</source>
-        <translation>Favor checar o endereço e tente novamente</translation>
+        <translation>Lütfen adresi kontrol edip tekrar deneyiniz.</translation>
     </message>
     <message>
         <source>The entered address does not refer to a key.</source>
-        <translation>O endereço fornecido não se refere a uma chave.</translation>
+        <translation>Girilen adres herhangi bir anahtara işaret etmemektedir.</translation>
     </message>
     <message>
         <source>Wallet unlock was cancelled.</source>
-        <translation>O desbloqueio da carteira foi cancelado</translation>
+        <translation>Cüzdan kilidinin açılması iptal edildi.</translation>
     </message>
     <message>
         <source>Private key for the entered address is not available.</source>
-        <translation>A chave privada para o endereço disponibilizado não está disponível.</translation>
+        <translation>Girilen adres için özel anahtar mevcut değildir.</translation>
     </message>
     <message>
         <source>Message signing failed.</source>
-        <translation>Assinatura da mensagem falhou.</translation>
+        <translation>İleti imzalaması başarısız oldu.</translation>
     </message>
     <message>
         <source>Message signed.</source>
-        <translation>Mensagem assinada.</translation>
+        <translation>İleti imzalandı.</translation>
     </message>
     <message>
         <source>The signature could not be decoded.</source>
-        <translation>A assinatura não pôde ser decodificada.</translation>
+        <translation>İmzanın kodu çözülemedi.</translation>
     </message>
     <message>
         <source>Please check the signature and try again.</source>
-        <translation>Por favor, cheque a assinatura e tente novamente.</translation>
+        <translation>Lütfen imzayı kontrol edip tekrar deneyiniz.</translation>
     </message>
     <message>
         <source>The signature did not match the message digest.</source>
-        <translation>A assinatura não corresponde a mensagem</translation>
+        <translation>İmza iletinin özeti ile eşleşmedi.</translation>
     </message>
     <message>
         <source>Message verification failed.</source>
-        <translation>Falha na verificação da mensagem</translation>
+        <translation>İleti doğrulaması başarısız oldu.</translation>
     </message>
     <message>
         <source>Message verified.</source>
-        <translation>Mensagem verificada</translation>
+        <translation>İleti doğrulandı.</translation>
     </message>
 </context>
 <context>
@@ -3252,7 +3201,7 @@ https://www.transifex.com/projects/p/dash/</translation>
     </message>
     <message>
         <source>Version %1</source>
-        <translation>Versão %1</translation>
+        <translation>Sürüm %1</translation>
     </message>
 </context>
 <context>
@@ -3266,488 +3215,488 @@ https://www.transifex.com/projects/p/dash/</translation>
     <name>TransactionDesc</name>
     <message numerus="yes">
         <source>Open for %n more block(s)</source>
-        <translation><numerusform>Aberto para %n mais blocos</numerusform><numerusform>Aberto para %n mais blocos</numerusform></translation>
+        <translation><numerusform>%n daha blok için açık</numerusform><numerusform>%n daha blok için açık</numerusform></translation>
     </message>
     <message>
         <source>Open until %1</source>
-        <translation>Aberto até %1</translation>
+        <translation>%1 değerine dek açık</translation>
     </message>
     <message>
         <source>conflicted</source>
-        <translation>Conflitado</translation>
+        <translation>Uyuşmadı</translation>
     </message>
     <message>
         <source>%1/offline</source>
-        <translation>%1/offline</translation>
+        <translation>%1/çevrim dışı</translation>
     </message>
     <message>
         <source>0/unconfirmed, %1</source>
-        <translation>0/não confirmado, %1</translation>
+        <translation>0/doğrulanmamış, %1</translation>
     </message>
     <message>
         <source>in memory pool</source>
-        <translation>na memória</translation>
+        <translation>bellek alanında</translation>
     </message>
     <message>
         <source>not in memory pool</source>
-        <translation>não na memóra</translation>
+        <translation>bellek alanında değil</translation>
     </message>
     <message>
         <source>abandoned</source>
-        <translation>abandonado</translation>
+        <translation>Terk edilmiş</translation>
     </message>
     <message>
         <source>%1/unconfirmed</source>
-        <translation>%1/não confirmado</translation>
+        <translation>%1/doğrulanmadı</translation>
     </message>
     <message>
         <source>%1 confirmations</source>
-        <translation>%1 confirmações</translation>
+        <translation>%1 doğrulama</translation>
     </message>
     <message>
         <source>verified via InstantSend</source>
-        <translation>verificado via InstantSend</translation>
+        <translation>Anında Gönder ile onaylanmış</translation>
     </message>
     <message>
         <source>InstantSend verification in progress - %1 of %2 signatures</source>
-        <translation>Confirmação InstantSend em andamento - %1 de  %2 assinaturas</translation>
+        <translation>Anında Gönder onaylaması sürüyor - %1 / %2 imza</translation>
     </message>
     <message>
         <source>InstantSend verification failed</source>
-        <translation>A confirmação do InstantSend falhou</translation>
+        <translation>Anında Gönder onaylaması başarısız</translation>
     </message>
     <message>
         <source>Status</source>
-        <translation>Status</translation>
+        <translation>Durum</translation>
     </message>
     <message>
         <source>, has not been successfully broadcast yet</source>
-        <translation>, ainda não foi propagada na rede com êxito.</translation>
+        <translation>, henüz başarılı bir şekilde yayınlanmadı</translation>
     </message>
     <message numerus="yes">
         <source>, broadcast through %n node(s)</source>
-        <translation><numerusform>, transmissão por %n nós</numerusform><numerusform>, transmissão por %n nós</numerusform></translation>
+        <translation><numerusform>, %n düğümden yayın</numerusform><numerusform>, %n düğümden yayın</numerusform></translation>
     </message>
     <message>
         <source>Date</source>
-        <translation>Data</translation>
+        <translation>Tarih</translation>
     </message>
     <message>
         <source>Source</source>
-        <translation>Fonte</translation>
+        <translation>Kaynak</translation>
     </message>
     <message>
         <source>Generated</source>
-        <translation>Gerado</translation>
+        <translation>Oluşturuldu</translation>
     </message>
     <message>
         <source>From</source>
-        <translation>De</translation>
+        <translation>Gönderen</translation>
     </message>
     <message>
         <source>unknown</source>
-        <translation>desconhecido</translation>
+        <translation>bilinmiyor</translation>
     </message>
     <message>
         <source>To</source>
-        <translation>Para</translation>
+        <translation>Alıcı</translation>
     </message>
     <message>
         <source>own address</source>
-        <translation>endereço próprio</translation>
+        <translation>kendi adresiniz</translation>
     </message>
     <message>
         <source>watch-only</source>
-        <translation>Monitorado</translation>
+        <translation>Sadece izlenen</translation>
     </message>
     <message>
         <source>label</source>
-        <translation>Rótulo</translation>
+        <translation>Etiket</translation>
     </message>
     <message>
         <source>Credit</source>
-        <translation>Crédito</translation>
+        <translation>Alınan Tutar</translation>
     </message>
     <message numerus="yes">
         <source>matures in %n more block(s)</source>
-        <translation><numerusform>Maduro em %n blocos</numerusform><numerusform>Maduro em %n blocos</numerusform></translation>
+        <translation><numerusform>%n blok sonra olgunlaşacak</numerusform><numerusform>%n blok sonra olgunlaşacak</numerusform></translation>
     </message>
     <message>
         <source>not accepted</source>
-        <translation>não aceito</translation>
+        <translation>kabul edilmedi</translation>
     </message>
     <message>
         <source>Debit</source>
-        <translation>Débito</translation>
+        <translation>Çekilen Tutar</translation>
     </message>
     <message>
         <source>Total debit</source>
-        <translation>Débito total</translation>
+        <translation>Toplam çekilen tutar</translation>
     </message>
     <message>
         <source>Total credit</source>
-        <translation>Crédito total</translation>
+        <translation>Toplam alınan tutar</translation>
     </message>
     <message>
         <source>Transaction fee</source>
-        <translation>Taxa da transação</translation>
+        <translation>İşlem ücreti</translation>
     </message>
     <message>
         <source>Net amount</source>
-        <translation>Valor líquido</translation>
+        <translation>Net tutar</translation>
     </message>
     <message>
         <source>Message</source>
-        <translation>Mensagem</translation>
+        <translation>İleti</translation>
     </message>
     <message>
         <source>Comment</source>
-        <translation>Comentário</translation>
+        <translation>Yorum</translation>
     </message>
     <message>
         <source>Transaction ID</source>
-        <translation>ID da transação</translation>
+        <translation>İşlem ID'si</translation>
     </message>
     <message>
         <source>Output index</source>
-        <translation>Index da saída</translation>
+        <translation>Çıktı indeksi</translation>
     </message>
     <message>
         <source>Transaction total size</source>
-        <translation>Tamanho transacional total</translation>
+        <translation>İşlemin toplam boyutu</translation>
     </message>
     <message>
         <source>Merchant</source>
-        <translation>Mercador</translation>
+        <translation>Tüccar</translation>
     </message>
     <message>
         <source>Generated coins must mature %1 blocks before they can be spent. When you generated this block, it was broadcast to the network to be added to the block chain. If it fails to get into the chain, its state will change to "not accepted" and it won't be spendable. This may occasionally happen if another node generates a block within a few seconds of yours.</source>
-        <translation>Moedas recém minerados precisam aguardar %1 blocos antes de serem gastos. Quando o bloco foi gerado, ele foi disseminado pela rede para ser adicionado à blockchain. Se ele falhar em ser inserido na cadeia, seu estado será modificado para "não aceito" e ele não poderá ser gasto. Isso pode acontecer eventualmente quando blocos são gerados quase que simultaneamente.</translation>
+        <translation>Oluşturulan bitcoin'lerin harcanabilmelerinden önce %1 blok beklemeleri gerekmektedir. Bu blok, oluşturduğunuzda, blok zincirine eklenmesi için ağda yayınlandı. Zincire eklenmesi başarısız olursa, durumu "kabul edilmedi" olarak değiştirilecek ve harcanamayacaktır. Bu, bazen başka bir düğüm sizden birkaç saniye önce ya da sonra blok oluşturursa meydana gelebilir.</translation>
     </message>
     <message>
         <source>Debug information</source>
-        <translation>Depurar informação</translation>
+        <translation>Hata ayıklama bilgisi</translation>
     </message>
     <message>
         <source>Transaction</source>
-        <translation>Transação</translation>
+        <translation>İşlem</translation>
     </message>
     <message>
         <source>Inputs</source>
-        <translation>Entradas</translation>
+        <translation>Girdiler</translation>
     </message>
     <message>
         <source>Amount</source>
-        <translation>Quantia</translation>
+        <translation>Tutar</translation>
     </message>
     <message>
         <source>true</source>
-        <translation>verdadeiro</translation>
+        <translation>doğru</translation>
     </message>
     <message>
         <source>false</source>
-        <translation>falso</translation>
+        <translation>yanlış</translation>
     </message>
 </context>
 <context>
     <name>TransactionDescDialog</name>
     <message>
         <source>This pane shows a detailed description of the transaction</source>
-        <translation>Este painel mostra uma descrição detalhada da transação</translation>
+        <translation>Bu pano muamelenin ayrıntılı açıklamasını gösterir</translation>
     </message>
     <message>
         <source>Details for %1</source>
-        <translation>Detalhes para %1</translation>
+        <translation>%1 için ayrıntılar</translation>
     </message>
 </context>
 <context>
     <name>TransactionTableModel</name>
     <message>
         <source>Date</source>
-        <translation>Data</translation>
+        <translation>Tarih</translation>
     </message>
     <message>
         <source>Type</source>
-        <translation>Tipo</translation>
+        <translation>Tür</translation>
     </message>
     <message>
         <source>Address / Label</source>
-        <translation>Endereço / Etiqueta</translation>
+        <translation>Adres / Etiket</translation>
     </message>
     <message numerus="yes">
         <source>Open for %n more block(s)</source>
-        <translation><numerusform>Aberto para %n mais blocos</numerusform><numerusform>Aberto para %n mais blocos</numerusform></translation>
+        <translation><numerusform>%n daha blok için açık</numerusform><numerusform>%n daha blok için açık</numerusform></translation>
     </message>
     <message>
         <source>Open until %1</source>
-        <translation>Aberto até %1</translation>
+        <translation>%1 değerine dek açık</translation>
     </message>
     <message>
         <source>Offline</source>
-        <translation>Offline</translation>
+        <translation>Çevrim dışı</translation>
     </message>
     <message>
         <source>Unconfirmed</source>
-        <translation>Não confirmado</translation>
+        <translation>Doğrulanmamış</translation>
     </message>
     <message>
         <source>Abandoned</source>
-        <translation>Abandonado</translation>
+        <translation>Terk edilmiş</translation>
     </message>
     <message>
         <source>Confirming (%1 of %2 recommended confirmations)</source>
-        <translation>Confirmando (%1 de %2 confirmações recomendadas)</translation>
+        <translation>Doğrulanıyor (%1 kere doğrulandı, önerilen doğrulama sayısı %2)</translation>
     </message>
     <message>
         <source>Confirmed (%1 confirmations)</source>
-        <translation>Confirmado (%1 confirmações)</translation>
+        <translation>Doğrulandı (%1 doğrulama)</translation>
     </message>
     <message>
         <source>Conflicted</source>
-        <translation>Conflitante</translation>
+        <translation>Uyuşmadı</translation>
     </message>
     <message>
         <source>Immature (%1 confirmations, will be available after %2)</source>
-        <translation>Recém-criado (%1 confirmações, disponível somente após %2)</translation>
+        <translation>Olgunlaşmamış (%1 doğrulama, %2 doğrulama sonra kullanılabilir olacaktır)</translation>
     </message>
     <message>
         <source>This block was not received by any other nodes and will probably not be accepted!</source>
-        <translation>Este bloco não foi recebido por nenhum outro participante da rede e provavelmente não será aceito!</translation>
+        <translation>Bu blok başka hiçbir düğüm tarafından alınmamıştır ve muhtemelen kabul edilmeyecektir!</translation>
     </message>
     <message>
         <source>Generated but not accepted</source>
-        <translation>Gerado mas não aceito</translation>
+        <translation>Oluşturuldu ama kabul edilmedi</translation>
     </message>
     <message>
         <source>Received with</source>
-        <translation>Recebido</translation>
+        <translation>Şununla alındı</translation>
     </message>
     <message>
         <source>Received from</source>
-        <translation>Recebido</translation>
+        <translation>Alındığı kişi</translation>
     </message>
     <message>
         <source>Received via PrivateSend</source>
-        <translation>Recebido via EnvioPrivado</translation>
+        <translation>Özel Gönder ile alındı</translation>
     </message>
     <message>
         <source>Sent to</source>
-        <translation>Enviado</translation>
+        <translation>Gönderildiği adres</translation>
     </message>
     <message>
         <source>Payment to yourself</source>
-        <translation>Pagamento a si mesmo</translation>
+        <translation>Kendinize ödeme</translation>
     </message>
     <message>
         <source>Mined</source>
-        <translation>Minerado</translation>
+        <translation>Madenden çıkarılan</translation>
     </message>
     <message>
         <source>PrivateSend Denominate</source>
-        <translation>PrivateSend Denominate</translation>
+        <translation>Özel Gönder Birimi</translation>
     </message>
     <message>
         <source>PrivateSend Collateral Payment</source>
-        <translation>PrivateSend Pagamento de Garantia</translation>
+        <translation>Özel Gönder Teminat Ödemesi</translation>
     </message>
     <message>
         <source>PrivateSend Make Collateral Inputs</source>
-        <translation>PrivateSend fazer insumos colaterais</translation>
+        <translation>Özel Gönder Teminat Girdisi Yap</translation>
     </message>
     <message>
         <source>PrivateSend Create Denominations</source>
-        <translation>PrivateSend Criar Denominações</translation>
+        <translation>Özel Gönder Birim Oluştur</translation>
     </message>
     <message>
         <source>PrivateSend</source>
-        <translation>EnvioPrivado</translation>
+        <translation>Özel Gönder</translation>
     </message>
     <message>
         <source>watch-only</source>
-        <translation>Monitorado</translation>
+        <translation>Sadece izlenen</translation>
     </message>
     <message>
         <source>(n/a)</source>
-        <translation>(n/a)</translation>
+        <translation>(mevcut değil)</translation>
     </message>
     <message>
         <source>(no label)</source>
-        <translation>(sem rótulo)</translation>
+        <translation>(etiket yok)</translation>
     </message>
     <message>
         <source>Transaction status. Hover over this field to show number of confirmations.</source>
-        <translation>Status da transação. Passe o mouse sobre este campo para mostrar o número de confirmações.</translation>
+        <translation>İşlem durumu. Doğrulama sayısını görüntülemek için fare imlecini bu alanın üzerinde tutunuz.</translation>
     </message>
     <message>
         <source>Date and time that the transaction was received.</source>
-        <translation>Data e hora que a transação foi recebida.</translation>
+        <translation>İşlemin alındığı tarih ve zaman.</translation>
     </message>
     <message>
         <source>Type of transaction.</source>
-        <translation>Tipo de transação.</translation>
+        <translation>İşlemin türü.</translation>
     </message>
     <message>
         <source>Whether or not a watch-only address is involved in this transaction.</source>
-        <translation>Mostrar ou não endereços monitorados na lista de transações.</translation>
+        <translation>Bu işleme sadece-izlenen bir adresin dahil edilip, edilmediği.</translation>
     </message>
     <message>
         <source>User-defined intent/purpose of the transaction.</source>
-        <translation>Intenção/Propósito definido pelo usuário para a transação</translation>
+        <translation>İşlemin kullanıcı tanımlı amacı.</translation>
     </message>
     <message>
         <source>Amount removed from or added to balance.</source>
-        <translation>Quantidade debitada ou creditada ao saldo.</translation>
+        <translation>Bakiyeden kaldırılan ya da bakiyeye eklenen tutar.</translation>
     </message>
 </context>
 <context>
     <name>TransactionView</name>
     <message>
         <source>All</source>
-        <translation>Todos</translation>
+        <translation>Hepsi</translation>
     </message>
     <message>
         <source>Today</source>
-        <translation>Hoje</translation>
+        <translation>Bugün</translation>
     </message>
     <message>
         <source>This week</source>
-        <translation>Essa semana</translation>
+        <translation>Bu hafta</translation>
     </message>
     <message>
         <source>This month</source>
-        <translation>Esse mês</translation>
+        <translation>Bu ay</translation>
     </message>
     <message>
         <source>Last month</source>
-        <translation>Último mês</translation>
+        <translation>Geçen ay</translation>
     </message>
     <message>
         <source>This year</source>
-        <translation>Esse ano</translation>
+        <translation>Bu yıl</translation>
     </message>
     <message>
         <source>Range...</source>
-        <translation>Intervalo...</translation>
+        <translation>Tarih Aralığı</translation>
     </message>
     <message>
         <source>Most Common</source>
-        <translation>Mais comum</translation>
+        <translation>En Sık</translation>
     </message>
     <message>
         <source>Received with</source>
-        <translation>Recebido com</translation>
+        <translation>Şununla alındı</translation>
     </message>
     <message>
         <source>Sent to</source>
-        <translation>Enviado para</translation>
+        <translation>Gönderildiği adres</translation>
     </message>
     <message>
         <source>PrivateSend</source>
-        <translation>EnvioPrivado</translation>
+        <translation>Özel Gönder</translation>
     </message>
     <message>
         <source>PrivateSend Make Collateral Inputs</source>
-        <translation>PrivateSend fazer insumos colaterais</translation>
+        <translation>Özel Gönder Teminat Girdisi Yap</translation>
     </message>
     <message>
         <source>PrivateSend Create Denominations</source>
-        <translation>PrivateSend Criar Denominações</translation>
+        <translation>Özel Gönder Birim Oluştur</translation>
     </message>
     <message>
         <source>PrivateSend Denominate</source>
-        <translation>PrivateSend Denominate</translation>
+        <translation>Özel Gönder Birimi</translation>
     </message>
     <message>
         <source>PrivateSend Collateral Payment</source>
-        <translation>PrivateSend Pagamento de Garantia</translation>
+        <translation>Özel Gönder Teminat Ödemesi</translation>
     </message>
     <message>
         <source>To yourself</source>
-        <translation>Para você mesmo</translation>
+        <translation>Kendinize</translation>
     </message>
     <message>
         <source>Mined</source>
-        <translation>Minerado</translation>
+        <translation>Madenden çıkarılan</translation>
     </message>
     <message>
         <source>Other</source>
-        <translation>Outro</translation>
+        <translation>Diğer</translation>
     </message>
     <message>
         <source>Enter address or label to search</source>
-        <translation>Procure um endereço ou etiqueta</translation>
+        <translation>Aranacak adres ya da etiket giriniz</translation>
     </message>
     <message>
         <source>Min amount</source>
-        <translation>Quantia mínima</translation>
+        <translation>En düşük tutar</translation>
     </message>
     <message>
         <source>Abandon transaction</source>
-        <translation>Abandonar transação</translation>
+        <translation>İşlemden vazgeç</translation>
     </message>
     <message>
         <source>Copy address</source>
-        <translation>Copiar endereço</translation>
+        <translation>Adres kopyala</translation>
     </message>
     <message>
         <source>Copy label</source>
-        <translation>Copiar rótulo</translation>
+        <translation>Etiket kopyala</translation>
     </message>
     <message>
         <source>Copy amount</source>
-        <translation>Copias quantia</translation>
+        <translation>Tutarı kopyala</translation>
     </message>
     <message>
         <source>Copy transaction ID</source>
-        <translation>Copiar ID da transação</translation>
+        <translation>İşlem ID'sini kopyala</translation>
     </message>
     <message>
         <source>Copy raw transaction</source>
-        <translation>Copiar o raw da transação</translation>
+        <translation>Ham işlemi kopyala</translation>
     </message>
     <message>
         <source>Copy full transaction details</source>
-        <translation>Copiar dados completos da transação</translation>
+        <translation>Tüm işlem ayrıntılarını kopyala</translation>
     </message>
     <message>
         <source>Edit label</source>
-        <translation>Editar rótulo</translation>
+        <translation>Etiketi düzenle</translation>
     </message>
     <message>
         <source>Show transaction details</source>
-        <translation>Mostrar detalhes da transação</translation>
+        <translation>İşlem ayrıntılarını göster</translation>
     </message>
     <message>
         <source>Export Transaction History</source>
-        <translation>Exportar histórico de transações</translation>
+        <translation>İşlem Tarihçesini Dışarı Aktar</translation>
     </message>
     <message>
         <source>Comma separated file (*.csv)</source>
-        <translation>Comma separated file (*.csv)</translation>
+        <translation>Virgülle ayrılmış değerler dosyası (*.csv)</translation>
     </message>
     <message>
         <source>Confirmed</source>
-        <translation>Confirmado</translation>
+        <translation>Doğrulandı</translation>
     </message>
     <message>
         <source>Watch-only</source>
-        <translation>Monitorado</translation>
+        <translation>Sadece izlenen</translation>
     </message>
     <message>
         <source>Date</source>
-        <translation>Data</translation>
+        <translation>Tarih</translation>
     </message>
     <message>
         <source>Type</source>
-        <translation>Tipo</translation>
+        <translation>Tür</translation>
     </message>
     <message>
         <source>Label</source>
-        <translation>Rótulo</translation>
+        <translation>Etiket</translation>
     </message>
     <message>
         <source>Address</source>
-        <translation>Endereço</translation>
+        <translation>Adres</translation>
     </message>
     <message>
         <source>ID</source>
@@ -3755,1074 +3704,1230 @@ https://www.transifex.com/projects/p/dash/</translation>
     </message>
     <message>
         <source>Exporting Failed</source>
-        <translation>Falha na exportação</translation>
+        <translation>Dışarı aktarmada hata</translation>
     </message>
     <message>
         <source>There was an error trying to save the transaction history to %1.</source>
-        <translation>Ocorreu um erro ao tentar salvar o histórico de transações em %1.</translation>
+        <translation>İşlem tarihçesinin %1 konumuna kaydedilmeye çalışıldığı sırada bir hata meydana geldi.</translation>
     </message>
     <message>
         <source>Exporting Successful</source>
-        <translation>Exportação feita com êxito</translation>
+        <translation>Dışarı Aktarma Başarılı</translation>
     </message>
     <message>
         <source>The transaction history was successfully saved to %1.</source>
-        <translation>O histórico de transação foi gravado com êxito em %1.</translation>
+        <translation>İşlem tarihçesi %1 konumuna başarıyla kaydedildi.</translation>
     </message>
     <message>
         <source>Range:</source>
-        <translation>Intervalo: </translation>
+        <translation>Tarih Aralığı:</translation>
     </message>
     <message>
         <source>to</source>
-        <translation>para</translation>
+        <translation>Alıcı</translation>
     </message>
 </context>
 <context>
     <name>UnitDisplayStatusBarControl</name>
     <message>
         <source>Unit to show amounts in. Click to select another unit.</source>
-        <translation>Unidade para mostrar. Clique para selecionar outra unidade.</translation>
+        <translation>Tutarı göstermek için birim. Başka bir birim seçmek için tıklayınız.</translation>
     </message>
 </context>
 <context>
     <name>WalletFrame</name>
     <message>
         <source>No wallet has been loaded.</source>
-        <translation>Nenhuma carteira carregada</translation>
+        <translation>Hiçbir cüzdan yüklenmedi.</translation>
     </message>
 </context>
 <context>
     <name>WalletModel</name>
     <message>
         <source>Send Coins</source>
-        <translation>Enviar moedas</translation>
+        <translation>Bitcoini Gönder</translation>
     </message>
     <message>
         <source>InstantSend doesn't support sending values that high yet. Transactions are currently limited to %1 DASH.</source>
-        <translation>EnvioInstantâneo não suporta o envio de valores tão altos ainda. As transações são limitadas a %1 DASH.</translation>
+        <translation>Anında Gönder şu anda bu kadar yüksek tutarları göndermeyi desteklemiyor. İşlemler şimdilik %1 DASH ile sınırlı.</translation>
     </message>
     <message>
         <source>Used way too many inputs (&gt;%1) for this InstantSend transaction, fees could be huge.</source>
-        <translation>Usado demais entradas (&gt;%1) para esta transação do InstantSend, as taxas podem ser enormes.</translation>
+        <translation>Bu Anında Gönder işlemi için çok fazla girdi (&gt;%1) kullanıldı, ücret çok yüksek olabilir.</translation>
     </message>
 </context>
 <context>
     <name>WalletView</name>
     <message>
         <source>&amp;Export</source>
-        <translation>&amp;Exportar</translation>
+        <translation>&amp;Dışarı aktar</translation>
     </message>
     <message>
         <source>Export the data in the current tab to a file</source>
-        <translation>Exportar os dados da guia atual para um arquivo</translation>
+        <translation>Mevcut sekmedeki verileri bir dosyaya aktar</translation>
     </message>
     <message>
         <source>Selected amount:</source>
-        <translation>Quantidade selecionada:</translation>
+        <translation>Seçilen tutar:</translation>
     </message>
     <message>
         <source>Backup Wallet</source>
-        <translation>Backup da carteira</translation>
+        <translation>Cüzdanı Yedekle</translation>
     </message>
     <message>
         <source>Wallet Data (*.dat)</source>
-        <translation>Dados da carteira (*.dat)</translation>
+        <translation>Cüzdan Verileri (*.dat)</translation>
     </message>
     <message>
         <source>Backup Failed</source>
-        <translation>Falha no backup</translation>
+        <translation>Yedekleme Başarısız Oldu</translation>
     </message>
     <message>
         <source>There was an error trying to save the wallet data to %1.</source>
-        <translation>Ocorreu um erro ao tentar salvar os dados da carteira em %1.</translation>
+        <translation>Cüzdan verilerinin %1 konumuna kaydedilmesi sırasında bir hata meydana geldi.</translation>
     </message>
     <message>
         <source>Backup Successful</source>
-        <translation>Backup bem sucedido</translation>
+        <translation>Yedekleme Başarılı</translation>
     </message>
     <message>
         <source>The wallet data was successfully saved to %1.</source>
-        <translation>Os dados da carteira foram salvos com êxito em %1.</translation>
+        <translation>Cüzdan verileri %1 konumuna başarıyla kaydedildi.</translation>
     </message>
 </context>
 <context>
     <name>dash-core</name>
     <message>
         <source>Bind to given address and always listen on it. Use [host]:port notation for IPv6</source>
-        <translation>Vincular ao endereço fornecido e sempre escutar nele. Use a notação [host]:port para IPv6</translation>
+        <translation>Belirtilen adrese bağlan ve daima ondan dinle. IPv6 için [makine]:port yazımını kullanınız</translation>
     </message>
     <message>
         <source>Error: Listening for incoming connections failed (listen returned error %s)</source>
-        <translation>Erro: Aceitar conexões de entrada falhou (retornou erro %s)</translation>
+        <translation>Hata: İçeri gelen bağlantıların dinlenmesi başarısız oldu (dinleme %s hatasını verdi)</translation>
     </message>
     <message>
         <source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source>
-        <translation>Executa um comando quando um alerta relevante é recebido ou vemos uma longa segregação (%s é substituída pela mensagem)</translation>
+        <translation>İlgili bir uyarı alındığında ya da gerçekten uzun bir çatallama gördüğümüzde komutu çalıştır (komuttaki %s mesaj ile değiştirilir)</translation>
     </message>
     <message>
         <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source>
-        <translation>Executa um comando quando uma transação da carteira mudar (%s no comando será substituído por TxID)</translation>
+        <translation>Bir cüzdan muamelesi değiştiğinde komutu çalıştır (komuttaki %s TxID ile değiştirilecektir)</translation>
     </message>
     <message>
         <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source>
-        <translation>Executa um comando quando o melhor bloco mudar (%s no comando será substituído pelo hash do bloco)</translation>
+        <translation>En iyi blok değiştiğinde komutu çalıştır (komut için %s parametresi blok hash değeri ile değiştirilecektir)</translation>
     </message>
     <message>
         <source>Name to construct url for KeePass entry that stores the wallet passphrase</source>
-        <translation>Nome para construir url para a entrada do KeePass que armazena a senha da carteira</translation>
+        <translation>Cüzdan parolanızı bulunduran KeePass girdisine url oluşturmak için ad</translation>
     </message>
     <message>
         <source>Set maximum size of high-priority/low-fee transactions in bytes (default: %d)</source>
-        <translation>Definir tamanho máximo de transações de alta prioridade/baixa taxa em bytes (padrão: %d)</translation>
+        <translation>Yüksek öncelikli/düşük ücretli muamelelerin azami boyutunu bayt olarak ayarla (varsayılan: %d)</translation>
     </message>
     <message>
         <source>Set the number of script verification threads (%u to %d, 0 = auto, &lt;0 = leave that many cores free, default: %d)</source>
-        <translation>Define o número de threads de verificação de script (%u a %d, 0 = automático, &lt;0 = número de cores deixados livres, padrão: %d)</translation>
+        <translation>Betik kontrolü iş parçacıklarının sayısını belirler (%u ilâ %d, 0 = otomatik, &lt;0 = bu sayıda çekirdeği kullanma, varsayılan: %d)</translation>
     </message>
     <message>
         <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source>
-        <translation>Este é um build de teste pré-lançamento - use por sua conta e risco - não use para mineração ou comércio.</translation>
+        <translation>Bu yayın öncesi bir deneme sürümüdür - tüm riski siz üstlenmiş olursunuz - bitcoin oluşturmak ya da ticari uygulamalar için kullanmayınız</translation>
     </message>
     <message>
         <source>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</source>
-        <translation>Atenção: A rede não parecem concordar plenamente! Alguns mineiros parecem estar enfrentando problemas.</translation>
+        <translation>Uyarı: şebeke tamamen mutabık değil gibi görünüyor! Bazı madenciler sorun yaşıyor gibi görünüyor.</translation>
     </message>
     <message>
         <source>Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.</source>
-        <translation>Atenção: Nós não parecemos concordar plenamente com nossos nós! Você pode precisar atualizar ou outros nós podem precisar atualizar.</translation>
+        <translation>Uyarı: eşlerimizle tamamen mutabık değiliz gibi görünüyor! Güncelleme yapmanız gerekebilir ya da diğer düğümlerin güncelleme yapmaları gerekebilir.</translation>
     </message>
     <message>
         <source>You must specify a masternodeprivkey in the configuration. Please see documentation for help.</source>
-        <translation>Você deve especificar um masternodeprivkey na configuração. Por favor, consulte a documentação para obter ajuda.</translation>
+        <translation>Ayarlarda bir masternodeprivkey belirtmelisiniz. Lütfen yardım almak için dökümantasyona göz atın.</translation>
     </message>
     <message>
         <source>Accept command line and JSON-RPC commands</source>
-        <translation>Aceitar linha de comando e comandos JSON-RPC</translation>
+        <translation>Komut satırı ve JSON-RPC komutlarını kabul et</translation>
     </message>
     <message>
         <source>Add a node to connect to and attempt to keep the connection open</source>
-        <translation>Adicionar um nó com o qual se conectar e tentar manter a conexão ativa</translation>
+        <translation>Bağlanılacak düğüm ekle ve bağlantıyı zinde tutmaya çalış</translation>
     </message>
     <message>
         <source>Allow DNS lookups for -addnode, -seednode and -connect</source>
-        <translation>Permitir consultas DNS para -addnode, -seednode e -connect</translation>
+        <translation>-addnode, -seednode ve -connect için DNS aramalarına izin ver</translation>
     </message>
     <message>
         <source>Already have that input.</source>
-        <translation>Já tem essa entrada.</translation>
+        <translation>Bu girdi zaten var.</translation>
     </message>
     <message>
         <source>Block creation options:</source>
-        <translation>Opções de criação de bloco:</translation>
+        <translation>Blok oluşturma seçenekleri:</translation>
     </message>
     <message>
         <source>Cannot downgrade wallet</source>
-        <translation>Não é possível fazer downgrade da carteira</translation>
+        <translation>Cüzdan eski biçime geri alınamaz</translation>
     </message>
     <message>
         <source>Cannot write default address</source>
-        <translation>Não foi possível escrever no endereço padrão</translation>
+        <translation>Varsayılan adres yazılamadı</translation>
     </message>
     <message>
         <source>Collateral not valid.</source>
-        <translation>Colateral inválido.</translation>
+        <translation>Teminat geçerli değil.</translation>
     </message>
     <message>
         <source>Connect to a node to retrieve peer addresses, and disconnect</source>
-        <translation>Conectar a um nó para receber endereços de participantes, e desconectar.</translation>
+        <translation>Eş adresleri elde etmek için bir düğüme bağlan ve ardından bağlantıyı kes</translation>
     </message>
     <message>
         <source>Connection options:</source>
-        <translation>Opções de conexão:</translation>
+        <translation>Bağlantı seçenekleri:</translation>
     </message>
     <message>
         <source>Corrupted block database detected</source>
-        <translation>Detectada database de bloco corrompida</translation>
+        <translation>Bozuk blok veritabanı tespit edildi</translation>
     </message>
     <message>
         <source>Debugging/Testing options:</source>
-        <translation>Opções de depuração/teste:</translation>
+        <translation>Hata ayıklama/deneme seçenekleri:</translation>
     </message>
     <message>
         <source>Do not load the wallet and disable wallet RPC calls</source>
-        <translation>Não carrega a carteira e desabilita as chamadas RPC para a carteira</translation>
+        <translation>Cüzdanı yükleme ve cüzdan RPC çağrılarını devre dışı bırak</translation>
     </message>
     <message>
         <source>Do you want to rebuild the block database now?</source>
-        <translation>Você quer reconstruir o banco de dados de blocos agora?</translation>
+        <translation>Blok veritabanını şimdi yeniden inşa etmek istiyor musunuz?</translation>
     </message>
     <message>
         <source>Done loading</source>
-        <translation>Carregamento completo</translation>
+        <translation>Yükleme tamamlandı</translation>
     </message>
     <message>
         <source>Entries are full.</source>
-        <translation>Entradas estão cheias.</translation>
+        <translation>Girdiler dolu.</translation>
     </message>
     <message>
         <source>Error initializing block database</source>
-        <translation>Erro ao inicializar a database do bloco</translation>
+        <translation>Blok veritabanını başlatılırken bir hata meydana geldi</translation>
     </message>
     <message>
         <source>Error initializing wallet database environment %s!</source>
-        <translation>Erro ao inicializar ambiente de banco de dados de carteira %s!</translation>
+        <translation>%s cüzdan veritabanı ortamının başlatılmasında hata meydana geldi!</translation>
     </message>
     <message>
         <source>Error loading block database</source>
-        <translation>Erro ao carregar banco de dados de blocos</translation>
+        <translation>Blok veritabanının yüklenmesinde hata</translation>
     </message>
     <message>
         <source>Error opening block database</source>
-        <translation>Erro ao abrir banco de dados de blocos</translation>
+        <translation>Blok veritabanının açılışı sırasında hata</translation>
     </message>
     <message>
         <source>Error reading from database, shutting down.</source>
-        <translation>Erro ao ler o banco de dados. Finalizando.</translation>
+        <translation>Veritabanından okumada hata, kapatılıyor.</translation>
     </message>
     <message>
         <source>Error</source>
-        <translation>Erro</translation>
+        <translation>Hata</translation>
     </message>
     <message>
         <source>Error: Disk space is low!</source>
-        <translation>Erro: Pouco espaço em disco!</translation>
+        <translation>Hata: Disk alanı düşük!</translation>
     </message>
     <message>
         <source>Failed to listen on any port. Use -listen=0 if you want this.</source>
-        <translation>Falha ao escutar em qualquer porta. Use -listen=0 se você quiser isso.</translation>
+        <translation>Herhangi bir portun dinlenmesi başarısız oldu. Bunu istiyorsanız -listen=0 seçeneğini kullanınız.</translation>
     </message>
     <message>
         <source>(1 = keep tx meta data e.g. account owner and payment request information, 2 = drop tx meta data)</source>
-        <translation>(1 = manter metadados tx e.g. informação do dono da conta e requisição de pagamente, 2 = descartar metadados tx)</translation>
+        <translation>(1 = tx meta verilerini tut mesela hesap sahibi ve ödeme talebi bilgileri, 2 = tx meta verilerini at)</translation>
     </message>
     <message>
         <source>-maxtxfee is set very high! Fees this large could be paid on a single transaction.</source>
-        <translation>-maxtxfee é muito alto! Essa quantia poderia ser paga em uma única transação.</translation>
+        <translation>-maxtxfee çok yüksek bir değere ayarlanmış! Bu denli yüksek ücretler tek bir işlemde ödenebilir.</translation>
     </message>
     <message>
         <source>A fee rate (in %s/kB) that will be used when fee estimation has insufficient data (default: %s)</source>
-        <translation>A variação da taxa (em %s/kB) que será usada quando não houver dados suficientes para se estimar a taxa (default: %s)</translation>
+        <translation>Ücret tahmini için yetersiz veri bulunduğunda kullanılacak ücret oranı (%s/kB olarak) (varsayılan: %s)</translation>
     </message>
     <message>
         <source>Accept relayed transactions received from whitelisted peers even when not relaying transactions (default: %d)</source>
-        <translation>Aceita transações retransmitidas advindas de pares em lista branca, mesmo quando não estiver retransmitindo transações (padrão: %d)</translation>
+        <translation>İşlemler aktarılmadığında dahi beyaz listedeki eşlerden aktarılan işlemleri kabul et (varsayılan: %d)</translation>
     </message>
     <message>
         <source>Allow JSON-RPC connections from specified source. Valid for &lt;ip&gt; are a single IP (e.g. 1.2.3.4), a network/netmask (e.g. 1.2.3.4/255.255.255.0) or a network/CIDR (e.g. 1.2.3.4/24). This option can be specified multiple times</source>
-        <translation>Permitir conexões JSON-RPC de uma fonte específica. Válido para um único ip (ex. 1.2.3.4), até uma rede/máscara (ex. 1.2.3.4/255.255.255.0) ou uma rede/CIDR (ex. 1.2.3.4/24). Esta opção pode ser usada múltiplas vezes</translation>
+        <translation>Belirtilen kaynaktan JSON-RPC bağlantılarını kabul et. Bir &lt;ip&gt; için geçerli olanlar şunlardır: IP adresi (mesela 1.2.3.4), bir ağ/ağ maskesi (örneğin 1.2.3.4/255.255.255.0) ya da bir ağ/CIDR (mesela 1.2.3.4/24). Bu seçenek birden fazla kez belirtilebilir</translation>
     </message>
     <message>
         <source>Bind to given address and whitelist peers connecting to it. Use [host]:port notation for IPv6</source>
-        <translation>Vincular ao endereço fornecido e sempre escutar nele. Use a notação [host]:port para IPv6</translation>
+        <translation>Belirtilen adrese bağlan ve ona bağlanan eşleri beyaz listeye al. IPv6 için [makine]:port imlasını kullanınız</translation>
+    </message>
+    <message>
+        <source>Bind to given address to listen for JSON-RPC connections. Use [host]:port notation for IPv6. This option can be specified multiple times (default: bind to all interfaces)</source>
+        <translation>JSON-RPC bağlantılarını dinlemek için verilen adrese bağla. IPv6 için [host]:port formatını kullanın. Bu seçenek birden fazla defa belirtilebilir (varsayılan: tüm arayüzlere bağla)</translation>
     </message>
     <message>
         <source>Create new files with system default permissions, instead of umask 077 (only effective with disabled wallet functionality)</source>
-        <translation>Criar novos arquivos com permissões padrão do sistema, em vez de umask 077 (apenas efetivo com funcionalidade de carteira desabilitada)</translation>
+        <translation>Yeni dosyaları umask 077 yerine varsayılan izinlerle oluştur (sadece devre dışı cüzdan işlevselliği ile etkilidir)</translation>
     </message>
     <message>
         <source>Delete all wallet transactions and only recover those parts of the blockchain through -rescan on startup</source>
-        <translation>Apaga todas as transações da carteira e somente recupera essas partes da blockchain usando o comando -rescan na inicialização</translation>
+        <translation>Tüm cüzdan işlemlerini sil ve başlangıçta -rescan ile sadece blok zincirinin parçası olanları geri getir</translation>
     </message>
     <message>
         <source>Error loading %s: You can't enable HD on a already existing non-HD wallet</source>
-        <translation>Erro ao carregar %s: você não pode ativar o HD em uma carteira não HD já existente</translation>
+        <translation>%s yüklenirken hata: Zaten var olan bir HD olmayan cüzdanda HD etkinleştiremezsiniz</translation>
     </message>
     <message>
         <source>Found unconfirmed denominated outputs, will wait till they confirm to continue.</source>
-        <translation>Encontrado saídas não confirmadas, esperará até que confirme para continuar.</translation>
+        <translation>Teyit edilmemiş birimlendirilmiş çıktılar bulundu, devam etmek için teyit edilene kadar beklenecek.</translation>
     </message>
     <message>
         <source>How thorough the block verification of -checkblocks is (0-4, default: %u)</source>
-        <translation>Quão completa a verificação de blocos do -checkblocks é (0-4, padrão: %u)</translation>
+        <translation>-checkblocks'un blok kontrolünün ne kadar kapsamlı olacağı (0 ilâ 4, varsayılan: %u)</translation>
     </message>
     <message>
         <source>If paytxfee is not set, include enough fee so transactions begin confirmation on average within n blocks (default: %u)</source>
-        <translation>Se paytxfee não estiver definida, incluir comissão suficiente para que as transações comecem a ter confirmações em média dentro de N blocos (padrão %u)</translation>
+        <translation>Eğer paytxfee ayarlanmadıysa kafi derecede ücret ekleyin ki işlemler teyite vasati n blok içinde başlasın (varsayılan: %u)</translation>
     </message>
     <message>
         <source>If this block is in the chain assume that it and its ancestors are valid and potentially skip their script verification (0 to verify all, default: %s, testnet: %s)</source>
-        <translation>Se este bloco está no blockchain, assume-se que ele e seus ancestrais são válidos e podem ignorar a verificação de scripts (0 para verificar todos, padrão: %s, testnet: %s)</translation>
+        <translation>Eğer bu blok zincirde yer alıyorsa onun ve atalarının geçerli olduğunu varsay ve potansiyel olarak onların betik doğrulamasını atla.  (Tümünü doğrulamak için 0, varsayılan %s, testnet: %s)</translation>
     </message>
     <message>
         <source>Invalid amount for -maxtxfee=&lt;amount&gt;: '%s' (must be at least the minrelay fee of %s to prevent stuck transactions)</source>
-        <translation>Valor inválido para -maxtxfee=&lt;valor&gt;: '%s' (precisa ser pelo menos a taxa mínima de %s para prevenir que a transação nunca seja confirmada)</translation>
+        <translation>-maxtxfee=&lt;tutar&gt; için geçersiz tutar: '%s' (Sıkışmış işlemleri önlemek için en az %s değerinde en düşük aktarım ücretine eşit olmalıdır)</translation>
     </message>
     <message>
         <source>Maintain a full transaction index, used by the getrawtransaction rpc call (default: %u)</source>
-        <translation>Mantém um índice completo de transações, usado pela chamada rpc getrawtransaction (padrão: %u)</translation>
+        <translation>İşlemlerin tamamının indeksini tut, getrawtransaction rpc çağrısı tarafından kullanılır (varsayılan: %u)</translation>
     </message>
     <message>
         <source>Make sure to encrypt your wallet and delete all non-encrypted backups after you verified that wallet works!</source>
-        <translation>Certifique-se de criptografar sua carteira e excluir todos os backups não criptografados depois de verificar se a carteira funciona!</translation>
+        <translation>Cüzdanın çalıştığından emin olduktan sonra mutlaka cüzdanınızı şifreleyip şifrelenmemiş tüm yedekleri silin!</translation>
     </message>
     <message>
         <source>Maximum size of data in data carrier transactions we relay and mine (default: %u)</source>
-        <translation>Tamanho máximo de dados em transações de dados de operadora (padrão %u)</translation>
+        <translation>Aktardığımız ve oluşturduğumuz veri taşıyıcı işlemlerindeki en yüksek veri boyutu (varsayılan: %u)</translation>
     </message>
     <message>
         <source>Number of seconds to keep misbehaving peers from reconnecting (default: %u)</source>
-        <translation>Número de segundos para impedir que peers mal comportados reconectem (padrão %u)</translation>
+        <translation>Aksaklık gösteren eşlerle terkar bağlantıyı engelleme süresi, saniye olarak (varsayılan: %u)</translation>
     </message>
     <message>
         <source>Output debugging information (default: %u, supplying &lt;category&gt; is optional)</source>
-        <translation>Informação de saída de debug (padrão: %u, definir &lt;category&gt; é opcional)</translation>
+        <translation>Hata ayıklama bilgisini dök (varsayılan: %u, &lt;category&gt; sağlanması seçime dayalıdır)</translation>
     </message>
     <message>
         <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: %s)</source>
-        <translation>Use um proxy SOCKS5 separado para alcançar participantes da rede via serviços ocultos Tor (padrão: %s)</translation>
+        <translation>Eşlere gizli Tor servisleri ile ulaşmak için ayrı SOCKS5 vekil sunucusu kullan (varsayılan: %s)</translation>
+    </message>
+    <message>
+        <source>User defined mnemonic for HD wallet (bip39). Only has effect during wallet creation/first start (default: randomly generated)</source>
+        <translation>HD cüzdan (bip39) için kullanıcı tarafından belirlenmiş anımsatıcı. Sadece cüzdan oluşturma/ilk açılış sırasında etkilidir (varsayılan: rastgele oluşturulur)</translation>
     </message>
     <message>
         <source>User defined seed for HD wallet (should be in hex). Only has effect during wallet creation/first start (default: randomly generated)</source>
-        <translation>Semente definida pelo usuário para carteira HD (deve estar em hex). Só tem efeito durante a criação / início da carteira (padrão: gerado aleatoriamente)</translation>
+        <translation>HD cüzdan (hex olmalıdır) için kullanıcı tarafından belirlenmiş kaynak. Sadece cüzdan oluşturma/ilk açılış sırasında etkilidir (varsayılan: rastgele oluşturulur)</translation>
     </message>
     <message>
         <source>Whitelisted peers cannot be DoS banned and their transactions are always relayed, even if they are already in the mempool, useful e.g. for a gateway</source>
-        <translation>Peers permitidos não podem ser banidos do DoS e suas transações sempre são transmitidas, até mesmo se eles já estão no pool de memória, útil, por exemplo, para um gateway</translation>
+        <translation>Beyaz listeye alınan eşler DoS yasaklamasına uğramazlar ve işlemleri zaten mempool'da olsalar da daima aktarılır, bu mesela bir geçit için kullanışlıdır</translation>
     </message>
     <message>
         <source>You need to rebuild the database using -reindex-chainstate to change -txindex</source>
-        <translation>Você precisa reconstruir o banco de dados usando -reindex-chainstate para alterar -txindex</translation>
+        <translation>-txindex'i değiştirmek için -reindex-chainstate kullanarak veritabanını baştan kurmalısınız</translation>
     </message>
     <message>
         <source>(default: %s)</source>
-        <translation>(padão: %s)</translation>
+        <translation>(varsayılan: %s)</translation>
     </message>
     <message>
         <source>Accept public REST requests (default: %u)</source>
-        <translation>Aceitar pedidos restantes públicas (padrão: %u)</translation>
+        <translation>Herkese açık REST taleplerini kabul et (varsayılan: %u)</translation>
     </message>
     <message>
         <source>Always query for peer addresses via DNS lookup (default: %u)</source>
-        <translation>Sempre pergunte pelo endereço de peer via pesquisa DNS (padrão: %u)</translation>
+        <translation>Eş adresleri sorgulaması için daima DNS aramasını kullan (varsayılan: %u)</translation>
     </message>
     <message>
         <source>Can't mix: no compatible inputs found!</source>
-        <translation>Não é possível misturar: não foram encontradas entradas compatíveis!</translation>
+        <translation>Karıştırılamıyor: hiç uyumlu girdi bulunamadı!</translation>
     </message>
     <message>
         <source>Chain selection options:</source>
-        <translation>Opções de seleção de cadeia:</translation>
+        <translation>Blok zinciri seçim ayarları:</translation>
     </message>
     <message>
         <source>Connect through SOCKS5 proxy</source>
-        <translation>Conecte através do proxy SOCKS5</translation>
+        <translation>SOCKS5 vekil sunucusu vasıtasıyla bağlan</translation>
     </message>
     <message>
         <source>Connect to KeePassHttp on port &lt;port&gt; (default: %u)</source>
-        <translation>Conecte-se ao KeePassHttp na porta&lt;port&gt; (padrão: %u) </translation>
+        <translation>Port &lt;port&gt; üstünde KeePassHttp'ye bağlan (varsayılan: %u)</translation>
+    </message>
+    <message>
+        <source>Enable the client to act as a masternode (0-1, default: %u)</source>
+        <translation>İstemcinin ana düğüm olarak davranmasını etkinleştir (0-1, varsayılan: %u)</translation>
     </message>
     <message>
         <source>Entry exceeds maximum size.</source>
-        <translation>Entrada excede o tamanho máximo.</translation>
+        <translation>Girdi maksimum boyutu aşıyor.</translation>
+    </message>
+    <message>
+        <source>Error loading %s: You can't disable HD on a already existing HD wallet</source>
+        <translation>%s yüklenirken hata: Zaten var olan bir HD cüzdanda HD'yi kapatamazsınız.</translation>
     </message>
     <message>
         <source>Failed to load fulfilled requests cache from</source>
-        <translation>Falha ao carregar o cache de solicitações preenchidas de</translation>
+        <translation>Şuradan tamamlanmış talep önbelleği yüklemesi başarısız:</translation>
     </message>
     <message>
         <source>Failed to load governance cache from</source>
-        <translation>Falha ao carregar o cache de governança de</translation>
+        <translation>Şuradan yönetim önbelleği yüklemesi başarısız:</translation>
     </message>
     <message>
         <source>Failed to load masternode cache from</source>
-        <translation>Falha ao carregar o cache masternode de</translation>
+        <translation>Şuradan ana düğüm önbelleği yüklemesi başarısız:</translation>
     </message>
     <message>
         <source>Failed to load masternode payments cache from</source>
-        <translation>Falha ao carregar o cache de pagamentos do masternode</translation>
+        <translation>Şuradan ana düğüm ödemeleri önbelleği yüklemesi başarısız:</translation>
     </message>
     <message>
         <source>Found enough users, signing ( waiting %s )</source>
-        <translation>Encontrou usuários suficientes, assinando ( esperando %s )</translation>
+        <translation>Yeterli kullanıcı bulundu, imzalanıyor ( %s bekleniyor )</translation>
     </message>
     <message>
         <source>Found enough users, signing ...</source>
-        <translation>Encontrou usuários suficientes, assinando ...</translation>
+        <translation>Yeterli kullanıcı bulundu, imzalanıyor ...</translation>
     </message>
     <message>
         <source>How many blocks to check at startup (default: %u, 0 = all)</source>
-        <translation>Quantos blocos devem ser checados ao iniciar (padrão: %u, 0 = todos)</translation>
+        <translation>Başlangıçta kontrol edilecek blok sayısı (varsayılan: %u, 0 = hepsi)</translation>
     </message>
     <message>
         <source>Importing...</source>
-        <translation>Importando...</translation>
+        <translation>İçe aktarılıyor...</translation>
     </message>
     <message>
         <source>Include IP addresses in debug output (default: %u)</source>
-        <translation>Incluir endereço IP na saída de depuração (padrão: %u)</translation>
+        <translation>Hata ayıklama çıktısına IP adreslerini dahil et (varsayılan: %u)</translation>
     </message>
     <message>
         <source>Incompatible mode.</source>
-        <translation>Modo incompatível.</translation>
+        <translation>Uyumsuz mod.</translation>
     </message>
     <message>
         <source>Incompatible version.</source>
-        <translation>Versão incompatível. </translation>
+        <translation>Uyumsuz sürüm.</translation>
     </message>
     <message>
         <source>Incorrect or no genesis block found. Wrong datadir for network?</source>
-        <translation>Bloco gênese incorreto ou não encontrado. Datadir errado para a rede?</translation>
+        <translation>Yanlış ya da bulunamamış doğuş bloku. Şebeke için yanlış veri klasörü mü?</translation>
     </message>
     <message>
         <source>Information</source>
-        <translation>Informação</translation>
+        <translation>Bilgi</translation>
     </message>
     <message>
         <source>Input is not valid.</source>
-        <translation>A entrada não é válida.</translation>
+        <translation>Girdi geçerli değil.</translation>
     </message>
     <message>
         <source>Insufficient funds.</source>
-        <translation>Saldo insuficiente. </translation>
+        <translation>Yetersiz bakiye.</translation>
     </message>
     <message>
         <source>Invalid -onion address: '%s'</source>
-        <translation>Endereço -onion inválido: '%s'</translation>
+        <translation>Geçersiz -onion adresi: '%s'</translation>
     </message>
     <message>
         <source>Invalid -proxy address: '%s'</source>
-        <translation>Endereço - proxy inválido: '%s'</translation>
+        <translation>Geçersiz -proxy adresi: '%s'</translation>
     </message>
     <message>
         <source>Invalid amount for -paytxfee=&lt;amount&gt;: '%s' (must be at least %s)</source>
-        <translation>Valor inválido para -paytxfee=&lt;amount&gt;: '%s' (precisa ser no mínimo %s)</translation>
+        <translation>-paytxfee=&lt;tutar&gt;:'%s' unsurunda geçersiz tutar (asgari %s olması lazımdır)</translation>
     </message>
     <message>
         <source>Keypool ran out, please call keypoolrefill first</source>
-        <translation>Erro na Keypool, favor executar keypoolrefill primeiro</translation>
+        <translation>Keypool tükendi, lütfen önce keypoolrefill'i çağırın</translation>
     </message>
     <message>
         <source>Listen for JSON-RPC connections on &lt;port&gt; (default: %u or testnet: %u)</source>
-        <translation>Escutar por conexões JSON-RPC na porta &lt;port&gt; (padrão: %u ou testnet: %u)</translation>
+        <translation>JSON-RPC bağlantılarını &lt;port&gt; üzerinde dinle (varsayılan: %u veya tesnet: %u)</translation>
     </message>
     <message>
         <source>Listen for connections on &lt;port&gt; (default: %u or testnet: %u)</source>
-        <translation>Aguardar por conexões na porta &lt;port&gt; (padrão: %u ou testnet: %u)</translation>
+        <translation>Bağlantılar için dinlenecek &lt;port&gt; (varsayılan: %u ya da testnet: %u)</translation>
     </message>
     <message>
         <source>Loading banlist...</source>
-        <translation>Carregando lista de banidos...</translation>
+        <translation>Yasaklama listesi yükleniyor...</translation>
     </message>
     <message>
         <source>Loading fulfilled requests cache...</source>
-        <translation>Carregando o cache de solicitações atendidas ...</translation>
+        <translation>Tamamlanan talepler önbelleği yükleniyor...</translation>
     </message>
     <message>
         <source>Loading masternode cache...</source>
-        <translation>Carregando o cache do masternode ...</translation>
+        <translation>Ana düğüm önbelleği yükleniyor...</translation>
     </message>
     <message>
         <source>Loading masternode payment cache...</source>
-        <translation>Carregando o cache de pagamento do masternode ...</translation>
+        <translation>Ana düğüm ödeme önbelleği yükleniyor...</translation>
     </message>
     <message>
         <source>Lock is already in place.</source>
-        <translation>Bloqueio já está no lugar.</translation>
+        <translation>Kilit zaten yerinde.</translation>
+    </message>
+    <message>
+        <source>Lock masternodes from masternode configuration file (default: %u)</source>
+        <translation>Ana düğüm ayar dosyasından ana düğümleri kilitle (varsayılan: %u)</translation>
     </message>
     <message>
         <source>Maximum per-connection receive buffer, &lt;n&gt;*1000 bytes (default: %u)</source>
-        <translation>Buffer máximo de recebimento por conexão, &lt;n&gt;*1000 bytes (padrão: %u)</translation>
+        <translation>Her bağlantı için en yüksek alım tamponu, &lt;n&gt;*1000 bayt (varsayılan: %u)</translation>
     </message>
     <message>
         <source>Maximum per-connection send buffer, &lt;n&gt;*1000 bytes (default: %u)</source>
-        <translation>Buffer máximo de envio por conexão, &lt;n&gt;*1000 bytes (padrão: %u)</translation>
+        <translation>Her bağlantı için çok gönderme tamponu, &lt;n&gt;*1000 bayt (varsayılan: %u)</translation>
     </message>
     <message>
         <source>Mixing in progress...</source>
-        <translation>Mixing em progresso...</translation>
+        <translation>Karışım devam ediyor...</translation>
+    </message>
+    <message>
+        <source>Mnemonic passphrase is too long, must be at most 256 characters</source>
+        <translation>Anımsatıcı parola çok uzun, en fazla 256 karakter olmalı</translation>
     </message>
     <message>
         <source>Need to specify a port with -whitebind: '%s'</source>
-        <translation>Necessário informar uma porta com -whitebind: '%s'</translation>
+        <translation>-whitebind: '%s' ile bir port belirtilmesi lazımdır</translation>
     </message>
     <message>
         <source>No Masternodes detected.</source>
-        <translation>Nenhum Masternode detectado.</translation>
+        <translation>Hiç Ana düğüm  bulunamadı.</translation>
     </message>
     <message>
         <source>No compatible Masternode found.</source>
-        <translation>Nenhum Masternode compatível encontrado.</translation>
+        <translation>Hiç uyumlu Ana düğüm bulunamadı.</translation>
     </message>
     <message>
         <source>Not in the Masternode list.</source>
-        <translation>Não está na lista de Masternode.</translation>
+        <translation>Ana düğüm listesinde yok.</translation>
     </message>
     <message>
         <source>Only connect to nodes in network &lt;net&gt; (ipv4, ipv6 or onion)</source>
-        <translation>Somente conectar a clientes na rede &lt;net&gt; (ipv4, ipv6 ou onion)</translation>
+        <translation>Sadece &lt;net&gt; ağındaki düğümlere bağlan (ipv4, ipv6 veya onion)</translation>
     </message>
     <message>
         <source>Port: %d</source>
-        <translation>Porta: %d</translation>
+        <translation>Port: %d</translation>
     </message>
     <message>
         <source>Prepend debug output with timestamp (default: %u)</source>
-        <translation>Adiciona timestamp como prefixo no debug (padrão: %u)</translation>
+        <translation>Hata ayıklama verilerinin önüne zaman damgası ekle (varsayılan: %u)</translation>
     </message>
     <message>
         <source>Rebuild chain state and block index from the blk*.dat files on disk</source>
-        <translation>Reconstruir índice de cadeia de bloco a partir dos arquivos blk*.dat no disco</translation>
+        <translation>Zincir durumu ve blok indeksini diskteki blk*.dat dosyalarından yeniden derle</translation>
     </message>
     <message>
         <source>Rebuild chain state from the currently indexed blocks</source>
-        <translation>Reconstruir estado a partir dos blocos indexados</translation>
+        <translation>Zincir durumunu güncel olarak indekslenen bloklardan yeniden derle</translation>
+    </message>
+    <message>
+        <source>Send trace/debug info to debug.log file (default: %u)</source>
+        <translation>trace/debug bilgisini debug.log dosyasına gönder (varsayılan: %u)</translation>
+    </message>
+    <message>
+        <source>Send transactions as zero-fee transactions if possible (default: %u)</source>
+        <translation>Eğer mümkünse işlemleri sıfır maliyetli işlem olarak gönder (varsayılan: %u)</translation>
     </message>
     <message>
         <source>Set key pool size to &lt;n&gt; (default: %u)</source>
-        <translation>Defina o tamanho da chave para piscina&lt;n&gt; (padrão: %u)</translation>
+        <translation>Anahtar alan boyutunu &lt;n&gt; değerine ayarla (varsayılan: %u)</translation>
     </message>
     <message>
         <source>Set the number of threads to service RPC calls (default: %d)</source>
-        <translation>Defina o número de threads para chamadas do serviço RPC (padrão: %d)</translation>
+        <translation>Hizmet RCP aramaları iş parçacığı sayısını belirle (varsayılan: %d)</translation>
     </message>
     <message>
         <source>Specify configuration file (default: %s)</source>
-        <translation>Especificar arquivo de configuração (padrão: %s)</translation>
+        <translation>Yapılandırma dosyası belirtiniz (varsayılan: %s)</translation>
     </message>
     <message>
         <source>Specify connection timeout in milliseconds (minimum: 1, default: %d)</source>
-        <translation>Especificar tempo para desistência de conexões, em mili segundos (mínimo: 1, padrão: %d)</translation>
+        <translation>Bağlantı zaman aşım süresini milisaniye olarak belirt (en düşüki: 1, varsayılan: %d)</translation>
+    </message>
+    <message>
+        <source>Specify masternode configuration file (default: %s)</source>
+        <translation>Ana düğüm ayar dosyasını belirt (varsayılan: %s)</translation>
     </message>
     <message>
         <source>Specify pid file (default: %s)</source>
-        <translation>Especificar arquivo pid (padrão: %s)</translation>
+        <translation>Pid dosyası belirtiniz (varsayılan: %s)</translation>
     </message>
     <message>
         <source>Spend unconfirmed change when sending transactions (default: %u)</source>
-        <translation>Gastar troco não confirmado quando enviar transações (padrão: %u)</translation>
+        <translation>Gönderme işlemlerinde doğrulanmamış para üstünü harca (varsayılan: %u)</translation>
+    </message>
+    <message>
+        <source>Submitted following entries to masternode: %u / %d</source>
+        <translation>Ana düğüme şu girdiler gönderildi: %u / %d</translation>
+    </message>
+    <message>
+        <source>Submitted to masternode, waiting for more entries ( %u / %d ) %s</source>
+        <translation>Ana düğüme gönderildi, daha fazla girdi bekleniyor ( %u / %d ) %s</translation>
     </message>
     <message>
         <source>Submitted to masternode, waiting in queue %s</source>
-        <translation>Enviado para o masternode, esperando na fila %s</translation>
+        <translation>Ana düğüme gönderildi, kuyrukta bekleniyor %s</translation>
     </message>
     <message>
         <source>Synchroning blockchain...</source>
-        <translation>Sincronizando blockchain...</translation>
+        <translation>Blok zinciri eşleniyor...</translation>
     </message>
     <message>
         <source>Synchronization failed</source>
-        <translation>Sincronização falhou</translation>
+        <translation>Eşleme başarısız</translation>
     </message>
     <message>
         <source>Synchronization finished</source>
-        <translation>Sincronização finalizada</translation>
+        <translation>Eşleme bitti</translation>
     </message>
     <message>
         <source>Synchronizing masternodes...</source>
-        <translation>Sincronizando masternodes...</translation>
+        <translation>Ana düğümler eşleniyor...</translation>
     </message>
     <message>
         <source>This is not a Masternode.</source>
-        <translation>Este não é um Masternode.</translation>
+        <translation>Bu bir Ana Düğüm değil.</translation>
     </message>
     <message>
         <source>Threshold for disconnecting misbehaving peers (default: %u)</source>
-        <translation>Limite para desconectar peers mal comportados (padrão: %u)</translation>
+        <translation>Aksaklık gösteren eşlerle bağlantıyı kesme sınırı (varsayılan: %u)</translation>
     </message>
     <message>
         <source>Too many %f denominations, removing.</source>
-        <translation>Muitas %f denominações, removendo.</translation>
+        <translation>Çok fazla %f birimi, siliniyor.</translation>
     </message>
     <message>
         <source>Tor control port password (default: empty)</source>
-        <translation>Senha da porta de controle do Tor (padrão: vazio)</translation>
+        <translation>Tor kontrol portu parolası (varsayılan: boş)</translation>
     </message>
     <message>
         <source>Tor control port to use if onion listening enabled (default: %s)</source>
-        <translation>Porta de controle a ser usada se o monitoramento onion estiver habilitado (padrão: %s)</translation>
+        <translation>Eğer onion dinlemesi etkinse kullanılacak Tor kontrol portu (varsayılan: %s)</translation>
     </message>
     <message>
         <source>Unable to start HTTP server. See debug log for details.</source>
-        <translation>Não foi possível iniciar o servidor HTTP. Veja o log de debug para detalhes.</translation>
+        <translation>HTTP sunucusu başlatılamadı. Ayrıntılar için debug.log dosyasına bakınız.</translation>
     </message>
     <message>
         <source>Unknown response.</source>
-        <translation>Resposta desconhecida.</translation>
+        <translation>Bilinmeyen cevap.</translation>
     </message>
     <message>
         <source>Unsupported argument -benchmark ignored, use -debug=bench.</source>
-        <translation>Argument -benchmark não suportado e ignorado, use -debug=bench.</translation>
+        <translation>Desteklenmeyen -benchmark argümanı görmezden gelindi, -debug=bench kullanınız.</translation>
     </message>
     <message>
         <source>Unsupported argument -debugnet ignored, use -debug=net.</source>
-        <translation>Argument -debugnet não suportado e ignorado, use -debug=net.</translation>
+        <translation>Desteklenmeyen -debugnet argümanı görmezden gelindi, debug=net kullanınız.</translation>
     </message>
     <message>
         <source>Unsupported argument -tor found, use -onion.</source>
-        <translation>O argumento -tor não é suportado, use -onion.</translation>
+        <translation>Deskteklenmeyen -tor argümanı bulundu, -onion kullanınız.</translation>
     </message>
     <message>
         <source>Upgrade wallet to latest format on startup</source>
-        <translation>Atualizar carteira para o formato mais recente ao iniciar</translation>
+        <translation>Başlangıçta cüzdanı en yeni biçime güncelle</translation>
+    </message>
+    <message>
+        <source>Use KeePass 2 integration using KeePassHttp plugin (default: %u)</source>
+        <translation>KeePassHttp eklentisi kullanarak KeePass 2 entegrasyonu kullan (varsayılan: %u)</translation>
     </message>
     <message>
         <source>Use UPnP to map the listening port (default: %u)</source>
-        <translation>Usar UPnP para mapear a porta de entrada (padrão: %u)</translation>
+        <translation>Dinleme portunu haritalamak için UPnP kullan (varsayılan: %u)</translation>
     </message>
     <message>
         <source>Use the test chain</source>
-        <translation>Use a cadeia de teste</translation>
+        <translation>Test blok zincirini kullan</translation>
     </message>
     <message>
         <source>User Agent comment (%s) contains unsafe characters.</source>
-        <translation>Comentário User Agent (%s) contém caracteres inseguros.</translation>
+        <translation>Kullanıcı Aracı açıklaması (%s) güvensiz karakterler içermektedir.</translation>
     </message>
     <message>
         <source>Will retry...</source>
-        <translation>Será feita nova tentativa...</translation>
+        <translation>Tekrar denenecek...</translation>
     </message>
     <message>
         <source>Invalid masternodeprivkey. Please see documenation.</source>
-        <translation>masternodeprivkey inválida. Por favor, consulte a documentação.</translation>
+        <translation>Geçersiz anadüğümözelanahtarı. Lütfen dökümantasyona göz atın.</translation>
     </message>
     <message>
         <source>Can't find random Masternode.</source>
-        <translation>Não é possível encontrar o Masternode aleatório.</translation>
+        <translation>Rastgele Ana düğüm bulunamıyor.</translation>
     </message>
     <message>
         <source>Can't mix while sync in progress.</source>
-        <translation>Não é possível misturar enquanto a sincronização está em progresso.</translation>
+        <translation>Eşleme sürerken karıştırılamaz.</translation>
     </message>
     <message>
         <source>Could not parse masternode.conf</source>
-        <translation>Impossível avaliar masternode.conf</translation>
+        <translation>masternode.conf okunamıyor</translation>
     </message>
     <message>
         <source>Invalid netmask specified in -whitelist: '%s'</source>
-        <translation>Máscara de rede inválida detectada em -whitelist: '%s'</translation>
+        <translation>-whitelist: '%s' unsurunda geçersiz bir ağ maskesi belirtildi</translation>
     </message>
     <message>
         <source>Invalid port detected in masternode.conf</source>
-        <translation>Porta inválida detectada em masternode.conf</translation>
+        <translation>masternode.conf dosyasında geçersiz port tespit edildi</translation>
     </message>
     <message>
         <source>Invalid script detected.</source>
-        <translation>Detectado script inválido.</translation>
+        <translation>Geçersiz betik tespit edildi.</translation>
     </message>
     <message>
         <source>KeePassHttp id for the established association</source>
-        <translation>KeePassHttp id para a associação estabelecida</translation>
+        <translation>Birliktelik başlatmak için KeePassHttp kimliği</translation>
+    </message>
+    <message>
+        <source>KeePassHttp key for AES encrypted communication with KeePass</source>
+        <translation>KeePass ile AES şifreli iletişim sağlamak için KeePassHttp anahtarı</translation>
     </message>
     <message>
         <source>Keep at most &lt;n&gt; unconnectable transactions in memory (default: %u)</source>
-        <translation>Manter ao máximo &lt;n&gt; transações inconectáveis na memória (padrão: %u)</translation>
+        <translation>Hafızada en çok &lt;n&gt; bağlanılamaz işlem tut (varsayılan: %u)</translation>
+    </message>
+    <message>
+        <source>Disable all Dash specific functionality (Masternodes, PrivateSend, InstantSend, Governance) (0-1, default: %u)</source>
+        <translation>Tüm Dash spesifik işlevleri kapat (Ana Düğümler, Özel Gönder, Anında Gönder, Yönetim) (0-1, varsayılan: %u)</translation>
+    </message>
+    <message>
+        <source>%s file contains all private keys from this wallet. Do not share it with anyone!</source>
+        <translation>%s dosyası bu cüzdana ait tüm özel anahtarları tutuyor. Kimseyle paylaşmayın!</translation>
     </message>
     <message>
         <source>Discover own IP addresses (default: 1 when listening and no -externalip or -proxy)</source>
-        <translation>Descobrir o próprio IP (padrão: 1 enquanto aguardando conexões e sem -externalip ou -proxy)</translation>
+        <translation>Kendi IP adreslerini keşfet (varsayılan: dinlenildiğinde ve -externalip ya da -proxy yoksa 1)</translation>
     </message>
     <message>
         <source>Do not keep transactions in the mempool longer than &lt;n&gt; hours (default: %u)</source>
-        <translation>Não manter transações na mempool por mais que &lt;n&gt; horas (padrão: %u)</translation>
+        <translation>İşlemleri bellek alanında &lt;n&gt; saatten fazla tutma (varsayılan: %u)</translation>
+    </message>
+    <message>
+        <source>Enable InstantSend, show confirmations for locked transactions (0-1, default: %u)</source>
+        <translation>Anında Gönderi aç, kilitlenmiş işlemler için teyitleri gösterir (0-1, varsayılan: %u)</translation>
+    </message>
+    <message>
+        <source>Enable multiple PrivateSend mixing sessions per block, experimental (0-1, default: %u)</source>
+        <translation>Blok başına birden fazla Özel Gönder karışım işlemini aç, deneysel (0-1, varsayılan: %u)</translation>
+    </message>
+    <message>
+        <source>Enable use of automated PrivateSend for funds stored in this wallet (0-1, default: %u)</source>
+        <translation>Bu cüzdanda depolanan meblağ için otomatik Özel Gönder kullanımını aç (0-1, varsayılan: %u)</translation>
+    </message>
+    <message>
+        <source>Execute command when a wallet InstantSend transaction is successfully locked (%s in cmd is replaced by TxID)</source>
+        <translation>Bir cüzdan bir Anında Gönder işlemini başarılı şekilde kilitlediğinde bir komut çalıştır (cmd içinde %s TxID ile değiştirilir)</translation>
+    </message>
+    <message>
+        <source>Extra transactions to keep in memory for compact block reconstructions (default: %u)</source>
+        <translation>Kompakt blok yeniden inşası için hafıza tutmak için ekstra işlemler (varsayılan: %u)</translation>
     </message>
     <message>
         <source>Failed to create backup, file already exists! This could happen if you restarted wallet in less than 60 seconds. You can continue if you are ok with this.</source>
-        <translation>Falha em criar o backup, o arquivo já existe! Isso pode ter acontecido se você resetou sua carteira em menos de 60 segundos. Você pode continuar se está ok com isso.</translation>
+        <translation>Yedek oluşturulamadı, dosya zaten mevcut! Bu durum eğer 60 saniyeden kısa sürede cüzdanı yenidden başlattıysanız oluşabilir. Sizin için sorun yoksa devam edebilirsiniz.</translation>
     </message>
     <message>
         <source>Fees (in %s/kB) smaller than this are considered zero fee for relaying, mining and transaction creation (default: %s)</source>
-        <translation>Comissões (em %s/kB) menores serão consideradas como zero para relaying, mineração e criação de transação (padrão %s)</translation>
+        <translation>Bundan düşük ücretler (%s/kB olarak) aktarma, oluşturma ve işlem yaratma için sıfır değerinde ücret olarak kabul edilir (varsayılan: %s)</translation>
     </message>
     <message>
         <source>Fees (in %s/kB) smaller than this are considered zero fee for transaction creation (default: %s)</source>
-        <translation>Comissões (em %s/kB) menores serão consideradas como zero para criação de transação (padrão %s)</translation>
+        <translation>Bundan düşük ücretler (%s/kB olarak) işlem oluşturulması için sıfır değerinde ücret olarak kabul edilir (varsayılan: %s)</translation>
     </message>
     <message>
         <source>If &lt;category&gt; is not supplied or if &lt;category&gt; = 1, output all debugging information.</source>
-        <translation>Se &lt;category&gt; não for suprida ou se &lt;category&gt; = 1, mostrar toda informação de depuração.</translation>
+        <translation>Eğer &lt;category&gt; belirtilmemişse ya da &lt;category&gt; = 1 ise, tüm hata ayıklama verilerini çıktı al.</translation>
     </message>
     <message>
         <source>InstantSend doesn't support sending values that high yet. Transactions are currently limited to %1 DASH.</source>
-        <translation>EnvioInstantâneo não suporta o envio de valores tão altos ainda. As transações são limitadas a %1 DASH.</translation>
+        <translation>Özel Gönder şu anda bu kadar büyük meblağları desteklemiyor. Şu anda işlemler %1 DASH ile sınırlı.</translation>
+    </message>
+    <message>
+        <source>InstantSend requires inputs with at least %d confirmations, you might need to wait a few minutes and try again.</source>
+        <translation>Anında Gönder için girdilerin en az %d teyidi olması gerekiyor, birkaç dakika daha bekleyip tekrar denemeniz gerekebilir.</translation>
+    </message>
+    <message>
+        <source>Maintain a full address index, used to query for the balance, txids and unspent outputs for addresses (default: %u)</source>
+        <translation>Tam adres endeksi tut, bakiye, txid ve adresler için harcanmamış çıktı sorgusu yapmak için kullanılır (varsayılan: %u)</translation>
+    </message>
+    <message>
+        <source>Maintain a full spent index, used to query the spending txid and input index for an outpoint (default: %u)</source>
+        <translation>Tam harcama endeksi tut, harcama txidleri ve bir çıkış noktası için girdi endeksi sorgusu yapmak için kullanılır (varsayılan: %u)</translation>
+    </message>
+    <message>
+        <source>Maintain a timestamp index for block hashes, used to query blocks hashes by a range of timestamps (default: %u)</source>
+        <translation>Blok hashleri için bir zaman kodu endeksi tut, bir düzü zaman kodu ile hash bloğu sorgusu yapmak için kullanılır (varsayılan: %u)</translation>
+    </message>
+    <message>
+        <source>Maintain at most &lt;n&gt; connections to peers (temporary service connections excluded) (default: %u)</source>
+        <translation>Eşlerle en fazla &lt;n&gt; bağlantı sağla (geçici hizmet bağlantıları dahil değildir) (varsayılan: %u)</translation>
+    </message>
+    <message>
+        <source>PrivateSend uses exact denominated amounts to send funds, you might simply need to anonymize some more coins.</source>
+        <translation>Özel Gönder para göndermek için tam olarak birimlendirilmiş meblağlar kullanır, sadece biraz daha fazla parayı anonim hale getirmeniz gerekiyor.</translation>
     </message>
     <message>
         <source>Prune configured below the minimum of %d MiB.  Please use a higher number.</source>
-        <translation>Prune configurado abaixo do mínimo de %d MiB. Por favor use um número mais alto.</translation>
+        <translation>Budama, en düşük değer olan %d MiB'den düşük olarak ayarlanmıştır. Lütfen daha yüksek bir sayı kullanınız.</translation>
     </message>
     <message>
         <source>Prune: last wallet synchronisation goes beyond pruned data. You need to -reindex (download the whole blockchain again in case of pruned node)</source>
-        <translation>Prune: A ultima sincronização da carteira foi além do dado comprimido. Você precisa reindexar (fazer o download de toda a blockchain novamente)</translation>
+        <translation>Budama: son cüzdan eşleşmesi budanmış verilerin ötesine gitmektedir. -reindex kullanmanız gerekmektedir (Budanmış düğüm ise tüm blok zincirini tekrar indirmeniz gerekir.)</translation>
     </message>
     <message>
         <source>Randomize credentials for every proxy connection. This enables Tor stream isolation (default: %u)</source>
-        <translation>Gerar credenciais aleatórias para cada conexão por proxy. Isto habilita o isolamento de stream do Tor (padrão: %u)</translation>
+        <translation>Her vekil bağlantısı için kimlik verilerini rastgele yap. Bu, Tor akış izolasyonunu etkinleştirir (varsayılan: %u)</translation>
     </message>
     <message>
         <source>Rescans are not possible in pruned mode. You will need to use -reindex which will download the whole blockchain again.</source>
-        <translation>Rescans não são possíveis no modo prune. Você precisa usar -reindex, que irá fazer o download de toda a blockchain novamente.</translation>
+        <translation>Tekrar taramalar budanmış kipte mümkün değildir. Tüm blok zincirini tekrar indirecek olan -reindex seçeneğini kullanmanız gerekecektir.</translation>
     </message>
     <message>
         <source>Specify full path to directory for automatic wallet backups (must exist)</source>
-        <translation>Especifique o caminho completo para o diretório de backups automáticos da carteira (deve existir)</translation>
+        <translation>Otomatik cüzdan yedekleri için tam yolu belirtin (yol şu an var olmalı)</translation>
     </message>
     <message>
         <source>Support filtering of blocks and transaction with bloom filters (default: %u)</source>
-        <translation>Suportar filtragem de blocos e transações com filtros bloom (padrão: %u)</translation>
+        <translation>Blokların ve işlemlerin bloom filtreleri ile süzülmesini destekle (varsayılan: %u)</translation>
     </message>
     <message>
         <source>The block database contains a block which appears to be from the future. This may be due to your computer's date and time being set incorrectly. Only rebuild the block database if you are sure that your computer's date and time are correct</source>
-        <translation>O banco de dados de blocos contém um bloco que parece ser do futuro. Isso pode ser devido à data e hora do seu computador estarem configuradas incorretamente. Apenas reconstrua o banco de dados de blocos se você estiver certo de que a data e hora de seu computador estão corretas.</translation>
+        <translation>Blok veritabanı gelecekten gibi görünen bir blok içermektedir. Bu, bilgisayarınızın saat ve tarihinin yanlış ayarlanmış olmasından kaynaklanabilir. Blok veritabanını sadece bilgisayarınızın tarih ve saatinin doğru olduğundan eminseniz yeniden derleyin.</translation>
     </message>
     <message>
         <source>The transaction amount is too small to send after the fee has been deducted</source>
-        <translation>O valor da transação é muito pequeno para ser enviado depois que a taxa foi deduzida</translation>
+        <translation>Bu işlem, tutar düşüldükten sonra göndermek için çok düşük</translation>
     </message>
     <message>
         <source>Total length of network version string (%i) exceeds maximum length (%i). Reduce the number or size of uacomments.</source>
-        <translation>O tamanho total da string de versão da rede (%i) excede o tamanho máximo (%i). Reduza o numero ou tamanho de uacomments.</translation>
+        <translation>Ağ sürümü zincirinin toplam boyutu (%i) en yüksek boyutu geçmektedir (%i). Kullanıcı aracı açıklamasının sayısı veya boyutunu azaltınız.</translation>
+    </message>
+    <message>
+        <source>Transaction index can't be disabled in full mode. Either start with -litemode command line switch or enable transaction index.</source>
+        <translation>Tam modda işlem endeksi kapatılamaz. Ya komut satırından -litemode ile başlatın ya da işlem endeksini açın.</translation>
     </message>
     <message>
         <source>Tries to keep outbound traffic under the given target (in MiB per 24h), 0 = no limit (default: %d)</source>
-        <translation>Tenta manter tráfego fora dos limites dentro do alvo especificado (em MiB por 24h), 0 = sem limite (padrão: %d)</translation>
+        <translation>Giden trafiği belirtilen hedefin altında tutmaya çalışır (24 saat başı MiB olarak), 0 = sınırsız (varsayılan: %d)</translation>
     </message>
     <message>
         <source>Unable to locate enough PrivateSend denominated funds for this transaction.</source>
-        <translation>Não é possível localizar fundos denominados do PrivateSend suficientes para essa transação.</translation>
+        <translation>Bu işlem için yeterli Özel Gönder ile birimlendirilmiş bakiye bulunamadı.</translation>
     </message>
     <message>
         <source>Unsupported argument -socks found. Setting SOCKS version isn't possible anymore, only SOCKS5 proxies are supported.</source>
-        <translation>Argumento inválido -socks encontrado. Definir a versão do SOCKS não é mais possível, somente proxys SOCK5 são suportados.</translation>
+        <translation>Desteklenmeyen -socks argümanı bulundu. SOCKS sürümünün ayarlanması artık mümkün değildir, sadece SOCKS5 vekilleri desteklenmektedir.</translation>
     </message>
     <message>
         <source>Unsupported argument -whitelistalwaysrelay ignored, use -whitelistrelay and/or -whitelistforcerelay.</source>
-        <translation>Argumento não suportado -whitelistalwaysrelay foi ignorado, utilize -whitelistrelay e/ou -whitelistforcerelay.</translation>
+        <translation>Desteklenmeyen argüman -whitelistalwaysrelay görmezden gelindi, -whitelistrelay ve/veya -whitelistforcerelay kullanın.</translation>
     </message>
     <message>
         <source>Use UPnP to map the listening port (default: 1 when listening and no -proxy)</source>
-        <translation>Usar UPnP para mapear a porta de entrada (padrão: 1 quando listening e no -proxy)</translation>
+        <translation>Dinlenecek portu haritalamak için UPnP kullan (varsayılan: dinlenildiğinde ve -proxy olmadığında 1)</translation>
     </message>
     <message>
         <source>WARNING! Failed to replenish keypool, please unlock your wallet to do so.</source>
-        <translation>ATENÇÃO! Falha ao repor o keypool, desbloqueie sua carteira para fazer isso.</translation>
+        <translation>UYARI! Anahtar havuzu yenilenemedi, lütfen devam etmek için cüzdanınızın kilidini açın.</translation>
+    </message>
+    <message>
+        <source>Wallet is locked, can't replenish keypool! Automatic backups and mixing are disabled, please unlock your wallet to replenish keypool.</source>
+        <translation>Cüzdanınız kilitli, anahtar havuzu yenilenemiyor! Otomatik yedekleme ve karışım kapalı, anahtar havuzunu yenilemek için lütfen cüzdanınızın kilidini açın.</translation>
     </message>
     <message>
         <source>Warning: Unknown block versions being mined! It's possible unknown rules are in effect</source>
-        <translation>Alerta: Versões de blocos desconhecidas mineradas! É possível que regras desconhecidas estejam ativas</translation>
+        <translation>Uyarı: Bilinmeyen blok sürümü oluşturulmaya çalışılıyor. Bilinmeyen kuralların işlemesi mümkündür.</translation>
+    </message>
+    <message>
+        <source>You are starting in lite mode, all Dash-specific functionality is disabled.</source>
+        <translation>Lite modda başlatıyorsunuz, tüm Dash spesifik işlevler kapalı olacak.</translation>
     </message>
     <message>
         <source>You need to rebuild the database using -reindex to go back to unpruned mode.  This will redownload the entire blockchain</source>
-        <translation>Você precisa reconstruir o banco de dados usando -reindex para sair do modo prune. Isso irá rebaixar todo o blockchain.</translation>
+        <translation>Budama olmayan kipe dönmek için veritabanını -reindex ile tekrar derlemeniz gerekir. Bu, tüm blok zincirini tekrar indirecektir</translation>
     </message>
     <message>
         <source>(%d could be used only on mainnet)</source>
-        <translation>(%d poderia ser usado somente na mainnet)</translation>
+        <translation>(%d sadece mainnet'te kullanılabilir)</translation>
     </message>
     <message>
         <source>(default: %u)</source>
-        <translation>(padrão: %u)</translation>
+        <translation>(varsayılan: %u)</translation>
     </message>
     <message>
         <source>(must be %d for mainnet)</source>
-        <translation>(precisa ser %d para mainnet)</translation>
+        <translation>(mainnet için %d olmalı)</translation>
     </message>
     <message>
         <source>-maxmempool must be at least %d MB</source>
-        <translation>-maxmempool deve ser pelo menos %d MB</translation>
+        <translation>-maxmempool en az %d MB olmalıdır</translation>
     </message>
     <message>
         <source>&lt;category&gt; can be:</source>
-        <translation>&lt;category&gt; pode ser:</translation>
+        <translation>&lt;kategori&gt; şunlar olabilir:</translation>
     </message>
     <message>
         <source>Append comment to the user agent string</source>
-        <translation>Adicionar comentário à string user agent</translation>
+        <translation>Kullanıcı aracı zincirine yorumu ekle</translation>
     </message>
     <message>
         <source>Automatic backups disabled</source>
-        <translation>Backup automáticos desabilitados.</translation>
+        <translation>Otomatik yedekleme kapalı</translation>
     </message>
     <message>
         <source>Automatically create Tor hidden service (default: %d)</source>
-        <translation>Criar automaticamente serviços ocultos do Tor (padrão: %d)</translation>
+        <translation>Otomatik olarak gizli Tor servisi oluştur (varsayılan: %d)</translation>
     </message>
     <message>
         <source>ERROR! Failed to create automatic backup</source>
-        <translation>ERRO! Falha ao criar o backup automático</translation>
+        <translation>HATA! Otomatik yedek oluşturulamadı</translation>
     </message>
     <message>
         <source>Enable publish hash block in &lt;address&gt;</source>
-        <translation>Abilitar a publicação da hash do block em &lt;endereço&gt;</translation>
+        <translation>Blok karma değerinin &lt;adres&gt;te yayınlanmasını etkinleştir</translation>
+    </message>
+    <message>
+        <source>Enable publish hash of governance objects (like proposals) in &lt;address&gt;</source>
+        <translation>Şuradaki yönetim nesnelerinin (teklifler gibi) hashlerini yayınlamayı etkinleştir: &lt;address&gt;</translation>
+    </message>
+    <message>
+        <source>Enable publish hash of governance votes in &lt;address&gt;</source>
+        <translation>Şuradaki yönetim hashlerini yayınlamayı etkinleştir: &lt;address&gt;</translation>
     </message>
     <message>
         <source>Enable publish hash transaction (locked via InstantSend) in &lt;address&gt;</source>
-        <translation>Ative a transação de hash de publicação (bloqueada via InstantSend) em&lt;address&gt;</translation>
+        <translation>Şurada hash işlemleri yayınlamayı etkinleştir (Anında Gönder ile kilitli): &lt;address&gt;</translation>
     </message>
     <message>
         <source>Enable publish hash transaction in &lt;address&gt;</source>
-        <translation>Abilitar a publicação da hash da transação em &lt;endereço&gt;</translation>
+        <translation>Karma değer işleminin &lt;adres&gt;te yayınlanmasını etkinleştir</translation>
     </message>
     <message>
         <source>Enable publish raw block in &lt;address&gt;</source>
-        <translation>Abilitar a publicação dos dados brutos do block em &lt;endereço&gt;</translation>
+        <translation>Ham blokun &lt;adres&gt;te yayınlanmasını etkinleştir</translation>
     </message>
     <message>
         <source>Enable publish raw transaction (locked via InstantSend) in &lt;address&gt;</source>
-        <translation>Ativar publicação de transação bruta (bloqueada via InstantSend) em&lt;address&gt;</translation>
+        <translation>Şurada ham işlemleri yayınlamayı etkinleştir (Anında Gönder ile kilitli): &lt;address&gt;</translation>
     </message>
     <message>
         <source>Enable publish raw transaction in &lt;address&gt;</source>
-        <translation>Abilitar a publicação dos dados brutos da transação em &lt;endereço&gt;</translation>
+        <translation>Ham işlemin &lt;adres&gt;te yayınlanmasını etkinleştir</translation>
     </message>
     <message>
         <source>Enable transaction replacement in the memory pool (default: %u)</source>
-        <translation>Habilita substituição de transação em memória (padrão: %u)</translation>
+        <translation>Bellek alanında işlem değiştirmeyi etkinleştir (varsayılan: %u)</translation>
     </message>
     <message>
         <source>Error: A fatal internal error occurred, see debug.log for details</source>
-        <translation>Erro: Um erro interno fatal ocorreu, veja debug.log para detalhes</translation>
+        <translation>Hata: Ölümcül dahili bir hata meydana geldi, ayrıntılar için debug.log dosyasına bakınız</translation>
     </message>
     <message>
         <source>Failed to create backup %s!</source>
-        <translation>Falhou ao criar backup %s!</translation>
+        <translation>Yedek %s oluşturulamadı!</translation>
     </message>
     <message>
         <source>Failed to create backup, error: %s</source>
-        <translation>Falha ao criar backup, erro: %s</translation>
+        <translation>Yedek oluşturulamadı, hata: %s</translation>
     </message>
     <message>
         <source>Failed to delete backup, error: %s</source>
-        <translation>Falha ao apagar backup, erro: %s</translation>
+        <translation>Yedek silinemedi, hata: %s</translation>
+    </message>
+    <message>
+        <source>Failed to load InstantSend data cache from</source>
+        <translation>Şuradan Anında Gönder verisi önbelleği yüklemesi başarısız:</translation>
+    </message>
+    <message>
+        <source>Failed to load sporks cache from</source>
+        <translation>Şuradan spork önbelleği yüklemesi başarısız:</translation>
     </message>
     <message>
         <source>Failed to parse host:port string</source>
-        <translation>Falha ao avaliar a string host:port</translation>
+        <translation>host:port metni okunamıyor</translation>
     </message>
     <message>
         <source>Fee (in %s/kB) to add to transactions you send (default: %s)</source>
-        <translation>Taxa (em %s/kB) a ser adicionada às transações que você mandar (padrão: %s)</translation>
+        <translation>Yolladığınız işlemlere eklenecek ücret (%s/kB olarak) (varsayılan: %s)</translation>
     </message>
     <message>
         <source>Imports blocks from external blk000??.dat file on startup</source>
-        <translation>Importar blocos a partir de arquivo externo blk000??.dat durante a inicialização</translation>
+        <translation>Başlangıçta harici blk000??.dat dosyasından blokları içe aktarır</translation>
     </message>
     <message>
         <source>InstantSend options:</source>
-        <translation>Opções de EnvioInstantâneo: </translation>
+        <translation>Anında Gönder seçenekleri:</translation>
     </message>
     <message>
         <source>Invalid amount for -fallbackfee=&lt;amount&gt;: '%s'</source>
-        <translation>Valor inválido para -fallbackfee=&lt;amount&gt;: '%s'</translation>
+        <translation> -fallbackfee=&lt;tutar&gt; için geçersiz tutar: '%s'</translation>
+    </message>
+    <message>
+        <source>Invalid input count.</source>
+        <translation>Girdi sayısı geçersiz.</translation>
     </message>
     <message>
         <source>Keep the transaction memory pool below &lt;n&gt; megabytes (default: %u)</source>
-        <translation>Mantenha a mempool de transações abaixo de &lt;n&gt; megabytes (padrão: %u)</translation>
+        <translation>İşlem bellek alanını &lt;n&gt; megabayttan düşük tut (varsayılan: %u)</translation>
     </message>
     <message>
         <source>Last PrivateSend was too recent.</source>
-        <translation>O último PrivateSend foi muito recente.</translation>
+        <translation>Son Özel Gönder çok yakında yapıldı.</translation>
     </message>
     <message>
         <source>Last successful PrivateSend action was too recent.</source>
-        <translation>A última ação PrivateSend com sucesso foi muito recente.</translation>
+        <translation>Son başarılı Özel Gönder eylemi çok yakında yapıldı.</translation>
     </message>
     <message>
         <source>Line: %d</source>
-        <translation>Linha: %d</translation>
+        <translation>Hat: %d</translation>
+    </message>
+    <message>
+        <source>Loading InstantSend data cache...</source>
+        <translation>Anında Gönder verisi önbelleği yükleniyor...</translation>
     </message>
     <message>
         <source>Loading addresses...</source>
-        <translation>Carregando endereços...</translation>
+        <translation>Adresler yükleniyor...</translation>
     </message>
     <message>
         <source>Loading block index...</source>
-        <translation>Carregando índice de blocos...</translation>
+        <translation>Blok indeksi yükleniyor...</translation>
     </message>
     <message>
         <source>Loading governance cache...</source>
-        <translation>Sincronizando cache de governança ....</translation>
+        <translation>Yönetim önbelleği yükleniyor...</translation>
+    </message>
+    <message>
+        <source>Loading sporks cache...</source>
+        <translation>Spork önbelleği yükleniyor...</translation>
     </message>
     <message>
         <source>Loading wallet... (%3.2f %%)</source>
-        <translation>Carregando carteira... (%3.2f %%)</translation>
+        <translation>Cüzdan yükleniyor... (%3.2f %%)</translation>
     </message>
     <message>
         <source>Loading wallet...</source>
-        <translation>Carregando carteira...</translation>
+        <translation>Cüzdan yükleniyor...</translation>
     </message>
     <message>
         <source>Location of the auth cookie (default: data dir)</source>
-        <translation>Localização do cookie de autenticação (padrão: diretório de dados)</translation>
+        <translation>auth çerezinin konumu (varsayılan: veri klasörü)</translation>
     </message>
     <message>
         <source>Make the wallet broadcast transactions</source>
-        <translation>Criar transações de transmissão de carteira</translation>
+        <translation>Cüzdanın işlemleri yayınlamasını sağla</translation>
     </message>
     <message>
         <source>Masternode cache is empty, skipping payments and governance cache...</source>
-        <translation>A  cache masternode está vazia, pulando cache de pagamentos e governança...</translation>
+        <translation>Ana düğüm önbelleği boş, ödeme ve yönetim önbellekleri atlanıyor...</translation>
     </message>
     <message>
         <source>Masternode options:</source>
-        <translation>Opções do Masternode:</translation>
+        <translation>Ana düğüm seçenekleri:</translation>
     </message>
     <message>
         <source>Masternode queue is full.</source>
-        <translation>A fila do masternode está cheia.</translation>
+        <translation>Ana düğüm kuyruğu dolu.</translation>
     </message>
     <message>
         <source>Masternode:</source>
-        <translation>Masternode:</translation>
+        <translation>Ana düğüm:</translation>
     </message>
     <message>
         <source>Minimum bytes per sigop in transactions we relay and mine (default: %u)</source>
-        <translation>Mínimo de bytes por sigop nas transações que retransmitimos e mineramos (padrão: %u)</translation>
+        <translation>Yönlendirip kazacağımız işlemlerde sigop başına minimum bayt (varsayılan: %u)</translation>
     </message>
     <message>
         <source>Missing input transaction information.</source>
-        <translation>Falta informação da transação de entrada.</translation>
+        <translation>Girdi işlem bilgisi eksik.</translation>
     </message>
     <message>
         <source>No errors detected.</source>
-        <translation>Nenhum erro detectado.</translation>
+        <translation>Hata tespit edilmedi.</translation>
     </message>
     <message>
         <source>No matching denominations found for mixing.</source>
-        <translation>Nenhuma denominação correspondente encontrada para misturar.</translation>
+        <translation>Karışım için uyumlu birim bulunamadı.</translation>
     </message>
     <message>
         <source>Node relay options:</source>
-        <translation>Opções de relé nó :</translation>
+        <translation>Düğüm aktarma seçenekleri:</translation>
     </message>
     <message>
         <source>Non-standard public key detected.</source>
-        <translation>Nenhuma chave pública fora do padrão detectada.</translation>
+        <translation>Standart olmayan herkese açık anahtar tespit edildi.</translation>
     </message>
     <message>
         <source>Not compatible with existing transactions.</source>
-        <translation>Não é compatível com as transações existentes.</translation>
+        <translation>Var olan işlemlerle uyumlu değil.</translation>
     </message>
     <message>
         <source>Not enough file descriptors available.</source>
-        <translation>Não há descritores de arquivos disponíveis.</translation>
+        <translation>Kafi derecede dosya tanımlayıcıları mevcut değil.</translation>
     </message>
     <message>
         <source>Not enough funds to anonymize.</source>
-        <translation>Não há fundos suficientes para anonimo.</translation>
+        <translation>Anonim hale getirilecek yeterli bakiye yok.</translation>
     </message>
     <message>
         <source>Number of automatic wallet backups (default: %u)</source>
-        <translation>Número de backups automáticos da carteira (padrão: %u)</translation>
+        <translation>Otomatik cüzdan yedeği sayısı (varsayılan: %u)</translation>
     </message>
     <message>
         <source>Options:</source>
-        <translation>Opções:</translation>
+        <translation>Seçenekler:</translation>
     </message>
     <message>
         <source>Password for JSON-RPC connections</source>
-        <translation>Senha para conexões JSON-RPC</translation>
+        <translation>JSON-RPC bağlantıları için parola</translation>
     </message>
     <message>
         <source>Print version and exit</source>
-        <translation>Versão de impressão e sair</translation>
+        <translation>Sürümü yaz ve çık</translation>
     </message>
     <message>
         <source>PrivateSend is idle.</source>
-        <translation>PrivateSend está inativo.</translation>
+        <translation>Özel Gönder boşta.</translation>
     </message>
     <message>
         <source>PrivateSend options:</source>
-        <translation>Opções do PrivateSend:</translation>
+        <translation>Özel Gönder seçenekleri:</translation>
     </message>
     <message>
         <source>PrivateSend request complete:</source>
-        <translation>PrivateSend solicitação completa:</translation>
+        <translation>Özel Gönder talebi tamamlandı:</translation>
     </message>
     <message>
         <source>PrivateSend request incomplete:</source>
-        <translation>PrivateSend solicitação incompleta:</translation>
+        <translation>Özel Gönder talebi tamamlanmadı:</translation>
     </message>
     <message>
         <source>Prune cannot be configured with a negative value.</source>
-        <translation>O modo prune não pode ser configurado com um valor negativo.</translation>
+        <translation>Budama negatif bir değerle yapılandırılamaz.</translation>
     </message>
     <message>
         <source>Prune mode is incompatible with -txindex.</source>
-        <translation>O modo prune é incompatível com -txindex.</translation>
+        <translation>Budama kipi -txindex ile uyumsuzdur.</translation>
     </message>
     <message>
         <source>Pruning blockstore...</source>
-        <translation>Prunando os blocos existentes...</translation>
+        <translation>Blockstore budanıyor...</translation>
     </message>
     <message>
         <source>Rescan the block chain for missing wallet transactions on startup</source>
-        <translation>Analise novamente o blockchain para ver se há transações da carteira em falta na inicialização</translation>
+        <translation>Başlangıçta blok zincirini eksik cüzdan işlemleri için tekrar tara</translation>
     </message>
     <message>
         <source>The wallet will avoid paying less than the minimum relay fee.</source>
-        <translation>A carteira irá evitar pagar menos que a taxa mínima de retransmissão.</translation>
+        <translation>Cüzdan en az aktarma ücretinden daha az ödeme yapmaktan sakınacaktır.</translation>
     </message>
     <message>
         <source>This is the minimum transaction fee you pay on every transaction.</source>
-        <translation>Esta é a taxa mínima que você paga em todas as transação.</translation>
+        <translation>Bu her işlemde ödeceğiniz en düşük işlem ücretidir.</translation>
     </message>
     <message>
         <source>This is the transaction fee you will pay if you send a transaction.</source>
-        <translation>Esta é a taxa que você irá pagar se enviar uma transação.</translation>
+        <translation>Eğer bir gönderme işlemi yaparsanız bu ödeyeceğiniz işlem ücretidir.</translation>
     </message>
     <message>
         <source>Transaction amounts must not be negative</source>
-        <translation>As quantidades nas transações não podem ser negativas.</translation>
+        <translation>İşlem tutarı negatif olmamalıdır</translation>
     </message>
     <message>
         <source>Transaction has too long of a mempool chain</source>
-        <translation>A transação demorou muito na memória</translation>
+        <translation>İşlem çok uzun bir mempool zincirine sahip</translation>
     </message>
     <message>
         <source>Transaction must have at least one recipient</source>
-        <translation>A transação deve ter ao menos um destinatário</translation>
+        <translation>İşlemin en az bir alıcısı olması gerekir</translation>
+    </message>
+    <message>
+        <source>Transaction too large</source>
+        <translation>İşlem çok büyük</translation>
     </message>
     <message>
         <source>Trying to connect...</source>
-        <translation>Tentando se conectar...</translation>
+        <translation>Bağlanmaya çalışılıyor...</translation>
     </message>
     <message>
         <source>Unable to bind to %s on this computer. %s is probably already running.</source>
-        <translation>Impossível vincular a %s neste computador. O %s provavelmente já está rodando.</translation>
+        <translation>Bu bilgisayarda %s unsuruna bağlanılamadı. %s muhtemelen hâlihazırda çalışmaktadır.</translation>
     </message>
     <message>
         <source>Upgrading UTXO database</source>
-        <translation>Atualizando banco de dados UTXO</translation>
+        <translation>UTXO veritabanı yükseltiliyor</translation>
     </message>
     <message>
         <source>Use devnet chain with provided name</source>
-        <translation>Use a cadeia devnet com o nome fornecido</translation>
+        <translation>Verilen ad ile devnet zinciri kullan</translation>
     </message>
     <message>
         <source>Wallet debugging/testing options:</source>
-        <translation>Opções de depuração/teste da Carteira</translation>
+        <translation>Cüzdan hata ayıklama/test etme seçenekleri:</translation>
+    </message>
+    <message>
+        <source>Wallet is not initialized</source>
+        <translation>Cüzdan başlatılmadı</translation>
     </message>
     <message>
         <source>Wallet needed to be rewritten: restart %s to complete</source>
-        <translation>A Carteira precisa ser reescrita: reinicie o %s para completar</translation>
+        <translation>Cüzdanın tekrar yazılması gerekiyordu: işlemi tamamlamak için %s programını yeniden başlatınız</translation>
     </message>
     <message>
         <source>Warning: unknown new rules activated (versionbit %i)</source>
-        <translation>Alerta: regras novas desconhecidas ativadas (versionbit %i)</translation>
+        <translation>Uyarı: bilinmeyen yeni kurallar etkinleştirilmiştir (versionbit %i)</translation>
     </message>
     <message>
         <source>Wasn't able to create wallet backup folder %s!</source>
-        <translation>Não foi possível criar a pasta para backup da carteira %s!</translation>
+        <translation>Cüzdan yedeği klasörü %s oluşturulamadı!</translation>
     </message>
     <message>
         <source>Whether to operate in a blocks only mode (default: %u)</source>
-        <translation>Se é para operar em modo somente blocos (padrão: %u)</translation>
+        <translation>Sadece blok kipinde çalışılıp çalışılmayacağı (varsayılan: %u)</translation>
+    </message>
+    <message>
+        <source>You can not start a masternode in lite mode.</source>
+        <translation>Bir ana düğümü lite modda başlatamazsınız.</translation>
     </message>
     <message>
         <source>ZeroMQ notification options:</source>
-        <translation>ZeroMQ notificação opções </translation>
+        <translation>ZeroMQ bildirim seçenekleri:</translation>
     </message>
     <message>
         <source>no mixing available.</source>
-        <translation>mixing não disponível.</translation>
+        <translation>karışım mevcut değil.</translation>
     </message>
     <message>
         <source>see debug.log for details.</source>
-        <translation>Consulte debug.log para obter detalhes.</translation>
+        <translation>ayrıntlar için debug.log dosyasına bakın</translation>
     </message>
     <message>
         <source>RPC server options:</source>
-        <translation>Opções do servidor RPC:</translation>
+        <translation>RPC sunucu seçenekleri:</translation>
     </message>
     <message>
         <source>Dash Core</source>
@@ -4830,387 +4935,395 @@ https://www.transifex.com/projects/p/dash/</translation>
     </message>
     <message>
         <source>The %s developers</source>
-        <translation>Desenvolvedores do %s</translation>
+        <translation>%s geliştiricileri</translation>
+    </message>
+    <message>
+        <source>Accept connections from outside (default: 1 if no -proxy or -connect/-noconnect)</source>
+        <translation>Dışarıdan gelen bağlantıları kabul et (varsayılan: -proxy veya -connect/-noconnect yoksa 1)</translation>
     </message>
     <message>
         <source>Cannot obtain a lock on data directory %s. %s is probably already running.</source>
-        <translation>Não foi possível obter exclusividade de escrita no endereço %s. O %s provavelmente já está sendo executado.</translation>
+        <translation>%s veri dizininde kilit elde edilemedi. %s muhtemelen hâlihazırda çalışmaktadır.</translation>
+    </message>
+    <message>
+        <source>Connect only to the specified node(s); -noconnect or -connect=0 alone to disable automatic connections</source>
+        <translation>Sadece belirtilen düğümler bağlan; otomatik bağlantıları devredışı bırakmak için -noconnect veya -connect=0 yeterli</translation>
     </message>
     <message>
         <source>Distributed under the MIT software license, see the accompanying file %s or %s</source>
-        <translation>Distribuído sob a licença de software MIT, veja o arquivo %s ou %s</translation>
+        <translation>MIT yazılım lisansı altında dağıtılmıştır, beraberindeki %s ya da %s dosyasına bakınız.</translation>
     </message>
     <message>
         <source>Error reading %s! All keys read correctly, but transaction data or address book entries might be missing or incorrect.</source>
-        <translation>Erro ao ler arquivo %s! Todas as chaves privadas foram lidas corretamente, mas os dados de transação ou o livro de endereços podem estar faltando ou incorretos.</translation>
+        <translation>%s dosyasının okunması sırasında bir hata meydana geldi! Tüm anahtarlar doğru bir şekilde okundu, ancak işlem verileri ya da adres defteri ögeleri hatalı veya eksik olabilir.</translation>
     </message>
     <message>
         <source>Force relay of transactions from whitelisted peers even if they violate local relay policy (default: %d)</source>
-        <translation>Força a retransmissão de transações de pares da lista branca, mesmo quando violam a política local de retransmissão (default: %d)</translation>
+        <translation>Yerel aktarma politikasını ihlal etseler bile beyaz listedeki eşlerden gelen işlemlerin aktarılmasını zorla (varsayılan: %d)</translation>
     </message>
     <message>
         <source>Incorrect or no devnet genesis block found. Wrong datadir for devnet specified?</source>
-        <translation>Bloco gênese incorreto ou não encontrado. Datadir errado para a devnet rede?</translation>
+        <translation>Geçersiz veya sıfır devnet genesis bloğu bulundu. Devnet için belirtilen datadir yanlış mı?</translation>
     </message>
     <message>
         <source>Maximum allowed median peer time offset adjustment. Local perspective of time may be influenced by peers forward or backward by this amount. (default: %u seconds)</source>
-        <translation>Ajuste da média máxima permitida do time offset para um par. A perspectiva local de horário pode ser influenciada por pares à frente ou atrás neste montante. (padrão: %u segundos)</translation>
+        <translation>İzin verilen edilen en yüksek medyan eş zamanı değişiklik sınırının ayarlaması. Zamanın yerel perspektifi bu miktar kadar ileri ya da geri eşler tarafından etkilenebilir. (Varsayılan %u saniye)</translation>
     </message>
     <message>
         <source>Maximum total fees (in %s) to use in a single wallet transaction or raw transaction; setting this too low may abort large transactions (default: %s)</source>
-        <translation>Total máximo de taxas (em %s) para usar em uma única transação de carteira ou transação crua; especificar um valor muito baixo pode abortar grandes transações (padrão: %s)</translation>
+        <translation>Tek bir cüzdan işleminde ya da ham işlemde kullanılacak en yüksek toplam ücret (%s olarak); bunu çok düşük olarak ayarlamak büyük işlemleri iptal edebilir (varsayılan: %s)</translation>
     </message>
     <message>
         <source>Override spork address. Only useful for regtest and devnet. Using this on mainnet or testnet will ban you.</source>
-        <translation>Substituir endereço de spork. Útil apenas para regtest e devnet. Usando isto na mainnet ou testnet irá banir você.</translation>
+        <translation>Spork adresini geçersiz kıl. Sadece regtest ve devnet içindir. Bunu mainnet veya testnet'te kullanmak engellenmenize yol açar.</translation>
     </message>
     <message>
         <source>Please check that your computer's date and time are correct! If your clock is wrong, %s will not work properly.</source>
-        <translation>Por favor verifique se a data e o horário de seu computador estão corretos. Se o relógio de seu computador estiver incorreto, %s não funcionará corretamente.</translation>
+        <translation>Lütfen bilgisayarınızın saat ve tarihinin doğru olduğunu kontrol ediniz! Saatinizde gecikme varsa %s doğru şekilde çalışamaz.</translation>
     </message>
     <message>
         <source>Please contribute if you find %s useful. Visit %s for further information about the software.</source>
-        <translation>Por favor contribua se você entender que %s é útil. Visite %s para mais informações sobre o software.</translation>
+        <translation>%s programını faydalı buluyorsanız lütfen katkıda bulununuz. Yazılım hakkında daha fazla bilgi için %s adresini ziyaret ediniz.</translation>
+    </message>
+    <message>
+        <source>Provide liquidity to PrivateSend by infrequently mixing coins on a continual basis (%u-%u, default: %u, 1=very frequent, high fees, %u=very infrequent, low fees)</source>
+        <translation>Sürekli olarak para karışımı yaparak Özel Göndere likidite sağla  (%u-%u, varsayılan: %u, 1=çok sık, yüksek ücret, %u=düşük sıklıkta, düşük ücret)</translation>
     </message>
     <message>
         <source>Query for peer addresses via DNS lookup, if low on addresses (default: 1 unless -connect/-noconnect)</source>
-        <translation>Consulta por endereços de pares via pesquisa de DNS, se baixa nos endereços (default: 1 unless -connect/-noconnect)</translation>
+        <translation>Eğer adresler az ise DNS lookup ile eş adresi talebi (varsayılan: 1 eğer -connect/-noconnect değilse)</translation>
     </message>
     <message>
         <source>Reduce storage requirements by enabling pruning (deleting) of old blocks. This allows the pruneblockchain RPC to be called to delete specific blocks, and enables automatic pruning of old blocks if a target size in MiB is provided. This mode is incompatible with -txindex and -rescan. Warning: Reverting this setting requires re-downloading the entire blockchain. (default: 0 = disable pruning blocks, 1 = allow manual pruning via RPC, &gt;%u = automatically prune block files to stay under the specified target size in MiB)</source>
-        <translation>Reduz o requerimente de espaço habiitando a poda (apagando) de blocos antigos. Isso permite chamar o comando pruneblockchain via RPC para apagar blocos específicos, e habiita o poda automático de blocos antigos se o tamanho em MiB for atingido. Esse modo é incompatível com -txindex e -rescan. Aviso: Reverter essa configuração requer baixar novamente o blockchain inteiro. (padrão: 0 = desabilitado, 1 = permite a poda manual via RPC, &gt;%u = poda os blocos para ficar abaixo do especificado, em MiB)</translation>
+        <translation>Eski blokları budamayı (silme) etkinleştirerek depolama gereksinimlerini azaltın. Bu belirli blokları silmek için pruneblockchain uzak yordam çağrısına (RPC) izin verir. Eğer bloklar hedef mebibyte boyutuna ulaşırsa eski blokların otomatik olarak budanmasını sağlar. Bu kip, -txindex ve -rescan ile uyumsuzdur. Uyarı: Bu ayarı geri almak, blok zincirinin tamamını yeniden yüklemeyi gerektirir. (varsayılan: 0 = blok budaması devre dışı, 1 = RPC üzerinden manuel budamaya izin verir, &gt;%u = mebibyte olarak belirtilen hedef boyutun altında kalması için blok dosyalarını otomatik olarak budar)</translation>
     </message>
     <message>
         <source>Set lowest fee rate (in %s/kB) for transactions to be included in block creation. (default: %s)</source>
-        <translation>Especificar a taxa miníma (em %s/KiB) para transações para ser incluída na criação de blocos. (padrão: %s)</translation>
-    </message>
-    <message>
-        <source>Show N confirmations for a successfully locked transaction (%u-%u, default: %u)</source>
-        <translation>Mostrar N confirmações para uma transação bloqueada com sucesso (%u-%u, padrão: %u)</translation>
+        <translation>Blok oluşturmaya dahil olan işlemler için en düşük ücret oranını (%s/kB olarak) ayarla. (varsayılan: %s)</translation>
     </message>
     <message>
         <source>This is the transaction fee you may pay when fee estimates are not available.</source>
-        <translation>Esta é a taxa que você deve pagar quando a taxa estimada não está disponível.</translation>
+        <translation>İşlem ücret tahminleri mevcut olmadığında ödeyebileceğiniz işlem ücreti budur.</translation>
     </message>
     <message>
         <source>This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit %s and cryptographic software written by Eric Young and UPnP software written by Thomas Bernard.</source>
-        <translation>Esse produto inclui um software desenvolvido pelo OpenSSL Project para uso na OpenSSL Toolkit %s e software criptográfico escrito por Eric Young e software UPnP escrito por Thomas Bernard. </translation>
+        <translation>Bu ürün OpenSSL Projesi tarafından geliştirilen OpenSSL araç takımınında kullanılmak üzere yazılan yazılımları %s Eric Young  tarafından yazılmış şifreleme yazılımını ve Thomas Bernard tarafından yazılmış UPnP yazılımını içerir.</translation>
     </message>
     <message>
         <source>Unable to locate enough PrivateSend non-denominated funds for this transaction.</source>
-        <translation>Não é possível localizar fundos não-expressos do PrivateSend suficientes para essa transação.</translation>
+        <translation>Bu işlem için yeterli Özel Gönder ile birimlendirilmemiş bakiye bulunamadı.</translation>
     </message>
     <message>
         <source>Use N separate masternodes for each denominated input to mix funds (%u-%u, default: %u)</source>
-        <translation>Use N masternodes separados para cada entrada denominada para misturar fundos (%u-%u, padrão: %u)</translation>
+        <translation>Her birimlendirilmiş girdi tutarı için N ayrı ana düğüm kullan (%u-%u, varsayılan: %u)</translation>
     </message>
     <message>
         <source>Use hierarchical deterministic key generation (HD) after BIP39/BIP44. Only has effect during wallet creation/first start</source>
-        <translation>Use a geração hierárquica de chaves determinísticas (HD) após o BIP39 / BIP44. Só tem efeito durante a criação / início da carteira</translation>
+        <translation>BIP39/BIP44'ten sonra hiyerarşik deterministik anahtar oluşturma (HD) kullan. Sadece cüzdan oluşturma/ilk açılış sırasında etkilidir</translation>
     </message>
     <message>
         <source>User defined mnemonic passphrase for HD wallet (BIP39). Only has effect during wallet creation/first start (default: empty string)</source>
-        <translation>Senha mnemônica definida pelo usuário para carteira HD (BIP39). Só tem efeito durante a criação da carteira / primeira inicialização (padrão: string vazia)</translation>
+        <translation>HD cüzdan (BIP39) için kullanıcı tarafından belirlenmiş anımsatıcı parola. Sadece cüzdan oluşturma/ilk açılış sırasında etkilidir (varsayılan: boş metin)</translation>
     </message>
     <message>
         <source>Username and hashed password for JSON-RPC connections. The field &lt;userpw&gt; comes in the format: &lt;USERNAME&gt;:&lt;SALT&gt;$&lt;HASH&gt;. A canonical python script is included in share/rpcuser. The client then connects normally using the rpcuser=&lt;USERNAME&gt;/rpcpassword=&lt;PASSWORD&gt; pair of arguments. This option can be specified multiple times</source>
-        <translation>Nome de usuário e hash da senha para conexões JSON-RPC. O campo &lt;userpw&gt; vem com o formato: &lt;USERNAME&gt;:&lt;SALT&gt;$&lt;HASH&gt;. Um script python canônico é incluído em share/rpcuser. O cliente pode conectar normalmente usando o rpcuser=&lt;USERNAME&gt;/rpcpassword=&lt;PASSWORD&gt;. Esta opção pode ser especificado multiplas vezes</translation>
+        <translation>JSON-RPC bağlantıları için kullanıcı adı ve karmalanmış parola. &lt;userpw&gt; alanı şu biçimdedir: &lt;KULLANICI ADI&gt;:&lt;SALT&gt;$&lt;HASH&gt;. Kanonik bir Python betiği share/rpcuser klasöründe bulunabilir. Ardından istemci normal şekilde rpcuser=&lt;KULLANICI ADI&gt;/rpcpassword=&lt;PAROLA&gt; argüman çiftini kullanarak bağlanabilir. Bu seçenek birden çok kez belirtilebilir.</translation>
     </message>
     <message>
         <source>Wallet will not create transactions that violate mempool chain limits (default: %u)</source>
-        <translation>A carteira não irá criar transações que violem o limite da mempool chain (padrão: %u)</translation>
+        <translation>Cüzdan, zincir bellek alanı limitlerini ihlal eden işlem oluşturmayacak. (varsayılan: %u)</translation>
     </message>
     <message>
         <source>Warning: At least %d of %d masternodes are running on a newer software version. Please check latest releases, you might need to update too.</source>
-        <translation>Aviso: Pelo menos %d de %d masternodes estão sendo executados em uma versão de software mais recente. Por favor, verifique os últimos lançamentos, talvez você precise atualizar também.</translation>
+        <translation>Uyarı: En az %d / %d ana düğüm yeni bir yazılım sürümüyle çalışıyor. Lütfen son sürümleri kontrol edin, sizin de güncellemeye ihtiyacınız olabilir.</translation>
     </message>
     <message>
         <source>Warning: Every masternode (out of %d known ones) is running on a newer software version. Please check latest releases, it's very likely that you missed a major/critical update.</source>
-        <translation>Aviso: Cada masternode (fora de %d conhecidos) está sendo executado em uma versão de software mais recente. Por favor, verifique os últimos lançamentos, é muito provável que você tenha perdido uma atualização importante / crítica.</translation>
+        <translation>Uyarı her ana düğüm (%d bilinen arasında) daha yeni bir yazılım sürümüyle çalışıyor. Lütfen son sürümleri kontrol edin, büyük/kritik bir güncellemeyi atlamış olmanız yüksek ihtimal dahilinde.</translation>
     </message>
     <message>
         <source>Warning: Wallet file corrupt, data salvaged! Original %s saved as %s in %s; if your balance or transactions are incorrect you should restore from a backup.</source>
-        <translation>Atenção: Arquivo da carteira corrompido, dados recuperados! Original %s salvo como %s em %s; se seu saldo ou transações estiverem incorretos, você deve restaurar o backup.</translation>
+        <translation>Uyarı: wallet.dat bozuk, veriler geri kazanıldı! Özgün %s, %s olarak %s klasörüne kaydedildi; bakiyeniz ya da işlemleriniz yanlışsa bir yedeklemeden tekrar yüklemeniz gerekir.</translation>
     </message>
     <message>
         <source>Whitelist peers connecting from the given IP address (e.g. 1.2.3.4) or CIDR notated network (e.g. 1.2.3.0/24). Can be specified multiple times.</source>
-        <translation>Inclui na lista branca pares conectando do dado endereço IP (ex: 1.2.3.4) ou rede em notação CIDR (ex: 1.2.3.0/24). Pode ser especificado várias vezes.</translation>
+        <translation>Beyaz listeye eklenen eşler verilen IP adresinden (ör. 1.2.3.4) veya CIDR ağından (ör. 1.2.3.0/24) bağlanabilir. Değerler birden çok kez kullanılabilir.</translation>
     </message>
     <message>
         <source>%s corrupt, salvage failed</source>
-        <translation>%s corrompido, recuperação falhou</translation>
+        <translation>%s bozuk, geri kazanım başarısız oldu</translation>
     </message>
     <message>
         <source>%s is not a valid backup folder!</source>
-        <translation>%s não é uma pasta de backup válida!</translation>
+        <translation>%s geçerli bir yedek klasörü değil!</translation>
     </message>
     <message>
         <source>%s is set very high!</source>
-        <translation>%s está muito alto!</translation>
+        <translation>%s çok yüksek ayarlanmış!</translation>
     </message>
     <message>
         <source>(press q to shutdown and continue later)</source>
-        <translation>(pressione q para desligar e continuar depois)</translation>
+        <translation>(kapatıp daha sonra devam etmek için q tuşuna basın)</translation>
     </message>
     <message>
         <source>-devnet can only be specified once</source>
-        <translation>-devnet só pode ser especificado uma vez</translation>
+        <translation>-devnet sadece bir kere belirtilebilir</translation>
     </message>
     <message>
         <source>-port must be specified when -devnet and -listen are specified</source>
-        <translation>-rpcport deve ser especificado quando -devnet e -server são especificados</translation>
+        <translation>-devnet ve -listen belirtildiğinde -port da belirtilmelidir</translation>
     </message>
     <message>
         <source>-rpcport must be specified when -devnet and -server are specified</source>
-        <translation>-rpcport deve ser especificado quando -devnet e -server são especificados</translation>
+        <translation>-devnet ve -server belirtildiğinde -rpcport da belirtilmelidir</translation>
     </message>
     <message>
         <source>Allow RFC1918 addresses to be relayed and connected to (default: %u)</source>
-        <translation>Permitir que os endereços RFC1918 sejam retransmitidos e conectados a (padrão: %u)</translation>
+        <translation>RFC1918 adreslerine iletim ve bağlantıya izin ver (varsayılan %u)</translation>
     </message>
     <message>
         <source>Attempt to recover private keys from a corrupt wallet on startup</source>
-        <translation>Tenta recuperar as chaves privadas de uma carteira corrompida ao inicializar</translation>
+        <translation>Başlangıçta bozuk bir cüzdandan özel anahtarları geri kazanmayı dene</translation>
     </message>
     <message>
         <source>Cannot resolve -%s address: '%s'</source>
-        <translation>Não foi possível encontrar o endereço de -%s: '%s'</translation>
+        <translation>Çözümlenemedi - %s adres: '%s'</translation>
     </message>
     <message>
         <source>Change index out of range</source>
-        <translation>Índice de mudança fora do intervalo</translation>
+        <translation>Aralık dışında değişiklik indeksi</translation>
     </message>
     <message>
         <source>Copyright (C)</source>
-        <translation>Copyright</translation>
+        <translation>Copyright (C)</translation>
     </message>
     <message>
         <source>Error loading %s</source>
-        <translation>Erro ao carregar %s</translation>
+        <translation>%s unsurunun yüklenmesinde hata oluştu</translation>
     </message>
     <message>
         <source>Error loading %s: Wallet corrupted</source>
-        <translation>Erro ao carregar %s Carteira corrompida</translation>
+        <translation>%s unsurunun yüklenmesinde hata oluştu: bozuk cüzdan</translation>
     </message>
     <message>
         <source>Error loading %s: Wallet requires newer version of %s</source>
-        <translation>Erro ao carregar %s A carteira requer a versão mais nova do %s</translation>
+        <translation>%s unsurunun yüklenmesinde hata oluştu: cüzdan %s programının yeni bir sürümüne ihtiyaç duyuyor</translation>
     </message>
     <message>
         <source>Error upgrading chainstate database</source>
-        <translation>Erro ao atualizar banco de dados do chainstate</translation>
+        <translation>Zincirdurumu veritabanı yükseltme hatası</translation>
     </message>
     <message>
         <source>Failed to find mixing queue to join</source>
-        <translation>Não foi possível encontrar a fila de mistura para participar</translation>
+        <translation>Katılacak karışım kuyruğu bulunamadı</translation>
     </message>
     <message>
         <source>Failed to start a new mixing queue</source>
-        <translation>Falha ao iniciar uma nova fila de mistura</translation>
+        <translation>Yeni bir karışım kuyruğu başlatılamadı</translation>
     </message>
     <message>
         <source>Initialization sanity check failed. %s is shutting down.</source>
-        <translation>O teste de integridade de inicialização falhou. O %s está sendo desligado.</translation>
+        <translation>Başlatma sınaması başarısız oldu. %s kapatılıyor.</translation>
     </message>
     <message>
         <source>Invalid amount for -%s=&lt;amount&gt;: '%s'</source>
-        <translation>Quantidade inválida para -%s=&lt;amount&gt;: '%s'</translation>
+        <translation>-%s=&lt;tutar&gt; için geçersiz tutar: '%s'</translation>
     </message>
     <message>
         <source>Invalid spork address specified with -sporkaddr</source>
-        <translation>Endereço de spork inválido especificado com -sporkaddr</translation>
+        <translation>-sporkaddr ile yanlış spork adresi belirtildi</translation>
     </message>
     <message>
         <source>Keep N DASH anonymized (%u-%u, default: %u)</source>
-        <translation>Mantenha o N DASH anônimo (%u-%u, padrão: %u)</translation>
+        <translation>N DASH'i anonim tut (%u-%u, varsayılan: %u)</translation>
     </message>
     <message>
         <source>Print this help message and exit</source>
-        <translation>Mostra essa mensagem de ajuda e sai</translation>
+        <translation>Bu yardım mesajını yaz ve çık</translation>
     </message>
     <message>
         <source>Receive and display P2P network alerts (default: %u)</source>
-        <translation>Receba e exiba alertas de rede P2P (default: %u)</translation>
+        <translation>P2P ağ uyarılarını al ve göster (varsayılan: %u)</translation>
     </message>
     <message>
         <source>Reducing -maxconnections from %d to %d, because of system limitations.</source>
-        <translation>Reduzindo -maxconnections de %d para %d, devido à limitações do sistema.</translation>
+        <translation>Sistem sınırlamaları sebebiyle -maxconnections %d değerinden %d değerine düşürülmüştür.</translation>
     </message>
     <message>
         <source>Relay and mine data carrier transactions (default: %u)</source>
-        <translation>Transações de dados de operadora (padrão: %u)</translation>
+        <translation>Veri taşıyıcı işlemleri oluştur ve aktar (varsayılan: %u)</translation>
     </message>
     <message>
         <source>Relay non-P2SH multisig (default: %u)</source>
-        <translation>Retransmitir P2SH não multisig (padrão: %u)</translation>
+        <translation>P2SH olmayan çoklu imzaları aktar (varsayılan: %u)</translation>
     </message>
     <message>
         <source>Rescanning...</source>
-        <translation>Escaneando...</translation>
+        <translation>Yeniden tarama...</translation>
     </message>
     <message>
         <source>Run in the background as a daemon and accept commands</source>
-        <translation>Executar em segundo plano como um daemon e aceitar comandos</translation>
+        <translation>Arka planda daemon (servis) olarak çalış ve komutları kabul et</translation>
     </message>
     <message>
         <source>Send trace/debug info to console instead of debug.log file</source>
-        <translation>Envia informação de trace/debug para o console e não para o arquivo debug.log</translation>
+        <translation>İzleme/hata ayıklama verilerini debug.log dosyası yerine konsola gönder</translation>
     </message>
     <message>
         <source>Session not complete!</source>
-        <translation>Sessão não completa!</translation>
+        <translation>Oturum tamamlanmadı!</translation>
     </message>
     <message>
         <source>Session timed out.</source>
-        <translation>A sessão expirou.</translation>
+        <translation>Oturum zaman aşımına uğradı.</translation>
     </message>
     <message>
         <source>Set database cache size in megabytes (%d to %d, default: %d)</source>
-        <translation>Define o tamanho da cache em megabytes (%d a %d, padrão: %d)</translation>
+        <translation>Veritabanı önbellek boyutunu megabayt olarak belirt (%d ilâ %d, varsayılan: %d)</translation>
     </message>
     <message>
         <source>Set maximum block size in bytes (default: %d)</source>
-        <translation>Definir tamanho máximo do bloco em bytes (padrão: %d)</translation>
+        <translation>Azami blok boyutunu bayt olarak ayarla (varsayılan: %d)</translation>
     </message>
     <message>
         <source>Set the masternode private key</source>
-        <translation>Definir a chave privada do masternode</translation>
+        <translation>Ana düğüm özel anahtarubu belirle</translation>
     </message>
     <message>
         <source>Show all debugging options (usage: --help -help-debug)</source>
-        <translation>Exibe todas as opçoes de debug (uso: --help -help-debug)</translation>
+        <translation>Tüm hata ayıklama seçeneklerini göster (kullanımı: --help -help-debug)</translation>
     </message>
     <message>
         <source>Shrink debug.log file on client startup (default: 1 when no -debug)</source>
-        <translation>Compactar arquivo debug.log ao executar o cliente (padrão: 1 sem -debug)</translation>
+        <translation>İstemci başlatıldığında debug.log dosyasını küçült (varsayılan: -debug bulunmadığında 1)</translation>
     </message>
     <message>
         <source>Signing transaction failed</source>
-        <translation>A transação assinada falhou</translation>
+        <translation>Muamelenin imzalanması başarısız oldu</translation>
     </message>
     <message>
         <source>Specify data directory</source>
-        <translation>Especificar diretório de dados</translation>
+        <translation>Veri dizinini belirt</translation>
     </message>
     <message>
         <source>Specify wallet file (within data directory)</source>
-        <translation>Especifique o arquivo da carteira (dentro do diretório de dados)</translation>
+        <translation>Cüzdan dosyası belirtiniz (veri klasörünün içinde)</translation>
     </message>
     <message>
         <source>Specify your own public address</source>
-        <translation>Especificar seu próprio endereço público</translation>
+        <translation>Kendi genel adresinizi tanımlayın</translation>
     </message>
     <message>
         <source>Starting network threads...</source>
-        <translation>Iniciando threads de rede...</translation>
+        <translation>Ağ iş parçacıkları başlatılıyor...</translation>
     </message>
     <message>
         <source>Synchronization pending...</source>
-        <translation>Sincronização pendente</translation>
+        <translation>Eşleme bekliyor...</translation>
     </message>
     <message>
         <source>Synchronizing governance objects...</source>
-        <translation>Sincronizando objetos de governança ....</translation>
+        <translation>Yönetim nesneleri eşleniyor...</translation>
     </message>
     <message>
         <source>Synchronizing masternode payments...</source>
-        <translation>Sincronizando pagamentos do masternode...</translation>
+        <translation>Ana düğüm ödemeleri eşleniyor...</translation>
     </message>
     <message>
         <source>The source code is available from %s.</source>
-        <translation>O código fonte está disponível pelo %s.</translation>
+        <translation>Kaynak kod şuradan elde edilebilir: %s.</translation>
     </message>
     <message>
         <source>The transaction amount is too small to pay the fee</source>
-        <translation>O valor da transação é muito pequeno para pagar a taxa</translation>
+        <translation>İşlemdeki bitcoin tutarı ücreti ödemek için çok düşük</translation>
     </message>
     <message>
         <source>This is experimental software.</source>
-        <translation>Este é um software experimental.</translation>
+        <translation>Bu, deneysel bir yazılımdır.</translation>
     </message>
     <message>
         <source>Transaction amount too small</source>
-        <translation>Quantia da transação muito pequena</translation>
+        <translation>Muamele meblağı çok düşük</translation>
     </message>
     <message>
         <source>Transaction created successfully.</source>
-        <translation>Transação criada com sucesso.</translation>
+        <translation>İşlem başarıyla oluşturuldu.</translation>
     </message>
     <message>
         <source>Transaction fees are too high.</source>
-        <translation>Taxa de transação muito alta.</translation>
+        <translation>İşlem ücretleri çok yüksek.</translation>
     </message>
     <message>
         <source>Transaction not valid.</source>
-        <translation>Transação inválida.</translation>
+        <translation>İşlem geçerli değil.</translation>
     </message>
     <message>
         <source>Transaction too large for fee policy</source>
-        <translation>Transação muito grande para a política de tarifas</translation>
+        <translation>Ücret politikası için işlem çok büyük</translation>
     </message>
     <message>
         <source>Unable to bind to %s on this computer (bind returned error %s)</source>
-        <translation>Impossível abrir %s neste computador (bind retornou o erro %s)</translation>
+        <translation>Bu bilgisayarda %s ögesine bağlanılamadı (bağlanma %s hatasını verdi)</translation>
     </message>
     <message>
         <source>Unable to sign spork message, wrong key?</source>
-        <translation>Impossível assinar mensagem spork, chave incorreta?</translation>
+        <translation>Spork mesajı imzalanamadı, anahtar mı yanlış?</translation>
     </message>
     <message>
         <source>Unknown network specified in -onlynet: '%s'</source>
-        <translation>Rede desconhecida fornecida em -onlynet: '%s'</translation>
+        <translation>-onlynet için bilinmeyen bir şebeke belirtildi: '%s'</translation>
     </message>
     <message>
         <source>Unknown state: id = %u</source>
-        <translation>Estado desconhecido: id = %u</translation>
+        <translation>Bilinmeyen durum: id = %u</translation>
     </message>
     <message>
         <source>Username for JSON-RPC connections</source>
-        <translation>Nome de usuario para conexão JSON-RPC</translation>
+        <translation>JSON-RPC bağlantıları için kullanıcı ismi</translation>
     </message>
     <message>
         <source>Verifying blocks...</source>
-        <translation>Verificando blocos...</translation>
+        <translation>Bloklar kontrol ediliyor...</translation>
     </message>
     <message>
         <source>Verifying wallet...</source>
-        <translation>Verificando carteira...</translation>
+        <translation>Cüzdan kontrol ediliyor...</translation>
     </message>
     <message>
         <source>Very low number of keys left: %d</source>
-        <translation>Número muito baixo de chaves restantes: %d</translation>
+        <translation>Çok az sayıda anahtar kaldı: %d</translation>
     </message>
     <message>
         <source>Wallet %s resides outside data directory %s</source>
-        <translation>Carteira %s está fora do diretório de dados %s</translation>
+        <translation>%s cüzdan %s veri klasörünün dışında bulunuyor</translation>
     </message>
     <message>
         <source>Wallet is locked.</source>
-        <translation>Carteira está bloqueada.</translation>
+        <translation>Cüzdan kilitli.</translation>
     </message>
     <message>
         <source>Wallet options:</source>
-        <translation>Opções da carteira:</translation>
+        <translation>Cüzdan seçenekleri:</translation>
     </message>
     <message>
         <source>Wallet window title</source>
-        <translation>Título da janela da carteira</translation>
+        <translation>Cüzdan penceresi başlığı</translation>
     </message>
     <message>
         <source>Warning</source>
-        <translation>Atenção</translation>
+        <translation>Uyarı</translation>
     </message>
     <message>
         <source>Your entries added successfully.</source>
-        <translation>Suas entradas foram adicionadas com êxito.</translation>
+        <translation>Girdileriniz başarıyla eklendi.</translation>
     </message>
     <message>
         <source>Your transaction was accepted into the pool!</source>
-        <translation>Sua transação foi aceita na pool!</translation>
+        <translation>İşleminiz havuza kabul edildi!</translation>
     </message>
     <message>
         <source>Zapping all transactions from wallet...</source>
-        <translation>Fazendo o Zapping de todas as transações da wallet...</translation>
+        <translation>Cüzdandaki tüm muameleler kaldırılıyor...</translation>
     </message>
 </context>
 </TS>
\ No newline at end of file
diff --git a/src/qt/locale/dash_vi.ts b/src/qt/locale/dash_vi.ts
index 1639a053e256..e950edc8c892 100644
--- a/src/qt/locale/dash_vi.ts
+++ b/src/qt/locale/dash_vi.ts
@@ -793,10 +793,6 @@
         <source>Please switch to "List mode" to use this function.</source>
         <translation>Hãy chuyển về "Chế độ danh sách" để sử dụng tính năng này.</translation>
     </message>
-    <message>
-        <source>Non-anonymized input selected. &lt;b&gt;PrivateSend will be disabled.&lt;/b&gt;&lt;br&gt;&lt;br&gt;If you still want to use PrivateSend, please deselect all non-nonymized inputs first and then check PrivateSend checkbox again.</source>
-        <translation>Đầu vào không ẩn danh được chọn. &lt;b&gt; PrivateSend sẽ bị tắt.&lt;/b&gt;&lt;br&gt;&lt;br&gt;Nếu bạn vẫn muốn sử dụng PrivateSend, hãy bỏ chọn tất cả các đầu vào không ẩn danh trước và đánh dấu vào hộp PrivateSend lần nữa.</translation>
-    </message>
     <message>
         <source>(%1 locked)</source>
         <translation>(%1 được khoá)</translation>
@@ -834,73 +830,6 @@
         <translation>không áp dụng</translation>
     </message>
 </context>
-<context>
-    <name>DarksendConfig</name>
-    <message>
-        <source>Configure PrivateSend</source>
-        <translation>Cấu hình PrivateSend</translation>
-    </message>
-    <message>
-        <source>Basic Privacy</source>
-        <translation>Mức Riêng tư Cơ bản</translation>
-    </message>
-    <message>
-        <source>High Privacy</source>
-        <translation>Mức Riêng tư Cao</translation>
-    </message>
-    <message>
-        <source>Maximum Privacy</source>
-        <translation>Mức Riêng tư Tối đa</translation>
-    </message>
-    <message>
-        <source>Please select a privacy level.</source>
-        <translation>Hãy chọn mức độ riêng tư.</translation>
-    </message>
-    <message>
-        <source>Use 2 separate masternodes to mix funds up to 1000 DASH</source>
-        <translation>Sử dụng 2 masternode khác nhau để trộn số tiền lên đến 1000 DASH</translation>
-    </message>
-    <message>
-        <source>Use 8 separate masternodes to mix funds up to 1000 DASH</source>
-        <translation>Sử dụng 8 masternode khác nhau để trộn số tiền lên đến 1000 DASH</translation>
-    </message>
-    <message>
-        <source>Use 16 separate masternodes</source>
-        <translation>Sử dụng 16 masternode khác nhau</translation>
-    </message>
-    <message>
-        <source>This option is the quickest and will cost about ~0.025 DASH to anonymize 1000 DASH</source>
-        <translation>Tuỳ chọn này là nhanh nhất và sẽ mất chi phí khoảng ~0.025 DASH để ẩn danh 1000 DASH</translation>
-    </message>
-    <message>
-        <source>This option is moderately fast and will cost about 0.05 DASH to anonymize 1000 DASH</source>
-        <translation>Tuỳ chọn này là tương đối nhanh và sẽ mất chi phí khoảng ~0.05 DASH để ẩn danh 1000 DASH</translation>
-    </message>
-    <message>
-        <source>0.1 DASH per 1000 DASH you anonymize.</source>
-        <translation>0.1 DASH cho mỗi 1000 DASH bạn muốn ẩn danh.</translation>
-    </message>
-    <message>
-        <source>This is the slowest and most secure option. Using maximum anonymity will cost</source>
-        <translation>Đây là tuỳ chọn chậm nhất và an toàn nhất. Sử dụng mức vô danh cao nhất sẽ tốn kém</translation>
-    </message>
-    <message>
-        <source>PrivateSend Configuration</source>
-        <translation>Cấu hình của PrivateSend</translation>
-    </message>
-    <message>
-        <source>PrivateSend was successfully set to basic (%1 and 2 rounds). You can change this at any time by opening Dash's configuration screen.</source>
-        <translation>PrivateSend đã được thiết lập thành công về mức cơ bản (%1 và 2 vòng). Bạn có thể thay đổi nó bất cứ thời gian nào bằng cách mở chức năng cấu hình của Dash.</translation>
-    </message>
-    <message>
-        <source>PrivateSend was successfully set to high (%1 and 8 rounds). You can change this at any time by opening Dash's configuration screen.</source>
-        <translation>PrivateSend đã được thiết lập thành công ở mức cao (%1 và 8 vòng). Bạn có thể thay đổi nó bất cứ lúc nào bằng cách mở chức năng cấu hình Dash.</translation>
-    </message>
-    <message>
-        <source>PrivateSend was successfully set to maximum (%1 and 16 rounds). You can change this at any time by opening Dash's configuration screen.</source>
-        <translation>PrivateSend đã được thiết lập thành công ở mức tối đa (%1 và 16 vòng). Bạn có thể thay đổi nó bất cứ thời gian nào bằng cách mở chức năng cấu hình của Dash.</translation>
-    </message>
-</context>
 <context>
     <name>EditAddressDialog</name>
     <message>
@@ -1037,11 +966,7 @@
         <source>PrivateSend information</source>
         <translation>Thông tin PrivateSend</translation>
     </message>
-    <message>
-        <source>&lt;h3&gt;PrivateSend Basics&lt;/h3&gt; PrivateSend gives you true financial privacy by obscuring the origins of your funds. All the Dash in your wallet is comprised of different "inputs" which you can think of as separate, discrete coins.&lt;br&gt; PrivateSend uses an innovative process to mix your inputs with the inputs of two other people, without having your coins ever leave your wallet. You retain control of your money at all times.&lt;hr&gt; &lt;b&gt;The PrivateSend process works like this:&lt;/b&gt;&lt;ol type="1"&gt; &lt;li&gt;PrivateSend begins by breaking your transaction inputs down into standard denominations. These denominations are 0.01 DASH, 0.1 DASH, 1 DASH and 10 DASH -- sort of like the paper money you use every day.&lt;/li&gt; &lt;li&gt;Your wallet then sends requests to specially configured software nodes on the network, called "masternodes." These masternodes are informed then that you are interested in mixing a certain denomination. No identifiable information is sent to the masternodes, so they never know "who" you are.&lt;/li&gt; &lt;li&gt;When two other people send similar messages, indicating that they wish to mix the same denomination, a mixing session begins. The masternode mixes up the inputs and instructs all three users' wallets to pay the now-transformed input back to themselves. Your wallet pays that denomination directly to itself, but in a different address (called a change address).&lt;/li&gt; &lt;li&gt;In order to fully obscure your funds, your wallet must repeat this process a number of times with each denomination. Each time the process is completed, it's called a "round." Each round of PrivateSend makes it exponentially more difficult to determine where your funds originated.&lt;/li&gt; &lt;li&gt;This mixing process happens in the background without any intervention on your part. When you wish to make a transaction, your funds will already be anonymized. No additional waiting is required.&lt;/li&gt; &lt;/ol&gt; &lt;hr&gt;&lt;b&gt;IMPORTANT:&lt;/b&gt; Your wallet only contains 1000 of these "change addresses." Every time a mixing event happens, up to 9 of your addresses are used up. This means those 1000 addresses last for about 100 mixing events. When 900 of them are used, your wallet must create more addresses. It can only do this, however, if you have automatic backups enabled.&lt;br&gt; Consequently, users who have backups disabled will also have PrivateSend disabled. &lt;hr&gt;For more info see &lt;a href="https://dashpay.atlassian.net/wiki/display/DOC/PrivateSend"&gt;https://dashpay.atlassian.net/wiki/display/DOC/PrivateSend&lt;/a&gt;         </source>
-        <translation>&lt;h3&gt;Cơ bản về PrivateSend&lt;/h3&gt; PrivateSend cho bạn sự thực sự riêng tư về tài chính bằng việc che dấu những nguồn cung. Tất cả Dash trong ví của bạn bao gồm những "nguồn" khác nhau mà bạn nghĩ đó là các coin riêng biệt và rời rạc.&lt;br&gt; PrivateSend sử dụng một tiến trình độc đáo để trộn các đầu vào của bạn với đầu vào của những người khác, mà không làm cho các coin rời khỏi ví của bạn. Bạn vẫn giữ quyền kiểm soát tiền của bạn bất cứ lúc nào..&lt;hr&gt; &lt;b&gt;Quá trình PrivateSend làm việc như sau: &lt;/b&gt; &lt;ol type="1"&gt; &lt;li&gt;PrivateSend bắt đầu bằng việc chia các giao dịch đầu vào của bạn thành những mệnh giá chuẩn. Những mệnh giá đó là 0.01 DASH, 0.1 DASH, 1 DASH, và 10 DASH -- cũng giống như các mệnh giá trên tiền giấy mà bạn sử dụng hàng ngày.&lt;li&gt; &lt;li&gt;Ví của bạn sau đó gửi yêu cầu đến những nút phần mềm được cấu hình đặc biệt trên mạng gọi là các "masternode". Những masternode được báo rằng bạn quan tâm đến việc xáo trộn một mệnh giá nào đó. Không có thông tin định danh nào được gửi đến cho các masternode, và như vậy họ không bao giờ biết bạn "là ai".&lt;/li&gt; &lt;li&gt;Khi hai người khác nhau gửi những thông điệp tương tự, có nghĩa là họ muốn xáo trộn cùng loại mệnh giá, một phiên xáo trộn bắt đầu.Masternode xáo trộn các đầu vào và hướng dẫn tất cả ví của tất cả ba người dùng để trả đầu vào đã được chuyển đổi trở lại cho chính họ. Ví của bạn sẽ trả mệnh giá đó trực tiếp cho nó, nhưng với một địa chỉ khác (được gọi là địa chỉ trả tiền lẻ).&lt;/li&gt; &lt;/li&gt;Để thực sự che khuất nguồn tiền của bạn, ví của bạn phải lặp lại quy trình đó một số lần với mỗi mệnh giá nhất định. Mỗi lần tiến trình hoàn tất, nó được gọi là một "vòng". Mỗi vòng của PrivateSend làm nên độ khó bậc số mũ để xác định nguồn tiền của bạn đến từ đâu.&lt;/li&gt; &lt;li&gt;Quá trình xáo trộn này xảy ra trong chế độ nền mà không xen vào những việc khác của bạn. Khi bạn muốn làm một giao dịch, nguồn tiền của bạn đã được ẩn danh hoá rồi. Do đó bạn không cần phải đợi thêm gì nữa.&lt;/li&gt; &lt;/ol&gt; &lt;hr&gt; &lt;b&gt;QUAN TRỌNG:&lt;/b&gt; Ví của bạn chỉ có chứa 1000 "địa chỉ tiền trả lại". Mỗi lần một sự kiện xáo trộn xảy ra, có đến 9 địa chỉ sẽ được sử dụng. Điều đó có nghĩa với ví mới với 1000 địa chỉ thì dùng cho 100 lần trộn. Khi 900 địa chỉ đã được sử dụng, ví của bạn phải tạo thêm các địa chỉ mới. Nó chỉ có thể làm việc đó, tuy nhiên, nếu bạn có chế độ tự động backup được bật&lt;br&gt; Kết quả là, những người dùng mà chế độ backup bị tắt sẽ có chế độ PrivateSend cũng bị tắt.&lt;hr&gt; Để biết thêm thông tin hãy xem &lt;a href="https://dashpay.atlassian.net/wiki/display/DOC/PrivateSend"&gt;https://dashpay.atlassian.net/wiki/display/DOC/PrivateSend&lt;/a&gt;</translation>
-    </message>
-</context>
+    </context>
 <context>
     <name>Intro</name>
     <message>
@@ -1829,10 +1754,6 @@ https://www.transifex.com/projects/p/dash/</translation>
         <source>We are about to create a new automatic backup for you, however &lt;span style='color:red;'&gt; you should always make sure you have backups saved in some safe place&lt;/span&gt;!</source>
         <translation>Chúng tôi sẽ tạo một bản tự động backup cho bạn, tuy nhiên &lt;span style='color:red;'&gt;bạn nên luôn chắc chắn rằng bạn đã lưu backup ở nơi nào đó an toàn&lt;/span&gt;!</translation>
     </message>
-    <message>
-        <source>Note: You can turn this message off in options.</source>
-        <translation>Chú ý: Bạn đã tắt thông báo này trong phần tuỳ chọn.</translation>
-    </message>
     <message>
         <source>WARNING! Something went wrong on automatic backup</source>
         <translation>CHÚ Ý: Có gì đó có vấn đề khi đang tự động backup</translation>
@@ -5012,10 +4933,6 @@ https://www.transifex.com/projects/p/dash/</translation>
         <source>Set lowest fee rate (in %s/kB) for transactions to be included in block creation. (default: %s)</source>
         <translation>Set lowest fee rate (in %s/kB) for transactions to be included in block creation. (default: %s)</translation>
     </message>
-    <message>
-        <source>Show N confirmations for a successfully locked transaction (%u-%u, default: %u)</source>
-        <translation>Hiển thị N xác thực cho một giao dịch được khoá thành công (%u-%u, ngầm định: %u)</translation>
-    </message>
     <message>
         <source>This is the transaction fee you may pay when fee estimates are not available.</source>
         <translation>This is the transaction fee you may pay when fee estimates are not available.</translation>
diff --git a/src/qt/locale/dash_zh_CN.ts b/src/qt/locale/dash_zh_CN.ts
index a1626bb619c1..707d37ef439a 100644
--- a/src/qt/locale/dash_zh_CN.ts
+++ b/src/qt/locale/dash_zh_CN.ts
@@ -793,10 +793,6 @@
         <source>Please switch to "List mode" to use this function.</source>
         <translation>请切换到“列表模式”来使用此功能。</translation>
     </message>
-    <message>
-        <source>Non-anonymized input selected. &lt;b&gt;PrivateSend will be disabled.&lt;/b&gt;&lt;br&gt;&lt;br&gt;If you still want to use PrivateSend, please deselect all non-nonymized inputs first and then check PrivateSend checkbox again.</source>
-        <translation>已选择非匿名输入。&lt;b&gt;匿名发送将会被禁用。&lt;/b&gt;&lt;br&gt;&lt;br&gt;如果你仍然想使用匿名发送功能，请先取消所选的非匿名输入，然后再勾选匿名发送。</translation>
-    </message>
     <message>
         <source>(%1 locked)</source>
         <translation>(%1 锁定)</translation>
@@ -834,73 +830,6 @@
         <translation>不可用</translation>
     </message>
 </context>
-<context>
-    <name>DarksendConfig</name>
-    <message>
-        <source>Configure PrivateSend</source>
-        <translation>配置匿名发送</translation>
-    </message>
-    <message>
-        <source>Basic Privacy</source>
-        <translation>基本隐私</translation>
-    </message>
-    <message>
-        <source>High Privacy</source>
-        <translation>高度隐私</translation>
-    </message>
-    <message>
-        <source>Maximum Privacy</source>
-        <translation>最大隐私</translation>
-    </message>
-    <message>
-        <source>Please select a privacy level.</source>
-        <translation>请选择隐私等级。</translation>
-    </message>
-    <message>
-        <source>Use 2 separate masternodes to mix funds up to 1000 DASH</source>
-        <translation>使用2个独立的主节点来混合最多1000个达世币</translation>
-    </message>
-    <message>
-        <source>Use 8 separate masternodes to mix funds up to 1000 DASH</source>
-        <translation>使用8个独立的主节点来混合最多1000个达世币</translation>
-    </message>
-    <message>
-        <source>Use 16 separate masternodes</source>
-        <translation>使用16个独立主节点</translation>
-    </message>
-    <message>
-        <source>This option is the quickest and will cost about ~0.025 DASH to anonymize 1000 DASH</source>
-        <translation>此选项为最快速度，需要支付约0.025达世币/1000达世币的匿名处理费用。</translation>
-    </message>
-    <message>
-        <source>This option is moderately fast and will cost about 0.05 DASH to anonymize 1000 DASH</source>
-        <translation>此选项为一般速度，需要支付约0.05达世币/1000达世币的匿名处理费用。</translation>
-    </message>
-    <message>
-        <source>0.1 DASH per 1000 DASH you anonymize.</source>
-        <translation>0.1达世币/1000达世币的匿名处理费用。</translation>
-    </message>
-    <message>
-        <source>This is the slowest and most secure option. Using maximum anonymity will cost</source>
-        <translation>此选项提供最慢速度却最安全的匿名服务。耗费最多的匿名处理费</translation>
-    </message>
-    <message>
-        <source>PrivateSend Configuration</source>
-        <translation>匿名发送设置</translation>
-    </message>
-    <message>
-        <source>PrivateSend was successfully set to basic (%1 and 2 rounds). You can change this at any time by opening Dash's configuration screen.</source>
-        <translation>匿名发送已成功设置为基本 (%1 和2次循环)。您可以随时打开达世币配置窗口来进行修改。</translation>
-    </message>
-    <message>
-        <source>PrivateSend was successfully set to high (%1 and 8 rounds). You can change this at any time by opening Dash's configuration screen.</source>
-        <translation>匿名发送已成功设置为高(%1到8次循环)。您可以随时打开达世币配置窗口来进行修改。</translation>
-    </message>
-    <message>
-        <source>PrivateSend was successfully set to maximum (%1 and 16 rounds). You can change this at any time by opening Dash's configuration screen.</source>
-        <translation>匿名发送已成功设置为最高(%1到16次循环)。您可以随时打开达世币配置窗口来进行修改。</translation>
-    </message>
-</context>
 <context>
     <name>EditAddressDialog</name>
     <message>
@@ -1037,11 +966,7 @@
         <source>PrivateSend information</source>
         <translation>匿名发送信息</translation>
     </message>
-    <message>
-        <source>&lt;h3&gt;PrivateSend Basics&lt;/h3&gt; PrivateSend gives you true financial privacy by obscuring the origins of your funds. All the Dash in your wallet is comprised of different "inputs" which you can think of as separate, discrete coins.&lt;br&gt; PrivateSend uses an innovative process to mix your inputs with the inputs of two other people, without having your coins ever leave your wallet. You retain control of your money at all times.&lt;hr&gt; &lt;b&gt;The PrivateSend process works like this:&lt;/b&gt;&lt;ol type="1"&gt; &lt;li&gt;PrivateSend begins by breaking your transaction inputs down into standard denominations. These denominations are 0.01 DASH, 0.1 DASH, 1 DASH and 10 DASH -- sort of like the paper money you use every day.&lt;/li&gt; &lt;li&gt;Your wallet then sends requests to specially configured software nodes on the network, called "masternodes." These masternodes are informed then that you are interested in mixing a certain denomination. No identifiable information is sent to the masternodes, so they never know "who" you are.&lt;/li&gt; &lt;li&gt;When two other people send similar messages, indicating that they wish to mix the same denomination, a mixing session begins. The masternode mixes up the inputs and instructs all three users' wallets to pay the now-transformed input back to themselves. Your wallet pays that denomination directly to itself, but in a different address (called a change address).&lt;/li&gt; &lt;li&gt;In order to fully obscure your funds, your wallet must repeat this process a number of times with each denomination. Each time the process is completed, it's called a "round." Each round of PrivateSend makes it exponentially more difficult to determine where your funds originated.&lt;/li&gt; &lt;li&gt;This mixing process happens in the background without any intervention on your part. When you wish to make a transaction, your funds will already be anonymized. No additional waiting is required.&lt;/li&gt; &lt;/ol&gt; &lt;hr&gt;&lt;b&gt;IMPORTANT:&lt;/b&gt; Your wallet only contains 1000 of these "change addresses." Every time a mixing event happens, up to 9 of your addresses are used up. This means those 1000 addresses last for about 100 mixing events. When 900 of them are used, your wallet must create more addresses. It can only do this, however, if you have automatic backups enabled.&lt;br&gt; Consequently, users who have backups disabled will also have PrivateSend disabled. &lt;hr&gt;For more info see &lt;a href="https://dashpay.atlassian.net/wiki/display/DOC/PrivateSend"&gt;https://dashpay.atlassian.net/wiki/display/DOC/PrivateSend&lt;/a&gt;         </source>
-        <translation>&lt;h3&gt;匿名发送基础知识&lt;/h3&gt;匿名发送通过隐藏您的资金来源为您提供真正的财务隐私。您的钱包中所有的达世币都由不同的“输入”组成，您可以将其视为分开的离散硬币。&lt;br&gt;匿名发送使用创新的方法将您的输入与其他两个人的输入相结合，而过程中不会让您的达世币离开您的钱包。每时每刻，您仍然控制着您的钱。&lt;hr&gt;&lt;b&gt;匿名发送的运作原理如下：&lt;/b&gt;&lt;ol type="1"&gt;&lt;li&gt;匿名发送首先将您的交易分柝成多个标准面额的交易。这些标准面额分别为0.01 DASH，0.1 DASH，1 DASH和10 DASH --有点像您每天使用的纸币。&lt;/li&gt;&lt;li&gt;您的钱包然后发送请求到网络上有专门配置的软件节点，称为“主节点”。这些主节点会收到您希望混合一些资金的通知。没有可识别的信息发送到主节点，所以他们永远不会知道你是“谁”。&lt;li&gt;当另外两个人发送类似的消息时，表示希望混合相同的面额的话，混合会话就会开始。相关的主节点会混合这些输入，并指示所有三个用户的钱包将已经转换了输入的交易支付给自己。您的钱包直接支付给自己，但是付给不同的位址（称之为找零地址）。&lt;/li&gt;&lt;li&gt;为了完全掩盖您的资金来源，您的钱包必须以每个面额来重复此过程数次。每次这个过程完成后，都称之为一个“循环”。每个循环的匿名发送都会令确定您的资金来源的工作倍加困难。&lt;/li&gt;&lt;li&gt;这种混合过程发生在后台，而不需要您进行任何操作。当您想进行交易时，您的资金将已被匿名处理。不需再花额外的时间等待。&lt;/li&gt;&lt;/ol&gt;&lt;hr&gt;重要：&lt;b&gt;您的钱包只能拥有1000个“找零地址”。每次混合事件发生时，最多会使用9个找零地址。这意味着这1000个地址可以容许100次的混合事件。当其的中900个已经被使用后，您的钱包必须创建更多的地址。如果您启用了自动备份，则只能够这样做。&lt;br&gt;因此，禁用备份的用户也将禁用匿名发送。&lt;hr&gt;如欲了解更多信息请参阅&lt;a href="https://dashpay.atlassian.net/wiki/display/DOC/PrivateSend"&gt;https://dashpay.atlassian.net/wiki/display/DOC/PrivateSend&lt;/a&gt;</translation>
-    </message>
-</context>
+    </context>
 <context>
     <name>Intro</name>
     <message>
@@ -1825,10 +1750,6 @@ https://www.transifex.com/projects/p/dash/</translation>
         <source>We are about to create a new automatic backup for you, however &lt;span style='color:red;'&gt; you should always make sure you have backups saved in some safe place&lt;/span&gt;!</source>
         <translation>我们即将为您创建一个新的自动备份，但&lt;span style='color:red;'&gt;您应该始终确保您有另外的一些备份保存在安全的位置&lt;/span&gt;！</translation>
     </message>
-    <message>
-        <source>Note: You can turn this message off in options.</source>
-        <translation>注意：您在选项中关闭了这项信息。</translation>
-    </message>
     <message>
         <source>WARNING! Something went wrong on automatic backup</source>
         <translation>警告！自动备份出现问题</translation>
@@ -5000,10 +4921,6 @@ https://www.transifex.com/projects/p/dash/</translation>
         <source>Set lowest fee rate (in %s/kB) for transactions to be included in block creation. (default: %s)</source>
         <translation>设定生成区块时，所要包含交易每千字节的最低手续费（单位是%s）。（默认：%s）</translation>
     </message>
-    <message>
-        <source>Show N confirmations for a successfully locked transaction (%u-%u, default: %u)</source>
-        <translation>显示N个确认为一个成功锁定的交易(%u-%u, 默认: %u)</translation>
-    </message>
     <message>
         <source>This is the transaction fee you may pay when fee estimates are not available.</source>
         <translation>这是在费用估计不可用时你可能会支付的交易费。</translation>
diff --git a/src/qt/locale/dash_zh_TW.ts b/src/qt/locale/dash_zh_TW.ts
index 9dc7a4f003a1..ec612c0c2ba8 100644
--- a/src/qt/locale/dash_zh_TW.ts
+++ b/src/qt/locale/dash_zh_TW.ts
@@ -793,10 +793,6 @@
         <source>Please switch to "List mode" to use this function.</source>
         <translation>請切換到“列表模式”來使用此功能。</translation>
     </message>
-    <message>
-        <source>Non-anonymized input selected. &lt;b&gt;PrivateSend will be disabled.&lt;/b&gt;&lt;br&gt;&lt;br&gt;If you still want to use PrivateSend, please deselect all non-nonymized inputs first and then check PrivateSend checkbox again.</source>
-        <translation>選擇了非匿名的輸入。 &lt;b&gt; 匿名發送將會被禁用。&lt;/ b&gt;&lt;br&gt; &lt;br&gt;如果你仍然想用匿名發送，請先取消選取所有非匿名的輸入，然後再勾選匿名發送的核取方塊</translation>
-    </message>
     <message>
         <source>(%1 locked)</source>
         <translation>(%1 鎖定)</translation>
@@ -834,73 +830,6 @@
         <translation>不適用</translation>
     </message>
 </context>
-<context>
-    <name>DarksendConfig</name>
-    <message>
-        <source>Configure PrivateSend</source>
-        <translation>配置匿名發送</translation>
-    </message>
-    <message>
-        <source>Basic Privacy</source>
-        <translation>基本隱私</translation>
-    </message>
-    <message>
-        <source>High Privacy</source>
-        <translation>高度隱私</translation>
-    </message>
-    <message>
-        <source>Maximum Privacy</source>
-        <translation>最大隱私</translation>
-    </message>
-    <message>
-        <source>Please select a privacy level.</source>
-        <translation>請選擇穩私級別。</translation>
-    </message>
-    <message>
-        <source>Use 2 separate masternodes to mix funds up to 1000 DASH</source>
-        <translation>使用2個獨立的主節點來混合最高達1000達世幣的資金</translation>
-    </message>
-    <message>
-        <source>Use 8 separate masternodes to mix funds up to 1000 DASH</source>
-        <translation>使用8個獨立的主節點來混合最高達1000達世幣的資金</translation>
-    </message>
-    <message>
-        <source>Use 16 separate masternodes</source>
-        <translation>使用16個獨立的主節點</translation>
-    </message>
-    <message>
-        <source>This option is the quickest and will cost about ~0.025 DASH to anonymize 1000 DASH</source>
-        <translation>這個是最快的選項，將耗費約~0.025達世幣作為匿名處理1000達世幣的費用</translation>
-    </message>
-    <message>
-        <source>This option is moderately fast and will cost about 0.05 DASH to anonymize 1000 DASH</source>
-        <translation>這個是一般的選項，將耗費約0.05達世幣作為匿名處理1000達世幣的費用</translation>
-    </message>
-    <message>
-        <source>0.1 DASH per 1000 DASH you anonymize.</source>
-        <translation>每1000達世幣耗費0.1達世幣作為匿名處理費用</translation>
-    </message>
-    <message>
-        <source>This is the slowest and most secure option. Using maximum anonymity will cost</source>
-        <translation>這是最慢的和最安全的選頁。耗費最多的匿名處理費</translation>
-    </message>
-    <message>
-        <source>PrivateSend Configuration</source>
-        <translation>匿名發送配置</translation>
-    </message>
-    <message>
-        <source>PrivateSend was successfully set to basic (%1 and 2 rounds). You can change this at any time by opening Dash's configuration screen.</source>
-        <translation>匿名發送已成功設置為一般(%1 到2次循環)。你可以隨時打開達世幣配置窗口來修改。</translation>
-    </message>
-    <message>
-        <source>PrivateSend was successfully set to high (%1 and 8 rounds). You can change this at any time by opening Dash's configuration screen.</source>
-        <translation>匿名發送已成功設置為高(%1 到8次循環)。你可以隨時打開達世幣配置窗口來修改。</translation>
-    </message>
-    <message>
-        <source>PrivateSend was successfully set to maximum (%1 and 16 rounds). You can change this at any time by opening Dash's configuration screen.</source>
-        <translation>匿名發送已成功設置為最高(%1 到16次循環)。你可以隨時打開達世幣配置窗口來修改。</translation>
-    </message>
-</context>
 <context>
     <name>EditAddressDialog</name>
     <message>
@@ -1037,10 +966,6 @@
         <source>PrivateSend information</source>
         <translation>匿名發送資訊</translation>
     </message>
-    <message>
-        <source>&lt;h3&gt;PrivateSend Basics&lt;/h3&gt; PrivateSend gives you true financial privacy by obscuring the origins of your funds. All the Dash in your wallet is comprised of different "inputs" which you can think of as separate, discrete coins.&lt;br&gt; PrivateSend uses an innovative process to mix your inputs with the inputs of two other people, without having your coins ever leave your wallet. You retain control of your money at all times.&lt;hr&gt; &lt;b&gt;The PrivateSend process works like this:&lt;/b&gt;&lt;ol type="1"&gt; &lt;li&gt;PrivateSend begins by breaking your transaction inputs down into standard denominations. These denominations are 0.01 DASH, 0.1 DASH, 1 DASH and 10 DASH -- sort of like the paper money you use every day.&lt;/li&gt; &lt;li&gt;Your wallet then sends requests to specially configured software nodes on the network, called "masternodes." These masternodes are informed then that you are interested in mixing a certain denomination. No identifiable information is sent to the masternodes, so they never know "who" you are.&lt;/li&gt; &lt;li&gt;When two other people send similar messages, indicating that they wish to mix the same denomination, a mixing session begins. The masternode mixes up the inputs and instructs all three users' wallets to pay the now-transformed input back to themselves. Your wallet pays that denomination directly to itself, but in a different address (called a change address).&lt;/li&gt; &lt;li&gt;In order to fully obscure your funds, your wallet must repeat this process a number of times with each denomination. Each time the process is completed, it's called a "round." Each round of PrivateSend makes it exponentially more difficult to determine where your funds originated.&lt;/li&gt; &lt;li&gt;This mixing process happens in the background without any intervention on your part. When you wish to make a transaction, your funds will already be anonymized. No additional waiting is required.&lt;/li&gt; &lt;/ol&gt; &lt;hr&gt;&lt;b&gt;IMPORTANT:&lt;/b&gt; Your wallet only contains 1000 of these "change addresses." Every time a mixing event happens, up to 9 of your addresses are used up. This means those 1000 addresses last for about 100 mixing events. When 900 of them are used, your wallet must create more addresses. It can only do this, however, if you have automatic backups enabled.&lt;br&gt; Consequently, users who have backups disabled will also have PrivateSend disabled. &lt;hr&gt;For more info see &lt;a href="https://dashpay.atlassian.net/wiki/display/DOC/PrivateSend"&gt;https://dashpay.atlassian.net/wiki/display/DOC/PrivateSend&lt;/a&gt;         </source>
-        <translation>&lt;h3&gt;匿名發送基礎知識&lt;/h3&gt; 匿名發送通過隱藏您的資金來源為您提供真正的財務隱私。您的錢包中所有的達世幣都由不同的“輸入”組成，您可以將其視為分開的離散硬幣。&lt;br&gt; 匿名發送使用創新的方法將您的輸入與其他兩個人的輸入相結合，而過程中不會讓您的達世幣離開您的錢包。每時每刻，您仍然控制著您的錢。&lt;hr&gt; &lt;b&gt;匿名發送的運作原理如下:&lt;/b&gt;&lt;ol type="1"&gt; &lt;li&gt;匿名發送首先將您的交易分柝成多個標準面額的交易。這些標準面額分別為0.01 DASH, 0.1 DASH, 1 DASH 和10 DASH --有點像您每天使用的紙幣。&lt;/li&gt; &lt;li&gt;您的錢包然後發送請求到網絡上有專門配置的軟件節點，稱為“主節點”。這些主節點會收到您希望混合一些資金的通知。沒有可識別的信息發送到主節點，所以他們永遠不會知道你是"誰"。&lt;/li&gt; &lt;li&gt;當另外兩個人發送類似的消息時，表示希望混合相同的面額的話，混合會話就會開始。相關的主節點會混合這些輸入，並指示所有三個用戶的錢包將已經轉換了輸入的交易支付給自己。你的錢包直接支付給自己，但是付給不同的位址 (稱之為找零位址)。&lt;/li&gt; &lt;li&gt;為了完全掩蓋您的資金來源，您的錢包必須以每個面額來重複此過程數次。每次這個過程完成後，都稱之為一個 "循環"。每個循環的匿名發送都會令確定您的資金來源的工作倍加困難。&lt;/li&gt; &lt;li&gt;這種混合過程發生在後台，而不需要您進行任何操作。當您想進行交易時，您的資金將已被匿名處理。不需再花額外的時間等待。&lt;/li&gt; &lt;/ol&gt; &lt;hr&gt;&lt;b&gt;重要:&lt;/b&gt;您的錢包只能擁有1000個"找零位址。" 每次混合事件發生時，最多會使用9個找零位址。這意味著這1000個位址可以容許100次的混合事件。當其的中900個已經被使用後，您的錢包必須創建更多的位址。如果您啟用了自動備份，則只能夠這樣做。&lt;br&gt;因此，禁用備份的用戶也將禁用匿名發送。&lt;hr&gt;如欲了解更多信息請參閱&lt;a href="https://dashpay.atlassian.net/wiki/display/DOC/PrivateSend"&gt;https://dashpay.atlassian.net/wiki/display/DOC/PrivateSend&lt;/a&gt;</translation>
-    </message>
 </context>
 <context>
     <name>Intro</name>
@@ -1829,10 +1754,6 @@ https://www.transifex.com/projects/p/dash/</translation>
         <source>We are about to create a new automatic backup for you, however &lt;span style='color:red;'&gt; you should always make sure you have backups saved in some safe place&lt;/span&gt;!</source>
         <translation>我們即將為您創建一個新的自動備份，但&lt;span style='color.red;'&gt;您應該始終確保 您有另外的一些備份保存在安全的位置&lt;/span&gt;!</translation>
     </message>
-    <message>
-        <source>Note: You can turn this message off in options.</source>
-        <translation>注意 : 您在選項中關閉了這項訊息。</translation>
-    </message>
     <message>
         <source>WARNING! Something went wrong on automatic backup</source>
         <translation>警告! 自動備份出現問題</translation>
@@ -5012,10 +4933,6 @@ https://www.transifex.com/projects/p/dash/</translation>
         <source>Set lowest fee rate (in %s/kB) for transactions to be included in block creation. (default: %s)</source>
         <translation>設定製造區塊時，所要包含交易每千位元組的最低手續費(單位是 %s)。(預設值: %s)</translation>
     </message>
-    <message>
-        <source>Show N confirmations for a successfully locked transaction (%u-%u, default: %u)</source>
-        <translation>如果交易成功鎖定的話，則顯示N個確認信息 (%u-%u, 預設值: %u)</translation>
-    </message>
     <message>
         <source>This is the transaction fee you may pay when fee estimates are not available.</source>
         <translation>這是當預估手續費還沒計算出來時，付款交易預設會付的手續費。</translation>

From 262454791c4b4f783b2533d1b16b757a71eb5f7d Mon Sep 17 00:00:00 2001
From: UdjinM6 <UdjinM6@users.noreply.github.com>
Date: Wed, 7 Nov 2018 10:39:25 +0300
Subject: [PATCH 249/400] Add 5th denom, drop deprecated logic and bump min PS
 version (#2318)

* Bump PS
- add 5th denom (0.001)
- always allow OP_RETURN in PS collaterals
- collateral amount is always 1/10 of the smallest denom
- bump MIN_PRIVATESEND_PEER_PROTO_VERSION to 70211

* drop backward compatibility in dsa/dsq serialization

* Use GetSmallestDenomination() in GetCollateralAmount()

* bump MIN_PRIVATESEND_PEER_PROTO_VERSION to 70212
---
 src/privatesend.cpp | 16 ++++------------
 src/privatesend.h   | 20 +++-----------------
 2 files changed, 7 insertions(+), 29 deletions(-)

diff --git a/src/privatesend.cpp b/src/privatesend.cpp
index a71b7a9f8725..e72e1d17d334 100644
--- a/src/privatesend.cpp
+++ b/src/privatesend.cpp
@@ -312,9 +312,7 @@ void CPrivateSend::InitStandardDenominations()
     vecStandardDenominations.push_back((1 * COIN) + 1000);
     vecStandardDenominations.push_back((.1 * COIN) + 100);
     vecStandardDenominations.push_back((.01 * COIN) + 10);
-    /* Disabled till we need them
-    vecStandardDenominations.push_back( (.001     * COIN)+1 );
-    */
+    vecStandardDenominations.push_back((.001 * COIN) + 1);
 }
 
 // check to make sure the collateral provided by the client is valid
@@ -329,8 +327,7 @@ bool CPrivateSend::IsCollateralValid(const CTransaction& txCollateral)
     for (const auto& txout : txCollateral.vout) {
         nValueOut += txout.nValue;
 
-        bool fAllowData = mnpayments.GetMinMasternodePaymentsProto() > 70208;
-        if (!txout.scriptPubKey.IsPayToPublicKeyHash() && !(fAllowData && txout.scriptPubKey.IsUnspendable())) {
+        if (!txout.scriptPubKey.IsPayToPublicKeyHash() && !txout.scriptPubKey.IsUnspendable()) {
             LogPrintf("CPrivateSend::IsCollateralValid -- Invalid Script, txCollateral=%s", txCollateral.ToString());
             return false;
         }
@@ -367,13 +364,8 @@ bool CPrivateSend::IsCollateralValid(const CTransaction& txCollateral)
 
 bool CPrivateSend::IsCollateralAmount(CAmount nInputAmount)
 {
-    if (mnpayments.GetMinMasternodePaymentsProto() > 70208) {
-        // collateral input can be anything between 1x and "max" (including both)
-        return (nInputAmount >= GetCollateralAmount() && nInputAmount <= GetMaxCollateralAmount());
-    } else { // <= 70208
-        // collateral input can be anything between 2x and "max" (including both)
-        return (nInputAmount >= GetCollateralAmount() * 2 && nInputAmount <= GetMaxCollateralAmount());
-    }
+    // collateral input can be anything between 1x and "max" (including both)
+    return (nInputAmount >= GetCollateralAmount() && nInputAmount <= GetMaxCollateralAmount());
 }
 
 /*  Create a nice string to show the denominations
diff --git a/src/privatesend.h b/src/privatesend.h
index d6e1b520da53..2e98823a63b4 100644
--- a/src/privatesend.h
+++ b/src/privatesend.h
@@ -24,7 +24,7 @@ static const int PRIVATESEND_QUEUE_TIMEOUT = 30;
 static const int PRIVATESEND_SIGNING_TIMEOUT = 15;
 
 //! minimum peer version accepted by mixing pool
-static const int MIN_PRIVATESEND_PEER_PROTO_VERSION = 70210;
+static const int MIN_PRIVATESEND_PEER_PROTO_VERSION = 70212;
 
 static const size_t PRIVATESEND_ENTRY_MAX_SIZE = 9;
 
@@ -118,11 +118,6 @@ class CPrivateSendAccept
     inline void SerializationOp(Stream& s, Operation ser_action)
     {
         READWRITE(nDenom);
-        int nVersion = s.GetVersion();
-        if (nVersion > 70208 && nVersion <= 70210) {
-            int nInputCount = 0;
-            READWRITE(nInputCount);
-        }
         READWRITE(txCollateral);
     }
 
@@ -179,7 +174,6 @@ class CPrivateSendQueue
 {
 public:
     int nDenom;
-    int nInputCount; // not used for anything but to calculate correct hash, remove after migration to 70211
     COutPoint masternodeOutpoint;
     int64_t nTime;
     bool fReady; //ready for submit
@@ -189,7 +183,6 @@ class CPrivateSendQueue
 
     CPrivateSendQueue() :
         nDenom(0),
-        nInputCount(0),
         masternodeOutpoint(COutPoint()),
         nTime(0),
         fReady(false),
@@ -200,7 +193,6 @@ class CPrivateSendQueue
 
     CPrivateSendQueue(int nDenom, COutPoint outpoint, int64_t nTime, bool fReady) :
         nDenom(nDenom),
-        nInputCount(0),
         masternodeOutpoint(outpoint),
         nTime(nTime),
         fReady(fReady),
@@ -215,10 +207,6 @@ class CPrivateSendQueue
     inline void SerializationOp(Stream& s, Operation ser_action)
     {
         READWRITE(nDenom);
-        int nVersion = s.GetVersion();
-        if (nVersion > 70208 && nVersion <= 70210) {
-            READWRITE(nInputCount);
-        }
         READWRITE(masternodeOutpoint);
         READWRITE(nTime);
         READWRITE(fReady);
@@ -390,8 +378,6 @@ class CPrivateSend
     CPrivateSend(CPrivateSend const&) = delete;
     CPrivateSend& operator=(CPrivateSend const&) = delete;
 
-    static const CAmount COLLATERAL = 0.001 * COIN;
-
     // static members
     static std::vector<CAmount> vecStandardDenominations;
     static std::map<uint256, CPrivateSendBroadcastTx> mapDSTX;
@@ -424,8 +410,8 @@ class CPrivateSend
 
     /// If the collateral is valid given by a client
     static bool IsCollateralValid(const CTransaction& txCollateral);
-    static CAmount GetCollateralAmount() { return COLLATERAL; }
-    static CAmount GetMaxCollateralAmount() { return COLLATERAL * 4; }
+    static CAmount GetCollateralAmount() { return GetSmallestDenomination() / 10; }
+    static CAmount GetMaxCollateralAmount() { return GetCollateralAmount() * 4; }
 
     static bool IsCollateralAmount(CAmount nInputAmount);
 

From adad3fcfe3d3a602933a679152590e8c8cb9b743 Mon Sep 17 00:00:00 2001
From: thephez <thephez@users.noreply.github.com>
Date: Thu, 8 Nov 2018 12:03:50 -0500
Subject: [PATCH 250/400] RPC: protx help corrections (#2422)

* RPC - Correct protx register_prepare help example

Use collateral hash and index instead of address

* RPC - Change protx register help ECDSA address to BLS operator key

* RPC - protx register_prepare help correction

Should direct to protx register help, not protx register_fund

* RPC - protx help typo
---
 src/rpc/rpcevo.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/rpc/rpcevo.cpp b/src/rpc/rpcevo.cpp
index 3f455d17c3ab..776e79cbb2b7 100644
--- a/src/rpc/rpcevo.cpp
+++ b/src/rpc/rpcevo.cpp
@@ -223,7 +223,7 @@ void protx_register_help()
             "2. collateralIndex      (numeric, required) The collateral transaction output index.\n"
             "3., 4., 5. ...          See help text of \"protx register_fund\"\n"
             "\nExamples:\n"
-            + HelpExampleCli("protx", "register \"0123456701234567012345670123456701234567012345670123456701234567\" 0 \"1.2.3.4:1234\" \"Xt9AMWaYSz7tR7Uo7gzXA3m4QmeWgrR3rr\" \"Xt9AMWaYSz7tR7Uo7gzXA3m4QmeWgrR3rr\" \"Xt9AMWaYSz7tR7Uo7gzXA3m4QmeWgrR3rr\" 0 \"XrVhS9LogauRJGJu2sHuryjhpuex4RNPSb\"")
+            + HelpExampleCli("protx", "register \"0123456701234567012345670123456701234567012345670123456701234567\" 0 \"1.2.3.4:1234\" \"Xt9AMWaYSz7tR7Uo7gzXA3m4QmeWgrR3rr\" \"93746e8731c57f87f79b3620a7982924e2931717d49540a85864bd543de11c43fb868fd63e501a1db37e19ed59ae6db4\" \"Xt9AMWaYSz7tR7Uo7gzXA3m4QmeWgrR3rr\" 0 \"XrVhS9LogauRJGJu2sHuryjhpuex4RNPSb\"")
     );
 }
 
@@ -235,7 +235,7 @@ void protx_register_prepare_help()
             "key and then passed to \"protx register_submit\". The prepared transaction will also contain inputs\n"
             "and outputs to cover fees.\n"
             "\nArguments:\n"
-            "1., 2., 3., ...         See help text of \"protx register_fund\".\n"
+            "1., 2., 3., ...         See help text of \"protx register\".\n"
             "\nResult:\n"
             "{                         (json object)\n"
             "  \"tx\" :                  (string) The serialized ProTx in hex format.\n"
@@ -244,7 +244,7 @@ void protx_register_prepare_help()
             "                          the collateral key.\n"
             "}\n"
             "\nExamples:\n"
-            + HelpExampleCli("protx", "register_prepare \"XrVhS9LogauRJGJu2sHuryjhpuex4RNPSb\" \"1.2.3.4:1234\" \"Xt9AMWaYSz7tR7Uo7gzXA3m4QmeWgrR3rr\" \"93746e8731c57f87f79b3620a7982924e2931717d49540a85864bd543de11c43fb868fd63e501a1db37e19ed59ae6db4\" \"Xt9AMWaYSz7tR7Uo7gzXA3m4QmeWgrR3rr\" 0 \"XrVhS9LogauRJGJu2sHuryjhpuex4RNPSb\"")
+            + HelpExampleCli("protx", "register_prepare \"0123456701234567012345670123456701234567012345670123456701234567\" 0 \"1.2.3.4:1234\" \"Xt9AMWaYSz7tR7Uo7gzXA3m4QmeWgrR3rr\" \"93746e8731c57f87f79b3620a7982924e2931717d49540a85864bd543de11c43fb868fd63e501a1db37e19ed59ae6db4\" \"Xt9AMWaYSz7tR7Uo7gzXA3m4QmeWgrR3rr\" 0 \"XrVhS9LogauRJGJu2sHuryjhpuex4RNPSb\"")
     );
 }
 
@@ -255,7 +255,7 @@ void protx_register_submit_help()
             "\nSubmits the specified ProTx to the network. This command will also sign the inputs of the transaction\n"
             "which were previously added by \"protx register_prepare\" to cover transaction fees\n"
             "\nArguments:\n"
-            "1. \"tx\"                 (string, required) The serialized transaction previosly returned by \"protx register_prepare\"\n"
+            "1. \"tx\"                 (string, required) The serialized transaction previously returned by \"protx register_prepare\"\n"
             "2. \"sig\"                (string, required) The signature signed with the collateral key. Must be in base64 format.\n"
             "\nExamples:\n"
             + HelpExampleCli("protx", "register_submit \"tx\" \"sig\"")

From da3e3db4dd3760a6bc05e62235d15ed1bd0ba6ac Mon Sep 17 00:00:00 2001
From: UdjinM6 <UdjinM6@users.noreply.github.com>
Date: Fri, 9 Nov 2018 09:48:26 +0300
Subject: [PATCH 251/400] Fix sub-command help for masternode, gobject and
 protx rpcs (#2425)

Fixes #2424
---
 src/rpc/governance.cpp | 2 +-
 src/rpc/masternode.cpp | 2 +-
 src/rpc/rpcevo.cpp     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/rpc/governance.cpp b/src/rpc/governance.cpp
index 639211f6fb71..7d4b45892677 100644
--- a/src/rpc/governance.cpp
+++ b/src/rpc/governance.cpp
@@ -975,7 +975,7 @@ UniValue gobject(const JSONRPCRequest& request)
     if (request.params.size() >= 1)
         strCommand = request.params[0].get_str();
 
-    if (request.fHelp || strCommand.empty()) {
+    if (request.fHelp && strCommand.empty()) {
         gobject_help();
     }
 
diff --git a/src/rpc/masternode.cpp b/src/rpc/masternode.cpp
index 1fb482a00f25..158f7d222b56 100644
--- a/src/rpc/masternode.cpp
+++ b/src/rpc/masternode.cpp
@@ -794,7 +794,7 @@ UniValue masternode(const JSONRPCRequest& request)
         throw JSONRPCError(RPC_INVALID_PARAMETER, "DEPRECATED, please use start-all instead");
 #endif // ENABLE_WALLET
 
-    if (request.fHelp || strCommand.empty()) {
+    if (request.fHelp && strCommand.empty()) {
         masternode_help();
     }
 
diff --git a/src/rpc/rpcevo.cpp b/src/rpc/rpcevo.cpp
index 776e79cbb2b7..7cfe111ce77f 100644
--- a/src/rpc/rpcevo.cpp
+++ b/src/rpc/rpcevo.cpp
@@ -843,7 +843,7 @@ UniValue protx_diff(const JSONRPCRequest& request)
 
 UniValue protx(const JSONRPCRequest& request)
 {
-    if (request.fHelp || request.params.empty()) {
+    if (request.fHelp && request.params.empty()) {
         protx_help();
     }
 

From 42ee369b1751c9e58f744f1888e88d52cd2f3924 Mon Sep 17 00:00:00 2001
From: PastaPastaPasta <pasta@dashboost.org>
Date: Fri, 9 Nov 2018 00:48:51 -0600
Subject: [PATCH 252/400] [Formatting] masternodelist.* clang+manual format
 (#2426)

* format

* clang suggested changes to be reverted

* Revert "clang suggested changes to be reverted"

This reverts commit 2c1e7744be1a2f6dd07772f222c656b2ebaa7718.
---
 src/qt/masternodelist.cpp | 145 ++++++++++++++++++--------------------
 src/qt/masternodelist.h   |  33 ++++-----
 2 files changed, 87 insertions(+), 91 deletions(-)

diff --git a/src/qt/masternodelist.cpp b/src/qt/masternodelist.cpp
index ce8e19784faa..2e9cd8a972ad 100644
--- a/src/qt/masternodelist.cpp
+++ b/src/qt/masternodelist.cpp
@@ -4,8 +4,8 @@
 #include "activemasternode.h"
 #include "clientmodel.h"
 #include "clientversion.h"
-#include "init.h"
 #include "guiutil.h"
+#include "init.h"
 #include "masternode-sync.h"
 #include "masternodeconfig.h"
 #include "masternodeman.h"
@@ -14,8 +14,8 @@
 #include "wallet/wallet.h"
 #include "walletmodel.h"
 
-#include <QTimer>
 #include <QMessageBox>
+#include <QTimer>
 
 int GetOffsetFromUtc()
 {
@@ -28,7 +28,7 @@ int GetOffsetFromUtc()
 #endif
 }
 
-MasternodeList::MasternodeList(const PlatformStyle *platformStyle, QWidget *parent) :
+MasternodeList::MasternodeList(const PlatformStyle* platformStyle, QWidget* parent) :
     QWidget(parent),
     ui(new Ui::MasternodeList),
     clientModel(0),
@@ -60,7 +60,7 @@ MasternodeList::MasternodeList(const PlatformStyle *platformStyle, QWidget *pare
 
     ui->tableWidgetMyMasternodes->setContextMenuPolicy(Qt::CustomContextMenu);
 
-    QAction *startAliasAction = new QAction(tr("Start alias"), this);
+    QAction* startAliasAction = new QAction(tr("Start alias"), this);
     contextMenu = new QMenu();
     contextMenu->addAction(startAliasAction);
     connect(ui->tableWidgetMyMasternodes, SIGNAL(customContextMenuRequested(const QPoint&)), this, SLOT(showContextMenu(const QPoint&)));
@@ -82,24 +82,24 @@ MasternodeList::~MasternodeList()
     delete ui;
 }
 
-void MasternodeList::setClientModel(ClientModel *model)
+void MasternodeList::setClientModel(ClientModel* model)
 {
     this->clientModel = model;
-    if(model) {
+    if (model) {
         // try to update list when masternode count changes
         connect(clientModel, SIGNAL(strMasternodesChanged(QString)), this, SLOT(updateNodeList()));
     }
 }
 
-void MasternodeList::setWalletModel(WalletModel *model)
+void MasternodeList::setWalletModel(WalletModel* model)
 {
     this->walletModel = model;
 }
 
-void MasternodeList::showContextMenu(const QPoint &point)
+void MasternodeList::showContextMenu(const QPoint& point)
 {
-    QTableWidgetItem *item = ui->tableWidgetMyMasternodes->itemAt(point);
-    if(item) contextMenu->exec(QCursor::pos());
+    QTableWidgetItem* item = ui->tableWidgetMyMasternodes->itemAt(point);
+    if (item) contextMenu->exec(QCursor::pos());
 }
 
 void MasternodeList::StartAlias(std::string strAlias)
@@ -108,7 +108,7 @@ void MasternodeList::StartAlias(std::string strAlias)
     strStatusHtml += "<center>Alias: " + strAlias;
 
     for (const auto& mne : masternodeConfig.getEntries()) {
-        if(mne.getAlias() == strAlias) {
+        if (mne.getAlias() == strAlias) {
             std::string strError;
             CMasternodeBroadcast mnb;
 
@@ -120,7 +120,7 @@ void MasternodeList::StartAlias(std::string strAlias)
                 fSuccess = false;
             }
 
-            if(fSuccess) {
+            if (fSuccess) {
                 strStatusHtml += "<br>Successfully started masternode.";
                 mnodeman.NotifyMasternodeUpdates(*g_connman);
             } else {
@@ -149,13 +149,13 @@ void MasternodeList::StartAll(std::string strCommand)
         CMasternodeBroadcast mnb;
 
         int32_t nOutputIndex = 0;
-        if(!ParseInt32(mne.getOutputIndex(), &nOutputIndex)) {
+        if (!ParseInt32(mne.getOutputIndex(), &nOutputIndex)) {
             continue;
         }
 
         COutPoint outpoint = COutPoint(uint256S(mne.getTxHash()), nOutputIndex);
 
-        if(strCommand == "start-missing" && mnodeman.Has(outpoint)) continue;
+        if (strCommand == "start-missing" && mnodeman.Has(outpoint)) continue;
 
         bool fSuccess = CMasternodeBroadcast::Create(mne.getIp(), mne.getPrivKey(), mne.getTxHash(), mne.getOutputIndex(), strError, mnb);
 
@@ -165,7 +165,7 @@ void MasternodeList::StartAll(std::string strCommand)
             fSuccess = false;
         }
 
-        if(fSuccess) {
+        if (fSuccess) {
             nCountSuccessful++;
             mnodeman.NotifyMasternodeUpdates(*g_connman);
         } else {
@@ -192,15 +192,15 @@ void MasternodeList::updateMyMasternodeInfo(QString strAlias, QString strAddr, c
     bool fOldRowFound = false;
     int nNewRow = 0;
 
-    for(int i = 0; i < ui->tableWidgetMyMasternodes->rowCount(); i++) {
-        if(ui->tableWidgetMyMasternodes->item(i, 0)->text() == strAlias) {
+    for (int i = 0; i < ui->tableWidgetMyMasternodes->rowCount(); i++) {
+        if (ui->tableWidgetMyMasternodes->item(i, 0)->text() == strAlias) {
             fOldRowFound = true;
             nNewRow = i;
             break;
         }
     }
 
-    if(nNewRow == 0 && !fOldRowFound) {
+    if (nNewRow == 0 && !fOldRowFound) {
         nNewRow = ui->tableWidgetMyMasternodes->rowCount();
         ui->tableWidgetMyMasternodes->insertRow(nNewRow);
     }
@@ -208,14 +208,14 @@ void MasternodeList::updateMyMasternodeInfo(QString strAlias, QString strAddr, c
     masternode_info_t infoMn;
     bool fFound = mnodeman.GetMasternodeInfo(outpoint, infoMn);
 
-    QTableWidgetItem *aliasItem = new QTableWidgetItem(strAlias);
-    QTableWidgetItem *addrItem = new QTableWidgetItem(fFound ? QString::fromStdString(infoMn.addr.ToString()) : strAddr);
-    QTableWidgetItem *protocolItem = new QTableWidgetItem(QString::number(fFound ? infoMn.nProtocolVersion : -1));
-    QTableWidgetItem *statusItem = new QTableWidgetItem(QString::fromStdString(fFound ? CMasternode::StateToString(infoMn.nActiveState) : "MISSING"));
-    QTableWidgetItem *activeSecondsItem = new QTableWidgetItem(QString::fromStdString(DurationToDHMS(fFound ? (infoMn.nTimeLastPing - infoMn.sigTime) : 0)));
-    QTableWidgetItem *lastSeenItem = new QTableWidgetItem(QString::fromStdString(DateTimeStrFormat("%Y-%m-%d %H:%M",
-                                                                                                   fFound ? infoMn.nTimeLastPing + GetOffsetFromUtc() : 0)));
-    QTableWidgetItem *pubkeyItem = new QTableWidgetItem(QString::fromStdString(fFound ? CBitcoinAddress(infoMn.keyIDCollateralAddress).ToString() : ""));
+    QTableWidgetItem* aliasItem = new QTableWidgetItem(strAlias);
+    QTableWidgetItem* addrItem = new QTableWidgetItem(fFound ? QString::fromStdString(infoMn.addr.ToString()) : strAddr);
+    QTableWidgetItem* protocolItem = new QTableWidgetItem(QString::number(fFound ? infoMn.nProtocolVersion : -1));
+    QTableWidgetItem* statusItem = new QTableWidgetItem(QString::fromStdString(fFound ? CMasternode::StateToString(infoMn.nActiveState) : "MISSING"));
+    QTableWidgetItem* activeSecondsItem = new QTableWidgetItem(QString::fromStdString(DurationToDHMS(fFound ? (infoMn.nTimeLastPing - infoMn.sigTime) : 0)));
+    QTableWidgetItem* lastSeenItem = new QTableWidgetItem(QString::fromStdString(DateTimeStrFormat("%Y-%m-%d %H:%M",
+        fFound ? infoMn.nTimeLastPing + GetOffsetFromUtc() : 0)));
+    QTableWidgetItem* pubkeyItem = new QTableWidgetItem(QString::fromStdString(fFound ? CBitcoinAddress(infoMn.keyIDCollateralAddress).ToString() : ""));
 
     ui->tableWidgetMyMasternodes->setItem(nNewRow, 0, aliasItem);
     ui->tableWidgetMyMasternodes->setItem(nNewRow, 1, addrItem);
@@ -229,9 +229,8 @@ void MasternodeList::updateMyMasternodeInfo(QString strAlias, QString strAddr, c
 void MasternodeList::updateMyNodeList(bool fForce)
 {
     TRY_LOCK(cs_mymnlist, fLockAcquired);
-    if(!fLockAcquired) {
-        return;
-    }
+    if (!fLockAcquired) return;
+
     static int64_t nTimeMyListUpdated = 0;
 
     // automatically update my masternode list only once in MY_MASTERNODELIST_UPDATE_SECONDS seconds,
@@ -239,7 +238,7 @@ void MasternodeList::updateMyNodeList(bool fForce)
     int64_t nSecondsTillUpdate = nTimeMyListUpdated + MY_MASTERNODELIST_UPDATE_SECONDS - GetTime();
     ui->secondsLabel->setText(QString::number(nSecondsTillUpdate));
 
-    if(nSecondsTillUpdate > 0 && !fForce) return;
+    if (nSecondsTillUpdate > 0 && !fForce) return;
     nTimeMyListUpdated = GetTime();
 
     // Find selected row
@@ -250,7 +249,7 @@ void MasternodeList::updateMyNodeList(bool fForce)
     ui->tableWidgetMyMasternodes->setSortingEnabled(false);
     for (const auto& mne : masternodeConfig.getEntries()) {
         int32_t nOutputIndex = 0;
-        if(!ParseInt32(mne.getOutputIndex(), &nOutputIndex)) {
+        if (!ParseInt32(mne.getOutputIndex(), &nOutputIndex)) {
             continue;
         }
 
@@ -266,20 +265,20 @@ void MasternodeList::updateMyNodeList(bool fForce)
 void MasternodeList::updateNodeList()
 {
     TRY_LOCK(cs_mnlist, fLockAcquired);
-    if(!fLockAcquired) {
-        return;
-    }
+    if (!fLockAcquired) return;
 
     static int64_t nTimeListUpdated = GetTime();
 
     // to prevent high cpu usage update only once in MASTERNODELIST_UPDATE_SECONDS seconds
     // or MASTERNODELIST_FILTER_COOLDOWN_SECONDS seconds after filter was last changed
     int64_t nSecondsToWait = fFilterUpdated
-                            ? nTimeFilterUpdated - GetTime() + MASTERNODELIST_FILTER_COOLDOWN_SECONDS
-                            : nTimeListUpdated - GetTime() + MASTERNODELIST_UPDATE_SECONDS;
+                                 ? nTimeFilterUpdated - GetTime() + MASTERNODELIST_FILTER_COOLDOWN_SECONDS
+                                 : nTimeListUpdated - GetTime() + MASTERNODELIST_UPDATE_SECONDS;
 
-    if(fFilterUpdated) ui->countLabel->setText(QString::fromStdString(strprintf("Please wait... %d", nSecondsToWait)));
-    if(nSecondsToWait > 0) return;
+    if (fFilterUpdated) {
+        ui->countLabel->setText(QString::fromStdString(strprintf("Please wait... %d", nSecondsToWait)));
+    }
+    if (nSecondsToWait > 0) return;
 
     nTimeListUpdated = GetTime();
     fFilterUpdated = false;
@@ -292,26 +291,24 @@ void MasternodeList::updateNodeList()
     std::map<COutPoint, CMasternode> mapMasternodes = mnodeman.GetFullMasternodeMap();
     int offsetFromUtc = GetOffsetFromUtc();
 
-    for (const auto& mnpair : mapMasternodes)
-    {
+    for (const auto& mnpair : mapMasternodes) {
         CMasternode mn = mnpair.second;
         // populate list
         // Address, Protocol, Status, Active Seconds, Last Seen, Pub Key
-        QTableWidgetItem *addressItem = new QTableWidgetItem(QString::fromStdString(mn.addr.ToString()));
-        QTableWidgetItem *protocolItem = new QTableWidgetItem(QString::number(mn.nProtocolVersion));
-        QTableWidgetItem *statusItem = new QTableWidgetItem(QString::fromStdString(mn.GetStatus()));
-        QTableWidgetItem *activeSecondsItem = new QTableWidgetItem(QString::fromStdString(DurationToDHMS(mn.lastPing.sigTime - mn.sigTime)));
-        QTableWidgetItem *lastSeenItem = new QTableWidgetItem(QString::fromStdString(DateTimeStrFormat("%Y-%m-%d %H:%M", mn.lastPing.sigTime + offsetFromUtc)));
-        QTableWidgetItem *pubkeyItem = new QTableWidgetItem(QString::fromStdString(CBitcoinAddress(mn.keyIDCollateralAddress).ToString()));
-
-        if (strCurrentFilter != "")
-        {
-            strToFilter =   addressItem->text() + " " +
-                            protocolItem->text() + " " +
-                            statusItem->text() + " " +
-                            activeSecondsItem->text() + " " +
-                            lastSeenItem->text() + " " +
-                            pubkeyItem->text();
+        QTableWidgetItem* addressItem = new QTableWidgetItem(QString::fromStdString(mn.addr.ToString()));
+        QTableWidgetItem* protocolItem = new QTableWidgetItem(QString::number(mn.nProtocolVersion));
+        QTableWidgetItem* statusItem = new QTableWidgetItem(QString::fromStdString(mn.GetStatus()));
+        QTableWidgetItem* activeSecondsItem = new QTableWidgetItem(QString::fromStdString(DurationToDHMS(mn.lastPing.sigTime - mn.sigTime)));
+        QTableWidgetItem* lastSeenItem = new QTableWidgetItem(QString::fromStdString(DateTimeStrFormat("%Y-%m-%d %H:%M", mn.lastPing.sigTime + offsetFromUtc)));
+        QTableWidgetItem* pubkeyItem = new QTableWidgetItem(QString::fromStdString(CBitcoinAddress(mn.keyIDCollateralAddress).ToString()));
+
+        if (strCurrentFilter != "") {
+            strToFilter = addressItem->text() + " " +
+                          protocolItem->text() + " " +
+                          statusItem->text() + " " +
+                          activeSecondsItem->text() + " " +
+                          lastSeenItem->text() + " " +
+                          pubkeyItem->text();
             if (!strToFilter.contains(strCurrentFilter)) continue;
         }
 
@@ -328,7 +325,7 @@ void MasternodeList::updateNodeList()
     ui->tableWidgetMasternodes->setSortingEnabled(true);
 }
 
-void MasternodeList::on_filterLineEdit_textChanged(const QString &strFilterIn)
+void MasternodeList::on_filterLineEdit_textChanged(const QString& strFilterIn)
 {
     strCurrentFilter = strFilterIn;
     nTimeFilterUpdated = GetTime();
@@ -345,7 +342,7 @@ void MasternodeList::on_startButton_clicked()
         QItemSelectionModel* selectionModel = ui->tableWidgetMyMasternodes->selectionModel();
         QModelIndexList selected = selectionModel->selectedRows();
 
-        if(selected.count() == 0) return;
+        if (selected.count() == 0) return;
 
         QModelIndex index = selected.at(0);
         int nSelectedRow = index.row();
@@ -358,14 +355,14 @@ void MasternodeList::on_startButton_clicked()
         QMessageBox::Yes | QMessageBox::Cancel,
         QMessageBox::Cancel);
 
-    if(retval != QMessageBox::Yes) return;
+    if (retval != QMessageBox::Yes) return;
 
     WalletModel::EncryptionStatus encStatus = walletModel->getEncryptionStatus();
 
-    if(encStatus == walletModel->Locked || encStatus == walletModel->UnlockedForMixingOnly) {
+    if (encStatus == walletModel->Locked || encStatus == walletModel->UnlockedForMixingOnly) {
         WalletModel::UnlockContext ctx(walletModel->requestUnlock());
 
-        if(!ctx.isValid()) return; // Unlock wallet was cancelled
+        if (!ctx.isValid()) return; // Unlock wallet was cancelled
 
         StartAlias(strAlias);
         return;
@@ -382,14 +379,14 @@ void MasternodeList::on_startAllButton_clicked()
         QMessageBox::Yes | QMessageBox::Cancel,
         QMessageBox::Cancel);
 
-    if(retval != QMessageBox::Yes) return;
+    if (retval != QMessageBox::Yes) return;
 
     WalletModel::EncryptionStatus encStatus = walletModel->getEncryptionStatus();
 
-    if(encStatus == walletModel->Locked || encStatus == walletModel->UnlockedForMixingOnly) {
+    if (encStatus == walletModel->Locked || encStatus == walletModel->UnlockedForMixingOnly) {
         WalletModel::UnlockContext ctx(walletModel->requestUnlock());
 
-        if(!ctx.isValid()) return; // Unlock wallet was cancelled
+        if (!ctx.isValid()) return; // Unlock wallet was cancelled
 
         StartAll();
         return;
@@ -400,8 +397,7 @@ void MasternodeList::on_startAllButton_clicked()
 
 void MasternodeList::on_startMissingButton_clicked()
 {
-
-    if(!masternodeSync.IsMasternodeListSynced()) {
+    if (!masternodeSync.IsMasternodeListSynced()) {
         QMessageBox::critical(this, tr("Command is not available right now"),
             tr("You can't use this command until masternode list is synced"));
         return;
@@ -414,14 +410,14 @@ void MasternodeList::on_startMissingButton_clicked()
         QMessageBox::Yes | QMessageBox::Cancel,
         QMessageBox::Cancel);
 
-    if(retval != QMessageBox::Yes) return;
+    if (retval != QMessageBox::Yes) return;
 
     WalletModel::EncryptionStatus encStatus = walletModel->getEncryptionStatus();
 
-    if(encStatus == walletModel->Locked || encStatus == walletModel->UnlockedForMixingOnly) {
+    if (encStatus == walletModel->Locked || encStatus == walletModel->UnlockedForMixingOnly) {
         WalletModel::UnlockContext ctx(walletModel->requestUnlock());
 
-        if(!ctx.isValid()) return; // Unlock wallet was cancelled
+        if (!ctx.isValid()) return; // Unlock wallet was cancelled
 
         StartAll("start-missing");
         return;
@@ -432,7 +428,7 @@ void MasternodeList::on_startMissingButton_clicked()
 
 void MasternodeList::on_tableWidgetMyMasternodes_itemSelectionChanged()
 {
-    if(ui->tableWidgetMyMasternodes->selectedItems().count() > 0) {
+    if (ui->tableWidgetMyMasternodes->selectedItems().count() > 0) {
         ui->startButton->setEnabled(true);
     }
 }
@@ -451,7 +447,7 @@ void MasternodeList::on_QRButton_clicked()
         QItemSelectionModel* selectionModel = ui->tableWidgetMyMasternodes->selectionModel();
         QModelIndexList selected = selectionModel->selectedRows();
 
-        if(selected.count() == 0) return;
+        if (selected.count() == 0) return;
 
         QModelIndex index = selected.at(0);
         int nSelectedRow = index.row();
@@ -461,10 +457,9 @@ void MasternodeList::on_QRButton_clicked()
     ShowQRCode(strAlias);
 }
 
-void MasternodeList::ShowQRCode(std::string strAlias) {
-
-    if(!walletModel || !walletModel->getOptionsModel())
-        return;
+void MasternodeList::ShowQRCode(std::string strAlias)
+{
+    if (!walletModel || !walletModel->getOptionsModel()) return;
 
     // Get private key for this alias
     std::string strMNPrivKey = "";
@@ -506,7 +501,7 @@ void MasternodeList::ShowQRCode(std::string strAlias) {
     }
 
     // Open QR dialog
-    QRDialog *dialog = new QRDialog(this);
+    QRDialog* dialog = new QRDialog(this);
     dialog->setAttribute(Qt::WA_DeleteOnClose);
     dialog->setModel(walletModel->getOptionsModel());
     dialog->setInfo(strWindowtitle, QString::fromStdString(strMNPrivKey), strHTML, strQRCodeTitle);
diff --git a/src/qt/masternodelist.h b/src/qt/masternodelist.h
index 8a6ef5445e53..34eb3d0b89f4 100644
--- a/src/qt/masternodelist.h
+++ b/src/qt/masternodelist.h
@@ -1,8 +1,8 @@
 #ifndef MASTERNODELIST_H
 #define MASTERNODELIST_H
 
-#include "primitives/transaction.h"
 #include "platformstyle.h"
+#include "primitives/transaction.h"
 #include "sync.h"
 #include "util.h"
 
@@ -10,12 +10,13 @@
 #include <QTimer>
 #include <QWidget>
 
-#define MY_MASTERNODELIST_UPDATE_SECONDS                 60
-#define MASTERNODELIST_UPDATE_SECONDS                    15
-#define MASTERNODELIST_FILTER_COOLDOWN_SECONDS            3
+#define MY_MASTERNODELIST_UPDATE_SECONDS 60
+#define MASTERNODELIST_UPDATE_SECONDS 15
+#define MASTERNODELIST_FILTER_COOLDOWN_SECONDS 3
 
-namespace Ui {
-    class MasternodeList;
+namespace Ui
+{
+class MasternodeList;
 }
 
 class ClientModel;
@@ -31,17 +32,17 @@ class MasternodeList : public QWidget
     Q_OBJECT
 
 public:
-    explicit MasternodeList(const PlatformStyle *platformStyle, QWidget *parent = 0);
+    explicit MasternodeList(const PlatformStyle* platformStyle, QWidget* parent = 0);
     ~MasternodeList();
 
-    void setClientModel(ClientModel *clientModel);
-    void setWalletModel(WalletModel *walletModel);
+    void setClientModel(ClientModel* clientModel);
+    void setWalletModel(WalletModel* walletModel);
     void ShowQRCode(std::string strAlias);
     void StartAlias(std::string strAlias);
     void StartAll(std::string strCommand = "start-all");
 
 private:
-    QMenu *contextMenu;
+    QMenu* contextMenu;
     int64_t nTimeFilterUpdated;
     bool fFilterUpdated;
 
@@ -54,10 +55,10 @@ public Q_SLOTS:
     void doubleClicked(const QModelIndex&);
 
 private:
-    QTimer *timer;
-    Ui::MasternodeList *ui;
-    ClientModel *clientModel;
-    WalletModel *walletModel;
+    QTimer* timer;
+    Ui::MasternodeList* ui;
+    ClientModel* clientModel;
+    WalletModel* walletModel;
 
     // Protects tableWidgetMasternodes
     CCriticalSection cs_mnlist;
@@ -68,8 +69,8 @@ public Q_SLOTS:
     QString strCurrentFilter;
 
 private Q_SLOTS:
-    void showContextMenu(const QPoint &);
-    void on_filterLineEdit_textChanged(const QString &strFilterIn);
+    void showContextMenu(const QPoint&);
+    void on_filterLineEdit_textChanged(const QString& strFilterIn);
     void on_QRButton_clicked();
     void on_startButton_clicked();
     void on_startAllButton_clicked();

From 0e9ad207ae2220a9c2c566ec6c6394eb554f140d Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Sat, 10 Nov 2018 06:29:14 +0100
Subject: [PATCH 253/400] Update hardcoded seeds (#2429)

* Update seeds for mainnet

* Update seeds for testnet
---
 contrib/seeds/nodes_main.txt | 299 +++++++++++++++-----------------
 contrib/seeds/nodes_test.txt |  27 ++-
 src/chainparamsseeds.h       | 326 +++++++++++++++++------------------
 3 files changed, 312 insertions(+), 340 deletions(-)

diff --git a/contrib/seeds/nodes_main.txt b/contrib/seeds/nodes_main.txt
index 4a0e89c5865d..8881999e662c 100644
--- a/contrib/seeds/nodes_main.txt
+++ b/contrib/seeds/nodes_main.txt
@@ -1,288 +1,275 @@
-5.2.66.144:9999
-5.132.159.6:9999
-5.132.159.8:9999
-5.132.159.9:9999
-5.132.159.10:9999
+5.9.99.80:9999
+5.132.191.109:9999
+5.132.191.211:9999
+5.132.191.213:9999
+5.132.191.216:9999
 5.134.115.37:9999
-5.189.129.41:9999
+5.189.171.64:9999
+5.200.23.33:9999
+5.200.53.96:9999
 18.221.96.149:9999
+23.175.0.111:9999
 23.175.0.112:9999
 23.175.0.113:9999
 23.175.0.114:9999
-23.175.0.115:9999
 23.182.128.21:9999
-23.182.128.22:9999
 23.182.128.23:9999
 23.182.128.24:9999
+23.182.128.25:9999
 23.227.160.76:9999
-31.13.217.52:9999
-31.13.217.53:9999
-31.13.217.54:9999
-31.13.217.55:9999
-31.14.134.237:9999
+23.227.163.23:9999
+23.227.163.52:9999
+27.102.114.61:9999
 31.31.73.82:9999
+34.196.96.99:9999
 34.199.130.69:9999
-34.206.0.63:9999
 34.225.101.97:9999
+35.167.192.165:9999
 35.196.242.227:9999
+35.197.187.1:9999
+37.97.227.21:9999
 37.120.161.145:9999
 37.157.199.210:9999
-37.200.122.223:9999
+37.221.192.220:9999
 37.221.194.42:9999
-37.221.194.220:9999
-37.221.194.222:9999
-38.127.169.147:9999
+37.221.194.43:9999
+40.113.6.44:9999
 43.229.77.46:9999
-45.32.192.69:9999
-45.58.48.17:9999
+45.32.206.185:9999
 45.76.64.6:9999
-45.76.128.61:9999
-47.74.23.207:9999
+46.28.109.195:9999
+46.37.158.177:9999
+46.163.166.57:9999
+47.52.229.72:9999
+47.75.49.228:9999
 47.90.14.156:9999
-47.90.53.103:9999
-47.91.217.49:9999
-47.100.25.118:9999
-50.3.74.81:9999
-50.3.74.82:9999
-50.3.74.84:9999
-50.3.74.85:9999
-50.99.0.243:9999
-52.14.192.211:9999
-52.44.128.25:9999
-52.78.165.91:9999
+47.98.66.94:9999
+47.104.96.207:9999
+47.244.102.81:9999
+51.15.42.143:9999
+51.38.105.36:9999
+51.38.128.251:9999
+51.255.32.213:9999
 52.79.112.22:9999
-52.80.55.223:9999
-52.170.102.253:9999
 52.187.135.187:9999
+52.235.36.187:9999
 52.242.37.8:9999
-52.242.39.96:9999
+54.70.231.195:9999
+54.172.145.162:9999
 62.138.3.214:9999
 62.138.8.7:9999
-62.210.5.246:9999
-62.210.161.248:9999
-64.19.211.41:9999
+62.138.8.103:9999
+62.146.13.50:9999
+63.142.253.85:9999
+64.34.218.48:9999
 64.140.157.114:9999
-64.140.158.96:9999
-64.210.41.226:9999
+64.140.159.226:9999
 66.23.242.86:9999
 66.23.242.89:9999
 66.23.242.90:9999
 66.23.242.91:9999
-66.172.11.249:9999
-66.172.12.244:9999
+66.172.11.85:9999
 66.172.27.70:9999
-66.172.33.108:9999
-69.12.67.171:9999
-69.12.67.193:9999
-69.12.67.197:9999
-69.27.173.165:9999
-69.27.173.166:9999
-69.30.193.154:9999
-69.90.186.9:9999
-69.90.186.10:9999
-69.90.186.13:9999
-72.18.213.107:9999
-76.74.178.221:9999
-77.73.69.190:9999
+69.51.13.90:9999
+69.51.13.101:9999
+69.51.20.70:9999
+69.51.20.71:9999
+74.207.228.180:9999
+75.127.4.248:9999
+76.74.219.148:9999
 77.81.226.146:9999
-78.46.234.241:9999
+78.41.207.70:9999
 78.83.19.0:9999
 78.133.169.70:9999
 80.120.27.150:9999
-80.211.197.235:9999
-81.169.139.149:9999
-81.169.188.88:9999
 81.169.205.220:9999
 81.169.229.84:9999
 81.171.2.245:9999
-81.229.119.216:9999
 82.118.227.52:9999
+82.165.29.103:9999
 82.211.21.128:9999
 82.211.21.131:9999
-82.211.21.173:9999
-82.211.34.103:9999
-82.239.79.88:9999
-83.1.99.1:9999
-83.1.99.6:9999
-85.25.194.204:9999
+82.211.21.136:9999
+82.211.21.139:9999
+84.234.96.82:9999
+84.234.96.86:9999
+84.234.96.87:9999
 85.25.199.215:9999
 85.184.254.29:9999
 85.184.254.181:9999
+85.217.170.206:9999
+85.217.171.243:9999
+85.255.1.65:9999
 85.255.4.212:9999
-86.105.235.103:9999
 87.106.63.52:9999
 87.117.253.55:9999
-88.119.179.178:9999
-88.119.179.179:9999
-88.166.200.153:9999
 89.36.220.241:9999
-89.38.144.71:9999
+89.40.0.14:9999
 89.40.114.69:9999
-89.45.67.33:9999
-89.163.134.227:9999
-90.187.5.61:9999
-91.123.195.83:9999
-91.123.201.94:9999
+89.238.181.74:9999
 91.219.239.82:9999
 91.219.239.83:9999
+92.63.57.28:9999
+92.63.57.120:9999
 93.90.205.80:9999
+93.104.213.208:9999
 93.158.216.153:9999
-93.185.103.70:9999
-93.185.103.71:9999
-94.130.104.169:9999
+94.156.174.166:9999
+94.176.239.62:9999
+94.177.170.223:9999
 94.177.224.225:9999
+94.177.225.115:9999
 94.177.225.210:9999
 94.177.232.33:9999
+94.177.250.61:9999
 95.43.139.162:9999
+95.181.226.47:9999
+95.183.50.97:9999
 95.183.51.98:9999
 95.183.51.141:9999
-95.183.53.56:9999
-95.183.53.96:9999
-95.215.45.225:9999
+95.183.53.134:9999
+95.216.11.57:9999
+95.216.147.47:9999
 96.126.96.164:9999
-101.132.25.188:9999
-103.11.64.94:9999
-104.128.226.70:9999
-104.128.226.72:9999
-104.238.192.146:9999
+101.37.96.0:9999
+101.37.96.96:9999
+104.196.169.81:9999
+104.223.6.164:9999
 107.6.140.35:9999
 107.6.140.55:9999
-107.6.175.206:9999
+107.6.175.150:9999
 107.155.118.137:9999
+107.191.101.212:9999
+108.61.224.22:9999
 108.61.224.33:9999
 110.10.25.76:9999
-116.62.237.190:9999
-118.31.38.232:9999
-120.132.27.39:9999
+115.159.86.118:9999
+122.106.55.214:9999
 122.114.173.218:9999
 123.193.64.166:9999
-125.89.62.36:9999
-125.89.62.37:9999
 130.185.251.69:9999
 130.185.251.113:9999
 133.130.102.22:9999
-139.162.11.82:9999
-141.255.184.191:9999
-142.44.229.61:9999
-142.54.162.179:9999
-149.56.128.199:9999
-154.127.57.66:9999
+139.99.193.23:9999
+148.66.50.42:9999
+151.236.10.109:9999
 154.127.57.240:9999
+154.127.57.254:9999
 154.127.59.27:9999
 154.127.60.8:9999
-155.254.32.139:9999
+159.69.155.94:9999
+159.89.32.12:9999
 159.100.19.166:9999
 159.100.19.167:9999
-162.221.195.17:9999
-162.221.195.243:9999
-162.250.145.107:9999
+159.203.20.131:9999
 163.44.167.144:9999
 163.44.167.237:9999
-163.44.171.51:9999
-163.172.128.187:9999
-163.172.129.13:9999
-164.132.42.162:9999
-167.88.15.98:9999
-168.235.96.202:9999
+163.44.168.191:9999
+167.88.15.97:9999
 168.235.96.203:9999
 168.235.96.205:9999
-168.235.99.45:9999
+168.235.99.47:9999
 170.75.162.60:9999
 170.75.162.219:9999
 170.75.163.108:9999
+172.81.177.42:9999
 172.86.121.148:9999
 172.104.64.13:9999
-172.110.6.167:9999
+172.110.5.98:9999
 172.110.6.169:9999
 173.212.241.50:9999
-176.31.145.50:9999
-178.62.128.50:9999
+176.122.20.207:9999
 178.62.160.29:9999
-178.62.192.42:9999
 178.209.50.30:9999
 178.238.42.7:9999
-178.254.23.160:9999
-178.254.32.48:9999
-185.2.82.137:9999
+185.22.174.37:9999
 185.26.126.250:9999
 185.28.101.91:9999
 185.28.101.133:9999
 185.35.64.217:9999
 185.35.67.117:9999
 185.43.210.125:9999
+185.58.194.113:9999
 185.58.224.234:9999
 185.64.104.221:9999
 185.64.104.222:9999
 185.64.104.223:9999
-185.82.22.228:9999
-185.106.121.163:9999
+185.106.122.46:9999
 185.119.85.30:9999
+185.133.37.105:9999
+185.139.237.154:9999
+185.141.26.106:9999
 185.142.212.144:9999
-185.156.178.74:9999
 185.156.178.125:9999
 185.156.178.216:9999
-185.156.178.221:9999
+185.156.178.218:9999
+185.156.178.222:9999
+185.165.168.21:9999
 185.165.168.22:9999
 185.165.168.23:9999
 185.165.168.25:9999
-185.165.168.27:9999
-185.166.239.48:9999
-185.166.239.162:9999
-185.166.239.187:9999
-185.166.239.191:9999
 185.168.8.144:9999
+185.183.97.131:9999
 185.185.40.13:9999
+185.203.117.229:9999
+185.212.44.250:9999
+185.213.37.1:9999
+185.213.37.6:9999
 185.217.1.99:9999
-188.40.62.22:9999
-188.40.93.205:9999
-188.166.74.173:9999
-188.213.171.30:9999
-188.227.16.16:9999
-188.227.16.83:9999
+185.217.1.100:9999
+185.243.112.48:9999
+185.243.112.80:9999
+185.243.112.187:9999
+185.243.112.221:9999
+185.253.189.18:9999
+185.253.189.66:9999
+185.253.189.70:9999
+185.253.189.80:9999
+188.166.69.88:9999
+188.227.74.171:9999
 188.227.74.193:9999
-188.227.74.196:9999
+190.4.184.180:9999
 190.10.8.250:9999
 192.81.130.228:9999
+192.161.182.104:9999
+192.161.182.108:9999
+192.161.182.109:9999
+192.227.143.41:9999
 192.227.228.196:9999
-192.227.228.197:9999
-192.243.214.90:9999
 192.250.230.17:9999
+193.29.187.85:9999
 193.234.224.72:9999
 193.234.224.100:9999
+193.234.224.103:9999
 193.234.224.145:9999
-193.234.224.152:9999
+194.99.20.100:9999
+195.154.105.109:9999
+195.154.105.125:9999
 198.20.101.116:9999
 198.23.128.75:9999
-198.23.226.41:9999
+198.53.74.14:9999
 198.61.190.142:9999
-198.204.251.58:9999
 199.201.110.195:9999
 200.122.128.172:9999
 202.71.98.123:9999
 202.71.98.124:9999
 202.71.98.125:9999
 202.71.98.126:9999
-204.12.240.98:9999
+204.16.243.106:9999
 204.16.245.98:9999
-204.27.58.212:9999
-209.177.87.148:9999
 209.177.88.87:9999
-211.99.224.163:9999
-211.99.224.167:9999
-211.99.224.174:9999
-211.99.224.202:9999
+209.177.91.203:9999
+212.24.96.16:9999
 212.24.96.26:9999
-212.24.96.120:9999
-212.24.96.159:9999
-212.24.96.178:9999
-212.227.136.235:9999
+212.47.235.253:9999
 212.227.201.47:9999
 212.237.37.240:9999
-213.136.80.137:9999
+213.64.197.95:9999
+213.136.80.93:9999
 213.136.80.159:9999
-213.169.73.74:9999
-217.13.101.94:9999
-217.13.107.26:9999
+216.107.217.62:9999
+216.189.145.161:9999
+216.189.147.178:9999
 217.61.2.53:9999
-217.61.3.193:9999
-219.2.130.110:9999
+221.156.133.110:9999
+222.231.59.30:9999
diff --git a/contrib/seeds/nodes_test.txt b/contrib/seeds/nodes_test.txt
index 3e17335c830f..d072dadea178 100644
--- a/contrib/seeds/nodes_test.txt
+++ b/contrib/seeds/nodes_test.txt
@@ -1,15 +1,14 @@
-34.237.167.248:19999
-34.238.93.224:19999
-43.229.77.46:19999
-45.32.104.95:19999
-45.32.215.31:19999
-45.32.221.230:19999
+34.250.38.147:19999
+35.237.50.123:19999
+45.32.211.155:19999
 45.32.237.76:19999
-52.7.46.113:19999
-52.201.23.129:19999
-138.68.20.142:19999
-165.227.8.80:19999
-217.182.229.128:19999
-217.182.229.132:19999
-217.182.229.134:19999
-217.182.229.136:19999
+45.76.131.178:19999
+52.77.244.215:19999
+54.91.130.170:19999
+109.235.71.56:19999
+159.65.233.52:19999
+178.62.203.249:19999
+178.151.192.107:19999
+185.213.37.1:19999
+185.213.37.2:19999
+206.189.209.197:19999
diff --git a/src/chainparamsseeds.h b/src/chainparamsseeds.h
index a6a10d20a472..a962fedf2015 100644
--- a/src/chainparamsseeds.h
+++ b/src/chainparamsseeds.h
@@ -8,311 +8,297 @@
  * IPv4 as well as onion addresses are wrapped inside a IPv6 address accordingly.
  */
 static SeedSpec6 pnSeed6_main[] = {
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x05,0x02,0x42,0x90}, 9999},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x05,0x84,0x9f,0x06}, 9999},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x05,0x84,0x9f,0x08}, 9999},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x05,0x84,0x9f,0x09}, 9999},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x05,0x84,0x9f,0x0a}, 9999},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x05,0x09,0x63,0x50}, 9999},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x05,0x84,0xbf,0x6d}, 9999},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x05,0x84,0xbf,0xd3}, 9999},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x05,0x84,0xbf,0xd5}, 9999},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x05,0x84,0xbf,0xd8}, 9999},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x05,0x86,0x73,0x25}, 9999},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x05,0xbd,0x81,0x29}, 9999},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x05,0xbd,0xab,0x40}, 9999},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x05,0xc8,0x17,0x21}, 9999},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x05,0xc8,0x35,0x60}, 9999},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x12,0xdd,0x60,0x95}, 9999},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x17,0xaf,0x00,0x6f}, 9999},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x17,0xaf,0x00,0x70}, 9999},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x17,0xaf,0x00,0x71}, 9999},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x17,0xaf,0x00,0x72}, 9999},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x17,0xaf,0x00,0x73}, 9999},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x17,0xb6,0x80,0x15}, 9999},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x17,0xb6,0x80,0x16}, 9999},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x17,0xb6,0x80,0x17}, 9999},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x17,0xb6,0x80,0x18}, 9999},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x17,0xb6,0x80,0x19}, 9999},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x17,0xe3,0xa0,0x4c}, 9999},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x1f,0x0d,0xd9,0x34}, 9999},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x1f,0x0d,0xd9,0x35}, 9999},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x1f,0x0d,0xd9,0x36}, 9999},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x1f,0x0d,0xd9,0x37}, 9999},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x1f,0x0e,0x86,0xed}, 9999},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x17,0xe3,0xa3,0x17}, 9999},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x17,0xe3,0xa3,0x34}, 9999},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x1b,0x66,0x72,0x3d}, 9999},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x1f,0x1f,0x49,0x52}, 9999},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x22,0xc4,0x60,0x63}, 9999},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x22,0xc7,0x82,0x45}, 9999},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x22,0xce,0x00,0x3f}, 9999},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x22,0xe1,0x65,0x61}, 9999},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x23,0xa7,0xc0,0xa5}, 9999},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x23,0xc4,0xf2,0xe3}, 9999},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x23,0xc5,0xbb,0x01}, 9999},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x25,0x61,0xe3,0x15}, 9999},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x25,0x78,0xa1,0x91}, 9999},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x25,0x9d,0xc7,0xd2}, 9999},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x25,0xc8,0x7a,0xdf}, 9999},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x25,0xdd,0xc0,0xdc}, 9999},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x25,0xdd,0xc2,0x2a}, 9999},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x25,0xdd,0xc2,0xdc}, 9999},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x25,0xdd,0xc2,0xde}, 9999},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x26,0x7f,0xa9,0x93}, 9999},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x25,0xdd,0xc2,0x2b}, 9999},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x28,0x71,0x06,0x2c}, 9999},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2b,0xe5,0x4d,0x2e}, 9999},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2d,0x20,0xc0,0x45}, 9999},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2d,0x3a,0x30,0x11}, 9999},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2d,0x20,0xce,0xb9}, 9999},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2d,0x4c,0x40,0x06}, 9999},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2d,0x4c,0x80,0x3d}, 9999},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2f,0x4a,0x17,0xcf}, 9999},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2e,0x1c,0x6d,0xc3}, 9999},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2e,0x25,0x9e,0xb1}, 9999},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2e,0xa3,0xa6,0x39}, 9999},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2f,0x34,0xe5,0x48}, 9999},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2f,0x4b,0x31,0xe4}, 9999},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2f,0x5a,0x0e,0x9c}, 9999},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2f,0x5a,0x35,0x67}, 9999},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2f,0x5b,0xd9,0x31}, 9999},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2f,0x64,0x19,0x76}, 9999},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x32,0x03,0x4a,0x51}, 9999},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x32,0x03,0x4a,0x52}, 9999},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x32,0x03,0x4a,0x54}, 9999},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x32,0x03,0x4a,0x55}, 9999},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x32,0x63,0x00,0xf3}, 9999},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x34,0x0e,0xc0,0xd3}, 9999},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x34,0x2c,0x80,0x19}, 9999},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x34,0x4e,0xa5,0x5b}, 9999},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2f,0x62,0x42,0x5e}, 9999},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2f,0x68,0x60,0xcf}, 9999},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2f,0xf4,0x66,0x51}, 9999},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x33,0x0f,0x2a,0x8f}, 9999},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x33,0x26,0x69,0x24}, 9999},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x33,0x26,0x80,0xfb}, 9999},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x33,0xff,0x20,0xd5}, 9999},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x34,0x4f,0x70,0x16}, 9999},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x34,0x50,0x37,0xdf}, 9999},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x34,0xaa,0x66,0xfd}, 9999},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x34,0xbb,0x87,0xbb}, 9999},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x34,0xeb,0x24,0xbb}, 9999},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x34,0xf2,0x25,0x08}, 9999},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x34,0xf2,0x27,0x60}, 9999},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x36,0x46,0xe7,0xc3}, 9999},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x36,0xac,0x91,0xa2}, 9999},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x3e,0x8a,0x03,0xd6}, 9999},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x3e,0x8a,0x08,0x07}, 9999},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x3e,0xd2,0x05,0xf6}, 9999},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x3e,0xd2,0xa1,0xf8}, 9999},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x40,0x13,0xd3,0x29}, 9999},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x3e,0x8a,0x08,0x67}, 9999},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x3e,0x92,0x0d,0x32}, 9999},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x3f,0x8e,0xfd,0x55}, 9999},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x40,0x22,0xda,0x30}, 9999},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x40,0x8c,0x9d,0x72}, 9999},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x40,0x8c,0x9e,0x60}, 9999},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x40,0xd2,0x29,0xe2}, 9999},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x40,0x8c,0x9f,0xe2}, 9999},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x42,0x17,0xf2,0x56}, 9999},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x42,0x17,0xf2,0x59}, 9999},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x42,0x17,0xf2,0x5a}, 9999},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x42,0x17,0xf2,0x5b}, 9999},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x42,0xac,0x0b,0xf9}, 9999},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x42,0xac,0x0c,0xf4}, 9999},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x42,0xac,0x0b,0x55}, 9999},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x42,0xac,0x1b,0x46}, 9999},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x42,0xac,0x21,0x6c}, 9999},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x45,0x0c,0x43,0xab}, 9999},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x45,0x0c,0x43,0xc1}, 9999},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x45,0x0c,0x43,0xc5}, 9999},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x45,0x1b,0xad,0xa5}, 9999},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x45,0x1b,0xad,0xa6}, 9999},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x45,0x1e,0xc1,0x9a}, 9999},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x45,0x5a,0xba,0x09}, 9999},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x45,0x5a,0xba,0x0a}, 9999},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x45,0x5a,0xba,0x0d}, 9999},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x48,0x12,0xd5,0x6b}, 9999},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x4c,0x4a,0xb2,0xdd}, 9999},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x4d,0x49,0x45,0xbe}, 9999},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x45,0x33,0x0d,0x5a}, 9999},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x45,0x33,0x0d,0x65}, 9999},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x45,0x33,0x14,0x46}, 9999},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x45,0x33,0x14,0x47}, 9999},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x4a,0xcf,0xe4,0xb4}, 9999},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x4b,0x7f,0x04,0xf8}, 9999},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x4c,0x4a,0xdb,0x94}, 9999},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x4d,0x51,0xe2,0x92}, 9999},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x4e,0x2e,0xea,0xf1}, 9999},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x4e,0x29,0xcf,0x46}, 9999},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x4e,0x53,0x13,0x00}, 9999},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x4e,0x85,0xa9,0x46}, 9999},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x50,0x78,0x1b,0x96}, 9999},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x50,0xd3,0xc5,0xeb}, 9999},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x51,0xa9,0x8b,0x95}, 9999},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x51,0xa9,0xbc,0x58}, 9999},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x51,0xa9,0xcd,0xdc}, 9999},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x51,0xa9,0xe5,0x54}, 9999},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x51,0xab,0x02,0xf5}, 9999},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x51,0xe5,0x77,0xd8}, 9999},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x52,0x76,0xe3,0x34}, 9999},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x52,0xa5,0x1d,0x67}, 9999},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x52,0xd3,0x15,0x80}, 9999},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x52,0xd3,0x15,0x83}, 9999},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x52,0xd3,0x15,0xad}, 9999},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x52,0xd3,0x22,0x67}, 9999},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x52,0xef,0x4f,0x58}, 9999},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x53,0x01,0x63,0x01}, 9999},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x53,0x01,0x63,0x06}, 9999},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x55,0x19,0xc2,0xcc}, 9999},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x52,0xd3,0x15,0x88}, 9999},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x52,0xd3,0x15,0x8b}, 9999},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x54,0xea,0x60,0x52}, 9999},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x54,0xea,0x60,0x56}, 9999},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x54,0xea,0x60,0x57}, 9999},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x55,0x19,0xc7,0xd7}, 9999},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x55,0xb8,0xfe,0x1d}, 9999},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x55,0xb8,0xfe,0xb5}, 9999},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x55,0xd9,0xaa,0xce}, 9999},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x55,0xd9,0xab,0xf3}, 9999},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x55,0xff,0x01,0x41}, 9999},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x55,0xff,0x04,0xd4}, 9999},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x56,0x69,0xeb,0x67}, 9999},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x57,0x6a,0x3f,0x34}, 9999},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x57,0x75,0xfd,0x37}, 9999},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x58,0x77,0xb3,0xb2}, 9999},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x58,0x77,0xb3,0xb3}, 9999},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x58,0xa6,0xc8,0x99}, 9999},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x59,0x24,0xdc,0xf1}, 9999},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x59,0x26,0x90,0x47}, 9999},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x59,0x28,0x00,0x0e}, 9999},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x59,0x28,0x72,0x45}, 9999},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x59,0x2d,0x43,0x21}, 9999},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x59,0xa3,0x86,0xe3}, 9999},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5a,0xbb,0x05,0x3d}, 9999},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5b,0x7b,0xc3,0x53}, 9999},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5b,0x7b,0xc9,0x5e}, 9999},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x59,0xee,0xb5,0x4a}, 9999},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5b,0xdb,0xef,0x52}, 9999},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5b,0xdb,0xef,0x53}, 9999},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5c,0x3f,0x39,0x1c}, 9999},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5c,0x3f,0x39,0x78}, 9999},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5d,0x5a,0xcd,0x50}, 9999},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5d,0x68,0xd5,0xd0}, 9999},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5d,0x9e,0xd8,0x99}, 9999},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5d,0xb9,0x67,0x46}, 9999},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5d,0xb9,0x67,0x47}, 9999},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5e,0x82,0x68,0xa9}, 9999},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5e,0x9c,0xae,0xa6}, 9999},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5e,0xb0,0xef,0x3e}, 9999},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5e,0xb1,0xaa,0xdf}, 9999},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5e,0xb1,0xe0,0xe1}, 9999},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5e,0xb1,0xe1,0x73}, 9999},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5e,0xb1,0xe1,0xd2}, 9999},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5e,0xb1,0xe8,0x21}, 9999},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5e,0xb1,0xfa,0x3d}, 9999},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5f,0x2b,0x8b,0xa2}, 9999},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5f,0xb5,0xe2,0x2f}, 9999},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5f,0xb7,0x32,0x61}, 9999},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5f,0xb7,0x33,0x62}, 9999},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5f,0xb7,0x33,0x8d}, 9999},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5f,0xb7,0x35,0x38}, 9999},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5f,0xb7,0x35,0x60}, 9999},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5f,0xd7,0x2d,0xe1}, 9999},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5f,0xb7,0x35,0x86}, 9999},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5f,0xd8,0x0b,0x39}, 9999},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5f,0xd8,0x93,0x2f}, 9999},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x60,0x7e,0x60,0xa4}, 9999},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x65,0x84,0x19,0xbc}, 9999},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x67,0x0b,0x40,0x5e}, 9999},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x68,0x80,0xe2,0x46}, 9999},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x68,0x80,0xe2,0x48}, 9999},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x68,0xee,0xc0,0x92}, 9999},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x65,0x25,0x60,0x00}, 9999},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x65,0x25,0x60,0x60}, 9999},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x68,0xc4,0xa9,0x51}, 9999},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x68,0xdf,0x06,0xa4}, 9999},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x6b,0x06,0x8c,0x23}, 9999},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x6b,0x06,0x8c,0x37}, 9999},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x6b,0x06,0xaf,0xce}, 9999},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x6b,0x06,0xaf,0x96}, 9999},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x6b,0x9b,0x76,0x89}, 9999},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x6b,0xbf,0x65,0xd4}, 9999},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x6c,0x3d,0xe0,0x16}, 9999},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x6c,0x3d,0xe0,0x21}, 9999},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x6e,0x0a,0x19,0x4c}, 9999},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x74,0x3e,0xed,0xbe}, 9999},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x76,0x1f,0x26,0xe8}, 9999},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x78,0x84,0x1b,0x27}, 9999},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x73,0x9f,0x56,0x76}, 9999},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x7a,0x6a,0x37,0xd6}, 9999},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x7a,0x72,0xad,0xda}, 9999},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x7b,0xc1,0x40,0xa6}, 9999},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x7d,0x59,0x3e,0x24}, 9999},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x7d,0x59,0x3e,0x25}, 9999},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x82,0xb9,0xfb,0x45}, 9999},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x82,0xb9,0xfb,0x71}, 9999},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x85,0x82,0x66,0x16}, 9999},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x8b,0xa2,0x0b,0x52}, 9999},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x8d,0xff,0xb8,0xbf}, 9999},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x8e,0x2c,0xe5,0x3d}, 9999},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x8e,0x36,0xa2,0xb3}, 9999},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x95,0x38,0x80,0xc7}, 9999},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x9a,0x7f,0x39,0x42}, 9999},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x8b,0x63,0xc1,0x17}, 9999},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x94,0x42,0x32,0x2a}, 9999},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x97,0xec,0x0a,0x6d}, 9999},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x9a,0x7f,0x39,0xf0}, 9999},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x9a,0x7f,0x39,0xfe}, 9999},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x9a,0x7f,0x3b,0x1b}, 9999},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x9a,0x7f,0x3c,0x08}, 9999},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x9b,0xfe,0x20,0x8b}, 9999},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x9f,0x45,0x9b,0x5e}, 9999},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x9f,0x59,0x20,0x0c}, 9999},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x9f,0x64,0x13,0xa6}, 9999},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x9f,0x64,0x13,0xa7}, 9999},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xa2,0xdd,0xc3,0x11}, 9999},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xa2,0xdd,0xc3,0xf3}, 9999},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xa2,0xfa,0x91,0x6b}, 9999},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x9f,0xcb,0x14,0x83}, 9999},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xa3,0x2c,0xa7,0x90}, 9999},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xa3,0x2c,0xa7,0xed}, 9999},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xa3,0x2c,0xab,0x33}, 9999},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xa3,0xac,0x80,0xbb}, 9999},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xa3,0xac,0x81,0x0d}, 9999},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xa4,0x84,0x2a,0xa2}, 9999},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xa7,0x58,0x0f,0x62}, 9999},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xa8,0xeb,0x60,0xca}, 9999},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xa3,0x2c,0xa8,0xbf}, 9999},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xa7,0x58,0x0f,0x61}, 9999},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xa8,0xeb,0x60,0xcb}, 9999},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xa8,0xeb,0x60,0xcd}, 9999},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xa8,0xeb,0x63,0x2d}, 9999},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xa8,0xeb,0x63,0x2f}, 9999},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xaa,0x4b,0xa2,0x3c}, 9999},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xaa,0x4b,0xa2,0xdb}, 9999},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xaa,0x4b,0xa3,0x6c}, 9999},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xac,0x51,0xb1,0x2a}, 9999},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xac,0x56,0x79,0x94}, 9999},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xac,0x68,0x40,0x0d}, 9999},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xac,0x6e,0x06,0xa7}, 9999},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xac,0x6e,0x05,0x62}, 9999},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xac,0x6e,0x06,0xa9}, 9999},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xad,0xd4,0xf1,0x32}, 9999},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb0,0x1f,0x91,0x32}, 9999},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb2,0x3e,0x80,0x32}, 9999},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb0,0x7a,0x14,0xcf}, 9999},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb2,0x3e,0xa0,0x1d}, 9999},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb2,0x3e,0xc0,0x2a}, 9999},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb2,0xd1,0x32,0x1e}, 9999},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb2,0xee,0x2a,0x07}, 9999},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb2,0xfe,0x17,0xa0}, 9999},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb2,0xfe,0x20,0x30}, 9999},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb9,0x02,0x52,0x89}, 9999},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb9,0x16,0xae,0x25}, 9999},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb9,0x1a,0x7e,0xfa}, 9999},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb9,0x1c,0x65,0x5b}, 9999},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb9,0x1c,0x65,0x85}, 9999},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb9,0x23,0x40,0xd9}, 9999},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb9,0x23,0x43,0x75}, 9999},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb9,0x2b,0xd2,0x7d}, 9999},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb9,0x3a,0xc2,0x71}, 9999},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb9,0x3a,0xe0,0xea}, 9999},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb9,0x40,0x68,0xdd}, 9999},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb9,0x40,0x68,0xde}, 9999},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb9,0x40,0x68,0xdf}, 9999},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb9,0x52,0x16,0xe4}, 9999},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb9,0x6a,0x79,0xa3}, 9999},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb9,0x6a,0x7a,0x2e}, 9999},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb9,0x77,0x55,0x1e}, 9999},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb9,0x85,0x25,0x69}, 9999},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb9,0x8b,0xed,0x9a}, 9999},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb9,0x8d,0x1a,0x6a}, 9999},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb9,0x8e,0xd4,0x90}, 9999},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb9,0x9c,0xb2,0x4a}, 9999},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb9,0x9c,0xb2,0x7d}, 9999},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb9,0x9c,0xb2,0xd8}, 9999},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb9,0x9c,0xb2,0xdd}, 9999},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb9,0x9c,0xb2,0xda}, 9999},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb9,0x9c,0xb2,0xde}, 9999},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb9,0xa5,0xa8,0x15}, 9999},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb9,0xa5,0xa8,0x16}, 9999},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb9,0xa5,0xa8,0x17}, 9999},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb9,0xa5,0xa8,0x19}, 9999},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb9,0xa5,0xa8,0x1b}, 9999},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb9,0xa6,0xef,0x30}, 9999},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb9,0xa6,0xef,0xa2}, 9999},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb9,0xa6,0xef,0xbb}, 9999},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb9,0xa6,0xef,0xbf}, 9999},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb9,0xa8,0x08,0x90}, 9999},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb9,0xb7,0x61,0x83}, 9999},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb9,0xb9,0x28,0x0d}, 9999},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb9,0xcb,0x75,0xe5}, 9999},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb9,0xd4,0x2c,0xfa}, 9999},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb9,0xd5,0x25,0x01}, 9999},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb9,0xd5,0x25,0x06}, 9999},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb9,0xd9,0x01,0x63}, 9999},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xbc,0x28,0x3e,0x16}, 9999},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xbc,0x28,0x5d,0xcd}, 9999},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xbc,0xa6,0x4a,0xad}, 9999},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xbc,0xd5,0xab,0x1e}, 9999},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xbc,0xe3,0x10,0x10}, 9999},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xbc,0xe3,0x10,0x53}, 9999},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb9,0xd9,0x01,0x64}, 9999},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb9,0xf3,0x70,0x30}, 9999},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb9,0xf3,0x70,0x50}, 9999},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb9,0xf3,0x70,0xbb}, 9999},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb9,0xf3,0x70,0xdd}, 9999},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb9,0xfd,0xbd,0x12}, 9999},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb9,0xfd,0xbd,0x42}, 9999},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb9,0xfd,0xbd,0x46}, 9999},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb9,0xfd,0xbd,0x50}, 9999},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xbc,0xa6,0x45,0x58}, 9999},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xbc,0xe3,0x4a,0xab}, 9999},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xbc,0xe3,0x4a,0xc1}, 9999},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xbc,0xe3,0x4a,0xc4}, 9999},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xbe,0x04,0xb8,0xb4}, 9999},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xbe,0x0a,0x08,0xfa}, 9999},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc0,0x51,0x82,0xe4}, 9999},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc0,0xa1,0xb6,0x68}, 9999},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc0,0xa1,0xb6,0x6c}, 9999},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc0,0xa1,0xb6,0x6d}, 9999},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc0,0xe3,0x8f,0x29}, 9999},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc0,0xe3,0xe4,0xc4}, 9999},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc0,0xe3,0xe4,0xc5}, 9999},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc0,0xf3,0xd6,0x5a}, 9999},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc0,0xfa,0xe6,0x11}, 9999},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc1,0x1d,0xbb,0x55}, 9999},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc1,0xea,0xe0,0x48}, 9999},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc1,0xea,0xe0,0x64}, 9999},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc1,0xea,0xe0,0x67}, 9999},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc1,0xea,0xe0,0x91}, 9999},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc1,0xea,0xe0,0x98}, 9999},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc2,0x63,0x14,0x64}, 9999},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc3,0x9a,0x69,0x6d}, 9999},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc3,0x9a,0x69,0x7d}, 9999},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc6,0x14,0x65,0x74}, 9999},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc6,0x17,0x80,0x4b}, 9999},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc6,0x17,0xe2,0x29}, 9999},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc6,0x35,0x4a,0x0e}, 9999},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc6,0x3d,0xbe,0x8e}, 9999},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc6,0xcc,0xfb,0x3a}, 9999},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc7,0xc9,0x6e,0xc3}, 9999},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc8,0x7a,0x80,0xac}, 9999},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xca,0x47,0x62,0x7b}, 9999},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xca,0x47,0x62,0x7c}, 9999},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xca,0x47,0x62,0x7d}, 9999},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xca,0x47,0x62,0x7e}, 9999},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xcc,0x0c,0xf0,0x62}, 9999},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xcc,0x10,0xf3,0x6a}, 9999},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xcc,0x10,0xf5,0x62}, 9999},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xcc,0x1b,0x3a,0xd4}, 9999},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd1,0xb1,0x57,0x94}, 9999},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd1,0xb1,0x58,0x57}, 9999},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd3,0x63,0xe0,0xa3}, 9999},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd3,0x63,0xe0,0xa7}, 9999},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd3,0x63,0xe0,0xae}, 9999},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd3,0x63,0xe0,0xca}, 9999},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd1,0xb1,0x5b,0xcb}, 9999},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd4,0x18,0x60,0x10}, 9999},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd4,0x18,0x60,0x1a}, 9999},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd4,0x18,0x60,0x78}, 9999},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd4,0x18,0x60,0x9f}, 9999},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd4,0x18,0x60,0xb2}, 9999},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd4,0xe3,0x88,0xeb}, 9999},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd4,0x2f,0xeb,0xfd}, 9999},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd4,0xe3,0xc9,0x2f}, 9999},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd4,0xed,0x25,0xf0}, 9999},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd5,0x88,0x50,0x89}, 9999},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd5,0x40,0xc5,0x5f}, 9999},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd5,0x88,0x50,0x5d}, 9999},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd5,0x88,0x50,0x9f}, 9999},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd5,0xa9,0x49,0x4a}, 9999},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd9,0x0d,0x65,0x5e}, 9999},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd9,0x0d,0x6b,0x1a}, 9999},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd8,0x6b,0xd9,0x3e}, 9999},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd8,0xbd,0x91,0xa1}, 9999},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd8,0xbd,0x93,0xb2}, 9999},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd9,0x3d,0x02,0x35}, 9999},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd9,0x3d,0x03,0xc1}, 9999},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xdb,0x02,0x82,0x6e}, 9999}
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xdd,0x9c,0x85,0x6e}, 9999},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xde,0xe7,0x3b,0x1e}, 9999}
 };
 
 static SeedSpec6 pnSeed6_test[] = {
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x22,0xed,0xa7,0xf8}, 19999},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x22,0xee,0x5d,0xe0}, 19999},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2b,0xe5,0x4d,0x2e}, 19999},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2d,0x20,0x68,0x5f}, 19999},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2d,0x20,0xd7,0x1f}, 19999},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2d,0x20,0xdd,0xe6}, 19999},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x22,0xfa,0x26,0x93}, 19999},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x23,0xed,0x32,0x7b}, 19999},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2d,0x20,0xd3,0x9b}, 19999},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2d,0x20,0xed,0x4c}, 19999},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x34,0x07,0x2e,0x71}, 19999},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x34,0xc9,0x17,0x81}, 19999},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x8a,0x44,0x14,0x8e}, 19999},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xa5,0xe3,0x08,0x50}, 19999},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd9,0xb6,0xe5,0x80}, 19999},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd9,0xb6,0xe5,0x84}, 19999},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd9,0xb6,0xe5,0x86}, 19999},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd9,0xb6,0xe5,0x88}, 19999}
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2d,0x4c,0x83,0xb2}, 19999},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x34,0x4d,0xf4,0xd7}, 19999},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x36,0x5b,0x82,0xaa}, 19999},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x6d,0xeb,0x47,0x38}, 19999},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x9f,0x41,0xe9,0x34}, 19999},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb2,0x3e,0xcb,0xf9}, 19999},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb2,0x97,0xc0,0x6b}, 19999},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb9,0xd5,0x25,0x01}, 19999},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb9,0xd5,0x25,0x02}, 19999},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xce,0xbd,0xd1,0xc5}, 19999}
 };
 #endif // DASH_CHAINPARAMSSEEDS_H

From 5ecd91b0542200f7ea28ae5190ec35c56b7cc3be Mon Sep 17 00:00:00 2001
From: UdjinM6 <UdjinM6@users.noreply.github.com>
Date: Sat, 10 Nov 2018 12:53:29 +0300
Subject: [PATCH 254/400] Fix ps collateral/denom creation tx category
 confusion (#2430)

* fix ps collateral/denom creation tx confusion

* clarify the logic of detecting PrivateSendMakeCollaterals/PrivateSendCreateDenominations category
---
 src/qt/transactionrecord.cpp | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/qt/transactionrecord.cpp b/src/qt/transactionrecord.cpp
index 2cea36561664..db9ae26b78aa 100644
--- a/src/qt/transactionrecord.cpp
+++ b/src/qt/transactionrecord.cpp
@@ -155,13 +155,12 @@ QList<TransactionRecord> TransactionRecord::decomposeTransaction(const CWallet *
                     sub.type = TransactionRecord::PrivateSendCollateralPayment;
                 } else {
                     for (const auto& txout : wtx.tx->vout) {
-                        if(txout.nValue == CPrivateSend::GetMaxCollateralAmount()) {
+                        if (txout.nValue == CPrivateSend::GetMaxCollateralAmount()) {
                             sub.type = TransactionRecord::PrivateSendMakeCollaterals;
-                            break;
-                        }
-                        if(CPrivateSend::IsDenominatedAmount(txout.nValue)) {
+                            continue; // Keep looking, could be a part of PrivateSendCreateDenominations
+                        } else if (CPrivateSend::IsDenominatedAmount(txout.nValue)) {
                             sub.type = TransactionRecord::PrivateSendCreateDenominations;
-                            break;
+                            break; // Done, it's definitely a tx creating mixing denoms, no need to look any further
                         }
                     }
                 }

From 76a38f6cebafc32e8ccaa09b76208f1f531a148a Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Sat, 10 Nov 2018 10:54:01 +0100
Subject: [PATCH 255/400]  Update defaultAssumeValid, nMinimumChainWork and
 checkpoints (#2428)

* Update defaultAssumeValid and nMinimumChainWork for mainnet

* Update defaultAssumeValid and nMinimumChainWork for testnet

* Add checkpoint for mainnet

* Add checkpoint for testnet
---
 src/chainparams.cpp | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/chainparams.cpp b/src/chainparams.cpp
index 0ef8ff759ec5..7af989cf72d4 100644
--- a/src/chainparams.cpp
+++ b/src/chainparams.cpp
@@ -175,10 +175,10 @@ class CMainParams : public CChainParams {
         consensus.vDeployments[Consensus::DEPLOYMENT_BIP147].nThreshold = 3226; // 80% of 4032
 
         // The best chain should have at least this much work.
-        consensus.nMinimumChainWork = uint256S("0x00000000000000000000000000000000000000000000081021b74f9f47bbd7bc"); // 888900
+        consensus.nMinimumChainWork = uint256S("0x000000000000000000000000000000000000000000000cca0a6a35241029410f"); // 967800
 
         // By default assume that the signatures in ancestors of this block are valid.
-        consensus.defaultAssumeValid = uint256S("0x0000000000000026c29d576073ab51ebd1d3c938de02e9a44c7ee9e16f82db28"); // 888900
+        consensus.defaultAssumeValid = uint256S("0x0000000000000024e26c7df7e46d673724d223cf4ca2b2adc21297cc095600f4"); // 967800
 
         /**
          * The message start string is designed to be unlikely to occur in normal data.
@@ -258,11 +258,12 @@ class CMainParams : public CChainParams {
             ( 523930, uint256S("0x0000000000000bccdb11c2b1cfb0ecab452abf267d89b7f46eaf2d54ce6e652c"))
             ( 750000, uint256S("0x00000000000000b4181bbbdddbae464ce11fede5d0292fb63fdede1e7c8ab21c"))
             ( 888900, uint256S("0x0000000000000026c29d576073ab51ebd1d3c938de02e9a44c7ee9e16f82db28"))
+            ( 967800, uint256S("0x0000000000000024e26c7df7e46d673724d223cf4ca2b2adc21297cc095600f4"))
         };
 
         chainTxData = ChainTxData{
-            1529305236, // * UNIX timestamp of last known number of transactions
-            6155435,    // * total number of transactions between genesis and that timestamp
+            1541738255, // * UNIX timestamp of last known number of transactions
+            8822293,    // * total number of transactions between genesis and that timestamp
                         //   (the tx=... number in the SetBestChain debug.log lines)
             0.1         // * estimated number of transactions per second after that timestamp
         };
@@ -337,10 +338,10 @@ class CTestNetParams : public CChainParams {
         consensus.vDeployments[Consensus::DEPLOYMENT_DIP0003].nThreshold = 50; // 50% of 100
 
         // The best chain should have at least this much work.
-        consensus.nMinimumChainWork = uint256S("0x000000000000000000000000000000000000000000000000003be69c34b1244f"); // 143200
+        consensus.nMinimumChainWork = uint256S("0x000000000000000000000000000000000000000000000000006e06c236f3dc1e"); // 260940
 
         // By default assume that the signatures in ancestors of this block are valid.
-        consensus.defaultAssumeValid = uint256S("0x0000000004a7878409189b7a8f75b3815d9b8c45ee8f79955a6c727d83bddb04"); // 143200
+        consensus.defaultAssumeValid = uint256S("0x000000000118fa2f031efedf874adbe7fe6b023cdf9478e8e2400c2d505df30d"); // 260940
 
         pchMessageStart[0] = 0xce;
         pchMessageStart[1] = 0xe2;
@@ -399,11 +400,12 @@ class CTestNetParams : public CChainParams {
             (   2999, uint256S("0x0000024bc3f4f4cb30d29827c13d921ad77d2c6072e586c7f60d83c2722cdcc5"))
             ( 100000, uint256S("0x0000000003aa53e24b6e60ef97642e4193611f2bcb75ea1fa8105f0b5ffd5242"))
             ( 143200, uint256S("0x0000000004a7878409189b7a8f75b3815d9b8c45ee8f79955a6c727d83bddb04"))
+            ( 260940, uint256S("0x000000000118fa2f031efedf874adbe7fe6b023cdf9478e8e2400c2d505df30d"))
         };
 
-        chainTxData = ChainTxData{        
-            1529294335, // * UNIX timestamp of last known number of transactions
-            5810120,    // * total number of transactions between genesis and that timestamp
+        chainTxData = ChainTxData{
+            1541743239, // * UNIX timestamp of last known number of transactions
+            6134223,    // * total number of transactions between genesis and that timestamp
                         //   (the tx=... number in the SetBestChain debug.log lines)
             0.01        // * estimated number of transactions per second after that timestamp
         };

From c27e62935f33728aa7dfb15d3a2a4728d18747fc Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Sat, 10 Nov 2018 10:54:16 +0100
Subject: [PATCH 256/400] Allow reusing of external collaterals in DIP3 (#2427)

* Allow to reuse collaterals and addresses in ProRegTx

This also requires to move out the duplication check from CheckService to
the 2 individual ProTx check methods.

* Implement replacement logic for reused collaterals

* Add tests for new replacement logic
---
 qa/rpc-tests/dip3-deterministicmns.py | 18 ++++++++++++++
 src/evo/deterministicmns.cpp          | 24 ++++++++++++------
 src/evo/providertx.cpp                | 35 +++++++++++++++------------
 3 files changed, 55 insertions(+), 22 deletions(-)

diff --git a/qa/rpc-tests/dip3-deterministicmns.py b/qa/rpc-tests/dip3-deterministicmns.py
index 6464a4b3eae5..25e37ac28028 100755
--- a/qa/rpc-tests/dip3-deterministicmns.py
+++ b/qa/rpc-tests/dip3-deterministicmns.py
@@ -294,6 +294,24 @@ def run_test(self):
         for mn in mns_protx:
             self.test_protx_update_service(mn)
 
+        print("testing reusing of collaterals for replaced MNs")
+        for i in range(0, 5):
+            mn = mns_protx[i]
+            # a few of these will actually refer to old ProRegTx internal collaterals,
+            # which should work the same as external collaterals
+            mn = self.create_mn_protx(self.nodes[0], mn.idx, 'mn-protx-%d' % mn.idx, mn.collateral_txid, mn.collateral_vout)
+            mns_protx[i] = mn
+            self.nodes[0].generate(1)
+            self.sync_all()
+            self.assert_mnlists(mns_protx)
+            print("restarting MN %s" % mn.alias)
+            self.stop_node(mn.idx)
+            self.start_mn(mn)
+            self.sync_all()
+
+        print("testing instant send with replaced MNs")
+        self.test_instantsend(20, 5)
+
     def create_mn(self, node, idx, alias):
         mn = Masternode()
         mn.idx = idx
diff --git a/src/evo/deterministicmns.cpp b/src/evo/deterministicmns.cpp
index 91bd0f228ee8..56103260ff98 100644
--- a/src/evo/deterministicmns.cpp
+++ b/src/evo/deterministicmns.cpp
@@ -392,13 +392,6 @@ bool CDeterministicMNManager::BuildNewListFromBlock(const CBlock& block, const C
                 assert(false); // this should have been handled already
             }
 
-            if (newList.HasUniqueProperty(proTx.addr)) {
-                return _state.DoS(100, false, REJECT_CONFLICT, "bad-protx-dup-addr");
-            }
-            if (newList.HasUniqueProperty(proTx.keyIDOwner) || newList.HasUniqueProperty(proTx.pubKeyOperator)) {
-                return _state.DoS(100, false, REJECT_CONFLICT, "bad-protx-dup-key");
-            }
-
             auto dmn = std::make_shared<CDeterministicMN>();
             dmn->proTxHash = tx.GetHash();
 
@@ -416,6 +409,23 @@ bool CDeterministicMNManager::BuildNewListFromBlock(const CBlock& block, const C
                 return _state.DoS(100, false, REJECT_INVALID, "bad-protx-collateral");
             }
 
+            auto replacedDmn = newList.GetMNByCollateral(dmn->collateralOutpoint);
+            if (replacedDmn != nullptr) {
+                // This might only happen with a ProRegTx that refers an external collateral
+                // In that case the new ProRegTx will replace the old one. This means the old one is removed
+                // and the new one is added like a completely fresh one, which is also at the bottom of the payment list
+                newList.RemoveMN(replacedDmn->proTxHash);
+                LogPrintf("CDeterministicMNManager::%s -- MN %s removed from list because collateral was used for a new ProRegTx. collateralOutpoint=%s, nHeight=%d, mapCurMNs.allMNsCount=%d\n",
+                          __func__, replacedDmn->proTxHash.ToString(), dmn->collateralOutpoint.ToStringShort(), nHeight, newList.GetAllMNsCount());
+            }
+
+            if (newList.HasUniqueProperty(proTx.addr)) {
+                return _state.DoS(100, false, REJECT_CONFLICT, "bad-protx-dup-addr");
+            }
+            if (newList.HasUniqueProperty(proTx.keyIDOwner) || newList.HasUniqueProperty(proTx.pubKeyOperator)) {
+                return _state.DoS(100, false, REJECT_CONFLICT, "bad-protx-dup-key");
+            }
+
             dmn->nOperatorReward = proTx.nOperatorReward;
             dmn->pdmnState = std::make_shared<CDeterministicMNState>(proTx);
 
diff --git a/src/evo/providertx.cpp b/src/evo/providertx.cpp
index abf3afce9656..0db1149e474c 100644
--- a/src/evo/providertx.cpp
+++ b/src/evo/providertx.cpp
@@ -18,7 +18,7 @@
 #include "validation.h"
 
 template <typename ProTx>
-static bool CheckService(const uint256& proTxHash, const ProTx& proTx, const CBlockIndex* pindexPrev, CValidationState& state)
+static bool CheckService(const uint256& proTxHash, const ProTx& proTx, CValidationState& state)
 {
     if (!proTx.addr.IsValid()) {
         return state.DoS(10, false, REJECT_INVALID, "bad-protx-addr");
@@ -31,13 +31,6 @@ static bool CheckService(const uint256& proTxHash, const ProTx& proTx, const CBl
         return state.DoS(10, false, REJECT_INVALID, "bad-protx-addr");
     }
 
-    if (pindexPrev) {
-        auto mnList = deterministicMNManager->GetListForBlock(pindexPrev->GetBlockHash());
-        if (mnList.HasUniqueProperty(proTx.addr) && mnList.GetUniquePropertyMN(proTx.addr)->proTxHash != proTxHash) {
-            return state.DoS(10, false, REJECT_DUPLICATE, "bad-protx-dup-addr");
-        }
-    }
-
     return true;
 }
 
@@ -135,7 +128,7 @@ bool CheckProRegTx(const CTransaction& tx, const CBlockIndex* pindexPrev, CValid
 
     // It's allowed to set addr to 0, which will put the MN into PoSe-banned state and require a ProUpServTx to be issues later
     // If any of both is set, it must be valid however
-    if (ptx.addr != CService() && !CheckService(tx.GetHash(), ptx, pindexPrev, state)) {
+    if (ptx.addr != CService() && !CheckService(tx.GetHash(), ptx, state)) {
         return false;
     }
 
@@ -144,6 +137,7 @@ bool CheckProRegTx(const CTransaction& tx, const CBlockIndex* pindexPrev, CValid
     }
 
     CKeyID keyForPayloadSig;
+    COutPoint collateralOutpoint;
 
     if (!ptx.collateralOutpoint.hash.IsNull()) {
         Coin coin;
@@ -162,17 +156,23 @@ bool CheckProRegTx(const CTransaction& tx, const CBlockIndex* pindexPrev, CValid
         if (!txAddr.GetKeyID(keyForPayloadSig)) {
             return state.DoS(10, false, REJECT_INVALID, "bad-protx-collateral-pkh");
         }
+
+        collateralOutpoint = ptx.collateralOutpoint;
+    } else {
+        collateralOutpoint = COutPoint(tx.GetHash(), ptx.collateralOutpoint.n);
     }
 
     if (pindexPrev) {
         auto mnList = deterministicMNManager->GetListForBlock(pindexPrev->GetBlockHash());
-        if (mnList.HasUniqueProperty(ptx.keyIDOwner) || mnList.HasUniqueProperty(ptx.pubKeyOperator)) {
-            return state.DoS(10, false, REJECT_DUPLICATE, "bad-protx-dup-key");
+
+        // only allow reusing of addresses when it's for the same collateral (which replaces the old MN)
+        if (mnList.HasUniqueProperty(ptx.addr) && mnList.GetUniquePropertyMN(ptx.addr)->collateralOutpoint != collateralOutpoint) {
+            return state.DoS(10, false, REJECT_DUPLICATE, "bad-protx-dup-addr");
         }
 
-        // check for collaterals which are already used in other MNs
-        if (!ptx.collateralOutpoint.hash.IsNull() && mnList.HasUniqueProperty(ptx.collateralOutpoint)) {
-            return state.DoS(10, false, REJECT_DUPLICATE, "bad-protx-dup-collateral");
+        // never allow duplicate keys, even if this ProTx would replace an existing MN
+        if (mnList.HasUniqueProperty(ptx.keyIDOwner) || mnList.HasUniqueProperty(ptx.pubKeyOperator)) {
+            return state.DoS(10, false, REJECT_DUPLICATE, "bad-protx-dup-key");
         }
 
         if (!deterministicMNManager->IsDeterministicMNsSporkActive(pindexPrev->nHeight)) {
@@ -214,7 +214,7 @@ bool CheckProUpServTx(const CTransaction& tx, const CBlockIndex* pindexPrev, CVa
         return state.DoS(100, false, REJECT_INVALID, "bad-protx-version");
     }
 
-    if (!CheckService(ptx.proTxHash, ptx, pindexPrev, state)) {
+    if (!CheckService(ptx.proTxHash, ptx, state)) {
         return false;
     }
 
@@ -225,6 +225,11 @@ bool CheckProUpServTx(const CTransaction& tx, const CBlockIndex* pindexPrev, CVa
             return state.DoS(100, false, REJECT_INVALID, "bad-protx-hash");
         }
 
+        // don't allow updating to addresses already used by other MNs
+        if (mnList.HasUniqueProperty(ptx.addr) && mnList.GetUniquePropertyMN(ptx.addr)->proTxHash != ptx.proTxHash) {
+            return state.DoS(10, false, REJECT_DUPLICATE, "bad-protx-dup-addr");
+        }
+
         if (ptx.scriptOperatorPayout != CScript()) {
             if (mn->nOperatorReward == 0) {
                 // don't allow to set operator reward payee in case no operatorReward was set

From 5fc4072ca051e1876f54b66810aba3ef4f1a52b0 Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Sat, 10 Nov 2018 17:00:24 +0100
Subject: [PATCH 257/400] Parallel ASN resolve and allow passing of input file
 names to makeseeds.py (#2432)

* Resolve ASNs in parallel

* Allow passing of filename to makeseeds.py
---
 contrib/seeds/makeseeds.py | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/contrib/seeds/makeseeds.py b/contrib/seeds/makeseeds.py
index f0c0d3d17141..c4b279618d43 100755
--- a/contrib/seeds/makeseeds.py
+++ b/contrib/seeds/makeseeds.py
@@ -25,6 +25,7 @@
 import collections
 import json
 import time
+import multiprocessing
 
 PATTERN_IPV4 = re.compile(r"^((\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})):(\d+)$")
 PATTERN_IPV6 = re.compile(r"^\[([0-9a-z:]+)\]:(\d+)$")
@@ -90,6 +91,10 @@ def filtermultiport(ips):
         hist[ip['sortkey']].append(ip)
     return [value[0] for (key,value) in list(hist.items()) if len(value)==1]
 
+def resolveasn(resolver, ip):
+    asn = int([x.to_text() for x in resolver.query('.'.join(reversed(ip.split('.'))) + '.origin.asn.cymru.com', 'TXT').response.answer][0].split('\"')[1].split(' ')[0])
+    return asn
+
 # Based on Greg Maxwell's seed_filter.py
 def filterbyasn(ips, max_per_asn, max_total):
     # Sift out ips by type
@@ -99,17 +104,23 @@ def filterbyasn(ips, max_per_asn, max_total):
 
     my_resolver = dns.resolver.Resolver()
 
+    pool = multiprocessing.Pool(processes=16)
+
     # OpenDNS servers
     my_resolver.nameservers = ['208.67.222.222', '208.67.220.220']
 
+    # Resolve ASNs in parallel
+    asns = [pool.apply_async(resolveasn, args=(my_resolver, ip['ip'])) for ip in ips_ipv4]
+
     # Filter IPv4 by ASN
     result = []
     asn_count = {}
-    for ip in ips_ipv4:
+    for i in range(len(ips_ipv4)):
+        ip = ips_ipv4[i]
         if len(result) == max_total:
             break
         try:
-            asn = int([x.to_text() for x in my_resolver.query('.'.join(reversed(ip['ip'].split('.'))) + '.origin.asn.cymru.com', 'TXT').response.answer][0].split('\"')[1].split(' ')[0])
+            asn = asns[i].get()
             if asn not in asn_count:
                 asn_count[asn] = 0
             if asn_count[asn] == max_per_asn:
@@ -127,7 +138,11 @@ def filterbyasn(ips, max_per_asn, max_total):
     return result
 
 def main():
-    js = json.load(sys.stdin)
+    if len(sys.argv) > 1:
+        with open(sys.argv[1], 'r') as f:
+            js = json.load(f)
+    else:
+        js = json.load(sys.stdin)
     ips = [parseline(line) for collateral, line in js.items()]
 
     cur_time = int(time.time())

From 46462d68290197f093a733a05d55c41d81c49580 Mon Sep 17 00:00:00 2001
From: UdjinM6 <UdjinM6@users.noreply.github.com>
Date: Mon, 12 Nov 2018 18:08:31 +0300
Subject: [PATCH 258/400] Add a column for IS lock status on Transactions tab
 (#2433)

* Drop colorizing for IS

* Add IS column

* Add IS filter
---
 src/qt/transactionfilterproxy.cpp | 12 +++++++
 src/qt/transactionfilterproxy.h   |  9 ++++++
 src/qt/transactiontablemodel.cpp  | 52 +++++++++++++++----------------
 src/qt/transactiontablemodel.h    | 14 ++++++---
 src/qt/transactionview.cpp        | 17 ++++++++++
 src/qt/transactionview.h          |  3 ++
 6 files changed, 77 insertions(+), 30 deletions(-)

diff --git a/src/qt/transactionfilterproxy.cpp b/src/qt/transactionfilterproxy.cpp
index 76ca8e00e97f..e4eff3e3fc14 100644
--- a/src/qt/transactionfilterproxy.cpp
+++ b/src/qt/transactionfilterproxy.cpp
@@ -23,6 +23,7 @@ TransactionFilterProxy::TransactionFilterProxy(QObject *parent) :
     addrPrefix(),
     typeFilter(COMMON_TYPES),
     watchOnlyFilter(WatchOnlyFilter_All),
+    instantsendFilter(InstantSendFilter_All),
     minAmount(0),
     limitRows(-1),
     showInactive(true)
@@ -36,6 +37,7 @@ bool TransactionFilterProxy::filterAcceptsRow(int sourceRow, const QModelIndex &
     int type = index.data(TransactionTableModel::TypeRole).toInt();
     QDateTime datetime = index.data(TransactionTableModel::DateRole).toDateTime();
     bool involvesWatchAddress = index.data(TransactionTableModel::WatchonlyRole).toBool();
+    bool lockedByInstantSend = index.data(TransactionTableModel::InstantSendRole).toBool();
     QString address = index.data(TransactionTableModel::AddressRole).toString();
     QString label = index.data(TransactionTableModel::LabelRole).toString();
     qint64 amount = llabs(index.data(TransactionTableModel::AmountRole).toLongLong());
@@ -49,6 +51,10 @@ bool TransactionFilterProxy::filterAcceptsRow(int sourceRow, const QModelIndex &
         return false;
     if (!involvesWatchAddress && watchOnlyFilter == WatchOnlyFilter_Yes)
         return false;
+    if (lockedByInstantSend && instantsendFilter == InstantSendFilter_No)
+        return false;
+    if (!lockedByInstantSend && instantsendFilter == InstantSendFilter_Yes)
+        return false;
     if(datetime < dateFrom || datetime > dateTo)
         return false;
     if (!address.contains(addrPrefix, Qt::CaseInsensitive) && !label.contains(addrPrefix, Qt::CaseInsensitive))
@@ -90,6 +96,12 @@ void TransactionFilterProxy::setWatchOnlyFilter(WatchOnlyFilter filter)
     invalidateFilter();
 }
 
+void TransactionFilterProxy::setInstantSendFilter(InstantSendFilter filter)
+{
+    this->instantsendFilter = filter;
+    invalidateFilter();
+}
+
 void TransactionFilterProxy::setLimit(int limit)
 {
     this->limitRows = limit;
diff --git a/src/qt/transactionfilterproxy.h b/src/qt/transactionfilterproxy.h
index fb3215cd0ff8..ed25b29c99c8 100644
--- a/src/qt/transactionfilterproxy.h
+++ b/src/qt/transactionfilterproxy.h
@@ -36,6 +36,13 @@ class TransactionFilterProxy : public QSortFilterProxyModel
         WatchOnlyFilter_No
     };
 
+    enum InstantSendFilter
+    {
+        InstantSendFilter_All,
+        InstantSendFilter_Yes,
+        InstantSendFilter_No
+    };
+
     void setDateRange(const QDateTime &from, const QDateTime &to);
     void setAddressPrefix(const QString &addrPrefix);
     /**
@@ -44,6 +51,7 @@ class TransactionFilterProxy : public QSortFilterProxyModel
     void setTypeFilter(quint32 modes);
     void setMinAmount(const CAmount& minimum);
     void setWatchOnlyFilter(WatchOnlyFilter filter);
+    void setInstantSendFilter(InstantSendFilter filter);
 
     /** Set maximum number of rows returned, -1 if unlimited. */
     void setLimit(int limit);
@@ -62,6 +70,7 @@ class TransactionFilterProxy : public QSortFilterProxyModel
     QString addrPrefix;
     quint32 typeFilter;
     WatchOnlyFilter watchOnlyFilter;
+    InstantSendFilter instantsendFilter;
     CAmount minAmount;
     int limitRows;
     bool showInactive;
diff --git a/src/qt/transactiontablemodel.cpp b/src/qt/transactiontablemodel.cpp
index 342e44851c07..aa792adab8f0 100644
--- a/src/qt/transactiontablemodel.cpp
+++ b/src/qt/transactiontablemodel.cpp
@@ -32,6 +32,7 @@
 static int column_alignments[] = {
         Qt::AlignLeft|Qt::AlignVCenter, /* status */
         Qt::AlignLeft|Qt::AlignVCenter, /* watchonly */
+        Qt::AlignLeft|Qt::AlignVCenter, /* instantsend */
         Qt::AlignLeft|Qt::AlignVCenter, /* date */
         Qt::AlignLeft|Qt::AlignVCenter, /* type */
         Qt::AlignLeft|Qt::AlignVCenter, /* address */
@@ -243,7 +244,7 @@ TransactionTableModel::TransactionTableModel(const PlatformStyle *_platformStyle
         fProcessingQueuedTransactions(false),
         platformStyle(_platformStyle)
 {
-    columns << QString() << QString() << tr("Date") << tr("Type") << tr("Address / Label") << BitcoinUnits::getAmountColumnTitle(walletModel->getOptionsModel()->getDisplayUnit());
+    columns << QString() << QString() << QString() << tr("Date") << tr("Type") << tr("Address / Label") << BitcoinUnits::getAmountColumnTitle(walletModel->getOptionsModel()->getDisplayUnit());
     priv->refreshWallet();
 
     connect(walletModel->getOptionsModel(), SIGNAL(displayUnitChanged(int)), this, SLOT(updateDisplayUnit()));
@@ -485,24 +486,6 @@ QString TransactionTableModel::formatTxAmount(const TransactionRecord *wtx, bool
     return QString(str);
 }
 
-QIcon IconWithShiftedColor(const QString& filename, bool shift)
-{
-    if (!shift)
-        return QIcon(filename);
-
-    QImage img(filename);
-    img = img.convertToFormat(QImage::Format_ARGB32);
-    for (int x = img.width(); x--; )
-    {
-        for (int y = img.height(); y--; )
-        {
-            const QRgb rgb = img.pixel(x, y);
-            img.setPixel(x, y, qRgba(qRed(rgb), qGreen(rgb), qBlue(rgb)+128, qAlpha(rgb)));
-        }
-    }
-    return QIcon(QPixmap::fromImage(img));
-}
-
 QVariant TransactionTableModel::txStatusDecoration(const TransactionRecord *wtx) const
 {
     QString theme = GUIUtil::getThemeName();
@@ -514,19 +497,17 @@ QVariant TransactionTableModel::txStatusDecoration(const TransactionRecord *wtx)
     case TransactionStatus::Offline:
         return COLOR_TX_STATUS_OFFLINE;
     case TransactionStatus::Unconfirmed:
-        // TODO: use special icon for InstantSend 0-conf
         return QIcon(":/icons/" + theme + "/transaction_0");
     case TransactionStatus::Abandoned:
         return QIcon(":/icons/" + theme + "/transaction_abandoned");
     case TransactionStatus::Confirming:
         switch(wtx->status.depth)
         {
-        // TODO: use special icons for InstantSend instead of color shifting
-        case 1: return IconWithShiftedColor(":/icons/" + theme + "/transaction_1", wtx->status.lockedByInstantSend);
-        case 2: return IconWithShiftedColor(":/icons/" + theme + "/transaction_2", wtx->status.lockedByInstantSend);
-        case 3: return IconWithShiftedColor(":/icons/" + theme + "/transaction_3", wtx->status.lockedByInstantSend);
-        case 4: return IconWithShiftedColor(":/icons/" + theme + "/transaction_4", wtx->status.lockedByInstantSend);
-        default: return IconWithShiftedColor(":/icons/" + theme + "/transaction_5", wtx->status.lockedByInstantSend);
+        case 1: return QIcon(":/icons/" + theme + "/transaction_1");
+        case 2: return QIcon(":/icons/" + theme + "/transaction_2");
+        case 3: return QIcon(":/icons/" + theme + "/transaction_3");
+        case 4: return QIcon(":/icons/" + theme + "/transaction_4");
+        default: return QIcon(":/icons/" + theme + "/transaction_5");
         };
     case TransactionStatus::Confirmed:
         return QIcon(":/icons/" + theme + "/transaction_confirmed");
@@ -554,6 +535,15 @@ QVariant TransactionTableModel::txWatchonlyDecoration(const TransactionRecord *w
         return QVariant();
 }
 
+QVariant TransactionTableModel::txInstantSendDecoration(const TransactionRecord *wtx) const
+{
+    if (wtx->status.lockedByInstantSend) {
+        QString theme = GUIUtil::getThemeName();
+        return QIcon(":/icons/" + theme + "/verify");
+    }
+    return QVariant();
+}
+
 QString TransactionTableModel::formatTooltip(const TransactionRecord *rec) const
 {
     QString tooltip = formatTxStatus(rec) + QString("\n") + formatTxType(rec);
@@ -580,6 +570,8 @@ QVariant TransactionTableModel::data(const QModelIndex &index, int role) const
             return txStatusDecoration(rec);
         case Watchonly:
             return txWatchonlyDecoration(rec);
+        case InstantSend:
+            return txInstantSendDecoration(rec);
         case ToAddress:
             return txAddressDecoration(rec);
         }
@@ -613,6 +605,8 @@ QVariant TransactionTableModel::data(const QModelIndex &index, int role) const
             return formatTxType(rec);
         case Watchonly:
             return (rec->involvesWatchAddress ? 1 : 0);
+        case InstantSend:
+            return (rec->status.lockedByInstantSend ? 1 : 0);
         case ToAddress:
             return formatTxToAddress(rec, true);
         case Amount:
@@ -655,6 +649,10 @@ QVariant TransactionTableModel::data(const QModelIndex &index, int role) const
         return rec->involvesWatchAddress;
     case WatchonlyDecorationRole:
         return txWatchonlyDecoration(rec);
+    case InstantSendRole:
+        return rec->status.lockedByInstantSend;
+    case InstantSendDecorationRole:
+        return txInstantSendDecoration(rec);
     case LongDescriptionRole:
         return priv->describe(rec, walletModel->getOptionsModel()->getDisplayUnit());
     case AddressRole:
@@ -730,6 +728,8 @@ QVariant TransactionTableModel::headerData(int section, Qt::Orientation orientat
                 return tr("Type of transaction.");
             case Watchonly:
                 return tr("Whether or not a watch-only address is involved in this transaction.");
+            case InstantSend:
+                return tr("Whether or not this transaction was locked by InstantSend.");
             case ToAddress:
                 return tr("User-defined intent/purpose of the transaction.");
             case Amount:
diff --git a/src/qt/transactiontablemodel.h b/src/qt/transactiontablemodel.h
index 6932646e1e50..9b97e1e26e14 100644
--- a/src/qt/transactiontablemodel.h
+++ b/src/qt/transactiontablemodel.h
@@ -30,10 +30,11 @@ class TransactionTableModel : public QAbstractTableModel
     enum ColumnIndex {
         Status = 0,
         Watchonly = 1,
-        Date = 2,
-        Type = 3,
-        ToAddress = 4,
-        Amount = 5
+        InstantSend = 2,
+        Date = 3,
+        Type = 4,
+        ToAddress = 5,
+        Amount = 6
     };
 
     /** Roles to get specific information from a transaction row.
@@ -48,6 +49,10 @@ class TransactionTableModel : public QAbstractTableModel
         WatchonlyRole,
         /** Watch-only icon */
         WatchonlyDecorationRole,
+        /** InstantSend boolean */
+        InstantSendRole,
+        /** InstantSend icon */
+        InstantSendDecorationRole,
         /** Long description (HTML format) */
         LongDescriptionRole,
         /** Address of transaction */
@@ -102,6 +107,7 @@ class TransactionTableModel : public QAbstractTableModel
     QString formatTooltip(const TransactionRecord *rec) const;
     QVariant txStatusDecoration(const TransactionRecord *wtx) const;
     QVariant txWatchonlyDecoration(const TransactionRecord *wtx) const;
+    QVariant txInstantSendDecoration(const TransactionRecord *wtx) const;
     QVariant txAddressDecoration(const TransactionRecord *wtx) const;
 
 public Q_SLOTS:
diff --git a/src/qt/transactionview.cpp b/src/qt/transactionview.cpp
index b64f217c8ae3..0395948575ca 100644
--- a/src/qt/transactionview.cpp
+++ b/src/qt/transactionview.cpp
@@ -64,6 +64,13 @@ TransactionView::TransactionView(const PlatformStyle *platformStyle, QWidget *pa
     watchOnlyWidget->addItem(QIcon(":/icons/" + theme + "/eye_minus"), "", TransactionFilterProxy::WatchOnlyFilter_No);
     hlayout->addWidget(watchOnlyWidget);
 
+    instantsendWidget = new QComboBox(this);
+    instantsendWidget->setFixedWidth(24);
+    instantsendWidget->addItem(tr("All"), TransactionFilterProxy::InstantSendFilter_All);
+    instantsendWidget->addItem(tr("Locked by InstantSend"), TransactionFilterProxy::InstantSendFilter_Yes);
+    instantsendWidget->addItem(tr("Not locked by InstantSend"), TransactionFilterProxy::InstantSendFilter_No);
+    hlayout->addWidget(instantsendWidget);
+
     dateWidget = new QComboBox(this);
     if (platformStyle->getUseExtraSpacing()) {
         dateWidget->setFixedWidth(120);
@@ -181,6 +188,7 @@ TransactionView::TransactionView(const PlatformStyle *platformStyle, QWidget *pa
     connect(dateWidget, SIGNAL(activated(int)), this, SLOT(chooseDate(int)));
     connect(typeWidget, SIGNAL(activated(int)), this, SLOT(chooseType(int)));
     connect(watchOnlyWidget, SIGNAL(activated(int)), this, SLOT(chooseWatchonly(int)));
+    connect(instantsendWidget, SIGNAL(activated(int)), this, SLOT(chooseInstantSend(int)));
     connect(addressWidget, SIGNAL(textChanged(QString)), this, SLOT(changedPrefix(QString)));
     connect(amountWidget, SIGNAL(textChanged(QString)), this, SLOT(changedAmount(QString)));
 
@@ -224,6 +232,7 @@ void TransactionView::setModel(WalletModel *_model)
 
         transactionView->setColumnWidth(TransactionTableModel::Status, STATUS_COLUMN_WIDTH);
         transactionView->setColumnWidth(TransactionTableModel::Watchonly, WATCHONLY_COLUMN_WIDTH);
+        transactionView->setColumnWidth(TransactionTableModel::InstantSend, INSTANTSEND_COLUMN_WIDTH);
         transactionView->setColumnWidth(TransactionTableModel::Date, DATE_COLUMN_WIDTH);
         transactionView->setColumnWidth(TransactionTableModel::Type, TYPE_COLUMN_WIDTH);
         transactionView->setColumnWidth(TransactionTableModel::Amount, AMOUNT_MINIMUM_COLUMN_WIDTH);
@@ -339,6 +348,14 @@ void TransactionView::chooseWatchonly(int idx)
         (TransactionFilterProxy::WatchOnlyFilter)watchOnlyWidget->itemData(idx).toInt());
 }
 
+void TransactionView::chooseInstantSend(int idx)
+{
+    if(!transactionProxyModel)
+        return;
+    transactionProxyModel->setInstantSendFilter(
+        (TransactionFilterProxy::InstantSendFilter)instantsendWidget->itemData(idx).toInt());
+}
+
 void TransactionView::changedPrefix(const QString &prefix)
 {
     if(!transactionProxyModel)
diff --git a/src/qt/transactionview.h b/src/qt/transactionview.h
index 995b4170e296..7b62e8f31eae 100644
--- a/src/qt/transactionview.h
+++ b/src/qt/transactionview.h
@@ -53,6 +53,7 @@ class TransactionView : public QWidget
     enum ColumnWidths {
         STATUS_COLUMN_WIDTH = 30,
         WATCHONLY_COLUMN_WIDTH = 23,
+        INSTANTSEND_COLUMN_WIDTH = 23,
         DATE_COLUMN_WIDTH = 120,
         TYPE_COLUMN_WIDTH = 240,
         AMOUNT_MINIMUM_COLUMN_WIDTH = 120,
@@ -66,6 +67,7 @@ class TransactionView : public QWidget
     QComboBox *dateWidget;
     QComboBox *typeWidget;
     QComboBox *watchOnlyWidget;
+    QComboBox *instantsendWidget;
     QLineEdit *addressWidget;
     QLineEdit *amountWidget;
 
@@ -113,6 +115,7 @@ public Q_SLOTS:
     void chooseDate(int idx);
     void chooseType(int idx);
     void chooseWatchonly(int idx);
+    void chooseInstantSend(int idx);
     void changedPrefix(const QString &prefix);
     void changedAmount(const QString &amount);
     void exportClicked();

From 3685c85e7f5b4fa3772e40765116ef7bfc85596e Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Mon, 12 Nov 2018 16:08:58 +0100
Subject: [PATCH 259/400] Show BIP9 progress in getblockchaininfo (#2435)

* Implement VersionBitsCountBlocksInWindow

This gives the count of blocks that voted for the given BIP9 deployment

* Add additional information to BIP9 softforks returned by getblockchaininfo

* make sure progress doesn't exceed 1
---
 src/rpc/blockchain.cpp | 15 +++++++++++++++
 src/versionbits.cpp    | 20 ++++++++++++++++++++
 src/versionbits.h      |  2 ++
 3 files changed, 37 insertions(+)

diff --git a/src/rpc/blockchain.cpp b/src/rpc/blockchain.cpp
index 582e47e353f7..d133cb4eeca0 100644
--- a/src/rpc/blockchain.cpp
+++ b/src/rpc/blockchain.cpp
@@ -1205,6 +1205,16 @@ static UniValue BIP9SoftForkDesc(const Consensus::Params& consensusParams, Conse
     if (THRESHOLD_STARTED == thresholdState)
     {
         rv.push_back(Pair("bit", consensusParams.vDeployments[id].bit));
+
+        int nBlockCount = VersionBitsCountBlocksInWindow(chainActive.Tip(), consensusParams, id);
+        int64_t nPeriod = consensusParams.vDeployments[id].nWindowSize ? consensusParams.vDeployments[id].nWindowSize : consensusParams.nMinerConfirmationWindow;
+        int64_t nThreshold = consensusParams.vDeployments[id].nThreshold ? consensusParams.vDeployments[id].nThreshold : consensusParams.nRuleChangeActivationThreshold;
+        int64_t nWindowStart = chainActive.Height() - (chainActive.Height() % nPeriod);
+        rv.push_back(Pair("period", nPeriod));
+        rv.push_back(Pair("threshold", nThreshold));
+        rv.push_back(Pair("windowStart", nWindowStart));
+        rv.push_back(Pair("windowBlocks", nBlockCount));
+        rv.push_back(Pair("windowProgress", std::min(1.0, (double)nBlockCount / nThreshold)));
     }
     rv.push_back(Pair("startTime", consensusParams.vDeployments[id].nStartTime));
     rv.push_back(Pair("timeout", consensusParams.vDeployments[id].nTimeout));
@@ -1252,6 +1262,11 @@ UniValue getblockchaininfo(const JSONRPCRequest& request)
             "     \"xxxx\" : {                (string) name of the softfork\n"
             "        \"status\": \"xxxx\",    (string) one of \"defined\", \"started\", \"locked_in\", \"active\", \"failed\"\n"
             "        \"bit\": xx,             (numeric) the bit (0-28) in the block version field used to signal this softfork (only for \"started\" status)\n"
+            "        \"period\": xx,          (numeric) the window size/period for this softfork (only for \"started\" status)\n"
+            "        \"threshold\": xx,       (numeric) the threshold for this softfork (only for \"started\" status)\n"
+            "        \"windowStart\": xx,     (numeric) the starting block height of the current window (only for \"started\" status)\n"
+            "        \"windowBlocks\": xx,    (numeric) the number of blocks in the current window that had the version bit set for this softfork (only for \"started\" status)\n"
+            "        \"windowProgress\": xx,  (numeric) the progress (between 0 and 1) for activation of this softfork (only for \"started\" status)\n"
             "        \"startTime\": xx,       (numeric) the minimum median time past of a block at which the bit gains its meaning\n"
             "        \"timeout\": xx,         (numeric) the median time past of a block at which the deployment is considered failed if not yet locked in\n"
             "        \"since\": xx            (numeric) height of the first block to which the status applies\n"
diff --git a/src/versionbits.cpp b/src/versionbits.cpp
index f7bf567a7fe9..eaddecad275a 100644
--- a/src/versionbits.cpp
+++ b/src/versionbits.cpp
@@ -148,6 +148,21 @@ int AbstractThresholdConditionChecker::GetStateSinceHeightFor(const CBlockIndex*
     return pindexPrev->nHeight + 1;
 }
 
+int AbstractThresholdConditionChecker::CountBlocksInWindow(const CBlockIndex* pindex, const Consensus::Params& params) const
+{
+    int nPeriod = Period(params);
+    int nStopHeight = pindex->nHeight - (pindex->nHeight % nPeriod) - 1;
+    const CBlockIndex* pindexCount = pindex;
+    int count = 0;
+    while (pindexCount && pindexCount->nHeight != nStopHeight) {
+        if (Condition(pindexCount, params)) {
+            count++;
+        }
+        pindexCount = pindexCount->pprev;
+    }
+    return count;
+}
+
 namespace
 {
 /**
@@ -185,6 +200,11 @@ int VersionBitsStateSinceHeight(const CBlockIndex* pindexPrev, const Consensus::
     return VersionBitsConditionChecker(pos).GetStateSinceHeightFor(pindexPrev, params, cache.caches[pos]);
 }
 
+int VersionBitsCountBlocksInWindow(const CBlockIndex* pindex, const Consensus::Params& params, Consensus::DeploymentPos pos)
+{
+    return VersionBitsConditionChecker(pos).CountBlocksInWindow(pindex, params);
+}
+
 uint32_t VersionBitsMask(const Consensus::Params& params, Consensus::DeploymentPos pos)
 {
     return VersionBitsConditionChecker(pos).Mask(params);
diff --git a/src/versionbits.h b/src/versionbits.h
index 7b66d328e1e1..1615a44986e9 100644
--- a/src/versionbits.h
+++ b/src/versionbits.h
@@ -56,6 +56,7 @@ class AbstractThresholdConditionChecker {
     // Note that the functions below take a pindexPrev as input: they compute information for block B based on its parent.
     ThresholdState GetStateFor(const CBlockIndex* pindexPrev, const Consensus::Params& params, ThresholdConditionCache& cache) const;
     int GetStateSinceHeightFor(const CBlockIndex* pindexPrev, const Consensus::Params& params, ThresholdConditionCache& cache) const;
+    int CountBlocksInWindow(const CBlockIndex* pindex, const Consensus::Params& params) const;
 };
 
 struct VersionBitsCache
@@ -67,6 +68,7 @@ struct VersionBitsCache
 
 ThresholdState VersionBitsState(const CBlockIndex* pindexPrev, const Consensus::Params& params, Consensus::DeploymentPos pos, VersionBitsCache& cache);
 int VersionBitsStateSinceHeight(const CBlockIndex* pindexPrev, const Consensus::Params& params, Consensus::DeploymentPos pos, VersionBitsCache& cache);
+int VersionBitsCountBlocksInWindow(const CBlockIndex* pindex, const Consensus::Params& params, Consensus::DeploymentPos pos);
 uint32_t VersionBitsMask(const Consensus::Params& params, Consensus::DeploymentPos pos);
 
 #endif

From 579c83e8810854cb8af360e749171bf25cb13110 Mon Sep 17 00:00:00 2001
From: UdjinM6 <UdjinM6@users.noreply.github.com>
Date: Tue, 13 Nov 2018 15:23:31 +0300
Subject: [PATCH 260/400] Add coinbase_payload to getblocktemplate help (#2437)

---
 src/rpc/mining.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/rpc/mining.cpp b/src/rpc/mining.cpp
index 3ca55356b725..43522360d6d5 100644
--- a/src/rpc/mining.cpp
+++ b/src/rpc/mining.cpp
@@ -409,7 +409,8 @@ UniValue getblocktemplate(const JSONRPCRequest& request)
             "      ,...\n"
             "  ],\n"
             "  \"superblocks_started\" : true|false, (boolean) true, if superblock payments started\n"
-            "  \"superblocks_enabled\" : true|false  (boolean) true, if superblock payments are enabled\n"
+            "  \"superblocks_enabled\" : true|false, (boolean) true, if superblock payments are enabled\n"
+            "  \"coinbase_payload\" : \"xxxxxxxx\"    (string) coinbase transaction payload data encoded in hexadecimal\n"
             "}\n"
 
             "\nExamples:\n"

From adf9c87e2e5bee0644fd5fc6200cf2dfb87ed676 Mon Sep 17 00:00:00 2001
From: UdjinM6 <UdjinM6@users.noreply.github.com>
Date: Tue, 13 Nov 2018 15:23:52 +0300
Subject: [PATCH 261/400] Fix protx/bls rpc help (#2438)

---
 src/rpc/rpcevo.cpp | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/rpc/rpcevo.cpp b/src/rpc/rpcevo.cpp
index 7cfe111ce77f..ab92be609e74 100644
--- a/src/rpc/rpcevo.cpp
+++ b/src/rpc/rpcevo.cpp
@@ -847,7 +847,10 @@ UniValue protx(const JSONRPCRequest& request)
         protx_help();
     }
 
-    std::string command = request.params[0].get_str();
+    std::string command;
+    if (request.params.size() >= 1) {
+        command = request.params[0].get_str();
+    }
 
     if (command == "register" || command == "register_fund" || command == "register_prepare") {
         return protx_register(request);
@@ -916,11 +919,14 @@ UniValue bls_generate(const JSONRPCRequest& request)
 
 UniValue _bls(const JSONRPCRequest& request)
 {
-    if (request.fHelp || request.params.empty()) {
+    if (request.fHelp && request.params.empty()) {
         bls_help();
     }
 
-    std::string command = request.params[0].get_str();
+    std::string command;
+    if (request.params.size() >= 1) {
+        command = request.params[0].get_str();
+    }
 
     if (command == "generate") {
         return bls_generate(request);

From 4ad2f647c266b18b12e6c3750f620ca95a23553e Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Tue, 13 Nov 2018 13:24:14 +0100
Subject: [PATCH 262/400] Use proTxHash instead of outpoint when calculating
 masternode scores (#2440)

* Track confirmedHash of masternodes

* Also include confirmedHash in DIP4

* Implement CalculateQuorum and CalculateScores in CDeterministicMNList

* Use new ProRegTx based scoring function in GetMasternodeScores

* Update test vectors for simplifiedmns_merkleroots tests
---
 src/evo/deterministicmns.cpp         | 66 ++++++++++++++++++++++++++++
 src/evo/deterministicmns.h           | 28 ++++++++++++
 src/evo/simplifiedmns.cpp            |  5 ++-
 src/evo/simplifiedmns.h              |  2 +
 src/masternode.cpp                   |  2 +
 src/masternodeman.cpp                | 33 ++++++++------
 src/test/evo_simplifiedmns_tests.cpp | 33 +++++++-------
 7 files changed, 137 insertions(+), 32 deletions(-)

diff --git a/src/evo/deterministicmns.cpp b/src/evo/deterministicmns.cpp
index 56103260ff98..97bbb8df4ac3 100644
--- a/src/evo/deterministicmns.cpp
+++ b/src/evo/deterministicmns.cpp
@@ -210,6 +210,54 @@ std::vector<CDeterministicMNCPtr> CDeterministicMNList::GetProjectedMNPayees(int
     return result;
 }
 
+std::vector<CDeterministicMNCPtr> CDeterministicMNList::CalculateQuorum(size_t maxSize, const uint256& modifier) const
+{
+    auto scores = CalculateScores(modifier);
+
+    // sort is descending order
+    std::sort(scores.rbegin(), scores.rend(), [](const std::pair<arith_uint256, CDeterministicMNCPtr>& a, std::pair<arith_uint256, CDeterministicMNCPtr>& b) {
+        if (a.first == b.first) {
+            // this should actually never happen, but we should stay compatible with how the non deterministic MNs did the sorting
+            return a.second->collateralOutpoint < b.second->collateralOutpoint;
+        }
+        return a.first < b.first;
+    });
+
+    // take top maxSize entries and return it
+    std::vector<CDeterministicMNCPtr> result;
+    result.resize(std::min(maxSize, scores.size()));
+    for (size_t i = 0; i < result.size(); i++) {
+        result[i] = std::move(scores[i].second);
+    }
+    return result;
+}
+
+std::vector<std::pair<arith_uint256, CDeterministicMNCPtr>> CDeterministicMNList::CalculateScores(const uint256& modifier) const
+{
+    std::vector<std::pair<arith_uint256, CDeterministicMNCPtr>> scores;
+    scores.reserve(GetAllMNsCount());
+    ForEachMN(true, [&](const CDeterministicMNCPtr& dmn) {
+        if (dmn->pdmnState->confirmedHash.IsNull()) {
+            // we only take confirmed MNs into account to avoid hash grinding on the ProRegTxHash to sneak MNs into a
+            // future quorums
+            return;
+        }
+        // calculate sha256(sha256(proTxHash, confirmedHash), modifier) per MN
+        // Please note that this is not a double-sha256 but a single-sha256
+        // The first part is already precalculated (confirmedHashWithProRegTxHash)
+        // TODO When https://github.com/bitcoin/bitcoin/pull/13191 gets backported, implement something that is similar but for single-sha256
+        uint256 h;
+        CSHA256 sha256;
+        sha256.Write(dmn->pdmnState->confirmedHashWithProRegTxHash.begin(), dmn->pdmnState->confirmedHashWithProRegTxHash.size());
+        sha256.Write(modifier.begin(), modifier.size());
+        sha256.Finalize(h.begin());
+
+        scores.emplace_back(UintToArith256(h), dmn);
+    });
+
+    return scores;
+}
+
 CDeterministicMNListDiff CDeterministicMNList::BuildDiff(const CDeterministicMNList& to) const
 {
     CDeterministicMNListDiff diffRet;
@@ -371,6 +419,24 @@ bool CDeterministicMNManager::BuildNewListFromBlock(const CBlock& block, const C
 
     auto payee = oldList.GetMNPayee();
 
+    // we iterate the oldList here and update the newList
+    // this is only valid as long these have not diverged at this point, which is the case as long as we don't add
+    // code above this loop that modifies newList
+    oldList.ForEachMN(false, [&](const CDeterministicMNCPtr& dmn) {
+        if (!dmn->pdmnState->confirmedHash.IsNull()) {
+            // already confirmed
+            return;
+        }
+        // this works on the previous block, so confirmation will happen one block after nMasternodeMinimumConfirmations
+        // has been reached, but the block hash will then point to the block at nMasternodeMinimumConfirmations
+        int nConfirmations = pindexPrev->nHeight - dmn->pdmnState->nRegisteredHeight;
+        if (nConfirmations >= Params().GetConsensus().nMasternodeMinimumConfirmations) {
+            CDeterministicMNState newState = *dmn->pdmnState;
+            newState.UpdateConfirmedHash(dmn->proTxHash, pindexPrev->GetBlockHash());
+            newList.UpdateMN(dmn->proTxHash, std::make_shared<CDeterministicMNState>(newState));
+        }
+    });
+
     // we skip the coinbase
     for (int i = 1; i < (int)block.vtx.size(); i++) {
         const CTransaction& tx = *block.vtx[i];
diff --git a/src/evo/deterministicmns.h b/src/evo/deterministicmns.h
index 719a1dad178b..70f3fcc87502 100644
--- a/src/evo/deterministicmns.h
+++ b/src/evo/deterministicmns.h
@@ -5,6 +5,7 @@
 #ifndef DASH_DETERMINISTICMNS_H
 #define DASH_DETERMINISTICMNS_H
 
+#include "arith_uint256.h"
 #include "bls/bls.h"
 #include "dbwrapper.h"
 #include "evodb.h"
@@ -30,6 +31,12 @@ class CDeterministicMNState
     int nPoSeBanHeight{-1};
     uint16_t nRevocationReason{CProUpRevTx::REASON_NOT_SPECIFIED};
 
+    // the block hash X blocks after registration, used in quorum calculations
+    uint256 confirmedHash;
+    // sha256(proTxHash, confirmedHash) to speed up quorum calculations
+    // please note that this is NOT a double-sha256 hash
+    uint256 confirmedHashWithProRegTxHash;
+
     CKeyID keyIDOwner;
     CBLSPublicKey pubKeyOperator;
     CKeyID keyIDVoting;
@@ -64,6 +71,8 @@ class CDeterministicMNState
         READWRITE(nPoSeRevivedHeight);
         READWRITE(nPoSeBanHeight);
         READWRITE(nRevocationReason);
+        READWRITE(confirmedHash);
+        READWRITE(confirmedHashWithProRegTxHash);
         READWRITE(keyIDOwner);
         READWRITE(pubKeyOperator);
         READWRITE(keyIDVoting);
@@ -85,6 +94,14 @@ class CDeterministicMNState
             nPoSeBanHeight = height;
         }
     }
+    void UpdateConfirmedHash(const uint256& _proTxHash, const uint256& _confirmedHash)
+    {
+        confirmedHash = _confirmedHash;
+        CSHA256 h;
+        h.Write(_proTxHash.begin(), _proTxHash.size());
+        h.Write(_confirmedHash.begin(), _confirmedHash.size());
+        h.Finalize(confirmedHashWithProRegTxHash.begin());
+    }
 
     bool operator==(const CDeterministicMNState& rhs) const
     {
@@ -94,6 +111,8 @@ class CDeterministicMNState
                nPoSeRevivedHeight == rhs.nPoSeRevivedHeight &&
                nPoSeBanHeight == rhs.nPoSeBanHeight &&
                nRevocationReason == rhs.nRevocationReason &&
+               confirmedHash == rhs.confirmedHash &&
+               confirmedHashWithProRegTxHash == rhs.confirmedHashWithProRegTxHash &&
                keyIDOwner == rhs.keyIDOwner &&
                pubKeyOperator == rhs.pubKeyOperator &&
                keyIDVoting == rhs.keyIDVoting &&
@@ -278,6 +297,15 @@ class CDeterministicMNList
      */
     std::vector<CDeterministicMNCPtr> GetProjectedMNPayees(int nCount) const;
 
+    /**
+     * Calculate a quorum based on the modifier. The resulting list is deterministically sorted by score
+     * @param maxSize
+     * @param modifier
+     * @return
+     */
+    std::vector<CDeterministicMNCPtr> CalculateQuorum(size_t maxSize, const uint256& modifier) const;
+    std::vector<std::pair<arith_uint256, CDeterministicMNCPtr>> CalculateScores(const uint256& modifier) const;
+
     CDeterministicMNListDiff BuildDiff(const CDeterministicMNList& to) const;
     CDeterministicMNList ApplyDiff(const CDeterministicMNListDiff& diff) const;
 
diff --git a/src/evo/simplifiedmns.cpp b/src/evo/simplifiedmns.cpp
index 16e7b49f63e9..e71d1168bd57 100644
--- a/src/evo/simplifiedmns.cpp
+++ b/src/evo/simplifiedmns.cpp
@@ -31,8 +31,8 @@ uint256 CSimplifiedMNListEntry::CalcHash() const
 
 std::string CSimplifiedMNListEntry::ToString() const
 {
-    return strprintf("CSimplifiedMNListEntry(proRegTxHash=%s, service=%s, pubKeyOperator=%s, keyIDVoting=%s, isValie=%d)",
-        proRegTxHash.ToString(), service.ToString(false), pubKeyOperator.ToString(), keyIDVoting.ToString(), isValid);
+    return strprintf("CSimplifiedMNListEntry(proRegTxHash=%s, confirmedHash=%s, service=%s, pubKeyOperator=%s, keyIDVoting=%s, isValie=%d)",
+        proRegTxHash.ToString(), confirmedHash.ToString(), service.ToString(false), pubKeyOperator.ToString(), keyIDVoting.ToString(), isValid);
 }
 
 void CSimplifiedMNListEntry::ToJson(UniValue& obj) const
@@ -40,6 +40,7 @@ void CSimplifiedMNListEntry::ToJson(UniValue& obj) const
     obj.clear();
     obj.setObject();
     obj.push_back(Pair("proRegTxHash", proRegTxHash.ToString()));
+    obj.push_back(Pair("confirmedHash", confirmedHash.ToString()));
     obj.push_back(Pair("service", service.ToString(false)));
     obj.push_back(Pair("pubKeyOperator", pubKeyOperator.ToString()));
     obj.push_back(Pair("keyIDVoting", keyIDVoting.ToString()));
diff --git a/src/evo/simplifiedmns.h b/src/evo/simplifiedmns.h
index 0a95a344f07b..1487cd64e48f 100644
--- a/src/evo/simplifiedmns.h
+++ b/src/evo/simplifiedmns.h
@@ -19,6 +19,7 @@ class CSimplifiedMNListEntry
 {
 public:
     uint256 proRegTxHash;
+    uint256 confirmedHash;
     CService service;
     CBLSPublicKey pubKeyOperator;
     CKeyID keyIDVoting;
@@ -35,6 +36,7 @@ class CSimplifiedMNListEntry
     inline void SerializationOp(Stream& s, Operation ser_action)
     {
         READWRITE(proRegTxHash);
+        READWRITE(confirmedHash);
         READWRITE(service);
         READWRITE(pubKeyOperator);
         READWRITE(keyIDVoting);
diff --git a/src/masternode.cpp b/src/masternode.cpp
index ba8e5a35ce86..82a39b5d5495 100644
--- a/src/masternode.cpp
+++ b/src/masternode.cpp
@@ -111,6 +111,8 @@ bool CMasternode::UpdateFromNewBroadcast(CMasternodeBroadcast& mnb, CConnman& co
 //
 arith_uint256 CMasternode::CalculateScore(const uint256& blockHash) const
 {
+    // NOTE not called when deterministic masternodes (spork15) are activated
+
     // Deterministically calculate a "score" for a Masternode based on any given (block)hash
     CHashWriter ss(SER_GETHASH, PROTOCOL_VERSION);
     ss << outpoint << nCollateralMinConfBlockHash << blockHash;
diff --git a/src/masternodeman.cpp b/src/masternodeman.cpp
index f6860a04a12d..90722cf77907 100644
--- a/src/masternodeman.cpp
+++ b/src/masternodeman.cpp
@@ -783,26 +783,31 @@ std::map<COutPoint, CMasternode> CMasternodeMan::GetFullMasternodeMap()
 
 bool CMasternodeMan::GetMasternodeScores(const uint256& nBlockHash, CMasternodeMan::score_pair_vec_t& vecMasternodeScoresRet, int nMinProtocol)
 {
-    vecMasternodeScoresRet.clear();
-
-    if (!masternodeSync.IsMasternodeListSynced())
-        return false;
-
     AssertLockHeld(cs);
 
-    if (mapMasternodes.empty())
-        return false;
+    vecMasternodeScoresRet.clear();
 
-    // calculate scores
-    for (const auto& mnpair : mapMasternodes) {
-        if (deterministicMNManager->IsDeterministicMNsSporkActive() && !deterministicMNManager->HasValidMNCollateralAtChainTip(mnpair.second.outpoint))
-            continue;
+    if (deterministicMNManager->IsDeterministicMNsSporkActive()) {
+        auto mnList = deterministicMNManager->GetListAtChainTip();
+        auto scores = mnList.CalculateScores(nBlockHash);
+        for (const auto& p : scores) {
+            auto* mn = Find(p.second->collateralOutpoint);
+            vecMasternodeScoresRet.emplace_back(p.first, mn);
+        }
+    } else {
+        if (!masternodeSync.IsMasternodeListSynced())
+            return false;
 
-        if (mnpair.second.nProtocolVersion >= nMinProtocol) {
-            vecMasternodeScoresRet.push_back(std::make_pair(mnpair.second.CalculateScore(nBlockHash), &mnpair.second));
+        if (mapMasternodes.empty())
+            return false;
+
+        // calculate scores
+        for (const auto& mnpair : mapMasternodes) {
+            if (mnpair.second.nProtocolVersion >= nMinProtocol) {
+                vecMasternodeScoresRet.push_back(std::make_pair(mnpair.second.CalculateScore(nBlockHash), &mnpair.second));
+            }
         }
     }
-
     sort(vecMasternodeScoresRet.rbegin(), vecMasternodeScoresRet.rend(), CompareScoreMN());
     return !vecMasternodeScoresRet.empty();
 }
diff --git a/src/test/evo_simplifiedmns_tests.cpp b/src/test/evo_simplifiedmns_tests.cpp
index 9e17e65542f2..ca1eabd5ee40 100644
--- a/src/test/evo_simplifiedmns_tests.cpp
+++ b/src/test/evo_simplifiedmns_tests.cpp
@@ -18,6 +18,7 @@ BOOST_AUTO_TEST_CASE(simplifiedmns_merkleroots)
     for (size_t i = 0; i < 15; i++) {
         CSimplifiedMNListEntry smle;
         smle.proRegTxHash.SetHex(strprintf("%064x", i));
+        smle.confirmedHash.SetHex(strprintf("%064x", i));
 
         std::string ip = strprintf("%d.%d.%d.%d", 0, 0, 0, i);
         Lookup(ip.c_str(), smle.service, i, false);
@@ -36,21 +37,21 @@ BOOST_AUTO_TEST_CASE(simplifiedmns_merkleroots)
     }
 
     std::vector<std::string> expectedHashes = {
-        "1465924a81df1d0fb46d2571e65296c0fddab30d1b4d104f182f80a6e45362fa",
-        "cb466084403067b699a50bd46e53145ebfd57af9a076a13432f524e41ec2d899",
-        "0f6a720d0119f5b83469d884ec2a7d739c1d653142e5d36b569cddaf735a6149",
-        "8794379559c77d67902a5e894739bd574f25ff6cd48612f7156c5fafaefefd4e",
-        "4738d4f17c76b4e61f028d9426f40242eb56977fe805704d980ff57ad3f60b90",
-        "6342b7ce87a299a0fb070ec040a45613f082b0c99395698a6f712e85be87ad06",
-        "0be7143f4fb357333350a7e28606713933e9819c83c71009b9ea97476d86b78e",
-        "d13dfedc920490a8c6d9b555d740f2944ac83eeb8c3923a51261371a8118ffe0",
-        "c0c4638fcefe09380adff61d59c064be03a18690245b89be20223df737590d46",
-        "4cce41032bb341adb9b9f3f6ba1de3c812f0d1630e3a561c7aae00f39e49c6d4",
-        "3e8c9ad9e2cf0520a96b6bc58aafb7009365a1d8f357047a40430b782142ed69",
-        "bde7a1b61a263a7e0dfe474c850c4f9d642d9a03da501a366800e03093e48cd9",
-        "e221a3e14868251083eea718e698cc81739b016665a9024d798a14c0e9417c35",
-        "b1be038e40bc8ee6a19dbbe70c92d7bc0880ccc54c4bd54eab6b7a30d0650ab1",
-        "0607e1d850e27c336e8d65722fc82eae7ab5331fd88a4fbfcff6c3a1bb6364da",
+        "373b549f6380d8f7b04d7b04d7c58a749c5cbe3bf41536785ba819879c4870f1",
+        "3a1010e28226558560e5296bcee6bf0b9b963b73a1514f5aa2885e270f6b90c1",
+        "85d3d93b28689128daf3a41d706ae5002f447b9b6372776f0ca9d53b31146884",
+        "8930eee6bd2e7971a7090edfb79f74c00a12280e59adfc2cc99d406a01e368f9",
+        "dc2e69caa0ef97e8f5cf40a9530641bd4933dd8c9ad533054537728f7e5f58c2",
+        "3e4a0e0a0d2ed397fa27221de3047de21f50d17d0ba43738cbdb9fee96c7cb46",
+        "eb18476a1496e1cb912b1d4dd93314b78c6a679d83cae8e144a717b967dc4b8c",
+        "6c0d01fa40ac11d7b523facd2bf5632c83f7e4df3f60fd1b364ea90f6c852156",
+        "c9e3e69d54e6e95b280ae102593fe114cf4620fa89dd88da1a146ada08815d68",
+        "1023f67f735e8e9403d5f083e7a17489619b1790feac4f6b133e9dda15999ae6",
+        "5d5fc77944f7c72df236a5baf460c7b9a947144d54d0953521f1494c8a2f7aaa",
+        "ac7db66820de3c7506f8c6415fd352e36ac5f27c6adbdfb74de3e109d0d277df",
+        "cbc25ca965d0fa69a1fdc1d796b8ee2726a0e2137414e92fb9541630e3189901",
+        "ac9934c4049ae952d41fb38e7e9659a558a5ce748bdb7fb613741598d1b16a27",
+        "a61177eb14450bb8c56e5f0547035e0f3a70fe46f36901351cc568b2e48e29d0",
     };
     std::vector<std::string> calculatedHashes;
 
@@ -63,7 +64,7 @@ BOOST_AUTO_TEST_CASE(simplifiedmns_merkleroots)
 
     CSimplifiedMNList sml(entries);
 
-    std::string expectedMerkleRoot = "a7fae13820022ddba6cf54ba9b234dfed54ccfa86c2635c5627287f1ffa5497f";
+    std::string expectedMerkleRoot = "b2303aca677ae2091c882e44b58f57869fa88a6db1f4e1a5d71975e5387fa195";
     std::string calculatedMerkleRoot = sml.CalcMerkleRoot(nullptr).ToString();
     //printf("merkleRoot=\"%s\",\n", calculatedMerkleRoot.c_str());
 

From 153afb9062398cd2beb164f6794c2db9e434ce3a Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Tue, 13 Nov 2018 13:24:30 +0100
Subject: [PATCH 263/400] Restart MNs in DIP3 tests even if collateral has not
 moved (#2441)

These need to be restarted even in this case as keys are cycled when
upgrade_mn_protx is called. This resulted in invalid IX votes but was not
noticed because only 2 MNs were affected (still 8 of 10 votes succesful)
---
 qa/rpc-tests/dip3-deterministicmns.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/qa/rpc-tests/dip3-deterministicmns.py b/qa/rpc-tests/dip3-deterministicmns.py
index 25e37ac28028..e9129374ae48 100755
--- a/qa/rpc-tests/dip3-deterministicmns.py
+++ b/qa/rpc-tests/dip3-deterministicmns.py
@@ -178,7 +178,7 @@ def run_test(self):
             self.nodes[0].generate(1)
 
             if fund:
-                # collateral has moved, so we need to start it again
+                # collateral has moved, so we need to "masternode start" it again
                 mns_to_restart.append(mns[i])
             else:
                 # collateral has not moved, so it should still be in the masternode list even after upgrade
@@ -195,7 +195,7 @@ def run_test(self):
         print("restarting controller and upgraded MNs")
         self.restart_controller_node()
         self.force_finish_mnsync_list(self.nodes[0])
-        for mn in mns_to_restart:
+        for mn in mns_protx:
             print("restarting MN %s" % mn.alias)
             self.stop_node(mn.idx)
             self.start_mn(mn)

From 658b7afd1871c10fd7f4667202d33c56e9ccbe27 Mon Sep 17 00:00:00 2001
From: UdjinM6 <UdjinM6@users.noreply.github.com>
Date: Tue, 13 Nov 2018 15:46:43 +0300
Subject: [PATCH 264/400] Make error messages re payload a bit more specific

---
 qa/rpc-tests/dip3-deterministicmns.py | 2 +-
 src/evo/cbtx.cpp                      | 4 ++--
 src/evo/providertx.cpp                | 8 ++++----
 src/evo/specialtx.cpp                 | 4 ++--
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/qa/rpc-tests/dip3-deterministicmns.py b/qa/rpc-tests/dip3-deterministicmns.py
index e9129374ae48..c192343a72f5 100755
--- a/qa/rpc-tests/dip3-deterministicmns.py
+++ b/qa/rpc-tests/dip3-deterministicmns.py
@@ -655,7 +655,7 @@ def test_fail_create_protx(self, node):
         address = node.getnewaddress()
         key = node.getnewaddress()
         blsKey = node.bls('generate')
-        assert_raises_jsonrpc(None, "bad-tx-type", node.protx, 'register_fund', address, '127.0.0.1:10000', key, blsKey['public'], key, 0, address)
+        assert_raises_jsonrpc(None, "bad-tx-type-dip3", node.protx, 'register_fund', address, '127.0.0.1:10000', key, blsKey['public'], key, 0, address)
 
     def test_success_create_protx(self, node):
         address = node.getnewaddress()
diff --git a/src/evo/cbtx.cpp b/src/evo/cbtx.cpp
index 9d0d5cd904a4..2eef16fa4a95 100644
--- a/src/evo/cbtx.cpp
+++ b/src/evo/cbtx.cpp
@@ -20,7 +20,7 @@ bool CheckCbTx(const CTransaction& tx, const CBlockIndex* pindexPrev, CValidatio
 
     CCbTx cbTx;
     if (!GetTxPayload(tx, cbTx)) {
-        return state.DoS(100, false, REJECT_INVALID, "bad-tx-payload");
+        return state.DoS(100, false, REJECT_INVALID, "bad-cbtx-payload");
     }
 
     if (cbTx.nVersion > CCbTx::CURRENT_VERSION) {
@@ -45,7 +45,7 @@ bool CheckCbTxMerkleRootMNList(const CBlock& block, const CBlockIndex* pindex, C
 
     CCbTx cbTx;
     if (!GetTxPayload(*block.vtx[0], cbTx)) {
-        return state.DoS(100, false, REJECT_INVALID, "bad-tx-payload");
+        return state.DoS(100, false, REJECT_INVALID, "bad-cbtx-payload");
     }
 
     if (pindex) {
diff --git a/src/evo/providertx.cpp b/src/evo/providertx.cpp
index 0db1149e474c..5e32efb01774 100644
--- a/src/evo/providertx.cpp
+++ b/src/evo/providertx.cpp
@@ -80,7 +80,7 @@ bool CheckProRegTx(const CTransaction& tx, const CBlockIndex* pindexPrev, CValid
 
     CProRegTx ptx;
     if (!GetTxPayload(tx, ptx)) {
-        return state.DoS(100, false, REJECT_INVALID, "bad-tx-payload");
+        return state.DoS(100, false, REJECT_INVALID, "bad-protx-payload");
     }
 
     if (ptx.nVersion > CProRegTx::CURRENT_VERSION) {
@@ -207,7 +207,7 @@ bool CheckProUpServTx(const CTransaction& tx, const CBlockIndex* pindexPrev, CVa
 
     CProUpServTx ptx;
     if (!GetTxPayload(tx, ptx)) {
-        return state.DoS(100, false, REJECT_INVALID, "bad-tx-payload");
+        return state.DoS(100, false, REJECT_INVALID, "bad-protx-payload");
     }
 
     if (ptx.nVersion > CProRegTx::CURRENT_VERSION) {
@@ -259,7 +259,7 @@ bool CheckProUpRegTx(const CTransaction& tx, const CBlockIndex* pindexPrev, CVal
 
     CProUpRegTx ptx;
     if (!GetTxPayload(tx, ptx)) {
-        return state.DoS(100, false, REJECT_INVALID, "bad-tx-payload");
+        return state.DoS(100, false, REJECT_INVALID, "bad-protx-payload");
     }
 
     if (ptx.nVersion > CProRegTx::CURRENT_VERSION) {
@@ -335,7 +335,7 @@ bool CheckProUpRevTx(const CTransaction& tx, const CBlockIndex* pindexPrev, CVal
 
     CProUpRevTx ptx;
     if (!GetTxPayload(tx, ptx)) {
-        return state.DoS(100, false, REJECT_INVALID, "bad-tx-payload");
+        return state.DoS(100, false, REJECT_INVALID, "bad-protx-payload");
     }
 
     if (ptx.nVersion > CProRegTx::CURRENT_VERSION) {
diff --git a/src/evo/specialtx.cpp b/src/evo/specialtx.cpp
index f73e72c61627..56e6474a7740 100644
--- a/src/evo/specialtx.cpp
+++ b/src/evo/specialtx.cpp
@@ -38,7 +38,7 @@ bool CheckSpecialTx(const CTransaction& tx, const CBlockIndex* pindexPrev, CVali
         return CheckCbTx(tx, pindexPrev, state);
     }
 
-    return state.DoS(10, false, REJECT_INVALID, "bad-tx-type");
+    return state.DoS(10, false, REJECT_INVALID, "bad-tx-type-check");
 }
 
 bool ProcessSpecialTx(const CTransaction& tx, const CBlockIndex* pindex, CValidationState& state)
@@ -57,7 +57,7 @@ bool ProcessSpecialTx(const CTransaction& tx, const CBlockIndex* pindex, CValida
         return true; // nothing to do
     }
 
-    return state.DoS(100, false, REJECT_INVALID, "bad-tx-type");
+    return state.DoS(100, false, REJECT_INVALID, "bad-tx-type-proc");
 }
 
 bool UndoSpecialTx(const CTransaction& tx, const CBlockIndex* pindex)

From 8bd5b231bf2e4dfd65b2828cd061764bfa1ccbe5 Mon Sep 17 00:00:00 2001
From: UdjinM6 <UdjinM6@users.noreply.github.com>
Date: Tue, 13 Nov 2018 15:47:28 +0300
Subject: [PATCH 265/400] Log mempool payload errors instead of crashing via
 assert

---
 src/txmempool.cpp | 36 ++++++++++++++++++++++++------------
 1 file changed, 24 insertions(+), 12 deletions(-)

diff --git a/src/txmempool.cpp b/src/txmempool.cpp
index 9021314c4740..46b4c4b74ca5 100644
--- a/src/txmempool.cpp
+++ b/src/txmempool.cpp
@@ -444,7 +444,8 @@ bool CTxMemPool::addUnchecked(const uint256& hash, const CTxMemPoolEntry &entry,
     if (tx.nType == TRANSACTION_PROVIDER_REGISTER) {
         CProRegTx proTx;
         if (!GetTxPayload(tx, proTx)) {
-            assert(false);
+            LogPrintf("%s: ERROR: Invalid transaction payload, tx: %s", __func__, tx.ToString());
+            return false;
         }
         mapProTxAddresses.emplace(proTx.addr, tx.GetHash());
         mapProTxPubKeyIDs.emplace(proTx.keyIDOwner, tx.GetHash());
@@ -455,13 +456,15 @@ bool CTxMemPool::addUnchecked(const uint256& hash, const CTxMemPoolEntry &entry,
     } else if (tx.nType == TRANSACTION_PROVIDER_UPDATE_SERVICE) {
         CProUpServTx proTx;
         if (!GetTxPayload(tx, proTx)) {
-            assert(false);
+            LogPrintf("%s: ERROR: Invalid transaction payload, tx: %s", __func__, tx.ToString());
+            return false;
         }
         mapProTxAddresses.emplace(proTx.addr, tx.GetHash());
     } else if (tx.nType == TRANSACTION_PROVIDER_UPDATE_REGISTRAR) {
         CProUpRegTx proTx;
         if (!GetTxPayload(tx, proTx)) {
-            assert(false);
+            LogPrintf("%s: ERROR: Invalid transaction payload, tx: %s", __func__, tx.ToString());
+            return false;
         }
         mapProTxBlsPubKeyHashes.emplace(proTx.pubKeyOperator.GetHash(), tx.GetHash());
     }
@@ -825,7 +828,8 @@ void CTxMemPool::removeProTxConflicts(const CTransaction &tx)
     if (tx.nType == TRANSACTION_PROVIDER_REGISTER) {
         CProRegTx proTx;
         if (!GetTxPayload(tx, proTx)) {
-            assert(false);
+            LogPrintf("%s: ERROR: Invalid transaction payload, tx: %s", __func__, tx.ToString());
+            return;
         }
 
         if (mapProTxAddresses.count(proTx.addr)) {
@@ -842,7 +846,8 @@ void CTxMemPool::removeProTxConflicts(const CTransaction &tx)
     } else if (tx.nType == TRANSACTION_PROVIDER_UPDATE_SERVICE) {
         CProUpServTx proTx;
         if (!GetTxPayload(tx, proTx)) {
-            assert(false);
+            LogPrintf("%s: ERROR: Invalid transaction payload, tx: %s", __func__, tx.ToString());
+            return;
         }
 
         if (mapProTxAddresses.count(proTx.addr)) {
@@ -854,7 +859,8 @@ void CTxMemPool::removeProTxConflicts(const CTransaction &tx)
     } else if (tx.nType == TRANSACTION_PROVIDER_UPDATE_REGISTRAR) {
         CProUpRegTx proTx;
         if (!GetTxPayload(tx, proTx)) {
-            assert(false);
+            LogPrintf("%s: ERROR: Invalid transaction payload, tx: %s", __func__, tx.ToString());
+            return;
         }
 
         removeProTxPubKeyConflicts(tx, proTx.pubKeyOperator);
@@ -1142,8 +1148,10 @@ bool CTxMemPool::existsProviderTxConflict(const CTransaction &tx) const {
     LOCK(cs);
     if (tx.nType == TRANSACTION_PROVIDER_REGISTER) {
         CProRegTx proTx;
-        if (!GetTxPayload(tx, proTx))
-            assert(false);
+        if (!GetTxPayload(tx, proTx)) {
+            LogPrintf("%s: ERROR: Invalid transaction payload, tx: %s", __func__, tx.ToString());
+            return true; // i.e. can't decode payload == conflict
+        }
         if (mapProTxAddresses.count(proTx.addr) || mapProTxPubKeyIDs.count(proTx.keyIDOwner) || mapProTxBlsPubKeyHashes.count(proTx.pubKeyOperator.GetHash()))
             return true;
         if (!proTx.collateralOutpoint.hash.IsNull() && mapProTxCollaterals.count(proTx.collateralOutpoint))
@@ -1151,14 +1159,18 @@ bool CTxMemPool::existsProviderTxConflict(const CTransaction &tx) const {
         return false;
     } else if (tx.nType == TRANSACTION_PROVIDER_UPDATE_SERVICE) {
         CProUpServTx proTx;
-        if (!GetTxPayload(tx, proTx))
-            assert(false);
+        if (!GetTxPayload(tx, proTx)) {
+            LogPrintf("%s: ERROR: Invalid transaction payload, tx: %s", __func__, tx.ToString());
+            return true; // i.e. can't decode payload == conflict
+        }
         auto it = mapProTxAddresses.find(proTx.addr);
         return it != mapProTxAddresses.end() && it->second != proTx.proTxHash;
     } else if (tx.nType == TRANSACTION_PROVIDER_UPDATE_REGISTRAR) {
         CProUpRegTx proTx;
-        if (!GetTxPayload(tx, proTx))
-            assert(false);
+        if (!GetTxPayload(tx, proTx)) {
+            LogPrintf("%s: ERROR: Invalid transaction payload, tx: %s", __func__, tx.ToString());
+            return true; // i.e. can't decode payload == conflict
+        }
         auto it = mapProTxBlsPubKeyHashes.find(proTx.pubKeyOperator.GetHash());
         return it != mapProTxBlsPubKeyHashes.end() && it->second != proTx.proTxHash;
     }

From c975a986b2c6e12439571006093023e14a4f8cce Mon Sep 17 00:00:00 2001
From: UdjinM6 <UdjinM6@users.noreply.github.com>
Date: Wed, 14 Nov 2018 00:17:16 +0300
Subject: [PATCH 266/400] no cs_main in specialtxes

---
 src/evo/cbtx.cpp       | 5 -----
 src/evo/providertx.cpp | 8 --------
 src/evo/specialtx.cpp  | 2 --
 3 files changed, 15 deletions(-)

diff --git a/src/evo/cbtx.cpp b/src/evo/cbtx.cpp
index 2eef16fa4a95..711aabb40973 100644
--- a/src/evo/cbtx.cpp
+++ b/src/evo/cbtx.cpp
@@ -12,8 +12,6 @@
 
 bool CheckCbTx(const CTransaction& tx, const CBlockIndex* pindexPrev, CValidationState& state)
 {
-    AssertLockHeld(cs_main);
-
     if (!tx.IsCoinBase()) {
         return state.DoS(100, false, REJECT_INVALID, "bad-cbtx-invalid");
     }
@@ -37,8 +35,6 @@ bool CheckCbTx(const CTransaction& tx, const CBlockIndex* pindexPrev, CValidatio
 // This can only be done after the block has been fully processed, as otherwise we won't have the finished MN list
 bool CheckCbTxMerkleRootMNList(const CBlock& block, const CBlockIndex* pindex, CValidationState& state)
 {
-    AssertLockHeld(cs_main);
-
     if (block.vtx[0]->nType != TRANSACTION_COINBASE) {
         return true;
     }
@@ -63,7 +59,6 @@ bool CheckCbTxMerkleRootMNList(const CBlock& block, const CBlockIndex* pindex, C
 
 bool CalcCbTxMerkleRootMNList(const CBlock& block, const CBlockIndex* pindexPrev, uint256& merkleRootRet, CValidationState& state)
 {
-    AssertLockHeld(cs_main);
     LOCK(deterministicMNManager->cs);
 
     CDeterministicMNList tmpMNList;
diff --git a/src/evo/providertx.cpp b/src/evo/providertx.cpp
index 5e32efb01774..dbae4eb56659 100644
--- a/src/evo/providertx.cpp
+++ b/src/evo/providertx.cpp
@@ -76,8 +76,6 @@ static bool CheckInputsHash(const CTransaction& tx, const ProTx& proTx, CValidat
 
 bool CheckProRegTx(const CTransaction& tx, const CBlockIndex* pindexPrev, CValidationState& state)
 {
-    AssertLockHeld(cs_main);
-
     CProRegTx ptx;
     if (!GetTxPayload(tx, ptx)) {
         return state.DoS(100, false, REJECT_INVALID, "bad-protx-payload");
@@ -203,8 +201,6 @@ bool CheckProRegTx(const CTransaction& tx, const CBlockIndex* pindexPrev, CValid
 
 bool CheckProUpServTx(const CTransaction& tx, const CBlockIndex* pindexPrev, CValidationState& state)
 {
-    AssertLockHeld(cs_main);
-
     CProUpServTx ptx;
     if (!GetTxPayload(tx, ptx)) {
         return state.DoS(100, false, REJECT_INVALID, "bad-protx-payload");
@@ -255,8 +251,6 @@ bool CheckProUpServTx(const CTransaction& tx, const CBlockIndex* pindexPrev, CVa
 
 bool CheckProUpRegTx(const CTransaction& tx, const CBlockIndex* pindexPrev, CValidationState& state)
 {
-    AssertLockHeld(cs_main);
-
     CProUpRegTx ptx;
     if (!GetTxPayload(tx, ptx)) {
         return state.DoS(100, false, REJECT_INVALID, "bad-protx-payload");
@@ -331,8 +325,6 @@ bool CheckProUpRegTx(const CTransaction& tx, const CBlockIndex* pindexPrev, CVal
 
 bool CheckProUpRevTx(const CTransaction& tx, const CBlockIndex* pindexPrev, CValidationState& state)
 {
-    AssertLockHeld(cs_main);
-
     CProUpRevTx ptx;
     if (!GetTxPayload(tx, ptx)) {
         return state.DoS(100, false, REJECT_INVALID, "bad-protx-payload");
diff --git a/src/evo/specialtx.cpp b/src/evo/specialtx.cpp
index 56e6474a7740..6352b6e660da 100644
--- a/src/evo/specialtx.cpp
+++ b/src/evo/specialtx.cpp
@@ -16,8 +16,6 @@
 
 bool CheckSpecialTx(const CTransaction& tx, const CBlockIndex* pindexPrev, CValidationState& state)
 {
-    AssertLockHeld(cs_main);
-
     if (tx.nVersion < 3 || tx.nType == TRANSACTION_NORMAL)
         return true;
 

From b843696638f34a11f87404839f2e975c9bd8ba6a Mon Sep 17 00:00:00 2001
From: UdjinM6 <UdjinM6@users.noreply.github.com>
Date: Wed, 14 Nov 2018 11:51:02 +0300
Subject: [PATCH 267/400] Be more specific about tx version in conditions

We don't want to set rules for version 4+ txes atm.
---
 src/evo/deterministicmns.cpp | 2 +-
 src/evo/specialtx.cpp        | 6 +++---
 src/primitives/transaction.h | 4 ++--
 src/script/interpreter.cpp   | 2 +-
 src/wallet/wallet.cpp        | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/evo/deterministicmns.cpp b/src/evo/deterministicmns.cpp
index 97bbb8df4ac3..724b33cd33db 100644
--- a/src/evo/deterministicmns.cpp
+++ b/src/evo/deterministicmns.cpp
@@ -676,7 +676,7 @@ int64_t CDeterministicMNManager::GetSpork15Value()
 
 bool CDeterministicMNManager::IsProTxWithCollateral(const CTransactionRef& tx, uint32_t n)
 {
-    if (tx->nVersion < 3 || tx->nType != TRANSACTION_PROVIDER_REGISTER) {
+    if (tx->nVersion != 3 || tx->nType != TRANSACTION_PROVIDER_REGISTER) {
         return false;
     }
     CProRegTx proTx;
diff --git a/src/evo/specialtx.cpp b/src/evo/specialtx.cpp
index 6352b6e660da..cd2a1d0bb72e 100644
--- a/src/evo/specialtx.cpp
+++ b/src/evo/specialtx.cpp
@@ -16,7 +16,7 @@
 
 bool CheckSpecialTx(const CTransaction& tx, const CBlockIndex* pindexPrev, CValidationState& state)
 {
-    if (tx.nVersion < 3 || tx.nType == TRANSACTION_NORMAL)
+    if (tx.nVersion != 3 || tx.nType == TRANSACTION_NORMAL)
         return true;
 
     if (pindexPrev && VersionBitsState(pindexPrev, Params().GetConsensus(), Consensus::DEPLOYMENT_DIP0003, versionbitscache) != THRESHOLD_ACTIVE) {
@@ -41,7 +41,7 @@ bool CheckSpecialTx(const CTransaction& tx, const CBlockIndex* pindexPrev, CVali
 
 bool ProcessSpecialTx(const CTransaction& tx, const CBlockIndex* pindex, CValidationState& state)
 {
-    if (tx.nVersion < 3 || tx.nType == TRANSACTION_NORMAL) {
+    if (tx.nVersion != 3 || tx.nType == TRANSACTION_NORMAL) {
         return true;
     }
 
@@ -60,7 +60,7 @@ bool ProcessSpecialTx(const CTransaction& tx, const CBlockIndex* pindex, CValida
 
 bool UndoSpecialTx(const CTransaction& tx, const CBlockIndex* pindex)
 {
-    if (tx.nVersion < 3 || tx.nType == TRANSACTION_NORMAL) {
+    if (tx.nVersion != 3 || tx.nType == TRANSACTION_NORMAL) {
         return true;
     }
 
diff --git a/src/primitives/transaction.h b/src/primitives/transaction.h
index cfcd66afe2c3..c2c2d1d5567a 100644
--- a/src/primitives/transaction.h
+++ b/src/primitives/transaction.h
@@ -260,7 +260,7 @@ class CTransaction
         s << vin;
         s << vout;
         s << nLockTime;
-        if (this->nVersion >= 3 && this->nType != TRANSACTION_NORMAL)
+        if (this->nVersion == 3 && this->nType != TRANSACTION_NORMAL)
             s << vExtraPayload;
     }
 
@@ -339,7 +339,7 @@ struct CMutableTransaction
         READWRITE(vin);
         READWRITE(vout);
         READWRITE(nLockTime);
-        if (this->nVersion >= 3 && this->nType != TRANSACTION_NORMAL) {
+        if (this->nVersion == 3 && this->nType != TRANSACTION_NORMAL) {
             READWRITE(vExtraPayload);
         }
     }
diff --git a/src/script/interpreter.cpp b/src/script/interpreter.cpp
index d86696cb8b56..bc7e58acdd02 100644
--- a/src/script/interpreter.cpp
+++ b/src/script/interpreter.cpp
@@ -1112,7 +1112,7 @@ class CTransactionSignatureSerializer {
              SerializeOutput(s, nOutput);
         // Serialize nLockTime
         ::Serialize(s, txTo.nLockTime);
-        if (txTo.nVersion >= 3 && txTo.nType != TRANSACTION_NORMAL)
+        if (txTo.nVersion == 3 && txTo.nType != TRANSACTION_NORMAL)
             ::Serialize(s, txTo.vExtraPayload);
     }
 };
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
index 9e88f53646e2..3ac1434b6b6f 100644
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -2975,7 +2975,7 @@ bool CWallet::FundTransaction(CMutableTransaction& tx, CAmount& nFeeRet, bool ov
         coinControl.Select(txin.prevout);
 
     int nExtraPayloadSize = 0;
-    if (tx.nVersion >= 3 && tx.nType != TRANSACTION_NORMAL)
+    if (tx.nVersion == 3 && tx.nType != TRANSACTION_NORMAL)
         nExtraPayloadSize = (int)tx.vExtraPayload.size();
 
     CReserveKey reservekey(this);

From 6761fa49f1ef0d20576a0f87eb56809eb78cf063 Mon Sep 17 00:00:00 2001
From: UdjinM6 <UdjinM6@users.noreply.github.com>
Date: Wed, 14 Nov 2018 16:59:10 +0300
Subject: [PATCH 268/400] More checks for tx type

---
 src/evo/cbtx.cpp       |  4 ++++
 src/evo/providertx.cpp | 16 ++++++++++++++++
 2 files changed, 20 insertions(+)

diff --git a/src/evo/cbtx.cpp b/src/evo/cbtx.cpp
index 711aabb40973..b7a8577606c1 100644
--- a/src/evo/cbtx.cpp
+++ b/src/evo/cbtx.cpp
@@ -12,6 +12,10 @@
 
 bool CheckCbTx(const CTransaction& tx, const CBlockIndex* pindexPrev, CValidationState& state)
 {
+    if (tx.nType != TRANSACTION_COINBASE) {
+        return state.DoS(100, false, REJECT_INVALID, "bad-cbtx-type");
+    }
+
     if (!tx.IsCoinBase()) {
         return state.DoS(100, false, REJECT_INVALID, "bad-cbtx-invalid");
     }
diff --git a/src/evo/providertx.cpp b/src/evo/providertx.cpp
index dbae4eb56659..42967ddba601 100644
--- a/src/evo/providertx.cpp
+++ b/src/evo/providertx.cpp
@@ -76,6 +76,10 @@ static bool CheckInputsHash(const CTransaction& tx, const ProTx& proTx, CValidat
 
 bool CheckProRegTx(const CTransaction& tx, const CBlockIndex* pindexPrev, CValidationState& state)
 {
+    if (tx.nType != TRANSACTION_PROVIDER_REGISTER) {
+        return state.DoS(100, false, REJECT_INVALID, "bad-protx-type");
+    }
+
     CProRegTx ptx;
     if (!GetTxPayload(tx, ptx)) {
         return state.DoS(100, false, REJECT_INVALID, "bad-protx-payload");
@@ -201,6 +205,10 @@ bool CheckProRegTx(const CTransaction& tx, const CBlockIndex* pindexPrev, CValid
 
 bool CheckProUpServTx(const CTransaction& tx, const CBlockIndex* pindexPrev, CValidationState& state)
 {
+    if (tx.nType != TRANSACTION_PROVIDER_UPDATE_SERVICE) {
+        return state.DoS(100, false, REJECT_INVALID, "bad-protx-type");
+    }
+
     CProUpServTx ptx;
     if (!GetTxPayload(tx, ptx)) {
         return state.DoS(100, false, REJECT_INVALID, "bad-protx-payload");
@@ -251,6 +259,10 @@ bool CheckProUpServTx(const CTransaction& tx, const CBlockIndex* pindexPrev, CVa
 
 bool CheckProUpRegTx(const CTransaction& tx, const CBlockIndex* pindexPrev, CValidationState& state)
 {
+    if (tx.nType != TRANSACTION_PROVIDER_UPDATE_REGISTRAR) {
+        return state.DoS(100, false, REJECT_INVALID, "bad-protx-type");
+    }
+
     CProUpRegTx ptx;
     if (!GetTxPayload(tx, ptx)) {
         return state.DoS(100, false, REJECT_INVALID, "bad-protx-payload");
@@ -325,6 +337,10 @@ bool CheckProUpRegTx(const CTransaction& tx, const CBlockIndex* pindexPrev, CVal
 
 bool CheckProUpRevTx(const CTransaction& tx, const CBlockIndex* pindexPrev, CValidationState& state)
 {
+    if (tx.nType != TRANSACTION_PROVIDER_UPDATE_REVOKE) {
+        return state.DoS(100, false, REJECT_INVALID, "bad-protx-type");
+    }
+
     CProUpRevTx ptx;
     if (!GetTxPayload(tx, ptx)) {
         return state.DoS(100, false, REJECT_INVALID, "bad-protx-payload");

From 7c1f11089336f9d01367bff3e549e27619794b07 Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Wed, 14 Nov 2018 18:40:31 +0100
Subject: [PATCH 269/400] Revert #2441 and retry fixing (#2444)

* Revert "Restart MNs in DIP3 tests even if collateral has not moved (#2441)"

This reverts commit 153afb9062398cd2beb164f6794c2db9e434ce3a.

* Reuse old legacy MN key when upgrading to protx
---
 qa/rpc-tests/dip3-deterministicmns.py | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/qa/rpc-tests/dip3-deterministicmns.py b/qa/rpc-tests/dip3-deterministicmns.py
index e9129374ae48..eebbcaf10f53 100755
--- a/qa/rpc-tests/dip3-deterministicmns.py
+++ b/qa/rpc-tests/dip3-deterministicmns.py
@@ -178,7 +178,7 @@ def run_test(self):
             self.nodes[0].generate(1)
 
             if fund:
-                # collateral has moved, so we need to "masternode start" it again
+                # collateral has moved, so we need to start it again
                 mns_to_restart.append(mns[i])
             else:
                 # collateral has not moved, so it should still be in the masternode list even after upgrade
@@ -195,7 +195,7 @@ def run_test(self):
         print("restarting controller and upgraded MNs")
         self.restart_controller_node()
         self.force_finish_mnsync_list(self.nodes[0])
-        for mn in mns_protx:
+        for mn in mns_to_restart:
             print("restarting MN %s" % mn.alias)
             self.stop_node(mn.idx)
             self.start_mn(mn)
@@ -337,7 +337,7 @@ def create_mn(self, node, idx, alias):
 
         return mn
 
-    def create_mn_protx_base(self, node, idx, alias):
+    def create_mn_protx_base(self, node, idx, alias, legacy_mn_key):
         mn = Masternode()
         mn.idx = idx
         mn.alias = alias
@@ -348,14 +348,14 @@ def create_mn_protx_base(self, node, idx, alias):
         mn.ownerAddr = node.getnewaddress()
         mn.operatorAddr = blsKey['public']
         mn.votingAddr = mn.ownerAddr
-        mn.legacyMnkey = node.masternode('genkey')
+        mn.legacyMnkey = node.masternode('genkey') if legacy_mn_key is None else legacy_mn_key
         mn.blsMnkey = blsKey['secret']
 
         return mn
 
     # create a protx MN and also fund it (using collateral inside ProRegTx)
-    def create_mn_protx_fund(self, node, idx, alias):
-        mn = self.create_mn_protx_base(node, idx, alias)
+    def create_mn_protx_fund(self, node, idx, alias, legacy_mn_key=None):
+        mn = self.create_mn_protx_base(node, idx, alias, legacy_mn_key=legacy_mn_key)
         mn.collateral_address = node.getnewaddress()
 
         mn.protx_hash = node.protx('register_fund', mn.collateral_address, '127.0.0.1:%d' % mn.p2p_port, mn.ownerAddr, mn.operatorAddr, mn.votingAddr, 0, mn.collateral_address)
@@ -372,8 +372,8 @@ def create_mn_protx_fund(self, node, idx, alias):
         return mn
 
     # create a protx MN which refers to an existing collateral
-    def create_mn_protx(self, node, idx, alias, collateral_txid, collateral_vout):
-        mn = self.create_mn_protx_base(node, idx, alias)
+    def create_mn_protx(self, node, idx, alias, collateral_txid, collateral_vout, legacy_mn_key=None):
+        mn = self.create_mn_protx_base(node, idx, alias, legacy_mn_key=legacy_mn_key)
         mn.rewards_address = node.getnewaddress()
 
         mn.protx_hash = node.protx('register', collateral_txid, collateral_vout, '127.0.0.1:%d' % mn.p2p_port, mn.ownerAddr, mn.operatorAddr, mn.votingAddr, 0, mn.rewards_address)
@@ -400,9 +400,9 @@ def spend_mn_collateral(self, mn, with_dummy_input_output=False):
     def upgrade_mn_protx(self, mn, refund):
         if refund:
             self.spend_mn_collateral(mn)
-            mn = self.create_mn_protx_fund(self.nodes[0], mn.idx, 'mn-protx-%d' % mn.idx)
+            mn = self.create_mn_protx_fund(self.nodes[0], mn.idx, 'mn-protx-%d' % mn.idx, legacy_mn_key=mn.legacyMnkey)
         else:
-            mn = self.create_mn_protx(self.nodes[0], mn.idx, 'mn-protx-%d' % mn.idx, mn.collateral_txid, mn.collateral_vout)
+            mn = self.create_mn_protx(self.nodes[0], mn.idx, 'mn-protx-%d' % mn.idx, mn.collateral_txid, mn.collateral_vout, legacy_mn_key=mn.legacyMnkey)
         return mn
 
     def test_protx_update_service(self, mn):

From 9adf8ad738fad103dca1c51c5fe8bbff9cc267ea Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Wed, 14 Nov 2018 14:10:33 +0100
Subject: [PATCH 270/400] Remove restriction that forced use of same addresses
 for payout and collateral

---
 src/evo/providertx.cpp | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/src/evo/providertx.cpp b/src/evo/providertx.cpp
index 0db1149e474c..f57022637ce4 100644
--- a/src/evo/providertx.cpp
+++ b/src/evo/providertx.cpp
@@ -101,12 +101,6 @@ bool CheckProRegTx(const CTransaction& tx, const CBlockIndex* pindexPrev, CValid
         if (tx.vout[ptx.collateralOutpoint.n].nValue != 1000 * COIN) {
             return state.DoS(10, false, REJECT_INVALID, "bad-protx-collateral");
         }
-
-        // This is a temporary restriction that will be lifted later
-        // It is required while we are transitioning from the old MN list to the deterministic list
-        if (tx.vout[ptx.collateralOutpoint.n].scriptPubKey != ptx.scriptPayout) {
-            return state.DoS(10, false, REJECT_INVALID, "bad-protx-payee-collateral");
-        }
     }
     if (ptx.keyIDOwner.IsNull() || !ptx.pubKeyOperator.IsValid() || ptx.keyIDVoting.IsNull()) {
         return state.DoS(10, false, REJECT_INVALID, "bad-protx-key-null");
@@ -295,15 +289,10 @@ bool CheckProUpRegTx(const CTransaction& tx, const CBlockIndex* pindexPrev, CVal
             return state.DoS(10, false, REJECT_INVALID, "bad-protx-payee-reuse");
         }
 
-        // This is a temporary restriction that will be lifted later
-        // It is required while we are transitioning from the old MN list to the deterministic list
         Coin coin;
         if (!GetUTXOCoin(dmn->collateralOutpoint, coin)) {
             return state.DoS(100, false, REJECT_INVALID, "bad-protx-payee-collateral");
         }
-        if (coin.out.scriptPubKey != ptx.scriptPayout) {
-            return state.DoS(10, false, REJECT_INVALID, "bad-protx-payee-collateral");
-        }
 
         if (mnList.HasUniqueProperty(ptx.pubKeyOperator)) {
             auto otherDmn = mnList.GetUniquePropertyMN(ptx.pubKeyOperator);

From dc404e7550c59e58e59156125c35bf2813409cd9 Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Wed, 14 Nov 2018 14:31:56 +0100
Subject: [PATCH 271/400] Allow P2SH for payout scripts

---
 src/evo/providertx.cpp | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/evo/providertx.cpp b/src/evo/providertx.cpp
index f57022637ce4..c781da630cb2 100644
--- a/src/evo/providertx.cpp
+++ b/src/evo/providertx.cpp
@@ -105,8 +105,7 @@ bool CheckProRegTx(const CTransaction& tx, const CBlockIndex* pindexPrev, CValid
     if (ptx.keyIDOwner.IsNull() || !ptx.pubKeyOperator.IsValid() || ptx.keyIDVoting.IsNull()) {
         return state.DoS(10, false, REJECT_INVALID, "bad-protx-key-null");
     }
-    // we may support P2SH later, but restrict it for now (while in transitioning phase from old MN list to deterministic list)
-    if (!ptx.scriptPayout.IsPayToPublicKeyHash()) {
+    if (!ptx.scriptPayout.IsPayToPublicKeyHash() && !ptx.scriptPayout.IsPayToScriptHash()) {
         return state.DoS(10, false, REJECT_INVALID, "bad-protx-payee");
     }
 
@@ -266,8 +265,7 @@ bool CheckProUpRegTx(const CTransaction& tx, const CBlockIndex* pindexPrev, CVal
     if (!ptx.pubKeyOperator.IsValid() || ptx.keyIDVoting.IsNull()) {
         return state.DoS(10, false, REJECT_INVALID, "bad-protx-key-null");
     }
-    // we may support P2SH later, but restrict it for now (while in transitioning phase from old MN list to deterministic list)
-    if (!ptx.scriptPayout.IsPayToPublicKeyHash()) {
+    if (!ptx.scriptPayout.IsPayToPublicKeyHash() && !ptx.scriptPayout.IsPayToScriptHash()) {
         return state.DoS(10, false, REJECT_INVALID, "bad-protx-payee");
     }
 

From 826e7d063aa105dd71251de94049589e5ab7ee63 Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Wed, 14 Nov 2018 14:49:32 +0100
Subject: [PATCH 272/400] Move internal collateral check to the else branch of
 the external collateral check

---
 src/evo/providertx.cpp | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/src/evo/providertx.cpp b/src/evo/providertx.cpp
index c781da630cb2..8f0bc7e0db76 100644
--- a/src/evo/providertx.cpp
+++ b/src/evo/providertx.cpp
@@ -93,15 +93,6 @@ bool CheckProRegTx(const CTransaction& tx, const CBlockIndex* pindexPrev, CValid
         return state.DoS(100, false, REJECT_INVALID, "bad-protx-mode");
     }
 
-    // when collateralOutpoint refers to an external collateral, we check it further down
-    if (ptx.collateralOutpoint.hash.IsNull()) {
-        if (ptx.collateralOutpoint.n >= tx.vout.size()) {
-            return state.DoS(10, false, REJECT_INVALID, "bad-protx-collateral-index");
-        }
-        if (tx.vout[ptx.collateralOutpoint.n].nValue != 1000 * COIN) {
-            return state.DoS(10, false, REJECT_INVALID, "bad-protx-collateral");
-        }
-    }
     if (ptx.keyIDOwner.IsNull() || !ptx.pubKeyOperator.IsValid() || ptx.keyIDVoting.IsNull()) {
         return state.DoS(10, false, REJECT_INVALID, "bad-protx-key-null");
     }
@@ -152,6 +143,12 @@ bool CheckProRegTx(const CTransaction& tx, const CBlockIndex* pindexPrev, CValid
 
         collateralOutpoint = ptx.collateralOutpoint;
     } else {
+        if (ptx.collateralOutpoint.n >= tx.vout.size()) {
+            return state.DoS(10, false, REJECT_INVALID, "bad-protx-collateral-index");
+        }
+        if (tx.vout[ptx.collateralOutpoint.n].nValue != 1000 * COIN) {
+            return state.DoS(10, false, REJECT_INVALID, "bad-protx-collateral");
+        }
         collateralOutpoint = COutPoint(tx.GetHash(), ptx.collateralOutpoint.n);
     }
 

From 927e8bd796e65bbd79559b6876def9833d8c8b3e Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Wed, 14 Nov 2018 14:53:41 +0100
Subject: [PATCH 273/400] Also forbid reusing collateral key for owner/voting
 keys

We previously only checked for the payee key.
---
 src/evo/providertx.cpp | 34 +++++++++++++++++++++++++++-------
 1 file changed, 27 insertions(+), 7 deletions(-)

diff --git a/src/evo/providertx.cpp b/src/evo/providertx.cpp
index 8f0bc7e0db76..ab9022f11616 100644
--- a/src/evo/providertx.cpp
+++ b/src/evo/providertx.cpp
@@ -105,7 +105,7 @@ bool CheckProRegTx(const CTransaction& tx, const CBlockIndex* pindexPrev, CValid
         // should not happen as we checked script types before
         return state.DoS(10, false, REJECT_INVALID, "bad-protx-payee-dest");
     }
-    // don't allow reuse of collateral key for other keys (don't allow people to put the collateral key onto an online server)
+    // don't allow reuse of payout key for other keys (don't allow people to put the payee key onto an online server)
     if (payoutDest == CTxDestination(ptx.keyIDOwner) || payoutDest == CTxDestination(ptx.keyIDVoting)) {
         return state.DoS(10, false, REJECT_INVALID, "bad-protx-payee-reuse");
     }
@@ -120,6 +120,7 @@ bool CheckProRegTx(const CTransaction& tx, const CBlockIndex* pindexPrev, CValid
         return state.DoS(10, false, REJECT_INVALID, "bad-protx-operator-reward");
     }
 
+    CTxDestination collateralTxDest;
     CKeyID keyForPayloadSig;
     COutPoint collateralOutpoint;
 
@@ -129,15 +130,13 @@ bool CheckProRegTx(const CTransaction& tx, const CBlockIndex* pindexPrev, CValid
             return state.DoS(10, false, REJECT_INVALID, "bad-protx-collateral");
         }
 
-        CTxDestination txDest;
-        if (!ExtractDestination(coin.out.scriptPubKey, txDest)) {
+        if (!ExtractDestination(coin.out.scriptPubKey, collateralTxDest)) {
             return state.DoS(10, false, REJECT_INVALID, "bad-protx-collateral-dest");
         }
 
         // Extract key from collateral. This only works for P2PK and P2PKH collaterals and will fail for P2SH.
         // Issuer of this ProRegTx must prove ownership with this key by signing the ProRegTx
-        CBitcoinAddress txAddr(txDest);
-        if (!txAddr.GetKeyID(keyForPayloadSig)) {
+        if (!CBitcoinAddress(collateralTxDest).GetKeyID(keyForPayloadSig)) {
             return state.DoS(10, false, REJECT_INVALID, "bad-protx-collateral-pkh");
         }
 
@@ -149,9 +148,20 @@ bool CheckProRegTx(const CTransaction& tx, const CBlockIndex* pindexPrev, CValid
         if (tx.vout[ptx.collateralOutpoint.n].nValue != 1000 * COIN) {
             return state.DoS(10, false, REJECT_INVALID, "bad-protx-collateral");
         }
+
+        if (!ExtractDestination(tx.vout[ptx.collateralOutpoint.n].scriptPubKey, collateralTxDest)) {
+            return state.DoS(10, false, REJECT_INVALID, "bad-protx-collateral-dest");
+        }
+
         collateralOutpoint = COutPoint(tx.GetHash(), ptx.collateralOutpoint.n);
     }
 
+    // don't allow reuse of collateral key for other keys (don't allow people to put the collateral key onto an online server)
+    // this check applies to internal and external collateral, but internal collaterals are not necessarely a P2PKH
+    if (collateralTxDest == CTxDestination(ptx.keyIDOwner) || collateralTxDest == CTxDestination(ptx.keyIDVoting)) {
+        return state.DoS(10, false, REJECT_INVALID, "bad-protx-collateral-reuse");
+    }
+
     if (pindexPrev) {
         auto mnList = deterministicMNManager->GetListForBlock(pindexPrev->GetBlockHash());
 
@@ -279,14 +289,24 @@ bool CheckProUpRegTx(const CTransaction& tx, const CBlockIndex* pindexPrev, CVal
             return state.DoS(100, false, REJECT_INVALID, "bad-protx-hash");
         }
 
-        // don't allow reuse of collateral key for other keys (don't allow people to put the collateral key onto an online server)
+        // don't allow reuse of payee key for other keys (don't allow people to put the payee key onto an online server)
         if (payoutDest == CTxDestination(dmn->pdmnState->keyIDOwner) || payoutDest == CTxDestination(ptx.keyIDVoting)) {
             return state.DoS(10, false, REJECT_INVALID, "bad-protx-payee-reuse");
         }
 
         Coin coin;
         if (!GetUTXOCoin(dmn->collateralOutpoint, coin)) {
-            return state.DoS(100, false, REJECT_INVALID, "bad-protx-payee-collateral");
+            // this should never happen (there would be no dmn otherwise)
+            return state.DoS(100, false, REJECT_INVALID, "bad-protx-collateral");
+        }
+
+        // don't allow reuse of collateral key for other keys (don't allow people to put the collateral key onto an online server)
+        CTxDestination collateralTxDest;
+        if (!ExtractDestination(coin.out.scriptPubKey, collateralTxDest)) {
+            return state.DoS(100, false, REJECT_INVALID, "bad-protx-collateral-dest");
+        }
+        if (collateralTxDest == CTxDestination(dmn->pdmnState->keyIDOwner) || collateralTxDest == CTxDestination(ptx.keyIDVoting)) {
+            return state.DoS(10, false, REJECT_INVALID, "bad-protx-collateral-reuse");
         }
 
         if (mnList.HasUniqueProperty(ptx.pubKeyOperator)) {

From 5ccf556f3a987cb439888ecac56d4070f15922fe Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Wed, 14 Nov 2018 14:57:58 +0100
Subject: [PATCH 274/400] GetMasternodeInfo with payee argument should do
 nothing when DIP3 is active

Also change ComputeBlockVersion to directly use mnList.GetMNPayee()
---
 src/masternodeman.cpp | 26 +++++++++++++++---------
 src/validation.cpp    | 46 +++++++++++++++++++++++++------------------
 2 files changed, 44 insertions(+), 28 deletions(-)

diff --git a/src/masternodeman.cpp b/src/masternodeman.cpp
index 90722cf77907..03f9a2f3b92e 100644
--- a/src/masternodeman.cpp
+++ b/src/masternodeman.cpp
@@ -605,18 +605,26 @@ bool CMasternodeMan::GetMasternodeInfo(const CKeyID& keyIDOperator, masternode_i
 
 bool CMasternodeMan::GetMasternodeInfo(const CScript& payee, masternode_info_t& mnInfoRet)
 {
-    CTxDestination dest;
-    if (!ExtractDestination(payee, dest) || !boost::get<CKeyID>(&dest))
+    if (deterministicMNManager->IsDeterministicMNsSporkActive()) {
+        // we can't reliably search by payee as there might be duplicates. Also, keyIDCollateralAddress is not
+        // always the payout address as DIP3 allows using different keys for collateral and payouts
+        // this method is only used from ComputeBlockVersion, which has a different logic for deterministic MNs
+        // this method won't be reimplemented when removing the compatibility code
         return false;
-    CKeyID keyId = *boost::get<CKeyID>(&dest);
-    LOCK(cs);
-    for (const auto& mnpair : mapMasternodes) {
-        if (mnpair.second.keyIDCollateralAddress == keyId) {
-            mnInfoRet = mnpair.second.GetInfo();
-            return true;
+    } else {
+        CTxDestination dest;
+        if (!ExtractDestination(payee, dest) || !boost::get<CKeyID>(&dest))
+            return false;
+        CKeyID keyId = *boost::get<CKeyID>(&dest);
+        LOCK(cs);
+        for (const auto& mnpair : mapMasternodes) {
+            if (mnpair.second.keyIDCollateralAddress == keyId) {
+                mnInfoRet = mnpair.second.GetInfo();
+                return true;
+            }
         }
+        return false;
     }
-    return false;
 }
 
 bool CMasternodeMan::Has(const COutPoint& outpoint)
diff --git a/src/validation.cpp b/src/validation.cpp
index 5ec27ca16783..8971cff84e01 100644
--- a/src/validation.cpp
+++ b/src/validation.cpp
@@ -1807,26 +1807,34 @@ int32_t ComputeBlockVersion(const CBlockIndex* pindexPrev, const Consensus::Para
         ThresholdState state = VersionBitsState(pindexPrev, params, pos, versionbitscache);
         const struct BIP9DeploymentInfo& vbinfo = VersionBitsDeploymentInfo[pos];
         if (vbinfo.check_mn_protocol && state == THRESHOLD_STARTED && fCheckMasternodesUpgraded) {
-            std::vector<CTxOut> voutMasternodePayments;
-            masternode_info_t mnInfo;
-            if (!mnpayments.GetBlockTxOuts(pindexPrev->nHeight + 1, 0, voutMasternodePayments)) {
-                // no votes for this block
-                continue;
-            }
-            bool mnKnown = false;
-            for (const auto& txout : voutMasternodePayments) {
-                if (mnodeman.GetMasternodeInfo(txout.scriptPubKey, mnInfo)) {
-                    mnKnown = true;
-                    break;
+            if (deterministicMNManager->IsDeterministicMNsSporkActive()) {
+                auto mnList = deterministicMNManager->GetListForBlock(pindexPrev->GetBlockHash());
+                auto payee = mnList.GetMNPayee();
+                if (!payee) {
+                    continue;
+                }
+            } else {
+                std::vector<CTxOut> voutMasternodePayments;
+                masternode_info_t mnInfo;
+                if (!mnpayments.GetBlockTxOuts(pindexPrev->nHeight + 1, 0, voutMasternodePayments)) {
+                    // no votes for this block
+                    continue;
+                }
+                bool mnKnown = false;
+                for (const auto& txout : voutMasternodePayments) {
+                    if (mnodeman.GetMasternodeInfo(txout.scriptPubKey, mnInfo)) {
+                        mnKnown = true;
+                        break;
+                    }
+                }
+                if (!mnKnown) {
+                    // unknown masternode
+                    continue;
+                }
+                if (mnInfo.nProtocolVersion < DMN_PROTO_VERSION) {
+                    // masternode is not upgraded yet
+                    continue;
                 }
-            }
-            if (!mnKnown) {
-                // unknown masternode
-                continue;
-            }
-            if (mnInfo.nProtocolVersion < DMN_PROTO_VERSION) {
-                // masternode is not upgraded yet
-                continue;
             }
         }
         if (state == THRESHOLD_LOCKED_IN || state == THRESHOLD_STARTED) {

From f5864254cfaec10d7475a6f91a6e3eae58b637fb Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Wed, 14 Nov 2018 15:39:40 +0100
Subject: [PATCH 275/400] Do not use keyIDCollateralAddress anymore when
 spork15 is active

---
 src/masternode.cpp     |  6 +-----
 src/masternode.h       |  2 +-
 src/rpc/masternode.cpp | 38 +++++++++++++++++++++++++++++++-------
 3 files changed, 33 insertions(+), 13 deletions(-)

diff --git a/src/masternode.cpp b/src/masternode.cpp
index 82a39b5d5495..9cce8bf7b2e3 100644
--- a/src/masternode.cpp
+++ b/src/masternode.cpp
@@ -56,13 +56,9 @@ CMasternode::CMasternode(const CMasternodeBroadcast& mnb) :
 
 CMasternode::CMasternode(const uint256 &proTxHash, const CDeterministicMNCPtr& dmn) :
     masternode_info_t{ MASTERNODE_ENABLED, DMN_PROTO_VERSION, GetAdjustedTime(),
-                       dmn->collateralOutpoint, dmn->pdmnState->addr, CKeyID(), dmn->pdmnState->keyIDOwner, dmn->pdmnState->pubKeyOperator, dmn->pdmnState->keyIDVoting},
+                       dmn->collateralOutpoint, dmn->pdmnState->addr, CKeyID() /* not valid with DIP3 */, dmn->pdmnState->keyIDOwner, dmn->pdmnState->pubKeyOperator, dmn->pdmnState->keyIDVoting},
     fAllowMixingTx(true)
 {
-    CTxDestination dest;
-    if (!ExtractDestination(dmn->pdmnState->scriptPayout, dest) || !boost::get<CKeyID>(&dest))
-        assert(false); // should not happen (previous verification forbids non p2pkh/p2pk
-    keyIDCollateralAddress = *boost::get<CKeyID>(&dest);
 }
 
 //
diff --git a/src/masternode.h b/src/masternode.h
index 4e60c9deaca1..bbba83c9d747 100644
--- a/src/masternode.h
+++ b/src/masternode.h
@@ -129,7 +129,7 @@ struct masternode_info_t
     CService addr{};
     CPubKey pubKeyCollateralAddress{}; // this will be invalid/unset when the network switches to deterministic MNs (luckely it's only important for the broadcast hash)
     CPubKey pubKeyMasternode{}; // this will be invalid/unset when the network switches to deterministic MNs (luckely it's only important for the broadcast hash)
-    CKeyID keyIDCollateralAddress{};
+    CKeyID keyIDCollateralAddress{}; // this is only used in compatibility code and won't be used when spork15 gets activated
     CKeyID keyIDOwner{};
     CKeyID legacyKeyIDOperator{};
     CBLSPublicKey blsPubKeyOperator;
diff --git a/src/rpc/masternode.cpp b/src/rpc/masternode.cpp
index 158f7d222b56..ebdcd741966c 100644
--- a/src/rpc/masternode.cpp
+++ b/src/rpc/masternode.cpp
@@ -283,13 +283,22 @@ UniValue GetNextMasternodeForPayment(int heightShift)
     nHeight = pindex->nHeight + heightShift;
     mnodeman.UpdateLastPaid(pindex);
 
+    CScript payeeScript;
     if (deterministicMNManager->IsDeterministicMNsSporkActive()) {
         auto payee = deterministicMNManager->GetListAtChainTip().GetMNPayee();
         if (!payee || !mnodeman.GetMasternodeInfo(payee->proTxHash, mnInfo))
             return "unknown";
+        payeeScript = payee->pdmnState->scriptPayout;
     } else {
         if (!mnodeman.GetNextMasternodeInQueueForPayment(nHeight, true, nCount, mnInfo))
             return "unknown";
+        payeeScript = GetScriptForDestination(mnInfo.keyIDCollateralAddress);
+    }
+
+    CTxDestination payeeDest;
+    CBitcoinAddress payeeAddr;
+    if (ExtractDestination(payeeScript, payeeDest)) {
+        payeeAddr = CBitcoinAddress(payeeDest);
     }
 
     UniValue obj(UniValue::VOBJ);
@@ -298,7 +307,7 @@ UniValue GetNextMasternodeForPayment(int heightShift)
     obj.push_back(Pair("IP:port",       mnInfo.addr.ToString()));
     obj.push_back(Pair("protocol",      mnInfo.nProtocolVersion));
     obj.push_back(Pair("outpoint",      mnInfo.outpoint.ToStringShort()));
-    obj.push_back(Pair("payee",         CBitcoinAddress(mnInfo.keyIDCollateralAddress).ToString()));
+    obj.push_back(Pair("payee",         payeeAddr.IsValid() ? payeeAddr.ToString() : "UNKNOWN"));
     obj.push_back(Pair("lastseen",      mnInfo.nTimeLastPing));
     obj.push_back(Pair("activeseconds", mnInfo.nTimeLastPing - mnInfo.sigTime));
     return obj;
@@ -877,6 +886,23 @@ UniValue masternodelist(const JSONRPCRequest& request)
         for (const auto& mnpair : mapMasternodes) {
             CMasternode mn = mnpair.second;
             std::string strOutpoint = mnpair.first.ToStringShort();
+
+            CScript payeeScript;
+            if (deterministicMNManager->IsDeterministicMNsSporkActive()) {
+                auto dmn = deterministicMNManager->GetListAtChainTip().GetMNByCollateral(mn.outpoint);
+                if (dmn) {
+                    payeeScript = dmn->pdmnState->scriptPayout;
+                }
+            } else {
+                payeeScript = GetScriptForDestination(mn.keyIDCollateralAddress);
+            }
+
+            CTxDestination payeeDest;
+            std::string payeeStr = "UNKOWN";
+            if (ExtractDestination(payeeScript, payeeDest)) {
+                payeeStr = CBitcoinAddress(payeeDest).ToString();
+            }
+
             if (strMode == "activeseconds") {
                 if (strFilter !="" && strOutpoint.find(strFilter) == std::string::npos) continue;
                 obj.push_back(Pair(strOutpoint, (int64_t)(mn.lastPing.sigTime - mn.sigTime)));
@@ -900,7 +926,7 @@ UniValue masternodelist(const JSONRPCRequest& request)
                 streamFull << std::setw(18) <<
                                mn.GetStatus() << " " <<
                                mn.nProtocolVersion << " " <<
-                               CBitcoinAddress(mn.keyIDCollateralAddress).ToString() << " " <<
+                               payeeStr << " " <<
                                (int64_t)mn.lastPing.sigTime << " " << std::setw(8) <<
                                (int64_t)(mn.lastPing.sigTime - mn.sigTime) << " " << std::setw(10) <<
                                mn.GetLastPaidTime() << " "  << std::setw(6) <<
@@ -915,7 +941,7 @@ UniValue masternodelist(const JSONRPCRequest& request)
                 streamInfo << std::setw(18) <<
                                mn.GetStatus() << " " <<
                                mn.nProtocolVersion << " " <<
-                               CBitcoinAddress(mn.keyIDCollateralAddress).ToString() << " " <<
+                               payeeStr << " " <<
                                (int64_t)mn.lastPing.sigTime << " " << std::setw(8) <<
                                (int64_t)(mn.lastPing.sigTime - mn.sigTime) << " " <<
                                mn.lastPing.GetSentinelString() << " "  <<
@@ -964,11 +990,9 @@ UniValue masternodelist(const JSONRPCRequest& request)
                 if (strFilter !="" && strOutpoint.find(strFilter) == std::string::npos) continue;
                 obj.push_back(Pair(strOutpoint, (int64_t)mn.lastPing.sigTime));
             } else if (strMode == "payee") {
-                CBitcoinAddress address(mn.keyIDCollateralAddress);
-                std::string strPayee = address.ToString();
-                if (strFilter !="" && strPayee.find(strFilter) == std::string::npos &&
+                if (strFilter !="" && payeeStr.find(strFilter) == std::string::npos &&
                     strOutpoint.find(strFilter) == std::string::npos) continue;
-                obj.push_back(Pair(strOutpoint, strPayee));
+                obj.push_back(Pair(strOutpoint, payeeStr));
             } else if (strMode == "protocol") {
                 if (strFilter !="" && strFilter != strprintf("%d", mn.nProtocolVersion) &&
                     strOutpoint.find(strFilter) == std::string::npos) continue;

From d130f25ac378baa98936f582285ade6437d4310e Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Wed, 14 Nov 2018 18:57:17 +0100
Subject: [PATCH 276/400] Fix check for number of params to
 protx_update_service (#2443)

---
 src/rpc/rpcevo.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/rpc/rpcevo.cpp b/src/rpc/rpcevo.cpp
index ab92be609e74..f4db5b608021 100644
--- a/src/rpc/rpcevo.cpp
+++ b/src/rpc/rpcevo.cpp
@@ -449,7 +449,7 @@ void protx_update_service_help()
 
 UniValue protx_update_service(const JSONRPCRequest& request)
 {
-    if (request.fHelp || (request.params.size() != 3 && request.params.size() != 4))
+    if (request.fHelp || (request.params.size() != 4 && request.params.size() != 5))
         protx_update_service_help();
 
     CProUpServTx ptx;

From f65e74682a1fa30e7f887be234eb890ce455a2fb Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Thu, 15 Nov 2018 08:04:58 +0100
Subject: [PATCH 277/400] Pass "-parallel=3" to reduce load on Travis nodes
 while testing

---
 .travis.yml                 | 2 +-
 ci/test_integrationtests.sh | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index d2a05ba47653..3a57c00eb2a2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -73,7 +73,7 @@ script:
     - if [ $SECONDS -gt 1200 ]; then export DEPENDS_TIMEOUT="true"; false; fi # The "false" here ensures that the build is marked as failed even though the whole script returns 0
     - test "$DEPENDS_TIMEOUT" != "true" && $DOCKER_RUN_IN_BUILDER ./ci/build_src.sh
     - test "$DEPENDS_TIMEOUT" != "true" && $DOCKER_RUN_IN_BUILDER ./ci/test_unittests.sh
-    - test "$DEPENDS_TIMEOUT" != "true" && $DOCKER_RUN_IN_BUILDER ./ci/test_integrationtests.sh
+    - test "$DEPENDS_TIMEOUT" != "true" && $DOCKER_RUN_IN_BUILDER ./ci/test_integrationtests.sh -parallel=3
     - test "$DEPENDS_TIMEOUT" != "true" && if [ "$DOCKER_BUILD" = "true" ]; then BUILD_DIR=build-ci/dashcore-$BUILD_TARGET ./docker/build-docker.sh; fi
 after_script:
     - echo $TRAVIS_COMMIT_RANGE
diff --git a/ci/test_integrationtests.sh b/ci/test_integrationtests.sh
index 2223a98c89d0..7b3573961919 100755
--- a/ci/test_integrationtests.sh
+++ b/ci/test_integrationtests.sh
@@ -4,6 +4,8 @@
 
 set -e
 
+PASS_ARGS="$@"
+
 source ./ci/matrix.sh
 
 if [ "$RUN_TESTS" != "true" ]; then
@@ -15,4 +17,4 @@ export LD_LIBRARY_PATH=$BUILD_DIR/depends/$HOST/lib
 
 cd build-ci/dashcore-$BUILD_TARGET
 
-./qa/pull-tester/rpc-tests.py --coverage
+./qa/pull-tester/rpc-tests.py --coverage $PASS_ARGS

From 3c1f44c3a2314f09ff1294fb6017bbb565145bad Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Thu, 15 Nov 2018 08:05:38 +0100
Subject: [PATCH 278/400] Make sure protx_update_registrar adds enough funds
 for the fees

FundSpecialTx must take the size of signature into account.
---
 src/rpc/rpcevo.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/rpc/rpcevo.cpp b/src/rpc/rpcevo.cpp
index f4db5b608021..cb1e3d815351 100644
--- a/src/rpc/rpcevo.cpp
+++ b/src/rpc/rpcevo.cpp
@@ -553,6 +553,9 @@ UniValue protx_update_registrar(const JSONRPCRequest& request)
     tx.nVersion = 3;
     tx.nType = TRANSACTION_PROVIDER_UPDATE_REGISTRAR;
 
+    // make sure we get anough fees added
+    ptx.vchSig.resize(65);
+
     FundSpecialTx(tx, ptx);
     SignSpecialTxPayloadByHash(tx, ptx, keyOwner);
     SetTxPayload(tx, ptx);

From 4de70f0aceea00088ec2156f958fbd415ee0863c Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Thu, 15 Nov 2018 08:06:21 +0100
Subject: [PATCH 279/400] Test P2SH/multisig payee addresses in DIP3 tests

---
 qa/rpc-tests/dip3-deterministicmns.py | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/qa/rpc-tests/dip3-deterministicmns.py b/qa/rpc-tests/dip3-deterministicmns.py
index 02eb80acfe5c..890a4ee936a7 100755
--- a/qa/rpc-tests/dip3-deterministicmns.py
+++ b/qa/rpc-tests/dip3-deterministicmns.py
@@ -294,6 +294,25 @@ def run_test(self):
         for mn in mns_protx:
             self.test_protx_update_service(mn)
 
+        print("testing P2SH/multisig for payee addresses")
+        multisig = self.nodes[0].createmultisig(1, [self.nodes[0].getnewaddress(), self.nodes[0].getnewaddress()])['address']
+        self.update_mn_payee(mns_protx[0], multisig)
+        found_multisig_payee = False
+        for i in range(len(mns_protx)):
+            bt = self.nodes[0].getblocktemplate()
+            expected_payee = bt['masternode'][0]['payee']
+            expected_amount = bt['masternode'][0]['amount']
+            self.nodes[0].generate(1)
+            self.sync_all()
+            if expected_payee == multisig:
+                block = self.nodes[0].getblock(self.nodes[0].getbestblockhash())
+                cbtx = self.nodes[0].getrawtransaction(block['tx'][0], 1)
+                for out in cbtx['vout']:
+                    if 'addresses' in out['scriptPubKey']:
+                        if expected_payee in out['scriptPubKey']['addresses'] and out['valueSat'] == expected_amount:
+                            found_multisig_payee = True
+        assert(found_multisig_payee)
+
         print("testing reusing of collaterals for replaced MNs")
         for i in range(0, 5):
             mn = mns_protx[i]
@@ -405,6 +424,13 @@ def upgrade_mn_protx(self, mn, refund):
             mn = self.create_mn_protx(self.nodes[0], mn.idx, 'mn-protx-%d' % mn.idx, mn.collateral_txid, mn.collateral_vout, legacy_mn_key=mn.legacyMnkey)
         return mn
 
+    def update_mn_payee(self, mn, payee):
+        self.nodes[0].protx('update_registrar', mn.protx_hash, '', '', payee)
+        self.nodes[0].generate(1)
+        self.sync_all()
+        info = self.nodes[0].protx('info', mn.protx_hash)
+        assert(info['state']['payoutAddress'] == payee)
+
     def test_protx_update_service(self, mn):
         self.nodes[0].protx('update_service', mn.protx_hash, '127.0.0.2:%d' % mn.p2p_port, mn.blsMnkey)
         self.nodes[0].generate(1)

From 3c99d9e3584de8d03c6a42cfdbe2812c70ed387a Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Thu, 15 Nov 2018 08:06:52 +0100
Subject: [PATCH 280/400] Fix test_fail_create_protx in DIP3 tests

This slipped through in a previous pull request and makes tests fail.
---
 qa/rpc-tests/dip3-deterministicmns.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/qa/rpc-tests/dip3-deterministicmns.py b/qa/rpc-tests/dip3-deterministicmns.py
index 890a4ee936a7..7818843e31fa 100755
--- a/qa/rpc-tests/dip3-deterministicmns.py
+++ b/qa/rpc-tests/dip3-deterministicmns.py
@@ -681,7 +681,7 @@ def test_fail_create_protx(self, node):
         address = node.getnewaddress()
         key = node.getnewaddress()
         blsKey = node.bls('generate')
-        assert_raises_jsonrpc(None, "bad-tx-type-dip3", node.protx, 'register_fund', address, '127.0.0.1:10000', key, blsKey['public'], key, 0, address)
+        assert_raises_jsonrpc(None, "bad-tx-type", node.protx, 'register_fund', address, '127.0.0.1:10000', key, blsKey['public'], key, 0, address)
 
     def test_success_create_protx(self, node):
         address = node.getnewaddress()

From 91af72b18fb23c78f913fc6e10e8379edbae7d01 Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Thu, 15 Nov 2018 09:44:37 +0100
Subject: [PATCH 281/400] Allow to specify how log to sleep between attempts in
 wait_until

---
 qa/rpc-tests/test_framework/mininode.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/qa/rpc-tests/test_framework/mininode.py b/qa/rpc-tests/test_framework/mininode.py
index c0b1ed7d9b67..95150865d324 100755
--- a/qa/rpc-tests/test_framework/mininode.py
+++ b/qa/rpc-tests/test_framework/mininode.py
@@ -1226,7 +1226,7 @@ def __repr__(self):
             % (self.message, self.code, self.reason, self.data)
 
 # Helper function
-def wait_until(predicate, *, attempts=float('inf'), timeout=float('inf')):
+def wait_until(predicate, *, attempts=float('inf'), timeout=float('inf'), sleep=0.05):
     attempt = 0
     elapsed = 0
 
@@ -1235,8 +1235,8 @@ def wait_until(predicate, *, attempts=float('inf'), timeout=float('inf')):
             if predicate():
                 return True
         attempt += 1
-        elapsed += 0.05
-        time.sleep(0.05)
+        elapsed += sleep
+        time.sleep(sleep)
 
     return False
 

From 6edad374577cc35789cebef56e6ae0d58f3ab0b3 Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Thu, 15 Nov 2018 10:41:14 +0100
Subject: [PATCH 282/400] Use ForEachMN and GetMN in BuildDiff instead of
 directly accessing mnMap

---
 src/evo/deterministicmns.cpp | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/evo/deterministicmns.cpp b/src/evo/deterministicmns.cpp
index 724b33cd33db..45246c285217 100644
--- a/src/evo/deterministicmns.cpp
+++ b/src/evo/deterministicmns.cpp
@@ -265,20 +265,20 @@ CDeterministicMNListDiff CDeterministicMNList::BuildDiff(const CDeterministicMNL
     diffRet.blockHash = to.blockHash;
     diffRet.nHeight = to.nHeight;
 
-    for (const auto& p : to.mnMap) {
-        const auto fromPtr = mnMap.find(p.first);
+    to.ForEachMN(false, [&](const CDeterministicMNCPtr& toPtr) {
+        auto fromPtr = GetMN(toPtr->proTxHash);
         if (fromPtr == nullptr) {
-            diffRet.addedMNs.emplace(p.first, p.second);
-        } else if (*p.second->pdmnState != *(*fromPtr)->pdmnState) {
-            diffRet.updatedMNs.emplace(p.first, p.second->pdmnState);
+            diffRet.addedMNs.emplace(toPtr->proTxHash, toPtr);
+        } else if (*toPtr->pdmnState != *fromPtr->pdmnState) {
+            diffRet.updatedMNs.emplace(toPtr->proTxHash, fromPtr->pdmnState);
         }
-    }
-    for (const auto& p : mnMap) {
-        const auto toPtr = to.mnMap.find(p.first);
+    });
+    ForEachMN(false, [&](const CDeterministicMNCPtr& fromPtr) {
+        auto toPtr = to.GetMN(fromPtr->proTxHash);
         if (toPtr == nullptr) {
-            diffRet.removedMns.insert(p.first);
+            diffRet.removedMns.insert(fromPtr->proTxHash);
         }
-    }
+    });
 
     return diffRet;
 }

From b5947f2997749500eb1d4fb766a3ca306226fbfc Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Thu, 15 Nov 2018 10:42:39 +0100
Subject: [PATCH 283/400] Implement BuildSimplifiedDiff in CDeterministicMNList

And use it instead of BuildDiff in DIP4
---
 src/evo/deterministicmns.cpp | 28 ++++++++++++++++++++++++++++
 src/evo/deterministicmns.h   |  2 ++
 src/evo/simplifiedmns.cpp    | 15 +--------------
 src/evo/simplifiedmns.h      | 15 +++++++++++++++
 4 files changed, 46 insertions(+), 14 deletions(-)

diff --git a/src/evo/deterministicmns.cpp b/src/evo/deterministicmns.cpp
index 45246c285217..fea319b0869e 100644
--- a/src/evo/deterministicmns.cpp
+++ b/src/evo/deterministicmns.cpp
@@ -283,6 +283,34 @@ CDeterministicMNListDiff CDeterministicMNList::BuildDiff(const CDeterministicMNL
     return diffRet;
 }
 
+CSimplifiedMNListDiff CDeterministicMNList::BuildSimplifiedDiff(const CDeterministicMNList& to) const
+{
+    CSimplifiedMNListDiff diffRet;
+    diffRet.baseBlockHash = blockHash;
+    diffRet.blockHash = to.blockHash;
+
+    to.ForEachMN(false, [&](const CDeterministicMNCPtr& toPtr) {
+        const auto fromPtr = mnMap.find(toPtr->proTxHash);
+        if (fromPtr == nullptr) {
+            diffRet.mnList.emplace_back(*toPtr);
+        } else {
+            CSimplifiedMNListEntry sme1(*toPtr);
+            CSimplifiedMNListEntry sme2(**fromPtr);
+            if (sme1 != sme2) {
+                diffRet.mnList.emplace_back(*toPtr);
+            }
+        }
+    });
+    ForEachMN(false, [&](const CDeterministicMNCPtr& fromPtr) {
+        const auto toPtr = to.mnMap.find(fromPtr->proTxHash);
+        if (toPtr == nullptr) {
+            diffRet.deletedMNs.emplace_back(fromPtr->proTxHash);
+        }
+    });
+
+    return diffRet;
+}
+
 CDeterministicMNList CDeterministicMNList::ApplyDiff(const CDeterministicMNListDiff& diff) const
 {
     assert(diff.prevBlockHash == blockHash && diff.nHeight == nHeight + 1);
diff --git a/src/evo/deterministicmns.h b/src/evo/deterministicmns.h
index 70f3fcc87502..bc9fadaa304e 100644
--- a/src/evo/deterministicmns.h
+++ b/src/evo/deterministicmns.h
@@ -10,6 +10,7 @@
 #include "dbwrapper.h"
 #include "evodb.h"
 #include "providertx.h"
+#include "simplifiedmns.h"
 #include "sync.h"
 
 #include "immer/map.hpp"
@@ -307,6 +308,7 @@ class CDeterministicMNList
     std::vector<std::pair<arith_uint256, CDeterministicMNCPtr>> CalculateScores(const uint256& modifier) const;
 
     CDeterministicMNListDiff BuildDiff(const CDeterministicMNList& to) const;
+    CSimplifiedMNListDiff BuildSimplifiedDiff(const CDeterministicMNList& to) const;
     CDeterministicMNList ApplyDiff(const CDeterministicMNListDiff& diff) const;
 
     void AddMN(const CDeterministicMNCPtr& dmn);
diff --git a/src/evo/simplifiedmns.cpp b/src/evo/simplifiedmns.cpp
index e71d1168bd57..26d26eb47ccd 100644
--- a/src/evo/simplifiedmns.cpp
+++ b/src/evo/simplifiedmns.cpp
@@ -144,7 +144,7 @@ bool BuildSimplifiedMNListDiff(const uint256& baseBlockHash, const uint256& bloc
 
     auto baseDmnList = deterministicMNManager->GetListForBlock(baseBlockHash);
     auto dmnList = deterministicMNManager->GetListForBlock(blockHash);
-    auto dmnDiff = baseDmnList.BuildDiff(dmnList);
+    mnListDiffRet = baseDmnList.BuildSimplifiedDiff(dmnList);
 
     // TODO store coinbase TX in CBlockIndex
     CBlock block;
@@ -153,8 +153,6 @@ bool BuildSimplifiedMNListDiff(const uint256& baseBlockHash, const uint256& bloc
         return false;
     }
 
-    mnListDiffRet.baseBlockHash = baseBlockHash;
-    mnListDiffRet.blockHash = blockHash;
     mnListDiffRet.cbTx = block.vtx[0];
 
     std::vector<uint256> vHashes;
@@ -164,17 +162,6 @@ bool BuildSimplifiedMNListDiff(const uint256& baseBlockHash, const uint256& bloc
     }
     vMatch[0] = true; // only coinbase matches
     mnListDiffRet.cbTxMerkleTree = CPartialMerkleTree(vHashes, vMatch);
-    mnListDiffRet.deletedMNs.assign(dmnDiff.removedMns.begin(), dmnDiff.removedMns.end());
-
-    for (const auto& p : dmnDiff.addedMNs) {
-        mnListDiffRet.mnList.emplace_back(*p.second);
-    }
-    for (const auto& p : dmnDiff.updatedMNs) {
-        const auto& dmn = dmnList.GetMN(p.first);
-        CDeterministicMN newDmn(*dmn);
-        newDmn.pdmnState = p.second;
-        mnListDiffRet.mnList.emplace_back(newDmn);
-    }
 
     return true;
 }
diff --git a/src/evo/simplifiedmns.h b/src/evo/simplifiedmns.h
index 1487cd64e48f..4266652197ab 100644
--- a/src/evo/simplifiedmns.h
+++ b/src/evo/simplifiedmns.h
@@ -29,6 +29,21 @@ class CSimplifiedMNListEntry
     CSimplifiedMNListEntry() {}
     CSimplifiedMNListEntry(const CDeterministicMN& dmn);
 
+    bool operator==(const CSimplifiedMNListEntry& rhs) const
+    {
+        return proRegTxHash == rhs.proRegTxHash &&
+               confirmedHash == rhs.confirmedHash &&
+               service == rhs.service &&
+               pubKeyOperator == rhs.pubKeyOperator &&
+               keyIDVoting == rhs.keyIDVoting &&
+               isValid == rhs.isValid;
+    }
+
+    bool operator!=(const CSimplifiedMNListEntry& rhs) const
+    {
+        return !(rhs == *this);
+    }
+
 public:
     ADD_SERIALIZE_METHODS;
 

From 83aac461bc48d8199ef8ebdf87e891412a558c40 Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Thu, 15 Nov 2018 13:24:46 +0100
Subject: [PATCH 284/400] Allow P2SH/multisig addresses for operator rewards

There is no reason left to stick with the P2PKH limitation
---
 src/evo/providertx.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/evo/providertx.cpp b/src/evo/providertx.cpp
index 36e6b9a5bb52..8da9b6bd6296 100644
--- a/src/evo/providertx.cpp
+++ b/src/evo/providertx.cpp
@@ -239,8 +239,7 @@ bool CheckProUpServTx(const CTransaction& tx, const CBlockIndex* pindexPrev, CVa
                 // don't allow to set operator reward payee in case no operatorReward was set
                 return state.DoS(10, false, REJECT_INVALID, "bad-protx-operator-payee");
             }
-            // we may support P2SH later, but restrict it for now (while in transitioning phase from old MN list to deterministic list)
-            if (!ptx.scriptOperatorPayout.IsPayToPublicKeyHash()) {
+            if (!ptx.scriptOperatorPayout.IsPayToPublicKeyHash() && !ptx.scriptOperatorPayout.IsPayToScriptHash()) {
                 return state.DoS(10, false, REJECT_INVALID, "bad-protx-operator-payee");
             }
         }

From 88498ba139b44ab0f4e3a76f2b190dfc98f6e926 Mon Sep 17 00:00:00 2001
From: UdjinM6 <UdjinM6@users.noreply.github.com>
Date: Thu, 15 Nov 2018 15:24:24 +0100
Subject: [PATCH 285/400] Apply suggestions from code review

Co-Authored-By: codablock <ablock84@gmail.com>
---
 src/evo/deterministicmns.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/evo/deterministicmns.cpp b/src/evo/deterministicmns.cpp
index fea319b0869e..9808f649444d 100644
--- a/src/evo/deterministicmns.cpp
+++ b/src/evo/deterministicmns.cpp
@@ -270,7 +270,7 @@ CDeterministicMNListDiff CDeterministicMNList::BuildDiff(const CDeterministicMNL
         if (fromPtr == nullptr) {
             diffRet.addedMNs.emplace(toPtr->proTxHash, toPtr);
         } else if (*toPtr->pdmnState != *fromPtr->pdmnState) {
-            diffRet.updatedMNs.emplace(toPtr->proTxHash, fromPtr->pdmnState);
+            diffRet.updatedMNs.emplace(toPtr->proTxHash, toPtr->pdmnState);
         }
     });
     ForEachMN(false, [&](const CDeterministicMNCPtr& fromPtr) {
@@ -290,19 +290,19 @@ CSimplifiedMNListDiff CDeterministicMNList::BuildSimplifiedDiff(const CDetermini
     diffRet.blockHash = to.blockHash;
 
     to.ForEachMN(false, [&](const CDeterministicMNCPtr& toPtr) {
-        const auto fromPtr = mnMap.find(toPtr->proTxHash);
+        auto fromPtr = GetMN(toPtr->proTxHash);
         if (fromPtr == nullptr) {
             diffRet.mnList.emplace_back(*toPtr);
         } else {
             CSimplifiedMNListEntry sme1(*toPtr);
-            CSimplifiedMNListEntry sme2(**fromPtr);
+            CSimplifiedMNListEntry sme2(*fromPtr);
             if (sme1 != sme2) {
                 diffRet.mnList.emplace_back(*toPtr);
             }
         }
     });
     ForEachMN(false, [&](const CDeterministicMNCPtr& fromPtr) {
-        const auto toPtr = to.mnMap.find(fromPtr->proTxHash);
+        auto toPtr = to.GetMN(fromPtr->proTxHash);
         if (toPtr == nullptr) {
             diffRet.deletedMNs.emplace_back(fromPtr->proTxHash);
         }

From c60687fe617cd69f54aa52e88bb58e4f2de092a3 Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Thu, 15 Nov 2018 15:25:04 +0100
Subject: [PATCH 286/400] Sleep longer between attempts in sync_blocks

---
 qa/rpc-tests/test_framework/comptool.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/qa/rpc-tests/test_framework/comptool.py b/qa/rpc-tests/test_framework/comptool.py
index dfa231a6568e..d1a141a6fa65 100755
--- a/qa/rpc-tests/test_framework/comptool.py
+++ b/qa/rpc-tests/test_framework/comptool.py
@@ -213,7 +213,7 @@ def blocks_requested():
             )
 
         # --> error if not requested
-        if not wait_until(blocks_requested, attempts=20*num_blocks):
+        if not wait_until(blocks_requested, attempts=20*num_blocks, sleep=0.1):
             # print [ c.cb.block_request_map for c in self.connections ]
             raise AssertionError("Not all nodes requested block")
 

From 624e50949e46935cd069237a4cdf9a50e8154c88 Mon Sep 17 00:00:00 2001
From: UdjinM6 <UdjinM6@users.noreply.github.com>
Date: Thu, 15 Nov 2018 21:56:13 +0300
Subject: [PATCH 287/400] Remove few leftovers of `-instantsenddepth`

---
 doc/man/dash-qt.1 | 5 -----
 doc/man/dashd.1   | 5 -----
 src/init.cpp      | 5 -----
 3 files changed, 15 deletions(-)

diff --git a/doc/man/dash-qt.1 b/doc/man/dash-qt.1
index 2ad3d1c67548..548c9b4c09d3 100644
--- a/doc/man/dash-qt.1
+++ b/doc/man/dash-qt.1
@@ -555,11 +555,6 @@ InstantSend options:
 Enable InstantSend, show confirmations for locked transactions (0\-1,
 default: 1)
 .HP
-\fB\-instantsenddepth=\fR<n>
-.IP
-Show N confirmations for a successfully locked transaction (0\-60,
-default: 5)
-.HP
 \fB\-instantsendnotify=\fR<cmd>
 .IP
 Execute command when a wallet InstantSend transaction is successfully
diff --git a/doc/man/dashd.1 b/doc/man/dashd.1
index 430f4803a91f..5bd2f92015c1 100644
--- a/doc/man/dashd.1
+++ b/doc/man/dashd.1
@@ -556,11 +556,6 @@ InstantSend options:
 Enable InstantSend, show confirmations for locked transactions (0\-1,
 default: 1)
 .HP
-\fB\-instantsenddepth=\fR<n>
-.IP
-Show N confirmations for a successfully locked transaction (0\-60,
-default: 5)
-.HP
 \fB\-instantsendnotify=\fR<cmd>
 .IP
 Execute command when a wallet InstantSend transaction is successfully
diff --git a/src/init.cpp b/src/init.cpp
index 9c789b2a70c8..854e371dd661 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -947,11 +947,6 @@ void InitParameterInteraction()
             LogPrintf("%s: parameter interaction: -whitelistforcerelay=1 -> setting -whitelistrelay=1\n", __func__);
     }
 
-    if(!GetBoolArg("-enableinstantsend", fEnableInstantSend)){
-        if (SoftSetArg("-instantsenddepth", "0"))
-            LogPrintf("%s: parameter interaction: -enableinstantsend=false -> setting -nInstantSendDepth=0\n", __func__);
-    }
-
 #ifdef ENABLE_WALLET
     int nLiqProvTmp = GetArg("-liquidityprovider", DEFAULT_PRIVATESEND_LIQUIDITY);
     if (nLiqProvTmp > 0) {

From fefe34250f433bae094ea61506d96649f5f29e03 Mon Sep 17 00:00:00 2001
From: UdjinM6 <UdjinM6@users.noreply.github.com>
Date: Thu, 15 Nov 2018 23:22:27 +0300
Subject: [PATCH 288/400] Update manpages

---
 doc/man/dash-cli.1 | 12 +++++------
 doc/man/dash-qt.1  | 54 +++++++++++++++++++++++++++++++++-------------
 doc/man/dash-tx.1  | 12 +++++------
 doc/man/dashd.1    | 54 +++++++++++++++++++++++++++++++++-------------
 4 files changed, 90 insertions(+), 42 deletions(-)

diff --git a/doc/man/dash-cli.1 b/doc/man/dash-cli.1
index 88fe0b0d1dff..54708eb09ac0 100644
--- a/doc/man/dash-cli.1
+++ b/doc/man/dash-cli.1
@@ -1,9 +1,9 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.4.
-.TH DASH-CLI "1" "May 2018" "dash-cli v0.12.3.0" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.8.
+.TH DASH-CLI "1" "November 2018" "dash-cli v0.13.0.0" "User Commands"
 .SH NAME
-dash-cli \- manual page for dash-cli v0.12.3.0
+dash-cli \- manual page for dash-cli v0.13.0.0
 .SH DESCRIPTION
-Dash Core RPC client version v0.12.3.0
+Dash Core RPC client version v0.13.0.0
 .SS "Usage:"
 .TP
 dash\-cli [options] <command> [params]
@@ -75,8 +75,8 @@ Timeout during HTTP requests (default: 900)
 Read extra arguments from standard input, one per line until EOF/Ctrl\-D
 (recommended for sensitive information such as passphrases)
 .SH COPYRIGHT
-Copyright (C) 2014-2017 The Dash Core developers
-Copyright (C) 2009-2017 The Bitcoin Core developers
+Copyright (C) 2014-2018 The Dash Core developers
+Copyright (C) 2009-2018 The Bitcoin Core developers
 
 Please contribute if you find Dash Core useful. Visit <https://dash.org> for
 further information about the software.
diff --git a/doc/man/dash-qt.1 b/doc/man/dash-qt.1
index 2ad3d1c67548..80d1891a5bed 100644
--- a/doc/man/dash-qt.1
+++ b/doc/man/dash-qt.1
@@ -1,9 +1,9 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.4.
-.TH DASH-QT "1" "May 2018" "dash-qt v0.12.3.0" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.8.
+.TH DASH-QT "1" "November 2018" "dash-qt v0.13.0.0" "User Commands"
 .SH NAME
-dash-qt \- manual page for dash-qt v0.12.3.0
+dash-qt \- manual page for dash-qt v0.13.0.0
 .SH DESCRIPTION
-Dash Core version v0.12.3.0 (64\-bit)
+Dash Core version v0.13.0.0 (64\-bit)
 Usage:
 .IP
 dash\-qt [command\-line options]
@@ -36,9 +36,9 @@ block hash)
 If this block is in the chain assume that it and its ancestors are valid
 and potentially skip their script verification (0 to verify all,
 default:
-0000000000000044d888c60cf2a3646f511a66fc35f4abc5f20377a7d658263b,
+0000000000000024e26c7df7e46d673724d223cf4ca2b2adc21297cc095600f4,
 testnet:
-0000000003aa53e24b6e60ef97642e4193611f2bcb75ea1fa8105f0b5ffd5242)
+000000000118fa2f031efedf874adbe7fe6b023cdf9478e8e2400c2d505df30d)
 .HP
 \fB\-conf=\fR<file>
 .IP
@@ -76,7 +76,7 @@ Extra transactions to keep in memory for compact block reconstructions
 .HP
 \fB\-par=\fR<n>
 .IP
-Set the number of script verification threads (\fB\-4\fR to 16, 0 = auto, <0 =
+Set the number of script verification threads (\fB\-2\fR to 16, 0 = auto, <0 =
 leave that many cores free, default: 0)
 .HP
 \fB\-pid=\fR<file>
@@ -419,6 +419,19 @@ Enable publish hash transaction in <address>
 .IP
 Enable publish hash transaction (locked via InstantSend) in <address>
 .HP
+\fB\-zmqpubhashgovernancevote=\fR<address>
+.IP
+Enable publish hash of governance votes in <address>
+.HP
+\fB\-zmqpubhashgovernanceobject=\fR<address>
+.IP
+Enable publish hash of governance objects (like proposals) in <address>
+.HP
+\fB\-zmqpubhashinstantsenddoublespend=\fR<address>
+.IP
+Enable publish transaction hashes of attempted InstantSend double spend
+in <address>
+.HP
 \fB\-zmqpubrawblock=\fR<address>
 .IP
 Enable publish raw block in <address>
@@ -430,6 +443,11 @@ Enable publish raw transaction in <address>
 \fB\-zmqpubrawtxlock=\fR<address>
 .IP
 Enable publish raw transaction (locked via InstantSend) in <address>
+.HP
+\fB\-zmqpubrawinstantsenddoublespend=\fR<address>
+.IP
+Enable publish raw transactions of attempted InstantSend double spend in
+<address>
 .PP
 Debugging/Testing options:
 .HP
@@ -469,7 +487,7 @@ relaying, mining and transaction creation (default: 0.00001)
 .IP
 Maximum total fees (in DASH) to use in a single wallet transaction or
 raw transaction; setting this too low may abort large
-transactions (default: 0.20)
+transactions (default: 0.10)
 .HP
 \fB\-printtoconsole\fR
 .IP
@@ -502,6 +520,12 @@ InstantSend, Governance) (0\-1, default: 0)
 .IP
 Override spork address. Only useful for regtest and devnet. Using this
 on mainnet or testnet will ban you.
+.HP
+\fB\-minsporkkeys=\fR<n>
+.IP
+Overrides minimum spork signers to change spork value. Only useful for
+regtest and devnet. Using this on mainnet or testnet will ban
+you.
 .PP
 Masternode options:
 .HP
@@ -533,10 +557,14 @@ Enable use of automated PrivateSend for funds stored in this wallet
 Enable multiple PrivateSend mixing sessions per block, experimental
 (0\-1, default: 0)
 .HP
+\fB\-privatesendsessions=\fR<n>
+.IP
+Use N separate masternodes in parallel to mix funds (1\-10, default: 4)
+.HP
 \fB\-privatesendrounds=\fR<n>
 .IP
 Use N separate masternodes for each denominated input to mix funds
-(2\-16, default: 2)
+(2\-16, default: 4)
 .HP
 \fB\-privatesendamount=\fR<n>
 .IP
@@ -579,10 +607,6 @@ Relay and mine data carrier transactions (default: 1)
 .IP
 Maximum size of data in data carrier transactions we relay and mine
 (default: 83)
-.HP
-\fB\-mempoolreplacement\fR
-.IP
-Enable transaction replacement in the memory pool (default: 0)
 .PP
 Block creation options:
 .HP
@@ -679,8 +703,8 @@ Show splash screen on startup (default: 1)
 .IP
 Reset all settings changed in the GUI
 .SH COPYRIGHT
-Copyright (C) 2014-2017 The Dash Core developers
-Copyright (C) 2009-2017 The Bitcoin Core developers
+Copyright (C) 2014-2018 The Dash Core developers
+Copyright (C) 2009-2018 The Bitcoin Core developers
 
 Please contribute if you find Dash Core useful. Visit <https://dash.org> for
 further information about the software.
diff --git a/doc/man/dash-tx.1 b/doc/man/dash-tx.1
index 2ad58f5b94ea..cedce40a0455 100644
--- a/doc/man/dash-tx.1
+++ b/doc/man/dash-tx.1
@@ -1,9 +1,9 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.4.
-.TH DASH-TX "1" "May 2018" "dash-tx v0.12.3.0" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.8.
+.TH DASH-TX "1" "November 2018" "dash-tx v0.13.0.0" "User Commands"
 .SH NAME
-dash-tx \- manual page for dash-tx v0.12.3.0
+dash-tx \- manual page for dash-tx v0.13.0.0
 .SH DESCRIPTION
-Dash Core dash\-tx utility version v0.12.3.0
+Dash Core dash\-tx utility version v0.13.0.0
 .SS "Usage:"
 .TP
 dash\-tx [options] <hex\-tx> [commands]
@@ -108,8 +108,8 @@ set=NAME:JSON\-STRING
 .IP
 Set register NAME to given JSON\-STRING
 .SH COPYRIGHT
-Copyright (C) 2014-2017 The Dash Core developers
-Copyright (C) 2009-2017 The Bitcoin Core developers
+Copyright (C) 2014-2018 The Dash Core developers
+Copyright (C) 2009-2018 The Bitcoin Core developers
 
 Please contribute if you find Dash Core useful. Visit <https://dash.org> for
 further information about the software.
diff --git a/doc/man/dashd.1 b/doc/man/dashd.1
index 430f4803a91f..c58b2c889c0e 100644
--- a/doc/man/dashd.1
+++ b/doc/man/dashd.1
@@ -1,9 +1,9 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.4.
-.TH DASHD "1" "May 2018" "dashd v0.12.3.0" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.8.
+.TH DASHD "1" "November 2018" "dashd v0.13.0.0" "User Commands"
 .SH NAME
-dashd \- manual page for dashd v0.12.3.0
+dashd \- manual page for dashd v0.13.0.0
 .SH DESCRIPTION
-Dash Core Daemon version v0.12.3.0
+Dash Core Daemon version v0.13.0.0
 .SS "Usage:"
 .TP
 dashd [options]
@@ -37,9 +37,9 @@ block hash)
 If this block is in the chain assume that it and its ancestors are valid
 and potentially skip their script verification (0 to verify all,
 default:
-0000000000000044d888c60cf2a3646f511a66fc35f4abc5f20377a7d658263b,
+0000000000000024e26c7df7e46d673724d223cf4ca2b2adc21297cc095600f4,
 testnet:
-0000000003aa53e24b6e60ef97642e4193611f2bcb75ea1fa8105f0b5ffd5242)
+000000000118fa2f031efedf874adbe7fe6b023cdf9478e8e2400c2d505df30d)
 .HP
 \fB\-conf=\fR<file>
 .IP
@@ -81,7 +81,7 @@ Extra transactions to keep in memory for compact block reconstructions
 .HP
 \fB\-par=\fR<n>
 .IP
-Set the number of script verification threads (\fB\-4\fR to 16, 0 = auto, <0 =
+Set the number of script verification threads (\fB\-2\fR to 16, 0 = auto, <0 =
 leave that many cores free, default: 0)
 .HP
 \fB\-pid=\fR<file>
@@ -420,6 +420,19 @@ Enable publish hash transaction in <address>
 .IP
 Enable publish hash transaction (locked via InstantSend) in <address>
 .HP
+\fB\-zmqpubhashgovernancevote=\fR<address>
+.IP
+Enable publish hash of governance votes in <address>
+.HP
+\fB\-zmqpubhashgovernanceobject=\fR<address>
+.IP
+Enable publish hash of governance objects (like proposals) in <address>
+.HP
+\fB\-zmqpubhashinstantsenddoublespend=\fR<address>
+.IP
+Enable publish transaction hashes of attempted InstantSend double spend
+in <address>
+.HP
 \fB\-zmqpubrawblock=\fR<address>
 .IP
 Enable publish raw block in <address>
@@ -431,6 +444,11 @@ Enable publish raw transaction in <address>
 \fB\-zmqpubrawtxlock=\fR<address>
 .IP
 Enable publish raw transaction (locked via InstantSend) in <address>
+.HP
+\fB\-zmqpubrawinstantsenddoublespend=\fR<address>
+.IP
+Enable publish raw transactions of attempted InstantSend double spend in
+<address>
 .PP
 Debugging/Testing options:
 .HP
@@ -470,7 +488,7 @@ relaying, mining and transaction creation (default: 0.00001)
 .IP
 Maximum total fees (in DASH) to use in a single wallet transaction or
 raw transaction; setting this too low may abort large
-transactions (default: 0.20)
+transactions (default: 0.10)
 .HP
 \fB\-printtoconsole\fR
 .IP
@@ -503,6 +521,12 @@ InstantSend, Governance) (0\-1, default: 0)
 .IP
 Override spork address. Only useful for regtest and devnet. Using this
 on mainnet or testnet will ban you.
+.HP
+\fB\-minsporkkeys=\fR<n>
+.IP
+Overrides minimum spork signers to change spork value. Only useful for
+regtest and devnet. Using this on mainnet or testnet will ban
+you.
 .PP
 Masternode options:
 .HP
@@ -534,10 +558,14 @@ Enable use of automated PrivateSend for funds stored in this wallet
 Enable multiple PrivateSend mixing sessions per block, experimental
 (0\-1, default: 0)
 .HP
+\fB\-privatesendsessions=\fR<n>
+.IP
+Use N separate masternodes in parallel to mix funds (1\-10, default: 4)
+.HP
 \fB\-privatesendrounds=\fR<n>
 .IP
 Use N separate masternodes for each denominated input to mix funds
-(2\-16, default: 2)
+(2\-16, default: 4)
 .HP
 \fB\-privatesendamount=\fR<n>
 .IP
@@ -580,10 +608,6 @@ Relay and mine data carrier transactions (default: 1)
 .IP
 Maximum size of data in data carrier transactions we relay and mine
 (default: 83)
-.HP
-\fB\-mempoolreplacement\fR
-.IP
-Enable transaction replacement in the memory pool (default: 0)
 .PP
 Block creation options:
 .HP
@@ -654,8 +678,8 @@ option can be specified multiple times
 .IP
 Set the number of threads to service RPC calls (default: 4)
 .SH COPYRIGHT
-Copyright (C) 2014-2017 The Dash Core developers
-Copyright (C) 2009-2017 The Bitcoin Core developers
+Copyright (C) 2014-2018 The Dash Core developers
+Copyright (C) 2009-2018 The Bitcoin Core developers
 
 Please contribute if you find Dash Core useful. Visit <https://dash.org> for
 further information about the software.

From 52bf5a6b0f96f0dd23c69cdd1da996a371109741 Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Fri, 16 Nov 2018 13:11:23 +0100
Subject: [PATCH 289/400] Install libxkbcommon0 in gitian-linux.yml

This fixes an issue reported by users on Ubuntu 18.04 LTS. They got the
following error message when starting dash-qt:

xkbcommon: ERROR: failed to add default include path auto
Qt: Failed to create XKB context!
Use QT_XKB_CONFIG_ROOT environmental variable to provide an additional search path, add ':' as separator to provide several search paths and/or make sure that XKB configuration data directory contains recent enough contents, to update please see http://cgit.freedesktop.org/xkeyboard-config/ .

Dash-qt starts then, but does not accept any input from the keyboard.
The reason is that qt tries to find the xkb config root in the configure
phase, but fails to find it. To make this detection work, libxkbcommon
has to be installed on the host system, even though it is then never used.
---
 contrib/gitian-descriptors/gitian-linux.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/contrib/gitian-descriptors/gitian-linux.yml b/contrib/gitian-descriptors/gitian-linux.yml
index ab3323166b00..6fcda5646561 100755
--- a/contrib/gitian-descriptors/gitian-linux.yml
+++ b/contrib/gitian-descriptors/gitian-linux.yml
@@ -29,6 +29,7 @@ packages:
 - "ca-certificates"
 - "python"
 - "python3"
+- "libxkbcommon0"
 remotes:
 - "url": "https://github.com/dashpay/dash.git"
   "dir": "dash"

From cf2b547b7c98b5653b15343ba176bcd0878c4c37 Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Fri, 16 Nov 2018 18:19:49 +0100
Subject: [PATCH 290/400] Implement tab for DIP3 MN list (#2454)

* Implement tab for DIP3 MN list

* Update src/qt/masternodelist.cpp

Co-Authored-By: codablock <ablock84@gmail.com>

* Change "x.xx% to UNSPECIFIED" to "x.xx% but not claimed" for opeartor reward
---
 src/qt/forms/masternodelist.ui | 157 +++++++++++++++++++++++++++++++--
 src/qt/masternodelist.cpp      | 141 ++++++++++++++++++++++++++++-
 src/qt/masternodelist.h        |   8 ++
 3 files changed, 298 insertions(+), 8 deletions(-)

diff --git a/src/qt/forms/masternodelist.ui b/src/qt/forms/masternodelist.ui
index 992d6c72d5af..a206094f2f11 100644
--- a/src/qt/forms/masternodelist.ui
+++ b/src/qt/forms/masternodelist.ui
@@ -217,7 +217,55 @@
          <string>All Masternodes</string>
         </attribute>
         <layout class="QGridLayout" name="gridLayout">
-         <item row="1" column="0">
+         <item row="1" column="0" rowspan="2" colspan="2">
+          <layout class="QHBoxLayout" name="horizontalLayout_3">
+           <property name="bottomMargin">
+            <number>0</number>
+           </property>
+           <item>
+            <widget class="QLabel" name="label_filter">
+             <property name="text">
+              <string>Filter List:</string>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <widget class="QLineEdit" name="filterLineEdit">
+             <property name="toolTip">
+              <string>Filter masternode list</string>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <spacer name="horizontalSpacer_3">
+             <property name="orientation">
+              <enum>Qt::Horizontal</enum>
+             </property>
+             <property name="sizeHint" stdset="0">
+              <size>
+               <width>10</width>
+               <height>20</height>
+              </size>
+             </property>
+            </spacer>
+           </item>
+           <item>
+            <widget class="QLabel" name="label_count">
+             <property name="text">
+              <string>Node Count:</string>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <widget class="QLabel" name="countLabel">
+             <property name="text">
+              <string>0</string>
+             </property>
+            </widget>
+           </item>
+          </layout>
+         </item>
+         <item row="3" column="0">
           <widget class="QTableWidget" name="tableWidgetMasternodes">
            <property name="editTriggers">
             <set>QAbstractItemView::NoEditTriggers</set>
@@ -270,26 +318,46 @@
           </widget>
          </item>
          <item row="0" column="0">
-          <layout class="QHBoxLayout" name="horizontalLayout_3">
+          <widget class="QLabel" name="legacyListNote">
+           <property name="text">
+            <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Note: This list represents the legacy and non-deterministic masternode list. It is only active as long as DIP3 has not been fully activated. After SPORK15 activation, this list will be empty.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+           </property>
+           <property name="textFormat">
+            <enum>Qt::AutoText</enum>
+           </property>
+           <property name="wordWrap">
+            <bool>true</bool>
+           </property>
+          </widget>
+         </item>
+        </layout>
+       </widget>
+       <widget class="QWidget" name="tabDIP3Masternodes">
+        <attribute name="title">
+         <string>DIP3 Masternodes</string>
+        </attribute>
+        <layout class="QGridLayout" name="gridLayout_3">
+         <item row="1" column="0">
+          <layout class="QHBoxLayout" name="horizontalLayout_4">
            <property name="bottomMargin">
             <number>0</number>
            </property>
            <item>
-            <widget class="QLabel" name="label_filter">
+            <widget class="QLabel" name="label_filter_2">
              <property name="text">
               <string>Filter List:</string>
              </property>
             </widget>
            </item>
            <item>
-            <widget class="QLineEdit" name="filterLineEdit">
+            <widget class="QLineEdit" name="filterLineEditDIP3">
              <property name="toolTip">
               <string>Filter masternode list</string>
              </property>
             </widget>
            </item>
            <item>
-            <spacer name="horizontalSpacer_3">
+            <spacer name="horizontalSpacer_4">
              <property name="orientation">
               <enum>Qt::Horizontal</enum>
              </property>
@@ -302,14 +370,14 @@
             </spacer>
            </item>
            <item>
-            <widget class="QLabel" name="label_count">
+            <widget class="QLabel" name="label_count_2">
              <property name="text">
               <string>Node Count:</string>
              </property>
             </widget>
            </item>
            <item>
-            <widget class="QLabel" name="countLabel">
+            <widget class="QLabel" name="countLabelDIP3">
              <property name="text">
               <string>0</string>
              </property>
@@ -317,6 +385,81 @@
            </item>
           </layout>
          </item>
+         <item row="2" column="0">
+          <widget class="QTableWidget" name="tableWidgetMasternodesDIP3">
+           <property name="editTriggers">
+            <set>QAbstractItemView::NoEditTriggers</set>
+           </property>
+           <property name="alternatingRowColors">
+            <bool>true</bool>
+           </property>
+           <property name="selectionMode">
+            <enum>QAbstractItemView::NoSelection</enum>
+           </property>
+           <property name="selectionBehavior">
+            <enum>QAbstractItemView::SelectRows</enum>
+           </property>
+           <property name="sortingEnabled">
+            <bool>true</bool>
+           </property>
+           <attribute name="horizontalHeaderStretchLastSection">
+            <bool>true</bool>
+           </attribute>
+           <column>
+            <property name="text">
+             <string>Address</string>
+            </property>
+           </column>
+           <column>
+            <property name="text">
+             <string>Status</string>
+            </property>
+           </column>
+           <column>
+            <property name="text">
+             <string>PoSe Score</string>
+            </property>
+           </column>
+           <column>
+            <property name="text">
+             <string>Registered</string>
+            </property>
+           </column>
+           <column>
+            <property name="text">
+             <string>Last Paid</string>
+            </property>
+           </column>
+           <column>
+            <property name="text">
+             <string>Next Payment</string>
+            </property>
+           </column>
+           <column>
+            <property name="text">
+             <string>Payee</string>
+            </property>
+           </column>
+           <column>
+            <property name="text">
+             <string>Operator Reward</string>
+            </property>
+           </column>
+          </widget>
+         </item>
+         <item row="0" column="0">
+          <widget class="QLabel" name="dip3NoteLabel">
+           <property name="text">
+            <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Note: This list is not active yet and only for informational purposes. The network is still running in compatibility mode, which means that the non-deterministic masternode list is still active. Only after SPORK15 activation, this list will become the active one. Also, the values in the payment related fields are not used at the moment, but still updated for every block. Please ignore this until SPORK15 activation.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+           </property>
+           <property name="textFormat">
+            <enum>Qt::AutoText</enum>
+           </property>
+           <property name="wordWrap">
+            <bool>true</bool>
+           </property>
+          </widget>
+         </item>
         </layout>
        </widget>
       </widget>
diff --git a/src/qt/masternodelist.cpp b/src/qt/masternodelist.cpp
index 2e9cd8a972ad..f3cf5ae7d8df 100644
--- a/src/qt/masternodelist.cpp
+++ b/src/qt/masternodelist.cpp
@@ -45,6 +45,13 @@ MasternodeList::MasternodeList(const PlatformStyle* platformStyle, QWidget* pare
     int columnActiveWidth = 130;
     int columnLastSeenWidth = 130;
 
+    int columnPoSeScoreWidth = 80;
+    int columnRegisteredWidth = 80;
+    int columnLastPaidWidth = 80;
+    int columnNextPaymentWidth = 100;
+    int columnPayeeWidth = 130;
+    int columnOperatorRewardWidth = 130;
+
     ui->tableWidgetMyMasternodes->setColumnWidth(0, columnAliasWidth);
     ui->tableWidgetMyMasternodes->setColumnWidth(1, columnAddressWidth);
     ui->tableWidgetMyMasternodes->setColumnWidth(2, columnProtocolWidth);
@@ -58,6 +65,15 @@ MasternodeList::MasternodeList(const PlatformStyle* platformStyle, QWidget* pare
     ui->tableWidgetMasternodes->setColumnWidth(3, columnActiveWidth);
     ui->tableWidgetMasternodes->setColumnWidth(4, columnLastSeenWidth);
 
+    ui->tableWidgetMasternodesDIP3->setColumnWidth(0, columnAddressWidth);
+    ui->tableWidgetMasternodesDIP3->setColumnWidth(1, columnStatusWidth);
+    ui->tableWidgetMasternodesDIP3->setColumnWidth(2, columnPoSeScoreWidth);
+    ui->tableWidgetMasternodesDIP3->setColumnWidth(3, columnRegisteredWidth);
+    ui->tableWidgetMasternodesDIP3->setColumnWidth(4, columnLastPaidWidth);
+    ui->tableWidgetMasternodesDIP3->setColumnWidth(5, columnNextPaymentWidth);
+    ui->tableWidgetMasternodesDIP3->setColumnWidth(6, columnPayeeWidth);
+    ui->tableWidgetMasternodesDIP3->setColumnWidth(7, columnOperatorRewardWidth);
+
     ui->tableWidgetMyMasternodes->setContextMenuPolicy(Qt::CustomContextMenu);
 
     QAction* startAliasAction = new QAction(tr("Start alias"), this);
@@ -70,11 +86,15 @@ MasternodeList::MasternodeList(const PlatformStyle* platformStyle, QWidget* pare
     timer = new QTimer(this);
     connect(timer, SIGNAL(timeout()), this, SLOT(updateNodeList()));
     connect(timer, SIGNAL(timeout()), this, SLOT(updateMyNodeList()));
+    connect(timer, SIGNAL(timeout()), this, SLOT(updateDIP3List()));
     timer->start(1000);
 
     fFilterUpdated = false;
+    fFilterUpdatedDIP3 = false;
     nTimeFilterUpdated = GetTime();
+    nTimeFilterUpdatedDIP3 = GetTime();
     updateNodeList();
+    updateDIP3List();
 }
 
 MasternodeList::~MasternodeList()
@@ -288,9 +308,16 @@ void MasternodeList::updateNodeList()
     ui->tableWidgetMasternodes->setSortingEnabled(false);
     ui->tableWidgetMasternodes->clearContents();
     ui->tableWidgetMasternodes->setRowCount(0);
-    std::map<COutPoint, CMasternode> mapMasternodes = mnodeman.GetFullMasternodeMap();
+
+    if (deterministicMNManager->IsDeterministicMNsSporkActive()) {
+        ui->countLabel->setText(QString::number(0));
+        return;
+    }
+
     int offsetFromUtc = GetOffsetFromUtc();
 
+    std::map<COutPoint, CMasternode> mapMasternodes = mnodeman.GetFullMasternodeMap();
+
     for (const auto& mnpair : mapMasternodes) {
         CMasternode mn = mnpair.second;
         // populate list
@@ -325,6 +352,110 @@ void MasternodeList::updateNodeList()
     ui->tableWidgetMasternodes->setSortingEnabled(true);
 }
 
+void MasternodeList::updateDIP3List()
+{
+    TRY_LOCK(cs_dip3list, fLockAcquired);
+    if (!fLockAcquired) return;
+
+    static int64_t nTimeListUpdated = GetTime();
+
+    // to prevent high cpu usage update only once in MASTERNODELIST_UPDATE_SECONDS seconds
+    // or MASTERNODELIST_FILTER_COOLDOWN_SECONDS seconds after filter was last changed
+    int64_t nSecondsToWait = fFilterUpdatedDIP3
+                             ? nTimeFilterUpdatedDIP3 - GetTime() + MASTERNODELIST_FILTER_COOLDOWN_SECONDS
+                             : nTimeListUpdated - GetTime() + MASTERNODELIST_UPDATE_SECONDS;
+
+    if (fFilterUpdatedDIP3) {
+        ui->countLabel->setText(QString::fromStdString(strprintf("Please wait... %d", nSecondsToWait)));
+    }
+    if (nSecondsToWait > 0) return;
+
+    nTimeListUpdated = GetTime();
+    fFilterUpdatedDIP3 = false;
+
+    QString strToFilter;
+    ui->countLabelDIP3->setText("Updating...");
+    ui->tableWidgetMasternodesDIP3->setSortingEnabled(false);
+    ui->tableWidgetMasternodesDIP3->clearContents();
+    ui->tableWidgetMasternodesDIP3->setRowCount(0);
+
+    if (deterministicMNManager->IsDeterministicMNsSporkActive()) {
+        ui->dip3NoteLabel->setVisible(false);
+    }
+
+    auto mnList = deterministicMNManager->GetListAtChainTip();
+    auto projectedPayees = mnList.GetProjectedMNPayees(mnList.GetValidMNsCount());
+    std::map<uint256, int> nextPayments;
+    for (size_t i = 0; i < projectedPayees.size(); i++) {
+        const auto& dmn = projectedPayees[i];
+        nextPayments.emplace(dmn->proTxHash, mnList.GetHeight() + (int)i + 1);
+    }
+
+    mnList.ForEachMN(false, [&](const CDeterministicMNCPtr& dmn) {
+        // populate list
+        // Address, Protocol, Status, Active Seconds, Last Seen, Pub Key
+        QTableWidgetItem* addressItem = new QTableWidgetItem(QString::fromStdString(dmn->pdmnState->addr.ToString()));
+        QTableWidgetItem* statusItem = new QTableWidgetItem(mnList.IsMNValid(dmn) ? tr("ENABLED") : (mnList.IsMNPoSeBanned(dmn) ? tr("POSE_BANNED") : tr("UNKNOWN")));
+        QTableWidgetItem* PoSeScoreItem = new QTableWidgetItem(QString::number(dmn->pdmnState->nPoSePenalty));
+        QTableWidgetItem* registeredItem = new QTableWidgetItem(QString::number(dmn->pdmnState->nRegisteredHeight));
+        QTableWidgetItem* lastPaidItem = new QTableWidgetItem(QString::number(dmn->pdmnState->nLastPaidHeight));
+        QTableWidgetItem* nextPaymentItem = new QTableWidgetItem(nextPayments.count(dmn->proTxHash) ? QString::number(nextPayments[dmn->proTxHash]) : tr("UNKNOWN"));
+
+        CTxDestination payeeDest;
+        QString payeeStr;
+        if (ExtractDestination(dmn->pdmnState->scriptPayout, payeeDest)) {
+            payeeStr = QString::fromStdString(CBitcoinAddress(payeeDest).ToString());
+        } else {
+            payeeStr = tr("UNKNOWN");
+        }
+        QTableWidgetItem* payeeItem = new QTableWidgetItem(payeeStr);
+
+        QString operatorRewardStr;
+        if (dmn->nOperatorReward) {
+            operatorRewardStr += QString::number(dmn->nOperatorReward / 100.0, 'f', 2) + "%";
+
+            if (dmn->pdmnState->scriptOperatorPayout != CScript()) {
+                CTxDestination dest;
+                if (ExtractDestination(dmn->pdmnState->scriptOperatorPayout, dest)) {
+                    operatorRewardStr += tr(" to %1").arg(QString::fromStdString(CBitcoinAddress(payeeDest).ToString()));
+                } else {
+                    operatorRewardStr += tr(" to UNKNOWN");
+                }
+            } else {
+                operatorRewardStr += tr(" but not claimed");
+            }
+        } else {
+            operatorRewardStr = tr("NONE");
+        }
+        QTableWidgetItem* operatorRewardItem = new QTableWidgetItem(operatorRewardStr);
+
+        if (strCurrentFilterDIP3 != "") {
+            strToFilter = addressItem->text() + " " +
+                          statusItem->text() + " " +
+                          PoSeScoreItem->text() + " " +
+                          registeredItem->text() + " " +
+                          lastPaidItem->text() + " " +
+                          nextPaymentItem->text() + " " +
+                          payeeItem->text() + " " +
+                          operatorRewardItem->text();
+            if (!strToFilter.contains(strCurrentFilterDIP3)) return;
+        }
+
+        ui->tableWidgetMasternodesDIP3->insertRow(0);
+        ui->tableWidgetMasternodesDIP3->setItem(0, 0, addressItem);
+        ui->tableWidgetMasternodesDIP3->setItem(0, 1, statusItem);
+        ui->tableWidgetMasternodesDIP3->setItem(0, 2, PoSeScoreItem);
+        ui->tableWidgetMasternodesDIP3->setItem(0, 3, registeredItem);
+        ui->tableWidgetMasternodesDIP3->setItem(0, 4, lastPaidItem);
+        ui->tableWidgetMasternodesDIP3->setItem(0, 5, nextPaymentItem);
+        ui->tableWidgetMasternodesDIP3->setItem(0, 6, payeeItem);
+        ui->tableWidgetMasternodesDIP3->setItem(0, 7, operatorRewardItem);
+    });
+
+    ui->countLabelDIP3->setText(QString::number(ui->tableWidgetMasternodesDIP3->rowCount()));
+    ui->tableWidgetMasternodesDIP3->setSortingEnabled(true);
+}
+
 void MasternodeList::on_filterLineEdit_textChanged(const QString& strFilterIn)
 {
     strCurrentFilter = strFilterIn;
@@ -333,6 +464,14 @@ void MasternodeList::on_filterLineEdit_textChanged(const QString& strFilterIn)
     ui->countLabel->setText(QString::fromStdString(strprintf("Please wait... %d", MASTERNODELIST_FILTER_COOLDOWN_SECONDS)));
 }
 
+void MasternodeList::on_filterLineEditDIP3_textChanged(const QString& strFilterIn)
+{
+    strCurrentFilterDIP3 = strFilterIn;
+    nTimeFilterUpdatedDIP3 = GetTime();
+    fFilterUpdatedDIP3 = true;
+    ui->countLabelDIP3->setText(QString::fromStdString(strprintf("Please wait... %d", MASTERNODELIST_FILTER_COOLDOWN_SECONDS)));
+}
+
 void MasternodeList::on_startButton_clicked()
 {
     std::string strAlias;
diff --git a/src/qt/masternodelist.h b/src/qt/masternodelist.h
index 34eb3d0b89f4..d51a403745d7 100644
--- a/src/qt/masternodelist.h
+++ b/src/qt/masternodelist.h
@@ -44,12 +44,15 @@ class MasternodeList : public QWidget
 private:
     QMenu* contextMenu;
     int64_t nTimeFilterUpdated;
+    int64_t nTimeFilterUpdatedDIP3;
     bool fFilterUpdated;
+    bool fFilterUpdatedDIP3;
 
 public Q_SLOTS:
     void updateMyMasternodeInfo(QString strAlias, QString strAddr, const COutPoint& outpoint);
     void updateMyNodeList(bool fForce = false);
     void updateNodeList();
+    void updateDIP3List();
 
 Q_SIGNALS:
     void doubleClicked(const QModelIndex&);
@@ -66,11 +69,16 @@ public Q_SLOTS:
     // Protects tableWidgetMyMasternodes
     CCriticalSection cs_mymnlist;
 
+    // Protects tableWidgetMasternodesDIP3
+    CCriticalSection cs_dip3list;
+
     QString strCurrentFilter;
+    QString strCurrentFilterDIP3;
 
 private Q_SLOTS:
     void showContextMenu(const QPoint&);
     void on_filterLineEdit_textChanged(const QString& strFilterIn);
+    void on_filterLineEditDIP3_textChanged(const QString& strFilterIn);
     void on_QRButton_clicked();
     void on_startButton_clicked();
     void on_startAllButton_clicked();

From 12aba2592df5edc846f3ebe50ebfeb08294dd03a Mon Sep 17 00:00:00 2001
From: UdjinM6 <UdjinM6@users.noreply.github.com>
Date: Fri, 16 Nov 2018 20:40:23 +0300
Subject: [PATCH 291/400] Updating translations for de, es, fi, nl, pt, sk,
 zh_CN, zh_TW (#2451)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Updating de, es, fi, nl, pt, sk, zh_CN, zh_TW

Known issues:
dash_zh_CN.ts: Mismatch between 'Start &all' and '启动全部(%A)'
dash_zh_CN.ts: Mismatch between 'Open the %1 debug log file from the current data directory. This can take a few seconds for large log files.' and '打开当前目录中的调试日志文件。日志文件大的话可能要等上几秒钟。'
dash_zh_CN.ts: Mismatch between 'Too many %f denominations, removing.' and '太多面额化资金，正在移除。'
dash_zh_CN.ts: Mismatch between 'Initialization sanity check failed. %s is shutting down.' and '初始化完整性检查失败。% 即将

* Fix issues in zh_CN
---
 src/qt/locale/dash_de.ts    | 71 ++++++++++++++++++++++++++++++-
 src/qt/locale/dash_es.ts    | 70 ++++++++++++++++++++++++++++++-
 src/qt/locale/dash_fi.ts    | 82 ++++++++++++++++++++++++++++++++----
 src/qt/locale/dash_nl.ts    | 84 ++++++++++++++++++-------------------
 src/qt/locale/dash_pt.ts    | 70 ++++++++++++++++++++++++++++++-
 src/qt/locale/dash_sk.ts    | 78 +++++++++++++++++++++++++++++++---
 src/qt/locale/dash_zh_CN.ts | 26 +++++++++++-
 src/qt/locale/dash_zh_TW.ts | 36 ++++++++++++++++
 8 files changed, 459 insertions(+), 58 deletions(-)

diff --git a/src/qt/locale/dash_de.ts b/src/qt/locale/dash_de.ts
index 6309ebf64fcd..dea83685e6b6 100644
--- a/src/qt/locale/dash_de.ts
+++ b/src/qt/locale/dash_de.ts
@@ -793,6 +793,10 @@
         <source>Please switch to "List mode" to use this function.</source>
         <translation>Wechseln Sie bitte zum "Listenmodus" um die Funktion zu benutzen.</translation>
     </message>
+    <message>
+        <source>Non-anonymized input selected. &lt;b&gt;PrivateSend will be disabled.&lt;/b&gt;&lt;br&gt;&lt;br&gt;If you still want to use PrivateSend, please deselect all non-anonymized inputs first and then check the PrivateSend checkbox again.</source>
+        <translation>Nicht-anonymisierter Input ausgewählt. &lt;b&gt;PrivateSend wird deaktiviert.&lt;/b&gt;&lt;br&gt;&lt;br&gt;Sollten Sie trotzdem PrivateSend verwenden wollen, müssen Sie zuerst alle nicht-anonymisierten Inputs entmarkieren und das Ankreuzfeld "PrivateSend" erneut auswählen.</translation>
+    </message>
     <message>
         <source>(%1 locked)</source>
         <translation>(%1 gesperrt)</translation>
@@ -966,7 +970,12 @@
         <source>PrivateSend information</source>
         <translation>PrivateSend Informationen</translation>
     </message>
-    </context>
+    <message>
+        <source>&lt;h3&gt;PrivateSend Basics&lt;/h3&gt; PrivateSend gives you true financial privacy by obscuring the origins of your funds. All the Dash in your wallet is comprised of different "inputs" which you can think of as separate, discrete coins.&lt;br&gt; PrivateSend uses an innovative process to mix your inputs with the inputs of two other people, without having your coins ever leave your wallet. You retain control of your money at all times.&lt;hr&gt; &lt;b&gt;The PrivateSend process works like this:&lt;/b&gt;&lt;ol type="1"&gt; &lt;li&gt;PrivateSend begins by breaking your transaction inputs down into standard denominations. These denominations are 0.01 DASH, 0.1 DASH, 1 DASH and 10 DASH -- sort of like the paper money you use every day.&lt;/li&gt; &lt;li&gt;Your wallet then sends requests to specially configured software nodes on the network, called "masternodes." These masternodes are informed then that you are interested in mixing a certain denomination. No identifiable information is sent to the masternodes, so they never know "who" you are.&lt;/li&gt; &lt;li&gt;When two other people send similar messages, indicating that they wish to mix the same denomination, a mixing session begins. The masternode mixes up the inputs and instructs all three users' wallets to pay the now-transformed input back to themselves. Your wallet pays that denomination directly to itself, but in a different address (called a change address).&lt;/li&gt; &lt;li&gt;In order to fully obscure your funds, your wallet must repeat this process a number of times with each denomination. Each time the process is completed, it's called a "round." Each round of PrivateSend makes it exponentially more difficult to determine where your funds originated.&lt;/li&gt; &lt;li&gt;This mixing process happens in the background without any intervention on your part. When you wish to make a transaction, your funds will already be anonymized. No additional waiting is required.&lt;/li&gt; &lt;/ol&gt; &lt;hr&gt;&lt;b&gt;IMPORTANT:&lt;/b&gt; Your wallet only contains 1000 of these "change addresses." Every time a mixing event happens, up to 9 of your addresses are used up. This means those 1000 addresses last for about 100 mixing events. When 900 of them are used, your wallet must create more addresses. It can only do this, however, if you have automatic backups enabled.&lt;br&gt; Consequently, users who have backups disabled will also have PrivateSend disabled. &lt;hr&gt;For more information, see the &lt;a href="https://docs.dash.org/en/latest/wallets/dashcore/privatesend-instantsend.html"&gt;PrivateSend documentation&lt;/a&gt;.         </source>
+        <translation>&lt;h3&gt;Basisinformation zu PrivateSend&lt;/h3&gt; PrivateSend bietet finanziellen Datenschutz durch geschickte Verschleierung der Herkunft Ihres Geldes. Die Dash in Ihrer Geldbörse setzen sich aus völlig unterschiedlichen eigenständigen "Inputs" zusammen.&lt;br&gt; PrivateSend benutzt einen innovativen Prozeß, um Ihre "Inputs" mit denen von 2 anderen Personen zu mischen, ohne das Ihr Geld jemals Ihre Geldbörse verlassen muß, d.h. Sie haben während dieses Prozesses immer die Kontrolle über Ihr Geld.&lt;hr&gt;&lt;b&gt;Der PrivateSend-Prozess funktioniert folgendermaßen:&lt;/b&gt;&lt;ol type="1"&gt;&lt;li&gt;PrivateSend stückelt Ihre "Inputs" in kleinere Teile. Diese sind 0,01 DASH, 0,1 DASH, 1DASH und 10 DASH -- im Prinzip wie Münzen oder Scheine, wie wir sie jeden Tag benutzen.&lt;/li&gt; &lt;li&gt;Ihre Geldbörse sendet dann eine entsprechende Mixing Anforderungen an spezielle Dash-Server im Internet, die sogenannten "Masternodes". Damit werden diese Masternodes darüber informiert, daß Sie Ihre gestückelten DASH gerne mixen würden. Dabei wird keinerlei Information über Sie versendet, d.h. die Masternodes wissen nie, wer genau mixen möchte.&lt;/li&gt; &lt;li&gt; Sobald zwei andere Personen eine gleiche Mixing-Anforderung mit der gleichen Stückelung senden beginnt der Mixing-Prozeß. Der Masternode vermischt (daher das Wort "Mixing") die gestückelten Inputs und weist das Ergebnis wieder den Geldbörsen zu, allerdings mit neuen Empfängeradressen (die natürlich zu Ihrer Wallet gehören), so daß man sie nicht mehr den ursprünglichen Adressen zuordnen kann.. Man kann sich das so vorstellen wie wenn 3 Personen jeweils 100 Euro in der gleichen Anzahl von 10 Euro Scheinen, 5 Euro Scheinen, 2- und 1-Euro Münzen auf einen Tisch legen, alles einmal gut durchmischen, und sich anschießend ohne hinzusehen wieder 100 Euro vom Tischen nehmen. Jeder hat genau so viele Euro wie vorher, aber keiner weiß, wessen Scheine oder Münzen er letztendlich in seiner Geldbörse hat, oder wo sie herkommen. Und das Gute dabei ist, im Dash Mixing Prozeß verlassen die Scheine oder Münzen niemals die Geldbörse ihres Besitzers, daher kann kein Betrug stattfinden.&lt;/li&gt; &lt;li&gt;Um die Herkunft Ihres Guthabens vollständig zu verschleiern muß dieser Prozeß mehrmals wiederholt werden, d.h. es gibt mehrere "Runden" des Mixing-Prozesses. Die Anzahl der Runden ist einstellbar, je mehr, desto besser ist die Herkunft Ihres Guthabens verschleiert, aber um so länger dauert der Prozeß.&lt;/li&gt; &lt;li&gt;
+Der Mixing-Prozeß läuft nach dem Start vollständig im Hintergrund, d.h. es ist keine Benutzerinteraktion mehr erforderlich. Das Wallet informiert Sie über den Fortschrittsbalken über den aktuellen Status des Prozesses.&lt;/li&gt; &lt;/ol&gt; &lt;hr&gt;&lt;b&gt;WICHTIG:&lt;/b&gt; beim Mischen der Inputs werden die einzelnen Stückelungen einer NEUEN Empfängeradresse zugeordnet (siehe Oben). Ihre Geldbörse hat bereits beim ersten Start 1000 dieser "Wechseladressen" auf Vorrat erzeugt. Bei jedem Mischen werden 9 dieser Wechseladressen verbraucht, d.h. nach ungefähr 100 Mischvorgänge sind diese 1000 Wechseladressen aufgebraucht. Die Geldbörse ist so eingestellt, daß sie bei Erreichen von 900 benutzen Wechseladressen wieder genug neue Wechseladressen erzeugt, damit man auch in der Zukunft wieder mischen kann. Die neuen Wechseladressen werden aber nur dann erzeugt, wenn man in den Einstellungen "Automatische Datensicherungen" aktiviert hat.&lt;br&gt; Daher ist bei Benutzern, die "Automatische Datensicherungen" deaktiviert haben, automatisch auch PrivateSend dekativiert.&lt;hr&gt; Weitere Information hierzu finden Sie in der &lt;a href="https://docs.dash.org/en/latest/wallets/dashcore/privatesend-instantsend.html"&gt;PrivateSend-Dokumentation&lt;/a&gt;.</translation>
+    </message>
+</context>
 <context>
     <name>Intro</name>
     <message>
@@ -1754,6 +1763,10 @@ https://www.transifex.com/projects/p/dash/</translation>
         <source>We are about to create a new automatic backup for you, however &lt;span style='color:red;'&gt; you should always make sure you have backups saved in some safe place&lt;/span&gt;!</source>
         <translation>Datensicherungen werden automatisch gemacht, aber &lt;span style='color:red;'&gt; Sie sollten zusätzlich immer noch Datensicherungen an einem sicheren Ort haben&lt;/span&gt;!</translation>
     </message>
+    <message>
+        <source>Note: You can turn this message off in options.</source>
+        <translation>Hinweis: Diese Nachricht kann unter "Einstellungen" deaktiviert werden.</translation>
+    </message>
     <message>
         <source>WARNING! Something went wrong on automatic backup</source>
         <translation>Warnung! Die automatische Datensicherung ist nicht in Ordnung</translation>
@@ -4402,6 +4415,10 @@ https://www.transifex.com/projects/p/dash/</translation>
         <source>Disable all Dash specific functionality (Masternodes, PrivateSend, InstantSend, Governance) (0-1, default: %u)</source>
         <translation>Deaktiviere all Dash-spezifischen Funktionen (Masternodes, PrivateSend, InstantSend, Governance) (0-1, Standard: %u)</translation>
     </message>
+    <message>
+        <source>%s file contains all private keys from this wallet. Do not share it with anyone!</source>
+        <translation>Die Datei %s beinhaltet alle privaten Schlüssel der Wallet. Diese sollten niemals weitergegeben werden!</translation>
+    </message>
     <message>
         <source>Discover own IP addresses (default: 1 when listening and no -externalip or -proxy)</source>
         <translation>Eigene IP-Adresse erkennen (Standard: 1, wenn -listen aktiv ist und nicht -externalip)</translation>
@@ -4426,6 +4443,10 @@ https://www.transifex.com/projects/p/dash/</translation>
         <source>Execute command when a wallet InstantSend transaction is successfully locked (%s in cmd is replaced by TxID)</source>
         <translation>Befehl ausführen wenn eine Wallet-Transaktion erfolgreich gesperrt wurde (%s im Befehl wird durch die TxID ersetzt)</translation>
     </message>
+    <message>
+        <source>Extra transactions to keep in memory for compact block reconstructions (default: %u)</source>
+        <translation>Zusätzliche Transaktionen, die im Speicher bleiben, damit kompakte Blöcke ermöglicht werden können (Standard: %u)</translation>
+    </message>
     <message>
         <source>Failed to create backup, file already exists! This could happen if you restarted wallet in less than 60 seconds. You can continue if you are ok with this.</source>
         <translation>Datensicherung fehlgeschlagen, da diese Datei bereits existiert. Dies kann vorkommen, wenn das Wallet innerhalb von 60 Sekunden neu gestartet wurde. Sie können ohne Probleme weiterarbeiten, falls das so von Ihnen gewollt war.</translation>
@@ -4506,6 +4527,10 @@ https://www.transifex.com/projects/p/dash/</translation>
         <source>Total length of network version string (%i) exceeds maximum length (%i). Reduce the number or size of uacomments.</source>
         <translation>Die Gesamtlänge des Versions-Namens (%i) überschreitet die erlaubte Maximallänge (%i). Bitte verringern Sie Anzahl oder Größe der Eingaben für die Kommandozeilenoption -uacomments.</translation>
     </message>
+    <message>
+        <source>Transaction index can't be disabled in full mode. Either start with -litemode command line switch or enable transaction index.</source>
+        <translation>Der Transaktionsindex kann bei einer Fullnode nicht deaktiviert werden. Der Transaktionsindex muss entweder aktiviert sein oder die Node muss mit dem Befehl -litemode gestartet werden.</translation>
+    </message>
     <message>
         <source>Tries to keep outbound traffic under the given target (in MiB per 24h), 0 = no limit (default: %d)</source>
         <translation>Versucht die Menge des Ausgehenden Datenverkehrs unterhalb der angegebenen Maximalmenge (in MiB pro Tag) zu halten, 0 = keine Maximalmenge (Standard: %d)</translation>
@@ -4538,6 +4563,10 @@ https://www.transifex.com/projects/p/dash/</translation>
         <source>Warning: Unknown block versions being mined! It's possible unknown rules are in effect</source>
         <translation>Warning: es wird eine unbekannt Block-Version gemined. Es werden unbekannte/ungültige Blockregeln angewandt.</translation>
     </message>
+    <message>
+        <source>You are starting in lite mode, all Dash-specific functionality is disabled.</source>
+        <translation>Der Start findet im Lite-Modus statt, weswegen alle Dash-spezifischen Funktionen deaktiviert wurden.</translation>
+    </message>
     <message>
         <source>You need to rebuild the database using -reindex to go back to unpruned mode.  This will redownload the entire blockchain</source>
         <translation>Sie müssen die Datenbank mit Hilfe von -reindex neu aufbauen, um zurück in den nicht abgeschnittenen/pruned Modus zu gehen. Dies wird die gesamte Blockchain downloaden</translation>
@@ -4582,6 +4611,14 @@ https://www.transifex.com/projects/p/dash/</translation>
         <source>Enable publish hash block in &lt;address&gt;</source>
         <translation>Veröffentlichung des Blockhash in &lt;Adresse&gt; ermöglichen </translation>
     </message>
+    <message>
+        <source>Enable publish hash of governance objects (like proposals) in &lt;address&gt;</source>
+        <translation>Veröffentlichung des Hash eines Governance Objects (z.B. ein Proposal) in &lt;address&gt; ermöglichen </translation>
+    </message>
+    <message>
+        <source>Enable publish hash of governance votes in &lt;address&gt;</source>
+        <translation>Veröffentlichung des Hash einer Governance Stimme in &lt;address&gt; ermöglichen </translation>
+    </message>
     <message>
         <source>Enable publish hash transaction (locked via InstantSend) in &lt;address&gt;</source>
         <translation>Veröffentlichung des Transaktionshash (blockiert via InstantSend) in &lt;Adresse&gt; ermöglichen </translation>
@@ -4622,6 +4659,14 @@ https://www.transifex.com/projects/p/dash/</translation>
         <source>Failed to delete backup, error: %s</source>
         <translation>Löschen einer alten Datensicherung ist fehlgeschlagen, Fehler: %s</translation>
     </message>
+    <message>
+        <source>Failed to load InstantSend data cache from</source>
+        <translation>Data Cache für InstantSend konnte nicht geladen werden aus</translation>
+    </message>
+    <message>
+        <source>Failed to load sporks cache from</source>
+        <translation>Sporks Cache konnte nicht geladen werden aus</translation>
+    </message>
     <message>
         <source>Failed to parse host:port string</source>
         <translation>Die Eingabe für Rechnername:Port wird nicht verstanden</translation>
@@ -4642,6 +4687,10 @@ https://www.transifex.com/projects/p/dash/</translation>
         <source>Invalid amount for -fallbackfee=&lt;amount&gt;: '%s'</source>
         <translation>Ungültiger Betrag für -fallbackfee=&lt;amount&gt;: '%s'</translation>
     </message>
+    <message>
+        <source>Invalid input count.</source>
+        <translation>Ungültige Input-Zahl</translation>
+    </message>
     <message>
         <source>Keep the transaction memory pool below &lt;n&gt; megabytes (default: %u)</source>
         <translation>Transaktionen im "Mempool" unterhalb von &lt;n&gt; halten (Standard: %u)</translation>
@@ -4658,6 +4707,10 @@ https://www.transifex.com/projects/p/dash/</translation>
         <source>Line: %d</source>
         <translation>Zeile: %d</translation>
     </message>
+    <message>
+        <source>Loading InstantSend data cache...</source>
+        <translation>Lade InstantSend Data Cache...</translation>
+    </message>
     <message>
         <source>Loading addresses...</source>
         <translation>Lade Adressen...</translation>
@@ -4670,6 +4723,10 @@ https://www.transifex.com/projects/p/dash/</translation>
         <source>Loading governance cache...</source>
         <translation>Lade Governance-Cache...</translation>
     </message>
+    <message>
+        <source>Loading sporks cache...</source>
+        <translation>Lade Sporks Cache...</translation>
+    </message>
     <message>
         <source>Loading wallet... (%3.2f %%)</source>
         <translation>Lade Wallet... (%3.2f %%)</translation>
@@ -4810,6 +4867,10 @@ https://www.transifex.com/projects/p/dash/</translation>
         <source>Transaction must have at least one recipient</source>
         <translation>Die Transaktion muss mindestens einen Empfänger enthalten.</translation>
     </message>
+    <message>
+        <source>Transaction too large</source>
+        <translation>Transaktion zu groß</translation>
+    </message>
     <message>
         <source>Trying to connect...</source>
         <translation>Verbindungsaufbau...</translation>
@@ -4830,6 +4891,10 @@ https://www.transifex.com/projects/p/dash/</translation>
         <source>Wallet debugging/testing options:</source>
         <translation>Wallet Debugging-/Testoptionen:</translation>
     </message>
+    <message>
+        <source>Wallet is not initialized</source>
+        <translation>Wallet wurde nicht initialisiert</translation>
+    </message>
     <message>
         <source>Wallet needed to be rewritten: restart %s to complete</source>
         <translation>Wallet musste neu geschrieben werden: starten Sie %s zur Fertigstellung neu</translation>
@@ -4846,6 +4911,10 @@ https://www.transifex.com/projects/p/dash/</translation>
         <source>Whether to operate in a blocks only mode (default: %u)</source>
         <translation>Arbeite im Block-Only-Modus (Standard: %u)</translation>
     </message>
+    <message>
+        <source>You can not start a masternode in lite mode.</source>
+        <translation>Eine Masternode kann nicht im Lite-Modus gestartet werden,</translation>
+    </message>
     <message>
         <source>ZeroMQ notification options:</source>
         <translation>ZeroMQ Benachrichtigung-Optionen:</translation>
diff --git a/src/qt/locale/dash_es.ts b/src/qt/locale/dash_es.ts
index 62a7d4a8c8ff..52363b975a28 100644
--- a/src/qt/locale/dash_es.ts
+++ b/src/qt/locale/dash_es.ts
@@ -793,6 +793,10 @@
         <source>Please switch to "List mode" to use this function.</source>
         <translation>Por favor, cambie a "Modo Lista" para poder usar esta función.</translation>
     </message>
+    <message>
+        <source>Non-anonymized input selected. &lt;b&gt;PrivateSend will be disabled.&lt;/b&gt;&lt;br&gt;&lt;br&gt;If you still want to use PrivateSend, please deselect all non-anonymized inputs first and then check the PrivateSend checkbox again.</source>
+        <translation>Entrada no-anónima seleccionada.&lt;b&gt;PrivateSend será deshabilitado.&lt;/b&gt;&lt;br&gt;&lt;br&gt;Si aún quiere usar PrivateSend, por favor, deseleccione todas las entradas no-anónimas primero y luego marque la casilla de verificación PrivateSend de nuevo.</translation>
+    </message>
     <message>
         <source>(%1 locked)</source>
         <translation>(%1 bloqueadas)</translation>
@@ -966,7 +970,11 @@
         <source>PrivateSend information</source>
         <translation>Información de PrivateSend</translation>
     </message>
-    </context>
+    <message>
+        <source>&lt;h3&gt;PrivateSend Basics&lt;/h3&gt; PrivateSend gives you true financial privacy by obscuring the origins of your funds. All the Dash in your wallet is comprised of different "inputs" which you can think of as separate, discrete coins.&lt;br&gt; PrivateSend uses an innovative process to mix your inputs with the inputs of two other people, without having your coins ever leave your wallet. You retain control of your money at all times.&lt;hr&gt; &lt;b&gt;The PrivateSend process works like this:&lt;/b&gt;&lt;ol type="1"&gt; &lt;li&gt;PrivateSend begins by breaking your transaction inputs down into standard denominations. These denominations are 0.01 DASH, 0.1 DASH, 1 DASH and 10 DASH -- sort of like the paper money you use every day.&lt;/li&gt; &lt;li&gt;Your wallet then sends requests to specially configured software nodes on the network, called "masternodes." These masternodes are informed then that you are interested in mixing a certain denomination. No identifiable information is sent to the masternodes, so they never know "who" you are.&lt;/li&gt; &lt;li&gt;When two other people send similar messages, indicating that they wish to mix the same denomination, a mixing session begins. The masternode mixes up the inputs and instructs all three users' wallets to pay the now-transformed input back to themselves. Your wallet pays that denomination directly to itself, but in a different address (called a change address).&lt;/li&gt; &lt;li&gt;In order to fully obscure your funds, your wallet must repeat this process a number of times with each denomination. Each time the process is completed, it's called a "round." Each round of PrivateSend makes it exponentially more difficult to determine where your funds originated.&lt;/li&gt; &lt;li&gt;This mixing process happens in the background without any intervention on your part. When you wish to make a transaction, your funds will already be anonymized. No additional waiting is required.&lt;/li&gt; &lt;/ol&gt; &lt;hr&gt;&lt;b&gt;IMPORTANT:&lt;/b&gt; Your wallet only contains 1000 of these "change addresses." Every time a mixing event happens, up to 9 of your addresses are used up. This means those 1000 addresses last for about 100 mixing events. When 900 of them are used, your wallet must create more addresses. It can only do this, however, if you have automatic backups enabled.&lt;br&gt; Consequently, users who have backups disabled will also have PrivateSend disabled. &lt;hr&gt;For more information, see the &lt;a href="https://docs.dash.org/en/latest/wallets/dashcore/privatesend-instantsend.html"&gt;PrivateSend documentation&lt;/a&gt;.         </source>
+        <translation>&lt;h3&gt;Conceptos básico de PrivateSend&lt;/h3&gt;PrivateSend te da verdadera privacidad financiera al ocultar los orígenes de tus fondos. Todos los Dash en su billetera están compuestos por diferentes "depositos" en las que puede pensar como monedas separadas, discretas.&lt;br&gt;PrivateSend utiliza un proceso innovador que mezcla sus depósitos con las depósitos de otras dos personas, sin que sus monedas salgan de billetera. Usted retiene el control de su dinero en todo momento ..&lt;hr&gt;&lt;b&gt;El proceso de PrivateSend funciona así:&lt;/b&gt;&lt;ol type="1"&gt;&lt;li&gt;PrivateSend comienza dividiendo los depósitos de sus transacciones en denominaciones estándar. Éstas denominaciones son 0.01 DASH, 0.1 DASH, 1 DASH y 10 DASH - algo así como el papel moneda que usas todos los días.&lt;/li&gt;&lt;li&gt;Entonces, su billetera envía solicitudes a nodos de software especialmente configurados en la red, llamados "masternodes". Estos masternodes son informados que usted está interesado en mezclar una cierta denominación. Información no identificable es enviada a los masternodes, por lo que nunca saben "quién" es usted.&lt;/li&gt;&lt;li&gt;Cuando otras dos personas envían mensajes similares, indicando que desean mezclar la misma denominación, comienza una sesión de mezclado. El masternode mezcla los depósitos e instruye a las billeteras de los tres usuarios para que paguen el depósito ahora transformado a si mismos. Su monedero paga esa denominación directamente a sí misma, pero en una dirección diferente (llamada dirección de cambio).&lt;/li&gt; &lt;li&gt;En orden de ocultar totalmente sus fondos, su billetera debe repetir este proceso varias veces con cada denominación. Cada vez que se completa el proceso, se denomina "ronda". Cada ronda de PrivateSend hace que sea exponencialmente más difícil determinar de dónde provienen los fondos.&lt;/li&gt;&lt;li&gt;Este proceso de mezclado ocurre en segundo plano sin ninguna intervención de su parte. Cuando desee realizar una transacción, sus fondos ya serán anónimos. No se requiere tiempo de espera adicional.&lt;/li&gt;&lt;/ol&gt;&lt;hr&gt;&lt;b&gt;IMPORTATE:&lt;/b&gt;Su billetera solo contiene 1000 de estas "direcciones de cambio". Cada vez que ocurre un evento de mezclado, hasta 9 de sus direcciones son usadas. Esto significa que esas 1000 direcciones duran alrededor de 100 eventos de mezclado. Cuando 900 de ellas sean usadas, su billetera debe crear más direcciones. Sin embargo, solo podra hacer esto si tiene las copias de seguridad automáticas habilitadas.&lt;br&gt;En consecuencia, los usuarios que tengan las copias de seguridad deshabilitadas también tendrán PrivateSend deshabilitado.&lt;hr&gt;Para mas información, consulte la &lt;a href="https://docs.dash.org/en/latest/wallets/dashcore/privatesend-instantsend.html"&gt;documentación de PrivateSend&lt;/a&gt;.</translation>
+    </message>
+</context>
 <context>
     <name>Intro</name>
     <message>
@@ -1754,6 +1762,10 @@ https://www.transifex.com/projects/p/dash/</translation>
         <source>We are about to create a new automatic backup for you, however &lt;span style='color:red;'&gt; you should always make sure you have backups saved in some safe place&lt;/span&gt;!</source>
         <translation>Estamos a punto de crear una nueva copia de seguridad automática para usted, sin embargo, &lt;span style='color:red;'&gt;¡Siempre debe asegurarse de tener copias de seguridad guardadas en un lugar seguro&lt;/span&gt;!</translation>
     </message>
+    <message>
+        <source>Note: You can turn this message off in options.</source>
+        <translation>Nota: Puedes desactivar este mensaje en opciones.</translation>
+    </message>
     <message>
         <source>WARNING! Something went wrong on automatic backup</source>
         <translation>¡ADVERTENCIA! Algo salió mal en la copia de seguridad automática</translation>
@@ -4401,6 +4413,10 @@ https://www.transifex.com/projects/p/dash/</translation>
         <source>Disable all Dash specific functionality (Masternodes, PrivateSend, InstantSend, Governance) (0-1, default: %u)</source>
         <translation>Deshabilitar todas las funcionalidades especificas de Dash (Masternodes, PrivateSend, InstantSend, Governanza) (0-1, predeterminado: %u)</translation>
     </message>
+    <message>
+        <source>%s file contains all private keys from this wallet. Do not share it with anyone!</source>
+        <translation>%s archivo contiene todas las llaves privadas de esta billetera. ¡No lo compartas con nadie!</translation>
+    </message>
     <message>
         <source>Discover own IP addresses (default: 1 when listening and no -externalip or -proxy)</source>
         <translation>Descubra direcciones IP propias (predeterminado: 1 cuando se escucha y nadie -externalip o -proxy)</translation>
@@ -4425,6 +4441,10 @@ https://www.transifex.com/projects/p/dash/</translation>
         <source>Execute command when a wallet InstantSend transaction is successfully locked (%s in cmd is replaced by TxID)</source>
         <translation>Ejecutar comando en la billetera cuando la transacción InstantSend este totalmente bloqueada (%s en cmd es reemplazada por TxID)</translation>
     </message>
+    <message>
+        <source>Extra transactions to keep in memory for compact block reconstructions (default: %u)</source>
+        <translation>Transacciones extra para guardar en memoria para reconstrucciones de bloques compactos (predeterminado: %u)</translation>
+    </message>
     <message>
         <source>Failed to create backup, file already exists! This could happen if you restarted wallet in less than 60 seconds. You can continue if you are ok with this.</source>
         <translation>¡Error al crear copia de seguridad, el archivo ya existe! Esto puede ocurrir si reinicio la billetera en menos de 60 segundos. Puede continuar si esta de acuerdo con esto.</translation>
@@ -4505,6 +4525,10 @@ https://www.transifex.com/projects/p/dash/</translation>
         <source>Total length of network version string (%i) exceeds maximum length (%i). Reduce the number or size of uacomments.</source>
         <translation>La longitud total de la cadena de versión de red ( %i ) supera la longitud máxima ( %i ) . Reducir el número o tamaño de uacomments .</translation>
     </message>
+    <message>
+        <source>Transaction index can't be disabled in full mode. Either start with -litemode command line switch or enable transaction index.</source>
+        <translation>El índice de transacción no se puede desactivar en modo completo. Inicia con el interruptor de línea de comando -litemode o habilita el índice de transacción.</translation>
+    </message>
     <message>
         <source>Tries to keep outbound traffic under the given target (in MiB per 24h), 0 = no limit (default: %d)</source>
         <translation>Intentar mantener el tráfico de salida bajo el objetivo determinado (en MiB por 24h), 0 =  sin limite (predeterminado :%d )</translation>
@@ -4537,6 +4561,10 @@ https://www.transifex.com/projects/p/dash/</translation>
         <source>Warning: Unknown block versions being mined! It's possible unknown rules are in effect</source>
         <translation>Advertencia: Se están minando versiones de bloques desconocidas! Es posible que normas desconocidas estén activas</translation>
     </message>
+    <message>
+        <source>You are starting in lite mode, all Dash-specific functionality is disabled.</source>
+        <translation>Estás iniciando en modo lite, toda la funcionalidad Dash-specific está deshabilitada.</translation>
+    </message>
     <message>
         <source>You need to rebuild the database using -reindex to go back to unpruned mode.  This will redownload the entire blockchain</source>
         <translation>Necesitas reconstruir la base de datos utilizando -reindex para volver al modo sin poda. Esto volverá a descargar toda la cadena de bloques</translation>
@@ -4581,6 +4609,14 @@ https://www.transifex.com/projects/p/dash/</translation>
         <source>Enable publish hash block in &lt;address&gt;</source>
         <translation>Habilitar la publicación del hash del bloque en &lt;address&gt;</translation>
     </message>
+    <message>
+        <source>Enable publish hash of governance objects (like proposals) in &lt;address&gt;</source>
+        <translation>Habilitar la publicación de hash de objetos de gobernanza (como propuestas) en &lt;address&gt;</translation>
+    </message>
+    <message>
+        <source>Enable publish hash of governance votes in &lt;address&gt;</source>
+        <translation>Habilitar la publicación de hash de los votos de gobernanza en &lt;address&gt;</translation>
+    </message>
     <message>
         <source>Enable publish hash transaction (locked via InstantSend) in &lt;address&gt;</source>
         <translation>Habilitar la publicación del hash de transacción (bloqueado a través de InstantSend) en &lt;address&gt;</translation>
@@ -4621,6 +4657,14 @@ https://www.transifex.com/projects/p/dash/</translation>
         <source>Failed to delete backup, error: %s</source>
         <translation>Error al borrar copia de seguridad, error: %s</translation>
     </message>
+    <message>
+        <source>Failed to load InstantSend data cache from</source>
+        <translation>Error al cargar el caché de datos de InstantSend desde</translation>
+    </message>
+    <message>
+        <source>Failed to load sporks cache from</source>
+        <translation>Error al cargar el caché de sporks desde</translation>
+    </message>
     <message>
         <source>Failed to parse host:port string</source>
         <translation>Error al interpretar linea host:port</translation>
@@ -4641,6 +4685,10 @@ https://www.transifex.com/projects/p/dash/</translation>
         <source>Invalid amount for -fallbackfee=&lt;amount&gt;: '%s'</source>
         <translation>Cantidad inválida para -fallbackfee=&lt;amount&gt;: '%s'</translation>
     </message>
+    <message>
+        <source>Invalid input count.</source>
+        <translation>Cuenta de entrada inválida.</translation>
+    </message>
     <message>
         <source>Keep the transaction memory pool below &lt;n&gt; megabytes (default: %u)</source>
         <translation>Mantener el pool de la memoria de transacciones por debajo de &lt;n&gt; megabytes (predeterminado: %u)</translation>
@@ -4657,6 +4705,10 @@ https://www.transifex.com/projects/p/dash/</translation>
         <source>Line: %d</source>
         <translation>Línea: %d</translation>
     </message>
+    <message>
+        <source>Loading InstantSend data cache...</source>
+        <translation>Cargando el caché de datos de InstantSend...</translation>
+    </message>
     <message>
         <source>Loading addresses...</source>
         <translation>Cargando direcciones...</translation>
@@ -4669,6 +4721,10 @@ https://www.transifex.com/projects/p/dash/</translation>
         <source>Loading governance cache...</source>
         <translation>Cargando memoria cache de gobernanza...</translation>
     </message>
+    <message>
+        <source>Loading sporks cache...</source>
+        <translation>Cargando el caché de sporks...</translation>
+    </message>
     <message>
         <source>Loading wallet... (%3.2f %%)</source>
         <translation>Cargando billetera... (%3.2f %%)</translation>
@@ -4809,6 +4865,10 @@ https://www.transifex.com/projects/p/dash/</translation>
         <source>Transaction must have at least one recipient</source>
         <translation>La transacción debe de tener al menos un receptor</translation>
     </message>
+    <message>
+        <source>Transaction too large</source>
+        <translation>Transacción demasiado grande</translation>
+    </message>
     <message>
         <source>Trying to connect...</source>
         <translation>Intentando conectar...</translation>
@@ -4829,6 +4889,10 @@ https://www.transifex.com/projects/p/dash/</translation>
         <source>Wallet debugging/testing options:</source>
         <translation>Opciones de depuración/pruebas de billetera:</translation>
     </message>
+    <message>
+        <source>Wallet is not initialized</source>
+        <translation>Billetera no inicializada</translation>
+    </message>
     <message>
         <source>Wallet needed to be rewritten: restart %s to complete</source>
         <translation>Es necesario reescribir la billetera: reiniciar %s para completar</translation>
@@ -4845,6 +4909,10 @@ https://www.transifex.com/projects/p/dash/</translation>
         <source>Whether to operate in a blocks only mode (default: %u)</source>
         <translation>Ya sea para operar en modo solo bloques (predeterminado: %u)</translation>
     </message>
+    <message>
+        <source>You can not start a masternode in lite mode.</source>
+        <translation>No puedes iniciar un masternode en modo lite.</translation>
+    </message>
     <message>
         <source>ZeroMQ notification options:</source>
         <translation>Opciones de notificación ZeroQM:</translation>
diff --git a/src/qt/locale/dash_fi.ts b/src/qt/locale/dash_fi.ts
index 1feee3abce4e..8393905ed04b 100644
--- a/src/qt/locale/dash_fi.ts
+++ b/src/qt/locale/dash_fi.ts
@@ -793,6 +793,10 @@
         <source>Please switch to "List mode" to use this function.</source>
         <translation>Vaihda "Lista tilaan" käyttääksesi tätä toimintoa.</translation>
     </message>
+    <message>
+        <source>Non-anonymized input selected. &lt;b&gt;PrivateSend will be disabled.&lt;/b&gt;&lt;br&gt;&lt;br&gt;If you still want to use PrivateSend, please deselect all non-anonymized inputs first and then check the PrivateSend checkbox again.</source>
+        <translation>Ei anonyymeja syötteitä valittu. &lt;b&gt;PrivateSend poistetaan käytöstä.&lt;/b&gt;&lt;br&gt;&lt;br&gt;Jos silti haluat käyttää PrivateSend:iä, poista ei anonyymit valinnat ensin ja valitse uudelleen PrivateSend optio.</translation>
+    </message>
     <message>
         <source>(%1 locked)</source>
         <translation>(%1 lukittu)</translation>
@@ -966,7 +970,11 @@
         <source>PrivateSend information</source>
         <translation>PrivateSend tietoja</translation>
     </message>
-    </context>
+    <message>
+        <source>&lt;h3&gt;PrivateSend Basics&lt;/h3&gt; PrivateSend gives you true financial privacy by obscuring the origins of your funds. All the Dash in your wallet is comprised of different "inputs" which you can think of as separate, discrete coins.&lt;br&gt; PrivateSend uses an innovative process to mix your inputs with the inputs of two other people, without having your coins ever leave your wallet. You retain control of your money at all times.&lt;hr&gt; &lt;b&gt;The PrivateSend process works like this:&lt;/b&gt;&lt;ol type="1"&gt; &lt;li&gt;PrivateSend begins by breaking your transaction inputs down into standard denominations. These denominations are 0.01 DASH, 0.1 DASH, 1 DASH and 10 DASH -- sort of like the paper money you use every day.&lt;/li&gt; &lt;li&gt;Your wallet then sends requests to specially configured software nodes on the network, called "masternodes." These masternodes are informed then that you are interested in mixing a certain denomination. No identifiable information is sent to the masternodes, so they never know "who" you are.&lt;/li&gt; &lt;li&gt;When two other people send similar messages, indicating that they wish to mix the same denomination, a mixing session begins. The masternode mixes up the inputs and instructs all three users' wallets to pay the now-transformed input back to themselves. Your wallet pays that denomination directly to itself, but in a different address (called a change address).&lt;/li&gt; &lt;li&gt;In order to fully obscure your funds, your wallet must repeat this process a number of times with each denomination. Each time the process is completed, it's called a "round." Each round of PrivateSend makes it exponentially more difficult to determine where your funds originated.&lt;/li&gt; &lt;li&gt;This mixing process happens in the background without any intervention on your part. When you wish to make a transaction, your funds will already be anonymized. No additional waiting is required.&lt;/li&gt; &lt;/ol&gt; &lt;hr&gt;&lt;b&gt;IMPORTANT:&lt;/b&gt; Your wallet only contains 1000 of these "change addresses." Every time a mixing event happens, up to 9 of your addresses are used up. This means those 1000 addresses last for about 100 mixing events. When 900 of them are used, your wallet must create more addresses. It can only do this, however, if you have automatic backups enabled.&lt;br&gt; Consequently, users who have backups disabled will also have PrivateSend disabled. &lt;hr&gt;For more information, see the &lt;a href="https://docs.dash.org/en/latest/wallets/dashcore/privatesend-instantsend.html"&gt;PrivateSend documentation&lt;/a&gt;.         </source>
+        <translation>&lt;h3&gt;PrivateSend perusteet&lt;/h3&gt; PrivateSend tarjoaa yksityisyyden hämärtämällä varojesi alkuperäisen osoitteen. Kaikki Dash:it lompakossasi muodostuvat erillisistä "syötteistä", joita voit ajatella erillisinä kolikkoina.&lt;br&gt; PrivateSend käyttää innovatiivista prosessia sekoittaakseen lompakkosi syötteet kahden muun ihmisen syötteisiin, siirtämättä varoja pois lompakostasi. Varojesi kontrolli pysyy aina sinulla.&lt;hr&gt; &lt;b&gt; PrivateSend prosessi toimii seuraavasti:&lt;/b&gt;&lt;ol type="1"&gt; &lt;li&gt;PrivateSend aloittaa pilkkomalla siirtotapahtumiesi syötteet pienemmiksi standardi arvoiksi. Nämä arvot ovat 0.01 DASH, 0.1 DASH, 1 DASH ja 10 DASH.&lt;/li&gt; &lt;li&gt;Sitten lompakkosi lähettää pyynnön verkon palvelimille, joita kutsutaan "masternode:iksi". Masternodet saavat tiedon että haluat sekoittaa pilkottuja standardi arvoja. Mitään tunnistetietoja ei lähetetä masternode:ille, ne eivät koskaan tiedä "kuka" olet.&lt;/li&gt; &lt;li&gt;Kun 2 muuta käyttäjää ilmoittaa että he haluavat myös sekoittaa varoja, alkaa sekoitus-sessio. Masternodet sekoittavat standardi arvot ja ilmoittavat kaikille 3:lle käyttäjän lompakoille että maksavat sekoitetut arvot takaisin itselleen. Lompakkosi maksaa nuo sekoitetut arvot suoraan itselleen, mutta eri osoitteeseen (vaihto-osoite).&lt;/li&gt; &lt;li&gt;Jotta varojesi alkuperäinen lähde hämärretään, lompakkosi suorittaa tämän prosessin useita kertoja kaikilla standardi arvoilla. Aina kun prosessi on valmis, sitä kutsutaan "kierrokseksi". Jokainen PrivateSend kierros tekee eksponentiaalisesti vaikeammaksi löytää varojesi alkuperäisen osoitteen.&lt;/li&gt; &lt;li&gt;Tämä sekoitusprosessi tapahtuu taustalla ilman käyttäjän toimenpiteitä. Kun haluat myöhemmin tehdä anonyymin varojen siirron, on varasi valmiiksi sekoitettu eli anonymisoitu. Erillistä sekoitusta/odotusta ei tarvita.&lt;/li&gt; &lt;/ol&gt; &lt;hr&gt;&lt;b&gt;TÄRKEÄÄ:&lt;/b&gt; Lompakkosi sisältää vain 1000 "vaihto-osoitetta". Aina kun sekoitustapahtuma tehdään, max 9 osoitetta käytetään. Tämä tarkoittaa sitä että nuo 1000 osoitetta kestää noin 100 sekoitustapahtumaa. Kun 900 osoitetta on käytetty, lompakkosi täytyy tehdä lisää osoitteita. Se voi tehdä niitä vain jos automaattinen varmistus on käytössä.&lt;br&gt; Tästä seuraa että jos varmistus ei ole käytössä, myös PrivateSend on pois käytöstä. &lt;hr&gt;Katso lisätietoja &lt;a href="https://docs.dash.org/en/latest/wallets/dashcore/privatesend-instantsend.html"&gt;PrivateSend dokumentaatiosta&lt;/a&gt;.</translation>
+    </message>
+</context>
 <context>
     <name>Intro</name>
     <message>
@@ -1347,7 +1355,7 @@
     </message>
     <message>
         <source>Third party URLs (e.g. a block explorer) that appear in the transactions tab as context menu items.&lt;br/&gt;%s in the URL is replaced by transaction hash. Multiple URLs are separated by vertical bar |.</source>
-        <translation>Ulkopuoliset URL-osoitteet (esim. lohkoselain) jotka esiintyvät tapahtumat-välilehdellä valikossa.&lt;br/&gt;%s URL osoitteessa korvataan siirtotunnuksella. Useampi URL osoite on eroteltu pystyviivalla |.</translation>
+        <translation>Ulkopuoliset URL-osoitteet (esim. lohkoselain) jotka esiintyvät tapahtumat-välilehdellä valikossa.&lt;br/&gt;%s URL osoitteessa korvataan siirtotunnuksen tarkisteella. Useampi URL osoite on eroteltu pystyviivalla |.</translation>
     </message>
     <message>
         <source>Expert</source>
@@ -1754,6 +1762,10 @@ https://www.transifex.com/projects/p/dash/</translation>
         <source>We are about to create a new automatic backup for you, however &lt;span style='color:red;'&gt; you should always make sure you have backups saved in some safe place&lt;/span&gt;!</source>
         <translation>Olemme tekemässä uutta automaattista varmistusta sinulle, mutta&lt;span style='color:red;'&gt; varmista aina että olet tallettanut varmistuksen turvalliseen paikkaan&lt;/span&gt;!</translation>
     </message>
+    <message>
+        <source>Note: You can turn this message off in options.</source>
+        <translation>Huom: Voit kytkeä tämän viestin pois päältä asetuksissa.</translation>
+    </message>
     <message>
         <source>WARNING! Something went wrong on automatic backup</source>
         <translation>VAROITUS! Jotain meni vikaan automaattisessa varmistuksessa</translation>
@@ -4079,7 +4091,7 @@ Näillä toiminnoilla voit korjata korruptoituneen lohkoketjun tai puuttuvat/van
     </message>
     <message>
         <source>Failed to load governance cache from</source>
-        <translation>Budjetti välimuistin lataaminen epäonnistui</translation>
+        <translation>Hallinnon välimuistin lataaminen epäonnistui</translation>
     </message>
     <message>
         <source>Failed to load masternode cache from</source>
@@ -4403,7 +4415,11 @@ Näillä toiminnoilla voit korjata korruptoituneen lohkoketjun tai puuttuvat/van
     </message>
     <message>
         <source>Disable all Dash specific functionality (Masternodes, PrivateSend, InstantSend, Governance) (0-1, default: %u)</source>
-        <translation>Kytke pois käytöstä kaikki Dash:in erityistoiminnot (Masternodet, PrivateSend, InstantSend, Budjetointi) (0-1, oletus: %u)</translation>
+        <translation>Kytke pois käytöstä kaikki Dash:in erityistoiminnot (Masternodet, PrivateSend, InstantSend, Hallinto) (0-1, oletus: %u)</translation>
+    </message>
+    <message>
+        <source>%s file contains all private keys from this wallet. Do not share it with anyone!</source>
+        <translation>%s tiedosto sisältää kaikki yksityisavaimet tähän lompakkoon. Älä luovuta sitä kenellekkän!</translation>
     </message>
     <message>
         <source>Discover own IP addresses (default: 1 when listening and no -externalip or -proxy)</source>
@@ -4429,6 +4445,10 @@ Näillä toiminnoilla voit korjata korruptoituneen lohkoketjun tai puuttuvat/van
         <source>Execute command when a wallet InstantSend transaction is successfully locked (%s in cmd is replaced by TxID)</source>
         <translation>Suorita käsky kun lompakon InstantSend siirtotapahtuma on hyväksytysti lukittu (%s cmd on korvattu TxID:llä)</translation>
     </message>
+    <message>
+        <source>Extra transactions to keep in memory for compact block reconstructions (default: %u)</source>
+        <translation>Ekstra siirtotapahtumat pidetään muistivarannossa kompaktia lohkon rekonstruktiota varten (oletus: %u)</translation>
+    </message>
     <message>
         <source>Failed to create backup, file already exists! This could happen if you restarted wallet in less than 60 seconds. You can continue if you are ok with this.</source>
         <translation>Varmistus epäonnistui, tiedosto on jo olemassa! Tämä voi tapahtua jos olet käynnistänyt lompakon uudelleen alle 60 sek aikana. Voit jatkaa jos hyväksyt tämän.</translation>
@@ -4510,6 +4530,10 @@ Näillä toiminnoilla voit korjata korruptoituneen lohkoketjun tai puuttuvat/van
         <translation>Verkon version merkkijonon (%i) kokonaispituus ylittää maksimi pituuden (%i).
 Vähennä uakommenttien määrää tai kokoa.</translation>
     </message>
+    <message>
+        <source>Transaction index can't be disabled in full mode. Either start with -litemode command line switch or enable transaction index.</source>
+        <translation>Siirtotapahtumaindeksiä ei voi poistaa käytöstä normaalitilassa. Joko käynnistä -litemode komentorivin valinnalla tai ota käyttöön siirtotapahtumaindeksi.</translation>
+    </message>
     <message>
         <source>Tries to keep outbound traffic under the given target (in MiB per 24h), 0 = no limit (default: %d)</source>
         <translation>Yrittää pitää ulos menevän liikenteen alle annetun tavoitteen (MiB per 24h), 0 = ei rajaa (oletus: %d)</translation>
@@ -4542,6 +4566,10 @@ Vähennä uakommenttien määrää tai kokoa.</translation>
         <source>Warning: Unknown block versions being mined! It's possible unknown rules are in effect</source>
         <translation>Varoitus: Tuntemattomia lohkoversioita louhitaan! On mahdollista että tuntemattomia sääntöjä on käytössä</translation>
     </message>
+    <message>
+        <source>You are starting in lite mode, all Dash-specific functionality is disabled.</source>
+        <translation>Olet käynnistämässä lite tilassa, kaikki Dash-toiminnot ovat pois käytöstä.</translation>
+    </message>
     <message>
         <source>You need to rebuild the database using -reindex to go back to unpruned mode.  This will redownload the entire blockchain</source>
         <translation>Sinun tulee uudelleen rakentaa tietokanta käyttäen -reindex palataksesi takaisin 'ei karsita' tilaan. Tämä aiheuttaa koko lohkoketjun uudelleen lataamisen</translation>
@@ -4586,6 +4614,14 @@ Vähennä uakommenttien määrää tai kokoa.</translation>
         <source>Enable publish hash block in &lt;address&gt;</source>
         <translation>Ota käyttöön julkaise tarkistelohko osoitteessa &lt;address&gt;</translation>
     </message>
+    <message>
+        <source>Enable publish hash of governance objects (like proposals) in &lt;address&gt;</source>
+        <translation>Ota käyttöön julkaise hallinnon objektien tarkiste (esim ehdotus) &lt;address&gt;</translation>
+    </message>
+    <message>
+        <source>Enable publish hash of governance votes in &lt;address&gt;</source>
+        <translation>Ota käyttöön julkaise hallinnon äänten tarkiste &lt;address&gt;</translation>
+    </message>
     <message>
         <source>Enable publish hash transaction (locked via InstantSend) in &lt;address&gt;</source>
         <translation>Ota käyttöön julkaise siirtotapahtuman tarkiste (lukittu InstantSend kautta) osoitteessa &lt;address&gt;</translation>
@@ -4626,6 +4662,14 @@ Vähennä uakommenttien määrää tai kokoa.</translation>
         <source>Failed to delete backup, error: %s</source>
         <translation>Varmistuksen poisto epäonnistui, virhe: %s</translation>
     </message>
+    <message>
+        <source>Failed to load InstantSend data cache from</source>
+        <translation>InstantSend välimuistin lataaminen epäonnistui</translation>
+    </message>
+    <message>
+        <source>Failed to load sporks cache from</source>
+        <translation>Spork välimuistin lataaminen epäonnistui</translation>
+    </message>
     <message>
         <source>Failed to parse host:port string</source>
         <translation>Isäntä:portti merkkijonon jäsennys epäonnistui</translation>
@@ -4646,6 +4690,10 @@ Vähennä uakommenttien määrää tai kokoa.</translation>
         <source>Invalid amount for -fallbackfee=&lt;amount&gt;: '%s'</source>
         <translation>Virheellinen määrä -fallbackfee=&lt;amount&gt;: '%s'</translation>
     </message>
+    <message>
+        <source>Invalid input count.</source>
+        <translation>Virheellinen syötemäärä.</translation>
+    </message>
     <message>
         <source>Keep the transaction memory pool below &lt;n&gt; megabytes (default: %u)</source>
         <translation>Pidä siirtotapahtuma muistivaranto alle &lt;n&gt; megatavun (oletus: %u)</translation>
@@ -4662,6 +4710,10 @@ Vähennä uakommenttien määrää tai kokoa.</translation>
         <source>Line: %d</source>
         <translation>Rivi: %d</translation>
     </message>
+    <message>
+        <source>Loading InstantSend data cache...</source>
+        <translation>Ladataan InstantSend välimuistia...</translation>
+    </message>
     <message>
         <source>Loading addresses...</source>
         <translation>Ladataan osoitteita...</translation>
@@ -4672,7 +4724,11 @@ Vähennä uakommenttien määrää tai kokoa.</translation>
     </message>
     <message>
         <source>Loading governance cache...</source>
-        <translation>Ladataan budjetti välimuistia...</translation>
+        <translation>Ladataan hallinnon välimuistia...</translation>
+    </message>
+    <message>
+        <source>Loading sporks cache...</source>
+        <translation>Ladataan spork välimuistia...</translation>
     </message>
     <message>
         <source>Loading wallet... (%3.2f %%)</source>
@@ -4692,7 +4748,7 @@ Vähennä uakommenttien määrää tai kokoa.</translation>
     </message>
     <message>
         <source>Masternode cache is empty, skipping payments and governance cache...</source>
-        <translation>Masternode välimuisti on tyhjä, ohitetaan maksujen ja budjetin välimuisti...</translation>
+        <translation>Masternode välimuisti on tyhjä, ohitetaan maksujen ja hallinnon välimuisti...</translation>
     </message>
     <message>
         <source>Masternode options:</source>
@@ -4814,6 +4870,10 @@ Vähennä uakommenttien määrää tai kokoa.</translation>
         <source>Transaction must have at least one recipient</source>
         <translation>Lähetyksessä tulee olla ainakin yksi vastaanottaja</translation>
     </message>
+    <message>
+        <source>Transaction too large</source>
+        <translation>Siirtotapahtuma on liian iso</translation>
+    </message>
     <message>
         <source>Trying to connect...</source>
         <translation>Yritetään kytkeytyä...</translation>
@@ -4834,6 +4894,10 @@ Vähennä uakommenttien määrää tai kokoa.</translation>
         <source>Wallet debugging/testing options:</source>
         <translation>Lompakon debug ja testausvalinnat:</translation>
     </message>
+    <message>
+        <source>Wallet is not initialized</source>
+        <translation>Lompakko ei ole alustettu</translation>
+    </message>
     <message>
         <source>Wallet needed to be rewritten: restart %s to complete</source>
         <translation>Lompakko tarvitsee uudelleenkirjoittaa: käynnistä %s uudelleen</translation>
@@ -4850,6 +4914,10 @@ Vähennä uakommenttien määrää tai kokoa.</translation>
         <source>Whether to operate in a blocks only mode (default: %u)</source>
         <translation>Käytä vain lohkoja moodia (default: %u)</translation>
     </message>
+    <message>
+        <source>You can not start a masternode in lite mode.</source>
+        <translation>Et voi käynnistää masternodea lite tilassa.</translation>
+    </message>
     <message>
         <source>ZeroMQ notification options:</source>
         <translation>ZeroMQ ilmoitus asetukset:</translation>
@@ -5160,7 +5228,7 @@ Vähennä uakommenttien määrää tai kokoa.</translation>
     </message>
     <message>
         <source>Synchronizing governance objects...</source>
-        <translation>Ladataan budjetti objekteja...</translation>
+        <translation>Ladataan hallinnon objekteja...</translation>
     </message>
     <message>
         <source>Synchronizing masternode payments...</source>
diff --git a/src/qt/locale/dash_nl.ts b/src/qt/locale/dash_nl.ts
index 30a73a558617..268cfa39bce2 100644
--- a/src/qt/locale/dash_nl.ts
+++ b/src/qt/locale/dash_nl.ts
@@ -59,7 +59,7 @@
     </message>
     <message>
         <source>Receiving addresses</source>
-        <translation>Ontvanstgadressen</translation>
+        <translation>Ontvangstadressen</translation>
     </message>
     <message>
         <source>These are your Dash addresses for sending payments. Always check the amount and the receiving address before sending coins.</source>
@@ -71,15 +71,15 @@
     </message>
     <message>
         <source>&amp;Copy Address</source>
-        <translation>Kopieer adres</translation>
+        <translation>&amp;Kopiëer Adres</translation>
     </message>
     <message>
         <source>Copy &amp;Label</source>
-        <translation>Kopieer label</translation>
+        <translation>Kopiëer &amp;Label</translation>
     </message>
     <message>
         <source>&amp;Edit</source>
-        <translation>Bewerken</translation>
+        <translation>&amp;Bewerken</translation>
     </message>
     <message>
         <source>Export Address List</source>
@@ -95,7 +95,7 @@
     </message>
     <message>
         <source>There was an error trying to save the address list to %1. Please try again.</source>
-        <translation>Er was een probleem tijdens het opslaan van de adressenlijst naar %1. Probeer het alstublieft opnieuw.</translation>
+        <translation>Er is een fout is opgetreden tijdens het opslaan van deze adreslijst naar %1. Probeer het opnieuw.</translation>
     </message>
 </context>
 <context>
@@ -125,11 +125,11 @@
     </message>
     <message>
         <source>New passphrase</source>
-        <translation>Nieuw wachtwoordzin</translation>
+        <translation>Nieuwe wachtwoordzin</translation>
     </message>
     <message>
         <source>Repeat new passphrase</source>
-        <translation>Herhaal nieuw wachtwoordzin</translation>
+        <translation>Herhaal nieuwe wachtwoordzin</translation>
     </message>
     <message>
         <source>Enter the new passphrase to the wallet.&lt;br/&gt;Please use a passphrase of &lt;b&gt;ten or more random characters&lt;/b&gt;, or &lt;b&gt;eight or more words&lt;/b&gt;.</source>
@@ -283,7 +283,7 @@
     </message>
     <message>
         <source>&amp;Transactions</source>
-        <translation>&amp;Transactis</translation>
+        <translation>&amp;Transacties</translation>
     </message>
     <message>
         <source>Browse transaction history</source>
@@ -535,15 +535,15 @@
     </message>
     <message>
         <source>Indexing blocks on disk...</source>
-        <translation>Bezig met indexeren van blokken op harde schijf...</translation>
+        <translation>Bezig met indexeren van blocks op harde schijf...</translation>
     </message>
     <message>
         <source>Processing blocks on disk...</source>
-        <translation>Bezig met verwerken van blokken op harde schijf...</translation>
+        <translation>Bezig met verwerken van blocks op harde schijf...</translation>
     </message>
     <message>
         <source>Reindexing blocks on disk...</source>
-        <translation>Bezig met herindexeren van blokken op harde schijf...</translation>
+        <translation>Bezig met herindexeren van blocks op harde schijf...</translation>
     </message>
     <message>
         <source>Connecting to peers...</source>
@@ -551,7 +551,7 @@
     </message>
     <message numerus="yes">
         <source>Processed %n block(s) of transaction history.</source>
-        <translation><numerusform>%n blok van transactiehistorie verwerkt.</numerusform><numerusform>%n blokken van transactiehistorie verwerkt.</numerusform></translation>
+        <translation><numerusform>%n blok van transactiehistorie verwerkt.</numerusform><numerusform>%n blocks van transactiehistorie verwerkt.</numerusform></translation>
     </message>
     <message>
         <source>%1 behind</source>
@@ -1193,7 +1193,7 @@
     </message>
     <message>
         <source>Number of blocks left</source>
-        <translation>Aantal blokken resterend.</translation>
+        <translation>Aantal blocks resterend.</translation>
     </message>
     <message>
         <source>Unknown...</source>
@@ -2133,7 +2133,7 @@ Om te mixen moeten andere gebruikers exact dezelfde denominaties inbrengen.</tra
     </message>
     <message>
         <source>Current number of blocks</source>
-        <translation>Huidig aantal blokken</translation>
+        <translation>Huidig aantal blocks </translation>
     </message>
     <message>
         <source>Client version</source>
@@ -2225,7 +2225,7 @@ Om te mixen moeten andere gebruikers exact dezelfde denominaties inbrengen.</tra
     </message>
     <message>
         <source>Synced Blocks</source>
-        <translation>Gesynchroniseerde blokken</translation>
+        <translation>Gesynchroniseerde blocks </translation>
     </message>
     <message>
         <source>Wallet Path</source>
@@ -2297,7 +2297,7 @@ Om te mixen moeten andere gebruikers exact dezelfde denominaties inbrengen.</tra
     </message>
     <message>
         <source>Salvage wallet</source>
-        <translation>Gerede portemonnee</translation>
+        <translation>Herstel portemonnee</translation>
     </message>
     <message>
         <source>Rescan blockchain files</source>
@@ -2305,15 +2305,15 @@ Om te mixen moeten andere gebruikers exact dezelfde denominaties inbrengen.</tra
     </message>
     <message>
         <source>Recover transactions 1</source>
-        <translation>Herstelde transacties 1</translation>
+        <translation>Herstel transacties 1</translation>
     </message>
     <message>
         <source>Recover transactions 2</source>
-        <translation>Herstelde transacties 2</translation>
+        <translation>Herstel transacties 2</translation>
     </message>
     <message>
         <source>Upgrade wallet format</source>
-        <translation>Upgrade portemonnee formaat</translation>
+        <translation>Upgrade portemonnee</translation>
     </message>
     <message>
         <source>The buttons below will restart the wallet with command-line options to repair the wallet, fix issues with corrupt blockhain files or missing/obsolete transactions.</source>
@@ -2321,7 +2321,7 @@ Om te mixen moeten andere gebruikers exact dezelfde denominaties inbrengen.</tra
     </message>
     <message>
         <source>-salvagewallet: Attempt to recover private keys from a corrupt wallet.dat.</source>
-        <translation>-red portemonnee: Poging om geheime sleutels terug te halen uit het beschadigede portemonnee bestand (wallet.dat.)</translation>
+        <translation>-herstel portemonnee: Poging om geheime sleutels terug te halen uit het beschadigde portemonnee bestand (wallet.dat.)</translation>
     </message>
     <message>
         <source>-rescan: Rescan the block chain for missing wallet transactions.</source>
@@ -2329,15 +2329,15 @@ Om te mixen moeten andere gebruikers exact dezelfde denominaties inbrengen.</tra
     </message>
     <message>
         <source>-zapwallettxes=1: Recover transactions from blockchain (keep meta-data, e.g. account owner).</source>
-        <translation>-zapwallettxes=1: Herstelde transacties van de blokketen (behoud metadata; bv. accounteigenaar)</translation>
+        <translation>-zapwallettxes=1: Herstel transacties van de blocks(behoud metadata; bv. accounteigenaar)</translation>
     </message>
     <message>
         <source>-zapwallettxes=2: Recover transactions from blockchain (drop meta-data).</source>
-        <translation>-zapwallettxed=2: Herstelde transacties vanuit de blokketen (laat metadata vervallen)</translation>
+        <translation>-zapwallettxes=2: Herstel transacties vanuit de blocks (laat metadata vervallen)</translation>
     </message>
     <message>
         <source>-upgradewallet: Upgrade wallet to latest format on startup. (Note: this is NOT an update of the wallet itself!)</source>
-        <translation>-upgrade portemonnee= Upgrade portemonnee naar het laatste formaat bij het starten: (Noot: dit is GEEN update van de portemonnee zelf!)</translation>
+        <translation>-upgrade portemonnee= Upgrade portemonnee naar het laatste formaat bij het starten: (Let op: dit is GEEN update van de portemonnee zelf!)</translation>
     </message>
     <message>
         <source>Wallet repair options.</source>
@@ -2345,7 +2345,7 @@ Om te mixen moeten andere gebruikers exact dezelfde denominaties inbrengen.</tra
     </message>
     <message>
         <source>Rebuild index</source>
-        <translation>Herbouw de index</translation>
+        <translation>Herbouw index</translation>
     </message>
     <message>
         <source>-reindex: Rebuild block chain index from current blk000??.dat files.</source>
@@ -2752,7 +2752,7 @@ Nota: Het bericht zal niet verzonden worden met de betaling over het Dash netwer
     </message>
     <message>
         <source>Paying only the minimum fee is just fine as long as there is less transaction volume than space in the blocks.&lt;br /&gt;But be aware that this can end up in a never confirming transaction once there is more demand for dash transactions than the network can process.</source>
-        <translation>Het betalen van de minimale vergoeding is prima zo lang er minder transactie volume is dan ruimte in de blokken. &lt;br /&gt;Maar houd er rekening mee dat dit kan eindigen in een nooit bevestigde transactie zodra er meer vraag is voor Dash transacties fdan het netwerk kan verwerken.</translation>
+        <translation>Het betalen van de minimale vergoeding is prima zo lang er minder transactie volume is dan ruimte in de blocks. &lt;br /&gt;Maar houd er rekening mee dat dit kan eindigen in een nooit bevestigde transactie zodra er meer vraag is voor Dash transacties fdan het netwerk kan verwerken.</translation>
     </message>
     <message>
         <source>per kilobyte</source>
@@ -2780,7 +2780,7 @@ Nota: Het bericht zal niet verzonden worden met de betaling over het Dash netwer
     </message>
     <message>
         <source>(Smart fee not initialized yet. This usually takes a few blocks...)</source>
-        <translation>(Slimme kosten zijn nog niet geïnitialiseerd Dit duurt meestal een paar blokken...)</translation>
+        <translation>(Slimme kosten zijn nog niet geïnitialiseerd Dit duurt meestal een paar blocks ...)</translation>
     </message>
     <message>
         <source>normal</source>
@@ -2928,7 +2928,7 @@ Nota: Het bericht zal niet verzonden worden met de betaling over het Dash netwer
     </message>
     <message numerus="yes">
         <source>%n block(s)</source>
-        <translation><numerusform>%n blok</numerusform><numerusform>%n blokken</numerusform></translation>
+        <translation><numerusform>%n blok</numerusform><numerusform>%n blocks</numerusform></translation>
     </message>
     <message>
         <source>Pay only the required fee of %1</source>
@@ -2936,7 +2936,7 @@ Nota: Het bericht zal niet verzonden worden met de betaling over het Dash netwer
     </message>
     <message numerus="yes">
         <source>Estimated to begin confirmation within %n block(s).</source>
-        <translation><numerusform>Schatting is dat bevestiging begint binnen %n blok.</numerusform><numerusform>Schatting is dat bevestiging begint binnen %n blokken.</numerusform></translation>
+        <translation><numerusform>Schatting is dat bevestiging begint binnen %n blok.</numerusform><numerusform>Schatting is dat bevestiging begint binnen %n blocks.</numerusform></translation>
     </message>
     <message>
         <source>Warning: Invalid Dash address</source>
@@ -3221,7 +3221,7 @@ Nota: Het bericht zal niet verzonden worden met de betaling over het Dash netwer
     <name>TransactionDesc</name>
     <message numerus="yes">
         <source>Open for %n more block(s)</source>
-        <translation><numerusform>Open voor nog %n blok</numerusform><numerusform>Open voor nog %n blokken</numerusform></translation>
+        <translation><numerusform>Open voor nog %n blok</numerusform><numerusform>Open voor nog %n blocks</numerusform></translation>
     </message>
     <message>
         <source>Open until %1</source>
@@ -3325,7 +3325,7 @@ Nota: Het bericht zal niet verzonden worden met de betaling over het Dash netwer
     </message>
     <message numerus="yes">
         <source>matures in %n more block(s)</source>
-        <translation><numerusform>komt beschikbaar na %n nieuw blok</numerusform><numerusform>komt beschikbaar na %n nieuwe blokken</numerusform></translation>
+        <translation><numerusform>komt beschikbaar na %n nieuw blok</numerusform><numerusform>komt beschikbaar na %n nieuwe blocks</numerusform></translation>
     </message>
     <message>
         <source>not accepted</source>
@@ -3377,7 +3377,7 @@ Nota: Het bericht zal niet verzonden worden met de betaling over het Dash netwer
     </message>
     <message>
         <source>Generated coins must mature %1 blocks before they can be spent. When you generated this block, it was broadcast to the network to be added to the block chain. If it fails to get into the chain, its state will change to "not accepted" and it won't be spendable. This may occasionally happen if another node generates a block within a few seconds of yours.</source>
-        <translation>Gegenereerde munten moeten %1 blokken rijpen voordat ze kunnen worden besteed. Toen dit blok gegenereerd werd, werd het uitgezonden naar het netwerk om aan de blokketen toegevoegd te worden. Als het niet lukt om in de keten toegevoegd te worden, zal de status te veranderen naar "niet geaccepteerd" en zal het niet besteedbaar zijn. Dit kan soms gebeuren als een ander knooppunt een blok genereert binnen een paar seconden na die van u.</translation>
+        <translation>Gegenereerde munten moeten %1 blocks rijpen voordat ze kunnen worden besteed. Toen dit blok gegenereerd werd, werd het uitgezonden naar het netwerk om aan de blocks toegevoegd te worden. Als het niet lukt om in de keten toegevoegd te worden, zal de status te veranderen naar "niet geaccepteerd" en zal het niet besteedbaar zijn. Dit kan soms gebeuren als een ander knooppunt een block genereert binnen een paar seconden na die van u.</translation>
     </message>
     <message>
         <source>Debug information</source>
@@ -3431,7 +3431,7 @@ Nota: Het bericht zal niet verzonden worden met de betaling over het Dash netwer
     </message>
     <message numerus="yes">
         <source>Open for %n more block(s)</source>
-        <translation><numerusform>Open voor nog %n blok</numerusform><numerusform>Open voor nog %n blokken</numerusform></translation>
+        <translation><numerusform>Open voor nog %n blok</numerusform><numerusform>Open voor nog %n blocks</numerusform></translation>
     </message>
     <message>
         <source>Open until %1</source>
@@ -3993,11 +3993,11 @@ Nota: Het bericht zal niet verzonden worden met de betaling over het Dash netwer
     </message>
     <message>
         <source>How thorough the block verification of -checkblocks is (0-4, default: %u)</source>
-        <translation>Hoe grondig de blokverificatie van -checkblocks is (0-4, standaard: %u)</translation>
+        <translation>Hoe grondig de blockverificatie van -checkblocks is (0-4, standaard: %u)</translation>
     </message>
     <message>
         <source>If paytxfee is not set, include enough fee so transactions begin confirmation on average within n blocks (default: %u)</source>
-        <translation>Als paytxfee niet is ingesteld, voeg voldoende vergoeding toe zodat transacties starten met bevestigingen binnen n blokken (standaard: %u)</translation>
+        <translation>Als paytxfee niet is ingesteld, voeg voldoende vergoeding toe zodat transacties starten met bevestigingen binnen n blocks (standaard: %u)</translation>
     </message>
     <message>
         <source>If this block is in the chain assume that it and its ancestors are valid and potentially skip their script verification (0 to verify all, default: %s, testnet: %s)</source>
@@ -4113,7 +4113,7 @@ Nota: Het bericht zal niet verzonden worden met de betaling over het Dash netwer
     </message>
     <message>
         <source>How many blocks to check at startup (default: %u, 0 = all)</source>
-        <translation>Aantal te checken blokken bij het opstarten (standaard: %u, 0 = allemaal)</translation>
+        <translation>Aantal te checken blocks bij het opstarten (standaard: %u, 0 = allemaal)</translation>
     </message>
     <message>
         <source>Importing...</source>
@@ -4245,7 +4245,7 @@ Nota: Het bericht zal niet verzonden worden met de betaling over het Dash netwer
     </message>
     <message>
         <source>Rebuild chain state from the currently indexed blocks</source>
-        <translation>Herbouw ketenstaat vanuit de huidige geindexeerde blokken</translation>
+        <translation>Herbouw ketenstaat vanuit de huidige geindexeerde blocks</translation>
     </message>
     <message>
         <source>Send trace/debug info to debug.log file (default: %u)</source>
@@ -4485,7 +4485,7 @@ Nota: Het bericht zal niet verzonden worden met de betaling over het Dash netwer
     </message>
     <message>
         <source>Maintain a timestamp index for block hashes, used to query blocks hashes by a range of timestamps (default: %u)</source>
-        <translation>Hou een tijdstempelindex bij voor blok hashes, wordt gebruikt om blokhashes op te vragen voor een bereik aan tijdstempels (standaard: %u)</translation>
+        <translation>Hou een tijdstempelindex bij voor block hashes, wordt gebruikt om blockhashes op te vragen voor een bereik aan tijdstempels (standaard: %u)</translation>
     </message>
     <message>
         <source>Maintain at most &lt;n&gt; connections to peers (temporary service connections excluded) (default: %u)</source>
@@ -4517,7 +4517,7 @@ Nota: Het bericht zal niet verzonden worden met de betaling over het Dash netwer
     </message>
     <message>
         <source>Support filtering of blocks and transaction with bloom filters (default: %u)</source>
-        <translation>Ondersteun filtering van blokken en transacties met bloomfilters (standaard: %u)</translation>
+        <translation>Ondersteun filtering van blocks en transacties met bloomfilters (standaard: %u)</translation>
     </message>
     <message>
         <source>The block database contains a block which appears to be from the future. This may be due to your computer's date and time being set incorrectly. Only rebuild the block database if you are sure that your computer's date and time are correct</source>
@@ -4681,7 +4681,7 @@ Nota: Het bericht zal niet verzonden worden met de betaling over het Dash netwer
     </message>
     <message>
         <source>Imports blocks from external blk000??.dat file on startup</source>
-        <translation>Importeer blokken van externe blk000??.dat-bestand bij opstarten</translation>
+        <translation>Importeer blocks van externe blk000??.dat-bestand bij opstarten</translation>
     </message>
     <message>
         <source>InstantSend options:</source>
@@ -4913,7 +4913,7 @@ Nota: Het bericht zal niet verzonden worden met de betaling over het Dash netwer
     </message>
     <message>
         <source>Whether to operate in a blocks only mode (default: %u)</source>
-        <translation>Om in alleen een blokmodus te opereren (standaard: %u)</translation>
+        <translation>Om in alleen een blockmodus te opereren (standaard: %u)</translation>
     </message>
     <message>
         <source>You can not start a masternode in lite mode.</source>
@@ -5001,7 +5001,7 @@ Nota: Het bericht zal niet verzonden worden met de betaling over het Dash netwer
     </message>
     <message>
         <source>Reduce storage requirements by enabling pruning (deleting) of old blocks. This allows the pruneblockchain RPC to be called to delete specific blocks, and enables automatic pruning of old blocks if a target size in MiB is provided. This mode is incompatible with -txindex and -rescan. Warning: Reverting this setting requires re-downloading the entire blockchain. (default: 0 = disable pruning blocks, 1 = allow manual pruning via RPC, &gt;%u = automatically prune block files to stay under the specified target size in MiB)</source>
-        <translation>Beperk benodigde opslag door het prunen (verwijderen) van oude blokken in te schakelen. Dit maakt het mogelijk om het pruneblockchain RPC commando aan te roepen om specifieke bloks te verwijderen, en maakt het automatische prunen van oude bloks mogelijk wanneer een doelgrootte in MiB is ingesteld. Deze modus is niet compatibel met -txindex en -rescan. Waarschuwing: ongedaan maken van deze instellingen vereist het opnieuw downloaden van gehele de blokketen. (standaard:0 = uitschakelen prunen, 1 = handmatig prunen via RPC toestaan, &gt;%u = automatisch blokketen bestanden prunen om beneden de gespecificeerde doelgrootte in MiB te blijven)</translation>
+        <translation>Beperk benodigde opslag door het prunen (verwijderen) van oude blocks in te schakelen. Dit maakt het mogelijk om het pruneblockchain RPC commando aan te roepen om specifieke blocks te verwijderen, en maakt het automatische prunen van oude blocks mogelijk wanneer een doelgrootte in MiB is ingesteld. Deze modus is niet compatibel met -txindex en -rescan. Waarschuwing: ongedaan maken van deze instellingen vereist het opnieuw downloaden van gehele de blocks. (standaard:0 = uitschakelen prunen, 1 = handmatig prunen via RPC toestaan, &gt;%u = automatisch blokketen bestanden prunen om beneden de gespecificeerde doelgrootte in MiB te blijven)</translation>
     </message>
     <message>
         <source>Set lowest fee rate (in %s/kB) for transactions to be included in block creation. (default: %s)</source>
@@ -5289,7 +5289,7 @@ Nota: Het bericht zal niet verzonden worden met de betaling over het Dash netwer
     </message>
     <message>
         <source>Verifying blocks...</source>
-        <translation>Blokken aan het controleren...</translation>
+        <translation>blocks aan het controleren...</translation>
     </message>
     <message>
         <source>Verifying wallet...</source>
diff --git a/src/qt/locale/dash_pt.ts b/src/qt/locale/dash_pt.ts
index eb99ef649b4f..66e2d643a027 100644
--- a/src/qt/locale/dash_pt.ts
+++ b/src/qt/locale/dash_pt.ts
@@ -793,6 +793,10 @@
         <source>Please switch to "List mode" to use this function.</source>
         <translation>Por favor alterne para "Modo lista" para usar essa função.</translation>
     </message>
+    <message>
+        <source>Non-anonymized input selected. &lt;b&gt;PrivateSend will be disabled.&lt;/b&gt;&lt;br&gt;&lt;br&gt;If you still want to use PrivateSend, please deselect all non-anonymized inputs first and then check the PrivateSend checkbox again.</source>
+        <translation>Entrada não anônima selecionada. &lt;b&gt;O PrivateSend será desativado.&lt;/b&gt; &lt;br&gt; &lt;br&gt; Se você ainda quiser usar o PrivateSend, desmarque primeiro todas as entradas não modificadas e marque a caixa de seleção PrivateSend novamente.</translation>
+    </message>
     <message>
         <source>(%1 locked)</source>
         <translation>(%1 bloqueado)</translation>
@@ -966,7 +970,11 @@
         <source>PrivateSend information</source>
         <translation>Informação de Envio&amp;Privado</translation>
     </message>
-    </context>
+    <message>
+        <source>&lt;h3&gt;PrivateSend Basics&lt;/h3&gt; PrivateSend gives you true financial privacy by obscuring the origins of your funds. All the Dash in your wallet is comprised of different "inputs" which you can think of as separate, discrete coins.&lt;br&gt; PrivateSend uses an innovative process to mix your inputs with the inputs of two other people, without having your coins ever leave your wallet. You retain control of your money at all times.&lt;hr&gt; &lt;b&gt;The PrivateSend process works like this:&lt;/b&gt;&lt;ol type="1"&gt; &lt;li&gt;PrivateSend begins by breaking your transaction inputs down into standard denominations. These denominations are 0.01 DASH, 0.1 DASH, 1 DASH and 10 DASH -- sort of like the paper money you use every day.&lt;/li&gt; &lt;li&gt;Your wallet then sends requests to specially configured software nodes on the network, called "masternodes." These masternodes are informed then that you are interested in mixing a certain denomination. No identifiable information is sent to the masternodes, so they never know "who" you are.&lt;/li&gt; &lt;li&gt;When two other people send similar messages, indicating that they wish to mix the same denomination, a mixing session begins. The masternode mixes up the inputs and instructs all three users' wallets to pay the now-transformed input back to themselves. Your wallet pays that denomination directly to itself, but in a different address (called a change address).&lt;/li&gt; &lt;li&gt;In order to fully obscure your funds, your wallet must repeat this process a number of times with each denomination. Each time the process is completed, it's called a "round." Each round of PrivateSend makes it exponentially more difficult to determine where your funds originated.&lt;/li&gt; &lt;li&gt;This mixing process happens in the background without any intervention on your part. When you wish to make a transaction, your funds will already be anonymized. No additional waiting is required.&lt;/li&gt; &lt;/ol&gt; &lt;hr&gt;&lt;b&gt;IMPORTANT:&lt;/b&gt; Your wallet only contains 1000 of these "change addresses." Every time a mixing event happens, up to 9 of your addresses are used up. This means those 1000 addresses last for about 100 mixing events. When 900 of them are used, your wallet must create more addresses. It can only do this, however, if you have automatic backups enabled.&lt;br&gt; Consequently, users who have backups disabled will also have PrivateSend disabled. &lt;hr&gt;For more information, see the &lt;a href="https://docs.dash.org/en/latest/wallets/dashcore/privatesend-instantsend.html"&gt;PrivateSend documentation&lt;/a&gt;.         </source>
+        <translation>&lt;h3&gt;O básico sobre EnvioPrivado&lt;/h3&gt;O EnvioPrivado te dá verdadeira privacidade financeira ao obscurecer a origem dos seus fundos. Todos os dashs na sua carteira é composto de "inputs" diferentes que você pode pensar como sendo moedas separadas, discretas.&lt;br&gt;O EnvioPrivado usa um processo inovador para misturas os inputs de duas pessoas diferentes, sem que suas moedas saiam de suas carteiras. Você mantém o controle de seu dinheiro o tempo todo.. &lt;hr&gt;&lt;b&gt;O processo do EnvioPrivado funciona assim: &lt;/b&gt;&lt;li&gt;O EnvioPrivado começa quebrando os inputs de suuas transações em denominações padrão. Essas denominações são 0.01 DASH, 0.1 DASH, 1 DASH e 10 DASH -- algo como o dinheiro de papel que você usa todo dia.&lt;/li&gt;Sua carteira então envia uma requisição para um software especialmente configurado na rede, chamados de "masternodes." Esses masternodes são informados que você está interessado em misturar uma denominação específica. Nenhuma informação identificável é enviada aos masternodes, então eles nunca sabem "quem" você é.&lt;li&gt;Quando duas pessoas enviam mensagens similares, uma sessão de mistura tem início. O masternode mistura os inputs e instrui os três usuários da carteira para pagar o input agora transformado de volta a si mesmos. Sua carteira paga a denominação diretamente a si mesmo, mas em um endereço diferente (chamado de endereço mudado).&lt;li&gt;A fim de obscurecer plenamente seus fundos, sua carteira repete esse processo várias vezes com cada denominação. Cada vez que o processo é completado, se chama um "round". Cada round de EnvioPrivado torna exponencialmente mais difícil determinar onde os fundos se originaram.&lt;li&gt;Esse processo de mistura acontece no background sem nenhuma intervenção da sua parte. Quando você deseja fazer uma transação, seus fundos jã estarão anonimizados. Nenhuma espera adicional é requerida.&lt;li&gt;&lt;ol type="1"&gt;&lt;hr&gt;IMPORTANTE: &lt;b&gt;Sua carteira só contém 1000 desses "endereços mudados." Cada vez que um evento de mistura acontece, 9 de seus endereços são usados. Isso indica que esses 1000 endereços duram por cerca de 100 eventos de mistura. Quando 900 desses endereços são usados, sua carteira deve criar mais endereços. Contudo, ela só é capaz de fazer isso se você tem o backup automático habilitado.&lt;br&gt;Consequentemente, usuários que têm seus backups desabilitados também terão o EnvioPrivado desabilitado. &lt;hr&gt;Para mais informações, consulte a &lt;a href="https://docs.dash.org/en/latest/wallets/dashcore/privatesend-instantsend.html"&gt;documentação do PrivateSend&lt;/a&gt;.</translation>
+    </message>
+</context>
 <context>
     <name>Intro</name>
     <message>
@@ -1754,6 +1762,10 @@ https://www.transifex.com/projects/p/dash/</translation>
         <source>We are about to create a new automatic backup for you, however &lt;span style='color:red;'&gt; you should always make sure you have backups saved in some safe place&lt;/span&gt;!</source>
         <translation>Estamos prestes a criar um novo backup automático para você, no entanto&lt;span style='color:red;'&gt;, você deve sempre garantir que você tenha backups salvos em algum lugar seguro&lt;/span&gt;!</translation>
     </message>
+    <message>
+        <source>Note: You can turn this message off in options.</source>
+        <translation>Nota: Você pode desativar essa mensagem nas opções.</translation>
+    </message>
     <message>
         <source>WARNING! Something went wrong on automatic backup</source>
         <translation>ALERTA! Algo de errado ocorreu com o backup automático</translation>
@@ -4401,6 +4413,10 @@ https://www.transifex.com/projects/p/dash/</translation>
         <source>Disable all Dash specific functionality (Masternodes, PrivateSend, InstantSend, Governance) (0-1, default: %u)</source>
         <translation>Desabilitar todas as funcionalidades específicas da Dash (Masternodes, EnvioPrivado, EnvioInstantâneo, Governança) (0-1, default: %u)</translation>
     </message>
+    <message>
+        <source>%s file contains all private keys from this wallet. Do not share it with anyone!</source>
+        <translation>%s arquivo contém todas as chaves privadas desta carteira. Não compartilhe com ninguém!</translation>
+    </message>
     <message>
         <source>Discover own IP addresses (default: 1 when listening and no -externalip or -proxy)</source>
         <translation>Descobrir o próprio IP (padrão: 1 enquanto aguardando conexões e sem -externalip ou -proxy)</translation>
@@ -4425,6 +4441,10 @@ https://www.transifex.com/projects/p/dash/</translation>
         <source>Execute command when a wallet InstantSend transaction is successfully locked (%s in cmd is replaced by TxID)</source>
         <translation>Execute comando quando uma transação EnvioInstantâneo numa carteira é fechada com sucesso (%s no cmd  é substituído por TxID)</translation>
     </message>
+    <message>
+        <source>Extra transactions to keep in memory for compact block reconstructions (default: %u)</source>
+        <translation>Transações extras para manter na memória para reconstruções do blocos compactos (padrão: %u)</translation>
+    </message>
     <message>
         <source>Failed to create backup, file already exists! This could happen if you restarted wallet in less than 60 seconds. You can continue if you are ok with this.</source>
         <translation>Falha em criar o backup, o arquivo já existe! Isso pode ter acontecido se você resetou sua carteira em menos de 60 segundos. Você pode continuar se está ok com isso.</translation>
@@ -4505,6 +4525,10 @@ https://www.transifex.com/projects/p/dash/</translation>
         <source>Total length of network version string (%i) exceeds maximum length (%i). Reduce the number or size of uacomments.</source>
         <translation>O tamanho total da string de versão da rede (%i) excede o tamanho máximo (%i). Reduza o numero ou tamanho de uacomments.</translation>
     </message>
+    <message>
+        <source>Transaction index can't be disabled in full mode. Either start with -litemode command line switch or enable transaction index.</source>
+        <translation>O índice de transação não pode ser desativado no modo completo. Inicie com o comutador na linha de comando -litemode ou ative o índice de transação.</translation>
+    </message>
     <message>
         <source>Tries to keep outbound traffic under the given target (in MiB per 24h), 0 = no limit (default: %d)</source>
         <translation>Tenta manter tráfego fora dos limites dentro do alvo especificado (em MiB por 24h), 0 = sem limite (padrão: %d)</translation>
@@ -4537,6 +4561,10 @@ https://www.transifex.com/projects/p/dash/</translation>
         <source>Warning: Unknown block versions being mined! It's possible unknown rules are in effect</source>
         <translation>Alerta: Versões de blocos desconhecidas mineradas! É possível que regras desconhecidas estejam ativas</translation>
     </message>
+    <message>
+        <source>You are starting in lite mode, all Dash-specific functionality is disabled.</source>
+        <translation>Você está começando no modo light, todas as funcionalidades específicas do Dash estão desativadas.</translation>
+    </message>
     <message>
         <source>You need to rebuild the database using -reindex to go back to unpruned mode.  This will redownload the entire blockchain</source>
         <translation>Você precisa reconstruir o banco de dados usando -reindex para sair do modo prune. Isso irá rebaixar todo o blockchain.</translation>
@@ -4581,6 +4609,14 @@ https://www.transifex.com/projects/p/dash/</translation>
         <source>Enable publish hash block in &lt;address&gt;</source>
         <translation>Abilitar a publicação da hash do block em &lt;endereço&gt;</translation>
     </message>
+    <message>
+        <source>Enable publish hash of governance objects (like proposals) in &lt;address&gt;</source>
+        <translation>Ativar o hash de publicação de objetos de controle (como propostas) em &lt;address&gt;</translation>
+    </message>
+    <message>
+        <source>Enable publish hash of governance votes in &lt;address&gt;</source>
+        <translation>Ativar o hash de publicação de votos da governança em &lt;address&gt;</translation>
+    </message>
     <message>
         <source>Enable publish hash transaction (locked via InstantSend) in &lt;address&gt;</source>
         <translation>Ative a transação de hash de publicação (bloqueada via InstantSend) em&lt;address&gt;</translation>
@@ -4621,6 +4657,14 @@ https://www.transifex.com/projects/p/dash/</translation>
         <source>Failed to delete backup, error: %s</source>
         <translation>Falha ao apagar backup, erro: %s</translation>
     </message>
+    <message>
+        <source>Failed to load InstantSend data cache from</source>
+        <translation>Falha ao carregar o cache de dados do InstantSend de</translation>
+    </message>
+    <message>
+        <source>Failed to load sporks cache from</source>
+        <translation>Falha ao carregar o cache de sporks de</translation>
+    </message>
     <message>
         <source>Failed to parse host:port string</source>
         <translation>Falha ao avaliar a string host:port</translation>
@@ -4641,6 +4685,10 @@ https://www.transifex.com/projects/p/dash/</translation>
         <source>Invalid amount for -fallbackfee=&lt;amount&gt;: '%s'</source>
         <translation>Valor inválido para -fallbackfee=&lt;amount&gt;: '%s'</translation>
     </message>
+    <message>
+        <source>Invalid input count.</source>
+        <translation>Contagem de entrada inválida.</translation>
+    </message>
     <message>
         <source>Keep the transaction memory pool below &lt;n&gt; megabytes (default: %u)</source>
         <translation>Mantenha a mempool de transações abaixo de &lt;n&gt; megabytes (padrão: %u)</translation>
@@ -4657,6 +4705,10 @@ https://www.transifex.com/projects/p/dash/</translation>
         <source>Line: %d</source>
         <translation>Linha: %d</translation>
     </message>
+    <message>
+        <source>Loading InstantSend data cache...</source>
+        <translation>Carregando o cache de dados do InstantSend ...</translation>
+    </message>
     <message>
         <source>Loading addresses...</source>
         <translation>Carregando endereços...</translation>
@@ -4669,6 +4721,10 @@ https://www.transifex.com/projects/p/dash/</translation>
         <source>Loading governance cache...</source>
         <translation>Sincronizando cache de governança ....</translation>
     </message>
+    <message>
+        <source>Loading sporks cache...</source>
+        <translation>Carregando o cache de sporks ...</translation>
+    </message>
     <message>
         <source>Loading wallet... (%3.2f %%)</source>
         <translation>Carregando carteira... (%3.2f %%)</translation>
@@ -4809,6 +4865,10 @@ https://www.transifex.com/projects/p/dash/</translation>
         <source>Transaction must have at least one recipient</source>
         <translation>A transação deve ter ao menos um destinatário</translation>
     </message>
+    <message>
+        <source>Transaction too large</source>
+        <translation>Transação muito grande</translation>
+    </message>
     <message>
         <source>Trying to connect...</source>
         <translation>Tentando se conectar...</translation>
@@ -4829,6 +4889,10 @@ https://www.transifex.com/projects/p/dash/</translation>
         <source>Wallet debugging/testing options:</source>
         <translation>Opções de depuração/teste da Carteira</translation>
     </message>
+    <message>
+        <source>Wallet is not initialized</source>
+        <translation>Carteira não inicializada</translation>
+    </message>
     <message>
         <source>Wallet needed to be rewritten: restart %s to complete</source>
         <translation>A Carteira precisa ser reescrita: reinicie o %s para completar</translation>
@@ -4845,6 +4909,10 @@ https://www.transifex.com/projects/p/dash/</translation>
         <source>Whether to operate in a blocks only mode (default: %u)</source>
         <translation>Se é para operar em modo somente blocos (padrão: %u)</translation>
     </message>
+    <message>
+        <source>You can not start a masternode in lite mode.</source>
+        <translation>Você não pode iniciar um masternode no modo light.</translation>
+    </message>
     <message>
         <source>ZeroMQ notification options:</source>
         <translation>ZeroMQ notificação opções </translation>
diff --git a/src/qt/locale/dash_sk.ts b/src/qt/locale/dash_sk.ts
index 942af40b7aed..7dcea13cb3c0 100644
--- a/src/qt/locale/dash_sk.ts
+++ b/src/qt/locale/dash_sk.ts
@@ -793,6 +793,10 @@
         <source>Please switch to "List mode" to use this function.</source>
         <translation>Pre použitie tejto funkcie prepnite na "Zoznamový mód".</translation>
     </message>
+    <message>
+        <source>Non-anonymized input selected. &lt;b&gt;PrivateSend will be disabled.&lt;/b&gt;&lt;br&gt;&lt;br&gt;If you still want to use PrivateSend, please deselect all non-anonymized inputs first and then check the PrivateSend checkbox again.</source>
+        <translation>Vybratý ne-anonymizovaný vstup. &lt;b&gt;PrivateSend bude vypnutý.&lt;/b&gt;&lt;br&gt;&lt;br&gt;Ak si stále želáte použiť PrivateSend, najskôr odznačte všetky ne-anonymizované vstupy a potom znova zaškrtnite PrivateSend políčko.</translation>
+    </message>
     <message>
         <source>(%1 locked)</source>
         <translation>(%1 zamknutých)</translation>
@@ -966,7 +970,11 @@
         <source>PrivateSend information</source>
         <translation>Informácie o PrivateSend</translation>
     </message>
-    </context>
+    <message>
+        <source>&lt;h3&gt;PrivateSend Basics&lt;/h3&gt; PrivateSend gives you true financial privacy by obscuring the origins of your funds. All the Dash in your wallet is comprised of different "inputs" which you can think of as separate, discrete coins.&lt;br&gt; PrivateSend uses an innovative process to mix your inputs with the inputs of two other people, without having your coins ever leave your wallet. You retain control of your money at all times.&lt;hr&gt; &lt;b&gt;The PrivateSend process works like this:&lt;/b&gt;&lt;ol type="1"&gt; &lt;li&gt;PrivateSend begins by breaking your transaction inputs down into standard denominations. These denominations are 0.01 DASH, 0.1 DASH, 1 DASH and 10 DASH -- sort of like the paper money you use every day.&lt;/li&gt; &lt;li&gt;Your wallet then sends requests to specially configured software nodes on the network, called "masternodes." These masternodes are informed then that you are interested in mixing a certain denomination. No identifiable information is sent to the masternodes, so they never know "who" you are.&lt;/li&gt; &lt;li&gt;When two other people send similar messages, indicating that they wish to mix the same denomination, a mixing session begins. The masternode mixes up the inputs and instructs all three users' wallets to pay the now-transformed input back to themselves. Your wallet pays that denomination directly to itself, but in a different address (called a change address).&lt;/li&gt; &lt;li&gt;In order to fully obscure your funds, your wallet must repeat this process a number of times with each denomination. Each time the process is completed, it's called a "round." Each round of PrivateSend makes it exponentially more difficult to determine where your funds originated.&lt;/li&gt; &lt;li&gt;This mixing process happens in the background without any intervention on your part. When you wish to make a transaction, your funds will already be anonymized. No additional waiting is required.&lt;/li&gt; &lt;/ol&gt; &lt;hr&gt;&lt;b&gt;IMPORTANT:&lt;/b&gt; Your wallet only contains 1000 of these "change addresses." Every time a mixing event happens, up to 9 of your addresses are used up. This means those 1000 addresses last for about 100 mixing events. When 900 of them are used, your wallet must create more addresses. It can only do this, however, if you have automatic backups enabled.&lt;br&gt; Consequently, users who have backups disabled will also have PrivateSend disabled. &lt;hr&gt;For more information, see the &lt;a href="https://docs.dash.org/en/latest/wallets/dashcore/privatesend-instantsend.html"&gt;PrivateSend documentation&lt;/a&gt;.         </source>
+        <translation>&lt;h3&gt;Základy PrivateSend&lt;/h3&gt; PrivateSend Vám poskytuje skutočné finančné súkromie skrývaním pôvodu Vašich zdrojov. Všetky Dash vo vašej peňaženke pozostávajú z rôznych "vstupov", ktoré si môžete predstaviť ako rozdelené, which you can think of as separate, diskrétne mince.&lt;br&gt; PrivateSend používa zdokonalený proces pre miešanie Vašich vstupov so vstupmi iných ľudí bez toho. aby Vaše mince museli opustiť Vašu peňaženku. Počas cele doby máte kontrolu nad Vašimi peniazmi.&lt;hr&gt; &lt;b&gt;Proces PrivateSend funguje nasledovne:&lt;/b&gt;&lt;ol type="1"&gt; &lt;li&gt;PrivateSend začne rozdelením Vašich transakčných vstupov na štandardné časti, takzvané denominácie. Tieto denominácie sú 0.01 DASH, 0.1 DASH, 1 DASH a 10 DASH -- v podstate niečo ako papierové peniaze, ktoré používate každý deň.&lt;/li&gt; &lt;li&gt;Vaša peňaženka potom pošle požiadavok špeciálne nastavenému softvérovému uzlu nazvaného "Masternode". Tieto Masternode sú potom informované, že máte záujem miešať určité denominácie. Masternode neobdrží žiadne informácie ktoré by Vás identifikovali, takže niekdy nevedia kto ste.&lt;/li&gt; &lt;li&gt;Keď ďalší dvaja ľudia pošlú podobnú správu hovoriacu o tom že chcú miešať rovnakú denomináciu, začne sa samotné miešanie. Masternode zamieša vstupy a povie peňaženkám všetkých troch používateľov, aby zaplatili teraz už zmiešané vstupy sami sebe. Vaša peňaženka zaplatí tieto denominácie priamo sebe, ale už na inú adresu (nazývanú "meniaca adresa").&lt;/li&gt; &lt;li&gt;Aby boli Vaše zdroje plne zakryté, Vaša peňaženka musí zopakovať tento proces niekoľko krát s každou denomináciou.  Vždy keď je tento proces dokončený, je nazvaný "kolo". Každé kolo PrivateSend exponenciálne sťažuje určiť odkiaľ pochádzajú Vaše zdroje.&lt;/li&gt; &lt;li&gt;Toto miešanie sa deje na pozadí bez nutnosti zásahov z Vašej strany. Keď si prajete uskutočniť transakciu, Vaše zdroje budú už anonýmne. Nie je nutné na nič čakať.&lt;/li&gt; &lt;/ol&gt; &lt;hr&gt; &lt;b&gt;DÔLEŽITÉ:&lt;/b&gt; Vaša peňaženka obsahuje iba 1000 týchto "meniacich adries". Vždy keď prebehne miešanie, použije sa maximálne až 9 Vašich adries. To znamená, že týchto 1000 adries vystačí zhruba na 100 miešaní. Keď sa použije 900 adries, Vaša peňaženka musí vytvoriť viac adries. Toto je však možné iba vtedy, keď máte zapnuté automatické zálohovanie.&lt;br&gt; V dôsledku toho, používatelia ktorí majú zálohovanie vypnuté, budú mať vypnutý aj PrivateSend. &lt;hr&gt;&lt;a href="https://docs.dash.org/en/latest/wallets/dashcore/privatesend-instantsend.html"&gt;Viac informácií nájdete v dokumentácii PrivateSend&lt;/a&gt;.</translation>
+    </message>
+</context>
 <context>
     <name>Intro</name>
     <message>
@@ -1754,6 +1762,10 @@ https://www.transifex.com/projects/p/dash/</translation>
         <source>We are about to create a new automatic backup for you, however &lt;span style='color:red;'&gt; you should always make sure you have backups saved in some safe place&lt;/span&gt;!</source>
         <translation>Chystáme sa pre Vás vytvoriť automatickú zálohu, avšak &lt;span style='color:red;'&gt;mali by ste sa uistiť, že máte zálohy uložené na bezpečnom mieste&lt;/span&gt;!</translation>
     </message>
+    <message>
+        <source>Note: You can turn this message off in options.</source>
+        <translation>Poznámka: Túto správu môžete vypnúť v nastaveniach.</translation>
+    </message>
     <message>
         <source>WARNING! Something went wrong on automatic backup</source>
         <translation>UPOZORNENIE: S automatickými zálohami nie je niečo v poriadku</translation>
@@ -2143,7 +2155,7 @@ https://www.transifex.com/projects/p/dash/</translation>
     </message>
     <message>
         <source>Current number of transactions</source>
-        <translation>Aktuálny počet tranzakcií</translation>
+        <translation>Aktuálny počet transakcií</translation>
     </message>
     <message>
         <source>Memory usage</source>
@@ -4402,6 +4414,10 @@ https://www.transifex.com/projects/p/dash/</translation>
         <source>Disable all Dash specific functionality (Masternodes, PrivateSend, InstantSend, Governance) (0-1, default: %u)</source>
         <translation>Vypnúť všetky funkcie špecifické pre Dash (Masternodes, PrivateSend, InstantSend, Vláda) (0-1, predvolené: %u)</translation>
     </message>
+    <message>
+        <source>%s file contains all private keys from this wallet. Do not share it with anyone!</source>
+        <translation>Súbor %s obsahuje všetky súkromné kľúče z tejto peňaženky. Nezdieľajte s nikým!</translation>
+    </message>
     <message>
         <source>Discover own IP addresses (default: 1 when listening and no -externalip or -proxy)</source>
         <translation>Zisti vlastnú IP adresu (predvolené: 1 pre listen a -externalip alebo -proxy)</translation>
@@ -4426,6 +4442,10 @@ https://www.transifex.com/projects/p/dash/</translation>
         <source>Execute command when a wallet InstantSend transaction is successfully locked (%s in cmd is replaced by TxID)</source>
         <translation>Spustiť príkaz keď je InstantSend zmení úspešne zamknutá (%s v cmd sa nahrádza TxID)</translation>
     </message>
+    <message>
+        <source>Extra transactions to keep in memory for compact block reconstructions (default: %u)</source>
+        <translation>Extra transakcie na uchovanie v pamäti, určené pre rekonštrukciu kompaktného bloku (predvolené: %u)</translation>
+    </message>
     <message>
         <source>Failed to create backup, file already exists! This could happen if you restarted wallet in less than 60 seconds. You can continue if you are ok with this.</source>
         <translation>Chyba pri vytváraní zálohy, lebo súbor už existuje! Toto môže nastať v prípade, ak ste reštartovali peňaženku za menej ako 60 sekúnd. Ak Vám to nevadí, môžete pokračovať.</translation>
@@ -4500,12 +4520,16 @@ https://www.transifex.com/projects/p/dash/</translation>
     </message>
     <message>
         <source>The transaction amount is too small to send after the fee has been deducted</source>
-        <translation>Suma je príliš malá pre odoslanie tranzakcie</translation>
+        <translation>Po odpočítaní poplatku je suma transakcie príliš malá pre odoslanie</translation>
     </message>
     <message>
         <source>Total length of network version string (%i) exceeds maximum length (%i). Reduce the number or size of uacomments.</source>
         <translation>Celková dĺžka verzie sieťového reťazca (%i) prekračuje maximálnu dĺžku (%i). Znížte počet a veľkosť parametra  uacomments.</translation>
     </message>
+    <message>
+        <source>Transaction index can't be disabled in full mode. Either start with -litemode command line switch or enable transaction index.</source>
+        <translation>Index transakcií nie je možné deaktivovať v plnom režime. Buď začnite s prepínačom príkazového riadka -litemode alebo aktivujte index transakcií.</translation>
+    </message>
     <message>
         <source>Tries to keep outbound traffic under the given target (in MiB per 24h), 0 = no limit (default: %d)</source>
         <translation>Sa snaží držať odchádzajúce prevádzku v rámci daného cieľa (v MB za 24h), 0 = žiadny limit (predvolený: %d)</translation>
@@ -4538,6 +4562,10 @@ https://www.transifex.com/projects/p/dash/</translation>
         <source>Warning: Unknown block versions being mined! It's possible unknown rules are in effect</source>
         <translation>Upozornenie: Ťaží sa neznáma verzia blokov! Je možné, že sú v platnosti neznáme pravidlá</translation>
     </message>
+    <message>
+        <source>You are starting in lite mode, all Dash-specific functionality is disabled.</source>
+        <translation>Začínate v režime Lite, všetky funkcie špecifické pre Dash sú deaktivované.</translation>
+    </message>
     <message>
         <source>You need to rebuild the database using -reindex to go back to unpruned mode.  This will redownload the entire blockchain</source>
         <translation>K návratu k neorezanému režimu je treba prestavať databázu použitím -reindex. Tiež sa znova stiahne celý blockchain</translation>
@@ -4582,13 +4610,21 @@ https://www.transifex.com/projects/p/dash/</translation>
         <source>Enable publish hash block in &lt;address&gt;</source>
         <translation>Povoliť zverejneneie hash blokov pre &lt;address&gt;</translation>
     </message>
+    <message>
+        <source>Enable publish hash of governance objects (like proposals) in &lt;address&gt;</source>
+        <translation>Povoliť zverejnenie hash objektov správy (ako napr. návrhy) pre &lt;address&gt;</translation>
+    </message>
+    <message>
+        <source>Enable publish hash of governance votes in &lt;address&gt;</source>
+        <translation>Povoliť zverejnenie hash hlasovania správy pre &lt;address&gt;</translation>
+    </message>
     <message>
         <source>Enable publish hash transaction (locked via InstantSend) in &lt;address&gt;</source>
         <translation>Povoliť publikovanie transformačných transakcií (zamknutých cez InstantSend) v &lt;address&gt;</translation>
     </message>
     <message>
         <source>Enable publish hash transaction in &lt;address&gt;</source>
-        <translation>Povoliť zverejnenie hash tranzakcií pre &lt;address&gt;</translation>
+        <translation>Povoliť zverejnenie hash transakcií pre &lt;address&gt;</translation>
     </message>
     <message>
         <source>Enable publish raw block in &lt;address&gt;</source>
@@ -4622,13 +4658,21 @@ https://www.transifex.com/projects/p/dash/</translation>
         <source>Failed to delete backup, error: %s</source>
         <translation>Nepodarilo sa vymazať zálohu, chyba: %s</translation>
     </message>
+    <message>
+        <source>Failed to load InstantSend data cache from</source>
+        <translation>Chyba pri načítaní vyrovnávajúcej pamäti InstantSend dát z</translation>
+    </message>
+    <message>
+        <source>Failed to load sporks cache from</source>
+        <translation>Chyba pri načítaní vyrovnávajúcej pamäti sporks z</translation>
+    </message>
     <message>
         <source>Failed to parse host:port string</source>
         <translation>Chyba pri načítaní reťazca host:port</translation>
     </message>
     <message>
         <source>Fee (in %s/kB) to add to transactions you send (default: %s)</source>
-        <translation>Poplatok (za %s/kB) pridaný do tranzakcie, ktorú posielate (predvolené: %s)</translation>
+        <translation>Poplatok (v %s/kB) pridaný do transakcie, ktorú posielate (predvolené: %s)</translation>
     </message>
     <message>
         <source>Imports blocks from external blk000??.dat file on startup</source>
@@ -4642,6 +4686,10 @@ https://www.transifex.com/projects/p/dash/</translation>
         <source>Invalid amount for -fallbackfee=&lt;amount&gt;: '%s'</source>
         <translation>Neplatná suma pre -fallbackfee=&lt;amount&gt;: '%s'</translation>
     </message>
+    <message>
+        <source>Invalid input count.</source>
+        <translation>Neplatný počet vstupov.</translation>
+    </message>
     <message>
         <source>Keep the transaction memory pool below &lt;n&gt; megabytes (default: %u)</source>
         <translation>Udržovať zasobník transakcií menší než &lt;n&gt; megabajtov (predvolené: %u)</translation>
@@ -4658,6 +4706,10 @@ https://www.transifex.com/projects/p/dash/</translation>
         <source>Line: %d</source>
         <translation>Riadok: %d</translation>
     </message>
+    <message>
+        <source>Loading InstantSend data cache...</source>
+        <translation>Načíta sa vyrovnávacia pamäť InstantSend dát...</translation>
+    </message>
     <message>
         <source>Loading addresses...</source>
         <translation>Načítavanie adries...</translation>
@@ -4670,6 +4722,10 @@ https://www.transifex.com/projects/p/dash/</translation>
         <source>Loading governance cache...</source>
         <translation>Načíta sa vyrovnávacia pamäť správy...</translation>
     </message>
+    <message>
+        <source>Loading sporks cache...</source>
+        <translation>Načíta sa vyrovnávacia pamäť sporks...</translation>
+    </message>
     <message>
         <source>Loading wallet... (%3.2f %%)</source>
         <translation>Načítavanie peňaženky... (%3.2f %%)</translation>
@@ -4810,6 +4866,10 @@ https://www.transifex.com/projects/p/dash/</translation>
         <source>Transaction must have at least one recipient</source>
         <translation>Transakcia musí mať aspoň jedného príjemcu</translation>
     </message>
+    <message>
+        <source>Transaction too large</source>
+        <translation>Transakcia je príliš veľká</translation>
+    </message>
     <message>
         <source>Trying to connect...</source>
         <translation>Pokúšame sa pripojiť...</translation>
@@ -4830,6 +4890,10 @@ https://www.transifex.com/projects/p/dash/</translation>
         <source>Wallet debugging/testing options:</source>
         <translation>Ladiace / testovacie možnosti peňaženky.</translation>
     </message>
+    <message>
+        <source>Wallet is not initialized</source>
+        <translation>Peňaženka nie je inicializovaná</translation>
+    </message>
     <message>
         <source>Wallet needed to be rewritten: restart %s to complete</source>
         <translation>Peňaženka musí byť prepísaná: pre dokončenie reštartujte %s</translation>
@@ -4846,6 +4910,10 @@ https://www.transifex.com/projects/p/dash/</translation>
         <source>Whether to operate in a blocks only mode (default: %u)</source>
         <translation>Či fungovat iba v čistom blokovom režime (predvolené: %u)</translation>
     </message>
+    <message>
+        <source>You can not start a masternode in lite mode.</source>
+        <translation>V režime Lite nemôžete spustiť masternode.</translation>
+    </message>
     <message>
         <source>ZeroMQ notification options:</source>
         <translation>Možnosti pripojenia ZeroMQ:</translation>
diff --git a/src/qt/locale/dash_zh_CN.ts b/src/qt/locale/dash_zh_CN.ts
index 707d37ef439a..89ab56421aa6 100644
--- a/src/qt/locale/dash_zh_CN.ts
+++ b/src/qt/locale/dash_zh_CN.ts
@@ -793,6 +793,10 @@
         <source>Please switch to "List mode" to use this function.</source>
         <translation>请切换到“列表模式”来使用此功能。</translation>
     </message>
+    <message>
+        <source>Non-anonymized input selected. &lt;b&gt;PrivateSend will be disabled.&lt;/b&gt;&lt;br&gt;&lt;br&gt;If you still want to use PrivateSend, please deselect all non-anonymized inputs first and then check the PrivateSend checkbox again.</source>
+        <translation>已选择非匿名输入。&lt;b&gt;匿名发送将会被禁用。&lt;/b&gt;&lt;br&gt;&lt;br&gt;如果你仍然想使用匿名发送功能，请先取消所选的非匿名输入，然后再勾选匿名发送。</translation>
+    </message>
     <message>
         <source>(%1 locked)</source>
         <translation>(%1 锁定)</translation>
@@ -966,7 +970,11 @@
         <source>PrivateSend information</source>
         <translation>匿名发送信息</translation>
     </message>
-    </context>
+    <message>
+        <source>&lt;h3&gt;PrivateSend Basics&lt;/h3&gt; PrivateSend gives you true financial privacy by obscuring the origins of your funds. All the Dash in your wallet is comprised of different "inputs" which you can think of as separate, discrete coins.&lt;br&gt; PrivateSend uses an innovative process to mix your inputs with the inputs of two other people, without having your coins ever leave your wallet. You retain control of your money at all times.&lt;hr&gt; &lt;b&gt;The PrivateSend process works like this:&lt;/b&gt;&lt;ol type="1"&gt; &lt;li&gt;PrivateSend begins by breaking your transaction inputs down into standard denominations. These denominations are 0.01 DASH, 0.1 DASH, 1 DASH and 10 DASH -- sort of like the paper money you use every day.&lt;/li&gt; &lt;li&gt;Your wallet then sends requests to specially configured software nodes on the network, called "masternodes." These masternodes are informed then that you are interested in mixing a certain denomination. No identifiable information is sent to the masternodes, so they never know "who" you are.&lt;/li&gt; &lt;li&gt;When two other people send similar messages, indicating that they wish to mix the same denomination, a mixing session begins. The masternode mixes up the inputs and instructs all three users' wallets to pay the now-transformed input back to themselves. Your wallet pays that denomination directly to itself, but in a different address (called a change address).&lt;/li&gt; &lt;li&gt;In order to fully obscure your funds, your wallet must repeat this process a number of times with each denomination. Each time the process is completed, it's called a "round." Each round of PrivateSend makes it exponentially more difficult to determine where your funds originated.&lt;/li&gt; &lt;li&gt;This mixing process happens in the background without any intervention on your part. When you wish to make a transaction, your funds will already be anonymized. No additional waiting is required.&lt;/li&gt; &lt;/ol&gt; &lt;hr&gt;&lt;b&gt;IMPORTANT:&lt;/b&gt; Your wallet only contains 1000 of these "change addresses." Every time a mixing event happens, up to 9 of your addresses are used up. This means those 1000 addresses last for about 100 mixing events. When 900 of them are used, your wallet must create more addresses. It can only do this, however, if you have automatic backups enabled.&lt;br&gt; Consequently, users who have backups disabled will also have PrivateSend disabled. &lt;hr&gt;For more information, see the &lt;a href="https://docs.dash.org/en/latest/wallets/dashcore/privatesend-instantsend.html"&gt;PrivateSend documentation&lt;/a&gt;.         </source>
+        <translation>&lt;h3&gt;匿名发送基础知识&lt;/h3&gt;匿名发送通过隐藏您的资金来源为您提供真正的财务隐私。您的钱包中所有的达世币都由不同的“输入”组成，您可以将其视为分开的离散硬币。&lt;br&gt;匿名发送使用创新的方法将您的输入与其他两个人的输入相结合，而过程中不会让您的达世币离开您的钱包。每时每刻，您仍然控制着您的钱。&lt;hr&gt;&lt;b&gt;匿名发送的运作原理如下：&lt;/b&gt;&lt;ol type="1"&gt;&lt;li&gt;匿名发送首先将您的交易分柝成多个标准面额的交易。这些标准面额分别为0.01 DASH，0.1 DASH，1 DASH和10 DASH --有点像您每天使用的纸币。&lt;/li&gt;&lt;li&gt;您的钱包然后发送请求到网络上有专门配置的软件节点，称为“主节点”。这些主节点会收到您希望混合一些资金的通知。没有可识别的信息发送到主节点，所以他们永远不会知道你是“谁”。&lt;li&gt;当另外两个人发送类似的消息时，表示希望混合相同的面额的话，混合会话就会开始。相关的主节点会混合这些输入，并指示所有三个用户的钱包将已经转换了输入的交易支付给自己。您的钱包直接支付给自己，但是付给不同的位址（称之为找零地址）。&lt;/li&gt;&lt;li&gt;为了完全掩盖您的资金来源，您的钱包必须以每个面额来重复此过程数次。每次这个过程完成后，都称之为一个“循环”。每个循环的匿名发送都会令确定您的资金来源的工作倍加困难。&lt;/li&gt;&lt;li&gt;这种混合过程发生在后台，而不需要您进行任何操作。当您想进行交易时，您的资金将已被匿名处理。不需再花额外的时间等待。&lt;/li&gt;&lt;/ol&gt;&lt;hr&gt;重要：&lt;b&gt;您的钱包只能拥有1000个“找零地址”。每次混合事件发生时，最多会使用9个找零地址。这意味着这1000个地址可以容许100次的混合事件。当其的中900个已经被使用后，您的钱包必须创建更多的地址。如果您启用了自动备份，则只能够这样做。&lt;br&gt;因此，禁用备份的用户也将禁用匿名发送。&lt;hr&gt;如欲了解更多信息请参阅&lt;a href="https://docs.dash.org/en/latest/wallets/dashcore/privatesend-instantsend.html"&gt;匿名发送文档&lt;/a&gt;。</translation>
+    </message>
+</context>
 <context>
     <name>Intro</name>
     <message>
@@ -1056,6 +1064,10 @@
         <source>S&amp;tart alias</source>
         <translation>启动别名(&amp;T)</translation>
     </message>
+    <message>
+        <source>Start &amp;all</source>
+        <translation>启动全部(&amp;A)</translation>
+    </message>
     <message>
         <source>Start &amp;MISSING</source>
         <translation>启动遗漏(&amp;M)</translation>
@@ -2220,6 +2232,10 @@ https://www.transifex.com/projects/p/dash/</translation>
         <source>Datadir</source>
         <translation>数据目录</translation>
     </message>
+    <message>
+        <source>Open the %1 debug log file from the current data directory. This can take a few seconds for large log files.</source>
+        <translation>打开当前目录中的%1调试日志文件。日志文件大的话可能要等上几秒钟。</translation>
+    </message>
     <message>
         <source>Decrease font size</source>
         <translation>缩小文字</translation>
@@ -4293,6 +4309,10 @@ https://www.transifex.com/projects/p/dash/</translation>
         <source>Threshold for disconnecting misbehaving peers (default: %u)</source>
         <translation>断开无效节点的临界值(默认：%u)</translation>
     </message>
+    <message>
+        <source>Too many %f denominations, removing.</source>
+        <translation>太多%f面额化资金，正在移除。</translation>
+    </message>
     <message>
         <source>Tor control port password (default: empty)</source>
         <translation>Tor 控制端口密码 (默认值：空白)</translation>
@@ -5041,6 +5061,10 @@ https://www.transifex.com/projects/p/dash/</translation>
         <source>Failed to start a new mixing queue</source>
         <translation>无法开始一个新的混币队列</translation>
     </message>
+    <message>
+        <source>Initialization sanity check failed. %s is shutting down.</source>
+        <translation>初始化完整性检查失败。%s即将关闭。</translation>
+    </message>
     <message>
         <source>Invalid amount for -%s=&lt;amount&gt;: '%s'</source>
         <translation>无效的金额 -%s=&lt;amount&gt;: '%s'</translation>
diff --git a/src/qt/locale/dash_zh_TW.ts b/src/qt/locale/dash_zh_TW.ts
index ec612c0c2ba8..8402b903e5f2 100644
--- a/src/qt/locale/dash_zh_TW.ts
+++ b/src/qt/locale/dash_zh_TW.ts
@@ -793,6 +793,10 @@
         <source>Please switch to "List mode" to use this function.</source>
         <translation>請切換到“列表模式”來使用此功能。</translation>
     </message>
+    <message>
+        <source>Non-anonymized input selected. &lt;b&gt;PrivateSend will be disabled.&lt;/b&gt;&lt;br&gt;&lt;br&gt;If you still want to use PrivateSend, please deselect all non-anonymized inputs first and then check the PrivateSend checkbox again.</source>
+        <translation>選擇了非匿名的輸入。 &lt;b&gt;匿名發送將會被禁用。&lt;/b&gt;&lt;br&gt;&lt;br&gt;如果你仍然想用匿名發送，請先取消選取所有非匿名的輸入，然後再勾選匿名發送的核取方塊。</translation>
+    </message>
     <message>
         <source>(%1 locked)</source>
         <translation>(%1 鎖定)</translation>
@@ -966,6 +970,10 @@
         <source>PrivateSend information</source>
         <translation>匿名發送資訊</translation>
     </message>
+    <message>
+        <source>&lt;h3&gt;PrivateSend Basics&lt;/h3&gt; PrivateSend gives you true financial privacy by obscuring the origins of your funds. All the Dash in your wallet is comprised of different "inputs" which you can think of as separate, discrete coins.&lt;br&gt; PrivateSend uses an innovative process to mix your inputs with the inputs of two other people, without having your coins ever leave your wallet. You retain control of your money at all times.&lt;hr&gt; &lt;b&gt;The PrivateSend process works like this:&lt;/b&gt;&lt;ol type="1"&gt; &lt;li&gt;PrivateSend begins by breaking your transaction inputs down into standard denominations. These denominations are 0.01 DASH, 0.1 DASH, 1 DASH and 10 DASH -- sort of like the paper money you use every day.&lt;/li&gt; &lt;li&gt;Your wallet then sends requests to specially configured software nodes on the network, called "masternodes." These masternodes are informed then that you are interested in mixing a certain denomination. No identifiable information is sent to the masternodes, so they never know "who" you are.&lt;/li&gt; &lt;li&gt;When two other people send similar messages, indicating that they wish to mix the same denomination, a mixing session begins. The masternode mixes up the inputs and instructs all three users' wallets to pay the now-transformed input back to themselves. Your wallet pays that denomination directly to itself, but in a different address (called a change address).&lt;/li&gt; &lt;li&gt;In order to fully obscure your funds, your wallet must repeat this process a number of times with each denomination. Each time the process is completed, it's called a "round." Each round of PrivateSend makes it exponentially more difficult to determine where your funds originated.&lt;/li&gt; &lt;li&gt;This mixing process happens in the background without any intervention on your part. When you wish to make a transaction, your funds will already be anonymized. No additional waiting is required.&lt;/li&gt; &lt;/ol&gt; &lt;hr&gt;&lt;b&gt;IMPORTANT:&lt;/b&gt; Your wallet only contains 1000 of these "change addresses." Every time a mixing event happens, up to 9 of your addresses are used up. This means those 1000 addresses last for about 100 mixing events. When 900 of them are used, your wallet must create more addresses. It can only do this, however, if you have automatic backups enabled.&lt;br&gt; Consequently, users who have backups disabled will also have PrivateSend disabled. &lt;hr&gt;For more information, see the &lt;a href="https://docs.dash.org/en/latest/wallets/dashcore/privatesend-instantsend.html"&gt;PrivateSend documentation&lt;/a&gt;.         </source>
+        <translation>&lt;h3&gt;匿名發送基礎知識&lt;/h3&gt; 匿名發送通過隱藏您的資金來源為您提供真正的財務隱私。您的錢包中所有的達世幣都由不同的“輸入”組成，您可以將其視為分開的離散硬幣。&lt;br&gt; 匿名發送使用創新的方法將您的輸入與其他兩個人的輸入相結合，而過程中不會讓您的達世幣離開您的錢包。每時每刻，您仍然控制著您的錢。&lt;hr&gt; &lt;b&gt;匿名發送的運作原理如下:&lt;/b&gt;&lt;ol type="1"&gt; &lt;li&gt;匿名發送首先將您的交易分柝成多個標準面額的交易。這些標準面額分別為0.01 DASH, 0.1 DASH, 1 DASH 和10 DASH --有點像您每天使用的紙幣。&lt;/li&gt; &lt;li&gt;您的錢包然後發送請求到網絡上有專門配置的軟件節點，稱為“主節點”。這些主節點會收到您希望混合一些資金的通知。沒有可識別的信息發送到主節點，所以他們永遠不會知道你是"誰"。&lt;/li&gt; &lt;li&gt;當另外兩個人發送類似的消息時，表示希望混合相同的面額的話，混合會話就會開始。相關的主節點會混合這些輸入，並指示所有三個用戶的錢包將已經轉換了輸入的交易支付給自己。你的錢包直接支付給自己，但是付給不同的位址 (稱之為找零位址)。&lt;/li&gt; &lt;li&gt;為了完全掩蓋您的資金來源，您的錢包必須以每個面額來重複此過程數次。每次這個過程完成後，都稱之為一個 "循環"。每個循環的匿名發送都會令確定您的資金來源的工作倍加困難。&lt;/li&gt; &lt;li&gt;這種混合過程發生在後台，而不需要您進行任何操作。當您想進行交易時，您的資金將已被匿名處理。不需再花額外的時間等待。&lt;/li&gt; &lt;/ol&gt; &lt;hr&gt;&lt;b&gt;重要:&lt;/b&gt;您的錢包只能擁有1000個"找零位址。" 每次混合事件發生時，最多會使用9個找零位址。這意味著這1000個位址可以容許100次的混合事件。當其的中900個已經被使用後，您的錢包必須創建更多的位址。如果您啟用了自動備份，則只能夠這樣做。&lt;br&gt;因此，禁用備份的用戶也將禁用匿名發送。&lt;hr&gt;如欲了解更多信息請參閱&lt;a href="https://docs.dash.org/en/latest/wallets/dashcore/privatesend-instantsend.html"&gt;匿名發送文檔&lt;/a&gt;。</translation>
+    </message>
 </context>
 <context>
     <name>Intro</name>
@@ -1754,6 +1762,10 @@ https://www.transifex.com/projects/p/dash/</translation>
         <source>We are about to create a new automatic backup for you, however &lt;span style='color:red;'&gt; you should always make sure you have backups saved in some safe place&lt;/span&gt;!</source>
         <translation>我們即將為您創建一個新的自動備份，但&lt;span style='color.red;'&gt;您應該始終確保 您有另外的一些備份保存在安全的位置&lt;/span&gt;!</translation>
     </message>
+    <message>
+        <source>Note: You can turn this message off in options.</source>
+        <translation>注意 : 您可以在選項中關閉這項訊息。</translation>
+    </message>
     <message>
         <source>WARNING! Something went wrong on automatic backup</source>
         <translation>警告! 自動備份出現問題</translation>
@@ -4537,6 +4549,10 @@ https://www.transifex.com/projects/p/dash/</translation>
         <source>Warning: Unknown block versions being mined! It's possible unknown rules are in effect</source>
         <translation>警告 : 正在開採未知版本的區塊。未知的規則可能正在生效</translation>
     </message>
+    <message>
+        <source>You are starting in lite mode, all Dash-specific functionality is disabled.</source>
+        <translation>您正在使用精簡模式，故此所有與達世幣相關的特別功能已被禁用。</translation>
+    </message>
     <message>
         <source>You need to rebuild the database using -reindex to go back to unpruned mode.  This will redownload the entire blockchain</source>
         <translation>您需要使用-reindex 來重建數據庫以回到未修剪模式。 這將重新下載整個區塊鏈</translation>
@@ -4621,6 +4637,14 @@ https://www.transifex.com/projects/p/dash/</translation>
         <source>Failed to delete backup, error: %s</source>
         <translation>無法刪除備份，錯誤: %s</translation>
     </message>
+    <message>
+        <source>Failed to load InstantSend data cache from</source>
+        <translation>無法載入即時到帳數據緩存</translation>
+    </message>
+    <message>
+        <source>Failed to load sporks cache from</source>
+        <translation>無法載入勺叉緩存</translation>
+    </message>
     <message>
         <source>Failed to parse host:port string</source>
         <translation>無法解析主機 : 端口串</translation>
@@ -4657,6 +4681,10 @@ https://www.transifex.com/projects/p/dash/</translation>
         <source>Line: %d</source>
         <translation>行: %d</translation>
     </message>
+    <message>
+        <source>Loading InstantSend data cache...</source>
+        <translation>正在載入即時到帳數據緩存...</translation>
+    </message>
     <message>
         <source>Loading addresses...</source>
         <translation>正在載入位址資料...</translation>
@@ -4669,6 +4697,10 @@ https://www.transifex.com/projects/p/dash/</translation>
         <source>Loading governance cache...</source>
         <translation>正在載入治理緩存...</translation>
     </message>
+    <message>
+        <source>Loading sporks cache...</source>
+        <translation>正在載入勺叉緩存...</translation>
+    </message>
     <message>
         <source>Loading wallet... (%3.2f %%)</source>
         <translation>正在載入錢包資料... (%3.2f %%)</translation>
@@ -4809,6 +4841,10 @@ https://www.transifex.com/projects/p/dash/</translation>
         <source>Transaction must have at least one recipient</source>
         <translation>交易必須至少要有一個收款人</translation>
     </message>
+    <message>
+        <source>Transaction too large</source>
+        <translation>交易太大了</translation>
+    </message>
     <message>
         <source>Trying to connect...</source>
         <translation>嘗試連接...</translation>

From 40fa1bb492c8832bddcc8dd49153ea39bc6d4e7a Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Mon, 19 Nov 2018 07:30:58 +0100
Subject: [PATCH 292/400] Add platform dependent include_directories in
 CMakeLists.txt (#2455)

This gives much better auto-completion and code analysis in CLion.

Also add src/qt/forms to include path.
---
 CMakeLists.txt | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 55f43ca69a39..9e22a2e9b52e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -12,10 +12,26 @@ set(CMAKE_CXX_STANDARD 14)
 
 include_directories(
         src
+        src/qt/forms
         src/leveldb/include
         src/univalue/include
 )
 
+if(UNIX AND NOT APPLE)
+    set(DEPENDS_PREFIX depends/x86_64-pc-linux-gnu)
+elseif(APPLE)
+    set(DEPENDS_PREFIX depends/x86_64-apple-darwin11)
+elseif(WIN32)
+    set(DEPENDS_PREFIX depends/x86_64-w64-mingw32)
+endif()
+
+message(STATUS "DEPENDS_PREFIX: ${DEPENDS_PREFIX}")
+
+if(DEFINED DEPENDS_PREFIX)
+    include_directories(${DEPENDS_PREFIX}/include)
+    include_directories(${DEPENDS_PREFIX}/include/QtWidgets)
+endif()
+
 add_definitions(
         -DENABLE_WALLET=1
 )

From 614ff70b4ce05da67bc0f893a8379f1097a9b134 Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Mon, 19 Nov 2018 07:31:13 +0100
Subject: [PATCH 293/400] Let ccache compress the cache by itself instead of
 compressing ccache.tar (#2456)

The cache can become quite large and uncompressing/recompressing it is slow.
Better to let ccache handle compression as it will then only perform it
on files which are actually used.
---
 Jenkinsfile.gitian                          |  2 ++
 contrib/gitian-descriptors/gitian-linux.yml | 11 +++++++----
 contrib/gitian-descriptors/gitian-osx.yml   | 11 +++++++----
 contrib/gitian-descriptors/gitian-win.yml   | 11 +++++++----
 4 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/Jenkinsfile.gitian b/Jenkinsfile.gitian
index f695706fb9d6..793d4880718c 100644
--- a/Jenkinsfile.gitian
+++ b/Jenkinsfile.gitian
@@ -117,6 +117,8 @@ for(int i = 0; i < targets.size(); i++) {
           archiveArtifacts artifacts: 'dashcore-binaries/*', fingerprint: true
         }
 
+        // TODO remove this in a few days (only needed to prune the old compressed file from Jenkins caches)
+        sh "cd gitian-builder/cache && find -name ccache.tar.gz | xargs rm -f"
         sh "cd gitian-builder/cache && tar czfv ../../cache-${gitianDescriptor.name}.tar.gz common ${gitianDescriptor.name}"
         archiveArtifacts artifacts: "cache-${gitianDescriptor.name}.tar.gz", fingerprint: true
       }
diff --git a/contrib/gitian-descriptors/gitian-linux.yml b/contrib/gitian-descriptors/gitian-linux.yml
index 6fcda5646561..39523dfc31d6 100755
--- a/contrib/gitian-descriptors/gitian-linux.yml
+++ b/contrib/gitian-descriptors/gitian-linux.yml
@@ -61,12 +61,15 @@ script: |
     export CCACHE_DIR=${GBUILD_PACKAGE_CACHE}/ccache
     # As we later wrap the gcc binaries, this is fast
     export CCACHE_COMPILERCHECK="content"
-    if [ -f ${GBUILD_PACKAGE_CACHE}/ccache.tar.gz ]; then
+    if [ -f ${GBUILD_PACKAGE_CACHE}/ccache.tar ]; then
       pushd ${GBUILD_PACKAGE_CACHE}
-      tar xzf ccache.tar.gz
-      rm ccache.tar.gz
+      tar xf ccache.tar
+      rm ccache.tar
       popd
     fi
+    # instead of compressing ccache.tar, we let ccache handle it by itself
+    # Otherwise we end up uncompressing/compressing a lot of cache files which we actually never use
+    export CCACHE_COMPRESS=1
   else
     CONFIGFLAGS="${CONFIGFLAGS} --disable-ccache"
   fi
@@ -212,7 +215,7 @@ script: |
   # Compress ccache (otherwise the assert file will get too huge)
   if [ "$CCACHE_DIR" != "" ]; then
     pushd ${GBUILD_PACKAGE_CACHE}
-    tar czf ccache.tar.gz ccache
+    tar cf ccache.tar ccache
     rm -rf ccache
     popd
   fi
diff --git a/contrib/gitian-descriptors/gitian-osx.yml b/contrib/gitian-descriptors/gitian-osx.yml
index 80fba15d852e..5c17c5b4660e 100644
--- a/contrib/gitian-descriptors/gitian-osx.yml
+++ b/contrib/gitian-descriptors/gitian-osx.yml
@@ -55,12 +55,15 @@ script: |
     # Setup ccache to use correct cache directories
     CONFIGFLAGS="${CONFIGFLAGS} --enable-ccache"
     export CCACHE_DIR=${GBUILD_PACKAGE_CACHE}/ccache
-    if [ -f ${GBUILD_PACKAGE_CACHE}/ccache.tar.gz ]; then
+    if [ -f ${GBUILD_PACKAGE_CACHE}/ccache.tar ]; then
       pushd ${GBUILD_PACKAGE_CACHE}
-      tar xzf ccache.tar.gz
-      rm ccache.tar.gz
+      tar xf ccache.tar
+      rm ccache.tar
       popd
     fi
+    # instead of compressing ccache.tar, we let ccache handle it by itself
+    # Otherwise we end up uncompressing/compressing a lot of cache files which we actually never use
+    export CCACHE_COMPRESS=1
   else
     CONFIGFLAGS="${CONFIGFLAGS} --disable-ccache"
   fi
@@ -176,7 +179,7 @@ script: |
   # Compress ccache (otherwise the assert file will get too huge)
   if [ "$CCACHE_DIR" != "" ]; then
     pushd ${GBUILD_PACKAGE_CACHE}
-    tar czf ccache.tar.gz ccache
+    tar cf ccache.tar ccache
     rm -rf ccache
     popd
   fi
diff --git a/contrib/gitian-descriptors/gitian-win.yml b/contrib/gitian-descriptors/gitian-win.yml
index ccb36c7bbc49..6d1b673a3736 100755
--- a/contrib/gitian-descriptors/gitian-win.yml
+++ b/contrib/gitian-descriptors/gitian-win.yml
@@ -53,12 +53,15 @@ script: |
     export CCACHE_DIR=${GBUILD_PACKAGE_CACHE}/ccache
     # As we later wrap the gcc binaries, this is fast
     export CCACHE_COMPILERCHECK="content"
-    if [ -f ${GBUILD_PACKAGE_CACHE}/ccache.tar.gz ]; then
+    if [ -f ${GBUILD_PACKAGE_CACHE}/ccache.tar ]; then
       pushd ${GBUILD_PACKAGE_CACHE}
-      tar xzf ccache.tar.gz
-      rm ccache.tar.gz
+      tar xf ccache.tar
+      rm ccache.tar
       popd
     fi
+    # instead of compressing ccache.tar, we let ccache handle it by itself
+    # Otherwise we end up uncompressing/compressing a lot of cache files which we actually never use
+    export CCACHE_COMPRESS=1
   else
     CONFIGFLAGS="${CONFIGFLAGS} --disable-ccache"
   fi
@@ -200,7 +203,7 @@ script: |
   # Compress ccache (otherwise the assert file will get too huge)
   if [ "$CCACHE_DIR" != "" ]; then
     pushd ${GBUILD_PACKAGE_CACHE}
-    tar czf ccache.tar.gz ccache
+    tar cf ccache.tar ccache
     rm -rf ccache
     popd
   fi

From 76e93c7d7be5c6911f6733c2a4620e5633352c54 Mon Sep 17 00:00:00 2001
From: strophy <32928115+strophy@users.noreply.github.com>
Date: Wed, 21 Nov 2018 14:57:47 +0800
Subject: [PATCH 294/400] Corrections to incorrect syntax in RPC help (#2466)

* Fix incorrect inline help for "protx update_registrar"

Initial ProRegTx does not define a field named "collateralAddress". It is not necessary to use the collateral address to receive payout, any Dash address can be defined here.

* Fix incorrect syntax for "protx revoke" inline help

"operatorKey" is required here
---
 src/rpc/rpcevo.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/rpc/rpcevo.cpp b/src/rpc/rpcevo.cpp
index cb1e3d815351..977d20d15868 100644
--- a/src/rpc/rpcevo.cpp
+++ b/src/rpc/rpcevo.cpp
@@ -506,7 +506,6 @@ void protx_update_registrar_help()
             "                         It has to match the private key which is later used when voting on proposals.\n"
             "                         If set to \"0\" or an empty string, the last on-chain voting key of the masternode will be used.\n"
             "4. \"payoutAddress\"       (string, required) The dash address to use for masternode reward payments\n"
-            "                         Must match \"collateralAddress\" of initial ProRegTx.\n"
             "                         If set to \"0\" or an empty string, the last on-chain payout address of the masternode will be used.\n"
             "\nExamples:\n"
             + HelpExampleCli("protx", "update_registrar \"0123456701234567012345670123456701234567012345670123456701234567\" \"982eb34b7c7f614f29e5c665bc3605f1beeef85e3395ca12d3be49d2868ecfea5566f11cedfad30c51b2403f2ad95b67\" \"XwnLY9Tf7Zsef8gMGL2fhWA9ZmMjt4KPwG\"")
@@ -566,7 +565,7 @@ UniValue protx_update_registrar(const JSONRPCRequest& request)
 void protx_revoke_help()
 {
     throw std::runtime_error(
-            "protx revoke \"proTxHash\"\n"
+            "protx revoke \"proTxHash\" \"operatorKey\"\n"
             "\nCreates and sends a ProUpRevTx to the network. This will revoke the operator key of the masternode and\n"
             "put it into the PoSe-banned state. It will also set the service field of the masternode\n"
             "to zero. Use this in case your operator key got compromised or you want to stop providing your service\n"

From 9232a455c89b0199640ef265f7ea2aff404c34ac Mon Sep 17 00:00:00 2001
From: UdjinM6 <UdjinM6@users.noreply.github.com>
Date: Wed, 21 Nov 2018 10:01:47 +0300
Subject: [PATCH 295/400] Do not hold cs_main while emitting messages in
 WalletModel::prepareTransaction (#2463)

* Do not hold cs_main while emitting messages

Fixes potential deadlock:
```
POTENTIAL DEADLOCK DETECTED
Previous lock order was:
 (1) cs_deqsessions  privatesend-client.cpp:966
 (2) cs_main  privatesend-client.cpp:816
Current lock order is:
 (2) cs_main  qt/walletmodel.cpp:299
 wallet->cs_wallet  qt/walletmodel.cpp:299
 (1) cs_deqsessions  privatesend-client.cpp:350
```

* Keep CWalletTx* newTx in inner scope
---
 src/qt/walletmodel.cpp | 72 +++++++++++++++++++++++-------------------
 1 file changed, 39 insertions(+), 33 deletions(-)

diff --git a/src/qt/walletmodel.cpp b/src/qt/walletmodel.cpp
index c71bf374e4d3..3802edd0362d 100644
--- a/src/qt/walletmodel.cpp
+++ b/src/qt/walletmodel.cpp
@@ -295,59 +295,65 @@ WalletModel::SendCoinsReturn WalletModel::prepareTransaction(WalletModelTransact
         return AmountExceedsBalance;
     }
 
+    if(recipients[0].fUseInstantSend && total > sporkManager.GetSporkValue(SPORK_5_INSTANTSEND_MAX_VALUE)*COIN) {
+        Q_EMIT message(tr("Send Coins"), tr("InstantSend doesn't support sending values that high yet. Transactions are currently limited to %1 DASH.").arg(sporkManager.GetSporkValue(SPORK_5_INSTANTSEND_MAX_VALUE)),
+                     CClientUIInterface::MSG_ERROR);
+        return TransactionCreationFailed;
+    }
+
+    CAmount nFeeRequired = 0;
+    CAmount nValueOut = 0;
+    size_t nVinSize = 0;
+    bool fCreated;
+    std::string strFailReason;
     {
         LOCK2(cs_main, wallet->cs_wallet);
 
         transaction.newPossibleKeyChange(wallet);
 
-        CAmount nFeeRequired = 0;
         int nChangePosRet = -1;
-        std::string strFailReason;
 
-        CWalletTx *newTx = transaction.getTransaction();
+        CWalletTx* newTx = transaction.getTransaction();
         CReserveKey *keyChange = transaction.getPossibleKeyChange();
 
-        if(recipients[0].fUseInstantSend && total > sporkManager.GetSporkValue(SPORK_5_INSTANTSEND_MAX_VALUE)*COIN){
-            Q_EMIT message(tr("Send Coins"), tr("InstantSend doesn't support sending values that high yet. Transactions are currently limited to %1 DASH.").arg(sporkManager.GetSporkValue(SPORK_5_INSTANTSEND_MAX_VALUE)),
-                         CClientUIInterface::MSG_ERROR);
-            return TransactionCreationFailed;
-        }
-
-        bool fCreated = wallet->CreateTransaction(vecSend, *newTx, *keyChange, nFeeRequired, nChangePosRet, strFailReason, coinControl, true, recipients[0].inputType, recipients[0].fUseInstantSend);
+        fCreated = wallet->CreateTransaction(vecSend, *newTx, *keyChange, nFeeRequired, nChangePosRet, strFailReason, coinControl, true, recipients[0].inputType, recipients[0].fUseInstantSend);
         transaction.setTransactionFee(nFeeRequired);
         if (fSubtractFeeFromAmount && fCreated)
             transaction.reassignAmounts(nChangePosRet);
 
-        if(recipients[0].fUseInstantSend) {
-            if(newTx->tx->GetValueOut() > sporkManager.GetSporkValue(SPORK_5_INSTANTSEND_MAX_VALUE)*COIN) {
-                Q_EMIT message(tr("Send Coins"), tr("InstantSend doesn't support sending values that high yet. Transactions are currently limited to %1 DASH.").arg(sporkManager.GetSporkValue(SPORK_5_INSTANTSEND_MAX_VALUE)),
-                             CClientUIInterface::MSG_ERROR);
-                return TransactionCreationFailed;
-            }
-            if(newTx->tx->vin.size() > CTxLockRequest::WARN_MANY_INPUTS) {
-                Q_EMIT message(tr("Send Coins"), tr("Used way too many inputs (>%1) for this InstantSend transaction, fees could be huge.").arg(CTxLockRequest::WARN_MANY_INPUTS),
-                             CClientUIInterface::MSG_WARNING);
-            }
-        }
+        nValueOut = newTx->tx->GetValueOut();
+        nVinSize = newTx->tx->vin.size();
+    }
 
-        if(!fCreated)
-        {
-            if(!fSubtractFeeFromAmount && (total + nFeeRequired) > nBalance)
-            {
-                return SendCoinsReturn(AmountWithFeeExceedsBalance);
-            }
-            Q_EMIT message(tr("Send Coins"), QString::fromStdString(strFailReason),
+    if(recipients[0].fUseInstantSend) {
+        if(nValueOut > sporkManager.GetSporkValue(SPORK_5_INSTANTSEND_MAX_VALUE)*COIN) {
+            Q_EMIT message(tr("Send Coins"), tr("InstantSend doesn't support sending values that high yet. Transactions are currently limited to %1 DASH.").arg(sporkManager.GetSporkValue(SPORK_5_INSTANTSEND_MAX_VALUE)),
                          CClientUIInterface::MSG_ERROR);
             return TransactionCreationFailed;
         }
+        if(nVinSize > CTxLockRequest::WARN_MANY_INPUTS) {
+            Q_EMIT message(tr("Send Coins"), tr("Used way too many inputs (>%1) for this InstantSend transaction, fees could be huge.").arg(CTxLockRequest::WARN_MANY_INPUTS),
+                         CClientUIInterface::MSG_WARNING);
+        }
+    }
 
-        // reject absurdly high fee. (This can never happen because the
-        // wallet caps the fee at maxTxFee. This merely serves as a
-        // belt-and-suspenders check)
-        if (nFeeRequired > maxTxFee)
-            return AbsurdFee;
+    if(!fCreated)
+    {
+        if(!fSubtractFeeFromAmount && (total + nFeeRequired) > nBalance)
+        {
+            return SendCoinsReturn(AmountWithFeeExceedsBalance);
+        }
+        Q_EMIT message(tr("Send Coins"), QString::fromStdString(strFailReason),
+                     CClientUIInterface::MSG_ERROR);
+        return TransactionCreationFailed;
     }
 
+    // reject absurdly high fee. (This can never happen because the
+    // wallet caps the fee at maxTxFee. This merely serves as a
+    // belt-and-suspenders check)
+    if (nFeeRequired > maxTxFee)
+        return AbsurdFee;
+
     return SendCoinsReturn(OK);
 }
 

From eb2103760be0ebdac6b15d6b3e6d30288cdc45fd Mon Sep 17 00:00:00 2001
From: PastaPastaPasta <pasta@dashboost.org>
Date: Wed, 21 Nov 2018 01:02:15 -0600
Subject: [PATCH 296/400] trivail, clarifies help text for protx register
 (#2462)

---
 src/rpc/rpcevo.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/rpc/rpcevo.cpp b/src/rpc/rpcevo.cpp
index 977d20d15868..88ba462648e4 100644
--- a/src/rpc/rpcevo.cpp
+++ b/src/rpc/rpcevo.cpp
@@ -197,7 +197,7 @@ void protx_register_fund_help()
             "3. \"ownerKeyAddr\"        (string, required) The owner key used for payee updates and proposal voting.\n"
             "                         The private key belonging to this address be known in your wallet. The address must\n"
             "                         be unused and must differ from the collateralAddress\n"
-            "4. \"operatorPubKey\"      (string, required) The operator public key. The private key does not have to be known.\n"
+            "4. \"operatorPubKey\"      (string, required) The operator BLS public key. The private key does not have to be known.\n"
             "                         It has to match the private key which is later used when operating the masternode.\n"
             "5. \"votingKeyAddr\"       (string, required) The voting key address. The private key does not have to be known by your wallet.\n"
             "                         It has to match the private key which is later used when voting on proposals.\n"

From e049f9c1ea0fa6c99af728a85ad902a15951cdfc Mon Sep 17 00:00:00 2001
From: InhumanPerfection <39734219+InhumanPerfection@users.noreply.github.com>
Date: Wed, 21 Nov 2018 09:02:54 +0200
Subject: [PATCH 297/400] fix protx register rpc help (#2461)

---
 src/rpc/rpcevo.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/rpc/rpcevo.cpp b/src/rpc/rpcevo.cpp
index 88ba462648e4..477b72e662e2 100644
--- a/src/rpc/rpcevo.cpp
+++ b/src/rpc/rpcevo.cpp
@@ -183,7 +183,7 @@ static std::string SignAndSendSpecialTx(const CMutableTransaction& tx)
 void protx_register_fund_help()
 {
     throw std::runtime_error(
-            "protx register_fund \"collateralAddress\" \"ipAndPort\" \"ownerKeyAddr\" \"operatorKeyAddr\" \"votingKeyAddr\" operatorReward \"payoutAddress\"\n"
+            "protx register_fund \"collateralAddress\" \"ipAndPort\" \"ownerKeyAddr\" \"operatorPubKey\" \"votingKeyAddr\" operatorReward \"payoutAddress\"\n"
             "\nCreates, funds and sends a ProTx to the network. The resulting transaction will move 1000 Dash\n"
             "to the address specified by collateralAddress and will then function as the collateral of your\n"
             "masternode.\n"
@@ -214,7 +214,7 @@ void protx_register_fund_help()
 void protx_register_help()
 {
     throw std::runtime_error(
-            "protx register \"collateralHash\" collateralIndex \"ipAndPort\" \"ownerKeyAddr\" \"operatorKeyAddr\" \"votingKeyAddr\" operatorReward \"payoutAddress\"\n"
+            "protx register \"collateralHash\" collateralIndex \"ipAndPort\" \"ownerKeyAddr\" \"operatorPubKey\" \"votingKeyAddr\" operatorReward \"payoutAddress\"\n"
             "\nSame as \"protx register_fund\", but with an externally referenced collateral.\n"
             "The collateral is specified through \"collateralHash\" and \"collateralIndex\" and must be an unspent\n"
             "transaction output. It must also not be used by any other masternode.\n"
@@ -230,7 +230,7 @@ void protx_register_help()
 void protx_register_prepare_help()
 {
     throw std::runtime_error(
-            "protx register_prepare \"collateralHash\" collateralIndex \"ipAndPort\" \"ownerKeyAddr\" \"operatorKeyAddr\" \"votingKeyAddr\" operatorReward \"payoutAddress\"\n"
+            "protx register_prepare \"collateralHash\" collateralIndex \"ipAndPort\" \"ownerKeyAddr\" \"operatorPubKey\" \"votingKeyAddr\" operatorReward \"payoutAddress\"\n"
             "\nCreates an unsigned ProTx and returns it. The ProTx must be signed externally with the collateral\n"
             "key and then passed to \"protx register_submit\". The prepared transaction will also contain inputs\n"
             "and outputs to cover fees.\n"

From 7cabbadefd2386d7f8a16130a161ea7942832f04 Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Wed, 21 Nov 2018 08:04:19 +0100
Subject: [PATCH 298/400] Implement context menu and extra info on double-click
 for DIP3 masternode list (#2459)

* Implement context menu and extra info on double-click for DIP3 masternode list

Menu items:
- "Copy ProTx hash"
- "Copy Collateral hash"

On double click:
Show simple message box with the json representation of the DMN.

* Fix review comments
---
 src/qt/forms/masternodelist.ui |  2 +-
 src/qt/masternodelist.cpp      | 81 ++++++++++++++++++++++++++++++++++
 src/qt/masternodelist.h        |  9 ++++
 3 files changed, 91 insertions(+), 1 deletion(-)

diff --git a/src/qt/forms/masternodelist.ui b/src/qt/forms/masternodelist.ui
index a206094f2f11..f479a608d9e7 100644
--- a/src/qt/forms/masternodelist.ui
+++ b/src/qt/forms/masternodelist.ui
@@ -394,7 +394,7 @@
             <bool>true</bool>
            </property>
            <property name="selectionMode">
-            <enum>QAbstractItemView::NoSelection</enum>
+            <enum>QAbstractItemView::SingleSelection</enum>
            </property>
            <property name="selectionBehavior">
             <enum>QAbstractItemView::SelectRows</enum>
diff --git a/src/qt/masternodelist.cpp b/src/qt/masternodelist.cpp
index f3cf5ae7d8df..ccaaac8adaf1 100644
--- a/src/qt/masternodelist.cpp
+++ b/src/qt/masternodelist.cpp
@@ -9,13 +9,17 @@
 #include "masternode-sync.h"
 #include "masternodeconfig.h"
 #include "masternodeman.h"
+#include "netbase.h"
 #include "qrdialog.h"
 #include "sync.h"
 #include "wallet/wallet.h"
 #include "walletmodel.h"
 
+#include <univalue.h>
+
 #include <QMessageBox>
 #include <QTimer>
+#include <QtGui/QClipboard>
 
 int GetOffsetFromUtc()
 {
@@ -75,6 +79,7 @@ MasternodeList::MasternodeList(const PlatformStyle* platformStyle, QWidget* pare
     ui->tableWidgetMasternodesDIP3->setColumnWidth(7, columnOperatorRewardWidth);
 
     ui->tableWidgetMyMasternodes->setContextMenuPolicy(Qt::CustomContextMenu);
+    ui->tableWidgetMasternodesDIP3->setContextMenuPolicy(Qt::CustomContextMenu);
 
     QAction* startAliasAction = new QAction(tr("Start alias"), this);
     contextMenu = new QMenu();
@@ -83,6 +88,16 @@ MasternodeList::MasternodeList(const PlatformStyle* platformStyle, QWidget* pare
     connect(ui->tableWidgetMyMasternodes, SIGNAL(doubleClicked(QModelIndex)), this, SLOT(on_QRButton_clicked()));
     connect(startAliasAction, SIGNAL(triggered()), this, SLOT(on_startButton_clicked()));
 
+    QAction* copyProTxHashAction = new QAction(tr("Copy ProTx Hash"), this);
+    QAction* copyCollateralOutpointAction = new QAction(tr("Copy Collateral Outpoint"), this);
+    contextMenuDIP3 = new QMenu();
+    contextMenuDIP3->addAction(copyProTxHashAction);
+    contextMenuDIP3->addAction(copyCollateralOutpointAction);
+    connect(ui->tableWidgetMasternodesDIP3, SIGNAL(customContextMenuRequested(const QPoint&)), this, SLOT(showContextMenuDIP3(const QPoint&)));
+    connect(ui->tableWidgetMasternodesDIP3, SIGNAL(doubleClicked(QModelIndex)), this, SLOT(on_extraInfoDIP3_clicked()));
+    connect(copyProTxHashAction, SIGNAL(triggered()), this, SLOT(on_copyProTxHash_clicked()));
+    connect(copyCollateralOutpointAction, SIGNAL(triggered()), this, SLOT(on_copyCollateralOutpoint_clicked()));
+
     timer = new QTimer(this);
     connect(timer, SIGNAL(timeout()), this, SLOT(updateNodeList()));
     connect(timer, SIGNAL(timeout()), this, SLOT(updateMyNodeList()));
@@ -122,6 +137,12 @@ void MasternodeList::showContextMenu(const QPoint& point)
     if (item) contextMenu->exec(QCursor::pos());
 }
 
+void MasternodeList::showContextMenuDIP3(const QPoint& point)
+{
+    QTableWidgetItem* item = ui->tableWidgetMasternodesDIP3->itemAt(point);
+    if (item) contextMenuDIP3->exec(QCursor::pos());
+}
+
 void MasternodeList::StartAlias(std::string strAlias)
 {
     std::string strStatusHtml;
@@ -646,3 +667,63 @@ void MasternodeList::ShowQRCode(std::string strAlias)
     dialog->setInfo(strWindowtitle, QString::fromStdString(strMNPrivKey), strHTML, strQRCodeTitle);
     dialog->show();
 }
+
+CDeterministicMNCPtr MasternodeList::GetSelectedDIP3MN()
+{
+    std::string strAddress;
+    {
+        LOCK(cs_dip3list);
+
+        QItemSelectionModel* selectionModel = ui->tableWidgetMasternodesDIP3->selectionModel();
+        QModelIndexList selected = selectionModel->selectedRows();
+
+        if (selected.count() == 0) return nullptr;
+
+        QModelIndex index = selected.at(0);
+        int nSelectedRow = index.row();
+        strAddress = ui->tableWidgetMasternodesDIP3->item(nSelectedRow, 0)->text().toStdString();
+    }
+    CService addr;
+    if (!Lookup(strAddress.c_str(), addr, Params().GetDefaultPort(), false)) {
+        return nullptr;
+    }
+    auto mnList = deterministicMNManager->GetListAtChainTip();
+    return mnList.GetUniquePropertyMN(addr);
+}
+
+void MasternodeList::on_extraInfoDIP3_clicked()
+{
+    auto dmn = GetSelectedDIP3MN();
+    if (!dmn) {
+        return;
+    }
+
+    UniValue json(UniValue::VOBJ);
+    dmn->ToJson(json);
+
+    // Title of popup window
+    QString strWindowtitle = tr("Additional information for DIP3 Masternode %1").arg(QString::fromStdString(dmn->proTxHash.ToString()));
+    QString strText = QString::fromStdString(json.write(2));
+
+    QMessageBox::information(this, strWindowtitle, strText);
+}
+
+void MasternodeList::on_copyProTxHash_clicked()
+{
+    auto dmn = GetSelectedDIP3MN();
+    if (!dmn) {
+        return;
+    }
+
+    QApplication::clipboard()->setText(QString::fromStdString(dmn->proTxHash.ToString()));
+}
+
+void MasternodeList::on_copyCollateralOutpoint_clicked()
+{
+    auto dmn = GetSelectedDIP3MN();
+    if (!dmn) {
+        return;
+    }
+
+    QApplication::clipboard()->setText(QString::fromStdString(dmn->collateralOutpoint.ToStringShort()));
+}
diff --git a/src/qt/masternodelist.h b/src/qt/masternodelist.h
index d51a403745d7..e10b323e6f37 100644
--- a/src/qt/masternodelist.h
+++ b/src/qt/masternodelist.h
@@ -6,6 +6,8 @@
 #include "sync.h"
 #include "util.h"
 
+#include <evo/deterministicmns.h>
+
 #include <QMenu>
 #include <QTimer>
 #include <QWidget>
@@ -40,9 +42,11 @@ class MasternodeList : public QWidget
     void ShowQRCode(std::string strAlias);
     void StartAlias(std::string strAlias);
     void StartAll(std::string strCommand = "start-all");
+    CDeterministicMNCPtr GetSelectedDIP3MN();
 
 private:
     QMenu* contextMenu;
+    QMenu* contextMenuDIP3;
     int64_t nTimeFilterUpdated;
     int64_t nTimeFilterUpdatedDIP3;
     bool fFilterUpdated;
@@ -77,6 +81,7 @@ public Q_SLOTS:
 
 private Q_SLOTS:
     void showContextMenu(const QPoint&);
+    void showContextMenuDIP3(const QPoint&);
     void on_filterLineEdit_textChanged(const QString& strFilterIn);
     void on_filterLineEditDIP3_textChanged(const QString& strFilterIn);
     void on_QRButton_clicked();
@@ -85,5 +90,9 @@ private Q_SLOTS:
     void on_startMissingButton_clicked();
     void on_tableWidgetMyMasternodes_itemSelectionChanged();
     void on_UpdateButton_clicked();
+
+    void on_extraInfoDIP3_clicked();
+    void on_copyProTxHash_clicked();
+    void on_copyCollateralOutpoint_clicked();
 };
 #endif // MASTERNODELIST_H

From 2ba1ff5216e0c861a67a904cd3ae2f16687ae431 Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Wed, 21 Nov 2018 08:04:42 +0100
Subject: [PATCH 299/400] Use ParseFixedPoint instead of ParseDoubleV in "protx
 register" commands (#2458)

---
 src/rpc/rpcevo.cpp | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/rpc/rpcevo.cpp b/src/rpc/rpcevo.cpp
index 477b72e662e2..083d244cc086 100644
--- a/src/rpc/rpcevo.cpp
+++ b/src/rpc/rpcevo.cpp
@@ -327,11 +327,14 @@ UniValue protx_register(const JSONRPCRequest& request)
         keyIDVoting = ParsePubKeyIDFromAddress(request.params[paramIdx + 3].get_str(), "voting address");
     }
 
-    double operatorReward = ParseDoubleV(request.params[paramIdx + 4], "operatorReward");
-    if (operatorReward < 0 || operatorReward > 100) {
+    int64_t operatorReward;
+    if (!ParseFixedPoint(request.params[paramIdx + 4].getValStr(), 2, &operatorReward)) {
+        throw JSONRPCError(RPC_INVALID_PARAMETER, "operatorReward must be a number");
+    }
+    if (operatorReward < 0 || operatorReward > 10000) {
         throw JSONRPCError(RPC_INVALID_PARAMETER, "operatorReward must be between 0.00 and 100.00");
     }
-    ptx.nOperatorReward = (uint16_t)(operatorReward * 100);
+    ptx.nOperatorReward = operatorReward;
 
     CBitcoinAddress payoutAddress(request.params[paramIdx + 5].get_str());
     if (!payoutAddress.IsValid()) {

From 85157f9a9e690180447fcd59cfe6b20063e49b28 Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Thu, 22 Nov 2018 06:05:20 +0100
Subject: [PATCH 300/400] Few trivial fixes for DIP2/DIP3 (#2474)

* Fix wrong index for argument to protx_update_service when error is thrown

* Unify and fix variable name in TxToJSON

The UniValue variable name for TRANSACTION_COINBASE was wrong and is fixed
now. Also changed names for all other special TXs to unify names. This
should avoid such errors in the future when new "else if" branches are
copy/pasted.

* Use "proRegTx" instead of "proTx" as key TRANSACTION_PROVIDER_REGISTER payloads
---
 src/rpc/rawtransaction.cpp | 30 +++++++++++++++---------------
 src/rpc/rpcevo.cpp         |  2 +-
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/rpc/rawtransaction.cpp b/src/rpc/rawtransaction.cpp
index b70ffda4928f..a4dd474ca951 100644
--- a/src/rpc/rawtransaction.cpp
+++ b/src/rpc/rawtransaction.cpp
@@ -134,37 +134,37 @@ void TxToJSON(const CTransaction& tx, const uint256 hashBlock, UniValue& entry)
     if (tx.nType == TRANSACTION_PROVIDER_REGISTER) {
         CProRegTx proTx;
         if (GetTxPayload(tx, proTx)) {
-            UniValue proTxObj;
-            proTx.ToJson(proTxObj);
-            entry.push_back(Pair("proTx", proTxObj));
+            UniValue obj;
+            proTx.ToJson(obj);
+            entry.push_back(Pair("proRegTx", obj));
         }
     } else if (tx.nType == TRANSACTION_PROVIDER_UPDATE_SERVICE) {
         CProUpServTx proTx;
         if (GetTxPayload(tx, proTx)) {
-            UniValue proTxObj;
-            proTx.ToJson(proTxObj);
-            entry.push_back(Pair("proUpServTx", proTxObj));
+            UniValue obj;
+            proTx.ToJson(obj);
+            entry.push_back(Pair("proUpServTx", obj));
         }
     } else if (tx.nType == TRANSACTION_PROVIDER_UPDATE_REGISTRAR) {
         CProUpRegTx proTx;
         if (GetTxPayload(tx, proTx)) {
-            UniValue proTxObj;
-            proTx.ToJson(proTxObj);
-            entry.push_back(Pair("proUpRegTx", proTxObj));
+            UniValue obj;
+            proTx.ToJson(obj);
+            entry.push_back(Pair("proUpRegTx", obj));
         }
     } else if (tx.nType == TRANSACTION_PROVIDER_UPDATE_REVOKE) {
         CProUpRevTx proTx;
         if (GetTxPayload(tx, proTx)) {
-            UniValue proTxObj;
-            proTx.ToJson(proTxObj);
-            entry.push_back(Pair("proUpRevTx", proTxObj));
+            UniValue obj;
+            proTx.ToJson(obj);
+            entry.push_back(Pair("proUpRevTx", obj));
         }
     } else if (tx.nType == TRANSACTION_COINBASE) {
         CCbTx cbTx;
         if (GetTxPayload(tx, cbTx)) {
-            UniValue proTxObj;
-            cbTx.ToJson(proTxObj);
-            entry.push_back(Pair("cbTx", proTxObj));
+            UniValue obj;
+            cbTx.ToJson(obj);
+            entry.push_back(Pair("cbTx", obj));
         }
     }
 
diff --git a/src/rpc/rpcevo.cpp b/src/rpc/rpcevo.cpp
index 083d244cc086..3f299f2f7ae5 100644
--- a/src/rpc/rpcevo.cpp
+++ b/src/rpc/rpcevo.cpp
@@ -460,7 +460,7 @@ UniValue protx_update_service(const JSONRPCRequest& request)
     ptx.proTxHash = ParseHashV(request.params[1], "proTxHash");
 
     if (!Lookup(request.params[2].get_str().c_str(), ptx.addr, Params().GetDefaultPort(), false)) {
-        throw std::runtime_error(strprintf("invalid network address %s", request.params[3].get_str()));
+        throw std::runtime_error(strprintf("invalid network address %s", request.params[2].get_str()));
     }
 
     CBLSSecretKey keyOperator = ParseBLSSecretKey(request.params[3].get_str(), "operatorKey");

From 5ffc31bce4f69526e0f58f19edfd2a0ed61cb3ab Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Thu, 22 Nov 2018 06:05:32 +0100
Subject: [PATCH 301/400] Forbid version=0 in special TXs (#2473)

---
 qa/rpc-tests/dip3-deterministicmns.py | 2 +-
 src/evo/cbtx.cpp                      | 2 +-
 src/evo/providertx.cpp                | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/qa/rpc-tests/dip3-deterministicmns.py b/qa/rpc-tests/dip3-deterministicmns.py
index 7818843e31fa..04c620fcfcf5 100755
--- a/qa/rpc-tests/dip3-deterministicmns.py
+++ b/qa/rpc-tests/dip3-deterministicmns.py
@@ -766,7 +766,7 @@ def mine_block(self, node, vtx=[], miner_address=None, mn_payee=None, mn_amount=
 
         # We can't really use this one as it would result in invalid merkle roots for masternode lists
         if len(bt['coinbase_payload']) != 0:
-            cbtx = FromHex(CCbTx(), bt['coinbase_payload'])
+            cbtx = FromHex(CCbTx(version=1), bt['coinbase_payload'])
             if use_mnmerkleroot_from_tip:
                 if 'cbTx' in tip_block:
                     cbtx.merkleRootMNList = int(tip_block['cbTx']['merkleRootMNList'], 16)
diff --git a/src/evo/cbtx.cpp b/src/evo/cbtx.cpp
index b7a8577606c1..43d3bcb4f9fe 100644
--- a/src/evo/cbtx.cpp
+++ b/src/evo/cbtx.cpp
@@ -25,7 +25,7 @@ bool CheckCbTx(const CTransaction& tx, const CBlockIndex* pindexPrev, CValidatio
         return state.DoS(100, false, REJECT_INVALID, "bad-cbtx-payload");
     }
 
-    if (cbTx.nVersion > CCbTx::CURRENT_VERSION) {
+    if (cbTx.nVersion == 0 || cbTx.nVersion > CCbTx::CURRENT_VERSION) {
         return state.DoS(100, false, REJECT_INVALID, "bad-cbtx-version");
     }
 
diff --git a/src/evo/providertx.cpp b/src/evo/providertx.cpp
index 8da9b6bd6296..9311968f7778 100644
--- a/src/evo/providertx.cpp
+++ b/src/evo/providertx.cpp
@@ -85,7 +85,7 @@ bool CheckProRegTx(const CTransaction& tx, const CBlockIndex* pindexPrev, CValid
         return state.DoS(100, false, REJECT_INVALID, "bad-protx-payload");
     }
 
-    if (ptx.nVersion > CProRegTx::CURRENT_VERSION) {
+    if (ptx.nVersion == 0 || ptx.nVersion > CProRegTx::CURRENT_VERSION) {
         return state.DoS(100, false, REJECT_INVALID, "bad-protx-version");
     }
     if (ptx.nType != 0) {
@@ -214,7 +214,7 @@ bool CheckProUpServTx(const CTransaction& tx, const CBlockIndex* pindexPrev, CVa
         return state.DoS(100, false, REJECT_INVALID, "bad-protx-payload");
     }
 
-    if (ptx.nVersion > CProRegTx::CURRENT_VERSION) {
+    if (ptx.nVersion == 0 || ptx.nVersion > CProRegTx::CURRENT_VERSION) {
         return state.DoS(100, false, REJECT_INVALID, "bad-protx-version");
     }
 
@@ -267,7 +267,7 @@ bool CheckProUpRegTx(const CTransaction& tx, const CBlockIndex* pindexPrev, CVal
         return state.DoS(100, false, REJECT_INVALID, "bad-protx-payload");
     }
 
-    if (ptx.nVersion > CProRegTx::CURRENT_VERSION) {
+    if (ptx.nVersion == 0 || ptx.nVersion > CProRegTx::CURRENT_VERSION) {
         return state.DoS(100, false, REJECT_INVALID, "bad-protx-version");
     }
     if (ptx.nMode != 0) {
@@ -349,7 +349,7 @@ bool CheckProUpRevTx(const CTransaction& tx, const CBlockIndex* pindexPrev, CVal
         return state.DoS(100, false, REJECT_INVALID, "bad-protx-payload");
     }
 
-    if (ptx.nVersion > CProRegTx::CURRENT_VERSION) {
+    if (ptx.nVersion == 0 || ptx.nVersion > CProRegTx::CURRENT_VERSION) {
         return state.DoS(100, false, REJECT_INVALID, "bad-protx-version");
     }
 

From 2b400f74b5c4b8283db7f45ef1d8a660dd71646b Mon Sep 17 00:00:00 2001
From: UdjinM6 <UdjinM6@users.noreply.github.com>
Date: Thu, 22 Nov 2018 08:09:35 +0300
Subject: [PATCH 302/400] Base dsq/dstx thresholold on total number of up to
 date masternodes (#2465)

Mixing on a newer version with small number of upgraded masternodes
causes mixing txes to "stuck" - old nodes refuse to relay dstxes from new ones because
they come from the same masternodes too often. Basing threshold on the total number
of up to date masternodes and not only on a newer (enabled) ones should solve this.
This however will cause mixing to fail if there are not enough masternodes
on the needed protocol version (i.e. at least GetMinMasternodePaymentsProto())
but it's better to stop mixing than having funds kind of spent yet not confirmed
for a long time.
---
 src/privatesend-client.cpp | 2 +-
 src/privatesend-server.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/privatesend-client.cpp b/src/privatesend-client.cpp
index 4880464c1be2..5a72ef800f55 100644
--- a/src/privatesend-client.cpp
+++ b/src/privatesend-client.cpp
@@ -94,7 +94,7 @@ void CPrivateSendClientManager::ProcessMessage(CNode* pfrom, const std::string&
                 }
             }
 
-            int nThreshold = infoMn.nLastDsq + mnodeman.CountEnabled(MIN_PRIVATESEND_PEER_PROTO_VERSION) / 5;
+            int nThreshold = infoMn.nLastDsq + mnodeman.CountMasternodes() / 5;
             LogPrint("privatesend", "DSQUEUE -- nLastDsq: %d  threshold: %d  nDsqCount: %d\n", infoMn.nLastDsq, nThreshold, mnodeman.nDsqCount);
             //don't allow a few nodes to dominate the queuing process
             if (infoMn.nLastDsq != 0 && nThreshold > mnodeman.nDsqCount) {
diff --git a/src/privatesend-server.cpp b/src/privatesend-server.cpp
index 322c406286df..69a9972f5cdf 100644
--- a/src/privatesend-server.cpp
+++ b/src/privatesend-server.cpp
@@ -114,7 +114,7 @@ void CPrivateSendServer::ProcessMessage(CNode* pfrom, const std::string& strComm
                 }
             }
 
-            int nThreshold = mnInfo.nLastDsq + mnodeman.CountEnabled(MIN_PRIVATESEND_PEER_PROTO_VERSION) / 5;
+            int nThreshold = mnInfo.nLastDsq + mnodeman.CountMasternodes() / 5;
             LogPrint("privatesend", "DSQUEUE -- nLastDsq: %d  threshold: %d  nDsqCount: %d\n", mnInfo.nLastDsq, nThreshold, mnodeman.nDsqCount);
             //don't allow a few nodes to dominate the queuing process
             if (mnInfo.nLastDsq != 0 && nThreshold > mnodeman.nDsqCount) {

From df7d12b41f4357fe4b40c80cc599c329aa17ed40 Mon Sep 17 00:00:00 2001
From: UdjinM6 <UdjinM6@users.noreply.github.com>
Date: Thu, 22 Nov 2018 08:09:58 +0300
Subject: [PATCH 303/400] Add univalue test for real numbers (#2460)

---
 src/test/univalue_tests.cpp | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/test/univalue_tests.cpp b/src/test/univalue_tests.cpp
index a6ac201a99a3..fdc8b1006bd2 100644
--- a/src/test/univalue_tests.cpp
+++ b/src/test/univalue_tests.cpp
@@ -92,6 +92,15 @@ BOOST_AUTO_TEST_CASE(univalue_typecheck)
     BOOST_CHECK_THROW(v4.getKeys(), std::runtime_error);
     BOOST_CHECK_THROW(v4.getValues(), std::runtime_error);
     BOOST_CHECK_THROW(v4.get_obj(), std::runtime_error);
+    BOOST_CHECK(v4.setNumStr("2.01"));
+    BOOST_CHECK_THROW(v4.get_int(), std::runtime_error);
+    BOOST_CHECK_THROW(v4.get_int64(), std::runtime_error);
+    BOOST_CHECK_THROW(v4.get_str(), std::runtime_error);
+    BOOST_CHECK_EQUAL(v4.get_real(), 2.01);
+    BOOST_CHECK_THROW(v4.get_array(), std::runtime_error);
+    BOOST_CHECK_THROW(v4.getKeys(), std::runtime_error);
+    BOOST_CHECK_THROW(v4.getValues(), std::runtime_error);
+    BOOST_CHECK_THROW(v4.get_obj(), std::runtime_error);
 
     UniValue v5;
     BOOST_CHECK(v5.read("[true, 10]"));

From d40a5ce31f0992e31821c8dc5e26b67382791945 Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Fri, 23 Nov 2018 10:40:46 +0100
Subject: [PATCH 304/400]  Properly initialize confirmedHash in
 CSimplifiedMNListEntry (#2479)

* Properly initialize confirmedHash in CSimplifiedMNListEntry

* Add consensus params for temporary hard-fork on testnet

This hard-fork is required on testnet as we have to fix a few consensus
bugs in DIP3/DIP4. It will also be required to introduce LLMQ commitments
to testnet.

* Add temporary fork-logic for testnet, which sets confirmedHash to null

...before fork activation. Otherwise we'd invalidate all DIP3 blocks on
testnet.

* Bump nTemporaryTestnetForkHeight to 273000
---
 src/chainparams.cpp       |  5 +++++
 src/consensus/params.h    |  5 +++++
 src/evo/cbtx.cpp          | 14 ++++++++++++++
 src/evo/simplifiedmns.cpp |  1 +
 4 files changed, 25 insertions(+)

diff --git a/src/chainparams.cpp b/src/chainparams.cpp
index 7af989cf72d4..b58fedff33ae 100644
--- a/src/chainparams.cpp
+++ b/src/chainparams.cpp
@@ -378,6 +378,11 @@ class CTestNetParams : public CChainParams {
         // Testnet Dash BIP44 coin type is '1' (All coin's testnet default)
         nExtCoinType = 1;
 
+        // This is temporary until we reset testnet for retesting of the full DIP3 deployment
+        consensus.nTemporaryTestnetForkDIP3Height = 264000;
+        consensus.nTemporaryTestnetForkHeight = 273000;
+        consensus.nTemporaryTestnetForkDIP3BlockHash.SetHex("00000048e6e71d4bd90e7c456dcb94683ae832fcad13e1760d8283f7e89f332f");
+
         fMiningRequiresPeers = true;
         fDefaultConsistencyChecks = false;
         fRequireStandard = false;
diff --git a/src/consensus/params.h b/src/consensus/params.h
index b59491cf3689..f5131d2b6caa 100644
--- a/src/consensus/params.h
+++ b/src/consensus/params.h
@@ -95,6 +95,11 @@ struct Params {
     int nMinimumDifficultyBlocks{0};
     int nHighSubsidyBlocks{0};
     int nHighSubsidyFactor{1};
+
+    // This is temporary until we reset testnet for retesting of the full DIP3 deployment
+    int nTemporaryTestnetForkDIP3Height{0};
+    uint256 nTemporaryTestnetForkDIP3BlockHash;
+    int nTemporaryTestnetForkHeight{0};
 };
 } // namespace Consensus
 
diff --git a/src/evo/cbtx.cpp b/src/evo/cbtx.cpp
index 43d3bcb4f9fe..a21fe7db6b0f 100644
--- a/src/evo/cbtx.cpp
+++ b/src/evo/cbtx.cpp
@@ -7,6 +7,7 @@
 #include "simplifiedmns.h"
 #include "specialtx.h"
 
+#include "chainparams.h"
 #include "univalue.h"
 #include "validation.h"
 
@@ -71,6 +72,19 @@ bool CalcCbTxMerkleRootMNList(const CBlock& block, const CBlockIndex* pindexPrev
     }
 
     CSimplifiedMNList sml(tmpMNList);
+
+    // BEGIN TEMPORARY CODE
+    const auto& consensus = Params().GetConsensus();
+    if (consensus.nTemporaryTestnetForkHeight != 0 &&
+        pindexPrev->nHeight + 1 >= consensus.nTemporaryTestnetForkDIP3Height &&
+        pindexPrev->nHeight + 1 < consensus.nTemporaryTestnetForkHeight &&
+        chainActive[consensus.nTemporaryTestnetForkDIP3Height]->GetBlockHash() == consensus.nTemporaryTestnetForkDIP3BlockHash) {
+        for (auto& sme : sml.mnList) {
+            sme.confirmedHash.SetNull();
+        }
+    }
+    // END TEMPORARY CODE
+
     bool mutated = false;
     merkleRootRet = sml.CalcMerkleRoot(&mutated);
     return !mutated;
diff --git a/src/evo/simplifiedmns.cpp b/src/evo/simplifiedmns.cpp
index 26d26eb47ccd..b630e06d318e 100644
--- a/src/evo/simplifiedmns.cpp
+++ b/src/evo/simplifiedmns.cpp
@@ -15,6 +15,7 @@
 
 CSimplifiedMNListEntry::CSimplifiedMNListEntry(const CDeterministicMN& dmn) :
     proRegTxHash(dmn.proTxHash),
+    confirmedHash(dmn.pdmnState->confirmedHash),
     service(dmn.pdmnState->addr),
     pubKeyOperator(dmn.pdmnState->pubKeyOperator),
     keyIDVoting(dmn.pdmnState->keyIDVoting),

From a57e9dea7402496cd973c89a3a777b91bc8f6432 Mon Sep 17 00:00:00 2001
From: gladcow <sergey@dash.org>
Date: Fri, 23 Nov 2018 17:40:19 +0300
Subject: [PATCH 305/400] Fix filtering of the lock votes for SPV nodes.
 (#2468)

* check request is not empty to use it for filtering

* Filter vote INVs by tx hash

* fix lock requests filtering

* Apply suggestions from code review

Co-Authored-By: gladcow <sergey@dash.org>
---
 src/instantx.cpp |  4 ++--
 src/net.cpp      | 21 +++++++++++++++++++++
 src/net.h        |  2 ++
 3 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/src/instantx.cpp b/src/instantx.cpp
index 14fa774dc03d..2fc415db075b 100644
--- a/src/instantx.cpp
+++ b/src/instantx.cpp
@@ -1156,10 +1156,10 @@ void CTxLockVote::Relay(CConnman& connman) const
 {
     CInv inv(MSG_TXLOCK_VOTE, GetHash());
     CTxLockRequest request;
-    if (instantsend.GetTxLockRequest(txHash, request)) {
+    if (instantsend.GetTxLockRequest(txHash, request) && request) {
         connman.RelayInvFiltered(inv, *request.tx);
     } else {
-        connman.RelayInv(inv);
+        connman.RelayInvFiltered(inv, txHash);
     }
 }
 
diff --git a/src/net.cpp b/src/net.cpp
index 1d84431965ba..651e672c0d60 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -2629,6 +2629,14 @@ void CConnman::RelayTransaction(const CTransaction& tx)
     LOCK(cs_vNodes);
     BOOST_FOREACH(CNode* pnode, vNodes)
     {
+        if (nInv == MSG_TXLOCK_REQUEST) {
+            // Additional filtering for lock requests.
+            // Make it here because lock request processing
+            // differs from simple tx processing in PushInventory
+            // and tx info will not be available there.
+            LOCK(pnode->cs_filter);
+            if(pnode->pfilter && !pnode->pfilter->IsRelevantAndUpdate(tx)) continue;
+        }
         pnode->PushInventory(inv);
     }
 }
@@ -2655,6 +2663,19 @@ void CConnman::RelayInvFiltered(CInv &inv, const CTransaction& relatedTx, const
     }
 }
 
+void CConnman::RelayInvFiltered(CInv &inv, const uint256& relatedTxHash, const int minProtoVersion)
+{
+    LOCK(cs_vNodes);
+    for (const auto& pnode : vNodes) {
+        if(pnode->nVersion < minProtoVersion) continue;
+        {
+            LOCK(pnode->cs_filter);
+            if(pnode->pfilter && !pnode->pfilter->contains(relatedTxHash)) continue;
+        }
+        pnode->PushInventory(inv);
+    }
+}
+
 void CConnman::RemoveAskFor(const uint256& hash)
 {
     mapAlreadyAskedFor.erase(hash);
diff --git a/src/net.h b/src/net.h
index 56aea9fc04eb..3fdb14cc3cfc 100644
--- a/src/net.h
+++ b/src/net.h
@@ -310,6 +310,8 @@ class CConnman
     void RelayTransaction(const CTransaction& tx, const CDataStream& ss);
     void RelayInv(CInv &inv, const int minProtoVersion = MIN_PEER_PROTO_VERSION);
     void RelayInvFiltered(CInv &inv, const CTransaction &relatedTx, const int minProtoVersion = MIN_PEER_PROTO_VERSION);
+    // This overload will not update node filters,  so use it only for the cases when other messages will update related transaction data in filters
+    void RelayInvFiltered(CInv &inv, const uint256 &relatedTxHash, const int minProtoVersion = MIN_PEER_PROTO_VERSION);
     void RemoveAskFor(const uint256& hash);
 
     // Addrman functions

From f4ef388deab575a375ddbc668e37eac694714404 Mon Sep 17 00:00:00 2001
From: PastaPastaPasta <pasta@dashboost.org>
Date: Fri, 23 Nov 2018 08:41:00 -0600
Subject: [PATCH 306/400] Update PS help text for the new denom (#2471)

---
 src/qt/utilitydialog.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/qt/utilitydialog.cpp b/src/qt/utilitydialog.cpp
index a2822804bef0..c807f233b639 100644
--- a/src/qt/utilitydialog.cpp
+++ b/src/qt/utilitydialog.cpp
@@ -145,7 +145,7 @@ You retain control of your money at all times.<hr> \
 <b>The PrivateSend process works like this:</b>\
 <ol type=\"1\"> \
 <li>PrivateSend begins by breaking your transaction inputs down into standard denominations. \
-These denominations are 0.01 DASH, 0.1 DASH, 1 DASH and 10 DASH -- sort of like the paper money you use every day.</li> \
+These denominations are 0.001 DASH, 0.01 DASH, 0.1 DASH, 1 DASH and 10 DASH -- sort of like the paper money you use every day.</li> \
 <li>Your wallet then sends requests to specially configured software nodes on the network, called \"masternodes.\" \
 These masternodes are informed then that you are interested in mixing a certain denomination. \
 No identifiable information is sent to the masternodes, so they never know \"who\" you are.</li> \

From 6c190d1bb3e058cb288b06467dc093c2f9025e5e Mon Sep 17 00:00:00 2001
From: UdjinM6 <UdjinM6@users.noreply.github.com>
Date: Fri, 23 Nov 2018 17:41:39 +0300
Subject: [PATCH 307/400] Fix make deploy error on macos (#2475)

---
 contrib/macdeploy/macdeployqtplus | 1 +
 1 file changed, 1 insertion(+)

diff --git a/contrib/macdeploy/macdeployqtplus b/contrib/macdeploy/macdeployqtplus
index 61654c849da0..7a22d99bbc6c 100755
--- a/contrib/macdeploy/macdeployqtplus
+++ b/contrib/macdeploy/macdeployqtplus
@@ -850,6 +850,7 @@ if config.dmg is not None:
             print("Running AppleScript:")
             print(s)
 
+        time.sleep(2) # fixes '112:116: execution error: Finder got an error: Can’t get disk "Dash-Core". (-1728)'
         p = subprocess.Popen(['osascript', '-'], stdin=subprocess.PIPE)
         p.communicate(input=s.encode('utf-8'))
         if p.returncode:

From 22b5952c5adfbc568aadc822c85ce6f8c03d8b68 Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Fri, 23 Nov 2018 15:42:09 +0100
Subject: [PATCH 308/400] Implement and enforce DIP6 commitments (#2477)

* Add LLMQ parameters to consensus params

* Add DIP6 quorum commitment special TX

* Implement CQuorumBlockProcessor which validates and handles commitments

* Add quorum commitments to new blocks

* Propagate QFCOMMITMENT messages to all nodes

* Allow special transactions in blocks which have no inputs/outputs

But only for TRANSACTION_QUORUM_COMMITMENT for now.

* Add quorum commitments to self-crafted blocks in DIP3 tests

* Add simple fork logic for current testnet

This should avoid a fork on the current testnet. It only applies to the
current chain which activated DIP3 at height 264000 and block
00000048e6e71d4bd90e7c456dcb94683ae832fcad13e1760d8283f7e89f332f.

When we revert the chain to retest the DIP3 deployment, this fork logic
can be removed again.

* Use quorumVvecHash instead of quorumHash to make null commitments unique

Implementation of https://github.com/dashpay/dips/pull/31

* Re-add quorum commitments after pruning mempool selected blocks

* Refactor CQuorumBlockProcessor::ProcessBlock to have less nested if/else statements

Also add BEGIN/END markers for temporary code.

* Add comments/documentation to LLMQParams

* Move code which determines if a commitment is required into IsCommitmentRequired

This should make the code easier to read and also removes some duplication.

The also changes the error types that are possible from 3 to 2 now. Instead
of having "bad-qc-already-mined" and "bad-qc-not-mining-phase", there is
only "bad-qc-not-allowed" now.

* Use new parameter from consensus parames for the temporary fork
---
 CMakeLists.txt                        |   2 +
 qa/rpc-tests/dip3-deterministicmns.py |   7 +
 src/Makefile.am                       |   8 +
 src/chainparams.cpp                   |  76 ++++-
 src/consensus/params.h                |  62 ++++
 src/evo/specialtx.cpp                 |  17 +
 src/init.cpp                          |   5 +
 src/llmq/quorums_blockprocessor.cpp   | 437 ++++++++++++++++++++++++++
 src/llmq/quorums_blockprocessor.h     |  61 ++++
 src/llmq/quorums_commitment.cpp       | 146 +++++++++
 src/llmq/quorums_commitment.h         |  92 ++++++
 src/llmq/quorums_init.cpp             |  24 ++
 src/llmq/quorums_init.h               |  18 ++
 src/llmq/quorums_utils.cpp            |  33 ++
 src/llmq/quorums_utils.h              |  28 ++
 src/miner.cpp                         |  12 +
 src/net_processing.cpp                |  14 +
 src/primitives/transaction.h          |   1 +
 src/protocol.cpp                      |   3 +
 src/protocol.h                        |   2 +
 src/qt/test/rpcnestedtests.cpp        |   4 +
 src/rpc/rawtransaction.cpp            |   8 +
 src/test/test_dash.cpp                |  12 +
 src/validation.cpp                    |  17 +-
 24 files changed, 1085 insertions(+), 4 deletions(-)
 create mode 100644 src/llmq/quorums_blockprocessor.cpp
 create mode 100644 src/llmq/quorums_blockprocessor.h
 create mode 100644 src/llmq/quorums_commitment.cpp
 create mode 100644 src/llmq/quorums_commitment.h
 create mode 100644 src/llmq/quorums_init.cpp
 create mode 100644 src/llmq/quorums_init.h
 create mode 100644 src/llmq/quorums_utils.cpp
 create mode 100644 src/llmq/quorums_utils.h

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9e22a2e9b52e..8ba410964e32 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -74,6 +74,8 @@ file(GLOB SOURCE_FILES
         src/*.h
         src/evo/*.h
         src/evo/*.cpp
+        src/llmq/*.h
+        src/llmq/*.cpp
         src/rpc/*.cpp
         src/rpc/*.h
         )
diff --git a/qa/rpc-tests/dip3-deterministicmns.py b/qa/rpc-tests/dip3-deterministicmns.py
index 04c620fcfcf5..3bccd4843df2 100755
--- a/qa/rpc-tests/dip3-deterministicmns.py
+++ b/qa/rpc-tests/dip3-deterministicmns.py
@@ -780,6 +780,13 @@ def mine_block(self, node, vtx=[], miner_address=None, mn_payee=None, mn_amount=
 
         block = create_block(int(tip_hash, 16), coinbase)
         block.vtx += vtx
+
+        # Add quorum commitments from template
+        for tx in bt['transactions']:
+            tx2 = FromHex(CTransaction(), tx['data'])
+            if tx2.nType == 6:
+                block.vtx.append(tx2)
+
         block.hashMerkleRoot = block.calc_merkle_root()
         block.solve()
         result = node.submitblock(ToHex(block))
diff --git a/src/Makefile.am b/src/Makefile.am
index 659af594ff7d..ef84482edead 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -139,6 +139,10 @@ BITCOIN_CORE_H = \
   keystore.h \
   dbwrapper.h \
   limitedmap.h \
+  llmq/quorums_commitment.h \
+  llmq/quorums_blockprocessor.h \
+  llmq/quorums_utils.h \
+  llmq/quorums_init.h \
   masternode.h \
   masternode-payments.h \
   masternode-sync.h \
@@ -243,6 +247,10 @@ libdash_server_a_SOURCES = \
   governance-validators.cpp \
   governance-vote.cpp \
   governance-votedb.cpp \
+  llmq/quorums_commitment.cpp \
+  llmq/quorums_blockprocessor.cpp \
+  llmq/quorums_utils.cpp \
+  llmq/quorums_init.cpp \
   masternode.cpp \
   masternode-payments.cpp \
   masternode-sync.cpp \
diff --git a/src/chainparams.cpp b/src/chainparams.cpp
index b58fedff33ae..bc4221e2b18c 100644
--- a/src/chainparams.cpp
+++ b/src/chainparams.cpp
@@ -106,6 +106,61 @@ static CBlock FindDevNetGenesisBlock(const Consensus::Params& params, const CBlo
     assert(false);
 }
 
+// this one is for testing only
+static Consensus::LLMQParams llmq10_60 = {
+        .type = Consensus::LLMQ_10_60,
+        .name = "llmq_10",
+        .size = 10,
+        .minSize = 6,
+        .threshold = 6,
+
+        .dkgInterval = 24, // one DKG per hour
+        .dkgPhaseBlocks = 2,
+        .dkgMiningWindowStart = 10, // dkgPhaseBlocks * 5 = after finalization
+        .dkgMiningWindowEnd = 18,
+};
+
+static Consensus::LLMQParams llmq50_60 = {
+        .type = Consensus::LLMQ_50_60,
+        .name = "llmq_50_60",
+        .size = 50,
+        .minSize = 40,
+        .threshold = 30,
+
+        .dkgInterval = 24, // one DKG per hour
+        .dkgPhaseBlocks = 2,
+        .dkgMiningWindowStart = 10, // dkgPhaseBlocks * 5 = after finalization
+        .dkgMiningWindowEnd = 18,
+};
+
+static Consensus::LLMQParams llmq400_60 = {
+        .type = Consensus::LLMQ_400_60,
+        .name = "llmq_400_51",
+        .size = 400,
+        .minSize = 300,
+        .threshold = 240,
+
+        .dkgInterval = 24 * 12, // one DKG every 12 hours
+        .dkgPhaseBlocks = 4,
+        .dkgMiningWindowStart = 20, // dkgPhaseBlocks * 5 = after finalization
+        .dkgMiningWindowEnd = 28,
+};
+
+// Used for deployment and min-proto-version signalling, so it needs a higher threshold
+static Consensus::LLMQParams llmq400_85 = {
+        .type = Consensus::LLMQ_400_85,
+        .name = "llmq_400_85",
+        .size = 400,
+        .minSize = 350,
+        .threshold = 340,
+
+        .dkgInterval = 24 * 24, // one DKG every 24 hours
+        .dkgPhaseBlocks = 4,
+        .dkgMiningWindowStart = 20, // dkgPhaseBlocks * 5 = after finalization
+        .dkgMiningWindowEnd = 48, // give it a larger mining window to make sure it is mined
+};
+
+
 /**
  * Main network
  */
@@ -219,6 +274,11 @@ class CMainParams : public CChainParams {
 
         vFixedSeeds = std::vector<SeedSpec6>(pnSeed6_main, pnSeed6_main + ARRAYLEN(pnSeed6_main));
 
+        // long living quorum params
+        consensus.llmqs[Consensus::LLMQ_50_60] = llmq50_60;
+        consensus.llmqs[Consensus::LLMQ_400_60] = llmq400_60;
+        consensus.llmqs[Consensus::LLMQ_400_85] = llmq400_85;
+
         fMiningRequiresPeers = true;
         fDefaultConsistencyChecks = false;
         fRequireStandard = true;
@@ -378,6 +438,11 @@ class CTestNetParams : public CChainParams {
         // Testnet Dash BIP44 coin type is '1' (All coin's testnet default)
         nExtCoinType = 1;
 
+        // long living quorum params
+        consensus.llmqs[Consensus::LLMQ_50_60] = llmq50_60;
+        consensus.llmqs[Consensus::LLMQ_400_60] = llmq400_60;
+        consensus.llmqs[Consensus::LLMQ_400_85] = llmq400_85;
+
         // This is temporary until we reset testnet for retesting of the full DIP3 deployment
         consensus.nTemporaryTestnetForkDIP3Height = 264000;
         consensus.nTemporaryTestnetForkHeight = 273000;
@@ -524,6 +589,11 @@ class CDevNetParams : public CChainParams {
         // Testnet Dash BIP44 coin type is '1' (All coin's testnet default)
         nExtCoinType = 1;
 
+        // long living quorum params
+        consensus.llmqs[Consensus::LLMQ_50_60] = llmq50_60;
+        consensus.llmqs[Consensus::LLMQ_400_60] = llmq400_60;
+        consensus.llmqs[Consensus::LLMQ_400_85] = llmq400_85;
+
         fMiningRequiresPeers = true;
         fDefaultConsistencyChecks = false;
         fRequireStandard = false;
@@ -675,7 +745,11 @@ class CRegTestParams : public CChainParams {
 
         // Regtest Dash BIP44 coin type is '1' (All coin's testnet default)
         nExtCoinType = 1;
-   }
+
+        // long living quorum params
+        consensus.llmqs[Consensus::LLMQ_10_60] = llmq10_60;
+        consensus.llmqs[Consensus::LLMQ_50_60] = llmq50_60;
+    }
 
     void UpdateBIP9Parameters(Consensus::DeploymentPos d, int64_t nStartTime, int64_t nTimeout)
     {
diff --git a/src/consensus/params.h b/src/consensus/params.h
index f5131d2b6caa..705f7b9e281a 100644
--- a/src/consensus/params.h
+++ b/src/consensus/params.h
@@ -39,6 +39,66 @@ struct BIP9Deployment {
     int64_t nThreshold;
 };
 
+enum LLMQType : uint8_t
+{
+    LLMQ_NONE = 0xff,
+
+    LLMQ_50_60 = 1, // 50 members, 30 (60%) threshold, one per hour
+    LLMQ_400_60 = 2, // 400 members, 240 (60%) threshold, one every 12 hours
+    LLMQ_400_85 = 3, // 400 members, 340 (85%) threshold, one every 24 hours
+
+    // for testing only
+    LLMQ_10_60 = 100, // 10 members, 6 (60%) threshold, one per hour
+};
+
+// Configures a LLMQ and its DKG
+// See https://github.com/dashpay/dips/blob/master/dip-0006.md for more details
+struct LLMQParams {
+    LLMQType type;
+
+    // not consensus critical, only used in logging, RPC and UI
+    std::string name;
+
+    // the size of the quorum, e.g. 50 or 400
+    int size;
+
+    // The minimum number of valid members after the DKK. If less members are determined valid, no commitment can be
+    // created. Should be higher then the threshold to allow some room for failing nodes, otherwise quorum might end up
+    // not being able to ever created a recovered signature if more nodes fail after the DKG
+    int minSize;
+
+    // The threshold required to recover a final signature. Should be at least 50%+1 of the quorum size. This value
+    // also controls the size of the public key verification vector and has a large influence on the performance of
+    // recovery. It also influences the amount of minimum messages that need to be exchanged for a single signing session.
+    // This value has the most influence on the security of the quorum. The number of total malicious masternodes
+    // required to negatively influence signing sessions highly correlates to the threshold percentage.
+    int threshold;
+
+    // The interval in number blocks for DKGs and the creation of LLMQs. If set to 24 for example, a DKG will start
+    // every 24 blocks, which is approximately once every hour.
+    int dkgInterval;
+
+    // The number of blocks per phase in a DKG session. There are 6 phases plus the mining phase that need to be processed
+    // per DKG. Set this value to a number of blocks so that each phase has enough time to propagate all required
+    // messages to all members before the next phase starts. If blocks are produced too fast, whole DKG sessions will
+    // fail.
+    int dkgPhaseBlocks;
+
+    // The starting block inside the DKG interval for when mining of commitments starts. The value is inclusive.
+    // Starting from this block, the inclusion of (possibly null) commitments is enforced until the first non-null
+    // commitment is mined. The chosen value should be at least 5 * dkgPhaseBlocks so that it starts right after the
+    // finalization phase.
+    int dkgMiningWindowStart;
+
+    // The ending block inside the DKG interval for when mining of commitments ends. The value is inclusive.
+    // Choose a value so that miners have enough time to receive the commitment and mine it. Also take into consideration
+    // that miners might omit real commitments and revert to always including null commitments. The mining window should
+    // be large enough so that other miners have a chance to produce a block containing a non-null commitment. The window
+    // should at the same time not be too large so that not too much space is wasted with null commitments in case a DKG
+    // session failed.
+    int dkgMiningWindowEnd;
+};
+
 /**
  * Parameters that influence chain consensus.
  */
@@ -96,6 +156,8 @@ struct Params {
     int nHighSubsidyBlocks{0};
     int nHighSubsidyFactor{1};
 
+    std::map<LLMQType, LLMQParams> llmqs;
+	
     // This is temporary until we reset testnet for retesting of the full DIP3 deployment
     int nTemporaryTestnetForkDIP3Height{0};
     uint256 nTemporaryTestnetForkDIP3BlockHash;
diff --git a/src/evo/specialtx.cpp b/src/evo/specialtx.cpp
index cd2a1d0bb72e..99e9e80bac51 100644
--- a/src/evo/specialtx.cpp
+++ b/src/evo/specialtx.cpp
@@ -14,6 +14,9 @@
 #include "deterministicmns.h"
 #include "specialtx.h"
 
+#include "llmq/quorums_commitment.h"
+#include "llmq/quorums_blockprocessor.h"
+
 bool CheckSpecialTx(const CTransaction& tx, const CBlockIndex* pindexPrev, CValidationState& state)
 {
     if (tx.nVersion != 3 || tx.nType == TRANSACTION_NORMAL)
@@ -34,6 +37,8 @@ bool CheckSpecialTx(const CTransaction& tx, const CBlockIndex* pindexPrev, CVali
         return CheckProUpRevTx(tx, pindexPrev, state);
     case TRANSACTION_COINBASE:
         return CheckCbTx(tx, pindexPrev, state);
+    case TRANSACTION_QUORUM_COMMITMENT:
+        return true; // can't really check much here. checks are done in ProcessBlock
     }
 
     return state.DoS(10, false, REJECT_INVALID, "bad-tx-type-check");
@@ -53,6 +58,8 @@ bool ProcessSpecialTx(const CTransaction& tx, const CBlockIndex* pindex, CValida
         return true; // handled in batches per block
     case TRANSACTION_COINBASE:
         return true; // nothing to do
+    case TRANSACTION_QUORUM_COMMITMENT:
+        return true; // handled per block
     }
 
     return state.DoS(100, false, REJECT_INVALID, "bad-tx-type-proc");
@@ -72,6 +79,8 @@ bool UndoSpecialTx(const CTransaction& tx, const CBlockIndex* pindex)
         return true; // handled in batches per block
     case TRANSACTION_COINBASE:
         return true; // nothing to do
+    case TRANSACTION_QUORUM_COMMITMENT:
+        return true; // handled per block
     }
 
     return false;
@@ -97,6 +106,10 @@ bool ProcessSpecialTxsInBlock(const CBlock& block, const CBlockIndex* pindex, CV
         return false;
     }
 
+    if (!llmq::quorumBlockProcessor->ProcessBlock(block, pindex->pprev, state)) {
+        return false;
+    }
+
     return true;
 }
 
@@ -109,6 +122,10 @@ bool UndoSpecialTxsInBlock(const CBlock& block, const CBlockIndex* pindex)
         }
     }
 
+    if (!llmq::quorumBlockProcessor->UndoBlock(block, pindex)) {
+        return false;
+    }
+
     if (!deterministicMNManager->UndoBlock(block, pindex)) {
         return false;
     }
diff --git a/src/init.cpp b/src/init.cpp
index 854e371dd661..118700cf6e86 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -68,6 +68,8 @@
 
 #include "evo/deterministicmns.h"
 
+#include "llmq/quorums_init.h"
+
 #include <stdint.h>
 #include <stdio.h>
 #include <memory>
@@ -303,6 +305,7 @@ void PrepareShutdown()
         pcoinsdbview = NULL;
         delete pblocktree;
         pblocktree = NULL;
+        llmq::DestroyLLMQSystem();
         delete deterministicMNManager;
         deterministicMNManager = NULL;
         delete evoDb;
@@ -1713,6 +1716,7 @@ bool AppInitMain(boost::thread_group& threadGroup, CScheduler& scheduler)
                 delete pcoinsdbview;
                 delete pcoinscatcher;
                 delete pblocktree;
+                llmq::DestroyLLMQSystem();
                 delete deterministicMNManager;
                 delete evoDb;
 
@@ -1722,6 +1726,7 @@ bool AppInitMain(boost::thread_group& threadGroup, CScheduler& scheduler)
                 pcoinsdbview = new CCoinsViewDB(nCoinDBCache, false, fReindex || fReindexChainState);
                 pcoinscatcher = new CCoinsViewErrorCatcher(pcoinsdbview);
                 pcoinsTip = new CCoinsViewCache(pcoinscatcher);
+                llmq::InitLLMQSystem(*evoDb);
 
                 if (fReindex) {
                     pblocktree->WriteReindexing(true);
diff --git a/src/llmq/quorums_blockprocessor.cpp b/src/llmq/quorums_blockprocessor.cpp
new file mode 100644
index 000000000000..c40c1a85c96d
--- /dev/null
+++ b/src/llmq/quorums_blockprocessor.cpp
@@ -0,0 +1,437 @@
+// Copyright (c) 2018 The Dash Core developers
+// Distributed under the MIT/X11 software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+#include "quorums_blockprocessor.h"
+#include "quorums_commitment.h"
+#include "quorums_utils.h"
+
+#include "evo/specialtx.h"
+
+#include "chain.h"
+#include "chainparams.h"
+#include "consensus/validation.h"
+#include "net.h"
+#include "net_processing.h"
+#include "primitives/block.h"
+#include "validation.h"
+
+namespace llmq
+{
+
+CQuorumBlockProcessor* quorumBlockProcessor;
+
+static const std::string DB_MINED_COMMITMENT = "q_mc";
+
+void CQuorumBlockProcessor::ProcessMessage(CNode* pfrom, const std::string& strCommand, CDataStream& vRecv, CConnman& connman)
+{
+    if (strCommand == NetMsgType::QFCOMMITMENT) {
+        CFinalCommitment qc;
+        vRecv >> qc;
+
+        if (qc.IsNull()) {
+            LOCK(cs_main);
+            LogPrintf("CQuorumBlockProcessor::%s -- null commitment from peer=%d\n", __func__, pfrom->id);
+            Misbehaving(pfrom->id, 100);
+            return;
+        }
+
+        if (!Params().GetConsensus().llmqs.count((Consensus::LLMQType)qc.llmqType)) {
+            LOCK(cs_main);
+            LogPrintf("CQuorumBlockProcessor::%s -- invalid commitment type %d from peer=%d\n", __func__,
+                    qc.llmqType, pfrom->id);
+            Misbehaving(pfrom->id, 100);
+            return;
+        }
+        auto type = (Consensus::LLMQType)qc.llmqType;
+        const auto& params = Params().GetConsensus().llmqs.at(type);
+
+        // Verify that quorumHash is part of the active chain and that it's the first block in the DKG interval
+        {
+            LOCK(cs_main);
+            if (!mapBlockIndex.count(qc.quorumHash)) {
+                LogPrintf("CQuorumBlockProcessor::%s -- unknown block %s in commitment, peer=%d\n", __func__,
+                        qc.quorumHash.ToString(), pfrom->id);
+                // can't really punish the node here, as we might simply be the one that is on the wrong chain or not
+                // fully synced
+                return;
+            }
+            auto pquorumIndex = mapBlockIndex[qc.quorumHash];
+            if (chainActive.Tip()->GetAncestor(pquorumIndex->nHeight) != pquorumIndex) {
+                LogPrintf("CQuorumBlockProcessor::%s -- block %s not in active chain, peer=%d\n", __func__,
+                          qc.quorumHash.ToString(), pfrom->id);
+                // same, can't punish
+                return;
+            }
+            int quorumHeight = pquorumIndex->nHeight - (pquorumIndex->nHeight % params.dkgInterval);
+            if (quorumHeight != pquorumIndex->nHeight) {
+                LogPrintf("CQuorumBlockProcessor::%s -- block %s is not the first block in the DKG interval, peer=%d\n", __func__,
+                          qc.quorumHash.ToString(), pfrom->id);
+                Misbehaving(pfrom->id, 100);
+                return;
+            }
+        }
+
+        {
+            // Check if we already got a better one locally
+            // We do this before verifying the commitment to avoid DoS
+            LOCK(minableCommitmentsCs);
+            auto k = std::make_pair(type, qc.quorumHash);
+            auto it = minableCommitmentsByQuorum.find(k);
+            if (it != minableCommitmentsByQuorum.end()) {
+                auto jt = minableCommitments.find(it->second);
+                if (jt != minableCommitments.end()) {
+                    if (jt->second.CountSigners() <= qc.CountSigners()) {
+                        return;
+                    }
+                }
+            }
+        }
+
+        auto members = CLLMQUtils::GetAllQuorumMembers(type, qc.quorumHash);
+
+        if (!qc.Verify(members)) {
+            LOCK(cs_main);
+            LogPrintf("CQuorumBlockProcessor::%s -- commitment for quorum %s:%d is not valid, peer=%d\n", __func__,
+                      qc.quorumHash.ToString(), qc.llmqType, pfrom->id);
+            Misbehaving(pfrom->id, 100);
+            return;
+        }
+
+        LogPrintf("CQuorumBlockProcessor::%s -- received commitment for quorum %s:%d, validMembers=%d, signers=%d, peer=%d\n", __func__,
+                  qc.quorumHash.ToString(), qc.llmqType, qc.CountValidMembers(), qc.CountSigners(), pfrom->id);
+
+        AddMinableCommitment(qc);
+    }
+}
+
+bool CQuorumBlockProcessor::ProcessBlock(const CBlock& block, const CBlockIndex* pindexPrev, CValidationState& state)
+{
+    AssertLockHeld(cs_main);
+
+    bool fDIP0003Active = VersionBitsState(pindexPrev, Params().GetConsensus(), Consensus::DEPLOYMENT_DIP0003, versionbitscache) == THRESHOLD_ACTIVE;
+    if (!fDIP0003Active) {
+        return true;
+    }
+
+    int nHeight = pindexPrev->nHeight + 1;
+
+    std::map<Consensus::LLMQType, CFinalCommitment> qcs;
+    if (!GetCommitmentsFromBlock(block, pindexPrev, qcs, state)) {
+        return false;
+    }
+
+    // The following checks make sure that there is always a (possibly null) commitment while in the mining phase
+    // until the first non-null commitment has been mined. After the non-null commitment, no other commitments are
+    // allowed, including null commitments.
+    for (const auto& p : Params().GetConsensus().llmqs) {
+        auto type = p.first;
+
+        uint256 quorumHash = GetQuorumBlockHash(type, pindexPrev);
+
+        // does the currently processed block contain a (possibly null) commitment for the current session?
+        bool hasCommitmentInNewBlock = qcs.count(type) != 0;
+        bool isCommitmentRequired = IsCommitmentRequired(type, pindexPrev);
+
+        if (hasCommitmentInNewBlock && !isCommitmentRequired) {
+            // If we're either not in the mining phase or a non-null commitment was mined already, reject the block
+            return state.DoS(100, false, REJECT_INVALID, "bad-qc-not-allowed");
+        }
+
+        if (!hasCommitmentInNewBlock && isCommitmentRequired) {
+            // If no non-null commitment was mined for the mining phase yet and the new block does not include
+            // a (possibly null) commitment, the block should be rejected.
+            return state.DoS(100, false, REJECT_INVALID, "bad-qc-missing");
+        }
+    }
+
+    for (auto& p : qcs) {
+        auto& qc = p.second;
+        if (!ProcessCommitment(pindexPrev, qc, state)) {
+            return false;
+        }
+    }
+    return true;
+}
+
+bool CQuorumBlockProcessor::ProcessCommitment(const CBlockIndex* pindexPrev, const CFinalCommitment& qc, CValidationState& state)
+{
+    auto& params = Params().GetConsensus().llmqs.at((Consensus::LLMQType)qc.llmqType);
+
+    uint256 quorumHash = GetQuorumBlockHash((Consensus::LLMQType)qc.llmqType, pindexPrev);
+    if (quorumHash.IsNull()) {
+        return state.DoS(100, false, REJECT_INVALID, "bad-qc-block");
+    }
+    if (quorumHash != qc.quorumHash) {
+        return state.DoS(100, false, REJECT_INVALID, "bad-qc-block");
+    }
+
+    if (qc.IsNull()) {
+        if (!qc.VerifyNull(pindexPrev->nHeight + 1)) {
+            return state.DoS(100, false, REJECT_INVALID, "bad-qc-invalid-null");
+        }
+        return true;
+    }
+
+    if (HasMinedCommitment(params.type, quorumHash)) {
+        // should not happen as it's already handled in ProcessBlock
+        return state.DoS(100, false, REJECT_INVALID, "bad-qc-dup");
+    }
+
+    if (!IsMiningPhase(params.type, pindexPrev->nHeight + 1)) {
+        // should not happen as it's already handled in ProcessBlock
+        return state.DoS(100, false, REJECT_INVALID, "bad-qc-height");
+    }
+
+    auto members = CLLMQUtils::GetAllQuorumMembers(params.type, quorumHash);
+
+    if (!qc.Verify(members)) {
+        return state.DoS(100, false, REJECT_INVALID, "bad-qc-invalid");
+    }
+
+    // Store commitment in DB
+    evoDb.Write(std::make_pair(DB_MINED_COMMITMENT, std::make_pair((uint8_t)params.type, quorumHash)), qc);
+
+    LogPrintf("CQuorumBlockProcessor::%s -- processed commitment from block. type=%d, quorumHash=%s, signers=%s, validMembers=%d, quorumPublicKey=%s\n", __func__,
+              qc.llmqType, quorumHash.ToString(), qc.CountSigners(), qc.CountValidMembers(), qc.quorumPublicKey.ToString());
+
+    return true;
+}
+
+bool CQuorumBlockProcessor::UndoBlock(const CBlock& block, const CBlockIndex* pindex)
+{
+    AssertLockHeld(cs_main);
+
+    std::map<Consensus::LLMQType, CFinalCommitment> qcs;
+    CValidationState dummy;
+    if (!GetCommitmentsFromBlock(block, pindex->pprev, qcs, dummy)) {
+        return false;
+    }
+
+    for (auto& p : qcs) {
+        auto& qc = p.second;
+        if (qc.IsNull()) {
+            continue;
+        }
+
+        evoDb.Erase(std::make_pair(DB_MINED_COMMITMENT, std::make_pair(qc.llmqType, qc.quorumHash)));
+
+        if (!qc.IsNull()) {
+            // if a reorg happened, we should allow to mine this commitment later
+            AddMinableCommitment(qc);
+        }
+    }
+
+    return true;
+}
+
+bool CQuorumBlockProcessor::GetCommitmentsFromBlock(const CBlock& block, const CBlockIndex* pindexPrev, std::map<Consensus::LLMQType, CFinalCommitment>& ret, CValidationState& state)
+{
+    AssertLockHeld(cs_main);
+
+    auto& consensus = Params().GetConsensus();
+    bool fDIP0003Active = VersionBitsState(pindexPrev, consensus, Consensus::DEPLOYMENT_DIP0003, versionbitscache) == THRESHOLD_ACTIVE;
+
+    ret.clear();
+
+    for (const auto& tx : block.vtx) {
+        if (tx->nType == TRANSACTION_QUORUM_COMMITMENT) {
+            CFinalCommitment qc;
+            if (!GetTxPayload(*tx, qc)) {
+                return state.DoS(100, false, REJECT_INVALID, "bad-tx-payload");
+            }
+
+            if (!consensus.llmqs.count((Consensus::LLMQType)qc.llmqType)) {
+                return state.DoS(100, false, REJECT_INVALID, "bad-qc-type");
+            }
+
+            // only allow one commitment per type and per block
+            if (ret.count((Consensus::LLMQType)qc.llmqType)) {
+                return state.DoS(100, false, REJECT_INVALID, "bad-qc-dup");
+            }
+
+            ret.emplace((Consensus::LLMQType)qc.llmqType, std::move(qc));
+        }
+    }
+
+    if (!fDIP0003Active && !ret.empty()) {
+        return state.DoS(100, false, REJECT_INVALID, "bad-qc-premature");
+    }
+
+    return true;
+}
+
+bool CQuorumBlockProcessor::IsMiningPhase(Consensus::LLMQType llmqType, int nHeight)
+{
+    const auto& params = Params().GetConsensus().llmqs.at(llmqType);
+    int phaseIndex = nHeight % params.dkgInterval;
+    if (phaseIndex >= params.dkgMiningWindowStart && phaseIndex <= params.dkgMiningWindowEnd) {
+        return true;
+    }
+    return false;
+}
+
+bool CQuorumBlockProcessor::IsCommitmentRequired(Consensus::LLMQType llmqType, const CBlockIndex* pindexPrev)
+{
+    // BEGIN TEMPORARY CODE
+    bool allowMissingQc = false;
+    {
+        // TODO We added the commitments code while DIP3 was already activated on testnet and we want
+        // to avoid reverting the chain again, as people already had many MNs registered at that time.
+        // So, we do a simple hardfork here at a fixed height, but only while we're on the original
+        // DIP3 chain.
+        // As we need to fork/revert the chain later to re-test all deployment stages of DIP3, we can
+        // remove all this temporary code later.
+        LOCK(cs_main);
+        const auto& consensus = Params().GetConsensus();
+        if (consensus.nTemporaryTestnetForkDIP3Height != 0 &&
+            pindexPrev->nHeight + 1 >= consensus.nTemporaryTestnetForkDIP3Height &&
+            pindexPrev->nHeight + 1 < consensus.nTemporaryTestnetForkHeight &&
+            chainActive[consensus.nTemporaryTestnetForkDIP3Height]->GetBlockHash() == consensus.nTemporaryTestnetForkDIP3BlockHash) {
+            allowMissingQc = true;
+        }
+    }
+    // END TEMPORARY CODE
+
+    uint256 quorumHash = GetQuorumBlockHash(llmqType, pindexPrev);
+
+    // perform extra check for quorumHash.IsNull as the quorum hash is unknown for the first block of a session
+    // this is because the currently processed block's hash will be the quorumHash of this session
+    bool isMiningPhase = !quorumHash.IsNull() && IsMiningPhase(llmqType, pindexPrev->nHeight + 1);
+
+    // did we already mine a non-null commitment for this session?
+    bool hasMinedCommitment = !quorumHash.IsNull() && HasMinedCommitment(llmqType, quorumHash);
+
+    return isMiningPhase && !hasMinedCommitment && !allowMissingQc;
+}
+
+// WARNING: This method returns uint256() on the first block of the DKG interval (because the block hash is not known yet)
+uint256 CQuorumBlockProcessor::GetQuorumBlockHash(Consensus::LLMQType llmqType, const CBlockIndex* pindexPrev)
+{
+    auto& params = Params().GetConsensus().llmqs.at(llmqType);
+
+    int nHeight = pindexPrev->nHeight + 1;
+    int quorumStartHeight = nHeight - (nHeight % params.dkgInterval);
+    if (quorumStartHeight >= pindexPrev->nHeight) {
+        return uint256();
+    }
+    auto quorumIndex = pindexPrev->GetAncestor(quorumStartHeight);
+    assert(quorumIndex);
+    return quorumIndex->GetBlockHash();
+}
+
+bool CQuorumBlockProcessor::HasMinedCommitment(Consensus::LLMQType llmqType, const uint256& quorumHash)
+{
+    auto key = std::make_pair(DB_MINED_COMMITMENT, std::make_pair((uint8_t)llmqType, quorumHash));
+    return evoDb.Exists(key);
+}
+
+bool CQuorumBlockProcessor::GetMinedCommitment(Consensus::LLMQType llmqType, const uint256& quorumHash, CFinalCommitment& ret)
+{
+    auto key = std::make_pair(DB_MINED_COMMITMENT, std::make_pair((uint8_t)llmqType, quorumHash));
+    return evoDb.Read(key, ret);
+}
+
+bool CQuorumBlockProcessor::HasMinableCommitment(const uint256& hash)
+{
+    LOCK(minableCommitmentsCs);
+    return minableCommitments.count(hash) != 0;
+}
+
+void CQuorumBlockProcessor::AddMinableCommitment(const CFinalCommitment& fqc)
+{
+    bool relay = false;
+    uint256 commitmentHash = ::SerializeHash(fqc);
+
+    {
+        LOCK(minableCommitmentsCs);
+
+        auto k = std::make_pair((Consensus::LLMQType) fqc.llmqType, fqc.quorumHash);
+        auto ins = minableCommitmentsByQuorum.emplace(k, commitmentHash);
+        if (ins.second) {
+            minableCommitments.emplace(commitmentHash, fqc);
+            relay = true;
+        } else {
+            auto& oldFqc = minableCommitments.at(ins.first->second);
+            if (fqc.CountSigners() > oldFqc.CountSigners()) {
+                // new commitment has more signers, so override the known one
+                ins.first->second = commitmentHash;
+                minableCommitments.erase(ins.first->second);
+                minableCommitments.emplace(commitmentHash, fqc);
+                relay = true;
+            }
+        }
+    }
+
+    // We only relay the new commitment if it's new or better then the old one
+    if (relay) {
+        CInv inv(MSG_QUORUM_FINAL_COMMITMENT, commitmentHash);
+        g_connman->RelayInv(inv, DMN_PROTO_VERSION);
+    }
+}
+
+bool CQuorumBlockProcessor::GetMinableCommitmentByHash(const uint256& commitmentHash, llmq::CFinalCommitment& ret)
+{
+    LOCK(minableCommitmentsCs);
+    auto it = minableCommitments.find(commitmentHash);
+    if (it == minableCommitments.end()) {
+        return false;
+    }
+    ret = it->second;
+    return true;
+}
+
+// Will return false if no commitment should be mined
+// Will return true and a null commitment if no minable commitment is known and none was mined yet
+bool CQuorumBlockProcessor::GetMinableCommitment(Consensus::LLMQType llmqType, const CBlockIndex* pindexPrev, CFinalCommitment& ret)
+{
+    AssertLockHeld(cs_main);
+
+    int nHeight = pindexPrev->nHeight + 1;
+
+    if (!IsCommitmentRequired(llmqType, pindexPrev)) {
+        // no commitment required
+        return false;
+    }
+
+    uint256 quorumHash = GetQuorumBlockHash(llmqType, pindexPrev);
+    if (quorumHash.IsNull()) {
+        return false;
+    }
+
+    LOCK(minableCommitmentsCs);
+
+    auto k = std::make_pair(llmqType, quorumHash);
+    auto it = minableCommitmentsByQuorum.find(k);
+    if (it == minableCommitmentsByQuorum.end()) {
+        // null commitment required
+        ret = CFinalCommitment(Params().GetConsensus().llmqs.at(llmqType), quorumHash);
+        ret.quorumVvecHash = ::SerializeHash(std::make_pair(quorumHash, nHeight));
+        return true;
+    }
+
+    ret = minableCommitments.at(it->second);
+
+    return true;
+}
+
+bool CQuorumBlockProcessor::GetMinableCommitmentTx(Consensus::LLMQType llmqType, const CBlockIndex* pindexPrev, CTransactionRef& ret)
+{
+    AssertLockHeld(cs_main);
+
+    CFinalCommitment qc;
+    if (!GetMinableCommitment(llmqType, pindexPrev, qc)) {
+        return false;
+    }
+
+    CMutableTransaction tx;
+    tx.nVersion = 3;
+    tx.nType = TRANSACTION_QUORUM_COMMITMENT;
+    SetTxPayload(tx, qc);
+
+    ret = MakeTransactionRef(tx);
+
+    return true;
+}
+
+}
diff --git a/src/llmq/quorums_blockprocessor.h b/src/llmq/quorums_blockprocessor.h
new file mode 100644
index 000000000000..ab1f34c96887
--- /dev/null
+++ b/src/llmq/quorums_blockprocessor.h
@@ -0,0 +1,61 @@
+// Copyright (c) 2018 The Dash Core developers
+// Distributed under the MIT/X11 software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+#ifndef DASH_QUORUMS_BLOCKPROCESSOR_H
+#define DASH_QUORUMS_BLOCKPROCESSOR_H
+
+#include "llmq/quorums_commitment.h"
+
+#include "consensus/params.h"
+#include "primitives/transaction.h"
+#include "sync.h"
+
+#include <map>
+
+class CNode;
+class CConnman;
+
+namespace llmq
+{
+
+class CQuorumBlockProcessor
+{
+private:
+    CEvoDB& evoDb;
+
+    // TODO cleanup
+    CCriticalSection minableCommitmentsCs;
+    std::map<std::pair<Consensus::LLMQType, uint256>, uint256> minableCommitmentsByQuorum;
+    std::map<uint256, CFinalCommitment> minableCommitments;
+
+public:
+    CQuorumBlockProcessor(CEvoDB& _evoDb) : evoDb(_evoDb) {}
+
+    void ProcessMessage(CNode* pfrom, const std::string& strCommand, CDataStream& vRecv, CConnman& connman);
+
+    bool ProcessBlock(const CBlock& block, const CBlockIndex* pindexPrev, CValidationState& state);
+    bool UndoBlock(const CBlock& block, const CBlockIndex* pindex);
+
+    void AddMinableCommitment(const CFinalCommitment& fqc);
+    bool HasMinableCommitment(const uint256& hash);
+    bool GetMinableCommitmentByHash(const uint256& commitmentHash, CFinalCommitment& ret);
+    bool GetMinableCommitment(Consensus::LLMQType llmqType, const CBlockIndex* pindexPrev, CFinalCommitment& ret);
+    bool GetMinableCommitmentTx(Consensus::LLMQType llmqType, const CBlockIndex* pindexPrev, CTransactionRef& ret);
+
+    bool HasMinedCommitment(Consensus::LLMQType llmqType, const uint256& quorumHash);
+    bool GetMinedCommitment(Consensus::LLMQType llmqType, const uint256& quorumHash, CFinalCommitment& ret);
+
+private:
+    bool GetCommitmentsFromBlock(const CBlock& block, const CBlockIndex* pindexPrev, std::map<Consensus::LLMQType, CFinalCommitment>& ret, CValidationState& state);
+    bool ProcessCommitment(const CBlockIndex* pindexPrev, const CFinalCommitment& qc, CValidationState& state);
+    bool IsMiningPhase(Consensus::LLMQType llmqType, int nHeight);
+    bool IsCommitmentRequired(Consensus::LLMQType llmqType, const CBlockIndex* pindexPrev);
+    uint256 GetQuorumBlockHash(Consensus::LLMQType llmqType, const CBlockIndex* pindexPrev);
+};
+
+extern CQuorumBlockProcessor* quorumBlockProcessor;
+
+}
+
+#endif//DASH_QUORUMS_BLOCKPROCESSOR_H
diff --git a/src/llmq/quorums_commitment.cpp b/src/llmq/quorums_commitment.cpp
new file mode 100644
index 000000000000..f8e0a6b51ab0
--- /dev/null
+++ b/src/llmq/quorums_commitment.cpp
@@ -0,0 +1,146 @@
+// Copyright (c) 2018 The Dash Core developers
+// Distributed under the MIT/X11 software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+#include "quorums_commitment.h"
+#include "quorums_utils.h"
+
+#include "chainparams.h"
+
+#include <univalue.h>
+
+namespace llmq
+{
+
+CFinalCommitment::CFinalCommitment(const Consensus::LLMQParams& params, const uint256& _quorumHash) :
+        llmqType(params.type),
+        quorumHash(_quorumHash),
+        signers(params.size),
+        validMembers(params.size)
+{
+}
+
+#define LogPrintfFinalCommitment(...) do { \
+    LogPrintStr(strprintf("CFinalCommitment::%s -- %s", __func__, tinyformat::format(__VA_ARGS__))); \
+} while(0)
+
+bool CFinalCommitment::Verify(const std::vector<CDeterministicMNCPtr>& members) const
+{
+    if (nVersion == 0 || nVersion > CURRENT_VERSION) {
+        return false;
+    }
+
+    if (!Params().GetConsensus().llmqs.count((Consensus::LLMQType)llmqType)) {
+        LogPrintfFinalCommitment("invalid llmqType=%d\n", llmqType);
+        return false;
+    }
+    const auto& params = Params().GetConsensus().llmqs.at((Consensus::LLMQType)llmqType);
+
+    if (!VerifySizes(params)) {
+        return false;
+    }
+
+    if (CountValidMembers() < params.minSize) {
+        LogPrintfFinalCommitment("invalid validMembers count. validMembersCount=%d\n", CountValidMembers());
+        return false;
+    }
+    if (CountSigners() < params.minSize) {
+        LogPrintfFinalCommitment("invalid signers count. signersCount=%d\n", CountSigners());
+        return false;
+    }
+    if (!quorumPublicKey.IsValid()) {
+        LogPrintfFinalCommitment("invalid quorumPublicKey\n");
+        return false;
+    }
+    if (quorumVvecHash.IsNull()) {
+        LogPrintfFinalCommitment("invalid quorumVvecHash\n");
+        return false;
+    }
+    if (!membersSig.IsValid()) {
+        LogPrintfFinalCommitment("invalid membersSig\n");
+        return false;
+    }
+    if (!quorumSig.IsValid()) {
+        LogPrintfFinalCommitment("invalid vvecSig\n");
+        return false;
+    }
+
+    for (size_t i = members.size(); i < params.size; i++) {
+        if (validMembers[i]) {
+            LogPrintfFinalCommitment("invalid validMembers bitset. bit %d should not be set\n", i);
+            return false;
+        }
+        if (signers[i]) {
+            LogPrintfFinalCommitment("invalid signers bitset. bit %d should not be set\n", i);
+            return false;
+        }
+    }
+
+    uint256 commitmentHash = CLLMQUtils::BuildCommitmentHash((uint8_t)params.type, quorumHash, validMembers, quorumPublicKey, quorumVvecHash);
+
+    std::vector<CBLSPublicKey> memberPubKeys;
+    for (size_t i = 0; i < members.size(); i++) {
+        if (!signers[i]) {
+            continue;
+        }
+        memberPubKeys.emplace_back(members[i]->pdmnState->pubKeyOperator);
+    }
+
+    if (!membersSig.VerifySecureAggregated(memberPubKeys, commitmentHash)) {
+        LogPrintfFinalCommitment("invalid aggregated members signature\n");
+        return false;
+    }
+
+    if (!quorumSig.VerifyInsecure(quorumPublicKey, commitmentHash)) {
+        LogPrintfFinalCommitment("invalid quorum signature\n");
+        return false;
+    }
+
+    return true;
+}
+
+bool CFinalCommitment::VerifyNull(int nHeight) const
+{
+    if (!Params().GetConsensus().llmqs.count((Consensus::LLMQType)llmqType)) {
+        LogPrintfFinalCommitment("invalid llmqType=%d\n", llmqType);
+        return false;
+    }
+    const auto& params = Params().GetConsensus().llmqs.at((Consensus::LLMQType)llmqType);
+
+    if (!IsNull() || !VerifySizes(params)) {
+        return false;
+    }
+
+    uint256 expectedQuorumVvecHash = ::SerializeHash(std::make_pair(quorumHash, nHeight));
+    if (quorumVvecHash != expectedQuorumVvecHash) {
+        return false;
+    }
+
+    return true;
+}
+
+bool CFinalCommitment::VerifySizes(const Consensus::LLMQParams& params) const
+{
+    if (signers.size() != params.size) {
+        LogPrintfFinalCommitment("invalid signers.size=%d\n", signers.size());
+        return false;
+    }
+    if (validMembers.size() != params.size) {
+        LogPrintfFinalCommitment("invalid signers.size=%d\n", signers.size());
+        return false;
+    }
+    return true;
+}
+
+void CFinalCommitment::ToJson(UniValue& obj) const
+{
+    obj.setObject();
+    obj.push_back(Pair("version", (int)nVersion));
+    obj.push_back(Pair("llmqType", (int)llmqType));
+    obj.push_back(Pair("quorumHash", quorumHash.ToString()));
+    obj.push_back(Pair("signersCount", CountSigners()));
+    obj.push_back(Pair("validMembersCount", CountValidMembers()));
+    obj.push_back(Pair("quorumPublicKey", quorumPublicKey.ToString()));
+}
+
+}
diff --git a/src/llmq/quorums_commitment.h b/src/llmq/quorums_commitment.h
new file mode 100644
index 000000000000..bbf702b22bbf
--- /dev/null
+++ b/src/llmq/quorums_commitment.h
@@ -0,0 +1,92 @@
+// Copyright (c) 2018 The Dash Core developers
+// Distributed under the MIT/X11 software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+#ifndef DASH_QUORUMS_COMMITMENT_H
+#define DASH_QUORUMS_COMMITMENT_H
+
+#include "consensus/params.h"
+
+#include "evo/deterministicmns.h"
+
+#include "bls/bls.h"
+
+namespace llmq
+{
+
+// This message is an aggregation of all received premature commitments and only valid if
+// enough (>=threshold) premature commitments were aggregated
+// This is mined on-chain as part of TRANSACTION_QUORUM_COMMITMENT
+class CFinalCommitment
+{
+public:
+    static const uint16_t CURRENT_VERSION = 1;
+
+public:
+    uint16_t nVersion{CURRENT_VERSION};
+    uint8_t llmqType{Consensus::LLMQ_NONE};
+    uint256 quorumHash;
+    std::vector<bool> signers;
+    std::vector<bool> validMembers;
+
+    CBLSPublicKey quorumPublicKey;
+    uint256 quorumVvecHash;
+
+    CBLSSignature quorumSig; // recovered threshold sig of blockHash+validMembers+pubKeyHash+vvecHash
+    CBLSSignature membersSig; // aggregated member sig of blockHash+validMembers+pubKeyHash+vvecHash
+
+public:
+    CFinalCommitment() {}
+    CFinalCommitment(const Consensus::LLMQParams& params, const uint256& _quorumHash);
+
+    int CountSigners() const
+    {
+        return (int)std::count(signers.begin(), signers.end(), true);
+    }
+    int CountValidMembers() const
+    {
+        return (int)std::count(validMembers.begin(), validMembers.end(), true);
+    }
+
+    bool Verify(const std::vector<CDeterministicMNCPtr>& members) const;
+    bool VerifyNull(int nHeight) const;
+    bool VerifySizes(const Consensus::LLMQParams& params) const;
+
+    void ToJson(UniValue& obj) const;
+
+public:
+    ADD_SERIALIZE_METHODS
+
+    template<typename Stream, typename Operation>
+    inline void SerializationOp(Stream& s, Operation ser_action)
+    {
+        READWRITE(nVersion);
+        READWRITE(llmqType);
+        READWRITE(quorumHash);
+        READWRITE(DYNBITSET(signers));
+        READWRITE(DYNBITSET(validMembers));
+        READWRITE(quorumPublicKey);
+        READWRITE(quorumVvecHash);
+        READWRITE(quorumSig);
+        READWRITE(membersSig);
+    }
+
+public:
+    bool IsNull() const
+    {
+        if (std::count(signers.begin(), signers.end(), true) ||
+            std::count(validMembers.begin(), validMembers.end(), true)) {
+            return false;
+        }
+        if (quorumPublicKey.IsValid() ||
+            membersSig.IsValid() ||
+            quorumSig.IsValid()) {
+            return false;
+        }
+        return true;
+    }
+};
+
+}
+
+#endif //DASH_QUORUMS_COMMITMENT_H
diff --git a/src/llmq/quorums_init.cpp b/src/llmq/quorums_init.cpp
new file mode 100644
index 000000000000..f6abb5d14622
--- /dev/null
+++ b/src/llmq/quorums_init.cpp
@@ -0,0 +1,24 @@
+// Copyright (c) 2018 The Dash Core developers
+// Distributed under the MIT/X11 software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+#include "quorums_init.h"
+
+#include "quorums_blockprocessor.h"
+#include "quorums_commitment.h"
+
+namespace llmq
+{
+
+void InitLLMQSystem(CEvoDB& evoDb)
+{
+    quorumBlockProcessor = new CQuorumBlockProcessor(evoDb);
+}
+
+void DestroyLLMQSystem()
+{
+    delete quorumBlockProcessor;
+    quorumBlockProcessor = nullptr;
+}
+
+}
diff --git a/src/llmq/quorums_init.h b/src/llmq/quorums_init.h
new file mode 100644
index 000000000000..137248b88546
--- /dev/null
+++ b/src/llmq/quorums_init.h
@@ -0,0 +1,18 @@
+// Copyright (c) 2018 The Dash Core developers
+// Distributed under the MIT/X11 software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+#ifndef DASH_QUORUMS_INIT_H
+#define DASH_QUORUMS_INIT_H
+
+class CEvoDB;
+
+namespace llmq
+{
+
+void InitLLMQSystem(CEvoDB& evoDb);
+void DestroyLLMQSystem();
+
+}
+
+#endif //DASH_QUORUMS_INIT_H
diff --git a/src/llmq/quorums_utils.cpp b/src/llmq/quorums_utils.cpp
new file mode 100644
index 000000000000..452909e07b58
--- /dev/null
+++ b/src/llmq/quorums_utils.cpp
@@ -0,0 +1,33 @@
+// Copyright (c) 2018 The Dash Core developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+#include "quorums_utils.h"
+
+#include "chainparams.h"
+#include "random.h"
+
+namespace llmq
+{
+
+std::vector<CDeterministicMNCPtr> CLLMQUtils::GetAllQuorumMembers(Consensus::LLMQType llmqType, const uint256& blockHash)
+{
+    auto& params = Params().GetConsensus().llmqs.at(llmqType);
+    auto allMns = deterministicMNManager->GetListForBlock(blockHash);
+    auto modifier = ::SerializeHash(std::make_pair((uint8_t)llmqType, blockHash));
+    return allMns.CalculateQuorum(params.size, modifier);
+}
+
+uint256 CLLMQUtils::BuildCommitmentHash(uint8_t llmqType, const uint256& blockHash, const std::vector<bool>& validMembers, const CBLSPublicKey& pubKey, const uint256& vvecHash)
+{
+    CHashWriter hw(SER_NETWORK, 0);
+    hw << llmqType;
+    hw << blockHash;
+    hw << DYNBITSET(validMembers);
+    hw << pubKey;
+    hw << vvecHash;
+    return hw.GetHash();
+}
+
+
+}
diff --git a/src/llmq/quorums_utils.h b/src/llmq/quorums_utils.h
new file mode 100644
index 000000000000..2aab41628dcf
--- /dev/null
+++ b/src/llmq/quorums_utils.h
@@ -0,0 +1,28 @@
+// Copyright (c) 2018 The Dash Core developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+#ifndef DASH_QUORUMS_UTILS_H
+#define DASH_QUORUMS_UTILS_H
+
+#include "consensus/params.h"
+
+#include "evo/deterministicmns.h"
+
+#include <vector>
+
+namespace llmq
+{
+
+class CLLMQUtils
+{
+public:
+    // includes members which failed DKG
+    static std::vector<CDeterministicMNCPtr> GetAllQuorumMembers(Consensus::LLMQType llmqType, const uint256& blockHash);
+
+    static uint256 BuildCommitmentHash(uint8_t llmqType, const uint256& blockHash, const std::vector<bool>& validMembers, const CBLSPublicKey& pubKey, const uint256& vvecHash);
+};
+
+}
+
+#endif//DASH_QUORUMS_UTILS_H
diff --git a/src/miner.cpp b/src/miner.cpp
index 3a1cf7dde29b..0229cd872f04 100644
--- a/src/miner.cpp
+++ b/src/miner.cpp
@@ -33,6 +33,8 @@
 #include "evo/simplifiedmns.h"
 #include "evo/deterministicmns.h"
 
+#include "llmq/quorums_blockprocessor.h"
+
 #include <algorithm>
 #include <boost/thread.hpp>
 #include <boost/tuple/tuple.hpp>
@@ -150,6 +152,16 @@ std::unique_ptr<CBlockTemplate> BlockAssembler::CreateNewBlock(const CScript& sc
                        ? nMedianTimePast
                        : pblock->GetBlockTime();
 
+    if (fDIP0003Active_context) {
+        for (auto& p : Params().GetConsensus().llmqs) {
+            CTransactionRef qcTx;
+            if (llmq::quorumBlockProcessor->GetMinableCommitmentTx(p.first, pindexPrev, qcTx)) {
+                pblock->vtx.emplace_back(qcTx);
+                pblocktemplate->vTxFees.emplace_back(0);
+            }
+        }
+    }
+
     addPriorityTxs();
 
     int nPackagesSelected = 0;
diff --git a/src/net_processing.cpp b/src/net_processing.cpp
index 908e0ba42a68..e311f093fb7f 100644
--- a/src/net_processing.cpp
+++ b/src/net_processing.cpp
@@ -44,6 +44,8 @@
 
 #include "evo/deterministicmns.h"
 #include "evo/simplifiedmns.h"
+#include "llmq/quorums_commitment.h"
+#include "llmq/quorums_blockprocessor.h"
 
 #include <boost/thread.hpp>
 
@@ -962,6 +964,9 @@ bool static AlreadyHave(const CInv& inv) EXCLUSIVE_LOCKS_REQUIRED(cs_main)
 
     case MSG_MASTERNODE_VERIFY:
         return mnodeman.mapSeenMasternodeVerification.count(inv.hash);
+
+    case MSG_QUORUM_FINAL_COMMITMENT:
+        return llmq::quorumBlockProcessor->HasMinableCommitment(inv.hash);
     }
 
     // Don't know what it is, just say we already got one
@@ -1275,6 +1280,14 @@ void static ProcessGetData(CNode* pfrom, const Consensus::Params& consensusParam
                     }
                 }
 
+                if (!push && (inv.type == MSG_QUORUM_FINAL_COMMITMENT)) {
+                    llmq::CFinalCommitment o;
+                    if (llmq::quorumBlockProcessor->GetMinableCommitmentByHash(inv.hash, o)) {
+                        connman.PushMessage(pfrom, msgMaker.Make(NetMsgType::QFCOMMITMENT, o));
+                        push = true;
+                    }
+                }
+
                 if (!push)
                     vNotFound.push_back(inv);
             }
@@ -2885,6 +2898,7 @@ bool static ProcessMessage(CNode* pfrom, const std::string& strCommand, CDataStr
             sporkManager.ProcessSpork(pfrom, strCommand, vRecv, connman);
             masternodeSync.ProcessMessage(pfrom, strCommand, vRecv);
             governance.ProcessMessage(pfrom, strCommand, vRecv, connman);
+            llmq::quorumBlockProcessor->ProcessMessage(pfrom, strCommand, vRecv, connman);
         }
         else
         {
diff --git a/src/primitives/transaction.h b/src/primitives/transaction.h
index c2c2d1d5567a..ec99b589f226 100644
--- a/src/primitives/transaction.h
+++ b/src/primitives/transaction.h
@@ -19,6 +19,7 @@ enum {
     TRANSACTION_PROVIDER_UPDATE_REGISTRAR = 3,
     TRANSACTION_PROVIDER_UPDATE_REVOKE = 4,
     TRANSACTION_COINBASE = 5,
+    TRANSACTION_QUORUM_COMMITMENT = 6,
 };
 
 /** An outpoint - a combination of a transaction hash and an index n into its vout */
diff --git a/src/protocol.cpp b/src/protocol.cpp
index fac2fab6e707..d9023cdcb754 100644
--- a/src/protocol.cpp
+++ b/src/protocol.cpp
@@ -71,6 +71,7 @@ const char *MNGOVERNANCEOBJECTVOTE="govobjvote";
 const char *MNVERIFY="mnv";
 const char *GETMNLISTDIFF="getmnlistd";
 const char *MNLISTDIFF="mnlistdiff";
+const char *QFCOMMITMENT="qfcommit";
 };
 
 static const char* ppszTypeName[] =
@@ -98,6 +99,7 @@ static const char* ppszTypeName[] =
     NetMsgType::MNGOVERNANCEOBJECTVOTE,
     NetMsgType::MNVERIFY,
     "compact block", // Should never occur
+    NetMsgType::QFCOMMITMENT,
 };
 
 /** All known message types. Keep this in the same order as the list of
@@ -157,6 +159,7 @@ const static std::string allNetMessageTypes[] = {
     NetMsgType::MNVERIFY,
     NetMsgType::GETMNLISTDIFF,
     NetMsgType::MNLISTDIFF,
+    NetMsgType::QFCOMMITMENT,
 };
 const static std::vector<std::string> allNetMessageTypesVec(allNetMessageTypes, allNetMessageTypes+ARRAYLEN(allNetMessageTypes));
 
diff --git a/src/protocol.h b/src/protocol.h
index f1dccca68ed7..562d5fb9d413 100644
--- a/src/protocol.h
+++ b/src/protocol.h
@@ -270,6 +270,7 @@ extern const char *MNGOVERNANCEOBJECTVOTE;
 extern const char *MNVERIFY;
 extern const char *GETMNLISTDIFF;
 extern const char *MNLISTDIFF;
+extern const char *QFCOMMITMENT;
 };
 
 /* Get a vector of all valid message types (see above) */
@@ -371,6 +372,7 @@ enum GetDataMsg {
     // Nodes may always request a MSG_CMPCT_BLOCK in a getdata, however,
     // MSG_CMPCT_BLOCK should not appear in any invs except as a part of getdata.
     MSG_CMPCT_BLOCK = 20, //!< Defined in BIP152
+    MSG_QUORUM_FINAL_COMMITMENT = 21,
 };
 
 /** inv message data */
diff --git a/src/qt/test/rpcnestedtests.cpp b/src/qt/test/rpcnestedtests.cpp
index eeba5d943926..e67b63ec8e9a 100644
--- a/src/qt/test/rpcnestedtests.cpp
+++ b/src/qt/test/rpcnestedtests.cpp
@@ -15,6 +15,7 @@
 #include "util.h"
 
 #include "evo/deterministicmns.h"
+#include "llmq/quorums_init.h"
 
 #include <QDir>
 #include <QtGlobal>
@@ -53,6 +54,9 @@ void RPCNestedTests::rpcNestedTests()
     pblocktree = new CBlockTreeDB(1 << 20, true);
     pcoinsdbview = new CCoinsViewDB(1 << 23, true);
     deterministicMNManager = new CDeterministicMNManager(*evoDb);
+
+    llmq::InitLLMQSystem(*evoDb);
+
     pcoinsTip = new CCoinsViewCache(pcoinsdbview);
     InitBlockIndex(chainparams);
     {
diff --git a/src/rpc/rawtransaction.cpp b/src/rpc/rawtransaction.cpp
index a4dd474ca951..86b57aca74e8 100644
--- a/src/rpc/rawtransaction.cpp
+++ b/src/rpc/rawtransaction.cpp
@@ -32,6 +32,7 @@
 #include "evo/specialtx.h"
 #include "evo/providertx.h"
 #include "evo/cbtx.h"
+#include "llmq/quorums_commitment.h"
 
 #include <stdint.h>
 
@@ -166,6 +167,13 @@ void TxToJSON(const CTransaction& tx, const uint256 hashBlock, UniValue& entry)
             cbTx.ToJson(obj);
             entry.push_back(Pair("cbTx", obj));
         }
+    } else if (tx.nType == TRANSACTION_QUORUM_COMMITMENT) {
+        llmq::CFinalCommitment qcTx;
+        if (GetTxPayload(tx, qcTx)) {
+            UniValue obj;
+            qcTx.ToJson(obj);
+            entry.push_back(Pair("qcTx", obj));
+        }
     }
 
     if (!hashBlock.IsNull()) {
diff --git a/src/test/test_dash.cpp b/src/test/test_dash.cpp
index 2654382264d7..7bc3f7e9f734 100644
--- a/src/test/test_dash.cpp
+++ b/src/test/test_dash.cpp
@@ -27,6 +27,7 @@
 #include "evo/specialtx.h"
 #include "evo/deterministicmns.h"
 #include "evo/cbtx.h"
+#include "llmq/quorums_init.h"
 
 #include <memory>
 
@@ -73,6 +74,7 @@ TestingSetup::TestingSetup(const std::string& chainName) : BasicTestingSetup(cha
         pblocktree = new CBlockTreeDB(1 << 20, true);
         pcoinsdbview = new CCoinsViewDB(1 << 23, true);
         deterministicMNManager = new CDeterministicMNManager(*evoDb);
+        llmq::InitLLMQSystem(*evoDb);
         pcoinsTip = new CCoinsViewCache(pcoinsdbview);
         InitBlockIndex(chainparams);
         {
@@ -95,6 +97,7 @@ TestingSetup::~TestingSetup()
         threadGroup.join_all();
         UnloadBlockIndex();
         delete pcoinsTip;
+        llmq::DestroyLLMQSystem();
         delete deterministicMNManager;
         delete pcoinsdbview;
         delete pblocktree;
@@ -144,8 +147,17 @@ CBlock TestChainSetup::CreateBlock(const std::vector<CMutableTransaction>& txns,
     std::unique_ptr<CBlockTemplate> pblocktemplate = BlockAssembler(chainparams).CreateNewBlock(scriptPubKey);
     CBlock& block = pblocktemplate->block;
 
+    std::vector<CTransactionRef> llmqCommitments;
+    for (const auto& tx : block.vtx) {
+        if (tx->nVersion == 3 && tx->nType == TRANSACTION_QUORUM_COMMITMENT) {
+            llmqCommitments.emplace_back(tx);
+        }
+    }
+
     // Replace mempool-selected txns with just coinbase plus passed-in txns:
     block.vtx.resize(1);
+    // Re-add quorum commitments
+    block.vtx.insert(block.vtx.end(), llmqCommitments.begin(), llmqCommitments.end());
     BOOST_FOREACH(const CMutableTransaction& tx, txns)
         block.vtx.push_back(MakeTransactionRef(tx));
 
diff --git a/src/validation.cpp b/src/validation.cpp
index 8971cff84e01..69856143a162 100644
--- a/src/validation.cpp
+++ b/src/validation.cpp
@@ -514,10 +514,15 @@ int GetUTXOConfirmations(const COutPoint& outpoint)
 
 bool CheckTransaction(const CTransaction& tx, CValidationState &state)
 {
+    bool allowEmptyTxInOut = false;
+    if (tx.nType == TRANSACTION_QUORUM_COMMITMENT) {
+        allowEmptyTxInOut = true;
+    }
+
     // Basic checks that don't depend on any context
-    if (tx.vin.empty())
+    if (!allowEmptyTxInOut && tx.vin.empty())
         return state.DoS(10, false, REJECT_INVALID, "bad-txns-vin-empty");
-    if (tx.vout.empty())
+    if (!allowEmptyTxInOut && tx.vout.empty())
         return state.DoS(10, false, REJECT_INVALID, "bad-txns-vout-empty");
     // Size limits
     if (::GetSerializeSize(tx, SER_NETWORK, PROTOCOL_VERSION) > MAX_LEGACY_BLOCK_SIZE)
@@ -580,7 +585,8 @@ bool ContextualCheckTransaction(const CTransaction& tx, CValidationState &state,
                 tx.nType != TRANSACTION_PROVIDER_UPDATE_SERVICE &&
                 tx.nType != TRANSACTION_PROVIDER_UPDATE_REGISTRAR &&
                 tx.nType != TRANSACTION_PROVIDER_UPDATE_REVOKE &&
-                tx.nType != TRANSACTION_COINBASE) {
+                tx.nType != TRANSACTION_COINBASE &&
+                tx.nType != TRANSACTION_QUORUM_COMMITMENT) {
                 return state.DoS(100, false, REJECT_INVALID, "bad-txns-type");
             }
             if (tx.IsCoinBase() && tx.nType != TRANSACTION_COINBASE)
@@ -645,6 +651,11 @@ bool AcceptToMemoryPoolWorker(CTxMemPool& pool, CValidationState& state, const C
     if (!ContextualCheckTransaction(tx, state, Params().GetConsensus(), chainActive.Tip()))
         return error("%s: ContextualCheckTransaction: %s, %s", __func__, hash.ToString(), FormatStateMessage(state));
 
+    if (tx.nVersion == 3 && tx.nType == TRANSACTION_QUORUM_COMMITMENT) {
+        // quorum commitment is not allowed outside of blocks
+        return state.DoS(100, false, REJECT_INVALID, "qc-not-allowed");
+    }
+
     if (!CheckSpecialTx(tx, chainActive.Tip(), state))
         return false;
 

From da4b5fb16e45358675e9eb770c7376f70f627159 Mon Sep 17 00:00:00 2001
From: PastaPastaPasta <pasta@dashboost.org>
Date: Fri, 23 Nov 2018 08:43:23 -0600
Subject: [PATCH 309/400] Remove an unused function from governance object
 collateral code (#2480)

---
 src/wallet/wallet.cpp | 10 ----------
 src/wallet/wallet.h   |  1 -
 2 files changed, 11 deletions(-)

diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
index 3ac1434b6b6f..c00f27e70144 100644
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -3362,16 +3362,6 @@ bool CWallet::CreateCollateralTransaction(CMutableTransaction& txCollateral, std
     return true;
 }
 
-bool CWallet::GetBudgetSystemCollateralTX(CTransactionRef& tx, uint256 hash, CAmount amount, bool fUseInstantSend)
-{
-    CWalletTx wtx;
-    if(GetBudgetSystemCollateralTX(wtx, hash, amount, fUseInstantSend)){
-        tx = wtx.tx;
-        return true;
-    }
-    return false;
-}
-
 bool CWallet::GetBudgetSystemCollateralTX(CWalletTx& tx, uint256 hash, CAmount amount, bool fUseInstantSend)
 {
     // make our change address
diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h
index 963096ad0bdb..1e55061a66a0 100644
--- a/src/wallet/wallet.h
+++ b/src/wallet/wallet.h
@@ -922,7 +922,6 @@ class CWallet : public CCryptoKeyStore, public CValidationInterface
     CAmount GetNeedsToBeAnonymizedBalance(CAmount nMinBalance = 0) const;
     CAmount GetDenominatedBalance(bool unconfirmed=false) const;
 
-    bool GetBudgetSystemCollateralTX(CTransactionRef& tx, uint256 hash, CAmount amount, bool fUseInstantSend);
     bool GetBudgetSystemCollateralTX(CWalletTx& tx, uint256 hash, CAmount amount, bool fUseInstantSend);
 
     /**

From aa495405b3ede87e579768ee11ec2925558b60df Mon Sep 17 00:00:00 2001
From: UdjinM6 <UdjinM6@users.noreply.github.com>
Date: Fri, 23 Nov 2018 18:23:15 +0300
Subject: [PATCH 310/400] [GUI] Realign tx filter widgets (#2485)

Also hide watch-only filter when no watch-only addresses are used (corresponding column already has this kind of behaviour).
---
 src/qt/transactionview.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/qt/transactionview.cpp b/src/qt/transactionview.cpp
index 0395948575ca..ce8d2f36c3c3 100644
--- a/src/qt/transactionview.cpp
+++ b/src/qt/transactionview.cpp
@@ -51,10 +51,10 @@ TransactionView::TransactionView(const PlatformStyle *platformStyle, QWidget *pa
     hlayout->setContentsMargins(0,0,0,0);
     if (platformStyle->getUseExtraSpacing()) {
         hlayout->setSpacing(0);
-        hlayout->addSpacing(6);
+        hlayout->addSpacing(STATUS_COLUMN_WIDTH - 1);
     } else {
         hlayout->setSpacing(1);
-        hlayout->addSpacing(5);
+        hlayout->addSpacing(STATUS_COLUMN_WIDTH - 2);
     }
     QString theme = GUIUtil::getThemeName();
     watchOnlyWidget = new QComboBox(this);
@@ -664,6 +664,6 @@ bool TransactionView::eventFilter(QObject *obj, QEvent *event)
 // show/hide column Watch-only
 void TransactionView::updateWatchOnlyColumn(bool fHaveWatchOnly)
 {
-    watchOnlyWidget->setVisible(true);
+    watchOnlyWidget->setVisible(fHaveWatchOnly);
     transactionView->setColumnHidden(TransactionTableModel::Watchonly, !fHaveWatchOnly);
 }

From fa8f4a10ccb64dced89afd51907b0719bc379d7e Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Fri, 23 Nov 2018 16:33:45 +0100
Subject: [PATCH 311/400]  Include masternodeProTxHash in CTxLockVote (#2484)

* Introduce proTxHash to CActiveMasternodeInfo

* Include masternodeProTxHash in CTxLockVote
---
 src/activemasternode.cpp |  2 ++
 src/activemasternode.h   |  1 +
 src/instantx.cpp         | 16 +++++++++++++++-
 src/instantx.h           | 13 ++++++++++++-
 4 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/src/activemasternode.cpp b/src/activemasternode.cpp
index b13437a8d3e7..f24cb942c609 100644
--- a/src/activemasternode.cpp
+++ b/src/activemasternode.cpp
@@ -94,6 +94,7 @@ void CActiveDeterministicMasternodeManager::Init()
         return;
     }
 
+    activeMasternodeInfo.proTxHash = mnListEntry->proTxHash;
     activeMasternodeInfo.outpoint = mnListEntry->collateralOutpoint;
     state = MASTERNODE_READY;
 }
@@ -113,6 +114,7 @@ void CActiveDeterministicMasternodeManager::UpdatedBlockTip(const CBlockIndex* p
         if (!mnList.IsMNValid(mnListEntry->proTxHash)) {
             // MN disappeared from MN list
             state = MASTERNODE_REMOVED;
+            activeMasternodeInfo.proTxHash = uint256();
             activeMasternodeInfo.outpoint.SetNull();
             // MN might have reappeared in same block with a new ProTx (with same masternode key)
             Init();
diff --git a/src/activemasternode.h b/src/activemasternode.h
index 7b3ef45009f0..690629c68cde 100644
--- a/src/activemasternode.h
+++ b/src/activemasternode.h
@@ -37,6 +37,7 @@ struct CActiveMasternodeInfo {
     std::unique_ptr<CBLSSecretKey> blsKeyOperator;
 
     // Initialized while registering Masternode
+    uint256 proTxHash;
     COutPoint outpoint;
     CService service;
 };
diff --git a/src/instantx.cpp b/src/instantx.cpp
index 2fc415db075b..a8fe3f9820ee 100644
--- a/src/instantx.cpp
+++ b/src/instantx.cpp
@@ -281,7 +281,8 @@ void CInstantSend::Vote(CTxLockCandidate& txLockCandidate, CConnman& connman)
         }
 
         // we haven't voted for this outpoint yet, let's try to do this now
-        CTxLockVote vote(txHash, outpointLockPair.first, activeMasternodeInfo.outpoint);
+        // Please note that activeMasternodeInfo.proTxHash is only valid after spork15 activation
+        CTxLockVote vote(txHash, outpointLockPair.first, activeMasternodeInfo.outpoint, activeMasternodeInfo.proTxHash);
 
         if (!vote.Sign()) {
             LogPrintf("CInstantSend::Vote -- Failed to sign consensus vote\n");
@@ -1029,6 +1030,19 @@ bool CTxLockVote::IsValid(CNode* pnode, CConnman& connman) const
         return false;
     }
 
+    // Verify that masternodeProTxHash belongs to the same MN referred by the collateral
+    // Only v13 nodes will send us locks with this field set, and only after spork15 activation
+    if (!masternodeProTxHash.IsNull()) {
+        masternode_info_t mnInfo;
+        if (!mnodeman.GetMasternodeInfo(masternodeProTxHash, mnInfo) || mnInfo.outpoint != outpointMasternode) {
+            LogPrint("instantsend", "CTxLockVote::IsValid -- invalid masternodeProTxHash %s\n", masternodeProTxHash.ToString());
+            return false;
+        }
+    } else if (deterministicMNManager->IsDeterministicMNsSporkActive()) {
+        LogPrint("instantsend", "CTxLockVote::IsValid -- missing masternodeProTxHash while DIP3 is active\n");
+        return false;
+    }
+
     Coin coin;
     if (!GetUTXOCoin(outpoint, coin)) {
         LogPrint("instantsend", "CTxLockVote::IsValid -- Failed to find UTXO %s\n", outpoint.ToStringShort());
diff --git a/src/instantx.h b/src/instantx.h
index 15b60868bafa..db0f0f12c8c3 100644
--- a/src/instantx.h
+++ b/src/instantx.h
@@ -8,6 +8,8 @@
 #include "net.h"
 #include "primitives/transaction.h"
 
+#include "evo/deterministicmns.h"
+
 class CTxLockVote;
 class COutPointLock;
 class CTxLockRequest;
@@ -231,7 +233,9 @@ class CTxLockVote
 private:
     uint256 txHash;
     COutPoint outpoint;
+    // TODO remove this member when the legacy masternode code is removed after DIP3 deployment
     COutPoint outpointMasternode;
+    uint256 masternodeProTxHash;
     std::vector<unsigned char> vchMasternodeSignature;
     // local memory only
     int nConfirmedHeight; ///< When corresponding tx is 0-confirmed or conflicted, nConfirmedHeight is -1
@@ -242,15 +246,17 @@ class CTxLockVote
         txHash(),
         outpoint(),
         outpointMasternode(),
+        masternodeProTxHash(),
         vchMasternodeSignature(),
         nConfirmedHeight(-1),
         nTimeCreated(GetTime())
         {}
 
-    CTxLockVote(const uint256& txHashIn, const COutPoint& outpointIn, const COutPoint& outpointMasternodeIn) :
+    CTxLockVote(const uint256& txHashIn, const COutPoint& outpointIn, const COutPoint& outpointMasternodeIn, const uint256& masternodeProTxHashIn) :
         txHash(txHashIn),
         outpoint(outpointIn),
         outpointMasternode(outpointMasternodeIn),
+        masternodeProTxHash(masternodeProTxHashIn),
         vchMasternodeSignature(),
         nConfirmedHeight(-1),
         nTimeCreated(GetTime())
@@ -263,6 +269,11 @@ class CTxLockVote
         READWRITE(txHash);
         READWRITE(outpoint);
         READWRITE(outpointMasternode);
+        if (deterministicMNManager->IsDeterministicMNsSporkActive()) {
+            // Starting with spork15 activation, the proTxHash is included. When we bump to >= 70213, we can remove
+            // the surrounding if. We might also remove outpointMasternode as well later
+            READWRITE(masternodeProTxHash);
+        }
         if (!(s.GetType() & SER_GETHASH)) {
             READWRITE(vchMasternodeSignature);
         }

From f5beeafa148d4135261941cfc7b55ce6e88d56ee Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Fri, 23 Nov 2018 16:45:56 +0100
Subject: [PATCH 312/400] Also restart MNs which didn't have the collateral
 moved, but do it later (#2483)

---
 qa/rpc-tests/dip3-deterministicmns.py | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/qa/rpc-tests/dip3-deterministicmns.py b/qa/rpc-tests/dip3-deterministicmns.py
index 3bccd4843df2..1eaf839ba036 100755
--- a/qa/rpc-tests/dip3-deterministicmns.py
+++ b/qa/rpc-tests/dip3-deterministicmns.py
@@ -169,6 +169,7 @@ def run_test(self):
         first_upgrade_count = 5
         mns_after_upgrade = []
         mns_to_restart = []
+        mns_to_restart_later = []
         mns_protx = []
         print("upgrading first %d MNs to use ProTx (but not deterministic MN lists)" % first_upgrade_count)
         for i in range(first_upgrade_count):
@@ -183,6 +184,7 @@ def run_test(self):
             else:
                 # collateral has not moved, so it should still be in the masternode list even after upgrade
                 mns_after_upgrade.append(mns[i])
+                mns_to_restart_later.append(mns[i])
             mns_protx.append(mns[i])
         for i in range(first_upgrade_count, len(mns)):
             mns_after_upgrade.append(mns[i])
@@ -214,6 +216,14 @@ def run_test(self):
         print("testing instant send (with mixed ProTx and legacy nodes)")
         self.test_instantsend(10, 5)
 
+        # We still need to restart them as otherwise they won't have the BLS operator key loaded
+        print("restart upgraded nodes which refer to old collaterals")
+        for mn in mns_to_restart_later:
+            print("restarting MN %s" % mn.alias)
+            self.stop_node(mn.idx)
+            self.start_mn(mn)
+            self.force_finish_mnsync_list(mn.node)
+
         print("activating spork15")
         height = self.nodes[0].getblockchaininfo()['blocks']
         spork15_offset = 10

From 65528e9e7b19095a27da4ad225fa3097b000b02a Mon Sep 17 00:00:00 2001
From: UdjinM6 <UdjinM6@users.noreply.github.com>
Date: Fri, 23 Nov 2018 20:15:38 +0300
Subject: [PATCH 313/400] Bump masternodeman cache version (#2467)

---
 src/masternodeman.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/masternodeman.cpp b/src/masternodeman.cpp
index 03f9a2f3b92e..dc9698c86d1c 100644
--- a/src/masternodeman.cpp
+++ b/src/masternodeman.cpp
@@ -28,7 +28,7 @@
 /** Masternode manager */
 CMasternodeMan mnodeman;
 
-const std::string CMasternodeMan::SERIALIZATION_VERSION_STRING = "CMasternodeMan-Version-10";
+const std::string CMasternodeMan::SERIALIZATION_VERSION_STRING = "CMasternodeMan-Version-11";
 const int CMasternodeMan::LAST_PAID_SCAN_BLOCKS = 100;
 
 struct CompareLastPaidBlock

From 45421b1a3ac51f0f059ca8c815e8eac1f3916b06 Mon Sep 17 00:00:00 2001
From: PastaPastaPasta <pasta@dashboost.org>
Date: Sun, 25 Nov 2018 07:26:50 -0600
Subject: [PATCH 314/400] Add IS parameter for gobject prepare (#2452)

* Add IS parameter for gobject prepare

* Update if statement

Co-Authored-By: PastaPastaPasta <pasta@dashboost.org>

* Update src/rpc/governance.cpp

Co-Authored-By: PastaPastaPasta <pasta@dashboost.org>

* Update src/rpc/governance.cpp

Co-Authored-By: PastaPastaPasta <pasta@dashboost.org>
---
 src/rpc/governance.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/rpc/governance.cpp b/src/rpc/governance.cpp
index 7d4b45892677..7c9e7f45a5e8 100644
--- a/src/rpc/governance.cpp
+++ b/src/rpc/governance.cpp
@@ -132,12 +132,13 @@ void gobject_prepare_help()
                 "2. revision      (numeric, required) object revision in the system\n"
                 "3. time          (numeric, required) time this object was created\n"
                 "4. data-hex      (string, required)  data in hex string form\n"
+                "5. use-IS        (boolean, optional, default=false) InstantSend lock the collateral, only requiring one chain confirmation\n"
                 );
 }
 
 UniValue gobject_prepare(const JSONRPCRequest& request)
 {
-    if (request.fHelp || request.params.size() != 5)
+    if (request.fHelp || (request.params.size() != 5 && request.params.size() != 6)) 
         gobject_prepare_help();
 
     if (!EnsureWalletIsAvailable(request.fHelp))
@@ -159,6 +160,8 @@ UniValue gobject_prepare(const JSONRPCRequest& request)
     int nRevision = atoi(strRevision);
     int64_t nTime = atoi64(strTime);
     std::string strDataHex = request.params[4].get_str();
+    bool useIS = false;
+    if (request.params.size() > 5) useIS = request.params[5].getBool();
 
     // CREATE A NEW COLLATERAL TRANSACTION FOR THIS SPECIFIC OBJECT
 
@@ -197,7 +200,7 @@ UniValue gobject_prepare(const JSONRPCRequest& request)
     EnsureWalletIsUnlocked();
 
     CWalletTx wtx;
-    if (!pwalletMain->GetBudgetSystemCollateralTX(wtx, govobj.GetHash(), govobj.GetMinCollateralFee(), false)) {
+    if (!pwalletMain->GetBudgetSystemCollateralTX(wtx, govobj.GetHash(), govobj.GetMinCollateralFee(), useIS)) {
         throw JSONRPCError(RPC_INTERNAL_ERROR, "Error making collateral transaction for governance object. Please check your wallet balance and make sure your wallet is unlocked.");
     }
 

From a4ea816b20c2ede5af3739c44af0a58038f91146 Mon Sep 17 00:00:00 2001
From: -k <slowdive@me.com>
Date: Sun, 25 Nov 2018 08:27:04 -0500
Subject: [PATCH 315/400] use aqua gui theme (#2472)

---
 share/qt/Info.plist.in | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/share/qt/Info.plist.in b/share/qt/Info.plist.in
index 65c2ebb7dc2d..6db46b192fa3 100644
--- a/share/qt/Info.plist.in
+++ b/share/qt/Info.plist.in
@@ -30,7 +30,7 @@
 
   <key>CFBundleExecutable</key>
   <string>Dash-Qt</string>
-  
+
   <key>CFBundleName</key>
   <string>Dash-Qt</string>
 
@@ -99,7 +99,10 @@
 
   <key>LSAppNapIsDisabled</key>
     <string>True</string>
-  
+
+  <key>NSRequiresAquaSystemAppearance</key>
+    <string>True</string>
+
   <key>LSApplicationCategoryType</key>
     <string>public.app-category.finance</string>
 </dict>

From 0123517b480bd758a38037935ca9a0d5dffd5b19 Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Sun, 25 Nov 2018 14:27:18 +0100
Subject: [PATCH 316/400] Implement PoSe based on information from LLMQ
 commitments (#2478)

Members which are not in the validMembers bitsets are now PoSe punished.
The maximum PoSe score is dynamic and mostly identical to the number of
registered MNs. Added PoSe scores for failures are then a percentage of
the maximum score, so that we can better control how often failures are
allowed per payment cycle. For LLMQ failures, this is 66% to allow
approximately 2 failures per payment cycle.
---
 src/evo/deterministicmns.cpp | 105 +++++++++++++++++++++++++++++++++++
 src/evo/deterministicmns.h   |  40 +++++++++++++
 2 files changed, 145 insertions(+)

diff --git a/src/evo/deterministicmns.cpp b/src/evo/deterministicmns.cpp
index 9808f649444d..8ccd785d0a0a 100644
--- a/src/evo/deterministicmns.cpp
+++ b/src/evo/deterministicmns.cpp
@@ -13,6 +13,9 @@
 #include "validation.h"
 #include "validationinterface.h"
 
+#include "llmq/quorums_commitment.h"
+#include "llmq/quorums_utils.h"
+
 #include <univalue.h>
 
 static const std::string DB_LIST_SNAPSHOT = "dmn_S";
@@ -258,6 +261,55 @@ std::vector<std::pair<arith_uint256, CDeterministicMNCPtr>> CDeterministicMNList
     return scores;
 }
 
+int CDeterministicMNList::CalcMaxPoSePenalty() const
+{
+    // Maximum PoSe penalty is dynamic and equals the number of registered MNs
+    // It's however at least 100.
+    // This means that the max penalty is usually equal to a full payment cycle
+    return std::max(100, (int)GetAllMNsCount());
+}
+
+int CDeterministicMNList::CalcPenalty(int percent) const
+{
+    assert(percent > 0);
+    return (CalcMaxPoSePenalty() * percent) / 100;
+}
+
+void CDeterministicMNList::PoSePunish(const uint256& proTxHash, int penalty)
+{
+    assert(penalty > 0);
+
+    auto dmn = GetMN(proTxHash);
+    assert(dmn);
+
+    int maxPenalty = CalcMaxPoSePenalty();
+
+    auto newState = std::make_shared<CDeterministicMNState>(*dmn->pdmnState);
+    newState->nPoSePenalty += penalty;
+    newState->nPoSePenalty = std::min(maxPenalty, newState->nPoSePenalty);
+
+    LogPrintf("CDeterministicMNList::%s -- punished MN %s, penalty %d->%d (max=%d)\n",
+              __func__, proTxHash.ToString(), dmn->pdmnState->nPoSePenalty, newState->nPoSePenalty, maxPenalty);
+
+    if (newState->nPoSePenalty >= maxPenalty && newState->nPoSeBanHeight == -1) {
+        newState->nPoSeBanHeight = nHeight;
+        LogPrintf("CDeterministicMNList::%s -- banned MN %s at height %d\n",
+                  __func__, proTxHash.ToString(), nHeight);
+    }
+    UpdateMN(proTxHash, newState);
+}
+
+void CDeterministicMNList::PoSeDecrease(const uint256& proTxHash)
+{
+    auto dmn = GetMN(proTxHash);
+    assert(dmn);
+    assert(dmn->pdmnState->nPoSePenalty > 0 && dmn->pdmnState->nPoSeBanHeight == -1);
+
+    auto newState = std::make_shared<CDeterministicMNState>(*dmn->pdmnState);
+    newState->nPoSePenalty--;
+    UpdateMN(proTxHash, newState);
+}
+
 CDeterministicMNListDiff CDeterministicMNList::BuildDiff(const CDeterministicMNList& to) const
 {
     CDeterministicMNListDiff diffRet;
@@ -465,6 +517,8 @@ bool CDeterministicMNManager::BuildNewListFromBlock(const CBlock& block, const C
         }
     });
 
+    DecreasePoSePenalties(newList);
+
     // we skip the coinbase
     for (int i = 1; i < (int)block.vtx.size(); i++) {
         const CTransaction& tx = *block.vtx[i];
@@ -480,6 +534,11 @@ bool CDeterministicMNManager::BuildNewListFromBlock(const CBlock& block, const C
             }
         }
 
+        if (tx.nVersion != 3) {
+            // only interested in special TXs
+            continue;
+        }
+
         if (tx.nType == TRANSACTION_PROVIDER_REGISTER) {
             CProRegTx proTx;
             if (!GetTxPayload(tx, proTx)) {
@@ -558,6 +617,7 @@ bool CDeterministicMNManager::BuildNewListFromBlock(const CBlock& block, const C
             if (newState->nPoSeBanHeight != -1) {
                 // only revive when all keys are set
                 if (newState->pubKeyOperator.IsValid() && !newState->keyIDVoting.IsNull() && !newState->keyIDOwner.IsNull()) {
+                    newState->nPoSePenalty = 0;
                     newState->nPoSeBanHeight = -1;
                     newState->nPoSeRevivedHeight = nHeight;
 
@@ -613,6 +673,14 @@ bool CDeterministicMNManager::BuildNewListFromBlock(const CBlock& block, const C
 
             LogPrintf("CDeterministicMNManager::%s -- MN %s revoked operator key at height %d: %s\n",
                 __func__, proTx.proTxHash.ToString(), nHeight, proTx.ToString());
+        } else if (tx.nType == TRANSACTION_QUORUM_COMMITMENT) {
+            llmq::CFinalCommitment qc;
+            if (!GetTxPayload(tx, qc)) {
+                assert(false); // this should have been handled already
+            }
+            if (!qc.IsNull()) {
+                HandleQuorumCommitment(qc, newList);
+            }
         }
     }
 
@@ -629,6 +697,43 @@ bool CDeterministicMNManager::BuildNewListFromBlock(const CBlock& block, const C
     return true;
 }
 
+void CDeterministicMNManager::HandleQuorumCommitment(llmq::CFinalCommitment& qc, CDeterministicMNList& mnList)
+{
+    // The commitment has already been validated at this point so it's safe to use members of it
+
+    auto members = llmq::CLLMQUtils::GetAllQuorumMembers((Consensus::LLMQType)qc.llmqType, qc.quorumHash);
+
+    for (size_t i = 0; i < members.size(); i++) {
+        if (!mnList.HasMN(members[i]->proTxHash)) {
+            continue;
+        }
+        if (!qc.validMembers[i]) {
+            // punish MN for failed DKG participation
+            // The idea is to immediately ban a MN when it fails 2 DKG sessions with only a few blocks in-between
+            // If there were enough blocks between failures, the MN has a chance to recover as he reduces his penalty by 1 for every block
+            // If it however fails 3 times in the timespan of a single payment cycle, it should definitely get banned
+            mnList.PoSePunish(members[i]->proTxHash, mnList.CalcPenalty(66));
+        }
+    }
+}
+
+void CDeterministicMNManager::DecreasePoSePenalties(CDeterministicMNList& mnList)
+{
+    std::vector<uint256> toDecrease;
+    toDecrease.reserve(mnList.GetValidMNsCount() / 10);
+    // only iterate and decrease for valid ones (not PoSe banned yet)
+    // if a MN ever reaches the maximum, it stays in PoSe banned state until revived
+    mnList.ForEachMN(true, [&](const CDeterministicMNCPtr& dmn) {
+        if (dmn->pdmnState->nPoSePenalty > 0 && dmn->pdmnState->nPoSeBanHeight == -1) {
+            toDecrease.emplace_back(dmn->proTxHash);
+        }
+    });
+
+    for (const auto& proTxHash : toDecrease) {
+        mnList.PoSeDecrease(proTxHash);
+    }
+}
+
 CDeterministicMNList CDeterministicMNManager::GetListForBlock(const uint256& blockHash)
 {
     LOCK(cs);
diff --git a/src/evo/deterministicmns.h b/src/evo/deterministicmns.h
index bc9fadaa304e..00aa99345d61 100644
--- a/src/evo/deterministicmns.h
+++ b/src/evo/deterministicmns.h
@@ -22,6 +22,11 @@ class CBlock;
 class CBlockIndex;
 class CValidationState;
 
+namespace llmq
+{
+    class CFinalCommitment;
+}
+
 class CDeterministicMNState
 {
 public:
@@ -307,6 +312,39 @@ class CDeterministicMNList
     std::vector<CDeterministicMNCPtr> CalculateQuorum(size_t maxSize, const uint256& modifier) const;
     std::vector<std::pair<arith_uint256, CDeterministicMNCPtr>> CalculateScores(const uint256& modifier) const;
 
+    /**
+     * Calculates the maximum penalty which is allowed at the height of this MN list. It is dynamic and might change
+     * for every block.
+     * @return
+     */
+    int CalcMaxPoSePenalty() const;
+
+    /**
+     * Returns a the given percentage from the max penalty for this MN list. Always use this method to calculate the
+     * value later passed to PoSePunish. The percentage should be high enough to take per-block penalty decreasing for MNs
+     * into account. This means, if you want to accept 2 failures per payment cycle, you should choose a percentage that
+     * is higher then 50%, e.g. 66%.
+     * @param percent
+     * @return
+     */
+    int CalcPenalty(int percent) const;
+
+    /**
+     * Punishes a MN for misbehavior. If the resulting penalty score of the MN reaches the max penalty, it is banned.
+     * Penalty scores are only increased when the MN is not already banned, which means that after banning the penalty
+     * might appear lower then the current max penalty, while the MN is still banned.
+     * @param proTxHash
+     * @param penalty
+     */
+    void PoSePunish(const uint256& proTxHash, int penalty);
+
+    /**
+     * Decrease penalty score of MN by 1.
+     * Only allowed on non-banned MNs.
+     * @param proTxHash
+     */
+    void PoSeDecrease(const uint256& proTxHash);
+
     CDeterministicMNListDiff BuildDiff(const CDeterministicMNList& to) const;
     CSimplifiedMNListDiff BuildSimplifiedDiff(const CDeterministicMNList& to) const;
     CDeterministicMNList ApplyDiff(const CDeterministicMNListDiff& diff) const;
@@ -422,6 +460,8 @@ class CDeterministicMNManager
 
     // the returned list will not contain the correct block hash (we can't know it yet as the coinbase TX is not updated yet)
     bool BuildNewListFromBlock(const CBlock& block, const CBlockIndex* pindexPrev, CValidationState& state, CDeterministicMNList& mnListRet);
+    void HandleQuorumCommitment(llmq::CFinalCommitment& qc, CDeterministicMNList& mnList);
+    void DecreasePoSePenalties(CDeterministicMNList& mnList);
 
     CDeterministicMNList GetListForBlock(const uint256& blockHash);
     CDeterministicMNList GetListAtChainTip();

From 9d4df466b943ab8ce647bc936f6781d1dc2d5723 Mon Sep 17 00:00:00 2001
From: UdjinM6 <UdjinM6@users.noreply.github.com>
Date: Sun, 25 Nov 2018 16:27:31 +0300
Subject: [PATCH 317/400] Fix CreateDenominated failure for addresses with huge
 amount of inputs (#2486)

* Allow specifing max number of outpoints to be returned per address in SelectCoinsGroupedByAddresses

Fixes CreateDenominated failure for addresses with huge amount of inputs

* Apply suggested fixes
---
 src/privatesend-client.cpp |  6 +++++-
 src/wallet/wallet.cpp      | 23 ++++++++++++++---------
 src/wallet/wallet.h        |  2 +-
 3 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/src/privatesend-client.cpp b/src/privatesend-client.cpp
index 5a72ef800f55..be9c870f6880 100644
--- a/src/privatesend-client.cpp
+++ b/src/privatesend-client.cpp
@@ -1444,8 +1444,12 @@ bool CPrivateSendClientSession::CreateDenominated(CConnman& connman)
 
     LOCK2(cs_main, pwalletMain->cs_wallet);
 
+    // NOTE: We do not allow txes larger than 100kB, so we have to limit number of inputs here.
+    // We still want to consume a lot of inputs to avoid creating only smaller denoms though.
+    // Knowing that each CTxIn is at least 148b big, 400 inputs should take 400 x ~148b = ~60kB.
+    // This still leaves more than enough room for another data of typical CreateDenominated tx.
     std::vector<CompactTallyItem> vecTally;
-    if (!pwalletMain->SelectCoinsGroupedByAddresses(vecTally)) {
+    if (!pwalletMain->SelectCoinsGroupedByAddresses(vecTally, true, true, true, 400)) {
         LogPrint("privatesend", "CPrivateSendClientSession::CreateDenominated -- SelectCoinsGroupedByAddresses can't find any inputs!\n");
         return false;
     }
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
index c00f27e70144..f74547b55691 100644
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -3069,14 +3069,14 @@ struct CompareByAmount
     }
 };
 
-bool CWallet::SelectCoinsGroupedByAddresses(std::vector<CompactTallyItem>& vecTallyRet, bool fSkipDenominated, bool fAnonymizable, bool fSkipUnconfirmed) const
+bool CWallet::SelectCoinsGroupedByAddresses(std::vector<CompactTallyItem>& vecTallyRet, bool fSkipDenominated, bool fAnonymizable, bool fSkipUnconfirmed, int nMaxOupointsPerAddress) const
 {
     LOCK2(cs_main, cs_wallet);
 
     isminefilter filter = ISMINE_SPENDABLE;
 
-    // try to use cache for already confirmed anonymizable inputs
-    if(fAnonymizable && fSkipUnconfirmed) {
+    // try to use cache for already confirmed anonymizable inputs, no cache should be used when the limit is specified
+    if(nMaxOupointsPerAddress != -1 && fAnonymizable && fSkipUnconfirmed) {
         if(fSkipDenominated && fAnonymizableTallyCachedNonDenom) {
             vecTallyRet = vecAnonymizableTallyCachedNonDenom;
             LogPrint("selectcoins", "SelectCoinsGroupedByAddresses - using cache for non-denom inputs %d\n", vecTallyRet.size());
@@ -3114,6 +3114,9 @@ bool CWallet::SelectCoinsGroupedByAddresses(std::vector<CompactTallyItem>& vecTa
             isminefilter mine = ::IsMine(*this, txdest);
             if(!(mine & filter)) continue;
 
+            auto itTallyItem = mapTally.find(txdest);
+            if (nMaxOupointsPerAddress != -1 && itTallyItem != mapTally.end() && itTallyItem->second.vecOutPoints.size() >= nMaxOupointsPerAddress) continue;
+
             if(IsSpent(outpoint.hash, i) || IsLockedCoin(outpoint.hash, i)) continue;
 
             if(fSkipDenominated && CPrivateSend::IsDenominatedAmount(wtx.tx->vout[i].nValue)) continue;
@@ -3129,10 +3132,12 @@ bool CWallet::SelectCoinsGroupedByAddresses(std::vector<CompactTallyItem>& vecTa
                 if(GetCappedOutpointPrivateSendRounds(COutPoint(outpoint.hash, i)) >= privateSendClient.nPrivateSendRounds) continue;
             }
 
-            CompactTallyItem& item = mapTally[txdest];
-            item.txdest = txdest;
-            item.nAmount += wtx.tx->vout[i].nValue;
-            item.vecOutPoints.emplace_back(outpoint.hash, i);
+            if (itTallyItem == mapTally.end()) {
+                itTallyItem = mapTally.emplace(txdest, CompactTallyItem()).first;
+                itTallyItem->second.txdest = txdest;
+            }
+            itTallyItem->second.nAmount += wtx.tx->vout[i].nValue;
+            itTallyItem->second.vecOutPoints.emplace_back(outpoint.hash, i);
         }
     }
 
@@ -3146,8 +3151,8 @@ bool CWallet::SelectCoinsGroupedByAddresses(std::vector<CompactTallyItem>& vecTa
     // order by amounts per address, from smallest to largest
     std::sort(vecTallyRet.rbegin(), vecTallyRet.rend(), CompareByAmount());
 
-    // cache already confirmed anonymizable entries for later use
-    if(fAnonymizable && fSkipUnconfirmed) {
+    // cache already confirmed anonymizable entries for later use, no cache should be saved when the limit is specified
+    if(nMaxOupointsPerAddress != -1 && fAnonymizable && fSkipUnconfirmed) {
         if(fSkipDenominated) {
             vecAnonymizableTallyCachedNonDenom = vecTallyRet;
             fAnonymizableTallyCachedNonDenom = true;
diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h
index 1e55061a66a0..d17e8e957490 100644
--- a/src/wallet/wallet.h
+++ b/src/wallet/wallet.h
@@ -810,7 +810,7 @@ class CWallet : public CCryptoKeyStore, public CValidationInterface
     bool GetCollateralTxDSIn(CTxDSIn& txdsinRet, CAmount& nValueRet) const;
     bool SelectPrivateCoins(CAmount nValueMin, CAmount nValueMax, std::vector<CTxIn>& vecTxInRet, CAmount& nValueRet, int nPrivateSendRoundsMin, int nPrivateSendRoundsMax) const;
 
-    bool SelectCoinsGroupedByAddresses(std::vector<CompactTallyItem>& vecTallyRet, bool fSkipDenominated = true, bool fAnonymizable = true, bool fSkipUnconfirmed = true) const;
+    bool SelectCoinsGroupedByAddresses(std::vector<CompactTallyItem>& vecTallyRet, bool fSkipDenominated = true, bool fAnonymizable = true, bool fSkipUnconfirmed = true, int nMaxOupointsPerAddress = -1) const;
 
     /// Get 1000DASH output and keys which can be used for the Masternode
     bool GetMasternodeOutpointAndKeys(COutPoint& outpointRet, CPubKey& pubKeyRet, CKey& keyRet, const std::string& strTxHash = "", const std::string& strOutputIndex = "");

From 67483cd340d8c3dc3c68a2f9c9782d35f73ccd27 Mon Sep 17 00:00:00 2001
From: UdjinM6 <UdjinM6@users.noreply.github.com>
Date: Sun, 25 Nov 2018 16:27:43 +0300
Subject: [PATCH 318/400] Fix dsq/dsa conditions (#2487)

* Apply new dsq rules in StartNewQueue and DSACCEPT

* Apply similar logic to vecMasternodesUsed

* Add extra check for DSACCEPT
---
 src/privatesend-client.cpp | 10 +++++-----
 src/privatesend-server.cpp | 15 ++++++++++++++-
 2 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/src/privatesend-client.cpp b/src/privatesend-client.cpp
index be9c870f6880..556c063fb9a7 100644
--- a/src/privatesend-client.cpp
+++ b/src/privatesend-client.cpp
@@ -951,10 +951,10 @@ bool CPrivateSendClientManager::DoAutomaticDenominating(CConnman& connman, bool
         return false;
     }
 
-    int nMnCountEnabled = mnodeman.CountEnabled(MIN_PRIVATESEND_PEER_PROTO_VERSION);
+    int nMnCount = mnodeman.CountMasternodes();
 
     // If we've used 90% of the Masternode list then drop the oldest first ~30%
-    int nThreshold_high = nMnCountEnabled * 0.9;
+    int nThreshold_high = nMnCount * 0.9;
     int nThreshold_low = nThreshold_high * 0.7;
     LogPrint("privatesend", "Checking vecMasternodesUsed: size: %d, threshold: %d\n", (int)vecMasternodesUsed.size(), nThreshold_high);
 
@@ -1067,7 +1067,7 @@ bool CPrivateSendClientSession::StartNewQueue(CAmount nValueMin, CAmount nBalanc
     if (!pwalletMain) return false;
 
     int nTries = 0;
-    int nMnCountEnabled = mnodeman.CountEnabled(MIN_PRIVATESEND_PEER_PROTO_VERSION);
+    int nMnCount = mnodeman.CountMasternodes();
 
     // ** find the coins we'll use
     std::vector<CTxIn> vecTxIn;
@@ -1098,11 +1098,11 @@ bool CPrivateSendClientSession::StartNewQueue(CAmount nValueMin, CAmount nBalanc
             continue;
         }
 
-        if (infoMn.nLastDsq != 0 && infoMn.nLastDsq + nMnCountEnabled / 5 > mnodeman.nDsqCount) {
+        if (infoMn.nLastDsq != 0 && infoMn.nLastDsq + nMnCount / 5 > mnodeman.nDsqCount) {
             LogPrintf("CPrivateSendClientSession::StartNewQueue -- Too early to mix on this masternode!"
                       " masternode=%s  addr=%s  nLastDsq=%d  CountEnabled/5=%d  nDsqCount=%d\n",
                 infoMn.outpoint.ToStringShort(), infoMn.addr.ToString(), infoMn.nLastDsq,
-                nMnCountEnabled / 5, mnodeman.nDsqCount);
+                nMnCount / 5, mnodeman.nDsqCount);
             nTries++;
             continue;
         }
diff --git a/src/privatesend-server.cpp b/src/privatesend-server.cpp
index 69a9972f5cdf..89b0ab2db2e1 100644
--- a/src/privatesend-server.cpp
+++ b/src/privatesend-server.cpp
@@ -50,8 +50,21 @@ void CPrivateSendServer::ProcessMessage(CNode* pfrom, const std::string& strComm
             return;
         }
 
+        {
+            TRY_LOCK(cs_vecqueue, lockRecv);
+            if (!lockRecv) return;
+
+            for (const auto& q : vecPrivateSendQueue) {
+                if (q.masternodeOutpoint == activeMasternodeInfo.outpoint) {
+                    // refuse to create another queue this often
+                    LogPrint("privatesend", "DSACCEPT -- last dsq is still in queue, refuse to mix\n");
+                    return;
+                }
+            }
+        }
+
         if (vecSessionCollaterals.size() == 0 && mnInfo.nLastDsq != 0 &&
-            mnInfo.nLastDsq + mnodeman.CountEnabled(MIN_PRIVATESEND_PEER_PROTO_VERSION) / 5 > mnodeman.nDsqCount) {
+            mnInfo.nLastDsq + mnodeman.CountMasternodes() / 5 > mnodeman.nDsqCount) {
             LogPrintf("DSACCEPT -- last dsq too recent, must wait: addr=%s\n", pfrom->addr.ToString());
             PushStatus(pfrom, STATUS_REJECTED, ERR_RECENT, connman);
             return;

From 66612cc4b59ac3b6bca2fab24357ab3d733bfc7e Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Sun, 25 Nov 2018 14:27:56 +0100
Subject: [PATCH 319/400] Add 0 entry to vTxSigOps when adding quorum
 commitments (#2489)

This fixes a crash observed on Travis. The same crash is likely to happen
outside of Travis as well later.
---
 src/miner.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/miner.cpp b/src/miner.cpp
index 0229cd872f04..40b0273e1143 100644
--- a/src/miner.cpp
+++ b/src/miner.cpp
@@ -158,6 +158,7 @@ std::unique_ptr<CBlockTemplate> BlockAssembler::CreateNewBlock(const CScript& sc
             if (llmq::quorumBlockProcessor->GetMinableCommitmentTx(p.first, pindexPrev, qcTx)) {
                 pblock->vtx.emplace_back(qcTx);
                 pblocktemplate->vTxFees.emplace_back(0);
+                pblocktemplate->vTxSigOps.emplace_back(0);
             }
         }
     }

From 6480ad1d5f729ac277bae68d7c436434d5bcda4b Mon Sep 17 00:00:00 2001
From: UdjinM6 <UdjinM6@users.noreply.github.com>
Date: Sun, 25 Nov 2018 16:35:52 +0300
Subject: [PATCH 320/400] Should check dsq queue regardless of the mixing state
 (#2491)

---
 src/privatesend-client.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/privatesend-client.cpp b/src/privatesend-client.cpp
index 556c063fb9a7..9249ee094b2f 100644
--- a/src/privatesend-client.cpp
+++ b/src/privatesend-client.cpp
@@ -448,10 +448,11 @@ bool CPrivateSendClientSession::CheckTimeout()
 void CPrivateSendClientManager::CheckTimeout()
 {
     if (fMasternodeMode) return;
-    if (!fEnablePrivateSend) return;
 
     CheckQueue();
 
+    if (!fEnablePrivateSend) return;
+
     LOCK(cs_deqsessions);
     for (auto& session : deqSessions) {
         if (session.CheckTimeout()) {

From bb11f1a638b3343234fdf2f3047636bef5f9698a Mon Sep 17 00:00:00 2001
From: InhumanPerfection <39734219+InhumanPerfection@users.noreply.github.com>
Date: Sun, 25 Nov 2018 22:52:56 +0200
Subject: [PATCH 321/400] Fix recent changes in DSA conditions (#2494)

* pr2487 bugfix

* push reject msg
---
 src/privatesend-server.cpp | 32 +++++++++++++++++---------------
 1 file changed, 17 insertions(+), 15 deletions(-)

diff --git a/src/privatesend-server.cpp b/src/privatesend-server.cpp
index 89b0ab2db2e1..57f8267f67ea 100644
--- a/src/privatesend-server.cpp
+++ b/src/privatesend-server.cpp
@@ -50,24 +50,26 @@ void CPrivateSendServer::ProcessMessage(CNode* pfrom, const std::string& strComm
             return;
         }
 
-        {
-            TRY_LOCK(cs_vecqueue, lockRecv);
-            if (!lockRecv) return;
-
-            for (const auto& q : vecPrivateSendQueue) {
-                if (q.masternodeOutpoint == activeMasternodeInfo.outpoint) {
-                    // refuse to create another queue this often
-                    LogPrint("privatesend", "DSACCEPT -- last dsq is still in queue, refuse to mix\n");
-                    return;
+        if (vecSessionCollaterals.size() == 0) {
+            {
+                TRY_LOCK(cs_vecqueue, lockRecv);
+                if (!lockRecv) return;
+
+                for (const auto& q : vecPrivateSendQueue) {
+                    if (q.masternodeOutpoint == activeMasternodeInfo.outpoint) {
+                        // refuse to create another queue this often
+                        LogPrint("privatesend", "DSACCEPT -- last dsq is still in queue, refuse to mix\n");
+                        PushStatus(pfrom, STATUS_REJECTED, ERR_RECENT, connman);
+                        return;
+                    }
                 }
             }
-        }
 
-        if (vecSessionCollaterals.size() == 0 && mnInfo.nLastDsq != 0 &&
-            mnInfo.nLastDsq + mnodeman.CountMasternodes() / 5 > mnodeman.nDsqCount) {
-            LogPrintf("DSACCEPT -- last dsq too recent, must wait: addr=%s\n", pfrom->addr.ToString());
-            PushStatus(pfrom, STATUS_REJECTED, ERR_RECENT, connman);
-            return;
+            if (mnInfo.nLastDsq != 0 && mnInfo.nLastDsq + mnodeman.CountMasternodes() / 5 > mnodeman.nDsqCount) {
+                LogPrintf("DSACCEPT -- last dsq too recent, must wait: addr=%s\n", pfrom->addr.ToString());
+                PushStatus(pfrom, STATUS_REJECTED, ERR_RECENT, connman);
+                return;
+            }
         }
 
         PoolMessage nMessageID = MSG_NOERR;

From 245c3220e9e0c3a4c716fc8b82f2f27f3af36e7e Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Mon, 26 Nov 2018 13:40:36 +0100
Subject: [PATCH 322/400] Sync blocks before creating TXs (#2496)

---
 qa/rpc-tests/p2p-instantsend.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/qa/rpc-tests/p2p-instantsend.py b/qa/rpc-tests/p2p-instantsend.py
index e16b26173cb2..69789b33f659 100755
--- a/qa/rpc-tests/p2p-instantsend.py
+++ b/qa/rpc-tests/p2p-instantsend.py
@@ -29,6 +29,8 @@ def run_test(self):
             set_mocktime(get_mocktime() + 1)
             set_node_times(self.nodes, get_mocktime())
             self.nodes[0].generate(1)
+        self.sync_all()
+
         # create doublepending transaction,  but don't relay it
         dblspnd_tx = self.create_raw_trx(self.nodes[self.sender_idx],
                                        self.nodes[self.isolated_idx],

From 69bffed72ff980c9378cead7c58735286a6a4975 Mon Sep 17 00:00:00 2001
From: UdjinM6 <UdjinM6@users.noreply.github.com>
Date: Mon, 26 Nov 2018 16:22:39 +0300
Subject: [PATCH 323/400] Do not sort resulting vector in
 SelectCoinsGroupedByAddresses (#2493)

Apply specific sort in each case separately instead (when needed).
---
 src/privatesend-client.cpp | 10 ++++++++++
 src/wallet/wallet.cpp      | 13 +------------
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/src/privatesend-client.cpp b/src/privatesend-client.cpp
index 9249ee094b2f..21d14d6e759d 100644
--- a/src/privatesend-client.cpp
+++ b/src/privatesend-client.cpp
@@ -1347,6 +1347,11 @@ bool CPrivateSendClientSession::MakeCollateralAmounts(CConnman& connman)
         return false;
     }
 
+    // Start from smallest balances first to consume tiny amounts and cleanup UTXO a bit
+    std::sort(vecTally.begin(), vecTally.end(), [](const CompactTallyItem& a, const CompactTallyItem& b) {
+        return a.nAmount < b.nAmount;
+    });
+
     // First try to use only non-denominated funds
     for (const auto& item : vecTally) {
         if (!MakeCollateralAmounts(item, false, connman)) continue;
@@ -1455,6 +1460,11 @@ bool CPrivateSendClientSession::CreateDenominated(CConnman& connman)
         return false;
     }
 
+    // Start from largest balances first to speed things up by creating txes with larger/largest denoms included
+    std::sort(vecTally.begin(), vecTally.end(), [](const CompactTallyItem& a, const CompactTallyItem& b) {
+        return a.nAmount > b.nAmount;
+    });
+
     bool fCreateMixingCollaterals = !pwalletMain->HasCollateralInputs();
 
     for (const auto& item : vecTally) {
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
index f74547b55691..ca9b51d1e41a 100644
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -3060,15 +3060,6 @@ bool CWallet::SelectPSInOutPairsByDenominations(int nDenom, CAmount nValueMin, C
     return nValueTotal >= nValueMin && nDenom == nDenomResult;
 }
 
-struct CompareByAmount
-{
-    bool operator()(const CompactTallyItem& t1,
-                    const CompactTallyItem& t2) const
-    {
-        return t1.nAmount > t2.nAmount;
-    }
-};
-
 bool CWallet::SelectCoinsGroupedByAddresses(std::vector<CompactTallyItem>& vecTallyRet, bool fSkipDenominated, bool fAnonymizable, bool fSkipUnconfirmed, int nMaxOupointsPerAddress) const
 {
     LOCK2(cs_main, cs_wallet);
@@ -3142,15 +3133,13 @@ bool CWallet::SelectCoinsGroupedByAddresses(std::vector<CompactTallyItem>& vecTa
     }
 
     // construct resulting vector
+    // NOTE: vecTallyRet is "sorted" by txdest (i.e. address), just like mapTally
     vecTallyRet.clear();
     for (const auto& item : mapTally) {
         if(fAnonymizable && item.second.nAmount < nSmallestDenom) continue;
         vecTallyRet.push_back(item.second);
     }
 
-    // order by amounts per address, from smallest to largest
-    std::sort(vecTallyRet.rbegin(), vecTallyRet.rend(), CompareByAmount());
-
     // cache already confirmed anonymizable entries for later use, no cache should be saved when the limit is specified
     if(nMaxOupointsPerAddress != -1 && fAnonymizable && fSkipUnconfirmed) {
         if(fSkipDenominated) {

From 80656038fab05b3b40a65d60e4eb927dc3a60f5a Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Mon, 26 Nov 2018 14:23:29 +0100
Subject: [PATCH 324/400] Bump nTemporaryTestnetForkHeight to 274000 (#2498)

---
 src/chainparams.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/chainparams.cpp b/src/chainparams.cpp
index bc4221e2b18c..8aed0007ef85 100644
--- a/src/chainparams.cpp
+++ b/src/chainparams.cpp
@@ -445,7 +445,7 @@ class CTestNetParams : public CChainParams {
 
         // This is temporary until we reset testnet for retesting of the full DIP3 deployment
         consensus.nTemporaryTestnetForkDIP3Height = 264000;
-        consensus.nTemporaryTestnetForkHeight = 273000;
+        consensus.nTemporaryTestnetForkHeight = 274000;
         consensus.nTemporaryTestnetForkDIP3BlockHash.SetHex("00000048e6e71d4bd90e7c456dcb94683ae832fcad13e1760d8283f7e89f332f");
 
         fMiningRequiresPeers = true;

From 7a709b81d858e3dc265fa0ed4548dd2c84dad9af Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Mon, 26 Nov 2018 14:23:46 +0100
Subject: [PATCH 325/400] Perform less instant send tests in DIP3 tests (#2499)

These take quite some time on Travis.
---
 qa/rpc-tests/dip3-deterministicmns.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/qa/rpc-tests/dip3-deterministicmns.py b/qa/rpc-tests/dip3-deterministicmns.py
index 1eaf839ba036..1cdf8ff34bc8 100755
--- a/qa/rpc-tests/dip3-deterministicmns.py
+++ b/qa/rpc-tests/dip3-deterministicmns.py
@@ -214,7 +214,7 @@ def run_test(self):
         self.test_mn_votes(10, test_enforcement=True)
 
         print("testing instant send (with mixed ProTx and legacy nodes)")
-        self.test_instantsend(10, 5)
+        self.test_instantsend(10, 3)
 
         # We still need to restart them as otherwise they won't have the BLS operator key loaded
         print("restart upgraded nodes which refer to old collaterals")
@@ -298,7 +298,7 @@ def run_test(self):
             self.sync_all()
 
         print("testing instant send with deterministic MNs")
-        self.test_instantsend(20, 5)
+        self.test_instantsend(10, 5)
 
         print("testing ProUpServTx")
         for mn in mns_protx:
@@ -339,7 +339,7 @@ def run_test(self):
             self.sync_all()
 
         print("testing instant send with replaced MNs")
-        self.test_instantsend(20, 5)
+        self.test_instantsend(10, 3)
 
     def create_mn(self, node, idx, alias):
         mn = Masternode()

From c248c48e4da7c8995c480347a2ef5fac39f4fce0 Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Mon, 26 Nov 2018 16:22:54 +0100
Subject: [PATCH 326/400] Try to fix a few sporadic instant send failures in
 DIP3 tests  (#2500)

* Sleep in wait_for_instant_lock when TX is not known yet

We'll otherwise stress the CPU quite a lot, which might in turn result in
instant send timeouts.

* Wait for all nodes to have the instant send lock

Otherwise individual nodes might end up not being able to catch up,
especially when it's the last iteration and we generate 6 blocks after it.

* Use getrawtransaction in wait_for_instant_lock instead of gettransaction

gettransaction fails if the TX is not owned by the wallet

* Give instant send tests more time after DIP3 activation

Signature verification changes to BLS when DIP3 gets activated, which is
much more resource hungry. Give instant send tests more time after DIP3
activation until we do proper batched verification of instant send
signatures.
---
 qa/rpc-tests/dip3-deterministicmns.py | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/qa/rpc-tests/dip3-deterministicmns.py b/qa/rpc-tests/dip3-deterministicmns.py
index 1cdf8ff34bc8..2ab0285a2a07 100755
--- a/qa/rpc-tests/dip3-deterministicmns.py
+++ b/qa/rpc-tests/dip3-deterministicmns.py
@@ -298,7 +298,7 @@ def run_test(self):
             self.sync_all()
 
         print("testing instant send with deterministic MNs")
-        self.test_instantsend(10, 5)
+        self.test_instantsend(10, 5, timeout=20)
 
         print("testing ProUpServTx")
         for mn in mns_protx:
@@ -339,7 +339,7 @@ def run_test(self):
             self.sync_all()
 
         print("testing instant send with replaced MNs")
-        self.test_instantsend(10, 3)
+        self.test_instantsend(10, 3, timeout=20)
 
     def create_mn(self, node, idx, alias):
         mn = Masternode()
@@ -558,7 +558,7 @@ def test_mn_votes(self, block_count, test_enforcement=False):
         if test_enforcement:
             self.nodes[0].spork('SPORK_8_MASTERNODE_PAYMENT_ENFORCEMENT', 4070908800)
 
-    def test_instantsend(self, tx_count, repeat):
+    def test_instantsend(self, tx_count, repeat, timeout=20):
         self.nodes[0].spork('SPORK_2_INSTANTSEND_ENABLED', 0)
         self.wait_for_sporks()
 
@@ -588,7 +588,9 @@ def test_instantsend(self, tx_count, repeat):
                         break
                 to_address = to_node.getnewaddress()
                 txid = from_node.instantsendtoaddress(to_address, 0.01)
-                self.wait_for_instant_lock(to_node, to_node_idx, txid)
+                for node in self.nodes:
+                    if node is not None:
+                        self.wait_for_instant_lock(node, to_node_idx, txid, timeout=timeout)
             self.nodes[0].generate(6)
             self.sync_all()
 
@@ -596,10 +598,11 @@ def wait_for_instant_lock(self, node, node_idx, txid, timeout=10):
         st = time.time()
         while time.time() < st + timeout:
             try:
-                tx = node.gettransaction(txid)
+                tx = node.getrawtransaction(txid, 1)
             except:
-                continue
+                tx = None
             if tx is None:
+                time.sleep(0.5)
                 continue
             if tx['instantlock']:
                 return

From a18ca49a228a1a5647a0011593297a9b28c99b81 Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Mon, 26 Nov 2018 16:23:17 +0100
Subject: [PATCH 327/400] Disconnect peers with version < 70212 after DIP3
 activation via BIP9 (#2497)

* Disconnect peers with version < 70212 after DIP3 activation via BIP9

* Send REJECT and log when diconnecting peers after DIP3 activation
---
 src/net_processing.cpp | 28 ++++++++++++++++++++++++++--
 src/version.h          |  3 +++
 2 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/src/net_processing.cpp b/src/net_processing.cpp
index e311f093fb7f..c5718aed2c7a 100644
--- a/src/net_processing.cpp
+++ b/src/net_processing.cpp
@@ -1340,6 +1340,19 @@ bool static ProcessMessage(CNode* pfrom, const std::string& strCommand, CDataStr
         return true;
     }
 
+    // BEGIN TEMPORARY CODE
+    bool fDIP0003Active;
+    {
+        LOCK(cs_main);
+        fDIP0003Active = VersionBitsState(chainActive.Tip(), chainparams.GetConsensus(), Consensus::DEPLOYMENT_DIP0003, versionbitscache) == THRESHOLD_ACTIVE;
+    }
+    // TODO delete this in next release after v13
+    int nMinPeerProtoVersion = MIN_PEER_PROTO_VERSION;
+    if (fDIP0003Active) {
+        nMinPeerProtoVersion = MIN_PEER_PROTO_VERSION_DIP3;
+    }
+    // END TEMPORARY CODE
+
     if (!(pfrom->GetLocalServices() & NODE_BLOOM) &&
               (strCommand == NetMsgType::FILTERLOAD ||
                strCommand == NetMsgType::FILTERADD))
@@ -1418,12 +1431,12 @@ bool static ProcessMessage(CNode* pfrom, const std::string& strCommand, CDataStr
             return false;
         }
 
-        if (nVersion < MIN_PEER_PROTO_VERSION)
+        if (nVersion < nMinPeerProtoVersion)
         {
             // disconnect from peers older than this proto version
             LogPrintf("peer=%d using obsolete version %i; disconnecting\n", pfrom->id, nVersion);
             connman.PushMessage(pfrom, CNetMsgMaker(INIT_PROTO_VERSION).Make(NetMsgType::REJECT, strCommand, REJECT_OBSOLETE,
-                               strprintf("Version must be %d or greater", MIN_PEER_PROTO_VERSION)));
+                               strprintf("Version must be %d or greater", nMinPeerProtoVersion)));
             pfrom->fDisconnect = true;
             return false;
         }
@@ -1564,6 +1577,17 @@ bool static ProcessMessage(CNode* pfrom, const std::string& strCommand, CDataStr
     // At this point, the outgoing message serialization version can't change.
     const CNetMsgMaker msgMaker(pfrom->GetSendVersion());
 
+    // BEGIN TEMPORARY CODE
+    if (pfrom->nVersion < nMinPeerProtoVersion) {
+        // disconnect from peers with version < 70212 after DIP3 has activated through the BIP9 deployment
+        LogPrintf("peer=%d using obsolete version %i after DIP3 activation; disconnecting\n", pfrom->id, pfrom->GetSendVersion());
+        connman.PushMessage(pfrom, msgMaker.Make(NetMsgType::REJECT, strCommand, REJECT_OBSOLETE,
+                strprintf("Version must be %d or greater", nMinPeerProtoVersion)));
+        pfrom->fDisconnect = true;
+        return false;
+    }
+    // END TEMPORARY CODE
+
     if (strCommand == NetMsgType::VERACK)
     {
         pfrom->SetRecvVersion(std::min(pfrom->nVersion.load(), PROTOCOL_VERSION));
diff --git a/src/version.h b/src/version.h
index 9d389bc4e7ce..a88927b46140 100644
--- a/src/version.h
+++ b/src/version.h
@@ -22,6 +22,9 @@ static const int GETHEADERS_VERSION = 70077;
 //! disconnect from peers older than this proto version
 static const int MIN_PEER_PROTO_VERSION = 70210;
 
+//! disconnect from peers older than this proto version when DIP3 is activated via the BIP9 deployment
+static const int MIN_PEER_PROTO_VERSION_DIP3 = 70212;
+
 //! nTime field added to CAddress, starting with this version;
 //! if possible, avoid requesting addresses nodes older than this
 static const int CADDR_TIME_VERSION = 31402;

From a4f5ba38b65384fb9243ce78c111feceb377e1a9 Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Mon, 26 Nov 2018 16:53:20 +0100
Subject: [PATCH 328/400]  Implement CDummyDKG and CDummyCommitment until we
 have the real DKG merged (#2492)

* Add SPORK_17_QUORUM_DKG_ENABLED spork

* Implement CDummyDKG and CDummyCommitment until we have the real DKG merged

This is only used on testnet/devnet/regtest and will NEVER be used on
mainnet. It is NOT SECURE AT ALL!

See comment in quorums_dummydkg.h for more details.

* Test simple PoSe in DIP3 tests

* Generate 2 instead of 4 blocks per iteration in PoSe tests

4 was based on old chainparams where I used larger phases.

* Only sleep when necessary in PoSe tests

* Fix typo in comment

* Give PoSe tests more time and sync after fast-forward
---
 qa/rpc-tests/dip3-deterministicmns.py |  41 +++
 src/Makefile.am                       |   2 +
 src/chainparams.cpp                   |   4 +
 src/consensus/params.h                |   3 +-
 src/dsnotificationinterface.cpp       |   3 +
 src/evo/specialtx.cpp                 |  10 +-
 src/llmq/quorums_dummydkg.cpp         | 454 ++++++++++++++++++++++++++
 src/llmq/quorums_dummydkg.h           | 121 +++++++
 src/llmq/quorums_init.cpp             |   4 +
 src/net_processing.cpp                |  18 +
 src/protocol.cpp                      |   3 +
 src/protocol.h                        |   2 +
 src/spork.cpp                         |   3 +
 src/spork.h                           |   3 +-
 14 files changed, 664 insertions(+), 7 deletions(-)
 create mode 100644 src/llmq/quorums_dummydkg.cpp
 create mode 100644 src/llmq/quorums_dummydkg.h

diff --git a/qa/rpc-tests/dip3-deterministicmns.py b/qa/rpc-tests/dip3-deterministicmns.py
index 2ab0285a2a07..dfcd14a56cc2 100755
--- a/qa/rpc-tests/dip3-deterministicmns.py
+++ b/qa/rpc-tests/dip3-deterministicmns.py
@@ -341,6 +341,47 @@ def run_test(self):
         print("testing instant send with replaced MNs")
         self.test_instantsend(10, 3, timeout=20)
 
+        print("testing simple PoSe")
+        self.assert_mnlists(mns_protx)
+        self.nodes[0].spork('SPORK_17_QUORUM_DKG_ENABLED', 0)
+        self.wait_for_sporks()
+
+        height = self.nodes[0].getblockcount()
+        skip_count = 24 - (height % 24)
+        if skip_count != 0:
+            self.nodes[0].generate(skip_count)
+
+        for i in range(len(mns_protx), len(mns_protx) - 2, -1):
+            mn = mns_protx[len(mns_protx) - 1]
+            mns_protx.remove(mn)
+            self.stop_node(mn.idx)
+            self.nodes.remove(mn.node)
+
+            punished = False
+            banned = False
+            t = time.time()
+            while (not punished or not banned) and (time.time() - t) < 60:
+                time.sleep(1)
+
+                # 2 dummy phases
+                for j in range(2):
+                    self.nodes[0].generate(2)
+                    self.sync_all()
+                    time.sleep(1)
+
+                info = self.nodes[0].protx('info', mn.protx_hash)
+                if not punished:
+                    if info['state']['PoSePenalty'] > 0:
+                        punished = True
+                if not banned:
+                    if info['state']['PoSeBanHeight'] != -1:
+                        banned = True
+
+                # Fast-forward to next DKG session
+                self.nodes[0].generate(24 - (self.nodes[0].getblockcount() % 24))
+                self.sync_all()
+            assert(punished and banned)
+
     def create_mn(self, node, idx, alias):
         mn = Masternode()
         mn.idx = idx
diff --git a/src/Makefile.am b/src/Makefile.am
index ef84482edead..5180097e16a3 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -141,6 +141,7 @@ BITCOIN_CORE_H = \
   limitedmap.h \
   llmq/quorums_commitment.h \
   llmq/quorums_blockprocessor.h \
+  llmq/quorums_dummydkg.h \
   llmq/quorums_utils.h \
   llmq/quorums_init.h \
   masternode.h \
@@ -249,6 +250,7 @@ libdash_server_a_SOURCES = \
   governance-votedb.cpp \
   llmq/quorums_commitment.cpp \
   llmq/quorums_blockprocessor.cpp \
+  llmq/quorums_dummydkg.cpp \
   llmq/quorums_utils.cpp \
   llmq/quorums_init.cpp \
   masternode.cpp \
diff --git a/src/chainparams.cpp b/src/chainparams.cpp
index 8aed0007ef85..9e6abc4c74b8 100644
--- a/src/chainparams.cpp
+++ b/src/chainparams.cpp
@@ -293,6 +293,7 @@ class CMainParams : public CChainParams {
         vSporkAddresses = {"Xgtyuk76vhuFW2iT7UAiHgNdWXCf3J34wh"};
         nMinSporkKeys = 1;
         fBIP9CheckMasternodesUpgraded = true;
+        consensus.fLLMQAllowDummyCommitments = false;
 
         checkpointData = (CCheckpointData) {
             boost::assign::map_list_of
@@ -462,6 +463,7 @@ class CTestNetParams : public CChainParams {
         vSporkAddresses = {"yjPtiKh2uwk3bDutTEA2q9mCtXyiZRWn55"};
         nMinSporkKeys = 1;
         fBIP9CheckMasternodesUpgraded = true;
+        consensus.fLLMQAllowDummyCommitments = true;
 
         checkpointData = (CCheckpointData) {
             boost::assign::map_list_of
@@ -608,6 +610,7 @@ class CDevNetParams : public CChainParams {
         nMinSporkKeys = 1;
         // devnets are started with no blocks and no MN, so we can't check for upgraded MN (as there are none)
         fBIP9CheckMasternodesUpgraded = false;
+        consensus.fLLMQAllowDummyCommitments = true;
 
         checkpointData = (CCheckpointData) {
             boost::assign::map_list_of
@@ -720,6 +723,7 @@ class CRegTestParams : public CChainParams {
         nMinSporkKeys = 1;
         // regtest usually has no masternodes in most tests, so don't check for upgraged MNs
         fBIP9CheckMasternodesUpgraded = false;
+        consensus.fLLMQAllowDummyCommitments = true;
 
         checkpointData = (CCheckpointData){
             boost::assign::map_list_of
diff --git a/src/consensus/params.h b/src/consensus/params.h
index 705f7b9e281a..bc2ccb8a89d2 100644
--- a/src/consensus/params.h
+++ b/src/consensus/params.h
@@ -157,7 +157,8 @@ struct Params {
     int nHighSubsidyFactor{1};
 
     std::map<LLMQType, LLMQParams> llmqs;
-	
+    bool fLLMQAllowDummyCommitments;
+
     // This is temporary until we reset testnet for retesting of the full DIP3 deployment
     int nTemporaryTestnetForkDIP3Height{0};
     uint256 nTemporaryTestnetForkDIP3BlockHash;
diff --git a/src/dsnotificationinterface.cpp b/src/dsnotificationinterface.cpp
index ec37ee6cfec1..625641d01110 100644
--- a/src/dsnotificationinterface.cpp
+++ b/src/dsnotificationinterface.cpp
@@ -16,6 +16,8 @@
 
 #include "evo/deterministicmns.h"
 
+#include "llmq/quorums_dummydkg.h"
+
 void CDSNotificationInterface::InitializeCurrentBlockTip()
 {
     LOCK(cs_main);
@@ -38,6 +40,7 @@ void CDSNotificationInterface::UpdatedBlockTip(const CBlockIndex *pindexNew, con
         return;
 
     deterministicMNManager->UpdatedBlockTip(pindexNew);
+    llmq::quorumDummyDKG->UpdatedBlockTip(pindexNew, fInitialDownload);
 
     masternodeSync.UpdatedBlockTip(pindexNew, fInitialDownload, connman);
 
diff --git a/src/evo/specialtx.cpp b/src/evo/specialtx.cpp
index 99e9e80bac51..1b9956b3da87 100644
--- a/src/evo/specialtx.cpp
+++ b/src/evo/specialtx.cpp
@@ -98,15 +98,15 @@ bool ProcessSpecialTxsInBlock(const CBlock& block, const CBlockIndex* pindex, CV
         }
     }
 
-    if (!deterministicMNManager->ProcessBlock(block, pindex->pprev, state)) {
+    if (!llmq::quorumBlockProcessor->ProcessBlock(block, pindex->pprev, state)) {
         return false;
     }
 
-    if (!CheckCbTxMerkleRootMNList(block, pindex, state)) {
+    if (!deterministicMNManager->ProcessBlock(block, pindex->pprev, state)) {
         return false;
     }
 
-    if (!llmq::quorumBlockProcessor->ProcessBlock(block, pindex->pprev, state)) {
+    if (!CheckCbTxMerkleRootMNList(block, pindex, state)) {
         return false;
     }
 
@@ -122,11 +122,11 @@ bool UndoSpecialTxsInBlock(const CBlock& block, const CBlockIndex* pindex)
         }
     }
 
-    if (!llmq::quorumBlockProcessor->UndoBlock(block, pindex)) {
+    if (!deterministicMNManager->UndoBlock(block, pindex)) {
         return false;
     }
 
-    if (!deterministicMNManager->UndoBlock(block, pindex)) {
+    if (!llmq::quorumBlockProcessor->UndoBlock(block, pindex)) {
         return false;
     }
 
diff --git a/src/llmq/quorums_dummydkg.cpp b/src/llmq/quorums_dummydkg.cpp
new file mode 100644
index 000000000000..538cfa204a54
--- /dev/null
+++ b/src/llmq/quorums_dummydkg.cpp
@@ -0,0 +1,454 @@
+// Copyright (c) 2018 The Dash Core developers
+// Distributed under the MIT/X11 software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+#include "quorums_dummydkg.h"
+
+#include "quorums_blockprocessor.h"
+#include "quorums_commitment.h"
+#include "quorums_utils.h"
+
+#include "evo/specialtx.h"
+
+#include "activemasternode.h"
+#include "chain.h"
+#include "chainparams.h"
+#include "consensus/validation.h"
+#include "net.h"
+#include "net_processing.h"
+#include "primitives/block.h"
+#include "spork.h"
+#include "validation.h"
+
+namespace llmq
+{
+
+CDummyDKG* quorumDummyDKG;
+
+void CDummyDKG::ProcessMessage(CNode* pfrom, const std::string& strCommand, CDataStream& vRecv, CConnman& connman)
+{
+    if (strCommand == NetMsgType::QDCOMMITMENT) {
+        if (!Params().GetConsensus().fLLMQAllowDummyCommitments) {
+            Misbehaving(pfrom->id, 100);
+            return;
+        }
+        if (!sporkManager.IsSporkActive(SPORK_17_QUORUM_DKG_ENABLED)) {
+            return;
+        }
+
+        CDummyCommitment qc;
+        vRecv >> qc;
+
+        uint256 hash = ::SerializeHash(qc);
+        {
+            LOCK(cs_main);
+            connman.RemoveAskFor(hash);
+        }
+
+        ProcessDummyCommitment(pfrom->id, qc);
+    }
+}
+
+void CDummyDKG::ProcessDummyCommitment(NodeId from, const llmq::CDummyCommitment& qc)
+{
+    if (!Params().GetConsensus().llmqs.count((Consensus::LLMQType)qc.llmqType)) {
+        LOCK(cs_main);
+        LogPrintf("CDummyDKG::%s -- invalid commitment type %d, peer=%d\n", __func__,
+                  qc.llmqType, from);
+        if (from != -1) {
+            Misbehaving(from, 100);
+        }
+        return;
+    }
+
+    auto type = (Consensus::LLMQType)qc.llmqType;
+    const auto& params = Params().GetConsensus().llmqs.at(type);
+
+    if (qc.validMembers.size() != params.size) {
+        LOCK(cs_main);
+        LogPrintf("CDummyDKG::%s -- invalid validMembers size %d, peer=%d\n", __func__,
+                  qc.validMembers.size(), from);
+        if (from != -1) {
+            Misbehaving(from, 100);
+        }
+        return;
+    }
+
+    int curQuorumHeight;
+    const CBlockIndex* quorumIndex;
+    {
+        LOCK(cs_main);
+        curQuorumHeight = chainActive.Height() - (chainActive.Height() % params.dkgInterval);
+        quorumIndex = chainActive[curQuorumHeight];
+    }
+    uint256 quorumHash = quorumIndex->GetBlockHash();
+    if (qc.quorumHash != quorumHash) {
+        LogPrintf("CDummyDKG::%s -- dummy commitment for wrong quorum, peer=%d\n", __func__,
+                  from);
+        return;
+    }
+
+    auto members = CLLMQUtils::GetAllQuorumMembers(type, qc.quorumHash);
+    if (members.size() != params.size) {
+        LOCK(cs_main);
+        LogPrintf("CDummyDKG::%s -- invalid members count %d, peer=%d\n", __func__,
+                  members.size(), from);
+        if (from != -1) {
+            Misbehaving(from, 100);
+        }
+        return;
+    }
+    if (qc.signer >= members.size()) {
+        LOCK(cs_main);
+        LogPrintf("CDummyDKG::%s -- invalid signer %d, peer=%d\n", __func__,
+                  qc.signer, from);
+        if (from != -1) {
+            Misbehaving(from, 100);
+        }
+        return;
+    }
+    if (qc.CountValidMembers() < params.minSize) {
+        LOCK(cs_main);
+        LogPrintf("CDummyDKG::%s -- invalid validMembers count %d, peer=%d\n", __func__,
+                  qc.CountValidMembers(), from);
+        if (from != -1) {
+            Misbehaving(from, 100);
+        }
+        return;
+    }
+
+    auto signer = members[qc.signer];
+
+    {
+        LOCK(sessionCs);
+        for (const auto& p : curSessions[type].dummyCommitmentsFromMembers) {
+            if (p.second.count(signer->proTxHash)) {
+                return;
+            }
+        }
+    }
+
+    auto svec = BuildDeterministicSvec(type, qc.quorumHash);
+    auto vvec = BuildVvec(svec);
+    auto vvecHash = ::SerializeHash(vvec);
+
+    auto commitmentHash = CLLMQUtils::BuildCommitmentHash((uint8_t)type, qc.quorumHash, qc.validMembers, vvec[0], vvecHash);
+
+    // verify member sig
+    if (!qc.membersSig.VerifyInsecure(signer->pdmnState->pubKeyOperator, commitmentHash)) {
+        LOCK(cs_main);
+        LogPrintf("CDummyDKG::%s -- invalid memberSig, peer=%d\n", __func__,
+                  from);
+        if (from != -1) {
+            Misbehaving(from, 100);
+        }
+        return;
+    }
+
+    // recover public key share
+    CBLSPublicKey sharePk;
+    if (!sharePk.PublicKeyShare(vvec, CBLSId::FromHash(signer->proTxHash))) {
+        LOCK(cs_main);
+        LogPrintf("CDummyDKG::%s -- failed to recover public key share, peer=%d\n", __func__,
+                  from);
+        if (from != -1) {
+            Misbehaving(from, 100);
+        }
+        return;
+    }
+
+    // verify sig share
+    if (!qc.quorumSig.VerifyInsecure(sharePk, commitmentHash)) {
+        LOCK(cs_main);
+        LogPrintf("CDummyDKG::%s -- invalid quorumSig, peer=%d\n", __func__,
+                  from);
+        if (from != -1) {
+            Misbehaving(from, 100);
+        }
+        return;
+    }
+
+    LogPrintf("CDummyDKG::%s -- processed dummy commitment for quorum %s:%d, validMembers=%d, signer=%d, peer=%d\n", __func__,
+              qc.quorumHash.ToString(), qc.llmqType, qc.CountValidMembers(), qc.signer, from);
+
+    uint256 hash = ::SerializeHash(qc);
+    {
+        LOCK(sessionCs);
+
+        // Mark all members as bad initially and clear that state when we receive a valid dummy commitment from them
+        // This information is then used in the next sessions to determine which ones are valid
+        if (curSessions[type].dummyCommitments.empty()) {
+            for (const auto& dmn : members) {
+                curSessions[type].badMembers.emplace(dmn->proTxHash);
+            }
+        }
+
+        curSessions[type].badMembers.erase(signer->proTxHash);
+        curSessions[type].dummyCommitments[hash] = qc;
+        curSessions[type].dummyCommitmentsFromMembers[commitmentHash][signer->proTxHash] = hash;
+    }
+
+    CInv inv(MSG_QUORUM_DUMMY_COMMITMENT, hash);
+    g_connman->RelayInv(inv, DMN_PROTO_VERSION);
+}
+
+void CDummyDKG::UpdatedBlockTip(const CBlockIndex* pindex, bool fInitialDownload)
+{
+    if (fInitialDownload) {
+        return;
+    }
+
+    if (!fMasternodeMode) {
+        return;
+    }
+
+    bool fDIP0003Active = VersionBitsState(chainActive.Tip(), Params().GetConsensus(), Consensus::DEPLOYMENT_DIP0003, versionbitscache) == THRESHOLD_ACTIVE;
+    if (!fDIP0003Active) {
+        return;
+    }
+
+    if (!sporkManager.IsSporkActive(SPORK_17_QUORUM_DKG_ENABLED)) {
+        return;
+    }
+
+    for (const auto& p : Params().GetConsensus().llmqs) {
+        const auto& params = p.second;
+        int phaseIndex = pindex->nHeight % params.dkgInterval;
+        if (phaseIndex == 0) {
+            CreateDummyCommitment(params.type, pindex);
+        } else if (phaseIndex == params.dkgPhaseBlocks * 2) {
+            CreateFinalCommitment(params.type, pindex);
+        }
+    }
+}
+
+void CDummyDKG::CreateDummyCommitment(Consensus::LLMQType llmqType, const CBlockIndex* pindex)
+{
+    const auto& params = Params().GetConsensus().llmqs.at(llmqType);
+    int quorumHeight = pindex->nHeight - (pindex->nHeight % params.dkgInterval);
+    const CBlockIndex* quorumIndex;
+    {
+        LOCK(cs_main);
+        quorumIndex = chainActive[quorumHeight];
+    }
+    uint256 quorumHash = quorumIndex->GetBlockHash();
+
+    auto members = CLLMQUtils::GetAllQuorumMembers(llmqType, quorumHash);
+    if (members.size() != params.size) {
+        return;
+    }
+
+    int myIdx = -1;
+    for (size_t i = 0; i < members.size(); i++) {
+        if (members[i]->collateralOutpoint == activeMasternodeInfo.outpoint) {
+            myIdx = (int)i;
+            break;
+        }
+    }
+    if (myIdx == -1) {
+        return;
+    }
+    auto signer = members[myIdx];
+
+    auto svec = BuildDeterministicSvec(llmqType, quorumHash);
+    auto vvec = BuildVvec(svec);
+    auto vvecHash = ::SerializeHash(vvec);
+    auto validMembers = GetValidMembers(llmqType, members);
+
+    auto commitmentHash = CLLMQUtils::BuildCommitmentHash((uint8_t)llmqType, quorumHash, validMembers, vvec[0], vvecHash);
+
+    CDummyCommitment qc;
+    qc.llmqType = (uint8_t)llmqType;
+    qc.quorumHash = quorumHash;
+    qc.signer = (uint16_t)myIdx;
+    qc.validMembers = validMembers;
+
+    qc.membersSig = activeMasternodeInfo.blsKeyOperator->Sign(commitmentHash);
+
+    CBLSSecretKey skShare;
+    if (!skShare.SecretKeyShare(svec, CBLSId::FromHash(signer->proTxHash))) {
+        return;
+    }
+    qc.quorumSig = skShare.Sign(commitmentHash);
+
+    ProcessDummyCommitment(-1, qc);
+}
+
+void CDummyDKG::CreateFinalCommitment(Consensus::LLMQType llmqType, const CBlockIndex* pindex)
+{
+    const auto& params = Params().GetConsensus().llmqs.at(llmqType);
+    int quorumHeight = pindex->nHeight - (pindex->nHeight % params.dkgInterval);
+    const CBlockIndex* quorumIndex;
+    {
+        LOCK(cs_main);
+        quorumIndex = chainActive[quorumHeight];
+    }
+    uint256 quorumHash = quorumIndex->GetBlockHash();
+
+    auto members = CLLMQUtils::GetAllQuorumMembers(llmqType, quorumHash);
+    if (members.size() != params.size) {
+        return;
+    }
+
+    auto svec = BuildDeterministicSvec(llmqType, quorumHash);
+    auto vvec = BuildVvec(svec);
+    auto vvecHash = ::SerializeHash(vvec);
+
+    LOCK(sessionCs);
+    auto& session = curSessions[llmqType];
+
+    for (const auto& p : session.dummyCommitmentsFromMembers) {
+        const auto& commitmentHash = p.first;
+        if (p.second.size() < params.minSize) {
+            continue;
+        }
+
+        const auto& firstQc = session.dummyCommitments[p.second.begin()->second];
+
+        CFinalCommitment fqc(params, quorumHash);
+        fqc.validMembers = firstQc.validMembers;
+        fqc.quorumPublicKey = vvec[0];
+        fqc.quorumVvecHash = vvecHash;
+
+        std::vector<CBLSSignature> quorumSigs;
+        std::vector<CBLSId> quorumSigIds;
+        std::vector<CBLSSignature> memberSigs;
+        std::vector<CBLSPublicKey> memberPubKeys;
+
+        for (const auto& p2 : p.second) {
+            const auto& proTxHash = p2.first;
+            const auto& qc = session.dummyCommitments[p2.second];
+
+            int signerIdx = -1;
+            for (size_t i = 0; i < members.size(); i++) {
+                if (members[i]->proTxHash == proTxHash) {
+                    signerIdx = (int)i;
+                    break;
+                }
+            }
+            if (signerIdx == -1) {
+                break;
+            }
+            fqc.signers[signerIdx] = true;
+            if (quorumSigs.size() < params.threshold) {
+                quorumSigs.emplace_back(qc.quorumSig);
+                quorumSigIds.emplace_back(CBLSId::FromHash(proTxHash));
+            }
+            memberSigs.emplace_back(qc.membersSig);
+            memberPubKeys.emplace_back(members[signerIdx]->pdmnState->pubKeyOperator);
+        }
+
+        if (!fqc.quorumSig.Recover(quorumSigs, quorumSigIds)) {
+            LogPrintf("CDummyDKG::%s -- recovery failed for quorum %s:%d, validMembers=%d, signers=%d\n", __func__,
+                      fqc.quorumHash.ToString(), fqc.llmqType, fqc.CountValidMembers(), fqc.CountSigners());
+            continue;
+        }
+        fqc.membersSig = CBLSSignature::AggregateSecure(memberSigs, memberPubKeys, commitmentHash);
+
+        if (!fqc.Verify(members)) {
+            LogPrintf("CDummyDKG::%s -- self created final commitment is invalid for quorum %s:%d, validMembers=%d, signers=%d\n", __func__,
+                      fqc.quorumHash.ToString(), fqc.llmqType, fqc.CountValidMembers(), fqc.CountSigners());
+            continue;
+        }
+
+        LogPrintf("CDummyDKG::%s -- self created final commitment for quorum %s:%d, validMembers=%d, signers=%d\n", __func__,
+                  fqc.quorumHash.ToString(), fqc.llmqType, fqc.CountValidMembers(), fqc.CountSigners());
+        quorumBlockProcessor->AddMinableCommitment(fqc);
+    }
+
+    prevSessions[llmqType].badMembers = curSessions[llmqType].badMembers;
+    prevSessions[llmqType].dummyCommitments = std::move(curSessions[llmqType].dummyCommitments);
+    prevSessions[llmqType].dummyCommitmentsFromMembers = std::move(curSessions[llmqType].dummyCommitmentsFromMembers);
+}
+
+std::vector<bool> CDummyDKG::GetValidMembers(Consensus::LLMQType llmqType, const std::vector<CDeterministicMNCPtr>& members)
+{
+    const auto& params = Params().GetConsensus().llmqs.at(llmqType);
+    std::vector<bool> ret(params.size, false);
+
+    LOCK(sessionCs);
+
+    // Valid members are members that sent us a dummy commitment in the previous session
+
+    for (size_t i = 0; i < params.size; i++) {
+        if (!prevSessions[llmqType].badMembers.count(members[i]->proTxHash)) {
+            ret[i] = true;
+        }
+    }
+
+    // set all to valid if last sessions failed (this reboots everything)
+    if (std::count(ret.begin(), ret.end(), true) < params.minSize) {
+        for (size_t i = 0; i < params.size; i++) {
+            ret[i] = true;
+        }
+    }
+    return ret;
+}
+
+// The returned secret key vector is NOT SECURE AT ALL!!
+// It is known by everyone. This is only for testnet/devnet/regtest, so this is fine. Also, we won't do any meaningful
+// things with the commitments. This is only needed to make the final commitments validate
+BLSSecretKeyVector CDummyDKG::BuildDeterministicSvec(Consensus::LLMQType llmqType, const uint256& quorumHash)
+{
+    const auto& params = Params().GetConsensus().llmqs.at(llmqType);
+
+    CHash256 seed_;
+    seed_.Write((unsigned char*)&llmqType, 1);
+    seed_.Write(quorumHash.begin(), quorumHash.size());
+
+    uint256 seed;
+    seed_.Finalize(seed.begin());
+
+    BLSSecretKeyVector svec;
+    svec.reserve(params.size);
+    for (size_t i = 0; i < params.threshold; i++) {
+        CBLSSecretKey sk;
+        while (true) {
+            seed = ::SerializeHash(seed);
+            sk.SetBuf(seed.begin(), seed.size());
+            if (sk.IsValid()) {
+                break;
+            }
+        }
+        svec.emplace_back(sk);
+    }
+
+    return svec;
+}
+
+BLSPublicKeyVector CDummyDKG::BuildVvec(const BLSSecretKeyVector& svec)
+{
+    BLSPublicKeyVector vvec;
+    vvec.reserve(svec.size());
+    for (size_t i = 0; i < svec.size(); i++) {
+        vvec.emplace_back(svec[i].GetPublicKey());
+    }
+    return vvec;
+}
+
+bool CDummyDKG::HasDummyCommitment(const uint256& hash)
+{
+    LOCK(sessionCs);
+    for (const auto& p : curSessions) {
+        auto it = p.second.dummyCommitments.find(hash);
+        if (it != p.second.dummyCommitments.end()) {
+            return true;
+        }
+    }
+    return false;
+}
+
+bool CDummyDKG::GetDummyCommitment(const uint256& hash, CDummyCommitment& ret)
+{
+    LOCK(sessionCs);
+    for (const auto& p : curSessions) {
+        auto it = p.second.dummyCommitments.find(hash);
+        if (it != p.second.dummyCommitments.end()) {
+            ret = it->second;
+            return true;
+        }
+    }
+    return false;
+}
+
+}
diff --git a/src/llmq/quorums_dummydkg.h b/src/llmq/quorums_dummydkg.h
new file mode 100644
index 000000000000..ca583f0ea39b
--- /dev/null
+++ b/src/llmq/quorums_dummydkg.h
@@ -0,0 +1,121 @@
+// Copyright (c) 2018 The Dash Core developers
+// Distributed under the MIT/X11 software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+#ifndef DASH_QUORUMS_DUMMYDKG_H
+#define DASH_QUORUMS_DUMMYDKG_H
+
+#include "llmq/quorums_commitment.h"
+
+#include "consensus/params.h"
+#include "net.h"
+#include "primitives/transaction.h"
+#include "sync.h"
+
+#include "bls/bls.h"
+
+#include <map>
+
+class CNode;
+class CConnman;
+
+/**
+ * Implementation of an insecure dummy DKG
+ *
+ * This is only used on testnet/devnet/regtest and will NEVER be used on
+ * mainnet. It is NOT SECURE AT ALL! It will actually be removed later when the real DKG is introduced.
+ *
+ * It works by using a deterministic secure vector as the secure polynomial. Everyone can calculate this
+ * polynomial by himself, which makes it insecure by definition.
+ *
+ * The purpose of this dummy implementation is to test final LLMQ commitments and simple PoSe on-chain.
+ * The dummy DKG first creates dummy commitments and propagates these to all nodes. They can then create
+ * a valid LLMQ commitment from these, which validates with the normal commitment validation code.
+ *
+ * After these have been mined on-chain, they are indistinguishable from commitments created from the real
+ * DKG, making them good enough for testing.
+ *
+ * The validMembers bitset is created from information of past dummy DKG sessions. If nodes failed to provide
+ * the dummy commitments, they will be marked as bad in the next session. This might create some chaos and
+ * finalizable commitments, but this is ok and will sort itself out after some sessions.
+ */
+
+namespace llmq
+{
+
+// This message is only allowed on testnet/devnet/regtest
+// If any peer tries to send this message on mainnet, it is banned immediately
+// It is used to test commitments on testnet without actually running a full-blown DKG.
+class CDummyCommitment
+{
+public:
+    uint8_t llmqType{Consensus::LLMQ_NONE};
+    uint256 quorumHash;
+    uint16_t signer{(uint16_t)-1};
+
+    std::vector<bool> validMembers;
+
+    CBLSSignature quorumSig;
+    CBLSSignature membersSig;
+
+public:
+    int CountValidMembers() const
+    {
+        return (int)std::count(validMembers.begin(), validMembers.end(), true);
+    }
+
+public:
+    ADD_SERIALIZE_METHODS
+
+    template<typename Stream, typename Operation>
+    inline void SerializationOp(Stream& s, Operation ser_action)
+    {
+        READWRITE(llmqType);
+        READWRITE(quorumHash);
+        READWRITE(signer);
+        READWRITE(DYNBITSET(validMembers));
+        READWRITE(quorumSig);
+        READWRITE(membersSig);
+    }
+};
+
+class CDummyDKGSession
+{
+public:
+    std::set<uint256> badMembers;
+    std::map<uint256, CDummyCommitment> dummyCommitments;
+    std::map<uint256, std::map<uint256, uint256>> dummyCommitmentsFromMembers;
+};
+
+// It simulates the result of a DKG session by deterministically calculating a secret/public key vector
+// !!!THIS IS NOT SECURE AT ALL AND WILL NEVER BE USED ON MAINNET!!!
+// The whole dummy DKG will be removed when we add the real DKG
+class CDummyDKG
+{
+private:
+    CCriticalSection sessionCs;
+    std::map<Consensus::LLMQType, CDummyDKGSession> prevSessions;
+    std::map<Consensus::LLMQType, CDummyDKGSession> curSessions;
+
+public:
+    void ProcessMessage(CNode* pfrom, const std::string& strCommand, CDataStream& vRecv, CConnman& connman);
+    void ProcessDummyCommitment(NodeId from, const CDummyCommitment& qc);
+
+    void UpdatedBlockTip(const CBlockIndex* pindex, bool fInitialDownload);
+    void CreateDummyCommitment(Consensus::LLMQType llmqType, const CBlockIndex* pindex);
+    void CreateFinalCommitment(Consensus::LLMQType llmqType, const CBlockIndex* pindex);
+
+    bool HasDummyCommitment(const uint256& hash);
+    bool GetDummyCommitment(const uint256& hash, CDummyCommitment& ret);
+
+private:
+    std::vector<bool> GetValidMembers(Consensus::LLMQType llmqType, const std::vector<CDeterministicMNCPtr>& members);
+    BLSSecretKeyVector BuildDeterministicSvec(Consensus::LLMQType llmqType, const uint256& quorumHash);
+    BLSPublicKeyVector BuildVvec(const BLSSecretKeyVector& svec);
+};
+
+extern CDummyDKG* quorumDummyDKG;
+
+}
+
+#endif//DASH_QUORUMS_DUMMYDKG_H
diff --git a/src/llmq/quorums_init.cpp b/src/llmq/quorums_init.cpp
index f6abb5d14622..fa29034601f3 100644
--- a/src/llmq/quorums_init.cpp
+++ b/src/llmq/quorums_init.cpp
@@ -6,6 +6,7 @@
 
 #include "quorums_blockprocessor.h"
 #include "quorums_commitment.h"
+#include "quorums_dummydkg.h"
 
 namespace llmq
 {
@@ -13,10 +14,13 @@ namespace llmq
 void InitLLMQSystem(CEvoDB& evoDb)
 {
     quorumBlockProcessor = new CQuorumBlockProcessor(evoDb);
+    quorumDummyDKG = new CDummyDKG();
 }
 
 void DestroyLLMQSystem()
 {
+    delete quorumDummyDKG;
+    quorumDummyDKG = nullptr;
     delete quorumBlockProcessor;
     quorumBlockProcessor = nullptr;
 }
diff --git a/src/net_processing.cpp b/src/net_processing.cpp
index c5718aed2c7a..c7e2ae53da10 100644
--- a/src/net_processing.cpp
+++ b/src/net_processing.cpp
@@ -45,6 +45,7 @@
 #include "evo/deterministicmns.h"
 #include "evo/simplifiedmns.h"
 #include "llmq/quorums_commitment.h"
+#include "llmq/quorums_dummydkg.h"
 #include "llmq/quorums_blockprocessor.h"
 
 #include <boost/thread.hpp>
@@ -967,6 +968,8 @@ bool static AlreadyHave(const CInv& inv) EXCLUSIVE_LOCKS_REQUIRED(cs_main)
 
     case MSG_QUORUM_FINAL_COMMITMENT:
         return llmq::quorumBlockProcessor->HasMinableCommitment(inv.hash);
+    case MSG_QUORUM_DUMMY_COMMITMENT:
+        return llmq::quorumDummyDKG->HasDummyCommitment(inv.hash);
     }
 
     // Don't know what it is, just say we already got one
@@ -1288,6 +1291,20 @@ void static ProcessGetData(CNode* pfrom, const Consensus::Params& consensusParam
                     }
                 }
 
+                if (!push && (inv.type == MSG_QUORUM_DUMMY_COMMITMENT)) {
+                    if (!consensusParams.fLLMQAllowDummyCommitments) {
+                        Misbehaving(pfrom->id, 100);
+                        pfrom->fDisconnect = true;
+                        return;
+                    }
+
+                    llmq::CDummyCommitment o;
+                    if (llmq::quorumDummyDKG->GetDummyCommitment(inv.hash, o)) {
+                        connman.PushMessage(pfrom, msgMaker.Make(NetMsgType::QDCOMMITMENT, o));
+                        push = true;
+                    }
+                }
+
                 if (!push)
                     vNotFound.push_back(inv);
             }
@@ -2923,6 +2940,7 @@ bool static ProcessMessage(CNode* pfrom, const std::string& strCommand, CDataStr
             masternodeSync.ProcessMessage(pfrom, strCommand, vRecv);
             governance.ProcessMessage(pfrom, strCommand, vRecv, connman);
             llmq::quorumBlockProcessor->ProcessMessage(pfrom, strCommand, vRecv, connman);
+            llmq::quorumDummyDKG->ProcessMessage(pfrom, strCommand, vRecv, connman);
         }
         else
         {
diff --git a/src/protocol.cpp b/src/protocol.cpp
index d9023cdcb754..1cde07d8297d 100644
--- a/src/protocol.cpp
+++ b/src/protocol.cpp
@@ -72,6 +72,7 @@ const char *MNVERIFY="mnv";
 const char *GETMNLISTDIFF="getmnlistd";
 const char *MNLISTDIFF="mnlistdiff";
 const char *QFCOMMITMENT="qfcommit";
+const char *QDCOMMITMENT="qdcommit";
 };
 
 static const char* ppszTypeName[] =
@@ -100,6 +101,7 @@ static const char* ppszTypeName[] =
     NetMsgType::MNVERIFY,
     "compact block", // Should never occur
     NetMsgType::QFCOMMITMENT,
+    NetMsgType::QDCOMMITMENT,
 };
 
 /** All known message types. Keep this in the same order as the list of
@@ -160,6 +162,7 @@ const static std::string allNetMessageTypes[] = {
     NetMsgType::GETMNLISTDIFF,
     NetMsgType::MNLISTDIFF,
     NetMsgType::QFCOMMITMENT,
+    NetMsgType::QDCOMMITMENT,
 };
 const static std::vector<std::string> allNetMessageTypesVec(allNetMessageTypes, allNetMessageTypes+ARRAYLEN(allNetMessageTypes));
 
diff --git a/src/protocol.h b/src/protocol.h
index 562d5fb9d413..4a5326f7b11f 100644
--- a/src/protocol.h
+++ b/src/protocol.h
@@ -271,6 +271,7 @@ extern const char *MNVERIFY;
 extern const char *GETMNLISTDIFF;
 extern const char *MNLISTDIFF;
 extern const char *QFCOMMITMENT;
+extern const char *QDCOMMITMENT;
 };
 
 /* Get a vector of all valid message types (see above) */
@@ -373,6 +374,7 @@ enum GetDataMsg {
     // MSG_CMPCT_BLOCK should not appear in any invs except as a part of getdata.
     MSG_CMPCT_BLOCK = 20, //!< Defined in BIP152
     MSG_QUORUM_FINAL_COMMITMENT = 21,
+    MSG_QUORUM_DUMMY_COMMITMENT = 22, // only valid on testnet/devnet/regtest
 };
 
 /** inv message data */
diff --git a/src/spork.cpp b/src/spork.cpp
index 8e4e19ff4ae2..d2e1cd678e39 100644
--- a/src/spork.cpp
+++ b/src/spork.cpp
@@ -29,6 +29,7 @@ std::map<int, int64_t> mapSporkDefaults = {
     {SPORK_14_REQUIRE_SENTINEL_FLAG,         4070908800ULL}, // OFF
     {SPORK_15_DETERMINISTIC_MNS_ENABLED,     4070908800ULL}, // OFF
     {SPORK_16_INSTANTSEND_AUTOLOCKS,         4070908800ULL}, // OFF
+    {SPORK_17_QUORUM_DKG_ENABLED,            4070908800ULL}, // OFF
 };
 
 bool CSporkManager::SporkValueIsActive(int nSporkID, int64_t &nActiveValueRet) const
@@ -284,6 +285,7 @@ int CSporkManager::GetSporkIDByName(const std::string& strName)
     if (strName == "SPORK_14_REQUIRE_SENTINEL_FLAG")            return SPORK_14_REQUIRE_SENTINEL_FLAG;
     if (strName == "SPORK_15_DETERMINISTIC_MNS_ENABLED")        return SPORK_15_DETERMINISTIC_MNS_ENABLED;
     if (strName == "SPORK_16_INSTANTSEND_AUTOLOCKS")            return SPORK_16_INSTANTSEND_AUTOLOCKS;
+    if (strName == "SPORK_17_QUORUM_DKG_ENABLED")               return SPORK_17_QUORUM_DKG_ENABLED;
 
     LogPrint("spork", "CSporkManager::GetSporkIDByName -- Unknown Spork name '%s'\n", strName);
     return -1;
@@ -303,6 +305,7 @@ std::string CSporkManager::GetSporkNameByID(int nSporkID)
         case SPORK_14_REQUIRE_SENTINEL_FLAG:            return "SPORK_14_REQUIRE_SENTINEL_FLAG";
         case SPORK_15_DETERMINISTIC_MNS_ENABLED:        return "SPORK_15_DETERMINISTIC_MNS_ENABLED";
         case SPORK_16_INSTANTSEND_AUTOLOCKS:            return "SPORK_16_INSTANTSEND_AUTOLOCKS";
+        case SPORK_17_QUORUM_DKG_ENABLED:               return "SPORK_17_QUORUM_DKG_ENABLED";
         default:
             LogPrint("spork", "CSporkManager::GetSporkNameByID -- Unknown Spork ID %d\n", nSporkID);
             return "Unknown";
diff --git a/src/spork.h b/src/spork.h
index 0b61a7154d49..f2baecf6a19b 100644
--- a/src/spork.h
+++ b/src/spork.h
@@ -28,9 +28,10 @@ static const int SPORK_12_RECONSIDER_BLOCKS                             = 10011;
 static const int SPORK_14_REQUIRE_SENTINEL_FLAG                         = 10013;
 static const int SPORK_15_DETERMINISTIC_MNS_ENABLED                     = 10014;
 static const int SPORK_16_INSTANTSEND_AUTOLOCKS                         = 10015;
+static const int SPORK_17_QUORUM_DKG_ENABLED                            = 10016;
 
 static const int SPORK_START                                            = SPORK_2_INSTANTSEND_ENABLED;
-static const int SPORK_END                                              = SPORK_16_INSTANTSEND_AUTOLOCKS;
+static const int SPORK_END                                              = SPORK_17_QUORUM_DKG_ENABLED;
 
 extern std::map<int, int64_t> mapSporkDefaults;
 extern CSporkManager sporkManager;

From ba49a4a1605ca35bd4b651beac47bf0b2aa38738 Mon Sep 17 00:00:00 2001
From: thephez <thephez@users.noreply.github.com>
Date: Mon, 26 Nov 2018 23:12:11 -0500
Subject: [PATCH 329/400] Trivial: protx fund_register RPC help corrections
 (#2502)

---
 src/rpc/rpcevo.cpp | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/rpc/rpcevo.cpp b/src/rpc/rpcevo.cpp
index 3f299f2f7ae5..c9fb8f08be4c 100644
--- a/src/rpc/rpcevo.cpp
+++ b/src/rpc/rpcevo.cpp
@@ -202,10 +202,9 @@ void protx_register_fund_help()
             "5. \"votingKeyAddr\"       (string, required) The voting key address. The private key does not have to be known by your wallet.\n"
             "                         It has to match the private key which is later used when voting on proposals.\n"
             "                         If set to \"0\" or an empty string, ownerAddr will be used.\n"
-            "6. \"operatorReward\"      (numeric, required) The fraction in % to share with the operator. If non-zero,\n"
-            "                         \"ipAndPort\" must be zero as well. The value must be between 0.00 and 100.00.\n"
-            "7. \"payoutAddress\"       (string, required) The dash address to use for masternode reward payments\n"
-            "                         Must match \"collateralAddress\"."
+            "6. \"operatorReward\"      (numeric, required) The fraction in % to share with the operator. The value must be\n"
+            "                         between 0.00 and 100.00.\n"
+            "7. \"payoutAddress\"       (string, required) The dash address to use for masternode reward payments."
             "\nExamples:\n"
             + HelpExampleCli("protx", "register_fund \"XrVhS9LogauRJGJu2sHuryjhpuex4RNPSb\" \"1.2.3.4:1234\" \"Xt9AMWaYSz7tR7Uo7gzXA3m4QmeWgrR3rr\" \"93746e8731c57f87f79b3620a7982924e2931717d49540a85864bd543de11c43fb868fd63e501a1db37e19ed59ae6db4\" \"Xt9AMWaYSz7tR7Uo7gzXA3m4QmeWgrR3rr\" 0 \"XrVhS9LogauRJGJu2sHuryjhpuex4RNPSb\"")
     );

From ed53fce470d85523fcc83b2491d4721852f038a5 Mon Sep 17 00:00:00 2001
From: UdjinM6 <UdjinM6@users.noreply.github.com>
Date: Tue, 27 Nov 2018 10:03:41 +0300
Subject: [PATCH 330/400] Revert "Apply similar logic to vecMasternodesUsed"
 (#2503)

This reverts commit ebb120005292bc077d6dd7c4ce8adbe25167bf16.
---
 src/privatesend-client.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/privatesend-client.cpp b/src/privatesend-client.cpp
index 21d14d6e759d..13b43e97f821 100644
--- a/src/privatesend-client.cpp
+++ b/src/privatesend-client.cpp
@@ -952,10 +952,10 @@ bool CPrivateSendClientManager::DoAutomaticDenominating(CConnman& connman, bool
         return false;
     }
 
-    int nMnCount = mnodeman.CountMasternodes();
+    int nMnCountEnabled = mnodeman.CountEnabled(MIN_PRIVATESEND_PEER_PROTO_VERSION);
 
     // If we've used 90% of the Masternode list then drop the oldest first ~30%
-    int nThreshold_high = nMnCount * 0.9;
+    int nThreshold_high = nMnCountEnabled * 0.9;
     int nThreshold_low = nThreshold_high * 0.7;
     LogPrint("privatesend", "Checking vecMasternodesUsed: size: %d, threshold: %d\n", (int)vecMasternodesUsed.size(), nThreshold_high);
 

From 812834dc5fed83cf4d99994c9c503acccf5024e8 Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Tue, 27 Nov 2018 08:04:08 +0100
Subject: [PATCH 331/400] Put height into mined commitments and use it instead
 of the special handling of quorumVvecHash (#2501)

* Allow to skip sig verification for CFinalCommitment::Verify

* Add CFinalCommitmentTxPayload and CheckLLMQCommitment and use it

As described in https://github.com/dashpay/dips/pull/31 (see discussion).

* Properly ban nodes for invalid commitments
---
 src/evo/deterministicmns.cpp        |  6 +-
 src/evo/specialtx.cpp               |  2 +-
 src/llmq/quorums_blockprocessor.cpp | 24 ++++----
 src/llmq/quorums_commitment.cpp     | 89 ++++++++++++++++++++++-------
 src/llmq/quorums_commitment.h       | 29 +++++++++-
 src/llmq/quorums_dummydkg.cpp       |  2 +-
 6 files changed, 111 insertions(+), 41 deletions(-)

diff --git a/src/evo/deterministicmns.cpp b/src/evo/deterministicmns.cpp
index 8ccd785d0a0a..502f330b08dd 100644
--- a/src/evo/deterministicmns.cpp
+++ b/src/evo/deterministicmns.cpp
@@ -674,12 +674,12 @@ bool CDeterministicMNManager::BuildNewListFromBlock(const CBlock& block, const C
             LogPrintf("CDeterministicMNManager::%s -- MN %s revoked operator key at height %d: %s\n",
                 __func__, proTx.proTxHash.ToString(), nHeight, proTx.ToString());
         } else if (tx.nType == TRANSACTION_QUORUM_COMMITMENT) {
-            llmq::CFinalCommitment qc;
+            llmq::CFinalCommitmentTxPayload qc;
             if (!GetTxPayload(tx, qc)) {
                 assert(false); // this should have been handled already
             }
-            if (!qc.IsNull()) {
-                HandleQuorumCommitment(qc, newList);
+            if (!qc.commitment.IsNull()) {
+                HandleQuorumCommitment(qc.commitment, newList);
             }
         }
     }
diff --git a/src/evo/specialtx.cpp b/src/evo/specialtx.cpp
index 1b9956b3da87..7bd29ed51f69 100644
--- a/src/evo/specialtx.cpp
+++ b/src/evo/specialtx.cpp
@@ -38,7 +38,7 @@ bool CheckSpecialTx(const CTransaction& tx, const CBlockIndex* pindexPrev, CVali
     case TRANSACTION_COINBASE:
         return CheckCbTx(tx, pindexPrev, state);
     case TRANSACTION_QUORUM_COMMITMENT:
-        return true; // can't really check much here. checks are done in ProcessBlock
+        return llmq::CheckLLMQCommitment(tx, pindexPrev, state);
     }
 
     return state.DoS(10, false, REJECT_INVALID, "bad-tx-type-check");
diff --git a/src/llmq/quorums_blockprocessor.cpp b/src/llmq/quorums_blockprocessor.cpp
index c40c1a85c96d..cde3f84ccad0 100644
--- a/src/llmq/quorums_blockprocessor.cpp
+++ b/src/llmq/quorums_blockprocessor.cpp
@@ -90,7 +90,7 @@ void CQuorumBlockProcessor::ProcessMessage(CNode* pfrom, const std::string& strC
 
         auto members = CLLMQUtils::GetAllQuorumMembers(type, qc.quorumHash);
 
-        if (!qc.Verify(members)) {
+        if (!qc.Verify(members, true)) {
             LOCK(cs_main);
             LogPrintf("CQuorumBlockProcessor::%s -- commitment for quorum %s:%d is not valid, peer=%d\n", __func__,
                       qc.quorumHash.ToString(), qc.llmqType, pfrom->id);
@@ -167,7 +167,7 @@ bool CQuorumBlockProcessor::ProcessCommitment(const CBlockIndex* pindexPrev, con
     }
 
     if (qc.IsNull()) {
-        if (!qc.VerifyNull(pindexPrev->nHeight + 1)) {
+        if (!qc.VerifyNull()) {
             return state.DoS(100, false, REJECT_INVALID, "bad-qc-invalid-null");
         }
         return true;
@@ -185,7 +185,7 @@ bool CQuorumBlockProcessor::ProcessCommitment(const CBlockIndex* pindexPrev, con
 
     auto members = CLLMQUtils::GetAllQuorumMembers(params.type, quorumHash);
 
-    if (!qc.Verify(members)) {
+    if (!qc.Verify(members, true)) {
         return state.DoS(100, false, REJECT_INVALID, "bad-qc-invalid");
     }
 
@@ -236,21 +236,18 @@ bool CQuorumBlockProcessor::GetCommitmentsFromBlock(const CBlock& block, const C
 
     for (const auto& tx : block.vtx) {
         if (tx->nType == TRANSACTION_QUORUM_COMMITMENT) {
-            CFinalCommitment qc;
+            CFinalCommitmentTxPayload qc;
             if (!GetTxPayload(*tx, qc)) {
+                // should not happen as it was verified before processing the block
                 return state.DoS(100, false, REJECT_INVALID, "bad-tx-payload");
             }
 
-            if (!consensus.llmqs.count((Consensus::LLMQType)qc.llmqType)) {
-                return state.DoS(100, false, REJECT_INVALID, "bad-qc-type");
-            }
-
             // only allow one commitment per type and per block
-            if (ret.count((Consensus::LLMQType)qc.llmqType)) {
+            if (ret.count((Consensus::LLMQType)qc.commitment.llmqType)) {
                 return state.DoS(100, false, REJECT_INVALID, "bad-qc-dup");
             }
 
-            ret.emplace((Consensus::LLMQType)qc.llmqType, std::move(qc));
+            ret.emplace((Consensus::LLMQType)qc.commitment.llmqType, std::move(qc.commitment));
         }
     }
 
@@ -406,7 +403,6 @@ bool CQuorumBlockProcessor::GetMinableCommitment(Consensus::LLMQType llmqType, c
     if (it == minableCommitmentsByQuorum.end()) {
         // null commitment required
         ret = CFinalCommitment(Params().GetConsensus().llmqs.at(llmqType), quorumHash);
-        ret.quorumVvecHash = ::SerializeHash(std::make_pair(quorumHash, nHeight));
         return true;
     }
 
@@ -419,11 +415,13 @@ bool CQuorumBlockProcessor::GetMinableCommitmentTx(Consensus::LLMQType llmqType,
 {
     AssertLockHeld(cs_main);
 
-    CFinalCommitment qc;
-    if (!GetMinableCommitment(llmqType, pindexPrev, qc)) {
+    CFinalCommitmentTxPayload qc;
+    if (!GetMinableCommitment(llmqType, pindexPrev, qc.commitment)) {
         return false;
     }
 
+    qc.nHeight = pindexPrev->nHeight + 1;
+
     CMutableTransaction tx;
     tx.nVersion = 3;
     tx.nType = TRANSACTION_QUORUM_COMMITMENT;
diff --git a/src/llmq/quorums_commitment.cpp b/src/llmq/quorums_commitment.cpp
index f8e0a6b51ab0..dd668a5c2d97 100644
--- a/src/llmq/quorums_commitment.cpp
+++ b/src/llmq/quorums_commitment.cpp
@@ -6,6 +6,9 @@
 #include "quorums_utils.h"
 
 #include "chainparams.h"
+#include "validation.h"
+
+#include "evo/specialtx.h"
 
 #include <univalue.h>
 
@@ -24,7 +27,7 @@ CFinalCommitment::CFinalCommitment(const Consensus::LLMQParams& params, const ui
     LogPrintStr(strprintf("CFinalCommitment::%s -- %s", __func__, tinyformat::format(__VA_ARGS__))); \
 } while(0)
 
-bool CFinalCommitment::Verify(const std::vector<CDeterministicMNCPtr>& members) const
+bool CFinalCommitment::Verify(const std::vector<CDeterministicMNCPtr>& members, bool checkSigs) const
 {
     if (nVersion == 0 || nVersion > CURRENT_VERSION) {
         return false;
@@ -76,30 +79,33 @@ bool CFinalCommitment::Verify(const std::vector<CDeterministicMNCPtr>& members)
         }
     }
 
-    uint256 commitmentHash = CLLMQUtils::BuildCommitmentHash((uint8_t)params.type, quorumHash, validMembers, quorumPublicKey, quorumVvecHash);
+    // sigs are only checked when the block is processed
+    if (checkSigs) {
+        uint256 commitmentHash = CLLMQUtils::BuildCommitmentHash((uint8_t)params.type, quorumHash, validMembers, quorumPublicKey, quorumVvecHash);
 
-    std::vector<CBLSPublicKey> memberPubKeys;
-    for (size_t i = 0; i < members.size(); i++) {
-        if (!signers[i]) {
-            continue;
+        std::vector<CBLSPublicKey> memberPubKeys;
+        for (size_t i = 0; i < members.size(); i++) {
+            if (!signers[i]) {
+                continue;
+            }
+            memberPubKeys.emplace_back(members[i]->pdmnState->pubKeyOperator);
         }
-        memberPubKeys.emplace_back(members[i]->pdmnState->pubKeyOperator);
-    }
 
-    if (!membersSig.VerifySecureAggregated(memberPubKeys, commitmentHash)) {
-        LogPrintfFinalCommitment("invalid aggregated members signature\n");
-        return false;
-    }
+        if (!membersSig.VerifySecureAggregated(memberPubKeys, commitmentHash)) {
+            LogPrintfFinalCommitment("invalid aggregated members signature\n");
+            return false;
+        }
 
-    if (!quorumSig.VerifyInsecure(quorumPublicKey, commitmentHash)) {
-        LogPrintfFinalCommitment("invalid quorum signature\n");
-        return false;
+        if (!quorumSig.VerifyInsecure(quorumPublicKey, commitmentHash)) {
+            LogPrintfFinalCommitment("invalid quorum signature\n");
+            return false;
+        }
     }
 
     return true;
 }
 
-bool CFinalCommitment::VerifyNull(int nHeight) const
+bool CFinalCommitment::VerifyNull() const
 {
     if (!Params().GetConsensus().llmqs.count((Consensus::LLMQType)llmqType)) {
         LogPrintfFinalCommitment("invalid llmqType=%d\n", llmqType);
@@ -111,11 +117,6 @@ bool CFinalCommitment::VerifyNull(int nHeight) const
         return false;
     }
 
-    uint256 expectedQuorumVvecHash = ::SerializeHash(std::make_pair(quorumHash, nHeight));
-    if (quorumVvecHash != expectedQuorumVvecHash) {
-        return false;
-    }
-
     return true;
 }
 
@@ -143,4 +144,50 @@ void CFinalCommitment::ToJson(UniValue& obj) const
     obj.push_back(Pair("quorumPublicKey", quorumPublicKey.ToString()));
 }
 
+bool CheckLLMQCommitment(const CTransaction& tx, const CBlockIndex* pindexPrev, CValidationState& state)
+{
+    CFinalCommitmentTxPayload qcTx;
+    if (!GetTxPayload(tx, qcTx)) {
+        return state.DoS(100, false, REJECT_INVALID, "bad-qc-payload");
+    }
+
+    if (qcTx.nVersion == 0 || qcTx.nVersion > CFinalCommitmentTxPayload::CURRENT_VERSION) {
+        return state.DoS(100, false, REJECT_INVALID, "bad-qc-version");
+    }
+
+    if (qcTx.nHeight != pindexPrev->nHeight + 1) {
+        return state.DoS(100, false, REJECT_INVALID, "bad-qc-height");
+    }
+
+    if (!mapBlockIndex.count(qcTx.commitment.quorumHash)) {
+        return state.DoS(100, false, REJECT_INVALID, "bad-qc-quorum-hash");
+    }
+
+    const CBlockIndex* pindexQuorum = mapBlockIndex[qcTx.commitment.quorumHash];
+
+    if (pindexQuorum != pindexPrev->GetAncestor(pindexQuorum->nHeight)) {
+        // not part of active chain
+        return state.DoS(100, false, REJECT_INVALID, "bad-qc-quorum-hash");
+    }
+
+    if (!Params().GetConsensus().llmqs.count((Consensus::LLMQType)qcTx.commitment.llmqType)) {
+        return state.DoS(100, false, REJECT_INVALID, "bad-qc-type");
+    }
+    const auto& params = Params().GetConsensus().llmqs.at((Consensus::LLMQType)qcTx.commitment.llmqType);
+
+    if (qcTx.commitment.IsNull()) {
+        if (!qcTx.commitment.VerifyNull()) {
+            return state.DoS(100, false, REJECT_INVALID, "bad-qc-invalid-null");
+        }
+        return true;
+    }
+
+    auto members = CLLMQUtils::GetAllQuorumMembers(params.type, qcTx.commitment.quorumHash);
+    if (!qcTx.commitment.Verify(members, false)) {
+        return state.DoS(100, false, REJECT_INVALID, "bad-qc-invalid");
+    }
+
+    return true;
+}
+
 }
diff --git a/src/llmq/quorums_commitment.h b/src/llmq/quorums_commitment.h
index bbf702b22bbf..3eeea96779bb 100644
--- a/src/llmq/quorums_commitment.h
+++ b/src/llmq/quorums_commitment.h
@@ -48,8 +48,8 @@ class CFinalCommitment
         return (int)std::count(validMembers.begin(), validMembers.end(), true);
     }
 
-    bool Verify(const std::vector<CDeterministicMNCPtr>& members) const;
-    bool VerifyNull(int nHeight) const;
+    bool Verify(const std::vector<CDeterministicMNCPtr>& members, bool checkSigs) const;
+    bool VerifyNull() const;
     bool VerifySizes(const Consensus::LLMQParams& params) const;
 
     void ToJson(UniValue& obj) const;
@@ -79,6 +79,7 @@ class CFinalCommitment
             return false;
         }
         if (quorumPublicKey.IsValid() ||
+            !quorumVvecHash.IsNull() ||
             membersSig.IsValid() ||
             quorumSig.IsValid()) {
             return false;
@@ -87,6 +88,30 @@ class CFinalCommitment
     }
 };
 
+class CFinalCommitmentTxPayload
+{
+public:
+    static const uint16_t CURRENT_VERSION = 1;
+
+public:
+    uint16_t nVersion{CURRENT_VERSION};
+    uint32_t nHeight{(uint32_t)-1};
+    CFinalCommitment commitment;
+
+public:
+    ADD_SERIALIZE_METHODS
+
+    template<typename Stream, typename Operation>
+    inline void SerializationOp(Stream& s, Operation ser_action)
+    {
+        READWRITE(nVersion);
+        READWRITE(nHeight);
+        READWRITE(commitment);
+    }
+};
+
+bool CheckLLMQCommitment(const CTransaction& tx, const CBlockIndex* pindexPrev, CValidationState& state);
+
 }
 
 #endif //DASH_QUORUMS_COMMITMENT_H
diff --git a/src/llmq/quorums_dummydkg.cpp b/src/llmq/quorums_dummydkg.cpp
index 538cfa204a54..384720d9bae3 100644
--- a/src/llmq/quorums_dummydkg.cpp
+++ b/src/llmq/quorums_dummydkg.cpp
@@ -345,7 +345,7 @@ void CDummyDKG::CreateFinalCommitment(Consensus::LLMQType llmqType, const CBlock
         }
         fqc.membersSig = CBLSSignature::AggregateSecure(memberSigs, memberPubKeys, commitmentHash);
 
-        if (!fqc.Verify(members)) {
+        if (!fqc.Verify(members, true)) {
             LogPrintf("CDummyDKG::%s -- self created final commitment is invalid for quorum %s:%d, validMembers=%d, signers=%d\n", __func__,
                       fqc.quorumHash.ToString(), fqc.llmqType, fqc.CountValidMembers(), fqc.CountSigners());
             continue;

From 35550a3f93d5847ed213ccc028e677b1177bb378 Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Wed, 28 Nov 2018 11:43:28 +0100
Subject: [PATCH 332/400] Add quorumModifierHash to instant send lock vote
 (#2505)

* Let GetMasternodeRank also return the block hash at the given height

* Add outpointConfirmedBlock to CTxLockVote and verify it

* Match order of parameters with member order

* Rename outpointConfirmedBlock to quorumModifierHash

* Add overload of GetMasternodeRank that does not return the block hash
---
 src/instantx.cpp      | 22 +++++++++++++++++++---
 src/instantx.h        |  8 ++++++--
 src/masternodeman.cpp | 12 +++++++++---
 src/masternodeman.h   |  1 +
 4 files changed, 35 insertions(+), 8 deletions(-)

diff --git a/src/instantx.cpp b/src/instantx.cpp
index a8fe3f9820ee..49cf7aea7cdf 100644
--- a/src/instantx.cpp
+++ b/src/instantx.cpp
@@ -244,11 +244,16 @@ void CInstantSend::Vote(CTxLockCandidate& txLockCandidate, CConnman& connman)
         int nLockInputHeight = nPrevoutHeight + Params().GetConsensus().nInstantSendConfirmationsRequired - 2;
 
         int nRank;
+        uint256 quorumModifierHash;
         int nMinRequiredProtocol = std::max(MIN_INSTANTSEND_PROTO_VERSION, mnpayments.GetMinMasternodePaymentsProto());
-        if (!mnodeman.GetMasternodeRank(activeMasternodeInfo.outpoint, nRank, nLockInputHeight, nMinRequiredProtocol)) {
+        if (!mnodeman.GetMasternodeRank(activeMasternodeInfo.outpoint, nRank, quorumModifierHash, nLockInputHeight, nMinRequiredProtocol)) {
             LogPrint("instantsend", "CInstantSend::Vote -- Can't calculate rank for masternode %s\n", activeMasternodeInfo.outpoint.ToStringShort());
             continue;
         }
+        if (!deterministicMNManager->IsDeterministicMNsSporkActive()) {
+            // not used until spork15 activation
+            quorumModifierHash = uint256();
+        }
 
         int nSignaturesTotal = COutPointLock::SIGNATURES_TOTAL;
         if (nRank > nSignaturesTotal) {
@@ -282,7 +287,7 @@ void CInstantSend::Vote(CTxLockCandidate& txLockCandidate, CConnman& connman)
 
         // we haven't voted for this outpoint yet, let's try to do this now
         // Please note that activeMasternodeInfo.proTxHash is only valid after spork15 activation
-        CTxLockVote vote(txHash, outpointLockPair.first, activeMasternodeInfo.outpoint, activeMasternodeInfo.proTxHash);
+        CTxLockVote vote(txHash, outpointLockPair.first, activeMasternodeInfo.outpoint, quorumModifierHash, activeMasternodeInfo.proTxHash);
 
         if (!vote.Sign()) {
             LogPrintf("CInstantSend::Vote -- Failed to sign consensus vote\n");
@@ -1052,12 +1057,23 @@ bool CTxLockVote::IsValid(CNode* pnode, CConnman& connman) const
     int nLockInputHeight = coin.nHeight + Params().GetConsensus().nInstantSendConfirmationsRequired - 2;
 
     int nRank;
+    uint256 expectedQuorumModifierHash;
     int nMinRequiredProtocol = std::max(MIN_INSTANTSEND_PROTO_VERSION, mnpayments.GetMinMasternodePaymentsProto());
-    if (!mnodeman.GetMasternodeRank(outpointMasternode, nRank, nLockInputHeight, nMinRequiredProtocol)) {
+    if (!mnodeman.GetMasternodeRank(outpointMasternode, nRank, expectedQuorumModifierHash, nLockInputHeight, nMinRequiredProtocol)) {
         //can be caused by past versions trying to vote with an invalid protocol
         LogPrint("instantsend", "CTxLockVote::IsValid -- Can't calculate rank for masternode %s\n", outpointMasternode.ToStringShort());
         return false;
     }
+    if (!quorumModifierHash.IsNull()) {
+        if (quorumModifierHash != expectedQuorumModifierHash) {
+            LogPrint("instantsend", "CTxLockVote::IsValid -- invalid quorumModifierHash %s, expected %s\n", quorumModifierHash.ToString(), expectedQuorumModifierHash.ToString());
+            return false;
+        }
+    } else if (deterministicMNManager->IsDeterministicMNsSporkActive()) {
+        LogPrint("instantsend", "CTxLockVote::IsValid -- missing quorumModifierHash while DIP3 is active\n");
+        return false;
+    }
+
     LogPrint("instantsend", "CTxLockVote::IsValid -- Masternode %s, rank=%d\n", outpointMasternode.ToStringShort(), nRank);
 
     int nSignaturesTotal = COutPointLock::SIGNATURES_TOTAL;
diff --git a/src/instantx.h b/src/instantx.h
index db0f0f12c8c3..31bf593edbeb 100644
--- a/src/instantx.h
+++ b/src/instantx.h
@@ -235,6 +235,7 @@ class CTxLockVote
     COutPoint outpoint;
     // TODO remove this member when the legacy masternode code is removed after DIP3 deployment
     COutPoint outpointMasternode;
+    uint256 quorumModifierHash;
     uint256 masternodeProTxHash;
     std::vector<unsigned char> vchMasternodeSignature;
     // local memory only
@@ -246,16 +247,18 @@ class CTxLockVote
         txHash(),
         outpoint(),
         outpointMasternode(),
+        quorumModifierHash(),
         masternodeProTxHash(),
         vchMasternodeSignature(),
         nConfirmedHeight(-1),
         nTimeCreated(GetTime())
         {}
 
-    CTxLockVote(const uint256& txHashIn, const COutPoint& outpointIn, const COutPoint& outpointMasternodeIn, const uint256& masternodeProTxHashIn) :
+    CTxLockVote(const uint256& txHashIn, const COutPoint& outpointIn, const COutPoint& outpointMasternodeIn, const uint256& quorumModifierHashIn, const uint256& masternodeProTxHashIn) :
         txHash(txHashIn),
         outpoint(outpointIn),
         outpointMasternode(outpointMasternodeIn),
+        quorumModifierHash(quorumModifierHashIn),
         masternodeProTxHash(masternodeProTxHashIn),
         vchMasternodeSignature(),
         nConfirmedHeight(-1),
@@ -270,8 +273,9 @@ class CTxLockVote
         READWRITE(outpoint);
         READWRITE(outpointMasternode);
         if (deterministicMNManager->IsDeterministicMNsSporkActive()) {
-            // Starting with spork15 activation, the proTxHash is included. When we bump to >= 70213, we can remove
+            // Starting with spork15 activation, the proTxHash and quorumModifierHash is included. When we bump to >= 70213, we can remove
             // the surrounding if. We might also remove outpointMasternode as well later
+            READWRITE(quorumModifierHash);
             READWRITE(masternodeProTxHash);
         }
         if (!(s.GetType() & SER_GETHASH)) {
diff --git a/src/masternodeman.cpp b/src/masternodeman.cpp
index dc9698c86d1c..4f8910fa150a 100644
--- a/src/masternodeman.cpp
+++ b/src/masternodeman.cpp
@@ -821,6 +821,12 @@ bool CMasternodeMan::GetMasternodeScores(const uint256& nBlockHash, CMasternodeM
 }
 
 bool CMasternodeMan::GetMasternodeRank(const COutPoint& outpoint, int& nRankRet, int nBlockHeight, int nMinProtocol)
+{
+    uint256 tmp;
+    return GetMasternodeRank(outpoint, nRankRet, tmp, nBlockHeight, nMinProtocol);
+}
+
+bool CMasternodeMan::GetMasternodeRank(const COutPoint& outpoint, int& nRankRet, uint256& blockHashRet, int nBlockHeight, int nMinProtocol)
 {
     nRankRet = -1;
 
@@ -828,8 +834,8 @@ bool CMasternodeMan::GetMasternodeRank(const COutPoint& outpoint, int& nRankRet,
         return false;
 
     // make sure we know about this block
-    uint256 nBlockHash = uint256();
-    if (!GetBlockHash(nBlockHash, nBlockHeight)) {
+    blockHashRet = uint256();
+    if (!GetBlockHash(blockHashRet, nBlockHeight)) {
         LogPrintf("CMasternodeMan::%s -- ERROR: GetBlockHash() failed at nBlockHeight %d\n", __func__, nBlockHeight);
         return false;
     }
@@ -837,7 +843,7 @@ bool CMasternodeMan::GetMasternodeRank(const COutPoint& outpoint, int& nRankRet,
     LOCK(cs);
 
     score_pair_vec_t vecMasternodeScores;
-    if (!GetMasternodeScores(nBlockHash, vecMasternodeScores, nMinProtocol))
+    if (!GetMasternodeScores(blockHashRet, vecMasternodeScores, nMinProtocol))
         return false;
 
     int nRank = 0;
diff --git a/src/masternodeman.h b/src/masternodeman.h
index 3e14b23b9872..853fed868301 100644
--- a/src/masternodeman.h
+++ b/src/masternodeman.h
@@ -187,6 +187,7 @@ class CMasternodeMan
 
     bool GetMasternodeRanks(rank_pair_vec_t& vecMasternodeRanksRet, int nBlockHeight = -1, int nMinProtocol = 0);
     bool GetMasternodeRank(const COutPoint &outpoint, int& nRankRet, int nBlockHeight = -1, int nMinProtocol = 0);
+    bool GetMasternodeRank(const COutPoint &outpoint, int& nRankRet, uint256& blockHashRet, int nBlockHeight = -1, int nMinProtocol = 0);
 
     void ProcessMasternodeConnections(CConnman& connman);
     std::pair<CService, std::set<uint256> > PopScheduledMnbRequestConnection();

From fc6d651c4351626ee23574255a7e3d36a00df9cd Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Thu, 29 Nov 2018 09:12:41 +0100
Subject: [PATCH 333/400] Fix crashes in "protx" RPCs when wallet is disabled
 (#2509)

---
 src/rpc/rpcevo.cpp | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/src/rpc/rpcevo.cpp b/src/rpc/rpcevo.cpp
index c9fb8f08be4c..358ab3f49d6b 100644
--- a/src/rpc/rpcevo.cpp
+++ b/src/rpc/rpcevo.cpp
@@ -34,6 +34,9 @@ static CKey ParsePrivKey(const std::string &strKeyOrAddress, bool allowAddresses
     CBitcoinAddress address;
     if (allowAddresses && address.SetString(strKeyOrAddress) && address.IsValid()) {
 #ifdef ENABLE_WALLET
+        if (!pwalletMain) {
+            throw std::runtime_error("addresses not supported when wallet is disabled");
+        }
         CKeyID keyId;
         CKey key;
         if (!address.GetKeyID(keyId) || !pwalletMain->GetKey(keyId, key))
@@ -643,6 +646,10 @@ void protx_list_help()
 }
 
 static bool CheckWalletOwnsScript(const CScript& script) {
+    if (!pwalletMain) {
+        return false;
+    }
+
     CTxDestination dest;
     if (ExtractDestination(script, dest)) {
         if ((boost::get<CKeyID>(&dest) && pwalletMain->HaveKey(*boost::get<CKeyID>(&dest))) || (boost::get<CScriptID>(&dest) && pwalletMain->HaveCScript(*boost::get<CScriptID>(&dest)))) {
@@ -665,9 +672,9 @@ UniValue BuildDMNListEntry(const CDeterministicMNCPtr& dmn, bool detailed)
     int confirmations = GetUTXOConfirmations(dmn->collateralOutpoint);
     o.push_back(Pair("confirmations", confirmations));
 
-    bool hasOwnerKey = pwalletMain->HaveKey(dmn->pdmnState->keyIDOwner);
-    bool hasOperatorKey = false; //pwalletMain->HaveKey(dmn->pdmnState->keyIDOperator);
-    bool hasVotingKey = pwalletMain->HaveKey(dmn->pdmnState->keyIDVoting);
+    bool hasOwnerKey = pwalletMain && pwalletMain->HaveKey(dmn->pdmnState->keyIDOwner);
+    bool hasOperatorKey = false; //pwalletMain && pwalletMain->HaveKey(dmn->pdmnState->keyIDOperator);
+    bool hasVotingKey = pwalletMain && pwalletMain->HaveKey(dmn->pdmnState->keyIDVoting);
 
     bool ownsCollateral = false;
     CTransactionRef collateralTx;
@@ -701,9 +708,14 @@ UniValue protx_list(const JSONRPCRequest& request)
 
     UniValue ret(UniValue::VARR);
 
-    LOCK2(cs_main, pwalletMain->cs_wallet);
+    LOCK(cs_main);
 
     if (type == "wallet") {
+        if (!pwalletMain) {
+            throw std::runtime_error("\"protx list wallet\" not supported when wallet is disabled");
+        }
+        LOCK(pwalletMain->cs_wallet);
+
         if (request.params.size() > 3) {
             protx_list_help();
         }

From f96563462b4792da6c576456f9d13ae0bf973907 Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Thu, 29 Nov 2018 09:12:51 +0100
Subject: [PATCH 334/400] Fix check for nTemporaryTestnetForkDIP3Height (#2508)

This caused a crash when performing a full-sync.
---
 src/evo/cbtx.cpp                    | 2 +-
 src/llmq/quorums_blockprocessor.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/evo/cbtx.cpp b/src/evo/cbtx.cpp
index a21fe7db6b0f..643b79595b10 100644
--- a/src/evo/cbtx.cpp
+++ b/src/evo/cbtx.cpp
@@ -76,7 +76,7 @@ bool CalcCbTxMerkleRootMNList(const CBlock& block, const CBlockIndex* pindexPrev
     // BEGIN TEMPORARY CODE
     const auto& consensus = Params().GetConsensus();
     if (consensus.nTemporaryTestnetForkHeight != 0 &&
-        pindexPrev->nHeight + 1 >= consensus.nTemporaryTestnetForkDIP3Height &&
+        pindexPrev->nHeight + 1 > consensus.nTemporaryTestnetForkDIP3Height &&
         pindexPrev->nHeight + 1 < consensus.nTemporaryTestnetForkHeight &&
         chainActive[consensus.nTemporaryTestnetForkDIP3Height]->GetBlockHash() == consensus.nTemporaryTestnetForkDIP3BlockHash) {
         for (auto& sme : sml.mnList) {
diff --git a/src/llmq/quorums_blockprocessor.cpp b/src/llmq/quorums_blockprocessor.cpp
index cde3f84ccad0..5a3d1feb4626 100644
--- a/src/llmq/quorums_blockprocessor.cpp
+++ b/src/llmq/quorums_blockprocessor.cpp
@@ -282,7 +282,7 @@ bool CQuorumBlockProcessor::IsCommitmentRequired(Consensus::LLMQType llmqType, c
         LOCK(cs_main);
         const auto& consensus = Params().GetConsensus();
         if (consensus.nTemporaryTestnetForkDIP3Height != 0 &&
-            pindexPrev->nHeight + 1 >= consensus.nTemporaryTestnetForkDIP3Height &&
+            pindexPrev->nHeight + 1 > consensus.nTemporaryTestnetForkDIP3Height &&
             pindexPrev->nHeight + 1 < consensus.nTemporaryTestnetForkHeight &&
             chainActive[consensus.nTemporaryTestnetForkDIP3Height]->GetBlockHash() == consensus.nTemporaryTestnetForkDIP3BlockHash) {
             allowMissingQc = true;

From 5da4c97284ae2b2bf0cfcb21b3d9dfd15b5c5771 Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Thu, 29 Nov 2018 13:31:37 +0100
Subject: [PATCH 335/400] Use "registered" as default for "protx list" (#2513)

"wallet" was confusing too many users as it shows an empty list if the local
wallet does not own any keys for any MN.
---
 src/rpc/rpcevo.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/rpc/rpcevo.cpp b/src/rpc/rpcevo.cpp
index 358ab3f49d6b..d1dada22e990 100644
--- a/src/rpc/rpcevo.cpp
+++ b/src/rpc/rpcevo.cpp
@@ -631,7 +631,7 @@ void protx_list_help()
     throw std::runtime_error(
             "protx list (\"type\")\n"
             "\nLists all ProTxs in your wallet or on-chain, depending on the given type. If \"type\" is not\n"
-            "specified, it defaults to \"wallet\". All types have the optional argument \"detailed\" which if set to\n"
+            "specified, it defaults to \"registered\". All types have the optional argument \"detailed\" which if set to\n"
             "\"true\" will result in a detailed list to be returned. If set to \"false\", only the hashes of the ProTx\n"
             "will be returned.\n"
             "\nAvailable types:\n"
@@ -701,7 +701,7 @@ UniValue protx_list(const JSONRPCRequest& request)
         protx_list_help();
     }
 
-    std::string type = "wallet";
+    std::string type = "registered";
     if (request.params.size() > 1) {
         type = request.params[1].get_str();
     }

From 5a3f64310b312acb7ad8bf961b458f5f4901b4e1 Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Thu, 29 Nov 2018 19:51:04 +0100
Subject: [PATCH 336/400] Deserialize CFinalCommitmentTxPayload instead of
 CFinalCommitment in TxToJSON (#2510)

* Deserialize CFinalCommitmentTxPayload instead of CFinalCommitment in TxToJSON

* Implement ToJson for CFinalCommitmentTxPayload and use it in TxToJSON

Otherwise the nVersion and nHeight members of it are not shown.
---
 src/llmq/quorums_commitment.cpp | 11 +++++++++++
 src/llmq/quorums_commitment.h   |  2 ++
 src/rpc/rawtransaction.cpp      |  2 +-
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/llmq/quorums_commitment.cpp b/src/llmq/quorums_commitment.cpp
index dd668a5c2d97..83d9c7727e78 100644
--- a/src/llmq/quorums_commitment.cpp
+++ b/src/llmq/quorums_commitment.cpp
@@ -144,6 +144,17 @@ void CFinalCommitment::ToJson(UniValue& obj) const
     obj.push_back(Pair("quorumPublicKey", quorumPublicKey.ToString()));
 }
 
+void CFinalCommitmentTxPayload::ToJson(UniValue& obj) const
+{
+    obj.setObject();
+    obj.push_back(Pair("version", (int)nVersion));
+    obj.push_back(Pair("height", (int)nHeight));
+
+    UniValue qcObj;
+    commitment.ToJson(qcObj);
+    obj.push_back(Pair("commitment", qcObj));
+}
+
 bool CheckLLMQCommitment(const CTransaction& tx, const CBlockIndex* pindexPrev, CValidationState& state)
 {
     CFinalCommitmentTxPayload qcTx;
diff --git a/src/llmq/quorums_commitment.h b/src/llmq/quorums_commitment.h
index 3eeea96779bb..de5ccbf2deb0 100644
--- a/src/llmq/quorums_commitment.h
+++ b/src/llmq/quorums_commitment.h
@@ -108,6 +108,8 @@ class CFinalCommitmentTxPayload
         READWRITE(nHeight);
         READWRITE(commitment);
     }
+
+    void ToJson(UniValue& obj) const;
 };
 
 bool CheckLLMQCommitment(const CTransaction& tx, const CBlockIndex* pindexPrev, CValidationState& state);
diff --git a/src/rpc/rawtransaction.cpp b/src/rpc/rawtransaction.cpp
index 86b57aca74e8..ec98823b067c 100644
--- a/src/rpc/rawtransaction.cpp
+++ b/src/rpc/rawtransaction.cpp
@@ -168,7 +168,7 @@ void TxToJSON(const CTransaction& tx, const uint256 hashBlock, UniValue& entry)
             entry.push_back(Pair("cbTx", obj));
         }
     } else if (tx.nType == TRANSACTION_QUORUM_COMMITMENT) {
-        llmq::CFinalCommitment qcTx;
+        llmq::CFinalCommitmentTxPayload qcTx;
         if (GetTxPayload(tx, qcTx)) {
             UniValue obj;
             qcTx.ToJson(obj);

From f6f6d075dcd061c3d6381cde7c9d4248f7e5183a Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Thu, 29 Nov 2018 19:51:31 +0100
Subject: [PATCH 337/400] Still support "protx list" and "protx diff" when
 wallet is disabled at compile time (#2511)

* Don't fully remove protx commands when ENABLE_WALLET is not set

* Check for wallet support at run-time for protx commands

* Only show subcommands that require the wallet when ENABLE_WALLET is set

* Add and use CheckWalletOwnsKey which is able to check wallet support at runtime

* Properly handle disabled wallets in "protx list"

This now also handles the case where ENABLE_WALLET is not defined.

* Drop comment that doesn't fully apply anymore
---
 src/rpc/rpcevo.cpp | 74 +++++++++++++++++++++++++++++++++++++---------
 1 file changed, 60 insertions(+), 14 deletions(-)

diff --git a/src/rpc/rpcevo.cpp b/src/rpc/rpcevo.cpp
index d1dada22e990..0f8686a99413 100644
--- a/src/rpc/rpcevo.cpp
+++ b/src/rpc/rpcevo.cpp
@@ -625,6 +625,7 @@ UniValue protx_revoke(const JSONRPCRequest& request)
 
     return SignAndSendSpecialTx(tx);
 }
+#endif//ENABLE_WALLET
 
 void protx_list_help()
 {
@@ -635,8 +636,10 @@ void protx_list_help()
             "\"true\" will result in a detailed list to be returned. If set to \"false\", only the hashes of the ProTx\n"
             "will be returned.\n"
             "\nAvailable types:\n"
+#ifdef ENABLE_WALLET
             "  wallet (detailed)              - List only ProTx which are found in your wallet. This will also include ProTx which\n"
             "                                   failed PoSe verfication\n"
+#endif
             "  valid (height) (detailed)      - List only ProTx which are active/valid at the given chain height. If height is not\n"
             "                                   specified, it defaults to the current chain-tip\n"
             "  registered (height) (detaileD) - List all ProTx which are registered at the given chain height. If height is not\n"
@@ -645,7 +648,21 @@ void protx_list_help()
     );
 }
 
+static bool CheckWalletOwnsKey(const CKeyID& keyID) {
+#ifndef ENABLE_WALLET
+    return false;
+#else
+    if (!pwalletMain) {
+        return false;
+    }
+    return pwalletMain->HaveKey(keyID);
+#endif
+}
+
 static bool CheckWalletOwnsScript(const CScript& script) {
+#ifndef ENABLE_WALLET
+    return false;
+#else
     if (!pwalletMain) {
         return false;
     }
@@ -657,6 +674,7 @@ static bool CheckWalletOwnsScript(const CScript& script) {
         }
     }
     return false;
+#endif
 }
 
 UniValue BuildDMNListEntry(const CDeterministicMNCPtr& dmn, bool detailed)
@@ -672,9 +690,9 @@ UniValue BuildDMNListEntry(const CDeterministicMNCPtr& dmn, bool detailed)
     int confirmations = GetUTXOConfirmations(dmn->collateralOutpoint);
     o.push_back(Pair("confirmations", confirmations));
 
-    bool hasOwnerKey = pwalletMain && pwalletMain->HaveKey(dmn->pdmnState->keyIDOwner);
-    bool hasOperatorKey = false; //pwalletMain && pwalletMain->HaveKey(dmn->pdmnState->keyIDOperator);
-    bool hasVotingKey = pwalletMain && pwalletMain->HaveKey(dmn->pdmnState->keyIDVoting);
+    bool hasOwnerKey = CheckWalletOwnsKey(dmn->pdmnState->keyIDOwner);
+    bool hasOperatorKey = false; //CheckWalletOwnsKey(dmn->pdmnState->keyIDOperator);
+    bool hasVotingKey = CheckWalletOwnsKey(dmn->pdmnState->keyIDVoting);
 
     bool ownsCollateral = false;
     CTransactionRef collateralTx;
@@ -701,6 +719,12 @@ UniValue protx_list(const JSONRPCRequest& request)
         protx_list_help();
     }
 
+#ifdef ENABLE_WALLET
+    bool hasWallet = pwalletMain != nullptr;
+#else
+    bool hasWallet = false;
+#endif
+
     std::string type = "registered";
     if (request.params.size() > 1) {
         type = request.params[1].get_str();
@@ -711,9 +735,10 @@ UniValue protx_list(const JSONRPCRequest& request)
     LOCK(cs_main);
 
     if (type == "wallet") {
-        if (!pwalletMain) {
+        if (!hasWallet) {
             throw std::runtime_error("\"protx list wallet\" not supported when wallet is disabled");
         }
+#ifdef ENABLE_WALLET
         LOCK(pwalletMain->cs_wallet);
 
         if (request.params.size() > 3) {
@@ -731,13 +756,14 @@ UniValue protx_list(const JSONRPCRequest& request)
 
         deterministicMNManager->GetListAtChainTip().ForEachMN(false, [&](const CDeterministicMNCPtr& dmn) {
             if (setOutpts.count(dmn->collateralOutpoint) ||
-                pwalletMain->HaveKey(dmn->pdmnState->keyIDOwner) ||
-                pwalletMain->HaveKey(dmn->pdmnState->keyIDVoting) ||
+                CheckWalletOwnsKey(dmn->pdmnState->keyIDOwner) ||
+                CheckWalletOwnsKey(dmn->pdmnState->keyIDVoting) ||
                 CheckWalletOwnsScript(dmn->pdmnState->scriptPayout) ||
                 CheckWalletOwnsScript(dmn->pdmnState->scriptOperatorPayout)) {
                 ret.push_back(BuildDMNListEntry(dmn, detailed));
             }
         });
+#endif
     } else if (type == "valid" || type == "registered") {
         if (request.params.size() > 4) {
             protx_list_help();
@@ -844,15 +870,19 @@ UniValue protx_diff(const JSONRPCRequest& request)
             "\nArguments:\n"
             "1. \"command\"        (string, required) The command to execute\n"
             "\nAvailable commands:\n"
+#ifdef ENABLE_WALLET
             "  register          - Create and send ProTx to network\n"
             "  register_fund     - Fund, create and send ProTx to network\n"
             "  register_prepare  - Create an unsigned ProTx\n"
             "  register_submit   - Sign and submit a ProTx\n"
+#endif
             "  list              - List ProTxs\n"
             "  info              - Return information about a ProTx\n"
+#ifdef ENABLE_WALLET
             "  update_service    - Create and send ProUpServTx to network\n"
             "  update_registrar  - Create and send ProUpRegTx to network\n"
             "  revoke            - Create and send ProUpRevTx to network\n"
+#endif
             "  diff              - Calculate a diff and a proof between two masternode lists\n"
     );
 }
@@ -868,27 +898,46 @@ UniValue protx(const JSONRPCRequest& request)
         command = request.params[0].get_str();
     }
 
+#ifdef ENABLE_WALLET
+    bool hasWallet = pwalletMain != nullptr;
+#else
+    bool hasWallet = false;
+#endif
+
+    auto checkWallet = [&](const std::string& command) {
+        if (!hasWallet) {
+            throw std::runtime_error(strprintf("%s not supported when wallet is disabled", command));
+        }
+    };
+
+#ifdef ENABLE_WALLET
     if (command == "register" || command == "register_fund" || command == "register_prepare") {
+        checkWallet(command);
         return protx_register(request);
     } if (command == "register_submit") {
+        checkWallet(command);
         return protx_register_submit(request);
-    } else if (command == "list") {
-        return protx_list(request);
-    } else if (command == "info") {
-        return protx_info(request);
     } else if (command == "update_service") {
+        checkWallet(command);
         return protx_update_service(request);
     } else if (command == "update_registrar") {
+        checkWallet(command);
         return protx_update_registrar(request);
     } else if (command == "revoke") {
+        checkWallet(command);
         return protx_revoke(request);
+    } else
+#endif
+    if (command == "list") {
+        return protx_list(request);
+    } else if (command == "info") {
+        return protx_info(request);
     } else if (command == "diff") {
         return protx_diff(request);
     } else {
         protx_help();
     }
 }
-#endif//ENABLE_WALLET
 
 void bls_generate_help()
 {
@@ -955,10 +1004,7 @@ static const CRPCCommand commands[] =
 { //  category              name                      actor (function)         okSafeMode
   //  --------------------- ------------------------  -----------------------  ----------
     { "evo",                "bls",                    &_bls,                   false, {}  },
-#ifdef ENABLE_WALLET
-    // these require the wallet to be enabled to fund the transactions
     { "evo",                "protx",                  &protx,                  false, {}  },
-#endif//ENABLE_WALLET
 };
 
 void RegisterEvoRPCCommands(CRPCTable &tableRPC)

From 0c1b683a06f4450e03d0e1fe6f15b315632a3b65 Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Thu, 29 Nov 2018 19:51:53 +0100
Subject: [PATCH 338/400] Clear votes which were created before spork15
 activation and use operator key for non-funding votes (#2512)

* Clear votes which were created before spork15 activation

* Reject incoming votes which were created pre-DIP3

* Only use voting keys for VOTE_SIGNAL_FUNDING

The other vote signals are meant to be emitted by sentinel and must thus
be signed with the operator key.

* Simplify GetMinVoteTime

* Review suggestions/fixes

* Add missing mutex in CGovernanceObject::RemoveOldVotes
---
 src/governance-object.cpp | 20 +++++++++++++++-
 src/governance-object.h   |  3 +++
 src/governance-votedb.cpp | 17 +++++++++++++
 src/governance-votedb.h   |  3 +++
 src/governance.cpp        | 50 ++++++++++++++++++++++++++++++++++++++-
 src/governance.h          |  4 ++++
 src/rpc/governance.cpp    |  2 +-
 7 files changed, 96 insertions(+), 3 deletions(-)

diff --git a/src/governance-object.cpp b/src/governance-object.cpp
index 73ec9f46601a..67ef9a7696c8 100644
--- a/src/governance-object.cpp
+++ b/src/governance-object.cpp
@@ -177,7 +177,7 @@ bool CGovernanceObject::ProcessVote(CNode* pfrom,
         }
     }
 
-    bool onlyOwnerAllowed = nObjectType == GOVERNANCE_OBJECT_PROPOSAL;
+    bool onlyOwnerAllowed = nObjectType == GOVERNANCE_OBJECT_PROPOSAL && vote.GetSignal() == VOTE_SIGNAL_FUNDING;
 
     // Finally check that the vote is actually valid (done last because of cost of signature verification)
     if (!vote.IsValid(onlyOwnerAllowed)) {
@@ -790,3 +790,21 @@ void CGovernanceObject::CheckOrphanVotes(CConnman& connman)
         }
     }
 }
+
+std::vector<uint256> CGovernanceObject::RemoveOldVotes(unsigned int nMinTime)
+{
+    LOCK(cs);
+
+    auto removed = fileVotes.RemoveOldVotes(nMinTime);
+
+    if (!removed.empty()) {
+        std::string removedStr;
+        for (auto& h : removed) {
+            removedStr += strprintf("  %s\n", h.ToString());
+        }
+        LogPrintf("CGovernanceObject::RemoveOldVotes -- Removed %d old (pre-DIP3) votes for %s:\n%s\n", removed.size(), GetHash().ToString(), removedStr);
+        fDirtyCache = true;
+    }
+
+    return removed;
+}
diff --git a/src/governance-object.h b/src/governance-object.h
index e4faa7cdfb1b..673491990693 100644
--- a/src/governance-object.h
+++ b/src/governance-object.h
@@ -350,6 +350,9 @@ class CGovernanceObject
     void ClearMasternodeVotes();
 
     void CheckOrphanVotes(CConnman& connman);
+
+    // TODO can be removed after DIP3 is fully deployed
+    std::vector<uint256> RemoveOldVotes(unsigned int nMinTime);
 };
 
 
diff --git a/src/governance-votedb.cpp b/src/governance-votedb.cpp
index 9f67e166155c..2e9f5e948509 100644
--- a/src/governance-votedb.cpp
+++ b/src/governance-votedb.cpp
@@ -68,6 +68,23 @@ void CGovernanceObjectVoteFile::RemoveVotesFromMasternode(const COutPoint& outpo
     }
 }
 
+std::vector<uint256> CGovernanceObjectVoteFile::RemoveOldVotes(unsigned int nMinTime)
+{
+    std::vector<uint256> removed;
+    vote_l_it it = listVotes.begin();
+    while (it != listVotes.end()) {
+        if (it->GetTimestamp() < nMinTime) {
+            --nMemoryVotes;
+            removed.emplace_back(it->GetHash());
+            mapVoteIndex.erase(it->GetHash());
+            listVotes.erase(it++);
+        } else {
+            ++it;
+        }
+    }
+    return removed;
+}
+
 void CGovernanceObjectVoteFile::RebuildIndex()
 {
     mapVoteIndex.clear();
diff --git a/src/governance-votedb.h b/src/governance-votedb.h
index c3b42f593be5..3a13d2e81bf1 100644
--- a/src/governance-votedb.h
+++ b/src/governance-votedb.h
@@ -74,6 +74,9 @@ class CGovernanceObjectVoteFile
 
     void RemoveVotesFromMasternode(const COutPoint& outpointMasternode);
 
+    // TODO can be removed after full DIP3 deployment
+    std::vector<uint256> RemoveOldVotes(unsigned int nMinTime);
+
     ADD_SERIALIZE_METHODS;
 
     template <typename Stream, typename Operation>
diff --git a/src/governance.cpp b/src/governance.cpp
index 11633ebedaab..a3cd27efd6fb 100644
--- a/src/governance.cpp
+++ b/src/governance.cpp
@@ -222,6 +222,12 @@ void CGovernanceManager::ProcessMessage(CNode* pfrom, const std::string& strComm
         CGovernanceVote vote;
         vRecv >> vote;
 
+        // TODO remove this check after full DIP3 deployment
+        if (vote.GetTimestamp() < GetMinVoteTime()) {
+            // Ignore votes pre-DIP3
+            return;
+        }
+
         uint256 nHash = vote.GetHash();
 
         {
@@ -573,6 +579,10 @@ void CGovernanceManager::DoMaintenance(CConnman& connman)
 {
     if (fLiteMode || !masternodeSync.IsSynced() || ShutdownRequested()) return;
 
+    if (deterministicMNManager->IsDeterministicMNsSporkActive()) {
+        ClearPreDIP3Votes();
+    }
+
     // CHECK OBJECTS WE'VE ASKED FOR, REMOVE OLD ENTRIES
 
     CleanOrphanObjects();
@@ -676,7 +686,7 @@ void CGovernanceManager::SyncSingleObjAndItsVotes(CNode* pnode, const uint256& n
     for (const auto& vote : fileVotes.GetVotes()) {
         uint256 nVoteHash = vote.GetHash();
 
-        bool onlyOwnerAllowed = govobj.GetObjectType() == GOVERNANCE_OBJECT_PROPOSAL;
+        bool onlyOwnerAllowed = govobj.GetObjectType() == GOVERNANCE_OBJECT_PROPOSAL && vote.GetSignal() == VOTE_SIGNAL_FUNDING;
 
         if (filter.contains(nVoteHash) || !vote.IsValid(onlyOwnerAllowed)) {
             continue;
@@ -1291,6 +1301,10 @@ void CGovernanceManager::UpdatedBlockTip(const CBlockIndex* pindex, CConnman& co
     nCachedBlockHeight = pindex->nHeight;
     LogPrint("gobject", "CGovernanceManager::UpdatedBlockTip -- nCachedBlockHeight: %d\n", nCachedBlockHeight);
 
+    if (deterministicMNManager->IsDeterministicMNsSporkActive(pindex->nHeight)) {
+        ClearPreDIP3Votes();
+    }
+
     CheckPostponedObjects(connman);
 
     CSuperblockManager::ExecuteBestSuperblock(pindex->nHeight);
@@ -1342,3 +1356,37 @@ void CGovernanceManager::CleanOrphanObjects()
         }
     }
 }
+
+unsigned int CGovernanceManager::GetMinVoteTime()
+{
+    LOCK(cs_main);
+    if (!deterministicMNManager->IsDeterministicMNsSporkActive()) {
+        return 0;
+    }
+    int64_t dip3SporkHeight = sporkManager.GetSporkValue(SPORK_15_DETERMINISTIC_MNS_ENABLED);
+    return chainActive[dip3SporkHeight]->nTime;
+}
+
+void CGovernanceManager::ClearPreDIP3Votes()
+{
+    // This removes all votes which were created before DIP3 spork15 activation
+    // All these votes are invalid immediately after spork15 activation due to the introduction of voting keys, which
+    // are not equal to the old masternode private keys
+
+    unsigned int minVoteTime = GetMinVoteTime();
+
+    LOCK(cs);
+    for (auto& p : mapObjects) {
+        auto& obj = p.second;
+        auto removed = obj.RemoveOldVotes(minVoteTime);
+        if (removed.empty()) {
+            continue;
+        }
+        for (auto& voteHash : removed) {
+            cmapVoteToObject.Erase(voteHash);
+            cmapInvalidVotes.Erase(voteHash);
+            cmmapOrphanVotes.Erase(voteHash);
+            setRequestedVotes.erase(voteHash);
+        }
+    }
+}
diff --git a/src/governance.h b/src/governance.h
index 6d07fdcafbbc..6790c2b2edbf 100644
--- a/src/governance.h
+++ b/src/governance.h
@@ -448,6 +448,10 @@ class CGovernanceManager
     void RequestOrphanObjects(CConnman& connman);
 
     void CleanOrphanObjects();
+
+    // TODO can be removed after full DIP3 deployment
+    unsigned int GetMinVoteTime();
+    void ClearPreDIP3Votes();
 };
 
 #endif
diff --git a/src/rpc/governance.cpp b/src/rpc/governance.cpp
index 7c9e7f45a5e8..2519a03172df 100644
--- a/src/rpc/governance.cpp
+++ b/src/rpc/governance.cpp
@@ -1086,7 +1086,7 @@ UniValue voteraw(const JSONRPCRequest& request)
     vote.SetTime(nTime);
     vote.SetSignature(vchSig);
 
-    bool onlyOwnerAllowed = govObjType == GOVERNANCE_OBJECT_PROPOSAL;
+    bool onlyOwnerAllowed = govObjType == GOVERNANCE_OBJECT_PROPOSAL && vote.GetSignal() == VOTE_SIGNAL_FUNDING;
 
     if (!vote.IsValid(onlyOwnerAllowed)) {
         throw JSONRPCError(RPC_INTERNAL_ERROR, "Failure to verify vote.");

From 0224914200e7886a8f4069b2b404dd8dae6b9936 Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Mon, 3 Dec 2018 16:48:29 +0100
Subject: [PATCH 339/400] Print the state object when ProcessSpecialTxsInBlock
 fails in ConnectBlock (#2516)

Currently, when any DIP2/3/6 validation fails, there is no error message
printed that shows what exactly went wrong.
---
 src/validation.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/validation.cpp b/src/validation.cpp
index 69856143a162..ecc8e42948a9 100644
--- a/src/validation.cpp
+++ b/src/validation.cpp
@@ -2188,8 +2188,10 @@ static bool ConnectBlock(const CBlock& block, CValidationState& state, CBlockInd
     int64_t nTime3 = GetTimeMicros(); nTimeConnect += nTime3 - nTime2;
     LogPrint("bench", "      - Connect %u transactions: %.2fms (%.3fms/tx, %.3fms/txin) [%.2fs]\n", (unsigned)block.vtx.size(), 0.001 * (nTime3 - nTime2), 0.001 * (nTime3 - nTime2) / block.vtx.size(), nInputs <= 1 ? 0 : 0.001 * (nTime3 - nTime2) / (nInputs-1), nTimeConnect * 0.000001);
 
-    if (!ProcessSpecialTxsInBlock(block, pindex, state))
-        return false;
+    if (!ProcessSpecialTxsInBlock(block, pindex, state)) {
+        return error("ConnectBlock(): ProcessSpecialTxsInBlock for block %s failed with %s",
+                     pindex->GetBlockHash().ToString(), FormatStateMessage(state));
+    }
 
     // DASH : MODIFIED TO CHECK MASTERNODE PAYMENTS AND SUPERBLOCKS
 

From 22dcec71a8461c73bdaff97b6967d526ba3c48a0 Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Mon, 3 Dec 2018 16:48:48 +0100
Subject: [PATCH 340/400] Punish nodes which keep requesting and then rejecting
 blocks (#2518)

* Move deserialization of REJECT message fields out of if(fDebug)

* Ban nodes which keep requesting and then rejecting blocks

* Don't read/deserialize reject hash twice

* Only use ban score of 1
---
 src/net_processing.cpp | 41 +++++++++++++++++++++++++----------------
 1 file changed, 25 insertions(+), 16 deletions(-)

diff --git a/src/net_processing.cpp b/src/net_processing.cpp
index c7e2ae53da10..2e45b65dd5e3 100644
--- a/src/net_processing.cpp
+++ b/src/net_processing.cpp
@@ -1386,25 +1386,34 @@ bool static ProcessMessage(CNode* pfrom, const std::string& strCommand, CDataStr
 
     if (strCommand == NetMsgType::REJECT)
     {
-        if (fDebug) {
-            try {
-                std::string strMsg; unsigned char ccode; std::string strReason;
-                vRecv >> LIMITED_STRING(strMsg, CMessageHeader::COMMAND_SIZE) >> ccode >> LIMITED_STRING(strReason, MAX_REJECT_MESSAGE_LENGTH);
+        std::string strMsg; unsigned char ccode; std::string strReason;
+        uint256 hash;
+        try {
+            vRecv >> LIMITED_STRING(strMsg, CMessageHeader::COMMAND_SIZE) >> ccode >> LIMITED_STRING(strReason, MAX_REJECT_MESSAGE_LENGTH);
+            if (strMsg == NetMsgType::BLOCK || strMsg == NetMsgType::TX) {
+                vRecv >> hash;
+            }
+        } catch (const std::ios_base::failure&) {
+            // Avoid feedback loops by preventing reject messages from triggering a new reject message.
+            LogPrint("net", "Unparseable reject message received\n");
+        }
 
-                std::ostringstream ss;
-                ss << strMsg << " code " << itostr(ccode) << ": " << strReason;
+        if (strMsg == NetMsgType::BLOCK) {
+            // The node requested a block from us and then rejected it, which indicates that it's most likely running
+            // on rules which are incompatible to ours. Better to ban him after some time as it might otherwise keep
+            // asking for the same block (if -addnode/-connect was used on the other side).
+            LOCK(cs_main);
+            Misbehaving(pfrom->id, 1);
+        }
 
-                if (strMsg == NetMsgType::BLOCK || strMsg == NetMsgType::TX)
-                {
-                    uint256 hash;
-                    vRecv >> hash;
-                    ss << ": hash " << hash.ToString();
-                }
-                LogPrint("net", "Reject %s\n", SanitizeString(ss.str()));
-            } catch (const std::ios_base::failure&) {
-                // Avoid feedback loops by preventing reject messages from triggering a new reject message.
-                LogPrint("net", "Unparseable reject message received\n");
+        if (fDebug) {
+            std::ostringstream ss;
+            ss << strMsg << " code " << itostr(ccode) << ": " << strReason;
+
+            if (strMsg == NetMsgType::BLOCK || strMsg == NetMsgType::TX) {
+                ss << ": hash " << hash.ToString();
             }
+            LogPrint("net", "Reject %s\n", SanitizeString(ss.str()));
         }
     }
 

From 1270b712291cd7782b2d41cbfed81fb692c019d4 Mon Sep 17 00:00:00 2001
From: Salisbury <salisbury.espinosa@gmail.com>
Date: Mon, 3 Dec 2018 18:49:21 +0300
Subject: [PATCH 341/400] Use a verbosity instead of two verbose parameters
 (#2506)

---
 src/rpc/blockchain.cpp | 39 ++++++++++++++++++++++++++-------------
 src/rpc/client.cpp     |  2 +-
 src/rpc/server.cpp     | 14 ++++++++++++--
 3 files changed, 39 insertions(+), 16 deletions(-)

diff --git a/src/rpc/blockchain.cpp b/src/rpc/blockchain.cpp
index d133cb4eeca0..d72ed10f8fbe 100644
--- a/src/rpc/blockchain.cpp
+++ b/src/rpc/blockchain.cpp
@@ -830,13 +830,16 @@ UniValue getblock(const JSONRPCRequest& request)
 {
     if (request.fHelp || request.params.size() < 1 || request.params.size() > 2)
         throw std::runtime_error(
-            "getblock \"blockhash\" ( verbose )\n"
-            "\nIf verbose is false, returns a string that is serialized, hex-encoded data for block 'hash'.\n"
-            "If verbose is true, returns an Object with information about block <hash>.\n"
+            "getblock \"blockhash\" ( verbosity ) \n"
+            "\nIf verbosity is 0, returns a string that is serialized, hex-encoded data for block 'hash'.\n"
+            "If verbosity is 1, returns an Object with information about block <hash>.\n"
+            "If verbosity is 2, returns an Object with information about block <hash> and information about each transaction. \n"
             "\nArguments:\n"
             "1. \"blockhash\"          (string, required) The block hash\n"
-            "2. verbose                (boolean, optional, default=true) true for a json object, false for the hex encoded data\n"
-            "\nResult (for verbose = true):\n"
+            "2. verbosity              (numeric, optional, default=1) 0 for hex-encoded data, 1 for a json object, and 2 for json object with transaction data\n"
+            "\nResult (for verbosity = 0):\n"
+            "\"data\"             (string) A string that is serialized, hex-encoded data for block 'hash'.\n"
+            "\nResult (for verbose = 1):\n"
             "{\n"
             "  \"hash\" : \"hash\",     (string) the block hash (same as provided)\n"
             "  \"confirmations\" : n,   (numeric) The number of confirmations, or -1 if the block is not on the main chain\n"
@@ -858,8 +861,14 @@ UniValue getblock(const JSONRPCRequest& request)
             "  \"previousblockhash\" : \"hash\",  (string) The hash of the previous block\n"
             "  \"nextblockhash\" : \"hash\"       (string) The hash of the next block\n"
             "}\n"
-            "\nResult (for verbose=false):\n"
-            "\"data\"             (string) A string that is serialized, hex-encoded data for block 'hash'.\n"
+            "\nResult (for verbosity = 2):\n"
+            "{\n"
+            "  ...,                     Same output as verbosity = 1.\n"
+            "  \"tx\" : [               (array of Objects) The transactions in the format of the getrawtransaction RPC. Different from verbosity = 1 \"tx\" result.\n"
+            "         ,...\n"
+            "  ],\n"
+            "  ,...                     Same output as verbosity = 1.\n"
+            "}\n"
             "\nExamples:\n"
             + HelpExampleCli("getblock", "\"00000000000fd08c2fb661d2fcb0d49abb3a91e5f27082ce64feed3b4dede2e2\"")
             + HelpExampleRpc("getblock", "\"00000000000fd08c2fb661d2fcb0d49abb3a91e5f27082ce64feed3b4dede2e2\"")
@@ -870,9 +879,13 @@ UniValue getblock(const JSONRPCRequest& request)
     std::string strHash = request.params[0].get_str();
     uint256 hash(uint256S(strHash));
 
-    bool fVerbose = true;
-    if (request.params.size() > 1)
-        fVerbose = request.params[1].get_bool();
+    int verbosity = 1;
+    if (request.params.size() > 1) {
+        if(request.params[1].isNum())
+            verbosity = request.params[1].get_int();
+        else
+            verbosity = request.params[1].get_bool() ? 1 : 0;
+    }
 
     if (mapBlockIndex.count(hash) == 0)
         throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Block not found");
@@ -886,7 +899,7 @@ UniValue getblock(const JSONRPCRequest& request)
     if(!ReadBlockFromDisk(block, pblockindex, Params().GetConsensus()))
         throw JSONRPCError(RPC_INTERNAL_ERROR, "Can't read block from disk");
 
-    if (!fVerbose)
+    if (verbosity <= 0)
     {
         CDataStream ssBlock(SER_NETWORK, PROTOCOL_VERSION);
         ssBlock << block;
@@ -894,7 +907,7 @@ UniValue getblock(const JSONRPCRequest& request)
         return strHex;
     }
 
-    return blockToJSON(block, pblockindex);
+    return blockToJSON(block, pblockindex, verbosity >= 2);
 }
 
 struct CCoinsStats
@@ -1613,7 +1626,7 @@ static const CRPCCommand commands[] =
     { "blockchain",         "getblockchaininfo",      &getblockchaininfo,      true,  {} },
     { "blockchain",         "getbestblockhash",       &getbestblockhash,       true,  {} },
     { "blockchain",         "getblockcount",          &getblockcount,          true,  {} },
-    { "blockchain",         "getblock",               &getblock,               true,  {"blockhash","verbose"} },
+    { "blockchain",         "getblock",               &getblock,               true,  {"blockhash","verbosity|verbose"} },
     { "blockchain",         "getblockhashes",         &getblockhashes,         true,  {"high","low"} },
     { "blockchain",         "getblockhash",           &getblockhash,           true,  {"height"} },
     { "blockchain",         "getblockheader",         &getblockheader,         true,  {"blockhash","verbose"} },
diff --git a/src/rpc/client.cpp b/src/rpc/client.cpp
index e1c6fb2ad544..643beb54e7c9 100644
--- a/src/rpc/client.cpp
+++ b/src/rpc/client.cpp
@@ -97,7 +97,7 @@ static const CRPCConvertParam vRPCConvertParams[] =
     { "listunspent", 1, "maxconf" },
     { "listunspent", 2, "addresses" },
     { "listunspent", 3, "include_unsafe" },
-    { "getblock", 1, "verbose" },
+    { "getblock", 1, "verbosity" },
     { "getblockheader", 1, "verbose" },
     { "getblockheaders", 1, "count" },
     { "getblockheaders", 2, "verbose" },
diff --git a/src/rpc/server.cpp b/src/rpc/server.cpp
index d969efdbc20f..c006b79562f5 100644
--- a/src/rpc/server.cpp
+++ b/src/rpc/server.cpp
@@ -23,6 +23,8 @@
 #include <boost/signals2/signal.hpp>
 #include <boost/thread.hpp>
 #include <boost/algorithm/string/case_conv.hpp> // for to_upper()
+#include <boost/algorithm/string/classification.hpp>
+#include <boost/algorithm/string/split.hpp>
 
 #include <algorithm>
 #include <memory> // for unique_ptr
@@ -495,8 +497,16 @@ static inline JSONRPCRequest transformNamedArguments(const JSONRPCRequest& in, c
     }
     // Process expected parameters.
     int hole = 0;
-    for (const std::string &argName: argNames) {
-        auto fr = argsIn.find(argName);
+    for (const std::string &argNamePattern: argNames) {
+        std::vector<std::string> vargNames;
+        boost::algorithm::split(vargNames, argNamePattern, boost::algorithm::is_any_of("|"));
+        auto fr = argsIn.end();
+        for (const std::string & argName : vargNames) {
+            fr = argsIn.find(argName);
+            if (fr != argsIn.end()) {
+                break;
+            }
+        }
         if (fr != argsIn.end()) {
             for (int i = 0; i < hole; ++i) {
                 // Fill hole between specified parameters with JSON nulls,

From 818f0f4647f895f2d7f8a09d3ee2087b1e4eb7d0 Mon Sep 17 00:00:00 2001
From: PastaPastaPasta <pasta@dashboost.org>
Date: Mon, 3 Dec 2018 12:00:09 -0600
Subject: [PATCH 342/400] Allow consuming specific UTXO in gobject prepare
 command (#2482)

* Implement optional CoinControl for gobject prepare

* Removes duplicate `);` from merge error

Co-Authored-By: PastaPastaPasta <pasta@dashboost.org>

* Fix equality check allowing more relevant help output

* Pass COutPoint as const reference

Co-Authored-By: PastaPastaPasta <pasta@dashboost.org>

* Remove unnecessary SetNull call

Co-Authored-By: PastaPastaPasta <pasta@dashboost.org>

* Specify proposal fee

Co-Authored-By: PastaPastaPasta <pasta@dashboost.org>
---
 src/rpc/governance.cpp | 22 +++++++++++++++++++---
 src/wallet/wallet.cpp  |  9 ++++++---
 src/wallet/wallet.h    |  2 +-
 3 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/src/rpc/governance.cpp b/src/rpc/governance.cpp
index 2519a03172df..97927afafacc 100644
--- a/src/rpc/governance.cpp
+++ b/src/rpc/governance.cpp
@@ -133,12 +133,14 @@ void gobject_prepare_help()
                 "3. time          (numeric, required) time this object was created\n"
                 "4. data-hex      (string, required)  data in hex string form\n"
                 "5. use-IS        (boolean, optional, default=false) InstantSend lock the collateral, only requiring one chain confirmation\n"
+                "6. outputHash    (string, optional) the single output to submit the proposal fee from\n"
+                "7. outputIndex   (numeric, optional) The output index.\n"
                 );
 }
 
 UniValue gobject_prepare(const JSONRPCRequest& request)
 {
-    if (request.fHelp || (request.params.size() != 5 && request.params.size() != 6)) 
+    if (request.fHelp || (request.params.size() != 5 && request.params.size() != 6 && request.params.size() != 8)) 
         gobject_prepare_help();
 
     if (!EnsureWalletIsAvailable(request.fHelp))
@@ -199,9 +201,23 @@ UniValue gobject_prepare(const JSONRPCRequest& request)
 
     EnsureWalletIsUnlocked();
 
+    // If specified, spend this outpoint as the proposal fee
+    COutPoint outpoint;
+    outpoint.SetNull();
+    if (request.params.size() == 8) {
+        uint256 collateralHash = ParseHashV(request.params[6], "outputHash");
+        int32_t collateralIndex = ParseInt32V(request.params[7], "outputIndex");
+        if (collateralHash.IsNull() || collateralIndex < 0) {
+            throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, strprintf("invalid hash or index: %s-%d", collateralHash.ToString(), collateralIndex));
+        }
+        outpoint = COutPoint(collateralHash, (uint32_t)collateralIndex);
+    }
+
     CWalletTx wtx;
-    if (!pwalletMain->GetBudgetSystemCollateralTX(wtx, govobj.GetHash(), govobj.GetMinCollateralFee(), useIS)) {
-        throw JSONRPCError(RPC_INTERNAL_ERROR, "Error making collateral transaction for governance object. Please check your wallet balance and make sure your wallet is unlocked.");
+    if (!pwalletMain->GetBudgetSystemCollateralTX(wtx, govobj.GetHash(), govobj.GetMinCollateralFee(), useIS, outpoint)) {
+        std::string err = "Error making collateral transaction for governance object. Please check your wallet balance and make sure your wallet is unlocked.";
+        if (request.params.size() == 8) err += "Please verify your specified output is valid and is enough for the combined proposal fee and transaction fee.";
+        throw JSONRPCError(RPC_INTERNAL_ERROR, err);
     }
 
     // -- make our change address
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
index ca9b51d1e41a..f1bb0b4ccec4 100644
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -3356,7 +3356,7 @@ bool CWallet::CreateCollateralTransaction(CMutableTransaction& txCollateral, std
     return true;
 }
 
-bool CWallet::GetBudgetSystemCollateralTX(CWalletTx& tx, uint256 hash, CAmount amount, bool fUseInstantSend)
+bool CWallet::GetBudgetSystemCollateralTX(CWalletTx& tx, uint256 hash, CAmount amount, bool fUseInstantSend, const COutPoint& outpoint)
 {
     // make our change address
     CReserveKey reservekey(this);
@@ -3370,8 +3370,11 @@ bool CWallet::GetBudgetSystemCollateralTX(CWalletTx& tx, uint256 hash, CAmount a
     std::vector< CRecipient > vecSend;
     vecSend.push_back((CRecipient){scriptChange, amount, false});
 
-    CCoinControl *coinControl=NULL;
-    bool success = CreateTransaction(vecSend, tx, reservekey, nFeeRet, nChangePosRet, strFail, coinControl, true, ALL_COINS, fUseInstantSend);
+    CCoinControl coinControl;
+    if (!outpoint.IsNull()) {
+        coinControl.Select(outpoint);
+    }
+    bool success = CreateTransaction(vecSend, tx, reservekey, nFeeRet, nChangePosRet, strFail, &coinControl, true, ALL_COINS, fUseInstantSend);
     if(!success){
         LogPrintf("CWallet::GetBudgetSystemCollateralTX -- Error: %s\n", strFail);
         return false;
diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h
index d17e8e957490..2e07ac69f89e 100644
--- a/src/wallet/wallet.h
+++ b/src/wallet/wallet.h
@@ -922,7 +922,7 @@ class CWallet : public CCryptoKeyStore, public CValidationInterface
     CAmount GetNeedsToBeAnonymizedBalance(CAmount nMinBalance = 0) const;
     CAmount GetDenominatedBalance(bool unconfirmed=false) const;
 
-    bool GetBudgetSystemCollateralTX(CWalletTx& tx, uint256 hash, CAmount amount, bool fUseInstantSend);
+    bool GetBudgetSystemCollateralTX(CWalletTx& tx, uint256 hash, CAmount amount, bool fUseInstantSend, const COutPoint& outpoint=COutPoint()/*defaults null*/);
 
     /**
      * Insert additional inputs into the transaction by

From 973a7f6dd6a984a3a1b79983d2a8d9c45dd8c716 Mon Sep 17 00:00:00 2001
From: UdjinM6 <UdjinM6@users.noreply.github.com>
Date: Thu, 6 Dec 2018 10:05:05 +0300
Subject: [PATCH 343/400] Fix GUI warnings in debug.log (#2521)

Specifically:

```
GUI: QMetaObject::connectSlotsByName: No matching signal for on_extraInfoDIP3_doubleClicked()
GUI: QMetaObject::connectSlotsByName: No matching signal for on_copyProTxHash_clicked()
GUI: QMetaObject::connectSlotsByName: No matching signal for on_copyCollateralOutpoint_clicked()
```
---
 src/qt/masternodelist.cpp | 12 ++++++------
 src/qt/masternodelist.h   |  6 +++---
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/qt/masternodelist.cpp b/src/qt/masternodelist.cpp
index ccaaac8adaf1..34356b489559 100644
--- a/src/qt/masternodelist.cpp
+++ b/src/qt/masternodelist.cpp
@@ -94,9 +94,9 @@ MasternodeList::MasternodeList(const PlatformStyle* platformStyle, QWidget* pare
     contextMenuDIP3->addAction(copyProTxHashAction);
     contextMenuDIP3->addAction(copyCollateralOutpointAction);
     connect(ui->tableWidgetMasternodesDIP3, SIGNAL(customContextMenuRequested(const QPoint&)), this, SLOT(showContextMenuDIP3(const QPoint&)));
-    connect(ui->tableWidgetMasternodesDIP3, SIGNAL(doubleClicked(QModelIndex)), this, SLOT(on_extraInfoDIP3_clicked()));
-    connect(copyProTxHashAction, SIGNAL(triggered()), this, SLOT(on_copyProTxHash_clicked()));
-    connect(copyCollateralOutpointAction, SIGNAL(triggered()), this, SLOT(on_copyCollateralOutpoint_clicked()));
+    connect(ui->tableWidgetMasternodesDIP3, SIGNAL(doubleClicked(QModelIndex)), this, SLOT(extraInfoDIP3_clicked()));
+    connect(copyProTxHashAction, SIGNAL(triggered()), this, SLOT(copyProTxHash_clicked()));
+    connect(copyCollateralOutpointAction, SIGNAL(triggered()), this, SLOT(copyCollateralOutpoint_clicked()));
 
     timer = new QTimer(this);
     connect(timer, SIGNAL(timeout()), this, SLOT(updateNodeList()));
@@ -691,7 +691,7 @@ CDeterministicMNCPtr MasternodeList::GetSelectedDIP3MN()
     return mnList.GetUniquePropertyMN(addr);
 }
 
-void MasternodeList::on_extraInfoDIP3_clicked()
+void MasternodeList::extraInfoDIP3_clicked()
 {
     auto dmn = GetSelectedDIP3MN();
     if (!dmn) {
@@ -708,7 +708,7 @@ void MasternodeList::on_extraInfoDIP3_clicked()
     QMessageBox::information(this, strWindowtitle, strText);
 }
 
-void MasternodeList::on_copyProTxHash_clicked()
+void MasternodeList::copyProTxHash_clicked()
 {
     auto dmn = GetSelectedDIP3MN();
     if (!dmn) {
@@ -718,7 +718,7 @@ void MasternodeList::on_copyProTxHash_clicked()
     QApplication::clipboard()->setText(QString::fromStdString(dmn->proTxHash.ToString()));
 }
 
-void MasternodeList::on_copyCollateralOutpoint_clicked()
+void MasternodeList::copyCollateralOutpoint_clicked()
 {
     auto dmn = GetSelectedDIP3MN();
     if (!dmn) {
diff --git a/src/qt/masternodelist.h b/src/qt/masternodelist.h
index e10b323e6f37..5532c94e661c 100644
--- a/src/qt/masternodelist.h
+++ b/src/qt/masternodelist.h
@@ -91,8 +91,8 @@ private Q_SLOTS:
     void on_tableWidgetMyMasternodes_itemSelectionChanged();
     void on_UpdateButton_clicked();
 
-    void on_extraInfoDIP3_clicked();
-    void on_copyProTxHash_clicked();
-    void on_copyCollateralOutpoint_clicked();
+    void extraInfoDIP3_clicked();
+    void copyProTxHash_clicked();
+    void copyCollateralOutpoint_clicked();
 };
 #endif // MASTERNODELIST_H

From 3a6bd8d235ae9a8e310d07e5c90840ba353b8eed Mon Sep 17 00:00:00 2001
From: UdjinM6 <UdjinM6@users.noreply.github.com>
Date: Thu, 6 Dec 2018 10:05:36 +0300
Subject: [PATCH 344/400] Call ProcessTick every second, handle tick cooldown
 inside (#2522)

---
 src/init.cpp            | 2 +-
 src/masternode-sync.cpp | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/init.cpp b/src/init.cpp
index 118700cf6e86..a66c23991157 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -2078,7 +2078,7 @@ bool AppInitMain(boost::thread_group& threadGroup, CScheduler& scheduler)
 
     if (!fLiteMode) {
         scheduler.scheduleEvery(boost::bind(&CNetFulfilledRequestManager::DoMaintenance, boost::ref(netfulfilledman)), 60);
-        scheduler.scheduleEvery(boost::bind(&CMasternodeSync::DoMaintenance, boost::ref(masternodeSync), boost::ref(*g_connman)), MASTERNODE_SYNC_TICK_SECONDS);
+        scheduler.scheduleEvery(boost::bind(&CMasternodeSync::DoMaintenance, boost::ref(masternodeSync), boost::ref(*g_connman)), 1);
         scheduler.scheduleEvery(boost::bind(&CMasternodeMan::DoMaintenance, boost::ref(mnodeman), boost::ref(*g_connman)), 1);
         scheduler.scheduleEvery(boost::bind(&CActiveLegacyMasternodeManager::DoMaintenance, boost::ref(legacyActiveMasternodeManager), boost::ref(*g_connman)), MASTERNODE_MIN_MNP_SECONDS);
 
diff --git a/src/masternode-sync.cpp b/src/masternode-sync.cpp
index 5cfa2cc1ee6d..b5cf4dc950fe 100644
--- a/src/masternode-sync.cpp
+++ b/src/masternode-sync.cpp
@@ -150,6 +150,12 @@ void CMasternodeSync::ProcessTick(CConnman& connman)
         nTimeLastProcess = GetTime();
         return;
     }
+
+    if(GetTime() - nTimeLastProcess < MASTERNODE_SYNC_TICK_SECONDS) {
+        // too early, nothing to do here
+        return;
+    }
+
     nTimeLastProcess = GetTime();
 
     // reset sync status in case of any other sync failure

From 7037f7c999f199f1186249918201d95a6fb290d9 Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Thu, 6 Dec 2018 08:05:57 +0100
Subject: [PATCH 345/400] Bail out from GetBlockTxOuts in case nBlockHeight is
 above tip+1 (#2523)

In the future, we should make sure that this method is only called for the
currently mined block or for old blocks, but never for non-existing blocks
further in the future.
---
 src/masternode-payments.cpp | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/masternode-payments.cpp b/src/masternode-payments.cpp
index 3ec15f7c1bb0..2c14bc1eb53e 100644
--- a/src/masternode-payments.cpp
+++ b/src/masternode-payments.cpp
@@ -595,6 +595,13 @@ bool CMasternodePayments::GetBlockTxOuts(int nBlockHeight, CAmount blockReward,
         uint256 blockHash;
         {
             LOCK(cs_main);
+            if (nBlockHeight - 1 > chainActive.Height()) {
+                // there are some cases (e.g. IsScheduled) where legacy/compatibility code runs into this method with
+                // block heights above the chain tip. Return false in this case
+                // TODO remove this when removing the compatibility code and make sure this method is only called with
+                // correct block height
+                return false;
+            }
             blockHash = chainActive[nBlockHeight - 1]->GetBlockHash();
         }
         uint256 proTxHash;

From 08dc178711e1570f5de6b93a81c14ad42a2b3c1d Mon Sep 17 00:00:00 2001
From: UdjinM6 <UdjinM6@users.noreply.github.com>
Date: Thu, 6 Dec 2018 10:06:21 +0300
Subject: [PATCH 346/400] Drop pre-DIP3 votes from current votes per MN per
 object (#2524)

---
 src/governance-object.cpp | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/src/governance-object.cpp b/src/governance-object.cpp
index 67ef9a7696c8..4d05a1f2b9e4 100644
--- a/src/governance-object.cpp
+++ b/src/governance-object.cpp
@@ -795,6 +795,7 @@ std::vector<uint256> CGovernanceObject::RemoveOldVotes(unsigned int nMinTime)
 {
     LOCK(cs);
 
+    // Drop pre-DIP3 votes from vote db
     auto removed = fileVotes.RemoveOldVotes(nMinTime);
 
     if (!removed.empty()) {
@@ -806,5 +807,24 @@ std::vector<uint256> CGovernanceObject::RemoveOldVotes(unsigned int nMinTime)
         fDirtyCache = true;
     }
 
+    // Same for current votes per MN for this specific object
+    auto itMnPair = mapCurrentMNVotes.begin();
+    while (itMnPair != mapCurrentMNVotes.end()) {
+        auto& miRef = itMnPair->second.mapInstances;
+        auto itVotePair = miRef.begin();
+        while (itVotePair != miRef.end()) {
+            if (itVotePair->second.nTime < nMinTime) {
+                miRef.erase(itVotePair++);
+            } else {
+                ++itVotePair;
+            }
+        }
+        if (miRef.empty()) {
+            mapCurrentMNVotes.erase(itMnPair++);
+        } else {
+            ++itMnPair;
+        }
+    }
+
     return removed;
 }

From 60867978d6b0a61611bf38395748d05e20009bd1 Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Thu, 6 Dec 2018 08:06:37 +0100
Subject: [PATCH 347/400] Avoid printing DIP3/DIP4 related logs twice (#2525)

All logging that happens in BuildNewListFromBlock is currently printed twice.
This is because BuildNewListFromBlock is called while processing the block
and also while calculating the DIP4 MN list commitment.

This commit adds the debugLogs to this method to allow omitting logs while
called from the DIP4 code.
---
 src/evo/cbtx.cpp             |  2 +-
 src/evo/deterministicmns.cpp | 67 ++++++++++++++++++++++--------------
 src/evo/deterministicmns.h   |  6 ++--
 3 files changed, 46 insertions(+), 29 deletions(-)

diff --git a/src/evo/cbtx.cpp b/src/evo/cbtx.cpp
index 643b79595b10..616eef489c3b 100644
--- a/src/evo/cbtx.cpp
+++ b/src/evo/cbtx.cpp
@@ -67,7 +67,7 @@ bool CalcCbTxMerkleRootMNList(const CBlock& block, const CBlockIndex* pindexPrev
     LOCK(deterministicMNManager->cs);
 
     CDeterministicMNList tmpMNList;
-    if (!deterministicMNManager->BuildNewListFromBlock(block, pindexPrev, state, tmpMNList)) {
+    if (!deterministicMNManager->BuildNewListFromBlock(block, pindexPrev, state, tmpMNList, false)) {
         return false;
     }
 
diff --git a/src/evo/deterministicmns.cpp b/src/evo/deterministicmns.cpp
index 502f330b08dd..162d3029c5a2 100644
--- a/src/evo/deterministicmns.cpp
+++ b/src/evo/deterministicmns.cpp
@@ -275,7 +275,7 @@ int CDeterministicMNList::CalcPenalty(int percent) const
     return (CalcMaxPoSePenalty() * percent) / 100;
 }
 
-void CDeterministicMNList::PoSePunish(const uint256& proTxHash, int penalty)
+void CDeterministicMNList::PoSePunish(const uint256& proTxHash, int penalty, bool debugLogs)
 {
     assert(penalty > 0);
 
@@ -288,13 +288,17 @@ void CDeterministicMNList::PoSePunish(const uint256& proTxHash, int penalty)
     newState->nPoSePenalty += penalty;
     newState->nPoSePenalty = std::min(maxPenalty, newState->nPoSePenalty);
 
-    LogPrintf("CDeterministicMNList::%s -- punished MN %s, penalty %d->%d (max=%d)\n",
-              __func__, proTxHash.ToString(), dmn->pdmnState->nPoSePenalty, newState->nPoSePenalty, maxPenalty);
+    if (debugLogs) {
+        LogPrintf("CDeterministicMNList::%s -- punished MN %s, penalty %d->%d (max=%d)\n",
+                  __func__, proTxHash.ToString(), dmn->pdmnState->nPoSePenalty, newState->nPoSePenalty, maxPenalty);
+    }
 
     if (newState->nPoSePenalty >= maxPenalty && newState->nPoSeBanHeight == -1) {
         newState->nPoSeBanHeight = nHeight;
-        LogPrintf("CDeterministicMNList::%s -- banned MN %s at height %d\n",
-                  __func__, proTxHash.ToString(), nHeight);
+        if (debugLogs) {
+            LogPrintf("CDeterministicMNList::%s -- banned MN %s at height %d\n",
+                      __func__, proTxHash.ToString(), nHeight);
+        }
     }
     UpdateMN(proTxHash, newState);
 }
@@ -431,7 +435,7 @@ bool CDeterministicMNManager::ProcessBlock(const CBlock& block, const CBlockInde
     int nHeight = pindexPrev->nHeight + 1;
 
     CDeterministicMNList newList;
-    if (!BuildNewListFromBlock(block, pindexPrev, _state, newList)) {
+    if (!BuildNewListFromBlock(block, pindexPrev, _state, newList, true)) {
         return false;
     }
 
@@ -486,7 +490,7 @@ void CDeterministicMNManager::UpdatedBlockTip(const CBlockIndex* pindex)
     tipBlockHash = pindex->GetBlockHash();
 }
 
-bool CDeterministicMNManager::BuildNewListFromBlock(const CBlock& block, const CBlockIndex* pindexPrev, CValidationState& _state, CDeterministicMNList& mnListRet)
+bool CDeterministicMNManager::BuildNewListFromBlock(const CBlock& block, const CBlockIndex* pindexPrev, CValidationState& _state, CDeterministicMNList& mnListRet, bool debugLogs)
 {
     AssertLockHeld(cs);
 
@@ -529,8 +533,10 @@ bool CDeterministicMNManager::BuildNewListFromBlock(const CBlock& block, const C
             if (dmn && dmn->collateralOutpoint == in.prevout) {
                 newList.RemoveMN(dmn->proTxHash);
 
-                LogPrintf("CDeterministicMNManager::%s -- MN %s removed from list because collateral was spent. collateralOutpoint=%s, nHeight=%d, mapCurMNs.allMNsCount=%d\n",
-                    __func__, dmn->proTxHash.ToString(), dmn->collateralOutpoint.ToStringShort(), nHeight, newList.GetAllMNsCount());
+                if (debugLogs) {
+                    LogPrintf("CDeterministicMNManager::%s -- MN %s removed from list because collateral was spent. collateralOutpoint=%s, nHeight=%d, mapCurMNs.allMNsCount=%d\n",
+                        __func__, dmn->proTxHash.ToString(), dmn->collateralOutpoint.ToStringShort(), nHeight, newList.GetAllMNsCount());
+                }
             }
         }
 
@@ -568,8 +574,10 @@ bool CDeterministicMNManager::BuildNewListFromBlock(const CBlock& block, const C
                 // In that case the new ProRegTx will replace the old one. This means the old one is removed
                 // and the new one is added like a completely fresh one, which is also at the bottom of the payment list
                 newList.RemoveMN(replacedDmn->proTxHash);
-                LogPrintf("CDeterministicMNManager::%s -- MN %s removed from list because collateral was used for a new ProRegTx. collateralOutpoint=%s, nHeight=%d, mapCurMNs.allMNsCount=%d\n",
-                          __func__, replacedDmn->proTxHash.ToString(), dmn->collateralOutpoint.ToStringShort(), nHeight, newList.GetAllMNsCount());
+                if (debugLogs) {
+                    LogPrintf("CDeterministicMNManager::%s -- MN %s removed from list because collateral was used for a new ProRegTx. collateralOutpoint=%s, nHeight=%d, mapCurMNs.allMNsCount=%d\n",
+                              __func__, replacedDmn->proTxHash.ToString(), dmn->collateralOutpoint.ToStringShort(), nHeight, newList.GetAllMNsCount());
+                }
             }
 
             if (newList.HasUniqueProperty(proTx.addr)) {
@@ -594,8 +602,10 @@ bool CDeterministicMNManager::BuildNewListFromBlock(const CBlock& block, const C
 
             newList.AddMN(dmn);
 
-            LogPrintf("CDeterministicMNManager::%s -- MN %s added at height %d: %s\n",
-                __func__, tx.GetHash().ToString(), nHeight, proTx.ToString());
+            if (debugLogs) {
+                LogPrintf("CDeterministicMNManager::%s -- MN %s added at height %d: %s\n",
+                    __func__, tx.GetHash().ToString(), nHeight, proTx.ToString());
+            }
         } else if (tx.nType == TRANSACTION_PROVIDER_UPDATE_SERVICE) {
             CProUpServTx proTx;
             if (!GetTxPayload(tx, proTx)) {
@@ -621,15 +631,18 @@ bool CDeterministicMNManager::BuildNewListFromBlock(const CBlock& block, const C
                     newState->nPoSeBanHeight = -1;
                     newState->nPoSeRevivedHeight = nHeight;
 
-                    LogPrintf("CDeterministicMNManager::%s -- MN %s revived at height %d\n",
-                        __func__, proTx.proTxHash.ToString(), nHeight);
+                    if (debugLogs) {
+                        LogPrintf("CDeterministicMNManager::%s -- MN %s revived at height %d\n",
+                            __func__, proTx.proTxHash.ToString(), nHeight);
+                    }
                 }
             }
 
             newList.UpdateMN(proTx.proTxHash, newState);
-
-            LogPrintf("CDeterministicMNManager::%s -- MN %s updated at height %d: %s\n",
-                __func__, proTx.proTxHash.ToString(), nHeight, proTx.ToString());
+            if (debugLogs) {
+                LogPrintf("CDeterministicMNManager::%s -- MN %s updated at height %d: %s\n",
+                    __func__, proTx.proTxHash.ToString(), nHeight, proTx.ToString());
+            }
         } else if (tx.nType == TRANSACTION_PROVIDER_UPDATE_REGISTRAR) {
             CProUpRegTx proTx;
             if (!GetTxPayload(tx, proTx)) {
@@ -652,8 +665,10 @@ bool CDeterministicMNManager::BuildNewListFromBlock(const CBlock& block, const C
 
             newList.UpdateMN(proTx.proTxHash, newState);
 
-            LogPrintf("CDeterministicMNManager::%s -- MN %s updated at height %d: %s\n",
-                __func__, proTx.proTxHash.ToString(), nHeight, proTx.ToString());
+            if (debugLogs) {
+                LogPrintf("CDeterministicMNManager::%s -- MN %s updated at height %d: %s\n",
+                    __func__, proTx.proTxHash.ToString(), nHeight, proTx.ToString());
+            }
         } else if (tx.nType == TRANSACTION_PROVIDER_UPDATE_REVOKE) {
             CProUpRevTx proTx;
             if (!GetTxPayload(tx, proTx)) {
@@ -671,15 +686,17 @@ bool CDeterministicMNManager::BuildNewListFromBlock(const CBlock& block, const C
 
             newList.UpdateMN(proTx.proTxHash, newState);
 
-            LogPrintf("CDeterministicMNManager::%s -- MN %s revoked operator key at height %d: %s\n",
-                __func__, proTx.proTxHash.ToString(), nHeight, proTx.ToString());
+            if (debugLogs) {
+                LogPrintf("CDeterministicMNManager::%s -- MN %s revoked operator key at height %d: %s\n",
+                    __func__, proTx.proTxHash.ToString(), nHeight, proTx.ToString());
+            }
         } else if (tx.nType == TRANSACTION_QUORUM_COMMITMENT) {
             llmq::CFinalCommitmentTxPayload qc;
             if (!GetTxPayload(tx, qc)) {
                 assert(false); // this should have been handled already
             }
             if (!qc.commitment.IsNull()) {
-                HandleQuorumCommitment(qc.commitment, newList);
+                HandleQuorumCommitment(qc.commitment, newList, debugLogs);
             }
         }
     }
@@ -697,7 +714,7 @@ bool CDeterministicMNManager::BuildNewListFromBlock(const CBlock& block, const C
     return true;
 }
 
-void CDeterministicMNManager::HandleQuorumCommitment(llmq::CFinalCommitment& qc, CDeterministicMNList& mnList)
+void CDeterministicMNManager::HandleQuorumCommitment(llmq::CFinalCommitment& qc, CDeterministicMNList& mnList, bool debugLogs)
 {
     // The commitment has already been validated at this point so it's safe to use members of it
 
@@ -712,7 +729,7 @@ void CDeterministicMNManager::HandleQuorumCommitment(llmq::CFinalCommitment& qc,
             // The idea is to immediately ban a MN when it fails 2 DKG sessions with only a few blocks in-between
             // If there were enough blocks between failures, the MN has a chance to recover as he reduces his penalty by 1 for every block
             // If it however fails 3 times in the timespan of a single payment cycle, it should definitely get banned
-            mnList.PoSePunish(members[i]->proTxHash, mnList.CalcPenalty(66));
+            mnList.PoSePunish(members[i]->proTxHash, mnList.CalcPenalty(66), debugLogs);
         }
     }
 }
diff --git a/src/evo/deterministicmns.h b/src/evo/deterministicmns.h
index 00aa99345d61..c4734e6c1530 100644
--- a/src/evo/deterministicmns.h
+++ b/src/evo/deterministicmns.h
@@ -336,7 +336,7 @@ class CDeterministicMNList
      * @param proTxHash
      * @param penalty
      */
-    void PoSePunish(const uint256& proTxHash, int penalty);
+    void PoSePunish(const uint256& proTxHash, int penalty, bool debugLogs);
 
     /**
      * Decrease penalty score of MN by 1.
@@ -459,8 +459,8 @@ class CDeterministicMNManager
     void UpdatedBlockTip(const CBlockIndex* pindex);
 
     // the returned list will not contain the correct block hash (we can't know it yet as the coinbase TX is not updated yet)
-    bool BuildNewListFromBlock(const CBlock& block, const CBlockIndex* pindexPrev, CValidationState& state, CDeterministicMNList& mnListRet);
-    void HandleQuorumCommitment(llmq::CFinalCommitment& qc, CDeterministicMNList& mnList);
+    bool BuildNewListFromBlock(const CBlock& block, const CBlockIndex* pindexPrev, CValidationState& state, CDeterministicMNList& mnListRet, bool debugLogs);
+    void HandleQuorumCommitment(llmq::CFinalCommitment& qc, CDeterministicMNList& mnList, bool debugLogs);
     void DecreasePoSePenalties(CDeterministicMNList& mnList);
 
     CDeterministicMNList GetListForBlock(const uint256& blockHash);

From d2ca9eddee2a824e7d91580971057c8d2a2a24d6 Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Thu, 6 Dec 2018 08:07:10 +0100
Subject: [PATCH 348/400] Fix multiple issues with governance voting after
 spork15 activation (#2526)

* Check resulting signature for validity when signing with BLS operator keys

* Support specifying proTxHash when using "gobject vote-alias"

The "alias-name" is now interpreted as proTxHash when deterministic MN lists
are active.

The classical "alias" as found in masternode.conf has no meaning after
spork15 activation.

* Don't use masternode.conf list in gobject_vote_many when spork15 is active

Keys don't match anymore so we should only rely on the deterministic list
and the local wallet's keys.

* Check for pwalletMain not being null in gobject_vote_many

* Allow to use vote-conf for non-proposal votes when spork15 is active

This fixes sentinel not being able to create triggers on testnet.

* Fix error message

* Fix no-wallet compilation and check for pwalletMain at runtime
---
 src/governance-object.cpp |  3 ++
 src/governance-vote.cpp   |  3 ++
 src/instantx.cpp          |  3 ++
 src/privatesend.cpp       |  6 ++++
 src/rpc/governance.cpp    | 64 ++++++++++++++++++++++++++++++++-------
 5 files changed, 68 insertions(+), 11 deletions(-)

diff --git a/src/governance-object.cpp b/src/governance-object.cpp
index 4d05a1f2b9e4..bd8324723c8e 100644
--- a/src/governance-object.cpp
+++ b/src/governance-object.cpp
@@ -333,6 +333,9 @@ bool CGovernanceObject::CheckSignature(const CKeyID& keyID) const
 bool CGovernanceObject::Sign(const CBLSSecretKey& key)
 {
     CBLSSignature sig = key.Sign(GetSignatureHash());
+    if (!key.IsValid()) {
+        return false;
+    }
     sig.GetBuf(vchSig);
     return true;
 }
diff --git a/src/governance-vote.cpp b/src/governance-vote.cpp
index 7b083b986dc6..15a145df12c4 100644
--- a/src/governance-vote.cpp
+++ b/src/governance-vote.cpp
@@ -218,6 +218,9 @@ bool CGovernanceVote::Sign(const CBLSSecretKey& key)
 {
     uint256 hash = GetSignatureHash();
     CBLSSignature sig = key.Sign(hash);
+    if (!sig.IsValid()) {
+        return false;
+    }
     sig.GetBuf(vchSig);
     return true;
 }
diff --git a/src/instantx.cpp b/src/instantx.cpp
index 49cf7aea7cdf..49bd568528aa 100644
--- a/src/instantx.cpp
+++ b/src/instantx.cpp
@@ -1152,6 +1152,9 @@ bool CTxLockVote::Sign()
         uint256 hash = GetSignatureHash();
 
         CBLSSignature sig = activeMasternodeInfo.blsKeyOperator->Sign(hash);
+        if (!sig.IsValid()) {
+            return false;
+        }
         sig.GetBuf(vchMasternodeSignature);
     } else if (sporkManager.IsSporkActive(SPORK_6_NEW_SIGS)) {
         uint256 hash = GetSignatureHash();
diff --git a/src/privatesend.cpp b/src/privatesend.cpp
index e72e1d17d334..b6189e424813 100644
--- a/src/privatesend.cpp
+++ b/src/privatesend.cpp
@@ -55,6 +55,9 @@ bool CPrivateSendQueue::Sign()
     if (deterministicMNManager->IsDeterministicMNsSporkActive()) {
         uint256 hash = GetSignatureHash();
         CBLSSignature sig = activeMasternodeInfo.blsKeyOperator->Sign(hash);
+        if (!sig.IsValid()) {
+            return false;
+        }
         sig.GetBuf(vchSig);
     } else if (sporkManager.IsSporkActive(SPORK_6_NEW_SIGS)) {
         uint256 hash = GetSignatureHash();
@@ -148,6 +151,9 @@ bool CPrivateSendBroadcastTx::Sign()
         uint256 hash = GetSignatureHash();
 
         CBLSSignature sig = activeMasternodeInfo.blsKeyOperator->Sign(hash);
+        if (!sig.IsValid()) {
+            return false;
+        }
         sig.GetBuf(vchSig);
     } else if (sporkManager.IsSporkActive(SPORK_6_NEW_SIGS)) {
         uint256 hash = GetSignatureHash();
diff --git a/src/rpc/governance.cpp b/src/rpc/governance.cpp
index 97927afafacc..d5bdf80bfac3 100644
--- a/src/rpc/governance.cpp
+++ b/src/rpc/governance.cpp
@@ -376,10 +376,6 @@ UniValue gobject_vote_conf(const JSONRPCRequest& request)
     if (request.fHelp || request.params.size() != 4)
         gobject_vote_conf_help();
 
-    if(deterministicMNManager->IsDeterministicMNsSporkActive()) {
-        throw JSONRPCError(RPC_INVALID_PARAMETER, "Can't use vote-conf when deterministic masternodes are active");
-    }
-
     uint256 hash;
 
     hash = ParseHashV(request.params[1], "Object hash");
@@ -430,7 +426,19 @@ UniValue gobject_vote_conf(const JSONRPCRequest& request)
     }
 
     CGovernanceVote vote(mn.outpoint, hash, eVoteSignal, eVoteOutcome);
-    if (!vote.Sign(activeMasternodeInfo.legacyKeyOperator, activeMasternodeInfo.legacyKeyIDOperator)) {
+
+    bool signSuccess = false;
+    if (deterministicMNManager->IsDeterministicMNsSporkActive()) {
+        if (govObjType == GOVERNANCE_OBJECT_PROPOSAL && eVoteSignal == VOTE_SIGNAL_FUNDING) {
+            throw JSONRPCError(RPC_INVALID_PARAMETER, "Can't use vote-conf for proposals when deterministic masternodes are active");
+        }
+        if (activeMasternodeInfo.blsKeyOperator) {
+            signSuccess = vote.Sign(*activeMasternodeInfo.blsKeyOperator);
+        }
+    } else {
+        signSuccess = vote.Sign(activeMasternodeInfo.legacyKeyOperator, activeMasternodeInfo.legacyKeyIDOperator);
+    }
+    if (!signSuccess) {
         nFailed++;
         statusObj.push_back(Pair("result", "failed"));
         statusObj.push_back(Pair("errorMessage", "Failure to sign."));
@@ -593,6 +601,11 @@ UniValue gobject_vote_many(const JSONRPCRequest& request)
     // We can remove this when we remove support for masternode.conf and only support wallet based masternode
     // management
     if (deterministicMNManager->IsDeterministicMNsSporkActive()) {
+        if (!pwalletMain) {
+            throw JSONRPCError(RPC_INVALID_PARAMETER, "vote-many not supported when wallet is disabled.");
+        }
+        entries.clear();
+
         auto mnList = deterministicMNManager->GetListAtChainTip();
         mnList.ForEachMN(true, [&](const CDeterministicMNCPtr& dmn) {
             bool found = false;
@@ -620,6 +633,10 @@ UniValue gobject_vote_many(const JSONRPCRequest& request)
             }
         });
     }
+#else
+    if (deterministicMNManager->IsDeterministicMNsSporkActive()) {
+        throw JSONRPCError(RPC_INVALID_PARAMETER, "vote-many not supported when wallet is disabled.");
+    }
 #endif
 
     return VoteWithMasternodeList(entries, hash, eVoteSignal, eVoteOutcome);
@@ -634,7 +651,7 @@ void gobject_vote_alias_help()
                 "1. governance-hash   (string, required) hash of the governance object\n"
                 "2. vote              (string, required) vote, possible values: [funding|valid|delete|endorsed]\n"
                 "3. vote-outcome      (string, required) vote outcome, possible values: [yes|no|abstain]\n"
-                "4. alias-name        (string, required) masternode alias"
+                "4. alias-name        (string, required) masternode alias or proTxHash after DIP3 activation"
                 );
 }
 
@@ -647,8 +664,6 @@ UniValue gobject_vote_alias(const JSONRPCRequest& request)
     std::string strVoteSignal = request.params[2].get_str();
     std::string strVoteOutcome = request.params[3].get_str();
 
-    std::string strAlias = request.params[4].get_str();
-
     vote_signal_enum_t eVoteSignal = CGovernanceVoting::ConvertVoteSignal(strVoteSignal);
     if (eVoteSignal == VOTE_SIGNAL_NONE) {
         throw JSONRPCError(RPC_INVALID_PARAMETER,
@@ -662,9 +677,36 @@ UniValue gobject_vote_alias(const JSONRPCRequest& request)
     }
 
     std::vector<CMasternodeConfig::CMasternodeEntry> entries;
-    for (const auto& mne : masternodeConfig.getEntries()) {
-        if (strAlias == mne.getAlias())
-            entries.push_back(mne);
+
+    if (deterministicMNManager->IsDeterministicMNsSporkActive()) {
+#ifdef ENABLE_WALLET
+        if (!pwalletMain) {
+            throw JSONRPCError(RPC_INVALID_PARAMETER, "vote-alias not supported when wallet is disabled");
+        }
+
+        uint256 proTxHash = ParseHashV(request.params[4], "alias-name");
+        auto dmn = deterministicMNManager->GetListAtChainTip().GetValidMN(proTxHash);
+        if (!dmn) {
+            throw JSONRPCError(RPC_INVALID_PARAMETER, "Invalid or unknown proTxHash");
+        }
+
+        CKey votingKey;
+        if (!pwalletMain->GetKey(dmn->pdmnState->keyIDVoting, votingKey)) {
+            throw JSONRPCError(RPC_INVALID_PARAMETER, strprintf("Voting ekey %s not known by wallet", CBitcoinAddress(dmn->pdmnState->keyIDVoting).ToString()));
+        }
+
+        CBitcoinSecret secret(votingKey);
+        CMasternodeConfig::CMasternodeEntry mne(dmn->proTxHash.ToString(), dmn->pdmnState->addr.ToStringIPPort(false), secret.ToString(), dmn->collateralOutpoint.hash.ToString(), itostr(dmn->collateralOutpoint.n));
+        entries.push_back(mne);
+#else
+        throw JSONRPCError(RPC_INVALID_PARAMETER, "vote-alias not supported when wallet is disabled");
+#endif
+    } else {
+        std::string strAlias = request.params[4].get_str();
+        for (const auto& mne : masternodeConfig.getEntries()) {
+            if (strAlias == mne.getAlias())
+                entries.push_back(mne);
+        }
     }
 
     return VoteWithMasternodeList(entries, hash, eVoteSignal, eVoteOutcome);

From 19a6f718d34ef607db566972ed2b73d44737bab7 Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Thu, 6 Dec 2018 08:07:33 +0100
Subject: [PATCH 349/400] Don't respond with getdata for legacy inv types when
 spork15 is active (#2528)

Avoid unnecessary traffic from non-upgraded nodes.
---
 src/net_processing.cpp | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/src/net_processing.cpp b/src/net_processing.cpp
index 2e45b65dd5e3..6cfa51662dd2 100644
--- a/src/net_processing.cpp
+++ b/src/net_processing.cpp
@@ -1786,6 +1786,18 @@ bool static ProcessMessage(CNode* pfrom, const std::string& strCommand, CDataStr
             }
             else
             {
+                static std::set<int> legacyMNObjs = {
+                        MSG_MASTERNODE_PAYMENT_VOTE,
+                        MSG_MASTERNODE_PAYMENT_BLOCK,
+                        MSG_MASTERNODE_ANNOUNCE,
+                        MSG_MASTERNODE_PING,
+                        MSG_MASTERNODE_VERIFY,
+                };
+                if (legacyMNObjs.count(inv.type) && deterministicMNManager->IsDeterministicMNsSporkActive()) {
+                    LogPrint("net", "ignoring (%s) inv of legacy type %d peer=%d\n", inv.hash.ToString(), inv.type, pfrom->id);
+                    continue;
+                }
+
                 pfrom->AddInventoryKnown(inv);
                 if (fBlocksOnly)
                     LogPrint("net", "transaction (%s) inv sent in violation of protocol peer=%d\n", inv.hash.ToString(), pfrom->id);

From 7c750086422b2fcf46ff0a98b5c90a104cea70c4 Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Thu, 6 Dec 2018 08:08:54 +0100
Subject: [PATCH 350/400] Also stop asking other peers for a TX when
 ProcessTxLockRequest fails (#2529)

This is moving up the RemoveAskFor call above the ProcessTxLockRequest
call. If ProcessTxLockRequest fails, we should not re-request the same
TX/IX from other nodes as it will continue to fail.
---
 src/net_processing.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/net_processing.cpp b/src/net_processing.cpp
index 6cfa51662dd2..71fc8e0b77f5 100644
--- a/src/net_processing.cpp
+++ b/src/net_processing.cpp
@@ -2037,6 +2037,10 @@ bool static ProcessMessage(CNode* pfrom, const std::string& strCommand, CDataStr
 
         CInv inv(nInvType, tx.GetHash());
         pfrom->AddInventoryKnown(inv);
+        {
+            LOCK(cs_main);
+            connman.RemoveAskFor(inv.hash);
+        }
 
         // Process custom logic, no matter if tx will be accepted to mempool later or not
         if (strCommand == NetMsgType::TXLOCKREQUEST || fCanAutoLock) {
@@ -2083,8 +2087,6 @@ bool static ProcessMessage(CNode* pfrom, const std::string& strCommand, CDataStr
 
         LOCK(cs_main);
 
-        connman.RemoveAskFor(inv.hash);
-
         bool fMissingInputs = false;
         CValidationState state;
 

From 8f8878a94f4ef38d2385d5e71e7ceb4233af36fc Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Thu, 6 Dec 2018 08:09:23 +0100
Subject: [PATCH 351/400] Add dummy/hidden column to carry the proTxHash per MN
 list entry... (#2530)

...and use this in GetSelectedDIP3MN. This fixes copy/paste issues with MNs
that don't have a valid address (PoSe banned).
---
 src/qt/masternodelist.cpp | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/src/qt/masternodelist.cpp b/src/qt/masternodelist.cpp
index 34356b489559..b90480c7cb42 100644
--- a/src/qt/masternodelist.cpp
+++ b/src/qt/masternodelist.cpp
@@ -78,6 +78,11 @@ MasternodeList::MasternodeList(const PlatformStyle* platformStyle, QWidget* pare
     ui->tableWidgetMasternodesDIP3->setColumnWidth(6, columnPayeeWidth);
     ui->tableWidgetMasternodesDIP3->setColumnWidth(7, columnOperatorRewardWidth);
 
+    // dummy column for proTxHash
+    // TODO use a proper table model for the MN list
+    ui->tableWidgetMasternodesDIP3->insertColumn(8);
+    ui->tableWidgetMasternodesDIP3->setColumnHidden(8, true);
+
     ui->tableWidgetMyMasternodes->setContextMenuPolicy(Qt::CustomContextMenu);
     ui->tableWidgetMasternodesDIP3->setContextMenuPolicy(Qt::CustomContextMenu);
 
@@ -462,6 +467,8 @@ void MasternodeList::updateDIP3List()
             if (!strToFilter.contains(strCurrentFilterDIP3)) return;
         }
 
+        QTableWidgetItem* proTxHashItem = new QTableWidgetItem(QString::fromStdString(dmn->proTxHash.ToString()));
+
         ui->tableWidgetMasternodesDIP3->insertRow(0);
         ui->tableWidgetMasternodesDIP3->setItem(0, 0, addressItem);
         ui->tableWidgetMasternodesDIP3->setItem(0, 1, statusItem);
@@ -471,6 +478,7 @@ void MasternodeList::updateDIP3List()
         ui->tableWidgetMasternodesDIP3->setItem(0, 5, nextPaymentItem);
         ui->tableWidgetMasternodesDIP3->setItem(0, 6, payeeItem);
         ui->tableWidgetMasternodesDIP3->setItem(0, 7, operatorRewardItem);
+        ui->tableWidgetMasternodesDIP3->setItem(0, 8, proTxHashItem);
     });
 
     ui->countLabelDIP3->setText(QString::number(ui->tableWidgetMasternodesDIP3->rowCount()));
@@ -670,7 +678,7 @@ void MasternodeList::ShowQRCode(std::string strAlias)
 
 CDeterministicMNCPtr MasternodeList::GetSelectedDIP3MN()
 {
-    std::string strAddress;
+    std::string strProTxHash;
     {
         LOCK(cs_dip3list);
 
@@ -681,14 +689,14 @@ CDeterministicMNCPtr MasternodeList::GetSelectedDIP3MN()
 
         QModelIndex index = selected.at(0);
         int nSelectedRow = index.row();
-        strAddress = ui->tableWidgetMasternodesDIP3->item(nSelectedRow, 0)->text().toStdString();
-    }
-    CService addr;
-    if (!Lookup(strAddress.c_str(), addr, Params().GetDefaultPort(), false)) {
-        return nullptr;
+        strProTxHash = ui->tableWidgetMasternodesDIP3->item(nSelectedRow, 8)->text().toStdString();
     }
+
+    uint256 proTxHash;
+    proTxHash.SetHex(strProTxHash);
+
     auto mnList = deterministicMNManager->GetListAtChainTip();
-    return mnList.GetUniquePropertyMN(addr);
+    return mnList.GetMN(proTxHash);
 }
 
 void MasternodeList::extraInfoDIP3_clicked()

From 2161199210d1e3937e33f554c0e78fee7f24d641 Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Thu, 6 Dec 2018 11:32:15 +0100
Subject: [PATCH 352/400] Fix wrong total MN count in UI and "masternode count"
 RPC (#2527)

* Use CountMasternodes() in ClientModel::getMasternodeCountString

* Use CountMasternodes() for total count in masternode_count

* Fix CountMasternodes() to give correct number of masternodes with spork15 enabled

Also change CountEnabled to not call CountMasternodes anymore but instead
have its own implementation which uses GetValidMNsCount instead of GetAllMNsCount

* Apply review suggestions
---
 src/masternodeman.cpp  | 16 +++++++++-------
 src/qt/clientmodel.cpp |  2 +-
 src/rpc/masternode.cpp |  5 ++---
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/src/masternodeman.cpp b/src/masternodeman.cpp
index 4f8910fa150a..865f0f3ef6b6 100644
--- a/src/masternodeman.cpp
+++ b/src/masternodeman.cpp
@@ -455,7 +455,7 @@ int CMasternodeMan::CountMasternodes(int nProtocolVersion)
 
     if (deterministicMNManager->IsDeterministicMNsSporkActive()) {
         auto mnList = deterministicMNManager->GetListAtChainTip();
-        nCount = (int)mnList.GetValidMNsCount();
+        nCount = (int)mnList.GetAllMNsCount();
     } else {
         for (const auto& mnpair : mapMasternodes) {
             if(mnpair.second.nProtocolVersion < nProtocolVersion) continue;
@@ -469,15 +469,17 @@ int CMasternodeMan::CountEnabled(int nProtocolVersion)
 {
     LOCK(cs);
 
-    if (deterministicMNManager->IsDeterministicMNsSporkActive())
-        return CountMasternodes(nProtocolVersion);
-
     int nCount = 0;
     nProtocolVersion = nProtocolVersion == -1 ? mnpayments.GetMinMasternodePaymentsProto() : nProtocolVersion;
 
-    for (const auto& mnpair : mapMasternodes) {
-        if(mnpair.second.nProtocolVersion < nProtocolVersion || !mnpair.second.IsEnabled()) continue;
-        nCount++;
+    if (deterministicMNManager->IsDeterministicMNsSporkActive()) {
+        auto mnList = deterministicMNManager->GetListAtChainTip();
+        nCount = (int)mnList.GetValidMNsCount();
+    } else {
+        for (const auto& mnpair : mapMasternodes) {
+            if (mnpair.second.nProtocolVersion < nProtocolVersion || !mnpair.second.IsEnabled()) continue;
+            nCount++;
+        }
     }
 
     return nCount;
diff --git a/src/qt/clientmodel.cpp b/src/qt/clientmodel.cpp
index 63a8a157bedd..07ff4ddcbb7a 100644
--- a/src/qt/clientmodel.cpp
+++ b/src/qt/clientmodel.cpp
@@ -84,7 +84,7 @@ QString ClientModel::getMasternodeCountString() const
 {
     // return tr("Total: %1 (PS compatible: %2 / Enabled: %3) (IPv4: %4, IPv6: %5, TOR: %6)").arg(QString::number((int)mnodeman.size()))
     return tr("Total: %1 (PS compatible: %2 / Enabled: %3)")
-            .arg(QString::number((int)mnodeman.size()))
+            .arg(QString::number((int)mnodeman.CountMasternodes(0)))
             .arg(QString::number((int)mnodeman.CountEnabled(MIN_PRIVATESEND_PEER_PROTO_VERSION)))
             .arg(QString::number((int)mnodeman.CountEnabled()));
             // .arg(QString::number((int)mnodeman.CountByIP(NET_IPV4)))
diff --git a/src/rpc/masternode.cpp b/src/rpc/masternode.cpp
index ebdcd741966c..f443a0527c00 100644
--- a/src/rpc/masternode.cpp
+++ b/src/rpc/masternode.cpp
@@ -225,13 +225,12 @@ UniValue masternode_count(const JSONRPCRequest& request)
         masternode_count_help();
 
     int nCount;
-    int total;
+    int total = mnodeman.CountMasternodes(0);
     if (deterministicMNManager->IsDeterministicMNsSporkActive()) {
-        nCount = total = mnodeman.CountEnabled();
+        nCount = mnodeman.CountEnabled();
     } else {
         masternode_info_t mnInfo;
         mnodeman.GetNextMasternodeInQueueForPayment(true, nCount, mnInfo);
-        total = mnodeman.size();
     }
 
     int ps = mnodeman.CountEnabled(MIN_PRIVATESEND_PEER_PROTO_VERSION);

From 9100c69eb9577cb9e3565ef231fc00c450f9e361 Mon Sep 17 00:00:00 2001
From: UdjinM6 <UdjinM6@users.noreply.github.com>
Date: Thu, 6 Dec 2018 13:32:42 +0300
Subject: [PATCH 353/400] Allow filtering by proTxHash on DIP3 MN tab (#2532)

---
 src/qt/masternodelist.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/qt/masternodelist.cpp b/src/qt/masternodelist.cpp
index b90480c7cb42..06b1d33e627c 100644
--- a/src/qt/masternodelist.cpp
+++ b/src/qt/masternodelist.cpp
@@ -454,6 +454,7 @@ void MasternodeList::updateDIP3List()
             operatorRewardStr = tr("NONE");
         }
         QTableWidgetItem* operatorRewardItem = new QTableWidgetItem(operatorRewardStr);
+        QTableWidgetItem* proTxHashItem = new QTableWidgetItem(QString::fromStdString(dmn->proTxHash.ToString()));
 
         if (strCurrentFilterDIP3 != "") {
             strToFilter = addressItem->text() + " " +
@@ -463,12 +464,11 @@ void MasternodeList::updateDIP3List()
                           lastPaidItem->text() + " " +
                           nextPaymentItem->text() + " " +
                           payeeItem->text() + " " +
-                          operatorRewardItem->text();
+                          operatorRewardItem->text() + " " +
+                          proTxHashItem->text();
             if (!strToFilter.contains(strCurrentFilterDIP3)) return;
         }
 
-        QTableWidgetItem* proTxHashItem = new QTableWidgetItem(QString::fromStdString(dmn->proTxHash.ToString()));
-
         ui->tableWidgetMasternodesDIP3->insertRow(0);
         ui->tableWidgetMasternodesDIP3->setItem(0, 0, addressItem);
         ui->tableWidgetMasternodesDIP3->setItem(0, 1, statusItem);

From d94092b60b8e35463fddf5dc3264d9a758e217e4 Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Thu, 6 Dec 2018 14:43:36 +0100
Subject: [PATCH 354/400] Fix spork propagation while in IBD and fix spork
 integration tests (#2533)

* Fix spork syncing issue in sporks tests

https://github.com/dashpay/dash/pull/2522 caused an issue with sporks syncing
in tests. The introduced time check in CMasternodeSync::ProcessTick causes
masternode sync to never start when mocktime is enabled, so this commit
disables mocktime for sporks.py.

Disabling mocktime however leads to fInitialDownload never becoming false
in CMasternodeSync::UpdatedBlockTip, so mnsync is never started. To fix
this, the tests now create a block before connecting the last node.

This however doesn't work because node1 will ignore the "getheaders" request
from node2 as it has not finished mnsync yet...so we also have to force
finish mnsync for node1.

* Also respond with getdata for announced sporks while in IBD

There was never a good reason to ignore spork announcements while in IBD.
At the same time, this poses the risk of missing out on sporks while in IBD.
This also fixes an issue in sporks testing, as nodes did not request for
announced sporks.

* Use wait_to_sync instead of custom loop
---
 qa/rpc-tests/sporks.py |  7 +++++++
 src/net_processing.cpp | 16 ++++++++++++----
 2 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/qa/rpc-tests/sporks.py b/qa/rpc-tests/sporks.py
index ceae32914d2f..f556468df08e 100755
--- a/qa/rpc-tests/sporks.py
+++ b/qa/rpc-tests/sporks.py
@@ -19,6 +19,7 @@ def __init__(self):
         self.is_network_split = False
 
     def setup_network(self):
+        disable_mocktime()
         self.nodes = []
         self.nodes.append(start_node(0, self.options.tmpdir,
                                      ["-debug", "-sporkkey=cP4EKFyJsHT39LDqgdcB43Y3YXjNyjb5Fuas1GQSeAtjnZWmZEQK"]))
@@ -69,6 +70,12 @@ def run_test(self):
         assert(not self.get_test_spork_state(self.nodes[0]))
         assert(not self.get_test_spork_state(self.nodes[1]))
 
+        # Force finish mnsync node as otherwise it will never send out headers to other peers
+        wait_to_sync(self.nodes[1], fast_mnsync=True)
+
+        # Generate one block to kick off masternode sync, which also starts sporks syncing for node2
+        self.nodes[1].generate(1)
+
         # connect new node and check spork propagation after restoring from cache
         connect_nodes(self.nodes[1], 2)
         start = time()
diff --git a/src/net_processing.cpp b/src/net_processing.cpp
index 71fc8e0b77f5..bc506e8da008 100644
--- a/src/net_processing.cpp
+++ b/src/net_processing.cpp
@@ -1793,16 +1793,24 @@ bool static ProcessMessage(CNode* pfrom, const std::string& strCommand, CDataStr
                         MSG_MASTERNODE_PING,
                         MSG_MASTERNODE_VERIFY,
                 };
+                static std::set<int> allowWhileInIBDObjs = {
+                        MSG_SPORK
+                };
                 if (legacyMNObjs.count(inv.type) && deterministicMNManager->IsDeterministicMNsSporkActive()) {
                     LogPrint("net", "ignoring (%s) inv of legacy type %d peer=%d\n", inv.hash.ToString(), inv.type, pfrom->id);
                     continue;
                 }
 
                 pfrom->AddInventoryKnown(inv);
-                if (fBlocksOnly)
-                    LogPrint("net", "transaction (%s) inv sent in violation of protocol peer=%d\n", inv.hash.ToString(), pfrom->id);
-                else if (!fAlreadyHave && !fImporting && !fReindex && !IsInitialBlockDownload())
-                    pfrom->AskFor(inv);
+                if (fBlocksOnly) {
+                    LogPrint("net", "transaction (%s) inv sent in violation of protocol peer=%d\n", inv.hash.ToString(),
+                             pfrom->id);
+                } else if (!fAlreadyHave) {
+                    bool allowWhileInIBD = allowWhileInIBDObjs.count(inv.type);
+                    if (allowWhileInIBD || (!fImporting && !fReindex && !IsInitialBlockDownload())) {
+                        pfrom->AskFor(inv);
+                    }
+                }
             }
 
             // Track requests for our stuff

From 225c2135e211d83ff2ff41dc25117004834da5d1 Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Thu, 6 Dec 2018 14:43:54 +0100
Subject: [PATCH 355/400] Allow skipping of MN payments with zero duffs (#2534)

* Allow skipping of MN payments with zero duffs

In case a MNO uses an operator reward of 100%, the normal reward will be 0
duffs. It doesn't make sense to enforce these payments.

This will cause a fork when miners start to mine with the new version, but
only for nodes that didn't upgrade.

* Apply suggestions from code review

Co-Authored-By: codablock <ablock84@gmail.com>
---
 src/masternode-payments.cpp | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/masternode-payments.cpp b/src/masternode-payments.cpp
index 2c14bc1eb53e..61da6eaeb62a 100644
--- a/src/masternode-payments.cpp
+++ b/src/masternode-payments.cpp
@@ -610,14 +610,21 @@ bool CMasternodePayments::GetBlockTxOuts(int nBlockHeight, CAmount blockReward,
             return false;
         }
 
-        if (dmnPayee->nOperatorReward == 0 || dmnPayee->pdmnState->scriptOperatorPayout == CScript()) {
-            voutMasternodePaymentsRet.emplace_back(masternodeReward, dmnPayee->pdmnState->scriptPayout);
-        } else {
-            CAmount operatorReward = (masternodeReward * dmnPayee->nOperatorReward) / 10000;
+        CAmount operatorReward = 0;
+        if (dmnPayee->nOperatorReward != 0 && dmnPayee->pdmnState->scriptOperatorPayout != CScript()) {
+            // This calculation might eventually turn out to result in 0 even if an operator reward percentage is given.
+            // This will however only happen in a few years when the block rewards drops very low.
+            operatorReward = (masternodeReward * dmnPayee->nOperatorReward) / 10000;
             masternodeReward -= operatorReward;
+        }
+
+        if (masternodeReward > 0) {
             voutMasternodePaymentsRet.emplace_back(masternodeReward, dmnPayee->pdmnState->scriptPayout);
+        }
+        if (operatorReward > 0) {
             voutMasternodePaymentsRet.emplace_back(operatorReward, dmnPayee->pdmnState->scriptOperatorPayout);
         }
+
         return true;
     } else {
         LOCK(cs_mapMasternodeBlocks);

From 5185dd5b73dda0da252c9cfa095290e9a6b2786a Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Thu, 6 Dec 2018 14:44:14 +0100
Subject: [PATCH 356/400] Use correct time field when removing pre-DIP3 votes
 (#2535)

nTime is not the timestamp from the vote object. nCreationTime is the
correct field to use.

This fixes continues deletion of votes.
---
 src/governance-object.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/governance-object.cpp b/src/governance-object.cpp
index bd8324723c8e..ac026e268a07 100644
--- a/src/governance-object.cpp
+++ b/src/governance-object.cpp
@@ -816,7 +816,7 @@ std::vector<uint256> CGovernanceObject::RemoveOldVotes(unsigned int nMinTime)
         auto& miRef = itMnPair->second.mapInstances;
         auto itVotePair = miRef.begin();
         while (itVotePair != miRef.end()) {
-            if (itVotePair->second.nTime < nMinTime) {
+            if (itVotePair->second.nCreationTime < nMinTime) {
                 miRef.erase(itVotePair++);
             } else {
                 ++itVotePair;

From cbd0303529bca6c8156b2bc992aaa022c5cf0789 Mon Sep 17 00:00:00 2001
From: Solar Designer <solar@openwall.com>
Date: Mon, 10 Dec 2018 05:40:08 +0100
Subject: [PATCH 357/400] Serialize the block header in CBlockHeader::GetHash()
 (#2531)

* Serialize the block header in CBlockHeader::GetHash()

* Switch from CDataStream to CVectorWriter

Co-Authored-By: solardiz <solar@openwall.com>
---
 src/Makefile.am          | 1 +
 src/primitives/block.cpp | 6 +++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/Makefile.am b/src/Makefile.am
index 5180097e16a3..deecee050b92 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -397,6 +397,7 @@ libdash_consensus_a_SOURCES = \
   script/script_error.cpp \
   script/script_error.h \
   serialize.h \
+  streams.h \
   tinyformat.h \
   uint256.cpp \
   uint256.h \
diff --git a/src/primitives/block.cpp b/src/primitives/block.cpp
index 4c41a02b9951..6459d0e957be 100644
--- a/src/primitives/block.cpp
+++ b/src/primitives/block.cpp
@@ -6,13 +6,17 @@
 #include "primitives/block.h"
 
 #include "hash.h"
+#include "streams.h"
 #include "tinyformat.h"
 #include "utilstrencodings.h"
 #include "crypto/common.h"
 
 uint256 CBlockHeader::GetHash() const
 {
-    return HashX11(BEGIN(nVersion), END(nNonce));
+    std::vector<unsigned char> vch(80);
+    CVectorWriter ss(SER_NETWORK, PROTOCOL_VERSION, vch, 0);
+    ss << *this;
+    return HashX11((const char *)vch.data(), (const char *)vch.data() + vch.size());
 }
 
 std::string CBlock::ToString() const

From 511dc3714c3320c3582d385c68fe785d10e8c5b0 Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Mon, 10 Dec 2018 06:03:57 +0100
Subject: [PATCH 358/400] Remove ProTxs from mempool that refer to a ProRegTx
 for which the collateral was spent (#2539)

* Track TXs in mempool which refer to an existing ProTx

* When a block is added, remove TXs that refer to ProTxs with spent collaterals

* Initalize evoDb and deterministicMNManager in BasicTestingSetup

instead of TestingSetup. Now that the mempool uses deterministicMNManager,
we need to initialize it for all tests that might use the mempool.
---
 src/test/test_dash.cpp |  9 +++---
 src/txmempool.cpp      | 72 ++++++++++++++++++++++++++++++++++++++++++
 src/txmempool.h        |  2 ++
 3 files changed, 79 insertions(+), 4 deletions(-)

diff --git a/src/test/test_dash.cpp b/src/test/test_dash.cpp
index 7bc3f7e9f734..521d8a422f4c 100644
--- a/src/test/test_dash.cpp
+++ b/src/test/test_dash.cpp
@@ -50,11 +50,16 @@ BasicTestingSetup::BasicTestingSetup(const std::string& chainName)
         fPrintToDebugLog = false; // don't want to write to debug.log file
         fCheckBlockIndex = true;
         SelectParams(chainName);
+        evoDb = new CEvoDB(1 << 20, true, true);
+        deterministicMNManager = new CDeterministicMNManager(*evoDb);
         noui_connect();
 }
 
 BasicTestingSetup::~BasicTestingSetup()
 {
+        delete deterministicMNManager;
+        delete evoDb;
+
         ECC_Stop();
         g_connman.reset();
 }
@@ -70,10 +75,8 @@ TestingSetup::TestingSetup(const std::string& chainName) : BasicTestingSetup(cha
         boost::filesystem::create_directories(pathTemp);
         ForceSetArg("-datadir", pathTemp.string());
         mempool.setSanityCheck(1.0);
-        evoDb = new CEvoDB(1 << 20, true, true);
         pblocktree = new CBlockTreeDB(1 << 20, true);
         pcoinsdbview = new CCoinsViewDB(1 << 23, true);
-        deterministicMNManager = new CDeterministicMNManager(*evoDb);
         llmq::InitLLMQSystem(*evoDb);
         pcoinsTip = new CCoinsViewCache(pcoinsdbview);
         InitBlockIndex(chainparams);
@@ -98,10 +101,8 @@ TestingSetup::~TestingSetup()
         UnloadBlockIndex();
         delete pcoinsTip;
         llmq::DestroyLLMQSystem();
-        delete deterministicMNManager;
         delete pcoinsdbview;
         delete pblocktree;
-        delete evoDb;
         boost::filesystem::remove_all(pathTemp);
 }
 
diff --git a/src/txmempool.cpp b/src/txmempool.cpp
index 46b4c4b74ca5..56437de93a25 100644
--- a/src/txmempool.cpp
+++ b/src/txmempool.cpp
@@ -447,6 +447,9 @@ bool CTxMemPool::addUnchecked(const uint256& hash, const CTxMemPoolEntry &entry,
             LogPrintf("%s: ERROR: Invalid transaction payload, tx: %s", __func__, tx.ToString());
             return false;
         }
+        if (!proTx.collateralOutpoint.hash.IsNull()) {
+            mapProTxRefs.emplace(tx.GetHash(), proTx.collateralOutpoint.hash);
+        }
         mapProTxAddresses.emplace(proTx.addr, tx.GetHash());
         mapProTxPubKeyIDs.emplace(proTx.keyIDOwner, tx.GetHash());
         mapProTxBlsPubKeyHashes.emplace(proTx.pubKeyOperator.GetHash(), tx.GetHash());
@@ -459,6 +462,7 @@ bool CTxMemPool::addUnchecked(const uint256& hash, const CTxMemPoolEntry &entry,
             LogPrintf("%s: ERROR: Invalid transaction payload, tx: %s", __func__, tx.ToString());
             return false;
         }
+        mapProTxRefs.emplace(proTx.proTxHash, tx.GetHash());
         mapProTxAddresses.emplace(proTx.addr, tx.GetHash());
     } else if (tx.nType == TRANSACTION_PROVIDER_UPDATE_REGISTRAR) {
         CProUpRegTx proTx;
@@ -466,7 +470,15 @@ bool CTxMemPool::addUnchecked(const uint256& hash, const CTxMemPoolEntry &entry,
             LogPrintf("%s: ERROR: Invalid transaction payload, tx: %s", __func__, tx.ToString());
             return false;
         }
+        mapProTxRefs.emplace(proTx.proTxHash, tx.GetHash());
         mapProTxBlsPubKeyHashes.emplace(proTx.pubKeyOperator.GetHash(), tx.GetHash());
+    } else if (tx.nType == TRANSACTION_PROVIDER_UPDATE_REVOKE) {
+        CProUpRevTx proTx;
+        if (!GetTxPayload(tx, proTx)) {
+            LogPrintf("%s: ERROR: Invalid transaction payload, tx: %s", __func__, tx.ToString());
+            return false;
+        }
+        mapProTxRefs.emplace(proTx.proTxHash, tx.GetHash());
     }
 
     return true;
@@ -644,11 +656,25 @@ void CTxMemPool::removeUnchecked(txiter it, MemPoolRemovalReason reason)
     } else
         vTxHashes.clear();
 
+    auto eraseProTxRef = [&](const uint256& proTxHash, const uint256& txHash) {
+        auto its = mapProTxRefs.equal_range(proTxHash);
+        for (auto it = its.first; it != its.second;) {
+            if (it->second == txHash) {
+                it = mapProTxRefs.erase(it);
+            } else {
+                ++it;
+            }
+        }
+    };
+
     if (it->GetTx().nType == TRANSACTION_PROVIDER_REGISTER) {
         CProRegTx proTx;
         if (!GetTxPayload(it->GetTx(), proTx)) {
             assert(false);
         }
+        if (!proTx.collateralOutpoint.IsNull()) {
+            eraseProTxRef(it->GetTx().GetHash(), proTx.collateralOutpoint.hash);
+        }
         mapProTxAddresses.erase(proTx.addr);
         mapProTxPubKeyIDs.erase(proTx.keyIDOwner);
         mapProTxBlsPubKeyHashes.erase(proTx.pubKeyOperator.GetHash());
@@ -658,13 +684,21 @@ void CTxMemPool::removeUnchecked(txiter it, MemPoolRemovalReason reason)
         if (!GetTxPayload(it->GetTx(), proTx)) {
             assert(false);
         }
+        eraseProTxRef(proTx.proTxHash, it->GetTx().GetHash());
         mapProTxAddresses.erase(proTx.addr);
     } else if (it->GetTx().nType == TRANSACTION_PROVIDER_UPDATE_REGISTRAR) {
         CProUpRegTx proTx;
         if (!GetTxPayload(it->GetTx(), proTx)) {
             assert(false);
         }
+        eraseProTxRef(proTx.proTxHash, it->GetTx().GetHash());
         mapProTxBlsPubKeyHashes.erase(proTx.pubKeyOperator.GetHash());
+    } else if (it->GetTx().nType == TRANSACTION_PROVIDER_UPDATE_REVOKE) {
+        CProUpRevTx proTx;
+        if (!GetTxPayload(it->GetTx(), proTx)) {
+            assert(false);
+        }
+        eraseProTxRef(proTx.proTxHash, it->GetTx().GetHash());
     }
 
     totalTxSize -= it->GetTxSize();
@@ -823,8 +857,46 @@ void CTxMemPool::removeProTxCollateralConflicts(const CTransaction &tx, const CO
     }
 }
 
+void CTxMemPool::removeProTxSpentCollateralConflicts(const CTransaction &tx)
+{
+    // Remove TXs that refer to a MN for which the collateral was spent
+    auto removeSpentCollateralConflict = [&](const uint256& proTxHash) {
+        // Can't use equal_range here as every call to removeRecursive might invalidate iterators
+        while (true) {
+            auto it = mapProTxRefs.find(proTxHash);
+            if (it == mapProTxRefs.end()) {
+                break;
+            }
+            auto conflictIt = mapTx.find(it->second);
+            if (conflictIt != mapTx.end()) {
+                removeRecursive(conflictIt->GetTx(), MemPoolRemovalReason::CONFLICT);
+            } else {
+                // Should not happen as we track referencing TXs in addUnchecked/removeUnchecked.
+                // But lets be on the safe side and not run into an endless loop...
+                LogPrintf("%s: ERROR: found invalid TX ref in mapProTxRefs, proTxHash=%s, txHash=%s", __func__, proTxHash.ToString(), it->second.ToString());
+                mapProTxRefs.erase(it);
+            }
+        }
+    };
+    auto mnList = deterministicMNManager->GetListAtChainTip();
+    for (const auto& in : tx.vin) {
+        auto collateralIt = mapProTxCollaterals.find(in.prevout);
+        if (collateralIt != mapProTxCollaterals.end()) {
+            // These are not yet mined ProRegTxs
+            removeSpentCollateralConflict(collateralIt->second);
+        }
+        auto dmn = mnList.GetMNByCollateral(in.prevout);
+        if (dmn) {
+            // These are updates refering to a mined ProRegTx
+            removeSpentCollateralConflict(dmn->proTxHash);
+        }
+    }
+}
+
 void CTxMemPool::removeProTxConflicts(const CTransaction &tx)
 {
+    removeProTxSpentCollateralConflicts(tx);
+
     if (tx.nType == TRANSACTION_PROVIDER_REGISTER) {
         CProRegTx proTx;
         if (!GetTxPayload(tx, proTx)) {
diff --git a/src/txmempool.h b/src/txmempool.h
index 81ceedc53d91..1362c8064392 100644
--- a/src/txmempool.h
+++ b/src/txmempool.h
@@ -534,6 +534,7 @@ class CTxMemPool
     typedef std::map<uint256, std::vector<CSpentIndexKey> > mapSpentIndexInserted;
     mapSpentIndexInserted mapSpentInserted;
 
+    std::multimap<uint256, uint256> mapProTxRefs; // proTxHash -> transaction (all TXs that refer to an existing proTx)
     std::map<CService, uint256> mapProTxAddresses;
     std::map<CKeyID, uint256> mapProTxPubKeyIDs;
     std::map<uint256, uint256> mapProTxBlsPubKeyHashes;
@@ -584,6 +585,7 @@ class CTxMemPool
     void removeProTxPubKeyConflicts(const CTransaction &tx, const CKeyID &keyId);
     void removeProTxPubKeyConflicts(const CTransaction &tx, const CBLSPublicKey &pubKey);
     void removeProTxCollateralConflicts(const CTransaction &tx, const COutPoint &collateralOutpoint);
+    void removeProTxSpentCollateralConflicts(const CTransaction &tx);
     void removeProTxConflicts(const CTransaction &tx);
     void removeForBlock(const std::vector<CTransactionRef>& vtx, unsigned int nBlockHeight);
 

From df0d0cce7784224022c8fdd2aa294f41850d16fd Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Mon, 10 Dec 2018 06:04:13 +0100
Subject: [PATCH 359/400] Watch for changes in operator key and disable local
 MN (#2541)

---
 src/activemasternode.cpp | 17 ++++++++++++++---
 src/activemasternode.h   |  1 +
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/src/activemasternode.cpp b/src/activemasternode.cpp
index f24cb942c609..c488079fcfff 100644
--- a/src/activemasternode.cpp
+++ b/src/activemasternode.cpp
@@ -26,6 +26,8 @@ std::string CActiveDeterministicMasternodeManager::GetStateString() const
         return "POSE_BANNED";
     case MASTERNODE_REMOVED:
         return "REMOVED";
+    case MASTERNODE_OPERATOR_KEY_CHANGED:
+        return "OPERATOR_KEY_CHANGED";
     case MASTERNODE_READY:
         return "READY";
     case MASTERNODE_ERROR:
@@ -44,6 +46,8 @@ std::string CActiveDeterministicMasternodeManager::GetStatus() const
         return "Masternode was PoSe banned";
     case MASTERNODE_REMOVED:
         return "Masternode removed from list";
+    case MASTERNODE_OPERATOR_KEY_CHANGED:
+        return "Operator key changed or revoked";
     case MASTERNODE_READY:
         return "Ready";
     case MASTERNODE_ERROR:
@@ -116,11 +120,18 @@ void CActiveDeterministicMasternodeManager::UpdatedBlockTip(const CBlockIndex* p
             state = MASTERNODE_REMOVED;
             activeMasternodeInfo.proTxHash = uint256();
             activeMasternodeInfo.outpoint.SetNull();
-            // MN might have reappeared in same block with a new ProTx (with same masternode key)
+            // MN might have reappeared in same block with a new ProTx
+            Init();
+        } else if (mnList.GetMN(mnListEntry->proTxHash)->pdmnState->pubKeyOperator != mnListEntry->pdmnState->pubKeyOperator) {
+            // MN operator key changed or revoked
+            state = MASTERNODE_OPERATOR_KEY_CHANGED;
+            activeMasternodeInfo.proTxHash = uint256();
+            activeMasternodeInfo.outpoint.SetNull();
+            // MN might have reappeared in same block with a new ProTx
             Init();
         }
-    } else if (state == MASTERNODE_REMOVED || state == MASTERNODE_POSE_BANNED) {
-        // MN might have reappeared with a new ProTx (with same masternode key)
+    } else if (state == MASTERNODE_REMOVED || state == MASTERNODE_POSE_BANNED || state == MASTERNODE_OPERATOR_KEY_CHANGED) {
+        // MN might have reappeared with a new ProTx
         Init();
     }
 }
diff --git a/src/activemasternode.h b/src/activemasternode.h
index 690629c68cde..e83b4edba7b3 100644
--- a/src/activemasternode.h
+++ b/src/activemasternode.h
@@ -50,6 +50,7 @@ class CActiveDeterministicMasternodeManager : public CValidationInterface
         MASTERNODE_WAITING_FOR_PROTX,
         MASTERNODE_POSE_BANNED,
         MASTERNODE_REMOVED,
+        MASTERNODE_OPERATOR_KEY_CHANGED,
         MASTERNODE_READY,
         MASTERNODE_ERROR,
     };

From d9b28fe1ad6e1fc07cdb185e9d41c6eab2548015 Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Mon, 10 Dec 2018 06:04:33 +0100
Subject: [PATCH 360/400] Introduce dummy (ping-like) contributions for the
 dummy DKG (#2542)

* Implement creation and propagation of dummy contributions

These act as a ping which is broadcast a few blocks before the dummy
commitments are created. They are meant to determine online/offline members.

* Use information about received dummy contributions to determine validMembers

* Fix PoSe tests

* Fix dummy DKG phase progress in PoSe tests and give tests more time

Mine one block at a time until we reach the mining phase.
---
 qa/rpc-tests/dip3-deterministicmns.py |  10 +-
 src/llmq/quorums_dummydkg.cpp         | 200 +++++++++++++++++++++++---
 src/llmq/quorums_dummydkg.h           |  40 +++++-
 src/net_processing.cpp                |  10 ++
 src/protocol.cpp                      |   3 +
 src/protocol.h                        |   2 +
 6 files changed, 235 insertions(+), 30 deletions(-)

diff --git a/qa/rpc-tests/dip3-deterministicmns.py b/qa/rpc-tests/dip3-deterministicmns.py
index dfcd14a56cc2..0ee75ae2d1a1 100755
--- a/qa/rpc-tests/dip3-deterministicmns.py
+++ b/qa/rpc-tests/dip3-deterministicmns.py
@@ -360,14 +360,14 @@ def run_test(self):
             punished = False
             banned = False
             t = time.time()
-            while (not punished or not banned) and (time.time() - t) < 60:
+            while (not punished or not banned) and (time.time() - t) < 120:
                 time.sleep(1)
 
-                # 2 dummy phases
-                for j in range(2):
-                    self.nodes[0].generate(2)
+                # 10 blocks until we can mine the dummy commitment
+                for j in range(10):
+                    self.nodes[0].generate(1)
                     self.sync_all()
-                    time.sleep(1)
+                    time.sleep(0.5)
 
                 info = self.nodes[0].protx('info', mn.protx_hash)
                 if not punished:
diff --git a/src/llmq/quorums_dummydkg.cpp b/src/llmq/quorums_dummydkg.cpp
index 384720d9bae3..896785300080 100644
--- a/src/llmq/quorums_dummydkg.cpp
+++ b/src/llmq/quorums_dummydkg.cpp
@@ -27,7 +27,28 @@ CDummyDKG* quorumDummyDKG;
 
 void CDummyDKG::ProcessMessage(CNode* pfrom, const std::string& strCommand, CDataStream& vRecv, CConnman& connman)
 {
-    if (strCommand == NetMsgType::QDCOMMITMENT) {
+    if (strCommand == NetMsgType::QCONTRIB) {
+        if (!sporkManager.IsSporkActive(SPORK_17_QUORUM_DKG_ENABLED)) {
+            return;
+        }
+
+        CDummyContribution qc;
+        try {
+            vRecv >> qc;
+        } catch (...) {
+            // When we switch to the real DKG, non-upgraded nodes will get to this point. Let them just ignore the
+            // incompatible messages
+            return;
+        }
+
+        uint256 hash = ::SerializeHash(qc);
+        {
+            LOCK(cs_main);
+            connman.RemoveAskFor(hash);
+        }
+
+        ProcessDummyContribution(pfrom->id, qc);
+    } else if (strCommand == NetMsgType::QDCOMMITMENT) {
         if (!Params().GetConsensus().fLLMQAllowDummyCommitments) {
             Misbehaving(pfrom->id, 100);
             return;
@@ -49,6 +70,89 @@ void CDummyDKG::ProcessMessage(CNode* pfrom, const std::string& strCommand, CDat
     }
 }
 
+void CDummyDKG::ProcessDummyContribution(NodeId from, const llmq::CDummyContribution& qc)
+{
+    if (!Params().GetConsensus().llmqs.count((Consensus::LLMQType)qc.llmqType)) {
+        LOCK(cs_main);
+        LogPrintf("CDummyDKG::%s -- invalid commitment type %d, peer=%d\n", __func__,
+                  qc.llmqType, from);
+        if (from != -1) {
+            Misbehaving(from, 100);
+        }
+        return;
+    }
+
+    auto type = (Consensus::LLMQType)qc.llmqType;
+    const auto& params = Params().GetConsensus().llmqs.at(type);
+
+    int curQuorumHeight;
+    const CBlockIndex* quorumIndex;
+    {
+        LOCK(cs_main);
+        curQuorumHeight = chainActive.Height() - (chainActive.Height() % params.dkgInterval);
+        quorumIndex = chainActive[curQuorumHeight];
+    }
+    uint256 quorumHash = quorumIndex->GetBlockHash();
+    if (qc.quorumHash != quorumHash) {
+        LogPrintf("CDummyDKG::%s -- dummy contrinution for wrong quorum, peer=%d\n", __func__,
+                  from);
+        return;
+    }
+
+    auto members = CLLMQUtils::GetAllQuorumMembers(type, qc.quorumHash);
+    if (members.size() != params.size) {
+        LOCK(cs_main);
+        LogPrintf("CDummyDKG::%s -- invalid members count %d, peer=%d\n", __func__,
+                  members.size(), from);
+        if (from != -1) {
+            Misbehaving(from, 100);
+        }
+        return;
+    }
+    if (qc.signer >= members.size()) {
+        LOCK(cs_main);
+        LogPrintf("CDummyDKG::%s -- invalid signer %d, peer=%d\n", __func__,
+                  qc.signer, from);
+        if (from != -1) {
+            Misbehaving(from, 100);
+        }
+        return;
+    }
+
+    auto signer = members[qc.signer];
+
+    {
+        LOCK(sessionCs);
+        if (curSessions[type].dummyContributionsFromMembers.count(signer->proTxHash)) {
+            return;
+        }
+    }
+
+    // verify member sig
+    if (!qc.sig.VerifyInsecure(signer->pdmnState->pubKeyOperator, qc.GetSignHash())) {
+        LOCK(cs_main);
+        LogPrintf("CDummyDKG::%s -- invalid memberSig, peer=%d\n", __func__,
+                  from);
+        if (from != -1) {
+            Misbehaving(from, 100);
+        }
+        return;
+    }
+
+    LogPrintf("CDummyDKG::%s -- processed dummy contribution for quorum %s:%d, signer=%d, peer=%d\n", __func__,
+              qc.quorumHash.ToString(), qc.llmqType, qc.signer, from);
+
+    uint256 hash = ::SerializeHash(qc);
+    {
+        LOCK(sessionCs);
+        curSessions[type].dummyContributions[hash] = qc;
+        curSessions[type].dummyContributionsFromMembers[signer->proTxHash] = hash;
+    }
+
+    CInv inv(MSG_QUORUM_DUMMY_CONTRIBUTION, hash);
+    g_connman->RelayInv(inv, DMN_PROTO_VERSION);
+}
+
 void CDummyDKG::ProcessDummyCommitment(NodeId from, const llmq::CDummyCommitment& qc)
 {
     if (!Params().GetConsensus().llmqs.count((Consensus::LLMQType)qc.llmqType)) {
@@ -174,16 +278,6 @@ void CDummyDKG::ProcessDummyCommitment(NodeId from, const llmq::CDummyCommitment
     uint256 hash = ::SerializeHash(qc);
     {
         LOCK(sessionCs);
-
-        // Mark all members as bad initially and clear that state when we receive a valid dummy commitment from them
-        // This information is then used in the next sessions to determine which ones are valid
-        if (curSessions[type].dummyCommitments.empty()) {
-            for (const auto& dmn : members) {
-                curSessions[type].badMembers.emplace(dmn->proTxHash);
-            }
-        }
-
-        curSessions[type].badMembers.erase(signer->proTxHash);
         curSessions[type].dummyCommitments[hash] = qc;
         curSessions[type].dummyCommitmentsFromMembers[commitmentHash][signer->proTxHash] = hash;
     }
@@ -215,13 +309,52 @@ void CDummyDKG::UpdatedBlockTip(const CBlockIndex* pindex, bool fInitialDownload
         const auto& params = p.second;
         int phaseIndex = pindex->nHeight % params.dkgInterval;
         if (phaseIndex == 0) {
-            CreateDummyCommitment(params.type, pindex);
+            CreateDummyContribution(params.type, pindex);
         } else if (phaseIndex == params.dkgPhaseBlocks * 2) {
+            CreateDummyCommitment(params.type, pindex);
+        } else if (phaseIndex == params.dkgPhaseBlocks * 4) {
             CreateFinalCommitment(params.type, pindex);
         }
     }
 }
 
+void CDummyDKG::CreateDummyContribution(Consensus::LLMQType llmqType, const CBlockIndex* pindex)
+{
+    const auto& params = Params().GetConsensus().llmqs.at(llmqType);
+    int quorumHeight = pindex->nHeight - (pindex->nHeight % params.dkgInterval);
+    const CBlockIndex* quorumIndex;
+    {
+        LOCK(cs_main);
+        quorumIndex = chainActive[quorumHeight];
+    }
+    uint256 quorumHash = quorumIndex->GetBlockHash();
+
+    auto members = CLLMQUtils::GetAllQuorumMembers(llmqType, quorumHash);
+    if (members.size() != params.size) {
+        return;
+    }
+
+    int myIdx = -1;
+    for (size_t i = 0; i < members.size(); i++) {
+        if (members[i]->collateralOutpoint == activeMasternodeInfo.outpoint) {
+            myIdx = (int)i;
+            break;
+        }
+    }
+    if (myIdx == -1) {
+        return;
+    }
+    auto signer = members[myIdx];
+
+    CDummyContribution qc;
+    qc.llmqType = (uint8_t)llmqType;
+    qc.quorumHash = quorumHash;
+    qc.signer = (uint16_t)myIdx;
+    qc.sig = activeMasternodeInfo.blsKeyOperator->Sign(qc.GetSignHash());
+
+    ProcessDummyContribution(-1, qc);
+}
+
 void CDummyDKG::CreateDummyCommitment(Consensus::LLMQType llmqType, const CBlockIndex* pindex)
 {
     const auto& params = Params().GetConsensus().llmqs.at(llmqType);
@@ -254,6 +387,9 @@ void CDummyDKG::CreateDummyCommitment(Consensus::LLMQType llmqType, const CBlock
     auto vvec = BuildVvec(svec);
     auto vvecHash = ::SerializeHash(vvec);
     auto validMembers = GetValidMembers(llmqType, members);
+    if (std::count(validMembers.begin(), validMembers.end(), true) < params.minSize) {
+        return;
+    }
 
     auto commitmentHash = CLLMQUtils::BuildCommitmentHash((uint8_t)llmqType, quorumHash, validMembers, vvec[0], vvecHash);
 
@@ -356,9 +492,8 @@ void CDummyDKG::CreateFinalCommitment(Consensus::LLMQType llmqType, const CBlock
         quorumBlockProcessor->AddMinableCommitment(fqc);
     }
 
-    prevSessions[llmqType].badMembers = curSessions[llmqType].badMembers;
-    prevSessions[llmqType].dummyCommitments = std::move(curSessions[llmqType].dummyCommitments);
-    prevSessions[llmqType].dummyCommitmentsFromMembers = std::move(curSessions[llmqType].dummyCommitmentsFromMembers);
+    // reset for next round
+    curSessions[llmqType] = CDummyDKGSession();
 }
 
 std::vector<bool> CDummyDKG::GetValidMembers(Consensus::LLMQType llmqType, const std::vector<CDeterministicMNCPtr>& members)
@@ -368,20 +503,14 @@ std::vector<bool> CDummyDKG::GetValidMembers(Consensus::LLMQType llmqType, const
 
     LOCK(sessionCs);
 
-    // Valid members are members that sent us a dummy commitment in the previous session
+    // Valid members are members that sent us a dummy contribution in this session
 
     for (size_t i = 0; i < params.size; i++) {
-        if (!prevSessions[llmqType].badMembers.count(members[i]->proTxHash)) {
+        if (curSessions[llmqType].dummyContributionsFromMembers.count(members[i]->proTxHash)) {
             ret[i] = true;
         }
     }
 
-    // set all to valid if last sessions failed (this reboots everything)
-    if (std::count(ret.begin(), ret.end(), true) < params.minSize) {
-        for (size_t i = 0; i < params.size; i++) {
-            ret[i] = true;
-        }
-    }
     return ret;
 }
 
@@ -426,6 +555,31 @@ BLSPublicKeyVector CDummyDKG::BuildVvec(const BLSSecretKeyVector& svec)
     return vvec;
 }
 
+bool CDummyDKG::HasDummyContribution(const uint256& hash)
+{
+    LOCK(sessionCs);
+    for (const auto& p : curSessions) {
+        auto it = p.second.dummyContributions.find(hash);
+        if (it != p.second.dummyContributions.end()) {
+            return true;
+        }
+    }
+    return false;
+}
+
+bool CDummyDKG::GetDummyContribution(const uint256& hash, CDummyContribution& ret)
+{
+    LOCK(sessionCs);
+    for (const auto& p : curSessions) {
+        auto it = p.second.dummyContributions.find(hash);
+        if (it != p.second.dummyContributions.end()) {
+            ret = it->second;
+            return true;
+        }
+    }
+    return false;
+}
+
 bool CDummyDKG::HasDummyCommitment(const uint256& hash)
 {
     LOCK(sessionCs);
diff --git a/src/llmq/quorums_dummydkg.h b/src/llmq/quorums_dummydkg.h
index ca583f0ea39b..c41cf9c1c267 100644
--- a/src/llmq/quorums_dummydkg.h
+++ b/src/llmq/quorums_dummydkg.h
@@ -43,6 +43,38 @@ class CConnman;
 namespace llmq
 {
 
+// This is more like a PING than a contribution
+// We will later replace this message (reusing same inv type) for the real contribution
+// Deserialization will then be incompatible between peers, but that is fine (let them reject the messages)
+class CDummyContribution
+{
+public:
+    uint8_t llmqType{Consensus::LLMQ_NONE};
+    uint256 quorumHash;
+    uint16_t signer{(uint16_t)-1};
+
+    CBLSSignature sig;
+
+public:
+    ADD_SERIALIZE_METHODS
+
+    template<typename Stream, typename Operation>
+    inline void SerializationOp(Stream& s, Operation ser_action)
+    {
+        READWRITE(llmqType);
+        READWRITE(quorumHash);
+        READWRITE(signer);
+        READWRITE(sig);
+    }
+
+    uint256 GetSignHash() const
+    {
+        CDummyContribution tmp(*this);
+        tmp.sig = CBLSSignature();
+        return ::SerializeHash(tmp);
+    }
+};
+
 // This message is only allowed on testnet/devnet/regtest
 // If any peer tries to send this message on mainnet, it is banned immediately
 // It is used to test commitments on testnet without actually running a full-blown DKG.
@@ -82,8 +114,9 @@ class CDummyCommitment
 class CDummyDKGSession
 {
 public:
-    std::set<uint256> badMembers;
+    std::map<uint256, CDummyContribution> dummyContributions;
     std::map<uint256, CDummyCommitment> dummyCommitments;
+    std::map<uint256, uint256> dummyContributionsFromMembers;
     std::map<uint256, std::map<uint256, uint256>> dummyCommitmentsFromMembers;
 };
 
@@ -94,17 +127,20 @@ class CDummyDKG
 {
 private:
     CCriticalSection sessionCs;
-    std::map<Consensus::LLMQType, CDummyDKGSession> prevSessions;
     std::map<Consensus::LLMQType, CDummyDKGSession> curSessions;
 
 public:
     void ProcessMessage(CNode* pfrom, const std::string& strCommand, CDataStream& vRecv, CConnman& connman);
+    void ProcessDummyContribution(NodeId from, const CDummyContribution& qc);
     void ProcessDummyCommitment(NodeId from, const CDummyCommitment& qc);
 
     void UpdatedBlockTip(const CBlockIndex* pindex, bool fInitialDownload);
+    void CreateDummyContribution(Consensus::LLMQType llmqType, const CBlockIndex* pindex);
     void CreateDummyCommitment(Consensus::LLMQType llmqType, const CBlockIndex* pindex);
     void CreateFinalCommitment(Consensus::LLMQType llmqType, const CBlockIndex* pindex);
 
+    bool HasDummyContribution(const uint256& hash);
+    bool GetDummyContribution(const uint256& hash, CDummyContribution& ret);
     bool HasDummyCommitment(const uint256& hash);
     bool GetDummyCommitment(const uint256& hash, CDummyCommitment& ret);
 
diff --git a/src/net_processing.cpp b/src/net_processing.cpp
index bc506e8da008..641efab9f61e 100644
--- a/src/net_processing.cpp
+++ b/src/net_processing.cpp
@@ -970,6 +970,8 @@ bool static AlreadyHave(const CInv& inv) EXCLUSIVE_LOCKS_REQUIRED(cs_main)
         return llmq::quorumBlockProcessor->HasMinableCommitment(inv.hash);
     case MSG_QUORUM_DUMMY_COMMITMENT:
         return llmq::quorumDummyDKG->HasDummyCommitment(inv.hash);
+    case MSG_QUORUM_DUMMY_CONTRIBUTION:
+        return llmq::quorumDummyDKG->HasDummyContribution(inv.hash);
     }
 
     // Don't know what it is, just say we already got one
@@ -1291,6 +1293,14 @@ void static ProcessGetData(CNode* pfrom, const Consensus::Params& consensusParam
                     }
                 }
 
+                if (!push && (inv.type == MSG_QUORUM_DUMMY_CONTRIBUTION)) {
+                    llmq::CDummyContribution o;
+                    if (llmq::quorumDummyDKG->GetDummyContribution(inv.hash, o)) {
+                        connman.PushMessage(pfrom, msgMaker.Make(NetMsgType::QCONTRIB, o));
+                        push = true;
+                    }
+                }
+
                 if (!push && (inv.type == MSG_QUORUM_DUMMY_COMMITMENT)) {
                     if (!consensusParams.fLLMQAllowDummyCommitments) {
                         Misbehaving(pfrom->id, 100);
diff --git a/src/protocol.cpp b/src/protocol.cpp
index 1cde07d8297d..fa1ccaf9ce77 100644
--- a/src/protocol.cpp
+++ b/src/protocol.cpp
@@ -73,6 +73,7 @@ const char *GETMNLISTDIFF="getmnlistd";
 const char *MNLISTDIFF="mnlistdiff";
 const char *QFCOMMITMENT="qfcommit";
 const char *QDCOMMITMENT="qdcommit";
+const char *QCONTRIB="qcontrib";
 };
 
 static const char* ppszTypeName[] =
@@ -102,6 +103,7 @@ static const char* ppszTypeName[] =
     "compact block", // Should never occur
     NetMsgType::QFCOMMITMENT,
     NetMsgType::QDCOMMITMENT,
+    NetMsgType::QCONTRIB,
 };
 
 /** All known message types. Keep this in the same order as the list of
@@ -163,6 +165,7 @@ const static std::string allNetMessageTypes[] = {
     NetMsgType::MNLISTDIFF,
     NetMsgType::QFCOMMITMENT,
     NetMsgType::QDCOMMITMENT,
+    NetMsgType::QCONTRIB,
 };
 const static std::vector<std::string> allNetMessageTypesVec(allNetMessageTypes, allNetMessageTypes+ARRAYLEN(allNetMessageTypes));
 
diff --git a/src/protocol.h b/src/protocol.h
index 4a5326f7b11f..ba1b25c45675 100644
--- a/src/protocol.h
+++ b/src/protocol.h
@@ -272,6 +272,7 @@ extern const char *GETMNLISTDIFF;
 extern const char *MNLISTDIFF;
 extern const char *QFCOMMITMENT;
 extern const char *QDCOMMITMENT;
+extern const char *QCONTRIB;
 };
 
 /* Get a vector of all valid message types (see above) */
@@ -375,6 +376,7 @@ enum GetDataMsg {
     MSG_CMPCT_BLOCK = 20, //!< Defined in BIP152
     MSG_QUORUM_FINAL_COMMITMENT = 21,
     MSG_QUORUM_DUMMY_COMMITMENT = 22, // only valid on testnet/devnet/regtest
+    MSG_QUORUM_DUMMY_CONTRIBUTION = 23, // not a valid contribution and only allowed on testnet/devnet/regtest. Will later be replaced with the real contribution
 };
 
 /** inv message data */

From 63b58b1e921169a581f9f8af8444966988d633fa Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Mon, 10 Dec 2018 06:04:48 +0100
Subject: [PATCH 361/400] Reintroduce BLSInit to correctly set secure alloctor
 callbacks (#2543)

https://github.com/dashpay/dash/pull/2409 removed the need to call the
Init method of the Chia BLS library, but we also accidently removed the
initialization of the secure allocator.
---
 src/bench/bench_dash.cpp | 1 +
 src/bls/bls.cpp          | 8 ++++++++
 src/bls/bls.h            | 2 ++
 src/init.cpp             | 4 ++++
 src/test/test_dash.cpp   | 1 +
 5 files changed, 16 insertions(+)

diff --git a/src/bench/bench_dash.cpp b/src/bench/bench_dash.cpp
index 82b1cf3b3ebd..a1d208502470 100644
--- a/src/bench/bench_dash.cpp
+++ b/src/bench/bench_dash.cpp
@@ -19,6 +19,7 @@ main(int argc, char** argv)
     ECC_Start();
     ECCVerifyHandle verifyHandle;
 
+    BLSInit();
     SetupEnvironment();
     fPrintToDebugLog = false; // don't want to write to debug.log file
 
diff --git a/src/bls/bls.cpp b/src/bls/bls.cpp
index 02a793551866..bb44f50296ac 100644
--- a/src/bls/bls.cpp
+++ b/src/bls/bls.cpp
@@ -462,3 +462,11 @@ static void secure_free(void* p)
     return get_secure_allocator().deallocate(ptr, n);
 }
 #endif
+
+bool BLSInit()
+{
+#ifndef BUILD_BITCOIN_INTERNAL
+    bls::BLS::SetSecureAllocator(secure_allocate, secure_free);
+#endif
+    return true;
+}
diff --git a/src/bls/bls.h b/src/bls/bls.h
index f62ab67566a4..c50a96ee11ec 100644
--- a/src/bls/bls.h
+++ b/src/bls/bls.h
@@ -300,4 +300,6 @@ typedef std::shared_ptr<BLSPublicKeyVector> BLSPublicKeyVectorPtr;
 typedef std::shared_ptr<BLSSecretKeyVector> BLSSecretKeyVectorPtr;
 typedef std::shared_ptr<BLSSignatureVector> BLSSignatureVectorPtr;
 
+bool BLSInit();
+
 #endif // DASH_CRYPTO_BLS_H
diff --git a/src/init.cpp b/src/init.cpp
index a66c23991157..5bf399197a24 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -855,6 +855,10 @@ bool InitSanityCheck(void)
     if (!glibc_sanity_test() || !glibcxx_sanity_test())
         return false;
 
+    if (!BLSInit()) {
+        return false;
+    }
+
     return true;
 }
 
diff --git a/src/test/test_dash.cpp b/src/test/test_dash.cpp
index 521d8a422f4c..b90722223cef 100644
--- a/src/test/test_dash.cpp
+++ b/src/test/test_dash.cpp
@@ -44,6 +44,7 @@ extern void noui_connect();
 BasicTestingSetup::BasicTestingSetup(const std::string& chainName)
 {
         ECC_Start();
+        BLSInit();
         SetupEnvironment();
         SetupNetworking();
         InitSignatureCache();

From 15414dac295812124612b27876a5ed703fc13234 Mon Sep 17 00:00:00 2001
From: UdjinM6 <UdjinM6@users.noreply.github.com>
Date: Mon, 10 Dec 2018 08:05:29 +0300
Subject: [PATCH 362/400] Refactor CQuorumBlockProcessor and
 CDeterministicMNManager (#2536)

* Refactor CDeterministicMNManager::ProcessBlock: pintexPrev -> pindex->pprev and/or adjust logic accordingly

* Refactor CQuorumBlockProcessor::ProcessBlock: pintexPrev -> pindex->pprev and/or adjust logic accordingly

* Drop unused
---
 src/evo/deterministicmns.cpp        |  8 ++++----
 src/evo/deterministicmns.h          |  2 +-
 src/evo/specialtx.cpp               |  4 ++--
 src/llmq/quorums_blockprocessor.cpp | 16 +++++-----------
 src/llmq/quorums_blockprocessor.h   |  2 +-
 5 files changed, 13 insertions(+), 19 deletions(-)

diff --git a/src/evo/deterministicmns.cpp b/src/evo/deterministicmns.cpp
index 162d3029c5a2..c92ee4369713 100644
--- a/src/evo/deterministicmns.cpp
+++ b/src/evo/deterministicmns.cpp
@@ -428,14 +428,14 @@ CDeterministicMNManager::CDeterministicMNManager(CEvoDB& _evoDb) :
 {
 }
 
-bool CDeterministicMNManager::ProcessBlock(const CBlock& block, const CBlockIndex* pindexPrev, CValidationState& _state)
+bool CDeterministicMNManager::ProcessBlock(const CBlock& block, const CBlockIndex* pindex, CValidationState& _state)
 {
     LOCK(cs);
 
-    int nHeight = pindexPrev->nHeight + 1;
+    int nHeight = pindex->nHeight;
 
     CDeterministicMNList newList;
-    if (!BuildNewListFromBlock(block, pindexPrev, _state, newList, true)) {
+    if (!BuildNewListFromBlock(block, pindex->pprev, _state, newList, true)) {
         return false;
     }
 
@@ -445,7 +445,7 @@ bool CDeterministicMNManager::ProcessBlock(const CBlock& block, const CBlockInde
 
     newList.SetBlockHash(block.GetHash());
 
-    CDeterministicMNList oldList = GetListForBlock(pindexPrev->GetBlockHash());
+    CDeterministicMNList oldList = GetListForBlock(pindex->pprev->GetBlockHash());
     CDeterministicMNListDiff diff = oldList.BuildDiff(newList);
 
     evoDb.Write(std::make_pair(DB_LIST_DIFF, diff.blockHash), diff);
diff --git a/src/evo/deterministicmns.h b/src/evo/deterministicmns.h
index c4734e6c1530..aeed32648c23 100644
--- a/src/evo/deterministicmns.h
+++ b/src/evo/deterministicmns.h
@@ -453,7 +453,7 @@ class CDeterministicMNManager
 public:
     CDeterministicMNManager(CEvoDB& _evoDb);
 
-    bool ProcessBlock(const CBlock& block, const CBlockIndex* pindexPrev, CValidationState& state);
+    bool ProcessBlock(const CBlock& block, const CBlockIndex* pindex, CValidationState& state);
     bool UndoBlock(const CBlock& block, const CBlockIndex* pindex);
 
     void UpdatedBlockTip(const CBlockIndex* pindex);
diff --git a/src/evo/specialtx.cpp b/src/evo/specialtx.cpp
index 7bd29ed51f69..9e916bb45698 100644
--- a/src/evo/specialtx.cpp
+++ b/src/evo/specialtx.cpp
@@ -98,11 +98,11 @@ bool ProcessSpecialTxsInBlock(const CBlock& block, const CBlockIndex* pindex, CV
         }
     }
 
-    if (!llmq::quorumBlockProcessor->ProcessBlock(block, pindex->pprev, state)) {
+    if (!llmq::quorumBlockProcessor->ProcessBlock(block, pindex, state)) {
         return false;
     }
 
-    if (!deterministicMNManager->ProcessBlock(block, pindex->pprev, state)) {
+    if (!deterministicMNManager->ProcessBlock(block, pindex, state)) {
         return false;
     }
 
diff --git a/src/llmq/quorums_blockprocessor.cpp b/src/llmq/quorums_blockprocessor.cpp
index 5a3d1feb4626..92442d4db61e 100644
--- a/src/llmq/quorums_blockprocessor.cpp
+++ b/src/llmq/quorums_blockprocessor.cpp
@@ -105,19 +105,17 @@ void CQuorumBlockProcessor::ProcessMessage(CNode* pfrom, const std::string& strC
     }
 }
 
-bool CQuorumBlockProcessor::ProcessBlock(const CBlock& block, const CBlockIndex* pindexPrev, CValidationState& state)
+bool CQuorumBlockProcessor::ProcessBlock(const CBlock& block, const CBlockIndex* pindex, CValidationState& state)
 {
     AssertLockHeld(cs_main);
 
-    bool fDIP0003Active = VersionBitsState(pindexPrev, Params().GetConsensus(), Consensus::DEPLOYMENT_DIP0003, versionbitscache) == THRESHOLD_ACTIVE;
+    bool fDIP0003Active = VersionBitsState(pindex->pprev, Params().GetConsensus(), Consensus::DEPLOYMENT_DIP0003, versionbitscache) == THRESHOLD_ACTIVE;
     if (!fDIP0003Active) {
         return true;
     }
 
-    int nHeight = pindexPrev->nHeight + 1;
-
     std::map<Consensus::LLMQType, CFinalCommitment> qcs;
-    if (!GetCommitmentsFromBlock(block, pindexPrev, qcs, state)) {
+    if (!GetCommitmentsFromBlock(block, pindex->pprev, qcs, state)) {
         return false;
     }
 
@@ -127,11 +125,9 @@ bool CQuorumBlockProcessor::ProcessBlock(const CBlock& block, const CBlockIndex*
     for (const auto& p : Params().GetConsensus().llmqs) {
         auto type = p.first;
 
-        uint256 quorumHash = GetQuorumBlockHash(type, pindexPrev);
-
         // does the currently processed block contain a (possibly null) commitment for the current session?
         bool hasCommitmentInNewBlock = qcs.count(type) != 0;
-        bool isCommitmentRequired = IsCommitmentRequired(type, pindexPrev);
+        bool isCommitmentRequired = IsCommitmentRequired(type, pindex->pprev);
 
         if (hasCommitmentInNewBlock && !isCommitmentRequired) {
             // If we're either not in the mining phase or a non-null commitment was mined already, reject the block
@@ -147,7 +143,7 @@ bool CQuorumBlockProcessor::ProcessBlock(const CBlock& block, const CBlockIndex*
 
     for (auto& p : qcs) {
         auto& qc = p.second;
-        if (!ProcessCommitment(pindexPrev, qc, state)) {
+        if (!ProcessCommitment(pindex->pprev, qc, state)) {
             return false;
         }
     }
@@ -384,8 +380,6 @@ bool CQuorumBlockProcessor::GetMinableCommitment(Consensus::LLMQType llmqType, c
 {
     AssertLockHeld(cs_main);
 
-    int nHeight = pindexPrev->nHeight + 1;
-
     if (!IsCommitmentRequired(llmqType, pindexPrev)) {
         // no commitment required
         return false;
diff --git a/src/llmq/quorums_blockprocessor.h b/src/llmq/quorums_blockprocessor.h
index ab1f34c96887..4bfc018ffd41 100644
--- a/src/llmq/quorums_blockprocessor.h
+++ b/src/llmq/quorums_blockprocessor.h
@@ -34,7 +34,7 @@ class CQuorumBlockProcessor
 
     void ProcessMessage(CNode* pfrom, const std::string& strCommand, CDataStream& vRecv, CConnman& connman);
 
-    bool ProcessBlock(const CBlock& block, const CBlockIndex* pindexPrev, CValidationState& state);
+    bool ProcessBlock(const CBlock& block, const CBlockIndex* pindex, CValidationState& state);
     bool UndoBlock(const CBlock& block, const CBlockIndex* pindex);
 
     void AddMinableCommitment(const CFinalCommitment& fqc);

From 88f7bf0d82a537532c60ab0d383c06f2678af236 Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Mon, 10 Dec 2018 08:31:09 +0100
Subject: [PATCH 363/400] Don't delete/add values to the unique property map
 when it's null (#2538)

* Don't delete/add values to the unique property map when it's null

This happens when revoking operator keys, as the revoked MN will then have
the address and operator keys set to the null representation. We shouldn't
add the null value to the unique property map as otherwise future revokes
crash in an assert.

* Assert that no null values are passed to Add/DeleteUniqueProperty

* Check for null values before calling Add/DeleteUniqueProperty

* Apply suggestions from code review

Co-Authored-By: codablock <ablock84@gmail.com>

* Add user generated default constructors to BLS primitives

Fixes build issues on Mac:

In file included from evo/deterministicmns.cpp:5:
./evo/deterministicmns.h:375:24: error: default initialization of an object of const type 'const CBLSPublicKey' without a user-provided default constructor
        static const T nullValue;
                       ^
---
 src/bls/bls.h                |  9 ++++++++-
 src/evo/deterministicmns.cpp | 16 ++++++++++++----
 src/evo/deterministicmns.h   | 17 +++++++++++++++--
 3 files changed, 35 insertions(+), 7 deletions(-)

diff --git a/src/bls/bls.h b/src/bls/bls.h
index c50a96ee11ec..ba614c623116 100644
--- a/src/bls/bls.h
+++ b/src/bls/bls.h
@@ -203,6 +203,8 @@ class CBLSId : public CBLSWrapper<uint256, BLS_CURVE_ID_SIZE, CBLSId>
     using CBLSWrapper::operator==;
     using CBLSWrapper::operator!=;
 
+    CBLSId() {}
+
     void SetInt(int x);
     void SetHash(const uint256& hash);
 
@@ -221,6 +223,8 @@ class CBLSSecretKey : public CBLSWrapper<bls::PrivateKey, BLS_CURVE_SECKEY_SIZE,
     using CBLSWrapper::operator==;
     using CBLSWrapper::operator!=;
 
+    CBLSSecretKey() {}
+
     void AggregateInsecure(const CBLSSecretKey& o);
     static CBLSSecretKey AggregateInsecure(const std::vector<CBLSSecretKey>& sks);
 
@@ -247,6 +251,8 @@ class CBLSPublicKey : public CBLSWrapper<bls::PublicKey, BLS_CURVE_PUBKEY_SIZE,
     using CBLSWrapper::operator==;
     using CBLSWrapper::operator!=;
 
+    CBLSPublicKey() {}
+
     void AggregateInsecure(const CBLSPublicKey& o);
     static CBLSPublicKey AggregateInsecure(const std::vector<CBLSPublicKey>& pks);
 
@@ -265,8 +271,9 @@ class CBLSSignature : public CBLSWrapper<bls::InsecureSignature, BLS_CURVE_SIG_S
 public:
     using CBLSWrapper::operator==;
     using CBLSWrapper::operator!=;
+    using CBLSWrapper::CBLSWrapper;
 
-    CBLSSignature() = default;
+    CBLSSignature() {}
     CBLSSignature(const CBLSSignature&) = default;
     CBLSSignature& operator=(const CBLSSignature&) = default;
 
diff --git a/src/evo/deterministicmns.cpp b/src/evo/deterministicmns.cpp
index c92ee4369713..1068b4f2d7db 100644
--- a/src/evo/deterministicmns.cpp
+++ b/src/evo/deterministicmns.cpp
@@ -393,9 +393,13 @@ void CDeterministicMNList::AddMN(const CDeterministicMNCPtr& dmn)
     assert(!mnMap.find(dmn->proTxHash));
     mnMap = mnMap.set(dmn->proTxHash, dmn);
     AddUniqueProperty(dmn, dmn->collateralOutpoint);
-    AddUniqueProperty(dmn, dmn->pdmnState->addr);
+    if (dmn->pdmnState->addr != CService()) {
+        AddUniqueProperty(dmn, dmn->pdmnState->addr);
+    }
     AddUniqueProperty(dmn, dmn->pdmnState->keyIDOwner);
-    AddUniqueProperty(dmn, dmn->pdmnState->pubKeyOperator);
+    if (dmn->pdmnState->pubKeyOperator.IsValid()) {
+        AddUniqueProperty(dmn, dmn->pdmnState->pubKeyOperator);
+    }
 }
 
 void CDeterministicMNList::UpdateMN(const uint256& proTxHash, const CDeterministicMNStateCPtr& pdmnState)
@@ -417,9 +421,13 @@ void CDeterministicMNList::RemoveMN(const uint256& proTxHash)
     auto dmn = GetMN(proTxHash);
     assert(dmn != nullptr);
     DeleteUniqueProperty(dmn, dmn->collateralOutpoint);
-    DeleteUniqueProperty(dmn, dmn->pdmnState->addr);
+    if (dmn->pdmnState->addr != CService()) {
+        DeleteUniqueProperty(dmn, dmn->pdmnState->addr);
+    }
     DeleteUniqueProperty(dmn, dmn->pdmnState->keyIDOwner);
-    DeleteUniqueProperty(dmn, dmn->pdmnState->pubKeyOperator);
+    if (dmn->pdmnState->pubKeyOperator.IsValid()) {
+        DeleteUniqueProperty(dmn, dmn->pdmnState->pubKeyOperator);
+    }
     mnMap = mnMap.erase(proTxHash);
 }
 
diff --git a/src/evo/deterministicmns.h b/src/evo/deterministicmns.h
index aeed32648c23..ba0d1fa8541c 100644
--- a/src/evo/deterministicmns.h
+++ b/src/evo/deterministicmns.h
@@ -372,6 +372,9 @@ class CDeterministicMNList
     template <typename T>
     void AddUniqueProperty(const CDeterministicMNCPtr& dmn, const T& v)
     {
+        static const T nullValue;
+        assert(v != nullValue);
+
         auto hash = ::SerializeHash(v);
         auto oldEntry = mnUniquePropertyMap.find(hash);
         assert(!oldEntry || oldEntry->first == dmn->proTxHash);
@@ -384,6 +387,9 @@ class CDeterministicMNList
     template <typename T>
     void DeleteUniqueProperty(const CDeterministicMNCPtr& dmn, const T& oldValue)
     {
+        static const T nullValue;
+        assert(oldValue != nullValue);
+
         auto oldHash = ::SerializeHash(oldValue);
         auto p = mnUniquePropertyMap.find(oldHash);
         assert(p && p->first == dmn->proTxHash);
@@ -399,8 +405,15 @@ class CDeterministicMNList
         if (oldValue == newValue) {
             return;
         }
-        DeleteUniqueProperty(dmn, oldValue);
-        AddUniqueProperty(dmn, newValue);
+        static const T nullValue;
+
+        if (oldValue != nullValue) {
+            DeleteUniqueProperty(dmn, oldValue);
+        }
+
+        if (newValue != nullValue) {
+            AddUniqueProperty(dmn, newValue);
+        }
     }
 };
 

From 5830353373aec05997573ef38c1dea140c5f47c7 Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Mon, 10 Dec 2018 09:14:19 +0100
Subject: [PATCH 364/400] Track operator key changes in mempool and handle
 conflicts (#2540)

* Track ProTx operator key changes in mempool

* Remove ProTx conflicts from mempool when ProUpRegTx or ProUpRevTx changed keys

* Only allow one operator key change per MN in in mempool
---
 src/txmempool.cpp | 79 +++++++++++++++++++++++++++++++++++++++++++++++
 src/txmempool.h   |  5 +++
 2 files changed, 84 insertions(+)

diff --git a/src/txmempool.cpp b/src/txmempool.cpp
index 56437de93a25..15acafde6d78 100644
--- a/src/txmempool.cpp
+++ b/src/txmempool.cpp
@@ -472,6 +472,13 @@ bool CTxMemPool::addUnchecked(const uint256& hash, const CTxMemPoolEntry &entry,
         }
         mapProTxRefs.emplace(proTx.proTxHash, tx.GetHash());
         mapProTxBlsPubKeyHashes.emplace(proTx.pubKeyOperator.GetHash(), tx.GetHash());
+
+        auto dmn = deterministicMNManager->GetListAtChainTip().GetMN(proTx.proTxHash);
+        assert(dmn); // we should never get such a ProTx into the mempool
+        newit->validForProTxKey = ::SerializeHash(dmn->pdmnState->pubKeyOperator);
+        if (dmn->pdmnState->pubKeyOperator != proTx.pubKeyOperator) {
+            newit->isKeyChangeProTx = true;
+        }
     } else if (tx.nType == TRANSACTION_PROVIDER_UPDATE_REVOKE) {
         CProUpRevTx proTx;
         if (!GetTxPayload(tx, proTx)) {
@@ -479,6 +486,12 @@ bool CTxMemPool::addUnchecked(const uint256& hash, const CTxMemPoolEntry &entry,
             return false;
         }
         mapProTxRefs.emplace(proTx.proTxHash, tx.GetHash());
+        auto dmn = deterministicMNManager->GetListAtChainTip().GetMN(proTx.proTxHash);
+        assert(dmn); // we should never get such a ProTx into the mempool
+        newit->validForProTxKey = ::SerializeHash(dmn->pdmnState->pubKeyOperator);
+        if (dmn->pdmnState->pubKeyOperator != CBLSPublicKey()) {
+            newit->isKeyChangeProTx = true;
+        }
     }
 
     return true;
@@ -893,6 +906,24 @@ void CTxMemPool::removeProTxSpentCollateralConflicts(const CTransaction &tx)
     }
 }
 
+void CTxMemPool::removeProTxKeyChangedConflicts(const CTransaction &tx, const uint256& proTxHash, const uint256& newKeyHash)
+{
+    std::set<uint256> conflictingTxs;
+    for (auto its = mapProTxRefs.equal_range(proTxHash); its.first != its.second; ++its.first) {
+        auto txit = mapTx.find(its.first->second);
+        if (txit == mapTx.end()) {
+            continue;
+        }
+        if (txit->validForProTxKey != newKeyHash) {
+            conflictingTxs.emplace(txit->GetTx().GetHash());
+        }
+    }
+    for (const auto& txHash : conflictingTxs) {
+        auto& tx = mapTx.find(txHash)->GetTx();
+        removeRecursive(tx, MemPoolRemovalReason::CONFLICT);
+    }
+}
+
 void CTxMemPool::removeProTxConflicts(const CTransaction &tx)
 {
     removeProTxSpentCollateralConflicts(tx);
@@ -936,6 +967,15 @@ void CTxMemPool::removeProTxConflicts(const CTransaction &tx)
         }
 
         removeProTxPubKeyConflicts(tx, proTx.pubKeyOperator);
+        removeProTxKeyChangedConflicts(tx, proTx.proTxHash, ::SerializeHash(proTx.pubKeyOperator));
+    } else if (tx.nType == TRANSACTION_PROVIDER_UPDATE_REVOKE) {
+        CProUpRevTx proTx;
+        if (!GetTxPayload(tx, proTx)) {
+            LogPrintf("%s: ERROR: Invalid transaction payload, tx: %s", __func__, tx.ToString());
+            return;
+        }
+
+        removeProTxKeyChangedConflicts(tx, proTx.proTxHash, ::SerializeHash(CBLSPublicKey()));
     }
 }
 
@@ -1218,6 +1258,20 @@ TxMempoolInfo CTxMemPool::info(const uint256& hash) const
 
 bool CTxMemPool::existsProviderTxConflict(const CTransaction &tx) const {
     LOCK(cs);
+
+    auto hasKeyChangeInMempool = [&](const uint256& proTxHash) {
+        for (auto its = mapProTxRefs.equal_range(proTxHash); its.first != its.second; ++its.first) {
+            auto txit = mapTx.find(its.first->second);
+            if (txit == mapTx.end()) {
+                continue;
+            }
+            if (txit->isKeyChangeProTx) {
+                return true;
+            }
+        }
+        return false;
+    };
+
     if (tx.nType == TRANSACTION_PROVIDER_REGISTER) {
         CProRegTx proTx;
         if (!GetTxPayload(tx, proTx)) {
@@ -1243,8 +1297,33 @@ bool CTxMemPool::existsProviderTxConflict(const CTransaction &tx) const {
             LogPrintf("%s: ERROR: Invalid transaction payload, tx: %s", __func__, tx.ToString());
             return true; // i.e. can't decode payload == conflict
         }
+
+        // only allow one operator key change in the mempool
+        auto dmn = deterministicMNManager->GetListAtChainTip().GetMN(proTx.proTxHash);
+        assert(dmn); // this method should only be called with validated ProTxs
+        if (dmn->pdmnState->pubKeyOperator != proTx.pubKeyOperator) {
+            if (hasKeyChangeInMempool(proTx.proTxHash)) {
+                return true;
+            }
+        }
+
         auto it = mapProTxBlsPubKeyHashes.find(proTx.pubKeyOperator.GetHash());
         return it != mapProTxBlsPubKeyHashes.end() && it->second != proTx.proTxHash;
+    } else if (tx.nType == TRANSACTION_PROVIDER_UPDATE_REVOKE) {
+        CProUpRevTx proTx;
+        if (!GetTxPayload(tx, proTx)) {
+            LogPrintf("%s: ERROR: Invalid transaction payload, tx: %s", __func__, tx.ToString());
+            return true; // i.e. can't decode payload == conflict
+        }
+
+        // only allow one operator key change in the mempool
+        auto dmn = deterministicMNManager->GetListAtChainTip().GetMN(proTx.proTxHash);
+        assert(dmn); // this method should only be called with validated ProTxs
+        if (dmn->pdmnState->pubKeyOperator != CBLSPublicKey()) {
+            if (hasKeyChangeInMempool(proTx.proTxHash)) {
+                return true;
+            }
+        }
     }
     return false;
 }
diff --git a/src/txmempool.h b/src/txmempool.h
index 1362c8064392..e88edf80f67f 100644
--- a/src/txmempool.h
+++ b/src/txmempool.h
@@ -162,6 +162,10 @@ class CTxMemPoolEntry
     unsigned int GetSigOpCountWithAncestors() const { return nSigOpCountWithAncestors; }
 
     mutable size_t vTxHashesIdx; //!< Index in mempool's vTxHashes
+
+    // If this is a proTx, this will be the hash of the key for which this ProTx was valid
+    mutable uint256 validForProTxKey;
+    mutable bool isKeyChangeProTx{false};
 };
 
 // Helpers for modifying CTxMemPool::mapTx, which is a boost multi_index.
@@ -586,6 +590,7 @@ class CTxMemPool
     void removeProTxPubKeyConflicts(const CTransaction &tx, const CBLSPublicKey &pubKey);
     void removeProTxCollateralConflicts(const CTransaction &tx, const COutPoint &collateralOutpoint);
     void removeProTxSpentCollateralConflicts(const CTransaction &tx);
+    void removeProTxKeyChangedConflicts(const CTransaction &tx, const uint256& proTxHash, const uint256& newKeyHash);
     void removeProTxConflicts(const CTransaction &tx);
     void removeForBlock(const std::vector<CTransactionRef>& vtx, unsigned int nBlockHeight);
 

From 18cd5965cc91694a558399e941eb0e8ef962456e Mon Sep 17 00:00:00 2001
From: UdjinM6 <UdjinM6@users.noreply.github.com>
Date: Mon, 10 Dec 2018 16:57:22 +0300
Subject: [PATCH 365/400] Sort recipients in SendCoins dialog via BIP69 rule
 (#2546)

---
 src/qt/sendcoinsdialog.cpp | 5 +++++
 src/qt/walletmodel.h       | 9 +++++++++
 2 files changed, 14 insertions(+)

diff --git a/src/qt/sendcoinsdialog.cpp b/src/qt/sendcoinsdialog.cpp
index 0aedece4def6..ecca3344b9f2 100644
--- a/src/qt/sendcoinsdialog.cpp
+++ b/src/qt/sendcoinsdialog.cpp
@@ -254,6 +254,11 @@ void SendCoinsDialog::on_sendButton_clicked()
         return;
     }
 
+    // apply BIP69
+    if (bBIP69Enabled) {
+        std::sort(recipients.begin(), recipients.end(), CompareSendCoinsRecipientBIP69());
+    }
+
     QString strFunds = tr("using") + " <b>" + tr("anonymous funds") + "</b>";
     QString strFee = "";
     recipients[0].inputType = ONLY_DENOMINATED;
diff --git a/src/qt/walletmodel.h b/src/qt/walletmodel.h
index f52657749caf..1a9e457d541d 100644
--- a/src/qt/walletmodel.h
+++ b/src/qt/walletmodel.h
@@ -101,6 +101,15 @@ class SendCoinsRecipient
     }
 };
 
+// same as CompareOutputBIP69 in primitives/transaction.h
+struct CompareSendCoinsRecipientBIP69
+{
+    inline bool operator()(const SendCoinsRecipient& a, const SendCoinsRecipient& b) const
+    {
+        return a.amount < b.amount || (a.amount == b.amount && a.address < b.address);
+    }
+};
+
 /** Interface to Bitcoin wallet from Qt view code. */
 class WalletModel : public QObject
 {

From 1522656d6f998151e4c01bc208a17bd79c6b495d Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Thu, 13 Dec 2018 07:49:50 +0100
Subject: [PATCH 366/400] Correctly handle spent collaterals for MNs that were
 registered in the same block (#2553)

* Move spent collateral handling to the bottom of BuildNewListFromBlock

* Handle conflicts with spent collaterals in mempool
---
 src/evo/deterministicmns.cpp | 31 ++++++++++++++++++-------------
 src/txmempool.cpp            | 12 ++++++++++--
 2 files changed, 28 insertions(+), 15 deletions(-)

diff --git a/src/evo/deterministicmns.cpp b/src/evo/deterministicmns.cpp
index 1068b4f2d7db..8dc45bec4272 100644
--- a/src/evo/deterministicmns.cpp
+++ b/src/evo/deterministicmns.cpp
@@ -535,19 +535,6 @@ bool CDeterministicMNManager::BuildNewListFromBlock(const CBlock& block, const C
     for (int i = 1; i < (int)block.vtx.size(); i++) {
         const CTransaction& tx = *block.vtx[i];
 
-        // check if any existing MN collateral is spent by this transaction
-        for (const auto& in : tx.vin) {
-            auto dmn = newList.GetMNByCollateral(in.prevout);
-            if (dmn && dmn->collateralOutpoint == in.prevout) {
-                newList.RemoveMN(dmn->proTxHash);
-
-                if (debugLogs) {
-                    LogPrintf("CDeterministicMNManager::%s -- MN %s removed from list because collateral was spent. collateralOutpoint=%s, nHeight=%d, mapCurMNs.allMNsCount=%d\n",
-                        __func__, dmn->proTxHash.ToString(), dmn->collateralOutpoint.ToStringShort(), nHeight, newList.GetAllMNsCount());
-                }
-            }
-        }
-
         if (tx.nVersion != 3) {
             // only interested in special TXs
             continue;
@@ -709,6 +696,24 @@ bool CDeterministicMNManager::BuildNewListFromBlock(const CBlock& block, const C
         }
     }
 
+    // we skip the coinbase
+    for (int i = 1; i < (int)block.vtx.size(); i++) {
+        const CTransaction& tx = *block.vtx[i];
+
+        // check if any existing MN collateral is spent by this transaction
+        for (const auto& in : tx.vin) {
+            auto dmn = newList.GetMNByCollateral(in.prevout);
+            if (dmn && dmn->collateralOutpoint == in.prevout) {
+                newList.RemoveMN(dmn->proTxHash);
+
+                if (debugLogs) {
+                    LogPrintf("CDeterministicMNManager::%s -- MN %s removed from list because collateral was spent. collateralOutpoint=%s, nHeight=%d, mapCurMNs.allMNsCount=%d\n",
+                              __func__, dmn->proTxHash.ToString(), dmn->collateralOutpoint.ToStringShort(), nHeight, newList.GetAllMNsCount());
+                }
+            }
+        }
+    }
+
     // The payee for the current block was determined by the previous block's list but it might have disappeared in the
     // current block. We still pay that MN one last time however.
     if (payee && newList.HasMN(payee->proTxHash)) {
diff --git a/src/txmempool.cpp b/src/txmempool.cpp
index 15acafde6d78..3037caeac2a9 100644
--- a/src/txmempool.cpp
+++ b/src/txmempool.cpp
@@ -1280,8 +1280,16 @@ bool CTxMemPool::existsProviderTxConflict(const CTransaction &tx) const {
         }
         if (mapProTxAddresses.count(proTx.addr) || mapProTxPubKeyIDs.count(proTx.keyIDOwner) || mapProTxBlsPubKeyHashes.count(proTx.pubKeyOperator.GetHash()))
             return true;
-        if (!proTx.collateralOutpoint.hash.IsNull() && mapProTxCollaterals.count(proTx.collateralOutpoint))
-            return true;
+        if (!proTx.collateralOutpoint.hash.IsNull()) {
+            if (mapProTxCollaterals.count(proTx.collateralOutpoint)) {
+                // there is another ProRegTx that refers to the same collateral
+                return true;
+            }
+            if (mapNextTx.count(proTx.collateralOutpoint)) {
+                // there is another tx that spends the collateral
+                return true;
+            }
+        }
         return false;
     } else if (tx.nType == TRANSACTION_PROVIDER_UPDATE_SERVICE) {
         CProUpServTx proTx;

From 09730e1c59c2b1f79e74f79ed87ff2388bcb0523 Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Thu, 13 Dec 2018 07:55:42 +0100
Subject: [PATCH 367/400] Bail out from update methods in MasternodeList when
 shutdown is requested (#2551)

---
 src/qt/masternodelist.cpp | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/src/qt/masternodelist.cpp b/src/qt/masternodelist.cpp
index 06b1d33e627c..ca76e4c5eb52 100644
--- a/src/qt/masternodelist.cpp
+++ b/src/qt/masternodelist.cpp
@@ -274,6 +274,10 @@ void MasternodeList::updateMyMasternodeInfo(QString strAlias, QString strAddr, c
 
 void MasternodeList::updateMyNodeList(bool fForce)
 {
+    if (ShutdownRequested()) {
+        return;
+    }
+
     TRY_LOCK(cs_mymnlist, fLockAcquired);
     if (!fLockAcquired) return;
 
@@ -310,6 +314,10 @@ void MasternodeList::updateMyNodeList(bool fForce)
 
 void MasternodeList::updateNodeList()
 {
+    if (ShutdownRequested()) {
+        return;
+    }
+
     TRY_LOCK(cs_mnlist, fLockAcquired);
     if (!fLockAcquired) return;
 
@@ -380,6 +388,10 @@ void MasternodeList::updateNodeList()
 
 void MasternodeList::updateDIP3List()
 {
+    if (ShutdownRequested()) {
+        return;
+    }
+
     TRY_LOCK(cs_dip3list, fLockAcquired);
     if (!fLockAcquired) return;
 

From 2127a426b8ef82eeca6d2e74bc1815733d7cc161 Mon Sep 17 00:00:00 2001
From: UdjinM6 <UdjinM6@users.noreply.github.com>
Date: Thu, 13 Dec 2018 11:04:08 +0300
Subject: [PATCH 368/400] Further refactoring of CQuorumBlockProcessor (#2545)

* Switch GetQuorumBlockHash from CBlockIndex* to nHeight

* `pindexPrev -> pindex` for ProcessCommitment

* Switch IsCommitmentRequired from CBlockIndex* to block height

* Switch GetMinableCommitment/Tx from CBlockIndex* to block height

* Add `AssertLockHeld(cs_main);`

Co-Authored-By: UdjinM6 <UdjinM6@users.noreply.github.com>
---
 src/llmq/quorums_blockprocessor.cpp | 44 ++++++++++++++---------------
 src/llmq/quorums_blockprocessor.h   | 10 +++----
 src/miner.cpp                       |  2 +-
 3 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/src/llmq/quorums_blockprocessor.cpp b/src/llmq/quorums_blockprocessor.cpp
index 92442d4db61e..7de9214efa77 100644
--- a/src/llmq/quorums_blockprocessor.cpp
+++ b/src/llmq/quorums_blockprocessor.cpp
@@ -127,7 +127,7 @@ bool CQuorumBlockProcessor::ProcessBlock(const CBlock& block, const CBlockIndex*
 
         // does the currently processed block contain a (possibly null) commitment for the current session?
         bool hasCommitmentInNewBlock = qcs.count(type) != 0;
-        bool isCommitmentRequired = IsCommitmentRequired(type, pindex->pprev);
+        bool isCommitmentRequired = IsCommitmentRequired(type, pindex->nHeight);
 
         if (hasCommitmentInNewBlock && !isCommitmentRequired) {
             // If we're either not in the mining phase or a non-null commitment was mined already, reject the block
@@ -143,18 +143,18 @@ bool CQuorumBlockProcessor::ProcessBlock(const CBlock& block, const CBlockIndex*
 
     for (auto& p : qcs) {
         auto& qc = p.second;
-        if (!ProcessCommitment(pindex->pprev, qc, state)) {
+        if (!ProcessCommitment(pindex, qc, state)) {
             return false;
         }
     }
     return true;
 }
 
-bool CQuorumBlockProcessor::ProcessCommitment(const CBlockIndex* pindexPrev, const CFinalCommitment& qc, CValidationState& state)
+bool CQuorumBlockProcessor::ProcessCommitment(const CBlockIndex* pindex, const CFinalCommitment& qc, CValidationState& state)
 {
     auto& params = Params().GetConsensus().llmqs.at((Consensus::LLMQType)qc.llmqType);
 
-    uint256 quorumHash = GetQuorumBlockHash((Consensus::LLMQType)qc.llmqType, pindexPrev);
+    uint256 quorumHash = GetQuorumBlockHash((Consensus::LLMQType)qc.llmqType, pindex->nHeight);
     if (quorumHash.IsNull()) {
         return state.DoS(100, false, REJECT_INVALID, "bad-qc-block");
     }
@@ -174,7 +174,7 @@ bool CQuorumBlockProcessor::ProcessCommitment(const CBlockIndex* pindexPrev, con
         return state.DoS(100, false, REJECT_INVALID, "bad-qc-dup");
     }
 
-    if (!IsMiningPhase(params.type, pindexPrev->nHeight + 1)) {
+    if (!IsMiningPhase(params.type, pindex->nHeight)) {
         // should not happen as it's already handled in ProcessBlock
         return state.DoS(100, false, REJECT_INVALID, "bad-qc-height");
     }
@@ -264,7 +264,7 @@ bool CQuorumBlockProcessor::IsMiningPhase(Consensus::LLMQType llmqType, int nHei
     return false;
 }
 
-bool CQuorumBlockProcessor::IsCommitmentRequired(Consensus::LLMQType llmqType, const CBlockIndex* pindexPrev)
+bool CQuorumBlockProcessor::IsCommitmentRequired(Consensus::LLMQType llmqType, int nHeight)
 {
     // BEGIN TEMPORARY CODE
     bool allowMissingQc = false;
@@ -278,19 +278,19 @@ bool CQuorumBlockProcessor::IsCommitmentRequired(Consensus::LLMQType llmqType, c
         LOCK(cs_main);
         const auto& consensus = Params().GetConsensus();
         if (consensus.nTemporaryTestnetForkDIP3Height != 0 &&
-            pindexPrev->nHeight + 1 > consensus.nTemporaryTestnetForkDIP3Height &&
-            pindexPrev->nHeight + 1 < consensus.nTemporaryTestnetForkHeight &&
+            nHeight > consensus.nTemporaryTestnetForkDIP3Height &&
+            nHeight < consensus.nTemporaryTestnetForkHeight &&
             chainActive[consensus.nTemporaryTestnetForkDIP3Height]->GetBlockHash() == consensus.nTemporaryTestnetForkDIP3BlockHash) {
             allowMissingQc = true;
         }
     }
     // END TEMPORARY CODE
 
-    uint256 quorumHash = GetQuorumBlockHash(llmqType, pindexPrev);
+    uint256 quorumHash = GetQuorumBlockHash(llmqType, nHeight);
 
     // perform extra check for quorumHash.IsNull as the quorum hash is unknown for the first block of a session
     // this is because the currently processed block's hash will be the quorumHash of this session
-    bool isMiningPhase = !quorumHash.IsNull() && IsMiningPhase(llmqType, pindexPrev->nHeight + 1);
+    bool isMiningPhase = !quorumHash.IsNull() && IsMiningPhase(llmqType, nHeight);
 
     // did we already mine a non-null commitment for this session?
     bool hasMinedCommitment = !quorumHash.IsNull() && HasMinedCommitment(llmqType, quorumHash);
@@ -299,18 +299,18 @@ bool CQuorumBlockProcessor::IsCommitmentRequired(Consensus::LLMQType llmqType, c
 }
 
 // WARNING: This method returns uint256() on the first block of the DKG interval (because the block hash is not known yet)
-uint256 CQuorumBlockProcessor::GetQuorumBlockHash(Consensus::LLMQType llmqType, const CBlockIndex* pindexPrev)
+uint256 CQuorumBlockProcessor::GetQuorumBlockHash(Consensus::LLMQType llmqType, int nHeight)
 {
+    AssertLockHeld(cs_main);
+
     auto& params = Params().GetConsensus().llmqs.at(llmqType);
 
-    int nHeight = pindexPrev->nHeight + 1;
     int quorumStartHeight = nHeight - (nHeight % params.dkgInterval);
-    if (quorumStartHeight >= pindexPrev->nHeight) {
+    uint256 quorumBlockHash;
+    if (!GetBlockHash(quorumBlockHash, quorumStartHeight)) {
         return uint256();
     }
-    auto quorumIndex = pindexPrev->GetAncestor(quorumStartHeight);
-    assert(quorumIndex);
-    return quorumIndex->GetBlockHash();
+    return quorumBlockHash;
 }
 
 bool CQuorumBlockProcessor::HasMinedCommitment(Consensus::LLMQType llmqType, const uint256& quorumHash)
@@ -376,16 +376,16 @@ bool CQuorumBlockProcessor::GetMinableCommitmentByHash(const uint256& commitment
 
 // Will return false if no commitment should be mined
 // Will return true and a null commitment if no minable commitment is known and none was mined yet
-bool CQuorumBlockProcessor::GetMinableCommitment(Consensus::LLMQType llmqType, const CBlockIndex* pindexPrev, CFinalCommitment& ret)
+bool CQuorumBlockProcessor::GetMinableCommitment(Consensus::LLMQType llmqType, int nHeight, CFinalCommitment& ret)
 {
     AssertLockHeld(cs_main);
 
-    if (!IsCommitmentRequired(llmqType, pindexPrev)) {
+    if (!IsCommitmentRequired(llmqType, nHeight)) {
         // no commitment required
         return false;
     }
 
-    uint256 quorumHash = GetQuorumBlockHash(llmqType, pindexPrev);
+    uint256 quorumHash = GetQuorumBlockHash(llmqType, nHeight);
     if (quorumHash.IsNull()) {
         return false;
     }
@@ -405,16 +405,16 @@ bool CQuorumBlockProcessor::GetMinableCommitment(Consensus::LLMQType llmqType, c
     return true;
 }
 
-bool CQuorumBlockProcessor::GetMinableCommitmentTx(Consensus::LLMQType llmqType, const CBlockIndex* pindexPrev, CTransactionRef& ret)
+bool CQuorumBlockProcessor::GetMinableCommitmentTx(Consensus::LLMQType llmqType, int nHeight, CTransactionRef& ret)
 {
     AssertLockHeld(cs_main);
 
     CFinalCommitmentTxPayload qc;
-    if (!GetMinableCommitment(llmqType, pindexPrev, qc.commitment)) {
+    if (!GetMinableCommitment(llmqType, nHeight, qc.commitment)) {
         return false;
     }
 
-    qc.nHeight = pindexPrev->nHeight + 1;
+    qc.nHeight = nHeight;
 
     CMutableTransaction tx;
     tx.nVersion = 3;
diff --git a/src/llmq/quorums_blockprocessor.h b/src/llmq/quorums_blockprocessor.h
index 4bfc018ffd41..ac97687644ba 100644
--- a/src/llmq/quorums_blockprocessor.h
+++ b/src/llmq/quorums_blockprocessor.h
@@ -40,18 +40,18 @@ class CQuorumBlockProcessor
     void AddMinableCommitment(const CFinalCommitment& fqc);
     bool HasMinableCommitment(const uint256& hash);
     bool GetMinableCommitmentByHash(const uint256& commitmentHash, CFinalCommitment& ret);
-    bool GetMinableCommitment(Consensus::LLMQType llmqType, const CBlockIndex* pindexPrev, CFinalCommitment& ret);
-    bool GetMinableCommitmentTx(Consensus::LLMQType llmqType, const CBlockIndex* pindexPrev, CTransactionRef& ret);
+    bool GetMinableCommitment(Consensus::LLMQType llmqType, int nHeight, CFinalCommitment& ret);
+    bool GetMinableCommitmentTx(Consensus::LLMQType llmqType, int nHeight, CTransactionRef& ret);
 
     bool HasMinedCommitment(Consensus::LLMQType llmqType, const uint256& quorumHash);
     bool GetMinedCommitment(Consensus::LLMQType llmqType, const uint256& quorumHash, CFinalCommitment& ret);
 
 private:
     bool GetCommitmentsFromBlock(const CBlock& block, const CBlockIndex* pindexPrev, std::map<Consensus::LLMQType, CFinalCommitment>& ret, CValidationState& state);
-    bool ProcessCommitment(const CBlockIndex* pindexPrev, const CFinalCommitment& qc, CValidationState& state);
+    bool ProcessCommitment(const CBlockIndex* pindex, const CFinalCommitment& qc, CValidationState& state);
     bool IsMiningPhase(Consensus::LLMQType llmqType, int nHeight);
-    bool IsCommitmentRequired(Consensus::LLMQType llmqType, const CBlockIndex* pindexPrev);
-    uint256 GetQuorumBlockHash(Consensus::LLMQType llmqType, const CBlockIndex* pindexPrev);
+    bool IsCommitmentRequired(Consensus::LLMQType llmqType, int nHeight);
+    uint256 GetQuorumBlockHash(Consensus::LLMQType llmqType, int nHeight);
 };
 
 extern CQuorumBlockProcessor* quorumBlockProcessor;
diff --git a/src/miner.cpp b/src/miner.cpp
index 40b0273e1143..217804ac5cdd 100644
--- a/src/miner.cpp
+++ b/src/miner.cpp
@@ -155,7 +155,7 @@ std::unique_ptr<CBlockTemplate> BlockAssembler::CreateNewBlock(const CScript& sc
     if (fDIP0003Active_context) {
         for (auto& p : Params().GetConsensus().llmqs) {
             CTransactionRef qcTx;
-            if (llmq::quorumBlockProcessor->GetMinableCommitmentTx(p.first, pindexPrev, qcTx)) {
+            if (llmq::quorumBlockProcessor->GetMinableCommitmentTx(p.first, nHeight, qcTx)) {
                 pblock->vtx.emplace_back(qcTx);
                 pblocktemplate->vTxFees.emplace_back(0);
                 pblocktemplate->vTxSigOps.emplace_back(0);

From 378dadd0f7c73285ab5a13d1f6fb96314822170b Mon Sep 17 00:00:00 2001
From: UdjinM6 <UdjinM6@users.noreply.github.com>
Date: Thu, 13 Dec 2018 11:11:50 +0300
Subject: [PATCH 369/400] Ensure EvoDB consistency for quorum commitments by
 storing the best block hash (#2537)

* Ensure EvoDB consistency by storing the best block hash

This approach is similar to the one used for chainstate currently.
Ensures that:
- nodes that upgraded after DIP3 has all the data processed correctly (they will crash and require reindex);
- evodb/ is removed when blocks/ is removed (otherwise sync will fail due to duplicate records).

* Implement CEvoDB::VerifyBestBlock/WriteBestBlock and call them from ConnectBlock/DisconnectBlock

* Fix walletbackup.py
---
 qa/rpc-tests/walletbackup.py |  2 ++
 src/evo/evodb.cpp            | 17 +++++++++++++++++
 src/evo/evodb.h              |  6 ++++++
 src/validation.cpp           | 21 +++++++++++++++++++++
 4 files changed, 46 insertions(+)

diff --git a/qa/rpc-tests/walletbackup.py b/qa/rpc-tests/walletbackup.py
index a8d28ed234ed..d8fbb0c86ca5 100755
--- a/qa/rpc-tests/walletbackup.py
+++ b/qa/rpc-tests/walletbackup.py
@@ -159,6 +159,7 @@ def run_test(self):
         # Start node2 with no chain
         shutil.rmtree(self.options.tmpdir + "/node2/regtest/blocks")
         shutil.rmtree(self.options.tmpdir + "/node2/regtest/chainstate")
+        shutil.rmtree(self.options.tmpdir + "/node2/regtest/evodb")
 
         # Restore wallets from backup
         shutil.copyfile(tmpdir + "/node0/wallet.bak", tmpdir + "/node0/regtest/wallet.dat")
@@ -180,6 +181,7 @@ def run_test(self):
         #start node2 with no chain
         shutil.rmtree(self.options.tmpdir + "/node2/regtest/blocks")
         shutil.rmtree(self.options.tmpdir + "/node2/regtest/chainstate")
+        shutil.rmtree(self.options.tmpdir + "/node2/regtest/evodb")
 
         self.start_three()
 
diff --git a/src/evo/evodb.cpp b/src/evo/evodb.cpp
index 755579f2753f..b041be3d99dd 100644
--- a/src/evo/evodb.cpp
+++ b/src/evo/evodb.cpp
@@ -11,3 +11,20 @@ CEvoDB::CEvoDB(size_t nCacheSize, bool fMemory, bool fWipe) :
     dbTransaction(db)
 {
 }
+
+bool CEvoDB::VerifyBestBlock(const uint256& hash)
+{
+    // Make sure evodb is consistent.
+    // If we already have best block hash saved, the previous block should match it.
+    uint256 hashBestBlock;
+    bool fHasBestBlock = Read(EVODB_BEST_BLOCK, hashBestBlock);
+    uint256 hashBlockIndex = fHasBestBlock ? hash : uint256();
+    assert(hashBestBlock == hashBlockIndex);
+
+    return fHasBestBlock;
+}
+
+void CEvoDB::WriteBestBlock(const uint256& hash)
+{
+    Write(EVODB_BEST_BLOCK, hash);
+}
diff --git a/src/evo/evodb.h b/src/evo/evodb.h
index 0bdcc5a27eb4..2506264c04c7 100644
--- a/src/evo/evodb.h
+++ b/src/evo/evodb.h
@@ -7,6 +7,9 @@
 
 #include "dbwrapper.h"
 #include "sync.h"
+#include "uint256.h"
+
+static const std::string EVODB_BEST_BLOCK = "b_b";
 
 class CEvoDB
 {
@@ -57,6 +60,9 @@ class CEvoDB
     {
         return db;
     }
+
+    bool VerifyBestBlock(const uint256& hash);
+    void WriteBestBlock(const uint256& hash);
 };
 
 extern CEvoDB* evoDb;
diff --git a/src/validation.cpp b/src/validation.cpp
index ecc8e42948a9..10cfbb8d35e1 100644
--- a/src/validation.cpp
+++ b/src/validation.cpp
@@ -1614,6 +1614,14 @@ static DisconnectResult DisconnectBlock(const CBlock& block, CValidationState& s
 {
     assert(pindex->GetBlockHash() == view.GetBestBlock());
 
+    bool fDIP0003Active = VersionBitsState(pindex->pprev, Params().GetConsensus(), Consensus::DEPLOYMENT_DIP0003, versionbitscache) == THRESHOLD_ACTIVE;
+    bool fHasBestBlock = evoDb->VerifyBestBlock(pindex->GetBlockHash());
+
+    if (fDIP0003Active) {
+        // Nodes that upgraded after DIP3 activation will have to reindex to ensure evodb consistency
+        assert(fHasBestBlock);
+    }
+
     bool fClean = true;
 
     CBlockUndo blockUndo;
@@ -1770,6 +1778,8 @@ static DisconnectResult DisconnectBlock(const CBlock& block, CValidationState& s
     instantsend.isAutoLockBip9Active =
             (VersionBitsState(pindex->pprev, Params().GetConsensus(), Consensus::DEPLOYMENT_DIP0003, versionbitscache) == THRESHOLD_ACTIVE);
 
+    evoDb->WriteBestBlock(pindex->pprev->GetBlockHash());
+
     return fClean ? DISCONNECT_OK : DISCONNECT_UNCLEAN;
 }
 
@@ -1919,6 +1929,16 @@ static bool ConnectBlock(const CBlock& block, CValidationState& state, CBlockInd
     uint256 hashPrevBlock = pindex->pprev == NULL ? uint256() : pindex->pprev->GetBlockHash();
     assert(hashPrevBlock == view.GetBestBlock());
 
+    if (pindex->pprev) {
+        bool fDIP0003Active = VersionBitsState(pindex->pprev, Params().GetConsensus(), Consensus::DEPLOYMENT_DIP0003, versionbitscache) == THRESHOLD_ACTIVE;
+        bool fHasBestBlock = evoDb->VerifyBestBlock(pindex->pprev->GetBlockHash());
+
+        if (fDIP0003Active) {
+            // Nodes that upgraded after DIP3 activation will have to reindex to ensure evodb consistency
+            assert(fHasBestBlock);
+        }
+    }
+
     // Special case for the genesis block, skipping connection of its transactions
     // (its coinbase is unspendable)
     if (block.GetHash() == chainparams.GetConsensus().hashGenesisBlock) {
@@ -2282,6 +2302,7 @@ static bool ConnectBlock(const CBlock& block, CValidationState& state, CBlockInd
     GetMainSignals().UpdatedTransaction(hashPrevBestCoinBase);
     hashPrevBestCoinBase = block.vtx[0]->GetHash();
 
+    evoDb->WriteBestBlock(pindex->GetBlockHash());
 
     int64_t nTime6 = GetTimeMicros(); nTimeCallbacks += nTime6 - nTime5;
     LogPrint("bench", "    - Callbacks: %.2fms [%.2fs]\n", 0.001 * (nTime6 - nTime5), nTimeCallbacks * 0.000001);

From ca0aec2a324851fd792aebfda27599749e0afb38 Mon Sep 17 00:00:00 2001
From: UdjinM6 <UdjinM6@users.noreply.github.com>
Date: Thu, 13 Dec 2018 11:12:07 +0300
Subject: [PATCH 370/400] Match recipients with txouts by scriptPubKey in
 reassignAmounts() (#2548)

* Match recipients with txouts by scriptPubKey in reassignAmounts()

* Drop no longer used nChangePosRet from reassignAmounts() params
---
 src/qt/walletmodel.cpp            |  2 +-
 src/qt/walletmodeltransaction.cpp | 27 +++++++++++++++++----------
 src/qt/walletmodeltransaction.h   |  2 +-
 3 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/src/qt/walletmodel.cpp b/src/qt/walletmodel.cpp
index 3802edd0362d..e754e5070524 100644
--- a/src/qt/walletmodel.cpp
+++ b/src/qt/walletmodel.cpp
@@ -319,7 +319,7 @@ WalletModel::SendCoinsReturn WalletModel::prepareTransaction(WalletModelTransact
         fCreated = wallet->CreateTransaction(vecSend, *newTx, *keyChange, nFeeRequired, nChangePosRet, strFailReason, coinControl, true, recipients[0].inputType, recipients[0].fUseInstantSend);
         transaction.setTransactionFee(nFeeRequired);
         if (fSubtractFeeFromAmount && fCreated)
-            transaction.reassignAmounts(nChangePosRet);
+            transaction.reassignAmounts();
 
         nValueOut = newTx->tx->GetValueOut();
         nVinSize = newTx->tx->vin.size();
diff --git a/src/qt/walletmodeltransaction.cpp b/src/qt/walletmodeltransaction.cpp
index 63a0d3c98651..8077156d9e3e 100644
--- a/src/qt/walletmodeltransaction.cpp
+++ b/src/qt/walletmodeltransaction.cpp
@@ -46,9 +46,9 @@ void WalletModelTransaction::setTransactionFee(const CAmount& newFee)
     fee = newFee;
 }
 
-void WalletModelTransaction::reassignAmounts(int nChangePosRet)
+void WalletModelTransaction::reassignAmounts()
 {
-    int i = 0;
+    // For each recipient look for a matching CTxOut in walletTransaction and reassign amounts
     for (QList<SendCoinsRecipient>::iterator it = recipients.begin(); it != recipients.end(); ++it)
     {
         SendCoinsRecipient& rcp = (*it);
@@ -61,19 +61,26 @@ void WalletModelTransaction::reassignAmounts(int nChangePosRet)
             {
                 const payments::Output& out = details.outputs(j);
                 if (out.amount() <= 0) continue;
-                if (i == nChangePosRet)
-                    i++;
-                subtotal += walletTransaction->tx->vout[i].nValue;
-                i++;
+                const unsigned char* scriptStr = (const unsigned char*)out.script().data();
+                CScript scriptPubKey(scriptStr, scriptStr+out.script().size());
+                for (const auto& txout : walletTransaction->tx->vout) {
+                    if (txout.scriptPubKey == scriptPubKey) {
+                        subtotal += txout.nValue;
+                        break;
+                    }
+                }
             }
             rcp.amount = subtotal;
         }
         else // normal recipient (no payment request)
         {
-            if (i == nChangePosRet)
-                i++;
-            rcp.amount = walletTransaction->tx->vout[i].nValue;
-            i++;
+            for (const auto& txout : walletTransaction->tx->vout) {
+                CScript scriptPubKey = GetScriptForDestination(CBitcoinAddress(rcp.address.toStdString()).Get());
+                if (txout.scriptPubKey == scriptPubKey) {
+                    rcp.amount = txout.nValue;
+                    break;
+                }
+            }
         }
     }
 }
diff --git a/src/qt/walletmodeltransaction.h b/src/qt/walletmodeltransaction.h
index 64922efada5e..e3eabcc2abcc 100644
--- a/src/qt/walletmodeltransaction.h
+++ b/src/qt/walletmodeltransaction.h
@@ -35,7 +35,7 @@ class WalletModelTransaction
     void newPossibleKeyChange(CWallet *wallet);
     CReserveKey *getPossibleKeyChange();
 
-    void reassignAmounts(int nChangePosRet); // needed for the subtract-fee-from-amount feature
+    void reassignAmounts(); // needed for the subtract-fee-from-amount feature
 
 private:
     QList<SendCoinsRecipient> recipients;

From 1a7c29b97c21dc1a071335ed089516e0d5765ed6 Mon Sep 17 00:00:00 2001
From: UdjinM6 <UdjinM6@users.noreply.github.com>
Date: Thu, 13 Dec 2018 11:12:22 +0300
Subject: [PATCH 371/400] Revert "Sort recipients in SendCoins dialog via BIP69
 rule (#2546)" (#2549)

This reverts commit 18cd5965cc91694a558399e941eb0e8ef962456e.
---
 src/qt/sendcoinsdialog.cpp | 5 -----
 src/qt/walletmodel.h       | 9 ---------
 2 files changed, 14 deletions(-)

diff --git a/src/qt/sendcoinsdialog.cpp b/src/qt/sendcoinsdialog.cpp
index ecca3344b9f2..0aedece4def6 100644
--- a/src/qt/sendcoinsdialog.cpp
+++ b/src/qt/sendcoinsdialog.cpp
@@ -254,11 +254,6 @@ void SendCoinsDialog::on_sendButton_clicked()
         return;
     }
 
-    // apply BIP69
-    if (bBIP69Enabled) {
-        std::sort(recipients.begin(), recipients.end(), CompareSendCoinsRecipientBIP69());
-    }
-
     QString strFunds = tr("using") + " <b>" + tr("anonymous funds") + "</b>";
     QString strFee = "";
     recipients[0].inputType = ONLY_DENOMINATED;
diff --git a/src/qt/walletmodel.h b/src/qt/walletmodel.h
index 1a9e457d541d..f52657749caf 100644
--- a/src/qt/walletmodel.h
+++ b/src/qt/walletmodel.h
@@ -101,15 +101,6 @@ class SendCoinsRecipient
     }
 };
 
-// same as CompareOutputBIP69 in primitives/transaction.h
-struct CompareSendCoinsRecipientBIP69
-{
-    inline bool operator()(const SendCoinsRecipient& a, const SendCoinsRecipient& b) const
-    {
-        return a.amount < b.amount || (a.amount == b.amount && a.address < b.address);
-    }
-};
-
 /** Interface to Bitcoin wallet from Qt view code. */
 class WalletModel : public QObject
 {

From 3e97b0cbdb88bbbe5cd9f2f93ea8baed7cb53da9 Mon Sep 17 00:00:00 2001
From: UdjinM6 <UdjinM6@users.noreply.github.com>
Date: Thu, 13 Dec 2018 11:12:45 +0300
Subject: [PATCH 372/400] Make sure that we can get inputType and
 fUseInstantSend regardless of the way recipients are sorted (#2550)

* Make sure that we can get inputType and fUseInstantSend regardless of the way recipients are sorted

* Move "for" loops outside of "if"s
---
 src/qt/sendcoinsdialog.cpp | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/qt/sendcoinsdialog.cpp b/src/qt/sendcoinsdialog.cpp
index 0aedece4def6..c89d7171a362 100644
--- a/src/qt/sendcoinsdialog.cpp
+++ b/src/qt/sendcoinsdialog.cpp
@@ -256,10 +256,8 @@ void SendCoinsDialog::on_sendButton_clicked()
 
     QString strFunds = tr("using") + " <b>" + tr("anonymous funds") + "</b>";
     QString strFee = "";
-    recipients[0].inputType = ONLY_DENOMINATED;
 
     if(ui->checkUsePrivateSend->isChecked()) {
-        recipients[0].inputType = ONLY_DENOMINATED;
         strFunds = tr("using") + " <b>" + tr("anonymous funds") + "</b>";
         QString strNearestAmount(
             BitcoinUnits::formatWithUnit(
@@ -268,18 +266,18 @@ void SendCoinsDialog::on_sendButton_clicked()
             "(privatesend requires this amount to be rounded up to the nearest %1)."
         ).arg(strNearestAmount));
     } else {
-        recipients[0].inputType = ALL_COINS;
         strFunds = tr("using") + " <b>" + tr("any available funds (not anonymous)") + "</b>";
     }
 
     if(ui->checkUseInstantSend->isChecked()) {
-        recipients[0].fUseInstantSend = true;
         strFunds += " ";
         strFunds += tr("and InstantSend");
-    } else {
-        recipients[0].fUseInstantSend = false;
     }
 
+    for (SendCoinsRecipient& rcp : recipients) {
+        rcp.inputType = ui->checkUsePrivateSend->isChecked() ? ONLY_DENOMINATED : ALL_COINS;
+        rcp.fUseInstantSend = ui->checkUseInstantSend->isChecked();
+    }
 
     fNewRecipientAllowed = false;
     // request unlock only if was locked or unlocked for mixing:

From 07309f0ec3da643c405567d48685523ec3272dbc Mon Sep 17 00:00:00 2001
From: UdjinM6 <UdjinM6@users.noreply.github.com>
Date: Thu, 13 Dec 2018 11:13:02 +0300
Subject: [PATCH 373/400] Allow up to MASTERNODE_MAX_MIXING_TXES (5) DSTXes per
 MN in a row (#2552)

---
 src/masternode.cpp     | 14 +++++---------
 src/masternode.h       | 12 +++++++++---
 src/masternodeman.cpp  |  6 +++---
 src/net_processing.cpp |  2 +-
 4 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/src/masternode.cpp b/src/masternode.cpp
index 9cce8bf7b2e3..e89e49d6c8e2 100644
--- a/src/masternode.cpp
+++ b/src/masternode.cpp
@@ -24,14 +24,12 @@
 
 
 CMasternode::CMasternode() :
-    masternode_info_t{ MASTERNODE_ENABLED, PROTOCOL_VERSION, GetAdjustedTime()},
-    fAllowMixingTx(true)
+    masternode_info_t{ MASTERNODE_ENABLED, PROTOCOL_VERSION, GetAdjustedTime()}
 {}
 
 CMasternode::CMasternode(CService addr, COutPoint outpoint, CPubKey pubKeyCollateralAddressNew, CPubKey pubKeyMasternodeNew, int nProtocolVersionIn) :
     masternode_info_t{ MASTERNODE_ENABLED, nProtocolVersionIn, GetAdjustedTime(),
-                       outpoint, addr, pubKeyCollateralAddressNew, pubKeyMasternodeNew},
-    fAllowMixingTx(true)
+                       outpoint, addr, pubKeyCollateralAddressNew, pubKeyMasternodeNew}
 {}
 
 CMasternode::CMasternode(const CMasternode& other) :
@@ -42,7 +40,7 @@ CMasternode::CMasternode(const CMasternode& other) :
     nBlockLastPaid(other.nBlockLastPaid),
     nPoSeBanScore(other.nPoSeBanScore),
     nPoSeBanHeight(other.nPoSeBanHeight),
-    fAllowMixingTx(other.fAllowMixingTx),
+    nMixingTxCount(other.nMixingTxCount),
     fUnitTest(other.fUnitTest)
 {}
 
@@ -50,14 +48,12 @@ CMasternode::CMasternode(const CMasternodeBroadcast& mnb) :
     masternode_info_t{ mnb.nActiveState, mnb.nProtocolVersion, mnb.sigTime,
                        mnb.outpoint, mnb.addr, mnb.pubKeyCollateralAddress, mnb.pubKeyMasternode},
     lastPing(mnb.lastPing),
-    vchSig(mnb.vchSig),
-    fAllowMixingTx(true)
+    vchSig(mnb.vchSig)
 {}
 
 CMasternode::CMasternode(const uint256 &proTxHash, const CDeterministicMNCPtr& dmn) :
     masternode_info_t{ MASTERNODE_ENABLED, DMN_PROTO_VERSION, GetAdjustedTime(),
-                       dmn->collateralOutpoint, dmn->pdmnState->addr, CKeyID() /* not valid with DIP3 */, dmn->pdmnState->keyIDOwner, dmn->pdmnState->pubKeyOperator, dmn->pdmnState->keyIDVoting},
-    fAllowMixingTx(true)
+                       dmn->collateralOutpoint, dmn->pdmnState->addr, CKeyID() /* not valid with DIP3 */, dmn->pdmnState->keyIDOwner, dmn->pdmnState->pubKeyOperator, dmn->pdmnState->keyIDVoting}
 {
 }
 
diff --git a/src/masternode.h b/src/masternode.h
index bbba83c9d747..81e396d07eae 100644
--- a/src/masternode.h
+++ b/src/masternode.h
@@ -24,6 +24,7 @@ static const int MASTERNODE_EXPIRATION_SECONDS          = 120 * 60;
 static const int MASTERNODE_NEW_START_REQUIRED_SECONDS  = 180 * 60;
 
 static const int MASTERNODE_POSE_BAN_MAX_SCORE          = 5;
+static const int MASTERNODE_MAX_MIXING_TXES             = 5;
 
 //
 // The Masternode Ping Class : Contains a different serialize method for sending pings from masternodes throughout the network
@@ -179,7 +180,7 @@ class CMasternode : public masternode_info_t
     int nBlockLastPaid{};
     int nPoSeBanScore{};
     int nPoSeBanHeight{};
-    bool fAllowMixingTx{};
+    int nMixingTxCount{};
     bool fUnitTest = false;
 
     // KEEP TRACK OF GOVERNANCE ITEMS EACH MASTERNODE HAS VOTE UPON FOR RECALCULATION
@@ -217,7 +218,7 @@ class CMasternode : public masternode_info_t
         READWRITE(nProtocolVersion);
         READWRITE(nPoSeBanScore);
         READWRITE(nPoSeBanHeight);
-        READWRITE(fAllowMixingTx);
+        READWRITE(nMixingTxCount);
         READWRITE(fUnitTest);
         READWRITE(mapGovernanceObjectsVotedOn);
     }
@@ -275,6 +276,11 @@ class CMasternode : public masternode_info_t
         return false;
     }
 
+    bool IsValidForMixingTxes() const
+    {
+        return nMixingTxCount <= MASTERNODE_MAX_MIXING_TXES;
+    }
+
     bool IsValidNetAddr();
     static bool IsValidNetAddr(CService addrIn);
 
@@ -308,7 +314,7 @@ class CMasternode : public masternode_info_t
         nBlockLastPaid = from.nBlockLastPaid;
         nPoSeBanScore = from.nPoSeBanScore;
         nPoSeBanHeight = from.nPoSeBanHeight;
-        fAllowMixingTx = from.fAllowMixingTx;
+        nMixingTxCount = from.nMixingTxCount;
         fUnitTest = from.fUnitTest;
         mapGovernanceObjectsVotedOn = from.mapGovernanceObjectsVotedOn;
         return *this;
diff --git a/src/masternodeman.cpp b/src/masternodeman.cpp
index 865f0f3ef6b6..b118b3839f54 100644
--- a/src/masternodeman.cpp
+++ b/src/masternodeman.cpp
@@ -28,7 +28,7 @@
 /** Masternode manager */
 CMasternodeMan mnodeman;
 
-const std::string CMasternodeMan::SERIALIZATION_VERSION_STRING = "CMasternodeMan-Version-11";
+const std::string CMasternodeMan::SERIALIZATION_VERSION_STRING = "CMasternodeMan-Version-12";
 const int CMasternodeMan::LAST_PAID_SCAN_BLOCKS = 100;
 
 struct CompareLastPaidBlock
@@ -136,7 +136,7 @@ bool CMasternodeMan::AllowMixing(const COutPoint &outpoint)
     }
     nDsqCount++;
     pmn->nLastDsq = nDsqCount;
-    pmn->fAllowMixingTx = true;
+    pmn->nMixingTxCount = 0;
 
     return true;
 }
@@ -148,7 +148,7 @@ bool CMasternodeMan::DisallowMixing(const COutPoint &outpoint)
     if (!pmn) {
         return false;
     }
-    pmn->fAllowMixingTx = false;
+    pmn->nMixingTxCount++;
 
     return true;
 }
diff --git a/src/net_processing.cpp b/src/net_processing.cpp
index 641efab9f61e..5be59acd520b 100644
--- a/src/net_processing.cpp
+++ b/src/net_processing.cpp
@@ -2086,7 +2086,7 @@ bool static ProcessMessage(CNode* pfrom, const std::string& strCommand, CDataStr
                 return false;
             }
 
-            if(!mn.fAllowMixingTx) {
+            if(!mn.IsValidForMixingTxes()) {
                 LogPrint("privatesend", "DSTX -- Masternode %s is sending too many transactions %s\n", dstx.masternodeOutpoint.ToStringShort(), hashTx.ToString());
                 return true;
                 // TODO: Not an error? Could it be that someone is relaying old DSTXes

From 9d33d216b73858943e0a2c74e18238c9715129ad Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Thu, 13 Dec 2018 13:55:46 +0100
Subject: [PATCH 374/400] Remove temporary code which forked testnet at block
 274000

---
 src/chainparams.cpp                 |  5 -----
 src/consensus/params.h              |  5 -----
 src/evo/cbtx.cpp                    | 12 ------------
 src/llmq/quorums_blockprocessor.cpp | 22 +---------------------
 4 files changed, 1 insertion(+), 43 deletions(-)

diff --git a/src/chainparams.cpp b/src/chainparams.cpp
index 9e6abc4c74b8..be707d6ac737 100644
--- a/src/chainparams.cpp
+++ b/src/chainparams.cpp
@@ -444,11 +444,6 @@ class CTestNetParams : public CChainParams {
         consensus.llmqs[Consensus::LLMQ_400_60] = llmq400_60;
         consensus.llmqs[Consensus::LLMQ_400_85] = llmq400_85;
 
-        // This is temporary until we reset testnet for retesting of the full DIP3 deployment
-        consensus.nTemporaryTestnetForkDIP3Height = 264000;
-        consensus.nTemporaryTestnetForkHeight = 274000;
-        consensus.nTemporaryTestnetForkDIP3BlockHash.SetHex("00000048e6e71d4bd90e7c456dcb94683ae832fcad13e1760d8283f7e89f332f");
-
         fMiningRequiresPeers = true;
         fDefaultConsistencyChecks = false;
         fRequireStandard = false;
diff --git a/src/consensus/params.h b/src/consensus/params.h
index bc2ccb8a89d2..c6dc9d5f40e8 100644
--- a/src/consensus/params.h
+++ b/src/consensus/params.h
@@ -158,11 +158,6 @@ struct Params {
 
     std::map<LLMQType, LLMQParams> llmqs;
     bool fLLMQAllowDummyCommitments;
-
-    // This is temporary until we reset testnet for retesting of the full DIP3 deployment
-    int nTemporaryTestnetForkDIP3Height{0};
-    uint256 nTemporaryTestnetForkDIP3BlockHash;
-    int nTemporaryTestnetForkHeight{0};
 };
 } // namespace Consensus
 
diff --git a/src/evo/cbtx.cpp b/src/evo/cbtx.cpp
index 616eef489c3b..e757c6084b8a 100644
--- a/src/evo/cbtx.cpp
+++ b/src/evo/cbtx.cpp
@@ -73,18 +73,6 @@ bool CalcCbTxMerkleRootMNList(const CBlock& block, const CBlockIndex* pindexPrev
 
     CSimplifiedMNList sml(tmpMNList);
 
-    // BEGIN TEMPORARY CODE
-    const auto& consensus = Params().GetConsensus();
-    if (consensus.nTemporaryTestnetForkHeight != 0 &&
-        pindexPrev->nHeight + 1 > consensus.nTemporaryTestnetForkDIP3Height &&
-        pindexPrev->nHeight + 1 < consensus.nTemporaryTestnetForkHeight &&
-        chainActive[consensus.nTemporaryTestnetForkDIP3Height]->GetBlockHash() == consensus.nTemporaryTestnetForkDIP3BlockHash) {
-        for (auto& sme : sml.mnList) {
-            sme.confirmedHash.SetNull();
-        }
-    }
-    // END TEMPORARY CODE
-
     bool mutated = false;
     merkleRootRet = sml.CalcMerkleRoot(&mutated);
     return !mutated;
diff --git a/src/llmq/quorums_blockprocessor.cpp b/src/llmq/quorums_blockprocessor.cpp
index 7de9214efa77..f014a3f44ff5 100644
--- a/src/llmq/quorums_blockprocessor.cpp
+++ b/src/llmq/quorums_blockprocessor.cpp
@@ -266,26 +266,6 @@ bool CQuorumBlockProcessor::IsMiningPhase(Consensus::LLMQType llmqType, int nHei
 
 bool CQuorumBlockProcessor::IsCommitmentRequired(Consensus::LLMQType llmqType, int nHeight)
 {
-    // BEGIN TEMPORARY CODE
-    bool allowMissingQc = false;
-    {
-        // TODO We added the commitments code while DIP3 was already activated on testnet and we want
-        // to avoid reverting the chain again, as people already had many MNs registered at that time.
-        // So, we do a simple hardfork here at a fixed height, but only while we're on the original
-        // DIP3 chain.
-        // As we need to fork/revert the chain later to re-test all deployment stages of DIP3, we can
-        // remove all this temporary code later.
-        LOCK(cs_main);
-        const auto& consensus = Params().GetConsensus();
-        if (consensus.nTemporaryTestnetForkDIP3Height != 0 &&
-            nHeight > consensus.nTemporaryTestnetForkDIP3Height &&
-            nHeight < consensus.nTemporaryTestnetForkHeight &&
-            chainActive[consensus.nTemporaryTestnetForkDIP3Height]->GetBlockHash() == consensus.nTemporaryTestnetForkDIP3BlockHash) {
-            allowMissingQc = true;
-        }
-    }
-    // END TEMPORARY CODE
-
     uint256 quorumHash = GetQuorumBlockHash(llmqType, nHeight);
 
     // perform extra check for quorumHash.IsNull as the quorum hash is unknown for the first block of a session
@@ -295,7 +275,7 @@ bool CQuorumBlockProcessor::IsCommitmentRequired(Consensus::LLMQType llmqType, i
     // did we already mine a non-null commitment for this session?
     bool hasMinedCommitment = !quorumHash.IsNull() && HasMinedCommitment(llmqType, quorumHash);
 
-    return isMiningPhase && !hasMinedCommitment && !allowMissingQc;
+    return isMiningPhase && !hasMinedCommitment;
 }
 
 // WARNING: This method returns uint256() on the first block of the DKG interval (because the block hash is not known yet)

From 431ef26280e48f787db9d9da085d55e0a23211ef Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Thu, 13 Dec 2018 13:57:08 +0100
Subject: [PATCH 375/400] Bump nPowKGWHeight for testnet and cause a fork at
 height 4001

This will reset testnet so that we can start with a clean state.
---
 src/chainparams.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/chainparams.cpp b/src/chainparams.cpp
index be707d6ac737..fb04daaf75ee 100644
--- a/src/chainparams.cpp
+++ b/src/chainparams.cpp
@@ -364,8 +364,8 @@ class CTestNetParams : public CChainParams {
         consensus.nPowTargetSpacing = 2.5 * 60; // Dash: 2.5 minutes
         consensus.fPowAllowMinDifficultyBlocks = true;
         consensus.fPowNoRetargeting = false;
-        consensus.nPowKGWHeight = 4001; // nPowKGWHeight >= nPowDGWHeight means "no KGW"
-        consensus.nPowDGWHeight = 4001;
+        consensus.nPowKGWHeight = 4002; // nPowKGWHeight >= nPowDGWHeight means "no KGW"
+        consensus.nPowDGWHeight = 4002;
         consensus.nRuleChangeActivationThreshold = 1512; // 75% for testchains
         consensus.nMinerConfirmationWindow = 2016; // nPowTargetTimespan / nPowTargetSpacing
         consensus.vDeployments[Consensus::DEPLOYMENT_TESTDUMMY].bit = 28;

From d6fa7026c9ed4ace65c80d023a23ab8704cb2ff2 Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Thu, 13 Dec 2018 14:03:02 +0100
Subject: [PATCH 376/400] Change CSV, DIP0001 and BIP147 deployments to start
 today

---
 src/chainparams.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/chainparams.cpp b/src/chainparams.cpp
index fb04daaf75ee..e85f294d1af8 100644
--- a/src/chainparams.cpp
+++ b/src/chainparams.cpp
@@ -374,20 +374,20 @@ class CTestNetParams : public CChainParams {
 
         // Deployment of BIP68, BIP112, and BIP113.
         consensus.vDeployments[Consensus::DEPLOYMENT_CSV].bit = 0;
-        consensus.vDeployments[Consensus::DEPLOYMENT_CSV].nStartTime = 1506556800; // September 28th, 2017
-        consensus.vDeployments[Consensus::DEPLOYMENT_CSV].nTimeout = 1538092800; // September 28th, 2018
+        consensus.vDeployments[Consensus::DEPLOYMENT_CSV].nStartTime = 1544655600; // Dec 13th, 2018
+        consensus.vDeployments[Consensus::DEPLOYMENT_CSV].nTimeout = 1576191600; // Dec 13th, 2019
 
         // Deployment of DIP0001
         consensus.vDeployments[Consensus::DEPLOYMENT_DIP0001].bit = 1;
-        consensus.vDeployments[Consensus::DEPLOYMENT_DIP0001].nStartTime = 1505692800; // Sep 18th, 2017
-        consensus.vDeployments[Consensus::DEPLOYMENT_DIP0001].nTimeout = 1537228800; // Sep 18th, 2018
+        consensus.vDeployments[Consensus::DEPLOYMENT_DIP0001].nStartTime = 1544655600; // Dec 13th, 2018
+        consensus.vDeployments[Consensus::DEPLOYMENT_DIP0001].nTimeout = 1576191600; // Dec 13th, 2019
         consensus.vDeployments[Consensus::DEPLOYMENT_DIP0001].nWindowSize = 100;
         consensus.vDeployments[Consensus::DEPLOYMENT_DIP0001].nThreshold = 50; // 50% of 100
 
         // Deployment of BIP147
         consensus.vDeployments[Consensus::DEPLOYMENT_BIP147].bit = 2;
-        consensus.vDeployments[Consensus::DEPLOYMENT_BIP147].nStartTime = 1517792400; // Feb 5th, 2018
-        consensus.vDeployments[Consensus::DEPLOYMENT_BIP147].nTimeout = 1549328400; // Feb 5th, 2019
+        consensus.vDeployments[Consensus::DEPLOYMENT_BIP147].nStartTime = 1544655600; // Dec 13th, 2018
+        consensus.vDeployments[Consensus::DEPLOYMENT_BIP147].nTimeout = 1576191600; // Dec 13th, 2019
         consensus.vDeployments[Consensus::DEPLOYMENT_BIP147].nWindowSize = 100;
         consensus.vDeployments[Consensus::DEPLOYMENT_BIP147].nThreshold = 50; // 50% of 100
 

From b2d3e220b5a9e79f3b345b5524d79351c29807e6 Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Thu, 13 Dec 2018 14:03:30 +0100
Subject: [PATCH 377/400] Change DIP0003 deployment to start today

---
 src/chainparams.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/chainparams.cpp b/src/chainparams.cpp
index e85f294d1af8..07fd8b1f2b07 100644
--- a/src/chainparams.cpp
+++ b/src/chainparams.cpp
@@ -393,8 +393,8 @@ class CTestNetParams : public CChainParams {
 
         // Deployment of DIP0003
         consensus.vDeployments[Consensus::DEPLOYMENT_DIP0003].bit = 3;
-        consensus.vDeployments[Consensus::DEPLOYMENT_DIP0003].nStartTime = 1540504800; // Oct 26, 2018
-        consensus.vDeployments[Consensus::DEPLOYMENT_DIP0003].nTimeout = 1572040800; // Oct 26, 2019
+        consensus.vDeployments[Consensus::DEPLOYMENT_DIP0003].nStartTime = 1544655600; // Dec 13th, 2018
+        consensus.vDeployments[Consensus::DEPLOYMENT_DIP0003].nTimeout = 1576191600; // Dec 13th, 2019
         consensus.vDeployments[Consensus::DEPLOYMENT_DIP0003].nWindowSize = 100;
         consensus.vDeployments[Consensus::DEPLOYMENT_DIP0003].nThreshold = 50; // 50% of 100
 

From ab3fe4fa860fb4ed0fe2b8687b288c5e3b0dbf2d Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Thu, 13 Dec 2018 14:04:45 +0100
Subject: [PATCH 378/400] Update nMinimumChainWork and defaultAssumeValid for
 block 4000

---
 src/chainparams.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/chainparams.cpp b/src/chainparams.cpp
index 07fd8b1f2b07..5dc53b02b5d8 100644
--- a/src/chainparams.cpp
+++ b/src/chainparams.cpp
@@ -399,10 +399,10 @@ class CTestNetParams : public CChainParams {
         consensus.vDeployments[Consensus::DEPLOYMENT_DIP0003].nThreshold = 50; // 50% of 100
 
         // The best chain should have at least this much work.
-        consensus.nMinimumChainWork = uint256S("0x000000000000000000000000000000000000000000000000006e06c236f3dc1e"); // 260940
+        consensus.nMinimumChainWork = uint256S("0x00000000000000000000000000000000000000000000000000000003cd72a542"); // 4000
 
         // By default assume that the signatures in ancestors of this block are valid.
-        consensus.defaultAssumeValid = uint256S("0x000000000118fa2f031efedf874adbe7fe6b023cdf9478e8e2400c2d505df30d"); // 260940
+        consensus.defaultAssumeValid = uint256S("0x00000ce22113f3eb8636e225d6a1691e132fdd587aed993e1bc9b07a0235eea4"); // 4000
 
         pchMessageStart[0] = 0xce;
         pchMessageStart[1] = 0xe2;

From 24ebcbd12cd2a8ca6e892f3b2a13cb2c9f47f1c6 Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Thu, 13 Dec 2018 14:24:29 +0100
Subject: [PATCH 379/400] Remove checkpoints above block 4000

---
 src/chainparams.cpp | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/chainparams.cpp b/src/chainparams.cpp
index 5dc53b02b5d8..f85c33b37341 100644
--- a/src/chainparams.cpp
+++ b/src/chainparams.cpp
@@ -465,14 +465,11 @@ class CTestNetParams : public CChainParams {
             (    261, uint256S("0x00000c26026d0815a7e2ce4fa270775f61403c040647ff2c3091f99e894a4618"))
             (   1999, uint256S("0x00000052e538d27fa53693efe6fb6892a0c1d26c0235f599171c48a3cce553b1"))
             (   2999, uint256S("0x0000024bc3f4f4cb30d29827c13d921ad77d2c6072e586c7f60d83c2722cdcc5"))
-            ( 100000, uint256S("0x0000000003aa53e24b6e60ef97642e4193611f2bcb75ea1fa8105f0b5ffd5242"))
-            ( 143200, uint256S("0x0000000004a7878409189b7a8f75b3815d9b8c45ee8f79955a6c727d83bddb04"))
-            ( 260940, uint256S("0x000000000118fa2f031efedf874adbe7fe6b023cdf9478e8e2400c2d505df30d"))
         };
 
         chainTxData = ChainTxData{
-            1541743239, // * UNIX timestamp of last known number of transactions
-            6134223,    // * total number of transactions between genesis and that timestamp
+            1544707462, // * UNIX timestamp of last known number of transactions
+            4100,       // * total number of transactions between genesis and that timestamp
                         //   (the tx=... number in the SetBestChain debug.log lines)
             0.01        // * estimated number of transactions per second after that timestamp
         };

From 79d543e89635a81183d318b235035694ac81858a Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Thu, 13 Dec 2018 20:30:19 +0100
Subject: [PATCH 380/400] Don't check for nSuperblockStartHash on testnet

---
 src/chainparams.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/chainparams.cpp b/src/chainparams.cpp
index f85c33b37341..ad695bc62d36 100644
--- a/src/chainparams.cpp
+++ b/src/chainparams.cpp
@@ -349,7 +349,7 @@ class CTestNetParams : public CChainParams {
         consensus.nBudgetPaymentsCycleBlocks = 50;
         consensus.nBudgetPaymentsWindowBlocks = 10;
         consensus.nSuperblockStartBlock = 4200; // NOTE: Should satisfy nSuperblockStartBlock > nBudgetPeymentsStartBlock
-        consensus.nSuperblockStartHash = uint256S("00000000cffabc0f646867fba0550afd6e30e0f4b0fc54e34d3e101a1552df5d");
+        consensus.nSuperblockStartHash = uint256(); // do not check this on testnet
         consensus.nSuperblockCycle = 24; // Superblocks can be issued hourly on testnet
         consensus.nGovernanceMinQuorum = 1;
         consensus.nGovernanceFilterElements = 500;

From 793e74cc9fe8d80c4365d5dfda37bc46ee779786 Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Thu, 13 Dec 2018 21:51:27 +0100
Subject: [PATCH 381/400] Remove temporary fork handling for emergency
 difficulty reduction on testnet

As we reset testnet, we can also remove the special handling for old blocks.
---
 src/pow.cpp | 47 +++++++++++------------------------------------
 1 file changed, 11 insertions(+), 36 deletions(-)

diff --git a/src/pow.cpp b/src/pow.cpp
index 34af27b9b1d2..d51025fdce7f 100644
--- a/src/pow.cpp
+++ b/src/pow.cpp
@@ -89,43 +89,18 @@ unsigned int static DarkGravityWave(const CBlockIndex* pindexLast, const CBlockH
         return bnPowLimit.GetCompact();
     }
 
-    if (params.fPowAllowMinDifficultyBlocks && (
-        // testnet ...
-        (params.hashDevnetGenesisBlock.IsNull() && pindexLast->nChainWork >= UintToArith256(uint256S("0x000000000000000000000000000000000000000000000000003e9ccfe0e03e01"))) ||
-        // or devnet
-        !params.hashDevnetGenesisBlock.IsNull())) {
-        // NOTE: 000000000000000000000000000000000000000000000000003e9ccfe0e03e01 is the work of the "wrong" chain,
-        // so this rule activates there immediately and new blocks with high diff from that chain are going
-        // to be rejected by updated nodes. Note, that old nodes are going to reject blocks from updated nodes
-        // after the "right" chain reaches this amount of work too. This is a temporary condition which should
-        // be removed when we decide to hard-fork testnet again.
-        // TODO: remove "testnet+work OR devnet" part on next testnet hard-fork
-        // Special difficulty rule for testnet/devnet:
-        // If the new block's timestamp is more than 2* 2.5 minutes
-        // then allow mining of a min-difficulty block.
-
-        // start using smoother adjustment on testnet when total work hits
-        // 000000000000000000000000000000000000000000000000003ff00000000000
-        if (pindexLast->nChainWork >= UintToArith256(uint256S("0x000000000000000000000000000000000000000000000000003ff00000000000"))
-            // and immediately on devnet
-            || !params.hashDevnetGenesisBlock.IsNull()) {
-            // recent block is more than 2 hours old
-            if (pblock->GetBlockTime() > pindexLast->GetBlockTime() + 2 * 60 * 60) {
-                return bnPowLimit.GetCompact();
-            }
-            // recent block is more than 10 minutes old
-            if (pblock->GetBlockTime() > pindexLast->GetBlockTime() + params.nPowTargetSpacing*4) {
-                arith_uint256 bnNew = arith_uint256().SetCompact(pindexLast->nBits) * 10;
-                if (bnNew > bnPowLimit) {
-                    bnNew = bnPowLimit;
-                }
-                return bnNew.GetCompact();
-            }
-        } else {
-            // old stuff
-            if (pblock->GetBlockTime() > pindexLast->GetBlockTime() + params.nPowTargetSpacing*2) {
-                return bnPowLimit.GetCompact();
+    if (params.fPowAllowMinDifficultyBlocks) {
+        // recent block is more than 2 hours old
+        if (pblock->GetBlockTime() > pindexLast->GetBlockTime() + 2 * 60 * 60) {
+            return bnPowLimit.GetCompact();
+        }
+        // recent block is more than 10 minutes old
+        if (pblock->GetBlockTime() > pindexLast->GetBlockTime() + params.nPowTargetSpacing * 4) {
+            arith_uint256 bnNew = arith_uint256().SetCompact(pindexLast->nBits) * 10;
+            if (bnNew > bnPowLimit) {
+                bnNew = bnPowLimit;
             }
+            return bnNew.GetCompact();
         }
     }
 

From e9f7142ed01c0d7b53ef8b5f6f3f6375a68ef422 Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Fri, 14 Dec 2018 16:33:58 +0100
Subject: [PATCH 382/400] Bump PROTOCOL_VERSION and DMN_PROTO_VERSION to 70213
 (#2557)

* Bump PROTOCOL_VERSION and DMN_PROTO_VERSION to 70213

This will disconnect all nodes from the old testnet chain when DIP3 gets
activated through BIP9.

Also update comments where 70212/70213 was referenced.

* Also bump MIN_PEER_PROTO_VERSION_DIP3 and MIN_PRIVATESEND_PEER_PROTO_VERSION
---
 src/instantx.h         | 2 +-
 src/net_processing.cpp | 2 +-
 src/privatesend.h      | 2 +-
 src/version.h          | 6 +++---
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/instantx.h b/src/instantx.h
index 31bf593edbeb..81f18c23b66c 100644
--- a/src/instantx.h
+++ b/src/instantx.h
@@ -273,7 +273,7 @@ class CTxLockVote
         READWRITE(outpoint);
         READWRITE(outpointMasternode);
         if (deterministicMNManager->IsDeterministicMNsSporkActive()) {
-            // Starting with spork15 activation, the proTxHash and quorumModifierHash is included. When we bump to >= 70213, we can remove
+            // Starting with spork15 activation, the proTxHash and quorumModifierHash is included. When we bump to >= 70214, we can remove
             // the surrounding if. We might also remove outpointMasternode as well later
             READWRITE(quorumModifierHash);
             READWRITE(masternodeProTxHash);
diff --git a/src/net_processing.cpp b/src/net_processing.cpp
index 5be59acd520b..3010fbd78108 100644
--- a/src/net_processing.cpp
+++ b/src/net_processing.cpp
@@ -1615,7 +1615,7 @@ bool static ProcessMessage(CNode* pfrom, const std::string& strCommand, CDataStr
 
     // BEGIN TEMPORARY CODE
     if (pfrom->nVersion < nMinPeerProtoVersion) {
-        // disconnect from peers with version < 70212 after DIP3 has activated through the BIP9 deployment
+        // disconnect from peers with version < 70213 after DIP3 has activated through the BIP9 deployment
         LogPrintf("peer=%d using obsolete version %i after DIP3 activation; disconnecting\n", pfrom->id, pfrom->GetSendVersion());
         connman.PushMessage(pfrom, msgMaker.Make(NetMsgType::REJECT, strCommand, REJECT_OBSOLETE,
                 strprintf("Version must be %d or greater", nMinPeerProtoVersion)));
diff --git a/src/privatesend.h b/src/privatesend.h
index 2e98823a63b4..440da1e7a084 100644
--- a/src/privatesend.h
+++ b/src/privatesend.h
@@ -24,7 +24,7 @@ static const int PRIVATESEND_QUEUE_TIMEOUT = 30;
 static const int PRIVATESEND_SIGNING_TIMEOUT = 15;
 
 //! minimum peer version accepted by mixing pool
-static const int MIN_PRIVATESEND_PEER_PROTO_VERSION = 70212;
+static const int MIN_PRIVATESEND_PEER_PROTO_VERSION = 70213;
 
 static const size_t PRIVATESEND_ENTRY_MAX_SIZE = 9;
 
diff --git a/src/version.h b/src/version.h
index a88927b46140..642af2841ab9 100644
--- a/src/version.h
+++ b/src/version.h
@@ -11,7 +11,7 @@
  */
 
 
-static const int PROTOCOL_VERSION = 70212;
+static const int PROTOCOL_VERSION = 70213;
 
 //! initial proto version, to be increased after version/verack negotiation
 static const int INIT_PROTO_VERSION = 209;
@@ -23,7 +23,7 @@ static const int GETHEADERS_VERSION = 70077;
 static const int MIN_PEER_PROTO_VERSION = 70210;
 
 //! disconnect from peers older than this proto version when DIP3 is activated via the BIP9 deployment
-static const int MIN_PEER_PROTO_VERSION_DIP3 = 70212;
+static const int MIN_PEER_PROTO_VERSION_DIP3 = 70213;
 
 //! nTime field added to CAddress, starting with this version;
 //! if possible, avoid requesting addresses nodes older than this
@@ -48,6 +48,6 @@ static const int DIP0001_PROTOCOL_VERSION = 70208;
 static const int SHORT_IDS_BLOCKS_VERSION = 70209;
 
 //! introduction of DIP3/deterministic masternodes
-static const int DMN_PROTO_VERSION = 70212;
+static const int DMN_PROTO_VERSION = 70213;
 
 #endif // BITCOIN_VERSION_H

From 552d9089e759fd4b711c7e2dbfb0186df1debe5f Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Fri, 14 Dec 2018 16:34:11 +0100
Subject: [PATCH 383/400] Update testnet seeds to point to MNs that are on the
 new chain (#2558)

---
 contrib/seeds/nodes_test.txt | 47 ++++++++++++++++++++++++----------
 src/chainparamsseeds.h       | 49 +++++++++++++++++++++++++-----------
 2 files changed, 69 insertions(+), 27 deletions(-)

diff --git a/contrib/seeds/nodes_test.txt b/contrib/seeds/nodes_test.txt
index d072dadea178..06e4b94633aa 100644
--- a/contrib/seeds/nodes_test.txt
+++ b/contrib/seeds/nodes_test.txt
@@ -1,14 +1,35 @@
-34.250.38.147:19999
-35.237.50.123:19999
-45.32.211.155:19999
-45.32.237.76:19999
-45.76.131.178:19999
-52.77.244.215:19999
-54.91.130.170:19999
-109.235.71.56:19999
-159.65.233.52:19999
+18.202.52.170:20008
+18.202.52.170:20004
+18.202.52.170:20000
+18.202.52.170:20012
+18.202.52.170:20016
+18.202.52.170:20020
+34.255.15.20:20007
+34.255.15.20:20003
+34.255.15.20:20015
+34.255.15.20:20011
+34.255.15.20:20019
+34.255.15.20:20023
+52.50.208.53:20009
+52.50.208.53:20005
+52.50.208.53:20001
+52.50.208.53:20013
+52.50.208.53:20017
+52.50.208.53:20021
+63.33.238.85:20010
+63.33.238.85:20006
+63.33.238.85:20002
+63.33.238.85:20014
+63.33.238.85:20018
+63.33.238.85:20022
+145.239.235.16:19999
+145.239.235.17:19999
+145.239.235.18:19999
+145.239.235.19:19999
+145.239.235.20:19999
+145.239.235.21:19999
+145.239.235.22:19999
+145.239.235.23:19999
+145.239.235.24:19999
+145.239.235.25:19999
 178.62.203.249:19999
-178.151.192.107:19999
-185.213.37.1:19999
-185.213.37.2:19999
-206.189.209.197:19999
diff --git a/src/chainparamsseeds.h b/src/chainparamsseeds.h
index a962fedf2015..c2853703745e 100644
--- a/src/chainparamsseeds.h
+++ b/src/chainparamsseeds.h
@@ -286,19 +286,40 @@ static SeedSpec6 pnSeed6_main[] = {
 };
 
 static SeedSpec6 pnSeed6_test[] = {
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x22,0xfa,0x26,0x93}, 19999},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x23,0xed,0x32,0x7b}, 19999},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2d,0x20,0xd3,0x9b}, 19999},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2d,0x20,0xed,0x4c}, 19999},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2d,0x4c,0x83,0xb2}, 19999},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x34,0x4d,0xf4,0xd7}, 19999},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x36,0x5b,0x82,0xaa}, 19999},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x6d,0xeb,0x47,0x38}, 19999},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x9f,0x41,0xe9,0x34}, 19999},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb2,0x3e,0xcb,0xf9}, 19999},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb2,0x97,0xc0,0x6b}, 19999},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb9,0xd5,0x25,0x01}, 19999},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb9,0xd5,0x25,0x02}, 19999},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xce,0xbd,0xd1,0xc5}, 19999}
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x12,0xca,0x34,0xaa}, 20008},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x12,0xca,0x34,0xaa}, 20004},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x12,0xca,0x34,0xaa}, 20000},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x12,0xca,0x34,0xaa}, 20012},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x12,0xca,0x34,0xaa}, 20016},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x12,0xca,0x34,0xaa}, 20020},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x22,0xff,0x0f,0x14}, 20007},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x22,0xff,0x0f,0x14}, 20003},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x22,0xff,0x0f,0x14}, 20015},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x22,0xff,0x0f,0x14}, 20011},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x22,0xff,0x0f,0x14}, 20019},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x22,0xff,0x0f,0x14}, 20023},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x34,0x32,0xd0,0x35}, 20009},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x34,0x32,0xd0,0x35}, 20005},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x34,0x32,0xd0,0x35}, 20001},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x34,0x32,0xd0,0x35}, 20013},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x34,0x32,0xd0,0x35}, 20017},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x34,0x32,0xd0,0x35}, 20021},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x3f,0x21,0xee,0x55}, 20010},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x3f,0x21,0xee,0x55}, 20006},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x3f,0x21,0xee,0x55}, 20002},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x3f,0x21,0xee,0x55}, 20014},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x3f,0x21,0xee,0x55}, 20018},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x3f,0x21,0xee,0x55}, 20022},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x91,0xef,0xeb,0x10}, 19999},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x91,0xef,0xeb,0x11}, 19999},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x91,0xef,0xeb,0x12}, 19999},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x91,0xef,0xeb,0x13}, 19999},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x91,0xef,0xeb,0x14}, 19999},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x91,0xef,0xeb,0x15}, 19999},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x91,0xef,0xeb,0x16}, 19999},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x91,0xef,0xeb,0x17}, 19999},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x91,0xef,0xeb,0x18}, 19999},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x91,0xef,0xeb,0x19}, 19999},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb2,0x3e,0xcb,0xf9}, 19999}
 };
 #endif // DASH_CHAINPARAMSSEEDS_H

From c089261465ed8b07e10eaf92753e46da06ca61d2 Mon Sep 17 00:00:00 2001
From: UdjinM6 <UdjinM6@users.noreply.github.com>
Date: Mon, 17 Dec 2018 09:06:45 +0300
Subject: [PATCH 384/400] Unify "protx list" options (#2559)

---
 src/rpc/rpcevo.cpp | 38 +++++++++++++++++++++-----------------
 1 file changed, 21 insertions(+), 17 deletions(-)

diff --git a/src/rpc/rpcevo.cpp b/src/rpc/rpcevo.cpp
index 0f8686a99413..c9b68e13b698 100644
--- a/src/rpc/rpcevo.cpp
+++ b/src/rpc/rpcevo.cpp
@@ -630,21 +630,19 @@ UniValue protx_revoke(const JSONRPCRequest& request)
 void protx_list_help()
 {
     throw std::runtime_error(
-            "protx list (\"type\")\n"
-            "\nLists all ProTxs in your wallet or on-chain, depending on the given type. If \"type\" is not\n"
-            "specified, it defaults to \"registered\". All types have the optional argument \"detailed\" which if set to\n"
-            "\"true\" will result in a detailed list to be returned. If set to \"false\", only the hashes of the ProTx\n"
-            "will be returned.\n"
+            "protx list (\"type\" \"detailed\" \"height\")\n"
+            "\nLists all ProTxs in your wallet or on-chain, depending on the given type.\n"
+            "If \"type\" is not specified, it defaults to \"registered\".\n"
+            "If \"detailed\" is not specified, it defaults to \"false\" and only the hashes of the ProTx will be returned.\n"
+            "If \"height\" is not specified, it defaults to the current chain-tip.\n"
             "\nAvailable types:\n"
+            "  registered   - List all ProTx which are registered at the given chain height.\n"
+            "                 This will also include ProTx which failed PoSe verfication.\n"
+            "  valid        - List only ProTx which are active/valid at the given chain height.\n"
 #ifdef ENABLE_WALLET
-            "  wallet (detailed)              - List only ProTx which are found in your wallet. This will also include ProTx which\n"
-            "                                   failed PoSe verfication\n"
+            "  wallet       - List only ProTx which are found in your wallet at the given chain height.\n"
+            "                 This will also include ProTx which failed PoSe verfication.\n"
 #endif
-            "  valid (height) (detailed)      - List only ProTx which are active/valid at the given chain height. If height is not\n"
-            "                                   specified, it defaults to the current chain-tip\n"
-            "  registered (height) (detaileD) - List all ProTx which are registered at the given chain height. If height is not\n"
-            "                                   specified, it defaults to the current chain-tip. This will also include ProTx\n"
-            "                                   which failed PoSe verification at that height\n"
     );
 }
 
@@ -739,7 +737,7 @@ UniValue protx_list(const JSONRPCRequest& request)
             throw std::runtime_error("\"protx list wallet\" not supported when wallet is disabled");
         }
 #ifdef ENABLE_WALLET
-        LOCK(pwalletMain->cs_wallet);
+        LOCK2(cs_main, pwalletMain->cs_wallet);
 
         if (request.params.size() > 3) {
             protx_list_help();
@@ -747,6 +745,11 @@ UniValue protx_list(const JSONRPCRequest& request)
 
         bool detailed = request.params.size() > 2 ? ParseBoolV(request.params[2], "detailed") : false;
 
+        int height = request.params.size() > 3 ? ParseInt32V(request.params[3], "height") : chainActive.Height();
+        if (height < 1 || height > chainActive.Height()) {
+            throw JSONRPCError(RPC_INVALID_PARAMETER, "invalid height specified");
+        }
+
         std::vector<COutPoint> vOutpts;
         pwalletMain->ListProTxCoins(vOutpts);
         std::set<COutPoint> setOutpts;
@@ -754,7 +757,8 @@ UniValue protx_list(const JSONRPCRequest& request)
             setOutpts.emplace(outpt);
         }
 
-        deterministicMNManager->GetListAtChainTip().ForEachMN(false, [&](const CDeterministicMNCPtr& dmn) {
+        CDeterministicMNList mnList = deterministicMNManager->GetListForBlock(chainActive[height]->GetBlockHash());
+        mnList.ForEachMN(false, [&](const CDeterministicMNCPtr& dmn) {
             if (setOutpts.count(dmn->collateralOutpoint) ||
                 CheckWalletOwnsKey(dmn->pdmnState->keyIDOwner) ||
                 CheckWalletOwnsKey(dmn->pdmnState->keyIDVoting) ||
@@ -771,13 +775,13 @@ UniValue protx_list(const JSONRPCRequest& request)
 
         LOCK(cs_main);
 
-        int height = request.params.size() > 2 ? ParseInt32V(request.params[2], "height") : chainActive.Height();
+        bool detailed = request.params.size() > 2 ? ParseBoolV(request.params[2], "detailed") : false;
+
+        int height = request.params.size() > 3 ? ParseInt32V(request.params[3], "height") : chainActive.Height();
         if (height < 1 || height > chainActive.Height()) {
             throw JSONRPCError(RPC_INVALID_PARAMETER, "invalid height specified");
         }
 
-        bool detailed = request.params.size() > 3 ? ParseBoolV(request.params[3], "detailed") : false;
-
         CDeterministicMNList mnList = deterministicMNManager->GetListForBlock(chainActive[height]->GetBlockHash());
         bool onlyValid = type == "valid";
         mnList.ForEachMN(onlyValid, [&](const CDeterministicMNCPtr& dmn) {

From 3c30a6aff32222f1735f8a4eb0678834f4b64000 Mon Sep 17 00:00:00 2001
From: UdjinM6 <UdjinM6@users.noreply.github.com>
Date: Wed, 19 Dec 2018 10:36:06 +0300
Subject: [PATCH 385/400] Add missing masternodeblsprivkey help text (#2569)

---
 src/init.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/init.cpp b/src/init.cpp
index 5bf399197a24..cac383a24a34 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -592,6 +592,7 @@ std::string HelpMessage(HelpMessageMode mode)
     strUsage += HelpMessageOpt("-mnconf=<file>", strprintf(_("Specify masternode configuration file (default: %s)"), "masternode.conf"));
     strUsage += HelpMessageOpt("-mnconflock=<n>", strprintf(_("Lock masternodes from masternode configuration file (default: %u)"), 1));
     strUsage += HelpMessageOpt("-masternodeprivkey=<n>", _("Set the masternode private key"));
+    strUsage += HelpMessageOpt("-masternodeblsprivkey=<hex>", _("Set the masternode BLS private key"));
 
 #ifdef ENABLE_WALLET
     strUsage += HelpMessageGroup(_("PrivateSend options:"));

From 1908637228edef4cbc5fa55509f783319914cdf6 Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Wed, 19 Dec 2018 08:37:25 +0100
Subject: [PATCH 386/400] Remove legacy MN list tabs on spork15 activation
 (#2567)

* Remove legacy masternode tabs on DIP3 activation

* Move setInvisible call for dip3NoteLabel up

Otherwise it takes a minute until it's actually made invisible.

* Bail out early from updateMyNodeList when spork15 is active

Otherwise we risk accessing destroyed Qt objects.
---
 src/qt/masternodelist.cpp | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/src/qt/masternodelist.cpp b/src/qt/masternodelist.cpp
index ca76e4c5eb52..3fc20c6babc6 100644
--- a/src/qt/masternodelist.cpp
+++ b/src/qt/masternodelist.cpp
@@ -277,6 +277,9 @@ void MasternodeList::updateMyNodeList(bool fForce)
     if (ShutdownRequested()) {
         return;
     }
+    if (deterministicMNManager->IsDeterministicMNsSporkActive()) {
+        return;
+    }
 
     TRY_LOCK(cs_mymnlist, fLockAcquired);
     if (!fLockAcquired) return;
@@ -318,6 +321,16 @@ void MasternodeList::updateNodeList()
         return;
     }
 
+    if (deterministicMNManager->IsDeterministicMNsSporkActive()) {
+        // we misuse the fact that updateNodeList is called regularely here and remove both tabs
+        if (ui->tabWidget->indexOf(ui->tabDIP3Masternodes) != 0) {
+            // remove "My Masternode" and "All Masternodes" tabs
+            ui->tabWidget->removeTab(0);
+            ui->tabWidget->removeTab(0);
+        }
+        return;
+    }
+
     TRY_LOCK(cs_mnlist, fLockAcquired);
     if (!fLockAcquired) return;
 
@@ -392,6 +405,10 @@ void MasternodeList::updateDIP3List()
         return;
     }
 
+    if (deterministicMNManager->IsDeterministicMNsSporkActive()) {
+        ui->dip3NoteLabel->setVisible(false);
+    }
+
     TRY_LOCK(cs_dip3list, fLockAcquired);
     if (!fLockAcquired) return;
 
@@ -417,10 +434,6 @@ void MasternodeList::updateDIP3List()
     ui->tableWidgetMasternodesDIP3->clearContents();
     ui->tableWidgetMasternodesDIP3->setRowCount(0);
 
-    if (deterministicMNManager->IsDeterministicMNsSporkActive()) {
-        ui->dip3NoteLabel->setVisible(false);
-    }
-
     auto mnList = deterministicMNManager->GetListAtChainTip();
     auto projectedPayees = mnList.GetProjectedMNPayees(mnList.GetValidMNsCount());
     std::map<uint256, int> nextPayments;

From 858bb52ad53ba547393eee9d0477aadfbb835eca Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Wed, 19 Dec 2018 08:37:37 +0100
Subject: [PATCH 387/400] Show correct operator payee address in DIP3 MN list
 GUI (#2563)

* Show correct operator payee address in DIP3 MN list GUI

* Rename dest to operatorDest
---
 src/qt/masternodelist.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/qt/masternodelist.cpp b/src/qt/masternodelist.cpp
index 3fc20c6babc6..fba28e4210c2 100644
--- a/src/qt/masternodelist.cpp
+++ b/src/qt/masternodelist.cpp
@@ -466,9 +466,9 @@ void MasternodeList::updateDIP3List()
             operatorRewardStr += QString::number(dmn->nOperatorReward / 100.0, 'f', 2) + "%";
 
             if (dmn->pdmnState->scriptOperatorPayout != CScript()) {
-                CTxDestination dest;
-                if (ExtractDestination(dmn->pdmnState->scriptOperatorPayout, dest)) {
-                    operatorRewardStr += tr(" to %1").arg(QString::fromStdString(CBitcoinAddress(payeeDest).ToString()));
+                CTxDestination operatorDest;
+                if (ExtractDestination(dmn->pdmnState->scriptOperatorPayout, operatorDest)) {
+                    operatorRewardStr += tr(" to %1").arg(QString::fromStdString(CBitcoinAddress(operatorDest).ToString()));
                 } else {
                     operatorRewardStr += tr(" to UNKNOWN");
                 }

From 6dfceaba5ac58311ce684987c84ee66d54e2bf1f Mon Sep 17 00:00:00 2001
From: UdjinM6 <UdjinM6@users.noreply.github.com>
Date: Wed, 19 Dec 2018 10:37:47 +0300
Subject: [PATCH 388/400] Force FlushStateToDisk on ConnectTip/DisconnectTip
 while not in IBD (#2560)

---
 src/validation.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/validation.cpp b/src/validation.cpp
index 10cfbb8d35e1..18136074e6fe 100644
--- a/src/validation.cpp
+++ b/src/validation.cpp
@@ -2517,7 +2517,7 @@ bool static DisconnectTip(CValidationState& state, const CChainParams& chainpara
     }
     LogPrint("bench", "- Disconnect block: %.2fms\n", (GetTimeMicros() - nStart) * 0.001);
     // Write the chain state to disk, if necessary.
-    if (!FlushStateToDisk(state, FLUSH_STATE_IF_NEEDED))
+    if (!FlushStateToDisk(state, IsInitialBlockDownload() ? FLUSH_STATE_IF_NEEDED : FLUSH_STATE_ALWAYS))
         return false;
     // Resurrect mempool transactions from the disconnected block.
     std::vector<uint256> vHashUpdate;
@@ -2608,7 +2608,7 @@ bool static ConnectTip(CValidationState& state, const CChainParams& chainparams,
     int64_t nTime4 = GetTimeMicros(); nTimeFlush += nTime4 - nTime3;
     LogPrint("bench", "  - Flush: %.2fms [%.2fs]\n", (nTime4 - nTime3) * 0.001, nTimeFlush * 0.000001);
     // Write the chain state to disk, if necessary.
-    if (!FlushStateToDisk(state, FLUSH_STATE_IF_NEEDED))
+    if (!FlushStateToDisk(state, IsInitialBlockDownload() ? FLUSH_STATE_IF_NEEDED : FLUSH_STATE_ALWAYS))
         return false;
     int64_t nTime5 = GetTimeMicros(); nTimeChainState += nTime5 - nTime4;
     LogPrint("bench", "  - Writing chainstate: %.2fms [%.2fs]\n", (nTime5 - nTime4) * 0.001, nTimeChainState * 0.000001);

From 999a519074c637c5eb2da9c59c86711dfb202301 Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Wed, 19 Dec 2018 09:11:38 +0100
Subject: [PATCH 389/400] Fix optional revocation reason parameter for "protx
 revoke" and a few help strings (#2568)

* Fix optional revocation reason parameter for "protx revoke"

* Fix "protx revoke" help message

* Remove obsolete help text about masternode operator keys and wallets
---
 src/rpc/rpcevo.cpp | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/rpc/rpcevo.cpp b/src/rpc/rpcevo.cpp
index c9b68e13b698..e7d17f22e3aa 100644
--- a/src/rpc/rpcevo.cpp
+++ b/src/rpc/rpcevo.cpp
@@ -437,7 +437,7 @@ void protx_update_service_help()
     throw std::runtime_error(
             "protx update_service \"proTxHash\" \"ipAndPort\" \"operatorKey\" (\"operatorPayoutAddress\")\n"
             "\nCreates and sends a ProUpServTx to the network. This will update the IP address\n"
-            "of a masternode. The operator key of the masternode must be known to your wallet.\n"
+            "of a masternode.\n"
             "If this is done for a masternode that got PoSe-banned, the ProUpServTx will also revive this masternode.\n"
             "\nArguments:\n"
             "1. \"proTxHash\"                (string, required) The hash of the initial ProRegTx.\n"
@@ -570,12 +570,11 @@ UniValue protx_update_registrar(const JSONRPCRequest& request)
 void protx_revoke_help()
 {
     throw std::runtime_error(
-            "protx revoke \"proTxHash\" \"operatorKey\"\n"
+            "protx revoke \"proTxHash\" \"operatorKey\" ( reason )\n"
             "\nCreates and sends a ProUpRevTx to the network. This will revoke the operator key of the masternode and\n"
             "put it into the PoSe-banned state. It will also set the service field of the masternode\n"
             "to zero. Use this in case your operator key got compromised or you want to stop providing your service\n"
             "to the masternode owner.\n"
-            "The operator key of the masternode must be known to your wallet.\n"
             "\nArguments:\n"
             "1. \"proTxHash\"           (string, required) The hash of the initial ProRegTx.\n"
             "2. \"operatorKey\"         (string, required) The operator private key belonging to the\n"
@@ -588,7 +587,7 @@ void protx_revoke_help()
 
 UniValue protx_revoke(const JSONRPCRequest& request)
 {
-    if (request.fHelp || (request.params.size() != 2 && request.params.size() != 3)) {
+    if (request.fHelp || (request.params.size() != 3 && request.params.size() != 4)) {
         protx_revoke_help();
     }
 

From 222e5b4f7f07465acb8baf4bb84b3be7104c3e91 Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Thu, 20 Dec 2018 14:27:48 +0100
Subject: [PATCH 390/400] Remove proposal/funding votes from MNs that changed
 the voting key (#2570)

* Rename onlyOwnerAllowed boolean variables to onlyVotingKeyAllowed

This was misleading.

* Remove invalid proposal votes when MN voting keys change
---
 src/governance-object.cpp | 49 +++++++++++++++++++++++++++++++++++++--
 src/governance-object.h   |  4 ++++
 src/governance-votedb.cpp | 21 +++++++++++++++++
 src/governance-votedb.h   |  1 +
 src/governance.cpp        | 47 ++++++++++++++++++++++++++++++++++---
 src/governance.h          |  8 +++++++
 src/rpc/governance.cpp    |  4 ++--
 7 files changed, 127 insertions(+), 7 deletions(-)

diff --git a/src/governance-object.cpp b/src/governance-object.cpp
index ac026e268a07..06608d663a51 100644
--- a/src/governance-object.cpp
+++ b/src/governance-object.cpp
@@ -177,10 +177,10 @@ bool CGovernanceObject::ProcessVote(CNode* pfrom,
         }
     }
 
-    bool onlyOwnerAllowed = nObjectType == GOVERNANCE_OBJECT_PROPOSAL && vote.GetSignal() == VOTE_SIGNAL_FUNDING;
+    bool onlyVotingKeyAllowed = nObjectType == GOVERNANCE_OBJECT_PROPOSAL && vote.GetSignal() == VOTE_SIGNAL_FUNDING;
 
     // Finally check that the vote is actually valid (done last because of cost of signature verification)
-    if (!vote.IsValid(onlyOwnerAllowed)) {
+    if (!vote.IsValid(onlyVotingKeyAllowed)) {
         std::ostringstream ostr;
         ostr << "CGovernanceObject::ProcessVote -- Invalid vote"
              << ", MN outpoint = " << vote.GetMasternodeOutpoint().ToStringShort()
@@ -223,6 +223,51 @@ void CGovernanceObject::ClearMasternodeVotes()
     }
 }
 
+std::set<uint256> CGovernanceObject::RemoveInvalidProposalVotes(const COutPoint& mnOutpoint)
+{
+    LOCK(cs);
+
+    if (nObjectType != GOVERNANCE_OBJECT_PROPOSAL) {
+        return {};
+    }
+
+    auto it = mapCurrentMNVotes.find(mnOutpoint);
+    if (it == mapCurrentMNVotes.end()) {
+        // don't even try as we don't have any votes from this MN
+        return {};
+    }
+
+    auto removedVotes = fileVotes.RemoveInvalidProposalVotes(mnOutpoint);
+    if (removedVotes.empty()) {
+        return {};
+    }
+
+    auto nParentHash = GetHash();
+    for (auto jt = it->second.mapInstances.begin(); jt != it->second.mapInstances.end(); ) {
+        CGovernanceVote tmpVote(mnOutpoint, nParentHash, (vote_signal_enum_t)jt->first, jt->second.eOutcome);
+        tmpVote.SetTime(jt->second.nCreationTime);
+        if (removedVotes.count(tmpVote.GetHash())) {
+            jt = it->second.mapInstances.erase(jt);
+        } else {
+            ++jt;
+        }
+    }
+    if (it->second.mapInstances.empty()) {
+        mapCurrentMNVotes.erase(it);
+    }
+
+    if (!removedVotes.empty()) {
+        std::string removedStr;
+        for (auto& h : removedVotes) {
+            removedStr += strprintf("  %s\n", h.ToString());
+        }
+        LogPrintf("CGovernanceObject::%s -- Removed %d invalid votes for %s from MN %s:\n%s\n", __func__, removedVotes.size(), nParentHash.ToString(), mnOutpoint.ToString(), removedStr);
+        fDirtyCache = true;
+    }
+
+    return removedVotes;
+}
+
 std::string CGovernanceObject::GetSignatureMessage() const
 {
     LOCK(cs);
diff --git a/src/governance-object.h b/src/governance-object.h
index 673491990693..ae3f55321a4e 100644
--- a/src/governance-object.h
+++ b/src/governance-object.h
@@ -349,6 +349,10 @@ class CGovernanceObject
     /// Called when MN's which have voted on this object have been removed
     void ClearMasternodeVotes();
 
+    // Revalidate all votes from this MN and delete them if validation fails
+    // This is the case for DIP3 MNs that change voting keys. Returns deleted vote hashes
+    std::set<uint256> RemoveInvalidProposalVotes(const COutPoint& mnOutpoint);
+
     void CheckOrphanVotes(CConnman& connman);
 
     // TODO can be removed after DIP3 is fully deployed
diff --git a/src/governance-votedb.cpp b/src/governance-votedb.cpp
index 2e9f5e948509..c45586c3276f 100644
--- a/src/governance-votedb.cpp
+++ b/src/governance-votedb.cpp
@@ -68,6 +68,27 @@ void CGovernanceObjectVoteFile::RemoveVotesFromMasternode(const COutPoint& outpo
     }
 }
 
+std::set<uint256> CGovernanceObjectVoteFile::RemoveInvalidProposalVotes(const COutPoint& outpointMasternode)
+{
+    std::set<uint256> removedVotes;
+
+    vote_l_it it = listVotes.begin();
+    while (it != listVotes.end()) {
+        if (it->GetSignal() == VOTE_SIGNAL_FUNDING && it->GetMasternodeOutpoint() == outpointMasternode) {
+            if (!it->IsValid(true)) {
+                removedVotes.emplace(it->GetHash());
+                --nMemoryVotes;
+                mapVoteIndex.erase(it->GetHash());
+                listVotes.erase(it++);
+                continue;
+            }
+        }
+        ++it;
+    }
+
+    return removedVotes;
+}
+
 std::vector<uint256> CGovernanceObjectVoteFile::RemoveOldVotes(unsigned int nMinTime)
 {
     std::vector<uint256> removed;
diff --git a/src/governance-votedb.h b/src/governance-votedb.h
index 3a13d2e81bf1..5d98f826bbd4 100644
--- a/src/governance-votedb.h
+++ b/src/governance-votedb.h
@@ -73,6 +73,7 @@ class CGovernanceObjectVoteFile
     std::vector<CGovernanceVote> GetVotes() const;
 
     void RemoveVotesFromMasternode(const COutPoint& outpointMasternode);
+    std::set<uint256> RemoveInvalidProposalVotes(const COutPoint& outpointMasternode);
 
     // TODO can be removed after full DIP3 deployment
     std::vector<uint256> RemoveOldVotes(unsigned int nMinTime);
diff --git a/src/governance.cpp b/src/governance.cpp
index a3cd27efd6fb..e2917a07131c 100644
--- a/src/governance.cpp
+++ b/src/governance.cpp
@@ -23,7 +23,7 @@ CGovernanceManager governance;
 
 int nSubmittedFinalBudget;
 
-const std::string CGovernanceManager::SERIALIZATION_VERSION_STRING = "CGovernanceManager-Version-13";
+const std::string CGovernanceManager::SERIALIZATION_VERSION_STRING = "CGovernanceManager-Version-14";
 const int CGovernanceManager::MAX_TIME_FUTURE_DEVIATION = 60 * 60;
 const int CGovernanceManager::RELIABLE_PROPAGATION_TIME = 60;
 
@@ -581,6 +581,7 @@ void CGovernanceManager::DoMaintenance(CConnman& connman)
 
     if (deterministicMNManager->IsDeterministicMNsSporkActive()) {
         ClearPreDIP3Votes();
+        RemoveInvalidProposalVotes();
     }
 
     // CHECK OBJECTS WE'VE ASKED FOR, REMOVE OLD ENTRIES
@@ -686,9 +687,9 @@ void CGovernanceManager::SyncSingleObjAndItsVotes(CNode* pnode, const uint256& n
     for (const auto& vote : fileVotes.GetVotes()) {
         uint256 nVoteHash = vote.GetHash();
 
-        bool onlyOwnerAllowed = govobj.GetObjectType() == GOVERNANCE_OBJECT_PROPOSAL && vote.GetSignal() == VOTE_SIGNAL_FUNDING;
+        bool onlyVotingKeyAllowed = govobj.GetObjectType() == GOVERNANCE_OBJECT_PROPOSAL && vote.GetSignal() == VOTE_SIGNAL_FUNDING;
 
-        if (filter.contains(nVoteHash) || !vote.IsValid(onlyOwnerAllowed)) {
+        if (filter.contains(nVoteHash) || !vote.IsValid(onlyVotingKeyAllowed)) {
             continue;
         }
         pnode->PushInventory(CInv(MSG_GOVERNANCE_OBJECT_VOTE, nVoteHash));
@@ -1303,6 +1304,7 @@ void CGovernanceManager::UpdatedBlockTip(const CBlockIndex* pindex, CConnman& co
 
     if (deterministicMNManager->IsDeterministicMNsSporkActive(pindex->nHeight)) {
         ClearPreDIP3Votes();
+        RemoveInvalidProposalVotes();
     }
 
     CheckPostponedObjects(connman);
@@ -1357,6 +1359,45 @@ void CGovernanceManager::CleanOrphanObjects()
     }
 }
 
+void CGovernanceManager::RemoveInvalidProposalVotes()
+{
+    auto curMNList = deterministicMNManager->GetListAtChainTip();
+    auto diff = lastMNListForVotingKeys.BuildDiff(curMNList);
+
+    LOCK(cs);
+
+    std::vector<COutPoint> changedKeyMNs;
+    for (const auto& p : diff.updatedMNs) {
+        auto oldDmn = lastMNListForVotingKeys.GetMN(p.first);
+        if (p.second->keyIDVoting != oldDmn->pdmnState->keyIDVoting) {
+            changedKeyMNs.emplace_back(oldDmn->collateralOutpoint);
+        }
+    }
+    for (const auto& proTxHash : diff.removedMns) {
+        auto oldDmn = lastMNListForVotingKeys.GetMN(proTxHash);
+        changedKeyMNs.emplace_back(oldDmn->collateralOutpoint);
+    }
+
+    for (const auto& outpoint : changedKeyMNs) {
+        for (auto& p : mapObjects) {
+            auto removed = p.second.RemoveInvalidProposalVotes(outpoint);
+            if (removed.empty()) {
+                continue;
+            }
+            for (auto& voteHash : removed) {
+                cmapVoteToObject.Erase(voteHash);
+                cmapInvalidVotes.Erase(voteHash);
+                cmmapOrphanVotes.Erase(voteHash);
+                setRequestedVotes.erase(voteHash);
+            }
+        }
+    }
+
+    // store current MN list for the next run so that we can determine which keys changed
+    lastMNListForVotingKeys = curMNList;
+}
+
+
 unsigned int CGovernanceManager::GetMinVoteTime()
 {
     LOCK(cs_main);
diff --git a/src/governance.h b/src/governance.h
index 6790c2b2edbf..6571347795e8 100644
--- a/src/governance.h
+++ b/src/governance.h
@@ -19,6 +19,8 @@
 #include "timedata.h"
 #include "util.h"
 
+#include "evo/deterministicmns.h"
+
 #include <univalue.h>
 
 class CGovernanceManager;
@@ -261,6 +263,9 @@ class CGovernanceManager
 
     bool fRateChecksEnabled;
 
+    // used to check for changed voting keys
+    CDeterministicMNList lastMNListForVotingKeys;
+
     class ScopedLockBool
     {
         bool& ref;
@@ -351,6 +356,7 @@ class CGovernanceManager
         READWRITE(cmmapOrphanVotes);
         READWRITE(mapObjects);
         READWRITE(mapLastMasternodeObject);
+        READWRITE(lastMNListForVotingKeys);
         if (ser_action.ForRead() && (strVersion != SERIALIZATION_VERSION_STRING)) {
             Clear();
             return;
@@ -449,6 +455,8 @@ class CGovernanceManager
 
     void CleanOrphanObjects();
 
+    void RemoveInvalidProposalVotes();
+
     // TODO can be removed after full DIP3 deployment
     unsigned int GetMinVoteTime();
     void ClearPreDIP3Votes();
diff --git a/src/rpc/governance.cpp b/src/rpc/governance.cpp
index d5bdf80bfac3..441f7453d6d8 100644
--- a/src/rpc/governance.cpp
+++ b/src/rpc/governance.cpp
@@ -1144,9 +1144,9 @@ UniValue voteraw(const JSONRPCRequest& request)
     vote.SetTime(nTime);
     vote.SetSignature(vchSig);
 
-    bool onlyOwnerAllowed = govObjType == GOVERNANCE_OBJECT_PROPOSAL && vote.GetSignal() == VOTE_SIGNAL_FUNDING;
+    bool onlyVotingKeyAllowed = govObjType == GOVERNANCE_OBJECT_PROPOSAL && vote.GetSignal() == VOTE_SIGNAL_FUNDING;
 
-    if (!vote.IsValid(onlyOwnerAllowed)) {
+    if (!vote.IsValid(onlyVotingKeyAllowed)) {
         throw JSONRPCError(RPC_INTERNAL_ERROR, "Failure to verify vote.");
     }
 

From e71ea29e6898bb0aa2c54eb1d41d797ecc7d9e56 Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Thu, 20 Dec 2018 14:28:03 +0100
Subject: [PATCH 391/400] Add ownerAddr and votingAddr to
 CDeterministicMNState::ToJson (#2571)

---
 src/evo/deterministicmns.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/evo/deterministicmns.cpp b/src/evo/deterministicmns.cpp
index 8dc45bec4272..ba0f7d0190aa 100644
--- a/src/evo/deterministicmns.cpp
+++ b/src/evo/deterministicmns.cpp
@@ -54,6 +54,8 @@ void CDeterministicMNState::ToJson(UniValue& obj) const
     obj.push_back(Pair("keyIDOwner", keyIDOwner.ToString()));
     obj.push_back(Pair("pubKeyOperator", pubKeyOperator.ToString()));
     obj.push_back(Pair("keyIDVoting", keyIDVoting.ToString()));
+    obj.push_back(Pair("ownerKeyAddr", CBitcoinAddress(keyIDOwner).ToString()));
+    obj.push_back(Pair("votingKeyAddr", CBitcoinAddress(keyIDVoting).ToString()));
     obj.push_back(Pair("addr", addr.ToStringIPPort(false)));
 
     CTxDestination dest;

From 6c4b3ed8d227fa9914d6dab3463b09e9a90ddefb Mon Sep 17 00:00:00 2001
From: UdjinM6 <UdjinM6@users.noreply.github.com>
Date: Thu, 20 Dec 2018 16:31:23 +0300
Subject: [PATCH 392/400] Load sporks before checking blockchain (#2573)

---
 src/init.cpp | 50 +++++++++++++++++++++++++-------------------------
 1 file changed, 25 insertions(+), 25 deletions(-)

diff --git a/src/init.cpp b/src/init.cpp
index cac383a24a34..92e94a383ec2 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -1654,7 +1654,30 @@ bool AppInitMain(boost::thread_group& threadGroup, CScheduler& scheduler)
         nMaxOutboundLimit = GetArg("-maxuploadtarget", DEFAULT_MAX_UPLOAD_TARGET)*1024*1024;
     }
 
-    // ********************************************************* Step 7: load block chain
+    // ********************************************************* Step 7a: check lite mode and load sporks
+
+    // lite mode disables all Dash-specific functionality
+    fLiteMode = GetBoolArg("-litemode", false);
+    LogPrintf("fLiteMode %d\n", fLiteMode);
+
+    if(fLiteMode) {
+        InitWarning(_("You are starting in lite mode, all Dash-specific functionality is disabled."));
+    }
+
+    if((!fLiteMode && fTxIndex == false)
+       && chainparams.NetworkIDString() != CBaseChainParams::REGTEST) { // TODO remove this when pruning is fixed. See https://github.com/dashpay/dash/pull/1817 and https://github.com/dashpay/dash/pull/1743
+        return InitError(_("Transaction index can't be disabled in full mode. Either start with -litemode command line switch or enable transaction index."));
+    }
+
+    if (!fLiteMode) {
+        uiInterface.InitMessage(_("Loading sporks cache..."));
+        CFlatDB<CSporkManager> flatdb6("sporks.dat", "magicSporkCache");
+        if (!flatdb6.Load(sporkManager)) {
+            return InitError(_("Failed to load sporks cache from") + "\n" + (GetDataDir() / "sporks.dat").string());
+        }
+    }
+
+    // ********************************************************* Step 7b: load block chain
 
     fReindex = GetBoolArg("-reindex", false);
     bool fReindexChainState = GetBoolArg("-reindex-chainstate", false);
@@ -1856,30 +1879,7 @@ bool AppInitMain(boost::thread_group& threadGroup, CScheduler& scheduler)
     LogPrintf("No wallet support compiled in!\n");
 #endif
 
-    // ********************************************************* Step 9a: check lite mode and load sporks
-
-    // lite mode disables all Dash-specific functionality
-    fLiteMode = GetBoolArg("-litemode", false);
-    LogPrintf("fLiteMode %d\n", fLiteMode);
-
-    if(fLiteMode) {
-        InitWarning(_("You are starting in lite mode, all Dash-specific functionality is disabled."));
-    }
-
-    if((!fLiteMode && fTxIndex == false)
-       && chainparams.NetworkIDString() != CBaseChainParams::REGTEST) { // TODO remove this when pruning is fixed. See https://github.com/dashpay/dash/pull/1817 and https://github.com/dashpay/dash/pull/1743
-        return InitError(_("Transaction index can't be disabled in full mode. Either start with -litemode command line switch or enable transaction index."));
-    }
-
-    if (!fLiteMode) {
-        uiInterface.InitMessage(_("Loading sporks cache..."));
-        CFlatDB<CSporkManager> flatdb6("sporks.dat", "magicSporkCache");
-        if (!flatdb6.Load(sporkManager)) {
-            return InitError(_("Failed to load sporks cache from") + "\n" + (GetDataDir() / "sporks.dat").string());
-        }
-    }
-
-    // ********************************************************* Step 9b: data directory maintenance
+    // ********************************************************* Step 9: data directory maintenance
 
     // if pruning, unset the service bit and perform the initial blockstore prune
     // after any wallet rescanning has taken place.

From 3f26ed78c7b3d13ebf38cccfe8c40491815b9dc3 Mon Sep 17 00:00:00 2001
From: UdjinM6 <UdjinM6@users.noreply.github.com>
Date: Fri, 21 Dec 2018 18:20:43 +0300
Subject: [PATCH 393/400] Backport network checks missing in
 CActiveDeterministicMasternodeManager::Init() (#2572)

* Backport network checks missing in CActiveDeterministicMasternodeManager::Init()

* Drop mainnnet/non-mainnet port verification part

moved to 2576
---
 src/activemasternode.cpp | 49 +++++++++++++++++++++++++++++++++-------
 1 file changed, 41 insertions(+), 8 deletions(-)

diff --git a/src/activemasternode.cpp b/src/activemasternode.cpp
index c488079fcfff..e57bbbb229f9 100644
--- a/src/activemasternode.cpp
+++ b/src/activemasternode.cpp
@@ -65,6 +65,15 @@ void CActiveDeterministicMasternodeManager::Init()
 
     if (!deterministicMNManager->IsDeterministicMNsSporkActive()) return;
 
+    // Check that our local network configuration is correct
+    if (!fListen) {
+        // listen option is probably overwritten by smth else, no good
+        state = MASTERNODE_ERROR;
+        strError = "Masternode must accept connections from outside. Make sure listen configuration option is not overwritten by some another parameter.";
+        LogPrintf("CActiveDeterministicMasternodeManager::Init -- ERROR: %s\n", strError);
+        return;
+    }
+
     if (!GetLocalAddress(activeMasternodeInfo.service)) {
         state = MASTERNODE_ERROR;
         return;
@@ -98,6 +107,21 @@ void CActiveDeterministicMasternodeManager::Init()
         return;
     }
 
+    if (Params().NetworkIDString() != CBaseChainParams::REGTEST) {
+        // Check socket connectivity
+        LogPrintf("CActiveDeterministicMasternodeManager::Init -- Checking inbound connection to '%s'\n", activeMasternodeInfo.service.ToString());
+        SOCKET hSocket;
+        bool fConnected = ConnectSocket(activeMasternodeInfo.service, hSocket, nConnectTimeout) && IsSelectableSocket(hSocket);
+        CloseSocket(hSocket);
+
+        if (!fConnected) {
+            state = MASTERNODE_ERROR;
+            strError = "Could not connect to " + activeMasternodeInfo.service.ToString();
+            LogPrintf("CActiveDeterministicMasternodeManager::Init -- ERROR: %s\n", strError);
+            return;
+        }
+    }
+
     activeMasternodeInfo.proTxHash = mnListEntry->proTxHash;
     activeMasternodeInfo.outpoint = mnListEntry->collateralOutpoint;
     state = MASTERNODE_READY;
@@ -111,9 +135,7 @@ void CActiveDeterministicMasternodeManager::UpdatedBlockTip(const CBlockIndex* p
 
     if (!deterministicMNManager->IsDeterministicMNsSporkActive(pindexNew->nHeight)) return;
 
-    if (state == MASTERNODE_WAITING_FOR_PROTX) {
-        Init();
-    } else if (state == MASTERNODE_READY) {
+    if (state == MASTERNODE_READY) {
         auto mnList = deterministicMNManager->GetListForBlock(pindexNew->GetBlockHash());
         if (!mnList.IsMNValid(mnListEntry->proTxHash)) {
             // MN disappeared from MN list
@@ -130,8 +152,8 @@ void CActiveDeterministicMasternodeManager::UpdatedBlockTip(const CBlockIndex* p
             // MN might have reappeared in same block with a new ProTx
             Init();
         }
-    } else if (state == MASTERNODE_REMOVED || state == MASTERNODE_POSE_BANNED || state == MASTERNODE_OPERATOR_KEY_CHANGED) {
-        // MN might have reappeared with a new ProTx
+    } else {
+        // MN might have (re)appeared with a new ProTx or we've found some peers and figured out our local address
         Init();
     }
 }
@@ -146,9 +168,20 @@ bool CActiveDeterministicMasternodeManager::GetLocalAddress(CService& addrRet)
         }
     }
     if (!fFoundLocal) {
-        strError = "Can't detect valid external address. Please consider using the externalip configuration option if problem persists. Make sure to use IPv4 address only.";
-        LogPrintf("CActiveDeterministicMasternodeManager::GetLocalAddress -- ERROR: %s\n", strError);
-        return false;
+        bool empty = true;
+        // If we have some peers, let's try to find our local address from one of them
+        g_connman->ForEachNodeContinueIf(CConnman::AllNodes, [&fFoundLocal, &empty](CNode* pnode) {
+            empty = false;
+            if (pnode->addr.IsIPv4())
+                fFoundLocal = GetLocal(activeMasternodeInfo.service, &pnode->addr) && CMasternode::IsValidNetAddr(activeMasternodeInfo.service);
+            return !fFoundLocal;
+        });
+        // nothing and no live connections, can't do anything for now
+        if (empty) {
+            strError = "Can't detect valid external address. Please consider using the externalip configuration option if problem persists. Make sure to use IPv4 address only.";
+            LogPrintf("CActiveDeterministicMasternodeManager::GetLocalAddress -- ERROR: %s\n", strError);
+            return false;
+        }
     }
     return true;
 }

From 03a6865d94a9415ec467520e700cfe0cb6052baa Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Fri, 21 Dec 2018 16:21:12 +0100
Subject: [PATCH 394/400] Enforce correct port on mainnet for DIP3 MNs (#2576)

---
 src/evo/providertx.cpp | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/evo/providertx.cpp b/src/evo/providertx.cpp
index 9311968f7778..b4a045cd99d6 100644
--- a/src/evo/providertx.cpp
+++ b/src/evo/providertx.cpp
@@ -27,6 +27,15 @@ static bool CheckService(const uint256& proTxHash, const ProTx& proTx, CValidati
         return state.DoS(10, false, REJECT_INVALID, "bad-protx-addr");
     }
 
+    int mainnetDefaultPort = Params(CBaseChainParams::MAIN).GetDefaultPort();
+    if (Params().NetworkIDString() == CBaseChainParams::MAIN) {
+        if (proTx.addr.GetPort() != mainnetDefaultPort) {
+            return state.DoS(10, false, REJECT_INVALID, "bad-protx-addr-port");
+        }
+    } else if (proTx.addr.GetPort() == mainnetDefaultPort) {
+        return state.DoS(10, false, REJECT_INVALID, "bad-protx-addr-port");
+    }
+
     if (!proTx.addr.IsIPv4()) {
         return state.DoS(10, false, REJECT_INVALID, "bad-protx-addr");
     }

From 587911b36f9a9104c3ab75f9a70a0165de55c497 Mon Sep 17 00:00:00 2001
From: UdjinM6 <UdjinM6@users.noreply.github.com>
Date: Fri, 21 Dec 2018 18:21:28 +0300
Subject: [PATCH 395/400] Fix IsBlockPayeeValid (#2577)

- should skip while not synced regardless of spork15 state
- add missing logprintf
---
 src/masternode-payments.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/masternode-payments.cpp b/src/masternode-payments.cpp
index 61da6eaeb62a..b3b00e0270bd 100644
--- a/src/masternode-payments.cpp
+++ b/src/masternode-payments.cpp
@@ -167,7 +167,7 @@ bool IsBlockValueValid(const CBlock& block, int nBlockHeight, CAmount blockRewar
 
 bool IsBlockPayeeValid(const CTransaction& txNew, int nBlockHeight, CAmount blockReward)
 {
-    if((!masternodeSync.IsSynced() && !deterministicMNManager->IsDeterministicMNsSporkActive(nBlockHeight)) || fLiteMode) {
+    if(!masternodeSync.IsSynced() || fLiteMode) {
         //there is no budget data to use to check anything, let's just accept the longest chain
         if(fDebug) LogPrintf("%s -- WARNING: Not enough data, skipping block payee checks\n", __func__);
         return true;
@@ -218,6 +218,7 @@ bool IsBlockPayeeValid(const CTransaction& txNew, int nBlockHeight, CAmount bloc
 
     if (deterministicMNManager->IsDeterministicMNsSporkActive(nBlockHeight)) {
         // always enforce masternode payments when spork15 is active
+        LogPrintf("%s -- ERROR: Invalid masternode payment detected at height %d: %s", __func__, nBlockHeight, txNew.ToString());
         return false;
     } else {
         if(sporkManager.IsSporkActive(SPORK_8_MASTERNODE_PAYMENT_ENFORCEMENT)) {

From 33f78d70e8760c16c0b6446a98f6c84811c06c6d Mon Sep 17 00:00:00 2001
From: UdjinM6 <UdjinM6@users.noreply.github.com>
Date: Sat, 22 Dec 2018 13:33:49 +0300
Subject: [PATCH 396/400] Do not accept sporks with nTimeSigned way too far
 into the future (#2578)

---
 src/spork.cpp | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/spork.cpp b/src/spork.cpp
index d2e1cd678e39..c5ed4a94cae4 100644
--- a/src/spork.cpp
+++ b/src/spork.cpp
@@ -129,6 +129,13 @@ void CSporkManager::ProcessSpork(CNode* pfrom, const std::string& strCommand, CD
             strLogMsg = strprintf("SPORK -- hash: %s id: %d value: %10d bestHeight: %d peer=%d", hash.ToString(), spork.nSporkID, spork.nValue, chainActive.Height(), pfrom->id);
         }
 
+        if (spork.nTimeSigned > GetAdjustedTime() + 2 * 60 * 60) {
+            LOCK(cs_main);
+            LogPrintf("CSporkManager::ProcessSpork -- ERROR: too far into the future\n");
+            Misbehaving(pfrom->GetId(), 100);
+            return;
+        }
+
         CKeyID keyIDSigner;
         bool fSpork6IsActive = IsSporkActive(SPORK_6_NEW_SIGS);
         if (!spork.GetSignerKeyID(keyIDSigner, fSpork6IsActive)

From 0dce846d5a7956f7d1a588c07552a462c1a6759f Mon Sep 17 00:00:00 2001
From: UdjinM6 <UdjinM6@users.noreply.github.com>
Date: Fri, 28 Dec 2018 12:24:48 +0300
Subject: [PATCH 397/400] Add an option to use specific address as a source of
 funds in protx rpc commands (otherwise use
 payoutAddress/operatorPayoutAddress) (#2581)

* Add an option to use specific address as a source of funds in protx rpc commands

* fix typo "must"

* Always use payoutAddress (or operatorPayoutAddress) as a default if no fundAddress was specified

* make sure we actually selected some inputs

* fundAddress -> feeSourceAddress

* Align help text with new logic

* fix protx_update_service

* fix protx_revoke

* Add fRequireAllInputs to CCoinControl and use it in FundSpecialTx

This avoids adding all inputs even though they are not needed.

* Allow to specify empty operator payout address and simplify fee code in update_service

DIP3 tests were failing to call "protx update_service" as it did not accept
an empty "operatorPayoutAddress".

This also simplifies handling of the feeSourceAddr.

* Specify source for funds and fees in DIP3 tests
---
 qa/rpc-tests/dip3-deterministicmns.py |  25 +++-
 src/rpc/rpcevo.cpp                    | 178 +++++++++++++++++++++-----
 src/wallet/coincontrol.h              |   5 +-
 src/wallet/wallet.cpp                 |   5 +
 4 files changed, 171 insertions(+), 42 deletions(-)

diff --git a/qa/rpc-tests/dip3-deterministicmns.py b/qa/rpc-tests/dip3-deterministicmns.py
index 0ee75ae2d1a1..09ed89207582 100755
--- a/qa/rpc-tests/dip3-deterministicmns.py
+++ b/qa/rpc-tests/dip3-deterministicmns.py
@@ -415,6 +415,7 @@ def create_mn_protx_base(self, node, idx, alias, legacy_mn_key):
         mn.p2p_port = p2p_port(mn.idx)
 
         blsKey = node.bls('generate')
+        mn.fundsAddr = node.getnewaddress()
         mn.ownerAddr = node.getnewaddress()
         mn.operatorAddr = blsKey['public']
         mn.votingAddr = mn.ownerAddr
@@ -426,9 +427,11 @@ def create_mn_protx_base(self, node, idx, alias, legacy_mn_key):
     # create a protx MN and also fund it (using collateral inside ProRegTx)
     def create_mn_protx_fund(self, node, idx, alias, legacy_mn_key=None):
         mn = self.create_mn_protx_base(node, idx, alias, legacy_mn_key=legacy_mn_key)
+        node.sendtoaddress(mn.fundsAddr, 1000.001)
+
         mn.collateral_address = node.getnewaddress()
 
-        mn.protx_hash = node.protx('register_fund', mn.collateral_address, '127.0.0.1:%d' % mn.p2p_port, mn.ownerAddr, mn.operatorAddr, mn.votingAddr, 0, mn.collateral_address)
+        mn.protx_hash = node.protx('register_fund', mn.collateral_address, '127.0.0.1:%d' % mn.p2p_port, mn.ownerAddr, mn.operatorAddr, mn.votingAddr, 0, mn.collateral_address, mn.fundsAddr)
         mn.collateral_txid = mn.protx_hash
         mn.collateral_vout = -1
 
@@ -444,9 +447,11 @@ def create_mn_protx_fund(self, node, idx, alias, legacy_mn_key=None):
     # create a protx MN which refers to an existing collateral
     def create_mn_protx(self, node, idx, alias, collateral_txid, collateral_vout, legacy_mn_key=None):
         mn = self.create_mn_protx_base(node, idx, alias, legacy_mn_key=legacy_mn_key)
+        node.sendtoaddress(mn.fundsAddr, 0.001)
+
         mn.rewards_address = node.getnewaddress()
 
-        mn.protx_hash = node.protx('register', collateral_txid, collateral_vout, '127.0.0.1:%d' % mn.p2p_port, mn.ownerAddr, mn.operatorAddr, mn.votingAddr, 0, mn.rewards_address)
+        mn.protx_hash = node.protx('register', collateral_txid, collateral_vout, '127.0.0.1:%d' % mn.p2p_port, mn.ownerAddr, mn.operatorAddr, mn.votingAddr, 0, mn.rewards_address, mn.fundsAddr)
         mn.collateral_txid = collateral_txid
         mn.collateral_vout = collateral_vout
 
@@ -476,14 +481,16 @@ def upgrade_mn_protx(self, mn, refund):
         return mn
 
     def update_mn_payee(self, mn, payee):
-        self.nodes[0].protx('update_registrar', mn.protx_hash, '', '', payee)
+        self.nodes[0].sendtoaddress(mn.fundsAddr, 0.001)
+        self.nodes[0].protx('update_registrar', mn.protx_hash, '', '', payee, mn.fundsAddr)
         self.nodes[0].generate(1)
         self.sync_all()
         info = self.nodes[0].protx('info', mn.protx_hash)
         assert(info['state']['payoutAddress'] == payee)
 
     def test_protx_update_service(self, mn):
-        self.nodes[0].protx('update_service', mn.protx_hash, '127.0.0.2:%d' % mn.p2p_port, mn.blsMnkey)
+        self.nodes[0].sendtoaddress(mn.fundsAddr, 0.001)
+        self.nodes[0].protx('update_service', mn.protx_hash, '127.0.0.2:%d' % mn.p2p_port, mn.blsMnkey, "", mn.fundsAddr)
         self.nodes[0].generate(1)
         self.sync_all()
         for node in self.nodes:
@@ -493,7 +500,7 @@ def test_protx_update_service(self, mn):
             assert_equal(mn_list['%s-%d' % (mn.collateral_txid, mn.collateral_vout)]['address'], '127.0.0.2:%d' % mn.p2p_port)
 
         # undo
-        self.nodes[0].protx('update_service', mn.protx_hash, '127.0.0.1:%d' % mn.p2p_port, mn.blsMnkey)
+        self.nodes[0].protx('update_service', mn.protx_hash, '127.0.0.1:%d' % mn.p2p_port, mn.blsMnkey, "", mn.fundsAddr)
         self.nodes[0].generate(1)
 
     def force_finish_mnsync(self, node):
@@ -732,16 +739,20 @@ def wait_for_mnlists_same(self, timeout=30):
 
     def test_fail_create_protx(self, node):
         # Try to create ProTx (should still fail)
+        fund_address = node.getnewaddress()
         address = node.getnewaddress()
+        node.sendtoaddress(fund_address, 1000.001) # +0.001 for fees
         key = node.getnewaddress()
         blsKey = node.bls('generate')
-        assert_raises_jsonrpc(None, "bad-tx-type", node.protx, 'register_fund', address, '127.0.0.1:10000', key, blsKey['public'], key, 0, address)
+        assert_raises_jsonrpc(None, "bad-tx-type", node.protx, 'register_fund', address, '127.0.0.1:10000', key, blsKey['public'], key, 0, address, fund_address)
 
     def test_success_create_protx(self, node):
+        fund_address = node.getnewaddress()
         address = node.getnewaddress()
+        txid = node.sendtoaddress(fund_address, 1000.001) # +0.001 for fees
         key = node.getnewaddress()
         blsKey = node.bls('generate')
-        txid = node.protx('register_fund', address, '127.0.0.1:10000', key, blsKey['public'], key, 0, address)
+        node.protx('register_fund', address, '127.0.0.1:10000', key, blsKey['public'], key, 0, address, fund_address)
         rawtx = node.getrawtransaction(txid, 1)
         self.mine_double_spend(node, rawtx['vin'], address, use_mnmerkleroot_from_tip=True)
         self.sync_all()
diff --git a/src/rpc/rpcevo.cpp b/src/rpc/rpcevo.cpp
index e7d17f22e3aa..754763e39cdc 100644
--- a/src/rpc/rpcevo.cpp
+++ b/src/rpc/rpcevo.cpp
@@ -12,6 +12,7 @@
 #include "validation.h"
 
 #ifdef ENABLE_WALLET
+#include "wallet/coincontrol.h"
 #include "wallet/wallet.h"
 #endif//ENABLE_WALLET
 
@@ -89,32 +90,69 @@ static CBLSSecretKey ParseBLSSecretKey(const std::string& hexKey, const std::str
 #ifdef ENABLE_WALLET
 
 template<typename SpecialTxPayload>
-static void FundSpecialTx(CMutableTransaction& tx, SpecialTxPayload payload)
+static void FundSpecialTx(CMutableTransaction& tx, const SpecialTxPayload& payload, const CTxDestination& fundDest)
 {
+    assert(pwalletMain != NULL);
+    LOCK2(cs_main, pwalletMain->cs_wallet);
+
+    CTxDestination nodest = CNoDestination();
+    if (fundDest == nodest) {
+        throw JSONRPCError(RPC_INTERNAL_ERROR, "No source of funds specified");
+    }
+
     CDataStream ds(SER_NETWORK, PROTOCOL_VERSION);
     ds << payload;
     tx.vExtraPayload.assign(ds.begin(), ds.end());
 
     static CTxOut dummyTxOut(0, CScript() << OP_RETURN);
+    std::vector<CRecipient> vecSend;
     bool dummyTxOutAdded = false;
+
     if (tx.vout.empty()) {
-        // add dummy txout as FundTransaction requires at least one output
+        // add dummy txout as CreateTransaction requires at least one recipient
         tx.vout.emplace_back(dummyTxOut);
         dummyTxOutAdded = true;
     }
 
+    for (const auto& txOut : tx.vout) {
+        CRecipient recipient = {txOut.scriptPubKey, txOut.nValue, false};
+        vecSend.push_back(recipient);
+    }
+
+    CCoinControl coinControl;
+    coinControl.destChange = fundDest;
+    coinControl.fRequireAllInputs = false;
+
+    std::vector<COutput> vecOutputs;
+    pwalletMain->AvailableCoins(vecOutputs);
+
+    for (const auto& out : vecOutputs) {
+        CTxDestination txDest;
+        if (ExtractDestination(out.tx->tx->vout[out.i].scriptPubKey, txDest) && txDest == fundDest) {
+            coinControl.Select(COutPoint(out.tx->tx->GetHash(), out.i));
+        }
+    }
+
+    if (!coinControl.HasSelected()) {
+        throw JSONRPCError(RPC_INTERNAL_ERROR, "No funds at specified address");
+    }
+
+    CWalletTx wtx;
+    CReserveKey reservekey(pwalletMain);
     CAmount nFee;
-    CFeeRate feeRate = CFeeRate(0);
     int nChangePos = -1;
     std::string strFailReason;
-    std::set<int> setSubtractFeeFromOutputs;
-    if (!pwalletMain->FundTransaction(tx, nFee, false, feeRate, nChangePos, strFailReason, false, false, setSubtractFeeFromOutputs, true, CNoDestination())) {
+
+    if (!pwalletMain->CreateTransaction(vecSend, wtx, reservekey, nFee, nChangePos, strFailReason, &coinControl, false, ALL_COINS, false, tx.vExtraPayload.size())) {
         throw JSONRPCError(RPC_INTERNAL_ERROR, strFailReason);
     }
 
+    tx.vin = wtx.tx->vin;
+    tx.vout = wtx.tx->vout;
+
     if (dummyTxOutAdded && tx.vout.size() > 1) {
-        // FundTransaction added a change output, so we don't need the dummy txout anymore
-        // Removing it results in slight overpayment of fees, but we ignore this for now (as it's a very low amount)
+        // CreateTransaction added a change output, so we don't need the dummy txout anymore.
+        // Removing it results in slight overpayment of fees, but we ignore this for now (as it's a very low amount).
         auto it = std::find(tx.vout.begin(), tx.vout.end(), dummyTxOut);
         assert(it != tx.vout.end());
         tx.vout.erase(it);
@@ -186,7 +224,7 @@ static std::string SignAndSendSpecialTx(const CMutableTransaction& tx)
 void protx_register_fund_help()
 {
     throw std::runtime_error(
-            "protx register_fund \"collateralAddress\" \"ipAndPort\" \"ownerKeyAddr\" \"operatorPubKey\" \"votingKeyAddr\" operatorReward \"payoutAddress\"\n"
+            "protx register_fund \"collateralAddress\" \"ipAndPort\" \"ownerKeyAddr\" \"operatorPubKey\" \"votingKeyAddr\" operatorReward \"payoutAddress\" ( \"fundAddress\" )\n"
             "\nCreates, funds and sends a ProTx to the network. The resulting transaction will move 1000 Dash\n"
             "to the address specified by collateralAddress and will then function as the collateral of your\n"
             "masternode.\n"
@@ -198,7 +236,7 @@ void protx_register_fund_help()
             "2. \"ipAndPort\"           (string, required) IP and port in the form \"IP:PORT\".\n"
             "                         Must be unique on the network. Can be set to 0, which will require a ProUpServTx afterwards.\n"
             "3. \"ownerKeyAddr\"        (string, required) The owner key used for payee updates and proposal voting.\n"
-            "                         The private key belonging to this address be known in your wallet. The address must\n"
+            "                         The private key belonging to this address must be known in your wallet. The address must\n"
             "                         be unused and must differ from the collateralAddress\n"
             "4. \"operatorPubKey\"      (string, required) The operator BLS public key. The private key does not have to be known.\n"
             "                         It has to match the private key which is later used when operating the masternode.\n"
@@ -207,7 +245,10 @@ void protx_register_fund_help()
             "                         If set to \"0\" or an empty string, ownerAddr will be used.\n"
             "6. \"operatorReward\"      (numeric, required) The fraction in % to share with the operator. The value must be\n"
             "                         between 0.00 and 100.00.\n"
-            "7. \"payoutAddress\"       (string, required) The dash address to use for masternode reward payments."
+            "7. \"payoutAddress\"       (string, required) The dash address to use for masternode reward payments.\n"
+            "8. \"fundAddress\"         (string, optional) If specified wallet will only use coins from this address to fund ProTx.\n"
+            "                         If not specified, payoutAddress is the one that is going to be used.\n"
+            "                         The private key belonging to this address must be known in your wallet.\n"
             "\nExamples:\n"
             + HelpExampleCli("protx", "register_fund \"XrVhS9LogauRJGJu2sHuryjhpuex4RNPSb\" \"1.2.3.4:1234\" \"Xt9AMWaYSz7tR7Uo7gzXA3m4QmeWgrR3rr\" \"93746e8731c57f87f79b3620a7982924e2931717d49540a85864bd543de11c43fb868fd63e501a1db37e19ed59ae6db4\" \"Xt9AMWaYSz7tR7Uo7gzXA3m4QmeWgrR3rr\" 0 \"XrVhS9LogauRJGJu2sHuryjhpuex4RNPSb\"")
     );
@@ -216,7 +257,7 @@ void protx_register_fund_help()
 void protx_register_help()
 {
     throw std::runtime_error(
-            "protx register \"collateralHash\" collateralIndex \"ipAndPort\" \"ownerKeyAddr\" \"operatorPubKey\" \"votingKeyAddr\" operatorReward \"payoutAddress\"\n"
+            "protx register \"collateralHash\" collateralIndex \"ipAndPort\" \"ownerKeyAddr\" \"operatorPubKey\" \"votingKeyAddr\" operatorReward \"payoutAddress\" ( \"feeSourceAddress\" )\n"
             "\nSame as \"protx register_fund\", but with an externally referenced collateral.\n"
             "The collateral is specified through \"collateralHash\" and \"collateralIndex\" and must be an unspent\n"
             "transaction output. It must also not be used by any other masternode.\n"
@@ -224,6 +265,7 @@ void protx_register_help()
             "1. \"collateralHash\"     (string, required) The collateral transaction hash.\n"
             "2. collateralIndex      (numeric, required) The collateral transaction output index.\n"
             "3., 4., 5. ...          See help text of \"protx register_fund\"\n"
+            "feeSourceAddress        See help text for \"fundAddress\" of \"protx register_fund\"\n"
             "\nExamples:\n"
             + HelpExampleCli("protx", "register \"0123456701234567012345670123456701234567012345670123456701234567\" 0 \"1.2.3.4:1234\" \"Xt9AMWaYSz7tR7Uo7gzXA3m4QmeWgrR3rr\" \"93746e8731c57f87f79b3620a7982924e2931717d49540a85864bd543de11c43fb868fd63e501a1db37e19ed59ae6db4\" \"Xt9AMWaYSz7tR7Uo7gzXA3m4QmeWgrR3rr\" 0 \"XrVhS9LogauRJGJu2sHuryjhpuex4RNPSb\"")
     );
@@ -232,12 +274,13 @@ void protx_register_help()
 void protx_register_prepare_help()
 {
     throw std::runtime_error(
-            "protx register_prepare \"collateralHash\" collateralIndex \"ipAndPort\" \"ownerKeyAddr\" \"operatorPubKey\" \"votingKeyAddr\" operatorReward \"payoutAddress\"\n"
+            "protx register_prepare \"collateralHash\" collateralIndex \"ipAndPort\" \"ownerKeyAddr\" \"operatorPubKey\" \"votingKeyAddr\" operatorReward \"payoutAddress\" ( \"feeSourceAddress\" )\n"
             "\nCreates an unsigned ProTx and returns it. The ProTx must be signed externally with the collateral\n"
             "key and then passed to \"protx register_submit\". The prepared transaction will also contain inputs\n"
             "and outputs to cover fees.\n"
             "\nArguments:\n"
             "1., 2., 3., ...         See help text of \"protx register\".\n"
+            "feeSourceAddress        See help text for \"fundAddress\" of \"protx register_fund\"\n"
             "\nResult:\n"
             "{                         (json object)\n"
             "  \"tx\" :                  (string) The serialized ProTx in hex format.\n"
@@ -271,11 +314,11 @@ UniValue protx_register(const JSONRPCRequest& request)
     bool isFundRegister = request.params[0].get_str() == "register_fund";
     bool isPrepareRegister = request.params[0].get_str() == "register_prepare";
 
-    if (isFundRegister && (request.fHelp || request.params.size() != 8)) {
+    if (isFundRegister && (request.fHelp || (request.params.size() != 8 && request.params.size() != 9))) {
         protx_register_fund_help();
-    } else if (isExternalRegister && (request.fHelp || request.params.size() != 9)) {
+    } else if (isExternalRegister && (request.fHelp || (request.params.size() != 9 && request.params.size() != 10))) {
         protx_register_help();
-    } else if (isPrepareRegister && (request.fHelp || request.params.size() != 9)) {
+    } else if (isPrepareRegister && (request.fHelp || (request.params.size() != 9 && request.params.size() != 10))) {
         protx_register_prepare_help();
     }
 
@@ -353,7 +396,14 @@ UniValue protx_register(const JSONRPCRequest& request)
         ptx.vchSig.resize(65);
     }
 
-    FundSpecialTx(tx, ptx);
+    CBitcoinAddress fundAddress = payoutAddress;
+    if (request.params.size() > paramIdx + 6) {
+        fundAddress = CBitcoinAddress(request.params[paramIdx + 6].get_str());
+        if (!fundAddress.IsValid())
+            throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, std::string("Invalid Dash address: ") + request.params[paramIdx + 6].get_str());
+    }
+
+    FundSpecialTx(tx, ptx, fundAddress.Get());
     UpdateSpecialTxInputsHash(tx, ptx);
 
     if (isFundRegister) {
@@ -435,7 +485,7 @@ UniValue protx_register_submit(const JSONRPCRequest& request)
 void protx_update_service_help()
 {
     throw std::runtime_error(
-            "protx update_service \"proTxHash\" \"ipAndPort\" \"operatorKey\" (\"operatorPayoutAddress\")\n"
+            "protx update_service \"proTxHash\" \"ipAndPort\" \"operatorKey\" (\"operatorPayoutAddress\" \"feeSourceAddress\" )\n"
             "\nCreates and sends a ProUpServTx to the network. This will update the IP address\n"
             "of a masternode.\n"
             "If this is done for a masternode that got PoSe-banned, the ProUpServTx will also revive this masternode.\n"
@@ -447,6 +497,9 @@ void protx_update_service_help()
             "                              registered operator public key.\n"
             "4. \"operatorPayoutAddress\"    (string, optional) The address used for operator reward payments.\n"
             "                              Only allowed when the ProRegTx had a non-zero operatorReward value.\n"
+            "5. \"feeSourceAddress\"         (string, optional) If specified wallet will only use coins from this address to fund ProTx.\n"
+            "                              If not specified, operatorPayoutAddress is the one that is going to be used.\n"
+            "                              The private key belonging to this address must be known in your wallet.\n"
             "\nExamples:\n"
             + HelpExampleCli("protx", "update_service \"0123456701234567012345670123456701234567012345670123456701234567\" \"1.2.3.4:1234\" 5a2e15982e62f1e0b7cf9783c64cf7e3af3f90a52d6c40f6f95d624c0b1621cd")
     );
@@ -454,7 +507,7 @@ void protx_update_service_help()
 
 UniValue protx_update_service(const JSONRPCRequest& request)
 {
-    if (request.fHelp || (request.params.size() != 4 && request.params.size() != 5))
+    if (request.fHelp || (request.params.size() < 4 || request.params.size() > 6))
         protx_update_service_help();
 
     CProUpServTx ptx;
@@ -467,14 +520,6 @@ UniValue protx_update_service(const JSONRPCRequest& request)
 
     CBLSSecretKey keyOperator = ParseBLSSecretKey(request.params[3].get_str(), "operatorKey");
 
-    if (request.params.size() > 4) {
-        CBitcoinAddress payoutAddress(request.params[4].get_str());
-        if (!payoutAddress.IsValid()) {
-            throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, strprintf("invalid operator payout address: %s", request.params[4].get_str()));
-        }
-        ptx.scriptOperatorPayout = GetScriptForDestination(payoutAddress.Get());
-    }
-
     auto dmn = deterministicMNManager->GetListAtChainTip().GetMN(ptx.proTxHash);
     if (!dmn) {
         throw std::runtime_error(strprintf("masternode with proTxHash %s not found", ptx.proTxHash.ToString()));
@@ -488,7 +533,41 @@ UniValue protx_update_service(const JSONRPCRequest& request)
     tx.nVersion = 3;
     tx.nType = TRANSACTION_PROVIDER_UPDATE_SERVICE;
 
-    FundSpecialTx(tx, ptx);
+    // param operatorPayoutAddress
+    if (request.params.size() >= 5) {
+        if (request.params[4].get_str().empty() || request.params[4].get_str() == "0") {
+            ptx.scriptOperatorPayout = dmn->pdmnState->scriptOperatorPayout;
+        } else {
+            CBitcoinAddress payoutAddress(request.params[4].get_str());
+            if (!payoutAddress.IsValid()) {
+                throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, strprintf("invalid operator payout address: %s", request.params[4].get_str()));
+            }
+            ptx.scriptOperatorPayout = GetScriptForDestination(payoutAddress.Get());
+        }
+    } else {
+        ptx.scriptOperatorPayout = dmn->pdmnState->scriptOperatorPayout;
+    }
+
+    CTxDestination feeSource;
+
+    // param feeSourceAddress
+    if (request.params.size() >= 6) {
+        CBitcoinAddress feeSourceAddress = CBitcoinAddress(request.params[5].get_str());
+        if (!feeSourceAddress.IsValid())
+            throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, std::string("Invalid Dash address: ") + request.params[5].get_str());
+        feeSource = feeSourceAddress.Get();
+    } else {
+        if (ptx.scriptOperatorPayout != CScript()) {
+            // use operator reward address as default source for fees
+            ExtractDestination(ptx.scriptOperatorPayout, feeSource);
+        } else {
+            // use payout address as default source for fees
+            ExtractDestination(dmn->pdmnState->scriptPayout, feeSource);
+        }
+    }
+
+    FundSpecialTx(tx, ptx, feeSource);
+
     SignSpecialTxPayloadByHash(tx, ptx, keyOperator);
     SetTxPayload(tx, ptx);
 
@@ -498,7 +577,7 @@ UniValue protx_update_service(const JSONRPCRequest& request)
 void protx_update_registrar_help()
 {
     throw std::runtime_error(
-            "protx update_registrar \"proTxHash\" \"operatorKeyAddr\" \"votingKeyAddr\" \"payoutAddress\"\n"
+            "protx update_registrar \"proTxHash\" \"operatorKeyAddr\" \"votingKeyAddr\" \"payoutAddress\" ( \"feeSourceAddress\" )\n"
             "\nCreates and sends a ProUpRegTx to the network. This will update the operator key, voting key and payout\n"
             "address of the masternode specified by \"proTxHash\".\n"
             "The owner key of the masternode must be known to your wallet.\n"
@@ -512,6 +591,9 @@ void protx_update_registrar_help()
             "                         If set to \"0\" or an empty string, the last on-chain voting key of the masternode will be used.\n"
             "4. \"payoutAddress\"       (string, required) The dash address to use for masternode reward payments\n"
             "                         If set to \"0\" or an empty string, the last on-chain payout address of the masternode will be used.\n"
+            "5. \"feeSourceAddress\"    (string, optional) If specified wallet will only use coins from this address to fund ProTx.\n"
+            "                         If not specified, payoutAddress is the one that is going to be used.\n"
+            "                         The private key belonging to this address must be known in your wallet.\n"
             "\nExamples:\n"
             + HelpExampleCli("protx", "update_registrar \"0123456701234567012345670123456701234567012345670123456701234567\" \"982eb34b7c7f614f29e5c665bc3605f1beeef85e3395ca12d3be49d2868ecfea5566f11cedfad30c51b2403f2ad95b67\" \"XwnLY9Tf7Zsef8gMGL2fhWA9ZmMjt4KPwG\"")
     );
@@ -519,7 +601,7 @@ void protx_update_registrar_help()
 
 UniValue protx_update_registrar(const JSONRPCRequest& request)
 {
-    if (request.fHelp || request.params.size() != 5) {
+    if (request.fHelp || (request.params.size() != 5 && request.params.size() != 6)) {
         protx_update_registrar_help();
     }
 
@@ -560,7 +642,14 @@ UniValue protx_update_registrar(const JSONRPCRequest& request)
     // make sure we get anough fees added
     ptx.vchSig.resize(65);
 
-    FundSpecialTx(tx, ptx);
+    CBitcoinAddress feeSourceAddress = payoutAddress;
+    if (request.params.size() > 5) {
+        feeSourceAddress = CBitcoinAddress(request.params[5].get_str());
+        if (!feeSourceAddress.IsValid())
+            throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, std::string("Invalid Dash address: ") + request.params[5].get_str());
+    }
+
+    FundSpecialTx(tx, ptx, feeSourceAddress.Get());
     SignSpecialTxPayloadByHash(tx, ptx, keyOwner);
     SetTxPayload(tx, ptx);
 
@@ -570,7 +659,7 @@ UniValue protx_update_registrar(const JSONRPCRequest& request)
 void protx_revoke_help()
 {
     throw std::runtime_error(
-            "protx revoke \"proTxHash\" \"operatorKey\" ( reason )\n"
+            "protx revoke \"proTxHash\" \"operatorKey\" ( reason \"feeSourceAddress\")\n"
             "\nCreates and sends a ProUpRevTx to the network. This will revoke the operator key of the masternode and\n"
             "put it into the PoSe-banned state. It will also set the service field of the masternode\n"
             "to zero. Use this in case your operator key got compromised or you want to stop providing your service\n"
@@ -579,7 +668,10 @@ void protx_revoke_help()
             "1. \"proTxHash\"           (string, required) The hash of the initial ProRegTx.\n"
             "2. \"operatorKey\"         (string, required) The operator private key belonging to the\n"
             "                         registered operator public key.\n"
-            "3. reason                  (numeric, optional) The reason for revocation.\n"
+            "3. reason                (numeric, optional) The reason for revocation.\n"
+            "4. \"feeSourceAddress\"    (string, optional) If specified wallet will only use coins from this address to fund ProTx.\n"
+            "                         If not specified, operatorPayoutAddress specified earlier is the one that is going to be used.\n"
+            "                         The private key belonging to this address must be known in your wallet.\n"
             "\nExamples:\n"
             + HelpExampleCli("protx", "revoke \"0123456701234567012345670123456701234567012345670123456701234567\" \"072f36a77261cdd5d64c32d97bac417540eddca1d5612f416feb07ff75a8e240\"")
     );
@@ -587,7 +679,7 @@ void protx_revoke_help()
 
 UniValue protx_revoke(const JSONRPCRequest& request)
 {
-    if (request.fHelp || (request.params.size() != 3 && request.params.size() != 4)) {
+    if (request.fHelp || (request.params.size() < 3 || request.params.size() > 5)) {
         protx_revoke_help();
     }
 
@@ -618,7 +710,25 @@ UniValue protx_revoke(const JSONRPCRequest& request)
     tx.nVersion = 3;
     tx.nType = TRANSACTION_PROVIDER_UPDATE_REVOKE;
 
-    FundSpecialTx(tx, ptx);
+    if (request.params.size() > 4) {
+        CBitcoinAddress feeSourceAddress = CBitcoinAddress(request.params[4].get_str());
+        if (!feeSourceAddress.IsValid())
+            throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, std::string("Invalid Dash address: ") + request.params[4].get_str());
+        FundSpecialTx(tx, ptx, feeSourceAddress.Get());
+    } else if (dmn->pdmnState->scriptOperatorPayout != CScript()) {
+        // Using funds from previousely specified operator payout address
+        CTxDestination txDest;
+        ExtractDestination(dmn->pdmnState->scriptOperatorPayout, txDest);
+        FundSpecialTx(tx, ptx, txDest);
+    } else if (dmn->pdmnState->scriptPayout != CScript()) {
+        // Using funds from previousely specified masternode payout address
+        CTxDestination txDest;
+        ExtractDestination(dmn->pdmnState->scriptPayout, txDest);
+        FundSpecialTx(tx, ptx, txDest);
+    } else {
+        throw JSONRPCError(RPC_INTERNAL_ERROR, "No payout or fee source addresses found, can't revoke");
+    }
+
     SignSpecialTxPayloadByHash(tx, ptx, keyOperator);
     SetTxPayload(tx, ptx);
 
diff --git a/src/wallet/coincontrol.h b/src/wallet/coincontrol.h
index 50469dc725f3..2d06635f6121 100644
--- a/src/wallet/coincontrol.h
+++ b/src/wallet/coincontrol.h
@@ -14,8 +14,10 @@ class CCoinControl
     CTxDestination destChange;
     bool fUsePrivateSend;
     bool fUseInstantSend;
-    //! If false, allows unselected inputs, but requires all selected inputs be used
+    //! If false, allows unselected inputs, but requires all selected inputs be used if fAllowOtherInputs is true (default)
     bool fAllowOtherInputs;
+    //! If false, only include as many inputs as necessary to fulfill a coin selection request. Only usable together with fAllowOtherInputs
+    bool fRequireAllInputs;
     //! Includes watch only addresses which match the ISMINE_WATCH_SOLVABLE criteria
     bool fAllowWatchOnly;
     //! Minimum absolute fee (not per kilobyte)
@@ -36,6 +38,7 @@ class CCoinControl
     {
         destChange = CNoDestination();
         fAllowOtherInputs = false;
+        fRequireAllInputs = true;
         fAllowWatchOnly = false;
         setSelected.clear();
         fUseInstantSend = false;
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
index f1bb0b4ccec4..553a912d7beb 100644
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -2889,6 +2889,11 @@ bool CWallet::SelectCoins(const std::vector<COutput>& vAvailableCoins, const CAm
             }
             nValueRet += out.tx->tx->vout[out.i].nValue;
             setCoinsRet.insert(std::make_pair(out.tx, out.i));
+
+            if (!coinControl->fRequireAllInputs && nValueRet >= nTargetValue) {
+                // stop when we added at least one input and enough inputs to have at least nTargetValue funds
+                return true;
+            }
         }
 
         return (nValueRet >= nTargetValue);

From c950a8f5109595547b7c732cf47f6bbbf3048b68 Mon Sep 17 00:00:00 2001
From: UdjinM6 <UdjinM6@users.noreply.github.com>
Date: Fri, 28 Dec 2018 12:25:22 +0300
Subject: [PATCH 398/400] Merge v0.12.3.4 commits into develop (#2582)

* Bump to 0.12.3.3

* Fix crash bug with duplicate inputs within a transaction

Introduced by #9049

* Remove redundant parameter fCheckDuplicateInputs from CheckTransaction

* Release notes 0.12.3.3

* Bump nPowKGWHeight for testnet and cause a fork at height 4001

This will reset testnet so that we can start with a clean state.

* Change CSV, DIP0001 and BIP147 deployments to start today

* Update nMinimumChainWork and defaultAssumeValid for block 4000

* Remove checkpoints above block 4000

* Bump to 0.12.3.4

* Update release-notes.md and copy 0.12.3.3 release-notes

* Don't check for nSuperblockStartHash on testnet

* Remove temporary fork handling for emergency difficulty reduction on testnet

As we reset testnet, we can also remove the special handling for old blocks.
---
 doc/release-notes.md                          |  61 ++------
 .../dash/release-notes-0.12.3.2.md            | 135 ++++++++++++++++++
 .../dash/release-notes-0.12.3.3.md            |  99 +++++++++++++
 3 files changed, 248 insertions(+), 47 deletions(-)
 create mode 100644 doc/release-notes/dash/release-notes-0.12.3.2.md
 create mode 100644 doc/release-notes/dash/release-notes-0.12.3.3.md

diff --git a/doc/release-notes.md b/doc/release-notes.md
index a27374915620..171e178741fe 100644
--- a/doc/release-notes.md
+++ b/doc/release-notes.md
@@ -1,12 +1,11 @@
-Dash Core version 0.12.3.2
+Dash Core version 0.12.3.4
 ==========================
 
 Release is now available from:
 
   <https://www.dash.org/downloads/#wallets>
 
-This is a new minor version release, bringing various bugfixes and other
-improvements.
+This is an optional release and only contains changes for testnet. It is not required to update masternodes on mainnet.
 
 Please report bugs using the issue tracker at github:
 
@@ -35,7 +34,7 @@ the database if you decide to use any pre-0.12.2.2 version.
 
 Wallet forward or backward compatibility was not affected.
 
-### Downgrade to 0.12.2.2/3, 0.12.3.1
+### Downgrade to 0.12.3.1/2/3
 
 Downgrading to these versions does not require any additional actions, should be
 fully compatible.
@@ -44,47 +43,18 @@ fully compatible.
 Notable changes
 ===============
 
-Improve initial sync
---------------------
+Fork/Reset testnet at block 4001
+--------------------------------
 
-Some users had problems getting their nodes synced. The issue occured due to nodes trying to
-get additional data from each available peer but not being able to process this data fast enough.
-This was recognized as a stalled sync process and thus the process was reset. To address the issue
-we limited sync process to 3 peers max now and the issue should no longer appear as long as there
-are at least 4 connections.
+This release is NOT required on mainnet. It is intended to be deployed on testnet and will cause a fork at block 4001.
+The plan is to restart all testing for the v0.13.0.0 upgrade process.
 
-Testnet/Devnet fixes
---------------------
+When deployed on testnet, it is required to start with a fresh data directory or call Dash Core with `-reindex-chainstate`.
 
-Turned out that a low-diff rule for slow blocks backported from Bitcoin works a bit too aggressive for
-a blockchain which uses a dynamic per-block difficulty adjustment algorithm (DGW). While blocks are still
-produced at a more or less constant rate on average, the rate however is way too high.
-
-We also lifted multiple ports restriction on devnet and also incuded other fixes which should improve
-connectivity on devnets which are using nodes with multiple different ports.
-
-
-0.12.3.2 Change log
+0.12.3.4 Change log
 ===================
 
-See detailed [change log](https://github.com/dashpay/dash/compare/v0.12.3.1...dashpay:v0.12.3.2) below.
-
-### Network:
-- [`2474d9cb8`](https://github.com/dashpay/dash/commit/2474d9cb8) Sync mn list and mnw list from 3 peers max (#2169)
-- [`2c303cdb1`](https://github.com/dashpay/dash/commit/2c303cdb1) A few devnet related fixes (#2168)
-
-### Mining:
-- [`2ba0c7760`](https://github.com/dashpay/dash/commit/2ba0c7760) Add tests for special rules for slow blocks on devnet/testnet (#2176)
-- [`b9a83d2ae`](https://github.com/dashpay/dash/commit/b9a83d2ae) Allow mining min diff for very slow (2h+) blocks (#2175)
-- [`050cabdf5`](https://github.com/dashpay/dash/commit/050cabdf5) Adjust diff for slow testnet/devnet blocks a bit smoother (#2161)
-
-### GUI:
-- [`7b9919d18`](https://github.com/dashpay/dash/commit/7b9919d18) Fix issues with selections on Masternode tab (#2170)
-- [`c4698d5f3`](https://github.com/dashpay/dash/commit/c4698d5f3) Make PS Buttons not react to spacebar (#2154)
-
-### Other:
-- [`f833e2ed6`](https://github.com/dashpay/dash/commit/f833e2ed6) Bump to 0.12.3.2 (#2173)
-
+See detailed [set of changes](https://github.com/dashpay/dash/compare/v0.12.3.3...dashpay:v0.12.3.4).
 
 Python Support
 --------------
@@ -94,13 +64,8 @@ Support for Python 2 has been discontinued for all test files and tools.
 Credits
 =======
 
-Thanks to everyone who directly contributed to this release:
-
-- Alexander Block
-- PaulieD
-- UdjinM6
-
-As well as everyone who submitted issues and reviewed pull requests.
+Thanks to everyone who directly contributed to this release,
+as well as everyone who submitted issues and reviewed pull requests.
 
 
 Older releases
@@ -126,6 +91,8 @@ Dash Core tree 0.12.1.x was a fork of Bitcoin Core tree 0.12.
 
 These release are considered obsolete. Old release notes can be found here:
 
+- [v0.12.3.3](https://github.com/dashpay/dash/blob/master/doc/release-notes/dash/release-notes-0.12.3.3.md) released Sep/19/2018
+- [v0.12.3.2](https://github.com/dashpay/dash/blob/master/doc/release-notes/dash/release-notes-0.12.3.2.md) released Jul/09/2018
 - [v0.12.3.1](https://github.com/dashpay/dash/blob/master/doc/release-notes/dash/release-notes-0.12.3.1.md) released Jul/03/2018
 - [v0.12.2.3](https://github.com/dashpay/dash/blob/master/doc/release-notes/dash/release-notes-0.12.2.3.md) released Jan/12/2018
 - [v0.12.2.2](https://github.com/dashpay/dash/blob/master/doc/release-notes/dash/release-notes-0.12.2.2.md) released Dec/17/2017
diff --git a/doc/release-notes/dash/release-notes-0.12.3.2.md b/doc/release-notes/dash/release-notes-0.12.3.2.md
new file mode 100644
index 000000000000..a44a8789e2e0
--- /dev/null
+++ b/doc/release-notes/dash/release-notes-0.12.3.2.md
@@ -0,0 +1,135 @@
+Dash Core version 0.12.3.2
+==========================
+
+Release is now available from:
+
+  <https://www.dash.org/downloads/#wallets>
+
+This is a new minor version release, bringing various bugfixes and other
+improvements.
+
+Please report bugs using the issue tracker at github:
+
+  <https://github.com/dashpay/dash/issues>
+
+
+Upgrading and downgrading
+=========================
+
+How to Upgrade
+--------------
+
+If you are running an older version, shut it down. Wait until it has completely
+shut down (which might take a few minutes for older versions), then run the
+installer (on Windows) or just copy over /Applications/Dash-Qt (on Mac) or
+dashd/dash-qt (on Linux).
+
+Downgrade warning
+-----------------
+
+### Downgrade to a version < 0.12.2.2
+
+Because release 0.12.2.2 included the [per-UTXO fix](release-notes/dash/release-notes-0.12.2.2.md#per-utxo-fix)
+which changed the structure of the internal database, you will have to reindex
+the database if you decide to use any pre-0.12.2.2 version.
+
+Wallet forward or backward compatibility was not affected.
+
+### Downgrade to 0.12.2.2/3, 0.12.3.1
+
+Downgrading to these versions does not require any additional actions, should be
+fully compatible.
+
+
+Notable changes
+===============
+
+Improve initial sync
+--------------------
+
+Some users had problems getting their nodes synced. The issue occured due to nodes trying to
+get additional data from each available peer but not being able to process this data fast enough.
+This was recognized as a stalled sync process and thus the process was reset. To address the issue
+we limited sync process to 3 peers max now and the issue should no longer appear as long as there
+are at least 4 connections.
+
+Testnet/Devnet fixes
+--------------------
+
+Turned out that a low-diff rule for slow blocks backported from Bitcoin works a bit too aggressive for
+a blockchain which uses a dynamic per-block difficulty adjustment algorithm (DGW). While blocks are still
+produced at a more or less constant rate on average, the rate however is way too high.
+
+We also lifted multiple ports restriction on devnet and also incuded other fixes which should improve
+connectivity on devnets which are using nodes with multiple different ports.
+
+
+0.12.3.2 Change log
+===================
+
+See detailed [change log](https://github.com/dashpay/dash/compare/v0.12.3.1...dashpay:v0.12.3.2) below.
+
+### Network:
+- [`2474d9cb8`](https://github.com/dashpay/dash/commit/2474d9cb8) Sync mn list and mnw list from 3 peers max (#2169)
+- [`2c303cdb1`](https://github.com/dashpay/dash/commit/2c303cdb1) A few devnet related fixes (#2168)
+
+### Mining:
+- [`2ba0c7760`](https://github.com/dashpay/dash/commit/2ba0c7760) Add tests for special rules for slow blocks on devnet/testnet (#2176)
+- [`b9a83d2ae`](https://github.com/dashpay/dash/commit/b9a83d2ae) Allow mining min diff for very slow (2h+) blocks (#2175)
+- [`050cabdf5`](https://github.com/dashpay/dash/commit/050cabdf5) Adjust diff for slow testnet/devnet blocks a bit smoother (#2161)
+
+### GUI:
+- [`7b9919d18`](https://github.com/dashpay/dash/commit/7b9919d18) Fix issues with selections on Masternode tab (#2170)
+- [`c4698d5f3`](https://github.com/dashpay/dash/commit/c4698d5f3) Make PS Buttons not react to spacebar (#2154)
+
+### Other:
+- [`f833e2ed6`](https://github.com/dashpay/dash/commit/f833e2ed6) Bump to 0.12.3.2 (#2173)
+
+
+Credits
+=======
+
+Thanks to everyone who directly contributed to this release:
+
+- Alexander Block
+- PaulieD
+- UdjinM6
+
+As well as everyone who submitted issues and reviewed pull requests.
+
+
+Older releases
+==============
+
+Dash was previously known as Darkcoin.
+
+Darkcoin tree 0.8.x was a fork of Litecoin tree 0.8, original name was XCoin
+which was first released on Jan/18/2014.
+
+Darkcoin tree 0.9.x was the open source implementation of masternodes based on
+the 0.8.x tree and was first released on Mar/13/2014.
+
+Darkcoin tree 0.10.x used to be the closed source implementation of Darksend
+which was released open source on Sep/25/2014.
+
+Dash Core tree 0.11.x was a fork of Bitcoin Core tree 0.9,
+Darkcoin was rebranded to Dash.
+
+Dash Core tree 0.12.0.x was a fork of Bitcoin Core tree 0.10.
+
+Dash Core tree 0.12.1.x was a fork of Bitcoin Core tree 0.12.
+
+These release are considered obsolete. Old release notes can be found here:
+
+- [v0.12.3.1](https://github.com/dashpay/dash/blob/master/doc/release-notes/dash/release-notes-0.12.3.1.md) released Jul/03/2018
+- [v0.12.2.3](https://github.com/dashpay/dash/blob/master/doc/release-notes/dash/release-notes-0.12.2.3.md) released Jan/12/2018
+- [v0.12.2.2](https://github.com/dashpay/dash/blob/master/doc/release-notes/dash/release-notes-0.12.2.2.md) released Dec/17/2017
+- [v0.12.2](https://github.com/dashpay/dash/blob/master/doc/release-notes/dash/release-notes-0.12.2.md) released Nov/08/2017
+- [v0.12.1](https://github.com/dashpay/dash/blob/master/doc/release-notes/dash/release-notes-0.12.1.md) released Feb/06/2017
+- [v0.12.0](https://github.com/dashpay/dash/blob/master/doc/release-notes/dash/release-notes-0.12.0.md) released Jun/15/2015
+- [v0.11.2](https://github.com/dashpay/dash/blob/master/doc/release-notes/dash/release-notes-0.11.2.md) released Mar/04/2015
+- [v0.11.1](https://github.com/dashpay/dash/blob/master/doc/release-notes/dash/release-notes-0.11.1.md) released Feb/10/2015
+- [v0.11.0](https://github.com/dashpay/dash/blob/master/doc/release-notes/dash/release-notes-0.11.0.md) released Jan/15/2015
+- [v0.10.x](https://github.com/dashpay/dash/blob/master/doc/release-notes/dash/release-notes-0.10.0.md) released Sep/25/2014
+- [v0.9.x](https://github.com/dashpay/dash/blob/master/doc/release-notes/dash/release-notes-0.9.0.md) released Mar/13/2014
+
diff --git a/doc/release-notes/dash/release-notes-0.12.3.3.md b/doc/release-notes/dash/release-notes-0.12.3.3.md
new file mode 100644
index 000000000000..36576174398b
--- /dev/null
+++ b/doc/release-notes/dash/release-notes-0.12.3.3.md
@@ -0,0 +1,99 @@
+Dash Core version 0.12.3.3
+==========================
+
+Release is now available from:
+
+  <https://www.dash.org/downloads/#wallets>
+
+This is a critical bugfix release.
+
+Please report bugs using the issue tracker at github:
+
+  <https://github.com/dashpay/dash/issues>
+
+
+Upgrading and downgrading
+=========================
+
+How to Upgrade
+--------------
+
+If you are running an older version, shut it down. Wait until it has completely
+shut down (which might take a few minutes for older versions), then run the
+installer (on Windows) or just copy over /Applications/Dash-Qt (on Mac) or
+dashd/dash-qt (on Linux).
+
+Downgrade warning
+-----------------
+
+### Downgrade to a version < 0.12.2.2
+
+Because release 0.12.2.2 included the [per-UTXO fix](release-notes/dash/release-notes-0.12.2.2.md#per-utxo-fix)
+which changed the structure of the internal database, you will have to reindex
+the database if you decide to use any pre-0.12.2.2 version.
+
+Wallet forward or backward compatibility was not affected.
+
+### Downgrade to 0.12.2.2/3, 0.12.3.1/2
+
+Downgrading to these versions does not require any additional actions, should be
+fully compatible.
+
+
+Notable changes
+===============
+
+Fix crash bug with duplicate inputs within a transaction
+--------------------------------------------------------
+
+There was a critical bug discovered in Bitcoin Core's codebase recently which
+can cause node receiving a block to crash https://github.com/bitcoin/bitcoin/pull/14247
+
+0.12.3.3 Change log
+===================
+
+See detailed [set of changes](https://github.com/dashpay/dash/compare/v0.12.3.2...dashpay:v0.12.3.3).
+
+Credits
+=======
+
+Thanks to everyone who directly contributed to this release,
+as well as everyone who submitted issues and reviewed pull requests.
+
+
+Older releases
+==============
+
+Dash was previously known as Darkcoin.
+
+Darkcoin tree 0.8.x was a fork of Litecoin tree 0.8, original name was XCoin
+which was first released on Jan/18/2014.
+
+Darkcoin tree 0.9.x was the open source implementation of masternodes based on
+the 0.8.x tree and was first released on Mar/13/2014.
+
+Darkcoin tree 0.10.x used to be the closed source implementation of Darksend
+which was released open source on Sep/25/2014.
+
+Dash Core tree 0.11.x was a fork of Bitcoin Core tree 0.9,
+Darkcoin was rebranded to Dash.
+
+Dash Core tree 0.12.0.x was a fork of Bitcoin Core tree 0.10.
+
+Dash Core tree 0.12.1.x was a fork of Bitcoin Core tree 0.12.
+
+These release are considered obsolete. Old release notes can be found here:
+
+- [v0.12.3.2](https://github.com/dashpay/dash/blob/master/doc/release-notes/dash/release-notes-0.12.3.2.md) released Jul/09/2018
+- [v0.12.3.1](https://github.com/dashpay/dash/blob/master/doc/release-notes/dash/release-notes-0.12.3.1.md) released Jul/03/2018
+- [v0.12.2.3](https://github.com/dashpay/dash/blob/master/doc/release-notes/dash/release-notes-0.12.2.3.md) released Jan/12/2018
+- [v0.12.2.2](https://github.com/dashpay/dash/blob/master/doc/release-notes/dash/release-notes-0.12.2.2.md) released Dec/17/2017
+- [v0.12.2](https://github.com/dashpay/dash/blob/master/doc/release-notes/dash/release-notes-0.12.2.md) released Nov/08/2017
+- [v0.12.1](https://github.com/dashpay/dash/blob/master/doc/release-notes/dash/release-notes-0.12.1.md) released Feb/06/2017
+- [v0.12.0](https://github.com/dashpay/dash/blob/master/doc/release-notes/dash/release-notes-0.12.0.md) released Jun/15/2015
+- [v0.11.2](https://github.com/dashpay/dash/blob/master/doc/release-notes/dash/release-notes-0.11.2.md) released Mar/04/2015
+- [v0.11.1](https://github.com/dashpay/dash/blob/master/doc/release-notes/dash/release-notes-0.11.1.md) released Feb/10/2015
+- [v0.11.0](https://github.com/dashpay/dash/blob/master/doc/release-notes/dash/release-notes-0.11.0.md) released Jan/15/2015
+- [v0.10.x](https://github.com/dashpay/dash/blob/master/doc/release-notes/dash/release-notes-0.10.0.md) released Sep/25/2014
+- [v0.9.x](https://github.com/dashpay/dash/blob/master/doc/release-notes/dash/release-notes-0.9.0.md) released Mar/13/2014
+

From 3861c6a82e82608aaeddfadf08c8af5b2a379a99 Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Fri, 28 Dec 2018 14:03:17 +0100
Subject: [PATCH 399/400] Add BIP9 deployment for DIP3 on mainnet (#2585)

---
 src/chainparams.cpp | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/chainparams.cpp b/src/chainparams.cpp
index ad695bc62d36..77f215fad8cb 100644
--- a/src/chainparams.cpp
+++ b/src/chainparams.cpp
@@ -229,6 +229,13 @@ class CMainParams : public CChainParams {
         consensus.vDeployments[Consensus::DEPLOYMENT_BIP147].nWindowSize = 4032;
         consensus.vDeployments[Consensus::DEPLOYMENT_BIP147].nThreshold = 3226; // 80% of 4032
 
+        // Deployment of DIP0003
+        consensus.vDeployments[Consensus::DEPLOYMENT_DIP0003].bit = 3;
+        consensus.vDeployments[Consensus::DEPLOYMENT_DIP0003].nStartTime = 1546300800; // Jan 1st, 2019
+        consensus.vDeployments[Consensus::DEPLOYMENT_DIP0003].nTimeout = 1577836800; // Jan 1st, 2020
+        consensus.vDeployments[Consensus::DEPLOYMENT_DIP0003].nWindowSize = 4032;
+        consensus.vDeployments[Consensus::DEPLOYMENT_DIP0003].nThreshold = 3226; // 80% of 4032
+
         // The best chain should have at least this much work.
         consensus.nMinimumChainWork = uint256S("0x000000000000000000000000000000000000000000000cca0a6a35241029410f"); // 967800
 

From 34d2a6038f72f6c68adc40db7d00103dd2a50c01 Mon Sep 17 00:00:00 2001
From: UdjinM6 <UdjinM6@users.noreply.github.com>
Date: Fri, 28 Dec 2018 16:08:01 +0300
Subject: [PATCH 400/400] Release notes 0.13.0.0 draft (#2583)

* Release notes 0.13.0.0

* Mention privatesendmultisession=1 requirement for fast mixing

* Update release-notes.md

* Update release-notes.md

* small fix

* add 2585
---
 doc/release-notes.md                          | 681 +++++++++++++++++-
 .../dash/release-notes-0.12.3.4.md            | 107 +++
 2 files changed, 755 insertions(+), 33 deletions(-)
 create mode 100644 doc/release-notes/dash/release-notes-0.12.3.4.md

diff --git a/doc/release-notes.md b/doc/release-notes.md
index 171e178741fe..ddda21de6e4f 100644
--- a/doc/release-notes.md
+++ b/doc/release-notes.md
@@ -1,11 +1,11 @@
-Dash Core version 0.12.3.4
+Dash Core version 0.13.0.0
 ==========================
 
 Release is now available from:
 
   <https://www.dash.org/downloads/#wallets>
 
-This is an optional release and only contains changes for testnet. It is not required to update masternodes on mainnet.
+This is a new major version release, bringing new features, various bugfixes and other improvements.
 
 Please report bugs using the issue tracker at github:
 
@@ -21,52 +21,666 @@ How to Upgrade
 If you are running an older version, shut it down. Wait until it has completely
 shut down (which might take a few minutes for older versions), then run the
 installer (on Windows) or just copy over /Applications/Dash-Qt (on Mac) or
-dashd/dash-qt (on Linux).
+dashd/dash-qt (on Linux). If you upgrade after DIP0003 activation you will
+have to reindex (start with -reindex-chainstate or -reindex) to make sure
+your wallet has all the new data synced.
 
 Downgrade warning
 -----------------
 
-### Downgrade to a version < 0.12.2.2
-
-Because release 0.12.2.2 included the [per-UTXO fix](release-notes/dash/release-notes-0.12.2.2.md#per-utxo-fix)
-which changed the structure of the internal database, you will have to reindex
-the database if you decide to use any pre-0.12.2.2 version.
-
-Wallet forward or backward compatibility was not affected.
-
-### Downgrade to 0.12.3.1/2/3
-
-Downgrading to these versions does not require any additional actions, should be
-fully compatible.
+### Downgrade to a version < 0.13.0.0
 
+Downgrading to a version smaller than 0.13 is only supported as long as DIP2/DIP3
+has not been activated. Activation will happen when enough miners signal compatibility
+through a BIP9 (bit 3) deployment.
 
 Notable changes
 ===============
 
-Fork/Reset testnet at block 4001
---------------------------------
-
-This release is NOT required on mainnet. It is intended to be deployed on testnet and will cause a fork at block 4001.
-The plan is to restart all testing for the v0.13.0.0 upgrade process.
-
-When deployed on testnet, it is required to start with a fresh data directory or call Dash Core with `-reindex-chainstate`.
-
-0.12.3.4 Change log
+DIP0002 - Special Transactions
+------------------------------
+Currently, new features and consensus mechanisms have to be implemented on top of the restrictions
+imposed by the simple nature of transactions. Since classical transactions can only carry inputs
+and outputs, they are most useful for financial transactions (i.e. transfers of quantities of Dash
+between addresses on the distributed ledger). These inputs and outputs carry scripts and signatures
+which are used to authorize and validate the transaction.
+
+To implement new on-chain features and consensus mechanisms which do not fit into this concept of
+financial transactions, it is often necessary to misuse the inputs/outputs and their corresponding
+scripts to add additional data and meaning to a transaction. For example, new opcodes would have
+to be introduced to mark a transaction as something special and add a payload. In other cases,
+OP_RETURN has been misused to store data on-chain.
+
+The introduction of special transactions will require the whole Dash ecosystem to perform a one-time
+mandatory update of all the software and libraries involved. Software and libraries will have to be
+changed so that they can differentiate between classical transactions and special transactions.
+Deserialization of a classical transaction remains unchanged. Deserialization of a special transaction
+requires the software/library to at least implement skipping and ignoring the extra_payload field.
+Validation and processing of the inputs and outputs of a special transaction must remain identical to
+classical transactions.
+
+Read more: https://github.com/dashpay/dips/blob/master/dip-0002.md
+
+DIP0003 - Deterministic Masternode Lists
+----------------------------------------
+This DIP provides on-chain consensus for masternode lists that in turn allow for deterministic quorum
+derivation and service scoring of masternode rewards.
+
+In the previous system, each node maintained its own individual masternode list. Masternodes gained
+entry to that masternode list after the owner created a 1000 Dash UTXO and the masternode broadcast
+a "masternode broadcast/announcement" P2P message. This in turn set the masternode to a PRE_ENABLED
+state in the list maintained by each node. Masternodes then regularly broadcasted ping messages to
+keep the masternode in ENABLED state.
+
+The previous system was maintained with consensus mechanisms that predated Satoshi Nakamoto’s solution
+to the Byzantine Generals Problem. This meant that each node needed to maintain their own individual
+masternode list with P2P messages and not a blockchain based solution. Due to the nature of the P2P
+system, there was no guarantee that nodes would come to the same conclusion on what the masternode
+list ought to look like. Discrepancies might, for example, occur due to a different order of message
+reception or if messages had not been received at all. This posed some risks in regard to consensus
+and limited the possible uses of quorums by the system.
+
+Additionally, the previous system required a complicated and failure prone "masternode sync" after
+the initial startup of the node. After the blockchain was synced, the node would request the current
+masternode list, the reward payment votes, and then verify the received list. This process tended to
+take an unnecessarily long amount of time and sometimes resulted in failure.
+
+In the new system, the masternode list is derived entirely from information found on-chain. New
+masternodes are added by new special transactions called Provider Registration Transactions
+(abbreviated as ProRegTx). They are only removed by spending the collateral. A ProRegTx is a special
+transaction which includes either a 1000-Dash collateral payment or a reference to it, along with
+other payload information (DIP0002).
+
+The new system is going to be activated via combination of a BIP9-like deployment (bit 3) and new spork
+(`SPORK_15_DETERMINISTIC_MNS_ENABLED`).
+
+Read more: https://github.com/dashpay/dips/blob/master/dip-0003.md
+Upgrade instructions: https://docs.dash.org/DIP3-masternode-upgrade
+
+DIP0004 - Simplified Verification of Deterministic Masternode Lists
+-------------------------------------------------------------------
+A verifiable and correct masternode list is foundational to many Dash features, including verification
+of an InstantSend transaction, mixing in PrivateSend and many features of Evolution. The deterministic
+masternode lists introduced by DIP0003 enable full derivation and verification of a masternode list via
+on-chain data. This, however, requires the full chain to be available to construct or verify this list.
+A SPV client does not have the full chain and thus would have to rely on a list provided by one or more
+nodes in the network. This provided list must be verifiable by the SPV client without needing the full
+chain. This DIP proposes additions to the block’s coinbase transaction and new P2P messages to get and
+update a masternode list with additional proof data.
+
+Read more: https://github.com/dashpay/dips/blob/master/dip-0004.md
+
+PrivateSend
+-----------
+With further refactoring of PrivateSend code it became possible to implement mixing in few parallel
+mixing sessions at once from one single wallet. You can set number of mixing sessions via
+`privatesendsessions` cmd-line option or dash.conf. You can pick any number of sessions between 1 and 10,
+default is 4 which should be good enough for most users. For this feature to work you should also make
+sure that `privatesendmultisession` is set to `1` via cmd-line or `Enable PrivateSend multi-session` is enabled
+in GUI.
+
+Introducing parallel mixing sessions should speed mixing up which makes it's reasonable to add a new
+mixing denom (0.00100001 DASH) now while keeping all the old ones too. It also makes sense to allow more
+mixing rounds now, so the new default number of rounds is 4 and the maximum number of rounds is 16 now.
+
+You can also adjust rounds and amount via `setprivatesendrounds` and `setprivatesendamount` RPC commands
+which override corresponding cmd-line params (`privatesendrounds` and `privatesendamount` respectively).
+
+InstantSend
+-----------
+With further improvements of networking code it's now possible to handle more load, so we are changing
+InstantSend to be always-on for so called "simple txes" - transactions with 4 or less inputs. Such
+transactions will be automatically locked even if they only pay minimal fee. According to stats, this
+means that up to 90% of currently observed transactions will became automatically locked via InstantSend
+with no additional cost to end users or any additional effort from wallet developers or other service
+providers.
+
+This feature is going to be activated via combination of a BIP9-like deployment (we are reusing bit 3)
+and new spork (`SPORK_16_INSTANTSEND_AUTOLOCKS`).
+
+Historically, InstantSend transactions were shown in GUI and RPC with more confirmations than regular ones,
+which caused quite a bit of confusion. This will no longer be the case, instead we are going to show real
+blockchain confirmations only and a separate indicator to show if transaction was locked via InstantSend
+or not. For GUI it's color highlight and a new column, for RPC commands - `instantlock` field and `addlocked`
+param.
+
+One of the issues with InstantSend adoption by SPV wallets (besides lack of Deterministic Masternode List)
+was inability to filter all InstantSend messages the same way transactions are filtered. This should be
+fixed now and SPV wallets should only get lock votes for transactions they are interested in.
+
+Another popular request was to preserve information about InstantSend locks between wallet restarts, which
+is now implemented. This data is stored in a new cache file `instantsend.dat`. You can safely remove it,
+if you don't need information about recent transaction locks for some reason (NOTE: make sure it's not one
+of your wallets!).
+
+We also added new ZMQ notifications for double-spend attempts which try to override transactions locked
+via InstantSend - `zmqpubrawinstantsenddoublespend` and `zmqpubhashinstantsenddoublespend`.
+
+Sporks
+------
+There are a couple of new sporks introduced in this version `SPORK_15_DETERMINISTIC_MNS_ENABLED` (block
+based) and `SPORK_16_INSTANTSEND_AUTOLOCKS` (timestamp based). There is aslo `SPORK_17_QUORUM_DKG_ENABLED`
+(timestamp based) which is going to be used on testnet only for now.
+
+Spork data is stored in a new cache file (`sporks.dat`) now.
+
+Governance
+----------
+Introduction of Deterministic Masternodes requires replacing of the old masternode private key which was used
+both for operating a MN and for voting on proposals with a set of separate keys, preferably fresh new ones.
+This means that votes casted for proposals by Masternode Owners via the old system will no longer be valid
+after DIP0003 activation and must be re-casted using the new voting key.
+
+Also, you can now get notifications about governance objects or votes via new ZMQ notifications:
+`zmqpubhashgovernancevote`, `zmqpubhashgovernanceobject`, `zmqpubrawgovernancevote` and
+`zmqpubhashgovernanceobject`.
+
+GUI changes
+-----------
+Masternodes tab has a new section dedicated to DIP0003 registered masternodes now. After DIP0003 activation
+this will be the only section shown here, the two old sections for non-deterministic masternodes will no
+longer be available.
+
+There are changes in the way InstantSend transactions are displayed, see `InstantSend` section above.
+
+Some other (mostly minor) issues were also fixed, see `GUI` part of `0.13.0.0 Change log` section below for
+detailed list of fixes.
+
+RPC changes
+-----------
+There are a few changes in existing RPC interfaces in this release:
+- `gobject prepare` accepts an UTXO reference to spend;
+- `masternode status` has DIP0003 related info now;
+- `previousbits` and `coinbase_payload` fields were added in `getblocktemplate`;
+- `getblocktemplate` now returns an array for masternode payments instead of a single object (miners and mining pools have to upgrade their software to support multiple masternode payees);
+- `getblockchaininfo` shows BIP9 deployment progress;
+- `help command subCommand` should give detailed help for subcommands e.g. `help protx list`;
+- `compressed` option in `masternode genkey`;
+- `dumpwallet` shows info about dumped wallet and warns user about security issues;
+- `instantlock` field added in output of `getrawmempool`, `getmempoolancestors`, `getmempooldescendants`, `getmempoolentry`,
+`getrawtransaction`, `decoderawtransaction`, `gettransaction`, `listtransactions`, `listsinceblock`;
+- `addlocked` param added to `getreceivedbyaddress`, `getreceivedbyaccount`, `getbalance`, `sendfrom`, `sendmany`,
+`listreceivedbyaddress`, `listreceivedbyaccount`, `listaccounts`.
+
+There are also new RPC commands:
+- `protx` (`list`, `info`, `diff`, `register`, `register_fund`, `register_prepare`,
+`register_submit`, `update_service`, `update_registrar`, `revoke`);
+- `bls generate`;
+- `setprivatesendrounds`;
+- `setprivatesendamount`.
+
+See `help command` in rpc for more info.
+
+Command-line options
+--------------------
+
+New cmd-line options:
+- `masternodeblsprivkey`;
+- `minsporkkeys`;
+- `privatesendsessions`;
+- `zmqpubrawinstantsenddoublespend`;
+- `zmqpubhashinstantsenddoublespend`;
+- `zmqpubhashgovernancevote`;
+- `zmqpubhashgovernanceobject`;
+- `zmqpubrawgovernancevote`;
+- `zmqpubhashgovernanceobject`.
+
+Some of them are Devnet only:
+- `budgetparams`;
+- `minimumdifficultyblocks`;
+- `highsubsidyblocks`;
+- `highsubsidyfactor`.
+
+Few cmd-line options are no longer supported:
+- `instantsenddepth`;
+- `mempoolreplacement`.
+
+See `Help -> Command-line options` in Qt wallet or `dashd --help` for more info.
+
+Lots of refactoring and bug fixes
+---------------------------------
+
+A lot of refactoring, code cleanups and other small fixes were done in this release.
+
+0.13.0.0 Change log
 ===================
 
-See detailed [set of changes](https://github.com/dashpay/dash/compare/v0.12.3.3...dashpay:v0.12.3.4).
-
-Python Support
---------------
-
-Support for Python 2 has been discontinued for all test files and tools.
+See detailed [set of changes](https://github.com/dashpay/dash/compare/v0.12.3.4...dashpay:v0.13.0.0).
+
+### Network
+- [`03a6865d9`](https://github.com/dashpay/dash/commit/03a6865d9) Enforce correct port on mainnet for DIP3 MNs (#2576)
+- [`3f26ed78c`](https://github.com/dashpay/dash/commit/3f26ed78c) Backport network checks missing in CActiveDeterministicMasternodeManager::Init() (#2572)
+- [`7c7500864`](https://github.com/dashpay/dash/commit/7c7500864) Also stop asking other peers for a TX when ProcessTxLockRequest fails (#2529)
+- [`19a6f718d`](https://github.com/dashpay/dash/commit/19a6f718d) Don't respond with getdata for legacy inv types when spork15 is active (#2528)
+- [`22dcec71a`](https://github.com/dashpay/dash/commit/22dcec71a) Punish nodes which keep requesting and then rejecting blocks (#2518)
+- [`a18ca49a2`](https://github.com/dashpay/dash/commit/a18ca49a2) Disconnect peers with version < 70212 after DIP3 activation via BIP9 (#2497)
+- [`a57e9dea7`](https://github.com/dashpay/dash/commit/a57e9dea7) Fix filtering of the lock votes for SPV nodes. (#2468)
+- [`c6cf4d9a4`](https://github.com/dashpay/dash/commit/c6cf4d9a4) Relay txes through MN network faster than through regular nodes (#2397)
+- [`e66c4e184`](https://github.com/dashpay/dash/commit/e66c4e184) Don't revert to INV based block announcements when the previous block is the devnet genesis block (#2388)
+- [`b5142ee2c`](https://github.com/dashpay/dash/commit/b5142ee2c) Implement RemoveAskFor to indicate that we're not interested in an item anymore (#2384)
+- [`53e12b7b4`](https://github.com/dashpay/dash/commit/53e12b7b4) Don't bail out from ProcessMasternodeConnections in regtest (#2368)
+- [`31759a44d`](https://github.com/dashpay/dash/commit/31759a44d) Fix tx inv throughput (#2300)
+- [`9d90b4fa4`](https://github.com/dashpay/dash/commit/9d90b4fa4) Honor filterInventoryKnown for non-tx/non-block items (#2292)
+- [`6764dafec`](https://github.com/dashpay/dash/commit/6764dafec) Skip initial masternode list sync if spork 15 is active
+- [`fced9a4b8`](https://github.com/dashpay/dash/commit/fced9a4b8) Ban peers that send us MNLISTDIFF messages
+- [`d3ac86206`](https://github.com/dashpay/dash/commit/d3ac86206) Implement GETMNLISTDIFF and MNLISTDIFF P2P messages
+- [`40eee1775`](https://github.com/dashpay/dash/commit/40eee1775) Fix sync in regtest (again) (#2241)
+- [`c4ee2c89e`](https://github.com/dashpay/dash/commit/c4ee2c89e) Fix mnsync in regtest (#2202)
+
+### Mining
+- [`f96563462`](https://github.com/dashpay/dash/commit/f96563462) Fix check for nTemporaryTestnetForkDIP3Height (#2508)
+- [`80656038f`](https://github.com/dashpay/dash/commit/80656038f) Bump nTemporaryTestnetForkHeight to 274000 (#2498)
+- [`1c25356ff`](https://github.com/dashpay/dash/commit/1c25356ff) Allow to use low difficulty and higher block rewards for devnet (#2369)
+- [`3cc4ac137`](https://github.com/dashpay/dash/commit/3cc4ac137) Fix crash bug with duplicate inputs within a transaction (#2302)
+- [`e6b699bc2`](https://github.com/dashpay/dash/commit/e6b699bc2) Enforce MN and superblock payments in same block
+- [`c7f75afdd`](https://github.com/dashpay/dash/commit/c7f75afdd) Fix nulldummy tests by creating correct DIP4 coinbase transactions
+- [`bcc071957`](https://github.com/dashpay/dash/commit/bcc071957) Calculate and enforce DIP4 masternodes merkle root in CbTx
+- [`0a086898f`](https://github.com/dashpay/dash/commit/0a086898f) Implement and enforce CbTx with correct block height and deprecate BIP34
+
+### RPC
+- [`0dce846d5`](https://github.com/dashpay/dash/commit/0dce846d5) Add an option to use specific address as a source of funds in protx rpc commands (otherwise use payoutAddress/operatorPayoutAddress) (#2581)
+- [`e71ea29e6`](https://github.com/dashpay/dash/commit/e71ea29e6) Add ownerAddr and votingAddr to CDeterministicMNState::ToJson (#2571)
+- [`999a51907`](https://github.com/dashpay/dash/commit/999a51907) Fix optional revocation reason parameter for "protx revoke" and a few help strings (#2568)
+- [`c08926146`](https://github.com/dashpay/dash/commit/c08926146) Unify "protx list" options (#2559)
+- [`e9f7142ed`](https://github.com/dashpay/dash/commit/e9f7142ed) Bump PROTOCOL_VERSION and DMN_PROTO_VERSION to 70213 (#2557)
+- [`818f0f464`](https://github.com/dashpay/dash/commit/818f0f464) Allow consuming specific UTXO in gobject prepare command (#2482)
+- [`1270b7122`](https://github.com/dashpay/dash/commit/1270b7122) Use a verbosity instead of two verbose parameters (#2506)
+- [`f6f6d075d`](https://github.com/dashpay/dash/commit/f6f6d075d) Still support "protx list" and "protx diff" when wallet is disabled at compile time (#2511)
+- [`5a3f64310`](https://github.com/dashpay/dash/commit/5a3f64310) Deserialize CFinalCommitmentTxPayload instead of CFinalCommitment in TxToJSON (#2510)
+- [`5da4c9728`](https://github.com/dashpay/dash/commit/5da4c9728) Use "registered" as default for "protx list" (#2513)
+- [`fc6d651c4`](https://github.com/dashpay/dash/commit/fc6d651c4) Fix crashes in "protx" RPCs when wallet is disabled (#2509)
+- [`ba49a4a16`](https://github.com/dashpay/dash/commit/ba49a4a16) Trivial: protx fund_register RPC help corrections (#2502)
+- [`45421b1a3`](https://github.com/dashpay/dash/commit/45421b1a3) Add IS parameter for gobject prepare (#2452)
+- [`2ba1ff521`](https://github.com/dashpay/dash/commit/2ba1ff521) Use ParseFixedPoint instead of ParseDoubleV in "protx register" commands (#2458)
+- [`e049f9c1e`](https://github.com/dashpay/dash/commit/e049f9c1e) fix protx register rpc help (#2461)
+- [`eb2103760`](https://github.com/dashpay/dash/commit/eb2103760) trivail, clarifies help text for protx register (#2462)
+- [`76e93c7d7`](https://github.com/dashpay/dash/commit/76e93c7d7) Corrections to incorrect syntax in RPC help (#2466)
+- [`3c1f44c3a`](https://github.com/dashpay/dash/commit/3c1f44c3a) Make sure protx_update_registrar adds enough funds for the fees
+- [`d130f25ac`](https://github.com/dashpay/dash/commit/d130f25ac) Fix check for number of params to protx_update_service (#2443)
+- [`adf9c87e2`](https://github.com/dashpay/dash/commit/adf9c87e2) Fix protx/bls rpc help (#2438)
+- [`579c83e88`](https://github.com/dashpay/dash/commit/579c83e88) Add coinbase_payload to getblocktemplate help (#2437)
+- [`3685c85e7`](https://github.com/dashpay/dash/commit/3685c85e7) Show BIP9 progress in getblockchaininfo (#2435)
+- [`da3e3db4d`](https://github.com/dashpay/dash/commit/da3e3db4d) Fix sub-command help for masternode, gobject and protx rpcs (#2425)
+- [`adad3fcfe`](https://github.com/dashpay/dash/commit/adad3fcfe) RPC: protx help corrections (#2422)
+- [`1d56dffda`](https://github.com/dashpay/dash/commit/1d56dffda) Unify help display logic for various "complex" rpc commands (#2415)
+- [`02442673d`](https://github.com/dashpay/dash/commit/02442673d) Trivial: Correct protx diff RPC help (#2410)
+- [`1f56600c4`](https://github.com/dashpay/dash/commit/1f56600c4) Trivial: Protx operator reward clarification (#2407)
+- [`7011fec1b`](https://github.com/dashpay/dash/commit/7011fec1b) RPC: Add help details for the bls RPC (#2403)
+- [`50f133ad0`](https://github.com/dashpay/dash/commit/50f133ad0) Add merkle tree and coinbase transaction to the `protx diff` rpc command (#2392)
+- [`25b6dae9e`](https://github.com/dashpay/dash/commit/25b6dae9e) Code style and RPC help string cleanups for DIP2/DIP3 (#2379)
+- [`0ad2906c5`](https://github.com/dashpay/dash/commit/0ad2906c5) Clarify addlocked description in getbalance RPC (#2364)
+- [`547b81dd0`](https://github.com/dashpay/dash/commit/547b81dd0) log `gobject prepare` params (#2317)
+- [`d932d2c4e`](https://github.com/dashpay/dash/commit/d932d2c4e) Add instantlock field to getrawtransaction rpc output (#2314)
+- [`c3d6b0651`](https://github.com/dashpay/dash/commit/c3d6b0651) Remove redundant check for unknown commands in masternode RPC (#2279)
+- [`44706dc88`](https://github.com/dashpay/dash/commit/44706dc88) Implement projection of MN reward winners in "masternode winners"
+- [`2d8f1244c`](https://github.com/dashpay/dash/commit/2d8f1244c) Implement 'masternode info <proTxHash>' RPC
+- [`e2a9dbbce`](https://github.com/dashpay/dash/commit/e2a9dbbce) Better "masternode status" for deterministic masternodes
+- [`50ac6fb3a`](https://github.com/dashpay/dash/commit/50ac6fb3a) Throw exception when trying to invoke start-xxx RPC in deterministic mode
+- [`58aa81364`](https://github.com/dashpay/dash/commit/58aa81364) Implement "protx revoke" RPC
+- [`185416b97`](https://github.com/dashpay/dash/commit/185416b97) Implement "protx update_registrar" RPC
+- [`32951f795`](https://github.com/dashpay/dash/commit/32951f795) Implement "protx update_service" RPC
+- [`5e3abeca2`](https://github.com/dashpay/dash/commit/5e3abeca2) Implement "protx list" RPC
+- [`c77242346`](https://github.com/dashpay/dash/commit/c77242346) Implement "protx register" RPC
+- [`1c2565804`](https://github.com/dashpay/dash/commit/1c2565804) Refactor `masternode` and `gobject` RPCs to support `help command subCommand` syntax (#2240)
+- [`fb4d301a2`](https://github.com/dashpay/dash/commit/fb4d301a2) Add extraPayloadSize/extraPayload fields to RPC help
+- [`2997d6d26`](https://github.com/dashpay/dash/commit/2997d6d26) add compressed option to `masternode genkey` (#2232)
+- [`98ed90cbb`](https://github.com/dashpay/dash/commit/98ed90cbb) adds rpc calls for `setprivatesendrounds` and `setprivatesendamount` (#2230)
+- [`50eb98d90`](https://github.com/dashpay/dash/commit/50eb98d90) Prepare for DIP3 operator reward payments and switch to array in getblocktemplate (#2216)
+- [`a959f60aa`](https://github.com/dashpay/dash/commit/a959f60aa) De-duplicate "gobject vote-alias" and "gobject "vote-many" code (#2217)
+- [`566fa5ec3`](https://github.com/dashpay/dash/commit/566fa5ec3) Add support for "help command subCommand" (#2210)
+- [`4cd969e3d`](https://github.com/dashpay/dash/commit/4cd969e3d) Add `previousbits` field to `getblocktemplate` output (#2201)
+- [`ac30196bc`](https://github.com/dashpay/dash/commit/ac30196bc) Show some info about the wallet dumped via dumpwallet (#2191)
+
+### LLMQ and Deterministic Masternodes
+- [`3861c6a82`](https://github.com/dashpay/dash/commit/3861c6a82) Add BIP9 deployment for DIP3 on mainnet (#2585)
+- [`587911b36`](https://github.com/dashpay/dash/commit/587911b36) Fix IsBlockPayeeValid (#2577)
+- [`3c30a6aff`](https://github.com/dashpay/dash/commit/3c30a6aff) Add missing masternodeblsprivkey help text (#2569)
+- [`378dadd0f`](https://github.com/dashpay/dash/commit/378dadd0f) Ensure EvoDB consistency for quorum commitments by storing the best block hash (#2537)
+- [`2127a426b`](https://github.com/dashpay/dash/commit/2127a426b) Further refactoring of CQuorumBlockProcessor (#2545)
+- [`1522656d6`](https://github.com/dashpay/dash/commit/1522656d6) Correctly handle spent collaterals for MNs that were registered in the same block (#2553)
+- [`583035337`](https://github.com/dashpay/dash/commit/583035337) Track operator key changes in mempool and handle conflicts (#2540)
+- [`88f7bf0d8`](https://github.com/dashpay/dash/commit/88f7bf0d8) Don't delete/add values to the unique property map when it's null (#2538)
+- [`15414dac2`](https://github.com/dashpay/dash/commit/15414dac2) Refactor CQuorumBlockProcessor and CDeterministicMNManager (#2536)
+- [`d9b28fe1a`](https://github.com/dashpay/dash/commit/d9b28fe1a) Introduce dummy (ping-like) contributions for the dummy DKG (#2542)
+- [`df0d0cce7`](https://github.com/dashpay/dash/commit/df0d0cce7) Watch for changes in operator key and disable local MN (#2541)
+- [`511dc3714`](https://github.com/dashpay/dash/commit/511dc3714) Remove ProTxs from mempool that refer to a ProRegTx for which the collateral was spent (#2539)
+- [`225c2135e`](https://github.com/dashpay/dash/commit/225c2135e) Allow skipping of MN payments with zero duffs (#2534)
+- [`60867978d`](https://github.com/dashpay/dash/commit/60867978d) Avoid printing DIP3/DIP4 related logs twice (#2525)
+- [`7037f7c99`](https://github.com/dashpay/dash/commit/7037f7c99) Bail out from GetBlockTxOuts in case nBlockHeight is above tip+1 (#2523)
+- [`022491420`](https://github.com/dashpay/dash/commit/022491420) Print the state object when ProcessSpecialTxsInBlock fails in ConnectBlock (#2516)
+- [`812834dc5`](https://github.com/dashpay/dash/commit/812834dc5) Put height into mined commitments and use it instead of the special handling of quorumVvecHash (#2501)
+- [`a4f5ba38b`](https://github.com/dashpay/dash/commit/a4f5ba38b)  Implement CDummyDKG and CDummyCommitment until we have the real DKG merged (#2492)
+- [`66612cc4b`](https://github.com/dashpay/dash/commit/66612cc4b) Add 0 entry to vTxSigOps when adding quorum commitments (#2489)
+- [`f5beeafa1`](https://github.com/dashpay/dash/commit/f5beeafa1) Also restart MNs which didn't have the collateral moved, but do it later (#2483)
+- [`0123517b4`](https://github.com/dashpay/dash/commit/0123517b4) Implement PoSe based on information from LLMQ commitments (#2478)
+- [`22b5952c5`](https://github.com/dashpay/dash/commit/22b5952c5) Implement and enforce DIP6 commitments (#2477)
+- [`d40a5ce31`](https://github.com/dashpay/dash/commit/d40a5ce31)  Properly initialize confirmedHash in CSimplifiedMNListEntry (#2479)
+- [`5ffc31bce`](https://github.com/dashpay/dash/commit/5ffc31bce) Forbid version=0 in special TXs (#2473)
+- [`85157f9a9`](https://github.com/dashpay/dash/commit/85157f9a9) Few trivial fixes for DIP2/DIP3 (#2474)
+- [`b5947f299`](https://github.com/dashpay/dash/commit/b5947f299) Implement BuildSimplifiedDiff in CDeterministicMNList
+- [`6edad3745`](https://github.com/dashpay/dash/commit/6edad3745) Use ForEachMN and GetMN in BuildDiff instead of directly accessing mnMap
+- [`83aac461b`](https://github.com/dashpay/dash/commit/83aac461b) Allow P2SH/multisig addresses for operator rewards
+- [`f5864254c`](https://github.com/dashpay/dash/commit/f5864254c) Do not use keyIDCollateralAddress anymore when spork15 is active
+- [`5ccf556f3`](https://github.com/dashpay/dash/commit/5ccf556f3) GetMasternodeInfo with payee argument should do nothing when DIP3 is active
+- [`927e8bd79`](https://github.com/dashpay/dash/commit/927e8bd79) Also forbid reusing collateral key for owner/voting keys
+- [`826e7d063`](https://github.com/dashpay/dash/commit/826e7d063) Move internal collateral check to the else branch of the external collateral check
+- [`dc404e755`](https://github.com/dashpay/dash/commit/dc404e755) Allow P2SH for payout scripts
+- [`9adf8ad73`](https://github.com/dashpay/dash/commit/9adf8ad73) Remove restriction that forced use of same addresses for payout and collateral
+- [`7c1f11089`](https://github.com/dashpay/dash/commit/7c1f11089) Revert #2441 and retry fixing (#2444)
+- [`6761fa49f`](https://github.com/dashpay/dash/commit/6761fa49f) More checks for tx type
+- [`b84369663`](https://github.com/dashpay/dash/commit/b84369663) Be more specific about tx version in conditions
+- [`c975a986b`](https://github.com/dashpay/dash/commit/c975a986b) no cs_main in specialtxes
+- [`8bd5b231b`](https://github.com/dashpay/dash/commit/8bd5b231b) Log mempool payload errors instead of crashing via assert
+- [`658b7afd1`](https://github.com/dashpay/dash/commit/658b7afd1) Make error messages re payload a bit more specific
+- [`153afb906`](https://github.com/dashpay/dash/commit/153afb906) Restart MNs in DIP3 tests even if collateral has not moved (#2441)
+- [`4ad2f647c`](https://github.com/dashpay/dash/commit/4ad2f647c) Use proTxHash instead of outpoint when calculating masternode scores (#2440)
+- [`c27e62935`](https://github.com/dashpay/dash/commit/c27e62935) Allow reusing of external collaterals in DIP3 (#2427)
+- [`9da9d575a`](https://github.com/dashpay/dash/commit/9da9d575a) Allow collaterals for non-DIP3 MNs which were created after DIP3/BIP9 activation (#2412)
+- [`30a2b283a`](https://github.com/dashpay/dash/commit/30a2b283a) Sign ProRegTx collaterals with a string message instead of payload hash, split `protx register` into `prepare`/`submit` (#2395)
+- [`e34701295`](https://github.com/dashpay/dash/commit/e34701295) Fix crash when deterministic MN list is empty and keep paying superblocks in this case (#2387)
+- [`28a6007a4`](https://github.com/dashpay/dash/commit/28a6007a4) Prepare DIP3 for testnet and reuse DIP3 deployment for autoix deployment (#2389)
+- [`e3df91082`](https://github.com/dashpay/dash/commit/e3df91082) Allow referencing other TX outputs for ProRegTx collateral (#2366)
+- [`fdfb07742`](https://github.com/dashpay/dash/commit/fdfb07742) Update ProRegTx serialization order (#2378)
+- [`eaa856eb7`](https://github.com/dashpay/dash/commit/eaa856eb7) Remove nProtocolVersion and add mode/type fields to DIP3 (#2358)
+- [`c9d274518`](https://github.com/dashpay/dash/commit/c9d274518) Use BLS keys for the DIP3 operator key (#2352)
+- [`eaef90202`](https://github.com/dashpay/dash/commit/eaef90202) Don't use boost range adaptors in CDeterministicMNList (#2327)
+- [`6adc236d0`](https://github.com/dashpay/dash/commit/6adc236d0) Only use dataDir in CEvoDB when not in-memory (#2291)
+- [`8a878bfcf`](https://github.com/dashpay/dash/commit/8a878bfcf) Call InitializeCurrentBlockTip and activeMasternodeManager->Init after importing has finished (#2286)
+- [`6b3d65028`](https://github.com/dashpay/dash/commit/6b3d65028) After DIP3 activation, allow voting with voting keys stored in your wallet (#2281)
+- [`d8247dfff`](https://github.com/dashpay/dash/commit/d8247dfff) Use refactored payment logic when spork15 is active
+- [`60002b7dd`](https://github.com/dashpay/dash/commit/60002b7dd) Payout and enforce operator reward payments
+- [`2c481f0f8`](https://github.com/dashpay/dash/commit/2c481f0f8) Implement deterministic version of CMasternodePayments::IsScheduled
+- [`19fbf8ab7`](https://github.com/dashpay/dash/commit/19fbf8ab7) Move cs_main lock from CMasternode::UpdateLastPaid to CMasternodeMan
+- [`dc7292afa`](https://github.com/dashpay/dash/commit/dc7292afa) Implement new MN payments logic and add compatibility code
+- [`d4530eb7d`](https://github.com/dashpay/dash/commit/d4530eb7d) Put all masternodes in MASTERNODE_ENABLED state when spork15 is active
+- [`31b4f8354`](https://github.com/dashpay/dash/commit/31b4f8354) Forbid starting of legacy masternodes with non matching ProTx collateral values
+- [`5050a9205`](https://github.com/dashpay/dash/commit/5050a9205) Add compatibility code for FindRandomNotInVec and GetMasternodeScores
+- [`cc73422f8`](https://github.com/dashpay/dash/commit/cc73422f8) Add methods to add/remove (non-)deterministic MNs
+- [`7d14566bc`](https://github.com/dashpay/dash/commit/7d14566bc) Add compatibility code to CMasternodeMan so that old code is still compatible
+- [`27e8b48a6`](https://github.com/dashpay/dash/commit/27e8b48a6) Stop executing legacy MN list code when spork 15 is activated
+- [`d90b13996`](https://github.com/dashpay/dash/commit/d90b13996) Implement CActiveDeterministicMasternodeManager
+- [`a5e65aa37`](https://github.com/dashpay/dash/commit/a5e65aa37) Erase mnListCache entry on UndoBlock (#2254)
+- [`88e7888de`](https://github.com/dashpay/dash/commit/88e7888de) Try using cache in GetListForBlock before reading from disk (#2253)
+- [`9653af2f3`](https://github.com/dashpay/dash/commit/9653af2f3) Classes, validation and update logic for CProUpRevTX
+- [`1c68d1107`](https://github.com/dashpay/dash/commit/1c68d1107) Classes, validation and update logic for CProUpRegTX
+- [`8aca3b040`](https://github.com/dashpay/dash/commit/8aca3b040) Also check duplicate addresses for CProUpServTX in CTxMemPool
+- [`923fd6739`](https://github.com/dashpay/dash/commit/923fd6739) Implement CProUpServTx logic in CDeterministicMNManager
+- [`6ec0d7aea`](https://github.com/dashpay/dash/commit/6ec0d7aea) Classes and basic validation of ProUpServTx
+- [`255403e92`](https://github.com/dashpay/dash/commit/255403e92) Include proTx data in json formatted transactions
+- [`25545fc1e`](https://github.com/dashpay/dash/commit/25545fc1e) Split keyIDMasternode into keyIDOwner/keyIDOperator/keyIDVoting (#2248)
+- [`2c172873a`](https://github.com/dashpay/dash/commit/2c172873a) Don't allow non-ProTx masternode collaterals after DIP3 activation
+- [`9e8a86714`](https://github.com/dashpay/dash/commit/9e8a86714) Implementation of deterministic MNs list
+- [`76fd30894`](https://github.com/dashpay/dash/commit/76fd30894) Automatically lock ProTx collaterals when TX is added/loaded to wallet
+- [`cdd723ede`](https://github.com/dashpay/dash/commit/cdd723ede) Conflict handling for ProRegTx in mempool
+- [`958b84ace`](https://github.com/dashpay/dash/commit/958b84ace) Implementation of ProRegTx with basic validation (no processing)
+- [`c9a72e888`](https://github.com/dashpay/dash/commit/c9a72e888) Introduce CEvoDB for all evo related things, e.g. DIP3
+- [`4531f6b89`](https://github.com/dashpay/dash/commit/4531f6b89) Implement CDBTransaction and CScopedDBTransaction
+- [`e225cebcd`](https://github.com/dashpay/dash/commit/e225cebcd) Use previous block for CheckSpecialTx (#2243)
+- [`b92bd8997`](https://github.com/dashpay/dash/commit/b92bd8997) Fix mninfo search by payee (#2233)
+- [`8af7f6223`](https://github.com/dashpay/dash/commit/8af7f6223) Account for extraPayload when calculating fees in FundTransaction
+- [`b606bde9a`](https://github.com/dashpay/dash/commit/b606bde9a) Support version 3 transaction serialization in mininode.py
+- [`61bbe54ab`](https://github.com/dashpay/dash/commit/61bbe54ab) Add Get-/SetTxPayload helpers
+- [`cebf71bbc`](https://github.com/dashpay/dash/commit/cebf71bbc) Stubs for special TX validation and processing
+- [`d6c5a72e2`](https://github.com/dashpay/dash/commit/d6c5a72e2) Basic validation of version 3 TXs in CheckTransaction
+- [`a3c4ee3fd`](https://github.com/dashpay/dash/commit/a3c4ee3fd) DIP2 changes to CTransaction and CMutableTransaction
+- [`d20100ecd`](https://github.com/dashpay/dash/commit/d20100ecd) DIP0003 deployment
+- [`4d3518fe0`](https://github.com/dashpay/dash/commit/4d3518fe0) Refactor MN payee logic in preparation for DIP3 (#2215)
+- [`d946f21bd`](https://github.com/dashpay/dash/commit/d946f21bd) Masternode related refactorings in preparation of DIP3 (#2212)
+
+### PrivateSend
+- [`07309f0ec`](https://github.com/dashpay/dash/commit/07309f0ec) Allow up to MASTERNODE_MAX_MIXING_TXES (5) DSTXes per MN in a row (#2552)
+- [`ed53fce47`](https://github.com/dashpay/dash/commit/ed53fce47) Revert "Apply similar logic to vecMasternodesUsed" (#2503)
+- [`69bffed72`](https://github.com/dashpay/dash/commit/69bffed72) Do not sort resulting vector in SelectCoinsGroupedByAddresses (#2493)
+- [`bb11f1a63`](https://github.com/dashpay/dash/commit/bb11f1a63) Fix recent changes in DSA conditions (#2494)
+- [`6480ad1d5`](https://github.com/dashpay/dash/commit/6480ad1d5) Should check dsq queue regardless of the mixing state (#2491)
+- [`67483cd34`](https://github.com/dashpay/dash/commit/67483cd34) Fix dsq/dsa conditions (#2487)
+- [`9d4df466b`](https://github.com/dashpay/dash/commit/9d4df466b) Fix CreateDenominated failure for addresses with huge amount of inputs (#2486)
+- [`2b400f74b`](https://github.com/dashpay/dash/commit/2b400f74b) Base dsq/dstx thresholold on total number of up to date masternodes (#2465)
+- [`262454791`](https://github.com/dashpay/dash/commit/262454791) Add 5th denom, drop deprecated logic and bump min PS version (#2318)
+- [`23f169c44`](https://github.com/dashpay/dash/commit/23f169c44) Drop custom PS logic for guessing fees etc. from SelectCoins (#2371)
+- [`f7b0b5759`](https://github.com/dashpay/dash/commit/f7b0b5759) Pick rounds with the most inputs available to mix first (#2278)
+- [`727e940c0`](https://github.com/dashpay/dash/commit/727e940c0) Fix recently introduced PS bugs (#2330)
+- [`85a958a36`](https://github.com/dashpay/dash/commit/85a958a36) Drop dummy copy constructors in CPrivateSend*Session (#2305)
+- [`c6a0c5541`](https://github.com/dashpay/dash/commit/c6a0c5541) A couple of small fixes for mixing collaterals (#2294)
+- [`d192d642f`](https://github.com/dashpay/dash/commit/d192d642f) Move heavy coin selection out of the loop in SubmitDenominate (#2274)
+- [`28e0476f4`](https://github.com/dashpay/dash/commit/28e0476f4) Squash two logic branches in SubmitDenominate into one (#2270)
+- [`9b6eb4765`](https://github.com/dashpay/dash/commit/9b6eb4765) Include inputs with max rounds in SelectCoinsDark/SelectCoinsByDenominations (#2277)
+- [`55d7bb900`](https://github.com/dashpay/dash/commit/55d7bb900) Add an option to disable popups for PS mixing txes (#2272)
+- [`38ccfef3b`](https://github.com/dashpay/dash/commit/38ccfef3b) Identify PS collateral payments in transaction list a bit more accurate (#2271)
+- [`ad31dbbd7`](https://github.com/dashpay/dash/commit/ad31dbbd7) Add more variance to coin selection in PS mixing (#2261)
+- [`8c9cb2909`](https://github.com/dashpay/dash/commit/8c9cb2909) Revert 2075 (#2259)
+- [`b164bcc7a`](https://github.com/dashpay/dash/commit/b164bcc7a) Split PS into Manager and Session and allow running multiple mixing sessions in parallel (client side) (#2203)
+- [`d4d11476a`](https://github.com/dashpay/dash/commit/d4d11476a) Fix typo and grammar in PS error message (#2199)
+- [`a83ab5501`](https://github.com/dashpay/dash/commit/a83ab5501) Fix wallet lock check in DoAutomaticDenominating (#2196)
+- [`30fa8bc33`](https://github.com/dashpay/dash/commit/30fa8bc33) Make sure pwalletMain is not null whenever it's used in PS client (#2190)
+- [`3c89983db`](https://github.com/dashpay/dash/commit/3c89983db) Remove DarksendConfig (#2132)
+- [`43091a3ef`](https://github.com/dashpay/dash/commit/43091a3ef) PrivateSend Enhancement: Up default round count to 4 and allow user to mix up to 16 rounds (#2128)
+
+### InstantSend
+- [`35550a3f9`](https://github.com/dashpay/dash/commit/35550a3f9) Add quorumModifierHash to instant send lock vote (#2505)
+- [`fa8f4a10c`](https://github.com/dashpay/dash/commit/fa8f4a10c)  Include masternodeProTxHash in CTxLockVote (#2484)
+- [`624e50949`](https://github.com/dashpay/dash/commit/624e50949) Remove few leftovers of `-instantsenddepth`
+- [`733cd9512`](https://github.com/dashpay/dash/commit/733cd9512) Remove global fDIP0003ActiveAtTip and fix wrong use of VersionBitsState in auto IX (#2380)
+- [`5454bea37`](https://github.com/dashpay/dash/commit/5454bea37) Automatic InstantSend locks for "simple" transactions (#2140)
+- [`1e74bcace`](https://github.com/dashpay/dash/commit/1e74bcace) [ZMQ] Notify when an IS double spend is attempted (#2262)
+- [`6bcd868de`](https://github.com/dashpay/dash/commit/6bcd868de) Fix lockedByInstantSend initialization (#2197)
+- [`0a6f47323`](https://github.com/dashpay/dash/commit/0a6f47323) Remove dummy confirmations in RPC API and GUI for InstantSend transactions (#2040)
+- [`ace980834`](https://github.com/dashpay/dash/commit/ace980834) Extend Bloom Filter support to InstantSend related messages (#2184)
+- [`2c0d4c9d7`](https://github.com/dashpay/dash/commit/2c0d4c9d7) Save/load InstantSend cache (#2051)
+
+### Sporks
+- [`33f78d70e`](https://github.com/dashpay/dash/commit/33f78d70e) Do not accept sporks with nTimeSigned way too far into the future (#2578)
+- [`6c4b3ed8d`](https://github.com/dashpay/dash/commit/6c4b3ed8d) Load sporks before checking blockchain (#2573)
+- [`d94092b60`](https://github.com/dashpay/dash/commit/d94092b60) Fix spork propagation while in IBD and fix spork integration tests (#2533)
+- [`43e757bee`](https://github.com/dashpay/dash/commit/43e757bee) Amend SERIALIZATION_VERSION_STRING string for spork cache (#2339)
+- [`f7ab6c469`](https://github.com/dashpay/dash/commit/f7ab6c469) M-of-N-like sporks (#2288)
+- [`c2958733e`](https://github.com/dashpay/dash/commit/c2958733e) CSporkManager::Clear() should not alter sporkPubKeyID and sporkPrivKey (#2313)
+- [`8c0dca282`](https://github.com/dashpay/dash/commit/8c0dca282) Add versioning to spork cache (#2312)
+- [`5461e92bf`](https://github.com/dashpay/dash/commit/5461e92bf) Add spork to control deterministic MN lists activation
+- [`73c2ddde7`](https://github.com/dashpay/dash/commit/73c2ddde7) extract sporkmanager from sporkmessage (#2234)
+- [`1767e3457`](https://github.com/dashpay/dash/commit/1767e3457) Save/load spork cache (#2206)
+- [`075ca0903`](https://github.com/dashpay/dash/commit/075ca0903) Protect CSporkManager with critical section (#2213)
+
+### Governance
+- [`222e5b4f7`](https://github.com/dashpay/dash/commit/222e5b4f7) Remove proposal/funding votes from MNs that changed the voting key (#2570)
+- [`5185dd5b7`](https://github.com/dashpay/dash/commit/5185dd5b7) Use correct time field when removing pre-DIP3 votes (#2535)
+- [`d2ca9edde`](https://github.com/dashpay/dash/commit/d2ca9edde) Fix multiple issues with governance voting after spork15 activation (#2526)
+- [`08dc17871`](https://github.com/dashpay/dash/commit/08dc17871) Drop pre-DIP3 votes from current votes per MN per object (#2524)
+- [`0c1b683a0`](https://github.com/dashpay/dash/commit/0c1b683a0) Clear votes which were created before spork15 activation and use operator key for non-funding votes (#2512)
+- [`da4b5fb16`](https://github.com/dashpay/dash/commit/da4b5fb16) Remove an unused function from governance object collateral code (#2480)
+- [`8deb8e90f`](https://github.com/dashpay/dash/commit/8deb8e90f) Modernize Gov Methods (#2326)
+- [`0471fa884`](https://github.com/dashpay/dash/commit/0471fa884) Drop MAX_GOVERNANCE_OBJECT_DATA_SIZE (and maxgovobjdatasize in rpc) (#2298)
+- [`737353c84`](https://github.com/dashpay/dash/commit/737353c84) Fix IsBlockValueValid/IsOldBudgetBlockValueValid (#2276)
+- [`a5643f899`](https://github.com/dashpay/dash/commit/a5643f899) Switch RequestGovernanceObjectVotes from pointers to hashes (#2189)
+- [`0e689341d`](https://github.com/dashpay/dash/commit/0e689341d) Implement Governance ZMQ notification messages (#2160)
+
+### GUI
+- [`858bb52ad`](https://github.com/dashpay/dash/commit/858bb52ad) Show correct operator payee address in DIP3 MN list GUI (#2563)
+- [`190863722`](https://github.com/dashpay/dash/commit/190863722) Remove legacy MN list tabs on spork15 activation (#2567)
+- [`3e97b0cbd`](https://github.com/dashpay/dash/commit/3e97b0cbd) Make sure that we can get inputType and fUseInstantSend regardless of the way recipients are sorted (#2550)
+- [`1a7c29b97`](https://github.com/dashpay/dash/commit/1a7c29b97) Revert "Sort recipients in SendCoins dialog via BIP69 rule (#2546)" (#2549)
+- [`ca0aec2a3`](https://github.com/dashpay/dash/commit/ca0aec2a3) Match recipients with txouts by scriptPubKey in reassignAmounts() (#2548)
+- [`09730e1c5`](https://github.com/dashpay/dash/commit/09730e1c5) Bail out from update methods in MasternodeList when shutdown is requested (#2551)
+- [`18cd5965c`](https://github.com/dashpay/dash/commit/18cd5965c) Sort recipients in SendCoins dialog via BIP69 rule (#2546)
+- [`9100c69eb`](https://github.com/dashpay/dash/commit/9100c69eb) Allow filtering by proTxHash on DIP3 MN tab (#2532)
+- [`216119921`](https://github.com/dashpay/dash/commit/216119921) Fix wrong total MN count in UI and "masternode count" RPC (#2527)
+- [`8f8878a94`](https://github.com/dashpay/dash/commit/8f8878a94) Add dummy/hidden column to carry the proTxHash per MN list entry... (#2530)
+- [`a4ea816b2`](https://github.com/dashpay/dash/commit/a4ea816b2) use aqua gui theme (#2472)
+- [`aa495405b`](https://github.com/dashpay/dash/commit/aa495405b) [GUI] Realign tx filter widgets (#2485)
+- [`f4ef388de`](https://github.com/dashpay/dash/commit/f4ef388de) Update PS help text for the new denom (#2471)
+- [`7cabbadef`](https://github.com/dashpay/dash/commit/7cabbadef) Implement context menu and extra info on double-click for DIP3 masternode list (#2459)
+- [`9232a455c`](https://github.com/dashpay/dash/commit/9232a455c) Do not hold cs_main while emitting messages in WalletModel::prepareTransaction (#2463)
+- [`cf2b547b7`](https://github.com/dashpay/dash/commit/cf2b547b7) Implement tab for DIP3 MN list (#2454)
+- [`46462d682`](https://github.com/dashpay/dash/commit/46462d682) Add a column for IS lock status on Transactions tab (#2433)
+- [`5ecd91b05`](https://github.com/dashpay/dash/commit/5ecd91b05) Fix ps collateral/denom creation tx category confusion (#2430)
+- [`4a78b161f`](https://github.com/dashpay/dash/commit/4a78b161f) PrivateSend spending txes should have "outgoing" icon on overview screen (#2396)
+- [`d7e210341`](https://github.com/dashpay/dash/commit/d7e210341) Fixes inaccurate round count in CoinControlDialog (#2137)
+
+### Cleanups/Tests/Docs/Other
+- [`c950a8f51`](https://github.com/dashpay/dash/commit/c950a8f51) Merge v0.12.3.4 commits into develop (#2582)
+- [`6dfceaba5`](https://github.com/dashpay/dash/commit/6dfceaba5) Force FlushStateToDisk on ConnectTip/DisconnectTip while not in IBD (#2560)
+- [`552d9089e`](https://github.com/dashpay/dash/commit/552d9089e) Update testnet seeds to point to MNs that are on the new chain (#2558)
+- [`63b58b1e9`](https://github.com/dashpay/dash/commit/63b58b1e9) Reintroduce BLSInit to correctly set secure alloctor callbacks (#2543)
+- [`cbd030352`](https://github.com/dashpay/dash/commit/cbd030352) Serialize the block header in CBlockHeader::GetHash() (#2531)
+- [`3a6bd8d23`](https://github.com/dashpay/dash/commit/3a6bd8d23) Call ProcessTick every second, handle tick cooldown inside (#2522)
+- [`973a7f6dd`](https://github.com/dashpay/dash/commit/973a7f6dd) Fix GUI warnings in debug.log (#2521)
+- [`c248c48e4`](https://github.com/dashpay/dash/commit/c248c48e4) Try to fix a few sporadic instant send failures in DIP3 tests  (#2500)
+- [`7a709b81d`](https://github.com/dashpay/dash/commit/7a709b81d) Perform less instant send tests in DIP3 tests (#2499)
+- [`245c3220e`](https://github.com/dashpay/dash/commit/245c3220e) Sync blocks before creating TXs (#2496)
+- [`65528e9e7`](https://github.com/dashpay/dash/commit/65528e9e7) Bump masternodeman cache version (#2467)
+- [`6c190d1bb`](https://github.com/dashpay/dash/commit/6c190d1bb) Fix make deploy error on macos (#2475)
+- [`df7d12b41`](https://github.com/dashpay/dash/commit/df7d12b41) Add univalue test for real numbers (#2460)
+- [`614ff70b4`](https://github.com/dashpay/dash/commit/614ff70b4) Let ccache compress the cache by itself instead of compressing ccache.tar (#2456)
+- [`40fa1bb49`](https://github.com/dashpay/dash/commit/40fa1bb49) Add platform dependent include_directories in CMakeLists.txt (#2455)
+- [`12aba2592`](https://github.com/dashpay/dash/commit/12aba2592) Updating translations for de, es, fi, nl, pt, sk, zh_CN, zh_TW (#2451)
+- [`52bf5a6b0`](https://github.com/dashpay/dash/commit/52bf5a6b0) Install libxkbcommon0 in gitian-linux.yml
+- [`fefe34250`](https://github.com/dashpay/dash/commit/fefe34250) Update manpages
+- [`c60687fe6`](https://github.com/dashpay/dash/commit/c60687fe6) Sleep longer between attempts in sync_blocks
+- [`88498ba13`](https://github.com/dashpay/dash/commit/88498ba13) Apply suggestions from code review
+- [`91af72b18`](https://github.com/dashpay/dash/commit/91af72b18) Allow to specify how log to sleep between attempts in wait_until
+- [`f65e74682`](https://github.com/dashpay/dash/commit/f65e74682) Pass "-parallel=3" to reduce load on Travis nodes while testing
+- [`3c99d9e35`](https://github.com/dashpay/dash/commit/3c99d9e35) Fix test_fail_create_protx in DIP3 tests
+- [`4de70f0ac`](https://github.com/dashpay/dash/commit/4de70f0ac) Test P2SH/multisig payee addresses in DIP3 tests
+- [`5fc4072ca`](https://github.com/dashpay/dash/commit/5fc4072ca) Parallel ASN resolve and allow passing of input file names to makeseeds.py (#2432)
+- [`76a38f6ce`](https://github.com/dashpay/dash/commit/76a38f6ce)  Update defaultAssumeValid, nMinimumChainWork and checkpoints (#2428)
+- [`0e9ad207a`](https://github.com/dashpay/dash/commit/0e9ad207a) Update hardcoded seeds (#2429)
+- [`42ee369b1`](https://github.com/dashpay/dash/commit/42ee369b1) [Formatting] masternodelist.* clang+manual format (#2426)
+- [`e961c7134`](https://github.com/dashpay/dash/commit/e961c7134) Translations 201811 (#2249)
+- [`f0df5bffa`](https://github.com/dashpay/dash/commit/f0df5bffa) Clang evo folder and activemasternode.* (#2418)
+- [`98bdf35f9`](https://github.com/dashpay/dash/commit/98bdf35f9) bump PS copyright (#2417)
+- [`e9bb822c1`](https://github.com/dashpay/dash/commit/e9bb822c1) Clang format PrivateSend files (#2373)
+- [`bea590958`](https://github.com/dashpay/dash/commit/bea590958) Fix auto-IS tests (#2414)
+- [`f03629d6d`](https://github.com/dashpay/dash/commit/f03629d6d) Explicitly specify which branch of Wine to install (#2411)
+- [`5e829a3b1`](https://github.com/dashpay/dash/commit/5e829a3b1) Update Chia bls-signature to latest version (#2409)
+- [`51addf9a0`](https://github.com/dashpay/dash/commit/51addf9a0) Fix p2p-instantsend.py test (#2408)
+- [`7e8f07bb9`](https://github.com/dashpay/dash/commit/7e8f07bb9) A couple of fixes for shutdown sequence (#2406)
+- [`9c455caea`](https://github.com/dashpay/dash/commit/9c455caea) A couple of fixes for init steps (#2405)
+- [`6560ac64b`](https://github.com/dashpay/dash/commit/6560ac64b) Properly escape $ in Jenkinsfile.gitian (#2404)
+- [`70eb710b1`](https://github.com/dashpay/dash/commit/70eb710b1) Undefine DOUBLE after include Chia BLS headers (#2400)
+- [`052af81b4`](https://github.com/dashpay/dash/commit/052af81b4) Ensure correct order of destruction for BLS secure allocator (#2401)
+- [`c8804ea5a`](https://github.com/dashpay/dash/commit/c8804ea5a) Do not ignore patches in depends (#2399)
+- [`13f2eb449`](https://github.com/dashpay/dash/commit/13f2eb449) Force fvisibility=hidden when compiling on macos (#2398)
+- [`9eb9c99d5`](https://github.com/dashpay/dash/commit/9eb9c99d5) Bump version to 0.13.0 (#2386)
+- [`8f9b004ca`](https://github.com/dashpay/dash/commit/8f9b004ca) Support "fast" mode when calling sync_masternodes (#2383)
+- [`fcea333ba`](https://github.com/dashpay/dash/commit/fcea333ba) Rewrite handling of too long depends builds in .travis.yml (#2385)
+- [`d1debfc26`](https://github.com/dashpay/dash/commit/d1debfc26) Implement mt_pooled_secure_allocator and use it for BLS secure allocation (#2375)
+- [`0692de1c5`](https://github.com/dashpay/dash/commit/0692de1c5) Fix prepare_masternodes/create_masternodes in DashTestFramework (#2382)
+- [`6433a944a`](https://github.com/dashpay/dash/commit/6433a944a) [Trivial] typo Groupped -> Grouped (#2374)
+- [`59932401b`](https://github.com/dashpay/dash/commit/59932401b) Change internal references of Darksend to PrivateSend (#2372)
+- [`e3046adb3`](https://github.com/dashpay/dash/commit/e3046adb3) Clear devNetParams and mimic behavior of other param types (#2367)
+- [`de426e962`](https://github.com/dashpay/dash/commit/de426e962) Give tail calls enough time to print errors (#2376)
+- [`0402240a2`](https://github.com/dashpay/dash/commit/0402240a2) Bump CMAKE_CXX_STANDARD to 14 in CMakeLists.txt (#2377)
+- [`3c9237aa4`](https://github.com/dashpay/dash/commit/3c9237aa4) Use VersionBitsState instead of VersionBitsTipState to avoid cs_main lock (#2370)
+- [`c4351fd32`](https://github.com/dashpay/dash/commit/c4351fd32) revert 737, DEFAULT_TRANSACTION_MAXFEE = 0.1 * COIN (#2362)
+- [`1c9ed7806`](https://github.com/dashpay/dash/commit/1c9ed7806) GDB automation with Python script to measure memory usage in dashd (#1609)
+- [`d998dc13e`](https://github.com/dashpay/dash/commit/d998dc13e) Add cmake to non-mac gitian descriptors (#2360)
+- [`266dd3232`](https://github.com/dashpay/dash/commit/266dd3232) mkdir -p to allow re-start of failed chia build (#2359)
+- [`11a0cbf84`](https://github.com/dashpay/dash/commit/11a0cbf84) InstantSend-related tests refactoring (#2333)
+- [`3313bbd51`](https://github.com/dashpay/dash/commit/3313bbd51) Backport bitcoin #13623 Migrate gitian-build.sh to python (#2319)
+- [`7b76bbb57`](https://github.com/dashpay/dash/commit/7b76bbb57)  Update Chia BLS libs to latest master (#2357)
+- [`e2de632f8`](https://github.com/dashpay/dash/commit/e2de632f8) Move handling of `size != SerSize` into SetBuf/GetBuf (#2356)
+- [`81d60bc28`](https://github.com/dashpay/dash/commit/81d60bc28) Fix the issue with transaction amount precision in IS tests (#2353)
+- [`a45055384`](https://github.com/dashpay/dash/commit/a45055384) Fix qt configure to detect clang version correctly (#2344)
+- [`b99d94a0f`](https://github.com/dashpay/dash/commit/b99d94a0f) Minor build documentation updates (#2343)
+- [`464191698`](https://github.com/dashpay/dash/commit/464191698) Review fixes
+- [`9c8e4ac76`](https://github.com/dashpay/dash/commit/9c8e4ac76) Move bls stuff from crypto/ to bls/
+- [`bed1ded8b`](https://github.com/dashpay/dash/commit/bed1ded8b) Remove duplicated check (#2336)
+- [`89f744d06`](https://github.com/dashpay/dash/commit/89f744d06) pack of small cleanup fixes / optimizations (#2334)
+- [`9603c5290`](https://github.com/dashpay/dash/commit/9603c5290) Trivial: Codestyle fixes in InstantSend code (#2332)
+- [`90ad75911`](https://github.com/dashpay/dash/commit/90ad75911) Fix auto-IS and tests (#2331)
+- [`b3fc236af`](https://github.com/dashpay/dash/commit/b3fc236af) Fix mnodeman.cs vs cs_vPendingMasternodes vs cs_main deadlock (#2200)
+- [`80fd096b0`](https://github.com/dashpay/dash/commit/80fd096b0) Add ECDSA benchmarks
+- [`78675d9bb`](https://github.com/dashpay/dash/commit/78675d9bb) Add BLS and DKG benchmarks
+- [`3ee27c168`](https://github.com/dashpay/dash/commit/3ee27c168) Add highly parallelized worker/helper for BLS/DKG calculations
+- [`aa3b0aa8a`](https://github.com/dashpay/dash/commit/aa3b0aa8a) Add simple helpers/wrappers for BLS+AES based integrated encryption schemes (IES)
+- [`9ccf6f584`](https://github.com/dashpay/dash/commit/9ccf6f584) Implement wrappers around Chia BLS lib
+- [`3039d44d3`](https://github.com/dashpay/dash/commit/3039d44d3) Add Chia bls-signatures library to depends
+- [`f3dcb6916`](https://github.com/dashpay/dash/commit/f3dcb6916) Add cmake to ci/Dockerfile.builder
+- [`057d7445e`](https://github.com/dashpay/dash/commit/057d7445e) Add libgmp to depends
+- [`b0d0093d7`](https://github.com/dashpay/dash/commit/b0d0093d7) Add helper to rename all threads of a ctpl::thread_pool
+- [`47a162255`](https://github.com/dashpay/dash/commit/47a162255) Add ctpl header only library
+- [`407baccec`](https://github.com/dashpay/dash/commit/407baccec) Remove obsolete build-openbsd.md (#2328)
+- [`8a1b51356`](https://github.com/dashpay/dash/commit/8a1b51356) Backport: Fix Qt build with XCode (for depends) (#2325)
+- [`a5aca049d`](https://github.com/dashpay/dash/commit/a5aca049d) rename vars in mnsync to make more sense (#2308)
+- [`ee6a5a33b`](https://github.com/dashpay/dash/commit/ee6a5a33b) Gov cleanup + copyright bump (#2324)
+- [`d7e5f02ea`](https://github.com/dashpay/dash/commit/d7e5f02ea) Update build documentation (#2323)
+- [`bd8c54d12`](https://github.com/dashpay/dash/commit/bd8c54d12) A bit more verbosity for some critical errors (#2316)
+- [`a4ff2a19a`](https://github.com/dashpay/dash/commit/a4ff2a19a) Fix some warnings and do a couple of other trivial cleanups (#2315)
+- [`07208a4ae`](https://github.com/dashpay/dash/commit/07208a4ae) document spork system with doxygen comments (#2301)
+- [`2c1a17909`](https://github.com/dashpay/dash/commit/2c1a17909) cleanup: remove unused vars, includes, functions (#2306)
+- [`3d48824b4`](https://github.com/dashpay/dash/commit/3d48824b4) Update .clang-format to more accurately show the actual style (#2299)
+- [`8ea40102c`](https://github.com/dashpay/dash/commit/8ea40102c) Remove leftover RBF code from BTC (#2297)
+- [`76599aad3`](https://github.com/dashpay/dash/commit/76599aad3) Drop (pre-)70208 compatibility code (#2295)
+- [`016681cd3`](https://github.com/dashpay/dash/commit/016681cd3) Add support for serialization of bitsets and tuples (#2293)
+- [`2a95dd30c`](https://github.com/dashpay/dash/commit/2a95dd30c) Fix locking issues in DIP3 unit tests (#2285)
+- [`47ca06ab3`](https://github.com/dashpay/dash/commit/47ca06ab3) DIP3 integration tests (#2280)
+- [`ad6c2893c`](https://github.com/dashpay/dash/commit/ad6c2893c) Docs - Update Core version number in readme files (#2267)
+- [`bc7924d41`](https://github.com/dashpay/dash/commit/bc7924d41) Add unit tests for DIP3 and DIP4
+- [`d653ace99`](https://github.com/dashpay/dash/commit/d653ace99) Update CbTx in TestChainSetup
+- [`9674be8f9`](https://github.com/dashpay/dash/commit/9674be8f9) Refactor TestChain100Setup to allow different test chain setups
+- [`cb37c3972`](https://github.com/dashpay/dash/commit/cb37c3972) Bump PROTOCOL_VERSION to 70211, bump MIN_* protocols to 70210 (#2256)
+- [`b99886532`](https://github.com/dashpay/dash/commit/b99886532) add link for developer-notes in contributing (#2260)
+- [`fded838c9`](https://github.com/dashpay/dash/commit/fded838c9) RPC folder: Cleaned up brackets on if, while, for, BOOST_FOREACH. Some whitespace fixes (#2257)
+- [`5295c78cc`](https://github.com/dashpay/dash/commit/5295c78cc) Fix typo in "penalty" (#2247)
+- [`c566ce75d`](https://github.com/dashpay/dash/commit/c566ce75d) Update copyright in specialtx.h/cpp
+- [`e002c50b0`](https://github.com/dashpay/dash/commit/e002c50b0) Add "immer" functional/immutable containers library (#2244)
+- [`799e3c312`](https://github.com/dashpay/dash/commit/799e3c312) Perform Jenkins builds in /dash-src all the time to fix caching issues (#2242)
+- [`b6896387a`](https://github.com/dashpay/dash/commit/b6896387a) Move DIP1 transaction size checks out of ContextualCheckBlock and use ContextualCheckTransaction instead (#2238)
+- [`e415fd049`](https://github.com/dashpay/dash/commit/e415fd049) Revert CMasternodePayments::IsTransactionValid to the logic before the recent refactorings (#2237)
+- [`8da88ecf6`](https://github.com/dashpay/dash/commit/8da88ecf6) Don't crash when formatting in logging throws exceptions (#2231)
+- [`2e06f8133`](https://github.com/dashpay/dash/commit/2e06f8133) fix missed format parameter (#2229)
+- [`3d654b981`](https://github.com/dashpay/dash/commit/3d654b981) Build bionic base image in Jenkinsfile.gitian & update docs (#2226)
+- [`c09f57bd7`](https://github.com/dashpay/dash/commit/c09f57bd7) Backport move to Ubuntu Bionic and GCC7 in Gitian builds (#2225)
+- [`7cf9572c2`](https://github.com/dashpay/dash/commit/7cf9572c2) Backport Bitcoin #11881: Remove Python2 support (#2224)
+- [`633879cd2`](https://github.com/dashpay/dash/commit/633879cd2) Only use version 1 and 2 transactions for sighash_tests (#2219)
+- [`2d4e18537`](https://github.com/dashpay/dash/commit/2d4e18537) Some useful commits from the DIP3 PR in regard to integration tests (#2218)
+- [`106bab1ae`](https://github.com/dashpay/dash/commit/106bab1ae) Add new ParseXXX methods to easily parse UniValue values (#2211)
+- [`c4c610783`](https://github.com/dashpay/dash/commit/c4c610783) Use C++14 standard when building (#2209)
+- [`589a77013`](https://github.com/dashpay/dash/commit/589a77013) Correction to release date for 0.12.0 (#2205)
+- [`96435288f`](https://github.com/dashpay/dash/commit/96435288f) Move block template specific stuff from CBlock to CBlockTemplate (#2195)
+- [`3d002c946`](https://github.com/dashpay/dash/commit/3d002c946) Fix active masternode task schedule (#2193)
+- [`65b904526`](https://github.com/dashpay/dash/commit/65b904526) Add helpers GetSentinelString() and GetDaemonString() to CMasternodePing (#2192)
+- [`eb202e812`](https://github.com/dashpay/dash/commit/eb202e812) Use ccache in gitian builds (#2185)
+- [`b47617325`](https://github.com/dashpay/dash/commit/b47617325) Install python3 in gitian builds (#2182)
+- [`7a85e24c3`](https://github.com/dashpay/dash/commit/7a85e24c3) Remove deprecated gitian-rpi2.yml descriptor (#2183)
+- [`1681d6366`](https://github.com/dashpay/dash/commit/1681d6366) Replace Dash-specific threads with Dash-specific scheduled tasks (#2043)
+- [`dac090964`](https://github.com/dashpay/dash/commit/dac090964) remove dashpay.io dns seed entry (#2181)
+- [`753c2436b`](https://github.com/dashpay/dash/commit/753c2436b) Fix MissingPropertyException on Jenkins when no cache was found (#2180)
+- [`f3e380659`](https://github.com/dashpay/dash/commit/f3e380659) Move to in-docker CI builds and add Jenkins support (#2178)
+- [`23dde9f12`](https://github.com/dashpay/dash/commit/23dde9f12) Remove a few annoying debug prints from CMasternodeMan (#2179)
+- [`5036d7dfc`](https://github.com/dashpay/dash/commit/5036d7dfc) depends: Update Qt download url (#2177)
+- [`e23339d6f`](https://github.com/dashpay/dash/commit/e23339d6f) use nullptr in Dash-specific code (#2166)
+- [`42c193df0`](https://github.com/dashpay/dash/commit/42c193df0) replace map count/insert w/emplace in instantx.cpp (#2165)
+- [`fd70a1eb9`](https://github.com/dashpay/dash/commit/fd70a1eb9) iterator cleanup in several places (#2164)
+- [`df1be90ce`](https://github.com/dashpay/dash/commit/df1be90ce)  Update links to obsolete documentation (#2162)
+- [`448e92f4a`](https://github.com/dashpay/dash/commit/448e92f4a) GetOutPointPrivateSendRounds readability (#2149)
+- [`6da2837bd`](https://github.com/dashpay/dash/commit/6da2837bd) InstantSend Integration tests (#2141)
+- [`8ee9333bc`](https://github.com/dashpay/dash/commit/8ee9333bc) remove boost dependency from Dash-specific code (#2072)
+- [`a527845e4`](https://github.com/dashpay/dash/commit/a527845e4) Bump to 0.12.4.0 pre-release (#2167)
 
 Credits
 =======
 
-Thanks to everyone who directly contributed to this release,
-as well as everyone who submitted issues and reviewed pull requests.
-
+Thanks to everyone who directly contributed to this release:
+
+- Alexander Block
+- UdjinM6
+- PastaPastaPasta
+- gladcow
+- Nathan Marley
+- thephez
+- strophy
+- PaulieD
+- InhumanPerfection
+- Spencer Lievens
+- -k
+- Salisbury
+- Solar Designer
+- Oleg Girko
+- Anton Suprunchuk
+
+As well as everyone that submitted issues, reviewed pull requests or helped translating on
+[Transifex](https://www.transifex.com/projects/p/dash/).
 
 Older releases
 ==============
@@ -91,6 +705,7 @@ Dash Core tree 0.12.1.x was a fork of Bitcoin Core tree 0.12.
 
 These release are considered obsolete. Old release notes can be found here:
 
+- [v0.12.3.4](https://github.com/dashpay/dash/blob/master/doc/release-notes/dash/release-notes-0.12.3.4.md) released Dec/14/2018
 - [v0.12.3.3](https://github.com/dashpay/dash/blob/master/doc/release-notes/dash/release-notes-0.12.3.3.md) released Sep/19/2018
 - [v0.12.3.2](https://github.com/dashpay/dash/blob/master/doc/release-notes/dash/release-notes-0.12.3.2.md) released Jul/09/2018
 - [v0.12.3.1](https://github.com/dashpay/dash/blob/master/doc/release-notes/dash/release-notes-0.12.3.1.md) released Jul/03/2018
diff --git a/doc/release-notes/dash/release-notes-0.12.3.4.md b/doc/release-notes/dash/release-notes-0.12.3.4.md
new file mode 100644
index 000000000000..171e178741fe
--- /dev/null
+++ b/doc/release-notes/dash/release-notes-0.12.3.4.md
@@ -0,0 +1,107 @@
+Dash Core version 0.12.3.4
+==========================
+
+Release is now available from:
+
+  <https://www.dash.org/downloads/#wallets>
+
+This is an optional release and only contains changes for testnet. It is not required to update masternodes on mainnet.
+
+Please report bugs using the issue tracker at github:
+
+  <https://github.com/dashpay/dash/issues>
+
+
+Upgrading and downgrading
+=========================
+
+How to Upgrade
+--------------
+
+If you are running an older version, shut it down. Wait until it has completely
+shut down (which might take a few minutes for older versions), then run the
+installer (on Windows) or just copy over /Applications/Dash-Qt (on Mac) or
+dashd/dash-qt (on Linux).
+
+Downgrade warning
+-----------------
+
+### Downgrade to a version < 0.12.2.2
+
+Because release 0.12.2.2 included the [per-UTXO fix](release-notes/dash/release-notes-0.12.2.2.md#per-utxo-fix)
+which changed the structure of the internal database, you will have to reindex
+the database if you decide to use any pre-0.12.2.2 version.
+
+Wallet forward or backward compatibility was not affected.
+
+### Downgrade to 0.12.3.1/2/3
+
+Downgrading to these versions does not require any additional actions, should be
+fully compatible.
+
+
+Notable changes
+===============
+
+Fork/Reset testnet at block 4001
+--------------------------------
+
+This release is NOT required on mainnet. It is intended to be deployed on testnet and will cause a fork at block 4001.
+The plan is to restart all testing for the v0.13.0.0 upgrade process.
+
+When deployed on testnet, it is required to start with a fresh data directory or call Dash Core with `-reindex-chainstate`.
+
+0.12.3.4 Change log
+===================
+
+See detailed [set of changes](https://github.com/dashpay/dash/compare/v0.12.3.3...dashpay:v0.12.3.4).
+
+Python Support
+--------------
+
+Support for Python 2 has been discontinued for all test files and tools.
+
+Credits
+=======
+
+Thanks to everyone who directly contributed to this release,
+as well as everyone who submitted issues and reviewed pull requests.
+
+
+Older releases
+==============
+
+Dash was previously known as Darkcoin.
+
+Darkcoin tree 0.8.x was a fork of Litecoin tree 0.8, original name was XCoin
+which was first released on Jan/18/2014.
+
+Darkcoin tree 0.9.x was the open source implementation of masternodes based on
+the 0.8.x tree and was first released on Mar/13/2014.
+
+Darkcoin tree 0.10.x used to be the closed source implementation of Darksend
+which was released open source on Sep/25/2014.
+
+Dash Core tree 0.11.x was a fork of Bitcoin Core tree 0.9,
+Darkcoin was rebranded to Dash.
+
+Dash Core tree 0.12.0.x was a fork of Bitcoin Core tree 0.10.
+
+Dash Core tree 0.12.1.x was a fork of Bitcoin Core tree 0.12.
+
+These release are considered obsolete. Old release notes can be found here:
+
+- [v0.12.3.3](https://github.com/dashpay/dash/blob/master/doc/release-notes/dash/release-notes-0.12.3.3.md) released Sep/19/2018
+- [v0.12.3.2](https://github.com/dashpay/dash/blob/master/doc/release-notes/dash/release-notes-0.12.3.2.md) released Jul/09/2018
+- [v0.12.3.1](https://github.com/dashpay/dash/blob/master/doc/release-notes/dash/release-notes-0.12.3.1.md) released Jul/03/2018
+- [v0.12.2.3](https://github.com/dashpay/dash/blob/master/doc/release-notes/dash/release-notes-0.12.2.3.md) released Jan/12/2018
+- [v0.12.2.2](https://github.com/dashpay/dash/blob/master/doc/release-notes/dash/release-notes-0.12.2.2.md) released Dec/17/2017
+- [v0.12.2](https://github.com/dashpay/dash/blob/master/doc/release-notes/dash/release-notes-0.12.2.md) released Nov/08/2017
+- [v0.12.1](https://github.com/dashpay/dash/blob/master/doc/release-notes/dash/release-notes-0.12.1.md) released Feb/06/2017
+- [v0.12.0](https://github.com/dashpay/dash/blob/master/doc/release-notes/dash/release-notes-0.12.0.md) released Aug/15/2015
+- [v0.11.2](https://github.com/dashpay/dash/blob/master/doc/release-notes/dash/release-notes-0.11.2.md) released Mar/04/2015
+- [v0.11.1](https://github.com/dashpay/dash/blob/master/doc/release-notes/dash/release-notes-0.11.1.md) released Feb/10/2015
+- [v0.11.0](https://github.com/dashpay/dash/blob/master/doc/release-notes/dash/release-notes-0.11.0.md) released Jan/15/2015
+- [v0.10.x](https://github.com/dashpay/dash/blob/master/doc/release-notes/dash/release-notes-0.10.0.md) released Sep/25/2014
+- [v0.9.x](https://github.com/dashpay/dash/blob/master/doc/release-notes/dash/release-notes-0.9.0.md) released Mar/13/2014
+