Skip to content

Commit ab603a1

Browse files
random-zebrarandom-zebra
committed
[Refactor] rename SporkKey to SporkPubKey
1 parent 899b4bd commit ab603a1

File tree

3 files changed

+11
-11
lines changed

3 files changed

+11
-11
lines changed

‎src/chainparams.cpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -240,8 +240,8 @@ class CMainParams : public CChainParams
240240

241241
nPoolMaxTransactions = 3;
242242
nBudgetCycleBlocks = 43200; //!< Amount of blocks in a months period of time (using 1 minutes per) = (60*24*30)
243-
strSporkKey = "040F129DE6546FE405995329A887329BED4321325B1A73B0A257423C05C1FCFE9E40EF0678AEF59036A22C42E61DFD29DF7EFB09F56CC73CADF64E05741880E3E7";
244-
strSporkKeyOld = "0499A7AF4806FC6DE640D23BC5936C29B77ADF2174B4F45492727F897AE63CF8D27B2F05040606E0D14B547916379FA10716E344E745F880EDC037307186AA25B7";
243+
strSporkPubKey = "040F129DE6546FE405995329A887329BED4321325B1A73B0A257423C05C1FCFE9E40EF0678AEF59036A22C42E61DFD29DF7EFB09F56CC73CADF64E05741880E3E7";
244+
strSporkPubKeyOld = "0499A7AF4806FC6DE640D23BC5936C29B77ADF2174B4F45492727F897AE63CF8D27B2F05040606E0D14B547916379FA10716E344E745F880EDC037307186AA25B7";
245245
strObfuscationPoolDummyAddress = "D87q2gC9j6nNrnzCsg4aY6bHMLsT9nUhEw";
246246
nStartMasternodePayments = 1403728576; //Wed, 25 Jun 2014 20:36:16 GMT
247247

@@ -355,8 +355,8 @@ class CTestNetParams : public CMainParams
355355

356356
nPoolMaxTransactions = 2;
357357
nBudgetCycleBlocks = 144; //!< Ten cycles per day on testnet
358-
strSporkKey = "04E88BB455E2A04E65FCC41D88CD367E9CCE1F5A409BE94D8C2B4B35D223DED9C8E2F4E061349BA3A38839282508066B6DC4DB72DD432AC4067991E6BF20176127";
359-
strSporkKeyOld = "04A8B319388C0F8588D238B9941DC26B26D3F9465266B368A051C5C100F79306A557780101FE2192FE170D7E6DEFDCBEE4C8D533396389C0DAFFDBC842B002243C";
358+
strSporkPubKey = "04E88BB455E2A04E65FCC41D88CD367E9CCE1F5A409BE94D8C2B4B35D223DED9C8E2F4E061349BA3A38839282508066B6DC4DB72DD432AC4067991E6BF20176127";
359+
strSporkPubKeyOld = "04A8B319388C0F8588D238B9941DC26B26D3F9465266B368A051C5C100F79306A557780101FE2192FE170D7E6DEFDCBEE4C8D533396389C0DAFFDBC842B002243C";
360360
strObfuscationPoolDummyAddress = "y57cqfGRkekRyDRNeJiLtYVEbvhXrNbmox";
361361
nStartMasternodePayments = 1420837558; //Fri, 09 Jan 2015 21:05:58 GMT
362362
nBudget_Fee_Confirmations = 3; // Number of confirmations for the finalization fee. We have to make this very short
@@ -437,7 +437,7 @@ class CRegTestParams : public CTestNetParams
437437
private key hex: bd4960dcbd9e7f2223f24e7164ecb6f1fe96fc3a416f5d3a830ba5720c84b8ca
438438
Address: yCvUVd72w7xpimf981m114FSFbmAmne7j9
439439
*/
440-
strSporkKey = "043969b1b0e6f327de37f297a015d37e2235eaaeeb3933deecd8162c075cee0207b13537618bde640879606001a8136091c62ec272dd0133424a178704e6e75bb7";
440+
strSporkPubKey = "043969b1b0e6f327de37f297a015d37e2235eaaeeb3933deecd8162c075cee0207b13537618bde640879606001a8136091c62ec272dd0133424a178704e6e75bb7";
441441
}
442442
const Checkpoints::CCheckpointData& Checkpoints() const
443443
{

‎src/chainparams.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -104,8 +104,8 @@ class CChainParams
104104
int64_t GetProposalEstablishmentTime() const { return nProposalEstablishmentTime; }
105105

106106
/** Spork key and Masternode Handling **/
107-
std::string SporkKey() const { return strSporkKey; }
108-
std::string SporkKeyOld() const { return strSporkKeyOld; }
107+
std::string SporkPubKey() const { return strSporkPubKey; }
108+
std::string SporkPubKeyOld() const { return strSporkPubKeyOld; }
109109
int64_t NewSporkStart() const { return nEnforceNewSporkKey; }
110110
int64_t RejectOldSporkKey() const { return nRejectOldSporkKey; }
111111
std::string ObfuscationPoolDummyAddress() const { return strObfuscationPoolDummyAddress; }
@@ -193,8 +193,8 @@ class CChainParams
193193
bool fHeadersFirstSyncingActive;
194194
int nPoolMaxTransactions;
195195
int nBudgetCycleBlocks;
196-
std::string strSporkKey;
197-
std::string strSporkKeyOld;
196+
std::string strSporkPubKey;
197+
std::string strSporkPubKeyOld;
198198
int64_t nEnforceNewSporkKey;
199199
int64_t nRejectOldSporkKey;
200200
std::string strObfuscationPoolDummyAddress;

‎src/spork.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ bool CSporkManager::CheckSignature(CSporkMessage& spork, bool fRequireNew)
177177
{
178178
//note: need to investigate why this is failing
179179
std::string strMessage = std::to_string(spork.nSporkID) + std::to_string(spork.nValue) + std::to_string(spork.nTimeSigned);
180-
CPubKey pubkeynew(ParseHex(Params().SporkKey()));
180+
CPubKey pubkeynew(ParseHex(Params().SporkPubKey()));
181181
std::string errorMessage = "";
182182

183183
bool fValidWithNewKey = obfuScationSigner.VerifyMessage(pubkeynew, spork.vchSig,strMessage, errorMessage);
@@ -187,7 +187,7 @@ bool CSporkManager::CheckSignature(CSporkMessage& spork, bool fRequireNew)
187187

188188
// See if window is open that allows for old spork key to sign messages
189189
if (!fValidWithNewKey && GetAdjustedTime() < Params().RejectOldSporkKey()) {
190-
CPubKey pubkeyold(ParseHex(Params().SporkKeyOld()));
190+
CPubKey pubkeyold(ParseHex(Params().SporkPubKeyOld()));
191191
return obfuScationSigner.VerifyMessage(pubkeyold, spork.vchSig, strMessage, errorMessage);
192192
}
193193

0 commit comments

Comments
 (0)