d0s3t3ch
/
onion-wownero-blockchain-explorer
mirror of https://git.wownero.com/wownero/onion-wownero-blockchain-explorer.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into matching_inputs_and_ouputs_public_keys

This commit is contained in:
moneroexamples 2017-01-22 06:53:33 +08:00
parent e4cf9c05d9 d5933100a8
commit 87e113d2b6
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/page.h
View File

@ -1460,7 +1460,7 @@ public:
mixins.push_back(mstch::map{ mixins.push_back(mstch::map{
{"mixin_pub_key" , out_pub_key_str}, {"mixin_pub_key" , out_pub_key_str},
{"mixin_outputs" , mstch::array{}}, make_pair<string, mstch::array>("mixin_outputs" , mstch::array{}),
{"has_mixin_outputs" , false} {"has_mixin_outputs" , false}
}); });
@ -1501,7 +1501,7 @@ public:
mixin_outputs.push_back(mstch::map{ mixin_outputs.push_back(mstch::map{
{"mix_tx_hash" , tx_hash_str}, {"mix_tx_hash" , tx_hash_str},
{"mix_tx_pub_key" , mixin_tx_pub_key_str}, {"mix_tx_pub_key" , mixin_tx_pub_key_str},
{"found_outputs" , mstch::array{}}, make_pair<string, mstch::array>("found_outputs" , mstch::array{}),
{"has_found_outputs", false} {"has_found_outputs", false}
}); });
@ -1643,7 +1643,7 @@ public:
context.emplace("inputs", inputs); context.emplace("inputs", inputs);
context["show_inputs"] = show_key_images; context["show_inputs"] = show_key_images;
context["inputs_no"] = inputs.size(); context["inputs_no"] = static_cast<uint64_t>(inputs.size());
context["sum_mixin_xmr"] = xmreg::xmr_amount_to_str(sum_mixin_xmr); context["sum_mixin_xmr"] = xmreg::xmr_amount_to_str(sum_mixin_xmr);
@ -3945,7 +3945,9 @@ private:
if (core_storage->have_tx(tx_hash)) if (core_storage->have_tx(tx_hash))
{ {
tx_blk_height = core_storage->get_db().get_tx_block_height(tx_hash); // currently get_tx_block_height seems to return a block hight
// +1. Before it was not like this.
tx_blk_height = core_storage->get_db().get_tx_block_height(tx_hash) - 1;
tx_blk_found = true; tx_blk_found = true;
} }