Merge pull request #1499

37ed96e6 tx_pool: fix uninitialized "last failed" fields (moneromooo-monero)
94b6feef rpc: fix mixup in tx_info serialization (moneromooo-monero)
This commit is contained in:
Riccardo Spagni 2017-01-08 16:35:49 -08:00
commit d655e88b44
No known key found for this signature in database
GPG Key ID: 55432DF31CCD4FCD
2 changed files with 3 additions and 1 deletions

View File

@ -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);

View File

@ -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()
};