Prepping updates

RaptureCore · Feb 21, 2018 · a0eed65 · a0eed65
1 parent 89a3ba7
commit a0eed65
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 4 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,6 +2,7 @@
 *.sublime-workspace
 todo.txt
 reset-files.bash
+*.kate-swp
 
 *.tar.gz
 

diff --git a/qa/rpc-tests/test_framework/mininode.py b/qa/rpc-tests/test_framework/mininode.py
@@ -35,7 +35,7 @@
 import rapture_hash
 
 BIP0031_VERSION = 60000
-MY_VERSION = 70208  # current MIN_PEER_PROTO_VERSION
+MY_VERSION = 70209  # current MIN_PEER_PROTO_VERSION
 MY_SUBVERSION = b"/python-mininode-tester:0.0.2/"
 
 MAX_INV_SZ = 50000

diff --git a/src/.version.h.kate-swp b/src/.version.h.kate-swp
diff --git a/src/validation.cpp b/src/validation.cpp
@@ -1278,7 +1278,8 @@ CAmount GetBlockSubsidy(int nPrevBits, int nPrevHeight, const Consensus::Params&
 CAmount GetMasternodePayment(int nHeight, CAmount blockValue)
 {
     CAmount ret = blockValue/4; // start at 25%
-    if(nHeight > 2000) ret = blockValue / 2 ;
+    if(nHeight > 2000) ret = blockValue / 2;
+ // if(nHeight > 28000) ret = blockValue / 1.27;
     return ret;
 }
 

diff --git a/src/version.h b/src/version.h
@@ -10,7 +10,7 @@
  * network protocol versioning
  */
 
-static const int PROTOCOL_VERSION = 70208;
+static const int PROTOCOL_VERSION = 70209;
 
 //! initial proto version, to be increased after version/verack negotiation
 static const int INIT_PROTO_VERSION = 209;
@@ -19,7 +19,7 @@ static const int INIT_PROTO_VERSION = 209;
 static const int GETHEADERS_VERSION = 70077;
 
 //! disconnect from peers older than this proto version
-static const int MIN_PEER_PROTO_VERSION = 70208;
+static const int MIN_PEER_PROTO_VERSION = 70209;
 
 //! nTime field added to CAddress, starting with this version;
 //! if possible, avoid requesting addresses nodes older than this