Merge pull request #259 from wowario/comment

comment out v16 fork
This commit is contained in:
jw 2020-05-19 11:51:20 -07:00 committed by GitHub
commit 1271a7e3a9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions

View file

@ -178,7 +178,7 @@
#define HF_VERSION_REJECT_SIGS_IN_COINBASE 15
#define HF_VERSION_ENFORCE_MIN_AGE 15
#define HF_VERSION_EFFECTIVE_SHORT_TERM_MEDIAN_IN_PENALTY 15
#define HF_VERSION_SHA3_POW 16 // Block 288,888 ~8 February 2021
#define HF_VERSION_SHA3_POW 16 // Block 288,888 ~8 February 2021, depends on availability of open source sha-3 fpga designs
#define PER_KB_FEE_QUANTIZATION_DECIMALS 8

View file

@ -41,7 +41,7 @@ const hardfork_t mainnet_hard_forks[] = {
{ 13, 114969, 0, 1559292691 },
{ 14, 115257, 0, 1559292774 },
{ 15, 160777, 0, 1573280497 },
{ 16, 288888, 0, 1589210508 },
//{ 16, 288888, 0, 1589210508 },
};
const size_t num_mainnet_hard_forks = sizeof(mainnet_hard_forks) / sizeof(mainnet_hard_forks[0]);