Merge pull request #61 from alvinjoelsantos/emission_rate_thread

Changed mixin to ring size/ring member

src/page.h

@@ -151,7 +151,7 @@ namespace xmreg
 
             if (!input_key_imgs.empty())
             {
-                mixin_str     = std::to_string(mixin_no - 1);
+                mixin_str     = std::to_string(mixin_no);
                 fee_str       = fmt::format("{:0.6f}", xmr_amount);
                 fee_short_str = fmt::format("{:0.3f}", xmr_amount);
             }
@@ -1012,7 +1012,7 @@ namespace xmreg
                         {"no_inputs"       , no_inputs},
                         {"no_outputs"      , no_outputs},
                         {"no_nonrct_inputs", num_nonrct_inputs},
-                        {"mixin"           , mixin_no},
+                        {"mixin"           , mixin_no+1},
                         {"txsize"          , txsize}
                 });
 

src/templates/block.html

@@ -60,7 +60,7 @@
                 <td>hash</td>
                 <td>outputs</td>
                 <td>fee</td>
-                <td>mixin</td>
+                <td>ring size</td>
                 <td>in/out</td>
                 <td>size [kB]</td>
                 <td>version</td>

src/templates/checkrawtx.html

@@ -36,8 +36,8 @@
                     </h5>
 
                     <h3>
-                        Inputs' mixins time scale (from {{min_mix_time}} till {{max_mix_time}};
-                        resolution: {{timescales_scale}} days{{#have_raw_tx}}; R - real mixin {{/have_raw_tx}})
+                        Inputs' ring size time scale (from {{min_mix_time}} till {{max_mix_time}};
+                        resolution: {{timescales_scale}} days{{#have_raw_tx}}; R - real ring member {{/have_raw_tx}})
                     </h3>
                     <div class="center">
                         <ul class="center">
@@ -111,4 +111,4 @@
     </div>
 
     <br/>
-</div>
+</div>

src/templates/index.html

@@ -32,7 +32,7 @@
                     <td>txs</td>
                     <td>fees</td>
                     <td>outputs</td>
-                    <td>mixins</td>
+                    <td>ring size</td>
                     <td>size [kB]</td>
                 </tr>
                 {{#blocks}}

src/templates/index2.html

@@ -76,7 +76,7 @@
                     <td>fees</td>
                     <td>outputs</td>
                     <td>in(nonrct)/out</td>
-                    <td>mixin</td>
+                    <td>ring size</td>
                     <td>tx size [kB]</td>
                 </tr>
                 {{#txs}}
@@ -115,4 +115,4 @@
             and {{construction_time_non_cached}} s from non cache ({{cache_misses}} misses)
         </h6>
     </div>
-{{/show_cache_times}}
+{{/show_cache_times}}

src/templates/mempool.html

@@ -11,7 +11,7 @@
                 <td>fee</td>
                 <td>outputs</td>
                 <td>in(nonrct)/out</td>
-                <td>mixin</td>
+                <td>ring size</td>
                 <td>tx size [kB]</td>
             </tr>
             {{#mempooltxs}}

src/templates/my_outputs.html

@@ -91,7 +91,7 @@
                             <table class="center">
                               <tr>
                                   <td style="text-align: center;">
-                                      Mixin {{mixin_pub_key}} might use your outputs
+                                      Ring member {{mixin_pub_key}} might use your outputs
                                       <br/>
                                       from tx of hash: <a href="/tx/{{mix_tx_hash}}">{{mix_tx_hash}}</a>
                                       <br/>(tx public key: {{mix_tx_pub_key}})
@@ -133,7 +133,7 @@
 
         </div>
         <h3>
-            Sum XMR from matched and marked by * mixin's outputs: {{sum_mixin_xmr}}
+            Sum XMR from matched and marked by * ring member's outputs: {{sum_mixin_xmr}}
             <br/>
             <span style="font-size: 16px"> Possible spending is:
                 {{possible_spending}} (tx fee included)
@@ -150,4 +150,4 @@
 
 
 </div>
-<br/>
+<br/>

src/templates/partials/tx_details.html

@@ -125,8 +125,8 @@
 
 {{#has_inputs}}
     {{#enable_mixins_details}}
-      <h3>Inputs' mixins time scale (from {{min_mix_time}} till {{max_mix_time}};
-        resolution: {{timescales_scale}} days{{#have_raw_tx}}; R - real mixin {{/have_raw_tx}})
+      <h3>Inputs' ring size time scale (from {{min_mix_time}} till {{max_mix_time}};
+        resolution: {{timescales_scale}} days{{#have_raw_tx}}; R - real ring member {{/have_raw_tx}})
       </h3>
       <div class="center">
         <ul class="center">
@@ -180,12 +180,12 @@
                 {{#enable_mixins_details}}
                     <table style="width:100%; margin-bottom:20px">
                     <tr>
-                      <td>Mixin stealth address</td>
+                      <td>ring members</td>
                       {{#have_raw_tx}}
                         <td>Is it real?</td>
                       {{/have_raw_tx}}
                       <td>blk</td>
-                      <td>mixin</td>
+                      <td>ring size</td>
                       <td>in/out</td>
                       <td>timestamp</td>
                       <td>age [y:d:h:m:s]</td>
@@ -214,7 +214,7 @@
                 {{^enable_mixins_details}}
                 <table style="width:100%; margin-bottom:20px">
                     <tr>
-                        <td>Mixin stealth address</td>
+                        <td>ring members</td>
                         {{#have_raw_tx}}
                             <td>Is it real?</td>
                         {{/have_raw_tx}}

src/templates/partials/tx_table_header.html

@@ -3,7 +3,7 @@
 	<td>tx hash</td>
 	<td>outputs</td>
 	<td>fee</td>
-	<td>mixin</td>
+	<td>ring size</td>
 	<td>in/out</td>
 	<td>size [kB]</td>
 </tr>