Auto merge of #4289 - daira:remove-eos-workaround, r=ebfull
Remove temporary workaround for deprecation height. Signed-off-by: Daira Hopwood <daira@jacaranda.org>
This commit is contained in:
commit
1ac3e8fb82
|
@ -8,18 +8,9 @@
|
||||||
// Deprecation policy:
|
// Deprecation policy:
|
||||||
// * Shut down 16 weeks' worth of blocks after the estimated release block height.
|
// * 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.
|
// * 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 WEEKS_UNTIL_DEPRECATION = 16;
|
||||||
// static const int DEPRECATION_HEIGHT = APPROX_RELEASE_HEIGHT + (WEEKS_UNTIL_DEPRECATION * 7 * 24 * 24);
|
static const int DEPRECATION_HEIGHT = APPROX_RELEASE_HEIGHT + (WEEKS_UNTIL_DEPRECATION * 7 * 24 * 48);
|
||||||
|
|
||||||
// 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;
|
|
||||||
|
|
||||||
// Number of blocks before deprecation to warn users
|
// Number of blocks before deprecation to warn users
|
||||||
static const int DEPRECATION_WARN_LIMIT = 14 * 24 * 48; // 2 weeks
|
static const int DEPRECATION_WARN_LIMIT = 14 * 24 * 48; // 2 weeks
|
||||||
|
|
Loading…
Reference in New Issue