GlcoinCore/mempool
1
0
Fork 0
mirror of https://github.com/mempool/mempool.git synced 2026-08-13 12:33:11 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'master' into mononaut/fix-ln-split-bug

Browse source
This commit is contained in:
nymkappa 2025-12-11 13:45:41 +01:00 • committed by GitHub
commit 3425c14478
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 112 additions and 87 deletions
Download patch file Download diff file Expand all files Collapse all files

16
backend/src/api/transaction-utils.ts
View file

@ -300,15 +300,15 @@ class TransactionUtils {
if (op >= 0x01 && op <= 0x4e) {
i++;
let push: number;
if (op === 0x4c) {
if (op === 0x4c && buf.length > i) {
push = buf.readUInt8(i);
b.push('OP_PUSHDATA1');
i += 1;
} else if (op === 0x4d) {
} else if (op === 0x4d && buf.length > i + 1) {
push = buf.readUInt16LE(i);
b.push('OP_PUSHDATA2');
i += 2;
} else if (op === 0x4e) {
} else if (op === 0x4e && buf.length > i + 3) {
push = buf.readUInt32LE(i);
b.push('OP_PUSHDATA4');
i += 4;
@ -317,13 +317,15 @@ class TransactionUtils {
b.push('OP_PUSHBYTES_' + push);
}
const data = buf.slice(i, i + push);
if (i >= buf.length) {
break;
}
const data = buf.subarray(i, Math.min(i + push, buf.length));
b.push(data.toString('hex'));
i += data.length;
if (data.length !== push) {
break;
}
b.push(data.toString('hex'));
i += data.length;
} else {
if (op === 0x00) {
b.push('OP_0');

160
frontend/src/app/services/time.service.ts
View file

@ -126,138 +126,138 @@ export class TimeService {
case 'since':
if (number === 1) {
switch (unit) { // singular (1 day)
case 'year': return $localize`:@@time-since:${dateStrings.i18nYear}:DATE: ago`; break;
case 'month': return $localize`:@@time-since:${dateStrings.i18nMonth}:DATE: ago`; break;
case 'week': return $localize`:@@time-since:${dateStrings.i18nWeek}:DATE: ago`; break;
case 'day': return $localize`:@@time-since:${dateStrings.i18nDay}:DATE: ago`; break;
case 'hour': return $localize`:@@time-since:${dateStrings.i18nHour}:DATE: ago`; break;
case 'minute': return $localize`:@@time-since:${dateStrings.i18nMinute}:DATE: ago`; break;
case 'second': return $localize`:@@time-since:${dateStrings.i18nSecond}:DATE: ago`; break;
case 'year': return $localize`:@@time-since:${dateStrings.i18nYear}:DATE: ago`;
case 'month': return $localize`:@@time-since:${dateStrings.i18nMonth}:DATE: ago`;
case 'week': return $localize`:@@time-since:${dateStrings.i18nWeek}:DATE: ago`;
case 'day': return $localize`:@@time-since:${dateStrings.i18nDay}:DATE: ago`;
case 'hour': return $localize`:@@time-since:${dateStrings.i18nHour}:DATE: ago`;
case 'minute': return $localize`:@@time-since:${dateStrings.i18nMinute}:DATE: ago`;
case 'second': return $localize`:@@time-since:${dateStrings.i18nSecond}:DATE: ago`;
}
} else {
switch (unit) { // plural (2 days)
case 'year': return $localize`:@@time-since:${dateStrings.i18nYears}:DATE: ago`; break;
case 'month': return $localize`:@@time-since:${dateStrings.i18nMonths}:DATE: ago`; break;
case 'week': return $localize`:@@time-since:${dateStrings.i18nWeeks}:DATE: ago`; break;
case 'day': return $localize`:@@time-since:${dateStrings.i18nDays}:DATE: ago`; break;
case 'hour': return $localize`:@@time-since:${dateStrings.i18nHours}:DATE: ago`; break;
case 'minute': return $localize`:@@time-since:${dateStrings.i18nMinutes}:DATE: ago`; break;
case 'second': return $localize`:@@time-since:${dateStrings.i18nSeconds}:DATE: ago`; break;
case 'year': return $localize`:@@time-since:${dateStrings.i18nYears}:DATE: ago`;
case 'month': return $localize`:@@time-since:${dateStrings.i18nMonths}:DATE: ago`;
case 'week': return $localize`:@@time-since:${dateStrings.i18nWeeks}:DATE: ago`;
case 'day': return $localize`:@@time-since:${dateStrings.i18nDays}:DATE: ago`;
case 'hour': return $localize`:@@time-since:${dateStrings.i18nHours}:DATE: ago`;
case 'minute': return $localize`:@@time-since:${dateStrings.i18nMinutes}:DATE: ago`;
case 'second': return $localize`:@@time-since:${dateStrings.i18nSeconds}:DATE: ago`;
}
}
break;
case 'until':
if (number === 1) {
switch (unit) { // singular (In ~1 day)
case 'year': return $localize`:@@time-until:In ~${dateStrings.i18nYear}:DATE:`; break;
case 'month': return $localize`:@@time-until:In ~${dateStrings.i18nMonth}:DATE:`; break;
case 'week': return $localize`:@@time-until:In ~${dateStrings.i18nWeek}:DATE:`; break;
case 'day': return $localize`:@@time-until:In ~${dateStrings.i18nDay}:DATE:`; break;
case 'hour': return $localize`:@@time-until:In ~${dateStrings.i18nHour}:DATE:`; break;
case 'year': return $localize`:@@time-until:In ~${dateStrings.i18nYear}:DATE:`;
case 'month': return $localize`:@@time-until:In ~${dateStrings.i18nMonth}:DATE:`;
case 'week': return $localize`:@@time-until:In ~${dateStrings.i18nWeek}:DATE:`;
case 'day': return $localize`:@@time-until:In ~${dateStrings.i18nDay}:DATE:`;
case 'hour': return $localize`:@@time-until:In ~${dateStrings.i18nHour}:DATE:`;
case 'minute': return $localize`:@@time-until:In ~${dateStrings.i18nMinute}:DATE:`;
case 'second': return $localize`:@@time-until:In ~${dateStrings.i18nSecond}:DATE:`;
}
} else {
switch (unit) { // plural (In ~2 days)
case 'year': return $localize`:@@time-until:In ~${dateStrings.i18nYears}:DATE:`; break;
case 'month': return $localize`:@@time-until:In ~${dateStrings.i18nMonths}:DATE:`; break;
case 'week': return $localize`:@@time-until:In ~${dateStrings.i18nWeeks}:DATE:`; break;
case 'day': return $localize`:@@time-until:In ~${dateStrings.i18nDays}:DATE:`; break;
case 'hour': return $localize`:@@time-until:In ~${dateStrings.i18nHours}:DATE:`; break;
case 'minute': return $localize`:@@time-until:In ~${dateStrings.i18nMinutes}:DATE:`; break;
case 'second': return $localize`:@@time-until:In ~${dateStrings.i18nSeconds}:DATE:`; break;
case 'year': return $localize`:@@time-until:In ~${dateStrings.i18nYears}:DATE:`;
case 'month': return $localize`:@@time-until:In ~${dateStrings.i18nMonths}:DATE:`;
case 'week': return $localize`:@@time-until:In ~${dateStrings.i18nWeeks}:DATE:`;
case 'day': return $localize`:@@time-until:In ~${dateStrings.i18nDays}:DATE:`;
case 'hour': return $localize`:@@time-until:In ~${dateStrings.i18nHours}:DATE:`;
case 'minute': return $localize`:@@time-until:In ~${dateStrings.i18nMinutes}:DATE:`;
case 'second': return $localize`:@@time-until:In ~${dateStrings.i18nSeconds}:DATE:`;
}
}
break;
case 'within':
if (number === 1) {
switch (unit) { // singular (In ~1 day)
case 'year': return $localize`:@@time-within:within ~${dateStrings.i18nYear}:DATE:`; break;
case 'month': return $localize`:@@time-within:within ~${dateStrings.i18nMonth}:DATE:`; break;
case 'week': return $localize`:@@time-within:within ~${dateStrings.i18nWeek}:DATE:`; break;
case 'day': return $localize`:@@time-within:within ~${dateStrings.i18nDay}:DATE:`; break;
case 'hour': return $localize`:@@time-within:within ~${dateStrings.i18nHour}:DATE:`; break;
case 'year': return $localize`:@@time-within:within ~${dateStrings.i18nYear}:DATE:`;
case 'month': return $localize`:@@time-within:within ~${dateStrings.i18nMonth}:DATE:`;
case 'week': return $localize`:@@time-within:within ~${dateStrings.i18nWeek}:DATE:`;
case 'day': return $localize`:@@time-within:within ~${dateStrings.i18nDay}:DATE:`;
case 'hour': return $localize`:@@time-within:within ~${dateStrings.i18nHour}:DATE:`;
case 'minute': return $localize`:@@time-within:within ~${dateStrings.i18nMinute}:DATE:`;
case 'second': return $localize`:@@time-within:within ~${dateStrings.i18nSecond}:DATE:`;
}
} else {
switch (unit) { // plural (In ~2 days)
case 'year': return $localize`:@@time-within:within ~${dateStrings.i18nYears}:DATE:`; break;
case 'month': return $localize`:@@time-within:within ~${dateStrings.i18nMonths}:DATE:`; break;
case 'week': return $localize`:@@time-within:within ~${dateStrings.i18nWeeks}:DATE:`; break;
case 'day': return $localize`:@@time-within:within ~${dateStrings.i18nDays}:DATE:`; break;
case 'hour': return $localize`:@@time-within:within ~${dateStrings.i18nHours}:DATE:`; break;
case 'minute': return $localize`:@@time-within:within ~${dateStrings.i18nMinutes}:DATE:`; break;
case 'second': return $localize`:@@time-within:within ~${dateStrings.i18nSeconds}:DATE:`; break;
case 'year': return $localize`:@@time-within:within ~${dateStrings.i18nYears}:DATE:`;
case 'month': return $localize`:@@time-within:within ~${dateStrings.i18nMonths}:DATE:`;
case 'week': return $localize`:@@time-within:within ~${dateStrings.i18nWeeks}:DATE:`;
case 'day': return $localize`:@@time-within:within ~${dateStrings.i18nDays}:DATE:`;
case 'hour': return $localize`:@@time-within:within ~${dateStrings.i18nHours}:DATE:`;
case 'minute': return $localize`:@@time-within:within ~${dateStrings.i18nMinutes}:DATE:`;
case 'second': return $localize`:@@time-within:within ~${dateStrings.i18nSeconds}:DATE:`;
}
}
break;
case 'span':
if (number === 1) {
switch (unit) { // singular (1 day)
case 'year': return $localize`:@@time-span:After ${dateStrings.i18nYear}:DATE:`; break;
case 'month': return $localize`:@@time-span:After ${dateStrings.i18nMonth}:DATE:`; break;
case 'week': return $localize`:@@time-span:After ${dateStrings.i18nWeek}:DATE:`; break;
case 'day': return $localize`:@@time-span:After ${dateStrings.i18nDay}:DATE:`; break;
case 'hour': return $localize`:@@time-span:After ${dateStrings.i18nHour}:DATE:`; break;
case 'minute': return $localize`:@@time-span:After ${dateStrings.i18nMinute}:DATE:`; break;
case 'second': return $localize`:@@time-span:After ${dateStrings.i18nSecond}:DATE:`; break;
case 'year': return $localize`:@@time-span:After ${dateStrings.i18nYear}:DATE:`;
case 'month': return $localize`:@@time-span:After ${dateStrings.i18nMonth}:DATE:`;
case 'week': return $localize`:@@time-span:After ${dateStrings.i18nWeek}:DATE:`;
case 'day': return $localize`:@@time-span:After ${dateStrings.i18nDay}:DATE:`;
case 'hour': return $localize`:@@time-span:After ${dateStrings.i18nHour}:DATE:`;
case 'minute': return $localize`:@@time-span:After ${dateStrings.i18nMinute}:DATE:`;
case 'second': return $localize`:@@time-span:After ${dateStrings.i18nSecond}:DATE:`;
}
} else {
switch (unit) { // plural (2 days)
case 'year': return $localize`:@@time-span:After ${dateStrings.i18nYears}:DATE:`; break;
case 'month': return $localize`:@@time-span:After ${dateStrings.i18nMonths}:DATE:`; break;
case 'week': return $localize`:@@time-span:After ${dateStrings.i18nWeeks}:DATE:`; break;
case 'day': return $localize`:@@time-span:After ${dateStrings.i18nDays}:DATE:`; break;
case 'hour': return $localize`:@@time-span:After ${dateStrings.i18nHours}:DATE:`; break;
case 'minute': return $localize`:@@time-span:After ${dateStrings.i18nMinutes}:DATE:`; break;
case 'second': return $localize`:@@time-span:After ${dateStrings.i18nSeconds}:DATE:`; break;
case 'year': return $localize`:@@time-span:After ${dateStrings.i18nYears}:DATE:`;
case 'month': return $localize`:@@time-span:After ${dateStrings.i18nMonths}:DATE:`;
case 'week': return $localize`:@@time-span:After ${dateStrings.i18nWeeks}:DATE:`;
case 'day': return $localize`:@@time-span:After ${dateStrings.i18nDays}:DATE:`;
case 'hour': return $localize`:@@time-span:After ${dateStrings.i18nHours}:DATE:`;
case 'minute': return $localize`:@@time-span:After ${dateStrings.i18nMinutes}:DATE:`;
case 'second': return $localize`:@@time-span:After ${dateStrings.i18nSeconds}:DATE:`;
}
}
break;
case 'before':
if (number === 1) {
switch (unit) { // singular (1 day)
case 'year': return $localize`:@@time-before:${dateStrings.i18nYear}:DATE: before`; break;
case 'month': return $localize`:@@time-before:${dateStrings.i18nMonth}:DATE: before`; break;
case 'week': return $localize`:@@time-before:${dateStrings.i18nWeek}:DATE: before`; break;
case 'day': return $localize`:@@time-before:${dateStrings.i18nDay}:DATE: before`; break;
case 'hour': return $localize`:@@time-before:${dateStrings.i18nHour}:DATE: before`; break;
case 'minute': return $localize`:@@time-before:${dateStrings.i18nMinute}:DATE: before`; break;
case 'second': return $localize`:@@time-before:${dateStrings.i18nSecond}:DATE: before`; break;
case 'year': return $localize`:@@time-before:${dateStrings.i18nYear}:DATE: before`;
case 'month': return $localize`:@@time-before:${dateStrings.i18nMonth}:DATE: before`;
case 'week': return $localize`:@@time-before:${dateStrings.i18nWeek}:DATE: before`;
case 'day': return $localize`:@@time-before:${dateStrings.i18nDay}:DATE: before`;
case 'hour': return $localize`:@@time-before:${dateStrings.i18nHour}:DATE: before`;
case 'minute': return $localize`:@@time-before:${dateStrings.i18nMinute}:DATE: before`;
case 'second': return $localize`:@@time-before:${dateStrings.i18nSecond}:DATE: before`;
}
} else {
switch (unit) { // plural (2 days)
case 'year': return $localize`:@@time-before:${dateStrings.i18nYears}:DATE: before`; break;
case 'month': return $localize`:@@time-before:${dateStrings.i18nMonths}:DATE: before`; break;
case 'week': return $localize`:@@time-before:${dateStrings.i18nWeeks}:DATE: before`; break;
case 'day': return $localize`:@@time-before:${dateStrings.i18nDays}:DATE: before`; break;
case 'hour': return $localize`:@@time-before:${dateStrings.i18nHours}:DATE: before`; break;
case 'minute': return $localize`:@@time-before:${dateStrings.i18nMinutes}:DATE: before`; break;
case 'second': return $localize`:@@time-before:${dateStrings.i18nSeconds}:DATE: before`; break;
case 'year': return $localize`:@@time-before:${dateStrings.i18nYears}:DATE: before`;
case 'month': return $localize`:@@time-before:${dateStrings.i18nMonths}:DATE: before`;
case 'week': return $localize`:@@time-before:${dateStrings.i18nWeeks}:DATE: before`;
case 'day': return $localize`:@@time-before:${dateStrings.i18nDays}:DATE: before`;
case 'hour': return $localize`:@@time-before:${dateStrings.i18nHours}:DATE: before`;
case 'minute': return $localize`:@@time-before:${dateStrings.i18nMinutes}:DATE: before`;
case 'second': return $localize`:@@time-before:${dateStrings.i18nSeconds}:DATE: before`;
}
}
break;
default:
if (number === 1) {
switch (unit) { // singular (1 day)
case 'year': return dateStrings.i18nYear; break;
case 'month': return dateStrings.i18nMonth; break;
case 'week': return dateStrings.i18nWeek; break;
case 'day': return dateStrings.i18nDay; break;
case 'hour': return dateStrings.i18nHour; break;
case 'minute': return dateStrings.i18nMinute; break;
case 'second': return dateStrings.i18nSecond; break;
case 'year': return dateStrings.i18nYear;
case 'month': return dateStrings.i18nMonth;
case 'week': return dateStrings.i18nWeek;
case 'day': return dateStrings.i18nDay;
case 'hour': return dateStrings.i18nHour;
case 'minute': return dateStrings.i18nMinute;
case 'second': return dateStrings.i18nSecond;
}
} else {
switch (unit) { // plural (2 days)
case 'year': return dateStrings.i18nYears; break;
case 'month': return dateStrings.i18nMonths; break;
case 'week': return dateStrings.i18nWeeks; break;
case 'day': return dateStrings.i18nDays; break;
case 'hour': return dateStrings.i18nHours; break;
case 'minute': return dateStrings.i18nMinutes; break;
case 'second': return dateStrings.i18nSeconds; break;
case 'year': return dateStrings.i18nYears;
case 'month': return dateStrings.i18nMonths;
case 'week': return dateStrings.i18nWeeks;
case 'day': return dateStrings.i18nDays;
case 'hour': return dateStrings.i18nHours;
case 'minute': return dateStrings.i18nMinutes;
case 'second': return dateStrings.i18nSeconds;
}
}
}

1
production/nginx/nginx.conf
View file

@ -52,6 +52,7 @@ http {
# for services from mempool.space like contributors on about page
set $mempoolSpaceServices "https://mempool.space";
set $mempoolSpaceUnfurler "http://127.0.0.1:8001";
set $mempoolSpaceSSR "http://127.0.0.1:4201";
# for mempool daemons, see upstream-mempool.conf
set $mempoolMainnet "http://mempool-bitcoin-mainnet";

22
production/nginx/server-common.conf
View file

@ -121,6 +121,10 @@ location ^~ /render {
location /unfurl/ {
try_files /dev/null @mempool-space-unfurler;
}
# ssr handler
location /ssr/ {
try_files /dev/null @mempool-space-ssr;
}
location /slurp/ {
try_files /dev/null @mempool-space-slurper;
}
@ -173,6 +177,24 @@ location @mempool-space-unfurler {
expires 1d;
}
location @mempool-space-ssr {
#rewrite ^(.*)$ $unfurlprefix$1 last;
proxy_pass $mempoolSpaceSSR;
proxy_set_header Host $host;
proxy_set_header X-Real-IP $remote_addr;
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 unfurler;
proxy_cache_valid 200 5m; # will re-render page if older than this
proxy_redirect off;
expires 5m;
}
location @mempool-space-slurper {
proxy_pass $mempoolSpaceUnfurler;