From 94b6feef244ef2b63d94d57162b474a58094080d Mon Sep 17 00:00:00 2001 From: moneromooo-monero Date: Sat, 24 Dec 2016 18:06:16 +0000 Subject: [PATCH 1/2] rpc: fix mixup in tx_info serialization --- src/rpc/core_rpc_server_commands_defs.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/rpc/core_rpc_server_commands_defs.h b/src/rpc/core_rpc_server_commands_defs.h index b09cad235..6060cee3a 100644 --- a/src/rpc/core_rpc_server_commands_defs.h +++ b/src/rpc/core_rpc_server_commands_defs.h @@ -919,7 +919,7 @@ namespace cryptonote KV_SERIALIZE(last_failed_id_hash) KV_SERIALIZE(receive_time) KV_SERIALIZE(relayed) - KV_SERIALIZE(last_failed_id_hash) + KV_SERIALIZE(last_relayed_time) END_KV_SERIALIZE_MAP() }; From 37ed96e6117af340eafa2495f24d513fe1a07de9 Mon Sep 17 00:00:00 2001 From: moneromooo-monero Date: Sat, 24 Dec 2016 19:42:35 +0000 Subject: [PATCH 2/2] tx_pool: fix uninitialized "last failed" fields --- src/cryptonote_core/tx_pool.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/cryptonote_core/tx_pool.cpp b/src/cryptonote_core/tx_pool.cpp index 4cfd61f9f..ca4b6d6f5 100644 --- a/src/cryptonote_core/tx_pool.cpp +++ b/src/cryptonote_core/tx_pool.cpp @@ -189,6 +189,8 @@ namespace cryptonote txd_p.first->second.fee = fee; txd_p.first->second.max_used_block_id = null_hash; txd_p.first->second.max_used_block_height = 0; + txd_p.first->second.last_failed_height = 0; + txd_p.first->second.last_failed_id = null_hash; txd_p.first->second.kept_by_block = kept_by_block; txd_p.first->second.receive_time = time(nullptr); txd_p.first->second.last_relayed_time = time(NULL);