From 2e6f856822e4cc69a9bdf40e48eaea353fed2f04 Mon Sep 17 00:00:00 2001 From: random-zebra Date: Fri, 18 Dec 2020 13:50:06 +0100 Subject: [PATCH 1/2] Consensus: update spork keys for v5 --- src/chainparams.cpp | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/src/chainparams.cpp b/src/chainparams.cpp index 874e501abffa..37b2f540c587 100644 --- a/src/chainparams.cpp +++ b/src/chainparams.cpp @@ -153,10 +153,10 @@ class CMainParams : public CChainParams consensus.nTimeSlotLength = 15; // spork keys - consensus.strSporkPubKey = "040F129DE6546FE405995329A887329BED4321325B1A73B0A257423C05C1FCFE9E40EF0678AEF59036A22C42E61DFD29DF7EFB09F56CC73CADF64E05741880E3E7"; - consensus.strSporkPubKeyOld = "0499A7AF4806FC6DE640D23BC5936C29B77ADF2174B4F45492727F897AE63CF8D27B2F05040606E0D14B547916379FA10716E344E745F880EDC037307186AA25B7"; - consensus.nTime_EnforceNewSporkKey = 1566860400; //!> August 26, 2019 11:00:00 PM GMT - consensus.nTime_RejectOldSporkKey = 1569538800; //!> September 26, 2019 11:00:00 PM GMT + consensus.strSporkPubKey = "0410050aa740d280b134b40b40658781fc1116ba7700764e0ce27af3e1737586b3257d19232e0cb5084947f5107e44bcd577f126c9eb4a30ea2807b271d2145298"; + consensus.strSporkPubKeyOld = "040F129DE6546FE405995329A887329BED4321325B1A73B0A257423C05C1FCFE9E40EF0678AEF59036A22C42E61DFD29DF7EFB09F56CC73CADF64E05741880E3E7"; + consensus.nTime_EnforceNewSporkKey = 1608512400; //!> December 21, 2020 01:00:00 AM GMT + consensus.nTime_RejectOldSporkKey = 1614560400; //!> March 1, 2021 01:00:00 AM GMT // height-based activations consensus.height_last_ZC_AccumCheckpoint = 1686240; @@ -292,10 +292,8 @@ class CTestNetParams : public CMainParams consensus.nTimeSlotLength = 15; // spork keys - consensus.strSporkPubKey = "04E88BB455E2A04E65FCC41D88CD367E9CCE1F5A409BE94D8C2B4B35D223DED9C8E2F4E061349BA3A38839282508066B6DC4DB72DD432AC4067991E6BF20176127"; - consensus.strSporkPubKeyOld = "04A8B319388C0F8588D238B9941DC26B26D3F9465266B368A051C5C100F79306A557780101FE2192FE170D7E6DEFDCBEE4C8D533396389C0DAFFDBC842B002243C"; - consensus.nTime_EnforceNewSporkKey = 1566860400; //!> August 26, 2019 11:00:00 PM GMT - consensus.nTime_RejectOldSporkKey = 1569538800; //!> September 26, 2019 11:00:00 PM GMT + consensus.strSporkPubKey = "04677c34726c491117265f4b1c83cef085684f36c8df5a97a3a42fc499316d0c4e63959c9eca0dba239d9aaaf72011afffeb3ef9f51b9017811dec686e412eb504"; + consensus.strSporkPubKeyOld = "04E88BB455E2A04E65FCC41D88CD367E9CCE1F5A409BE94D8C2B4B35D223DED9C8E2F4E061349BA3A38839282508066B6DC4DB72DD432AC4067991E6BF20176127"; // height based activations consensus.height_last_ZC_AccumCheckpoint = 1106090; From 2fc2d8fb221f2beb4bf8114811eed2e52a726c99 Mon Sep 17 00:00:00 2001 From: random-zebra Date: Fri, 18 Dec 2020 14:03:38 +0100 Subject: [PATCH 2/2] Consensus: Allow setting old spork key before its expiration --- src/spork.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/spork.cpp b/src/spork.cpp index 45ab0243b96f..10894f0c7e1c 100644 --- a/src/spork.cpp +++ b/src/spork.cpp @@ -268,9 +268,8 @@ bool CSporkManager::SetPrivKey(std::string strPrivKey) spork.Sign(strPrivKey); - const bool fRequireNew = GetTime() >= Params().GetConsensus().nTime_EnforceNewSporkKey; bool fValidSig = spork.CheckSignature(); - if (!fValidSig && !fRequireNew) { + if (!fValidSig) { // See if window is open that allows for old spork key to sign messages if (GetAdjustedTime() < Params().GetConsensus().nTime_RejectOldSporkKey) { CPubKey pubkeyold = spork.GetPublicKeyOld();