From a9a3d742e203f0cfca00fbf5138d708670afc17b Mon Sep 17 00:00:00 2001 From: JoelKatz Date: Wed, 24 Apr 2013 08:50:19 -0700 Subject: [PATCH 1/2] Change default fee vote to 50/12.5 --- src/cpp/ripple/Application.cpp | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/src/cpp/ripple/Application.cpp b/src/cpp/ripple/Application.cpp index 7d91b4c05..fc8bb4ec5 100644 --- a/src/cpp/ripple/Application.cpp +++ b/src/cpp/ripple/Application.cpp @@ -26,8 +26,6 @@ Application* theApp = NULL; int DatabaseCon::sCount = 0; -// #define RESERVE_BASE_100 - DatabaseCon::DatabaseCon(const std::string& strName, const char *initStrings[], int initCount) { ++sCount; @@ -53,11 +51,7 @@ Application::Application() : mTempNodeCache("NodeCache", 16384, 90), mHashedObjectStore(16384, 300), mSLECache("LedgerEntryCache", 4096, 120), mSNTPClient(mAuxService), mJobQueue(mIOService), mFeeTrack(), -#ifdef RESERVE_BASE_100 - mFeeVote(10, 100 * SYSTEM_CURRENCY_PARTS, 25 * SYSTEM_CURRENCY_PARTS), -#else - mFeeVote(10, 200 * SYSTEM_CURRENCY_PARTS, 50 * SYSTEM_CURRENCY_PARTS), -#endif + mFeeVote(10, 50 * SYSTEM_CURRENCY_PARTS, 12.5 * SYSTEM_CURRENCY_PARTS), mRpcDB(NULL), mTxnDB(NULL), mLedgerDB(NULL), mWalletDB(NULL), mHashNodeDB(NULL), mNetNodeDB(NULL), mPathFindDB(NULL), From 93c4e5aa5f60d1db3cd8302ca267ee70b77fa8f8 Mon Sep 17 00:00:00 2001 From: JoelKatz Date: Wed, 24 Apr 2013 09:40:13 -0700 Subject: [PATCH 2/2] We log the wrong ledger hash --- src/cpp/ripple/LedgerConsensus.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/cpp/ripple/LedgerConsensus.cpp b/src/cpp/ripple/LedgerConsensus.cpp index 850ca21fc..305321818 100644 --- a/src/cpp/ripple/LedgerConsensus.cpp +++ b/src/cpp/ripple/LedgerConsensus.cpp @@ -1197,10 +1197,10 @@ void LedgerConsensus::accept(SHAMap::ref set, LoadEvent::pointer) while ((fc = SHAMap::flushDirty(*txnNodes, 256, hotTRANSACTION_NODE, newLCL->getLedgerSeq())) > 0) { cLog(lsTRACE) << "Flushed " << fc << " dirty transaction nodes"; } - cLog(lsDEBUG) << "Report: NewL = " << newLCL->getHash() << ":" << newLCL->getLedgerSeq(); - newLCL->setAccepted(closeTime, mCloseResolution, closeTimeCorrect); newLCL->updateHash(); + + cLog(lsDEBUG) << "Report: NewL = " << newLCL->getHash() << ":" << newLCL->getLedgerSeq(); uint256 newLCLHash = newLCL->getHash(); if (sLog(lsTRACE))