fix-

galorecoin · Mar 5, 2019 · 85e1f4e · 85e1f4e
1 parent 8ca63ac
commit 85e1f4e
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 13 deletions.
diff --git a/src/main.cpp b/src/main.cpp
@@ -1360,12 +1360,12 @@ int64_t GetProofOfWorkReward(int nHeight, int64_t nFees)
     int64_t nSubsidy = 0 * COIN;
 
     if (nHeight == 1) {
-        nSubsidy = 2500 * COIN; // premine
+        nSubsidy = 0.01 * COIN; // premine
     }
-    else if (nHeight >= 2 && nHeight < 11) {
-        nSubsidy = 2500 * COIN; // premine
+    else if (nHeight >= 2 && nHeight < 3) {
+        nSubsidy = 25000 * COIN; // premine
     }
-    else if (nHeight >= 11 && nHeight < 91)    { nSubsidy = 0.1 * COIN; }
+    else if (nHeight >= 3 && nHeight < 91)    { nSubsidy = 0.1 * COIN; }
 
     else if (nHeight >= 91 && nHeight < 1000)    { nSubsidy = 0.01 * COIN; }
 

diff --git a/src/version.cpp b/src/version.cpp
@@ -31,7 +31,7 @@ const std::string CLIENT_NAME("Galore");
 // git will put "#define GIT_ARCHIVE 1" on the next line inside archives. 
 #define GIT_ARCHIVE 1
 #ifdef GIT_ARCHIVE
-#    define GIT_COMMIT_ID "60003"
+#    define GIT_COMMIT_ID "60004"
 #endif
 
 #define BUILD_DESC_FROM_COMMIT(maj,min,rev,build,commit) \

diff --git a/src/version.h b/src/version.h
@@ -30,37 +30,37 @@ static const int DATABASE_VERSION = 70509;
 // network protocol versioning
 //
 
-static const int PROTOCOL_VERSION = 60003;
+static const int PROTOCOL_VERSION = 60004;
 
 // intial proto version, to be increased after version/verack negotiation
 static const int INIT_PROTO_VERSION = 209;
 
 // disconnect from peers older than this proto version
-static const int MIN_PEER_PROTO_VERSION = 60003;
+static const int MIN_PEER_PROTO_VERSION = 60004;
 
 // minimum peer version accepted by DarkSendPool
-static const int MIN_POOL_PEER_PROTO_VERSION = 60003; 
+static const int MIN_POOL_PEER_PROTO_VERSION = 60004; 
 
-static const int MIN_INSTANTX_PROTO_VERSION = 60003;
+static const int MIN_INSTANTX_PROTO_VERSION = 60004;
 
 //! minimum peer version that can receive masternode payments
 // V1 - Last protocol version before update
 // V2 - Newest protocol version
-static const int MIN_MASTERNODE_PAYMENT_PROTO_VERSION_1 = 60003;
-static const int MIN_MASTERNODE_PAYMENT_PROTO_VERSION_2 = 60003;
+static const int MIN_MASTERNODE_PAYMENT_PROTO_VERSION_1 = 60004;
+static const int MIN_MASTERNODE_PAYMENT_PROTO_VERSION_2 = 60004;
 
 // 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;
 
 // only request blocks from nodes outside this range of versions
 static const int NOBLKS_VERSION_START = 0;
-static const int NOBLKS_VERSION_END = 60003;
+static const int NOBLKS_VERSION_END = 60004;
 
 // BIP 0031, pong message, is enabled for all versions AFTER this one
 static const int BIP0031_VERSION = 60000;
 
 // "mempool" command, enhanced "getdata" behavior starts with this version:
-static const int MEMPOOL_GD_VERSION = 60003;
+static const int MEMPOOL_GD_VERSION = 60004;
 
 #endif