|
|
|
@ -622,7 +622,7 @@ namespace cryptonote
|
|
|
|
|
CRITICAL_REGION_LOCAL(m_transactions_lock);
|
|
|
|
|
CRITICAL_REGION_LOCAL1(m_blockchain);
|
|
|
|
|
|
|
|
|
|
m_blockchain.for_all_txpool_txes([this, &hashes, &txes](const crypto::hash &txid, const txpool_tx_meta_t &meta, const cryptonote::blobdata*) {
|
|
|
|
|
m_blockchain.for_all_txpool_txes([this, &hashes, &txes](const crypto::hash &txid, const txpool_tx_meta_t &meta, const cryptonote::blobdata_ref*) {
|
|
|
|
|
const auto tx_relay_method = meta.get_relay_method();
|
|
|
|
|
if (tx_relay_method != relay_method::block && tx_relay_method != relay_method::fluff)
|
|
|
|
|
return true;
|
|
|
|
@ -670,7 +670,7 @@ namespace cryptonote
|
|
|
|
|
CRITICAL_REGION_LOCAL(m_transactions_lock);
|
|
|
|
|
CRITICAL_REGION_LOCAL1(m_blockchain);
|
|
|
|
|
std::list<std::pair<crypto::hash, uint64_t>> remove;
|
|
|
|
|
m_blockchain.for_all_txpool_txes([this, &remove](const crypto::hash &txid, const txpool_tx_meta_t &meta, const cryptonote::blobdata*) {
|
|
|
|
|
m_blockchain.for_all_txpool_txes([this, &remove](const crypto::hash &txid, const txpool_tx_meta_t &meta, const cryptonote::blobdata_ref*) {
|
|
|
|
|
uint64_t tx_age = time(nullptr) - meta.receive_time;
|
|
|
|
|
|
|
|
|
|
if((tx_age > CRYPTONOTE_MEMPOOL_TX_LIVETIME && !meta.kept_by_block) ||
|
|
|
|
@ -737,7 +737,7 @@ namespace cryptonote
|
|
|
|
|
CRITICAL_REGION_LOCAL1(m_blockchain);
|
|
|
|
|
LockedTXN lock(m_blockchain.get_db());
|
|
|
|
|
txs.reserve(m_blockchain.get_txpool_tx_count());
|
|
|
|
|
m_blockchain.for_all_txpool_txes([this, now, &txs, &change_timestamps](const crypto::hash &txid, const txpool_tx_meta_t &meta, const cryptonote::blobdata *){
|
|
|
|
|
m_blockchain.for_all_txpool_txes([this, now, &txs, &change_timestamps](const crypto::hash &txid, const txpool_tx_meta_t &meta, const cryptonote::blobdata_ref *){
|
|
|
|
|
// 0 fee transactions are never relayed
|
|
|
|
|
if(!meta.pruned && meta.fee > 0 && !meta.do_not_relay)
|
|
|
|
|
{
|
|
|
|
@ -844,7 +844,7 @@ namespace cryptonote
|
|
|
|
|
CRITICAL_REGION_LOCAL1(m_blockchain);
|
|
|
|
|
const relay_category category = include_sensitive ? relay_category::all : relay_category::broadcasted;
|
|
|
|
|
txs.reserve(m_blockchain.get_txpool_tx_count(include_sensitive));
|
|
|
|
|
m_blockchain.for_all_txpool_txes([&txs](const crypto::hash &txid, const txpool_tx_meta_t &meta, const cryptonote::blobdata *bd){
|
|
|
|
|
m_blockchain.for_all_txpool_txes([&txs](const crypto::hash &txid, const txpool_tx_meta_t &meta, const cryptonote::blobdata_ref *bd){
|
|
|
|
|
transaction tx;
|
|
|
|
|
if (!(meta.pruned ? parse_and_validate_tx_base_from_blob(*bd, tx) : parse_and_validate_tx_from_blob(*bd, tx)))
|
|
|
|
|
{
|
|
|
|
@ -864,7 +864,7 @@ namespace cryptonote
|
|
|
|
|
CRITICAL_REGION_LOCAL1(m_blockchain);
|
|
|
|
|
const relay_category category = include_sensitive ? relay_category::all : relay_category::broadcasted;
|
|
|
|
|
txs.reserve(m_blockchain.get_txpool_tx_count(include_sensitive));
|
|
|
|
|
m_blockchain.for_all_txpool_txes([&txs](const crypto::hash &txid, const txpool_tx_meta_t &meta, const cryptonote::blobdata *bd){
|
|
|
|
|
m_blockchain.for_all_txpool_txes([&txs](const crypto::hash &txid, const txpool_tx_meta_t &meta, const cryptonote::blobdata_ref *bd){
|
|
|
|
|
txs.push_back(txid);
|
|
|
|
|
return true;
|
|
|
|
|
}, false, category);
|
|
|
|
@ -877,7 +877,7 @@ namespace cryptonote
|
|
|
|
|
const uint64_t now = time(NULL);
|
|
|
|
|
const relay_category category = include_sensitive ? relay_category::all : relay_category::broadcasted;
|
|
|
|
|
backlog.reserve(m_blockchain.get_txpool_tx_count(include_sensitive));
|
|
|
|
|
m_blockchain.for_all_txpool_txes([&backlog, now](const crypto::hash &txid, const txpool_tx_meta_t &meta, const cryptonote::blobdata *bd){
|
|
|
|
|
m_blockchain.for_all_txpool_txes([&backlog, now](const crypto::hash &txid, const txpool_tx_meta_t &meta, const cryptonote::blobdata_ref *bd){
|
|
|
|
|
backlog.push_back({meta.weight, meta.fee, meta.receive_time - now});
|
|
|
|
|
return true;
|
|
|
|
|
}, false, category);
|
|
|
|
@ -893,7 +893,7 @@ namespace cryptonote
|
|
|
|
|
stats.txs_total = m_blockchain.get_txpool_tx_count(include_sensitive);
|
|
|
|
|
std::vector<uint32_t> weights;
|
|
|
|
|
weights.reserve(stats.txs_total);
|
|
|
|
|
m_blockchain.for_all_txpool_txes([&stats, &weights, now, &agebytes](const crypto::hash &txid, const txpool_tx_meta_t &meta, const cryptonote::blobdata *bd){
|
|
|
|
|
m_blockchain.for_all_txpool_txes([&stats, &weights, now, &agebytes](const crypto::hash &txid, const txpool_tx_meta_t &meta, const cryptonote::blobdata_ref *bd){
|
|
|
|
|
weights.push_back(meta.weight);
|
|
|
|
|
stats.bytes_total += meta.weight;
|
|
|
|
|
if (!stats.bytes_min || meta.weight < stats.bytes_min)
|
|
|
|
@ -978,10 +978,10 @@ namespace cryptonote
|
|
|
|
|
const size_t count = m_blockchain.get_txpool_tx_count(include_sensitive_data);
|
|
|
|
|
tx_infos.reserve(count);
|
|
|
|
|
key_image_infos.reserve(count);
|
|
|
|
|
m_blockchain.for_all_txpool_txes([&tx_infos, key_image_infos, include_sensitive_data](const crypto::hash &txid, const txpool_tx_meta_t &meta, const cryptonote::blobdata *bd){
|
|
|
|
|
m_blockchain.for_all_txpool_txes([&tx_infos, key_image_infos, include_sensitive_data](const crypto::hash &txid, const txpool_tx_meta_t &meta, const cryptonote::blobdata_ref *bd){
|
|
|
|
|
tx_info txi;
|
|
|
|
|
txi.id_hash = epee::string_tools::pod_to_hex(txid);
|
|
|
|
|
txi.tx_blob = *bd;
|
|
|
|
|
txi.tx_blob = blobdata(bd->data(), bd->size());
|
|
|
|
|
transaction tx;
|
|
|
|
|
if (!(meta.pruned ? parse_and_validate_tx_base_from_blob(*bd, tx) : parse_and_validate_tx_from_blob(*bd, tx)))
|
|
|
|
|
{
|
|
|
|
@ -1035,7 +1035,7 @@ namespace cryptonote
|
|
|
|
|
CRITICAL_REGION_LOCAL1(m_blockchain);
|
|
|
|
|
tx_infos.reserve(m_blockchain.get_txpool_tx_count());
|
|
|
|
|
key_image_infos.reserve(m_blockchain.get_txpool_tx_count());
|
|
|
|
|
m_blockchain.for_all_txpool_txes([&tx_infos, key_image_infos](const crypto::hash &txid, const txpool_tx_meta_t &meta, const cryptonote::blobdata *bd){
|
|
|
|
|
m_blockchain.for_all_txpool_txes([&tx_infos, key_image_infos](const crypto::hash &txid, const txpool_tx_meta_t &meta, const cryptonote::blobdata_ref *bd){
|
|
|
|
|
cryptonote::rpc::tx_in_pool txi;
|
|
|
|
|
txi.tx_hash = txid;
|
|
|
|
|
if (!(meta.pruned ? parse_and_validate_tx_base_from_blob(*bd, txi.tx) : parse_and_validate_tx_from_blob(*bd, txi.tx)))
|
|
|
|
@ -1331,7 +1331,7 @@ namespace cryptonote
|
|
|
|
|
std::stringstream ss;
|
|
|
|
|
CRITICAL_REGION_LOCAL(m_transactions_lock);
|
|
|
|
|
CRITICAL_REGION_LOCAL1(m_blockchain);
|
|
|
|
|
m_blockchain.for_all_txpool_txes([&ss, short_format](const crypto::hash &txid, const txpool_tx_meta_t &meta, const cryptonote::blobdata *txblob) {
|
|
|
|
|
m_blockchain.for_all_txpool_txes([&ss, short_format](const crypto::hash &txid, const txpool_tx_meta_t &meta, const cryptonote::blobdata_ref *txblob) {
|
|
|
|
|
ss << "id: " << txid << std::endl;
|
|
|
|
|
if (!short_format) {
|
|
|
|
|
cryptonote::transaction tx;
|
|
|
|
@ -1509,7 +1509,7 @@ namespace cryptonote
|
|
|
|
|
std::unordered_set<crypto::hash> remove;
|
|
|
|
|
|
|
|
|
|
m_txpool_weight = 0;
|
|
|
|
|
m_blockchain.for_all_txpool_txes([this, &remove, tx_weight_limit](const crypto::hash &txid, const txpool_tx_meta_t &meta, const cryptonote::blobdata*) {
|
|
|
|
|
m_blockchain.for_all_txpool_txes([this, &remove, tx_weight_limit](const crypto::hash &txid, const txpool_tx_meta_t &meta, const cryptonote::blobdata_ref*) {
|
|
|
|
|
m_txpool_weight += meta.weight;
|
|
|
|
|
if (meta.weight > tx_weight_limit) {
|
|
|
|
|
LOG_PRINT_L1("Transaction " << txid << " is too big (" << meta.weight << " bytes), removing it from pool");
|
|
|
|
@ -1581,7 +1581,7 @@ namespace cryptonote
|
|
|
|
|
for (int pass = 0; pass < 2; ++pass)
|
|
|
|
|
{
|
|
|
|
|
const bool kept = pass == 1;
|
|
|
|
|
bool r = m_blockchain.for_all_txpool_txes([this, &remove, kept](const crypto::hash &txid, const txpool_tx_meta_t &meta, const cryptonote::blobdata *bd) {
|
|
|
|
|
bool r = m_blockchain.for_all_txpool_txes([this, &remove, kept](const crypto::hash &txid, const txpool_tx_meta_t &meta, const cryptonote::blobdata_ref *bd) {
|
|
|
|
|
if (!!kept != !!meta.kept_by_block)
|
|
|
|
|
return true;
|
|
|
|
|
cryptonote::transaction_prefix tx;
|
|
|
|
|