github/monero
1
Fork 0
mirror of https://github.com/monero-project/monero synced 2024-11-16 04:33:51 +01:00
Code Releases Activity

Merge pull request #6949

Browse Source 
aad780b Fix CLI and unrestricted RPC relay_tx with stempool (Lee Clagett)
This commit is contained in:
luigi1111 2020-11-29 01:52:23 -06:00
commit bb56248acd
No known key found for this signature in database
GPG Key ID: F4ACA0183641E010
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/rpc/core_rpc_server.cpp
View File

@ -2827,6 +2827,8 @@ namespace cryptonote
RPC_TRACKER(relay_tx);
CHECK_PAYMENT_MIN1(req, res, req.txids.size() * COST_PER_TX_RELAY, false);
const bool restricted = m_restricted && ctx;
bool failed = false;
res.status = "";
for (const auto &str: req.txids)
@ -2840,12 +2842,16 @@ namespace cryptonote
continue;
}
//TODO: The get_pool_transaction could have an optional meta parameter
bool broadcasted = false;
cryptonote::blobdata txblob;
if (m_core.get_pool_transaction(txid, txblob, relay_category::legacy))
if ((broadcasted = m_core.get_pool_transaction(txid, txblob, relay_category::broadcasted)) || (!restricted && m_core.get_pool_transaction(txid, txblob, relay_category::all)))
{
// The settings below always choose i2p/tor if enabled. Otherwise, do fluff iff previously relayed else dandelion++ stem.
NOTIFY_NEW_TRANSACTIONS::request r;
r.txs.push_back(std::move(txblob));
m_core.get_protocol()->relay_transactions(r, boost::uuids::nil_uuid(), epee::net_utils::zone::invalid, relay_method::local);
const auto tx_relay = broadcasted ? relay_method::fluff : relay_method::local;
m_core.get_protocol()->relay_transactions(r, boost::uuids::nil_uuid(), epee::net_utils::zone::invalid, tx_relay);
//TODO: make sure that tx has reached other nodes here, probably wait to receive reflections from other nodes
}
else