moneroexamples 5 years ago
parent 746798813e
commit cd64eef13a

@ -192,9 +192,6 @@ main(int ac, const char* av[])
return EXIT_FAILURE; return EXIT_FAILURE;
} }
cout << blockchain_path << endl;
// create instance of our MicroCore // create instance of our MicroCore
// and make pointer to the Blockchain // and make pointer to the Blockchain
xmreg::MicroCore mcore; xmreg::MicroCore mcore;

@ -200,26 +200,6 @@ MempoolStatus::read_mempool()
last_tx.txsize = fmt::format("{:0.2f}", tx_size); last_tx.txsize = fmt::format("{:0.2f}", tx_size);
last_tx.pID = '-';
crypto::hash payment_id;
crypto::hash8 payment_id8;
get_payment_id(tx, payment_id, payment_id8);
if (payment_id != null_hash)
last_tx.pID = 'l'; // legacy payment id
else if (payment_id8 != null_hash8)
last_tx.pID = 'e'; // encrypted payment id
else if (!get_additional_tx_pub_keys_from_extra(tx).empty())
{
// if multioutput tx have additional public keys,
// mark it so that it represents that it has at least
// one sub-address
last_tx.pID = 's';
}
// } // if (hex_to_pod(_tx_info.id_hash, mem_tx_hash))
} // for (size_t i = 0; i < mempool_tx_info.size(); ++i) } // for (size_t i = 0; i < mempool_tx_info.size(); ++i)

@ -46,10 +46,6 @@ struct MempoolStatus
string xmr_outputs_str; string xmr_outputs_str;
string timestamp_str; string timestamp_str;
string txsize; string txsize;
char pID; // '-' - no payment ID,
// 'l' - legacy, long 64 character payment id,
// 'e' - encrypted, short, from integrated addresses
}; };

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

@ -83,7 +83,7 @@
<td>transaction hash</td> <td>transaction hash</td>
<td>fee [&#181;&#x271]</td> <td>fee [&#181;&#x271]</td>
<td>outputs</td> <td>outputs</td>
<td>in/out/pID</td> <td>in/out</td>
<td>tx size [kB]</td> <td>tx size [kB]</td>
</tr> </tr>
{{#txs}} {{#txs}}
@ -94,7 +94,7 @@
<td><a href="/tx/{{hash}}">{{hash}}</a></td> <td><a href="/tx/{{hash}}">{{hash}}</a></td>
<td>{{fee_micro}}</td> <td>{{fee_micro}}</td>
<td>{{sum_outputs_short}}</td> <td>{{sum_outputs_short}}</td>
<td>{{no_inputs}}/{{no_outputs}}/{{pID}}</td> <td>{{no_inputs}}/{{no_outputs}}</td>
<td>{{tx_size_short}}</td> <td>{{tx_size_short}}</td>
</tr> </tr>
{{/txs}} {{/txs}}

@ -10,7 +10,7 @@
<td>transaction hash</td> <td>transaction hash</td>
<td>fee/per_kB [&#181;&#x271]</td> <td>fee/per_kB [&#181;&#x271]</td>
<!--<td>outputs</td>--> <!--<td>outputs</td>-->
<td>in/out/pID</td> <td>in/out</td>
<td>tx size [kB]</td> <td>tx size [kB]</td>
</tr> </tr>
{{#mempooltxs}} {{#mempooltxs}}
@ -19,7 +19,7 @@
<td><a href="/tx/{{hash}}">{{hash}}</a></td> <td><a href="/tx/{{hash}}">{{hash}}</a></td>
<td>{{fee}}/{{payed_for_kB}}</td> <td>{{fee}}/{{payed_for_kB}}</td>
<!--<td>{{xmr_outputs}}</td>--> <!--<td>{{xmr_outputs}}</td>-->
<td>{{no_inputs}}/{{no_outputs}}/{{pID}}</td> <td>{{no_inputs}}/{{no_outputs}}</td>
<td>{{txsize}}</td> <td>{{txsize}}</td>
</tr> </tr>
{{/mempooltxs}} {{/mempooltxs}}

Loading…
Cancel
Save