Merge pull request #24 from PACGlobalOfficial/revert-aggressive-rebrand

Amend overaggressive rebrand, will cause future porting headaches.

src/batchedlogger.h

@@ -2,8 +2,8 @@
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#ifndef PAC_BATCHEDLOGGER_H
-#define PAC_BATCHEDLOGGER_H
+#ifndef DASH_BATCHEDLOGGER_H
+#define DASH_BATCHEDLOGGER_H
 
 #include "tinyformat.h"
 

src/bip39.h

@@ -21,8 +21,8 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#ifndef PAC_BIP39_H
-#define PAC_BIP39_H
+#ifndef DASH_BIP39_H
+#define DASH_BIP39_H
 
 #include "support/allocators/secure.h"
 

src/bls/bls.h

@@ -2,8 +2,8 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#ifndef PAC_CRYPTO_BLS_H
-#define PAC_CRYPTO_BLS_H
+#ifndef DASH_CRYPTO_BLS_H
+#define DASH_CRYPTO_BLS_H
 
 #include "hash.h"
 #include "serialize.h"

src/bls/bls_batchverifier.h

@@ -2,8 +2,8 @@
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#ifndef PAC_CRYPTO_BLS_BATCHVERIFIER_H
-#define PAC_CRYPTO_BLS_BATCHVERIFIER_H
+#ifndef DASH_CRYPTO_BLS_BATCHVERIFIER_H
+#define DASH_CRYPTO_BLS_BATCHVERIFIER_H
 
 #include "bls.h"
 

src/bls/bls_ies.h

@@ -2,8 +2,8 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#ifndef PAC_CRYPTO_BLS_IES_H
-#define PAC_CRYPTO_BLS_IES_H
+#ifndef DASH_CRYPTO_BLS_IES_H
+#define DASH_CRYPTO_BLS_IES_H
 
 #include "bls.h"
 #include "streams.h"

src/bls/bls_worker.h

@@ -2,8 +2,8 @@
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#ifndef PAC_CRYPTO_BLS_WORKER_H
-#define PAC_CRYPTO_BLS_WORKER_H
+#ifndef DASH_CRYPTO_BLS_WORKER_H
+#define DASH_CRYPTO_BLS_WORKER_H
 
 #include "bls.h"
 

src/chainparams.cpp

