Merge branch 'master' into natsoni/statistics-replication

This commit is contained in:
natsoni
2024-05-21 11:35:16 +02:00
158 changed files with 3350 additions and 738 deletions

View File

@@ -6,7 +6,6 @@ listen=1
discover=1
par=16
dbcache=8192
maxmempool=4096
mempoolfullrbf=1
maxconnections=100
onion=127.0.0.1:9050
@@ -20,6 +19,7 @@ whitelist=2401:b140::/32
[main]
mempoolexpiry=999999
maxmempool=4096
rpcbind=127.0.0.1:8332
rpcbind=[::1]:8332
bind=0.0.0.0:8333
@@ -38,6 +38,14 @@ zmqpubrawtx=tcp://127.0.0.1:8335
#addnode=[2401:b140:2::92:204]:8333
#addnode=[2401:b140:2::92:205]:8333
#addnode=[2401:b140:2::92:206]:8333
#addnode=[2401:b140:2::92:207]:8333
#addnode=[2401:b140:2::92:208]:8333
#addnode=[2401:b140:2::92:209]:8333
#addnode=[2401:b140:2::92:210]:8333
#addnode=[2401:b140:2::92:211]:8333
#addnode=[2401:b140:2::92:212]:8333
#addnode=[2401:b140:2::92:213]:8333
#addnode=[2401:b140:2::92:214]:8333
#addnode=[2401:b140:3::92:201]:8333
#addnode=[2401:b140:3::92:202]:8333
#addnode=[2401:b140:3::92:203]:8333
@@ -50,6 +58,12 @@ zmqpubrawtx=tcp://127.0.0.1:8335
#addnode=[2401:b140:4::92:204]:8333
#addnode=[2401:b140:4::92:205]:8333
#addnode=[2401:b140:4::92:206]:8333
#addnode=[2401:b140:4::92:207]:8333
#addnode=[2401:b140:4::92:208]:8333
#addnode=[2401:b140:4::92:209]:8333
#addnode=[2401:b140:4::92:210]:8333
#addnode=[2401:b140:4::92:211]:8333
#addnode=[2401:b140:4::92:212]:8333
[test]
daemon=1
@@ -71,6 +85,14 @@ zmqpubrawtx=tcp://127.0.0.1:18335
#addnode=[2401:b140:2::92:204]:18333
#addnode=[2401:b140:2::92:205]:18333
#addnode=[2401:b140:2::92:206]:18333
#addnode=[2401:b140:2::92:207]:18333
#addnode=[2401:b140:2::92:208]:18333
#addnode=[2401:b140:2::92:209]:18333
#addnode=[2401:b140:2::92:210]:18333
#addnode=[2401:b140:2::92:211]:18333
#addnode=[2401:b140:2::92:212]:18333
#addnode=[2401:b140:2::92:213]:18333
#addnode=[2401:b140:2::92:214]:18333
#addnode=[2401:b140:3::92:201]:18333
#addnode=[2401:b140:3::92:202]:18333
#addnode=[2401:b140:3::92:203]:18333
@@ -83,39 +105,12 @@ zmqpubrawtx=tcp://127.0.0.1:18335
#addnode=[2401:b140:4::92:204]:18333
#addnode=[2401:b140:4::92:205]:18333
#addnode=[2401:b140:4::92:206]:18333
[testnet4]
daemon=1
rpcbind=127.0.0.1:48332
rpcbind=[::1]:48332
bind=0.0.0.0:48333
bind=[::]:48333
zmqpubrawblock=tcp://127.0.0.1:48334
zmqpubrawtx=tcp://127.0.0.1:48335
#addnode=[2401:b140:1::92:201]:48333
#addnode=[2401:b140:1::92:202]:48333
#addnode=[2401:b140:1::92:203]:48333
#addnode=[2401:b140:1::92:204]:48333
#addnode=[2401:b140:1::92:205]:48333
#addnode=[2401:b140:1::92:206]:48333
#addnode=[2401:b140:2::92:201]:48333
#addnode=[2401:b140:2::92:202]:48333
#addnode=[2401:b140:2::92:203]:48333
#addnode=[2401:b140:2::92:204]:48333
#addnode=[2401:b140:2::92:205]:48333
#addnode=[2401:b140:2::92:206]:48333
#addnode=[2401:b140:3::92:201]:48333
#addnode=[2401:b140:3::92:202]:48333
#addnode=[2401:b140:3::92:203]:48333
#addnode=[2401:b140:3::92:204]:48333
#addnode=[2401:b140:3::92:205]:48333
#addnode=[2401:b140:3::92:206]:48333
#addnode=[2401:b140:4::92:201]:48333
#addnode=[2401:b140:4::92:202]:48333
#addnode=[2401:b140:4::92:203]:48333
#addnode=[2401:b140:4::92:204]:48333
#addnode=[2401:b140:4::92:205]:48333
#addnode=[2401:b140:4::92:206]:48333
#addnode=[2401:b140:4::92:207]:18333
#addnode=[2401:b140:4::92:208]:18333
#addnode=[2401:b140:4::92:209]:18333
#addnode=[2401:b140:4::92:210]:18333
#addnode=[2401:b140:4::92:211]:18333
#addnode=[2401:b140:4::92:212]:18333
[signet]
daemon=1
@@ -137,6 +132,14 @@ zmqpubrawtx=tcp://127.0.0.1:38335
#addnode=[2401:b140:2::92:204]:38333
#addnode=[2401:b140:2::92:205]:38333
#addnode=[2401:b140:2::92:206]:38333
#addnode=[2401:b140:2::92:207]:38333
#addnode=[2401:b140:2::92:208]:38333
#addnode=[2401:b140:2::92:209]:38333
#addnode=[2401:b140:2::92:210]:38333
#addnode=[2401:b140:2::92:211]:38333
#addnode=[2401:b140:2::92:212]:38333
#addnode=[2401:b140:2::92:213]:38333
#addnode=[2401:b140:2::92:214]:38333
#addnode=[2401:b140:3::92:201]:38333
#addnode=[2401:b140:3::92:202]:38333
#addnode=[2401:b140:3::92:203]:38333
@@ -149,3 +152,60 @@ zmqpubrawtx=tcp://127.0.0.1:38335
#addnode=[2401:b140:4::92:204]:38333
#addnode=[2401:b140:4::92:205]:38333
#addnode=[2401:b140:4::92:206]:38333
#addnode=[2401:b140:4::92:207]:38333
#addnode=[2401:b140:4::92:208]:38333
#addnode=[2401:b140:4::92:209]:38333
#addnode=[2401:b140:4::92:210]:38333
#addnode=[2401:b140:4::92:211]:38333
#addnode=[2401:b140:4::92:212]:38333
#addnode=[2401:b140:4::92:213]:38333
#addnode=[2401:b140:4::92:214]:38333
[testnet4]
daemon=1
rpcbind=127.0.0.1:48332
rpcbind=[::1]:48332
bind=0.0.0.0:48333
bind=[::]:48333
zmqpubrawblock=tcp://127.0.0.1:48334
zmqpubrawtx=tcp://127.0.0.1:48335
#addnode=[2401:b140:1::92:201]:48333
#addnode=[2401:b140:1::92:202]:48333
#addnode=[2401:b140:1::92:203]:48333
#addnode=[2401:b140:1::92:204]:48333
#addnode=[2401:b140:1::92:205]:48333
#addnode=[2401:b140:1::92:206]:48333
#addnode=[2401:b140:2::92:201]:48333
#addnode=[2401:b140:2::92:202]:48333
#addnode=[2401:b140:2::92:203]:48333
#addnode=[2401:b140:2::92:204]:48333
#addnode=[2401:b140:2::92:205]:48333
#addnode=[2401:b140:2::92:206]:48333
#addnode=[2401:b140:2::92:207]:48333
#addnode=[2401:b140:2::92:208]:48333
#addnode=[2401:b140:2::92:209]:48333
#addnode=[2401:b140:2::92:210]:48333
#addnode=[2401:b140:2::92:211]:48333
#addnode=[2401:b140:2::92:212]:48333
#addnode=[2401:b140:2::92:213]:48333
#addnode=[2401:b140:2::92:214]:48333
#addnode=[2401:b140:3::92:201]:48333
#addnode=[2401:b140:3::92:202]:48333
#addnode=[2401:b140:3::92:203]:48333
#addnode=[2401:b140:3::92:204]:48333
#addnode=[2401:b140:3::92:205]:48333
#addnode=[2401:b140:3::92:206]:48333
#addnode=[2401:b140:4::92:201]:48333
#addnode=[2401:b140:4::92:202]:48333
#addnode=[2401:b140:4::92:203]:48333
#addnode=[2401:b140:4::92:204]:48333
#addnode=[2401:b140:4::92:205]:48333
#addnode=[2401:b140:4::92:206]:48333
#addnode=[2401:b140:4::92:207]:48333
#addnode=[2401:b140:4::92:208]:48333
#addnode=[2401:b140:4::92:209]:48333
#addnode=[2401:b140:4::92:210]:48333
#addnode=[2401:b140:4::92:211]:48333
#addnode=[2401:b140:4::92:212]:48333
#addnode=[2401:b140:4::92:213]:48333
#addnode=[2401:b140:4::92:214]:48333

