diff --git a/doc/release-notes.md b/doc/release-notes.md --- a/doc/release-notes.md +++ b/doc/release-notes.md @@ -8,6 +8,7 @@ it returns the active commands and the corresponding execution time. - `ischange` field of boolean type that shows if an address was used for change output was added to `getaddressinfo` method response. +- Bump automatic replay protection to Nov 2020 upgrade. New RPC methods diff --git a/src/chainparams.cpp b/src/chainparams.cpp --- a/src/chainparams.cpp +++ b/src/chainparams.cpp @@ -174,6 +174,9 @@ // May 15, 2020 12:00:00 UTC protocol upgrade consensus.phononActivationTime = 1589544000; + // Nov 15, 2020 12:00:00 UTC protocol upgrade + consensus.axionActivationTime = 1605441600; + /** * The message start string is designed to be unlikely to occur in * normal data. The characters are rarely used upper ASCII, not valid as @@ -398,6 +401,9 @@ // May 15, 2020 12:00:00 UTC protocol upgrade consensus.phononActivationTime = 1589544000; + // Nov 15, 2020 12:00:00 UTC protocol upgrade + consensus.axionActivationTime = 1605441600; + diskMagic[0] = 0x0b; diskMagic[1] = 0x11; diskMagic[2] = 0x09; @@ -573,6 +579,9 @@ // May 15, 2020 12:00:00 UTC protocol upgrade consensus.phononActivationTime = 1589544000; + // Nov 15, 2020 12:00:00 UTC protocol upgrade + consensus.axionActivationTime = 1605441600; + diskMagic[0] = 0xfa; diskMagic[1] = 0xbf; diskMagic[2] = 0xb5; diff --git a/src/consensus/params.h b/src/consensus/params.h --- a/src/consensus/params.h +++ b/src/consensus/params.h @@ -84,6 +84,8 @@ int gravitonHeight; /** Unix time used for MTP activation of 15 May 2020 12:00:00 UTC upgrade */ int phononActivationTime; + /** Unix time used for MTP activation of 15 Nov 2020 12:00:00 UTC upgrade */ + int axionActivationTime; /** * Don't warn about unknown BIP 9 activations below this height. diff --git a/src/validation.cpp b/src/validation.cpp --- a/src/validation.cpp +++ b/src/validation.cpp @@ -464,7 +464,7 @@ static bool IsReplayProtectionEnabled(const Consensus::Params ¶ms, int64_t nMedianTimePast) { return nMedianTimePast >= gArgs.GetArg("-replayprotectionactivationtime", - params.phononActivationTime); + params.axionActivationTime); } static bool IsReplayProtectionEnabled(const Consensus::Params ¶ms,