Merge remote-tracking branch 'origin/devel' into devel

README.md

@@ -100,7 +100,7 @@ git clone https://github.com/monero-project/monero
 cd monero/
 
 # checkout last monero version
-git checkout -b last_release v0.11.0.0
+git checkout -b last_release v0.11.1.0
 
 make
 ```

src/MempoolStatus.cpp

@@ -174,7 +174,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}");
+            last_tx.fee_str         = xmreg::xmr_amount_to_str(_tx_info.fee, "{:0.3f}", false);
             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}");
             last_tx.timestamp_str   = xmreg::timestamp_to_str_gm(_tx_info.receive_time);

src/page.h

@@ -1147,7 +1147,7 @@ namespace xmreg
 
             // add total fees in the block to the context
             context["sum_fees"]
-                    = xmreg::xmr_amount_to_str(sum_fees, "{:0.6f}");
+                    = xmreg::xmr_amount_to_str(sum_fees, "{:0.6f}", "0");
 
             // get xmr in the block reward
             context["blk_reward"]
@@ -1640,7 +1640,7 @@ namespace xmreg
                     {"blk_height"           , tx_blk_height_str},
                     {"tx_size"              , fmt::format("{:0.4f}",
                                                           static_cast<double>(txd.size) / 1024.0)},
-                    {"tx_fee"               , xmreg::xmr_amount_to_str(txd.fee)},
+                    {"tx_fee"               , xmreg::xmr_amount_to_str(txd.fee, "{:0.12f}", true)},
                     {"blk_timestamp"        , blk_timestamp},
                     {"delta_time"           , age.first},
                     {"outputs_no"           , static_cast<uint64_t>(txd.output_pub_keys.size())},
@@ -5066,7 +5066,7 @@ namespace xmreg
 
                 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}");
+                string emission_fee      = xmr_amount_to_str(current_values.fee, "{:0.3f}", false);
 
                 j_data = json {
                         {"blk_no"  , current_values.blk_no - 1},
@@ -5436,7 +5436,7 @@ namespace xmreg
                     {"tx_blk_height"         , tx_blk_height},
                     {"tx_size"               , fmt::format("{:0.4f}",
                                                            static_cast<double>(txd.size) / 1024.0)},
-                    {"tx_fee"                , xmreg::xmr_amount_to_str(txd.fee)},
+                    {"tx_fee"                , xmreg::xmr_amount_to_str(txd.fee, "{:0.12f}", false)},
                     {"tx_version"            , static_cast<uint64_t>(txd.version)},
                     {"blk_timestamp"         , blk_timestamp},
                     {"blk_timestamp_uint"    , blk.timestamp},

src/templates/rawtx.html

@@ -15,6 +15,7 @@
             <br/>
             (In Linux, can get the raw tx data: <i>cat raw_monero_tx | xclip -selection clipboard</i>)<br/>
             (In Windows, can get the raw tx data: <i>certutil.exe -encode -f raw_monero_tx encoded.txt & type "encoded.txt" | clip</i>)<br/>
+
             <textarea name="rawtxdata" rows="20" cols="80"></textarea>
             <br/>
             Note: data is sent to the server, as the calculations are done on the server side