1.0.0.2-60005

galorecoin · Apr 8, 2019 · 079f311 · 079f311
1 parent 85e1f4e
commit 079f311
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 13 deletions.
diff --git a/src/clientversion.h b/src/clientversion.h
@@ -9,7 +9,7 @@
 #define CLIENT_VERSION_MAJOR       1
 #define CLIENT_VERSION_MINOR       0
 #define CLIENT_VERSION_REVISION    0
-#define CLIENT_VERSION_BUILD       1
+#define CLIENT_VERSION_BUILD       2
 
 // Set to true for release, false for prerelease or test build
 #define CLIENT_VERSION_IS_RELEASE  true

diff --git a/src/main.cpp b/src/main.cpp
@@ -4549,7 +4549,18 @@ bool SendMessages(CNode* pto, bool fSendTrickle)
 
 int64_t GetMasternodePayment(int nHeight, int64_t blockValue)
 {
-    int64_t ret = blockValue * 4/5;
+    int64_t ret;
+
+    if(nHeight < 60000) {
+        ret = blockValue * 4/5;
+    }
+    else if (nHeight >= 60000 && nHeight < 120000) {
+        ret = blockValue * 17/20;
+    }
+    else {
+        ret = blockValue * 9/10;
+    }
+
 
     return ret;
 }
diff --git a/src/main.h b/src/main.h
@@ -83,8 +83,9 @@ static const unsigned char REJECT_INVALID = 0x10;
 //  inline int64_t GetMNCollateral(int nHeight) { return 4000; }
 inline int64_t GetMNCollateral(int nHeight) { 
     if(nHeight < 50000) return 1000; 
-    else if(nHeight < 100000) return 3000; 
-    else return 5000;
+    else if(nHeight < 60000) return 3000; 
+    else if(nHeight < 120000) return 10000; 
+    else return 15000;
 }
 
 extern CScript COINBASE_FLAGS;

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 "60004"
+#    define GIT_COMMIT_ID "60005"
 #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 = 60004;
+static const int PROTOCOL_VERSION = 60005;
 
 // 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 = 60004;
+static const int MIN_PEER_PROTO_VERSION = 60005;
 
 // minimum peer version accepted by DarkSendPool
-static const int MIN_POOL_PEER_PROTO_VERSION = 60004; 
+static const int MIN_POOL_PEER_PROTO_VERSION = 60005; 
 
-static const int MIN_INSTANTX_PROTO_VERSION = 60004;
+static const int MIN_INSTANTX_PROTO_VERSION = 60005;
 
 //! 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 = 60004;
-static const int MIN_MASTERNODE_PAYMENT_PROTO_VERSION_2 = 60004;
+static const int MIN_MASTERNODE_PAYMENT_PROTO_VERSION_1 = 60005;
+static const int MIN_MASTERNODE_PAYMENT_PROTO_VERSION_2 = 60005;
 
 // 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 = 60004;
+static const int NOBLKS_VERSION_END = 60005;
 
 // 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 = 60004;
+static const int MEMPOOL_GD_VERSION = 60005;
 
 #endif