diff options
| author | Riccardo Spagni <ric@spagni.net> | 2017-01-15 14:50:10 -0500 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2017-01-15 14:50:10 -0500 |
| commit | 10c6afd3167172628ac538c1efa5afe2127cd1d6 (patch) | |
| tree | 44963d677b21bd8f2b9a43dd0424daf95b83d1d1 /src/rpc | |
| parent | Merge pull request #1568 (diff) | |
| parent | fix do_not_relay not preventing relaying on a timer (diff) | |
| download | monero-10c6afd3167172628ac538c1efa5afe2127cd1d6.tar.xz | |
Merge pull request #1571
81c384e4 fix do_not_relay not preventing relaying on a timer (moneromooo-monero)
Diffstat (limited to 'src/rpc')
| -rw-r--r-- | src/rpc/core_rpc_server.cpp | 4 | ||||
| -rw-r--r-- | src/rpc/core_rpc_server_commands_defs.h | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/rpc/core_rpc_server.cpp b/src/rpc/core_rpc_server.cpp index fc93b3a51..0cec3c26e 100644 --- a/src/rpc/core_rpc_server.cpp +++ b/src/rpc/core_rpc_server.cpp @@ -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"; diff --git a/src/rpc/core_rpc_server_commands_defs.h b/src/rpc/core_rpc_server_commands_defs.h index 49de94ad9..c1dc9ed6c 100644 --- a/src/rpc/core_rpc_server_commands_defs.h +++ b/src/rpc/core_rpc_server_commands_defs.h @@ -922,6 +922,7 @@ namespace cryptonote uint64_t receive_time; bool relayed; uint64_t last_relayed_time; + bool do_not_relay; BEGIN_KV_SERIALIZE_MAP() KV_SERIALIZE(id_hash) @@ -936,6 +937,7 @@ namespace cryptonote KV_SERIALIZE(receive_time) KV_SERIALIZE(relayed) KV_SERIALIZE(last_relayed_time) + KV_SERIALIZE(do_not_relay) END_KV_SERIALIZE_MAP() }; |