From 78b6fa32ab1d8013e4625232fe38f505d571f387 Mon Sep 17 00:00:00 2001 From: stoffu Date: Wed, 12 Sep 2018 08:49:06 +0900 Subject: [PATCH 1/3] support for the new Bulletproofs format --- src/page.h | 8 ++++---- src/rpccalls.cpp | 4 ++-- src/tools.cpp | 3 +-- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/src/page.h b/src/page.h index 61d1513..ada33a8 100644 --- a/src/page.h +++ b/src/page.h @@ -653,7 +653,7 @@ index2(uint64_t page_no = 0, bool refresh_page = false) crypto::hash blk_hash = core_storage->get_block_id_by_height(i); // get block size in kB - double blk_size = static_cast(core_storage->get_db().get_block_size(i))/1024.0; + double blk_size = static_cast(core_storage->get_db().get_block_weight(i))/1024.0; string blk_size_str = fmt::format("{:0.2f}", blk_size); @@ -1225,7 +1225,7 @@ show_block(uint64_t _blk_height) } // get block size in bytes - uint64_t blk_size = core_storage->get_db().get_block_size(_blk_height); + uint64_t blk_size = core_storage->get_db().get_block_weight(_blk_height); // miner reward tx transaction coinbase_tx = blk.miner_tx; @@ -4610,7 +4610,7 @@ json_block(string block_no_or_hash) // get block size in bytes - uint64_t blk_size = core_storage->get_db().get_block_size(block_height); + uint64_t blk_size = core_storage->get_db().get_block_weight(block_height); // miner reward tx transaction coinbase_tx = blk.miner_tx; @@ -4839,7 +4839,7 @@ json_transactions(string _page, string _limit) } // get block size in bytes - double blk_size = core_storage->get_db().get_block_size(i); + double blk_size = core_storage->get_db().get_block_weight(i); crypto::hash blk_hash = core_storage->get_block_id_by_height(i); diff --git a/src/rpccalls.cpp b/src/rpccalls.cpp index d9711be..c5ec95f 100644 --- a/src/rpccalls.cpp +++ b/src/rpccalls.cpp @@ -275,9 +275,9 @@ rpccalls::get_dynamic_per_kb_fee_estimate( uint64_t& fee, string& error_msg) { - epee::json_rpc::request + epee::json_rpc::request req_t = AUTO_VAL_INIT(req_t); - epee::json_rpc::response + epee::json_rpc::response resp_t = AUTO_VAL_INIT(resp_t); diff --git a/src/tools.cpp b/src/tools.cpp index 2c8300a..e7d3025 100644 --- a/src/tools.cpp +++ b/src/tools.cpp @@ -935,7 +935,7 @@ decode_ringct(rct::rctSig const& rv, switch (rv.type) { case rct::RCTTypeSimple: - case rct::RCTTypeSimpleBulletproof: + case rct::RCTTypeBulletproof: amount = rct::decodeRctSimple(rv, rct::sk2rct(scalar1), i, @@ -943,7 +943,6 @@ decode_ringct(rct::rctSig const& rv, hw::get_device("default")); break; case rct::RCTTypeFull: - case rct::RCTTypeFullBulletproof: amount = rct::decodeRct(rv, rct::sk2rct(scalar1), i, From e29a7ba133baef40341b459c0162320a643cf6e1 Mon Sep 17 00:00:00 2001 From: stoffu Date: Wed, 12 Sep 2018 08:50:03 +0900 Subject: [PATCH 2/3] fix compile error from boost variant initialization --- src/page.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/page.h b/src/page.h index ada33a8..1cd5920 100644 --- a/src/page.h +++ b/src/page.h @@ -2539,7 +2539,7 @@ show_my_outputs(string tx_hash_str, //cout << "\nmixins: " << mix << '\n'; - context["no_all_possible_mixins"] = all_possible_mixins.size(); + context["no_all_possible_mixins"] = static_cast(all_possible_mixins.size()); context["all_possible_mixins_amount"] = all_possible_mixins_amount1; From 639be9d7673f0f537871dc87a2cc305d178cc805 Mon Sep 17 00:00:00 2001 From: stoffu Date: Wed, 12 Sep 2018 08:55:40 +0900 Subject: [PATCH 3/3] increase precision of printed fee --- src/MempoolStatus.cpp | 2 +- src/page.h | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/MempoolStatus.cpp b/src/MempoolStatus.cpp index 76b5e90..151532d 100644 --- a/src/MempoolStatus.cpp +++ b/src/MempoolStatus.cpp @@ -168,7 +168,7 @@ MempoolStatus::read_mempool() last_tx.mixin_no = sum_data[2]; last_tx.num_nonrct_inputs = sum_data[3]; - last_tx.fee_str = xmreg::xmr_amount_to_str(_tx_info.fee, "{:0.3f}", false); + last_tx.fee_str = xmreg::xmr_amount_to_str(_tx_info.fee, "{:0.4f}", false); last_tx.payed_for_kB_str = fmt::format("{:0.4f}", payed_for_kB); last_tx.xmr_inputs_str = xmreg::xmr_amount_to_str(last_tx.sum_inputs , "{:0.3f}"); last_tx.xmr_outputs_str = xmreg::xmr_amount_to_str(last_tx.sum_outputs, "{:0.3f}"); diff --git a/src/page.h b/src/page.h index 1cd5920..2903b0b 100644 --- a/src/page.h +++ b/src/page.h @@ -256,8 +256,8 @@ struct tx_details mixin_str = std::to_string(mixin_no); fee_str = fmt::format("{:0.6f}", xmr_amount); - fee_short_str = fmt::format("{:0.3f}", xmr_amount); - payed_for_kB_str = fmt::format("{:0.3f}", payed_for_kB); + fee_short_str = fmt::format("{:0.4f}", xmr_amount); + payed_for_kB_str = fmt::format("{:0.4f}", payed_for_kB); } @@ -5542,7 +5542,7 @@ json_emission() string emission_blk_no = std::to_string(current_values.blk_no - 1); string emission_coinbase = xmr_amount_to_str(current_values.coinbase, "{:0.3f}"); - string emission_fee = xmr_amount_to_str(current_values.fee, "{:0.3f}", false); + string emission_fee = xmr_amount_to_str(current_values.fee, "{:0.4f}", false); j_data = json { {"blk_no" , current_values.blk_no - 1},