Merge branch 'master' into knorrium/cache_assets_gha

contributors/isghe.txt

@@ -0,0 +1,3 @@
+I hereby accept the terms of the Contributor License Agreement in the CONTRIBUTING.md file of the mempool/mempool git repository as of January 18, 2024.
+
+Signed: isghe

frontend/src/app/components/about/about.component.html

@@ -405,7 +405,7 @@
 
   <div class="copyright">
     <div class="title">
-      Copyright &copy; 2019-2023<br>
+      Copyright &copy; 2019-2024<br>
       Mempool Space K.K.<br>
       and other shadowy super-coders
     </div>

frontend/src/app/components/acceleration/acceleration-fees-graph/acceleration-fees-graph.component.ts

@@ -66,7 +66,7 @@ export class AccelerationFeesGraphComponent implements OnInit, OnDestroy {
   }
 
   ngOnInit(): void {
-    this.seoService.setTitle($localize`:@@6c453b11fd7bd159ae30bc381f367bc736d86909:Acceleration Fees`);
+    this.seoService.setTitle($localize`:@@bcf34abc2d9ed8f45a2f65dd464c46694e9a181e:Acceleration Fees`);
     this.isLoading = true;
     if (this.widget) {
       this.miningWindowPreference = '1m';

frontend/src/app/components/acceleration/acceleration-stats/acceleration-stats.component.html

@@ -17,7 +17,7 @@
       </div>
     </div>
     <div class="item">
-      <h5 class="card-title" i18n="accelerator.success-rate">Success rate</h5>
+      <h5 class="card-title" i18n="accelerator.success-rate">Success Rate</h5>
       <div class="card-text">
         <div>{{ stats.successRate.toFixed(2) }} %</div>
         <div class="symbol" i18n="accelerator.mined-next-block">mined</div>
@@ -43,7 +43,7 @@
       </div>
     </div>
     <div class="item">
-      <h5 class="card-title" i18n="accelerator.success-rate">Success rate</h5>
+      <h5 class="card-title" i18n="accelerator.success-rate">Success Rate</h5>
       <div class="card-text">
         <div class="skeleton-loader"></div>
         <div class="skeleton-loader"></div>

frontend/src/app/components/acceleration/accelerator-dashboard/accelerator-dashboard.component.html

@@ -7,7 +7,7 @@
     <!-- pending stats -->
     <div class="col">
       <div class="main-title">
-        <span [attr.data-cy]="'pending-accelerations'" i18n="accelerator.pending-accelerations">Active accelerations</span>
+        <span [attr.data-cy]="'pending-accelerations'" i18n="accelerator.pending-accelerations">Active Accelerations</span>
       </div>
       <div class="card-wrapper">
         <div class="card">
@@ -69,7 +69,7 @@
       <div class="card list-card">
         <div class="card-body">
           <div class="title-link">
-            <h5 class="card-title d-inline" i18n="dashboard.recent-accelerations">Active Accelerations</h5>
+            <h5 class="card-title d-inline" i18n="accelerator.pending-accelerations">Active Accelerations</h5>
           </div>
           <app-accelerations-list [attr.data-cy]="'pending-accelerations'" [widget]=true [pending]="true" [accelerations$]="pendingAccelerations$"></app-accelerations-list>
         </div>

frontend/src/app/components/acceleration/pending-stats/pending-stats.component.html

@@ -17,7 +17,7 @@
       </div>
     </div>
     <div class="item">
-      <h5 class="card-title" i18n="accelerator.total-vsize">Total vsize</h5>
+      <h5 class="card-title" i18n="accelerator.total-vsize">Total Vsize</h5>
       <div class="card-text">
         <div [innerHTML]="'&lrm;' + (stats.totalVsize * 4 | vbytes: 2)"></div>
         <div class="symbol">{{ (stats.totalVsize / 1_000_000 * 100).toFixed(2) }}% <span i18n="accelerator.percent-of-next-block"> of next block</span></div>
@@ -43,7 +43,7 @@
       </div>
     </div>
     <div class="item">
-      <h5 class="card-title" i18n="accelerator.total-vsize">Total vsize</h5>
+      <h5 class="card-title" i18n="accelerator.total-vsize">Total Vsize</h5>
       <div class="card-text">
         <div class="skeleton-loader"></div>
         <div class="skeleton-loader"></div>

frontend/src/app/components/master-page/master-page.component.html

@@ -53,7 +53,7 @@
         <a class="nav-link" [routerLink]="['/' | relativeUrl]" (click)="collapse()"><fa-icon [icon]="['fas', 'tachometer-alt']" [fixedWidth]="true" i18n-title="master-page.dashboard" title="Dashboard"></fa-icon></a>
       </li>
       <li class="nav-item" routerLinkActive="active" [routerLinkActiveOptions]="{exact: true}" id="btn-home" *ngIf="stateService.env.ACCELERATOR">
-        <a class="nav-link" [routerLink]="['/acceleration' | relativeUrl]" (click)="collapse()"><fa-icon [icon]="['fas', 'rocket']" [fixedWidth]="true" i18n-title="master-page.acceleration-dashboard" title="Acceleration Dashboard"></fa-icon></a>
+        <a class="nav-link" [routerLink]="['/acceleration' | relativeUrl]" (click)="collapse()"><fa-icon [icon]="['fas', 'rocket']" [fixedWidth]="true" i18n-title="master-page.accelerator-dashboard" title="Accelerator Dashboard"></fa-icon></a>
       </li>
       <li class="nav-item" routerLinkActive="active" [routerLinkActiveOptions]="{exact: true}" id="btn-pools" *ngIf="stateService.env.MINING_DASHBOARD">
         <a class="nav-link" [routerLink]="['/mining' | relativeUrl]" (click)="collapse()"><fa-icon [icon]="['fas', 'hammer']" [fixedWidth]="true" i18n-title="mining.mining-dashboard" title="Mining Dashboard"></fa-icon></a>

frontend/src/app/components/transaction/transaction.component.html

@@ -299,7 +299,7 @@
                 <td [innerHTML]="'&lrm;' + (tx.weight / 4 | vbytes: 2)"></td>
               </tr>
               <tr *ngIf="adjustedVsize != null">
-                <td i18n="transaction.adjusted-vsize|Transaction Adjusted VSize">Adjusted vsize
+                <td><ng-template i18n="transaction.adjusted-vsize|Transaction Adjusted VSize">Adjusted vsize</ng-template>
                   <a class="info-link" [routerLink]="['/docs/faq/' | relativeUrl]" fragment="what-is-adjusted-vsize">
                     <fa-icon [icon]="['fas', 'info-circle']" [fixedWidth]="true"></fa-icon>
                   </a>
@@ -325,7 +325,7 @@
                 <td [innerHTML]="'&lrm;' + (tx.locktime | number)"></td>
               </tr>
               <tr *ngIf="sigops != null">
-                <td i18n="transaction.sigops|Transaction Sigops">Sigops
+                <td><ng-template i18n="transaction.sigops|Transaction Sigops">Sigops</ng-template>
                   <a class="info-link" [routerLink]="['/docs/faq/' | relativeUrl]" fragment="what-are-sigops">
                     <fa-icon [icon]="['fas', 'info-circle']" [fixedWidth]="true"></fa-icon>
                   </a>

frontend/src/locale/messages.xlf

@@ -1661,6 +1661,10 @@
           <context context-type="sourcefile">src/app/components/acceleration/acceleration-fees-graph/acceleration-fees-graph.component.html</context>
           <context context-type="linenumber">6</context>
         </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/acceleration/acceleration-fees-graph/acceleration-fees-graph.component.ts</context>
+          <context context-type="linenumber">69</context>
+        </context-group>
         <note priority="1" from="description">accelerator.acceleration-fees</note>
       </trans-unit>
       <trans-unit id="bdb8bbb38e4ca3c73e19dc4167fbe4aec316f818" datatype="html">
@@ -1679,25 +1683,6 @@
         </context-group>
         <note priority="1" from="description">acceleration.total-bid-boost</note>
       </trans-unit>
-      <trans-unit id="6c453b11fd7bd159ae30bc381f367bc736d86909" datatype="html">
-        <source>Acceleration Fees</source>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/acceleration/acceleration-fees-graph/acceleration-fees-graph.component.ts</context>
-          <context context-type="linenumber">69</context>
-        </context-group>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/block-fees-graph/block-fees-graph.component.html</context>
-          <context context-type="linenumber">6</context>
-        </context-group>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/block-fees-graph/block-fees-graph.component.ts</context>
-          <context context-type="linenumber">67</context>
-        </context-group>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/graphs/graphs.component.html</context>
-          <context context-type="linenumber">19</context>
-        </context-group>
-      </trans-unit>
       <trans-unit id="4793828002882320882" datatype="html">
         <source>At block: <x id="PH" equiv-text="data[0].data[2]"/></source>
         <context-group purpose="location">
@@ -1777,8 +1762,8 @@
         <note priority="1" from="description">BTC</note>
         <note priority="1" from="meaning">shared.btc</note>
       </trans-unit>
-      <trans-unit id="4e0fbac5ba55cf78f1accbaf9c871fb23b4b67d9" datatype="html">
-        <source>Success rate</source>
+      <trans-unit id="599dec71fe5c264d05012c7f64080d6347c1dc49" datatype="html">
+        <source>Success Rate</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/acceleration/acceleration-stats/acceleration-stats.component.html</context>
           <context context-type="linenumber">20</context>
@@ -1941,12 +1926,16 @@
         </context-group>
         <note priority="1" from="description">accelerations.no-accelerations</note>
       </trans-unit>
-      <trans-unit id="8adc22d4ccfd987ce3e2c1c86d0ccae17d281328" datatype="html">
-        <source>Active accelerations</source>
+      <trans-unit id="e51c45c636401f8bb3bd8cfd1ed5a3c9810c5fa8" datatype="html">
+        <source>Active Accelerations</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/acceleration/accelerator-dashboard/accelerator-dashboard.component.html</context>
           <context context-type="linenumber">10</context>
         </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/acceleration/accelerator-dashboard/accelerator-dashboard.component.html</context>
+          <context context-type="linenumber">72</context>
+        </context-group>
         <note priority="1" from="description">accelerator.pending-accelerations</note>
       </trans-unit>
       <trans-unit id="41a9456b7e195dfc4df3d67b09940bda160882af" datatype="html">
@@ -1965,14 +1954,6 @@
         </context-group>
         <note priority="1" from="description">mining.144-blocks</note>
       </trans-unit>
-      <trans-unit id="e51c45c636401f8bb3bd8cfd1ed5a3c9810c5fa8" datatype="html">
-        <source>Active Accelerations</source>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/acceleration/accelerator-dashboard/accelerator-dashboard.component.html</context>
-          <context context-type="linenumber">72</context>
-        </context-group>
-        <note priority="1" from="description">dashboard.recent-accelerations</note>
-      </trans-unit>
       <trans-unit id="f0ae1220633178276128371f3965fb53d63581d4" datatype="html">
         <source>Recent Accelerations</source>
         <context-group purpose="location">
@@ -2020,8 +2001,8 @@
         </context-group>
         <note priority="1" from="description">accelerator.average-max-bid</note>
       </trans-unit>
-      <trans-unit id="62be8da2e6a219a43d83a1887e55dc0ae1be155b" datatype="html">
-        <source>Total vsize</source>
+      <trans-unit id="16fedee43f919b6a0992f32aeec5d6938e8d6b76" datatype="html">
+        <source>Total Vsize</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/acceleration/pending-stats/pending-stats.component.html</context>
           <context context-type="linenumber">20</context>
@@ -2563,6 +2544,22 @@
           <context context-type="linenumber">73</context>
         </context-group>
       </trans-unit>
+      <trans-unit id="6c453b11fd7bd159ae30bc381f367bc736d86909" datatype="html">
+        <source>Block Fees</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/block-fees-graph/block-fees-graph.component.html</context>
+          <context context-type="linenumber">6</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/block-fees-graph/block-fees-graph.component.ts</context>
+          <context context-type="linenumber">67</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/graphs/graphs.component.html</context>
+          <context context-type="linenumber">19</context>
+        </context-group>
+        <note priority="1" from="description">mining.block-fees</note>
+      </trans-unit>
       <trans-unit id="meta.description.bitcoin.graphs.block-fees" datatype="html">
         <source>See the average mining fees earned per Bitcoin block visualized in BTC and USD over time.</source>
         <context-group purpose="location">
@@ -4268,13 +4265,13 @@
         </context-group>
         <note priority="1" from="description">master-page.graphs</note>
       </trans-unit>
-      <trans-unit id="2efef6dfa1c2d2d8fa05b337eccf3e0006af1e94" datatype="html">
-        <source>Acceleration Dashboard</source>
+      <trans-unit id="6b867dc61c6a92f3229f1950f9f2d414790cce95" datatype="html">
+        <source>Accelerator Dashboard</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/master-page/master-page.component.html</context>
           <context context-type="linenumber">56</context>
         </context-group>
-        <note priority="1" from="description">master-page.acceleration-dashboard</note>
+        <note priority="1" from="description">master-page.accelerator-dashboard</note>
       </trans-unit>
       <trans-unit id="142e923d3b04186ac6ba23387265d22a2fa404e0" datatype="html">
         <source>Lightning Explorer</source>
@@ -5547,11 +5544,11 @@
         </context-group>
         <note priority="1" from="description">show-diagram</note>
       </trans-unit>
-      <trans-unit id="9ad256cfb48e88f5bc56243641c992d53461f482" datatype="html">
-        <source>Adjusted vsize <x id="START_LINK" ctype="x-a" equiv-text="&lt;a class=&quot;info-link&quot; [routerLink]=&quot;[&apos;/docs/faq/&apos; | relativeUrl]&quot; fragment=&quot;what-is-adjusted-vsize&quot;&gt;"/><x id="START_TAG_FA_ICON" ctype="x-fa_icon" equiv-text="&lt;fa-icon [icon]=&quot;[&apos;fas&apos;, &apos;info-circle&apos;]&quot; [fixedWidth]=&quot;true&quot;&gt;"/><x id="CLOSE_TAG_FA_ICON" ctype="x-fa_icon"/><x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a&gt;"/></source>
+      <trans-unit id="a8a4dd861f790141e19f773153cf42b5d0b0e6b6" datatype="html">
+        <source>Adjusted vsize</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/transaction/transaction.component.html</context>
-          <context context-type="linenumber">302,306</context>
+          <context context-type="linenumber">302</context>
         </context-group>
         <note priority="1" from="description">Transaction Adjusted VSize</note>
         <note priority="1" from="meaning">transaction.adjusted-vsize</note>
@@ -5564,11 +5561,11 @@
         </context-group>
         <note priority="1" from="description">transaction.locktime</note>
       </trans-unit>
-      <trans-unit id="c93f5659ea1b4a8c59a8e4710cbcdb62b37206b0" datatype="html">
-        <source>Sigops <x id="START_LINK" ctype="x-a" equiv-text="&lt;a class=&quot;info-link&quot; [routerLink]=&quot;[&apos;/docs/faq/&apos; | relativeUrl]&quot; fragment=&quot;what-are-sigops&quot;&gt;"/><x id="START_TAG_FA_ICON" ctype="x-fa_icon" equiv-text="&lt;fa-icon [icon]=&quot;[&apos;fas&apos;, &apos;info-circle&apos;]&quot; [fixedWidth]=&quot;true&quot;&gt;"/><x id="CLOSE_TAG_FA_ICON" ctype="x-fa_icon"/><x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a&gt;"/></source>
+      <trans-unit id="3dd65e8fa7035988a691aadcb583862c2a9e336a" datatype="html">
+        <source>Sigops</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/transaction/transaction.component.html</context>
-          <context context-type="linenumber">328,332</context>
+          <context context-type="linenumber">328</context>
         </context-group>
         <note priority="1" from="description">Transaction Sigops</note>
         <note priority="1" from="meaning">transaction.sigops</note>