From dc3ff97648a33396d9c84978992b0c4c58cf1105 Mon Sep 17 00:00:00 2001 From: kenshi84 Date: Fri, 20 Jan 2017 10:32:13 +0900 Subject: [PATCH 1/2] build on mac --- src/page.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/page.h b/src/page.h index ba5a8a7..e13495a 100644 --- a/src/page.h +++ b/src/page.h @@ -1461,7 +1461,7 @@ public: mixins.push_back(mstch::map{ {"mixin_pub_key" , out_pub_key_str}, - {"mixin_outputs" , mstch::array{}}, + make_pair("mixin_outputs" , mstch::array{}), {"has_mixin_outputs" , false} }); @@ -1502,7 +1502,7 @@ public: mixin_outputs.push_back(mstch::map{ {"mix_tx_hash" , tx_hash_str}, {"mix_tx_pub_key" , mixin_tx_pub_key_str}, - {"found_outputs" , mstch::array{}}, + make_pair("found_outputs" , mstch::array{}), {"has_found_outputs", false} }); @@ -1633,7 +1633,7 @@ public: context.emplace("inputs", inputs); context["show_inputs"] = show_key_images; - context["inputs_no"] = inputs.size(); + context["inputs_no"] = static_cast(inputs.size()); context["sum_mixin_xmr"] = xmreg::xmr_amount_to_str(sum_mixin_xmr); From d5933100a81506e3788f4ccdbf327f6d247b62e0 Mon Sep 17 00:00:00 2001 From: moneroexamples Date: Sun, 22 Jan 2017 06:47:29 +0800 Subject: [PATCH 2/2] fix: tx block number incorrect by 1. --- src/page.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/page.h b/src/page.h index e13495a..05aa3d8 100644 --- a/src/page.h +++ b/src/page.h @@ -3935,7 +3935,9 @@ private: 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; }