codeberg-wownero/lwcli-wow
1
0
Fork 0
mirror of https://codeberg.org/wownero/lwcli-wow.git synced 2026-10-17 05:51:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update lswf pin + update oa/dnssec error reporting

Browse Source
This commit is contained in:
Lee *!* Clagett
2025-05-17 00:03:31 -04:00
parent fbd694f55b
commit 5a524c4232
2 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
external/lwsf
Vendored
+1 -1
Submodule external/lwsf updated: 68ccb25862...cf83295348
src/views/send.cpp
+12 -13
View File
@@ -238,7 +238,7 @@ namespace lwcli { namespace view
ftxui::Element error_;
ftxui::Component ui_;
ftxui::Element cached_;
std::future<std::optional<std::pair<std::string, std::shared_ptr<dest_pair>>>> oa_;
std::future<std::tuple<std::string, std::shared_ptr<dest_pair>, bool>> oa_;
std::future<std::tuple<std::shared_ptr<Monero::PendingTransaction>, dest_group, std::string>> tx_;
const std::uint32_t account_;
unsigned animation_;
@@ -355,13 +355,11 @@ namespace lwcli { namespace view
return;
}
const auto oa_lookup = [dest] (std::shared_ptr<Monero::WalletManager> wm, const std::string& uri)
-> std::optional<std::pair<std::string, std::shared_ptr<dest_pair>>>
-> std::tuple<std::string, std::shared_ptr<dest_pair>, bool>
{
bool dnssec = false;
std::string result = wm->resolveOpenAlias(uri, dnssec);
if (!dnssec)
return std::nullopt;
return {{std::move(result), dest}};
return std::make_tuple(std::move(result), dest, dnssec);
};
if (!wm_)
@@ -438,16 +436,17 @@ namespace lwcli { namespace view
auto oa = oa_.get();
error_.reset();
if (!oa)
error_ = ftxui::text(_("dnssec failure for domain"));
else if (oa->first.empty())
error_ = ftxui::text(_("No XMR OpenAlias found"));
else if (!lwsf::addressValid(oa->first, wal_->nettype()))
error_ = ftxui::text(_("OpenAlias record is invalid"));
if (std::get<0>(oa).empty())
error_ = ftxui::text(_("No XMR OpenAlias found for ") + std::get<1>(oa)->second);
else if (!lwsf::addressValid(std::get<0>(oa), wal_->nettype()))
error_ = ftxui::text(_("OpenAlias record is invalid for ") + std::get<1>(oa)->second);
else if (!closing_)
{
oa->second->second = std::move(oa->first);
try_construct();
std::get<1>(oa)->second = std::move(std::get<0>(oa));
if (!std::get<2>(oa))
error_ = ftxui::text(_("dnssec verification failure for ") + std::get<1>(oa)->second);
else
try_construct();
}
animate = oa_.valid();