Compare commits

..

2 Commits

Author SHA1 Message Date
Nik Bougalis
bdfb5fa2bc Set version to 0.30.1-rc2 2016-01-14 13:36:34 -08:00
Nik Bougalis
b2c9179100 Increase minimum local fee 2016-01-14 13:36:18 -08:00
2 changed files with 10 additions and 3 deletions

View File

@@ -1858,8 +1858,15 @@ void LedgerConsensusImp::addLoad(STValidation::ref val)
std::uint32_t fee = std::max( std::uint32_t fee = std::max(
app_.getFeeTrack().getLocalFee(), app_.getFeeTrack().getLocalFee(),
app_.getFeeTrack().getClusterFee()); app_.getFeeTrack().getClusterFee());
std::uint32_t ref = app_.getFeeTrack().getLoadBase();
if (fee > ref) std::uint32_t loadBase = app_.getFeeTrack().getLoadBase();
// Hard code the minimum fee for now:
std::uint32_t const minFee = 10000;
std::uint32_t const refFee = 10;
fee = std::max(fee, (minFee * loadBase + refFee - 1) / refFee);
if (fee > loadBase)
val->setFieldU32(sfLoadFee, fee); val->setFieldU32(sfLoadFee, fee);
} }

View File

@@ -35,7 +35,7 @@ char const* getRawVersionString ()
// //
// The build version number (edit this for each release) // The build version number (edit this for each release)
// //
"0.30.1-rc1" "0.30.1-rc2"
// //
// Must follow the format described here: // Must follow the format described here:
// //