From 7eb5c49d321a2f67759d6ec1b6e696383aa90bae Mon Sep 17 00:00:00 2001 From: Daira Hopwood Date: Wed, 8 Jan 2020 06:14:05 +0000 Subject: [PATCH] Remove temporary workaround for deprecation height. Signed-off-by: Daira Hopwood --- src/deprecation.h | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/src/deprecation.h b/src/deprecation.h index a6986dddb..b98e181f2 100644 --- a/src/deprecation.h +++ b/src/deprecation.h @@ -8,18 +8,9 @@ // Deprecation policy: // * Shut down 16 weeks' worth of blocks after the estimated release block height. // * A warning is shown during the 2 weeks' worth of blocks prior to shut down. -static const int APPROX_RELEASE_HEIGHT = 684782; +static const int APPROX_RELEASE_HEIGHT = 684936; static const int WEEKS_UNTIL_DEPRECATION = 16; -// static const int DEPRECATION_HEIGHT = APPROX_RELEASE_HEIGHT + (WEEKS_UNTIL_DEPRECATION * 7 * 24 * 24); - -// TEMPORARY! -// This is hardcoded to a height that is roughly 10 weeks following the -// activation of Blossom on mainnet, which is itself almost 6 weeks following -// this release. This is done because the calculation of the deprecation height -// does not account for the change in block target spacing; after Blossom has -// activated, this should be removed and the previous line fixed to use -// APPROX_RELEASE_HEIGHT + (WEEKS_UNTIL_DEPRECATION * 7 * 24 * 48) -static const int DEPRECATION_HEIGHT = 734240; +static const int DEPRECATION_HEIGHT = APPROX_RELEASE_HEIGHT + (WEEKS_UNTIL_DEPRECATION * 7 * 24 * 48); // Number of blocks before deprecation to warn users static const int DEPRECATION_WARN_LIMIT = 14 * 24 * 48; // 2 weeks