Merge pull request #47 from wowario/rename

rename to wownero
This commit is contained in:
jw 2018-06-04 10:04:17 -07:00 committed by GitHub
commit be6320b1a2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 23 additions and 23 deletions

View file

@ -12,16 +12,16 @@ See also each utility's "--help" option.
### Export an existing blockchain database ### Export an existing blockchain database
`$ monero-blockchain-export` `$ wownero-blockchain-export`
This loads the existing blockchain and exports it to `$MONERO_DATA_DIR/export/blockchain.raw` This loads the existing blockchain and exports it to `$MONERO_DATA_DIR/export/blockchain.raw`
### Import the exported file ### Import the exported file
`$ monero-blockchain-import` `$ wownero-blockchain-import`
This imports blocks from `$MONERO_DATA_DIR/export/blockchain.raw` (exported using the This imports blocks from `$MONERO_DATA_DIR/export/blockchain.raw` (exported using the
`monero-blockchain-export` tool as described above) into the current database. `wownero-blockchain-export` tool as described above) into the current database.
Defaults: `--batch on`, `--batch size 20000`, `--verify on` Defaults: `--batch on`, `--batch size 20000`, `--verify on`
@ -30,14 +30,14 @@ Batch size refers to number of blocks and can be adjusted for performance based
Verification should only be turned off if importing from a trusted blockchain. Verification should only be turned off if importing from a trusted blockchain.
If you encounter an error like "resizing not supported in batch mode", you can just re-run If you encounter an error like "resizing not supported in batch mode", you can just re-run
the `monero-blockchain-import` command again, and it will restart from where it left off. the `wownero-blockchain-import` command again, and it will restart from where it left off.
```bash ```bash
## use default settings to import blockchain.raw into database ## use default settings to import blockchain.raw into database
$ monero-blockchain-import $ wownero-blockchain-import
## fast import with large batch size, database mode "fastest", verification off ## fast import with large batch size, database mode "fastest", verification off
$ monero-blockchain-import --batch-size 20000 --database lmdb#fastest --verify off $ wownero-blockchain-import --batch-size 20000 --database lmdb#fastest --verify off
``` ```
@ -80,9 +80,9 @@ LMDB flags (more than one may be specified):
## Examples: ## Examples:
``` ```
$ monero-blockchain-import --database lmdb#fastest $ wownero-blockchain-import --database lmdb#fastest
$ monero-blockchain-import --database lmdb#nosync $ wownero-blockchain-import --database lmdb#nosync
$ monero-blockchain-import --database lmdb#nosync,nometasync $ wownero-blockchain-import --database lmdb#nosync,nometasync
``` ```

View file

@ -213,7 +213,7 @@ int main(int argc, char* argv[])
return 1; return 1;
} }
mlog_configure(mlog_get_default_log_path("monero-blockchain-blackball.log"), true); mlog_configure(mlog_get_default_log_path("wownero-blockchain-blackball.log"), true);
if (!command_line::is_arg_defaulted(vm, arg_log_level)) if (!command_line::is_arg_defaulted(vm, arg_log_level))
mlog_set_log(command_line::get_arg(vm, arg_log_level).c_str()); mlog_set_log(command_line::get_arg(vm, arg_log_level).c_str());
else else

View file

@ -102,7 +102,7 @@ int main(int argc, char* argv[])
return 1; return 1;
} }
mlog_configure(mlog_get_default_log_path("monero-blockchain-export.log"), true); mlog_configure(mlog_get_default_log_path("wownero-blockchain-export.log"), true);
if (!command_line::is_arg_defaulted(vm, arg_log_level)) if (!command_line::is_arg_defaulted(vm, arg_log_level))
mlog_set_log(command_line::get_arg(vm, arg_log_level).c_str()); mlog_set_log(command_line::get_arg(vm, arg_log_level).c_str());
else else

View file

@ -679,7 +679,7 @@ int main(int argc, char* argv[])
m_config_folder = command_line::get_arg(vm, cryptonote::arg_data_dir); m_config_folder = command_line::get_arg(vm, cryptonote::arg_data_dir);
db_arg_str = command_line::get_arg(vm, arg_database); db_arg_str = command_line::get_arg(vm, arg_database);
mlog_configure(mlog_get_default_log_path("monero-blockchain-import.log"), true); mlog_configure(mlog_get_default_log_path("wownero-blockchain-import.log"), true);
if (!command_line::is_arg_defaulted(vm, arg_log_level)) if (!command_line::is_arg_defaulted(vm, arg_log_level))
mlog_set_log(command_line::get_arg(vm, arg_log_level).c_str()); mlog_set_log(command_line::get_arg(vm, arg_log_level).c_str());
else else

View file

