From 6d1742f65c5f0dec5bc2915558cee7a9b93608b9 Mon Sep 17 00:00:00 2001 From: quarkonium Date: Sun, 27 May 2018 17:30:16 +0200 Subject: [PATCH] shade, block update --- src/main.h | 2 +- src/version.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main.h b/src/main.h index d22e94bd..9c804836 100644 --- a/src/main.h +++ b/src/main.h @@ -74,7 +74,7 @@ static const uint256 hashGenesisBlock("0x00000afad2d5833b50b59a9784fdc59869b6886 static const uint256 hashGenesisBlockTestNet("5f97300cd3dc3d2215dd38ce6d99bf7d5984bb62b2777060d3b5564298bd5484"); static const uint256 hashGenesisMerkleRoot("0xcd5029ac01fb6cd7da8ff00ff1e82f3aca6bf3ecce5fb60623ee807fa83d1795"); -const int SHADE_FEATURE_UPDATE = 75 * 500 + 1854426; +const int SHADE_FEATURE_UPDATE = 75 * 500 + 1860837; inline bool IsProtocolV2(int nHeight) { return nHeight > 65000; } inline bool V3(int nHeight) { return fTestNet ? nHeight >= 10 : nHeight >= 1625000; } diff --git a/src/version.cpp b/src/version.cpp index 5419f405..2374471e 100644 --- a/src/version.cpp +++ b/src/version.cpp @@ -36,7 +36,7 @@ const std::string CLIENT_NAME("Satoshi"); // git will put "#define GIT_ARCHIVE 1" on the next line inside archives. #define GIT_ARCHIVE 1 #ifdef GIT_ARCHIVE -# define GIT_COMMIT_ID "de2f9bb" +# define GIT_COMMIT_ID "fd13958" # define GIT_COMMIT_DATE "$Format:%cD" #endif