View File

@@ -2,4 +2,5 @@
@reboot sleep 5 ; /usr/local/bin/bitcoind -signet >/dev/null 2>&1
@reboot sleep 10 ; screen -dmS mainnet /bitcoin/electrs/start mainnet
@reboot sleep 10 ; screen -dmS testnet /bitcoin/electrs/start testnet
@reboot sleep 10 ; screen -dmS testnet4 /bitcoin/electrs/start testnet4
@reboot sleep 10 ; screen -dmS signet /bitcoin/electrs/start signet

View File

@@ -152,11 +152,6 @@ for repo in $backend_repos;do
update_repo "${repo}"
done
# build unfurlers
for repo in $frontend_repos;do
build_unfurler "${repo}"
done
# build backends
for repo in $backend_repos;do
build_backend "${repo}"
@@ -172,6 +167,11 @@ for target in $frontend_repos;do
ship_frontend "${target}"
done
# build unfurlers
for repo in $frontend_repos;do
build_unfurler "${repo}"
done
# notify everyone
echo "${HOSTNAME} updated to \`${REF}\` @ \`${HASH}\`" | /usr/local/bin/keybase chat send --nonblock --channel general mempool.dev
echo "${HOSTNAME} updated to \`${REF}\` @ \`${HASH}\`" | /usr/local/bin/keybase chat send --nonblock --channel general "mempool.ops.${LOCATION}"