@@ -209,10 +209,10 @@ class CMainParams : public CChainParams {
         consensus.nMasternodePaymentsStartBlock = 200;
         consensus.nMasternodePaymentsIncreaseBlock = 217736;
         consensus.nMasternodePaymentsIncreasePeriod = 576*30;
-        consensus.nInstaPACConfirmationsRequired = 6;
-        consensus.nInstaPACKeepLock = 24;
-        consensus.nInstaPACSigsRequired = 6;
-        consensus.nInstaPACSigsTotal = 10;
+        consensus.nInstantSendConfirmationsRequired = 6;
+        consensus.nInstantSendKeepLock = 24;
+        consensus.nInstantSendSigsRequired = 6;
+        consensus.nInstantSendSigsTotal = 10;
         consensus.nBudgetPaymentsStartBlock = 200;
         consensus.nBudgetPaymentsCycleBlocks = 16616;
         consensus.nBudgetPaymentsWindowBlocks = 100;
@@ -402,10 +402,10 @@ class CTestNetParams : public CChainParams {
         consensus.nMasternodePaymentsStartBlock = 50;
         consensus.nMasternodePaymentsIncreaseBlock = NEVER32;
         consensus.nMasternodePaymentsIncreasePeriod = NEVER32;
-        consensus.nInstaPACConfirmationsRequired = 2;
-        consensus.nInstaPACKeepLock = 6;
-        consensus.nInstaPACSigsRequired = 6;
-        consensus.nInstaPACSigsTotal = 10;
+        consensus.nInstantSendConfirmationsRequired = 2;
+        consensus.nInstantSendKeepLock = 6;
+        consensus.nInstantSendSigsRequired = 6;
+        consensus.nInstantSendSigsTotal = 10;
         consensus.nBudgetPaymentsStartBlock = NEVER32;
         consensus.nBudgetPaymentsCycleBlocks = NEVER32;
         consensus.nBudgetPaymentsWindowBlocks = NEVER32;
@@ -568,10 +568,10 @@ class CDevNetParams : public CChainParams {
         consensus.nMasternodePaymentsStartBlock = 4010; // not true, but it's ok as long as it's less then nMasternodePaymentsIncreaseBlock
         consensus.nMasternodePaymentsIncreaseBlock = 4030;
         consensus.nMasternodePaymentsIncreasePeriod = 10;
-        consensus.nInstaPACConfirmationsRequired = 2;
-        consensus.nInstaPACKeepLock = 6;
-        consensus.nInstaPACSigsRequired = 6;
-        consensus.nInstaPACSigsTotal = 10;
+        consensus.nInstantSendConfirmationsRequired = 2;
+        consensus.nInstantSendKeepLock = 6;
+        consensus.nInstantSendSigsRequired = 6;
+        consensus.nInstantSendSigsTotal = 10;
         consensus.nBudgetPaymentsStartBlock = 4100;
         consensus.nBudgetPaymentsCycleBlocks = 50;
         consensus.nBudgetPaymentsWindowBlocks = 10;
@@ -745,10 +745,10 @@ class CRegTestParams : public CChainParams {
         consensus.nMasternodePaymentsStartBlock = 240;
         consensus.nMasternodePaymentsIncreaseBlock = 350;
         consensus.nMasternodePaymentsIncreasePeriod = 10;
-        consensus.nInstaPACConfirmationsRequired = 2;
-        consensus.nInstaPACKeepLock = 6;
-        consensus.nInstaPACSigsRequired = 3;
-        consensus.nInstaPACSigsTotal = 5;
+        consensus.nInstantSendConfirmationsRequired = 2;
+        consensus.nInstantSendKeepLock = 6;
+        consensus.nInstantSendSigsRequired = 3;
+        consensus.nInstantSendSigsTotal = 5;
         consensus.nBudgetPaymentsStartBlock = 1000;
         consensus.nBudgetPaymentsCycleBlocks = 50;
         consensus.nBudgetPaymentsWindowBlocks = 10;

src/chainparamsseeds.h

@@ -1,5 +1,5 @@
-#ifndef PAC_CHAINPARAMSSEEDS_H
-#define PAC_CHAINPARAMSSEEDS_H
+#ifndef DASH_CHAINPARAMSSEEDS_H
+#define DASH_CHAINPARAMSSEEDS_H
 /**
  * List of fixed seed nodes for the dash network
  * AUTOGENERATED by contrib/seeds/generate-seeds.py

src/consensus/params.h

@@ -124,10 +124,10 @@ struct Params {
     int nMasternodePaymentsStartBlock;
     int nMasternodePaymentsIncreaseBlock;
     int nMasternodePaymentsIncreasePeriod; // in blocks
-    int nInstaPACConfirmationsRequired; // in blocks
-    int nInstaPACKeepLock; // in blocks
-    int nInstaPACSigsRequired;
-    int nInstaPACSigsTotal;
+    int nInstantSendConfirmationsRequired; // in blocks
+    int nInstantSendKeepLock; // in blocks
+    int nInstantSendSigsRequired;
+    int nInstantSendSigsTotal;
     int nBudgetPaymentsStartBlock;
     int nBudgetPaymentsCycleBlocks;
     int nBudgetPaymentsWindowBlocks;

src/dsnotificationinterface.cpp

@@ -66,7 +66,7 @@ void CDSNotificationInterface::UpdatedBlockTip(const CBlockIndex *pindexNew, con
     if (fLiteMode)
         return;
 
-    llmq::quorumInstaPACManager->UpdatedBlockTip(pindexNew);
+    llmq::quorumInstantSendManager->UpdatedBlockTip(pindexNew);
     llmq::chainLocksHandler->UpdatedBlockTip(pindexNew);
 
     CPrivateSend::UpdatedBlockTip(pindexNew);
@@ -81,7 +81,7 @@ void CDSNotificationInterface::UpdatedBlockTip(const CBlockIndex *pindexNew, con
 
 void CDSNotificationInterface::SyncTransaction(const CTransaction &tx, const CBlockIndex *pindex, int posInBlock)
 {
-    llmq::quorumInstaPACManager->SyncTransaction(tx, pindex, posInBlock);
+    llmq::quorumInstantSendManager->SyncTransaction(tx, pindex, posInBlock);
     llmq::chainLocksHandler->SyncTransaction(tx, pindex, posInBlock);
     instantsend.SyncTransaction(tx, pindex, posInBlock);
     CPrivateSend::SyncTransaction(tx, pindex, posInBlock);
@@ -97,5 +97,5 @@ void CDSNotificationInterface::NotifyMasternodeListChanged(bool undo, const CDet
 
 void CDSNotificationInterface::NotifyChainLock(const CBlockIndex* pindex)
 {
-    llmq::quorumInstaPACManager->NotifyChainLock(pindex);
+    llmq::quorumInstantSendManager->NotifyChainLock(pindex);
 }

src/evo/cbtx.h

@@ -2,8 +2,8 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#ifndef PAC_CBTX_H
-#define PAC_CBTX_H
+#ifndef DASH_CBTX_H
+#define DASH_CBTX_H
 
 #include "consensus/validation.h"
 #include "primitives/transaction.h"

src/evo/deterministicmns.h

@@ -2,8 +2,8 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#ifndef PAC_DETERMINISTICMNS_H
-#define PAC_DETERMINISTICMNS_H
+#ifndef DASH_DETERMINISTICMNS_H
+#define DASH_DETERMINISTICMNS_H
 
 #include "arith_uint256.h"
 #include "bls/bls.h"

src/evo/evodb.h

@@ -2,8 +2,8 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#ifndef PAC_EVODB_H
-#define PAC_EVODB_H
+#ifndef DASH_EVODB_H
+#define DASH_EVODB_H
 
 #include "dbwrapper.h"
 #include "sync.h"

src/evo/mnauth.h

@@ -2,8 +2,8 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#ifndef PAC_MNAUTH_H
-#define PAC_MNAUTH_H
+#ifndef DASH_MNAUTH_H
+#define DASH_MNAUTH_H
 
 #include "bls/bls.h"
 #include "serialize.h"

src/evo/providertx.h

@@ -2,8 +2,8 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#ifndef PAC_PROVIDERTX_H
-#define PAC_PROVIDERTX_H
+#ifndef DASH_PROVIDERTX_H
+#define DASH_PROVIDERTX_H
 
 #include "bls/bls.h"
 #include "consensus/validation.h"

src/evo/simplifiedmns.h

@@ -2,8 +2,8 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#ifndef PAC_SIMPLIFIEDMNS_H
-#define PAC_SIMPLIFIEDMNS_H
+#ifndef DASH_SIMPLIFIEDMNS_H
+#define DASH_SIMPLIFIEDMNS_H
 
 #include "bls/bls.h"
 #include "merkleblock.h"

src/evo/specialtx.h

@@ -2,8 +2,8 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#ifndef PAC_SPECIALTX_H
-#define PAC_SPECIALTX_H
+#ifndef DASH_SPECIALTX_H
+#define DASH_SPECIALTX_H
 
 #include "primitives/transaction.h"
 #include "streams.h"

src/hdchain.h

@@ -1,7 +1,7 @@
 // Copyright (c) 2014-2018 The Dash Core developers
 // Distributed under the MIT software license, see the accompanying
-#ifndef PAC_HDCHAIN_H
-#define PAC_HDCHAIN_H
+#ifndef DASH_HDCHAIN_H
+#define DASH_HDCHAIN_H
 
 #include "key.h"
 #include "sync.h"

src/httpserver.cpp

@@ -308,7 +308,7 @@ static void http_reject_request_cb(struct evhttp_request* req, void*)
 /** Event dispatcher thread */
 static bool ThreadHTTP(struct event_base* base, struct evhttp* http)
 {
-    RenameThread("dash-http");
+    RenameThread("pacglobal-http");
     LogPrint("http", "Entering http event loop\n");
     event_base_dispatch(base);
     // Event loop will be interrupted by InterruptHTTPServer()
@@ -358,7 +358,7 @@ static bool HTTPBindAddresses(struct evhttp* http)
 /** Simple wrapper to set thread name and run work queue */
 static void HTTPWorkQueueRun(WorkQueue<HTTPClosure>* queue)
 {
-    RenameThread("dash-httpworker");
+    RenameThread("pacglobal-httpworker");
     queue->Run();
 }
 

src/init.cpp

@@ -229,7 +229,7 @@ void PrepareShutdown()
     /// for example if the data directory was found to be locked.
     /// Be sure that anything that writes files or flushes caches only does this if the respective
     /// module was initialized.
-    RenameThread("dash-shutoff");
+    RenameThread("pacglobal-shutoff");
     mempool.AddTransactionsUpdated(1);
     StopHTTPRPC();
     StopREST();
@@ -268,9 +268,9 @@ void PrepareShutdown()
         flatdb3.Dump(governance);
         CFlatDB<CNetFulfilledRequestManager> flatdb4("netfulfilled.dat", "magicFulfilledCache");
         flatdb4.Dump(netfulfilledman);
-        if(fEnableInstaPAC)
+        if(fEnableInstantSend)
         {
-            CFlatDB<CInstaPAC> flatdb5("instantsend.dat", "magicInstaPACCache");
+            CFlatDB<CInstantSend> flatdb5("instantsend.dat", "magicInstaPACCache");
             flatdb5.Dump(instantsend);
         }
         CFlatDB<CSporkManager> flatdb6("sporks.dat", "magicSporkCache");
@@ -749,7 +749,7 @@ void CleanupBlockRevFiles()
 void ThreadImport(std::vector<boost::filesystem::path> vImportFiles)
 {
     const CChainParams& chainparams = Params();
-    RenameThread("dash-loadblk");
+    RenameThread("pacglobal-loadblk");
 
     {
     CImportingNow imp;
@@ -1969,7 +1969,7 @@ bool AppInitMain(boost::thread_group& threadGroup, CScheduler& scheduler)
 
     // ********************************************************* Step 10b: setup InstaPAC
 
-    fEnableInstaPAC = GetBoolArg("-enableinstantsend", 1);
+    fEnableInstantSend = GetBoolArg("-enableinstantsend", 1);
 
     // ********************************************************* Step 10c: Load cache data
 
@@ -2002,13 +2002,13 @@ bool AppInitMain(boost::thread_group& threadGroup, CScheduler& scheduler)
             return InitError(_("Failed to load fulfilled requests cache from") + "\n" + (pathDB / strDBName).string());
         }
 
-        if(fEnableInstaPAC)
+        if(fEnableInstantSend)
         {
             strDBName = "instantsend.dat";
             uiInterface.InitMessage(_("Loading InstaPAC data cache..."));
-            CFlatDB<CInstaPAC> flatdb5(strDBName, "magicInstaPACCache");
+            CFlatDB<CInstantSend> flatdb5(strDBName, "magicInstaPACCache");
             if(!flatdb5.Load(instantsend)) {
-                return InitError(_("Failed to load InstaPAC data cache from") + "\n" + (pathDB / strDBName).string());
+                return InitError(_("Failed to load InstantSend data cache from") + "\n" + (pathDB / strDBName).string());
             }
         }
     }
@@ -2022,7 +2022,7 @@ bool AppInitMain(boost::thread_group& threadGroup, CScheduler& scheduler)
 
         scheduler.scheduleEvery(boost::bind(&CGovernanceManager::DoMaintenance, boost::ref(governance), boost::ref(*g_connman)), 60 * 5 * 1000);
 
-        scheduler.scheduleEvery(boost::bind(&CInstaPAC::DoMaintenance, boost::ref(instantsend)), 60 * 1000);
+        scheduler.scheduleEvery(boost::bind(&CInstantSend::DoMaintenance, boost::ref(instantsend)), 60 * 1000);
 
         if (fMasternodeMode)
             scheduler.scheduleEvery(boost::bind(&CPrivateSendServer::DoMaintenance, boost::ref(privateSendServer), boost::ref(*g_connman)), 1 * 1000);