ARCHIVE/rippled
1
0
Fork 0
mirror of https://github.com/XRPLF/rippled.git synced 2025-12-05 16:57:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Write back feature majority times. Mark a FIXME.

Browse Source
This commit is contained in:
JoelKatz
2013-05-29 13:04:05 -07:00
parent 76358edc31
commit d5b1970ab3
1 changed files with 22 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/cpp/ripple/FeatureTable.cpp
View File

@@ -193,7 +193,22 @@ void FeatureTable::reportValidations(const FeatureSet& set)
if (!changedFeatures.empty()) if (!changedFeatures.empty())
{ {
// WRITEME write changed features to SQL db ScopedLock sl(theApp->getWalletDB()->getDBLock());
Database* db = theApp->getWalletDB()->getDB();
db->executeSQL("BEGIN TRANSACTION;");
BOOST_FOREACH(const uint256& hash, changedFeatures)
{
FeatureState& fState = mFeatureMap[hash];
db->executeSQL(boost::str(boost::format(
"UPDATE Features SET FirstMajority = %d WHERE Hash = '%s';"
) % fState.mFirstMajority % hash.GetHex()));
db->executeSQL(boost::str(boost::format(
"UPDATE Features SET LastMajority = %d WHERE Hash = '%s';"
) % fState.mLastMajority % hash.GetHex()));
}
db->executeSQL("END TRANSACTION;");
changedFeatures.clear();
} }
} }
@@ -246,12 +261,12 @@ void FeatureTable::doVoting(Ledger::ref lastClosedLedger, SHAMap::ref initialPos
BOOST_FOREACH(const uint256& uFeature, lFeatures) BOOST_FOREACH(const uint256& uFeature, lFeatures)
{ {
WriteLog (lsWARNING, FeatureTable) << "We are voting for feature " << uFeature; WriteLog (lsWARNING, FeatureTable) << "Voting for feature: " << uFeature;
SerializedTransaction trans(ttFEATURE); SerializedTransaction trans(ttFEATURE);
trans.setFieldAccount(sfAccount, uint160()); trans.setFieldAccount(sfAccount, uint160());
trans.setFieldH256(sfFeature, uFeature); trans.setFieldH256(sfFeature, uFeature);
uint256 txID = trans.getTransactionID(); uint256 txID = trans.getTransactionID();
WriteLog (lsWARNING, FeatureTable) << "Vote: " << txID; WriteLog (lsWARNING, FeatureTable) << "Vote ID: " << txID;
Serializer s; Serializer s;
trans.add(s, true); trans.add(s, true);
@@ -271,7 +286,7 @@ Json::Value FeatureTable::getJson(int)
boost::mutex::scoped_lock sl(mMutex); boost::mutex::scoped_lock sl(mMutex);
BOOST_FOREACH(const featureIt_t& it, mFeatureMap) BOOST_FOREACH(const featureIt_t& it, mFeatureMap)
{ {
Json::Value v(Json::objectValue); Json::Value& v(ret[it.first.GetHex()] = Json::objectValue);
v["supported"] = it.second.mSupported; v["supported"] = it.second.mSupported;
@@ -283,7 +298,9 @@ Json::Value FeatureTable::getJson(int)
if (mLastReport != 0) if (mLastReport != 0)
{ {
if (it.second.mLastMajority == 0) if (it.second.mLastMajority == 0)
{
v["majority"] = false; v["majority"] = false;
}
else else
{ {
if (it.second.mFirstMajority != 0) if (it.second.mFirstMajority != 0)
@@ -306,8 +323,6 @@ Json::Value FeatureTable::getJson(int)
if (it.second.mVetoed) if (it.second.mVetoed)
v["veto"] = true; v["veto"] = true;
ret[it.first.GetHex()] = v;
} }
} }
@@ -350,6 +365,7 @@ public:
typedef typename std::map<INT, int>::value_type mapVType; typedef typename std::map<INT, int>::value_type mapVType;
BOOST_FOREACH(const mapVType& value, mVoteMap) BOOST_FOREACH(const mapVType& value, mVoteMap)
{ // Take most voted value between current and target, inclusive { // Take most voted value between current and target, inclusive
// FIXME: Should take best value that can get a significant majority
if ((value.first <= std::max(mTarget, mCurrent)) && if ((value.first <= std::max(mTarget, mCurrent)) &&
(value.first >= std::min(mTarget, mCurrent)) && (value.first >= std::min(mTarget, mCurrent)) &&
(value.second > weight)) (value.second > weight))