oxen-io
/
oxen-core
mirror of https://github.com/oxen-io/oxen-core.git
2
1
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #1463 from jagerman/ons-lookup-fix 

ONS backup owner lookup fixes
This commit is contained in:
Jason Rhinelander 2021-06-10 15:09:41 -03:00 committed by GitHub
parent 138dfeb023 5b1ca27e2e
commit 821837368e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/rpc/core_rpc_server.cpp
View File

@ -3556,13 +3556,18 @@ namespace cryptonote { namespace rpc {
std::vector<ons::mapping_record> records = db.get_mappings_by_owners(owners, height);
for (auto &record : records)
{
auto& entry = res.entries.emplace_back();
auto it = owner_to_request_index.find(record.owner);
auto it = owner_to_request_index.end();
if (record.owner)
it = owner_to_request_index.find(record.owner);
if (it == owner_to_request_index.end() && record.backup_owner)
it = owner_to_request_index.find(record.backup_owner);
if (it == owner_to_request_index.end())
throw rpc_error{ERROR_INTERNAL, "Owner=" + record.owner.to_string(nettype()) +
", could not be mapped back a index in the request 'entries' array"};
throw rpc_error{ERROR_INTERNAL,
(record.owner ? ("Owner=" + record.owner.to_string(nettype()) + " ") : ""s) +
(record.backup_owner ? ("BackupOwner=" + record.backup_owner.to_string(nettype()) + " ") : ""s) +
" could not be mapped back a index in the request 'entries' array"};
auto& entry = res.entries.emplace_back();
entry.request_index = it->second;
entry.type = record.type;
entry.name_hash = std::move(record.name_hash);

13
src/simplewallet/simplewallet.cpp
View File

@ -7068,17 +7068,6 @@ bool simple_wallet::ons_by_owner(const std::vector<std::string>& args)
auto const &rpc = rpc_results[i];
for (auto const &entry : rpc)
{
std::string const *owner = nullptr;
try
{
owner = &requests[i].entries.at(entry.request_index);
}
catch (std::exception const &e)
{
fail_msg_writer() << "Daemon returned an invalid owner index = " << entry.request_index << " skipping mapping";
continue;
}
std::string_view name;
std::string value;
if (auto got = cache.find(entry.name_hash); got != cache.end())
@ -7100,7 +7089,7 @@ bool simple_wallet::ons_by_owner(const std::vector<std::string>& args)
if (!value.empty()) writer
<< "\n Value: " << value;
writer
<< "\n Owner: " << *owner;
<< "\n Owner: " << entry.owner;
if (entry.backup_owner) writer
<< "\n Backup owner: " << *entry.backup_owner;
writer