Here the updated diff I'm going to commit:
diff --git a/src/clientversion.h b/src/clientversion.h
index 6b23a4c..ba1f35d 100644
--- 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 1
#define CLIENT_VERSION_MINOR 3
-#define CLIENT_VERSION_REVISION 0
+#define CLIENT_VERSION_REVISION 1
#define CLIENT_VERSION_BUILD 0
// Set to true for release, false for prerelease or test build
diff --git a/src/main.cpp b/src/main.cpp
index 2a1cb00..69a1452 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1271,7 +1271,7 @@ const CBlockIndex* GetLastBlockIndexForAlgo(const CBlockIndex* pindex, int algo)
int64 static GetBlockValue(int nHeight, int64 nFees)
{
- int64 nSubsidy = 0;
+ int64 nSubsidy = 0.5 * COIN;
if (nHeight == 1) nSubsidy = 1400000 * COIN; // IPO block
else
if (nHeight <= 800) nSubsidy = 0.5 * COIN;
@@ -1285,6 +1285,8 @@ int64 static GetBlockValue(int nHeight, int64 nFees)
if (nHeight <= 40000) nSubsidy = 3 * COIN;
else
if (nHeight <= 626200) nSubsidy = 2 * COIN;
+ else
+ if (nHeight >= 630000 && nHeight <= 1329800) nSubsidy = 1 * COIN;
return nSubsidy + nFees;
}
diff --git a/src/version.h b/src/version.h
index 9d7402a..096f110 100644
--- a/src/version.h
+++ b/src/version.h
@@ -25,7 +25,7 @@ extern const std::string CLIENT_DATE;
// network protocol versioning
//
-static const int PROTOCOL_VERSION = 1004;
+static const int PROTOCOL_VERSION = 1005;
// earlier versions not supported as of Feb 2012, and are disconnected
static const int MIN_PROTO_VERSION = 1000;
NOTE: it will be pushed to
https://github.com/pallas1/joincoinNOTE2: I changed the start of 1 coin block reward from 629000 to 630000, as suggested
I will wait till tomorrow so everybody can comment, then if it's ok I'll push it to my repository, and we will have it built for all the platforms. Then we will notify the services.
