Merge pull request #13 from ParsiCoin/development

Development
ParsiCoin · Jun 16, 2019 · 6ae5088 · 6ae5088
2 parents 0aa1c01 + 0e95f52
commit 6ae5088
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 10 deletions.
diff --git a/src/CryptoNoteConfig.h b/src/CryptoNoteConfig.h
@@ -156,7 +156,7 @@ const uint32_t P2P_IDLE_CONNECTION_KILL_INTERVAL             = (5 * 60);      //
 
 const char     P2P_STAT_TRUSTED_PUB_KEY[]                    = "8f80f9a5a434a9f1510d12436238debfee9c918ce605efe225d8c94d045fa115";
 
-const char* const SEED_NODES[] = { 
+const char* const SEED_NODES[] = {
   "explorer.parsicoin.net:17240",
   "wallet.parsicoin.net:17240",
   "pool.parsicoin.net:17240",
@@ -168,7 +168,7 @@ struct CheckpointData {
   const char* blockId;
 };
 
-const std::initializer_list<CheckpointData> CHECKPOINTS = { 
+const std::initializer_list<CheckpointData> CHECKPOINTS = {
   {1,	"b46fc8d77728e4e0092962864561c5cd1cd5eafba60cb2ef025e5ada4eb66faa" },
   {2,	"86dded9420cc94037fffa40205bc1e939994c9f77deba40212b417823a57ff27" },
   {3,	"90e8374d29bc23be19ee69cf5b97dc9551a5d5d8385de6a6443e196c102937d2" },
@@ -180,11 +180,9 @@ const std::initializer_list<CheckpointData> CHECKPOINTS = {
   {30000,	"aea4027bc9bd0bdacbc541286ee732dd2c541445a4cab2231ef03cb17812933a" },
   {40000,	"8ef378217b20e0570e3457be275c7600b82a8de52f73d2f8970c338ece869829" },
   {50000,	"1da4964d42c063a491aebd2ca9ef9e0bdbcc4cbee31bf3d5c633daccdbbb59f5" },
+  {60000,	"dc8a14fc8b039285dedbca628699608fb0bdbe1a8e3637a642005167308765ce" },
 };
 
 } // CryptoNote
 
 #define ALLOW_DEBUG_COMMANDS
-
-
-
diff --git a/src/parsicoin.rc b/src/parsicoin.rc
@@ -1,8 +1,8 @@
 #include <windows.h>
 
 1 VERSIONINFO
- FILEVERSION 3,0,0,0
- PRODUCTVERSION 3,0,0,0
+ FILEVERSION 3,0,2
+ PRODUCTVERSION 3,0,2
  FILEFLAGSMASK 0x3fL
  FILEFLAGS 0x0L
  FILEOS 0x40004L
@@ -15,12 +15,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "ParsiCoin Foundation"
             VALUE "FileDescription", "ParsiCoin network daemon"
-            VALUE "FileVersion", "3.0.0.0"
+            VALUE "FileVersion", "3.0.2"
             VALUE "InternalName", "parsicoind.exe"
             VALUE "LegalCopyright", "Copyright (C) 2018-2019, ParsiCoin Developers"
             VALUE "OriginalFilename", "parsicoind.exe"
             VALUE "ProductName", "ParsiCoin"
-            VALUE "ProductVersion", "3.0.0.0"
+            VALUE "ProductVersion", "3.0.2"
         END
     END
     BLOCK "VarFileInfo"

diff --git a/src/version.h.in b/src/version.h.in
@@ -1,4 +1,4 @@
 #define BUILD_COMMIT_ID "Stable"
 #define PROJECT_VERSION "3.0"
-#define PROJECT_VERSION_BUILD_NO "1"
+#define PROJECT_VERSION_BUILD_NO "2"
 #define PROJECT_VERSION_LONG PROJECT_VERSION "." PROJECT_VERSION_BUILD_NO " (" BUILD_COMMIT_ID ")"