Skip to content

Commit

Permalink
Introduce MINIMUM_FEE_V2 and activate at height 2517000
Browse files Browse the repository at this point in the history
  • Loading branch information
LeoStehlik committed Feb 4, 2022
1 parent f65166d commit ee75652
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 4 deletions.
4 changes: 4 additions & 0 deletions src/config/CryptoNoteConfig.h
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,10 @@ namespace CryptoNote

const uint64_t MINIMUM_FEE_V1_HEIGHT = 1470000;

/* Fee adjusting V2 2517000 */
const uint64_t MINIMUM_FEE_V2 = UINT64_C(10000);

const uint64_t MINIMUM_FEE_V2_HEIGHT = 2517000;

/* This section defines our minimum and maximum mixin counts required for transactions */
const uint64_t MINIMUM_MIXIN_V0 = 0;
Expand Down
6 changes: 3 additions & 3 deletions src/config/WalletConfig.h
Original file line number Diff line number Diff line change
Expand Up @@ -54,13 +54,13 @@ namespace WalletConfig
const uint16_t integratedAddressLength = standardAddressLength + ((64 * 11) / 8);

/* The default fee value to use with transactions (in ATOMIC units!) */
const uint64_t defaultFee = CryptoNote::parameters::MINIMUM_FEE_V1;
const uint64_t defaultFee = CryptoNote::parameters::MINIMUM_FEE_V2;

/* The minimum fee value to allow with transactions (in ATOMIC units!) */
const uint64_t minimumFee = CryptoNote::parameters::MINIMUM_FEE_V1;
const uint64_t minimumFee = CryptoNote::parameters::MINIMUM_FEE_V2;

/* The minimum amount allowed to be sent - usually 1 (in ATOMIC units!) */
const uint64_t minimumSend = 100000;
const uint64_t minimumSend = 10000;

/* Is a mixin of zero disabled on your network? */
const bool mixinZeroDisabled = false;
Expand Down
6 changes: 5 additions & 1 deletion src/utilities/Fees.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,11 @@ namespace Utilities
{
uint64_t minFee = CryptoNote::parameters::MINIMUM_FEE;

if (height >= CryptoNote::parameters::MINIMUM_FEE_V1_HEIGHT)
if (height >= CryptoNote::parameters::MINIMUM_FEE_V2_HEIGHT)
{
minFee = CryptoNote::parameters::MINIMUM_FEE_V2;
}
else if (height >= CryptoNote::parameters::MINIMUM_FEE_V1_HEIGHT)
{
minFee = CryptoNote::parameters::MINIMUM_FEE_V1;
}
Expand Down

0 comments on commit ee75652

Please sign in to comment.