Merge branch 'master' into nymkappa/bugfix/loading-spinner

frontend/src/app/lightning/node/node.component.html

@@ -132,7 +132,14 @@
     <app-node-channels style="display:block;margin-bottom: 40px" [publicKey]="node.public_key"></app-node-channels>
 
     <div class="d-flex justify-content-between">
-      <h2>Channels ({{ channelsListStatus === 'open' ? node.opened_channel_count : node.closed_channel_count }})</h2>
+      <h2 *ngIf="channelsListStatus === 'open'">
+        <span i18n="lightning.open-channels">Open channels</span>
+        <span> ({{ node.opened_channel_count }})</span>
+      </h2>
+      <h2 *ngIf="channelsListStatus === 'closed'">
+        <span i18n="lightning.open-channels">Closed channels</span>
+        <span> ({{ node.closed_channel_count }})</span>
+      </h2>
     </div>
 
     <app-channels-list [publicKey]="node.public_key"

frontend/src/app/lightning/nodes-channels-map/nodes-channels-map.component.html

@@ -1,5 +1,5 @@
-<div [style]="style === 'widget' ? 'height: 250px' : ''">
+<div class="map-wrapper" [class]="style">
-  <div *ngIf="channelsObservable | async">
+  <ng-container *ngIf="channelsObservable | async">
     <div *ngIf="chartOptions" [class]="'full-container ' + style + (fitContainer ? ' fit-container' : '')">
       <div *ngIf="style === 'graph'" class="card-header">
         <div class="d-flex d-md-block align-items-baseline" style="margin-bottom: -5px">
@@ -8,8 +8,8 @@
         <small style="color: #ffffff66" i18n="lightning.tor-nodes-excluded">(Tor nodes excluded)</small>
       </div>
 
-    <div class="chart" [class]="style" echarts [initOpts]="chartInitOptions" [options]="chartOptions" (chartInit)="onChartInit($event)"
+      <div class="chart" [class]="style" echarts [initOpts]="chartInitOptions" [options]="chartOptions"
-      (chartFinished)="onChartFinished($event)">
+        (chartInit)="onChartInit($event)" (chartFinished)="onChartFinished($event)">
       </div>
 
       <div *ngIf="!chartOptions && style === 'nodepage'" style="padding-top: 30px"></div>
@@ -18,4 +18,5 @@
     <div class="text-center loading-spinner" [class]="style" *ngIf="isLoading">
       <div class="spinner-border text-light"></div>
     </div>
+  </ng-container>
 </div>

frontend/src/app/lightning/nodes-channels-map/nodes-channels-map.component.scss

@@ -1,3 +1,15 @@
+.map-wrapper {
+  height: 100%;
+
+  &.widget {
+    height: 250px;
+  }
+
+  &.graph {
+    height: auto;
+  }
+}
+
 .card-header {
   border-bottom: 0;
   font-size: 18px;

frontend/src/app/lightning/nodes-networks-chart/nodes-networks-chart.component.ts

@@ -121,7 +121,7 @@ export class NodesNetworksChartComponent implements OnInit {
         left: 'center',
         top: 'center',
       };
-    } else if (data.tor_nodes.length > 0) {
+    } else if (this.widget && data.tor_nodes.length > 0) {
       title = {
         textStyle: {
           color: 'grey',

frontend/src/app/lightning/statistics-chart/lightning-statistics-chart.component.ts

@@ -113,7 +113,7 @@ export class LightningStatisticsChartComponent implements OnInit {
         left: 'center',
         top: 'center'
       };
-    } else if (data.channel_count.length > 0) {
+    } else if (this.widget && data.channel_count.length > 0) {
       title = {
         textStyle: {
           color: 'grey',

production/install

@@ -385,7 +385,7 @@ DEBIAN_UNFURL_PKG+=(libxdamage-dev libxrandr-dev libgbm-dev libpango1.0-dev liba
 
 # packages needed for mempool ecosystem
 FREEBSD_PKG=()
-FREEBSD_PKG+=(zsh sudo git screen curl wget calc neovim)
+FREEBSD_PKG+=(zsh sudo git git-lfs screen curl wget calc neovim)
 FREEBSD_PKG+=(openssh-portable py39-pip rust llvm90 jq base64 libzmq4)
 FREEBSD_PKG+=(boost-libs autoconf automake gmake gcc libevent libtool pkgconf)
 FREEBSD_PKG+=(nginx rsync py39-certbot-nginx mariadb105-server keybase)
@@ -1267,7 +1267,7 @@ case $OS in
         osGroupCreate "${CLN_GROUP}"
         osUserCreate "${CLN_USER}" "${CLN_HOME}" "${CLN_GROUP}"
         osSudo "${ROOT_USER}" chsh -s `which zsh` "${CLN_USER}"
-        osSudo "${CLN_USER}" touch "${CLN_HOME}/.zshrc"
+        echo "export PATH=$PATH:$HOME/.local/bin" >> "${CLN_HOME}/.zshrc"
         osSudo "${ROOT_USER}" chown -R "${CLN_USER}:${CLN_GROUP}" "${CLN_HOME}"
 
         echo "[*] Installing Core Lightning package"

production/syslog.conf

@@ -1,4 +1,4 @@
-local7.>=notice |/usr/local/bin/sudo -u mempool /usr/local/bin/mempool-logger mempool.ops alerts
+local7.>=err |/usr/local/bin/sudo -u mempool /usr/local/bin/mempool-logger mempool.ops alerts
 local7.>=info |/usr/local/bin/sudo -u mempool /usr/local/bin/mempool-logger mempool.ops node100
 local7.>=info /var/log/mempool
 local7.* /var/log/mempool.debug