Change info added to unsigned tx check

master
moneroexamples 8 years ago
parent 1007b2f7d0
commit 7dbf279594

@ -1581,37 +1581,49 @@ namespace xmreg {
{ {
size_t no_of_sources = tx_cd.sources.size(); size_t no_of_sources = tx_cd.sources.size();
// assume single destination for now // assume single destination for now
const tx_destination_entry& tx_dest = tx_cd.destinations.at(0); const tx_destination_entry& tx_dest = tx_cd.destinations.at(0);
for (const tx_destination_entry& a_dest: tx_cd.destinations)
{
cout << "a_dest.addr: " << get_account_address_as_str(testnet, a_dest.addr)
<< " " << a_dest.amount << endl;
}
const tx_destination_entry& tx_change = tx_cd.change_dts;
mstch::map tx_cd_data { mstch::map tx_cd_data {
{"no_of_sources" , no_of_sources}, {"no_of_sources" , no_of_sources},
{"use_rct" , tx_cd.use_rct}, {"use_rct" , tx_cd.use_rct},
{"single_dest_source" , get_account_address_as_str(testnet, tx_dest.addr)}, {"single_dest_source" , get_account_address_as_str(testnet, tx_dest.addr)},
{"dest_amount" , fmt::format("{:0.12f}", XMR_AMOUNT(tx_dest.amount))}, {"dest_amount" , fmt::format("{:0.12f}", XMR_AMOUNT(tx_dest.amount))},
{"change_amount" , fmt::format("{:0.12f}", XMR_AMOUNT(tx_change.amount))},
{"dest_sources" , mstch::array{}} {"dest_sources" , mstch::array{}}
}; };
mstch::array& dest_sources = boost::get<mstch::array>(tx_cd_data["dest_sources"]); mstch::array& dest_sources = boost::get<mstch::array>(tx_cd_data["dest_sources"]);
uint64_t sum_outputs_amounts {0};
for (size_t i = 0; i < no_of_sources; ++i) for (size_t i = 0; i < no_of_sources; ++i)
{ {
//const tx_destination_entry& tx_dest = tx_cd.destinations.at(i); //const tx_destination_entry& tx_dest = tx_cd.destinations.at(i);
const tx_source_entry& tx_source = tx_cd.sources.at(i); const tx_source_entry& tx_source = tx_cd.sources.at(i);
mstch::map single_dest_source { mstch::map single_dest_source {
{"output_amount" , {"output_amount" , fmt::format("{:0.12f}",
fmt::format("{:0.12f}", XMR_AMOUNT(tx_source.amount))}, XMR_AMOUNT(tx_source.amount))},
{"real_output" , tx_source.real_output}, {"real_output" , tx_source.real_output},
{"real_out_tx_key" , pod_to_hex(tx_source.real_out_tx_key)}, {"real_out_tx_key" , pod_to_hex(tx_source.real_out_tx_key)},
{"real_output_in_tx_index" , tx_source.real_output_in_tx_index}, {"real_output_in_tx_index" , tx_source.real_output_in_tx_index},
{"outputs" , mstch::array{}} {"outputs" , mstch::array{}}
}; };
cout << tx_source.real_output << endl; sum_outputs_amounts += tx_source.amount;
cout << tx_source.real_out_tx_key << endl;
cout << tx_source.real_output_in_tx_index << endl; //cout << tx_source.real_output << endl;
//cout << tx_source.real_out_tx_key << endl;
//cout << tx_source.real_output_in_tx_index << endl;
uint64_t index_of_real_output = tx_source.outputs[tx_source.real_output].first; uint64_t index_of_real_output = tx_source.outputs[tx_source.real_output].first;
@ -1631,9 +1643,9 @@ namespace xmreg {
public_key real_out_pub_key = real_txd.output_pub_keys[tx_source.real_output_in_tx_index].first.key; public_key real_out_pub_key = real_txd.output_pub_keys[tx_source.real_output_in_tx_index].first.key;
cout << "real_txd.hash: " << pod_to_hex(real_txd.hash) << endl; //cout << "real_txd.hash: " << pod_to_hex(real_txd.hash) << endl;
cout << "real_txd.pk: " << pod_to_hex(real_txd.pk) << endl; //cout << "real_txd.pk: " << pod_to_hex(real_txd.pk) << endl;
cout << "real_out_pub_key: " << pod_to_hex(real_out_pub_key) << endl; //cout << "real_out_pub_key: " << pod_to_hex(real_out_pub_key) << endl;
mstch::array& outputs = boost::get<mstch::array>(single_dest_source["outputs"]); mstch::array& outputs = boost::get<mstch::array>(single_dest_source["outputs"]);
@ -1691,14 +1703,18 @@ namespace xmreg {
{"is_real" , (out_pub_key == real_out_pub_key)} {"is_real" , (out_pub_key == real_out_pub_key)}
}; };
single_dest_source.insert({"age_format" , age.second}); single_dest_source.insert({"age_format" , age.second});
outputs.push_back(single_output); outputs.push_back(single_output);
++output_i; ++output_i;
} }
dest_sources.push_back(single_dest_source); dest_sources.push_back(single_dest_source);
} }
tx_cd_data.insert({"sum_outputs_amounts" , fmt::format("{:0.12f}", XMR_AMOUNT(sum_outputs_amounts))});
txs.push_back(tx_cd_data); txs.push_back(tx_cd_data);
} }
} }

@ -137,16 +137,16 @@
<div class="center"> <div class="center">
<h3>Details of submitted raw tx data</h3> <h3>Details of submitted raw tx data</h3>
unsigned_tx_given: {{unsigned_tx_given}}
<br/> <h4>unsigned_tx_given: {{unsigned_tx_given}}</h4>
{{#txs}} {{#txs}}
no_of_destinations: {{no_of_destinations}} <br/> <div class="center" style="width: 95%; margin-top:10px">
<div class="center" style="width: 90%; margin-top:10px"> <h4>Destination information</h4>
Amount: {{dest_amount}} <br/> Amount: {{dest_amount}} <br/>
To address: {{single_dest_source}} <br/> Destination address: {{single_dest_source}}
<h4>Outputs used</h4> <h4>Outputs selected for this tx (total: {{sum_outputs_amounts}})</h4>
{{#dest_sources}} {{#dest_sources}}
<table style="width: 80%; margin-top:10px"> <table style="width: 100%; margin-top:10px">
<tr> <tr>
<td>Output Index</td> <td>Output Index</td>
<td>Stealth address</td> <td>Stealth address</td>
@ -171,6 +171,8 @@
{{/outputs}} {{/outputs}}
</table> </table>
{{/dest_sources}} {{/dest_sources}}
<h4>Change to be returned to the sender</h4>
Amount: {{change_amount}}
</div> </div>
{{/txs}} {{/txs}}
</div> </div>

Loading…
Cancel
Save