rottenwheel/monero
1
0
Fork 0
mirror of https://codeberg.org/anoncontributorxmr/monero.git synced 2025-07-09 03:02:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1571

Browse source 
81c384e4 fix do_not_relay not preventing relaying on a timer (moneromooo-monero)
This commit is contained in:
Riccardo Spagni 2017-01-15 14:50:10 -05:00
commit 10c6afd316
No known key found for this signature in database
GPG key ID: 55432DF31CCD4FCD
13 changed files with 55 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/rpc/core_rpc_server.cpp
View file

@ -528,7 +528,7 @@ namespace cryptonote
cryptonote_connection_context fake_context = AUTO_VAL_INIT(fake_context);
tx_verification_context tvc = AUTO_VAL_INIT(tvc);
if(!m_core.handle_incoming_tx(tx_blob, tvc, false, false) || tvc.m_verifivation_failed)
if(!m_core.handle_incoming_tx(tx_blob, tvc, false, false, req.do_not_relay) || tvc.m_verifivation_failed)
{
if (tvc.m_verifivation_failed)
{
@ -558,7 +558,7 @@ namespace cryptonote
return true;
}
if(!tvc.m_should_be_relayed || req.do_not_relay)
if(!tvc.m_should_be_relayed)
{
LOG_PRINT_L0("[on_send_raw_tx]: tx accepted, but not relayed");
res.reason = "Not relayed";