diff --git a/newcoin.vcxproj b/newcoin.vcxproj index e29623a848..adb8abc714 100644 --- a/newcoin.vcxproj +++ b/newcoin.vcxproj @@ -102,12 +102,14 @@ + + @@ -198,6 +200,7 @@ + diff --git a/newcoin.vcxproj.filters b/newcoin.vcxproj.filters index dd3b6d700c..b97a607c9e 100644 --- a/newcoin.vcxproj.filters +++ b/newcoin.vcxproj.filters @@ -282,6 +282,12 @@ Source Files + + Source Files + + + Source Files + @@ -527,6 +533,9 @@ Header Files + + Source Files + diff --git a/src/Config.cpp b/src/Config.cpp index 4e36f39a1b..92034ed9d7 100644 --- a/src/Config.cpp +++ b/src/Config.cpp @@ -12,6 +12,7 @@ #define SECTION_FEE_DEFAULT "fee_default" #define SECTION_FEE_NICKNAME_CREATE "fee_nickname_create" #define SECTION_FEE_OFFER "fee_offer" +#define SECTION_FEE_OPERATION "fee_operation" #define SECTION_IPS "ips" #define SECTION_NETWORK_QUORUM "network_quorum" #define SECTION_PEER_CONNECT_LOW_WATER "peer_connect_low_water" @@ -37,6 +38,7 @@ #define DEFAULT_FEE_ACCOUNT_CREATE 1000 #define DEFAULT_FEE_NICKNAME_CREATE 1000 #define DEFAULT_FEE_OFFER DEFAULT_FEE_DEFAULT +#define DEFAULT_FEE_OPERATION 1 Config theConfig; @@ -145,6 +147,7 @@ void Config::setup(const std::string& strConf) FEE_NICKNAME_CREATE = DEFAULT_FEE_NICKNAME_CREATE; FEE_OFFER = DEFAULT_FEE_OFFER; FEE_DEFAULT = DEFAULT_FEE_DEFAULT; + FEE_CONTRACT_OPERATION = DEFAULT_FEE_OPERATION; ACCOUNT_PROBE_MAX = 10; @@ -258,6 +261,9 @@ void Config::load() if (sectionSingleB(secConfig, SECTION_FEE_DEFAULT, strTemp)) FEE_DEFAULT = boost::lexical_cast(strTemp); + if (sectionSingleB(secConfig, SECTION_FEE_OPERATION, strTemp)) + FEE_CONTRACT_OPERATION = boost::lexical_cast(strTemp); + if (sectionSingleB(secConfig, SECTION_ACCOUNT_PROBE_MAX, strTemp)) ACCOUNT_PROBE_MAX = boost::lexical_cast(strTemp); diff --git a/src/Config.h b/src/Config.h index 89fb60b3de..6fc42dca35 100644 --- a/src/Config.h +++ b/src/Config.h @@ -97,6 +97,7 @@ public: uint64 FEE_ACCOUNT_CREATE; // Fee to create an account. uint64 FEE_NICKNAME_CREATE; // Fee to create a nickname. uint64 FEE_OFFER; // Rate per day. + int FEE_CONTRACT_OPERATION; // fee for each contract operation // Client behavior int ACCOUNT_PROBE_MAX; // How far to scan for accounts.