sikkienl/dash
1
0
Fork 0
mirror of https://github.com/dashpay/dash.git synced 2024-12-27 21:12:48 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Chainparams: Decouple CAlert from CChainParams

Browse Source
This commit is contained in:
Jorge Timón 2015-04-03 17:42:06 +02:00
parent 2dc679d22f
commit f14e687feb
4 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/alert.cpp
View File

@ -5,7 +5,6 @@
#include "alert.h" #include "alert.h"
#include "chainparams.h"
#include "clientversion.h" #include "clientversion.h"
#include "net.h" #include "net.h"
#include "pubkey.h" #include "pubkey.h"
@ -145,9 +144,9 @@ bool CAlert::RelayTo(CNode* pnode) const
return false; return false;
} }
bool CAlert::CheckSignature() const bool CAlert::CheckSignature(const std::vector<unsigned char>& alertKey) const
{ {
CPubKey key(Params().AlertKey()); CPubKey key(alertKey);
if (!key.Verify(Hash(vchMsg.begin(), vchMsg.end()), vchSig)) if (!key.Verify(Hash(vchMsg.begin(), vchMsg.end()), vchSig))
return error("CAlert::CheckSignature(): verify signature failed"); return error("CAlert::CheckSignature(): verify signature failed");
@ -169,9 +168,9 @@ CAlert CAlert::getAlertByHash(const uint256 &hash)
return retval; return retval;
} }
bool CAlert::ProcessAlert(bool fThread) bool CAlert::ProcessAlert(const std::vector<unsigned char>& alertKey, bool fThread)
{ {
if (!CheckSignature()) if (!CheckSignature(alertKey))
return false; return false;
if (!IsInEffect()) if (!IsInEffect())
return false; return false;

4
src/alert.h
View File

@ -100,8 +100,8 @@ public:
bool AppliesTo(int nVersion, std::string strSubVerIn) const; bool AppliesTo(int nVersion, std::string strSubVerIn) const;
bool AppliesToMe() const; bool AppliesToMe() const;
bool RelayTo(CNode* pnode) const; bool RelayTo(CNode* pnode) const;
bool CheckSignature() const; bool CheckSignature(const std::vector<unsigned char>& alertKey) const;
bool ProcessAlert(bool fThread = true); // fThread means run -alertnotify in a free-running thread bool ProcessAlert(const std::vector<unsigned char>& alertKey, bool fThread = true); // fThread means run -alertnotify in a free-running thread
static void Notify(const std::string& strMessage, bool fThread); static void Notify(const std::string& strMessage, bool fThread);
/* /*

2
src/main.cpp
View File

@ -4262,7 +4262,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
uint256 alertHash = alert.GetHash(); uint256 alertHash = alert.GetHash();
if (pfrom->setKnown.count(alertHash) == 0) if (pfrom->setKnown.count(alertHash) == 0)
{ {
if (alert.ProcessAlert()) if (alert.ProcessAlert(Params().AlertKey()))
{ {
// Relay // Relay
pfrom->setKnown.insert(alertHash); pfrom->setKnown.insert(alertHash);

7
src/test/alert_tests.cpp
View File

@ -10,6 +10,7 @@
#include "clientversion.h" #include "clientversion.h"
#include "data/alertTests.raw.h" #include "data/alertTests.raw.h"
#include "chainparams.h"
#include "serialize.h" #include "serialize.h"
#include "streams.h" #include "streams.h"
#include "util.h" #include "util.h"
@ -119,10 +120,11 @@ BOOST_FIXTURE_TEST_SUITE(Alert_tests, ReadAlerts)
BOOST_AUTO_TEST_CASE(AlertApplies) BOOST_AUTO_TEST_CASE(AlertApplies)
{ {
SetMockTime(11); SetMockTime(11);
const std::vector<unsigned char>& alertKey = Params(CBaseChainParams::MAIN).AlertKey();
BOOST_FOREACH(const CAlert& alert, alerts) BOOST_FOREACH(const CAlert& alert, alerts)
{ {
BOOST_CHECK(alert.CheckSignature()); BOOST_CHECK(alert.CheckSignature(alertKey));
} }
BOOST_CHECK(alerts.size() >= 3); BOOST_CHECK(alerts.size() >= 3);
@ -159,6 +161,7 @@ BOOST_AUTO_TEST_CASE(AlertApplies)
BOOST_AUTO_TEST_CASE(AlertNotify) BOOST_AUTO_TEST_CASE(AlertNotify)
{ {
SetMockTime(11); SetMockTime(11);
const std::vector<unsigned char>& alertKey = Params(CBaseChainParams::MAIN).AlertKey();
boost::filesystem::path temp = GetTempPath() / "alertnotify.txt"; boost::filesystem::path temp = GetTempPath() / "alertnotify.txt";
boost::filesystem::remove(temp); boost::filesystem::remove(temp);
@ -166,7 +169,7 @@ BOOST_AUTO_TEST_CASE(AlertNotify)
mapArgs["-alertnotify"] = std::string("echo %s >> ") + temp.string(); mapArgs["-alertnotify"] = std::string("echo %s >> ") + temp.string();
BOOST_FOREACH(CAlert alert, alerts) BOOST_FOREACH(CAlert alert, alerts)
alert.ProcessAlert(false); alert.ProcessAlert(alertKey, false);
std::vector<std::string> r = read_lines(temp); std::vector<std::string> r = read_lines(temp);
BOOST_CHECK_EQUAL(r.size(), 4u); BOOST_CHECK_EQUAL(r.size(), 4u);