From d2fcec54139a70cdd272e45d207098a39175a45b Mon Sep 17 00:00:00 2001 From: wowario Date: Sun, 27 Jun 2021 02:42:04 +0300 Subject: [PATCH] update fork height --- README.md | 2 +- src/cryptonote_config.h | 2 +- src/hardforks/hardforks.cpp | 3 +-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 38e65e7ed..44914c0da 100644 --- a/README.md +++ b/README.md @@ -91,7 +91,7 @@ Dates are provided in the format YYYY-MM-DD. | 160,777 | 2019-11-20 | Gaping Goatse | v0.7.0.0 | v0.7.1.0 | Only allow >= 2 outputs, change to the block median used to calculate penalty, rct sigs in coinbase forbidden, 4 unlock time as protocol rule | - | 2020-06-28 | Hallucinogenic Hypnotoad | v0.8.0.0 | v0.8.0.2 | Dandelion++ support | 253,999 | 2020-10-09 | Illiterate Illuminati | v0.9.0.0 | v0.9.3.3 | Dynamic coinbase unlock (up to 1 mo.), Deterministic unlock times, Enforce maximum coinbase amount, show_qr_code wallet command, CLSAG -| 331,176 | 2021-07-04 | Junkie Jeff | v0.10.0.0 | v0.10.0.0 | Miner Block Header Signing, Vote by Block, Change coinbase unlock time to 1 day, Reset difficulty and switch back to Monero's difficulty algorithm +| 331,170 | 2021-07-04 | Junkie Jeff | v0.10.0.0 | v0.10.0.0 | Miner Block Header Signing, Vote by Block, Change coinbase unlock time to 1 day, Reset difficulty and switch back to Monero's difficulty algorithm X's indicate that these details have not been determined as of commit date. diff --git a/src/cryptonote_config.h b/src/cryptonote_config.h index 5182984e4..0c4253c36 100644 --- a/src/cryptonote_config.h +++ b/src/cryptonote_config.h @@ -90,7 +90,7 @@ #define DIFFICULTY_BLOCKS_COUNT_V3 DIFFICULTY_WINDOW_V3 + 1 // added +1 to make N=N #define DIFFICULTY_BLOCKS_COUNT_V2 DIFFICULTY_WINDOW_V2 + 1 // added +1 to make N=N #define DIFFICULTY_BLOCKS_COUNT DIFFICULTY_WINDOW + DIFFICULTY_LAG -#define DIFFICULTY_RESET_HEIGHT 331176// ~July 4, 2021 Pool Independence Day +#define DIFFICULTY_RESET_HEIGHT 331170// ~July 4, 2021 Pool Independence Day #define DIFFICULTY_RESET_LEVEL 100000000 // 100 mill diff --git a/src/hardforks/hardforks.cpp b/src/hardforks/hardforks.cpp index b7185b333..40251b7ca 100644 --- a/src/hardforks/hardforks.cpp +++ b/src/hardforks/hardforks.cpp @@ -43,8 +43,7 @@ const hardfork_t mainnet_hard_forks[] = { { 15, 160777, 0, 1573280497 }, { 16, 253999, 0, 1600576508 }, { 17, 254287, 0, 1600576524 }, - { 18, 331176, 0, 1623245591 }, - { 19, 331464, 0, 1623693101 }, + { 18, 331170, 0, 1623245591 }, }; const size_t num_mainnet_hard_forks = sizeof(mainnet_hard_forks) / sizeof(mainnet_hard_forks[0]);