View File

@@ -2,6 +2,7 @@
"BASE_MODULE": "liquid",
"OFFICIAL_MEMPOOL_SPACE": true,
"TESTNET_ENABLED": true,
"TESTNET4_ENABLED": true,
"LIQUID_ENABLED": true,
"LIQUID_TESTNET_ENABLED": true,
"BISQ_ENABLED": true,

View File

@@ -1,6 +1,7 @@
{
"OFFICIAL_MEMPOOL_SPACE": true,
"TESTNET_ENABLED": true,
"TESTNET4_ENABLED": true,
"LIQUID_ENABLED": true,
"LIQUID_TESTNET_ENABLED": true,
"BISQ_ENABLED": true,

View File

@@ -1,6 +1,7 @@
{
"OFFICIAL_MEMPOOL_SPACE": true,
"TESTNET_ENABLED": true,
"TESTNET4_ENABLED": true,
"LIQUID_ENABLED": true,
"LIQUID_TESTNET_ENABLED": true,
"BISQ_ENABLED": true,

View File

@@ -73,8 +73,8 @@ location @mempool-liquid-api-v1-cache-forever {
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header X-Forwarded-Proto $scheme;
proxy_cache_background_update on;
proxy_cache_use_stale updating;
proxy_cache_background_update off;
proxy_cache_use_stale error;
proxy_cache apicold;
proxy_cache_valid 200 30d;
proxy_redirect off;
@@ -90,8 +90,8 @@ location @mempool-liquid-api-v1-cache-warm {
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header X-Forwarded-Proto $scheme;
proxy_cache_background_update on;
proxy_cache_use_stale updating;
proxy_cache_background_update off;
proxy_cache_use_stale error;
proxy_cache apiwarm;
proxy_cache_valid 200 10s;
proxy_redirect off;
@@ -148,8 +148,8 @@ location @esplora-liquid-api-cache-forever {
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header X-Forwarded-Proto $scheme;
proxy_cache_background_update on;
proxy_cache_use_stale updating;
proxy_cache_background_update off;
proxy_cache_use_stale error;
proxy_cache apicold;
proxy_cache_valid 200 30d;
proxy_redirect off;

View File

@@ -77,8 +77,8 @@ location @mempool-liquidtestnet-api-v1-cache-forever {
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header X-Forwarded-Proto $scheme;
proxy_cache_background_update on;
proxy_cache_use_stale updating;
proxy_cache_background_update off;
proxy_cache_use_stale error;
proxy_cache apicold;
proxy_cache_valid 200 30d;
proxy_redirect off;
@@ -94,8 +94,8 @@ location @mempool-liquidtestnet-api-v1-cache-warm {
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header X-Forwarded-Proto $scheme;
proxy_cache_background_update on;
proxy_cache_use_stale updating;
proxy_cache_background_update off;
proxy_cache_use_stale error;
proxy_cache apiwarm;
proxy_cache_valid 200 10s;
proxy_redirect off;
@@ -152,8 +152,8 @@ location @esplora-liquidtestnet-api-cache-forever {
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header X-Forwarded-Proto $scheme;
proxy_cache_background_update on;
proxy_cache_use_stale updating;
proxy_cache_background_update off;
proxy_cache_use_stale error;
proxy_cache apicold;
proxy_cache_valid 200 30d;
proxy_redirect off;

View File

@@ -11,8 +11,8 @@ location @mempool-signet-api-v1-lightning {
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header X-Forwarded-Proto $scheme;
proxy_cache_background_update on;
proxy_cache_use_stale updating;
proxy_cache_background_update off;
proxy_cache_use_stale error;
proxy_cache apiwarm;
proxy_cache_valid 200 10s;
proxy_redirect off;

View File

@@ -77,8 +77,8 @@ location @mempool-signet-api-v1-cache-forever {
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header X-Forwarded-Proto $scheme;
proxy_cache_background_update on;
proxy_cache_use_stale updating;
proxy_cache_background_update off;
proxy_cache_use_stale error;
proxy_cache apicold;
proxy_cache_valid 200 30d;
proxy_redirect off;
@@ -94,8 +94,8 @@ location @mempool-signet-api-v1-cache-warm {
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header X-Forwarded-Proto $scheme;
proxy_cache_background_update on;
proxy_cache_use_stale updating;
proxy_cache_background_update off;
proxy_cache_use_stale error;
proxy_cache apiwarm;
proxy_cache_valid 200 10s;
proxy_redirect off;
@@ -152,8 +152,8 @@ location @esplora-signet-api-cache-forever {
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header X-Forwarded-Proto $scheme;
proxy_cache_background_update on;
proxy_cache_use_stale updating;
proxy_cache_background_update off;
proxy_cache_use_stale error;
proxy_cache apicold;
proxy_cache_valid 200 30d;
proxy_redirect off;

View File

@@ -11,8 +11,8 @@ location @mempool-testnet-api-v1-lightning {
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header X-Forwarded-Proto $scheme;
proxy_cache_background_update on;
proxy_cache_use_stale updating;
proxy_cache_background_update off;
proxy_cache_use_stale error;
proxy_cache apiwarm;
proxy_cache_valid 200 10s;
proxy_redirect off;

View File

@@ -77,8 +77,8 @@ location @mempool-testnet-api-v1-cache-forever {
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header X-Forwarded-Proto $scheme;
proxy_cache_background_update on;
proxy_cache_use_stale updating;
proxy_cache_background_update off;
proxy_cache_use_stale error;
proxy_cache apicold;
proxy_cache_valid 200 30d;
proxy_redirect off;
@@ -94,8 +94,8 @@ location @mempool-testnet-api-v1-cache-warm {
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header X-Forwarded-Proto $scheme;
proxy_cache_background_update on;
proxy_cache_use_stale updating;
proxy_cache_background_update off;
proxy_cache_use_stale error;
proxy_cache apiwarm;
proxy_cache_valid 200 10s;
proxy_redirect off;
@@ -152,8 +152,8 @@ location @esplora-testnet-api-cache-forever {
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header X-Forwarded-Proto $scheme;
proxy_cache_background_update on;
proxy_cache_use_stale updating;
proxy_cache_background_update off;
proxy_cache_use_stale error;
proxy_cache apicold;
proxy_cache_valid 200 30d;
proxy_redirect off;

View File

@@ -77,8 +77,8 @@ location @mempool-testnet4-api-v1-cache-forever {
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header X-Forwarded-Proto $scheme;
proxy_cache_background_update on;
proxy_cache_use_stale updating;
proxy_cache_background_update off;
proxy_cache_use_stale error;
proxy_cache apicold;
proxy_cache_valid 200 30d;
proxy_redirect off;
@@ -94,8 +94,8 @@ location @mempool-testnet4-api-v1-cache-warm {
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header X-Forwarded-Proto $scheme;
proxy_cache_background_update on;
proxy_cache_use_stale updating;
proxy_cache_background_update off;
proxy_cache_use_stale error;
proxy_cache apiwarm;
proxy_cache_valid 200 10s;
proxy_redirect off;
@@ -152,8 +152,8 @@ location @esplora-testnet4-api-cache-forever {
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header X-Forwarded-Proto $scheme;
proxy_cache_background_update on;
proxy_cache_use_stale updating;
proxy_cache_background_update off;
proxy_cache_use_stale error;
proxy_cache apicold;
proxy_cache_valid 200 30d;
proxy_redirect off;

View File

@@ -90,6 +90,11 @@ location /resources/config. {
try_files $uri =404;
expires 5m;
}
# only cache /resources/customize.* for 5 minutes since it changes often
location /resources/customize. {
try_files $uri =404;
expires 5m;
}
# cache /main.f40e91d908a068a2.js forever since they never change
location ~* ^/.+\..+\.(js|css)$ {

View File

@@ -5,7 +5,7 @@
},
"MEMPOOL": {
"HTTP_HOST": "http://127.0.0.1",
"HTTP_PORT": 83,
"HTTP_PORT": 84,
"NETWORK": "onbtc"
},
"PUPPETEER": {