Merge branch 'master' into nymkappa/mega-branch

.github/workflows/ci.yml

@@ -115,6 +115,10 @@ jobs:
 
       - name: Sync-assets
         run: npm run sync-assets-dev
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          MEMPOOL_CDN: 1
+          VERBOSE: 1
         working-directory: assets/frontend
 
       - name: Zip mining-pool assets
@@ -237,6 +241,8 @@ jobs:
         working-directory: ${{ matrix.node }}/${{ matrix.flavor }}/frontend
         env: 
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          MEMPOOL_CDN: 1
+          VERBOSE: 1
   
   e2e:
     if: "!contains(github.event.pull_request.labels.*.name, 'ops') && !contains(github.head_ref, 'ops/')"
@@ -330,3 +336,31 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           CYPRESS_PROJECT_ID: ${{ secrets.CYPRESS_PROJECT_ID }}
 
+  validate_docker_json:
+    if: "!contains(github.event.pull_request.labels.*.name, 'ops') && !contains(github.head_ref, 'ops/')"
+    runs-on: "ubuntu-latest"
+    name: Validate generated backend Docker JSON
+
+    steps: 
+      - name: Checkout
+        uses: actions/checkout@v3
+        with:
+          path: docker
+      
+      - name: Install jq
+        run: sudo apt-get install jq -y
+
+      - name: Create new start script to run on CI
+        run: |
+          sed '$d' start.sh > start_ci.sh
+        working-directory: docker/docker/backend
+
+      - name: Run the script to generate the sample JSON
+        run: |
+          sh start_ci.sh
+        working-directory: docker/docker/backend
+
+      - name: Validate JSON syntax
+        run: |
+          cat mempool-config.json | jq
+        working-directory: docker/docker/backend

.gitignore

@@ -6,3 +6,4 @@ backend/mempool-config.json
 frontend/src/resources/config.template.js
 frontend/src/resources/config.js
 target
+docker/backend/start_ci.sh

backend/package-lock.json

@@ -17,7 +17,7 @@
         "crypto-js": "~4.2.0",
         "express": "~4.18.2",
         "maxmind": "~4.3.11",
-        "mysql2": "~3.7.0",
+        "mysql2": "~3.9.1",
         "redis": "^4.6.6",
         "rust-gbt": "file:./rust-gbt",
         "socks-proxy-agent": "~7.0.0",
