Mirrors/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2025-12-09 00:21:28 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10007

Browse Source 
5e54c72 wallet: RPC method /incoming_transfers without daemon connection (jeffro256)
This commit is contained in:
tobtoht 2025-08-21 16:20:37 +00:00
commit 563a5b1a7d
No known key found for this signature in database
GPG Key ID: E45B10DD027D2472
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/wallet/wallet_rpc_server.cpp
View File

@ -2237,6 +2237,11 @@ namespace tools
{ {
if (req.account_index != td.m_subaddr_index.major || (!req.subaddr_indices.empty() && req.subaddr_indices.count(td.m_subaddr_index.minor) == 0)) if (req.account_index != td.m_subaddr_index.major || (!req.subaddr_indices.empty() && req.subaddr_indices.count(td.m_subaddr_index.minor) == 0))
continue; continue;
// wallet2::is_transfer_unlocked() needs a daemon connection to work. if it fails, assume locked
bool unlocked = false;
try { unlocked = m_wallet->is_transfer_unlocked(td); } catch (...) {}
wallet_rpc::transfer_details rpc_transfers; wallet_rpc::transfer_details rpc_transfers;
rpc_transfers.amount = td.amount(); rpc_transfers.amount = td.amount();
rpc_transfers.spent = td.m_spent; rpc_transfers.spent = td.m_spent;
@ -2247,7 +2252,7 @@ namespace tools
rpc_transfers.pubkey = epee::string_tools::pod_to_hex(td.get_public_key()); rpc_transfers.pubkey = epee::string_tools::pod_to_hex(td.get_public_key());
rpc_transfers.block_height = td.m_block_height; rpc_transfers.block_height = td.m_block_height;
rpc_transfers.frozen = td.m_frozen; rpc_transfers.frozen = td.m_frozen;
rpc_transfers.unlocked = m_wallet->is_transfer_unlocked(td); rpc_transfers.unlocked = unlocked;
res.transfers.push_back(rpc_transfers); res.transfers.push_back(rpc_transfers);
} }
} }