Merge branch 'master' into ops/remove-fmt-add-hnl-sg1

2025-01-25 17:57:28 +09:00
parent 8670897a50 470a6a7534
commit 1a62c867de
112 changed files with 5428 additions and 920 deletions
--- a/production/mempool-config.mainnet.json
+++ b/production/mempool-config.mainnet.json
@@ -158,5 +158,9 @@
  "WALLETS": {
    "ENABLED": true,
    "WALLETS": ["BITB", "3350"]
+  },
+  "STRATUM": {
+    "ENABLED": true,
+    "API": "http://127.0.0.1:81/api/v1/stratum/ws"
  }
 }
--- a/production/mempool-frontend-config.mainnet.json
+++ b/production/mempool-frontend-config.mainnet.json
@@ -4,8 +4,7 @@
  "TESTNET4_ENABLED": true,
  "LIQUID_ENABLED": false,
  "LIQUID_TESTNET_ENABLED": false,
-  "BISQ_ENABLED": true,
-  "BISQ_SEPARATE_BACKEND": true,
+  "STRATUM_ENABLED": true,
  "SIGNET_ENABLED": true,
  "MEMPOOL_WEBSITE_URL": "https://mempool.space",
  "LIQUID_WEBSITE_URL": "https://liquid.network",
--- a/production/nginx/location-api.conf
+++ b/production/nginx/location-api.conf
@@ -140,7 +140,8 @@ location @mempool-api-v1-cache-normal {
 	proxy_cache_valid 200 2s;
 	proxy_redirect off;

-	expires 2s;
+	# cache for 2 seconds on server, but send expires -1 so browser doesn't cache
+	expires -1;
 }

 location @mempool-api-v1-cache-disabled {