gitea-mirror/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2026-08-03 01:15:55 -07:00
Code Issues Packages Projects Releases Wiki Activity

fix do_not_relay not preventing relaying on a timer

Browse Source 
Also print its value when printing pool
This commit is contained in:
moneromooo-monero
2017-01-14 13:07:05 +00:00
parent 2806842200
commit 81c384e408
13 changed files with 56 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/rpc/core_rpc_server.cpp
+2 -2
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";
src/rpc/core_rpc_server_commands_defs.h
+3 -1
View File
@@ -49,7 +49,7 @@ namespace cryptonote
// advance which version they will stop working with
// Don't go over 32767 for any of these
#define CORE_RPC_VERSION_MAJOR 1
#define CORE_RPC_VERSION_MINOR 4
#define CORE_RPC_VERSION_MINOR 5
#define CORE_RPC_VERSION (((CORE_RPC_VERSION_MAJOR)<<16)|(CORE_RPC_VERSION_MINOR))
struct COMMAND_RPC_GET_HEIGHT
@@ -920,6 +920,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)
@@ -934,6 +935,7 @@ namespace cryptonote
KV_SERIALIZE(receive_time)
KV_SERIALIZE(relayed)
KV_SERIALIZE(last_relayed_time)
KV_SERIALIZE(do_not_relay)
END_KV_SERIALIZE_MAP()
};