Skip to content

Commit

Permalink
shade, block update
Browse files Browse the repository at this point in the history
  • Loading branch information
quarkonium committed May 27, 2018
1 parent fd13958 commit 6d1742f
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion src/main.h
Original file line number Diff line number Diff line change
Expand Up @@ -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; }
Expand Down
2 changes: 1 addition & 1 deletion src/version.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down

0 comments on commit 6d1742f

Please sign in to comment.