Merge pull request #62 from spectrecoin/donation_fork

Donation fork
aliascash · Jul 25, 2018 · 6f91fd0 · 6f91fd0
2 parents 3f8cd5d + 9c02d69
commit 6f91fd0
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/src/chainparams.cpp b/src/chainparams.cpp
@@ -162,7 +162,7 @@ class CMainParams : public CBaseChainParams {
 
         convertSeeds(vFixedSeeds, pnSeed, ARRAYLEN(pnSeed), nDefaultPort);
 
-        nForkV2Time = 2000000000; // temporary epoch time set for chain fork
+        nForkV2Time = 1534888800; // MAINNET V2 chain fork (GMT: Tuesday, 21. August 2018 22.00)
 
         devContributionAddress = "SdrdWNtjD7V6BSt3EyQZKCnZDkeE28cZhr";
     }

diff --git a/src/clientversion.h b/src/clientversion.h
@@ -8,7 +8,7 @@
 // These need to be macros, as version.cpp's and bitcoin-qt.rc's voodoo requires it
 #define CLIENT_VERSION_MAJOR       2
 #define CLIENT_VERSION_MINOR       0
-#define CLIENT_VERSION_REVISION    3
+#define CLIENT_VERSION_REVISION    4
 #define CLIENT_VERSION_BUILD       0
 
 // Converts the parameter X to a string after macro replacement on X has been performed.

diff --git a/src/main.cpp b/src/main.cpp
@@ -2749,7 +2749,7 @@ bool CBlock::ConnectBlock(CTxDB& txdb, CBlockIndex* pindex, bool fJustCheck)
             }
             if (!containsDonation) {
                 LogPrintf("ConnectBlock() : stake does not pay to the donation address\n");
-                return DoS(100, error("ConnectBlock() : stake does not pay to the donation address in trx\n%s\n", vtx[0].ToString()));
+                return DoS(100, error("ConnectBlock() : stake does not pay to the donation address in trx\n%s\n", vtx[1].ToString()));
             }            
         }
     }

diff --git a/src/net.cpp b/src/net.cpp
@@ -1088,9 +1088,9 @@ void ThreadSocketHandler()
 // hidden service seeds
 static const char *strMainNetOnionSeed[][1] = {
 // project-maintained nodes
-    {"qe6swgcfktc5l3l7.onion"},
-	{"6f3czb57puvm4si3.onion"},
-	{"j5tnnelwfsop3rsa.onion"},
+    {"zhn7wjfhk232kkmb.onion"},
+	{"qe6swgcfktc5l3l7.onion"},
+	{"r5mk35ekwr6j7ccb.onion"},
 
 // other stable nodes that are monitored by the project
     {NULL}