|
|
@ -323,10 +323,6 @@ struct tx_details
|
|
|
|
|
|
|
|
|
|
|
|
bool has_additional_tx_pub_keys {false};
|
|
|
|
bool has_additional_tx_pub_keys {false};
|
|
|
|
|
|
|
|
|
|
|
|
char pID; // '-' - no payment ID,
|
|
|
|
|
|
|
|
// 'l' - legacy, long 64 character payment id,
|
|
|
|
|
|
|
|
// 'e' - encrypted, short, from integrated addresses
|
|
|
|
|
|
|
|
// 's' - sub-address (avaliable only for multi-output txs)
|
|
|
|
|
|
|
|
uint64_t unlock_time;
|
|
|
|
uint64_t unlock_time;
|
|
|
|
uint64_t no_confirmations;
|
|
|
|
uint64_t no_confirmations;
|
|
|
|
vector<uint8_t> extra;
|
|
|
|
vector<uint8_t> extra;
|
|
|
@ -395,7 +391,6 @@ struct tx_details
|
|
|
|
{"version" , static_cast<uint64_t>(version)},
|
|
|
|
{"version" , static_cast<uint64_t>(version)},
|
|
|
|
{"has_payment_id" , payment_id != null_hash},
|
|
|
|
{"has_payment_id" , payment_id != null_hash},
|
|
|
|
{"has_payment_id8" , payment_id8 != null_hash8},
|
|
|
|
{"has_payment_id8" , payment_id8 != null_hash8},
|
|
|
|
{"pID" , string {pID}},
|
|
|
|
|
|
|
|
{"payment_id" , pod_to_hex(payment_id)},
|
|
|
|
{"payment_id" , pod_to_hex(payment_id)},
|
|
|
|
{"confirmations" , no_confirmations},
|
|
|
|
{"confirmations" , no_confirmations},
|
|
|
|
{"extra" , get_extra_str()},
|
|
|
|
{"extra" , get_extra_str()},
|
|
|
@ -939,7 +934,6 @@ mempool(bool add_header_and_footer = false, uint64_t no_of_mempool_tx = 25)
|
|
|
|
{"xmr_outputs" , mempool_tx.xmr_outputs_str},
|
|
|
|
{"xmr_outputs" , mempool_tx.xmr_outputs_str},
|
|
|
|
{"no_inputs" , mempool_tx.no_inputs},
|
|
|
|
{"no_inputs" , mempool_tx.no_inputs},
|
|
|
|
{"no_outputs" , mempool_tx.no_outputs},
|
|
|
|
{"no_outputs" , mempool_tx.no_outputs},
|
|
|
|
{"pID" , string {mempool_tx.pID}},
|
|
|
|
|
|
|
|
{"no_nonrct_inputs", mempool_tx.num_nonrct_inputs},
|
|
|
|
{"no_nonrct_inputs", mempool_tx.num_nonrct_inputs},
|
|
|
|
{"mixin" , mempool_tx.mixin_no},
|
|
|
|
{"mixin" , mempool_tx.mixin_no},
|
|
|
|
{"txsize" , mempool_tx.txsize}
|
|
|
|
{"txsize" , mempool_tx.txsize}
|
|
|
@ -6542,8 +6536,6 @@ get_tx_details(const transaction& tx,
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
txd.pID = '-'; // no payment ID
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
get_payment_id(tx, txd.payment_id, txd.payment_id8);
|
|
|
|
get_payment_id(tx, txd.payment_id, txd.payment_id8);
|
|
|
|
|
|
|
|
|
|
|
|
// get tx size in bytes
|
|
|
|
// get tx size in bytes
|
|
|
@ -6551,23 +6543,6 @@ get_tx_details(const transaction& tx,
|
|
|
|
|
|
|
|
|
|
|
|
txd.extra = tx.extra;
|
|
|
|
txd.extra = tx.extra;
|
|
|
|
|
|
|
|
|
|
|
|
if (txd.payment_id != null_hash)
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
txd.payment_id_as_ascii = std::string(txd.payment_id.data, crypto::HASH_SIZE);
|
|
|
|
|
|
|
|
txd.pID = 'l'; // legacy payment id
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
else if (txd.payment_id8 != null_hash8)
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
txd.pID = 'e'; // encrypted payment id
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
else if (txd.additional_pks.empty() == false)
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
// if multioutput tx have additional public keys,
|
|
|
|
|
|
|
|
// mark it so that it represents that it has at least
|
|
|
|
|
|
|
|
// one sub-address
|
|
|
|
|
|
|
|
txd.pID = 's';
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// get tx signatures for each input
|
|
|
|
// get tx signatures for each input
|
|
|
|
txd.signatures = tx.signatures;
|
|
|
|
txd.signatures = tx.signatures;
|
|
|
|
|
|
|
|
|
|
|
|