From 8e88b1cd8a1c50dc6f3aabed1714ab3b4dc0541d Mon Sep 17 00:00:00 2001 From: Arthur Britto Date: Tue, 5 Jun 2012 14:13:00 -0700 Subject: [PATCH] Add fee configuration for creating nicknames. --- src/Config.cpp | 16 +++++++++++----- src/Config.h | 5 +++-- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/src/Config.cpp b/src/Config.cpp index a1e767cde1..980c9812d3 100644 --- a/src/Config.cpp +++ b/src/Config.cpp @@ -8,7 +8,8 @@ #include // Fees are in XNS raw. -#define DEFAULT_FEE_CREATE 1000 +#define DEFAULT_FEE_ACCOUNT_CREATE 1000 +#define DEFAULT_FEE_NICKNAME_CREATE 1000 #define DEFAULT_FEE_DEFAULT 100 #define CONFIG_FILE_NAME SYSTEM_NAME "d.cfg" // newcoind.cfg @@ -24,7 +25,8 @@ #define SECTION_PEER_CONNECT_LOW_WATER "peer_connect_low_water" #define SECTION_NETWORK_QUORUM "network_quorum" #define SECTION_VALIDATION_QUORUM "validation_quorum" -#define SECTION_FEE_CREATE "fee_create" +#define SECTION_FEE_ACCOUNT_CREATE "fee_account_create" +#define SECTION_FEE_NICKNAME_CREATE "fee_nickname_create" #define SECTION_FEE_DEFAULT "fee_default" #define SECTION_ACCOUNT_PROBE_MAX "account_probe_max" @@ -59,7 +61,8 @@ Config::Config() NETWORK_QUORUM = 0; // Don't need to see other nodes VALIDATION_QUORUM = 1; // Only need one node to vouch - FEE_CREATE = DEFAULT_FEE_CREATE; + FEE_ACCOUNT_CREATE = DEFAULT_FEE_ACCOUNT_CREATE; + FEE_NICKNAME_CREATE = DEFAULT_FEE_NICKNAME_CREATE; FEE_DEFAULT = DEFAULT_FEE_DEFAULT; ACCOUNT_PROBE_MAX = 10; @@ -118,8 +121,11 @@ void Config::load() if (sectionSingleB(secConfig, SECTION_VALIDATION_QUORUM, strTemp)) VALIDATION_QUORUM = MAX(0, boost::lexical_cast(strTemp)); - if (sectionSingleB(secConfig, SECTION_FEE_CREATE, strTemp)) - FEE_CREATE = boost::lexical_cast(strTemp); + if (sectionSingleB(secConfig, SECTION_FEE_ACCOUNT_CREATE, strTemp)) + FEE_ACCOUNT_CREATE = boost::lexical_cast(strTemp); + + if (sectionSingleB(secConfig, SECTION_FEE_NICKNAME_CREATE, strTemp)) + FEE_NICKNAME_CREATE = boost::lexical_cast(strTemp); if (sectionSingleB(secConfig, SECTION_FEE_DEFAULT, strTemp)) FEE_DEFAULT = boost::lexical_cast(strTemp); diff --git a/src/Config.h b/src/Config.h index 51290f0bd8..e6f74a0c6d 100644 --- a/src/Config.h +++ b/src/Config.h @@ -75,8 +75,9 @@ public: std::string VALIDATION_KEY; // Fees - uint64 FEE_CREATE; // Fee to create an account - uint64 FEE_DEFAULT; // Default fee. + uint64 FEE_DEFAULT; // Default fee. + uint64 FEE_ACCOUNT_CREATE; // Fee to create an account. + uint64 FEE_NICKNAME_CREATE; // Fee to create a nickname. // Configuration parameters std::string DATA_DIR;