|
|
|
@ -214,7 +214,7 @@ namespace
|
|
|
|
|
const char* USAGE_GET_TX_NOTE("get_tx_note <txid>");
|
|
|
|
|
const char* USAGE_GET_DESCRIPTION("get_description");
|
|
|
|
|
const char* USAGE_SET_DESCRIPTION("set_description [free text note]");
|
|
|
|
|
const char* USAGE_SIGN("sign <filename>");
|
|
|
|
|
const char* USAGE_SIGN("sign [<account_index>,<address_index>] <filename>");
|
|
|
|
|
const char* USAGE_VERIFY("verify <filename> <address> <signature>");
|
|
|
|
|
const char* USAGE_EXPORT_KEY_IMAGES("export_key_images [all] <filename>");
|
|
|
|
|
const char* USAGE_IMPORT_KEY_IMAGES("import_key_images <filename>");
|
|
|
|
@ -3346,7 +3346,7 @@ simple_wallet::simple_wallet()
|
|
|
|
|
m_cmd_binder.set_handler("sign",
|
|
|
|
|
boost::bind(&simple_wallet::on_command, this, &simple_wallet::sign, _1),
|
|
|
|
|
tr(USAGE_SIGN),
|
|
|
|
|
tr("Sign the contents of a file."));
|
|
|
|
|
tr("Sign the contents of a file with the given subaddress (or the main address if not specified)"));
|
|
|
|
|
m_cmd_binder.set_handler("verify",
|
|
|
|
|
boost::bind(&simple_wallet::on_command, this, &simple_wallet::verify, _1),
|
|
|
|
|
tr(USAGE_VERIFY),
|
|
|
|
@ -9572,7 +9572,7 @@ bool simple_wallet::sign(const std::vector<std::string> &args)
|
|
|
|
|
fail_msg_writer() << tr("command not supported by HW wallet");
|
|
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|
if (args.size() != 1)
|
|
|
|
|
if (args.size() != 1 && args.size() != 2)
|
|
|
|
|
{
|
|
|
|
|
PRINT_USAGE(USAGE_SIGN);
|
|
|
|
|
return true;
|
|
|
|
@ -9588,7 +9588,20 @@ bool simple_wallet::sign(const std::vector<std::string> &args)
|
|
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
std::string filename = args[0];
|
|
|
|
|
subaddress_index index{0, 0};
|
|
|
|
|
if (args.size() == 2)
|
|
|
|
|
{
|
|
|
|
|
unsigned int a, b;
|
|
|
|
|
if (sscanf(args[0].c_str(), "%u,%u", &a, &b) != 2)
|
|
|
|
|
{
|
|
|
|
|
fail_msg_writer() << tr("Invalid subaddress index format");
|
|
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|
index.major = a;
|
|
|
|
|
index.minor = b;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
const std::string &filename = args.back();
|
|
|
|
|
std::string data;
|
|
|
|
|
bool r = m_wallet->load_from_file(filename, data);
|
|
|
|
|
if (!r)
|
|
|
|
@ -9599,7 +9612,7 @@ bool simple_wallet::sign(const std::vector<std::string> &args)
|
|
|
|
|
|
|
|
|
|
SCOPED_WALLET_UNLOCK();
|
|
|
|
|
|
|
|
|
|
std::string signature = m_wallet->sign(data);
|
|
|
|
|
std::string signature = m_wallet->sign(data, index);
|
|
|
|
|
success_msg_writer() << signature;
|
|
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|