diff --git a/docker/backend/Dockerfile b/docker/backend/Dockerfile index 0f0ef5250..7ab3d605c 100644 --- a/docker/backend/Dockerfile +++ b/docker/backend/Dockerfile @@ -1,4 +1,4 @@ -FROM node:20.11.1-buster-slim AS builder +FROM node:20.12.0-buster-slim AS builder ARG commitHash ENV MEMPOOL_COMMIT_HASH=${commitHash} @@ -17,7 +17,7 @@ ENV PATH="/root/.cargo/bin:$PATH" RUN npm install --omit=dev --omit=optional RUN npm run package -FROM node:20.11.1-buster-slim +FROM node:20.12.0-buster-slim WORKDIR /backend diff --git a/docker/frontend/Dockerfile b/docker/frontend/Dockerfile index 5c852b0db..3a63107bf 100644 --- a/docker/frontend/Dockerfile +++ b/docker/frontend/Dockerfile @@ -1,4 +1,4 @@ -FROM node:20.11.1-buster-slim AS builder +FROM node:20.12.0-buster-slim AS builder ARG commitHash ENV DOCKER_COMMIT_HASH=${commitHash} diff --git a/frontend/src/app/components/mempool-blocks/mempool-blocks.component.html b/frontend/src/app/components/mempool-blocks/mempool-blocks.component.html index 80fae9df8..98b148f26 100644 --- a/frontend/src/app/components/mempool-blocks/mempool-blocks.component.html +++ b/frontend/src/app/components/mempool-blocks/mempool-blocks.component.html @@ -20,10 +20,12 @@ - -
+
-
+ +
+
{{ i }} transaction diff --git a/frontend/src/app/components/mempool-blocks/mempool-blocks.component.ts b/frontend/src/app/components/mempool-blocks/mempool-blocks.component.ts index 016798777..ed5b61f2b 100644 --- a/frontend/src/app/components/mempool-blocks/mempool-blocks.component.ts +++ b/frontend/src/app/components/mempool-blocks/mempool-blocks.component.ts @@ -1,5 +1,5 @@ import { Component, OnInit, OnDestroy, ChangeDetectionStrategy, ChangeDetectorRef, HostListener, Input, OnChanges, SimpleChanges, Output, EventEmitter } from '@angular/core'; -import { Subscription, Observable, of, combineLatest } from 'rxjs'; +import { Subscription, Observable, of, combineLatest, BehaviorSubject } from 'rxjs'; import { MempoolBlock } from '../../interfaces/websocket.interface'; import { StateService } from '../../services/state.service'; import { Router } from '@angular/router'; @@ -42,6 +42,7 @@ export class MempoolBlocksComponent implements OnInit, OnChanges, OnDestroy { mempoolBlocks$: Observable; difficultyAdjustments$: Observable; loadingBlocks$: Observable; + showMiningInfo$: BehaviorSubject = new BehaviorSubject(false); blocksSubscription: Subscription; mempoolBlocksFull: MempoolBlock[] = []; @@ -57,10 +58,8 @@ export class MempoolBlocksComponent implements OnInit, OnChanges, OnDestroy { network = ''; now = new Date().getTime(); timeOffset = 0; - showMiningInfo = false; timeLtrSubscription: Subscription; timeLtr: boolean; - showMiningInfoSubscription: Subscription; animateEntry: boolean = false; blockOffset: number = 155; @@ -98,10 +97,7 @@ export class MempoolBlocksComponent implements OnInit, OnChanges, OnDestroy { this.widthChange.emit(this.mempoolWidth); if (['', 'testnet', 'signet'].includes(this.stateService.network)) { - this.showMiningInfoSubscription = this.stateService.showMiningInfo$.subscribe((showMiningInfo) => { - this.showMiningInfo = showMiningInfo; - this.cd.markForCheck(); - }); + this.showMiningInfo$ = this.stateService.showMiningInfo$; } this.timeLtrSubscription = this.stateService.timeLtr.subscribe((ltr) => { @@ -267,7 +263,6 @@ export class MempoolBlocksComponent implements OnInit, OnChanges, OnDestroy { this.chainTipSubscription.unsubscribe(); this.keySubscription.unsubscribe(); this.isTabHiddenSubscription.unsubscribe(); - this.showMiningInfoSubscription.unsubscribe(); clearTimeout(this.resetTransitionTimeout); } diff --git a/production/check b/production/check index 262227599..29adb0a67 100755 --- a/production/check +++ b/production/check @@ -1,8 +1,7 @@ #!/usr/bin/env zsh #for j in fmt va1 fra tk7;do for i in 1 2 3 4 5 6;do echo -n 20$i.$j: ;curl -i -s https://node20$i.$j.mempool.space/api/v1/services/accelerator/accelerations|head -1;done;done check_mempoolspace_frontend_git_hash() { - echo curl -s --connect-to "::node${1}.${2}.mempool.space:443" https://mempool.space/resources/config.js - echo -n $(curl -s --connect-to "::node${1}.${2}.mempool.space:443" https://mempool.space/resources/config.js|grep GIT_COMMIT_HASH|cut -d "'" -f2|cut -c1-8) + echo -n $(curl -s --connect-to "::node${1}.${2}.mempool.space:443" https://mempool.space/en-US/resources/config.js|grep GIT_COMMIT_HASH|cut -d "'" -f2|cut -c1-8) } check_mempoolfoss_frontend_git_hash() { echo -n $(curl -s "https://node${1}.${2}.mempool.space/resources/config.js"|grep GIT_COMMIT_HASH|cut -d "'" -f2|cut -c1-8) @@ -13,19 +12,24 @@ check_mempoolspace_frontend_md5_hash() { check_mempoolfoss_frontend_md5_hash() { echo -n $(curl -s https://node${1}.${2}.mempool.space|md5|cut -c1-8) } +check_mempool_electrs_git_hash() { + echo -n $(curl -s -i https://node${1}.${2}.mempool.space/api/mempool|grep -i x-powered-by|cut -d ' ' -f3) +} for site in fmt va1 fra tk7;do echo "${site}" for node in 201 202 203 204 205 206 207 208 209 210 211 212 213 214;do [ "${site}" = "fmt" ] && [ "${node}" -gt 206 ] && continue [ "${site}" = "tk7" ] && [ "${node}" -gt 206 ] && continue echo -n "node${node}.${site}: " - #check_mempoolspace_frontend_git_hash $node $site - #echo -n " " - check_mempoolspace_frontend_md5_hash $node $site + check_mempoolspace_frontend_git_hash $node $site echo -n " " check_mempoolfoss_frontend_git_hash $node $site echo -n " " + check_mempoolspace_frontend_md5_hash $node $site + echo -n " " check_mempoolfoss_frontend_md5_hash $node $site + echo -n " " + check_mempool_electrs_git_hash $node $site echo done done