diff --git a/src/cryptonote_core/cryptonote_core.cpp b/src/cryptonote_core/cryptonote_core.cpp index 2fb2a1ac3..a22edca01 100644 --- a/src/cryptonote_core/cryptonote_core.cpp +++ b/src/cryptonote_core/cryptonote_core.cpp @@ -1146,7 +1146,7 @@ namespace cryptonote const bool res = m_mempool.add_tx(tx, tx_hash, blob, tx_weight, tvc, tx_relay, relayed, version); // If new incoming tx passed verification and entered the pool, notify ZMQ - if (!tvc.m_verifivation_failed && res && matches_category(tx_relay, relay_category::legacy)) + if (!tvc.m_verifivation_failed && res && matches_category(tvc.m_relay, relay_category::legacy)) { m_blockchain_storage.notify_txpool_event({txpool_event{ .tx = tx, diff --git a/src/cryptonote_core/tx_pool.cpp b/src/cryptonote_core/tx_pool.cpp index 1890ef903..94ce76457 100644 --- a/src/cryptonote_core/tx_pool.cpp +++ b/src/cryptonote_core/tx_pool.cpp @@ -339,16 +339,16 @@ namespace cryptonote MERROR("internal error: error adding transaction to txpool: " << e.what()); return false; } - - static_assert(unsigned(relay_method::none) == 0, "expected relay_method::none value to be zero"); - if(meta.fee > 0 && tx_relay != relay_method::forward) - tvc.m_relay = tx_relay; } tvc.m_verifivation_failed = false; if (tvc.m_added_to_pool) m_txpool_weight += tx_weight; + static_assert(unsigned(relay_method::none) == 0, "expected relay_method::none value to be zero"); + if (meta.fee > 0 && tx_relay != relay_method::forward) + tvc.m_relay = tx_relay; + ++m_cookie; MINFO("Transaction added to pool: txid " << id << " weight: " << tx_weight << " fee/byte: " << (fee / (double)(tx_weight ? tx_weight : 1)) << ", count: " << m_added_txs_by_id.size());