+
This is development version on mainnet.
Don't use unless you know what you are doing.
diff --git a/main.cpp b/main.cpp
index 338add3..130a047 100755
--- a/main.cpp
+++ b/main.cpp
@@ -38,6 +38,11 @@ bool testnet = *testnet_opt;
bool stagenet = *stagenet_opt;
bool do_not_relay = *do_not_relay_opt;
+if (testnet && stagenet)
+{
+ cerr << "testnet and stagenet cannot be specified at the same time!" << endl;
+ return EXIT_FAILURE;
+}
// check if config-file provided exist
if (!boost::filesystem::exists(*config_file_opt))
@@ -63,52 +68,19 @@ catch (const std::exception& e)
return EXIT_FAILURE;
}
-
//cast port number in string to uint16
uint16_t app_port = boost::lexical_cast(*port_opt);
-// get blockchain path
-// if confing.json paths are emtpy, defeault monero
-// paths are going to be used
-path blockchain_path = testnet
- ? path(config_json["blockchain-path"]["testnet"].get())
- : path(config_json["blockchain-path"]["mainnet"].get());
-
-const cryptonote::network_type nettype = testnet ?
- cryptonote::network_type::TESTNET : stagenet ?
- cryptonote::network_type::STAGENET : cryptonote::network_type::MAINNET;
-
-if (!xmreg::get_blockchain_path(blockchain_path, testnet))
-{
- cerr << "Error getting blockchain path." << endl;
- return EXIT_FAILURE;
-}
-
-cout << "Blockchain path: " << blockchain_path.string() << endl;
-
-
-
-string deamon_url = testnet
- ? config_json["daemon-url"]["testnet"]
- : config_json["daemon-url"]["mainnet"];
-
-// set mysql/mariadb connection details
-xmreg::MySqlConnector::url = config_json["database"]["url"];
-xmreg::MySqlConnector::port = config_json["database"]["port"];
-xmreg::MySqlConnector::username = config_json["database"]["user"];
-xmreg::MySqlConnector::password = config_json["database"]["password"];
-xmreg::MySqlConnector::dbname = config_json["database"]["dbname"];
-
+// get the network type
+cryptonote::network_type nettype = testnet ?
+ cryptonote::network_type::TESTNET : stagenet ?
+ cryptonote::network_type::STAGENET : cryptonote::network_type::MAINNET;
// set blockchain status monitoring thread parameters
-xmreg::CurrentBlockchainStatus::blockchain_path
- = blockchain_path.string();
xmreg::CurrentBlockchainStatus::net_type
= nettype;
xmreg::CurrentBlockchainStatus::do_not_relay
= do_not_relay;
-xmreg::CurrentBlockchainStatus::deamon_url
- = deamon_url;
xmreg::CurrentBlockchainStatus::refresh_block_status_every_seconds
= config_json["refresh_block_status_every_seconds"];
xmreg::CurrentBlockchainStatus::max_number_of_blocks_to_import
@@ -118,21 +90,68 @@ xmreg::CurrentBlockchainStatus::search_thread_life_in_seconds
xmreg::CurrentBlockchainStatus::import_fee
= config_json["wallet_import"]["fee"];
-if (testnet)
+
+string deamon_url;
+
+// get blockchain path
+// if confing.json paths are emtpy, defeault monero
+// paths are going to be used
+path blockchain_path;
+
+switch (nettype)
{
- xmreg::CurrentBlockchainStatus::import_payment_address_str
- = config_json["wallet_import"]["testnet"]["address"];
- xmreg::CurrentBlockchainStatus::import_payment_viewkey_str
- = config_json["wallet_import"]["testnet"]["viewkey"];
+ case cryptonote::network_type::MAINNET:
+ blockchain_path = path(config_json["blockchain-path"]["mainnet"].get());
+ deamon_url = config_json["daemon-url"]["mainnet"];
+ xmreg::CurrentBlockchainStatus::import_payment_address_str
+ = config_json["wallet_import"]["mainnet"]["address"];
+ xmreg::CurrentBlockchainStatus::import_payment_viewkey_str
+ = config_json["wallet_import"]["mainnet"]["viewkey"];
+ break;
+ case cryptonote::network_type::TESTNET:
+ blockchain_path = path(config_json["blockchain-path"]["testnet"].get());
+ deamon_url = config_json["daemon-url"]["testnet"];
+ xmreg::CurrentBlockchainStatus::import_payment_address_str
+ = config_json["wallet_import"]["testnet"]["address"];
+ xmreg::CurrentBlockchainStatus::import_payment_viewkey_str
+ = config_json["wallet_import"]["testnet"]["viewkey"];
+ break;
+ case cryptonote::network_type::STAGENET:
+ blockchain_path = path(config_json["blockchain-path"]["stagenet"].get());
+ deamon_url = config_json["daemon-url"]["stagenet"];
+ xmreg::CurrentBlockchainStatus::import_payment_address_str
+ = config_json["wallet_import"]["stagenet"]["address"];
+ xmreg::CurrentBlockchainStatus::import_payment_viewkey_str
+ = config_json["wallet_import"]["stagenet"]["viewkey"];
+ break;
+ default:
+ cerr << "Invalid netowork type provided: " << static_cast(nettype) << "\n";
+ return EXIT_FAILURE;
}
-else
+
+
+if (!xmreg::get_blockchain_path(blockchain_path, nettype))
{
- xmreg::CurrentBlockchainStatus::import_payment_address_str
- = config_json["wallet_import"]["mainnet"]["address"];
- xmreg::CurrentBlockchainStatus::import_payment_viewkey_str
- = config_json["wallet_import"]["mainnet"]["viewkey"];
+ cerr << "Error getting blockchain path.\n";
+ return EXIT_FAILURE;
}
+// set remaining blockchain status variables that depend on the network type
+xmreg::CurrentBlockchainStatus::blockchain_path
+ = blockchain_path.string();
+xmreg::CurrentBlockchainStatus::deamon_url
+ = deamon_url;
+
+cout << "Blockchain path: " << blockchain_path.string() << endl;
+
+
+// set mysql/mariadb connection details
+xmreg::MySqlConnector::url = config_json["database"]["url"];
+xmreg::MySqlConnector::port = config_json["database"]["port"];
+xmreg::MySqlConnector::username = config_json["database"]["user"];
+xmreg::MySqlConnector::password = config_json["database"]["password"];
+xmreg::MySqlConnector::dbname = config_json["database"]["dbname"];
+
// try connecting to the mysql
shared_ptr mysql_accounts;
@@ -149,7 +168,6 @@ catch(std::exception const& e)
}
-
// since CurrentBlockchainStatus class monitors current status
// of the blockchain (e.g., current height), its seems logical to
// make static objects for accessing the blockchain in this class.
diff --git a/src/CurrentBlockchainStatus.cpp b/src/CurrentBlockchainStatus.cpp
index 8384110..9046b9f 100755
--- a/src/CurrentBlockchainStatus.cpp
+++ b/src/CurrentBlockchainStatus.cpp
@@ -131,10 +131,7 @@ CurrentBlockchainStatus::init_monero_blockchain()
// initialize the core using the blockchain path
if (!mcore->init(blockchain_path))
- {
- cerr << "Error accessing blockchain." << endl;
return false;
- }
// get the high level Blockchain object to interact
// with the blockchain lmdb database
diff --git a/src/tools.cpp b/src/tools.cpp
index a5449b7..a3fda82 100755
--- a/src/tools.cpp
+++ b/src/tools.cpp
@@ -248,14 +248,16 @@ generate_key_image(const crypto::key_derivation& derivation,
string
-get_default_lmdb_folder(bool testnet)
+get_default_lmdb_folder(network_type nettype)
{
// default path to monero folder
// on linux this is /home//.bitmonero
string default_monero_dir = tools::get_default_data_dir();
- if (testnet)
+ if (nettype == cryptonote::network_type::TESTNET)
default_monero_dir += "/testnet";
+ if (nettype == cryptonote::network_type::STAGENET)
+ default_monero_dir += "/stagenet";
// the default folder of the lmdb blockchain database
@@ -264,6 +266,7 @@ get_default_lmdb_folder(bool testnet)
}
+
/*
* Ge blockchain exception from command line option
*
@@ -271,11 +274,10 @@ get_default_lmdb_folder(bool testnet)
*/
bool
get_blockchain_path(bf::path& blockchain_path,
- bool testnet)
+ cryptonote::network_type nettype)
{
// the default folder of the lmdb blockchain database
- string default_lmdb_dir = xmreg::get_default_lmdb_folder(testnet);
-
+ string default_lmdb_dir = xmreg::get_default_lmdb_folder(nettype);
blockchain_path = !blockchain_path.empty()
? blockchain_path
@@ -284,8 +286,7 @@ get_blockchain_path(bf::path& blockchain_path,
if (!bf::is_directory(blockchain_path))
{
cerr << "Given path \"" << blockchain_path << "\" "
- << "is not a folder or does not exist" << " "
- << endl;
+ << "is not a folder or does not exist \n";
return false;
}
diff --git a/src/tools.h b/src/tools.h
index f14021e..72c984d 100755
--- a/src/tools.h
+++ b/src/tools.h
@@ -91,7 +91,7 @@ operator<< (ostream& os, const address_parse_info& addr);
string
-get_default_lmdb_folder(bool testnet = false);
+get_default_lmdb_folder(network_type nettype = network_type::MAINNET);
bool
generate_key_image(const crypto::key_derivation& derivation,
@@ -102,7 +102,7 @@ generate_key_image(const crypto::key_derivation& derivation,
bool
get_blockchain_path(bf::path& blockchain_path,
- bool testnet = false);
+ network_type nettype = network_type::MAINNET);
array
summary_of_in_out_rct(