nihilist/monero
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

simplewallet: make the key image export format binary

Browse Source 
Saves on space, and on some pointless hex conversions
This commit is contained in:
moneromooo-monero 2016-09-01 11:04:53 +01:00
parent c3ba844f03
commit f4e894a526
No known key found for this signature in database
GPG Key ID: 686F07454D6CEFC3
1 changed files with 5 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/simplewallet/simplewallet.cpp
View File

@ -3586,8 +3586,8 @@ bool simple_wallet::export_key_images(const std::vector<std::string> &args)
std::string data; std::string data;
for (const auto &i: ski) for (const auto &i: ski)
{ {
data += epee::string_tools::pod_to_hex(i.first); data += std::string((const char *)&i.first, sizeof(crypto::key_image));
data += epee::string_tools::pod_to_hex(i.second); data += std::string((const char *)&i.second, sizeof(crypto::signature));
} }
bool r = epee::file_io_utils::save_string_to_file(filename, data); bool r = epee::file_io_utils::save_string_to_file(filename, data);
if (!r) if (!r)
@ -3624,7 +3624,7 @@ bool simple_wallet::import_key_images(const std::vector<std::string> &args)
return true; return true;
} }
const size_t record_size = sizeof(crypto::key_image)*2 + sizeof(crypto::signature)*2; const size_t record_size = sizeof(crypto::key_image) + sizeof(crypto::signature);
if (data.size() % record_size) if (data.size() % record_size)
{ {
fail_msg_writer() << "Bad data size from file " << filename; fail_msg_writer() << "Bad data size from file " << filename;
@ -3636,21 +3636,8 @@ bool simple_wallet::import_key_images(const std::vector<std::string> &args)
ski.reserve(nki); ski.reserve(nki);
for (size_t n = 0; n < nki; ++n) for (size_t n = 0; n < nki; ++n)
{ {
cryptonote::blobdata bd; crypto::key_image key_image = *reinterpret_cast<const crypto::key_image*>(&data[n * record_size]);
crypto::signature signature = *reinterpret_cast<const crypto::signature*>(&data[n * record_size + sizeof(crypto::key_image)]);
if(!epee::string_tools::parse_hexstr_to_binbuff(std::string(&data[n * record_size], sizeof(crypto::key_image)*2), bd))
{
fail_msg_writer() << tr("failed to parse key image");
return false;
}
crypto::key_image key_image = *reinterpret_cast<const crypto::key_image*>(bd.data());
if(!epee::string_tools::parse_hexstr_to_binbuff(std::string(&data[n * record_size + sizeof(crypto::key_image)*2], sizeof(crypto::signature)*2), bd))
{
fail_msg_writer() << tr("failed to parse signature");
return false;
}
crypto::signature signature = *reinterpret_cast<const crypto::signature*>(bd.data());
ski.push_back(std::make_pair(key_image, signature)); ski.push_back(std::make_pair(key_image, signature));
} }