@@ -3673,9 +3673,9 @@
       "dev": true
     },
     "node_modules/follow-redirects": {
-      "version": "1.15.2",
+      "version": "1.15.5",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.5.tgz",
-      "integrity": "sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==",
+      "integrity": "sha512-vSFWUON1B+yAw1VN4xMfxgn5fTUiaOzAJCKBwIIgT/+7CuGy9+r+5gITvP62j3RmaD5Ph65UaERdOSRGUzZtgw==",
       "funding": [
         {
           "type": "individual",
@@ -6110,9 +6110,9 @@
       "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
     },
     "node_modules/mysql2": {
-      "version": "3.7.0",
+      "version": "3.9.1",
-      "resolved": "https://registry.npmjs.org/mysql2/-/mysql2-3.7.0.tgz",
+      "resolved": "https://registry.npmjs.org/mysql2/-/mysql2-3.9.1.tgz",
-      "integrity": "sha512-c45jA3Jc1X8yJKzrWu1GpplBKGwv/wIV6ITZTlCSY7npF2YfJR+6nMP5e+NTQhUeJPSyOQAbGDCGEHbAl8HN9w==",
+      "integrity": "sha512-3njoWAAhGBYy0tWBabqUQcLtczZUxrmmtc2vszQUekg3kTJyZ5/IeLC3Fo04u6y6Iy5Sba7pIIa2P/gs8D3ZeQ==",
       "dependencies": {
         "denque": "^2.1.0",
         "generate-function": "^2.3.1",
@@ -10440,9 +10440,9 @@
       "dev": true
     },
     "follow-redirects": {
-      "version": "1.15.2",
+      "version": "1.15.5",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.5.tgz",
-      "integrity": "sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA=="
+      "integrity": "sha512-vSFWUON1B+yAw1VN4xMfxgn5fTUiaOzAJCKBwIIgT/+7CuGy9+r+5gITvP62j3RmaD5Ph65UaERdOSRGUzZtgw=="
     },
     "form-data": {
       "version": "4.0.0",
@@ -12230,9 +12230,9 @@
       "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
     },
     "mysql2": {
-      "version": "3.7.0",
+      "version": "3.9.1",
-      "resolved": "https://registry.npmjs.org/mysql2/-/mysql2-3.7.0.tgz",
+      "resolved": "https://registry.npmjs.org/mysql2/-/mysql2-3.9.1.tgz",
-      "integrity": "sha512-c45jA3Jc1X8yJKzrWu1GpplBKGwv/wIV6ITZTlCSY7npF2YfJR+6nMP5e+NTQhUeJPSyOQAbGDCGEHbAl8HN9w==",
+      "integrity": "sha512-3njoWAAhGBYy0tWBabqUQcLtczZUxrmmtc2vszQUekg3kTJyZ5/IeLC3Fo04u6y6Iy5Sba7pIIa2P/gs8D3ZeQ==",
       "requires": {
         "denque": "^2.1.0",
         "generate-function": "^2.3.1",

backend/package.json

@@ -47,7 +47,7 @@
     "crypto-js": "~4.2.0",
     "express": "~4.18.2",
     "maxmind": "~4.3.11",
-    "mysql2": "~3.7.0",
+    "mysql2": "~3.9.1",
     "rust-gbt": "file:./rust-gbt",
     "redis": "^4.6.6",
     "socks-proxy-agent": "~7.0.0",

docker/backend/mempool-config.json

@@ -35,7 +35,7 @@
     "ALLOW_UNREACHABLE": __MEMPOOL_ALLOW_UNREACHABLE__,
     "POOLS_JSON_TREE_URL": "__MEMPOOL_POOLS_JSON_TREE_URL__",
     "POOLS_JSON_URL": "__MEMPOOL_POOLS_JSON_URL__",
-    "PRICE_UPDATES_PER_HOUR": __MEMPOOL_PRICE_UPDATES_PER_HOUR__
+    "PRICE_UPDATES_PER_HOUR": __MEMPOOL_PRICE_UPDATES_PER_HOUR__,
     "MAX_TRACKED_ADDRESSES": __MEMPOOL_MAX_TRACKED_ADDRESSES__
   },
   "CORE_RPC": {

frontend/src/app/components/address-labels/address-labels.component.ts

@@ -43,7 +43,7 @@ export class AddressLabelsComponent implements OnChanges {
 
   handleVin() {
     if (this.vin.inner_witnessscript_asm) {
-      if (this.vin.inner_witnessscript_asm.indexOf('OP_DEPTH OP_PUSHNUM_12 OP_EQUAL OP_IF OP_PUSHNUM_11') === 0) {
+      if (this.vin.inner_witnessscript_asm.indexOf('OP_DEPTH OP_PUSHNUM_12 OP_EQUAL OP_IF OP_PUSHNUM_11') === 0 || this.vin.inner_witnessscript_asm.indexOf('OP_PUSHNUM_15 OP_CHECKMULTISIG OP_IFDUP OP_NOTIF OP_PUSHBYTES_2') === 1259) {
         if (this.vin.witness.length > 11) {
           this.label = 'Liquid Peg Out';
         } else {

frontend/sync-assets.js

@@ -4,6 +4,8 @@ var crypto = require('crypto');
 var path = require('node:path');
 const LOG_TAG = '[sync-assets]';
 let verbose = false;
+let MEMPOOL_CDN = false;
+let DRY_RUN = false;
 
 if (parseInt(process.env.SKIP_SYNC) === 1) {
   console.log(`${LOG_TAG} SKIP_SYNC is set, not checking any assets`);
@@ -15,6 +17,18 @@ if (parseInt(process.env.VERBOSE) === 1) {
   verbose = true;
 }
 
+if (parseInt(process.env.MEMPOOL_CDN) === 1) {
+  console.log(`${LOG_TAG} MEMPOOL_CDN is set, assets will be downloaded from mempool.space`);
+  MEMPOOL_CDN = true;
+}
+
+if (parseInt(process.env.DRY_RUN) === 1) {
+  console.log(`${LOG_TAG} DRY_RUN is set, not downloading any assets`);
+  DRY_RUN = true;
+}
+
+const githubSecret = process.env.GITHUB_TOKEN;
+
 const CONFIG_FILE_NAME = 'mempool-frontend-config.json';
 let configContent = {};
 
@@ -46,8 +60,6 @@ try {
   }
 }
 
-const githubSecret = process.env.GITHUB_TOKEN;
-
 function download(filename, url) {
   https.get(url, (response) => {
     if (response.statusCode < 200 || response.statusCode > 299) {
@@ -60,7 +72,7 @@ function download(filename, url) {
   })
   .on('finish', () => {
     if (verbose) {
-      console.log(`${LOG_TAG} Finished downloading ${url} to ${filename}`);
+      console.log(`${LOG_TAG} \tFinished downloading ${url} to ${filename}`);
     }
   });
 }
@@ -72,7 +84,7 @@ function getLocalHash(filePath) {
   const hash = crypto.createHash('sha1').update(bufferWithHeader).digest('hex');
 
   if (verbose) {
-    console.log(`${LOG_TAG} \tgetLocalHash ${filePath} ${hash}`);
+    console.log(`${LOG_TAG} \t\tgetLocalHash ${filePath} ${hash}`);
   }
 
   return hash;
@@ -80,7 +92,7 @@ function getLocalHash(filePath) {
 
 function downloadMiningPoolLogos$() {
   return new Promise((resolve, reject) => {
-    console.log(`${LOG_TAG} Checking if mining pool logos needs downloading or updating...`);
+    console.log(`${LOG_TAG} \tChecking if mining pool logos needs downloading or updating...`);
     const options = {
       host: 'api.github.com',
       path: '/repos/mempool/mining-pool-logos/contents/',
@@ -110,29 +122,54 @@ function downloadMiningPoolLogos$() {
           }
           let downloadedCount = 0;
           for (const poolLogo of poolLogos) {
+            if (verbose) {
+              console.log(`${LOG_TAG} Processing ${poolLogo.name}`);
+            }
             const filePath = `${PATH}/mining-pools/${poolLogo.name}`;
             if (fs.existsSync(filePath)) {
               const localHash = getLocalHash(filePath);
               if (verbose) {
-                console.log(`${LOG_TAG} Remote ${poolLogo.name} logo hash ${poolLogo.sha}`);
+                console.log(`${LOG_TAG} \t\tremote ${poolLogo.name} logo hash ${poolLogo.sha}`);
-                console.log(`${LOG_TAG} \tchecking if ${filePath} exists: ${fs.existsSync(filePath)}`);
+                console.log(`${LOG_TAG} \t\t\tchecking if ${filePath} exists: ${fs.existsSync(filePath)}`);
               }
               if (localHash !== poolLogo.sha) {
-                console.log(`${LOG_TAG} \t\t${poolLogo.name} is different on the remote, downloading...`);
+                console.log(`${LOG_TAG} \t\t\t\t${poolLogo.name} is different on the remote, downloading...`);
-                download(filePath, poolLogo.download_url);
+                let download_url = poolLogo.download_url;
-                downloadedCount++;
+                if (MEMPOOL_CDN) {
+                  download_url = download_url.replace("raw.githubusercontent.com/mempool/mining-pool-logos/master", "mempool.space/resources/mining-pools");
+                }
+                if (DRY_RUN) {
+                  console.log(`${LOG_TAG} \t\tDRY_RUN is set, not downloading ${poolLogo.name} but we should`);
+                } else {
+                  if (verbose) {
+                    console.log(`${LOG_TAG} \t\tDownloading ${download_url} to ${filePath}`);
+                  }
+                  download(filePath, download_url);
+                  downloadedCount++;
+                }
+              } else {
+                console.log(`${LOG_TAG} \t\t${poolLogo.name} is already up to date. Skipping.`);
               }
             } else {
-              console.log(`${LOG_TAG} ${poolLogo.name} is missing, downloading...`);
+              console.log(`${LOG_TAG} \t\t${poolLogo.name} is missing, downloading...`);
               const miningPoolsDir = `${PATH}/mining-pools/`;
               if (!fs.existsSync(miningPoolsDir)){
                 fs.mkdirSync(miningPoolsDir, { recursive: true });
               }
-              download(filePath, poolLogo.download_url);
+              let download_url = poolLogo.download_url;
-              downloadedCount++;
+              if (MEMPOOL_CDN) {
+                download_url = download_url.replace("raw.githubusercontent.com/mempool/mining-pool-logos/master", "mempool.space/resources/mining-pools");
+              }
+              if (DRY_RUN) {
+                console.log(`${LOG_TAG} DRY_RUN is set, not downloading ${poolLogo.name} but it should`);
+              } else {
+                console.log(`${LOG_TAG} \tDownloading ${download_url} to ${filePath}`);
+                download(filePath, download_url);
+                downloadedCount++;
+              }
             }
           }
-          console.log(`${LOG_TAG} Downloaded ${downloadedCount} and skipped ${poolLogos.length - downloadedCount} existing mining pool logos`);
+          console.log(`${LOG_TAG} \t\tDownloaded ${downloadedCount} and skipped ${poolLogos.length - downloadedCount} existing mining pool logos`);
           resolve();
         } catch (e) {
           reject(`Unable to download mining pool logos. Trying again at next restart. Reason: ${e instanceof Error ? e.message : e}`);
@@ -148,7 +185,7 @@ function downloadMiningPoolLogos$() {
 
 function downloadPromoVideoSubtiles$() {
   return new Promise((resolve, reject) => {
-    console.log(`${LOG_TAG} Checking if promo video subtitles needs downloading or updating...`);
+    console.log(`${LOG_TAG} \tChecking if promo video subtitles needs downloading or updating...`);
     const options = {
       host: 'api.github.com',
       path: '/repos/mempool/mempool-promo/contents/subtitles',
@@ -157,7 +194,7 @@ function downloadPromoVideoSubtiles$() {
     };
 
     if (githubSecret) {
-      console.log(`${LOG_TAG} Downloading the promo video subtitles with authentication`);
+      console.log(`${LOG_TAG} \tDownloading the promo video subtitles with authentication`);
       options.headers['authorization'] = `Bearer ${githubSecret}`;
       options.headers['X-GitHub-Api-Version'] = '2022-11-28';
     }
@@ -179,27 +216,53 @@ function downloadPromoVideoSubtiles$() {
           }
           let downloadedCount = 0;
           for (const language of videoLanguages) {
+            if (verbose) {
+              console.log(`${LOG_TAG} Processing ${language.name}`);
+            }
             const filePath = `${PATH}/promo-video/${language.name}`;
             if (fs.existsSync(filePath)) {
               if (verbose) {
-                console.log(`${LOG_TAG} ${language.name} remote promo video hash ${language.sha}`);
+                console.log(`${LOG_TAG} \t${language.name} remote promo video hash ${language.sha}`);
               }
               const localHash = getLocalHash(filePath);
-
               if (localHash !== language.sha) {
-                console.log(`${LOG_TAG} ${language.name} is different on the remote, updating`);
+                console.log(`${LOG_TAG} \t\t${language.name} is different on the remote, updating`);
-                download(filePath, language.download_url);
+                let download_url = language.download_url;
-                downloadedCount++;
+                if (MEMPOOL_CDN) {
+                  download_url = download_url.replace("raw.githubusercontent.com/mempool/mempool-promo/master/subtitles", "mempool.space/resources/promo-video");
+                }
+                if (DRY_RUN) {
+                  console.log(`${LOG_TAG} \t\tDRY_RUN is set, not downloading ${language.name} but we should`);
+                } else {
+                  if (verbose) {
+                    console.log(`${LOG_TAG} \t\tdownloading ${download_url} to ${filePath}`);
+                  }
+                  download(filePath, download_url);
+                  downloadedCount++;
+                }
+              } else {
+                console.log(`${LOG_TAG} \t\t${language.name} is already up to date. Skipping.`);
               }
             } else {
-              console.log(`${LOG_TAG} ${language.name} is missing, downloading`);
+              console.log(`${LOG_TAG} \t\t${language.name} is missing, downloading`);
               const promoVideosDir = `${PATH}/promo-video/`;
               if (!fs.existsSync(promoVideosDir)){
                 fs.mkdirSync(promoVideosDir, { recursive: true });
               }
 
-              download(filePath, language.download_url);
+              let download_url = language.download_url;
-              downloadedCount++;
+              if (MEMPOOL_CDN) {
+                download_url = downloadownload_url = download_url.replace("raw.githubusercontent.com/mempool/mempool-promo/master/subtitles", "mempool.space/resources/promo-video");
+              }
+              if (DRY_RUN) {
+                console.log(`${LOG_TAG} \tDRY_RUN is set, not downloading ${language.name} but we should`);
+              } else {
+                if (verbose) {
+                  console.log(`${LOG_TAG} downloading ${download_url} to ${filePath}`);
+                }
+                download(filePath, download_url);
+                downloadedCount++;
+              }
             }
           }
           console.log(`${LOG_TAG} Downloaded ${downloadedCount} and skipped ${videoLanguages.length - downloadedCount} existing video subtitles`);
@@ -218,7 +281,7 @@ function downloadPromoVideoSubtiles$() {
 
 function downloadPromoVideo$() {
   return new Promise((resolve, reject) => {
-    console.log(`${LOG_TAG} Checking if promo video needs downloading or updating...`);
+    console.log(`${LOG_TAG} \tChecking if promo video needs downloading or updating...`);
     const options = {
       host: 'api.github.com',
       path: '/repos/mempool/mempool-promo/contents',
@@ -227,7 +290,7 @@ function downloadPromoVideo$() {
     };
 
     if (githubSecret) {
-      console.log(`${LOG_TAG} Downloading the promo video with authentication`);
+      console.log(`${LOG_TAG} \tDownloading the promo video with authentication`);
       options.headers['authorization'] = `Bearer ${githubSecret}`;
       options.headers['X-GitHub-Api-Version'] = '2022-11-28';
     }
@@ -256,14 +319,36 @@ function downloadPromoVideo$() {
 
               if (localHash !== item.sha) {
                 console.log(`${LOG_TAG} \tmempool-promo.mp4 is different on the remote, updating`);
-                download(filePath, item.download_url);
+                let download_url = item.download_url;
-                console.log(`${LOG_TAG} \tmempool-promo.mp4 downloaded.`);
+                if (MEMPOOL_CDN) {
+                  download_url = download_url.replace("raw.githubusercontent.com/mempool/mempool-promo/master/promo.mp4", "mempool.space/resources/promo-video/mempool-promo.mp4");
+                }
+                if (DRY_RUN) {
+                  console.log(`${LOG_TAG} DRY_RUN is set, not downloading mempool-promo.mp4 but we should`);
+                } else {
+                  if (verbose) {
+                    console.log(`${LOG_TAG} downloading ${download_url} to ${filePath}`);
+                  }
+                  download(filePath, download_url);
+                  console.log(`${LOG_TAG} \tmempool-promo.mp4 downloaded.`);
+                }
               } else {
-                console.log(`${LOG_TAG} \tmempool-promo.mp4 is already up to date. Skipping.`);
+                console.log(`${LOG_TAG} \t\tmempool-promo.mp4 is already up to date. Skipping.`);
               }
             } else {
               console.log(`${LOG_TAG} \tmempool-promo.mp4 is missing, downloading`);
-              download(filePath, item.download_url);
+              let download_url = item.download_url;
+              if (MEMPOOL_CDN) {
+                download_url = download_url.replace("raw.githubusercontent.com/mempool/mempool-promo/master/promo.mp4", "mempool.space/resources/promo-video/mempool-promo.mp4");
+              }
+              if (DRY_RUN) {
+                console.log(`${LOG_TAG} DRY_RUN is set, not downloading mempool-promo.mp4 but we should`);
+              } else {
+                if (verbose) {
+                  console.log(`${LOG_TAG} downloading ${download_url} to ${filePath}`);
+                }
+                download(filePath, download_url);
+              }
             }
           }
           resolve();
@@ -300,7 +385,7 @@ if (configContent.BASE_MODULE && configContent.BASE_MODULE === 'liquid') {
   download(`${PATH}/assets-testnet.minimal.json`, testnetAssetsMinimalJsonUrl);
 } else {
   if (verbose) {
-    console.log(`${LOG_TAG} BASE_MODULE is not set to Liquid (${configContent.BASE_MODULE}), skipping downloading assets`);
+    console.log(`${LOG_TAG} BASE_MODULE is not set to Liquid (currently ${configContent.BASE_MODULE}), skipping downloading assets`);
   }
 }
 

production/nginx-cache-heater

@@ -1,5 +1,5 @@
 #!/usr/bin/env zsh
-hostname=mempool.space
+hostname=$(hostname)
 
 heat()
 {

production/nginx/http-proxy-cache.conf

@@ -1,8 +1,12 @@
 # proxy cache
-proxy_cache_path /var/cache/nginx/api keys_zone=api:20m levels=1:2 inactive=365d max_size=2000m;
+proxy_cache_path /var/cache/nginx/services keys_zone=services:20m levels=1:2 inactive=30d max_size=200m;
-proxy_cache_path /var/cache/nginx/unfurler keys_zone=unfurler:20m levels=1:2 inactive=365d max_size=2000m;
+proxy_cache_path /var/cache/nginx/apihot keys_zone=apihot:20m levels=1:2 inactive=60m max_size=20m;
-proxy_cache_path /var/cache/nginx/slurper keys_zone=slurper:20m levels=1:2 inactive=365d max_size=5000m;
+proxy_cache_path /var/cache/nginx/apiwarm keys_zone=apiwarm:20m levels=1:2 inactive=24h max_size=200m;
-proxy_cache_path /var/cache/nginx/services keys_zone=services:20m levels=1:2 inactive=365d max_size=100m;
+proxy_cache_path /var/cache/nginx/apinormal keys_zone=apinormal:200m levels=1:2 inactive=30d max_size=2000m;
+proxy_cache_path /var/cache/nginx/apicold keys_zone=apicold:200m levels=1:2 inactive=365d max_size=2000m;
+
+proxy_cache_path /var/cache/nginx/unfurler keys_zone=unfurler:200m levels=1:2 inactive=30d max_size=2000m;
+proxy_cache_path /var/cache/nginx/slurper keys_zone=slurper:500m levels=1:2 inactive=365d max_size=5000m;
 proxy_cache_path /var/cache/nginx/markets keys_zone=markets:20m levels=1:2 inactive=365d max_size=100m;
 types_hash_max_size 4096;
 proxy_buffer_size 8k;

production/nginx/location-api-v1-lightning.conf

@@ -12,7 +12,7 @@ location @mempool-api-v1-lightning {
 
 	proxy_cache_background_update on;
 	proxy_cache_use_stale updating;
-	proxy_cache api;
+	proxy_cache apiwarm;
 	proxy_cache_valid 200 10s;
 	proxy_redirect off;
 

production/nginx/location-api.conf

@@ -77,7 +77,7 @@ location @mempool-api-v1-cache-forever {
 
 	proxy_cache_background_update on;
 	proxy_cache_use_stale updating;
-	proxy_cache api;
+	proxy_cache apicold;
 	proxy_cache_valid 200 30d;
 	proxy_redirect off;
 
@@ -94,9 +94,11 @@ location @mempool-api-v1-cache-hot {
 
 	proxy_cache_background_update on;
 	proxy_cache_use_stale updating;
-	proxy_cache api;
+	proxy_cache apihot;
 	proxy_cache_valid 200 1s;
 	proxy_redirect off;
+
+	expires 1s;
 }
 
 location @mempool-api-v1-cache-warm {
@@ -109,7 +111,7 @@ location @mempool-api-v1-cache-warm {
 
 	proxy_cache_background_update on;
 	proxy_cache_use_stale updating;
-	proxy_cache api;
+	proxy_cache apiwarm;
 	proxy_cache_valid 200 10s;
 	proxy_redirect off;
 }
@@ -122,7 +124,7 @@ location @mempool-api-v1-cache-normal {
 	proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
 	proxy_set_header X-Forwarded-Proto $scheme;
 
-	proxy_cache api;
+	proxy_cache apinormal;
 	proxy_cache_valid 200 2s;
 	proxy_redirect off;
 
@@ -167,7 +169,7 @@ location @esplora-api-cache-forever {
 
 	proxy_cache_background_update on;
 	proxy_cache_use_stale updating;
-	proxy_cache api;
+	proxy_cache apicold;
 	proxy_cache_valid 200 30d;
 	proxy_redirect off;
 

production/nginx/location-liquid-api.conf

@@ -75,7 +75,7 @@ location @mempool-liquid-api-v1-cache-forever {
 
 	proxy_cache_background_update on;
 	proxy_cache_use_stale updating;
-	proxy_cache api;
+	proxy_cache apicold;
 	proxy_cache_valid 200 30d;
 	proxy_redirect off;
 
@@ -92,7 +92,7 @@ location @mempool-liquid-api-v1-cache-warm {
 
 	proxy_cache_background_update on;
 	proxy_cache_use_stale updating;
-	proxy_cache api;
+	proxy_cache apiwarm;
 	proxy_cache_valid 200 10s;
 	proxy_redirect off;
 }
@@ -105,7 +105,7 @@ location @mempool-liquid-api-v1-cache-normal {
 	proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
 	proxy_set_header X-Forwarded-Proto $scheme;
 
-	proxy_cache api;
+	proxy_cache apinormal;
 	proxy_cache_valid 200 10s;
 	proxy_redirect off;
 
@@ -150,7 +150,7 @@ location @esplora-liquid-api-cache-forever {
 
 	proxy_cache_background_update on;
 	proxy_cache_use_stale updating;
-	proxy_cache api;
+	proxy_cache apicold;
 	proxy_cache_valid 200 30d;
 	proxy_redirect off;
 

production/nginx/location-liquidtestnet-api.conf

@@ -79,7 +79,7 @@ location @mempool-liquidtestnet-api-v1-cache-forever {
 
 	proxy_cache_background_update on;
 	proxy_cache_use_stale updating;
-	proxy_cache api;
+	proxy_cache apicold;
 	proxy_cache_valid 200 30d;
 	proxy_redirect off;
 
@@ -96,7 +96,7 @@ location @mempool-liquidtestnet-api-v1-cache-warm {
 
 	proxy_cache_background_update on;
 	proxy_cache_use_stale updating;
-	proxy_cache api;
+	proxy_cache apiwarm;
 	proxy_cache_valid 200 10s;
 	proxy_redirect off;
 }
@@ -109,7 +109,7 @@ location @mempool-liquidtestnet-api-v1-cache-normal {
 	proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
 	proxy_set_header X-Forwarded-Proto $scheme;
 
-	proxy_cache api;
+	proxy_cache apinormal;
 	proxy_cache_valid 200 10s;
 	proxy_redirect off;
 
@@ -154,7 +154,7 @@ location @esplora-liquidtestnet-api-cache-forever {
 
 	proxy_cache_background_update on;
 	proxy_cache_use_stale updating;
-	proxy_cache api;
+	proxy_cache apicold;
 	proxy_cache_valid 200 30d;
 	proxy_redirect off;
 

production/nginx/location-signet-api-v1-lightning.conf

@@ -13,7 +13,7 @@ location @mempool-signet-api-v1-lightning {
 
 	proxy_cache_background_update on;
 	proxy_cache_use_stale updating;
-	proxy_cache api;
+	proxy_cache apiwarm;
 	proxy_cache_valid 200 10s;
 	proxy_redirect off;
 

production/nginx/location-signet-api.conf

@@ -79,7 +79,7 @@ location @mempool-signet-api-v1-cache-forever {
 
 	proxy_cache_background_update on;
 	proxy_cache_use_stale updating;
-	proxy_cache api;
+	proxy_cache apicold;
 	proxy_cache_valid 200 30d;
 	proxy_redirect off;
 
@@ -96,7 +96,7 @@ location @mempool-signet-api-v1-cache-warm {
 
 	proxy_cache_background_update on;
 	proxy_cache_use_stale updating;
-	proxy_cache api;
+	proxy_cache apiwarm;
 	proxy_cache_valid 200 10s;
 	proxy_redirect off;
 }
@@ -109,7 +109,7 @@ location @mempool-signet-api-v1-cache-normal {
 	proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
 	proxy_set_header X-Forwarded-Proto $scheme;
 
-	proxy_cache api;
+	proxy_cache apinormal;
 	proxy_cache_valid 200 10s;
 	proxy_redirect off;
 
@@ -154,7 +154,7 @@ location @esplora-signet-api-cache-forever {
 
 	proxy_cache_background_update on;
 	proxy_cache_use_stale updating;
-	proxy_cache api;
+	proxy_cache apicold;
 	proxy_cache_valid 200 30d;
 	proxy_redirect off;
 

production/nginx/location-testnet-api-v1-lightning.conf

@@ -13,7 +13,7 @@ location @mempool-testnet-api-v1-lightning {
 
 	proxy_cache_background_update on;
 	proxy_cache_use_stale updating;
-	proxy_cache api;
+	proxy_cache apiwarm;
 	proxy_cache_valid 200 10s;
 	proxy_redirect off;
 

production/nginx/location-testnet-api.conf

@@ -79,7 +79,7 @@ location @mempool-testnet-api-v1-cache-forever {
 
 	proxy_cache_background_update on;
 	proxy_cache_use_stale updating;
-	proxy_cache api;
+	proxy_cache apicold;
 	proxy_cache_valid 200 30d;
 	proxy_redirect off;
 
@@ -96,7 +96,7 @@ location @mempool-testnet-api-v1-cache-warm {
 
 	proxy_cache_background_update on;
 	proxy_cache_use_stale updating;
-	proxy_cache api;
+	proxy_cache apiwarm;
 	proxy_cache_valid 200 10s;
 	proxy_redirect off;
 }
@@ -109,7 +109,7 @@ location @mempool-testnet-api-v1-cache-normal {
 	proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
 	proxy_set_header X-Forwarded-Proto $scheme;
 
-	proxy_cache api;
+	proxy_cache apinormal;
 	proxy_cache_valid 200 10s;
 	proxy_redirect off;
 
@@ -154,7 +154,7 @@ location @esplora-testnet-api-cache-forever {
 
 	proxy_cache_background_update on;
 	proxy_cache_use_stale updating;
-	proxy_cache api;
+	proxy_cache apicold;
 	proxy_cache_valid 200 30d;
 	proxy_redirect off;