If you have any questions about this Policy, would like to speak with us about the use of our Marks in ways not described in the Policy, or see any abuse of our Marks, please email us at <legal@mempool.space>
+If you have any questions about this Policy, would like to speak with us about the use of our Marks in ways not described in the Policy, or see any abuse of our Marks, please email us at <legal@mempool.space>
diff --git a/frontend/src/app/services/http-cache.interceptor.ts b/frontend/src/app/services/http-cache.interceptor.ts index c0f1646ad..da683325e 100644 --- a/frontend/src/app/services/http-cache.interceptor.ts +++ b/frontend/src/app/services/http-cache.interceptor.ts @@ -1,8 +1,8 @@ -import { Inject, Injectable, PLATFORM_ID } from '@angular/core'; +import { Inject, Injectable, PLATFORM_ID, makeStateKey, TransferState } from '@angular/core'; import { HttpInterceptor, HttpEvent, HttpRequest, HttpHandler, HttpResponse, HttpErrorResponse, HttpHeaders } from '@angular/common/http'; import { Observable, of } from 'rxjs'; import { catchError, tap } from 'rxjs/operators'; -import { TransferState, makeStateKey } from '@angular/platform-browser'; + import { isPlatformBrowser } from '@angular/common'; @Injectable() diff --git a/frontend/src/main.server.ts b/frontend/src/main.server.ts index 6121b7d88..58acaeffc 100644 --- a/frontend/src/main.server.ts +++ b/frontend/src/main.server.ts @@ -7,5 +7,5 @@ if (environment.production) { enableProdMode(); } -export { AppServerModule } from './app/app.server.module'; +export { AppServerModule } from './app/app.module.server'; export { renderModule } from '@angular/platform-server'; diff --git a/frontend/sync-assets.js b/frontend/sync-assets.js index 2ff642e27..4164efff6 100644 --- a/frontend/sync-assets.js +++ b/frontend/sync-assets.js @@ -32,19 +32,19 @@ const githubSecret = process.env.GITHUB_TOKEN; const CONFIG_FILE_NAME = 'mempool-frontend-config.json'; let configContent = {}; -var PATH; +var ASSETS_PATH; if (process.argv[2]) { - PATH = process.argv[2]; - PATH += PATH.endsWith("/") ? "" : "/" - PATH = path.resolve(path.normalize(PATH)); - console.log(`[sync-assets] using PATH ${PATH}`); - if (!fs.existsSync(PATH)){ - console.log(`${LOG_TAG} ${PATH} does not exist, creating`); - fs.mkdirSync(PATH, { recursive: true }); + ASSETS_PATH = process.argv[2]; + ASSETS_PATH += ASSETS_PATH.endsWith("/") ? "" : "/" + ASSETS_PATH = path.resolve(path.normalize(ASSETS_PATH)); + console.log(`[sync-assets] using ASSETS_PATH ${ASSETS_PATH}`); + if (!fs.existsSync(ASSETS_PATH)){ + console.log(`${LOG_TAG} ${ASSETS_PATH} does not exist, creating`); + fs.mkdirSync(ASSETS_PATH, { recursive: true }); } } -if (!PATH) { +if (!ASSETS_PATH) { throw new Error('Resource path argument is not set'); } @@ -125,7 +125,8 @@ function downloadMiningPoolLogos$() { if (verbose) { console.log(`${LOG_TAG} Processing ${poolLogo.name}`); } - const filePath = `${PATH}/mining-pools/${poolLogo.name}`; + console.log(`${ASSETS_PATH}/mining-pools/${poolLogo.name}`); + const filePath = `${ASSETS_PATH}/mining-pools/${poolLogo.name}`; if (fs.existsSync(filePath)) { const localHash = getLocalHash(filePath); if (verbose) { @@ -152,7 +153,7 @@ function downloadMiningPoolLogos$() { } } else { console.log(`${LOG_TAG} \t\t${poolLogo.name} is missing, downloading...`); - const miningPoolsDir = `${PATH}/mining-pools/`; + const miningPoolsDir = `${ASSETS_PATH}/mining-pools/`; if (!fs.existsSync(miningPoolsDir)){ fs.mkdirSync(miningPoolsDir, { recursive: true }); } @@ -219,7 +220,7 @@ function downloadPromoVideoSubtiles$() { if (verbose) { console.log(`${LOG_TAG} Processing ${language.name}`); } - const filePath = `${PATH}/promo-video/${language.name}`; + const filePath = `${ASSETS_PATH}/promo-video/${language.name}`; if (fs.existsSync(filePath)) { if (verbose) { console.log(`${LOG_TAG} \t${language.name} remote promo video hash ${language.sha}`); @@ -245,7 +246,7 @@ function downloadPromoVideoSubtiles$() { } } else { console.log(`${LOG_TAG} \t\t${language.name} is missing, downloading`); - const promoVideosDir = `${PATH}/promo-video/`; + const promoVideosDir = `${ASSETS_PATH}/promo-video/`; if (!fs.existsSync(promoVideosDir)){ fs.mkdirSync(promoVideosDir, { recursive: true }); } @@ -313,7 +314,7 @@ function downloadPromoVideo$() { if (item.name !== 'promo.mp4') { continue; } - const filePath = `${PATH}/promo-video/mempool-promo.mp4`; + const filePath = `${ASSETS_PATH}/promo-video/mempool-promo.mp4`; if (fs.existsSync(filePath)) { const localHash = getLocalHash(filePath); @@ -373,16 +374,16 @@ if (configContent.BASE_MODULE && configContent.BASE_MODULE === 'liquid') { const testnetAssetsMinimalJsonUrl = 'https://raw.githubusercontent.com/Blockstream/asset_registry_testnet_db/master/index.minimal.json'; console.log(`${LOG_TAG} Downloading assets`); - download(`${PATH}/assets.json`, assetsJsonUrl); + download(`${ASSETS_PATH}/assets.json`, assetsJsonUrl); console.log(`${LOG_TAG} Downloading assets minimal`); - download(`${PATH}/assets.minimal.json`, assetsMinimalJsonUrl); + download(`${ASSETS_PATH}/assets.minimal.json`, assetsMinimalJsonUrl); console.log(`${LOG_TAG} Downloading testnet assets`); - download(`${PATH}/assets-testnet.json`, testnetAssetsJsonUrl); + download(`${ASSETS_PATH}/assets-testnet.json`, testnetAssetsJsonUrl); console.log(`${LOG_TAG} Downloading testnet assets minimal`); - download(`${PATH}/assets-testnet.minimal.json`, testnetAssetsMinimalJsonUrl); + download(`${ASSETS_PATH}/assets-testnet.minimal.json`, testnetAssetsMinimalJsonUrl); } else { if (verbose) { console.log(`${LOG_TAG} BASE_MODULE is not set to Liquid (currently ${configContent.BASE_MODULE}), skipping downloading assets`); diff --git a/frontend/tsconfig.base.json b/frontend/tsconfig.base.json index cd44cb6d9..bfb2e2d71 100644 --- a/frontend/tsconfig.base.json +++ b/frontend/tsconfig.base.json @@ -7,7 +7,7 @@ "declaration": false, "downlevelIteration": true, "experimentalDecorators": true, - "module": "ES2020", + "module": "ES2022", "moduleResolution": "node", "importHelpers": true, "target": "ES2022", @@ -15,7 +15,7 @@ "node_modules/@types" ], "lib": [ - "ES2018", + "ES2022", "dom", "dom.iterable" ] 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 diff --git a/production/install b/production/install index c89bf004f..30754863c 100755 --- a/production/install +++ b/production/install @@ -1047,9 +1047,9 @@ osSudo "${ROOT_USER}" crontab -u "${MEMPOOL_USER}" "${MEMPOOL_HOME}/${MEMPOOL_RE echo "[*] Installing nvm.sh from GitHub" osSudo "${MEMPOOL_USER}" sh -c 'curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.1/install.sh | zsh' -echo "[*] Building NodeJS v20.5.1 via nvm.sh" -osSudo "${MEMPOOL_USER}" zsh -c 'source ~/.zshrc ; nvm install v20.7.0 --shared-zlib' -osSudo "${MEMPOOL_USER}" zsh -c 'source ~/.zshrc ; nvm alias default 20.7.0' +echo "[*] Building NodeJS via nvm.sh" +osSudo "${MEMPOOL_USER}" zsh -c 'source ~/.zshrc ; nvm install v20.12.0 --shared-zlib' +osSudo "${MEMPOOL_USER}" zsh -c 'source ~/.zshrc ; nvm alias default 20.12.0' #################### # Tor installation # @@ -1449,7 +1449,7 @@ if [ "${UNFURL_INSTALL}" = ON ];then echo 'nvidia_xorg_enable="YES"' >> /etc/rc.conf echo "[*] Installing color emoji" - osSudo "${ROOT_USER}" curl "https://github.com/samuelngs/apple-emoji-linux/releases/download/ios-15.4/AppleColorEmoji.ttf" -o /usr/local/share/fonts/TTF/AppleColorEmoji.ttf + osSudo "${ROOT_USER}" curl -sSL "https://github.com/samuelngs/apple-emoji-linux/releases/download/ios-15.4/AppleColorEmoji.ttf" -o /usr/local/share/fonts/TTF/AppleColorEmoji.ttf cat > /usr/local/etc/fonts/conf.d/01-emoji.conf <