From f91aa8bd997eda5af2d2aa4dc7ee6c2341fa307d Mon Sep 17 00:00:00 2001 From: BtcDrak Date: Sun, 6 Mar 2016 10:38:53 +0000 Subject: [PATCH] Remove alert keys --- src/chainparams.cpp | 11 ++++------- src/chainparams.h | 3 --- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/src/chainparams.cpp b/src/chainparams.cpp index 611ca5f48..36d5e6032 100644 --- a/src/chainparams.cpp +++ b/src/chainparams.cpp @@ -126,7 +126,6 @@ public: pchMessageStart[1] = 0x35; pchMessageStart[2] = 0x22; pchMessageStart[3] = 0x05; - vAlertPubKey = ParseHex("0486bce1bac0d543f104cbff2bd23680056a3b9ea05e1137d2ff90eeb5e08472eb500322593a2cb06fbf8297d7beb6cd30cb90f98153b5b7cce1493749e41e0284"); nDefaultPort = 15714; nMaxTipAge = 24 * 60 * 60; nPruneAfterHeight = 100000; @@ -224,7 +223,6 @@ public: pchMessageStart[1] = 0xf2; pchMessageStart[2] = 0xc0; pchMessageStart[3] = 0xef; - vAlertPubKey = ParseHex("0471dc165db490094d35cde15b1f5d755fa6ad6f2b5ed0f340e3f17f57389c3c2af113a8cbcc885bde73305a553b5640c83021128008ddf882e856336269080496"); nDefaultPort = 25714; nMaxTipAge = 0x7fffffff; nPruneAfterHeight = 1000; @@ -291,10 +289,10 @@ public: consensus.vDeployments[Consensus::DEPLOYMENT_TESTDUMMY].nStartTime = 1199145601; // January 1, 2008 consensus.vDeployments[Consensus::DEPLOYMENT_TESTDUMMY].nTimeout = 1230767999; // December 31, 2008 - // Deployment of BIP68, BIP112, and BIP113. -// consensus.vDeployments[Consensus::DEPLOYMENT_CSV].bit = 0; -// consensus.vDeployments[Consensus::DEPLOYMENT_CSV].nStartTime = 999999999999ULL; // never -// consensus.vDeployments[Consensus::DEPLOYMENT_CSV].nTimeout = 0; // out of time +// Deployment of BIP68, BIP112, and BIP113. +// consensus.vDeployments[Consensus::DEPLOYMENT_CSV].bit = 0; +// consensus.vDeployments[Consensus::DEPLOYMENT_CSV].nStartTime = 999999999999ULL; // never +// consensus.vDeployments[Consensus::DEPLOYMENT_CSV].nTimeout = 0; // out of time consensus.nProtocolV1RetargetingFixedTime = 1400000000; consensus.nProtocolV2Time = 1410000000; @@ -311,7 +309,6 @@ public: pchMessageStart[1] = 0x35; pchMessageStart[2] = 0x22; pchMessageStart[3] = 0x06; - vAlertPubKey = ParseHex("042508124261e3c969d9b4988349c41a329c6979e446facffc3227e16e5420c366e7d917e8ef80e70a27b90582272c93b6d0f16b0c728b970f73478167729cbbea"); nDefaultPort = 25714; nMaxTipAge = 0x7fffffff; nPruneAfterHeight = 100000; diff --git a/src/chainparams.h b/src/chainparams.h index 03b51616f..4cd13bd41 100644 --- a/src/chainparams.h +++ b/src/chainparams.h @@ -54,7 +54,6 @@ public: const Consensus::Params& GetConsensus() const { return consensus; } const CMessageHeader::MessageStartChars& MessageStart() const { return pchMessageStart; } - const std::vector& AlertKey() const { return vAlertPubKey; } int GetDefaultPort() const { return nDefaultPort; } const CBlock& GenesisBlock() const { return genesis; } @@ -83,8 +82,6 @@ protected: Consensus::Params consensus; CMessageHeader::MessageStartChars pchMessageStart; - //! Raw pub key bytes for the broadcast alert signing key. - std::vector vAlertPubKey; int nDefaultPort; long nMaxTipAge; uint64_t nPruneAfterHeight;