@ -134,7 +134,7 @@ int main(int argc, char* argv[])
return 1; return 1;
} }
mlog_configure(mlog_get_default_log_path("monero-blockchain-usage.log"), true); mlog_configure(mlog_get_default_log_path("wownero-blockchain-usage.log"), true);
if (!command_line::is_arg_defaulted(vm, arg_log_level)) if (!command_line::is_arg_defaulted(vm, arg_log_level))
mlog_set_log(command_line::get_arg(vm, arg_log_level).c_str()); mlog_set_log(command_line::get_arg(vm, arg_log_level).c_str());
else else

View file

@ -1145,10 +1145,10 @@ bool t_rpc_command_executor::print_status()
bool daemon_is_alive = m_rpc_client->check_connection(); bool daemon_is_alive = m_rpc_client->check_connection();
if(daemon_is_alive) { if(daemon_is_alive) {
tools::success_msg_writer() << "monerod is running"; tools::success_msg_writer() << "wownerod is running";
} }
else { else {
tools::fail_msg_writer() << "monerod is NOT running"; tools::fail_msg_writer() << "wownerod is NOT running";
} }
return true; return true;

View file

@ -10138,7 +10138,7 @@ std::string wallet2::make_uri(const std::string &address, const std::string &pay
} }
} }
std::string uri = "monero:" + address; std::string uri = "wownero:" + address;
unsigned int n_fields = 0; unsigned int n_fields = 0;
if (!payment_id.empty()) if (!payment_id.empty())
@ -10167,9 +10167,9 @@ std::string wallet2::make_uri(const std::string &address, const std::string &pay
//---------------------------------------------------------------------------------------------------- //----------------------------------------------------------------------------------------------------
bool wallet2::parse_uri(const std::string &uri, std::string &address, std::string &payment_id, uint64_t &amount, std::string &tx_description, std::string &recipient_name, std::vector<std::string> &unknown_parameters, std::string &error) bool wallet2::parse_uri(const std::string &uri, std::string &address, std::string &payment_id, uint64_t &amount, std::string &tx_description, std::string &recipient_name, std::vector<std::string> &unknown_parameters, std::string &error)
{ {
if (uri.substr(0, 7) != "monero:") if (uri.substr(0, 7) != "wownero:")
{ {
error = std::string("URI has wrong scheme (expected \"monero:\"): ") + uri; error = std::string("URI has wrong scheme (expected \"wownero:\"): ") + uri;
return false; return false;
} }

View file

@ -63,7 +63,7 @@ namespace
const command_line::arg_descriptor<std::string> arg_wallet_dir = {"wallet-dir", "Directory for newly created wallets"}; const command_line::arg_descriptor<std::string> arg_wallet_dir = {"wallet-dir", "Directory for newly created wallets"};
const command_line::arg_descriptor<bool> arg_prompt_for_password = {"prompt-for-password", "Prompts for password when not provided", false}; const command_line::arg_descriptor<bool> arg_prompt_for_password = {"prompt-for-password", "Prompts for password when not provided", false};
constexpr const char default_rpc_username[] = "monero"; constexpr const char default_rpc_username[] = "wownero";
boost::optional<tools::password_container> password_prompter(const char *prompt, bool verify) boost::optional<tools::password_container> password_prompter(const char *prompt, bool verify)
{ {
@ -201,7 +201,7 @@ namespace tools
string_encoding::base64_encode(rand_128bit.data(), rand_128bit.size()) string_encoding::base64_encode(rand_128bit.data(), rand_128bit.size())
); );
std::string temp = "monero-wallet-rpc." + bind_port + ".login"; std::string temp = "wownero-wallet-rpc." + bind_port + ".login";
rpc_login_file = tools::private_file::create(temp); rpc_login_file = tools::private_file::create(temp);
if (!rpc_login_file.handle()) if (!rpc_login_file.handle())
{ {
@ -2897,12 +2897,12 @@ int main(int argc, char** argv) {
const auto vm = wallet_args::main( const auto vm = wallet_args::main(
argc, argv, argc, argv,
"monero-wallet-rpc [--wallet-file=<file>|--generate-from-json=<file>|--wallet-dir=<directory>] [--rpc-bind-port=<port>]", "wownero-wallet-rpc [--wallet-file=<file>|--generate-from-json=<file>|--wallet-dir=<directory>] [--rpc-bind-port=<port>]",
tools::wallet_rpc_server::tr("This is the RPC monero wallet. It needs to connect to a monero\ndaemon to work correctly."), tools::wallet_rpc_server::tr("This is the RPC wownero wallet. It needs to connect to a wownero\ndaemon to work correctly."),
desc_params, desc_params,
po::positional_options_description(), po::positional_options_description(),
[](const std::string &s, bool emphasis){ epee::set_console_color(emphasis ? epee::console_color_white : epee::console_color_default, true); std::cout << s << std::endl; if (emphasis) epee::reset_console_color(); }, [](const std::string &s, bool emphasis){ epee::set_console_color(emphasis ? epee::console_color_white : epee::console_color_default, true); std::cout << s << std::endl; if (emphasis) epee::reset_console_color(); },
"monero-wallet-rpc.log", "wownero-wallet-rpc.log",
true true
); );
if (!vm) if (!vm)