diff options
author | iamsmooth <iamjaviersmooth@gmail.com> | 2014-11-09 10:53:29 +0000 |
---|---|---|
committer | iamsmooth <iamjaviersmooth@gmail.com> | 2014-11-09 10:53:29 +0000 |
commit | cc74b43651710fd37284b0c33e6c5423e5ab8537 (patch) | |
tree | 8f04af7d824a5a3944a67baefe2fe2af3d547efd /src/cryptonote_config.h | |
parent | Merge pull request #184 (diff) | |
download | monero-cc74b43651710fd37284b0c33e6c5423e5ab8537.tar.xz |
Remove DEFAULT_FEE, add temporary acceptance of too-small per-kb fee >= 0.1, denominations based on DEFAULT_DUST_THRESHOLD, document fee arg to create_transactions as unused, se DEFAULT_DUST_THRESHOLD for wallet dust collection instead of calcualted tx fee
Diffstat (limited to '')
-rw-r--r-- | src/cryptonote_config.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/cryptonote_config.h b/src/cryptonote_config.h index fd52f2e87..5e58aa757 100644 --- a/src/cryptonote_config.h +++ b/src/cryptonote_config.h @@ -56,9 +56,11 @@ #define CRYPTONOTE_DISPLAY_DECIMAL_POINT 12 // COIN - number of smallest units in one coin #define COIN ((uint64_t)1000000000000) // pow(10, 12) -#define DEFAULT_FEE ((uint64_t)100000000000) // 5 * pow(10, 11) + #define FEE_PER_KB ((uint64_t)10000000000) // pow(10, 10) +// temporarily to allow backward compatibility during the switch to per-kb +#define MINING_ALLOWED_LEGACY_FEE ((uint64_t)100000000000) // pow(10, 11) #define ORPHANED_BLOCKS_MAX_COUNT 100 @@ -115,7 +117,7 @@ namespace config { uint64_t const DEFAULT_FEE_ATOMIC_XMR_PER_KB = 500; // Just a placeholder! Change me! uint8_t const FEE_CALCULATION_MAX_RETRIES = 10; - uint64_t const DEFAULT_DUST_THRESHOLD = 5000000000; // 5 * 10^9 + uint64_t const DEFAULT_DUST_THRESHOLD = ((uint64_t)10000000000); // pow(10, 10) std::string const P2P_REMOTE_DEBUG_TRUSTED_PUB_KEY = "0000000000000000000000000000000000000000000000000000000000000000"; uint64_t const CRYPTONOTE_PUBLIC_ADDRESS_BASE58_PREFIX = 18; |