diff --git a/backend/src/tasks/lightning/network-sync.service.ts b/backend/src/tasks/lightning/network-sync.service.ts index 3701e11bc..8d6d64d66 100644 --- a/backend/src/tasks/lightning/network-sync.service.ts +++ b/backend/src/tasks/lightning/network-sync.service.ts @@ -83,7 +83,7 @@ class NetworkSyncService { logger.info(`${progress} nodes updated. ${deletedSockets} sockets deleted`); // If a channel if not present in the graph, mark it as inactive - nodesApi.$setNodesInactive(graphNodesPubkeys); + await nodesApi.$setNodesInactive(graphNodesPubkeys); if (config.MAXMIND.ENABLED) { $lookupNodeLocation(); @@ -121,7 +121,7 @@ class NetworkSyncService { logger.info(`${progress} channels updated`); // If a channel if not present in the graph, mark it as inactive - channelsApi.$setChannelsInactive(graphChannelsIds); + await channelsApi.$setChannelsInactive(graphChannelsIds); } catch (e) { logger.err(`Cannot update channel list. Reason: ${(e instanceof Error ? e.message : e)}`); } diff --git a/frontend/src/app/lightning/node-statistics-chart/node-statistics-chart.component.scss b/frontend/src/app/lightning/node-statistics-chart/node-statistics-chart.component.scss index 85e7c5e68..d738daa81 100644 --- a/frontend/src/app/lightning/node-statistics-chart/node-statistics-chart.component.scss +++ b/frontend/src/app/lightning/node-statistics-chart/node-statistics-chart.component.scss @@ -1,129 +1,5 @@ - -.main-title { - position: relative; - color: #ffffff91; - margin-top: -13px; - font-size: 10px; - text-transform: uppercase; - font-weight: 500; - text-align: center; - padding-bottom: 3px; -} - .full-container { - padding: 0px 15px; - width: 100%; - /* min-height: 500px; */ - height: calc(100% - 150px); - @media (max-width: 992px) { - height: 100%; - padding-bottom: 100px; - }; + margin-top: 25px; + margin-bottom: 25px; + min-height: 100%; } -/* -.chart { - width: 100%; - height: 100%; - padding-bottom: 20px; - padding-right: 10px; - @media (max-width: 992px) { - padding-bottom: 25px; - } - @media (max-width: 829px) { - padding-bottom: 50px; - } - @media (max-width: 767px) { - padding-bottom: 25px; - } - @media (max-width: 629px) { - padding-bottom: 55px; - } - @media (max-width: 567px) { - padding-bottom: 55px; - } -} -*/ -.chart-widget { - width: 100%; - height: 100%; - max-height: 270px; -} - -.formRadioGroup { - margin-top: 6px; - display: flex; - flex-direction: column; - @media (min-width: 991px) { - position: relative; - top: -65px; - } - @media (min-width: 830px) and (max-width: 991px) { - position: relative; - top: 0px; - } - @media (min-width: 830px) { - flex-direction: row; - float: right; - margin-top: 0px; - } - .btn-sm { - font-size: 9px; - @media (min-width: 830px) { - font-size: 14px; - } - } -} - -.pool-distribution { - min-height: 56px; - display: block; - @media (min-width: 485px) { - display: flex; - flex-direction: row; - } - h5 { - margin-bottom: 10px; - } - .item { - width: 50%; - display: inline-block; - margin: 0px auto 20px; - &:nth-child(2) { - order: 2; - @media (min-width: 485px) { - order: 3; - } - } - &:nth-child(3) { - order: 3; - @media (min-width: 485px) { - order: 2; - display: block; - } - @media (min-width: 768px) { - display: none; - } - @media (min-width: 992px) { - display: block; - } - } - .card-title { - font-size: 1rem; - color: #4a68b9; - } - .card-text { - font-size: 18px; - span { - color: #ffffff66; - font-size: 12px; - } - } - } -} - -.skeleton-loader { - width: 100%; - display: block; - max-width: 80px; - margin: 15px auto 3px; -} \ No newline at end of file diff --git a/frontend/src/app/lightning/node-statistics-chart/node-statistics-chart.component.ts b/frontend/src/app/lightning/node-statistics-chart/node-statistics-chart.component.ts index 962059c9d..6f0721d38 100644 --- a/frontend/src/app/lightning/node-statistics-chart/node-statistics-chart.component.ts +++ b/frontend/src/app/lightning/node-statistics-chart/node-statistics-chart.component.ts @@ -25,7 +25,7 @@ import { ActivatedRoute, ParamMap } from '@angular/router'; export class NodeStatisticsChartComponent implements OnInit { @Input() publicKey: string; @Input() right: number | string = 65; - @Input() left: number | string = 55; + @Input() left: number | string = 45; @Input() widget = false; miningWindowPreference: string; @@ -96,7 +96,7 @@ export class NodeStatisticsChartComponent implements OnInit { ], grid: { top: 30, - bottom: 70, + bottom: 20, right: this.right, left: this.left, }, diff --git a/frontend/src/app/lightning/node/node.component.html b/frontend/src/app/lightning/node/node.component.html index 61c8b3e10..b9b295e07 100644 --- a/frontend/src/app/lightning/node/node.component.html +++ b/frontend/src/app/lightning/node/node.component.html @@ -119,10 +119,14 @@
- - -

Node history

- +
+
+ +
+
+ +
+

Active channels map

diff --git a/frontend/src/app/lightning/nodes-channels-map/nodes-channels-map.component.html b/frontend/src/app/lightning/nodes-channels-map/nodes-channels-map.component.html index 7eda48b2b..1da3a4baf 100644 --- a/frontend/src/app/lightning/nodes-channels-map/nodes-channels-map.component.html +++ b/frontend/src/app/lightning/nodes-channels-map/nodes-channels-map.component.html @@ -1,5 +1,5 @@ -
-
+
+
@@ -8,15 +8,15 @@ (Tor nodes excluded)
-
+
+ +
-
-
- -
-
-
-
+
+
+
+
+
\ No newline at end of file diff --git a/frontend/src/app/lightning/nodes-channels-map/nodes-channels-map.component.scss b/frontend/src/app/lightning/nodes-channels-map/nodes-channels-map.component.scss index fd93b09c5..d8838a093 100644 --- a/frontend/src/app/lightning/nodes-channels-map/nodes-channels-map.component.scss +++ b/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; @@ -12,11 +24,6 @@ width: 100%; min-height: 600px; height: calc(100% - 150px); - - @media (max-width: 992px) { - height: 100%; - padding-bottom: 100px; - } } .full-container.nodepage { min-height: 400px; @@ -27,6 +34,7 @@ min-height: 400px; margin-top: 25px; margin-bottom: 25px; + min-height: 100%; } .full-container.widget { height: 250px; @@ -68,21 +76,21 @@ min-height: 600px; } .chart.nodepage { - min-height: 400px; + min-height: 100%; + width: 100%; + height: 100%; + padding-bottom: 0px; } .chart.channelpage { min-height: 400px; } .widget { - width: 90vw; + width: 100%; margin-left: auto; margin-right: auto; height: 250px; -webkit-mask: linear-gradient(0deg, #11131f00 5%, #11131fff 25%); - @media (max-width: 767.98px) { - width: 100vw; - } } .widget > .chart { min-height: 250px; @@ -107,4 +115,4 @@ @media (max-width: 767.98px) { top: 250px; } -} +} \ No newline at end of file diff --git a/frontend/src/app/lightning/nodes-channels-map/nodes-channels-map.component.ts b/frontend/src/app/lightning/nodes-channels-map/nodes-channels-map.component.ts index 09e6a17bc..421190d48 100644 --- a/frontend/src/app/lightning/nodes-channels-map/nodes-channels-map.component.ts +++ b/frontend/src/app/lightning/nodes-channels-map/nodes-channels-map.component.ts @@ -165,7 +165,7 @@ export class NodesChannelsMap implements OnInit { if (this.style === 'nodepage' && thisNodeGPS) { this.center = [thisNodeGPS[0], thisNodeGPS[1]]; - this.zoom = 10; + this.zoom = 5; this.channelWidth = 1; this.channelOpacity = 1; } diff --git a/frontend/src/app/lightning/nodes-networks-chart/nodes-networks-chart.component.ts b/frontend/src/app/lightning/nodes-networks-chart/nodes-networks-chart.component.ts index ecbf92f39..22f46e8e7 100644 --- a/frontend/src/app/lightning/nodes-networks-chart/nodes-networks-chart.component.ts +++ b/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', diff --git a/frontend/src/app/lightning/statistics-chart/lightning-statistics-chart.component.ts b/frontend/src/app/lightning/statistics-chart/lightning-statistics-chart.component.ts index bd210b09a..6fb8fd1e2 100644 --- a/frontend/src/app/lightning/statistics-chart/lightning-statistics-chart.component.ts +++ b/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', diff --git a/production/install b/production/install index 1187ee813..0302f0c60 100755 --- a/production/install +++ b/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" diff --git a/production/syslog.conf b/production/syslog.conf index 1a36100dd..7a55c57c7 100644 --- a/production/syslog.conf +++ b/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